Skip to content

Commit 54c339e

Browse files
UltraProdigyRanzuu
andauthored
cast it up (#99)
Co-authored-by: Ranzu <66495944+Ranzuu@users.noreply.github.com>
1 parent d34cd04 commit 54c339e

17 files changed

Lines changed: 15 additions & 22 deletions

‎src/main/java/team/chisel/BlockNameConversion.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ static public void init() {
8888
namingConversion.put("blockFft", "fantasyblock");
8989
namingConversion.put("blockCarpetFloor", "carpet");
9090
namingConversion.put("blockLaboratory", "laboratoryblock");
91+
namingConversion.put("wroughtironblock", "castironblock");
9192
}
9293

9394
public static Item findItem(String oldname) {

‎src/main/java/team/chisel/Features.java‎

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4812,33 +4812,25 @@ void addBlocks() {
48124812
Carving.chisel.registerOre("platinumblock", "blockPlatinum");
48134813
}
48144814
},
4815-
WROUGHT_IRON {
4815+
CAST_IRON {
48164816

48174817
@Override
48184818
void addBlocks() {
4819-
BlockCarvable wrought_iron = (BlockCarvable) new BlockBeaconBase(Material.iron)
4819+
BlockCarvable cast_iron = (BlockCarvable) new BlockBeaconBase(Material.iron)
48204820
.setStepSound(Block.soundTypeMetal)
48214821
.setCreativeTab(ChiselTabs.tabModdedChiselBlocks)
48224822
.setHardness(5F)
48234823
.setResistance(10F);
4824-
wrought_iron.carverHelper
4825-
.addVariation("tile.newmetalOre.0.desc", 0, "metals/wrought_iron/wrought_iron_0", 0);
4826-
wrought_iron.carverHelper
4827-
.addVariation("tile.newmetalOre.1.desc", 1, "metals/wrought_iron/wrought_iron_1", 1);
4828-
wrought_iron.carverHelper
4829-
.addVariation("tile.newetalOre.2.desc", 2, "metals/wrought_iron/wrought_iron_2", 2);
4830-
wrought_iron.carverHelper
4831-
.addVariation("tile.newetalOre.3.desc", 3, "metals/wrought_iron/wrought_iron_3", 3);
4832-
wrought_iron.carverHelper
4833-
.addVariation("tile.newetalOre.4.desc", 4, "metals/wrought_iron/wrought_iron_4", 4);
4834-
wrought_iron.carverHelper
4835-
.addVariation("tile.newetalOre.5.desc", 5, "metals/wrought_iron/wrought_iron_5", 5);
4836-
wrought_iron.carverHelper
4837-
.addVariation("tile.newetalOre.6.desc", 6, "metals/wrought_iron/wrought_iron_6", 6);
4838-
wrought_iron.carverHelper
4839-
.addVariation("tile.newetalOre.7.desc", 7, "metals/wrought_iron/wrought_iron_7", 6);
4840-
wrought_iron.carverHelper.registerAll(wrought_iron, "wroughtironblock");
4841-
Carving.chisel.registerOre("wroughtironblock", "blockWroughtIron");
4824+
cast_iron.carverHelper.addVariation("tile.newmetalOre.0.desc", 0, "metals/cast_iron/cast_iron_0", 0);
4825+
cast_iron.carverHelper.addVariation("tile.newmetalOre.1.desc", 1, "metals/cast_iron/cast_iron_1", 1);
4826+
cast_iron.carverHelper.addVariation("tile.newetalOre.2.desc", 2, "metals/cast_iron/cast_iron_2", 2);
4827+
cast_iron.carverHelper.addVariation("tile.newetalOre.3.desc", 3, "metals/cast_iron/cast_iron_3", 3);
4828+
cast_iron.carverHelper.addVariation("tile.newetalOre.4.desc", 4, "metals/cast_iron/cast_iron_4", 4);
4829+
cast_iron.carverHelper.addVariation("tile.newetalOre.5.desc", 5, "metals/cast_iron/cast_iron_5", 5);
4830+
cast_iron.carverHelper.addVariation("tile.newetalOre.6.desc", 6, "metals/cast_iron/cast_iron_6", 6);
4831+
cast_iron.carverHelper.addVariation("tile.newetalOre.7.desc", 7, "metals/cast_iron/cast_iron_7", 6);
4832+
cast_iron.carverHelper.registerAll(cast_iron, "castironblock");
4833+
Carving.chisel.registerOre("castironblock", "blockCastIron");
48424834
}
48434835
},
48444836
TITANIUM {

‎src/main/java/team/chisel/init/ChiselBlocks.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public final class ChiselBlocks {
189189
public static final BlockCarvable invar = null;
190190
public static final BlockCarvable nickel = null;
191191
public static final BlockCarvable platinum = null;
192-
public static final BlockCarvable wrought_iron = null;
192+
public static final BlockCarvable cast_iron = null;
193193
public static final BlockCarvable stainless_steel = null;
194194
public static final BlockCarvable titanium = null;
195195
public static final BlockCarvable tungstensteel = null;

‎src/main/resources/assets/chisel/lang/en_US.lang‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2820,7 +2820,7 @@ tile.chisel.invarblock.name=Block of Invar
28202820
tile.chisel.electrumblock.name=Block of Electrum
28212821
tile.chisel.nickelblock.name=Block of Nickel
28222822
tile.chisel.platinumblock.name=Block of Platinum
2823-
tile.chisel.wroughtironblock.name=Block of Wrought Iron
2823+
tile.chisel.castironblock.name=Block of Cast Iron
28242824
tile.chisel.stainlesssteelblock.name=Block of Stainless Steel
28252825
tile.chisel.titaniumblock.name=Block of Titanium
28262826
tile.chisel.tungstensteelblock.name=Block of Tungstensteel

src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_0.png renamed to src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_0.png

File renamed without changes.

src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_1-ctm.png renamed to src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_1-ctm.png

File renamed without changes.

src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_1.png renamed to src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_1.png

File renamed without changes.

src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_2.png renamed to src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_2.png

File renamed without changes.

src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_3-ctm.png renamed to src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_3-ctm.png

File renamed without changes.

src/main/resources/assets/chisel/textures/blocks/metals/wrought_iron/wrought_iron_3.png renamed to src/main/resources/assets/chisel/textures/blocks/metals/cast_iron/cast_iron_3.png

File renamed without changes.

0 commit comments

Comments
 (0)