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

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

@@ -6,7 +6,7 @@ import com.cricketcraft.chisel.Chisel;
 import com.cricketcraft.chisel.api.ICarvable;
 import com.cricketcraft.chisel.carving.CarvableHelper;
 
-public class BlockCarvableAntiBlock extends BlockCarvable implements ICarvable {
+public class BlockCarvableAntiBlock extends BlockCarvableColor implements ICarvable {
 
 	public CarvableHelper carverHelper;
 

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

@@ -0,0 +1,26 @@
+package com.cricketcraft.chisel.block;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+
+public class BlockCarvableColor extends BlockCarvable {
+
+    public BlockCarvableColor() {
+        this(Material.rock);
+    }
+
+    public BlockCarvableColor(Material m) {
+        super(m);
+    }
+
+    @Override
+    public boolean recolourBlock(World world, int x, int y, int z, ForgeDirection side, int color) {
+        int newColor = 15 - color;
+        if (world.getBlockMetadata(x, y, z) != newColor) {
+            world.setBlockMetadataWithNotify(x, y, z, newColor, 3);
+            return true;
+        }
+        return false;
+    }
+}

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

@@ -9,7 +9,7 @@ import com.cricketcraft.chisel.Chisel;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class BlockCarvableGlow extends BlockCarvable {
+public class BlockCarvableGlow extends BlockCarvableColor {
 
 	@SideOnly(Side.CLIENT)
 	private IIcon glowTexture;