Remove GT++ AutoMap (#3199)

8 files changed, 87 insertions, 125 deletions

diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java
index cdb61a5e46..12e127c3b7 100644
--- a/src/main/java/gtPlusPlus/core/item/ModItems.java
+++ b/src/main/java/gtPlusPlus/core/item/ModItems.java
@@ -958,23 +958,21 @@ public final class ModItems {
         MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.GEAR, MaterialsElements.STANDALONE.RHUGNOR);
 
         // Special Sillyness
-        if (true) {
 
-            if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateSodium", 1) == null) {
-                new BaseItemPlate(MaterialsElements.getInstance().SODIUM);
-            }
+        if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateSodium", 1) == null) {
+            new BaseItemPlate(MaterialsElements.getInstance().SODIUM);
+        }
 
-            Material meatRaw = MaterialsOther.MEAT;
-            // A plate of Meat.
-            if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateMeatRaw", 1) == null) {
-                itemPlateRawMeat = new BaseItemPlate(meatRaw);
-                ItemUtils.registerFuel(ItemUtils.getSimpleStack(itemPlateRawMeat), 100);
-            }
-            // A Block of Meat.
-            if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("blockMeatRaw", 1) == null) {
-                blockRawMeat = new BlockBaseModular(meatRaw, BlockTypes.STANDARD);
-                ItemUtils.registerFuel(ItemUtils.getSimpleStack(blockRawMeat), 900);
-            }
+        Material meatRaw = MaterialsOther.MEAT;
+        // A plate of Meat.
+        if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateMeatRaw", 1) == null) {
+            itemPlateRawMeat = new BaseItemPlate(meatRaw);
+            ItemUtils.registerFuel(ItemUtils.getSimpleStack(itemPlateRawMeat), 100);
+        }
+        // A Block of Meat.
+        if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("blockMeatRaw", 1) == null) {
+            blockRawMeat = new BlockBaseModular(meatRaw, BlockTypes.STANDARD);
+            ItemUtils.registerFuel(ItemUtils.getSimpleStack(blockRawMeat), 900);
         }
 
         // A plate of Vanadium.
diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java
index 54cfefbac2..240c0851e1 100644
--- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java
+++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java
@@ -1,5 +1,6 @@
 package gtPlusPlus.core.item.base.itemblock;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -13,12 +14,11 @@ import net.minecraft.util.IIcon;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.api.interfaces.ITileTooltip;
