Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/cricketcraft/chisel/Chisel.java

@@ -1,6 +1,20 @@
 package com.cricketcraft.chisel;
 
-import com.cricketcraft.chisel.api.IChiselItem;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.common.config.Configuration;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
 import com.cricketcraft.chisel.block.BlockCarvable;
 import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel;
 import com.cricketcraft.chisel.block.tileentity.TileEntityPresent;
@@ -30,8 +44,12 @@ import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.Mod.Instance;
 import cpw.mods.fml.common.SidedProxy;
-import cpw.mods.fml.common.event.*;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLInterModComms;
+import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
 import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.network.IGuiHandler;
 import cpw.mods.fml.common.network.NetworkRegistry;
@@ -39,22 +57,8 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.GameRegistry.Type;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.common.config.Configuration;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-@Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = Chisel.VERSION, guiFactory = "com.cricketcraft.chisel.client.gui.GuiFactory", dependencies = "after:ForgeMultipart;after:Thaumcraft;after:appliedenergistics2;after:Railcraft")
+@Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = Chisel.VERSION, guiFactory = "com.cricketcraft.chisel.client.gui.GuiFactory", dependencies = "after:ForgeMultipart;after:Thaumcraft;after:appliedenergistics2;after:Railcraft;after:AWWayofTime")
 public class Chisel {
 
 	public static final List<String> modsSupported = new ArrayList<String>();
@@ -70,7 +74,8 @@ public class Chisel {
 	public static int renderCarpetId;
 	public static int renderAutoChiselId;
 	public static int renderGlowId;
-	
+	public static int renderLayeredId;
+
 	public static final Logger logger = LogManager.getLogger(MOD_ID);
 
 	@Instance(MOD_ID)

src/main/java/com/cricketcraft/chisel/api/IFacade.java

@@ -2,6 +2,7 @@ package com.cricketcraft.chisel.api;
 
 import net.minecraft.block.Block;
 import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
 
 /**
  * To be implemented on blocks that "hide" another block inside, so connected textuers can still be

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

@@ -18,6 +18,7 @@ public class BlockCarvableGlow extends BlockCarvable {
 
 	public BlockCarvableGlow(String glowTexture) {
 		super();
+		this.setLightLevel(0.5F); //Same as redstone torch
 		this.glowTexturePath = glowTexture;
 	}
 

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

@@ -0,0 +1,42 @@
+package com.cricketcraft.chisel.block;
+
+import java.util.Random;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+
+public class BlockCarvableGlowstone extends BlockCarvable {
+
+	public BlockCarvableGlowstone() {
+		super(Material.glass);
+	}
+
+	@Override
+	public int quantityDropped(Random random) {
+		return Blocks.glowstone.quantityDropped(random);
+	}
+
+	@Override
+	public Item getItemDropped(int i, Random random, int a) {
+		return Items.glowstone_dust;
+	}
+
+	@Override
+	public int damageDropped(int i) {
+		return 0;
+	}
+	@Override
+    public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player)
+    {
+    	Block glowstone = world.getBlock(x, y, z);
+    	int meta = world.getBlockMetadata(x, y, z);
+        return new ItemStack(Item.getItemFromBlock(glowstone), 1, meta);
+    }
+}

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

@@ -0,0 +1,38 @@
+package com.cricketcraft.chisel.block;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.util.IIcon;
+
+import com.cricketcraft.chisel.Chisel;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public class BlockCarvableLayered extends BlockCarvable {
+	@SideOnly(Side.CLIENT)
+	private IIcon baseTexture;
+	private String baseTexLocation;
+
+	public BlockCarvableLayered(Material mat, String baseTexLocation) {
+		super(mat);
+		this.baseTexLocation = baseTexLocation;
+	}
+	@Override
+	public void registerBlockIcons(IIconRegister register) {
+		super.registerBlockIcons(register);
+		baseTexture = register.registerIcon(Chisel.MOD_ID + ":" + baseTexLocation);
+	}
+	public IIcon getBaseTex() {
+		return baseTexture;
+	}
+	@Override
+	public int getRenderType() {
+		return Chisel.renderLayeredId;
+	}
+
+	@Override
+	public boolean renderAsNormalBlock() {
+		return false;
+	}
+}

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

@@ -0,0 +1,87 @@
+package com.cricketcraft.chisel.block;
+
+import java.util.Random;
+
+import net.minecraft.block.BlockTorch;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.world.World;
+
+import com.cricketcraft.chisel.Chisel;
+import com.cricketcraft.chisel.api.ICarvable;
+import com.cricketcraft.chisel.carving.CarvableHelper;
+import com.cricketcraft.chisel.carving.CarvableVariation;
+import com.cricketcraft.chisel.init.ChiselTabs;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public class BlockCarvableTorch extends BlockTorch implements ICarvable
+{
+	public CarvableHelper carverHelper;
+	private String texLocation;
+	protected boolean emitsParticles = true;
+
+	public BlockCarvableTorch()
+	{
+		super();
+		carverHelper = new CarvableHelper();
+		setCreativeTab(ChiselTabs.tabOtherChiselBlocks);
+		setLightLevel(0.9375F);
+		setBlockName("torch");
+	}
+	@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;
+	}
+	public BlockCarvableTorch disableParticles()
+	{
+		this.emitsParticles = false;
+		return this;
+	}
+	@SideOnly(Side.CLIENT)
+	public void randomDisplayTick(World p_149734_1_, int p_149734_2_, int p_149734_3_, int p_149734_4_, Random p_149734_5_)
+	{
+		if(emitsParticles)
+		{
+			int l = p_149734_1_.getBlockMetadata(p_149734_2_, p_149734_3_, p_149734_4_);
+			double d0 = (double)((float)p_149734_2_ + 0.5F);
+			double d1 = (double)((float)p_149734_3_ + 0.7F);
+			double d2 = (double)((float)p_149734_4_ + 0.5F);
+			double d3 = 0.2199999988079071D;
+			double d4 = 0.27000001072883606D;
+
+			if (l == 1)
+			{
+				p_149734_1_.spawnParticle("smoke", d0 - d4, d1 + d3, d2, 0.0D, 0.0D, 0.0D);
+				p_149734_1_.spawnParticle("flame", d0 - d4, d1 + d3, d2, 0.0D, 0.0D, 0.0D);
+			}
+			else if (l == 2)
+			{
+				p_149734_1_.spawnParticle("smoke", d0 + d4, d1 + d3, d2, 0.0D, 0.0D, 0.0D);
+				p_149734_1_.spawnParticle("flame", d0 + d4, d1 + d3, d2, 0.0D, 0.0D, 0.0D);
+			}
+			else if (l == 3)
+			{
+				p_149734_1_.spawnParticle("smoke", d0, d1 + d3, d2 - d4, 0.0D, 0.0D, 0.0D);
+				p_149734_1_.spawnParticle("flame", d0, d1 + d3, d2 - d4, 0.0D, 0.0D, 0.0D);
+			}
+			else if (l == 4)
+			{
+				p_149734_1_.spawnParticle("smoke", d0, d1 + d3, d2 + d4, 0.0D, 0.0D, 0.0D);
+				p_149734_1_.spawnParticle("flame", d0, d1 + d3, d2 + d4, 0.0D, 0.0D, 0.0D);
+			}
+			else
+			{
+				p_149734_1_.spawnParticle("smoke", d0, d1, d2, 0.0D, 0.0D, 0.0D);
+				p_149734_1_.spawnParticle("flame", d0, d1, d2, 0.0D, 0.0D, 0.0D);
+			}
+		}
+	}
+}

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

@@ -1,30 +0,0 @@
-package com.cricketcraft.chisel.block;
-
-import java.util.Random;
-
-import net.minecraft.block.material.Material;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-
-public class BlockLightstoneCarvable extends BlockCarvable {
-
-	public BlockLightstoneCarvable() {
-		super(Material.glass);
-	}
-
-	@Override
-	public int quantityDropped(Random random) {
-		return Blocks.glowstone.quantityDropped(random);
-	}
-
-	@Override
-	public Item getItemDropped(int i, Random random, int a) {
-		return Items.glowstone_dust;
-	}
-
-	@Override
-	public int damageDropped(int i) {
-		return 0;
-	}
-}

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

@@ -9,6 +9,7 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
 import com.cricketcraft.chisel.client.render.BlockRoadLineRenderer;
+import com.cricketcraft.chisel.config.Configurations;
 
 public class BlockRoadLine extends Block {
 
@@ -19,6 +20,9 @@ public class BlockRoadLine extends Block {
 	public BlockRoadLine() {
 		super(Material.circuits);
 
+		if (Configurations.useRoadLineTool) {
+			this.setHarvestLevel(Configurations.getRoadLineTool,Configurations.roadLineToolLevel);
+		}
 		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);
 	}

src/main/java/com/cricketcraft/chisel/client/render/BlockGlowRenderer.java

@@ -1,13 +1,13 @@
 package com.cricketcraft.chisel.client.render;
 
-import org.lwjgl.opengl.GL11;
-
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.item.ItemDye;
 import net.minecraft.world.IBlockAccess;
 
+import org.lwjgl.opengl.GL11;
+
 import com.cricketcraft.chisel.Chisel;
 import com.cricketcraft.chisel.block.BlockCarvableGlow;
 import com.cricketcraft.chisel.utils.Drawing;

src/main/java/com/cricketcraft/chisel/client/render/BlockLayeredRenderer.java

@@ -0,0 +1,50 @@
+package com.cricketcraft.chisel.client.render;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.world.IBlockAccess;
+
+import org.lwjgl.opengl.GL11;
+
+import com.cricketcraft.chisel.Chisel;
+import com.cricketcraft.chisel.block.BlockCarvableLayered;
+import com.cricketcraft.chisel.utils.Drawing;
+
+import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
+import cpw.mods.fml.client.registry.RenderingRegistry;
+
+public class BlockLayeredRenderer implements ISimpleBlockRenderingHandler {
+
+	public BlockLayeredRenderer() {
+		Chisel.renderLayeredId = RenderingRegistry.getNextAvailableRenderId();
+	}
+
+	@Override
+	public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) {
+		GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
+		GL11.glDisable(GL11.GL_LIGHTING);
+		Drawing.drawBlock(block, ((BlockCarvableLayered)block).getBaseTex(), renderer);
+		GL11.glEnable(GL11.GL_LIGHTING);
+		Drawing.drawBlock(block, metadata, renderer);
+		GL11.glTranslatef(0.5F, 0.5F, 0.5F);
+	}
+
+	@Override
+	public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) {
+		Drawing.renderAllFaces(renderer, block, x, y, z, ((BlockCarvableLayered) block).getBaseTex());
+		Tessellator.instance.setBrightness(0xFFFFFF);
+		renderer.renderStandardBlock(block, x, y, z);
+		return true;
+	}
+
+	@Override
+	public boolean shouldRender3DInInventory(int modelId) {
+		return true;
+	}
+
+	@Override
+	public int getRenderId() {
+		return Chisel.renderLayeredId;
+	}
+}

src/main/java/com/cricketcraft/chisel/client/render/RenderStandardBlockNoSunlight.java

@@ -1,7 +1,6 @@
 package com.cricketcraft.chisel.client.render;
 
 import net.minecraft.block.Block;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;
 

src/main/java/com/cricketcraft/chisel/config/Configurations.java

@@ -2,12 +2,12 @@ package com.cricketcraft.chisel.config;
 
 import java.util.Locale;
 
+import net.minecraftforge.common.config.Configuration;
+
 import org.apache.commons.lang3.StringUtils;
 
 import com.cricketcraft.chisel.init.Features;
 
-import net.minecraftforge.common.config.Configuration;
-
 public class Configurations {
 
 	public static Configuration config;
@@ -39,6 +39,10 @@ public class Configurations {
 	public static int diamondChiselMaxDamage;
 	public static boolean ironChiselCanLeftClick;
 	
+	public static boolean useRoadLineTool;
+	public static String getRoadLineTool;
+	public static int roadLineToolLevel;
+	
 	public static boolean refreshConfig() {
 
 		String category;
@@ -79,6 +83,12 @@ public class Configurations {
 		diamondChiselMaxDamage = config.get(category, "diamondChiselMaxDamage", 5000, "The max damage of the diamond chisel. Default: 5000").getInt();
 		ironChiselCanLeftClick = config.get(category, "ironChiselCanLeftClick", true, "If this is true, the iron chisel can left click chisel blocks. If false, it cannot.").getBoolean();
 		
+		/* block */
+		category = "block";
+		useRoadLineTool = config.get(category, "useRoadLineTool", false, "Should the road line require a tool to break (If false, road lines can be broken in Adventure)").getBoolean();
+		getRoadLineTool = config.get(category, "getRoadLineTool","pickaxe","The tool that is able to break roadLines (requires useRoadLineTool to be true to take effect)").getString();
+		roadLineToolLevel = config.get(category, "roadLineToolLevel",0,"The lowest harvest level of the tool able to break the road lines (requires useRoadLineTool to be true to take effect) (0 = Wood/Gold, 1 = Stone, 2 = Iron, 3 = Diamond) Default: 0").getInt();
+		
 		if (config.hasChanged()) {
 			config.save();
 		}

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

@@ -5,18 +5,20 @@ import net.minecraft.block.Block;
 import com.cricketcraft.chisel.Chisel;
 import com.cricketcraft.chisel.block.BlockCarvable;
 import com.cricketcraft.chisel.block.BlockCarvableGlass;
+import com.cricketcraft.chisel.block.BlockCarvableGlowstone;
+import com.cricketcraft.chisel.block.BlockCarvableLayered;
 import com.cricketcraft.chisel.block.BlockCarvablePane;
 import com.cricketcraft.chisel.block.BlockCarvablePowered;
 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;
 import com.cricketcraft.chisel.block.BlockHolystone;
 import com.cricketcraft.chisel.block.BlockLavastone;
-import com.cricketcraft.chisel.block.BlockLightstoneCarvable;
 import com.cricketcraft.chisel.block.BlockMarbleCarpet;
 import com.cricketcraft.chisel.block.BlockMarbleIce;
 import com.cricketcraft.chisel.block.BlockMarbleIceStairs;
@@ -55,7 +57,7 @@ public final class ChiselBlocks {
 	public static final BlockCarvable iron_block = null;
 	public static final BlockCarvable gold_block = null;
 	public static final BlockCarvable diamond_block = null;
-	public static final BlockLightstoneCarvable glowstone = null;
+	public static final BlockCarvableGlowstone glowstone = null;
 	public static final BlockCarvable lapis_block = null;
 	public static final BlockCarvable emerald_block = null;
 	public static final BlockCarvable nether_brick = null;
@@ -104,13 +106,15 @@ public final class ChiselBlocks {
 	public static final BlockCarvable technical = null;
 	public static final BlockCarvableGlass technical2 = null;
 	public static final BlockCarvable futura = null;
-	public static final BlockCarvable bone = null;
-	public static final BlockCarvable scorching = null;
 	public static final BlockCarvable brickCustom = null;
-	public static final BlockCarvable sign = null;
+	public static final BlockCarvableLayered sign = null;
 	public static final BlockCarvable arcane = null;
+	public static final BlockCarvable thaumium = null;
+	public static final BlockCarvable tallow = 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;
@@ -19,12 +28,15 @@ import com.cricketcraft.chisel.block.BlockBeaconBase;
 import com.cricketcraft.chisel.block.BlockCarvable;
 import com.cricketcraft.chisel.block.BlockCarvableGlass;
 import com.cricketcraft.chisel.block.BlockCarvableGlow;
+import com.cricketcraft.chisel.block.BlockCarvableGlowstone;
+import com.cricketcraft.chisel.block.BlockCarvableLayered;
 import com.cricketcraft.chisel.block.BlockCarvablePane;
 import com.cricketcraft.chisel.block.BlockCarvablePowered;
 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;
@@ -32,7 +44,6 @@ import com.cricketcraft.chisel.block.BlockGrimstone;
 import com.cricketcraft.chisel.block.BlockHolystone;
 import com.cricketcraft.chisel.block.BlockLavastone;
 import com.cricketcraft.chisel.block.BlockLeaf;
-import com.cricketcraft.chisel.block.BlockLightstoneCarvable;
 import com.cricketcraft.chisel.block.BlockMarbleBookshelf;
 import com.cricketcraft.chisel.block.BlockMarbleCarpet;
 import com.cricketcraft.chisel.block.BlockMarbleIce;
@@ -70,9 +81,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") {
@@ -130,8 +138,47 @@ public enum Features {
 		}
 	},
 
+	THAUMIUM("Thaumcraft") {
+
+		@Override
+		void addBlocks() {
+			BlockCarvable thaumium = (BlockCarvable) new BlockCarvable(Material.iron).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeMetal);
+			Carving.chisel.addVariation("thaumium", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 4, 0);
+			thaumium.carverHelper.addVariation(StatCollector.translateToLocal("tile.thaumium.0.desc"), 0, "thaumium/bevel");
+			thaumium.carverHelper.addVariation(StatCollector.translateToLocal("tile.thaumium.1.desc"), 1, "thaumium/chunks");
+			thaumium.carverHelper.addVariation(StatCollector.translateToLocal("tile.thaumium.2.desc"), 2, "thaumium/purplerunes");
+			thaumium.carverHelper.addVariation(StatCollector.translateToLocal("tile.thaumium.3.desc"), 3, "thaumium/runes");
+			thaumium.carverHelper.register(thaumium, "thaumium");
+			Carving.chisel.registerOre("thaumium", "thaumium");
+		}
+	},
+
+	TALLOW("Thaumcraft") {
+
+		@Override
+		void addBlocks() {
+			BlockCarvable tallow = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeSnow);
+			Carving.chisel.addVariation("tallow", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 5, 0);
+			tallow.carverHelper.register(tallow, "tallow");
+			Carving.chisel.registerOre("tallow", "tallow");
+		}
+	},
+
+	AMBER("Thaumcraft") {
+
+		@Override
+		void addBlocks() {
+			BlockCarvable amber = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeStone);
+			Carving.chisel.addVariation("amber", GameRegistry.findBlock("Thaumcraft", "blockCosmeticOpaque"), 0, 0);
+			Carving.chisel.addVariation("amber", GameRegistry.findBlock("Thaumcraft", "blockCosmeticOpaque"), 1, 1);
+			amber.carverHelper.register(amber, "amber");
+			Carving.chisel.registerOre("amber", "amber");
+		}
+	},
+
 	AUTO_CHISEL {
 
+		@Override
 		void addBlocks() {
 			Block autoChisel = new BlockAutoChisel().setBlockTextureName(Chisel.MOD_ID + ":autoChisel/autoChisel").setCreativeTab(ChiselTabs.tabChisel).setBlockName("autoChisel");
 			GameRegistry.registerBlock(autoChisel, "autoChisel");
@@ -168,12 +215,12 @@ public enum Features {
 		}
 	},
 
-	BLOOD_RUNE("AWWayOfTime") {
+	BLOOD_RUNE("AWWayofTime") {
 
 		@Override
 		void addBlocks() {
 			BlockCarvable bloodRune = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeStone);
-			Carving.chisel.addVariation("bloodRune", GameRegistry.findBlock("AWWayOfTime", "bloodRune.blank"), 0, 0);
+			Carving.chisel.addVariation("bloodRune", GameRegistry.findBlock("AWWayofTime", "AlchemicalWizardrybloodRune"), 0, 0);
 			bloodRune.carverHelper.addVariation(StatCollector.translateToLocal("tile.bloodRune.0.desc"), 0, "bloodMagic/bloodRuneArranged");
 			bloodRune.carverHelper.addVariation(StatCollector.translateToLocal("tile.bloodRune.1.desc"), 1, "bloodMagic/bloodRuneBricks");
 			bloodRune.carverHelper.addVariation(StatCollector.translateToLocal("tile.bloodRune.2.desc"), 2, "bloodMagic/bloodRuneCarved");
@@ -725,6 +772,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();
@@ -790,7 +838,7 @@ public enum Features {
 
 		@Override
 		void addBlocks() {
-			BlockLightstoneCarvable glowstone = (BlockLightstoneCarvable) new BlockLightstoneCarvable().setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.3F).setLightLevel(1.0F)
+			BlockCarvableGlowstone glowstone = (BlockCarvableGlowstone) new BlockCarvableGlowstone().setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.3F).setLightLevel(1.0F)
 					.setStepSound(Block.soundTypeGlass);
 			Carving.chisel.addVariation("glowstone", Blocks.glowstone, 0, 0);
 			glowstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lightstone.1.desc"), 1, "lightstone/terrain-sulphur-cobble");
@@ -1770,6 +1818,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);
@@ -2075,6 +2124,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);
@@ -2222,6 +2272,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");
@@ -2327,7 +2378,52 @@ public enum Features {
 		boolean needsMetaRecipes() {
 			return true;
 		}
-	}
+	},
+
+	WARNING_SIGN {
+		@Override
+		void addBlocks() {
+			BlockCarvableLayered sign = (BlockCarvableLayered) new BlockCarvableLayered(Material.iron, "warning/base").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 type = 0; type < 10; type++){
+			if(type == 8 || type == 9)
+				torch[type] = (BlockCarvableTorch) new BlockCarvableTorch().disableParticles();
+			else
+				torch[type] = (BlockCarvableTorch) new BlockCarvableTorch();
+
+			torch[type].setInformation("torch" + (type + 1));
+			GameRegistry.registerBlock(torch[type], "torch" + (type + 1));
+			Carving.chisel.addVariation("torch", torch[type], 0, (type + 1));
+		}
+		Carving.chisel.registerOre("torch", "torch");
+		}
+	},
 
 	;
 

