diff --git a/src/main/java/mekanism/api/ItemInfo.java b/src/main/java/mekanism/api/ItemInfo.java index 2c45f0cfe..f3ad54d4c 100644 --- a/src/main/java/mekanism/api/ItemInfo.java +++ b/src/main/java/mekanism/api/ItemInfo.java @@ -22,7 +22,7 @@ public class ItemInfo @Override public boolean equals(Object obj) { - return obj instanceof BlockInfo && + return obj instanceof ItemInfo && ((ItemInfo)obj).item == item && ((ItemInfo)obj).meta == meta; } @@ -31,8 +31,8 @@ public class ItemInfo public int hashCode() { int code = 1; - code = 31 * code + item.getUnlocalizedName().hashCode(); - code = 31 * code + meta; + code = 31 * code + System.identityHashCode(item); + code = 7 * code + meta; return code; } } diff --git a/src/main/java/mekanism/common/OreDictCache.java b/src/main/java/mekanism/common/OreDictCache.java index 6a37d8d7d..d642d56bb 100644 --- a/src/main/java/mekanism/common/OreDictCache.java +++ b/src/main/java/mekanism/common/OreDictCache.java @@ -24,10 +24,11 @@ public final class OreDictCache } ItemInfo info = ItemInfo.get(check); + List cached = cachedKeys.get(info); - if(cachedKeys.get(info) != null) + if(cached != null) { - return cachedKeys.get(info); + return cached; } int[] idsFound = OreDictionary.getOreIDs(check);