Remove GT++ AutoMap (#3199)

7 files changed, 45 insertions, 44 deletions

diff --git a/src/main/java/gtPlusPlus/core/util/data/StringUtils.java b/src/main/java/gtPlusPlus/core/util/data/StringUtils.java
index 77efadbc9a..c2a923bb75 100644
--- a/src/main/java/gtPlusPlus/core/util/data/StringUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/data/StringUtils.java
@@ -1,7 +1,8 @@
 package gtPlusPlus.core.util.data;
 
+import java.util.ArrayList;
+
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.util.Utils;
 
 public class StringUtils {
@@ -105,7 +106,7 @@ public class StringUtils {
 
     /**
      * Is this a special regex character for delimination? (.$|()[]{}^?*+\\)
-     * 
+     *
      * @param aChar - The char to test
      * @return - Is this a special character?
      */
@@ -146,18 +147,18 @@ public class StringUtils {
 
         Logger.INFO("Splitting " + aInput);
         String[] aSplit = aInput.split(aDelim);
-        Logger.INFO("Split into " + aSplit == null ? "" + 0 : aSplit.length + " parts.");
-        if (aSplit == null || aSplit.length == 0) {
+        Logger.INFO(aSplit.length + " parts.");
+        if (aSplit.length == 0) {
             return aInput;
         } else {
-            AutoMap<String> aTemp = new AutoMap<>();
+            ArrayList<String> aTemp = new ArrayList<>();
             for (String s : aSplit) {
                 Logger.INFO("Found: " + s);
                 s = s.replace(".", "");
                 s = Utils.sanitizeString(s);
                 s = firstLetterCaps(s);
                 Logger.INFO("Formatted & Captilized: " + s);
-                aTemp.put(s);
+                aTemp.add(s);
             }
             Logger.INFO("Rebuilding");
             StringBuilder aReturn = new StringBuilder();
diff --git a/src/main/java/gtPlusPlus/core/util/math/MathUtils.java b/src/main/java/gtPlusPlus/core/util/math/MathUtils.java
index 4fb34bd158..05e238b098 100644
--- a/src/main/java/gtPlusPlus/core/util/math/MathUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/math/MathUtils.java
@@ -1,12 +1,12 @@
 package gtPlusPlus.core.util.math;
 
 import java.text.NumberFormat;
+import java.util.ArrayList;
 import java.util.Map;
 import java.util.Random;
 
 import gregtech.api.enums.GTValues;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.Utils;
 
@@ -291,7 +291,7 @@ public class MathUtils {
      * Averages
      */
 
-    public static byte getByteAverage(AutoMap<Byte> aDataSet) {
+    public static byte getByteAverage(ArrayList<Byte> aDataSet) {
         byte[] aNewSet = new byte[aDataSet.size()];
         for (int u = 0; u < aDataSet.size(); u++) {
             byte b = getSafeByte(aDataSet.get(u));
@@ -300,7 +300,7 @@ public class MathUtils {
         return getByteAverage(aNewSet);
     }
 
-    public static short getShortAverage(AutoMap<Short> aDataSet) {
+    public static short getShortAverage(ArrayList<Short> aDataSet) {
         short[] aNewSet = new short[aDataSet.size()];
         for (int u = 0; u < aDataSet.size(); u++) {
             short b = getSafeShort(aDataSet.get(u));
@@ -309,7 +309,7 @@ public class MathUtils {
         return getShortAverage(aNewSet);
     }
 
-    public static int getIntAverage(AutoMap<Integer> aDataSet) {
+    public static int getIntAverage(ArrayList<Integer> aDataSet) {
         int[] aNewSet = new int[aDataSet.size()];
         for (int u = 0; u < aDataSet.size(); u++) {
             int b = getSafeInt(aDataSet.get(u));
@@ -318,7 +318,7 @@ public class MathUtils {
         return getIntAverage(aNewSet);
     }
 
-    public static long getLongAverage(AutoMap<Long> aDataSet) {
+    public static long getLongAverage(ArrayList<Long> aDataSet) {
         long[] aNewSet = new long[aDataSet.size()];
         for (int u = 0; u < aDataSet.size(); u++) {
             long b = getSafeLong(aDataSet.get(u));
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index 26d7783b78..930ab6c34a 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -35,7 +35,6 @@ import gregtech.api.util.GTOreDictUnificator;
 import gregtech.api.util.GTUtility;
 import gregtech.common.items.MetaGeneratedTool01;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.item.base.dusts.BaseItemDustUnique;
@@ -855,10 +854,10 @@ public class ItemUtils {
     public static ItemStack[] cleanItemStackArray(ItemStack[] input) {
         int aArraySize = input.length;
         ItemStack[] aOutput = new ItemStack[aArraySize];
-        AutoMap<ItemStack> aCleanedItems = new AutoMap<>();
+        ArrayList<ItemStack> aCleanedItems = new ArrayList<>();
         for (ItemStack checkStack : input) {
             if (ItemUtils.checkForInvalidItems(checkStack)) {
-                aCleanedItems.put(checkStack);
+                aCleanedItems.add(checkStack);
             }
         }
         for (int i = 0; i < aArraySize; i++) {
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
index 6675e19891..8b0d73cc8b 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
@@ -1,5 +1,6 @@
 package gtPlusPlus.core.util.minecraft;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -15,7 +16,6 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TextureSet;
 import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.data.TypeCounter;
 import gtPlusPlus.core.client.CustomTextureSet.TextureSets;
 import gtPlusPlus.core.item.base.BaseItemComponent;
@@ -292,15 +292,15 @@ public class MaterialUtils {
         return m;
     }
 
-    public static AutoMap<Material> getCompoundMaterialsRecursively(Material aMat) {
+    public static ArrayList<Material> getCompoundMaterialsRecursively(Material aMat) {
         return getCompoundMaterialsRecursively_Speiger(aMat);
     }
 
-    public static AutoMap<Material> getCompoundMaterialsRecursively_Speiger(Material toSearch) {
-        AutoMap<Material> resultList = new AutoMap<>();
+    public static ArrayList<Material> getCompoundMaterialsRecursively_Speiger(Material toSearch) {
+        ArrayList<Material> resultList = new ArrayList<>();
         if (toSearch.getComposites()
             .isEmpty()) {
-            resultList.put(toSearch);
+            resultList.add(toSearch);
             return resultList;
         }
         final int HARD_LIMIT = 1000;
@@ -315,7 +315,7 @@ public class MaterialUtils {
             Material current = toCheck.remove();
             if (current.getComposites()
                 .isEmpty()) {
-                resultList.put(current);
+                resultList.add(current);
             } else {
                 for (MaterialStack entry : current.getComposites()) {
                     toCheck.add(entry.getStackMaterial());
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java
index 8845409da9..34945a5d8a 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java
@@ -1,11 +1,11 @@
 package gtPlusPlus.core.util.minecraft;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 
 import gregtech.api.enums.Mods;
 import gregtech.common.WorldgenGTOreLayer;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import micdoodle8.mods.galacticraft.core.util.ConfigManagerCore;
 import micdoodle8.mods.galacticraft.planets.asteroids.ConfigManagerAsteroids;
@@ -22,7 +22,7 @@ public class MiningUtils {
         String aTextWorldGen;
         if (MiningUtils.findAndMapOreTypesFromGT()) {
             int mapKey = 0;
-            for (AutoMap<WorldgenGTOreLayer> g : MiningUtils.mOreMaps) {
+            for (ArrayList<WorldgenGTOreLayer> g : MiningUtils.mOreMaps) {
                 for (WorldgenGTOreLayer h : g) {
 
                     try {
@@ -40,14 +40,14 @@ public class MiningUtils {
         }
     }
 
-    public static AutoMap<WorldgenGTOreLayer>[] mOreMaps = new AutoMap[7];
-    private static final AutoMap<WorldgenGTOreLayer> Ores_Overworld = new AutoMap<>();
-    private static final AutoMap<WorldgenGTOreLayer> Ores_Nether = new AutoMap<>();
-    private static final AutoMap<WorldgenGTOreLayer> Ores_End = new AutoMap<>();
-    private static final AutoMap<WorldgenGTOreLayer> Ores_Moon = new AutoMap<>();
-    private static final AutoMap<WorldgenGTOreLayer> Ores_Mars = new AutoMap<>();
-    private static final AutoMap<WorldgenGTOreLayer> Ores_Comets = new AutoMap<>();
-    private static final AutoMap<WorldgenGTOreLayer> Ores_Misc = new AutoMap<>();
+    public static ArrayList<WorldgenGTOreLayer>[] mOreMaps = new ArrayList[7];
+    private static final ArrayList<WorldgenGTOreLayer> Ores_Overworld = new ArrayList<>();
+    private static final ArrayList<WorldgenGTOreLayer> Ores_Nether = new ArrayList<>();
+    private static final ArrayList<WorldgenGTOreLayer> Ores_End = new ArrayList<>();
+    private static final ArrayList<WorldgenGTOreLayer> Ores_Moon = new ArrayList<>();
+    private static final ArrayList<WorldgenGTOreLayer> Ores_Mars = new ArrayList<>();
+    private static final ArrayList<WorldgenGTOreLayer> Ores_Comets = new ArrayList<>();
+    private static final ArrayList<WorldgenGTOreLayer> Ores_Misc = new ArrayList<>();
 
     public static boolean findAndMapOreTypesFromGT() {
         // Gets Moon ID
@@ -73,20 +73,20 @@ public class MiningUtils {
         for (WorldgenGTOreLayer gtOreLayer : WorldgenGTOreLayer.sList) {
             if (gtOreLayer.mEnabled) {
                 if (gtOreLayer.mOverworld) {
-                    Ores_Overworld.put(gtOreLayer);
+                    Ores_Overworld.add(gtOreLayer);
                 }
                 if (gtOreLayer.mNether) {
-                    Ores_Nether.put(gtOreLayer);
+                    Ores_Nether.add(gtOreLayer);
                 }
                 if (gtOreLayer.mEnd || gtOreLayer.mEndAsteroid) {
-                    Ores_End.put(gtOreLayer);
+                    Ores_End.add(gtOreLayer);
                 }
                 if (gtOreLayer.mOverworld || gtOreLayer.mNether || (gtOreLayer.mEnd || gtOreLayer.mEndAsteroid)) {
                     continue;
                 }
-                Ores_Misc.put(gtOreLayer);
+                Ores_Misc.add(gtOreLayer);
             } else {
-                Ores_Comets.put(gtOreLayer);
+                Ores_Comets.add(gtOreLayer);
             }
         }
 
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
index 6df6974030..792119d1bc 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
@@ -65,7 +65,7 @@ public class RecipeUtils {
 
         try {
             int size = CompatHandler.mRecipesToGenerate.size();
-            CompatHandler.mRecipesToGenerate.put(new InternalRecipeObject(o, resultItem, false));
+            CompatHandler.mRecipesToGenerate.add(new InternalRecipeObject(o, resultItem, false));
             // Utils.LOG_WARNING("Success! Added a recipe for "+resultItem.getDisplayName());
             if (CompatHandler.mRecipesToGenerate.size() > size) {
                 if (!CompatHandler.areInitItemsLoaded) {
@@ -171,7 +171,7 @@ public class RecipeUtils {
         }
 
         int size = CompatHandler.mGtRecipesToGenerate.size();
-        CompatHandler.mGtRecipesToGenerate.put(new InternalRecipeObject(o, OutputItem, true));
+        CompatHandler.mGtRecipesToGenerate.add(new InternalRecipeObject(o, OutputItem, true));
 
         if (CompatHandler.mGtRecipesToGenerate.size() > size) {
             if (!CompatHandler.areInitItemsLoaded) {
@@ -415,7 +415,7 @@ public class RecipeUtils {
         ShapedOreRecipe aRecipe = new ShapedOreRecipe(aOutputStack, aDataObject);
 
         int size = CompatHandler.mRecipesToGenerate.size();
-        CompatHandler.mRecipesToGenerate.put(new InternalRecipeObject2(aRecipe));
+        CompatHandler.mRecipesToGenerate.add(new InternalRecipeObject2(aRecipe));
         if (CompatHandler.mRecipesToGenerate.size() > size) {
             if (!CompatHandler.areInitItemsLoaded) {
                 RegistrationHandler.recipesSuccess++;
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
index d9cf2e3769..f753561d71 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.util.minecraft.gregtech;
 
+import java.util.ArrayList;
+
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraftforge.fluids.FluidStack;
@@ -12,7 +14,6 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords;
 import gregtech.common.Pollution;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.item.base.cell.BaseItemCell;
 import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.material.MaterialMisc;
@@ -21,7 +22,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class PollutionUtils {
 
-    public static AutoMap<FluidStack> mPollutionFluidStacks = new AutoMap<>();
+    public static ArrayList<FluidStack> mPollutionFluidStacks = new ArrayList<>();
 
     public static boolean isPollutionEnabled() {
         return GTMod.gregtechproxy.mPollution;
@@ -99,10 +100,10 @@ public class PollutionUtils {
             CD = FluidUtils.getFluidStack("carbondioxide", 1000);
             CM = FluidUtils.getFluidStack("carbonmonoxide", 1000);
             SD = FluidUtils.getFluidStack("sulfurdioxide", 1000);
-            if (PollutionUtils.mPollutionFluidStacks.size() == 0) {
+            if (PollutionUtils.mPollutionFluidStacks.isEmpty()) {
                 if (CD != null) {
                     Logger.INFO("[PollutionCompat] Found carbon dioxide fluid, registering it.");
-                    PollutionUtils.mPollutionFluidStacks.put(CD);
+                    PollutionUtils.mPollutionFluidStacks.add(CD);
                     MaterialMisc.CARBON_DIOXIDE.registerComponentForMaterial(CD);
                     ItemStack cellCD = ItemUtils.getItemStackOfAmountFromOreDict("cellCarbonDioxide", 1);
                     if (ItemUtils.checkForInvalidItems(cellCD)) {
@@ -118,7 +119,7 @@ public class PollutionUtils {
 
                 if (CM != null) {
                     Logger.INFO("[PollutionCompat] Found carbon monoxide fluid, registering it.");
-                    PollutionUtils.mPollutionFluidStacks.put(CM);
+                    PollutionUtils.mPollutionFluidStacks.add(CM);
                     MaterialMisc.CARBON_MONOXIDE.registerComponentForMaterial(CM);
                     ItemStack cellCD = ItemUtils.getItemStackOfAmountFromOreDict("cellCarbonMonoxide", 1);
                     if (ItemUtils.checkForInvalidItems(cellCD)) {
@@ -134,7 +135,7 @@ public class PollutionUtils {
 
                 if (SD != null) {
                     Logger.INFO("[PollutionCompat] Found sulfur dioxide fluid, registering it.");
-                    PollutionUtils.mPollutionFluidStacks.put(SD);
+                    PollutionUtils.mPollutionFluidStacks.add(SD);
                 }
             }
         } else {