From 5e24fe2c85fab5c924e35e5cd16cd69c6af7687e Mon Sep 17 00:00:00 2001 From: GearShocky Date: Thu, 27 Feb 2025 16:44:03 +0500 Subject: [PATCH] Iron --- .../mc/otm/datagen/lang/English.kt | 2 ++ .../mc/otm/datagen/lang/Russian.kt | 2 ++ .../datagen/recipes/CraftingTableRecipes.kt | 18 +++++++++++++----- .../otm/datagen/recipes/MultiblockRecipes.kt | 12 ++++++++++++ .../ru/dbotthepony/mc/otm/registry/MNames.kt | 1 + .../mc/otm/registry/game/MItems.kt | 4 ++++ .../models/block/frame_block.json | 4 ++-- .../item/component/reinforced_iron_plate.png | Bin 0 -> 500 bytes .../component/reinforced_tritanium_plate.png | Bin 277 -> 507 bytes 9 files changed, 36 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/component/reinforced_iron_plate.png 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 65f84bf30..b60fdaff0 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 @@ -814,6 +814,8 @@ private fun items(provider: MatteryLanguageProvider) { add(MItems.MIRROR, "desc", "I can clearly see my own reflection in this mirror") add(MItems.REINFORCED_TRITANIUM_PLATE, "Reinforced Tritanium Plate") add(MItems.REINFORCED_TRITANIUM_PLATE, "desc", "An armor plate, reinforced to withstand great kinetic forces") + add(MItems.REINFORCED_IRON_PLATE, "Reinforced Iron Plate") + add(MItems.REINFORCED_IRON_PLATE, "desc", "A sturdier and more durable Iron Plate") add(MItems.ARMOR_ASSEMBLY, "Armor assembly") add(MItems.CARBON_MESH, "Carbon Mesh") 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 a7f1ae945..d4867917a 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 @@ -807,6 +807,8 @@ private fun items(provider: MatteryLanguageProvider) { add(MItems.MIRROR, "desc", "Я могу очень отчётливо видеть своё отражение в этом зеркале") add(MItems.REINFORCED_TRITANIUM_PLATE, "Укреплённая тритановая пластина") add(MItems.REINFORCED_TRITANIUM_PLATE, "desc", "Бронированная пластина, усиленная чтобы выдержать большие кинетические силы") + add(MItems.REINFORCED_IRON_PLATE, "Укреплённая железная пластина") + add(MItems.REINFORCED_IRON_PLATE, "desc", "Более надёжная и прочная железная пластина") add(MItems.ARMOR_ASSEMBLY, "Стройка брони") add(MItems.CARBON_MESH, "Углеродная сетка") 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 5ba4a2ce6..2389b6cb9 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 @@ -262,11 +262,19 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) { .build(consumer) MatteryRecipe(MItems.REINFORCED_TRITANIUM_PLATE, category = RecipeCategory.MISC) - .rowB(MItemTags.CARBON_PLATES) - .row(MItemTags.CARBON_PLATES, MItemTags.TRITANIUM_PLATES, MItemTags.CARBON_PLATES) - .rowB(MItemTags.CARBON_PLATES) - .unlockedBy(MItemTags.TRITANIUM_PLATES) - .build(consumer) + .rowB(MItemTags.CARBON_PLATES) + .row(MItemTags.CARBON_PLATES, MItemTags.TRITANIUM_PLATES, MItemTags.CARBON_PLATES) + .rowB(MItemTags.CARBON_PLATES) + .unlockedBy(MItemTags.TRITANIUM_PLATES) + .build(consumer) + + MatteryRecipe(MItems.REINFORCED_IRON_PLATE, category = RecipeCategory.MISC) + .rowB(MItemTags.CARBON_PLATES) + .row(MItemTags.CARBON_PLATES, MItemTags.IRON_PLATES, MItemTags.CARBON_PLATES) + .rowB(MItemTags.CARBON_PLATES) + .unlockedBy(MItemTags.IRON_PLATES) + .build(consumer) + MatteryRecipe(MItems.ARMOR_ASSEMBLY, category = RecipeCategory.MISC) .row(MItemTags.CARBON_PLATES, MItemTags.IRON_PLATES, MItemTags.CARBON_PLATES) .row(MItemTags.IRON_PLATES, Items.DIAMOND, MItemTags.IRON_PLATES) 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 index 9ba54c635..aa26f9d42 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MultiblockRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MultiblockRecipes.kt @@ -116,6 +116,18 @@ fun addMultiblockRecipes(consumer: RecipeOutput) { .row(MItems.ELECTRIC_PARTS, MItems.ELECTROMOTOR, MItems.ELECTRIC_PARTS) .build(consumer) + MatteryRecipe(MItems.MODULAR_FRAME, category = machinesCategory) + .row(MItemTags.IRON_PLATES, Tags.Items.INGOTS_IRON, MItemTags.IRON_PLATES) + .rowAC(Tags.Items.INGOTS_IRON, Tags.Items.INGOTS_IRON) + .row(MItemTags.IRON_PLATES, Tags.Items.INGOTS_IRON, MItemTags.IRON_PLATES) + .build(consumer) + + MatteryRecipe(MItems.HEAVY_MODULAR_FRAME, category = machinesCategory) + .rowB(MItems.REINFORCED_IRON_PLATE) + .row(MItems.REINFORCED_IRON_PLATE, MItems.MODULAR_FRAME, MItems.REINFORCED_IRON_PLATE) + .rowB(MItems.REINFORCED_IRON_PLATE) + .build(consumer) + // blackhole generator MatteryRecipe(MItems.BLACK_HOLE_GENERATOR, category = machinesCategory) .row(MItemTags.ADVANCED_CIRCUIT, MItems.BLACK_HOLE_SCANNER, MItemTags.ADVANCED_CIRCUIT) 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 e92f94346..5a4218d0a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt @@ -204,6 +204,7 @@ object MNames { const val CARBON_MESH = "carbon_mesh" const val ARMOR_ASSEMBLY = "armor_assembly" const val REINFORCED_TRITANIUM_PLATE = "reinforced_tritanium_plate" + const val REINFORCED_IRON_PLATE = "reinforced_iron_plate" const val QUANTUM_TRANSCEIVER = "quantum_transceiver" const val ELECTROMAGNET = "electromagnet" 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 8a07647ce..b200f0536 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 @@ -539,6 +539,9 @@ object MItems { val REINFORCED_TRITANIUM_PLATE: Item by registry.register(MNames.REINFORCED_TRITANIUM_PLATE) { MatteryItem( DEFAULT_PROPERTIES ).addSimpleDescription() } + val REINFORCED_IRON_PLATE: Item by registry.register(MNames.REINFORCED_IRON_PLATE) { MatteryItem( + DEFAULT_PROPERTIES + ).addSimpleDescription() } val QUANTUM_TRANSCEIVER: Item by registry.register(MNames.QUANTUM_TRANSCEIVER) { Item(DEFAULT_PROPERTIES) } val ELECTROMAGNET: Item by registry.register(MNames.ELECTROMAGNET) { Item(DEFAULT_PROPERTIES) } @@ -612,6 +615,7 @@ object MItems { MItems::CARBON_MESH, MItems::ARMOR_ASSEMBLY, MItems::REINFORCED_TRITANIUM_PLATE, + MItems::REINFORCED_IRON_PLATE, ) val CARGO_CRATE_MINECARTS = registry.coloredWithBase(MNames.MINECART_CARGO_CRATE, ::MinecartCargoCrateItem) diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/frame_block.json b/src/main/resources/assets/overdrive_that_matters/models/block/frame_block.json index bbdeb0ca9..5aea3aa89 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/frame_block.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/frame_block.json @@ -17,8 +17,8 @@ } }, { - "from": [15.99999, 15.99999, 15.99999], - "to": [0.00001, 0.00001, 0.00001], + "from": [15.99995, 15.99995, 15.99995], + "to": [0.00005, 0.00005, 0.00005], "rotation": {"angle": 0, "axis": "y", "origin": [16, 16, 16]}, "faces": { "north": {"uv": [0, 0, 16, 16], "texture": "#texture", "cullface": "south"}, diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/reinforced_iron_plate.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/reinforced_iron_plate.png new file mode 100644 index 0000000000000000000000000000000000000000..928758f1bded1afd7d71b2028c3d4341ed15abae GIT binary patch literal 500 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}%0G|-oxVX6g|NpO8vEt^inAohFBqr> z3>bp_D}+FT1s;*b3=DkxL735kHCP2GC{f}XQ4*Y=R#Ki=l*$m0n3-3i=jR%tV5(=R zXY_jy^ERNGZK)BSX`Y^13>-iXD}xjxD+42tvp@3Xlx~Oh9v) zz$$|*Er2YjE<*zYkZdRaUFSNsJ;Fd{x~Gd{h(>U1A0yuZ1rFxbP9Oj4$2D3`HkI1D zxHIX05$mri76Z4t@w#)0Rj=r6F%wv4YMje3H)_4%fwxi}j`p&f=QIbhIW=2voH literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/reinforced_tritanium_plate.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/reinforced_tritanium_plate.png index 5e41fa12500a60a4ded4fce29bfbe4eecc3432c9..165517bc50d6dcb783ea5b793b236e722ec91039 100644 GIT binary patch delta 398 zcmbQr^qYBtk4$b;f8(qbvH4Zn+S-1x>2h*%Vq#(p3=E!^F7Z#y(5sgyag8Vm&QB{T zPb^Ah2uRG#E79|F4N)-FGt@Ksy@z=lQ0=zV2+uT6Pb~%xAcvJfijkFp5yX6s4hbT1CVSd|6S)gwmrf?W|pUmV~9p@ zY#%q*0R>R%i_7$idc|<{W<3A^ delta 166 zcmV;X09pV01C;`hOdL*KXKjLyftsjYZ+a^$D;^#m78Vu&006)q`&^M|E`MrCL_t(2 zQ(cZx4uCKSLn{mz_rI_mpe8n1#(VSwMD1~4wU zW%wE3Ml&%JAY6`N$H?M{T}Fr|?tzTc8QejU)fwzN*kKA=u(M+qj$o(POp7;}HwHHb U3Dm$FfB*mh07*qoM6N<$g5I}5xc~qF