From 57d67b29457b67d1d289c373af81477287485442 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sun, 9 Feb 2025 13:30:58 +0700 Subject: [PATCH] Multiblock parts recipes, mechanical parts item --- .../ru/dbotthepony/mc/otm/datagen/DataGen.kt | 1 + .../mc/otm/datagen/lang/English.kt | 4 + .../mc/otm/datagen/lang/Russian.kt | 4 + .../otm/datagen/recipes/ComponentRecipes.kt | 11 ++ .../datagen/recipes/CraftingTableRecipes.kt | 8 +- .../datagen/recipes/MatterEntanglerRecipes.kt | 15 ++ .../otm/datagen/recipes/MultiblockRecipes.kt | 167 ++++++++++++++++++ .../ru/dbotthepony/mc/otm/registry/MNames.kt | 2 - .../mc/otm/registry/game/MCreativeTabs.kt | 3 + .../mc/otm/registry/game/MItems.kt | 10 +- .../component/antimatter_transform_matrix.png | Bin 0 -> 2437 bytes .../item/component/mechanical_parts.png | Bin 0 -> 2437 bytes 12 files changed, 214 insertions(+), 11 deletions(-) create mode 100644 src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MultiblockRecipes.kt create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/component/antimatter_transform_matrix.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/component/mechanical_parts.png diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt index 4be8f7178..3186d87c4 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt +++ b/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) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt index 8f3b5a99f..417b5cb10 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt +++ b/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") diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt index ef7c6330a..a6a78ac18 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt +++ b/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, "Железная пластина") diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ComponentRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ComponentRecipes.kt index 5441d4e1f..89a1a4e4d 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ComponentRecipes.kt +++ b/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) } diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt index f6dca2fe7..c32226065 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt +++ b/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)) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatterEntanglerRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatterEntanglerRecipes.kt index 7874282c1..d57c2ee3d 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatterEntanglerRecipes.kt +++ b/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() + ) } diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MultiblockRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MultiblockRecipes.kt new file mode 100644 index 000000000..47c89d19c --- /dev/null +++ b/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) +} diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt index 2339ce62d..12b1734de 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt +++ b/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" diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MCreativeTabs.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MCreativeTabs.kt index 7428eacd1..1a90da578 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MCreativeTabs.kt +++ b/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) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MItems.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MItems.kt index 2d1bc6e9e..eeabe5ade 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MItems.kt +++ b/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, diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/antimatter_transform_matrix.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/antimatter_transform_matrix.png new file mode 100644 index 0000000000000000000000000000000000000000..d36635b4d3d72a5dd2644f4bd55341d6da866d5b GIT binary patch literal 2437 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