src/main/java/com/cricketcraft/chisel/inventory/ContainerChisel.java

@@ -6,7 +6,6 @@ import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 
 import com.cricketcraft.chisel.carving.Carving;
 import com.cricketcraft.chisel.item.chisel.ItemChisel;

src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java

@@ -1,9 +1,6 @@
 package com.cricketcraft.chisel.item.chisel;
 
 import io.netty.buffer.ByteBuf;
-
-import java.util.Arrays;
-
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;

src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java

@@ -13,13 +13,14 @@ import com.cricketcraft.chisel.client.render.BlockAdvancedMarbleRenderer;
 import com.cricketcraft.chisel.client.render.BlockCarpetRenderer;
 import com.cricketcraft.chisel.client.render.BlockEldritchRenderer;
 import com.cricketcraft.chisel.client.render.BlockGlowRenderer;
+import com.cricketcraft.chisel.client.render.BlockLayeredRenderer;
 import com.cricketcraft.chisel.client.render.BlockMarblePaneRenderer;
 import com.cricketcraft.chisel.client.render.BlockMarblePillarRenderer;
 import com.cricketcraft.chisel.client.render.BlockMarbleStairsRenderer;
-import com.cricketcraft.chisel.client.render.RenderStandardBlockNoSunlight;
 import com.cricketcraft.chisel.client.render.BlockRoadLineRenderer;
 import com.cricketcraft.chisel.client.render.BlockSnakeStoneRenderer;
 import com.cricketcraft.chisel.client.render.BlockTexturedOreRenderer;
