From 06f2aff70c1ffc5f4cd6f8ccd8a3722cd0c46df0 Mon Sep 17 00:00:00 2001
From: tterrag1098 <tterrag1098@gmail.com>
Date: Sun, 25 Jan 2015 15:08:29 -0500
Subject: [PATCH] Fix typo causing some oredict blocks to not be chiseleable in
 world Closes #177

---
 src/main/java/com/cricketcraft/chisel/api/ICarvable.java | 9 ++++++---
 .../java/com/cricketcraft/chisel/carving/Carving.java    | 2 +-
 .../cricketcraft/chisel/inventory/ContainerChisel.java   | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/cricketcraft/chisel/api/ICarvable.java b/src/main/java/com/cricketcraft/chisel/api/ICarvable.java
index 151c4cf7..7b7c7ec1 100644
--- a/src/main/java/com/cricketcraft/chisel/api/ICarvable.java
+++ b/src/main/java/com/cricketcraft/chisel/api/ICarvable.java
@@ -1,11 +1,14 @@
 package com.cricketcraft.chisel.api;
 
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.IBlockAccess;
-
 import com.cricketcraft.chisel.carving.CarvableHelper;
 import com.cricketcraft.chisel.carving.CarvableVariation;
 
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.IBlockAccess;
+
+/**
+ * To be implemented on blocks that can be chiseled and need advanced metadata to variation mapping. Currently not very usable without internal classes.
+ */
 public interface ICarvable {
 
 	/**
diff --git a/src/main/java/com/cricketcraft/chisel/carving/Carving.java b/src/main/java/com/cricketcraft/chisel/carving/Carving.java
index 17aa371b..03d889cb 100644
--- a/src/main/java/com/cricketcraft/chisel/carving/Carving.java
+++ b/src/main/java/com/cricketcraft/chisel/carving/Carving.java
@@ -112,7 +112,7 @@ public class Carving implements ICarvingRegistry {
 
 	@Override
 	public ICarvingGroup getGroup(Block block, int metadata) {
-		int[] ids = OreDictionary.getOreIDs(new ItemStack(block, metadata));
+		int[] ids = OreDictionary.getOreIDs(new ItemStack(block, 1, metadata));
 		if (ids.length > 0) {
 			for (int id : ids) {
 				ICarvingGroup oreGroup = groups.getGroupByOre(OreDictionary.getOreName(id));
diff --git a/src/main/java/com/cricketcraft/chisel/inventory/ContainerChisel.java b/src/main/java/com/cricketcraft/chisel/inventory/ContainerChisel.java
index ac841217..f6962945 100644
--- a/src/main/java/com/cricketcraft/chisel/inventory/ContainerChisel.java
+++ b/src/main/java/com/cricketcraft/chisel/inventory/ContainerChisel.java
@@ -129,7 +129,7 @@ public class ContainerChisel extends Container {
 
 	public void onChiselSlotChanged() {
 		ItemStack stack = playerInventory.mainInventory[currentIndex];
-		if (!stack.isItemEqual(chisel))
+		if (stack == null || !stack.isItemEqual(chisel))
 			finished = true;
 
 		if (finished)