From 155bc00f0e5d0e3d6fd83fc0a60dfd850c38eece Mon Sep 17 00:00:00 2001
From: tterrag1098 <tterrag1098@gmail.com>
Date: Thu, 15 Jan 2015 00:03:43 -0500
Subject: [PATCH 1/3] Begin refactor, make CarvingVariation and CarvingGroup
 interfaces

---
 .../com/cricketcraft/chisel/Features.java     |  3 -
 .../chisel/api/carving/CarvingUtils.java      | 17 ++++++
 .../chisel/api/carving/ICarvingGroup.java     | 58 +++++++++++++++++++
 .../chisel/api/carving/ICarvingVariation.java | 34 +++++++++++
 .../chisel/carving/CarvableHelper.java        |  1 -
 .../cricketcraft/chisel/carving/Carving.java  | 52 ++++++-----------
 .../chisel/carving/CarvingGroup.java          | 48 +++++++++++----
 .../chisel/carving/CarvingVariation.java      | 43 ++++++++++----
 .../compat/nei/RecipeHandlerChisel.java       |  3 +-
 .../chisel/item/chisel/ChiselController.java  | 11 ++--
 .../chisel/item/chisel/ItemChisel.java        |  7 +--
 .../network/message/MessageChiselSound.java   |  4 +-
 12 files changed, 206 insertions(+), 75 deletions(-)
 create mode 100644 src/main/java/com/cricketcraft/chisel/api/carving/CarvingUtils.java
 create mode 100644 src/main/java/com/cricketcraft/chisel/api/carving/ICarvingGroup.java
 create mode 100644 src/main/java/com/cricketcraft/chisel/api/carving/ICarvingVariation.java

diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java
index 74920ccd..98d68dd0 100644
--- a/src/main/java/com/cricketcraft/chisel/Features.java
+++ b/src/main/java/com/cricketcraft/chisel/Features.java
@@ -1045,7 +1045,6 @@ public enum Features {
 			ice_pillar.carverHelper.addVariation("tile.icePillar.5.desc", 5, "icepillar/carved");
 			ice_pillar.carverHelper.addVariation("tile.icePillar.6.desc", 6, "icepillar/ornamental");
 			ice_pillar.carverHelper.register(ice_pillar, "ice_pillar");
-			Carving.chisel.setGroupClass("ice_pillar", "ice");
 		}
 
 		@Override
@@ -1465,7 +1464,6 @@ public enum Features {
 				marble_pillar.carverHelper.addVariation("tile.marblePillar.15.desc", 15, "marblepillar/ornamental");
 			}
 			marble_pillar.carverHelper.register(marble_pillar, "marble_pillar");
-			Carving.chisel.setGroupClass("marble_pillar", "marble");
 
 			BlockCarvableSlab marble_pillar_slab = (BlockCarvableSlab) new BlockCarvableSlab(marble_pillar).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F)
 					.setStepSound(Block.soundTypeStone);
@@ -1639,7 +1637,6 @@ public enum Features {
 			packedice_pillar.carverHelper.addVariation("tile.packedicePillar.5.desc", 5, "icepillar/carved");
 			packedice_pillar.carverHelper.addVariation("tile.packedicePillar.6.desc", 6, "icepillar/ornamental");
 			packedice_pillar.carverHelper.register(packedice_pillar, "packedice_pillar");
-			Carving.chisel.setGroupClass("packedice_pillar", "packedice");
 		}
 	},
 
diff --git a/src/main/java/com/cricketcraft/chisel/api/carving/CarvingUtils.java b/src/main/java/com/cricketcraft/chisel/api/carving/CarvingUtils.java
new file mode 100644
index 00000000..f9950593
--- /dev/null
+++ b/src/main/java/com/cricketcraft/chisel/api/carving/CarvingUtils.java
@@ -0,0 +1,17 @@
+package com.cricketcraft.chisel.api.carving;
+
+public class CarvingUtils {
+
+	/**
+	 * The default implementation of {@link ICarvingVariation#compareTo(ICarvingVariation)}
+	 * 
+	 * @param v1
+	 *            The first {@link ICarvingVariation variation}. Usually 'this'.
+	 * @param v2
+	 *            The second {@link ICarvingVariation variation}. Usually the parameter to the {@code comapreTo} method.
+	 * @return A positive integer if the first's order is greater, a negative integer if the second's is greater, and 0 if they are equal.
+	 */
+	public static int compare(ICarvingVariation v1, ICarvingVariation v2) {
+		return v1.getOrder() - v2.getOrder();
+	}
+}
diff --git a/src/main/java/com/cricketcraft/chisel/api/carving/ICarvingGroup.java b/src/main/java/com/cricketcraft/chisel/api/carving/ICarvingGroup.java
new file mode 100644
index 00000000..287929c8
--- /dev/null
+++ b/src/main/java/com/cricketcraft/chisel/api/carving/ICarvingGroup.java
@@ -0,0 +1,58 @@
+package com.cricketcraft.chisel.api.carving;
+
+import java.util.List;
+
+public interface ICarvingGroup {
+
+	/**
+	 * The name of this group. Used for internal identification.
+	 * 
+	 * @return A string name for the group
+	 */
+	String getName();
+
+	/**
+	 * Can return null. If null, fallback sound will be used (the standard chisel sound).
+	 * 
+	 * @return The string resource path of the sound to use for chiseling items in this group
+	 */
+	String getSound();
+
+	/**
+	 * Sets the sound of this group
+	 * 
+	 * @param sound
+	 *            A string resource path for the sound this group makes when chiseled
+	 */
+	void setSound(String sound);
+
+	/**
+	 * The oredict name to match to this group. All items with this oredict name will be assumed to be part of this group.
+	 * 
+	 * @return An ore dictionary name
+	 */
+	String getOreName();
+
+	/**
+	 * Sets the oredict name for this group.
+	 * 
+	 * @param oreName
+	 *            The String oredict name to be associated with this group.
+	 */
+	void setOreName(String oreName);
+
+	/**
+	 * Gets all carving variations associated with this group.
+	 * 
+	 * @return A {@link List} of {@link ICarvingVariation}s
+	 */
+	List<ICarvingVariation> getVariations();
+
+	/**
+	 * Adds a variation to this group.
+	 * 
+	 * @param variation
+	 *            An {@link ICarvingVariation} to add to this group
+	 */
+	void addVariation(ICarvingVariation variation);
+}
diff --git a/src/main/java/com/cricketcraft/chisel/api/carving/ICarvingVariation.java b/src/main/java/com/cricketcraft/chisel/api/carving/ICarvingVariation.java
new file mode 100644
index 00000000..6b09c259
--- /dev/null
+++ b/src/main/java/com/cricketcraft/chisel/api/carving/ICarvingVariation.java
@@ -0,0 +1,34 @@
+package com.cricketcraft.chisel.api.carving;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+
+/**
+ * Represents a variation of a chiselable block.
+ * <p>
+ * Do note that while this interface extends {@link Comparable}, a default implementation of {@link Comparable#compareTo(Object)} is provided in
+ * {@link CarvingUtils#compare(ICarvingVariation, ICarvingVariation)}
+ */
+public interface ICarvingVariation extends Comparable<ICarvingVariation> {
+
+	Block getBlock();
+
+	int getBlockMeta();
+
+	int getItemMeta();
+
+	/**
+	 * Gets an {@link ItemStack} representing this variation.
+	 * 
+	 * @return An {@link ItemStack} to represent this variation
+	 */
+	ItemStack getStack();
+
+	/**
+	 * The "order" of this variation. Represents its position in the list of variations.
+	 * 
+	 * @return An integer to represent the position of this variation in the list of all variations in the group
+	 */
+	int getOrder();
+
+}
diff --git a/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java b/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java
index b495773b..cc79178a 100644
--- a/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java
+++ b/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java
@@ -284,7 +284,6 @@ public class CarvableHelper {
 
 				if (!forbidChiseling) {
 					Carving.chisel.addVariation(name + ".top", slab.top, variation.metadata, 0);
-					Carving.chisel.setGroupClass(name + ".top", name);
 				}
 			}
 		}
diff --git a/src/main/java/com/cricketcraft/chisel/carving/Carving.java b/src/main/java/com/cricketcraft/chisel/carving/Carving.java
index 05366412..a62e0e6a 100644
--- a/src/main/java/com/cricketcraft/chisel/carving/Carving.java
+++ b/src/main/java/com/cricketcraft/chisel/carving/Carving.java
@@ -11,6 +11,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
 import com.cricketcraft.chisel.Chisel;