-import gtPlusPlus.api.objects.data.AutoMap;
 
 public class ItemBlockMeta extends ItemBlockWithMetadata {
 
     private final Block mBlock;
-    private HashMap<Integer, AutoMap<String>> aTooltips = new LinkedHashMap<>();
+    private HashMap<Integer, ArrayList<String>> aTooltips = new LinkedHashMap<>();
 
     public ItemBlockMeta(final Block aBlock) {
         super(aBlock, aBlock);
@@ -36,11 +36,9 @@ public class ItemBlockMeta extends ItemBlockWithMetadata {
         Block aThis = Block.getBlockFromItem(stack.getItem());
         if (aThis != null) {
             if (!aTooltips.isEmpty()) {
-                AutoMap<String> h = aTooltips.get(stack.getItemDamage());
+                ArrayList<String> h = aTooltips.get(stack.getItemDamage());
                 if (h != null && !h.isEmpty()) {
-                    for (String s : h) {
-                        list.add(s);
-                    }
+                    list.addAll(h);
                 }
             }
         }
diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java
index 45d0e4f60e..538436d610 100644
--- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java
+++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java
@@ -1,5 +1,6 @@
 package gtPlusPlus.core.item.base.itemblock;
 
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -12,7 +13,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.block.base.BlockBaseOre;
 import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.material.Material;
@@ -40,27 +40,26 @@ public class ItemBlockOre extends ItemBlock {
         }
     }
 
-    private static Map<String, AutoMap<String>> mMapOreBlockItemToDimName = new LinkedHashMap<>();
+    private static final Map<String, HashSet<String>> mMapOreBlockItemToDimName = new LinkedHashMap<>();
     private static boolean mInitOres_Everglades = false;
-    private AutoMap<String> mDimsForThisOre = new AutoMap<>();
+    private HashSet<String> mDimsForThisOre = new HashSet<>();
 
     @Override
-    public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
+    public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List<String> list,
+        final boolean bool) {
 
         if (!mInitOres_Everglades) {
             for (WorldGen_GT_Ore_Layer f : gtPlusPlus.everglades.gen.gt.WorldGen_Ores.validOreveins.values()) {
                 Material[] m2 = new Material[] { f.mPrimary, f.mSecondary, f.mBetween, f.mSporadic };
                 for (Material m1 : m2) {
-                    AutoMap<String> aMap = mMapOreBlockItemToDimName.get(
+                    HashSet<String> aMap = mMapOreBlockItemToDimName.get(
                         m1.getUnlocalizedName()
                             .toLowerCase());
                     if (aMap == null) {
-                        aMap = new AutoMap<>();
+                        aMap = new HashSet<>();
                     }
                     String aDimName = "Everglades";
-                    if (!aMap.containsValue(aDimName)) {
-                        aMap.put(aDimName);
-                    }
+                    aMap.add(aDimName);
                     mMapOreBlockItemToDimName.put(
                         m1.getUnlocalizedName()
                             .toLowerCase(),
@@ -104,7 +103,7 @@ public class ItemBlockOre extends ItemBlock {
             }
 
             if (mDimsForThisOre.isEmpty()) {
-                AutoMap<String> A = mMapOreBlockItemToDimName.get(
+                HashSet<String> A = mMapOreBlockItemToDimName.get(
                     this.mThisMaterial.getUnlocalizedName()
                         .toLowerCase());
                 if (A != null) {
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
index 1e05e123cb..c1a4ae845a 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
@@ -33,7 +33,6 @@ import gregtech.api.enums.TierEU;
 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.minecraft.ItemPackage;
 import gtPlusPlus.core.item.circuit.GTPPIntegratedCircuitItem;
 import gtPlusPlus.core.recipe.common.CI;
@@ -50,7 +49,7 @@ public class AgriculturalChem extends ItemPackage {
     private static boolean aBOP;
     private static boolean aTiCon;
 
-    private static AutoMap<FluidStack> mBloodFluids = new AutoMap<>();
+    private static ArrayList<FluidStack> mBloodFluids = new ArrayList<>();
 
     /**
      * Fluids
@@ -306,7 +305,7 @@ public class AgriculturalChem extends ItemPackage {
             if (aBlood != null) {
                 Logger.INFO("Found Biome's o Plenty, enabled Blood support.");
                 CustomBlood = aBlood.getFluid();
-                mBloodFluids.put(aBlood);
+                mBloodFluids.add(aBlood);
             }
         }
 
@@ -315,7 +314,7 @@ public class AgriculturalChem extends ItemPackage {
             if (aBlood != null) {
                 Logger.INFO("Found Tinker's Construct, enabled Blood support.");
                 CustomBlood = aBlood.getFluid();
-                mBloodFluids.put(FluidUtils.getFluidStack("blood", 100));
+                mBloodFluids.add(FluidUtils.getFluidStack("blood", 100));
             }
         }
 
@@ -336,24 +335,24 @@ public class AgriculturalChem extends ItemPackage {
                 }
             }
             Logger.INFO("Using " + CustomBlood.getName());
-            mBloodFluids.put(FluidUtils.getFluidStack(CustomBlood, 100));
+            mBloodFluids.add(FluidUtils.getFluidStack(CustomBlood, 100));
         }
     }
 
-    private static final AutoMap<ItemStack> mMeats = new AutoMap<>();
-    private static final AutoMap<ItemStack> mFish = new AutoMap<>();
-    private static final AutoMap<ItemStack> mFruits = new AutoMap<>();
-    private static final AutoMap<ItemStack> mVege = new AutoMap<>();
-    private static final AutoMap<ItemStack> mNuts = new AutoMap<>();
-    private static final AutoMap<ItemStack> mSeeds = new AutoMap<>();
-    private static final AutoMap<ItemStack> mPeat = new AutoMap<>();
-    private static final AutoMap<ItemStack> mBones = new AutoMap<>();
-    private static final AutoMap<ItemStack> mBoneMeal = new AutoMap<>();
-
-    private static final AutoMap<ItemStack> mList_Master_Meats = new AutoMap<>();
-    private static final AutoMap<ItemStack> mList_Master_FruitVege = new AutoMap<>();
-    private static final AutoMap<ItemStack> mList_Master_Seeds = new AutoMap<>();
-    private static final AutoMap<ItemStack> mList_Master_Bones = new AutoMap<>();
+    private static final ArrayList<ItemStack> mMeats = new ArrayList<>();
+    private static final ArrayList<ItemStack> mFish = new ArrayList<>();
+    private static final ArrayList<ItemStack> mFruits = new ArrayList<>();
+    private static final ArrayList<ItemStack> mVege = new ArrayList<>();
+    private static final ArrayList<ItemStack> mNuts = new ArrayList<>();
+    private static final ArrayList<ItemStack> mSeeds = new ArrayList<>();
+    private static final ArrayList<ItemStack> mPeat = new ArrayList<>();
+    private static final ArrayList<ItemStack> mBones = new ArrayList<>();
+    private static final ArrayList<ItemStack> mBoneMeal = new ArrayList<>();
+
+    private static final ArrayList<ItemStack> mList_Master_Meats = new ArrayList<>();
+    private static final ArrayList<ItemStack> mList_Master_FruitVege = new ArrayList<>();
+    private static final ArrayList<ItemStack> mList_Master_Seeds = new ArrayList<>();
+    private static final ArrayList<ItemStack> mList_Master_Bones = new ArrayList<>();
 
     private static void processAllOreDict() {
         processOreDict("listAllmeatraw", mMeats);
@@ -367,9 +366,7 @@ public class AgriculturalChem extends ItemPackage {
         processOreDict("dustBone", mBoneMeal);
         // Just make a mega list, makes life easier.
         if (!mMeats.isEmpty()) {
-            for (ItemStack g : mMeats) {
-                mList_Master_Meats.put(g);
-            }
+            mList_Master_Meats.addAll(mMeats);
         }
         if (!mFish.isEmpty()) {
             for (ItemStack g : mFish) {
@@ -381,33 +378,23 @@ public class AgriculturalChem extends ItemPackage {
                     }
                 }
                 if (foundDupe) continue;
-                mList_Master_Meats.put(g);
+                mList_Master_Meats.add(g);
             }
         }
         if (!mFruits.isEmpty()) {
-            for (ItemStack g : mFruits) {
-                mList_Master_FruitVege.put(g);
-            }
+            mList_Master_FruitVege.addAll(mFruits);
         }
         if (!mVege.isEmpty()) {
-            for (ItemStack g : mVege) {
-                mList_Master_FruitVege.put(g);
-            }
+            mList_Master_FruitVege.addAll(mVege);
         }
         if (!mNuts.isEmpty()) {
-            for (ItemStack g : mNuts) {
-                mList_Master_FruitVege.put(g);
-            }
+            mList_Master_FruitVege.addAll(mNuts);
         }
         if (!mSeeds.isEmpty()) {
-            for (ItemStack g : mSeeds) {
-                mList_Master_Seeds.put(g);
-            }
+            mList_Master_Seeds.addAll(mSeeds);
         }
         if (!mBoneMeal.isEmpty()) {
-            for (ItemStack g : mBoneMeal) {
-                mList_Master_Bones.put(g);
-            }
+            mList_Master_Bones.addAll(mBoneMeal);
         }
         if (!mBones.isEmpty()) {
             for (ItemStack g : mBones) {
@@ -419,17 +406,15 @@ public class AgriculturalChem extends ItemPackage {
                     }
                 }
                 if (foundDupe) continue;
-                mList_Master_Bones.put(g);
+                mList_Master_Bones.add(g);
             }
         }
     }
 
-    private static void processOreDict(String aOreName, AutoMap<ItemStack> aMap) {
+    private static void processOreDict(String aOreName, ArrayList<ItemStack> aMap) {
         ArrayList<ItemStack> aTemp = OreDictionary.getOres(aOreName);
         if (!aTemp.isEmpty()) {
-            for (ItemStack stack : aTemp) {
-                aMap.put(stack);
-            }
+            aMap.addAll(aTemp);
         }
     }
 
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java
index 4909d269cc..e945729cf8 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java
@@ -8,6 +8,7 @@ import static gregtech.api.util.GTRecipeConstants.CHEMPLANT_CASING_TIER;
 import static gregtech.api.util.GTRecipeConstants.COIL_HEAT;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.*;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 
 import net.minecraft.item.Item;
@@ -22,7 +23,6 @@ import gregtech.api.enums.TierEU;
 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.api.objects.data.Quad;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
@@ -642,10 +642,10 @@ public class MilledOreProcessing extends ItemPackage {
     }
 
     private void addPineOilExtraction() {
-        AutoMap<ItemStack> aLogs = new AutoMap<>();
-        AutoMap<ItemStack> aLeaves = new AutoMap<>();
-        AutoMap<ItemStack> aSaplings = new AutoMap<>();
-        AutoMap<ItemStack> aPinecones = new AutoMap<>();
+        ArrayList<ItemStack> aLogs = new ArrayList<>();
+        ArrayList<ItemStack> aLeaves = new ArrayList<>();
+        ArrayList<ItemStack> aSaplings = new ArrayList<>();
+        ArrayList<ItemStack> aPinecones = new ArrayList<>();
 
         ItemStack aCrushedPine = ItemUtils.getSimpleStack(AgriculturalChem.mCrushedPine, 1);
 
@@ -745,10 +745,10 @@ public class MilledOreProcessing extends ItemPackage {
 
     public static ItemStack[] cleanArray(ItemStack[] input) {
         int aArraySize = input.length;
-        AutoMap<ItemStack> aCleanedItems = new AutoMap<>();
+        ArrayList<ItemStack> aCleanedItems = new ArrayList<>();
         for (ItemStack checkStack : input) {
             if (ItemUtils.checkForInvalidItems(checkStack)) {
-                aCleanedItems.put(checkStack);
+                aCleanedItems.add(checkStack);
             }
         }
         ItemStack[] aOutput = new ItemStack[aCleanedItems.size()];
@@ -799,10 +799,9 @@ public class MilledOreProcessing extends ItemPackage {
 
     private static ItemStack[] getArrayFromQuad(
         Quad<Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>> aData) {
-        AutoMap<ItemStack> aOutputs = new AutoMap<>();
+        ArrayList<ItemStack> aOutputs = new ArrayList<>();
         for (Object aPair : aData.values()) {
-            if (aPair != null && Pair.class.isInstance(aPair)) {
-                Pair aObj = (Pair) aPair;
+            if (aPair instanceof Pair aObj) {
                 Material aMat = (Material) aObj.getKey();
                 int aCount = (int) aObj.getValue();
                 aOutputs.addAll(getItemStackFromPair(aMat, aCount));
@@ -816,23 +815,23 @@ public class MilledOreProcessing extends ItemPackage {
         return aRealOutputArray;
     }
 
-    private static AutoMap<ItemStack> getItemStackFromPair(Material aMat, Integer aCount) {
-        AutoMap<ItemStack> aOutputs = new AutoMap<>();
+    private static ArrayList<ItemStack> getItemStackFromPair(Material aMat, Integer aCount) {
+        ArrayList<ItemStack> aOutputs = new ArrayList<>();
         if (aCount > 64) {
-            AutoMap<Integer> sizes = getStackSizes(aCount);
+            ArrayList<Integer> sizes = getStackSizes(aCount);
             for (int aSplitSize : sizes) {
                 ItemStack aDustStack = aMat.getDust(aSplitSize);
-                aOutputs.put(aDustStack);
+                aOutputs.add(aDustStack);
             }
         } else {
             ItemStack aDustStack = aMat.getDust(aCount);
-            aOutputs.put(aDustStack);
+            aOutputs.add(aDustStack);
         }
         return aOutputs;
     }
 
-    private static AutoMap<Integer> getStackSizes(int aBigSize) {
-        AutoMap<Integer> aSizes = new AutoMap<>();
+    private static ArrayList<Integer> getStackSizes(int aBigSize) {
+        ArrayList<Integer> aSizes = new ArrayList<>();
         if (aBigSize <= 64) {
             aSizes.add(aBigSize);
         } else {
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java b/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java
index 1604bcb571..0c3d481fd7 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java
@@ -2,6 +2,7 @@ package gtPlusPlus.core.item.chemistry;
 
 import static gregtech.api.enums.Mods.GTPlusPlus;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
@@ -12,7 +13,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IIcon;
 
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.item.base.misc.BaseItemParticle;
 import gtPlusPlus.core.material.Particle;
 import gtPlusPlus.core.material.Particle.ElementaryGroup;
@@ -87,7 +87,7 @@ public class StandardBaseParticles extends BaseItemParticle {
     }
 
     public static Particle getParticle(ItemStack aStack) {
-        AutoMap<Particle> g = Particle.aMap;
+        ArrayList<Particle> g = Particle.aMap;
         for (Particle p : g) {
             String aPartName = Utils.sanitizeString(p.mParticleName.toLowerCase());
             String expectedPart = Utils.sanitizeString(aTypes[aStack.getItemDamage()].toLowerCase());
diff --git a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java
index 01f2b1b263..5c38dde63b 100644
--- a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java
+++ b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java
@@ -3,6 +3,7 @@ package gtPlusPlus.core.item.food;
 import static gregtech.api.enums.Mods.GTPlusPlus;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 
@@ -24,7 +25,6 @@ import gregtech.api.enums.Materials;
 import gregtech.api.objects.ItemData;
 import gregtech.api.objects.MaterialStack;
 import gregtech.api.util.GTOreDictUnificator;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.util.math.MathUtils;
@@ -95,7 +95,7 @@ public class BaseItemMetaFood extends ItemFood {
             4,
             1,
             64,
-            new AutoMap<>(),
+            new ArrayList<>(),
             new setOnFire(),
             getOreDictNamesAsArrayList("listAllmeatcooked"));
     }
@@ -105,7 +105,7 @@ public class BaseItemMetaFood extends ItemFood {
     private static final HashMap<Integer, EnumRarity> mRarityMap = new HashMap<>();
     private static final HashMap<Integer, Integer> mHealAmountMap = new HashMap<>();
     private static final HashMap<Integer, Float> mSaturationAmountMap = new HashMap<>();
-    private static final HashMap<Integer, AutoMap<PotionEffectPackage>> mPotionEffectsMap = new HashMap<>();
+    private static final HashMap<Integer, ArrayList<PotionEffectPackage>> mPotionEffectsMap = new HashMap<>();
     private static final HashMap<Integer, Boolean> mHasSpecialBehaviourMap = new HashMap<>();
     private static final HashMap<Integer, SpecialFoodBehaviour> mSpecialBehaviourMap = new HashMap<>();
     private static final HashMap<Integer, ArrayList<String>> mOreDictNames = new HashMap<>();
@@ -119,7 +119,7 @@ public class BaseItemMetaFood extends ItemFood {
             aHealAmount,
             aSaturationModifier,
             aMaxStacksize,
-            new AutoMap<>(),
+            new ArrayList<>(),
             null,
             new ArrayList<>());
     }
@@ -133,27 +133,13 @@ public class BaseItemMetaFood extends ItemFood {
             aHealAmount,
             aSaturationModifier,
             aMaxStacksize,
-            new AutoMap<>(),
+            new ArrayList<>(),
             null,
             aOreDictNames);
     }
 
     public static void registerNewMetaFood(final int aMetaID, String aTooltip, final int aHealAmount,
-        final float aSaturationModifier, final int aMaxStacksize, final AutoMap<PotionEffectPackage> aPotionEffects) {
-        registerNewMetaFood(
-            aMetaID,
-            aTooltip,
-            EnumRarity.common,
-            aHealAmount,
-            aSaturationModifier,
-            aMaxStacksize,
-            new AutoMap<>(),
-            null,
-            new ArrayList<>());
-    }
-
-    public static void registerNewMetaFood(final int aMetaID, String aTooltip, final int aHealAmount,
-        final float aSaturationModifier, final int aMaxStacksize, final AutoMap<PotionEffectPackage> aPotionEffects,
+        final float aSaturationModifier, final int aMaxStacksize, final ArrayList<PotionEffectPackage> aPotionEffects,
         final ArrayList<String> aOreDictNames) {
         registerNewMetaFood(
             aMetaID,
@@ -169,7 +155,7 @@ public class BaseItemMetaFood extends ItemFood {
 
     public static void registerNewMetaFood(final int aMetaID, String aTooltip, EnumRarity aRarity,
         final int aHealAmount, final float aSaturationModifier, final int aMaxStacksize,
-        final AutoMap<PotionEffectPackage> aPotionEffects, final SpecialFoodBehaviour aSpecialBehaviour) {
+        final ArrayList<PotionEffectPackage> aPotionEffects, final SpecialFoodBehaviour aSpecialBehaviour) {
         registerNewMetaFood(
             aMetaID,
             aTooltip,
@@ -184,7 +170,7 @@ public class BaseItemMetaFood extends ItemFood {
 
     public static void registerNewMetaFood(final int aMetaID, String aTooltip, EnumRarity aRarity,
         final int aHealAmount, final float aSaturationModifier, final int aMaxStacksize,
-        final AutoMap<PotionEffectPackage> aPotionEffects, final SpecialFoodBehaviour aSpecialBehaviour,
+        final ArrayList<PotionEffectPackage> aPotionEffects, final SpecialFoodBehaviour aSpecialBehaviour,
         final ArrayList<String> aOreDictNames) {
         mTotalMetaItems++;
         mMaxStackSizeMap.put(aMetaID, aMaxStacksize);
@@ -257,8 +243,8 @@ public class BaseItemMetaFood extends ItemFood {
     @Override
     protected void onFoodEaten(final ItemStack aStack, final World aWorld, final EntityPlayer aPlayer) {
         // super.onFoodEaten(stack, world, player);
-        AutoMap<PotionEffectPackage> aPotionEffects = mPotionEffectsMap.get(getMetaKey(aStack));
-        if (!aWorld.isRemote && aPotionEffects != null && aPotionEffects.size() > 0) {
+        ArrayList<PotionEffectPackage> aPotionEffects = mPotionEffectsMap.get(getMetaKey(aStack));
+        if (!aWorld.isRemote && aPotionEffects != null && !aPotionEffects.isEmpty()) {
             for (PotionEffectPackage aFoodEffect : aPotionEffects) {
                 if (MathUtils.randInt(0, 100) <= aFoodEffect.getChance() || aFoodEffect.getChance() == 100) {
                     PotionEffect aEffect = aFoodEffect.getEffect();
@@ -426,12 +412,10 @@ public class BaseItemMetaFood extends ItemFood {
         }
     }
 
-    private static AutoMap<PotionEffectPackage> getPotionEffectPackage(PotionEffectPackage... aEffects) {
-        AutoMap<PotionEffectPackage> aPackage = new AutoMap<>();
+    private static ArrayList<PotionEffectPackage> getPotionEffectPackage(PotionEffectPackage... aEffects) {
+        ArrayList<PotionEffectPackage> aPackage = new ArrayList<>();
         if (aEffects != null && aEffects.length > 0) {
-            for (PotionEffectPackage aEffect : aEffects) {
-                aPackage.put(aEffect);
-            }
+            Collections.addAll(aPackage, aEffects);
         }
         return aPackage;
     }
diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/ItemGregtechPump.java b/src/main/java/gtPlusPlus/core/item/tool/misc/ItemGregtechPump.java
index 1c896e8497..a8173571dc 100644
--- a/src/main/java/gtPlusPlus/core/item/tool/misc/ItemGregtechPump.java
+++ b/src/main/java/gtPlusPlus/core/item/tool/misc/ItemGregtechPump.java
@@ -51,7 +51,6 @@ import gregtech.api.util.GTModHandler;
 import gregtech.api.util.GTOreDictUnificator;
 import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
@@ -1140,9 +1139,9 @@ public class ItemGregtechPump extends Item implements ISpecialElectricItem, IEle
             return getStoredFluidOfVanillaTank((IFluidTank) aTileEntity);
         }
         FluidStack f;
-        AutoMap<FluidTankInfo[]> m = new AutoMap<>();
+        ArrayList<FluidTankInfo[]> m = new ArrayList<>();
         for (int i = 0; i < 6; i++) {
-            m.put(aTileEntity.getTankInfo(ForgeDirection.getOrientation(i)));
+            m.add(aTileEntity.getTankInfo(ForgeDirection.getOrientation(i)));
         }
         if (m.get(0) != null && m.get(0)[0] != null && m.get(0)[0].fluid != null) {
             return m.get(0)[0].fluid;