Reimplementing Warning Signs & Torches

src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java

@@ -0,0 +1,33 @@
+package com.cricketcraft.chisel.block;
+
+import net.minecraft.block.BlockTorch;
+import net.minecraft.client.renderer.texture.IIconRegister;
+
+import com.cricketcraft.chisel.Chisel;
+import com.cricketcraft.chisel.api.ICarvable;
+import com.cricketcraft.chisel.carving.CarvableHelper;
+import com.cricketcraft.chisel.carving.CarvableVariation;
+
+public class BlockCarvableTorch extends BlockTorch implements ICarvable
+{
+    public CarvableHelper carverHelper;
+    private String texLocation;
+
+    public BlockCarvableTorch()
+    {
+        super();
+
+        carverHelper = new CarvableHelper();
+    }
+	@Override
+	public CarvableVariation getVariation(int metadata) {
+		return carverHelper.getVariation(metadata);
+	}
+	@Override
+    public void registerBlockIcons(IIconRegister icon){
+        this.blockIcon = icon.registerIcon(Chisel.MOD_ID + ":torch/"+ texLocation);
+    }
+	public void setInformation(String textureLocation){
+        this.texLocation = textureLocation;
+    }
+}

src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java

@@ -11,6 +11,7 @@ import com.cricketcraft.chisel.block.BlockCarvablePumpkin;
 import com.cricketcraft.chisel.block.BlockCarvableSand;
 import com.cricketcraft.chisel.block.BlockCarvableSlab;
 import com.cricketcraft.chisel.block.BlockCarvableStairs;
+import com.cricketcraft.chisel.block.BlockCarvableTorch;
 import com.cricketcraft.chisel.block.BlockCloud;
 import com.cricketcraft.chisel.block.BlockConcrete;
 import com.cricketcraft.chisel.block.BlockGrimstone;
