diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index a54c8dd8..c3faf549 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -95,6 +95,17 @@ public enum Features { aluminum.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/aluminum/bolted", 25); aluminum.carverHelper.registerAll(aluminum, "aluminumblock"); Carving.chisel.registerOre("aluminumblock", "blockAluminum"); + + CarvableStairsMaker aluminumStairs = new CarvableStairsMaker(aluminum); + + aluminumStairs.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/aluminum/caution"); + aluminumStairs.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/aluminum/crate"); + aluminumStairs.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/aluminum/thermal"); + aluminumStairs.carverHelper.addVariation("tile.metalOre.3.desc", 3, "metals/aluminum/adv"); + aluminumStairs.carverHelper.addVariation("tile.metalOre.4.desc", 4, "metals/aluminum/egregious"); + aluminumStairs.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/aluminum/bolted"); + aluminumStairs.create("aluminum_stairs", ChiselBlocks.aluminumStairs); + Carving.chisel.registerOre("aluminum_stairs", "aluminum_stairs"); } }, diff --git a/src/main/java/com/cricketcraft/chisel/block/CarvableStairsMaker.java b/src/main/java/com/cricketcraft/chisel/block/CarvableStairsMaker.java index dea80570..f4e2074a 100644 --- a/src/main/java/com/cricketcraft/chisel/block/CarvableStairsMaker.java +++ b/src/main/java/com/cricketcraft/chisel/block/CarvableStairsMaker.java @@ -1,5 +1,6 @@ package com.cricketcraft.chisel.block; +import com.cricketcraft.chisel.init.ChiselTabs; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; @@ -30,7 +31,7 @@ public class CarvableStairsMaker { String n = name + "." + i; blocks[i] = creator == null ? new BlockCarvableStairs(blockBase, i * 2, carverHelper) : creator.create(blockBase, i * 2, carverHelper); - blocks[i].setBlockName("chisel." + n); + blocks[i].setBlockName("chisel." + n).setCreativeTab(ChiselTabs.tabStairChiselBlocks); GameRegistry.registerBlock(blocks[i], ItemCarvable.class, n); for (int meta = 0; meta < 2 && i * 2 + meta < carverHelper.infoList.size(); meta++) { diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java index 124f293a..ead9941b 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java @@ -92,6 +92,7 @@ public final class ChiselBlocks { public static final BlockCarvable copperblock = null; public static final BlockCarvable bronzeblock = null; public static final BlockCarvable aluminumblock = null; + public static BlockCarvableStairs[] aluminumStairs = new BlockCarvableStairs[8]; public static final BlockCarvable leadblock = null; public static final BlockCarvable silverblock = null; public static final BlockCarvable steelblock = null; diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java b/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java index c27a2b1b..24064a51 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java @@ -66,6 +66,7 @@ public class ChiselTabs { public static final CustomCreativeTab tabMetalChiselBlocks = new CustomCreativeTab("tabMetalChiselBlocks", true); public static final CustomCreativeTab tabOtherChiselBlocks = new CustomCreativeTab("tabOtherChiselBlocks", true); public static final CustomCreativeTab tabModdedChiselBlocks = new CustomCreativeTab("tabModdedChiselBlocks", true); + public static final CustomCreativeTab tabStairChiselBlocks = new CustomCreativeTab("tabStairChiselBlocks", true); // this serves mostly just to load the static initializers public static void preInit() { @@ -94,6 +95,10 @@ public class ChiselTabs { tabOtherChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.jackolantern[0])); else tabOtherChiselBlocks.setTabIconItemStack(new ItemStack(Blocks.lit_pumpkin)); + if (Features.ICE_STAIRS.enabled()) + tabStairChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.iceStairs[0])); + else + tabStairChiselBlocks.setTabIconItemStack(new ItemStack(Blocks.nether_brick_stairs)); if (atLeastOneModIsLoaded) { if (Features.ARCANE.enabled()) { diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 96185575..f7300f95 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -1655,6 +1655,7 @@ itemGroup.tabStoneChiselBlocks=Stone Chisel Blocks itemGroup.tabWoodChiselBlocks=Wood Chisel Blocks itemGroup.tabMetalChiselBlocks=Metal Chisel Blocks itemGroup.tabModdedChiselBlocks=Modded Chisel Blocks +itemGroup.tabStairChiselBlocks=Chisel Stairs itemGroup.tabChisel=Chisel Items #Container