From d8dee6bd870f03ae276f3c2162ee4d318a740609 Mon Sep 17 00:00:00 2001 From: UltraProdigy <187078471+UltraProdigy@users.noreply.github.com> Date: Wed, 8 Jul 2026 03:21:24 -0400 Subject: [PATCH] cast it up --- .../java/team/chisel/BlockNameConversion.java | 1 + src/main/java/team/chisel/Features.java | 32 +++++++----------- .../java/team/chisel/init/ChiselBlocks.java | 2 +- .../resources/assets/chisel/lang/en_US.lang | 2 +- .../cast_iron_0.png} | Bin .../cast_iron_1-ctm.png} | Bin .../cast_iron_1.png} | Bin .../cast_iron_2.png} | Bin .../cast_iron_3-ctm.png} | Bin .../cast_iron_3.png} | Bin .../cast_iron_4-ctm.png} | Bin .../cast_iron_4.png} | Bin .../cast_iron_5-ctm.png} | Bin .../cast_iron_5.png} | Bin .../cast_iron_6-ctm.png} | Bin .../cast_iron_6.png} | Bin .../cast_iron_7.png} | Bin 17 files changed, 15 insertions(+), 22 deletions(-) rename src/main/resources/assets/chisel/textures/blocks/metals/{wrought_iron/wrought_iron_0.png => cast_iron/cast_iron_0.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/metals/{wrought_iron/wrought_iron_1-ctm.png => cast_iron/cast_iron_1-ctm.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/metals/{wrought_iron/wrought_iron_1.png => cast_iron/cast_iron_1.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/metals/{wrought_iron/wrought_iron_2.png => cast_iron/cast_iron_2.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/metals/{wrought_iron/wrought_iron_3-ctm.png => cast_iron/cast_iron_3-ctm.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/metals/{wrought_iron/wrought_iron_3.png => cast_iron/cast_iron_3.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/metals/{wrought_iron/wrought_iron_4-ctm.png => cast_iron/cast_iron_4-ctm.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/metals/{wrought_iron/wrought_iron_4.png => cast_iron/cast_iron_4.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/metals/{wrought_iron/wrought_iron_5-ctm.png => cast_iron/cast_iron_5-ctm.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/metals/{wrought_iron/wrought_iron_5.png => cast_iron/cast_iron_5.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/metals/{wrought_iron/wrought_iron_6-ctm.png => cast_iron/cast_iron_6-ctm.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/metals/{wrought_iron/wrought_iron_6.png => cast_iron/cast_iron_6.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/metals/{wrought_iron/wrought_iron_7.png => cast_iron/cast_iron_7.png} (100%) diff --git a/src/main/java/team/chisel/BlockNameConversion.java b/src/main/java/team/chisel/BlockNameConversion.java index fc4a268d0..e53650851 100644 --- a/src/main/java/team/chisel/BlockNameConversion.java +++ b/src/main/java/team/chisel/BlockNameConversion.java @@ -88,6 +88,7 @@ static public void init() { namingConversion.put("blockFft", "fantasyblock"); namingConversion.put("blockCarpetFloor", "carpet"); namingConversion.put("blockLaboratory", "laboratoryblock"); + namingConversion.put("wroughtironblock", "castironblock"); } public static Item findItem(String oldname) { diff --git a/src/main/java/team/chisel/Features.java b/src/main/java/team/chisel/Features.java index 9017ac6e3..395e402fd 100644 --- a/src/main/java/team/chisel/Features.java +++ b/src/main/java/team/chisel/Features.java @@ -4812,33 +4812,25 @@ void addBlocks() { Carving.chisel.registerOre("platinumblock", "blockPlatinum"); } }, - WROUGHT_IRON { + CAST_IRON { @Override void addBlocks() { - BlockCarvable wrought_iron = (BlockCarvable) new BlockBeaconBase(Material.iron) + BlockCarvable cast_iron = (BlockCarvable) new BlockBeaconBase(Material.iron) .setStepSound(Block.soundTypeMetal) .setCreativeTab(ChiselTabs.tabModdedChiselBlocks) .setHardness(5F) .setResistance(10F); - wrought_iron.carverHelper - .addVariation("tile.newmetalOre.0.desc", 0, "metals/wrought_iron/wrought_iron_0", 0); - wrought_iron.carverHelper - .addVariation("tile.newmetalOre.1.desc", 1, "metals/wrought_iron/wrought_iron_1", 1); - wrought_iron.carverHelper - .addVariation("tile.newetalOre.2.desc", 2, "metals/wrought_iron/wrought_iron_2", 2); - wrought_iron.carverHelper - .addVariation("tile.newetalOre.3.desc", 3, "metals/wrought_iron/wrought_iron_3", 3); - wrought_iron.carverHelper - .addVariation("tile.newetalOre.4.desc", 4, "metals/wrought_iron/wrought_iron_4", 4); - wrought_iron.carverHelper - .addVariation("tile.newetalOre.5.desc", 5, "metals/wrought_iron/wrought_iron_5", 5); - wrought_iron.carverHelper - .addVariation("tile.newetalOre.6.desc", 6, "metals/wrought_iron/wrought_iron_6", 6); - wrought_iron.carverHelper - .addVariation("tile.newetalOre.7.desc", 7, "metals/wrought_iron/wrought_iron_7", 6); - wrought_iron.carverHelper.registerAll(wrought_iron, "wroughtironblock"); - Carving.chisel.registerOre("wroughtironblock", "blockWroughtIron"); + cast_iron.carverHelper.addVariation("tile.newmetalOre.0.desc", 0, "metals/cast_iron/cast_iron_0", 0); + cast_iron.carverHelper.addVariation("tile.newmetalOre.1.desc", 1, "metals/cast_iron/cast_iron_1", 1); + cast_iron.carverHelper.addVariation("tile.newetalOre.2.desc", 2, "metals/cast_iron/cast_iron_2", 2); + cast_iron.carverHelper.addVariation("tile.newetalOre.3.desc", 3, "metals/cast_iron/cast_iron_3", 3); + cast_iron.carverHelper.addVariation("tile.newetalOre.4.desc", 4, "metals/cast_iron/cast_iron_4", 4); + cast_iron.carverHelper.addVariation("tile.newetalOre.5.desc", 5, "metals/cast_iron/cast_iron_5", 5); + cast_iron.carverHelper.addVariation("tile.newetalOre.6.desc", 6, "metals/cast_iron/cast_iron_6", 6); + cast_iron.carverHelper.addVariation("tile.newetalOre.7.desc", 7, "metals/cast_iron/cast_iron_7", 6); + cast_iron.carverHelper.registerAll(cast_iron, "castironblock"); + Carving.chisel.registerOre("castironblock", "blockCastIron"); } }, TITANIUM { diff --git a/src/main/java/team/chisel/init/ChiselBlocks.java b/src/main/java/team/chisel/init/ChiselBlocks.java index 659229138..696224b00 100644 --- a/src/main/java/team/chisel/init/ChiselBlocks.java +++ b/src/main/java/team/chisel/init/ChiselBlocks.java @@ -189,7 +189,7 @@ public final class ChiselBlocks { public static final BlockCarvable invar = null; public static final BlockCarvable nickel = null; public static final BlockCarvable platinum = null; - public static final BlockCarvable wrought_iron = null; + public static final BlockCarvable cast_iron = null; public static final BlockCarvable stainless_steel = null; public static final BlockCarvable titanium = null; public static final BlockCarvable tungstensteel = null; diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index adf8f7ecc..e0896966e 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -2820,7 +2820,7 @@ tile.chisel.invarblock.name=Block of Invar tile.chisel.electrumblock.name=Block of Electrum tile.chisel.nickelblock.name=Block of Nickel tile.chisel.platinumblock.name=Block of Platinum -tile.chisel.wroughtironblock.name=Block of Wrought Iron +tile.chisel.castironblock.name=Block of Cast Iron tile.chisel.stainlesssteelblock.name=Block of Stainless Steel tile.chisel.titaniumblock.name=Block of Titanium tile.chisel.tungstensteelblock.name=Block of Tungstensteel diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_0.png b/src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_0.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_0.png rename to src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_0.png diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_1-ctm.png b/src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_1-ctm.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_1-ctm.png rename to src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_1-ctm.png diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_1.png b/src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_1.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_1.png rename to src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_1.png diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_2.png b/src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_2.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_2.png rename to src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_2.png diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_3-ctm.png b/src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_3-ctm.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_3-ctm.png rename to src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_3-ctm.png diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_3.png b/src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_3.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_3.png rename to src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_3.png diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_4-ctm.png b/src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_4-ctm.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_4-ctm.png rename to src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_4-ctm.png diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_4.png b/src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_4.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_4.png rename to src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_4.png diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_5-ctm.png b/src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_5-ctm.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_5-ctm.png rename to src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_5-ctm.png diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_5.png b/src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_5.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_5.png rename to src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_5.png diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_6-ctm.png b/src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_6-ctm.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_6-ctm.png rename to src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_6-ctm.png diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_6.png b/src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_6.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_6.png rename to src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_6.png diff --git a/src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_7.png b/src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_7.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_7.png rename to src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_7.png