Improve performance of LOreDict::mergeFuzzy

Fybe · Oct 29, 2023 · a27e33c · a27e33c
1 parent 80e8f5d
commit a27e33c
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/main/java/me/towdium/jecalculation/data/label/labels/LOreDict.java b/src/main/java/me/towdium/jecalculation/data/label/labels/LOreDict.java
@@ -20,6 +20,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.function.BiPredicate;
@@ -69,9 +70,13 @@ public static boolean mergeFuzzy(ILabel a, ILabel b) {
         if (a instanceof LOreDict && b instanceof LItemStack) {
             LOreDict lod = (LOreDict) a;
             LItemStack lis = (LItemStack) b;
-            return lod.getAmount() * lis.getAmount() < 0
-                    && OreDictionary.getOres(lod.name).stream().map(Converter::from)
-                    .anyMatch(i -> LItemStack.merge(i, lis));
+            if (lod.getAmount() * lis.getAmount() >= 0)
+                return false;
+
+            int[] oreIDs = OreDictionary.getOreIDs(lis.getRep());
+            return Arrays.stream(oreIDs)
+                .mapToObj(OreDictionary::getOreName)
+                .anyMatch(ore -> ore.equals(lod.getName()));
         }
         return false;
     }