Merge remote-tracking branch 'origin/gtpp-utils-cleanup' into dev

GTNewHorizons · Feb 14, 2025 · 663631b · 663631b
2 parents 9c8aae1 + a9c8e63
commit 663631b
Show file tree

Hide file tree

Showing 27 changed files with 158 additions and 590 deletions.
diff --git a/src/main/java/gregtech/api/util/SemiFluidFuelHandler.java b/src/main/java/gregtech/api/util/SemiFluidFuelHandler.java
@@ -9,10 +9,11 @@
 import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
+import org.apache.commons.lang3.tuple.Pair;
+
 import gregtech.api.enums.GTValues;
 import gregtech.api.recipe.RecipeMaps;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 
 public class SemiFluidFuelHandler {
@@ -31,7 +32,7 @@ public static boolean generateFuels() {
                 for (ItemStack i : g.mInputs) {
                     FluidStack f = FluidContainerRegistry.getFluidForFilledItem(i);
                     if (f != null) {
-                        Pair<FluidStack, Integer> aData = new Pair<>(f, g.mSpecialValue);
+                        Pair<FluidStack, Integer> aData = Pair.of(f, g.mSpecialValue);
                         aFoundFluidsFromItems.put(aData.hashCode(), aData);
                     }
                 }

diff --git a/src/main/java/gtPlusPlus/api/objects/data/Pair.java b/src/main/java/gtPlusPlus/api/objects/data/Pair.java
diff --git a/src/main/java/gtPlusPlus/api/objects/data/Quad.java b/src/main/java/gtPlusPlus/api/objects/data/Quad.java
diff --git a/src/main/java/gtPlusPlus/api/objects/data/Triplet.java b/src/main/java/gtPlusPlus/api/objects/data/Triplet.java
diff --git a/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java b/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java
diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java
@@ -1,6 +1,8 @@
 package gtPlusPlus.api.objects.minecraft;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.ISidedInventory;
@@ -9,7 +11,7 @@
 
 import gregtech.api.util.GTUtility;
 import gtPlusPlus.core.tileentities.base.TileEntityBase;
-import gtPlusPlus.core.util.data.ArrayUtils;
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 
 public class BTF_Inventory implements ISidedInventory {
 
@@ -204,7 +206,9 @@ public boolean addItemStack(ItemStack aInput) {
     }
 
     public final void purgeNulls() {
-        ItemStack[] aTemp = ArrayUtils.removeNulls(this.mInventory);
+        List<ItemStack> list = new ObjectArrayList<>(this.mInventory);
+        list.removeAll(Collections.singleton((ItemStack) null));
+        ItemStack[] aTemp = list.toArray(new ItemStack[0]);
         for (int g = 0; g < this.getSizeInventory(); g++) {
             if (aTemp.length < this.getSizeInventory()) {
                 if (g <= aTemp.length - 1) {

diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java
@@ -6,9 +6,10 @@
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 
+import org.apache.commons.lang3.tuple.Pair;
+
 import gregtech.mixin.interfaces.accessors.IRecipeMutableAccess;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class ShapedRecipe implements IRecipeMutableAccess {
@@ -89,7 +90,7 @@ public ShapedRecipe(Object[] aInputs, ItemStack aOutput) {
                             }
                             mInfo = ((ItemStack) stack).getDisplayName();
                         }
-                        aRecipePairs.add(new Pair<>(CHARS.charAt(aCharSlot), stack));
+                        aRecipePairs.add(Pair.of(CHARS.charAt(aCharSlot), stack));
                         Logger.RECIPE(
                             "Storing '" + CHARS.charAt(aCharSlot)
                                 + "' with an object of type "
@@ -101,7 +102,7 @@ public ShapedRecipe(Object[] aInputs, ItemStack aOutput) {
                         aCharSlot++;
                         aLoggingInfo[aInfoSlot++] = mInfo;
                     } else {
-                        aRecipePairs.add(new Pair<>(' ', null));
+                        aRecipePairs.add(Pair.of(' ', null));
                         Logger.RECIPE("Storing ' ' with an object of type null");
                         aChar[aMemSlot++] = ' ';
                         aLoggingInfo[aInfoSlot++] = "Empty";
@@ -153,7 +154,7 @@ public ShapedRecipe(Object[] aInputs, ItemStack aOutput) {
                                 }
                                 mInfo = ((ItemStack) stack).getDisplayName();
                             }
-                            aRecipePairs.add(new Pair<>(CHARS.charAt(aCharSlot), stack));
+                            aRecipePairs.add(Pair.of(CHARS.charAt(aCharSlot), stack));
                             Logger.RECIPE(
                                 "Registering Pair of '" + CHARS.charAt(aCharSlot)
                                     + "' and a "

diff --git a/src/main/java/gtPlusPlus/core/common/CommonProxy.java b/src/main/java/gtPlusPlus/core/common/CommonProxy.java
@@ -8,6 +8,8 @@
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.living.LivingAttackEvent;
 
+import org.apache.commons.lang3.tuple.Pair;
+
 import baubles.common.container.InventoryBaubles;
 import baubles.common.lib.PlayerHandler;
 import cpw.mods.fml.common.IFuelHandler;
@@ -23,7 +25,6 @@
 import galaxyspace.core.entity.mob.EntityEvolvedColdBlaze;
 import gregtech.api.enums.Mods;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.config.ASMConfiguration;
 import gtPlusPlus.core.creative.AddToCreativeTab;