From 5bd18ca2f88edd5da1cf7804a51fc217624d47fc Mon Sep 17 00:00:00 2001 From: Tobias Wohlfarth Date: Fri, 2 Jan 2015 15:28:40 +0100 Subject: [PATCH] support Chisel Input with registered ores and oreDictonary modified: src/main/java/com/cricketcraft/chisel/carving/Carving.java --- .../com/cricketcraft/chisel/carving/Carving.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/carving/Carving.java b/src/main/java/com/cricketcraft/chisel/carving/Carving.java index 24d624aa..396066d5 100644 --- a/src/main/java/com/cricketcraft/chisel/carving/Carving.java +++ b/src/main/java/com/cricketcraft/chisel/carving/Carving.java @@ -113,10 +113,16 @@ public class Carving int i = OreDictionary.getOreID(block.getUnlocalizedName()); if(i < 1) return null; - - //if((res = carvingGroupsByOre.get(OreDictionary.getOreIDs(new ItemStack(block, 1, metadata)))) != null) - // return res; - + + //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); + } + if((res = carvingGroupsByVariation.get(key(block, metadata))) != null) return res;