Multiblock parts recipes, mechanical parts item

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt

@@ -588,6 +588,7 @@ object DataGen {
 			addComponentRecipes(consumer)
 			addStorageItemRecipes(consumer)
 			addCraftingTableRecipes(consumer)
+			addMultiblockRecipes(consumer)
 			addBlastingRecipes(consumer)
 			addDecorativesRecipes(recipeProvider, consumer)
 			addMachineUpgradeRecipes(consumer)

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt

@@ -768,8 +768,12 @@ private fun items(provider: MatteryLanguageProvider) {
 		add(MItems.TRITANIUM_NUGGET, "Tritanium Nugget")
 		add(MItems.MATTER_IO_PORT, "Matter IO Port")
 		add(MItems.MATTER_TRANSFORM_MATRIX, "Matter Transformation Matrix")
+		add(MItems.ANTIMATTER_TRANSFORM_MATRIX, "Antimatter Transformation Matrix")
 		add(MItems.ENERGY_BUS, "Energy Bus")
 		add(MItems.ELECTRIC_PARTS, "Electric Parts")
+		add(MItems.ELECTRIC_PARTS, "desc", "Capacitors, resistors, diodes, jumpers...")
+		add(MItems.MECHANICAL_PARTS, "Mechanical Parts")
+		add(MItems.MECHANICAL_PARTS, "desc", "Bearings, gears, fittings, axial shafts...")
 		add(MItems.MACHINE_FRAME, "Machine Frame")
 		add(MItems.TRITANIUM_PLATE, "Tritanium Plate")
 		add(MItems.IRON_PLATE, "Iron Plate")

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt

@@ -764,8 +764,12 @@ private fun items(provider: MatteryLanguageProvider) {
 		add(MItems.TRITANIUM_NUGGET, "Тритановый самородок")
 		add(MItems.MATTER_IO_PORT, "Порт ввода/вывода материи")
 		add(MItems.MATTER_TRANSFORM_MATRIX, "Матрица преобразования материи")
+		add(MItems.ANTIMATTER_TRANSFORM_MATRIX, "Матрица преобразования антиматерии")
 		add(MItems.ENERGY_BUS, "Шина питания")
 		add(MItems.ELECTRIC_PARTS, "Электрические части")
+		add(MItems.ELECTRIC_PARTS, "desc", "Конденсаторы, резисторы, диоды, перемычки...")
+		add(MItems.MECHANICAL_PARTS, "Механические части")
+		add(MItems.MECHANICAL_PARTS, "desc", "Подшипники, шестерёнки, муфты, осевые валы...")
 		add(MItems.MACHINE_FRAME, "Каркас механизма")
 		add(MItems.TRITANIUM_PLATE, "Тритановая пластина")
 		add(MItems.IRON_PLATE, "Железная пластина")

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ComponentRecipes.kt

@@ -89,4 +89,15 @@ fun addComponentRecipes(consumer: RecipeOutput) {
 		.row(Tags.Items.NUGGETS_GOLD, Tags.Items.NUGGETS_IRON, Tags.Items.NUGGETS_GOLD)
 		.row(Tags.Items.DUSTS_REDSTONE, MItemTags.COPPER_WIRES, Tags.Items.DUSTS_REDSTONE)
 		.build(consumer)
+
+	MatteryRecipe(MItems.MECHANICAL_PARTS, count = 4, category = RecipeCategory.MISC)
+		.row(MItemTags.TRITANIUM_INGOTS, Tags.Items.INGOTS_IRON, MItemTags.TRITANIUM_INGOTS)
+		.build(consumer)
+
+	MatteryRecipe(MItems.ELECTROMOTOR, category = RecipeCategory.MISC)
+		.rowB(MItems.ELECTRIC_PARTS)
+		.row(MItems.ELECTROMAGNET, MItems.MECHANICAL_PARTS, MItems.ELECTROMAGNET)
+		.row(MItemTags.COPPER_WIRES, MItems.MECHANICAL_PARTS, MItemTags.COPPER_WIRES)
+		.unlockedBy(MItems.ELECTROMAGNET)
+		.build(consumer)
 }

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt

@@ -244,13 +244,6 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) {
 		.unlockedBy(Tags.Items.INGOTS_IRON)
 		.build(consumer)
 
-	MatteryRecipe(MItems.ELECTROMOTOR, category = RecipeCategory.MISC)
-		.rowB(MItems.ELECTROMAGNET)
-		.row(MItems.ELECTROMAGNET, Tags.Items.INGOTS_IRON, MItems.ELECTROMAGNET)
-		.row(MItemTags.COPPER_WIRES, Tags.Items.INGOTS_IRON, MItemTags.COPPER_WIRES)
-		.unlockedBy(MItems.ELECTROMAGNET)
-		.build(consumer)
-
 	MatteryRecipe(MItems.ENERGY_SERVO[null]!!, category = RecipeCategory.MISC)
 		.row(MItemTags.TRITANIUM_PLATES, MItems.MACHINE_FRAME, MItemTags.TRITANIUM_PLATES)
 		.row(MItemTags.TRITANIUM_PLATES, MItems.ENERGY_BUS, MItemTags.TRITANIUM_PLATES)
@@ -558,6 +551,7 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) {
 	MatteryRecipe(MItems.REDSTONE_INTERACTOR, category = RecipeCategory.TOOLS)
 		.rowAB(Items.LEVER, Tags.Items.NUGGETS_IRON)
 		.rowB(Tags.Items.DUSTS_REDSTONE)
+		.unlockedBy(Tags.Items.DUSTS_REDSTONE)
 		.build(consumer)
 
 	ShapelessRecipeBuilder.shapeless(RecipeCategory.BUILDING_BLOCKS, ItemStack(MItems.DILITHIUM_CRYSTAL_BLOCK))

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatterEntanglerRecipes.kt

@@ -67,4 +67,19 @@ fun addMatterEntanglerRecipes(consumer: RecipeOutput) {
 			experience = 20f
 		).energetic()
 	)
+
+	consumer.accept(
+		modLocation("antimatter_transform_matrix"),
+		MatterEntanglerRecipe(
+			ingredients = pattern(
+				Ingredient.of(Tags.Items.ENDER_PEARLS), Ingredient.of(MItemTags.DILITHIUM_GEMS), Ingredient.of(Tags.Items.ENDER_PEARLS),
+				Ingredient.of(Tags.Items.DUSTS_REDSTONE), Ingredient.of(MItems.MATTER_TRANSFORM_MATRIX), Ingredient.of(Tags.Items.DUSTS_REDSTONE),
+				Ingredient.of(Tags.Items.DUSTS_GLOWSTONE), Ingredient.of(MItemTags.DILITHIUM_GEMS), Ingredient.of(Tags.Items.DUSTS_GLOWSTONE),
+			),
+			matter = Decimal(600),
+			ticks = 2000.0,
+			result = ItemStack(MItems.ANTIMATTER_TRANSFORM_MATRIX, 1),
+			experience = 20f
+		).energetic()
+	)
 }

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MultiblockRecipes.kt

@@ -0,0 +1,167 @@
+package ru.dbotthepony.mc.otm.datagen.recipes
+
+import net.minecraft.data.recipes.RecipeCategory
+import net.minecraft.data.recipes.RecipeOutput
+import net.minecraft.data.recipes.ShapelessRecipeBuilder
+import net.minecraft.world.item.ItemStack
+import net.neoforged.neoforge.common.Tags
+import ru.dbotthepony.mc.otm.datagen.modLocation
+import ru.dbotthepony.mc.otm.recipe.UpgradeRecipe
+import ru.dbotthepony.mc.otm.registry.MItemTags
+import ru.dbotthepony.mc.otm.registry.game.MItems
+
+fun addMultiblockRecipes(consumer: RecipeOutput) {
+	val machinesCategory = RecipeCategory.DECORATIONS
+
+	// energy interface
+	MatteryRecipe(MItems.ENERGY_INPUT_INTERFACE, category = machinesCategory)
+		.rowB(MItems.ENERGY_BUS)
+		.row(MItems.ELECTRIC_PARTS, MItems.MACHINE_FRAME, MItems.ELECTRIC_PARTS)
+		.build(consumer)
+
+	ShapelessRecipeBuilder.shapeless(machinesCategory, ItemStack(MItems.ENERGY_INPUT_INTERFACE))
+		.requires(MItems.ENERGY_OUTPUT_INTERFACE)
+		.unlockedBy(MItems.ENERGY_OUTPUT_INTERFACE)
+		.unlockedBy(MItems.ENERGY_INPUT_INTERFACE)
+		.save(consumer, modLocation("energy_interface_to_input"))
+
+	MatteryRecipe(MItems.ENERGY_OUTPUT_INTERFACE, category = machinesCategory)
+		.row(MItems.ELECTRIC_PARTS, MItems.MACHINE_FRAME, MItems.ELECTRIC_PARTS)
+		.rowB(MItems.ENERGY_BUS)
+		.build(consumer)
+
+	ShapelessRecipeBuilder.shapeless(machinesCategory, ItemStack(MItems.ENERGY_OUTPUT_INTERFACE))
+		.requires(MItems.ENERGY_INPUT_INTERFACE)
+		.unlockedBy(MItems.ENERGY_OUTPUT_INTERFACE)
+		.unlockedBy(MItems.ENERGY_INPUT_INTERFACE)
+		.save(consumer, modLocation("energy_interface_to_output"))
+
+	// energy hatch
+	MatteryRecipe(MItems.ENERGY_INPUT_HATCH, category = machinesCategory)
+		.rowAC(MItemTags.GOLD_WIRES, MItemTags.GOLD_WIRES)
+		.row(MItems.ELECTRIC_PARTS, MItems.ENERGY_INPUT_INTERFACE, MItems.ELECTRIC_PARTS)
+		.row(Tags.Items.DUSTS_REDSTONE, MItemTags.DILITHIUM_GEMS, Tags.Items.DUSTS_REDSTONE)
+		.build(consumer)
+
+	MatteryRecipe(MItems.ENERGY_OUTPUT_HATCH, category = machinesCategory)
+		.row(Tags.Items.DUSTS_REDSTONE, MItemTags.DILITHIUM_GEMS, Tags.Items.DUSTS_REDSTONE)
+		.row(MItems.ELECTRIC_PARTS, MItems.ENERGY_INPUT_INTERFACE, MItems.ELECTRIC_PARTS)
+		.rowAC(MItemTags.GOLD_WIRES, MItemTags.GOLD_WIRES)
+		.build(consumer)
+
+	MatteryRecipe(MItems.ENERGY_INPUT_HATCH, category = machinesCategory)
+		.rowB(MItems.ENERGY_OUTPUT_HATCH)
+		.setUpgradeSource(MItems.ENERGY_OUTPUT_HATCH)
+		.addUpgradeOps(UpgradeRecipe.CopyAllComponents)
+		.build(consumer, "from_output")
+
+	MatteryRecipe(MItems.ENERGY_OUTPUT_HATCH, category = machinesCategory)
+		.rowB(MItems.ENERGY_INPUT_HATCH)
+		.setUpgradeSource(MItems.ENERGY_INPUT_HATCH)
+		.addUpgradeOps(UpgradeRecipe.CopyAllComponents)
+		.build(consumer, "from_input")
+
+	// item hatch
+	MatteryRecipe(MItems.ITEM_INPUT_HATCH, category = machinesCategory)
+		.rowB(MItemTags.BASIC_CIRCUIT)
+		.row(MItems.MECHANICAL_PARTS, MItemTags.CARGO_CRATES, MItems.MECHANICAL_PARTS)
+		.build(consumer)
+
+	MatteryRecipe(MItems.ITEM_OUTPUT_HATCH, category = machinesCategory)
+		.row(MItems.MECHANICAL_PARTS, MItemTags.CARGO_CRATES, MItems.MECHANICAL_PARTS)
+		.rowB(MItemTags.BASIC_CIRCUIT)
+		.build(consumer)
+
+	ShapelessRecipeBuilder.shapeless(machinesCategory, ItemStack(MItems.ITEM_INPUT_HATCH))
+		.requires(MItems.ITEM_OUTPUT_HATCH)
+		.unlockedBy(MItems.ITEM_INPUT_HATCH)
+		.unlockedBy(MItems.ITEM_OUTPUT_HATCH)
+		.save(consumer, modLocation("item_hatch_to_input"))
+
+	ShapelessRecipeBuilder.shapeless(machinesCategory, ItemStack(MItems.ITEM_OUTPUT_HATCH))
+		.requires(MItems.ITEM_INPUT_HATCH)
+		.unlockedBy(MItems.ITEM_INPUT_HATCH)
+		.unlockedBy(MItems.ITEM_OUTPUT_HATCH)
+		.save(consumer, modLocation("item_hatch_to_output"))
+
+	// matter hatch
+	MatteryRecipe(MItems.MATTER_INPUT_HATCH, category = machinesCategory)
+		.rowB(MItems.MATTER_IO_PORT)
+		.row(MItems.MECHANICAL_PARTS, MItems.MACHINE_FRAME, MItems.ELECTRIC_PARTS)
+		.rowAC(MItems.MATTER_CAPACITOR_PARTS, MItems.MATTER_CAPACITOR_PARTS)
+		.build(consumer)
+
+	MatteryRecipe(MItems.MATTER_OUTPUT_HATCH, category = machinesCategory)
+		.rowAC(MItems.MATTER_CAPACITOR_PARTS, MItems.MATTER_CAPACITOR_PARTS)
+		.row(MItems.MECHANICAL_PARTS, MItems.MACHINE_FRAME, MItems.ELECTRIC_PARTS)
+		.rowB(MItems.MATTER_IO_PORT)
+		.build(consumer)
+
+	MatteryRecipe(MItems.MATTER_INPUT_HATCH, category = machinesCategory)
+		.rowB(MItems.MATTER_OUTPUT_HATCH)
+		.setUpgradeSource(MItems.MATTER_OUTPUT_HATCH)
+		.addUpgradeOps(UpgradeRecipe.CopyAllComponents)
+		.build(consumer, "from_output")
+
+	MatteryRecipe(MItems.MATTER_OUTPUT_HATCH, category = machinesCategory)
+		.rowB(MItems.MATTER_INPUT_HATCH)
+		.setUpgradeSource(MItems.MATTER_INPUT_HATCH)
+		.addUpgradeOps(UpgradeRecipe.CopyAllComponents)
+		.build(consumer, "from_input")
+
+	// misc
+	MatteryRecipe(MItems.GENERATOR_BLOCK, category = machinesCategory)
+		.row(MItems.ELECTRIC_PARTS, MItems.ELECTROMOTOR, MItems.ELECTRIC_PARTS)
+		.row(MItems.ELECTROMOTOR, MItems.MACHINE_FRAME, MItems.ELECTROMOTOR)
+		.row(MItems.ELECTRIC_PARTS, MItems.ELECTROMOTOR, MItems.ELECTRIC_PARTS)
+		.build(consumer)
+
+	// blackhole generator
+	MatteryRecipe(MItems.BLACK_HOLE_GENERATOR, category = machinesCategory)
+		.row(MItemTags.ADVANCED_CIRCUIT, MItems.BLACK_HOLE_SCANNER, MItemTags.ADVANCED_CIRCUIT)
+		.row(MItemTags.DILITHIUM_GEMS, MItems.MACHINE_FRAME, MItemTags.DILITHIUM_GEMS)
+		.row(MItems.MATTER_CAPACITOR_PARTS, Tags.Items.GEMS_DIAMOND, MItems.MATTER_CAPACITOR_PARTS)
+		.build(consumer)
+
+	MatteryRecipe(MItems.MATTER_INJECTOR, category = machinesCategory)
+		.row(MItemTags.ADVANCED_CIRCUIT, MItems.MATTER_TRANSFORM_MATRIX, MItemTags.ADVANCED_CIRCUIT)
+		.row(MItemTags.DILITHIUM_GEMS, MItems.MACHINE_FRAME, MItemTags.DILITHIUM_GEMS)
+		.row(MItems.MATTER_IO_PORT, MItems.GRAVITATION_FIELD_SENSOR, MItems.MATTER_IO_PORT)
+		.build(consumer)
+
+	MatteryRecipe(MItems.ANTIMATTER_INJECTOR, category = machinesCategory)
+		.row(MItemTags.ADVANCED_CIRCUIT, MItems.ANTIMATTER_TRANSFORM_MATRIX, MItemTags.ADVANCED_CIRCUIT)
+		.row(MItemTags.DILITHIUM_GEMS, MItems.MACHINE_FRAME, MItemTags.DILITHIUM_GEMS)
+		.row(MItems.MATTER_IO_PORT, MItems.GRAVITATION_FIELD_SENSOR, MItems.MATTER_IO_PORT)
+		.build(consumer)
+
+	MatteryRecipe(MItems.HIGH_ENERGY_PARTICLE_COLLECTOR, category = machinesCategory)
+		.row(MItemTags.ADVANCED_CIRCUIT, MItems.MECHANICAL_PARTS, MItemTags.ADVANCED_CIRCUIT)
+		.row(Tags.Items.GEMS_QUARTZ, MItems.MACHINE_FRAME, Tags.Items.GEMS_QUARTZ)
+		.row(MItemTags.DILITHIUM_GEMS, MItems.GRAVITATION_FIELD_LIMITER, MItemTags.DILITHIUM_GEMS)
+		.build(consumer)
+
+	// flywheel
+	MatteryRecipe(MItems.FLYWHEEL_SHAFT, category = machinesCategory)
+		.row(MItemTags.TRITANIUM_PLATES, MItems.MECHANICAL_PARTS, MItemTags.TRITANIUM_PLATES)
+		.row(MItemTags.TRITANIUM_PLATES, MItems.MECHANICAL_PARTS, MItemTags.TRITANIUM_PLATES)
+		.row(MItemTags.TRITANIUM_PLATES, MItems.MECHANICAL_PARTS, MItemTags.TRITANIUM_PLATES)
+		.build(consumer)
+
+	MatteryRecipe(MItems.FLYWHEEL_BEARING, category = machinesCategory)
+		.row(MItemTags.TRITANIUM_PLATES, MItems.MECHANICAL_PARTS, MItemTags.TRITANIUM_PLATES)
+		.row(MItems.MECHANICAL_PARTS, MItems.MECHANICAL_PARTS, MItems.MECHANICAL_PARTS)
+		.row(MItemTags.TRITANIUM_PLATES, MItems.MECHANICAL_PARTS, MItemTags.TRITANIUM_PLATES)
+		.build(consumer)
+
+	MatteryRecipe(MItems.FLYWHEEL_HOUSING, count = 4, category = machinesCategory)
+		.row(MItemTags.CARBON_PLATES, MItemTags.TRITANIUM_PLATES, MItemTags.CARBON_PLATES)
+		.row(MItemTags.TRITANIUM_PLATES, MItems.ELECTRIC_PARTS, MItemTags.TRITANIUM_PLATES)
+		.row(MItemTags.CARBON_PLATES, MItemTags.TRITANIUM_PLATES, MItemTags.CARBON_PLATES)
+		.build(consumer)
+
+	MatteryRecipe(MItems.FLYWHEEL_BATTERY, category = machinesCategory)
+		.row(MItemTags.ADVANCED_CIRCUIT, MItems.FLYWHEEL_HOUSING, MItemTags.ADVANCED_CIRCUIT)
+		.row(MItemTags.GOLD_WIRES, MItemTags.COPPER_WIRES, MItemTags.GOLD_WIRES)
+		.build(consumer)
+}

src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt

@@ -196,7 +196,6 @@ object MNames {
 	const val METAL_RAILING = "metal_railing"
 
 	const val MATTER_IO_PORT = "matter_io_port"
-	const val MATTER_TRANSFORM_MATRIX = "matter_transform_matrix"
 
 	const val CARBON_MESH = "carbon_mesh"
 	const val ARMOR_ASSEMBLY = "armor_assembly"
@@ -210,7 +209,6 @@ object MNames {
 	const val BLANK_MACHINE_UPGRADE = "blank_machine_upgrade"
 
 	const val ENERGY_BUS = "energy_bus"
-	const val ELECTRIC_PARTS = "electric_parts"
 
 	const val MACHINE_FRAME = "machine_frame"
 	const val TRITANIUM_PLATE = "tritanium_plate"

src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MCreativeTabs.kt

@@ -186,6 +186,9 @@ private fun addMainCreativeTabItems(consumer: CreativeModeTab.Output) {
 		accept(MItems.GENERATOR_BLOCK)
 
 		accept(MItems.BLACK_HOLE_GENERATOR)
+		accept(MItems.MATTER_INJECTOR)
+		accept(MItems.ANTIMATTER_INJECTOR)
+		accept(MItems.HIGH_ENERGY_PARTICLE_COLLECTOR)
 
 		accept(MItems.ITEM_INPUT_HATCH)
 		accept(MItems.ITEM_OUTPUT_HATCH)

src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MItems.kt

@@ -497,9 +497,11 @@ object MItems {
 
 	// components
 	val MATTER_IO_PORT: Item by registry.register(MNames.MATTER_IO_PORT) { Item(DEFAULT_PROPERTIES) }
-	val MATTER_TRANSFORM_MATRIX: Item by registry.register(MNames.MATTER_TRANSFORM_MATRIX) { Item(DEFAULT_PROPERTIES) }
+	val MATTER_TRANSFORM_MATRIX: Item by registry.register("matter_transform_matrix") { MatteryItem(DEFAULT_PROPERTIES) }
+	val ANTIMATTER_TRANSFORM_MATRIX: Item by registry.register("antimatter_transform_matrix") { MatteryItem(DEFAULT_PROPERTIES) }
 	val ENERGY_BUS: Item by registry.register(MNames.ENERGY_BUS) { Item(DEFAULT_PROPERTIES) }
-	val ELECTRIC_PARTS: Item by registry.register(MNames.ELECTRIC_PARTS) { Item(DEFAULT_PROPERTIES) }
+	val ELECTRIC_PARTS: Item by registry.register("electric_parts") { MatteryItem(DEFAULT_PROPERTIES).addSimpleDescription() }
+	val MECHANICAL_PARTS: Item by registry.register("mechanical_parts") { MatteryItem(DEFAULT_PROPERTIES).addSimpleDescription() }
 	val MACHINE_FRAME: Item by registry.register(MNames.MACHINE_FRAME) { Item(DEFAULT_PROPERTIES) }
 	val TRITANIUM_PLATE: Item by registry.register(MNames.TRITANIUM_PLATE) { Item(DEFAULT_PROPERTIES) }
 	val IRON_PLATE: Item by registry.register(MNames.IRON_PLATE) { Item(DEFAULT_PROPERTIES) }
@@ -534,8 +536,10 @@ object MItems {
 	val COMPONENTS = SupplierList(
 		MItems::MATTER_IO_PORT,
 		MItems::MATTER_TRANSFORM_MATRIX,
+		MItems::ANTIMATTER_TRANSFORM_MATRIX,
 		MItems::ENERGY_BUS,
 		MItems::ELECTRIC_PARTS,
+		MItems::MECHANICAL_PARTS,
 		MItems::MACHINE_FRAME,
 		MItems::TRITANIUM_PLATE,
 		MItems::IRON_PLATE,
@@ -570,6 +574,7 @@ object MItems {
 	val DATAGEN_COMPONENTS = SupplierList(
 		MItems::ENERGY_BUS,
 		MItems::ELECTRIC_PARTS,
+		MItems::MECHANICAL_PARTS,
 		MItems::TRITANIUM_PLATE,
 		MItems::IRON_PLATE,
 		MItems::GOLD_PLATE,
@@ -581,6 +586,7 @@ object MItems {
 		MItems::MATTER_CAPACITOR_PARTS,
 		MItems::MATTER_IO_PORT,
 		MItems::MATTER_TRANSFORM_MATRIX,
+		MItems::ANTIMATTER_TRANSFORM_MATRIX,
 		MItems::QUANTUM_TRANSCEIVER,
 		MItems::ELECTROMAGNET,
 		MItems::ELECTROMOTOR,