From 3f6c87d8f5293c87a123ed2132917fa022b0502d Mon Sep 17 00:00:00 2001 From: sk89q Date: Tue, 30 Sep 2014 12:15:54 -0700 Subject: [PATCH 1/3] Fix ItemInfo.equals() not functioning as intended. --- src/main/java/mekanism/api/ItemInfo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mekanism/api/ItemInfo.java b/src/main/java/mekanism/api/ItemInfo.java index 2c45f0cfe..0204c3f23 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; } From 125ac34c01b35b36093eaa091b72774813652eb9 Mon Sep 17 00:00:00 2001 From: sk89q Date: Tue, 30 Sep 2014 12:17:12 -0700 Subject: [PATCH 2/3] Use object default hashCode in ItemInfo for Item. Also change the hashCode() algorithm slightly. --- src/main/java/mekanism/api/ItemInfo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/api/ItemInfo.java b/src/main/java/mekanism/api/ItemInfo.java index 0204c3f23..f3ad54d4c 100644 --- a/src/main/java/mekanism/api/ItemInfo.java +++ b/src/main/java/mekanism/api/ItemInfo.java @@ -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; } } From 16fc882da7c42faad9689370e77a81748fb2db30 Mon Sep 17 00:00:00 2001 From: sk89q Date: Tue, 30 Sep 2014 12:18:37 -0700 Subject: [PATCH 3/3] Change OreDictCache to hit the hash map one fewer time. --- src/main/java/mekanism/common/OreDictCache.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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);