From 70f5045418b13c57df7031881ccbc2d6f04bb561 Mon Sep 17 00:00:00 2001
From: tterrag1098 <tterrag1098@gmail.com>
Date: Sat, 24 Jan 2015 23:22:55 -0500
Subject: [PATCH] Fix chiseling stained glass always showing white variations.
 Closes #174

---
 .../chisel/carving/CarvableVariation.java     |   6 +++---
 .../cricketcraft/chisel/carving/Carving.java  |  17 ++++++++++++++---
 .../assets/chisel/textures/chisel2Gui.png     | Bin 266140 -> 266140 bytes
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/cricketcraft/chisel/carving/CarvableVariation.java b/src/main/java/com/cricketcraft/chisel/carving/CarvableVariation.java
index dc5c776d..65c5a06f 100644
--- a/src/main/java/com/cricketcraft/chisel/carving/CarvableVariation.java
+++ b/src/main/java/com/cricketcraft/chisel/carving/CarvableVariation.java
@@ -9,7 +9,7 @@ import com.cricketcraft.chisel.client.render.TextureSubmap;
 public class CarvableVariation {
 
 	public String blockName;
-	private String description;
+	public String descriptionUnloc;
 	public int metadata;
 	public int kind;
 
@@ -30,11 +30,11 @@ public class CarvableVariation {
 	public TextureSubmap submapSmall;
 
 	public String getDescription() {
-		return I18n.format(description);
+		return I18n.format(descriptionUnloc);
 	}
 
 	public void setDescriptionUnloc(String desc) {
-		this.description = desc;
+		this.descriptionUnloc = desc;
 	}
 
 	static class CarvableVariationCTM {
diff --git a/src/main/java/com/cricketcraft/chisel/carving/Carving.java b/src/main/java/com/cricketcraft/chisel/carving/Carving.java
index acea6c4c..17aa371b 100644
--- a/src/main/java/com/cricketcraft/chisel/carving/Carving.java
+++ b/src/main/java/com/cricketcraft/chisel/carving/Carving.java
@@ -19,7 +19,7 @@ public class Carving implements ICarvingRegistry {
 
 	GroupList groups = new GroupList();
 
-	public static final Carving chisel = new Carving();
+	public static final ICarvingRegistry chisel = new Carving();
 	public static final Carving needle = new Carving();
 
 	private Carving() {
@@ -60,9 +60,20 @@ public class Carving implements ICarvingRegistry {
 	public List<ItemStack> getItemsForChiseling(ItemStack chiseledItem) {
 		ArrayList<ItemStack> items = new ArrayList<ItemStack>();
 
-		int damage = chiseledItem.getItemDamage();
+		ICarvingGroup group = null;
+
+		int[] oreids = OreDictionary.getOreIDs(chiseledItem);
+		for (int i : oreids) {
+			group = groups.getGroupByOre(OreDictionary.getOreName(i));
+			if (group != null) {
+				break;
+			}
+		}
+
+		if (group == null) {
+			group = getGroup(Block.getBlockFromItem(chiseledItem.getItem()), chiseledItem.getItemDamage());
+		}
 
-		ICarvingGroup group = getGroup(Block.getBlockFromItem(chiseledItem.getItem()), damage);
 		if (group == null)
 			return items;
 
diff --git a/src/main/resources/assets/chisel/textures/chisel2Gui.png b/src/main/resources/assets/chisel/textures/chisel2Gui.png
index ef0f58525741891d425dfaaf49870a5623ca169b..b21ae9dd6b466c20107da74619f6d94e6330b3da 100644
GIT binary patch
delta 153
zcmbO;UtrFBfej~lI3!s(rIVB2w{5=2^PHKL(aOq-VfqC#W|ip=#F#lYzZAH@%=mx$
zc_U_(i5plZE7Y=VekSr+oQ2cl?#juGz2YEMiqi|&7#$`H7&c4~xWy!~9mw0u2ITr|
zPPlnc7|3whtWf)kx%sJ2`%@oAAZFVB)Q5TTArbx4=hj_*pd`Zp1fH&bF6*2UngABb
BIpY8T

delta 149
zcmbO;UtrFBfej~lIQW=Uc<b&7ui1Q&=Q%SAgO!!l^z&xSs?#5cF>`EwDR6;#GE=F{
z#0|WY6>3>FKNI;Z&hpA9%5gGduQ*7F;`9PGMu*7)h7HpLZZS!02lDo^0l7Y#6K)<9
x1~ObWE7ZPXZhq?1{?vyNh?%xO^<iFoNaU>Q*>&p2S&uOQfv2mV%Q~loCIB9{H|hWY