From be02120be30d80c817b763902d8d71441c71381a Mon Sep 17 00:00:00 2001
From: Richard Hendricks <richardhendricks@pobox.com>
Date: Mon, 10 Sep 2018 20:18:20 -0500
Subject: Trying Alkalus fix, compile problem with hashCode.

---
 src/main/java/gregtech/api/enums/OrePrefixes.java | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java
index 72f04dd7c9..434acc0f59 100644
--- a/src/main/java/gregtech/api/enums/OrePrefixes.java
+++ b/src/main/java/gregtech/api/enums/OrePrefixes.java
@@ -867,33 +867,32 @@ public enum OrePrefixes {
     }
 
     private static final LinkedHashMap<String, ObjMap<Integer, Boolean>>mCachedResults = new LinkedHashMap<String, ObjMap<Integer, Boolean>>();
-    
+
     public boolean contains(ItemStack aStack) {
         if (aStack == null){
             return false;
         }
-        ObjMap<Integer, Boolean> aCurrentSet;
-        if (mCachedResults.get(this.toString()) != null){
-            aCurrentSet = mCachedResults.get(this.toString());
-        }
 
-        else {
+        ObjMap<Integer, Boolean> aCurrentSet = mCachedResults.get(this.toString().toUpperCase());
+        if (aCurrentSet == null){
             aCurrentSet = new ObjMap<Integer, Boolean>((mPrefixedItems != null && mPrefixedItems.size() > 0 ? mPrefixedItems.size() : 1000), 0.5f);
-            mCachedResults.put(this.toString(), aCurrentSet);
+            mCachedResults.put(this.toString().toUpperCase(), aCurrentSet);
         }
 
-        if (aCurrentSet.get(aStack.hashCode()) != null){
-            return aCurrentSet.get(aStack.hashCode());
+        int mainHash = Objects.hashCode(aStack.getItem(), aStack.getItemDamage());
+        Boolean result = aCurrentSet.get(mainHash);
+        if (result != null){
+            return result;
         }
         else {
             for (ItemStack tStack : mPrefixedItems){
                 if (GT_Utility.areStacksEqual(aStack, tStack, !tStack.hasTagCompound())){
-                    aCurrentSet.put(aStack.hashCode(), true);
+                    aCurrentSet.put(Objects.hashCode(tStack.getItem(), tStack.getItemDamage()), true);
                     return true;
                 }
             }
         }
-        aCurrentSet.put(aStack.hashCode(), false);
+        aCurrentSet.put(mainHash, false);
         return false;
     }
 
-- 
cgit