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 5069aef84..3dde05b1a 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 @@ -400,6 +400,7 @@ private fun items(provider: MatteryLanguageProvider) { add(MItems.BASIC_CONTROL_CIRCUIT, "Basic Control Circuit") add(MItems.ADVANCED_CONTROL_CIRCUIT, "Advanced Control Circuit") add(MItems.QUANTUM_TRANSCEIVER, "Quantum Transceiver") + add(MItems.ELECTROMAGNET, "Electromagnet") add(MItems.GRAVITATIONAL_DISRUPTOR, "Gravitational Disruptor") 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 c4eeed78a..830c70d51 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 @@ -147,6 +147,11 @@ fun addCraftingTableRecipes(consumer: Consumer) { .unlockedBy(Tags.Items.ENDER_PEARLS) .build(consumer) + MatteryRecipe(MItems.ELECTROMAGNET) + .row(MItemTags.COPPER_WIRES, Tags.Items.INGOTS_IRON, MItemTags.COPPER_WIRES) + .unlockedBy(Tags.Items.ENDER_PEARLS) + .build(consumer) + MatteryRecipe(MItems.ENERGY_SERVO) .row(MItemTags.TRITANIUM_PLATES, MItems.MACHINE_FRAME, MItemTags.TRITANIUM_PLATES) .row(MItemTags.TRITANIUM_PLATES, MItems.ENERGY_BUS, MItemTags.TRITANIUM_PLATES) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt index a50fd9747..09c7a63db 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt @@ -243,6 +243,7 @@ object MItems { val MATTER_CAPACITOR_PARTS: Item by registry.register(MNames.MATTER_CAPACITOR_PARTS) { Item(DEFAULT_PROPERTIES) } val QUANTUM_TRANSCEIVER: Item by registry.register("quantum_transceiver") { Item(DEFAULT_PROPERTIES) } + val ELECTROMAGNET: Item by registry.register("electromagnet") { Item(DEFAULT_PROPERTIES) } val DATAGEN_COMPONENTS = LazyList( { ENERGY_BUS }, @@ -258,6 +259,8 @@ object MItems { { MATTER_CAPACITOR_PARTS }, { MATTER_IO_PORT }, { MATTER_TRANSFORM_MATRIX }, + { QUANTUM_TRANSCEIVER }, + { ELECTROMAGNET }, ) val EXOSUIT_PROBE: Item by registry.register(MNames.EXOSUIT_PROBE, ::ExoSuitProbeItem) diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/electromagnet.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/electromagnet.png new file mode 100644 index 000000000..d36635b4d Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/component/electromagnet.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/quantum_transceiver.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/quantum_transceiver.png new file mode 100644 index 000000000..d36635b4d Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/component/quantum_transceiver.png differ