diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 88884a20..df747da0 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -1082,7 +1082,7 @@ public enum Features { public BlockCarvableStairs create(Block block, int meta, CarvableHelper helper) { return new BlockCarvableIceStairs(block, meta, helper); } - }, "ice_stairs"); + }, "ice_stairs", ChiselBlocks.iceStairs); Carving.chisel.registerOre("iceStairs", "iceStairs"); } }, @@ -1329,7 +1329,7 @@ public enum Features { makerLimestoneStairs.carverHelper.addVariation("tile.limestoneStairs.13.desc", 13, "limestone/terrain-pistonback-lightfour"); makerLimestoneStairs.carverHelper.addVariation("tile.limestoneStairs.14.desc", 14, "limestone/terrain-pistonback-lightmarker"); makerLimestoneStairs.carverHelper.addVariation("tile.limestoneStairs.15.desc", 15, "limestone/terrain-pistonback-lightpanel"); - makerLimestoneStairs.create("limestone_stairs"); + makerLimestoneStairs.create("limestone_stairs", ChiselBlocks.limestoneStairs); Carving.chisel.registerOre("limestone_stairs", "limestone_stairs"); } @@ -1407,7 +1407,7 @@ public enum Features { makerMarbleStairs.carverHelper.addVariation("tile.marbleStairs.13.desc", 13, "marbleslab/marble-arranged-bricks"); makerMarbleStairs.carverHelper.addVariation("tile.marbleStairs.14.desc", 14, "marbleslab/marble-fancy-bricks"); makerMarbleStairs.carverHelper.addVariation("tile.marbleStairs.15.desc", 15, "marbleslab/marble-blocks"); - makerMarbleStairs.create("marble_stairs"); + makerMarbleStairs.create("marble_stairs", ChiselBlocks.marbleStairs); } @Override @@ -1671,7 +1671,7 @@ public enum Features { public BlockCarvableStairs create(Block block, int meta, CarvableHelper helper) { return new BlockCarvablePackedIceStairs(block, meta, helper); } - }, "packedice_stairs"); + }, "packedice_stairs", ChiselBlocks.packediceStairs); Carving.chisel.registerOre("packedIceStairs", "packedIceStairs"); } }, diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleStairsMaker.java b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleStairsMaker.java index 095d7272..b75a379f 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleStairsMaker.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleStairsMaker.java @@ -13,8 +13,6 @@ import cpw.mods.fml.common.registry.GameRegistry; public class BlockMarbleStairsMaker { public CarvableHelper carverHelper; - BlockCarvableStairs blocks[]; - // int idStart; Block blockBase; String blockName; @@ -24,12 +22,11 @@ public class BlockMarbleStairsMaker { blockBase = base; } - public void create(String name) { - create(null, name); + public void create(String name, Block[] blocks) { + create(null, name, blocks); } - public void create(BlockMarbleStairsMakerCreator creator, String name) { - blocks = new BlockCarvableStairs[carverHelper.variations.size() / 2]; + public void create(BlockMarbleStairsMakerCreator creator, String name, Block[] blocks) { for (int i = 0; i < blocks.length; i++) { String n = name + "." + i; blocks[i] = creator == null ? new BlockCarvableStairs(blockBase, i * 2, carverHelper) : creator.create(blockBase, i * 2, carverHelper); diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java index 6da9ee38..3e9a0d74 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java @@ -66,15 +66,11 @@ public final class ChiselBlocks { public static final BlockCarvable netherrack = null; public static final BlockCarvable mossy_cobblestone = null; public static final BlockCarvable stonebricksmooth = null; - public static final BlockCarvableStairs marbleStairs = null; - public static final BlockCarvableStairs limestoneStairs = null; public static final BlockCarvablePane iron_bars = null; public static final BlockCarvableIce ice = null; public static final BlockCarvableIcePillar ice_pillar = null; public static final BlockCarvablePackedIce packedice = null; public static final BlockCarvablePackedIcePillar packedice_pillar = null; - public static final BlockCarvableIceStairs iceStairs = null; - public static final BlockCarvablePackedIceStairs packediceStairs = null; public static final BlockCarvable obsidian = null; public static final BlockCarvablePowered redstone_block = null; public static final BlockHolystone holystone = null; @@ -117,9 +113,15 @@ public final class ChiselBlocks { public static final BlockCarvable bloodRune = null; public static final BlockCarvable bloodBrick = null; public static final BlockCarvableSand colored_sand = null; + + // Arrays can't be final because of how @ObjectHolder works + public static BlockCarvableStairs[] marbleStairs = new BlockCarvableStairs[8]; + public static BlockCarvableStairs[] limestoneStairs = new BlockCarvableStairs[8]; + public static BlockCarvableIceStairs[] iceStairs = new BlockCarvableIceStairs[8]; + public static BlockCarvablePackedIceStairs[] packediceStairs = new BlockCarvablePackedIceStairs[8]; + public static BlockCarvableTorch[] torch = new BlockCarvableTorch[16]; - // Arrays can't be final because of how @ObjectHolder works public static BlockCarvable[] planks = new BlockCarvable[6]; public static BlockPresent[] present = new BlockPresent[16];