From 034fd78d4d1c954497a34ea9b480944d1da6bb30 Mon Sep 17 00:00:00 2001 From: Arona Jones Date: Thu, 1 Jan 2015 11:39:05 +0000 Subject: [PATCH] Subsplit the creative tab into 4, by material. May sort it a different way, this is still under consideration. --- .../chisel/block/BlockCarvable.java | 2 +- .../chisel/block/BlockCarvableGlass.java | 2 +- .../chisel/block/BlockCarvablePane.java | 2 +- .../chisel/block/BlockCarvableTorch.java | 2 - .../chisel/block/BlockGrimstone.java | 1 - .../chisel/block/BlockMarbleCarpet.java | 2 - .../chisel/block/BlockMarbleIce.java | 1 - .../chisel/block/BlockMarblePackedIce.java | 1 - .../chisel/block/BlockMarbleStairs.java | 1 - .../chisel/block/BlockMarbleTexturedOre.java | 4 - .../chisel/block/BlockMarbleWall.java | 2 - .../chisel/block/BlockPresent.java | 3 +- .../chisel/block/BlockRoadLine.java | 2 - .../chisel/block/BlockSnakestone.java | 1 - .../chisel/block/BlockVoidstonePillar.java | 1 - .../chisel/block/BlockVoidstonePillar2.java | 1 - .../cricketcraft/chisel/init/ModBlocks.java | 137 +++++++++--------- .../com/cricketcraft/chisel/init/ModTabs.java | 29 +++- .../resources/assets/chisel/lang/en_US.lang | 5 +- 19 files changed, 102 insertions(+), 97 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java index 29869a91..c775cb28 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java @@ -30,7 +30,7 @@ public class BlockCarvable extends Block implements ICarvable { carverHelper = new CarvableHelper(); setResistance(10.0F); setHardness(2.0F); - setCreativeTab(ModTabs.tabChiselBlocks); + setCreativeTab(ModTabs.tabOtherChiselBlocks); } public BlockCarvable setStained(boolean a) { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java index ddd95cdd..78239576 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java @@ -28,7 +28,7 @@ public class BlockCarvableGlass extends BlockGlass implements ICarvable super(Material.glass, false); carverHelper = new CarvableHelper(); - setCreativeTab(ModTabs.tabChiselBlocks); + setCreativeTab(ModTabs.tabOtherChiselBlocks); } public BlockCarvableGlass setStained(boolean a) diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePane.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePane.java index e3d012ef..7d3689b0 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePane.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePane.java @@ -29,7 +29,7 @@ public class BlockCarvablePane extends BlockPane implements ICarvable carverHelper = new CarvableHelper(); - setCreativeTab(ModTabs.tabChiselBlocks); + setCreativeTab(ModTabs.tabOtherChiselBlocks); } public BlockCarvablePane setStained(boolean a) diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java index c3869194..2c6db8c5 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java @@ -19,8 +19,6 @@ public class BlockCarvableTorch extends BlockTorch implements ICarvable super(); carverHelper = new CarvableHelper(); - - setCreativeTab(ModTabs.tabChiselBlocks); } @Override public CarvableVariation getVariation(int metadata) { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockGrimstone.java b/src/main/java/com/cricketcraft/chisel/block/BlockGrimstone.java index af201dbd..c2bb1ef9 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockGrimstone.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockGrimstone.java @@ -17,7 +17,6 @@ public class BlockGrimstone extends BlockCarvable { public BlockGrimstone(Material m) { super(m); - this.setCreativeTab(ModTabs.tabChiselBlocks); } @Override diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleCarpet.java b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleCarpet.java index 092dd56a..208119d9 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleCarpet.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleCarpet.java @@ -23,8 +23,6 @@ public class BlockMarbleCarpet extends BlockCarpet implements ICarvable public BlockMarbleCarpet(Material m) { carverHelper = new CarvableHelper(); - - setCreativeTab(ModTabs.tabChiselBlocks); } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleIce.java b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleIce.java index a77cfcdd..6b982003 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleIce.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleIce.java @@ -25,7 +25,6 @@ public class BlockMarbleIce extends BlockIce implements ICarvable { super(); carverHelper = new CarvableHelper(); - setCreativeTab(ModTabs.tabChiselBlocks); } @Override diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMarblePackedIce.java b/src/main/java/com/cricketcraft/chisel/block/BlockMarblePackedIce.java index 9bf2916f..5ebf9493 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMarblePackedIce.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockMarblePackedIce.java @@ -26,7 +26,6 @@ public class BlockMarblePackedIce extends Block implements ICarvable { super(Material.ice); carverHelper = new CarvableHelper(); - setCreativeTab(ModTabs.tabChiselBlocks); } @Override diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleStairs.java b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleStairs.java index 161048b4..f1f7f59e 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleStairs.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleStairs.java @@ -29,7 +29,6 @@ public class BlockMarbleStairs extends BlockStairs implements ICarvable super(block, meta); this.useNeighborBrightness = true; - setCreativeTab(ModTabs.tabChiselBlocks); carverHelper = helper; blockMeta = meta; } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleTexturedOre.java b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleTexturedOre.java index e2cb75c0..b4a17d00 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleTexturedOre.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleTexturedOre.java @@ -23,16 +23,12 @@ public class BlockMarbleTexturedOre extends BlockTexturedOre implements ICarvabl super(mat, baseIcon); carverHelper = new CarvableHelper(); - - setCreativeTab(ModTabs.tabChiselBlocks); } public BlockMarbleTexturedOre(Material mat, Block block) { super(mat, block); carverHelper = new CarvableHelper(); - - setCreativeTab(ModTabs.tabChiselBlocks); } @Override diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleWall.java b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleWall.java index 56cc018a..b106157c 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleWall.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleWall.java @@ -21,8 +21,6 @@ public class BlockMarbleWall extends BlockWall super(block); carverHelper = new CarvableHelper(); - - setCreativeTab(ModTabs.tabChiselBlocks); } @Override diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockPresent.java b/src/main/java/com/cricketcraft/chisel/block/BlockPresent.java index 6a510872..3b4f8b43 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockPresent.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockPresent.java @@ -40,11 +40,10 @@ public class BlockPresent extends BlockChest implements ICarvable { super(1); this.type = type; carverHelper = new CarvableHelper(); - setCreativeTab(ModTabs.tabChiselBlocks); setBlockBounds(0.0625F, 0.0F, 0.0625F, 0.9375F, 0875F, 0.9365F); Calendar calendar = Calendar.getInstance(); - + //Unneeded? if (calendar.get(2) + 1 == 12 || calendar.get(2) + 1 == 1) { isChristmas = true; //The Christmas Season lasts for december and january } else { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java b/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java index e25efbbd..e2601567 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java @@ -23,8 +23,6 @@ public class BlockRoadLine extends Block this.setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 0.00390625f, 1.0f); // this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.0625F, 1.0F); - - setCreativeTab(ModTabs.tabChiselBlocks); } @Override diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockSnakestone.java b/src/main/java/com/cricketcraft/chisel/block/BlockSnakestone.java index a7291698..45fb3af8 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockSnakestone.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockSnakestone.java @@ -57,7 +57,6 @@ public class BlockSnakestone extends Block setHardness(1.5F); setResistance(10.0F); setStepSound(Block.soundTypeStone); - setCreativeTab(ModTabs.tabChiselBlocks); flipTopTextures = false; this.iconPrefix = iconPrefix; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockVoidstonePillar.java b/src/main/java/com/cricketcraft/chisel/block/BlockVoidstonePillar.java index 7a56576a..5934f1ed 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockVoidstonePillar.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockVoidstonePillar.java @@ -21,7 +21,6 @@ public class BlockVoidstonePillar extends Block implements ICarvable{ carvableHelper = new CarvableHelper(); setHardness(5.0F); setResistance(10.0F); - setCreativeTab(ModTabs.tabChiselBlocks); } @Override diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockVoidstonePillar2.java b/src/main/java/com/cricketcraft/chisel/block/BlockVoidstonePillar2.java index 22da2ad9..e7da3d72 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockVoidstonePillar2.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockVoidstonePillar2.java @@ -21,7 +21,6 @@ public class BlockVoidstonePillar2 extends Block implements ICarvable{ carvableHelper = new CarvableHelper(); setHardness(5.0F); setResistance(10.0F); - setCreativeTab(ModTabs.tabChiselBlocks); } @Override diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index 9f1989f0..3e4465fe 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -146,7 +146,7 @@ public class ModBlocks { if(Configurations.featureEnabled("marble")) { - marble = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); + marble = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); marble.carverHelper.setChiselBlockName("Marble"); marble.carverHelper.addVariation(StatCollector.translateToLocal("tile.marble.0.desc"), 0, "marble"); marble.carverHelper.addVariation(StatCollector.translateToLocal("tile.marble.1.desc"), 1, "marble/a1-stoneornamental-marblebrick"); @@ -194,7 +194,7 @@ public class ModBlocks { { if(Configurations.oldPillars) { - marblePillar = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); + marblePillar = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); marblePillar.carverHelper.setChiselBlockName("Marble Pillar"); marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarOld.0.desc"), 0, "marblepillarold/column"); marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarOld.1.desc"), 1, "marblepillarold/capstone"); @@ -214,7 +214,7 @@ public class ModBlocks { marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarOld.15.desc"), 15, "marblepillarold/a1-stonepillar-plainbottomgreek"); } else { - marblePillar = (BlockCarvable) new BlockMarblePillar(Material.rock).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); + marblePillar = (BlockCarvable) new BlockMarblePillar(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); marblePillar.carverHelper.setChiselBlockName("Marble Pillar"); marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillar.0.desc"), 0, "marblepillar/pillar"); marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillar.1.desc"), 1, "marblepillar/default"); @@ -236,7 +236,7 @@ public class ModBlocks { marblePillar.carverHelper.register(marblePillar, "marble_pillar"); Carving.chisel.setGroupClass("marble_pillar", "marble"); - marblePillarSlab = (BlockMarbleSlab) new BlockMarbleSlab(marblePillar).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); + marblePillarSlab = (BlockMarbleSlab) new BlockMarbleSlab(marblePillar).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); marblePillarSlab.carverHelper.setChiselBlockName("Marble Pillar Slab"); if(Configurations.oldPillars) { @@ -301,7 +301,7 @@ public class ModBlocks { if(Configurations.featureEnabled("limestone")) { - limestone = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); + limestone = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); limestone.carverHelper.setChiselBlockName("Limestone"); limestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestone.0.desc"), 0, "limestone"); limestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestone.1.desc"), 1, "limestone/terrain-cobbsmalltilelight"); @@ -323,7 +323,7 @@ public class ModBlocks { OreDictionary.registerOre("limestone", limestone); Carving.chisel.registerOre("limestone", "limestone"); - limestoneSlab = (BlockMarbleSlab) new BlockMarbleSlab(limestone).setHardness(2.0F).setResistance(10F); + limestoneSlab = (BlockMarbleSlab) new BlockMarbleSlab(limestone).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F); limestoneSlab.carverHelper.setChiselBlockName("Limestone Slab"); limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneSlab.0.desc"), 0, "limestone"); limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneSlab.1.desc"), 1, "limestone/terrain-cobbsmalltilelight"); @@ -368,7 +368,7 @@ public class ModBlocks { if(Configurations.featureEnabled("cobblestone")) { - cobblestone = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); + cobblestone = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); Carving.chisel.addVariation("cobblestone", Blocks.cobblestone, 0, 0); cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.cobblestone.0.desc"), 1, "cobblestone/terrain-cobb-brickaligned"); cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.cobblestone.1.desc"), 2, "cobblestone/terrain-cob-detailedbrick"); @@ -391,7 +391,7 @@ public class ModBlocks { if(Configurations.featureEnabled("glass")) { - glass = (BlockCarvableGlass) new BlockCarvableGlass().setHardness(0.3F).setStepSound(Block.soundTypeGlass); + glass = (BlockCarvableGlass) new BlockCarvableGlass().setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(0.3F).setStepSound(Block.soundTypeGlass); Carving.chisel.addVariation("glass", Blocks.glass, 0, 0); glass.carverHelper.addVariation(StatCollector.translateToLocal("tile.glass.1.desc"), 1, "glass/terrain-glassbubble"); glass.carverHelper.addVariation(StatCollector.translateToLocal("tile.glass.2.desc"), 2, "glass/terrain-glass-chinese"); @@ -414,7 +414,7 @@ public class ModBlocks { if(Configurations.featureEnabled("sandstone")) { - sandstone = (BlockCarvable) new BlockCarvable(Material.rock).setStepSound(Block.soundTypeStone).setHardness(0.8F); + sandstone = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setStepSound(Block.soundTypeStone).setHardness(0.8F); Carving.chisel.addVariation("sandstone", Blocks.sandstone, 0, 0); Carving.chisel.addVariation("sandstone", Blocks.sandstone, 1, 1); Carving.chisel.addVariation("sandstone", Blocks.sandstone, 2, 2); @@ -436,7 +436,7 @@ public class ModBlocks { if(Configurations.featureEnabled("snakeSandstone")) { - sandSnakestone = (BlockSnakestone) new BlockSnakestone("Chisel:snakestone/sandsnake/").setBlockName("snakestoneSand"); + sandSnakestone = (BlockSnakestone) new BlockSnakestone("Chisel:snakestone/sandsnake/").setCreativeTab(ModTabs.tabStoneChiselBlocks).setBlockName("snakestoneSand"); GameRegistry.registerBlock(sandSnakestone, ItemCarvable.class, "sand_snakestone"); //TODO- eat me! //LanguageRegistry.addName(new ItemStack(sandSnakestone, 1, 1), "Sandstone snake block head"); @@ -449,7 +449,7 @@ public class ModBlocks { if(Configurations.featureEnabled("sandstoneScribbles")) { - sandstoneScribbles = (BlockCarvable) new BlockCarvable(Material.rock).setStepSound(Block.soundTypeStone).setHardness(0.8F); + sandstoneScribbles = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setStepSound(Block.soundTypeStone).setHardness(0.8F); sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstoneScribbles.desc"), 0, "sandstone-scribbles/scribbles-0"); sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstoneScribbles.desc"), 1, "sandstone-scribbles/scribbles-1"); sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstoneScribbles.desc"), 2, "sandstone-scribbles/scribbles-2"); @@ -472,7 +472,7 @@ public class ModBlocks { if(Configurations.featureEnabled("concrete")) { - concrete = (BlockConcrete) new BlockConcrete().setStepSound(Block.soundTypeStone).setHardness(0.5F); + concrete = (BlockConcrete) new BlockConcrete().setStepSound(Block.soundTypeStone).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(0.5F); concrete.carverHelper.addVariation(StatCollector.translateToLocal("tile.concrete.0.desc"), 0, "concrete/default"); concrete.carverHelper.addVariation(StatCollector.translateToLocal("tile.concrete.1.desc"), 1, "concrete/block"); concrete.carverHelper.addVariation(StatCollector.translateToLocal("tile.concrete.2.desc"), 2, "concrete/doubleslab"); @@ -491,14 +491,14 @@ public class ModBlocks { if(Configurations.featureEnabled("roadLine")) { - roadLine = (BlockRoadLine) new BlockRoadLine().setStepSound(Block.soundTypeStone).setHardness(0.01F).setBlockName("roadLine"); + roadLine = (BlockRoadLine) new BlockRoadLine().setStepSound(Block.soundTypeStone).setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(0.01F).setBlockName("roadLine"); GameRegistry.registerBlock(roadLine, ItemCarvable.class, "road_line"); Carving.chisel.registerOre("roadLine", "roadLine"); } if(Configurations.featureEnabled("ironBlock")) { - iron = (BlockBeaconBase) new BlockBeaconBase().setHardness(5F).setResistance(10F).setStepSound(Block.soundTypeMetal); + iron = (BlockBeaconBase) new BlockBeaconBase().setCreativeTab(ModTabs.tabMetalChiselBlocks).setHardness(5F).setResistance(10F).setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("iron_block", Blocks.iron_block, 0, 0); iron.carverHelper.addVariation(StatCollector.translateToLocal("tile.iron.1.desc"), 1, "iron/terrain-iron-largeingot"); iron.carverHelper.addVariation(StatCollector.translateToLocal("tile.iron.2.desc"), 2, "iron/terrain-iron-smallingot"); @@ -521,7 +521,7 @@ public class ModBlocks { if(Configurations.featureEnabled("goldBlock")) { - gold = (BlockBeaconBase) new BlockBeaconBase().setHardness(3F).setResistance(10F).setStepSound(Block.soundTypeMetal); + gold = (BlockBeaconBase) new BlockBeaconBase().setCreativeTab(ModTabs.tabMetalChiselBlocks).setHardness(3F).setResistance(10F).setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("gold_block", Blocks.gold_block, 0, 0); gold.carverHelper.addVariation(StatCollector.translateToLocal("tile.gold.1.desc"), 1, "gold/terrain-gold-largeingot"); gold.carverHelper.addVariation(StatCollector.translateToLocal("tile.gold.2.desc"), 2, "gold/terrain-gold-smallingot"); @@ -543,7 +543,7 @@ public class ModBlocks { if(Configurations.featureEnabled("diamondBlock")) { - diamond = (BlockBeaconBase) new BlockBeaconBase().setHardness(5F).setResistance(10F).setStepSound(Block.soundTypeMetal); + diamond = (BlockBeaconBase) new BlockBeaconBase().setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(5F).setResistance(10F).setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("diamond_block", Blocks.diamond_block, 0, 0); diamond.carverHelper.addVariation(StatCollector.translateToLocal("tile.diamond.1.desc"), 1, "diamond/terrain-diamond-embossed"); diamond.carverHelper.addVariation(StatCollector.translateToLocal("tile.diamond.2.desc"), 2, "diamond/terrain-diamond-gem"); @@ -563,7 +563,7 @@ public class ModBlocks { if(Configurations.featureEnabled("glowstone")) { - lightstone = (BlockLightstoneCarvable) new BlockLightstoneCarvable().setHardness(0.3F).setLightLevel(1.0F).setStepSound(Block.soundTypeGlass); + lightstone = (BlockLightstoneCarvable) new BlockLightstoneCarvable().setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(0.3F).setLightLevel(1.0F).setStepSound(Block.soundTypeGlass); Carving.chisel.addVariation("glowstone", Blocks.glowstone, 0, 0); lightstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lightstone.1.desc"), 1, "lightstone/terrain-sulphur-cobble"); lightstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lightstone.2.desc"), 2, "lightstone/terrain-sulphur-corroded"); @@ -586,7 +586,7 @@ public class ModBlocks { if(Configurations.featureEnabled("lapisBlock")) { - lapis = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(3F).setResistance(5F).setStepSound(Block.soundTypeStone); + lapis = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(3F).setResistance(5F).setStepSound(Block.soundTypeStone); Carving.chisel.addVariation("lapis_block", Blocks.lapis_block, 0, 0); lapis.carverHelper.addVariation(StatCollector.translateToLocal("tile.lapis.1.desc"), 1, "lapis/terrain-lapisblock-chunky"); lapis.carverHelper.addVariation(StatCollector.translateToLocal("tile.lapis.2.desc"), 2, "lapis/terrain-lapisblock-panel"); @@ -602,7 +602,7 @@ public class ModBlocks { if(Configurations.featureEnabled("emeraldBlock")) { - emerald = (BlockBeaconBase) new BlockBeaconBase().setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeMetal); + emerald = (BlockBeaconBase) new BlockBeaconBase().setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("emerald_block", Blocks.emerald_block, 0, 0); emerald.carverHelper.addVariation(StatCollector.translateToLocal("tile.emerald.1.desc"), 1, "emerald/panel"); emerald.carverHelper.addVariation(StatCollector.translateToLocal("tile.emerald.2.desc"), 2, "emerald/panelclassic"); @@ -621,7 +621,7 @@ public class ModBlocks { if(Configurations.featureEnabled("netherBrick")) { - netherBrick = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setStepSound(Block.soundTypeStone); + netherBrick = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10.0F).setStepSound(Block.soundTypeStone); Carving.chisel.addVariation("nether_brick", Blocks.nether_brick, 0, 0); //netherBrick.carverHelper.addVariation("Nether brick", 0, Blocks.nether_brick); netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.netherBrick.1.desc"), 1, "netherbrick/a1-netherbrick-brinstar"); @@ -645,7 +645,7 @@ public class ModBlocks { if(Configurations.featureEnabled("netherRack")) { - netherrack = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(0.4F).setStepSound(Block.soundTypeStone); + netherrack = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(0.4F).setStepSound(Block.soundTypeStone); Carving.chisel.addVariation("netherrack", Blocks.netherrack, 0, 0); netherrack.carverHelper.addVariation(StatCollector.translateToLocal("tile.hellrock.1.desc"), 1, "netherrack/a1-netherrack-bloodgravel"); netherrack.carverHelper.addVariation(StatCollector.translateToLocal("tile.hellrock.2.desc"), 2, "netherrack/a1-netherrack-bloodrock"); @@ -667,7 +667,7 @@ public class ModBlocks { if(Configurations.featureEnabled("cobblestoneMossy")) { - cobblestoneMossy = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setStepSound(Block.soundTypeStone); + cobblestoneMossy = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10.0F).setStepSound(Block.soundTypeStone); Carving.chisel.addVariation("mossy_cobblestone", Blocks.mossy_cobblestone, 0, 0); cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.stoneMoss.1.desc"), 1, "cobblestonemossy/terrain-cobb-brickaligned"); cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.stoneMoss.2.desc"), 2, "cobblestonemossy/terrain-cob-detailedbrick"); @@ -690,7 +690,7 @@ public class ModBlocks { if(Configurations.featureEnabled("stoneBrick")) { - stoneBrick = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(1.5F).setResistance(10.0F).setStepSound(Block.soundTypeStone); + stoneBrick = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(1.5F).setResistance(10.0F).setStepSound(Block.soundTypeStone); for(int i = 0; i < 4; i++) { if(i == 1) @@ -718,7 +718,7 @@ public class ModBlocks { if(Configurations.featureEnabled("snakestone")) { - snakestone = (BlockSnakestone) new BlockSnakestone("Chisel:snakestone/snake/").setBlockName("snakestoneStone"); + snakestone = (BlockSnakestone) new BlockSnakestone("Chisel:snakestone/snake/").setBlockName("snakestoneStone").setCreativeTab(ModTabs.tabStoneChiselBlocks); GameRegistry.registerBlock(snakestone, ItemCarvable.class, "stone_snakestone"); //LanguageRegistry.addName(new ItemStack(snakestone, 1, 1), "Stone snake block head"); //LanguageRegistry.addName(new ItemStack(snakestone, 1, 13), "Stone snake block body"); @@ -729,7 +729,7 @@ public class ModBlocks { if(Configurations.featureEnabled("dirt")) { - dirt = (BlockCarvable) new BlockCarvable(Material.ground).setHardness(0.5F).setStepSound(Block.soundTypeGravel).setBlockName("dirt.default"); + dirt = (BlockCarvable) new BlockCarvable(Material.ground).setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(0.5F).setStepSound(Block.soundTypeGravel).setBlockName("dirt.default"); Carving.chisel.addVariation("dirt", Blocks.dirt, 0, 0); dirt.carverHelper.setChiselBlockName("Dirt"); //dirt.carverHelper.addVariation("Dirt", 0, Blocks.dirt); @@ -754,7 +754,7 @@ public class ModBlocks { if(Configurations.featureEnabled("ice")) { - ice = (BlockMarbleIce) new BlockMarbleIce().setHardness(0.5F).setLightOpacity(3).setStepSound(Block.soundTypeGlass); + ice = (BlockMarbleIce) new BlockMarbleIce().setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(0.5F).setLightOpacity(3).setStepSound(Block.soundTypeGlass); Carving.chisel.addVariation("ice", Blocks.ice, 0, 0); ice.carverHelper.addVariation(StatCollector.translateToLocal("tile.ice.1.desc"), 1, "ice/a1-ice-light"); ice.carverHelper.addVariation(StatCollector.translateToLocal("tile.ice.2.desc"), 2, "ice/a1-stonecobble-icecobble"); @@ -776,7 +776,7 @@ public class ModBlocks { if(Configurations.featureEnabled("icePillar")) { - icePillar = (BlockMarbleIce) new BlockMarbleIce().setHardness(0.5F).setLightOpacity(3).setStepSound(Block.soundTypeGlass); + icePillar = (BlockMarbleIce) new BlockMarbleIce().setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(0.5F).setLightOpacity(3).setStepSound(Block.soundTypeGlass); icePillar.carverHelper.setChiselBlockName("Ice Pillar"); icePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.0.desc"), 0, "icepillar/column"); icePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.1.desc"), 1, "icepillar/capstone"); @@ -829,10 +829,9 @@ public class ModBlocks { Carving.chisel.registerOre("iceStairs", "iceStairs"); } } - //TODO: Make these textures a bit less transparent if(Configurations.featureEnabled("packedice")) { - packedice = (BlockMarblePackedIce) new BlockMarblePackedIce().setHardness(0.5F).setLightOpacity(3).setStepSound(Block.soundTypeGlass); + packedice = (BlockMarblePackedIce) new BlockMarblePackedIce().setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(0.5F).setLightOpacity(3).setStepSound(Block.soundTypeGlass); Carving.chisel.addVariation("packedice", Blocks.packed_ice, 0, 0); packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.1.desc"), 1, "packedice/a1-ice-light"); packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.2.desc"), 2, "packedice/a1-stonecobble-icecobble"); @@ -854,7 +853,7 @@ public class ModBlocks { if(Configurations.featureEnabled("packedicePillar")) { - packedicePillar = (BlockMarblePackedIce) new BlockMarblePackedIce().setHardness(0.5F).setLightOpacity(3).setStepSound(Block.soundTypeGlass); + packedicePillar = (BlockMarblePackedIce) new BlockMarblePackedIce().setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(0.5F).setLightOpacity(3).setStepSound(Block.soundTypeGlass); packedicePillar.carverHelper.setChiselBlockName("Packed Ice Pillar"); packedicePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.0.desc"), 0, "packedicepillar/column"); packedicePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.1.desc"), 1, "packedicepillar/capstone"); @@ -918,7 +917,7 @@ public class ModBlocks { String u = plank_ucnames[i]; final String orename = n.replace('-', '_') + "_planks"; - planks[i] = (BlockCarvable) (new BlockCarvable(Material.wood)).setHardness(2.0F).setResistance(5.0F).setStepSound(Block.soundTypeWood); + planks[i] = (BlockCarvable) (new BlockCarvable(Material.wood)).setCreativeTab(ModTabs.tabWoodChiselBlocks).setHardness(2.0F).setResistance(5.0F).setStepSound(Block.soundTypeWood); planks[i].carverHelper.setChiselBlockName(u + " Wood Planks"); planks[i].carverHelper.addVariation("Smooth " + n + " wood planks", 1, "planks-" + n + "/clean"); planks[i].carverHelper.addVariation("Short " + n + " wood planks", 2, "planks-" + n + "/short"); @@ -945,7 +944,7 @@ public class ModBlocks { if(Configurations.featureEnabled("obsidian")) { - obsidian = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(50.0F).setResistance(2000.0F).setStepSound(Block.soundTypeStone); + obsidian = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(50.0F).setResistance(2000.0F).setStepSound(Block.soundTypeStone); Carving.chisel.addVariation("obsidian", Blocks.obsidian, 0, 0); obsidian.carverHelper.addVariation(StatCollector.translateToLocal("tile.obsidian.1.desc"), 1, "obsidian/pillar"); obsidian.carverHelper.addVariation(StatCollector.translateToLocal("tile.obsidian.2.desc"), 2, "obsidian/pillar-quartz"); @@ -977,7 +976,7 @@ public class ModBlocks { if(Configurations.featureEnabled("ironBars")) { - paneIron = (BlockCarvablePane) new BlockCarvablePane(Material.iron, true).setHardness(0.3F).setStepSound(Block.soundTypeMetal); + paneIron = (BlockCarvablePane) new BlockCarvablePane(Material.iron, true).setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(0.3F).setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("iron_bars", Blocks.iron_bars, 0, 0); paneIron.carverHelper.addVariation(StatCollector.translateToLocal("tile.iron_bars.1.desc"), 1, "ironpane/fenceIron"); paneIron.carverHelper.addVariation(StatCollector.translateToLocal("tile.iron_bars.2.desc"), 2, "ironpane/barbedwire"); @@ -994,7 +993,7 @@ public class ModBlocks { if(Configurations.featureEnabled("glassPane")) { - paneGlass = (BlockCarvablePane) new BlockCarvablePane(Material.glass, false).setHardness(0.3F).setStepSound(Block.soundTypeGlass); + paneGlass = (BlockCarvablePane) new BlockCarvablePane(Material.glass, false).setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(0.3F).setStepSound(Block.soundTypeGlass); Carving.chisel.addVariation("glass_pane", Blocks.glass_pane, 0, 0); paneGlass.carverHelper.addVariation(StatCollector.translateToLocal("tile.glass_pane.1.desc"), 1, "glasspane/terrain-glassbubble"); paneGlass.carverHelper.addVariation(StatCollector.translateToLocal("tile.glass_pane.2.desc"), 2, "glasspane/terrain-glassnoborder"); @@ -1010,7 +1009,7 @@ public class ModBlocks { if(Configurations.featureEnabled("redstoneBlock")) { - redstone = (BlockCarvablePowered) (new BlockCarvablePowered(Material.iron)).setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeMetal); + redstone = (BlockCarvablePowered) (new BlockCarvablePowered(Material.iron)).setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("redstone_block", Blocks.redstone_block, 0, 0); redstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.redstone_block.1.desc"), 1, "redstone/smooth"); redstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.redstone_block.2.desc"), 2, "redstone/block"); @@ -1033,7 +1032,7 @@ public class ModBlocks { if(Configurations.featureEnabled("holystone")) { - holystone = (BlockHolystone) new BlockHolystone(Material.rock).setHardness(2.0F).setResistance(10F).setStepSound(Chisel.soundHolystoneFootstep); + holystone = (BlockHolystone) new BlockHolystone(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F).setStepSound(Chisel.soundHolystoneFootstep); holystone.carverHelper.addVariation(StatCollector.translateToLocal("tile.holystone.0.desc"), 0, "holystone/holystone"); holystone.carverHelper.addVariation(StatCollector.translateToLocal("tile.holystone.1.desc"), 1, "holystone/smooth"); holystone.carverHelper.addVariation(StatCollector.translateToLocal("tile.holystone.2.desc"), 2, "holystone/love"); @@ -1055,7 +1054,7 @@ public class ModBlocks { if(Configurations.featureEnabled("lavastone")) { - lavastone = (BlockLavastone) new BlockLavastone(Material.rock, "lava_flow").setHardness(2.0F).setResistance(10F); + lavastone = (BlockLavastone) new BlockLavastone(Material.rock, "lava_flow").setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F); lavastone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lavastone.0.desc"), 0, "lavastone/cobble"); lavastone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lavastone.1.desc"), 1, "lavastone/black"); lavastone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lavastone.2.desc"), 2, "lavastone/tiles"); @@ -1071,7 +1070,7 @@ public class ModBlocks { if(Configurations.featureEnabled("fantasy")) { - fantasy = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10F); + fantasy = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F); fantasy.carverHelper.setChiselBlockName("Fantasy Block"); fantasy.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock.0.desc"), 0, "fantasy/brick"); fantasy.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock.1.desc"), 1, "fantasy/brick-faded"); @@ -1096,7 +1095,7 @@ public class ModBlocks { if(Configurations.featureEnabled("carpet")) { - carpet = (BlockCarvable) new BlockCarvable(Material.cloth).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeCloth); + carpet = (BlockCarvable) new BlockCarvable(Material.cloth).setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeCloth); carpet.carverHelper.setChiselBlockName("Carpet Block"); carpet.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet_block.0.desc"), 0, "carpet/white"); carpet.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet_block.1.desc"), 1, "carpet/orange"); @@ -1122,7 +1121,7 @@ public class ModBlocks { if(Configurations.featureEnabled("carpetFloor")) { - carpetFloor = (BlockMarbleCarpet) new BlockMarbleCarpet(Material.cloth).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeCloth); + carpetFloor = (BlockMarbleCarpet) new BlockMarbleCarpet(Material.cloth).setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeCloth); carpetFloor.carverHelper.setChiselBlockName("Carpet"); carpetFloor.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet.0.desc"), 0, "carpet/white"); carpetFloor.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet.1.desc"), 1, "carpet/orange"); @@ -1157,7 +1156,7 @@ public class ModBlocks { if(Configurations.featureEnabled("bookshelf")) { - bookshelf = (BlockCarvable) new BlockMarbleBookshelf().setHardness(1.5F).setStepSound(Block.soundTypeWood); + bookshelf = (BlockCarvable) new BlockMarbleBookshelf().setHardness(1.5F).setCreativeTab(ModTabs.tabWoodChiselBlocks).setStepSound(Block.soundTypeWood); Carving.chisel.addVariation("bookshelf", Blocks.bookshelf, 0, 0); bookshelf.carverHelper.addVariation(StatCollector.translateToLocal("tile.bookshelf.1.desc"), 1, "bookshelf/rainbow"); bookshelf.carverHelper.addVariation(StatCollector.translateToLocal("tile.bookshelf.2.desc"), 2, "bookshelf/necromancer-novice"); @@ -1174,7 +1173,7 @@ public class ModBlocks { if(Configurations.featureEnabled("futuristicArmorPlating")) { - tyrian = (BlockCarvable) new BlockCarvable(Material.iron).setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeMetal); + tyrian = (BlockCarvable) new BlockCarvable(Material.iron).setCreativeTab(ModTabs.tabMetalChiselBlocks).setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeMetal); tyrian.carverHelper.setChiselBlockName("Futuristic Armor Plating Block"); tyrian.carverHelper.addVariation(StatCollector.translateToLocal("tile.tyrian.0.desc"), 0, "tyrian/shining"); tyrian.carverHelper.addVariation(StatCollector.translateToLocal("tile.tyrian.1.desc"), 1, "tyrian/tyrian"); @@ -1200,7 +1199,7 @@ public class ModBlocks { if(Configurations.featureEnabled("templeBlock")) { - temple = (BlockCarvable) new BlockEldritch().setHardness(2.0F).setResistance(10F).setStepSound(Chisel.soundTempleFootstep); + temple = (BlockCarvable) new BlockEldritch().setHardness(2.0F).setCreativeTab(ModTabs.tabStoneChiselBlocks).setResistance(10F).setStepSound(Chisel.soundTempleFootstep); temple.carverHelper.setChiselBlockName("Temple Block"); temple.carverHelper.addVariation(StatCollector.translateToLocal("tile.templeblock.0.desc"), 0, "temple/cobble"); temple.carverHelper.addVariation(StatCollector.translateToLocal("tile.templeblock.1.desc"), 1, "temple/ornate"); @@ -1223,7 +1222,7 @@ public class ModBlocks { if(Configurations.featureEnabled("templeBlockMossy")) { - templeMossy = (BlockCarvable) new BlockEldritch().setHardness(2.0F).setResistance(10F).setStepSound(Chisel.soundTempleFootstep); + templeMossy = (BlockCarvable) new BlockEldritch().setHardness(2.0F).setCreativeTab(ModTabs.tabStoneChiselBlocks).setResistance(10F).setStepSound(Chisel.soundTempleFootstep); templeMossy.carverHelper.setChiselBlockName("Mossy Temple Block"); templeMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.mossy_templeblock.0.desc"), 0, "templemossy/cobble"); templeMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.mossy_templeblock.1.desc"), 1, "templemossy/ornate"); @@ -1248,7 +1247,7 @@ public class ModBlocks { if(Configurations.featureEnabled("cloud")) { - cloud = (BlockCloud) new BlockCloud().setHardness(0.2F).setLightOpacity(3).setStepSound(Block.soundTypeCloth); + cloud = (BlockCloud) new BlockCloud().setHardness(0.2F).setCreativeTab(ModTabs.tabOtherChiselBlocks).setLightOpacity(3).setStepSound(Block.soundTypeCloth); cloud.carverHelper.addVariation(StatCollector.translateToLocal("tile.cloud.0.desc"), 0, "cloud/cloud"); cloud.carverHelper.addVariation(StatCollector.translateToLocal("tile.cloud.1.desc"), 1, "cloud/large"); cloud.carverHelper.addVariation(StatCollector.translateToLocal("tile.cloud.2.desc"), 2, "cloud/small"); @@ -1261,7 +1260,7 @@ public class ModBlocks { if(Configurations.featureEnabled("factory")) { - factory = (BlockCarvable) new BlockCarvable(Material.iron).setHardness(2.0F).setResistance(10F).setStepSound(Chisel.soundMetalFootstep); + factory = (BlockCarvable) new BlockCarvable(Material.iron).setCreativeTab(ModTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F).setStepSound(Chisel.soundMetalFootstep); factory.carverHelper.setChiselBlockName("factoryblock"); factory.carverHelper.addVariation(StatCollector.translateToLocal("tile.factory.0.desc"), 0, "factory/dots"); factory.carverHelper.addVariation(StatCollector.translateToLocal("tile.factory.1.desc"), 1, "factory/rust2"); @@ -1329,7 +1328,7 @@ public class ModBlocks { int glassId = i >> 1; if(glassPrefix == 0) { - stainedGlassPane[glassId] = (BlockCarvablePane) new BlockCarvablePane(Material.glass, true).setStained(true).setHardness(0.3F).setStepSound(Block.soundTypeGlass).setBlockName("Stained Glass Pane"); + stainedGlassPane[glassId] = (BlockCarvablePane) new BlockCarvablePane(Material.glass, true).setStained(true).setHardness(0.3F).setStepSound(Block.soundTypeGlass).setBlockName("Stained Glass Pane").setCreativeTab(ModTabs.tabOtherChiselBlocks); stainedGlassPane[glassId].carverHelper.registerBlock(stainedGlassPane[glassId], blockName); stainedGlassPane[glassId].carverHelper.blockName = "Stained Glass Pane"; } @@ -1351,7 +1350,7 @@ public class ModBlocks { if(Configurations.featureEnabled("paperWall")) { - paperWall = (BlockCarvablePane) new BlockCarvablePane(Material.ground, true).setCreativeTab(ModTabs.tabChiselBlocks).setHardness(0.5F).setResistance(10F); + paperWall = (BlockCarvablePane) new BlockCarvablePane(Material.ground, true).setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(0.5F).setResistance(10F); paperWall.carverHelper.setChiselBlockName("Paper Wall"); paperWall.carverHelper.addVariation(StatCollector.translateToLocal("tile.paperwall.0.desc"), 0, "paper/box"); paperWall.carverHelper.addVariation(StatCollector.translateToLocal("tile.paperwall.1.desc"), 1, "paper/throughMiddle"); @@ -1370,7 +1369,7 @@ public class ModBlocks { if(Configurations.featureEnabled("woolenClay")) { - woolenClay = (BlockCarvable) new BlockCarvable(Material.clay).setCreativeTab(ModTabs.tabChiselBlocks).setHardness(2F).setResistance(10F); + woolenClay = (BlockCarvable) new BlockCarvable(Material.clay).setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(2F).setResistance(10F); woolenClay.carverHelper.setChiselBlockName("Woolen Clay"); for(int i = 0; i < 16; i++) @@ -1382,7 +1381,7 @@ public class ModBlocks { if(Configurations.featureEnabled("laboratory")) { - laboratory = (BlockCarvable) new BlockCarvable(Material.iron).setHardness(2.0F).setResistance(10F).setStepSound(Chisel.soundMetalFootstep); + laboratory = (BlockCarvable) new BlockCarvable(Material.iron).setCreativeTab(ModTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F).setStepSound(Chisel.soundMetalFootstep); laboratory.carverHelper.setChiselBlockName("laboratoryblock"); laboratory.carverHelper.addVariation(StatCollector.translateToLocal("tile.laboratory.0.desc"), 0, "laboratory/wallpanel"); laboratory.carverHelper.addVariation(StatCollector.translateToLocal("tile.laboratory.1.desc"), 1, "laboratory/dottedpanel"); @@ -1407,7 +1406,7 @@ public class ModBlocks { if(Configurations.featureEnabled("pumpkin")) { for(int metadata = 0; metadata < 16; metadata++){ - pumpkin[metadata] = (BlockCarvablePumpkin) new BlockCarvablePumpkin(false).setHardness(1.0F).setBlockName("pumpkin").setCreativeTab(ModTabs.tabChiselBlocks); + pumpkin[metadata] = (BlockCarvablePumpkin) new BlockCarvablePumpkin(false).setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(1.0F).setBlockName("pumpkin").setCreativeTab(ModTabs.tabOtherChiselBlocks); pumpkin[metadata].setInformation("pumpkin/pumpkin_face_" + (metadata + 1) + "_off"); GameRegistry.registerBlock(pumpkin[metadata], "pumpkin" + (metadata + 1)); Carving.chisel.addVariation("pumpkin", pumpkin[metadata], 0, (metadata + 1)); @@ -1419,7 +1418,7 @@ public class ModBlocks { if(Configurations.featureEnabled("jackolantern")) { for(int metadata = 0; metadata < 16; metadata++){ - jackolantern[metadata] = (BlockCarvablePumpkin) new BlockCarvablePumpkin(true).setHardness(1.0F).setBlockName("litpumpkin").setCreativeTab(ModTabs.tabChiselBlocks); + jackolantern[metadata] = (BlockCarvablePumpkin) new BlockCarvablePumpkin(true).setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(1.0F).setBlockName("litpumpkin").setCreativeTab(ModTabs.tabOtherChiselBlocks); jackolantern[metadata].setInformation("pumpkin/pumpkin_face_" + (metadata + 1) + "_on"); GameRegistry.registerBlock(jackolantern[metadata], ("jackolantern" + (metadata + 1))); Carving.chisel.addVariation("jackolantern", jackolantern[metadata], 0, (metadata + 1)); @@ -1429,7 +1428,7 @@ public class ModBlocks { } if(Configurations.featureEnabled("leaves")){ - leaf = (BlockLeaf) new BlockLeaf(Material.leaves).setHardness(0.2F).setStepSound(Block.soundTypeGrass); + leaf = (BlockLeaf) new BlockLeaf(Material.leaves).setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(0.2F).setStepSound(Block.soundTypeGrass); Carving.chisel.addVariation("leaves", Blocks.leaves, 0, 0); Carving.chisel.addVariation("leaves", Blocks.leaves, 1, 0); Carving.chisel.addVariation("leaves", Blocks.leaves, 2, 0); @@ -1460,7 +1459,7 @@ public class ModBlocks { if (Configurations.featureEnabled("chest")) { for(int x = 0; x < 16; x++){ - present[x] = (BlockPresent) new BlockPresent(x).setHardness(2.0F).setResistance(10.0F).setBlockName("present"); + present[x] = (BlockPresent) new BlockPresent(x).setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(2.0F).setResistance(10.0F).setBlockName("present"); GameRegistry.registerBlock(present[x], "chest" + x); Carving.chisel.addVariation("present", present[x], 0, (x + 1)); } @@ -1468,7 +1467,7 @@ public class ModBlocks { } if(Configurations.featureEnabled("voidstone")){ - voidstone = (BlockCarvable) new BlockCarvable().setStepSound(Block.soundTypeStone).setCreativeTab(ModTabs.tabChiselBlocks).setHardness(5.0F).setResistance(10.0F); + voidstone = (BlockCarvable) new BlockCarvable().setCreativeTab(ModTabs.tabStoneChiselBlocks).setStepSound(Block.soundTypeStone).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(5.0F).setResistance(10.0F); voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.0.desc"), 0, "voidstone/raw"); voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.1.desc"), 1, "voidstone/quarters"); voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.2.desc"), 2, "voidstone/smooth"); @@ -1481,7 +1480,7 @@ public class ModBlocks { voidstone.carverHelper.register(voidstone, "voidstone"); Carving.chisel.registerOre("voidstone", "voidstone"); - voidstone2 = (BlockMarbleTexturedOre) new BlockMarbleTexturedOre(Material.rock, Chisel.MOD_ID + ":voidstone/animated/void").setStepSound(Block.soundTypeStone).setCreativeTab(ModTabs.tabChiselBlocks).setHardness(5.0F).setResistance(10.0F); + voidstone2 = (BlockMarbleTexturedOre) new BlockMarbleTexturedOre(Material.rock, Chisel.MOD_ID + ":voidstone/animated/void").setStepSound(Block.soundTypeStone).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(5.0F).setResistance(10.0F); voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.0.desc"), 0, "voidstone/animated/raw"); voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.1.desc"), 1, "voidstone/animated/quarters"); voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.2.desc"), 2, "voidstone/animated/smooth"); @@ -1496,7 +1495,7 @@ public class ModBlocks { } if(Configurations.featureEnabled("voidstonePillars")){ - voidstonePillar = (BlockVoidstonePillar) new BlockVoidstonePillar().setStepSound(Block.soundTypeStone); + voidstonePillar = (BlockVoidstonePillar) new BlockVoidstonePillar().setCreativeTab(ModTabs.tabStoneChiselBlocks).setStepSound(Block.soundTypeStone); voidstonePillar.carvableHelper.addVariation(StatCollector.translateToLocal("tile.voidstonePillar.0.desc"), 0, "voidstone/pillar-side"); voidstonePillar.carvableHelper.register(voidstonePillar, "voidstonePillar"); Carving.chisel.registerOre("voidstonePillar", "voidstonePillar"); @@ -1508,7 +1507,7 @@ public class ModBlocks { } if (Configurations.featureEnabled("waterstone")) { - waterstone = (BlockWaterstone) new BlockWaterstone(Material.rock, "water_flow").setHardness(2.0F).setResistance(10.0F); + waterstone = (BlockWaterstone) new BlockWaterstone(Material.rock, "water_flow").setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10.0F); waterstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.waterstone.0.desc"), 0, "waterstone/cobble"); waterstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.waterstone.1.desc"), 1, "waterstone/black"); waterstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.waterstone.2.desc"), 2, "waterstone/tiles"); @@ -1522,7 +1521,7 @@ public class ModBlocks { } if(Configurations.featureEnabled("hexPlating")){ - hexPlating = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10.0F); + hexPlating = (BlockCarvable) new BlockCarvable().setCreativeTab(ModTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10.0F); hexPlating.carverHelper.addVariation(StatCollector.translateToLocal("tile.hexPlating.0.desc"), 0, "hexPlating/black"); hexPlating.carverHelper.addVariation(StatCollector.translateToLocal("tile.hexPlating.1.desc"), 1, "hexPlating/blue"); hexPlating.carverHelper.addVariation(StatCollector.translateToLocal("tile.hexPlating.2.desc"), 2, "hexPlating/brown"); @@ -1544,7 +1543,7 @@ public class ModBlocks { } if(Configurations.featureEnabled("fantasy2")){ - fantasy2 = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10F); + fantasy2 = (BlockCarvable) new BlockCarvable().setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F); fantasy2.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock2.0.desc"), 0, "fantasy2/brick"); fantasy2.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock2.1.desc"), 1, "fantasy2/brick-faded"); fantasy2.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock2.2.desc"), 2, "fantasy2/brick-wear"); @@ -1567,7 +1566,7 @@ public class ModBlocks { } if(Configurations.featureEnabled("grimstone")){ - grimstone = (BlockGrimstone) new BlockGrimstone(Material.rock).setHardness(2.0F).setResistance(10F); + grimstone = (BlockGrimstone) new BlockGrimstone(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F); grimstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.grimstone.0.desc"), 0, "grimstone/grimstone"); grimstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.grimstone.1.desc"), 1, "grimstone/smooth"); grimstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.grimstone.2.desc"), 2, "grimstone/hate"); @@ -1588,7 +1587,7 @@ public class ModBlocks { } if(Configurations.featureEnabled("technical")){ - technical = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10F); + technical = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.0.desc"), 0, "technical/scaffold"); technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.1.desc"), 1, "technical/cautiontape"); technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.2.desc"), 2, "technical/industrialrelic"); @@ -1620,7 +1619,7 @@ public class ModBlocks { //Once screen overlay is done, remove WIP texs if(Configurations.featureEnabled("futura")){ - futura = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10F); + futura = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); futura.carverHelper.addVariation(StatCollector.translateToLocal("tile.futura.0.desc"), 0, "futura/screenMetallicWIP"); futura.carverHelper.addVariation(StatCollector.translateToLocal("tile.futura.1.desc"), 1, "futura/screenCyanWIP"); futura.carverHelper.register(futura, "futura"); @@ -1629,7 +1628,7 @@ public class ModBlocks { if(Configurations.featureEnabled("bone")) { - bone = (BlockCarvable) new BlockCarvable(Material.rock); + bone = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabOtherChiselBlocks); bone.carverHelper.addVariation(StatCollector.translateToLocal("tile.bone.0.desc"), 0, "bone/solid"); bone.carverHelper.addVariation(StatCollector.translateToLocal("tile.bone.1.desc"), 1, "bone/skullpile"); bone.carverHelper.addVariation(StatCollector.translateToLocal("tile.bone.2.desc"), 2, "bone/stacked"); @@ -1641,7 +1640,7 @@ public class ModBlocks { if(Configurations.featureEnabled("scorching")) { - scorching = (BlockCarvable) new BlockCarvable(Material.rock).setLightLevel(1F); + scorching = (BlockCarvable) new BlockCarvable(Material.rock).setLightLevel(1F).setCreativeTab(ModTabs.tabOtherChiselBlocks); scorching.carverHelper.addVariation(StatCollector.translateToLocal("tile.scorching.0.desc"), 0, "scorching/scorch"); scorching.carverHelper.addVariation(StatCollector.translateToLocal("tile.scorching.1.desc"), 1, "scorching/bordered"); scorching.carverHelper.addVariation(StatCollector.translateToLocal("tile.scorching.2.desc"), 2, "scorching/beveled"); @@ -1653,7 +1652,7 @@ public class ModBlocks { if(Configurations.featureEnabled("brickCustom")) { - brickCustom = (BlockCarvable) new BlockCarvable(Material.rock).setStepSound(Block.soundTypeStone); + brickCustom = (BlockCarvable) new BlockCarvable(Material.rock).setStepSound(Block.soundTypeStone).setCreativeTab(ModTabs.tabStoneChiselBlocks); Carving.chisel.addVariation("brickCustom", Blocks.brick_block, 0, 0); brickCustom.carverHelper.addVariation(StatCollector.translateToLocal("tile.brickCustom.1.desc"), 1, "brickCustom/large"); brickCustom.carverHelper.addVariation(StatCollector.translateToLocal("tile.brickCustom.2.desc"), 2, "brickCustom/mortarless"); @@ -1669,7 +1668,7 @@ public class ModBlocks { { Carving.chisel.addVariation("torch", Blocks.torch, 0, 0); for(int metadata = 0; metadata < 10; metadata++){ - torch[metadata] = (BlockCarvableTorch) new BlockCarvableTorch().setLightLevel(0.9375F).setBlockName("torch").setCreativeTab(ModTabs.tabChiselBlocks); + torch[metadata] = (BlockCarvableTorch) new BlockCarvableTorch().setCreativeTab(ModTabs.tabOtherChiselBlocks).setLightLevel(0.9375F).setBlockName("torch").setCreativeTab(ModTabs.tabOtherChiselBlocks); torch[metadata].setInformation("torch" + (metadata + 1)); GameRegistry.registerBlock(torch[metadata], "torch" + (metadata + 1)); Carving.chisel.addVariation("torch", torch[metadata], 0, (metadata + 1)); @@ -1679,7 +1678,7 @@ public class ModBlocks { if(Configurations.featureEnabled("warningSign")) { - sign = (BlockCarvable) new BlockCarvable(Material.iron).setHardness(2.0F).setResistance(10.0F); + sign = (BlockCarvable) new BlockCarvable(Material.iron).setCreativeTab(ModTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10.0F); sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.0.desc"), 0, "warning/rad"); sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.1.desc"), 1, "warning/bio"); sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.2.desc"), 2, "warning/fire"); @@ -1711,7 +1710,7 @@ public class ModBlocks { if(Configurations.featureEnabled("arcane") && Loader.isModLoaded("Thaumcraft")) { - arcane = (BlockCarvable) new BlockCarvable(Material.rock).setStepSound(Block.soundTypeStone); + arcane = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setStepSound(Block.soundTypeStone); Carving.chisel.addVariation("arcane", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 6, 0); Carving.chisel.addVariation("arcane", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 7, 1); arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.0.desc"), 0, "arcane/moonEngrave"); diff --git a/src/main/java/com/cricketcraft/chisel/init/ModTabs.java b/src/main/java/com/cricketcraft/chisel/init/ModTabs.java index 85128d5a..5da8b733 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModTabs.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModTabs.java @@ -6,9 +6,10 @@ import net.minecraft.item.Item; public class ModTabs { public static CreativeTabs tabChisel; - public static CreativeTabs tabChiselBlocks; + public static CreativeTabs tabStoneChiselBlocks, tabWoodChiselBlocks,tabMetalChiselBlocks, tabOtherChiselBlocks; public static void load(){ + tabChisel = new CreativeTabs("tabChisel") { @Override @@ -16,13 +17,35 @@ public class ModTabs { return ModItems.chisel; } }; - - tabChiselBlocks = new CreativeTabs("tabChiselBlocks") { + tabStoneChiselBlocks = new CreativeTabs("tabStoneChiselBlocks") { @Override public Item getTabIconItem() { return Item.getItemFromBlock(ModBlocks.holystone); } }; + tabWoodChiselBlocks = new CreativeTabs("tabWoodChiselBlocks") { + @Override + public Item getTabIconItem() + { + //Broken + //return Item.getItemFromBlock(ModBlocks.bookshelf); + return ModItems.chisel + } + }; + tabMetalChiselBlocks = new CreativeTabs("tabMetalChiselBlocks") { + @Override + public Item getTabIconItem() + { + return Item.getItemFromBlock(ModBlocks.technical); + } + }; + tabOtherChiselBlocks = new CreativeTabs("tabOtherChiselBlocks") { + @Override + public Item getTabIconItem() + { + return Item.getItemFromBlock(ModBlocks.jackolantern[0]); + } + }; } } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 6826b9f5..d7a194be 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -1147,7 +1147,10 @@ tile.laboratory.14.desc=Direction Console (Left) tile.laboratory.15.desc=Information Console # Creative Tab localizations -itemGroup.tabChiselBlocks=Chisel Blocks +itemGroup.tabOtherChiselBlocks=Other Chisel Blocks +itemGroup.tabStoneChiselBlocks=Stone Chisel Blocks +itemGroup.tabWoodChiselBlocks=Wood Chisel Blocks +itemGroup.tabMetalChiselBlocks=Metal Chisel Blocks itemGroup.tabChisel=Chisel Items #Container