From 35ee672696da0b9e4361601adbd0abd9c678d2a5 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sun, 25 Sep 2022 18:43:19 +0700 Subject: [PATCH] Rename tag constants names to something better --- .../mc/otm/datagen/ResearchData.kt | 18 +-- .../datagen/recipes/CraftingTableRecipes.kt | 116 +++++++++--------- .../otm/datagen/recipes/DecorativesRecipes.kt | 26 ++-- .../mc/otm/item/TritaniumArmorItem.kt | 2 +- .../ru/dbotthepony/mc/otm/registry/Tags.kt | 8 +- 5 files changed, 85 insertions(+), 85 deletions(-) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/ResearchData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/ResearchData.kt index 5f9b86865..8a581c0bc 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/ResearchData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/ResearchData.kt @@ -26,7 +26,7 @@ fun addResearchData(serializer: Consumer, lang: MatteryLang .withDescription() .withIcon(ResearchIcons.ICON_AIR_BAGS) .addItem(Tags.Items.GLASS_PANES, 6) - .addItem(MItemTags.PLATE_IRON) + .addItem(MItemTags.IRON_PLATES) .build() serializer.accept(AIR_BAGS) @@ -35,8 +35,8 @@ fun addResearchData(serializer: Consumer, lang: MatteryLang .withExperience(20) .withDescription() .withIcon(ResearchIcons.ICON_EXTENDED_REACH) - .addItem(MItemTags.PLATE_TRITANIUM, 3) - .addItem(MItemTags.PLATE_IRON, 2) + .addItem(MItemTags.TRITANIUM_PLATES, 3) + .addItem(MItemTags.IRON_PLATES, 2) .addItem(MItemTags.GOLD_WIRES, 4) .build() @@ -49,7 +49,7 @@ fun addResearchData(serializer: Consumer, lang: MatteryLang .withIcon(ResearchIcons.ICON_STEP_ASSIST) .addPrerequisite(IMPROVED_LIMBS) .addItem(MItemTags.PISTONS, 2) - .addItem(MItemTags.PLATE_TRITANIUM, 4) + .addItem(MItemTags.TRITANIUM_PLATES, 4) .addItem(MItemTags.COPPER_WIRES, 6) .build() @@ -62,7 +62,7 @@ fun addResearchData(serializer: Consumer, lang: MatteryLang .withDescription() .withIcon(ResearchIcons.ICON_EXTENDED_REACH) .addItem(MItemTags.PISTONS, 2) - .addItem(MItemTags.PLATE_TRITANIUM, 4) + .addItem(MItemTags.TRITANIUM_PLATES, 4) .addItem(MItemTags.GOLD_WIRES, 6) .addItem(MItems.QUANTUM_TRANSCEIVER) .build() @@ -76,7 +76,7 @@ fun addResearchData(serializer: Consumer, lang: MatteryLang .addFeatureResult(AndroidFeatures.NIGHT_VISION) .addItem(Tags.Items.GLASS_PANES_COLORLESS, 4) .addItem(Tags.Items.DUSTS_REDSTONE, 4) - .addItem(MItemTags.PLATE_TRITANIUM, 2) + .addItem(MItemTags.TRITANIUM_PLATES, 2) .addItem(MItems.ELECTRIC_PARTS, 3) .addItem(MItemTags.ADVANCED_CIRCUIT) .addItem(Items.ENDER_EYE, 2) @@ -99,7 +99,7 @@ fun addResearchData(serializer: Consumer, lang: MatteryLang .addFeatureResult(OverdriveThatMatters.loc(MNames.NANOBOTS_ARMOR)) .withIcon(ResearchIcons.ICON_ARMOR) .addBlocker(OverdriveThatMatters.loc(MNames.ATTACK_BOOST_1), rigid = true) - .addItem(MItemTags.PLATE_TRITANIUM, 4) + .addItem(MItemTags.TRITANIUM_PLATES, 4) .addItem(MItemTags.COPPER_WIRES, 8) .build() @@ -208,7 +208,7 @@ fun addResearchData(serializer: Consumer, lang: MatteryLang (i + 1) * 6 ) ) - .addItem(MItemTags.PLATE_TRITANIUM, 2 + i * 2) + .addItem(MItemTags.TRITANIUM_PLATES, 2 + i * 2) .addItem(Items.SUGAR, 1 + i) .addFeatureResult(AndroidFeatures.NANOBOTS_ARMOR, 0, transformersUp = listOf(NanobotsArmorFeature.STRENGTH_TRANSFORMER_UP.bind(level)), @@ -262,7 +262,7 @@ fun addResearchData(serializer: Consumer, lang: MatteryLang .addItem(Tags.Items.ENDER_PEARLS) .addItem(Tags.Items.DUSTS_REDSTONE, 2) .addItem(MItemTags.GOLD_WIRES, 4) - .addItem(MItemTags.PLATE_GOLD, 2) + .addItem(MItemTags.GOLD_PLATES, 2) .build() val ITEM_MAGNET = 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 709a4c156..c4eeed78a 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 @@ -18,12 +18,12 @@ import java.util.function.Consumer fun addCraftingTableRecipes(consumer: Consumer) { for ((dye, crate) in MRegistry.CARGO_CRATES.blocks) { ShapedRecipeBuilder(crate, 1) - .define('P', MItemTags.PLATE_TRITANIUM) + .define('P', MItemTags.TRITANIUM_PLATES) .define('C', Tags.Items.CHESTS) .define('D', dye.tag) .pattern(" D ").pattern("PCP") // .unlockedBy("has_dye", has(dye.tag)) - .unlockedBy("has_tritanium_plate", has(MItemTags.PLATE_TRITANIUM)) + .unlockedBy("has_tritanium_plate", has(MItemTags.TRITANIUM_PLATES)) .unlockedBy("has_chest", has(Tags.Items.CHESTS)) .save(consumer) @@ -35,63 +35,63 @@ fun addCraftingTableRecipes(consumer: Consumer) { } ShapedRecipeBuilder(MRegistry.CARGO_CRATES.item, 1) - .define('P', MItemTags.PLATE_TRITANIUM) + .define('P', MItemTags.TRITANIUM_PLATES) .define('C', Tags.Items.CHESTS) .pattern("PCP") - .unlockedBy("has_tritanium_plate", has(MItemTags.PLATE_TRITANIUM)) + .unlockedBy("has_tritanium_plate", has(MItemTags.TRITANIUM_PLATES)) .unlockedBy("has_chest", has(Tags.Items.CHESTS)) .save(consumer) MatteryRecipe(MBlocks.PLATE_PRESS) .row(MItems.ELECTRIC_PARTS, MItems.ENERGY_BUS, MItems.ELECTRIC_PARTS) - .row(MItemTags.INGOT_TRITANIUM, Items.BLAST_FURNACE, MItemTags.INGOT_TRITANIUM) - .row(MItemTags.PISTONS, MItemTags.INGOT_TRITANIUM, MItemTags.PISTONS) - .unlockedBy(MItemTags.INGOT_TRITANIUM) + .row(MItemTags.TRITANIUM_INGOTS, Items.BLAST_FURNACE, MItemTags.TRITANIUM_INGOTS) + .row(MItemTags.PISTONS, MItemTags.TRITANIUM_INGOTS, MItemTags.PISTONS) + .unlockedBy(MItemTags.TRITANIUM_INGOTS) .unlockedBy(MItems.ELECTRIC_PARTS) .build(consumer) MatteryRecipe(MBlocks.PLATE_PRESS) .rowB(MItemTags.BASIC_CIRCUIT) - .row(MItemTags.PLATE_TRITANIUM, MItems.MACHINE_FRAME, MItemTags.PLATE_TRITANIUM) + .row(MItemTags.TRITANIUM_PLATES, MItems.MACHINE_FRAME, MItemTags.TRITANIUM_PLATES) .rowAC(MItemTags.PISTONS, MItemTags.PISTONS) - .unlockedBy(MItemTags.INGOT_TRITANIUM) + .unlockedBy(MItemTags.TRITANIUM_INGOTS) .unlockedBy(MItems.ELECTRIC_PARTS) .build(consumer, "advanced") MatteryRecipe(MBlocks.TRITANIUM_STRIPED_BLOCK, 24) - .rowB(MItemTags.PLATE_TRITANIUM) - .row(MItemTags.PLATE_TRITANIUM, COBBLESTONE, MItemTags.PLATE_TRITANIUM) - .rowAB(Tags.Items.DYES_YELLOW, MItemTags.PLATE_TRITANIUM) - .unlockedBy(MItemTags.PLATE_TRITANIUM) + .rowB(MItemTags.TRITANIUM_PLATES) + .row(MItemTags.TRITANIUM_PLATES, COBBLESTONE, MItemTags.TRITANIUM_PLATES) + .rowAB(Tags.Items.DYES_YELLOW, MItemTags.TRITANIUM_PLATES) + .unlockedBy(MItemTags.TRITANIUM_PLATES) .unlockedBy(Tags.Items.DYES_YELLOW) .build(consumer) MatteryRecipe(MRegistry.TRITANIUM_BLOCK.item, 24) - .rowB(MItemTags.PLATE_TRITANIUM) - .row(MItemTags.PLATE_TRITANIUM, COBBLESTONE, MItemTags.PLATE_TRITANIUM) - .rowB(MItemTags.PLATE_TRITANIUM) - .unlockedBy(MItemTags.PLATE_TRITANIUM) + .rowB(MItemTags.TRITANIUM_PLATES) + .row(MItemTags.TRITANIUM_PLATES, COBBLESTONE, MItemTags.TRITANIUM_PLATES) + .rowB(MItemTags.TRITANIUM_PLATES) + .unlockedBy(MItemTags.TRITANIUM_PLATES) .build(consumer) // Машины MatteryRecipe(MItems.MATTER_RECYCLER) .row(MItems.MATTER_CAPACITOR_PARTS, Items.HOPPER, MItemTags.BASIC_CIRCUIT) - .row(MItemTags.PLATE_TRITANIUM, MItems.MACHINE_FRAME, MItemTags.PLATE_TRITANIUM) + .row(MItemTags.TRITANIUM_PLATES, MItems.MACHINE_FRAME, MItemTags.TRITANIUM_PLATES) .row(MItems.MATTER_CABLE, MItems.MATTER_IO_PORT, MItems.MATTER_CABLE) .unlockedBy(MItems.MATTER_CABLE) .build(consumer) // Блоки MatteryRecipe(MItems.MATTER_CAPACITOR_BANK) - .row(Tags.Items.GLASS, MItemTags.PLATE_IRON, Tags.Items.GLASS) - .row(MItemTags.PLATE_IRON, MItems.MACHINE_FRAME, MItemTags.PLATE_IRON) + .row(Tags.Items.GLASS, MItemTags.IRON_PLATES, Tags.Items.GLASS) + .row(MItemTags.IRON_PLATES, MItems.MACHINE_FRAME, MItemTags.IRON_PLATES) .row(MItems.MATTER_CABLE, MItems.MATTER_IO_PORT, MItems.MATTER_CABLE) .unlockedBy(MItems.MATTER_CABLE) .build(consumer) MatteryRecipe(MItems.BATTERY_BANK) - .row(Tags.Items.GLASS, MItemTags.PLATE_IRON, Tags.Items.GLASS) - .row(MItemTags.PLATE_IRON, MItems.MACHINE_FRAME, MItemTags.PLATE_IRON) + .row(Tags.Items.GLASS, MItemTags.IRON_PLATES, Tags.Items.GLASS) + .row(MItemTags.IRON_PLATES, MItems.MACHINE_FRAME, MItemTags.IRON_PLATES) .row(MItems.ELECTRIC_PARTS, MItems.ENERGY_BUS, MItems.ELECTRIC_PARTS) .unlockedBy(MItems.ENERGY_BUS) .build(consumer) @@ -99,44 +99,44 @@ fun addCraftingTableRecipes(consumer: Consumer) { MatteryRecipe(MItems.GRAVITATION_STABILIZER) .row(MItemTags.ADVANCED_CIRCUIT, MItems.GRAVITATION_FIELD_SENSOR, MItemTags.ADVANCED_CIRCUIT) .row(MItems.MATTER_TRANSFORM_MATRIX, MItems.MACHINE_FRAME, MItems.MATTER_TRANSFORM_MATRIX) - .row(MItemTags.PLATE_TRITANIUM, MItems.GRAVITATION_FIELD_LIMITER, MItemTags.PLATE_TRITANIUM) + .row(MItemTags.TRITANIUM_PLATES, MItems.GRAVITATION_FIELD_LIMITER, MItemTags.TRITANIUM_PLATES) .unlockedBy(MItems.GRAVITATION_FIELD_LIMITER) .unlockedBy(MItems.GRAVITATION_FIELD_SENSOR) .build(consumer) MatteryRecipe(MItems.PORTABLE_GRAVITATION_STABILIZER) - .rowB(MItemTags.PLATE_TRITANIUM) - .row(MItemTags.PLATE_TRITANIUM, MItems.GRAVITATION_FIELD_SENSOR, MItemTags.PLATE_TRITANIUM) - .row(MItemTags.PLATE_TRITANIUM, MItems.GRAVITATION_FIELD_LIMITER, MItemTags.PLATE_TRITANIUM) + .rowB(MItemTags.TRITANIUM_PLATES) + .row(MItemTags.TRITANIUM_PLATES, MItems.GRAVITATION_FIELD_SENSOR, MItemTags.TRITANIUM_PLATES) + .row(MItemTags.TRITANIUM_PLATES, MItems.GRAVITATION_FIELD_LIMITER, MItemTags.TRITANIUM_PLATES) .unlockedBy(MItems.GRAVITATION_FIELD_LIMITER) .unlockedBy(MItems.GRAVITATION_FIELD_SENSOR) .build(consumer) MatteryRecipe(MItems.GRAVITATION_FIELD_SENSOR) .rowB(MItemTags.BASIC_CIRCUIT) - .row(MItemTags.PLATE_TRITANIUM, MItems.QUANTUM_TRANSCEIVER, MItemTags.PLATE_TRITANIUM) - .rowB(MItemTags.PLATE_IRON) + .row(MItemTags.TRITANIUM_PLATES, MItems.QUANTUM_TRANSCEIVER, MItemTags.TRITANIUM_PLATES) + .rowB(MItemTags.IRON_PLATES) .unlockedBy(MItems.QUANTUM_TRANSCEIVER) .build(consumer) MatteryRecipe(MItems.GRAVITATION_FIELD_LIMITER) .row(Tags.Items.ENDER_PEARLS, MItemTags.ADVANCED_CIRCUIT, Tags.Items.ENDER_PEARLS) .row(MItemTags.GOLD_WIRES, MItems.QUANTUM_TRANSCEIVER, MItemTags.GOLD_WIRES) - .rowB(MItemTags.PLATE_TRITANIUM) + .rowB(MItemTags.TRITANIUM_PLATES) .unlockedBy(MItems.QUANTUM_TRANSCEIVER) .build(consumer) MatteryRecipe(MItems.BLACK_HOLE_SCANNER) - .row(MItemTags.PLATE_IRON, Tags.Items.GLASS_PANES_COLORLESS, MItemTags.PLATE_IRON) + .row(MItemTags.IRON_PLATES, Tags.Items.GLASS_PANES_COLORLESS, MItemTags.IRON_PLATES) .row(MItemTags.GOLD_WIRES, MItems.GRAVITATION_FIELD_SENSOR, MItemTags.ADVANCED_CIRCUIT) - .rowAC(Tags.Items.DUSTS_GLOWSTONE, MItemTags.PLATE_TRITANIUM) + .rowAC(Tags.Items.DUSTS_GLOWSTONE, MItemTags.TRITANIUM_PLATES) .unlockedBy(MItems.GRAVITATION_FIELD_SENSOR) .build(consumer) MatteryRecipe(MItems.PHANTOM_ATTRACTOR) .row(Tags.Items.DUSTS_REDSTONE, Tags.Items.GLASS_COLORLESS, Tags.Items.DUSTS_REDSTONE) - .row(MItemTags.PLATE_TRITANIUM, MItems.QUANTUM_TRANSCEIVER, MItemTags.PLATE_TRITANIUM) - .row(MItemTags.PLATE_TRITANIUM, ItemTags.BEDS, MItemTags.PLATE_TRITANIUM) + .row(MItemTags.TRITANIUM_PLATES, MItems.QUANTUM_TRANSCEIVER, MItemTags.TRITANIUM_PLATES) + .row(MItemTags.TRITANIUM_PLATES, ItemTags.BEDS, MItemTags.TRITANIUM_PLATES) .unlockedBy(MItems.QUANTUM_TRANSCEIVER) .build(consumer) @@ -148,36 +148,36 @@ fun addCraftingTableRecipes(consumer: Consumer) { .build(consumer) MatteryRecipe(MItems.ENERGY_SERVO) - .row(MItemTags.PLATE_TRITANIUM, MItems.MACHINE_FRAME, MItemTags.PLATE_TRITANIUM) - .row(MItemTags.PLATE_TRITANIUM, MItems.ENERGY_BUS, MItemTags.PLATE_TRITANIUM) + .row(MItemTags.TRITANIUM_PLATES, MItems.MACHINE_FRAME, MItemTags.TRITANIUM_PLATES) + .row(MItemTags.TRITANIUM_PLATES, MItems.ENERGY_BUS, MItemTags.TRITANIUM_PLATES) .unlockedBy(Tags.Items.ENDER_PEARLS) .build(consumer) // броня MatteryRecipe(MItems.TRITANIUM_HELMET) - .row(MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_TRITANIUM) - .row(MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_IRON, MItemTags.PLATE_TRITANIUM) - .unlockedBy(MItemTags.PLATE_TRITANIUM) + .row(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES) + .row(MItemTags.TRITANIUM_PLATES, MItemTags.IRON_PLATES, MItemTags.TRITANIUM_PLATES) + .unlockedBy(MItemTags.TRITANIUM_PLATES) .build(consumer) MatteryRecipe(MItems.TRITANIUM_PANTS) - .row(MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_TRITANIUM) - .row(MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_IRON, MItemTags.PLATE_TRITANIUM) - .rowAC(MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_TRITANIUM) - .unlockedBy(MItemTags.PLATE_TRITANIUM) + .row(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES) + .row(MItemTags.TRITANIUM_PLATES, MItemTags.IRON_PLATES, MItemTags.TRITANIUM_PLATES) + .rowAC(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES) + .unlockedBy(MItemTags.TRITANIUM_PLATES) .build(consumer) MatteryRecipe(MItems.TRITANIUM_CHESTPLATE) - .row(MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_IRON, MItemTags.PLATE_TRITANIUM) - .row(MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_TRITANIUM) - .row(MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_TRITANIUM) - .unlockedBy(MItemTags.PLATE_TRITANIUM) + .row(MItemTags.TRITANIUM_PLATES, MItemTags.IRON_PLATES, MItemTags.TRITANIUM_PLATES) + .row(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES) + .row(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES) + .unlockedBy(MItemTags.TRITANIUM_PLATES) .build(consumer) MatteryRecipe(MItems.TRITANIUM_BOOTS) - .rowAC(MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_TRITANIUM) - .row(MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_IRON, MItemTags.PLATE_TRITANIUM) - .unlockedBy(MItemTags.PLATE_TRITANIUM) + .rowAC(MItemTags.TRITANIUM_PLATES, MItemTags.TRITANIUM_PLATES) + .row(MItemTags.TRITANIUM_PLATES, MItemTags.IRON_PLATES, MItemTags.TRITANIUM_PLATES) + .unlockedBy(MItemTags.TRITANIUM_PLATES) .build(consumer) // простые батарейки @@ -190,45 +190,45 @@ fun addCraftingTableRecipes(consumer: Consumer) { MatteryRecipe(MItems.BATTERY_BASIC) .rowAC(Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE) .rowB(MItems.ELECTRIC_PARTS) - .rowB(MItemTags.PLATE_IRON) + .rowB(MItemTags.IRON_PLATES) .build(consumer) MatteryRecipe(MItems.BATTERY_NORMAL) .rowB(MItems.ELECTRIC_PARTS) - .row(MItemTags.COPPER_WIRES, MItemTags.PLATE_IRON, MItemTags.COPPER_WIRES) + .row(MItemTags.COPPER_WIRES, MItemTags.IRON_PLATES, MItemTags.COPPER_WIRES) .row(Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE) .build(consumer) MatteryRecipe(MItems.BATTERY_DENSE) .row(Tags.Items.DUSTS_REDSTONE, MItems.ENERGY_BUS, Tags.Items.DUSTS_REDSTONE) - .row(MItemTags.GOLD_WIRES, MItemTags.PLATE_TRITANIUM, MItemTags.GOLD_WIRES) + .row(MItemTags.GOLD_WIRES, MItemTags.TRITANIUM_PLATES, MItemTags.GOLD_WIRES) .row(Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE, Tags.Items.DUSTS_REDSTONE) .build(consumer) MatteryRecipe(MItems.BATTERY_CAPACITOR) .row(Tags.Items.DUSTS_REDSTONE, MItems.ENERGY_BUS, Tags.Items.DUSTS_REDSTONE) - .row(MItemTags.GOLD_WIRES, MItemTags.PLATE_TRITANIUM, MItemTags.GOLD_WIRES) + .row(MItemTags.GOLD_WIRES, MItemTags.TRITANIUM_PLATES, MItemTags.GOLD_WIRES) .row(MItemTags.GOLD_WIRES, Tags.Items.DUSTS_REDSTONE, MItemTags.GOLD_WIRES) .build(consumer) // накопители материи MatteryRecipe(MItems.MATTER_CAPACITOR_DENSE) .row(MItems.MATTER_CAPACITOR_PARTS, Tags.Items.GLASS, MItems.MATTER_CAPACITOR_PARTS) - .row(MItemTags.PLATE_TRITANIUM, Tags.Items.ENDER_PEARLS, MItemTags.PLATE_TRITANIUM) + .row(MItemTags.TRITANIUM_PLATES, Tags.Items.ENDER_PEARLS, MItemTags.TRITANIUM_PLATES) .rowAC(Tags.Items.GEMS_DIAMOND, Tags.Items.GEMS_DIAMOND) .build(consumer) // станция андроида MatteryRecipe(MItems.ANDROID_STATION) .row(MItems.ELECTRIC_PARTS, MItemTags.ADVANCED_CIRCUIT, MItems.ELECTRIC_PARTS) - .row(MItemTags.PLATE_TRITANIUM, MItems.MACHINE_FRAME, MItemTags.PLATE_TRITANIUM) - .row(MItemTags.PLATE_TRITANIUM, MItems.ELECTRIC_PARTS, MItemTags.PLATE_TRITANIUM) + .row(MItemTags.TRITANIUM_PLATES, MItems.MACHINE_FRAME, MItemTags.TRITANIUM_PLATES) + .row(MItemTags.TRITANIUM_PLATES, MItems.ELECTRIC_PARTS, MItemTags.TRITANIUM_PLATES) .build(consumer) // Энерго меч MatteryRecipe(MItems.ENERGY_SWORD) - .rowBC(MItemTags.PLATE_TRITANIUM, MItemTags.GOLD_WIRES) - .rowBC(MItemTags.PLATE_TRITANIUM, MItemTags.GOLD_WIRES) + .rowBC(MItemTags.TRITANIUM_PLATES, MItemTags.GOLD_WIRES) + .rowBC(MItemTags.TRITANIUM_PLATES, MItemTags.GOLD_WIRES) .row(MItems.BATTERY_CAPACITOR, MItems.TRITANIUM_SWORD, MItemTags.ADVANCED_CIRCUIT) .unlockedBy(MItems.BATTERY_CAPACITOR) .buildEnergetic(consumer) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/DecorativesRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/DecorativesRecipes.kt index 62a39cb3d..6e58d36bb 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/DecorativesRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/DecorativesRecipes.kt @@ -51,10 +51,10 @@ fun addDecorativesRecipes(provider: MatteryRecipeProvider, consumer: Consumer = ItemTags.create(ResourceLocation("forge", "ingots/tritanium")) - val PLATE_TRITANIUM: TagKey = ItemTags.create(ResourceLocation("forge", "plates/tritanium")) - val PLATE_IRON: TagKey = ItemTags.create(ResourceLocation("forge", "plates/iron")) - val PLATE_GOLD: TagKey = ItemTags.create(ResourceLocation("forge", "plates/gold")) + val TRITANIUM_INGOTS: TagKey = ItemTags.create(ResourceLocation("forge", "ingots/tritanium")) + val TRITANIUM_PLATES: TagKey = ItemTags.create(ResourceLocation("forge", "plates/tritanium")) + val IRON_PLATES: TagKey = ItemTags.create(ResourceLocation("forge", "plates/iron")) + val GOLD_PLATES: TagKey = ItemTags.create(ResourceLocation("forge", "plates/gold")) val TRITANIUM_CRATES: TagKey = ItemTags.create(ResourceLocation(OverdriveThatMatters.MOD_ID, "tritanium_crates")) val INDUSTRIAL_GLASS: TagKey = ItemTags.create(ResourceLocation(OverdriveThatMatters.MOD_ID, "industrial_glass"))