From 76b114d55edfb8f1debda37afbb3e7b04cfe0801 Mon Sep 17 00:00:00 2001
From: Mary <33456283+FourIsTheNumber@users.noreply.github.com>
Date: Thu, 3 Oct 2024 02:02:10 -0400
Subject: Revert material hashing (#3319)

---
 src/main/java/gregtech/api/enums/OrePrefixes.java | 32 ++---------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

(limited to 'src/main/java/gregtech/api/enums')

diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java
index 8860d90119..418fe71681 100644
--- a/src/main/java/gregtech/api/enums/OrePrefixes.java
+++ b/src/main/java/gregtech/api/enums/OrePrefixes.java
@@ -3,7 +3,6 @@ package gregtech.api.enums;
 import static gregtech.api.enums.GTValues.B;
 import static gregtech.api.enums.GTValues.D2;
 import static gregtech.api.enums.GTValues.M;
-import static gregtech.api.util.GTRecipeBuilder.DEBUG_MODE_COLLISION;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -16,7 +15,6 @@ import net.minecraft.item.ItemStack;
 
 import com.google.common.collect.ImmutableList;
 
-import gregtech.api.GregTechAPI;
 import gregtech.api.enums.TCAspects.TC_AspectStack;
 import gregtech.api.interfaces.ICondition;
 import gregtech.api.interfaces.IOreRecipeRegistrator;
@@ -1181,8 +1179,6 @@ public enum OrePrefixes {
         } else if (name().startsWith("battery")) {
             new TC_AspectStack(TCAspects.ELECTRUM, 1).addToAspectList(mAspects);
         }
-
-        GregTechAPI.sGTCompleteLoad.add(this::onLoadComplete);
     }
 
     public static boolean isInstanceOf(String aName, OrePrefixes aPrefix) {
@@ -1301,9 +1297,6 @@ public enum OrePrefixes {
         return mOreProcessing.add(aRegistrator);
     }
 
-    // Hack to prevent duplicate registry of oredicted materials
-    HashSet<Materials> used = new HashSet<>();
-
     public void processOre(Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) {
 
         if (aMaterial == null) {
@@ -1314,28 +1307,11 @@ public enum OrePrefixes {
             return;
         }
 
-        if (aMaterial == Materials._NULL && !mIsSelfReferencing && mIsMaterialBased) {
-            return;
-        }
-
-        if (!GTUtility.isStackValid(aStack)) {
+        if (!((aMaterial != Materials._NULL || mIsSelfReferencing || !mIsMaterialBased)
+            && GTUtility.isStackValid(aStack))) {
             return;
         }
 
-        if (!aOreDictName.startsWith("stone") && aMaterial != Materials._NULL) {
-            if (!used.add(aMaterial)) {
-                if (DEBUG_MODE_COLLISION) {
-                    GTLog.out
-                        .println("Attempted duplicate recipe registration by " + aModName + " for " + aOreDictName);
-                }
-                return;
-            } else {
-                if (DEBUG_MODE_COLLISION) {
-                    GTLog.out.println("New recipe registration by " + aModName + " for " + aOreDictName);
-                }
-            }
-        }
-
         for (IOreRecipeRegistrator tRegistrator : mOreProcessing) {
             if (D2) GTLog.ore.println(
                 "Processing '" + aOreDictName
@@ -1349,10 +1325,6 @@ public enum OrePrefixes {
         }
     }
 
-    public void onLoadComplete() {
-        used = null;
-    }
-
     public Object get(Object aMaterial) {
         if (aMaterial instanceof Materials) return new ItemData(this, (Materials) aMaterial);
         return name() + aMaterial;
-- 
cgit