Remove GT++ AutoMap (#3199)

17 files changed, 68 insertions, 73 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenAlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenAlloySmelter.java
index 8ef73917b7..dfe8db8dc8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenAlloySmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenAlloySmelter.java
@@ -17,7 +17,7 @@ public class RecipeGenAlloySmelter extends RecipeGenBase {
     public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>();
 
     static {
-        MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
+        MaterialGenerator.mRecipeMapsToGenerate.add(mRecipeGenMap);
     }
 
     public RecipeGenAlloySmelter(final Material M) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenAssembler.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenAssembler.java
index 64ce9d1c42..3963390dbc 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenAssembler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenAssembler.java
@@ -21,7 +21,7 @@ public class RecipeGenAssembler extends RecipeGenBase {
     public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>();
 
     static {
-        MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
+        MaterialGenerator.mRecipeMapsToGenerate.add(mRecipeGenMap);
     }
 
     public RecipeGenAssembler(final Material M) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java
index a0104cd809..c64c846541 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java
@@ -36,7 +36,7 @@ public class RecipeGenBlastSmelter extends RecipeGenBase {
     public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>();
 
     static {
-        MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
+        MaterialGenerator.mRecipeMapsToGenerate.add(mRecipeGenMap);
     }
 
     public RecipeGenBlastSmelter(final Material M) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java
index 62fd4d39b1..4b7d94f1f4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java
@@ -36,7 +36,7 @@ public class RecipeGenDustGeneration extends RecipeGenBase {
     public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>();
 
     static {
-        MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
+        MaterialGenerator.mRecipeMapsToGenerate.add(mRecipeGenMap);
     }
 
     public RecipeGenDustGeneration(final Material M) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenExtruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenExtruder.java
index 80b9a75a14..a3bf9e6c06 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenExtruder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenExtruder.java
@@ -21,7 +21,7 @@ public class RecipeGenExtruder extends RecipeGenBase {
     public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>();
 
     static {
-        MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
+        MaterialGenerator.mRecipeMapsToGenerate.add(mRecipeGenMap);
     }
 
     public RecipeGenExtruder(final Material M) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluids.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluids.java
index aa2f85f037..aae19c22bd 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluids.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluids.java
@@ -20,7 +20,7 @@ public class RecipeGenFluids extends RecipeGenBase {
     public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>();
 
     static {
-        MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
+        MaterialGenerator.mRecipeMapsToGenerate.add(mRecipeGenMap);
     }
 
     public RecipeGenFluids(final Material M) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluorite.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluorite.java
index 0916febadc..9ed9d2d8a6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluorite.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluorite.java
@@ -33,7 +33,7 @@ public class RecipeGenFluorite extends RecipeGenBase {
     public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>();
 
     static {
-        MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
+        MaterialGenerator.mRecipeMapsToGenerate.add(mRecipeGenMap);
     }
 
     public RecipeGenFluorite(final Material material) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMaterialProcessing.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMaterialProcessing.java
index 8ca1e6f447..352217ff95 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMaterialProcessing.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMaterialProcessing.java
@@ -16,7 +16,6 @@ import net.minecraft.item.ItemStack;
 import gregtech.api.enums.GTValues;
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
@@ -30,7 +29,7 @@ public class RecipeGenMaterialProcessing extends RecipeGenBase {
     public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>();
 
     static {
-        MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
+        MaterialGenerator.mRecipeMapsToGenerate.add(mRecipeGenMap);
     }
 
     public RecipeGenMaterialProcessing(final Material M) {
@@ -63,11 +62,11 @@ public class RecipeGenMaterialProcessing extends RecipeGenBase {
                     partSizes[hu] = (int) material.vSmallestRatio[hu];
                 }
             }
-            AutoMap<Pair<Integer, Material>> componentMap = new AutoMap<>();
+            ArrayList<Pair<Integer, Material>> componentMap = new ArrayList<>();
             int alnsnfds = 0;
             for (MaterialStack r : material.getComposites()) {
                 if (r != null) {
-                    componentMap.put(new Pair<>(partSizes[alnsnfds], r.getStackMaterial()));
+                    componentMap.add(new Pair<>(partSizes[alnsnfds], r.getStackMaterial()));
                 }
                 alnsnfds++;
             }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMetalRecipe.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMetalRecipe.java
index 975d903e87..634784952a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMetalRecipe.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMetalRecipe.java
@@ -22,7 +22,7 @@ public class RecipeGenMetalRecipe extends RecipeGenBase {
     public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>();
 
     static {
-        MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
+        MaterialGenerator.mRecipeMapsToGenerate.add(mRecipeGenMap);
     }
 
     public RecipeGenMetalRecipe(final Material M) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMultisUsingFluidInsteadOfCells.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMultisUsingFluidInsteadOfCells.java
index 20d4fcdb36..196cf30e86 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMultisUsingFluidInsteadOfCells.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMultisUsingFluidInsteadOfCells.java
@@ -11,7 +11,6 @@ import gregtech.api.recipe.RecipeMap;
 import gregtech.api.util.GTRecipe;
 import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.recipe.GTRecipeUtils;
@@ -19,7 +18,7 @@ import gtPlusPlus.core.util.recipe.GTRecipeUtils;
 public class RecipeGenMultisUsingFluidInsteadOfCells {
 
     private static ItemStack mEmptyCell;
-    private static final AutoMap<ItemStack> mItemsToIgnore = new AutoMap<>();
+    private static final ArrayList<ItemStack> mItemsToIgnore = new ArrayList<>();
     private static boolean mInit = false;
 
     private static void init() {
@@ -82,10 +81,10 @@ public class RecipeGenMultisUsingFluidInsteadOfCells {
                 FluidStack[] aInputFluids = x.mFluidInputs.clone();
                 FluidStack[] aOutputFluids = x.mFluidOutputs.clone();
 
-                AutoMap<ItemStack> aInputItemsMap = new AutoMap<>();
-                AutoMap<ItemStack> aOutputItemsMap = new AutoMap<>();
-                AutoMap<FluidStack> aInputFluidsMap = new AutoMap<>();
-                AutoMap<FluidStack> aOutputFluidsMap = new AutoMap<>();
+                ArrayList<ItemStack> aInputItemsMap = new ArrayList<>();
+                ArrayList<ItemStack> aOutputItemsMap = new ArrayList<>();
+                ArrayList<FluidStack> aInputFluidsMap = new ArrayList<>();
+                ArrayList<FluidStack> aOutputFluidsMap = new ArrayList<>();
 
                 // Iterate Inputs, Convert valid items into fluids
                 for (ItemStack aInputStack : aInputItems) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java
index 14d5e86e7b..ed8f446bab 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java
@@ -25,7 +25,6 @@ import gregtech.api.enums.Materials;
 import gregtech.api.util.GTModHandler;
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
@@ -41,7 +40,7 @@ public class RecipeGenOre extends RecipeGenBase {
     public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>();
 
     static {
-        MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
+        MaterialGenerator.mRecipeMapsToGenerate.add(mRecipeGenMap);
     }
 
     public RecipeGenOre(final Material M) {
@@ -100,12 +99,12 @@ public class RecipeGenOre extends RecipeGenBase {
             }
         }
 
-        AutoMap<Material> amJ = new AutoMap<>();
+        ArrayList<Material> amJ = new ArrayList<>();
         int aIndexCounter = 0;
         for (Material g : aMatComp) {
             if (g.hasSolidForm()) {
                 if (getDust(g) != null && getTinyDust(g) != null) {
-                    amJ.put(g);
+                    amJ.add(g);
                 }
             }
         }
@@ -167,10 +166,10 @@ public class RecipeGenOre extends RecipeGenBase {
             bonusB = tVoltageMultiplier > 100 ? material : mStone;
         }
 
-        AutoMap<Pair<Integer, Material>> componentMap = new AutoMap<>();
+        ArrayList<Pair<Integer, Material>> componentMap = new ArrayList<>();
         for (MaterialStack r : material.getComposites()) {
             if (r != null) {
-                componentMap.put(new Pair<>(r.getPartsPerOneHundred(), r.getStackMaterial()));
+                componentMap.add(new Pair<>(r.getPartsPerOneHundred(), r.getStackMaterial()));
             }
         }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenPlasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenPlasma.java
index d281c528dc..b2ec9167c2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenPlasma.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenPlasma.java
@@ -24,7 +24,7 @@ public class RecipeGenPlasma extends RecipeGenBase {
     public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>();
 
     static {
-        MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
+        MaterialGenerator.mRecipeMapsToGenerate.add(mRecipeGenMap);
     }
 
     public RecipeGenPlasma(final Material M) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenPlates.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenPlates.java
index eb48d6d8e7..defc71232b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenPlates.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenPlates.java
@@ -26,7 +26,7 @@ public class RecipeGenPlates extends RecipeGenBase {
     public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>();
 
     static {
-        MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
+        MaterialGenerator.mRecipeMapsToGenerate.add(mRecipeGenMap);
     }
 
     public RecipeGenPlates(final Material M) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java
index 305422ccea..89fdf23ec6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java
@@ -22,7 +22,6 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GTOreDictUnificator;
 import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.state.MaterialState;
@@ -31,11 +30,11 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class RecipeGenRecycling implements Runnable {
 
-    public static AutoMap<Runnable> mQueuedRecyclingGenerators = new AutoMap<>();
+    public static ArrayList<Runnable> mQueuedRecyclingGenerators = new ArrayList<>();
 
     public static void executeGenerators() {
         if (mQueuedRecyclingGenerators.size() > 0) {
-            for (Runnable R : mQueuedRecyclingGenerators.values()) {
+            for (Runnable R : mQueuedRecyclingGenerators) {
                 R.run();
             }
         }
@@ -49,7 +48,7 @@ public class RecipeGenRecycling implements Runnable {
         if (mNameMap == null) {
             mNameMap = this.getNameMap();
         }
-        mQueuedRecyclingGenerators.put(this);
+        mQueuedRecyclingGenerators.add(this);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenShapedCrafting.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenShapedCrafting.java
index 0c07b382ec..97445915f2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenShapedCrafting.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenShapedCrafting.java
@@ -15,7 +15,7 @@ public class RecipeGenShapedCrafting extends RecipeGenBase {
     public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>();
 
     static {
-        MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap);
+        MaterialGenerator.mRecipeMapsToGenerate.add(mRecipeGenMap);
     }
 
     public RecipeGenShapedCrafting(final Material M) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderAlgaeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderAlgaeFarm.java
index bfa8b6d1b1..d5fe301173 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderAlgaeFarm.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderAlgaeFarm.java
@@ -1,5 +1,6 @@
 package gtPlusPlus.xmod.gregtech.loaders.recipe;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 
 import net.minecraft.item.ItemStack;
@@ -8,7 +9,6 @@ import net.minecraftforge.fluids.FluidStack;
 import gregtech.api.enums.GTValues;
 import gregtech.api.util.GTRecipe;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.data.WeightedCollection;
 import gtPlusPlus.core.item.chemistry.AgriculturalChem;
 import gtPlusPlus.core.util.math.MathUtils;
@@ -16,8 +16,8 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class RecipeLoaderAlgaeFarm {
 
-    private static final HashMap<Integer, AutoMap<GTRecipe>> mRecipeCache = new HashMap<>();
-    private static final HashMap<Integer, AutoMap<GTRecipe>> mRecipeCompostCache = new HashMap<>();
+    private static final HashMap<Integer, ArrayList<GTRecipe>> mRecipeCache = new HashMap<>();
+    private static final HashMap<Integer, ArrayList<GTRecipe>> mRecipeCompostCache = new HashMap<>();
 
     public static void generateRecipes() {
         for (int i = 0; i < 15; i++) {
@@ -29,12 +29,12 @@ public class RecipeLoaderAlgaeFarm {
     }
 
     public static GTRecipe getTieredRecipeFromCache(int aTier, boolean aCompost) {
-        HashMap<Integer, AutoMap<GTRecipe>> aMap = aCompost ? mRecipeCompostCache : mRecipeCache;
+        HashMap<Integer, ArrayList<GTRecipe>> aMap = aCompost ? mRecipeCompostCache : mRecipeCache;
         String aComp = aCompost ? "(Compost)" : "";
 
-        AutoMap<GTRecipe> aTemp = aMap.get(aTier);
+        ArrayList<GTRecipe> aTemp = aMap.get(aTier);
         if (aTemp == null || aTemp.isEmpty()) {
-            aTemp = new AutoMap<>();
+            aTemp = new ArrayList<>();
             aMap.put(aTier, aTemp);
             Logger.INFO("Tier " + aTier + aComp + " had no recipes, initialising new map.");
         }
@@ -42,7 +42,7 @@ public class RecipeLoaderAlgaeFarm {
             Logger
                 .INFO("Tier " + aTier + aComp + " has less than 500 recipes, generating " + (500 - aTemp.size()) + ".");
             for (int i = aTemp.size(); i < 500; i++) {
-                aTemp.put(generateBaseRecipe(aCompost, aTier));
+                aTemp.add(generateBaseRecipe(aCompost, aTier));
             }
         }
         int aIndex = MathUtils.randInt(0, aTemp.isEmpty() ? 1 : aTemp.size());
@@ -109,61 +109,59 @@ public class RecipeLoaderAlgaeFarm {
     }
 
     private static ItemStack[] getOutputsForTier(int aTier) {
-
-        // Create an Automap to dump contents into
-        AutoMap<ItemStack> aOutputMap = new AutoMap<>();
+        ArrayList<ItemStack> aOutputMap = new ArrayList<>();
 
         // Add loot relevant to tier and also add any from lower tiers.
 
         if (aTier >= 0) {
-            aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, 2));
-            aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, 4));
+            aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, 2));
+            aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, 4));
             if (MathUtils.randInt(0, 10) > 9) {
-                aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 2));
+                aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 2));
             }
         }
 
         if (aTier >= 1) {
-            aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, 4));
-            aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 2));
+            aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, 4));
+            aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 2));
             if (MathUtils.randInt(0, 10) > 9) {
-                aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 4));
+                aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 4));
             }
         }
         if (aTier >= 2) {
-            aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 2));
-            aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 3));
+            aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 2));
+            aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 3));
             if (MathUtils.randInt(0, 10) > 9) {
-                aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 8));
+                aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 8));
             }
         }
         if (aTier >= 3) {
-            aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 4));
-            aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 1));
+            aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 4));
+            aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 1));
             if (MathUtils.randInt(0, 10) > 9) {
-                aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 4));
+                aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 4));
             }
         }
         if (aTier >= 4) {
-            aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 2));
-            aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 3));
+            aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 2));
+            aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 3));
             if (MathUtils.randInt(0, 10) > 9) {
-                aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, 4));
+                aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, 4));
             }
         }
         if (aTier >= 5) {
-            aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 4));
-            aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, 2));
+            aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 4));
+            aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, 2));
             if (MathUtils.randInt(0, 10) > 9) {
-                aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, 4));
+                aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, 4));
             }
         }
         // Tier 6 is Highest for outputs
         if (aTier >= 6) {
-            aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, 4));
-            aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, 2));
+            aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, 4));
+            aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, 2));
             if (MathUtils.randInt(0, 10) > 9) {
-                aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, 8));
+                aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, 8));
             }
         }
 
