Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/team/chisel/BlockNameConversion.java
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
32 changes: 12 additions & 20 deletions src/main/java/team/chisel/Features.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/team/chisel/init/ChiselBlocks.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/chisel/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading