GT_Recipe: speedup

4 files changed, 73 insertions, 18 deletions

diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java
index 19f46dfd15..98a2d9635d 100644
--- a/src/main/java/gregtech/api/util/GT_Recipe.java
+++ b/src/main/java/gregtech/api/util/GT_Recipe.java
@@ -9,6 +9,7 @@ import gregtech.api.objects.GT_FluidStack;
 import gregtech.api.objects.GT_ItemStack;
 import gregtech.api.objects.ItemData;
 import gregtech.api.objects.MaterialStack;
+import gregtech.api.util.extensions.ArrayExt;
 import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Replicator;
 import gregtech.nei.GT_NEI_DefaultHandler.FixedPositionedStack;
 import ic2.core.Ic2Items;
@@ -23,7 +24,6 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidContainerItem;
 
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import static gregtech.api.enums.GT_Values.*;
@@ -97,7 +97,8 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
         mEnabled = aRecipe.mEnabled;
         mHidden = aRecipe.mHidden;
     }
-    protected GT_Recipe(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems, int[] aChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) {
+
+    public GT_Recipe(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems, int[] aChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) {
         if (aInputs == null)
             aInputs = new ItemStack[0];
         if (aOutputs == null)
@@ -111,10 +112,10 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
         if (aChances.length < aOutputs.length)
             aChances = Arrays.copyOf(aChances, aOutputs.length);
 
-        aInputs = GT_Utility.getArrayListWithoutTrailingNulls(aInputs).toArray(new ItemStack[0]);
-        aOutputs = GT_Utility.getArrayListWithoutTrailingNulls(aOutputs).toArray(new ItemStack[0]);
-        aFluidInputs = GT_Utility.getArrayListWithoutNulls(aFluidInputs).toArray(new FluidStack[0]);
-        aFluidOutputs = GT_Utility.getArrayListWithoutNulls(aFluidOutputs).toArray(new FluidStack[0]);
+        aInputs = ArrayExt.withoutTrailingNulls(aInputs, ItemStack[]::new);
+        aOutputs = ArrayExt.withoutTrailingNulls(aOutputs, ItemStack[]::new);
+        aFluidInputs = ArrayExt.withoutNulls(aFluidInputs, FluidStack[]::new);
+        aFluidOutputs = ArrayExt.withoutNulls(aFluidOutputs, FluidStack[]::new);
 
         GT_OreDictUnificator.setStackArray(true, aInputs);
         GT_OreDictUnificator.setStackArray(true, aOutputs);
@@ -1627,12 +1628,12 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
     	}
     	
     }
