From bee38576ae9ea8398a84d7f4afa38999e52bc118 Mon Sep 17 00:00:00 2001 From: HenryLoenwind Date: Sun, 13 Sep 2015 23:16:37 +0200 Subject: [PATCH] Fix for setting conduit channel color with a dye item in hand --- .../java/com/enderio/core/common/util/DyeColor.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/enderio/core/common/util/DyeColor.java b/src/main/java/com/enderio/core/common/util/DyeColor.java index 467ddc6..e0e0587 100644 --- a/src/main/java/com/enderio/core/common/util/DyeColor.java +++ b/src/main/java/com/enderio/core/common/util/DyeColor.java @@ -49,14 +49,13 @@ public enum DyeColor { if (dye == null) { return null; } - int oreId = OreDictionary.getOreID(dye); - if (oreId < 0) { - return null; - } + int[] oreIDs = OreDictionary.getOreIDs(dye); for (int i = 0; i < DYE_ORE_NAMES.length; i++) { - String dyeName = DYE_ORE_NAMES[i]; - if (OreDictionary.getOreID(dyeName) == oreId) { - return DyeColor.values()[i]; + int dyeID = OreDictionary.getOreID(DYE_ORE_NAMES[i]); + for (int oreId : oreIDs) { + if (dyeID == oreId) { + return DyeColor.values()[i]; + } } } return null;