+import com.cricketcraft.chisel.api.carving.ICarvingVariation;
 
 public class Carving {
 
@@ -29,26 +30,12 @@ public class Carving {
 		return Block.blockRegistry.getNameForObject(block) + "|" + metadata;
 	}
 
-	public boolean isVariationOfSameClass(Block target, int metadata1, Block block2, int metadata2) {
-		CarvingGroup group1 = carvingGroupsByVariation.get(key(target, metadata1));
-		if (group1 == null)
-			return false;
-
-		CarvingGroup group2 = carvingGroupsByVariation.get(key(block2, metadata2));
-		if (group2 == null)
-			return false;
-
-		return group1 == group2 || group1.className.equals(group2.className) && !group1.className.isEmpty();
-
-	}
-
-	public CarvingVariation[] getVariations(Block block, int metadata) {
+	public List<ICarvingVariation> getVariations(Block block, int metadata) {
 		CarvingGroup group = getGroup(block, metadata);
 		if (group == null)
 			return null;
 
-		CarvingVariation[] res = group.variations.toArray(new CarvingVariation[group.variations.size()]);
-		return res;
+		return group.getVariations();
 	}
 
 	public String getOre(Block block, int metadata) {
@@ -56,7 +43,7 @@ public class Carving {
 		if (group == null)
 			return null;
 
-		return group.oreName;
+		return group.getOreName();
 	}
 
 	public ArrayList<ItemStack> getItems(ItemStack chiseledItem) {
@@ -70,20 +57,23 @@ public class Carving {
 
 		HashMap<String, Integer> mapping = new HashMap<String, Integer>();
 
-		if (group.variations != null) {
-			for (CarvingVariation v : group.variations) {
+		List<ICarvingVariation> variations = group.getVariations();
 
-				String key = Block.getIdFromBlock(v.block) + "|" + v.damage;
+		if (!group.getVariations().isEmpty()) {
+			for (ICarvingVariation v : variations) {
+
+				String key = Block.getIdFromBlock(v.getBlock()) + "|" + v.getItemMeta();
 				if (mapping.containsKey(key))
 					continue;
 				mapping.put(key, 1);
 
-				items.add(new ItemStack(v.block, 1, v.damage));
+				items.add(new ItemStack(v.getBlock(), 1, v.getItemMeta()));
 			}
 		}
 
 		ArrayList<ItemStack> ores;
-		if (group.oreName != null && ((ores = OreDictionary.getOres(group.oreName)) != null)) {
+		String oreName = group.getOreName();
+		if (oreName != null && ((ores = OreDictionary.getOres(oreName)) != null)) {
 			for (ItemStack stack : ores) {
 
 				String key = Item.getIdFromItem(stack.getItem()) + "|" + stack.getItemDamage();
@@ -124,7 +114,6 @@ public class Carving {
 		CarvingGroup group = carvingGroupsByName.get(name);
 		if (group == null) {
 			group = new CarvingGroup(name);
-			group.className = name;
 			carvingGroupsByName.put(name, group);
 		}
 
@@ -139,8 +128,7 @@ public class Carving {
 			return null;
 
 		CarvingVariation variation = new CarvingVariation(block, metadata, order);
-		group.variations.add(variation);
-		Collections.sort(group.variations);
+		group.addVariation(variation);
 		carvingGroupsByVariation.put(key(block, metadata), group);
 
 		return variation;
@@ -151,18 +139,12 @@ public class Carving {
 
 		carvingGroupsByOre.put(oreName, group);
 
-		group.oreName = oreName;
-	}
-
-	public void setGroupClass(String name, String className) {
-		CarvingGroup group = getGroup(name);
-
-		group.className = className;
+		group.setOreName(oreName);
 	}
 
 	public void setVariationSound(String name, String sound) {
 		CarvingGroup group = getGroup(name);
-		group.sound = sound;
+		group.setSound(sound);
 	}
 
 	public String getVariationSound(Block block, int metadata) {
@@ -171,10 +153,10 @@ public class Carving {
 
 	public String getVariationSound(Item item, int metadata) {
 		CarvingGroup blockGroup = carvingGroupsByVariation.get(key(item, metadata));
-		if (blockGroup == null || blockGroup.sound == null)
+		if (blockGroup == null || blockGroup.getSound() == null)
 			return Chisel.MOD_ID + ":chisel.fallback";
 
-		return blockGroup.sound;
+		return blockGroup.getSound();
 	}
 
 	public List<String> getSortedGroupNames() {
diff --git a/src/main/java/com/cricketcraft/chisel/carving/CarvingGroup.java b/src/main/java/com/cricketcraft/chisel/carving/CarvingGroup.java
index 09c40808..5f4ecf3f 100644
--- a/src/main/java/com/cricketcraft/chisel/carving/CarvingGroup.java
+++ b/src/main/java/com/cricketcraft/chisel/carving/CarvingGroup.java
@@ -1,33 +1,57 @@
 package com.cricketcraft.chisel.carving;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
+import com.cricketcraft.chisel.api.carving.ICarvingGroup;
+import com.cricketcraft.chisel.api.carving.ICarvingVariation;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
 
-public class CarvingGroup {
+public class CarvingGroup implements ICarvingGroup {
 
-	public CarvingGroup(String n) {
-		name = n;
+	private String name;
+	private String sound;
+	private String oreName;
+
+	private List<ICarvingVariation> variations = Lists.newArrayList();
+
+	public CarvingGroup(String name) {
+		this.name = name;
 	}
 
-	String name;
-	String className;
-	String sound;
-	String oreName;
-
-	List<CarvingVariation> variations = new ArrayList<CarvingVariation>();
-
-	public List<CarvingVariation> getVariations() {
+	public List<ICarvingVariation> getVariations() {
 		return ImmutableList.copyOf(variations);
 	}
 
+	@Override
+	public void addVariation(ICarvingVariation variation) {
+		variations.add(variation);
+		Collections.sort(variations);
+	}
+
+	@Override
 	public String getName() {
 		return name;
 	}
 
+	@Override
+	public String getSound() {
+		return sound;
+	}
+
+	@Override
+	public void setSound(String sound) {
+		this.sound = sound;
+	}
+
+	@Override
 	public String getOreName() {
 		return oreName;
 	}
 
+	@Override
+	public void setOreName(String oreName) {
+		this.oreName = oreName;
+	}
 }
diff --git a/src/main/java/com/cricketcraft/chisel/carving/CarvingVariation.java b/src/main/java/com/cricketcraft/chisel/carving/CarvingVariation.java
index 99da0f9e..42cc6d59 100644
--- a/src/main/java/com/cricketcraft/chisel/carving/CarvingVariation.java
+++ b/src/main/java/com/cricketcraft/chisel/carving/CarvingVariation.java
@@ -3,7 +3,15 @@ package com.cricketcraft.chisel.carving;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 
-public class CarvingVariation implements Comparable<CarvingVariation> {
+import com.cricketcraft.chisel.api.carving.CarvingUtils;
+import com.cricketcraft.chisel.api.carving.ICarvingVariation;
+
+public class CarvingVariation implements ICarvingVariation {
+
+	private int order;
+	private Block block;
+	private int meta;
+	private int damage;
 
 	public CarvingVariation(Block block, int metadata, int ord) {
 		this.order = ord;
@@ -13,17 +21,32 @@ public class CarvingVariation implements Comparable<CarvingVariation> {
 	}
 
 	@Override
-	public int compareTo(CarvingVariation a) {
-		return order - a.order;
-	}
-
-	public int order;
-	public Block block;
-	public int meta;
-	public int damage;
-
 	public ItemStack getStack() {
 		return new ItemStack(block, 1, damage);
 	}
 
+	@Override
+	public Block getBlock() {
+		return block;
+	}
+
+	@Override
+	public int getBlockMeta() {
+		return meta;
+	}
+
+	@Override
+	public int getItemMeta() {
+		return damage;
+	}
+
+	@Override
+	public int getOrder() {
+		return order;
+	}
+
+	@Override
+	public int compareTo(ICarvingVariation o) {
+		return CarvingUtils.compare(this, o);
+	}
 }
diff --git a/src/main/java/com/cricketcraft/chisel/compat/nei/RecipeHandlerChisel.java b/src/main/java/com/cricketcraft/chisel/compat/nei/RecipeHandlerChisel.java
index 572bf491..a3c686fc 100644
--- a/src/main/java/com/cricketcraft/chisel/compat/nei/RecipeHandlerChisel.java
+++ b/src/main/java/com/cricketcraft/chisel/compat/nei/RecipeHandlerChisel.java
@@ -15,6 +15,7 @@ import codechicken.nei.NEIServerUtils;
 import codechicken.nei.PositionedStack;
 import codechicken.nei.recipe.TemplateRecipeHandler;
 
+import com.cricketcraft.chisel.api.carving.ICarvingVariation;
 import com.cricketcraft.chisel.carving.Carving;
 import com.cricketcraft.chisel.carving.CarvingGroup;
 import com.cricketcraft.chisel.carving.CarvingVariation;
@@ -164,7 +165,7 @@ public class RecipeHandlerChisel extends TemplateRecipeHandler {
 
 	private static List<ItemStack> getVariationStacks(CarvingGroup g) {
 		List<ItemStack> stacks = new ArrayList<ItemStack>();
-		for (CarvingVariation v : g.getVariations()) {
+		for (ICarvingVariation v : g.getVariations()) {
 			stacks.add(v.getStack());
 		}
 		String oreName = g.getOreName();
diff --git a/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java b/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java
index e903fd56..b2b6fb18 100644
--- a/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java
+++ b/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java
@@ -49,28 +49,28 @@ public final class ChiselController {
 			z = event.z;
 			Block block = event.world.getBlock(x, y, z);
 			int metadata = event.world.getBlockMetadata(x, y, z);
-			CarvingVariation[] variations = Carving.chisel.getVariations(block, metadata);
+			CarvingVariation[] variations = Carving.chisel.getVariations(block, metadata).toArray(new CarvingVariation[] {});
 
 			if (variations != null && chisel.canChiselBlock(event.world, x, y, z, block, metadata)) {
 				ItemStack target = General.getChiselTarget(held);
 
 				if (target != null) {
 					for (CarvingVariation v : variations) {
-						if (v.block == Block.getBlockFromItem(target.getItem()) && v.meta == target.getItemDamage()) {
+						if (v.getBlock() == Block.getBlockFromItem(target.getItem()) && v.getBlockMeta() == target.getItemDamage()) {
 							setVariation(event.entityPlayer, event.world, x, y, z, v, target);
 						}
 					}
 				} else {
 					for (int i = 0; i < variations.length; i++) {
 						CarvingVariation v = variations[i];
-						if (v.block == block && v.meta == metadata) {
+						if (v.getBlock() == block && v.getBlockMeta() == metadata) {
 							variations = ArrayUtils.remove(variations, i--);
 						}
 					}
 
 					int index = event.world.rand.nextInt(variations.length);
 					CarvingVariation newVar = variations[index];
-					setVariation(event.entityPlayer, event.world, x, y, z, newVar, new ItemStack(newVar.block, 1, newVar.damage));
+					setVariation(event.entityPlayer, event.world, x, y, z, newVar, new ItemStack(newVar.getBlock(), 1, newVar.getItemMeta()));
 					event.entityPlayer.inventory.currentItem = slot;
 				}
 			}
@@ -89,8 +89,7 @@ public final class ChiselController {
 	 */
 	private void setVariation(EntityPlayer player, World world, int x, int y, int z, CarvingVariation v, ItemStack target) {
 		PacketHandler.INSTANCE.sendTo(new MessageChiselSound(x, y, z, v), (EntityPlayerMP) player);
-		world.setBlock(x, y, z, v.block);
-		world.setBlockMetadataWithNotify(x, y, z, v.meta, 3);
+		world.setBlock(x, y, z, v.getBlock(), v.getBlockMeta(), 3);
 		((IChiselItem) player.getCurrentEquippedItem().getItem()).onChisel(world, player.inventory, player.inventory.currentItem, player.getCurrentEquippedItem(), target);
 	}
 }
diff --git a/src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java b/src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java
index 16470d97..2eed31dc 100644
--- a/src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java
+++ b/src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java
@@ -17,7 +17,6 @@ import com.cricketcraft.chisel.api.ChiselMode;
 import com.cricketcraft.chisel.api.IChiselItem;
 import com.cricketcraft.chisel.carving.Carving;
 import com.cricketcraft.chisel.config.Configurations;
-import com.cricketcraft.chisel.init.ChiselBlocks;
 import com.cricketcraft.chisel.utils.GeneralClient;
 
 public class ItemChisel extends Item implements IChiselItem {
@@ -104,10 +103,8 @@ public class ItemChisel extends Item implements IChiselItem {
 			String sound = carving.getVariationSound(target.getItem(), target.getItemDamage());
 			EntityPlayer player = Chisel.proxy.getClientPlayer();
 			GeneralClient.playChiselSound(world, MathHelper.floor_double(player.posX), MathHelper.floor_double(player.posY), MathHelper.floor_double(player.posZ), sound);
-		} else {
-			if (chisel.getItemDamage() >= chisel.getMaxDamage()) {
-				inv.decrStackSize(slot, 1);
-			}
+		} else if (chisel.getItemDamage() >= chisel.getMaxDamage()) {
+			inv.decrStackSize(slot, 1);
 		}
 	}
 
diff --git a/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselSound.java b/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselSound.java
index 5df9a879..8f7dee3c 100644
--- a/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselSound.java
+++ b/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselSound.java
@@ -23,8 +23,8 @@ public class MessageChiselSound extends MessageCoords {
 
 	public MessageChiselSound(int x, int y, int z, CarvingVariation v) {
 		super(x, y, z);
-		this.block = Block.getIdFromBlock(v.block);
-		this.meta = (byte) v.meta;
+		this.block = Block.getIdFromBlock(v.getBlock());
+		this.meta = (byte) v.getBlockMeta();
 	}
 
 	@Override

From f7ff55c62a257097be46a8f4fce9b3b2ca713127 Mon Sep 17 00:00:00 2001
From: Drullkus <ericsplanet@mac.com>
Date: Wed, 14 Jan 2015 21:22:59 -0800
Subject: [PATCH 2/3] Add another two thaumium block variants

---
 .../java/com/cricketcraft/chisel/Features.java   |   4 ++--
 src/main/resources/assets/chisel/lang/en_US.lang |   4 ++--
 .../chisel/textures/blocks/thaumium/small.png    | Bin 0 -> 3337 bytes
 .../blocks/thaumium/thaumiumBigBricks-ctm.png    | Bin 0 -> 3581 bytes
 .../blocks/thaumium/thaumiumBigBricks.png        | Bin 0 -> 3325 bytes
 5 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 src/main/resources/assets/chisel/textures/blocks/thaumium/small.png
 create mode 100644 src/main/resources/assets/chisel/textures/blocks/thaumium/thaumiumBigBricks-ctm.png
 create mode 100644 src/main/resources/assets/chisel/textures/blocks/thaumium/thaumiumBigBricks.png

diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java
index 74920ccd..68d42acf 100644
--- a/src/main/java/com/cricketcraft/chisel/Features.java
+++ b/src/main/java/com/cricketcraft/chisel/Features.java
@@ -2228,8 +2228,8 @@ public enum Features {
 			Carving.chisel.addVariation("thaumium", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 4, 0);
 			thaumium.carverHelper.addVariation("tile.thaumium.0.desc", 0, "thaumium/ornate");
 			thaumium.carverHelper.addVariation("tile.thaumium.1.desc", 1, "thaumium/totem");
-			thaumium.carverHelper.addVariation("tile.thaumium.2.desc", 2, "thaumium/purplerunes");
-			thaumium.carverHelper.addVariation("tile.thaumium.3.desc", 3, "thaumium/runes");
+			thaumium.carverHelper.addVariation("tile.thaumium.2.desc", 2, "thaumium/thaumiumBigBricks");
+			thaumium.carverHelper.addVariation("tile.thaumium.3.desc", 3, "thaumium/small");
 			thaumium.carverHelper.register(thaumium, "thaumium");
 			Carving.chisel.registerOre("thaumium", "thaumium");
 		}
diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang
index a35b87a3..1eaf045e 100644
--- a/src/main/resources/assets/chisel/lang/en_US.lang
+++ b/src/main/resources/assets/chisel/lang/en_US.lang
@@ -140,8 +140,8 @@ tile.arcane.8.desc=Spatial Conduit
 tile.thaumium.name=Thaumium Block
 tile.thaumium.0.desc=Ornate Pattern
 tile.thaumium.1.desc=Totem Faces
-tile.thaumium.2.desc=Engraved Symbols
-tile.thaumium.3.desc=Red Symbols
+tile.thaumium.2.desc=Bricks
+tile.thaumium.3.desc=Small Tiles
 
 #Tallow
 tile.tallow.name=Block of Tallow
diff --git a/src/main/resources/assets/chisel/textures/blocks/thaumium/small.png b/src/main/resources/assets/chisel/textures/blocks/thaumium/small.png
new file mode 100644
index 0000000000000000000000000000000000000000..31dc54e674b7022c5c53040b877f8606fad84294
GIT binary patch
literal 3337
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
Tpc=WA00000NkvXXu0mjfge4}o

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/chisel/textures/blocks/thaumium/thaumiumBigBricks-ctm.png b/src/main/resources/assets/chisel/textures/blocks/thaumium/thaumiumBigBricks-ctm.png
new file mode 100644
index 0000000000000000000000000000000000000000..54b22e134086338d708dd8ab31f9ca375b0cd9b3
GIT binary patch
literal 3581
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
DEGM_U

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/chisel/textures/blocks/thaumium/thaumiumBigBricks.png b/src/main/resources/assets/chisel/textures/blocks/thaumium/thaumiumBigBricks.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b4cf1cb4b10b273a0288d5087248f61a9046f4a
GIT binary patch
literal 3325
zcmV<Z3<C3sP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkYPiaF#P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)XH-+^7Crag
z^g>IBfRsybQWXdwQbLP>6p<z>Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh<iVD~V
z<RPMtgQJLw%KPDaqifc@_vX$1wbwr9tn;0-&j-K=43<bUQ8j=JsX`tR;Dg7+#^K~H
zK!FM*Z~zbpvt%K2{UZSY_<lS*D<Z%Lz5oGu(+dayz)hRLFdT>f59&ghTmgWD0l;*T
zI7<kC6aYYajzXpYKt=(8otP$50H6c_V9R4-;{Z@C0AMG7=F<Rxo%or10RUT+Ar%3j
zkpLhQWr#!oXgdI`&sK^>09Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p
z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-<?i
z0%4j!F2Z@488U%158(66005wo6%pWr^Zj_v4zAA5HjcIqUoGmt2LB>rV&neh&#Q1i
z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_<lS*MWK+n+1cgf
z<k(8YLR(?VSAG6x!e78w{cQPuJpA|d;J)G{fihizM+Erb!p!tcr5w+a34~(Y=8s4G
zw+sLL9n&JjNn*KJDiq^U5^;`1nvC-@r6P$!k}1U{(*I=Q-z@tBKHoI}uxdU5dyy@u
zU1J0GOD7Ombim^G008p4Z^6_k2m^p<gW=D2|L;HjN1!DDfM!XOaR2~bL?kX$%CkSm
z2mk;?pn)o|K^yeJ7%adB9Ki+L!3+FgHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_v
zKpix|QD}yfa1JiQRk#j4a1Z)n2%f<xynzV>LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW
zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifq<Ex{*7`05XF7hP+2Hl!3BQJ=6@fL%FCo
z8iYoo3(#bAF`ADSpqtQgv>H8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X
zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ<AYmRsNLWl*PS{AOARHt#5!wki2?K;t
z!Y3k=s7tgax)J%r7-BLphge7~Bi0g+6E6^Zh(p9TBoc{3GAFr^0!gu?RMHaCM$&Fl
zBk3%un>0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4
z<uv66WtcKSRim0x-Ke2d5jBrmLam{;Qm;{ms1r1GnmNsb7D-E`t)i9F8fX`2_i3-_
zbh;7Ul^#x)&{xvS=|||7=mYe33=M`AgU5(xC>fg=2N-7=cNnjjOr{yriy6mMFgG#l
znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U
zt5vF<Q0r40Q)j6=sE4X&sBct1q<&fbi3VB2Ov6t@q*0);U*o*SAPZv|vv@2aYYnT0
zb%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KOarm5cP6_8Ir<e17iry6O
zDdH&`rZh~sF=bq9s+O0QSgS~@QL9Jmy*94xr=6y~MY~!1fet~(N+(<=M`w@D1)b+p
z*;C!83a1uLJv#NSE~;y#8=<>IcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya?
z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y
zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB
zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt
z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a<fJbF^|4I#xQ~n$Dc=
zKYhjYmgz5NSkDm8*fZm{6U!;YX`NG>(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C
z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB
zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe
zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0
z?2xS?_ve_-k<Mujg;0Lz*3buG=3$G&ehepthlN*$KaOySSQ^nWmo<0M+(UEUMEXRQ
zMBbZcF;6+KElM>iKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$
z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4
z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu
zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu
z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E
ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw
zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX
z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&
z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01
z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R
z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw
zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD
zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3|
zawq-H%e&ckC+@AhPrP6BK<z=<L*0kfKU@CX*zeqbYQT4(^U>T#_XdT7&;F71j}Joy
zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z
zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot<a{81DF0~rvGr5Xr~8u`lav1h
z1DNytV>2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F}
z0006gNkl<Zc-l0RNv<1L3`Gx{S5is;BL=(&&$5E-e=k9TAU15N>NO-YkTNDfp4(7<
z|Mo|@HrjR})}*S)D#kn!1U09s*xV6O%#2tIH76@@5cd6p&;2)goG6N_(MP8$F*8h+
z0=9Mm;5eVGH97h(To7CxHRaasT(+IeptS}fm?&Ar=8Y^^YvS4%(aB6)Rmn=!6u}Sy
zC~o@)rV65{2)%ctl88W6x!*qddHg^t3ySvuRF$?}*tU(<+6%u5H6>!<&8dPh2P%q-
z$oslrYPdP7hNz(etvSbWaGocb!5D+g1SyKd=jyCj9Q|Od&Mg<Nj+h~Ud*ku^#h4v3
zsY?1h=;O&8C*Ei0-|v61Z5QshPx^QwD02<AcI7x9xHZP;Krz;dU>yBHR-pQp(Aq{H
z9gsJo(C3q}PG(H5`wjDk*@l?n-d=>;cIC_GSKJ%>^-e@kS%|<t-~Ytb`SSUd%eFJ;
z$<Ys7onsvQ`1$wC#Ql1wwJRouYmr%;{ek<&9G%QS0Mo|D-iQol4ED<nzg})+B#TMv
z%On*gDb9XyX;%bcWxQ)12*Q5(;2e)vk>;Eff<(N!UV)_GVni%NAS0lP|BIIdZVfjz
zR!*#5Xjui7%;*F~ti_5%Yat@9DBm7MPJFJxzI||>Pt2S#Uz#H(y&sqvXMf`M`VA3K
z5%Rs<pT~n(!CVU{0J4%fJCO@bp&qYTuiK7!Bi4i}3ixjTr*Lb%p;lzv00000NkvXX
Hu0mjf=@2-u

literal 0
HcmV?d00001


From 447e472c0431326cd5a82beb904b83be84598169 Mon Sep 17 00:00:00 2001
From: tterrag1098 <tterrag1098@gmail.com>
Date: Thu, 15 Jan 2015 03:16:02 -0500
Subject: [PATCH 3/3] Rewrite how Carving stores variants and groups

---
 .../com/cricketcraft/chisel/Features.java     |  61 +++--
 ...irsMaker.java => CarvableStairsMaker.java} |  16 +-
 ...sMakerCreator.java => IStairsCreator.java} |   2 +-
 .../chisel/carving/CarvableHelper.java        |   9 +-
 .../cricketcraft/chisel/carving/Carving.java  | 100 ++++----
 .../chisel/carving/GroupList.java             | 217 ++++++++++++++++++
 .../chisel/compat/Compatibility.java          |   6 +-
 .../compat/nei/RecipeHandlerChisel.java       |  11 +-
 .../chisel/item/chisel/ChiselController.java  |  21 +-
 .../network/message/MessageChiselSound.java   |   3 +-
 10 files changed, 327 insertions(+), 119 deletions(-)
 rename src/main/java/com/cricketcraft/chisel/block/{BlockMarbleStairsMaker.java => CarvableStairsMaker.java} (64%)
 rename src/main/java/com/cricketcraft/chisel/block/{BlockMarbleStairsMakerCreator.java => IStairsCreator.java} (81%)
 create mode 100644 src/main/java/com/cricketcraft/chisel/carving/GroupList.java

diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java
index 98d68dd0..daf5d3ef 100644
--- a/src/main/java/com/cricketcraft/chisel/Features.java
+++ b/src/main/java/com/cricketcraft/chisel/Features.java
@@ -43,8 +43,8 @@ import com.cricketcraft.chisel.block.BlockLavastone;
 import com.cricketcraft.chisel.block.BlockLeaf;
 import com.cricketcraft.chisel.block.BlockMarbleBookshelf;
 import com.cricketcraft.chisel.block.BlockMarbleCarpet;
-import com.cricketcraft.chisel.block.BlockMarbleStairsMaker;
-import com.cricketcraft.chisel.block.BlockMarbleStairsMakerCreator;
+import com.cricketcraft.chisel.block.CarvableStairsMaker;
+import com.cricketcraft.chisel.block.IStairsCreator;
 import com.cricketcraft.chisel.block.BlockMarbleTexturedOre;
 import com.cricketcraft.chisel.block.BlockPresent;
 import com.cricketcraft.chisel.block.BlockRoadLine;
@@ -134,14 +134,11 @@ public enum Features {
 			antiBlock.carverHelper.setChiselBlockName("Anti Block");
 
 			for (int i = 0; i < 16; i++) {
-				final String blockName = "antiBlock" + ItemDye.field_150921_b[i];
-				String oreName = "antiBlock" + ItemDye.field_150921_b[i];
-
 				antiBlock.carverHelper.addVariation("tile.antiBlock." + ItemDye.field_150921_b[i] + ".desc", i, "antiblock/" + ItemDye.field_150921_b[i] + "-antiBlock");
-				Carving.chisel.registerOre(blockName, oreName);
 			}
 
 			antiBlock.carverHelper.register(antiBlock, "antiBlock");
+			Carving.chisel.registerOre("antiBlock", "antiBlock");
 		}
 
 		@Override
@@ -317,8 +314,7 @@ public enum Features {
 			carpet_block.carverHelper.addVariation("tile.carpet_block.15.desc", 15, "carpet/black");
 			carpet_block.carverHelper.forbidChiseling = true;
 			carpet_block.carverHelper.register(carpet_block, "carpet_block");
-			OreDictionary.registerOre("carpet", carpet_block);
-			Carving.chisel.registerOre("carpet_block", "carpet");
+			OreDictionary.registerOre("blockCarpet", carpet_block);
 		}
 
 		@Override
@@ -361,12 +357,13 @@ public enum Features {
 			for (int i = 0; i < 16; i++) {
 				String group = "carpet." + i;
 
-				Carving.needle.addVariation(group, Blocks.carpet, i, 0);
-				Carving.needle.addVariation(group, carpet, i, 2);
-				Carving.needle.addVariation(group, carpet_block, i, 1);
+				// TODO needle stuff
+//				Carving.needle.addVariation(group, Blocks.carpet, i, 0);
+//				Carving.needle.addVariation(group, carpet, i, 2);
+//				Carving.needle.addVariation(group, carpet_block, i, 1);
 			}
 
-			Carving.chisel.registerOre("carpet", "carpet");
+			OreDictionary.registerOre("carpet", carpet);
 		}
 
 		@Override
@@ -1057,7 +1054,7 @@ public enum Features {
 
 		@Override
 		void addBlocks() {
-			BlockMarbleStairsMaker makerIceStairs = new BlockMarbleStairsMaker(Blocks.ice);
+			CarvableStairsMaker makerIceStairs = new CarvableStairsMaker(Blocks.ice);
 			makerIceStairs.carverHelper.setChiselBlockName("Ice Stairs");
 			makerIceStairs.carverHelper.addVariation("tile.iceStairs.0.desc", 0, Blocks.ice);
 			makerIceStairs.carverHelper.addVariation("tile.iceStairs.1.desc", 1, "ice/a1-ice-light");
@@ -1075,14 +1072,14 @@ public enum Features {
 			makerIceStairs.carverHelper.addVariation("tile.iceStairs.13.desc", 13, "ice/zelda");
 			makerIceStairs.carverHelper.addVariation("tile.iceStairs.14.desc", 14, "ice/bismuth");
 			makerIceStairs.carverHelper.addVariation("tile.iceStairs.15.desc", 15, "ice/poison");
-			makerIceStairs.create(new BlockMarbleStairsMakerCreator() {
+			makerIceStairs.create(new IStairsCreator() {
 
 				@Override
 				public BlockCarvableStairs create(Block block, int meta, CarvableHelper helper) {
 					return new BlockCarvableIceStairs(block, meta, helper);
 				}
 			}, "ice_stairs", ChiselBlocks.iceStairs);
-			Carving.chisel.registerOre("iceStairs", "iceStairs");
+			Carving.chisel.registerOre("ice_stairs", "iceStairs");
 		}
 	},
 
@@ -1310,7 +1307,7 @@ public enum Features {
 			registerSlabTop(limestone_slab, limestone_slab.top);
 			Carving.chisel.registerOre("limestone_slab", "limestone_slab");
 
-			BlockMarbleStairsMaker makerLimestoneStairs = new BlockMarbleStairsMaker(limestone);
+			CarvableStairsMaker makerLimestoneStairs = new CarvableStairsMaker(limestone);
 			makerLimestoneStairs.carverHelper.setChiselBlockName("Limestone Stairs");
 			makerLimestoneStairs.carverHelper.addVariation("tile.limestoneStairs.0.desc", 0, "limestone");
 			makerLimestoneStairs.carverHelper.addVariation("tile.limestoneStairs.1.desc", 1, "limestone/terrain-cobbsmalltilelight");
@@ -1388,7 +1385,7 @@ public enum Features {
 			registerSlabTop(marble_slab, marble_slab.top);
 			Carving.chisel.registerOre("marble_slab", "marble_slab");
 
-			BlockMarbleStairsMaker makerMarbleStairs = new BlockMarbleStairsMaker(marble);
+			CarvableStairsMaker makerMarbleStairs = new CarvableStairsMaker(marble);
 			makerMarbleStairs.carverHelper.setChiselBlockName("Marble Stairs");
 			makerMarbleStairs.carverHelper.addVariation("tile.marbleStairs.0.desc", 0, "marble");
 			makerMarbleStairs.carverHelper.addVariation("tile.marbleStairs.6.desc", 1, "marbleslab/a1-stoneornamental-marblebrick");
@@ -1644,7 +1641,7 @@ public enum Features {
 
 		@Override
 		void addBlocks() {
-			BlockMarbleStairsMaker makerPackedIceStairs = new BlockMarbleStairsMaker(Blocks.packed_ice);
+			CarvableStairsMaker makerPackedIceStairs = new CarvableStairsMaker(Blocks.packed_ice);
 			makerPackedIceStairs.carverHelper.setChiselBlockName("Packed Ice Stairs");
 			makerPackedIceStairs.carverHelper.addVariation("tile.packediceStairs.0.desc", 0, Blocks.packed_ice);
 			makerPackedIceStairs.carverHelper.addVariation("tile.packediceStairs.1.desc", 1, "ice/a1-ice-light");
@@ -1662,14 +1659,14 @@ public enum Features {
 			makerPackedIceStairs.carverHelper.addVariation("tile.packediceStairs.13.desc", 13, "ice/zelda");
 			makerPackedIceStairs.carverHelper.addVariation("tile.packediceStairs.14.desc", 14, "ice/bismuth");
 			makerPackedIceStairs.carverHelper.addVariation("tile.packediceStairs.15.desc", 15, "ice/poison");
-			makerPackedIceStairs.create(new BlockMarbleStairsMakerCreator() {
+			makerPackedIceStairs.create(new IStairsCreator() {
 
 				@Override
 				public BlockCarvableStairs create(Block block, int meta, CarvableHelper helper) {
 					return new BlockCarvablePackedIceStairs(block, meta, helper);
 				}
 			}, "packedice_stairs", ChiselBlocks.packediceStairs);
-			Carving.chisel.registerOre("packedIceStairs", "packedIceStairs");
+			Carving.chisel.registerOre("packedice_stairs", "packedIceStairs");
 		}
 	},
 
@@ -1708,7 +1705,7 @@ public enum Features {
 				GameRegistry.registerBlock(present[x], "chest" + x);
 				Carving.chisel.addVariation("present", present[x], 0, (x + 1));
 			}
-			Carving.chisel.registerOre("chest", "chest");
+			Carving.chisel.registerOre("present", "chest");
 		}
 
 		@Override
@@ -1885,8 +1882,8 @@ public enum Features {
 			road_line.carverHelper.addVariation("tile.roadLine.1.desc", 1, "line-marking/double-white-center");
 			road_line.carverHelper.addVariation("tile.roadLine.2.desc", 2, "line-marking/yellow-center");
 			road_line.carverHelper.addVariation("tile.roadLine.3.desc", 3, "line-marking/double-yellow-center");
-			GameRegistry.registerBlock(road_line, ItemCarvable.class, "road_line");
-			Carving.chisel.registerOre("roadLine", "roadLine");
+			road_line.carverHelper.register(road_line, "road_line");
+			Carving.chisel.registerOre("road_line", "roadLine");
 		}
 
 		@Override
@@ -1992,7 +1989,7 @@ public enum Features {
 			// 13), "Sandstone snake block body");
 			Carving.chisel.addVariation("sandstone", sand_snakestone, 1, 16);
 			Carving.chisel.addVariation("sandstone", sand_snakestone, 13, 17);
-			Carving.chisel.registerOre("sandSnakestone", "sandSnakestone");
+//			Carving.chisel.registerOre("sandstone", "sandSnakestone");
 		}
 	},
 
@@ -2008,7 +2005,7 @@ public enum Features {
 			// "Stone snake block body");
 			Carving.chisel.addVariation("stonebrick", stone_snakestone, 1, 16);
 			Carving.chisel.addVariation("stonebrick", stone_snakestone, 13, 17);
-			Carving.chisel.registerOre("snakestoneStone", "snakestoneStone");
+//			Carving.chisel.registerOre("snakestoneStone", "snakestoneStone");
 		}
 	},
 
@@ -2021,7 +2018,7 @@ public enum Features {
 			GameRegistry.registerBlock(obsidian_snakestone, ItemCarvable.class, "obsidian_snakestone");
 			Carving.chisel.addVariation("obsidian", obsidian_snakestone, 1, 16);
 			Carving.chisel.addVariation("obsidian", obsidian_snakestone, 13, 17);
-			Carving.chisel.registerOre("obsidianSnakestone", "obsidianSnakestone");
+//			Carving.chisel.registerOre("obsidianSnakestone", "obsidianSnakestone");
 		}
 	},
 
@@ -2411,7 +2408,7 @@ public enum Features {
 			for (int i = 0; i < plank_names.length; i++) {
 				String n = plank_names[i];
 				String u = plank_ucnames[i];
-				final String orename = n.replace('-', '_') + "_planks";
+				final String name = n.replace('-', '_') + "_planks";
 
 				planks[i] = (BlockCarvable) (new BlockCarvable(Material.wood)).setCreativeTab(ChiselTabs.tabWoodChiselBlocks).setHardness(2.0F).setResistance(5.0F).setStepSound(Block.soundTypeWood);
 				planks[i].carverHelper.setChiselBlockName(u + " Wood Planks");
@@ -2430,11 +2427,11 @@ public enum Features {
 				planks[i].carverHelper.addVariation(u + " wood scaffold", 12, "planks-" + n + "/crateex");
 				planks[i].carverHelper.addVariation(u + " wood planks in disarray", 14, "planks-" + n + "/chaotic-hor");
 				planks[i].carverHelper.addVariation("Vertical " + n + " wood planks in disarray", 15, "planks-" + n + "/chaotic");
-				planks[i].carverHelper.register(planks[i], orename);
-				Carving.chisel.addVariation(orename, Blocks.planks, i, 0);
+				planks[i].carverHelper.register(planks[i], name);
+				Carving.chisel.addVariation(name, Blocks.planks, i, 0);
 				planks[i].setHarvestLevel("axe", 0);
-				Carving.chisel.registerOre("wood", "wood");
-				Carving.chisel.setVariationSound(orename, Chisel.MOD_ID + ":chisel.wood");
+				Carving.chisel.registerOre(name, "wood");
+				Carving.chisel.setVariationSound(name, Chisel.MOD_ID + ":chisel.wood");
 			}
 		}
 	},
@@ -2566,7 +2563,7 @@ public enum Features {
 	boolean needsMetaRecipes() {
 		return false;
 	}
-	
+
 	private static void registerSlabTop(Block bottom, Block top) {
 		String name = Block.blockRegistry.getNameForObject(bottom);
 		name = name.substring(name.indexOf(':') + 1) + "_top";
diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleStairsMaker.java b/src/main/java/com/cricketcraft/chisel/block/CarvableStairsMaker.java
similarity index 64%
rename from src/main/java/com/cricketcraft/chisel/block/BlockMarbleStairsMaker.java
rename to src/main/java/com/cricketcraft/chisel/block/CarvableStairsMaker.java
index b75a379f..524a8b9d 100644
--- a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleStairsMaker.java
+++ b/src/main/java/com/cricketcraft/chisel/block/CarvableStairsMaker.java
@@ -2,7 +2,6 @@ package com.cricketcraft.chisel.block;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.CraftingManager;
 
 import com.cricketcraft.chisel.carving.CarvableHelper;
 import com.cricketcraft.chisel.carving.CarvableVariation;
@@ -10,14 +9,14 @@ import com.cricketcraft.chisel.item.ItemCarvable;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 
-public class BlockMarbleStairsMaker {
+public class CarvableStairsMaker {
 
 	public CarvableHelper carverHelper;
 	// int idStart;
 	Block blockBase;
 	String blockName;
 
-	public BlockMarbleStairsMaker(Block base) {
+	public CarvableStairsMaker(Block base) {
 		carverHelper = new CarvableHelper();
 		blockBase = base;
 	}
@@ -26,7 +25,7 @@ public class BlockMarbleStairsMaker {
 		create(null, name, blocks);
 	}
 
-	public void create(BlockMarbleStairsMakerCreator creator, String name, Block[] blocks) {
+	public void create(IStairsCreator creator, String name, Block[] blocks) {
 		for (int i = 0; i < blocks.length; i++) {
 			String n = name + "." + i;
 			blocks[i] = creator == null ? new BlockCarvableStairs(blockBase, i * 2, carverHelper) : creator.create(blockBase, i * 2, carverHelper);
@@ -37,15 +36,10 @@ public class BlockMarbleStairsMaker {
 			for (int meta = 0; meta < 2 && i * 2 + meta < carverHelper.variations.size(); meta++) {
 				CarvableVariation variation = carverHelper.variations.get(i * 2 + meta);
 
-				for (int j = 0; j < 8; j++)
-					carverHelper.registerVariation(name + ".orientation." + j, variation, blocks[i], j + meta * 8);
+				carverHelper.registerVariation(name, variation, blocks[i], meta * 8);
 
-				CraftingManager.getInstance().addRecipe(new ItemStack(blocks[i], 4, meta * 8), new Object[] { "*  ", "** ", "***", '*', new ItemStack(blockBase, 1, i * 2 + meta) });
+				GameRegistry.addRecipe(new ItemStack(blocks[i], 4, meta * 8), "*  ", "** ", "***", '*', new ItemStack(blockBase, 1, i * 2 + meta));
 			}
-
-			CarvableHelper.chiselBlocks.add(blocks[i]);
 		}
-
 	}
-
 }
diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleStairsMakerCreator.java b/src/main/java/com/cricketcraft/chisel/block/IStairsCreator.java
similarity index 81%
rename from src/main/java/com/cricketcraft/chisel/block/BlockMarbleStairsMakerCreator.java
rename to src/main/java/com/cricketcraft/chisel/block/IStairsCreator.java
index a850081c..c3d91703 100644
--- a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleStairsMakerCreator.java
+++ b/src/main/java/com/cricketcraft/chisel/block/IStairsCreator.java
@@ -4,7 +4,7 @@ import net.minecraft.block.Block;
 
 import com.cricketcraft.chisel.carving.CarvableHelper;
 
-public interface BlockMarbleStairsMakerCreator {
+public interface IStairsCreator {
 
 	public BlockCarvableStairs create(Block block, int meta, CarvableHelper helper);
 }
diff --git a/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java b/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java
index cc79178a..5f2464bd 100644
--- a/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java
+++ b/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java
@@ -13,6 +13,7 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
+import net.minecraftforge.oredict.OreDictionary;
 
 import com.cricketcraft.chisel.Chisel;
 import com.cricketcraft.chisel.block.BlockCarvableSlab;
@@ -28,8 +29,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
 
 public class CarvableHelper {
 
-	public static final ArrayList<Block> chiselBlocks = new ArrayList<Block>();
-
 	public static final int NORMAL = 0;
 	public static final int TOPSIDE = 1;
 	public static final int TOPBOTSIDE = 2;
@@ -270,7 +269,6 @@ public class CarvableHelper {
 	void registerBlock(Block block, String name, Class<? extends ItemCarvable> cl) {
 		block.setBlockName(name);
 		GameRegistry.registerBlock(block, cl, name);
-		chiselBlocks.add(block);
 	}
 
 	public void register(Block block, String name, Class<? extends ItemCarvable> cl) {
@@ -388,7 +386,10 @@ public class CarvableHelper {
 
 	public static Set<Block> getChiselBlockSet() {
 		HashSet<Block> tools = new HashSet<Block>();
-		tools.addAll(CarvableHelper.chiselBlocks);
 		return tools;
 	}
+
+	public void registerOre(String ore) {
+		OreDictionary.registerOre(ore, variations.get(0).block);
+	}
 }
diff --git a/src/main/java/com/cricketcraft/chisel/carving/Carving.java b/src/main/java/com/cricketcraft/chisel/carving/Carving.java
index a62e0e6a..0a9e501b 100644
--- a/src/main/java/com/cricketcraft/chisel/carving/Carving.java
+++ b/src/main/java/com/cricketcraft/chisel/carving/Carving.java
@@ -11,16 +11,18 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
 import com.cricketcraft.chisel.Chisel;
+import com.cricketcraft.chisel.api.carving.ICarvingGroup;
 import com.cricketcraft.chisel.api.carving.ICarvingVariation;
 
 public class Carving {
 
-	HashMap<String, CarvingGroup> carvingGroupsByName = new HashMap<String, CarvingGroup>();
-	HashMap<String, CarvingGroup> carvingGroupsByOre = new HashMap<String, CarvingGroup>();
-	HashMap<String, CarvingGroup> carvingGroupsByVariation = new HashMap<String, CarvingGroup>();
+	GroupList groups = new GroupList();
 
-	public static Carving chisel = new Carving();
-	public static Carving needle = new Carving();
+	public static final Carving chisel = new Carving();
+	public static final Carving needle = new Carving();
+
+	private Carving() {
+	}
 
 	String key(Item item, int metadata) {
 		return Item.itemRegistry.getNameForObject(item) + "|" + metadata;
@@ -31,7 +33,7 @@ public class Carving {
 	}
 
 	public List<ICarvingVariation> getVariations(Block block, int metadata) {
-		CarvingGroup group = getGroup(block, metadata);
+		ICarvingGroup group = getGroup(block, metadata);
 		if (group == null)
 			return null;
 
@@ -39,7 +41,7 @@ public class Carving {
 	}
 
 	public String getOre(Block block, int metadata) {
-		CarvingGroup group = getGroup(block, metadata);
+		ICarvingGroup group = getGroup(block, metadata);
 		if (group == null)
 			return null;
 
@@ -51,7 +53,7 @@ public class Carving {
 
 		int damage = chiseledItem.getItemDamage();
 
-		CarvingGroup group = getGroup(Block.getBlockFromItem(chiseledItem.getItem()), damage);
+		ICarvingGroup group = getGroup(Block.getBlockFromItem(chiseledItem.getItem()), damage);
 		if (group == null)
 			return items;
 
@@ -88,63 +90,53 @@ public class Carving {
 		return items;
 	}
 
-	public CarvingGroup getGroup(Block block, int metadata) {
-		// Check name first
-		CarvingGroup res;
-		int i = OreDictionary.getOreID(block.getUnlocalizedName());
-		if (i < 1)
-			return null;
-
-		// get All dictionary names for that block via Ids
-		// the first one matching with a group is chosen
-		int[] oreDictIds = OreDictionary.getOreIDs(new ItemStack(block, 1, metadata));
-		for (int oreId : oreDictIds) {
-			String oreDictName = OreDictionary.getOreName(oreId);
-			if (carvingGroupsByOre.containsKey(oreDictName))
-				return carvingGroupsByOre.get(oreDictName);
+	public ICarvingGroup getGroup(Block block, int metadata) {
+		int[] ids = OreDictionary.getOreIDs(new ItemStack(block, metadata));
+		if (ids.length > 0) {
+			for (int id : ids) {
+				return groups.getGroupByOre(OreDictionary.getOreName(id));
+			}
 		}
 
-		if ((res = carvingGroupsByVariation.get(key(block, metadata))) != null)
-			return res;
-
-		return null;
+		return groups.getGroup(block, metadata);
 	}
 
-	public CarvingGroup getGroup(String name) {
-		CarvingGroup group = carvingGroupsByName.get(name);
-		if (group == null) {
-			group = new CarvingGroup(name);
-			carvingGroupsByName.put(name, group);
-		}
-
-		return group;
+	public ICarvingGroup getGroup(String name) {
+		return groups.getGroupByName(name);
 	}
 
 	public CarvingVariation addVariation(String name, Block block, int metadata, int order) {
-		CarvingGroup group = getGroup(name);
-
-		CarvingGroup blockGroup = carvingGroupsByVariation.get(key(block, metadata));
-		if (blockGroup != null || blockGroup == group)
-			return null;
 
 		CarvingVariation variation = new CarvingVariation(block, metadata, order);
-		group.addVariation(variation);
-		carvingGroupsByVariation.put(key(block, metadata), group);
+
+		ICarvingGroup group = groups.getGroupByName(name);
+
+		if (group == null) {
+			group = new CarvingGroup(name);
+			groups.add(group);
+		}
+
+		groups.addVariation(name, variation);
 
 		return variation;
 	}
 
 	public void registerOre(String name, String oreName) {
-		CarvingGroup group = getGroup(name);
-
-		carvingGroupsByOre.put(oreName, group);
-
-		group.setOreName(oreName);
+		ICarvingGroup group = groups.getGroupByName(name);
+		if (group != null) {
+			group.setOreName(oreName);
+		} else {
+			throw new NullPointerException("Cannot register ore name for group " + name + ", as it does not exist.");
+		}
 	}
 
 	public void setVariationSound(String name, String sound) {
-		CarvingGroup group = getGroup(name);
-		group.setSound(sound);
+		ICarvingGroup group = groups.getGroupByName(name);
+		if (group != null) {
+			group.setSound(sound);
+		} else {
+			throw new NullPointerException("Cannot set sound for group " + name + ", as it does not exist.");
+		}
 	}
 
 	public String getVariationSound(Block block, int metadata) {
@@ -152,18 +144,14 @@ public class Carving {
 	}
 
 	public String getVariationSound(Item item, int metadata) {
-		CarvingGroup blockGroup = carvingGroupsByVariation.get(key(item, metadata));
-		if (blockGroup == null || blockGroup.getSound() == null)
-			return Chisel.MOD_ID + ":chisel.fallback";
-
-		return blockGroup.getSound();
+		ICarvingGroup group = groups.getGroup(Block.getBlockFromItem(item), metadata);
+		String sound = group == null ? null : group.getSound();
+		return sound == null ? Chisel.MOD_ID + ":chisel.fallback" : sound;
 	}
 
 	public List<String> getSortedGroupNames() {
 		List<String> names = new ArrayList<String>();
-		for (String s : carvingGroupsByName.keySet()) {
-			names.add(s);
-		}
+		names.addAll(groups.getNames());
 		Collections.sort(names);
 		return names;
 	}
diff --git a/src/main/java/com/cricketcraft/chisel/carving/GroupList.java b/src/main/java/com/cricketcraft/chisel/carving/GroupList.java
new file mode 100644
index 00000000..80e0dc88
--- /dev/null
+++ b/src/main/java/com/cricketcraft/chisel/carving/GroupList.java
@@ -0,0 +1,217 @@
+package com.cricketcraft.chisel.carving;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Set;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+
+import org.apache.commons.lang3.tuple.Pair;
+
+import com.cricketcraft.chisel.api.carving.ICarvingGroup;
+import com.cricketcraft.chisel.api.carving.ICarvingVariation;
+import com.google.common.collect.Maps;
+
+public class GroupList implements Set<ICarvingGroup> {
+
+	private class VariationWrapper {
+
+		private ICarvingVariation v;
+
+		private VariationWrapper(ICarvingVariation v) {
+			this.v = v;
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (obj instanceof ICarvingVariation) {
+				ICarvingVariation v2 = (ICarvingVariation) obj;
+				return v.getBlock() == v2.getBlock() && (v.getBlockMeta() == v2.getBlockMeta() || v.getItemMeta() == v2.getItemMeta());
+			} else if (obj instanceof VariationWrapper) {
+				return equals(((VariationWrapper) obj).v);
+			}
+			return false;
+		}
+
+		@Override
+		public int hashCode() {
+			return v.getBlock().hashCode();
+		}
+	}
+
+	private class VariationKey implements ICarvingVariation {
+
+		Pair<Block, Integer> data;
+
+		private VariationKey(Block block, int blockMeta) {
+			data = Pair.of(block, blockMeta);
+		}
+
+		@Override
+		public int compareTo(ICarvingVariation o) {
+			return 0;
+		}
+
+		@Override
+		public Block getBlock() {
+			return data.getLeft();
+		}
+
+		@Override
+		public int getBlockMeta() {
+			return data.getRight();
+		}
+
+		@Override
+		public int getItemMeta() {
+			return data.getRight();
+		}
+
+		@Override
+		public ItemStack getStack() {
+			return null;
+		}
+
+		@Override
+		public int getOrder() {
+			return 0;
+		}
+
+		@Override
+		public String toString() {
+			return data.toString();
+		}
+	}
+
+	private HashMap<String, ICarvingGroup> groups = Maps.newHashMap();
+	private HashMap<VariationWrapper, ICarvingGroup> lookup = Maps.newHashMap();
+
+	@Override
+	public int size() {
+		return groups.size();
+	}
+
+	@Override
+	public boolean isEmpty() {
+		return groups.isEmpty();
+	}
+
+	@Override
+	public boolean contains(Object o) {
+		if (o instanceof ICarvingGroup) {
+			return groups.containsKey(((ICarvingGroup) o).getName());
+		}
+		return false;
+	}
+
+	@Override
+	public Iterator<ICarvingGroup> iterator() {
+		return groups.values().iterator();
+	}
+
+	@Override
+	public Object[] toArray() {
+		return groups.values().toArray();
+	}
+
+	@Override
+	public <T> T[] toArray(T[] arr) {
+		return groups.values().toArray(arr);
+	}
+
+	@Override
+	public boolean add(ICarvingGroup group) {
+		String key = group.getName();
+		if (groups.containsKey(key)) {
+			return false;
+		}
+		groups.put(key, group);
+		return true;
+	}
+
+	@Override
+	public boolean remove(Object o) {
+		if (o instanceof ICarvingGroup) {
+			return groups.remove(((ICarvingGroup) o).getName()) != null;
+		}
+		return false;
+	}
+
+	@Override
+	public boolean containsAll(Collection<?> c) {
+		for (Object o : c) {
+			if (!(o instanceof ICarvingGroup)) {
+				return false;
+			}
+			if (!groups.containsKey(((ICarvingGroup) o).getName())) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	@Override
+	public boolean addAll(Collection<? extends ICarvingGroup> c) {
+		boolean ret = false;
+		for (ICarvingGroup g : c) {
+			ret |= add(g);
+		}
+		return ret;
+	}
+
+	@Override
+	public boolean removeAll(Collection<?> c) {
+		boolean ret = false;
+		for (Object o : c) {
+			ret |= remove(o);
+		}
+		return ret;
+	}
+
+	@Override
+	public boolean retainAll(Collection<?> c) {
+		throw new UnsupportedOperationException(); // not using it, not gonna bother
+	}
+
+	@Override
+	public void clear() {
+		groups.clear();
+	}
+
+	public ICarvingGroup getGroup(Block block, int metadata) {
+		return lookup.get(new VariationWrapper(new VariationKey(block, metadata)));
+	}
+
+	public void addVariation(String name, ICarvingVariation variation) {
+		ICarvingGroup g = groups.get(name);
+		if (g == null) {
+			throw new NullPointerException("No group exists for name " + name);
+		}
+		g.addVariation(variation);
+		lookup.put(new VariationWrapper(variation), g);
+	}
+
+	public ICarvingGroup getGroupByName(String groupName) {
+		return groups.get(groupName);
+	}
+
+	public ICarvingGroup getGroupByOre(String oreName) {
+		for (ICarvingGroup group : groups.values()) {
+			if (oreName.equals(group.getOreName())) {
+				return group;
+			}
+		}
+		return null;
+	}
+
+	public Collection<? extends String> getNames() {
+		return groups.keySet();
+	}
+
+	@Override
+	public String toString() {
+		return groups.toString();
+	}
+}
diff --git a/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java b/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java
index ec415d94..b3d2ef4a 100644
--- a/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java
+++ b/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java
@@ -29,8 +29,10 @@ public class Compatibility {
 
 		/* Mariculture */
 		Block block = GameRegistry.findBlock("mariculture", "limestone");
-		for (int i = 0; i < 16; i++) {
-			addSupport("limestone", block, i, 99);
+		if (block != null) {
+			for (int i = 0; i < 16; i++) {
+				addSupport("limestone", block, i, 99);
+			}
 		}
 
 		/* Geologica */
diff --git a/src/main/java/com/cricketcraft/chisel/compat/nei/RecipeHandlerChisel.java b/src/main/java/com/cricketcraft/chisel/compat/nei/RecipeHandlerChisel.java
index a3c686fc..05c541e5 100644
--- a/src/main/java/com/cricketcraft/chisel/compat/nei/RecipeHandlerChisel.java
+++ b/src/main/java/com/cricketcraft/chisel/compat/nei/RecipeHandlerChisel.java
@@ -15,10 +15,9 @@ import codechicken.nei.NEIServerUtils;
 import codechicken.nei.PositionedStack;
 import codechicken.nei.recipe.TemplateRecipeHandler;
 
+import com.cricketcraft.chisel.api.carving.ICarvingGroup;
 import com.cricketcraft.chisel.api.carving.ICarvingVariation;
 import com.cricketcraft.chisel.carving.Carving;
-import com.cricketcraft.chisel.carving.CarvingGroup;
-import com.cricketcraft.chisel.carving.CarvingVariation;
 
 public class RecipeHandlerChisel extends TemplateRecipeHandler {
 
@@ -108,7 +107,7 @@ public class RecipeHandlerChisel extends TemplateRecipeHandler {
 	public void loadCraftingRecipes(String outputId, Object... results) {
 		if (outputId.equals("chisel2.chisel")) {
 			for (String name : Carving.chisel.getSortedGroupNames()) {
-				CarvingGroup g = Carving.chisel.getGroup(name);
+				ICarvingGroup g = Carving.chisel.getGroup(name);
 				if (!g.getVariations().isEmpty()) {
 					addCached(getVariationStacks(g));
 				}
@@ -121,7 +120,7 @@ public class RecipeHandlerChisel extends TemplateRecipeHandler {
 	@Override
 	public void loadCraftingRecipes(ItemStack result) {
 		for (String name : Carving.chisel.getSortedGroupNames()) {
-			CarvingGroup g = Carving.chisel.getGroup(name);
+			ICarvingGroup g = Carving.chisel.getGroup(name);
 			List<ItemStack> variations = getVariationStacks(g);
 			for (ItemStack stack : variations) {
 				if (NEIServerUtils.areStacksSameTypeCrafting(stack, result)) {
@@ -134,7 +133,7 @@ public class RecipeHandlerChisel extends TemplateRecipeHandler {
 	@Override
 	public void loadUsageRecipes(ItemStack ingredient) {
 		for (String name : Carving.chisel.getSortedGroupNames()) {
-			CarvingGroup g = Carving.chisel.getGroup(name);
+			ICarvingGroup g = Carving.chisel.getGroup(name);
 			List<ItemStack> variations = getVariationStacks(g);
 			for (ItemStack stack : variations) {
 				if (NEIServerUtils.areStacksSameTypeCrafting(stack, ingredient)) {
@@ -163,7 +162,7 @@ public class RecipeHandlerChisel extends TemplateRecipeHandler {
 		addCached(variations, null, null);
 	}
 
-	private static List<ItemStack> getVariationStacks(CarvingGroup g) {
+	private static List<ItemStack> getVariationStacks(ICarvingGroup g) {
 		List<ItemStack> stacks = new ArrayList<ItemStack>();
 		for (ICarvingVariation v : g.getVariations()) {
 			stacks.add(v.getStack());
diff --git a/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java b/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java
index b2b6fb18..7a8a8485 100644
--- a/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java
+++ b/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java
@@ -1,5 +1,7 @@
 package com.cricketcraft.chisel.item.chisel;
 
+import java.util.List;
+
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -12,6 +14,7 @@ import org.apache.commons.lang3.ArrayUtils;
 
 import com.cricketcraft.chisel.Chisel;
 import com.cricketcraft.chisel.api.IChiselItem;
+import com.cricketcraft.chisel.api.carving.ICarvingVariation;
 import com.cricketcraft.chisel.carving.Carving;
 import com.cricketcraft.chisel.carving.CarvingVariation;
 import com.cricketcraft.chisel.network.PacketHandler;
@@ -49,27 +52,33 @@ public final class ChiselController {
 			z = event.z;
 			Block block = event.world.getBlock(x, y, z);
 			int metadata = event.world.getBlockMetadata(x, y, z);
-			CarvingVariation[] variations = Carving.chisel.getVariations(block, metadata).toArray(new CarvingVariation[] {});
+			List<ICarvingVariation> list = Carving.chisel.getVariations(block, metadata);
+			
+			if (list == null || list.isEmpty()) {
+				break;
+			}
+			
+			ICarvingVariation[]	variations = list.toArray(new CarvingVariation[] {});
 
-			if (variations != null && chisel.canChiselBlock(event.world, x, y, z, block, metadata)) {
+			if (chisel.canChiselBlock(event.world, x, y, z, block, metadata)) {
 				ItemStack target = General.getChiselTarget(held);
 
 				if (target != null) {
-					for (CarvingVariation v : variations) {
+					for (ICarvingVariation v : variations) {
 						if (v.getBlock() == Block.getBlockFromItem(target.getItem()) && v.getBlockMeta() == target.getItemDamage()) {
 							setVariation(event.entityPlayer, event.world, x, y, z, v, target);
 						}
 					}
 				} else {
 					for (int i = 0; i < variations.length; i++) {
-						CarvingVariation v = variations[i];
+						ICarvingVariation v = variations[i];
 						if (v.getBlock() == block && v.getBlockMeta() == metadata) {
 							variations = ArrayUtils.remove(variations, i--);
 						}
 					}
 
 					int index = event.world.rand.nextInt(variations.length);
-					CarvingVariation newVar = variations[index];
+					ICarvingVariation newVar = variations[index];
 					setVariation(event.entityPlayer, event.world, x, y, z, newVar, new ItemStack(newVar.getBlock(), 1, newVar.getItemMeta()));
 					event.entityPlayer.inventory.currentItem = slot;
 				}
@@ -87,7 +96,7 @@ public final class ChiselController {
 	/**
 	 * Assumes that the player is holding a chisel
 	 */
-	private void setVariation(EntityPlayer player, World world, int x, int y, int z, CarvingVariation v, ItemStack target) {
+	private void setVariation(EntityPlayer player, World world, int x, int y, int z, ICarvingVariation v, ItemStack target) {
 		PacketHandler.INSTANCE.sendTo(new MessageChiselSound(x, y, z, v), (EntityPlayerMP) player);
 		world.setBlock(x, y, z, v.getBlock(), v.getBlockMeta(), 3);
 		((IChiselItem) player.getCurrentEquippedItem().getItem()).onChisel(world, player.inventory, player.inventory.currentItem, player.getCurrentEquippedItem(), target);
diff --git a/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselSound.java b/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselSound.java
index 8f7dee3c..781e3da6 100644
--- a/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselSound.java
+++ b/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselSound.java
@@ -3,6 +3,7 @@ package com.cricketcraft.chisel.network.message;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.block.Block;
 
+import com.cricketcraft.chisel.api.carving.ICarvingVariation;
 import com.cricketcraft.chisel.carving.CarvingVariation;
 import com.cricketcraft.chisel.client.GeneralChiselClient;
 import com.cricketcraft.chisel.item.chisel.ItemChisel;
@@ -21,7 +22,7 @@ public class MessageChiselSound extends MessageCoords {
 	private int block;
 	private byte meta;
 
-	public MessageChiselSound(int x, int y, int z, CarvingVariation v) {
+	public MessageChiselSound(int x, int y, int z, ICarvingVariation v) {
 		super(x, y, z);
 		this.block = Block.getIdFromBlock(v.getBlock());
 		this.meta = (byte) v.getBlockMeta();