-    
-    public static class GT_Recipe_Map_LargeChemicalReactor extends GT_Recipe_Map{
-        private static int TOTAL_INPUT_COUNT = 6;
-    	private static int OUTPUT_COUNT = 2;
-    	private static int FLUID_OUTPUT_COUNT = 4;
-    	
+
+    public static class GT_Recipe_Map_LargeChemicalReactor extends GT_Recipe_Map {
+        private static final int TOTAL_INPUT_COUNT = 6;
+        private static final int OUTPUT_COUNT = 2;
+        private static final int FLUID_OUTPUT_COUNT = 4;
+
         public GT_Recipe_Map_LargeChemicalReactor() {
             super(new HashSet<>(1000), "gt.recipe.largechemicalreactor", "Large Chemical Reactor", null, RES_PATH_GUI + "basicmachines/Default", 2, OUTPUT_COUNT, 0, 0, 1, E, 1, E, true, true);
         }
@@ -1648,7 +1649,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
             if (aInputs == null) {
                 aInputs = new ItemStack[0];
             } else {
-                aInputs = GT_Utility.getArrayListWithoutTrailingNulls(aInputs).toArray(new ItemStack[0]);
+                aInputs = ArrayExt.withoutTrailingNulls(aInputs, ItemStack[]::new);
             }
 
             for (ItemStack input : aInputs) {
@@ -1688,7 +1689,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
             if (aOutputs == null) {
                 aOutputs = new ItemStack[0];
             } else {
-                aOutputs = GT_Utility.getArrayListWithoutTrailingNulls(aOutputs).toArray(new ItemStack[0]);
+                aOutputs = ArrayExt.withoutTrailingNulls(aOutputs, ItemStack[]::new);
             }
 
             for (ItemStack output : aOutputs) {
@@ -1734,9 +1735,9 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
                 for (int i = 0; i < itemLimit; i++, j++) {
                     if (this.mInputs == null || (this.mInputs[i] == null && (i == 0 && itemLimit == 1))) {
                         if (this.mOutputs != null && this.mOutputs.length > 0 && this.mOutputs[0] != null)
-                            GT_Log.out.println("recipe " + this.toString() + " Output 0:" + this.mOutputs[0].getDisplayName() + " has errored!");
+                            GT_Log.out.println("recipe " + this + " Output 0:" + this.mOutputs[0].getDisplayName() + " has errored!");
                         else
-                            GT_Log.out.println("recipe " + this.toString() + " has errored!");
+                            GT_Log.out.println("recipe " + this + " has errored!");
 
                         new Exception("Recipe Fixme").printStackTrace(GT_Log.out);
                     }
@@ -1751,9 +1752,9 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
 				for (int i = 0; i < fluidLimit; i++, j++) {
                     if (this.mFluidInputs == null || this.mFluidInputs[i] == null) {
                         if (this.mOutputs != null && this.mOutputs.length > 0 && this.mOutputs[0] != null)
-                            GT_Log.out.println("recipe " + this.toString() + " Output 0:" + this.mOutputs[0].getDisplayName() + " has errored!");
+                            GT_Log.out.println("recipe " + this + " Output 0:" + this.mOutputs[0].getDisplayName() + " has errored!");
                         else
-                            GT_Log.out.println("recipe " + this.toString() + " has errored!");
+                            GT_Log.out.println("recipe " + this + " has errored!");
 
                         new Exception("Recipe Fixme").printStackTrace(GT_Log.out);
                     }
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index 12ec2427ce..94195d76ce 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -24,6 +24,7 @@ import gregtech.api.net.GT_Packet_Sound;
 import gregtech.api.objects.GT_ItemStack;
 import gregtech.api.objects.ItemData;
 import gregtech.api.threads.GT_Runnable_Sound;
+import gregtech.api.util.extensions.ArrayExt;
 import gregtech.common.GT_Proxy;
 import ic2.api.recipe.IRecipeInput;
 import ic2.api.recipe.RecipeInputItemStack;
@@ -81,6 +82,7 @@ import java.text.DecimalFormatSymbols;
 import java.text.NumberFormat;
 import java.util.*;
 import java.util.Map.Entry;
+import java.util.function.IntFunction;
 
 import static gregtech.GT_Mod.GT_FML_LOGGER;
 import static gregtech.api.enums.GT_Values.*;
@@ -1236,6 +1238,9 @@ public class GT_Utility {
         return false;
     }
 
+    /**
+     * Note: use {@link ArrayExt#withoutNulls(Object[], IntFunction)} if you want an array as a result.
+     */
     public static <T> ArrayList<T> getArrayListWithoutNulls(T... aArray) {
         if (aArray == null) return new ArrayList<>();
         ArrayList<T> rList = new ArrayList<>(Arrays.asList(aArray));
@@ -1243,6 +1248,9 @@ public class GT_Utility {
         return rList;
     }
 
+    /**
+     * Note: use {@link ArrayExt#withoutTrailingNulls(Object[], IntFunction)} if you want an array as a result.
+     */
     public static <T> ArrayList<T> getArrayListWithoutTrailingNulls(T... aArray) {
         if (aArray == null) return new ArrayList<>();
         ArrayList<T> rList = new ArrayList<>(Arrays.asList(aArray));
diff --git a/src/main/java/gregtech/api/util/extensions/ArrayExt.java b/src/main/java/gregtech/api/util/extensions/ArrayExt.java
index faa01cb368..9b39f74518 100644
--- a/src/main/java/gregtech/api/util/extensions/ArrayExt.java
+++ b/src/main/java/gregtech/api/util/extensions/ArrayExt.java
@@ -32,6 +32,29 @@ public class ArrayExt {
         return objects;
     }
 
+    @SuppressWarnings("ForLoopReplaceableByForEach")
+    public static <T> T[] withoutNulls(T[] array, IntFunction<T[]> arrayFactory) {
+        int count = 0;
+        for (int i = 0; i < array.length; i++) {
+            if (array[i] != null) {
+                count++;
+            }
+        }
+
+        T[] newArr = arrayFactory.apply(count);
+        if (count == 0) return newArr;
+
+        int j = 0;
+        for (int i = 0; i < array.length; i++) {
+            if (array[i] != null) {
+                newArr[j] = array[i];
+                j++;
+            }
+        }
+
+        return newArr;
+    }
+
     public static <T> T[] withoutTrailingNulls(T[] array, IntFunction<T[]> arrayFactory) {
         int firstNull = -1;
         for (int i = 0; i < array.length; i++) {
diff --git a/src/main/java/gregtech/api/util/extensions/IteratorExt.java b/src/main/java/gregtech/api/util/extensions/IteratorExt.java
new file mode 100644
index 0000000000..1a29a7b41a
--- /dev/null
+++ b/src/main/java/gregtech/api/util/extensions/IteratorExt.java
@@ -0,0 +1,23 @@
+package gregtech.api.util.extensions;
+
+import gregtech.api.objects.iterators.ArrayIterator;
+import gregtech.api.objects.iterators.MergedIterator;
+import gregtech.api.objects.iterators.NonNullIterator;
+
+import java.util.Iterator;
+
+public class IteratorExt {
+    @SafeVarargs
+    public static <T> Iterator<T> merge(Iterator<T>... iterators) {
+        return new MergedIterator<>(iterators);
+    }
+
+    public static <T> Iterator<T> withoutNulls(Iterator<T> iterator) {
+        return new NonNullIterator<>(iterator);
+    }
+
+    @SafeVarargs
+    public static <T> ArrayIterator<T> ofArray(T... items) {
+        return new ArrayIterator<>(items);
+    }
+}