@@ -111,6 +112,7 @@ public final class ChiselBlocks {
 	public static final BlockCarvable arcane = null;
 	public static final BlockCarvable bloodRune = null;
 	public static final BlockCarvableSand colored_sand = null;
+	public static BlockCarvableTorch[] torch = new BlockCarvableTorch[16];
 
 	// Arrays can't be final because of how @ObjectHolder works
 	public static BlockCarvable[] planks = new BlockCarvable[6];

src/main/java/com/cricketcraft/chisel/init/Features.java

@@ -1,5 +1,14 @@
 package com.cricketcraft.chisel.init;
 
+import static com.cricketcraft.chisel.init.ChiselBlocks.carpet_block;
+import static com.cricketcraft.chisel.init.ChiselBlocks.jackolantern;
+import static com.cricketcraft.chisel.init.ChiselBlocks.planks;
+import static com.cricketcraft.chisel.init.ChiselBlocks.present;
+import static com.cricketcraft.chisel.init.ChiselBlocks.pumpkin;
+import static com.cricketcraft.chisel.init.ChiselBlocks.stainedGlass;
+import static com.cricketcraft.chisel.init.ChiselBlocks.stainedGlassPane;
+import static com.cricketcraft.chisel.init.ChiselBlocks.torch;
+import static com.cricketcraft.chisel.utils.General.sGNames;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.init.Blocks;
@@ -25,6 +34,7 @@ import com.cricketcraft.chisel.block.BlockCarvablePumpkin;
 import com.cricketcraft.chisel.block.BlockCarvableSand;
 import com.cricketcraft.chisel.block.BlockCarvableSlab;
 import com.cricketcraft.chisel.block.BlockCarvableStairs;
+import com.cricketcraft.chisel.block.BlockCarvableTorch;
 import com.cricketcraft.chisel.block.BlockCloud;
 import com.cricketcraft.chisel.block.BlockConcrete;
 import com.cricketcraft.chisel.block.BlockEldritch;
@@ -70,9 +80,6 @@ import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.registry.EntityRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
 
-import static com.cricketcraft.chisel.init.ChiselBlocks.*;
-import static com.cricketcraft.chisel.utils.General.*;
-
 public enum Features {
 
 	AE_CERTUS_QUARTZ("appliedenergistics2") {
@@ -132,6 +139,7 @@ public enum Features {
 
 	AUTO_CHISEL {
 
+		@Override
 		void addBlocks() {
 			Block autoChisel = new BlockAutoChisel().setBlockTextureName(Chisel.MOD_ID + ":autoChisel/autoChisel").setCreativeTab(ChiselTabs.tabChisel).setBlockName("autoChisel");
 			GameRegistry.registerBlock(autoChisel, "autoChisel");
@@ -724,6 +732,7 @@ public enum Features {
 
 	GLASS_STAINED {
 
+		@Override
 		void addBlocks() {
 			for (int i = 0; i < 16; i++) {
 				final String blockName = "stained_glass_" + sGNames[i].replaceAll(" ", "").toLowerCase();
@@ -1769,6 +1778,7 @@ public enum Features {
 
 	RC_QUARRIED_BLOCK(RAILCRAFT.getRequiredMod(), RAILCRAFT) {
 
+		@Override
 		void addBlocks() {
 			Carving.chisel.addVariation("RCQuarriedBlock", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.quarried"), 0, 0);
 			Carving.chisel.addVariation("RCQuarriedBlock", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.quarried"), 1, 1);
@@ -2074,6 +2084,7 @@ public enum Features {
 
 	TEMPLE_BLOCK_MOSSY {
 
+		@Override
 		void addBlocks() {
 			BlockCarvable mossy_templeblock = (BlockCarvable) new BlockEldritch().setHardness(2.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setResistance(10F)
 					.setStepSound(Chisel.soundTempleFootstep);
@@ -2221,6 +2232,7 @@ public enum Features {
 
 	VOIDSTONE_PILLARS {
 
+		@Override
 		void addBlocks() {
 			BlockVoidstonePillar voidstonePillar = (BlockVoidstonePillar) new BlockVoidstonePillar().setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setStepSound(Block.soundTypeStone);
 			voidstonePillar.carvableHelper.addVariation(StatCollector.translateToLocal("tile.voidstonePillar.0.desc"), 0, "voidstone/pillar-side");
@@ -2326,7 +2338,48 @@ public enum Features {
 		boolean needsMetaRecipes() {
 			return true;
 		}
-	}
+	},
+
+	WARNING_SIGN {
+		@Override
+		void addBlocks() {
+			BlockCarvable sign = (BlockCarvable) new BlockCarvable(Material.iron).setCreativeTab(ChiselTabs.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");
+			sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.3.desc"), 3, "warning/explosion");
+			sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.4.desc"), 4, "warning/death");
+			sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.5.desc"), 5, "warning/falling");
+			sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.6.desc"), 6, "warning/fall");
+			sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.7.desc"), 7, "warning/voltage");
+			sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.8.desc"), 8, "warning/generic");
+			sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.9.desc"), 9, "warning/acid");
+			sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.10.desc"), 10, "warning/underconstruction");
+			sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.11.desc"), 11, "warning/sound");
+			sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.12.desc"), 12, "warning/noentry");
+			sign.carverHelper.addVariation(StatCollector.translateToLocal("tile.warningSign.13.desc"), 13, "warning/cryogenic");
+			sign.carverHelper.register(sign, "warningSign");
+			Carving.chisel.registerOre("warningSign", "warningSign");
+		}
+		@Override
+		void addRecipes() {
+			 GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.sign, 4, 0), new Object[]{"xxx", "xyx", "xxx", 'x', "stone", 'y', Items.sign}));
+		}
+	},
+
+	TORCH {
+		@Override
+		void addBlocks() {
+		Carving.chisel.addVariation("torch", Blocks.torch, 0, 0);
+		for(int metadata = 0; metadata < 10; metadata++){
+			torch[metadata] = (BlockCarvableTorch) new BlockCarvableTorch().setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setLightLevel(0.9375F).setBlockName("torch");
+			torch[metadata].setInformation("torch" + (metadata + 1));
+			GameRegistry.registerBlock(torch[metadata], "torch" + (metadata + 1));
+			Carving.chisel.addVariation("torch", torch[metadata], 0, (metadata + 1));
+		}
+		Carving.chisel.registerOre("torch", "torch");
+		}
+	},
 
 	;
 

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

@@ -73,6 +73,23 @@ tile.voidstone.7.desc=Beveled Voidstone
 tile.voidstonePillar.name=Voidstone Pillar
 tile.voidstonePillar.0.desc=Striped Voidstone Pillar
 
+-#Warning
+tile.warningSign.name=Warning Sign
+tile.warningSign.0.desc=Radiation
+tile.warningSign.1.desc=Biohazard
+tile.warningSign.2.desc=Fire
+tile.warningSign.3.desc=Explosion
+tile.warningSign.4.desc=Death
+tile.warningSign.5.desc=Falling Objects
+tile.warningSign.6.desc=Danger of Falling
+tile.warningSign.7.desc=High Voltage
+tile.warningSign.8.desc=Generic Warning
+tile.warningSign.9.desc=Dangerous Chemicals
+tile.warningSign.10.desc=Under Construction
+tile.warningSign.11.desc=Loud Sounds
+tile.warningSign.12.desc=No Entry
+tile.warningSign.13.desc=Cryogenic Freezing in progress
+
 #Energised Void Stone Blocks
 tile.voidstone2.name=Energised Voidstone
 tile.voidstone2.0.desc=Raw Energised Voidstone