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 getItemsForChiseling(ItemStack chiseledItem) { ArrayList items = new ArrayList(); - 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 ef0f5852..b21ae9dd 100644 Binary files a/src/main/resources/assets/chisel/textures/chisel2Gui.png and b/src/main/resources/assets/chisel/textures/chisel2Gui.png differ