Merge pull request #624 from GTNewHorizons/arrays-rename

Arrays class rename

4 files changed, 65 insertions, 38 deletions

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBus.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBus.java
index 7d9cd4f780..cfb4d33150 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBus.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBus.java
@@ -10,7 +10,7 @@ import gregtech.api.util.GT_ClientPreference;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gregtech.api.util.GT_Utility;
-import gregtech.api.util.extensions.Arrays;
+import gregtech.api.util.extensions.ArrayExt;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
@@ -29,7 +29,7 @@ public class GT_MetaTileEntity_Hatch_InputBus extends GT_MetaTileEntity_Hatch {
     }
 
     public GT_MetaTileEntity_Hatch_InputBus(int id, String name, String nameRegional, int tier, int slots) {
-        super(id, name, nameRegional, tier, slots, Arrays.of(
+        super(id, name, nameRegional, tier, slots, ArrayExt.of(
                 "Item Input for Multiblocks",
                 "Shift + right click with screwdriver to turn Sort mode on/off",
                 "Capacity: " + slots + " stack" + (slots >= 2 ? "s" : "")));
@@ -38,7 +38,7 @@ public class GT_MetaTileEntity_Hatch_InputBus extends GT_MetaTileEntity_Hatch {
     @Deprecated
     // having too many constructors is bad, don't be so lazy, use GT_MetaTileEntity_Hatch_InputBus(String, int, String[], ITexture[][][])
     public GT_MetaTileEntity_Hatch_InputBus(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
-        this(aName, aTier, Arrays.of(aDescription), aTextures);
+        this(aName, aTier, ArrayExt.of(aDescription), aTextures);
     }
 
     public GT_MetaTileEntity_Hatch_InputBus(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBus.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBus.java
index 7f5970d184..f997f5f489 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBus.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBus.java
@@ -6,7 +6,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_Utility;
-import gregtech.api.util.extensions.Arrays;
+import gregtech.api.util.extensions.ArrayExt;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.IInventory;
@@ -21,7 +21,7 @@ public class GT_MetaTileEntity_Hatch_OutputBus extends GT_MetaTileEntity_Hatch {
     }
 
     public GT_MetaTileEntity_Hatch_OutputBus(int id, String name, String nameRegional, int tier, int slots) {
-        super(id, name, nameRegional, tier, slots, Arrays.of(
+        super(id, name, nameRegional, tier, slots, ArrayExt.of(
                 "Item Output for Multiblocks",
                 "Capacity: " + getSlots(tier) + " stack" + (getSlots(tier) >= 2 ? "s" : "")));
     }
@@ -37,7 +37,7 @@ public class GT_MetaTileEntity_Hatch_OutputBus extends GT_MetaTileEntity_Hatch {
     @Deprecated
     // having too many constructors is bad, don't be so lazy, use GT_MetaTileEntity_Hatch_OutputBus(String, int, String[], ITexture[][][])
     public GT_MetaTileEntity_Hatch_OutputBus(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
-        this(aName, aTier, getSlots(aTier), Arrays.of(aDescription), aTextures);
+        this(aName, aTier, getSlots(aTier), ArrayExt.of(aDescription), aTextures);
     }
 
     public GT_MetaTileEntity_Hatch_OutputBus(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
diff --git a/src/main/java/gregtech/api/util/extensions/ArrayExt.java b/src/main/java/gregtech/api/util/extensions/ArrayExt.java
new file mode 100644
index 0000000000..faa01cb368
--- /dev/null
+++ b/src/main/java/gregtech/api/util/extensions/ArrayExt.java
@@ -0,0 +1,59 @@
+package gregtech.api.util.extensions;
+
+import java.util.function.IntFunction;
+
+public class ArrayExt {
+    public static int[] of(int... objects) {
+        return objects;
+    }
+
+    public static float[] of(float... objects) {
+        return objects;
+    }
+
+    public static double[] of(double... objects) {
+        return objects;
+    }
+
+    public static char[] of(char... objects) {
+        return objects;
+    }
+
+    public static byte[] of(byte... objects) {
+        return objects;
+    }
+
+    public static long[] of(long... objects) {
+        return objects;
+    }
+
+    @SafeVarargs
+    public static <T> T[] of(T... objects) {
+        return objects;
+    }
+
+    public static <T> T[] withoutTrailingNulls(T[] array, IntFunction<T[]> arrayFactory) {
+        int firstNull = -1;
+        for (int i = 0; i < array.length; i++) {
+            if (array[i] == null) {
+                if (firstNull == -1) {
+                    firstNull = i;
+                }
+            } else {
+                firstNull = -1;
+            }
+        }
+
+        if (firstNull == -1) {
+            T[] newArray = arrayFactory.apply(array.length);
+            System.arraycopy(array, 0, newArray, 0, array.length);
+            return newArray;
+        } else if (firstNull == 0) {
+            return arrayFactory.apply(0);
+        } else {
+            T[] newArray = arrayFactory.apply(firstNull);
+            System.arraycopy(array, 0, newArray, 0, firstNull);
+            return newArray;
+        }
+    }
+}
diff --git a/src/main/java/gregtech/api/util/extensions/Arrays.java b/src/main/java/gregtech/api/util/extensions/Arrays.java
deleted file mode 100644
index 41efec5587..0000000000
--- a/src/main/java/gregtech/api/util/extensions/Arrays.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package gregtech.api.util.extensions;
-
-public class Arrays {
-    public static int[] of(int... objects) {
-        return objects;
-    }
-
-    public static float[] of(float... objects) {
-        return objects;
-    }
-
-    public static double[] of(double... objects) {
-        return objects;
-    }
-
-    public static char[] of(char... objects) {
-        return objects;
-    }
-
-    public static byte[] of(byte... objects) {
-        return objects;
-    }
-
-    public static long[] of(long... objects) {
-        return objects;
-    }
-
-    @SafeVarargs
-    public static <T> T[] of(T... objects) {
-        return objects;
-    }
-}