@@ -171,10 +169,10 @@ public class RecipeLoaderAlgaeFarm {
         for (int i2 = 0; i2 < 20; i2++) {
             if (aTier >= (6 + i2)) {
                 int aMulti = i2 + 1;
-                aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, aMulti * 4));
-                aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, aMulti * 3));
-                aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, aMulti * 2));
-                aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, aMulti));
+                aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, aMulti * 4));
+                aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, aMulti * 3));
+                aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, aMulti * 2));
+                aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, aMulti));
             } else {
                 i2 = 20;
             }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderLFTR.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderLFTR.java
index b5a3a55cd0..4c87da567b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderLFTR.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderLFTR.java
@@ -5,26 +5,27 @@ import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 import static gregtech.api.util.GTRecipeConstants.LFTR_OUTPUT_POWER;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.liquidFluorineThoriumReactorRecipes;
 
+import java.util.ArrayList;
+
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
 import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.util.GasSpargingRecipeMap;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.material.MaterialsElements;
 import gtPlusPlus.core.material.nuclear.MaterialsFluorides;
 import gtPlusPlus.core.material.nuclear.MaterialsNuclides;
 
 public class RecipeLoaderLFTR {
 
-    private static AutoMap<Fluid> mNobleGases;
-    private static AutoMap<Fluid> mFluorideGases;
-    private static AutoMap<Fluid> mSpargeGases;
+    private static ArrayList<Fluid> mNobleGases;
+    private static ArrayList<Fluid> mFluorideGases;
+    private static ArrayList<Fluid> mSpargeGases;
 
     private static void configureSparging() {
         if (mSpargeGases == null) {
-            mSpargeGases = new AutoMap<>();
+            mSpargeGases = new ArrayList<>();
             mSpargeGases.add(
                 Materials.Helium.getGas(1)
                     .getFluid());
@@ -33,7 +34,7 @@ public class RecipeLoaderLFTR {
                     .getFluid());
         }
         if (mNobleGases == null) {
-            mNobleGases = new AutoMap<>();
+            mNobleGases = new ArrayList<>();
             mNobleGases.add(mSpargeGases.get(0));
             mNobleGases.add(MaterialsElements.getInstance().XENON.getFluid());
             mNobleGases.add(MaterialsElements.getInstance().NEON.getFluid());
@@ -42,7 +43,7 @@ public class RecipeLoaderLFTR {
             mNobleGases.add(MaterialsElements.getInstance().RADON.getFluid());
         }
         if (mFluorideGases == null) {
-            mFluorideGases = new AutoMap<>();
+            mFluorideGases = new ArrayList<>();
             mFluorideGases.add(mSpargeGases.get(1));
             mFluorideGases.add(MaterialsFluorides.LITHIUM_FLUORIDE.getFluid());
             mFluorideGases.add(MaterialsFluorides.NEPTUNIUM_HEXAFLUORIDE.getFluid());