From b378f2dcb9b3e95b54dbf1b7a36a6553bb6b8c94 Mon Sep 17 00:00:00 2001 From: Ayutac Date: Sat, 26 Feb 2022 12:03:23 +0100 Subject: [PATCH] In-depth update of chrome->chromium, thanks to Ayutac, Xanthian * In-depth update of chrome->chromium, thanks to Ayutac, Xanthian This fixes Bug #2621 without accidentally destroying items (untested, but the chrome item registration isn't changed) and supersedes PR #2780 which only made language changes. I just plainly copied the lang changes from Xanthian. As for the chrome stuff, I thought long and hard how to do it properly. Possible variants: 1. Change tag names in constructor for chrome only. 2. Change tag names in enum for chrome only. 3. Don't change the internal tag names of the enums, but change the tag registration process in datagen for chrome only. 4. Introduce CHROMIUM variant, add conversion recipes etc. and hope over time CHROME can be safely removed. (4) always had the potential of item loss, so I discarded it first. Deciding between (1), (2) and (3) was harder. The drawback of (2) is code bloating by adding a lot of extra enum constructors, especially for cases which already had enum constructor options. But in the end I decided to go with it because it was the cleanest solution to a dirty problem. This is the first time I encountered a datagen drawback, because if we didn't register by running through the enum array, we could have simply changed it there; a possible (5) but still worse than (2). * Whoops, forgot recipe changes with the tags * Merged chromium with hardness/resistance Replaced the isHot argument from constructors with default false while I was at it. --- src/main/java/techreborn/init/TRContent.java | 128 ++++++++++++------ .../assets/techreborn/lang/en_us.json | 46 +++---- .../recipes/compressor/chrome_plate.json | 2 +- .../compressor/chrome_plate_from_block.json | 2 +- .../crafting_table/armor/cloaking_device.json | 2 +- .../industrial_machine_casing.json | 2 +- .../industrial_machine_casing_alt.json | 2 +- .../industrial_machine_frame.json | 2 +- .../recipes/grinder/chrome_dust.json | 2 +- .../nichrome_heating_coil.json | 2 +- 10 files changed, 116 insertions(+), 74 deletions(-) diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index 35a8ebdc4..329cfd699 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -489,41 +489,47 @@ public class TRContent { } } + /** + * The base tag name for chrome items. "chromium" is proper spelling, but changing the enum constant names or + * directly registry names will result in item loss upon updating. Hence, only the base tag is changed, where needed. + */ + public static final String CHROME_TAG_NAME_BASE = "chromium"; + public static final Tag.Identified STORAGE_BLOCK_TAG = TagFactory.ITEM.create(new Identifier(TechReborn.MOD_ID, "storage_blocks")); public enum StorageBlocks implements ItemConvertible, TagConvertible { - ADVANCED_ALLOY(false, 5f, 6f), + ADVANCED_ALLOY(5f, 6f), ALUMINUM(), BRASS(), - BRONZE(false, 5f, 6f), - CHROME(false, 5f, 6f), + BRONZE(5f, 6f), + CHROME(false, 5f, 6f, CHROME_TAG_NAME_BASE), ELECTRUM(), HOT_TUNGSTENSTEEL(true, 5f, 6f), INVAR(), - IRIDIUM(false, 5f, 6f), - IRIDIUM_REINFORCED_STONE(false, 30f, 800f), - IRIDIUM_REINFORCED_TUNGSTENSTEEL(false, 50f, 1200f), + IRIDIUM(5f, 6f), + IRIDIUM_REINFORCED_STONE(30f, 800f), + IRIDIUM_REINFORCED_TUNGSTENSTEEL(50f, 1200f), LEAD(), - NICKEL(false, 5f, 6f), - PERIDOT(false, 5f, 6f), - PLATINUM(false, 5f, 6f), - RAW_IRIDIUM(false, 2f, 2f), - RAW_LEAD(false, 2f, 2f), - RAW_SILVER(false, 2f, 2f), - RAW_TIN(false, 2f, 2f), - RAW_TUNGSTEN(false, 2f, 2f), - RED_GARNET(false, 5f, 6f), - REFINED_IRON(false, 5f, 6f), - RUBY(false, 5f, 6f), - SAPPHIRE(false, 5f, 6f), - SILVER(false, 5f, 6f), - STEEL(false, 5f, 6f), + NICKEL(5f, 6f), + PERIDOT(5f, 6f), + PLATINUM(5f, 6f), + RAW_IRIDIUM(2f, 2f), + RAW_LEAD(2f, 2f), + RAW_SILVER(2f, 2f), + RAW_TIN(2f, 2f), + RAW_TUNGSTEN(2f, 2f), + RED_GARNET(5f, 6f), + REFINED_IRON(5f, 6f), + RUBY(5f, 6f), + SAPPHIRE(5f, 6f), + SILVER(5f, 6f), + STEEL(5f, 6f), TIN(), - TITANIUM(false, 5f, 6f), - TUNGSTEN(false, 5f, 6f), - TUNGSTENSTEEL(false, 30f, 800f), - YELLOW_GARNET(false, 5f, 6f), - ZINC(false, 5f, 6f); + TITANIUM(5f, 6f), + TUNGSTEN(5f, 6f), + TUNGSTENSTEEL(30f, 800f), + YELLOW_GARNET(5f, 6f), + ZINC(5f, 6f); private final String name; private final Block block; @@ -532,11 +538,11 @@ public class TRContent { private final WallBlock wallBlock; private final Tag.Identified tag; - StorageBlocks(boolean isHot, float hardness, float resistance) { + StorageBlocks(boolean isHot, float hardness, float resistance, String tagNameBase) { name = this.toString().toLowerCase(Locale.ROOT); block = new BlockStorage(isHot, hardness, resistance); InitUtils.setup(block, name + "_storage_block"); - tag = TagFactory.ITEM.create(new Identifier("c", name + "_blocks")); + tag = TagFactory.ITEM.create(new Identifier("c", Objects.requireNonNullElse(tagNameBase, name) + "_blocks")); stairsBlock = new TechRebornStairsBlock(block.getDefaultState(), FabricBlockSettings.copyOf(block)); InitUtils.setup(stairsBlock, name + "_storage_block_stairs"); @@ -548,6 +554,14 @@ public class TRContent { InitUtils.setup(wallBlock, name + "_storage_block_wall"); } + StorageBlocks(boolean isHot, float hardness, float resistance) { + this(isHot, hardness, resistance, null); + } + + StorageBlocks(float hardness, float resistance) { + this(false, hardness, resistance, null); + } + StorageBlocks() { this(false, 3f, 6f); } @@ -707,7 +721,7 @@ public class TRContent { public static final Tag.Identified DUSTS_TAG = TagFactory.ITEM.create(new Identifier(TechReborn.MOD_ID, "dusts")); public enum Dusts implements ItemConvertible, TagConvertible { - ALMANDINE, ALUMINUM, AMETHYST, ANDESITE, ANDRADITE, ASHES, BASALT, BAUXITE, BRASS, BRONZE, CALCITE, CHARCOAL, CHROME, + ALMANDINE, ALUMINUM, AMETHYST, ANDESITE, ANDRADITE, ASHES, BASALT, BAUXITE, BRASS, BRONZE, CALCITE, CHARCOAL, CHROME(CHROME_TAG_NAME_BASE), CINNABAR, CLAY, COAL, DARK_ASHES, DIAMOND, DIORITE, ELECTRUM, EMERALD, ENDER_EYE, ENDER_PEARL, ENDSTONE, FLINT, GALENA, GRANITE, GROSSULAR, INVAR, LAZURITE, MAGNESIUM, MANGANESE, MARBLE, NETHERRACK, NICKEL, OBSIDIAN, OLIVINE, PERIDOT, PHOSPHOROUS, PLATINUM, PYRITE, PYROPE, QUARTZ, RED_GARNET, RUBY, SALTPETER, @@ -717,11 +731,15 @@ public class TRContent { private final Item item; private final Tag.Identified tag; - Dusts() { + Dusts(String tagNameBase) { name = this.toString().toLowerCase(Locale.ROOT); item = new Item(new Item.Settings().group(TechReborn.ITEMGROUP)); InitUtils.setup(item, name + "_dust"); - tag = TagFactory.ITEM.create(new Identifier("c", name + "_dusts")); + tag = TagFactory.ITEM.create(new Identifier("c", Objects.requireNonNullElse(tagNameBase, name) + "_dusts")); + } + + Dusts() { + this(null); } public ItemStack getStack() { @@ -798,7 +816,7 @@ public class TRContent { public static final Tag.Identified SMALL_DUSTS_TAG = TagFactory.ITEM.create(new Identifier(TechReborn.MOD_ID, "small_dusts")); public enum SmallDusts implements ItemConvertible, TagConvertible { - ALMANDINE, ANDESITE, ANDRADITE, ASHES, BASALT, BAUXITE, CALCITE, CHARCOAL, CHROME, + ALMANDINE, ANDESITE, ANDRADITE, ASHES, BASALT, BAUXITE, CALCITE, CHARCOAL, CHROME(CHROME_TAG_NAME_BASE), CINNABAR, CLAY, COAL, DARK_ASHES, DIAMOND, DIORITE, ELECTRUM, EMERALD, ENDER_EYE, ENDER_PEARL, ENDSTONE, FLINT, GALENA, GLOWSTONE(Items.GLOWSTONE_DUST), GRANITE, GROSSULAR, INVAR, LAZURITE, MAGNESIUM, MANGANESE, MARBLE, NETHERRACK, NICKEL, OBSIDIAN, OLIVINE, PERIDOT, PHOSPHOROUS, PLATINUM, PYRITE, PYROPE, QUARTZ, REDSTONE(Items.REDSTONE), @@ -810,7 +828,7 @@ public class TRContent { private final ItemConvertible dust; private final Tag.Identified tag; - SmallDusts(ItemConvertible dustVariant) { + SmallDusts(String tagNameBase, ItemConvertible dustVariant) { name = this.toString().toLowerCase(Locale.ROOT); item = new Item(new Item.Settings().group(TechReborn.ITEMGROUP)); if (dustVariant == null) @@ -822,11 +840,19 @@ public class TRContent { } dust = dustVariant; InitUtils.setup(item, name + "_small_dust"); - tag = TagFactory.ITEM.create(new Identifier("c", name + "_small_dusts")); + tag = TagFactory.ITEM.create(new Identifier("c", Objects.requireNonNullElse(tagNameBase, name) + "_small_dusts")); + } + + SmallDusts(String tagNameBase) { + this(tagNameBase, null); + } + + SmallDusts(ItemConvertible dustVariant) { + this(null, dustVariant); } SmallDusts() { - this(null); + this(null, null); } public ItemStack getStack() { @@ -934,7 +960,7 @@ public class TRContent { public static final Tag.Identified INGOTS_TAG = TagFactory.ITEM.create(new Identifier(TechReborn.MOD_ID, "ingots")); public enum Ingots implements ItemConvertible, TagConvertible { - ADVANCED_ALLOY, ALUMINUM, BRASS, BRONZE, CHROME, ELECTRUM, HOT_TUNGSTENSTEEL, INVAR, IRIDIUM_ALLOY, IRIDIUM, + ADVANCED_ALLOY, ALUMINUM, BRASS, BRONZE, CHROME(CHROME_TAG_NAME_BASE), ELECTRUM, HOT_TUNGSTENSTEEL, INVAR, IRIDIUM_ALLOY, IRIDIUM, LEAD, MIXED_METAL, NICKEL, PLATINUM, REFINED_IRON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, ZINC; private final String name; @@ -942,7 +968,7 @@ public class TRContent { private final ItemConvertible storageBlock; private final Tag.Identified tag; - Ingots() { + Ingots(String tagNameBase) { name = this.toString().toLowerCase(Locale.ROOT); item = new Item(new Item.Settings().group(TechReborn.ITEMGROUP)); ItemConvertible blockVariant = null; @@ -954,7 +980,11 @@ public class TRContent { } storageBlock = blockVariant; InitUtils.setup(item, name + "_ingot"); - tag = TagFactory.ITEM.create(new Identifier("c", name + "_ingots")); + tag = TagFactory.ITEM.create(new Identifier("c", Objects.requireNonNullElse(tagNameBase, name) + "_ingots")); + } + + Ingots() { + this(null); } public ItemStack getStack() { @@ -995,7 +1025,7 @@ public class TRContent { public static final Tag.Identified NUGGETS_TAG = TagFactory.ITEM.create(new Identifier(TechReborn.MOD_ID, "nuggets")); public enum Nuggets implements ItemConvertible, TagConvertible { - ALUMINUM, BRASS, BRONZE, CHROME, COPPER(Items.COPPER_INGOT, false), DIAMOND(Items.DIAMOND, true), + ALUMINUM, BRASS, BRONZE, CHROME(CHROME_TAG_NAME_BASE), COPPER(Items.COPPER_INGOT, false), DIAMOND(Items.DIAMOND, true), ELECTRUM, EMERALD(Items.EMERALD, true), HOT_TUNGSTENSTEEL, INVAR, IRIDIUM, LEAD, NICKEL, PLATINUM, REFINED_IRON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, ZINC; @@ -1005,7 +1035,7 @@ public class TRContent { private final boolean ofGem; private final Tag.Identified tag; - Nuggets(ItemConvertible ingotVariant, boolean ofGem) { + Nuggets(String tagNameBase, ItemConvertible ingotVariant, boolean ofGem) { name = this.toString().toLowerCase(Locale.ROOT); item = new Item(new Item.Settings().group(TechReborn.ITEMGROUP)); if (ingotVariant == null) @@ -1018,7 +1048,15 @@ public class TRContent { ingot = ingotVariant; this.ofGem = ofGem; InitUtils.setup(item, name + "_nugget"); - tag = TagFactory.ITEM.create(new Identifier("c", name + "_nuggets")); + tag = TagFactory.ITEM.create(new Identifier("c", Objects.requireNonNullElse(tagNameBase, name) + "_nuggets")); + } + + Nuggets(ItemConvertible ingotVariant, boolean ofGem) { + this(null, ingotVariant, ofGem); + } + + Nuggets(String tagNameBase) { + this(tagNameBase, null, false); } Nuggets() { @@ -1144,7 +1182,7 @@ public class TRContent { public static final Tag.Identified PLATES_TAG = TagFactory.ITEM.create(new Identifier(TechReborn.MOD_ID, "plates")); public enum Plates implements ItemConvertible, TagConvertible { - ADVANCED_ALLOY, ALUMINUM, BRASS, BRONZE, CARBON, CHROME, COAL, COPPER, DIAMOND, ELECTRUM, EMERALD, GOLD, INVAR, + ADVANCED_ALLOY, ALUMINUM, BRASS, BRONZE, CARBON, CHROME(CHROME_TAG_NAME_BASE), COAL, COPPER, DIAMOND, ELECTRUM, EMERALD, GOLD, INVAR, IRIDIUM_ALLOY, IRIDIUM, IRON, LAPIS, LAZURITE, LEAD, MAGNALIUM, NICKEL, OBSIDIAN, PERIDOT, PLATINUM, QUARTZ, RED_GARNET, REDSTONE, REFINED_IRON, RUBY, SAPPHIRE, SILICON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, WOOD, YELLOW_GARNET, ZINC; @@ -1153,11 +1191,15 @@ public class TRContent { private final Item item; private final Tag.Identified tag; - Plates() { + Plates(String tagNameBase) { name = this.toString().toLowerCase(Locale.ROOT); item = new Item(new Item.Settings().group(TechReborn.ITEMGROUP)); InitUtils.setup(item, name + "_plate"); - tag = TagFactory.ITEM.create(new Identifier("c", name + "_plates")); + tag = TagFactory.ITEM.create(new Identifier("c", Objects.requireNonNullElse(tagNameBase, name) + "_plates")); + } + + Plates() { + this(null); } public ItemStack getStack() { diff --git a/src/main/resources/assets/techreborn/lang/en_us.json b/src/main/resources/assets/techreborn/lang/en_us.json index c8eb88ed7..d3cc130c4 100644 --- a/src/main/resources/assets/techreborn/lang/en_us.json +++ b/src/main/resources/assets/techreborn/lang/en_us.json @@ -166,10 +166,10 @@ "block.techreborn.bronze_storage_block_stairs": "Bronze Stairs", "block.techreborn.bronze_storage_block_slab": "Bronze Slab", "block.techreborn.bronze_storage_block_wall": "Bronze Wall", - "block.techreborn.chrome_storage_block": "Block of Chrome", - "block.techreborn.chrome_storage_block_stairs": "Chrome Stairs", - "block.techreborn.chrome_storage_block_slab": "Chrome Slab", - "block.techreborn.chrome_storage_block_wall": "Chrome Wall", + "block.techreborn.chrome_storage_block": "Block of Chromium", + "block.techreborn.chrome_storage_block_stairs": "Chromium Stairs", + "block.techreborn.chrome_storage_block_slab": "Chromium Slab", + "block.techreborn.chrome_storage_block_wall": "Chromium Wall", "block.techreborn.copper_wall": "Copper Wall", "block.techreborn.electrum_storage_block": "Block of Electrum", "block.techreborn.electrum_storage_block_stairs": "Electrum Stairs", @@ -395,7 +395,7 @@ "item.techreborn.bronze_dust": "Bronze Dust", "item.techreborn.calcite_dust": "Calcite Dust", "item.techreborn.charcoal_dust": "Charcoal Dust", - "item.techreborn.chrome_dust": "Chrome Dust", + "item.techreborn.chrome_dust": "Chromium Dust", "item.techreborn.cinnabar_dust": "Cinnabar Dust", "item.techreborn.clay_dust": "Clay Dust", "item.techreborn.coal_dust": "Coal Dust", @@ -459,7 +459,7 @@ "item.techreborn.bronze_small_dust": "Small Pile of Bronze Dust", "item.techreborn.calcite_small_dust": "Small Pile of Calcite Dust", "item.techreborn.charcoal_small_dust": "Small Pile of Charcoal Dust", - "item.techreborn.chrome_small_dust": "Small Pile of Chrome Dust", + "item.techreborn.chrome_small_dust": "Small Pile of Chromium Dust", "item.techreborn.cinnabar_small_dust": "Small Pile of Cinnabar Dust", "item.techreborn.clay_small_dust": "Small Pile of Clay Dust", "item.techreborn.coal_small_dust": "Small Pile of Coal Dust", @@ -524,7 +524,7 @@ "item.techreborn.aluminum_ingot": "Aluminium Ingot", "item.techreborn.brass_ingot": "Brass Ingot", "item.techreborn.bronze_ingot": "Bronze Ingot", - "item.techreborn.chrome_ingot": "Chrome Ingot", + "item.techreborn.chrome_ingot": "Chromium Ingot", "item.techreborn.electrum_ingot": "Electrum Ingot", "item.techreborn.hot_tungstensteel_ingot": "Hot Tungstensteel Ingot", "item.techreborn.invar_ingot": "Invar Ingot", @@ -547,7 +547,7 @@ "item.techreborn.aluminum_nugget": "Aluminium Nugget", "item.techreborn.brass_nugget": "Brass Nugget", "item.techreborn.bronze_nugget": "Bronze Nugget", - "item.techreborn.chrome_nugget": "Chrome Nugget", + "item.techreborn.chrome_nugget": "Chromium Nugget", "item.techreborn.copper_nugget": "Copper Nugget", "item.techreborn.diamond_nugget": "Diamond Nugget", "item.techreborn.electrum_nugget": "Electrum Nugget", @@ -574,7 +574,7 @@ "item.techreborn.brass_plate": "Brass Plate", "item.techreborn.bronze_plate": "Bronze Plate", "item.techreborn.carbon_plate": "Carbon Plate", - "item.techreborn.chrome_plate": "Chrome Plate", + "item.techreborn.chrome_plate": "Chromium Plate", "item.techreborn.coal_plate": "Coal Plate", "item.techreborn.copper_plate": "Copper Plate", "item.techreborn.diamond_plate": "Diamond Plate", @@ -611,37 +611,37 @@ "item.techreborn.zinc_plate": "Zinc Plate", "_comment13": "Parts", - "item.techreborn.carbon_fiber": "Carbon Fiber", - "item.techreborn.carbon_mesh": "Carbon Mesh", + "item.techreborn.carbon_fiber": "Carbon Fiber", + "item.techreborn.carbon_mesh": "Carbon Mesh", "item.techreborn.electronic_circuit": "Electronic Circuit", "item.techreborn.advanced_circuit": "Advanced Circuit", - "item.techreborn.industrial_circuit": "Industrial Circuit", + "item.techreborn.industrial_circuit": "Industrial Circuit", "item.techreborn.machine_parts": "Machine Parts", "item.techreborn.basic_display": "Basic Display", "item.techreborn.digital_display": "Digital Display", "item.techreborn.data_storage_core": "Data Storage Core", - "item.techreborn.data_storage_chip": "Data Storage Chip", + "item.techreborn.data_storage_chip": "Data Storage Chip", "item.techreborn.energy_flow_chip": "Energy Flow Chip", - "item.techreborn.superconductor": "Superconductor", - "item.techreborn.diamond_saw_blade": "Diamond Saw Blade", + "item.techreborn.superconductor": "Superconductor", + "item.techreborn.diamond_saw_blade": "Diamond Saw Blade", "item.techreborn.diamond_grinding_head": "Diamond Grinding Head", - "item.techreborn.tungsten_grinding_head": "Tungsten Grinding Head", + "item.techreborn.tungsten_grinding_head": "Tungsten Grinding Head", "item.techreborn.cupronickel_heating_coil": "Cupronickel Heating Coil", - "item.techreborn.kanthal_heating_coil": "Kanthal Heating Coil", - "item.techreborn.nichrome_heating_coil": "Nichrome Heating Coil", + "item.techreborn.kanthal_heating_coil": "Kanthal Heating Coil", + "item.techreborn.nichrome_heating_coil": "Nichrome Heating Coil", "item.techreborn.neutron_reflector": "Neutron Reflector", - "item.techreborn.thick_neutron_reflector": "Thick Neutron Reflector", + "item.techreborn.thick_neutron_reflector": "Thick Neutron Reflector", "item.techreborn.iridium_neutron_reflector": "Iridium Neutron Reflector", "item.techreborn.water_coolant_cell_10k": "10k Water Coolant Cell", "item.techreborn.water_coolant_cell_30k": "30k Water Coolant Cell", "item.techreborn.water_coolant_cell_60k": "60k Water Coolant Cell", "item.techreborn.helium_coolant_cell_60k": "60k Helium Coolant Cell", "item.techreborn.helium_coolant_cell_180k": "180k Helium Coolant Cell", - "item.techreborn.helium_coolant_cell_360k": "360k Helium Coolant Cell", + "item.techreborn.helium_coolant_cell_360k": "360k Helium Coolant Cell", "item.techreborn.nak_coolant_cell_60k": "60k NaK Coolant Cell", "item.techreborn.nak_coolant_cell_180k": "180k NaK Coolant Cell", "item.techreborn.nak_coolant_cell_360k": "360k NaK Coolant Cell", - "item.techreborn.rubber": "Rubber", + "item.techreborn.rubber": "Rubber", "item.techreborn.sap": "Sap", "item.techreborn.scrap": "Scrap", "item.techreborn.uu_matter": "UU-Matter", @@ -649,7 +649,7 @@ "item.techreborn.compressed_plantball": "Compressed Plantball", "item.techreborn.sponge_piece": "Piece of Sponge", "item.techreborn.synthetic_redstone_crystal": "Synthetic Redstone Crystal", - + "_comment14": "Items-Armor", "item.techreborn.cloaking_device": "Cloaking Device", "item.techreborn.lapotronic_orbpack": "Lapotronic Orbpack", @@ -1083,4 +1083,4 @@ "gui.techreborn.tank.amount": "Fluid Amount:", "gui.techreborn.storage.store": "Storing:", "gui.techreborn.storage.amount": "Amount:" -} +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/chrome_plate.json b/src/main/resources/data/techreborn/recipes/compressor/chrome_plate.json index d551ec543..d0c4fe17a 100644 --- a/src/main/resources/data/techreborn/recipes/compressor/chrome_plate.json +++ b/src/main/resources/data/techreborn/recipes/compressor/chrome_plate.json @@ -4,7 +4,7 @@ "time": 300, "ingredients": [ { - "tag": "c:chrome_ingots" + "tag": "c:chromium_ingots" } ], "results": [ diff --git a/src/main/resources/data/techreborn/recipes/compressor/chrome_plate_from_block.json b/src/main/resources/data/techreborn/recipes/compressor/chrome_plate_from_block.json index 84b6690b0..b9365a70c 100644 --- a/src/main/resources/data/techreborn/recipes/compressor/chrome_plate_from_block.json +++ b/src/main/resources/data/techreborn/recipes/compressor/chrome_plate_from_block.json @@ -4,7 +4,7 @@ "time": 300, "ingredients": [ { - "tag": "c:chrome_blocks" + "tag": "c:chromium_blocks" } ], "results": [ diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/armor/cloaking_device.json b/src/main/resources/data/techreborn/recipes/crafting_table/armor/cloaking_device.json index 1fdf39702..b677f4eb7 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/armor/cloaking_device.json +++ b/src/main/resources/data/techreborn/recipes/crafting_table/armor/cloaking_device.json @@ -7,7 +7,7 @@ ], "key": { "C": { - "tag": "c:chrome_ingots" + "tag": "c:chromium_ingots" }, "I": { "item": "techreborn:iridium_alloy_plate" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/machine_block/industrial_machine_casing.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine_block/industrial_machine_casing.json index 33bface4a..34599de92 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/machine_block/industrial_machine_casing.json +++ b/src/main/resources/data/techreborn/recipes/crafting_table/machine_block/industrial_machine_casing.json @@ -10,7 +10,7 @@ "item": "techreborn:industrial_machine_frame" }, "R": { - "tag": "c:chrome_plates" + "tag": "c:chromium_plates" }, "C": { "item": "techreborn:data_storage_core" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/machine_block/industrial_machine_casing_alt.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine_block/industrial_machine_casing_alt.json index f94f89f68..1993de4e9 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/machine_block/industrial_machine_casing_alt.json +++ b/src/main/resources/data/techreborn/recipes/crafting_table/machine_block/industrial_machine_casing_alt.json @@ -10,7 +10,7 @@ "item": "techreborn:advanced_machine_casing" }, "R": { - "tag": "c:chrome_plates" + "tag": "c:chromium_plates" }, "C": { "item": "techreborn:data_storage_core" diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/machine_block/industrial_machine_frame.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine_block/industrial_machine_frame.json index e1e418934..b7324f9c3 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/machine_block/industrial_machine_frame.json +++ b/src/main/resources/data/techreborn/recipes/crafting_table/machine_block/industrial_machine_frame.json @@ -10,7 +10,7 @@ "item": "techreborn:advanced_machine_frame" }, "C": { - "tag": "c:chrome_plates" + "tag": "c:chromium_plates" }, "T": { "tag": "c:titanium_plates" diff --git a/src/main/resources/data/techreborn/recipes/grinder/chrome_dust.json b/src/main/resources/data/techreborn/recipes/grinder/chrome_dust.json index d4ae673b0..63dcf18f7 100644 --- a/src/main/resources/data/techreborn/recipes/grinder/chrome_dust.json +++ b/src/main/resources/data/techreborn/recipes/grinder/chrome_dust.json @@ -4,7 +4,7 @@ "time": 250, "ingredients": [ { - "tag": "c:chrome_ingots" + "tag": "c:chromium_ingots" } ], "results": [ diff --git a/src/main/resources/data/techreborn/recipes/rolling_machine/nichrome_heating_coil.json b/src/main/resources/data/techreborn/recipes/rolling_machine/nichrome_heating_coil.json index 9f76006f6..6eefca405 100644 --- a/src/main/resources/data/techreborn/recipes/rolling_machine/nichrome_heating_coil.json +++ b/src/main/resources/data/techreborn/recipes/rolling_machine/nichrome_heating_coil.json @@ -11,7 +11,7 @@ "tag": "c:nickel_ingots" }, "C": { - "tag": "c:chrome_ingots" + "tag": "c:chromium_ingots" } }, "result": {