+import com.cricketcraft.chisel.client.render.RenderStandardBlockNoSunlight;
 import com.cricketcraft.chisel.client.render.item.ItemChiselRenderer;
 import com.cricketcraft.chisel.client.render.item.ItemPresentRenderer;
 import com.cricketcraft.chisel.client.render.tile.RenderAutoChisel;
@@ -53,6 +54,7 @@ public class ClientProxy extends CommonProxy {
 		RenderingRegistry.registerBlockHandler(new BlockAdvancedMarbleRenderer());
 		RenderingRegistry.registerBlockHandler(new BlockCarpetRenderer());
 		RenderingRegistry.registerBlockHandler(new BlockGlowRenderer());
+		RenderingRegistry.registerBlockHandler(new BlockLayeredRenderer());
 
 		RenderingRegistry.registerBlockHandler(new BlockTexturedOreRenderer());
 

src/main/java/com/cricketcraft/chisel/utils/GeneralClient.java

@@ -3,14 +3,14 @@ package com.cricketcraft.chisel.utils;
 import java.util.HashMap;
 import java.util.Random;
 
-import org.lwjgl.opengl.GL11;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 
+import org.lwjgl.opengl.GL11;
+
 public class GeneralClient {
 
 	public static Random rand = new Random();

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
@@ -100,6 +117,23 @@ tile.arcane.6.desc=Temporal Conduit
 tile.arcane.7.desc=Braaainz
 tile.arcane.8.desc=Spatial Conduit
 
+#Thaumium
+tile.thaumium.name=Thaumium Block
+tile.thaumium.0.desc=Beveled Thaumium Block
+tile.thaumium.1.desc=Small Thaumium Blocks
+tile.thaumium.2.desc=Engraved Symbols
+tile.thaumium.3.desc=Red Symbols
+
+#Blood Rune
+tile.bloodrune.name=Blood Rune
+tile.bloodrune.0.desc=Arranged Blood Rune
+tile.bloodrune.1.desc=Blood Rune Bricks
+tile.bloodrune.2.desc=Carved Blood Rune
+tile.bloodrune.3.desc=Radial Carved Blood Rune
+tile.bloodrune.4.desc=Classic Panel Blood Rune
+tile.bloodrune.5.desc=Blood Rune Tiles
+
+
 #Futura
 tile.futura.name=Futura Block
 tile.futura.0.desc=Glowing Screen with Metallic Borders