Remove GT++ AutoMap (#3199)

82 files changed, 873 insertions, 1368 deletions

diff --git a/src/main/java/gregtech/api/enums/TAE.java b/src/main/java/gregtech/api/enums/TAE.java
index 79d3037a5a..48a39da036 100644
--- a/src/main/java/gregtech/api/enums/TAE.java
+++ b/src/main/java/gregtech/api/enums/TAE.java
@@ -6,7 +6,6 @@ import java.util.HashSet;
 
 import gregtech.api.interfaces.ITexture;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
@@ -53,22 +52,22 @@ public class TAE {
     }
 
     public static void finalizeTAE() {
-        String aFreeSpaces = "";
-        String aPageAndSlotFree = "";
-        AutoMap<Integer> aTemp = new AutoMap<>(mFreeSlots);
+        StringBuilder aFreeSpaces = new StringBuilder();
+        StringBuilder aPageAndSlotFree = new StringBuilder();
+        Integer[] aTemp = mFreeSlots.toArray(new Integer[] {});
         for (int i = 0; i < mFreeSlots.size(); i++) {
-            int j = aTemp.get(i);
-            aFreeSpaces += j;
-            aPageAndSlotFree += getPageFromIndex(j);
+            int j = aTemp[i];
+            aFreeSpaces.append(j);
+            aPageAndSlotFree.append(getPageFromIndex(j));
             if (i != (mFreeSlots.size() - 1)) {
-                aFreeSpaces += ", ";
-                aPageAndSlotFree += ", ";
+                aFreeSpaces.append(", ");
+                aPageAndSlotFree.append(", ");
             }
         }
         Logger.INFO("Free Indexes within TAE: " + aFreeSpaces);
         Logger.INFO("Free Page slots within TAE: " + aPageAndSlotFree);
         Logger.INFO("Filling them with ERROR textures.");
-        for (int aFreeSlot : aTemp.values()) {
+        for (int aFreeSlot : aTemp) {
             registerTexture(aFreeSlot, new GTPPCopiedBlockTexture(ModBlocks.blockCasingsTieredGTPP, 1, 15));
         }
         Logger.INFO("Finalising TAE.");
diff --git a/src/main/java/gregtech/api/util/FishPondFakeRecipe.java b/src/main/java/gregtech/api/util/FishPondFakeRecipe.java
index 8f36600e2a..2deb38dccf 100644
--- a/src/main/java/gregtech/api/util/FishPondFakeRecipe.java
+++ b/src/main/java/gregtech/api/util/FishPondFakeRecipe.java
@@ -11,7 +11,6 @@ import net.minecraftforge.common.FishingHooks;
 
 import gregtech.api.enums.GTValues;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 
@@ -36,13 +35,13 @@ public class FishPondFakeRecipe {
             e.printStackTrace();
         }
 
-        AutoMap<ArrayList<WeightedRandomFishable>> mega = new AutoMap<>();
-        mega.put(fish);
-        mega.put(junk);
-        mega.put(treasure);
+        ArrayList<ArrayList<WeightedRandomFishable>> mega = new ArrayList<>();
+        mega.add(fish);
+        mega.add(junk);
+        mega.add(treasure);
 
         int mType = 14;
-        for (ArrayList<WeightedRandomFishable> f : mega.values()) {
+        for (ArrayList<WeightedRandomFishable> f : mega) {
             for (WeightedRandomFishable weightedRandomFishable : f) {
                 if (weightedRandomFishable != null) {
                     WeightedRandomFishable u = weightedRandomFishable;
diff --git a/src/main/java/gregtech/api/util/GasSpargingRecipe.java b/src/main/java/gregtech/api/util/GasSpargingRecipe.java
index 527359e0e8..0e8deb285b 100644
--- a/src/main/java/gregtech/api/util/GasSpargingRecipe.java
+++ b/src/main/java/gregtech/api/util/GasSpargingRecipe.java
@@ -1,9 +1,10 @@
 package gregtech.api.util;
 
+import java.util.ArrayList;
+
 import net.minecraftforge.fluids.FluidStack;
 
 import gregtech.api.enums.TierEU;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.util.data.ArrayUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
@@ -92,12 +93,11 @@ public class GasSpargingRecipe implements Comparable<GasSpargingRecipe> {
     }
 
     public String[] getRecipeInfo() {
-        AutoMap<String> result = new AutoMap<>();
-        result.put("Input " + ItemUtils.getArrayStackNames(mFluidInputs));
-        result.put("Output " + ItemUtils.getArrayStackNames(mFluidOutputs));
-        result.put("Duration: " + mDuration);
-        result.put("EU/t: " + mEUt);
-        String s[] = result.toArray();
-        return s;
+        ArrayList<String> result = new ArrayList<>();
+        result.add("Input " + ItemUtils.getArrayStackNames(mFluidInputs));
+        result.add("Output " + ItemUtils.getArrayStackNames(mFluidOutputs));
+        result.add("Duration: " + mDuration);
+        result.add("EU/t: " + mEUt);
+        return result.toArray(new String[] {});
     }
 }
diff --git a/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java b/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java
index 6dcc7721e0..ece9c024e4 100644
--- a/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java
+++ b/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java
@@ -2,15 +2,14 @@ package gregtech.api.util;
 
 import static gregtech.api.enums.Mods.GregTech;
 
-import net.minecraftforge.fluids.FluidStack;
+import java.util.HashSet;
 
-import gtPlusPlus.api.objects.data.AutoMap;
+import net.minecraftforge.fluids.FluidStack;
 
-public class GasSpargingRecipeMap extends AutoMap<GasSpargingRecipe> {
+public class GasSpargingRecipeMap {
 
-    public static final AutoMap<GasSpargingRecipe> mRecipes = new AutoMap<>();
+    public static final HashSet<GasSpargingRecipe> mRecipes = new HashSet<>();
     public static final String mUnlocalizedName = "gtpp.recipe.lftr.sparging";
-    public static final String mNEIName = mUnlocalizedName;
     public static final String mNEIDisplayName = "LFTR Gas Sparging";
     public static final String mNEIGUIPath = GregTech.getResourcePath("textures", "gui/basicmachines/FissionFuel.png");
 
@@ -30,7 +29,7 @@ public class GasSpargingRecipeMap extends AutoMap<GasSpargingRecipe> {
         }
         int aMapSize = mRecipes.size();
         GasSpargingRecipe aRecipe = new GasSpargingRecipe(aSpargeGas, aSpentFuel, aSpargedFuel, aOutputs, aMaxOutputs);
-        mRecipes.put(aRecipe);
+        mRecipes.add(aRecipe);
         return mRecipes.size() > aMapSize;
     }
 
diff --git a/src/main/java/gtPlusPlus/GTplusplus.java b/src/main/java/gtPlusPlus/GTplusplus.java
index ef6b1759e9..8823304e89 100644
--- a/src/main/java/gtPlusPlus/GTplusplus.java
+++ b/src/main/java/gtPlusPlus/GTplusplus.java
@@ -280,25 +280,25 @@ public class GTplusplus implements ActionListener {
     }
 
     private static void setupMaterialBlacklist() {
-        Material.invalidMaterials.put(Materials._NULL);
-        Material.invalidMaterials.put(Materials.Clay);
-        Material.invalidMaterials.put(Materials.Phosphorus);
-        Material.invalidMaterials.put(Materials.Steel);
-        Material.invalidMaterials.put(Materials.Bronze);
-        Material.invalidMaterials.put(Materials.Hydrogen);
+        Material.invalidMaterials.add(Materials._NULL);
+        Material.invalidMaterials.add(Materials.Clay);
+        Material.invalidMaterials.add(Materials.Phosphorus);
+        Material.invalidMaterials.add(Materials.Steel);
+        Material.invalidMaterials.add(Materials.Bronze);
+        Material.invalidMaterials.add(Materials.Hydrogen);
         // Infused TC stuff
-        Material.invalidMaterials.put(Materials.InfusedAir);
-        Material.invalidMaterials.put(Materials.InfusedEarth);
-        Material.invalidMaterials.put(Materials.InfusedFire);
-        Material.invalidMaterials.put(Materials.InfusedWater);
+        Material.invalidMaterials.add(Materials.InfusedAir);
+        Material.invalidMaterials.add(Materials.InfusedEarth);
+        Material.invalidMaterials.add(Materials.InfusedFire);
+        Material.invalidMaterials.add(Materials.InfusedWater);
         // EIO Materials
-        Material.invalidMaterials.put(Materials.SoulSand);
-        Material.invalidMaterials.put(Materials.EnderPearl);
-        Material.invalidMaterials.put(Materials.EnderEye);
-        Material.invalidMaterials.put(Materials.Redstone);
-        Material.invalidMaterials.put(Materials.Glowstone);
-        Material.invalidMaterials.put(Materials.Soularium);
-        Material.invalidMaterials.put(Materials.PhasedIron);
+        Material.invalidMaterials.add(Materials.SoulSand);
+        Material.invalidMaterials.add(Materials.EnderPearl);
+        Material.invalidMaterials.add(Materials.EnderEye);
+        Material.invalidMaterials.add(Materials.Redstone);
+        Material.invalidMaterials.add(Materials.Glowstone);
+        Material.invalidMaterials.add(Materials.Soularium);
+        Material.invalidMaterials.add(Materials.PhasedIron);
 
     }
 
diff --git a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java
deleted file mode 100644
index 4de2e9ab78..0000000000
--- a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java
+++ /dev/null
@@ -1,356 +0,0 @@
-package gtPlusPlus.api.objects.data;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Queue;
-import java.util.Set;
-
-public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collection<V>, Queue<V>, List<V> {
-
-    /**
-     * The Internal Map
-     */
-    protected final Map<Integer, V> mInternalMap;
-
-    protected final Map<String, Integer> mInternalNameMap;
-
-    /**
-     * The Internal ID
-     */
-    private int mInternalID = 0;
-
-    private static final long serialVersionUID = 3771412318075131790L;
-
-    public AutoMap() {
-        this(new LinkedHashMap<>());
-    }
-
-    public Map<Integer, V> getMap() {
-        return mInternalMap;
-    }
-
-    public AutoMap(Map<Integer, V> defaultMapType) {
-        mInternalMap = defaultMapType;
-        mInternalNameMap = new LinkedHashMap<>();
-    }
-
-    /**
-     * Generates an AutoMap from the List.
-     *
-     * @param aList - Data to be inserted into the AutoMap.
-     */
-    public AutoMap(List<V> aL