Remove GT++ AutoMap (#3199)

3 files changed, 15 insertions, 15 deletions

diff --git a/src/main/java/gtPlusPlus/core/handler/CompatHandler.java b/src/main/java/gtPlusPlus/core/handler/CompatHandler.java
index 83426c18c4..1c44216344 100644
--- a/src/main/java/gtPlusPlus/core/handler/CompatHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/CompatHandler.java
@@ -5,6 +5,7 @@ import static gregtech.api.enums.Mods.PamsHarvestCraft;
 import static gregtech.api.enums.Mods.Thaumcraft;
 import static gregtech.api.enums.Mods.Witchery;
 
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.Queue;
 import java.util.Set;
@@ -16,7 +17,6 @@ import gregtech.api.enums.GTValues;
 import gregtech.api.util.GTOreDictUnificator;
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
 import gtPlusPlus.core.common.compat.CompatExtraUtils;
 import gtPlusPlus.core.common.compat.CompatHarvestCraft;
@@ -258,11 +258,11 @@ public class CompatHandler {
         runQueuedOnLoadComplete(event);
     }
 
-    public static final AutoMap<RunnableWithInfo<String>> mRecipesToGenerate = new AutoMap<>();
-    public static final AutoMap<RunnableWithInfo<String>> mGtRecipesToGenerate = new AutoMap<>();
+    public static final ArrayList<RunnableWithInfo<String>> mRecipesToGenerate = new ArrayList<>();
+    public static final ArrayList<RunnableWithInfo<String>> mGtRecipesToGenerate = new ArrayList<>();
 
-    public static final AutoMap<RunnableWithInfo<String>> mObjectsToRunInPostInit = new AutoMap<>();
-    public static final AutoMap<ItemPackage> mObjectsToRunInOnLoadComplete = new AutoMap<>();
+    public static final ArrayList<RunnableWithInfo<String>> mObjectsToRunInPostInit = new ArrayList<>();
+    public static final ArrayList<ItemPackage> mObjectsToRunInOnLoadComplete = new ArrayList<>();
 
     public static void runQueuedRecipes() {
         // Add autogenerated Recipes from Item Components
diff --git a/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java b/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java
index 769973f617..36e3b6edd8 100644
--- a/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java
+++ b/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java
@@ -1,14 +1,15 @@
 package gtPlusPlus.core.handler.Recipes;
 
+import java.util.ArrayList;
+
 import net.minecraft.item.ItemStack;
 
 import gregtech.api.util.GTUtility;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class DecayableRecipe {
 
-    public static final AutoMap<DecayableRecipe> mRecipes = new AutoMap<>();
+    public static final ArrayList<DecayableRecipe> mRecipes = new ArrayList<>();
 
     public final int mTime;
     public final ItemStack mInput;
@@ -18,7 +19,7 @@ public class DecayableRecipe {
         mTime = time;
         mInput = input;
         mOutput = output;
-        mRecipes.put(this);
+        mRecipes.add(this);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/handler/events/EntityDeathHandler.java b/src/main/java/gtPlusPlus/core/handler/events/EntityDeathHandler.java
index 4baa7a80dd..35970d9165 100644
--- a/src/main/java/gtPlusPlus/core/handler/events/EntityDeathHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/events/EntityDeathHandler.java
@@ -18,7 +18,6 @@ import com.kuba6000.mobsinfo.api.MobRecipe;
 import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.data.Triplet;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.util.math.MathUtils;
@@ -28,7 +27,7 @@ import gtPlusPlus.core.util.minecraft.PlayerUtils;
 @Optional.Interface(iface = "com.kuba6000.mobsinfo.api.IMobExtraInfoProvider", modid = "mobsinfo")
 public class EntityDeathHandler implements IMobExtraInfoProvider {
 
-    private static final HashMap<Class, AutoMap<Triplet<ItemStack, Integer, Integer>>> mMobDropMap = new HashMap<>();
+    private static final HashMap<Class, ArrayList<Triplet<ItemStack, Integer, Integer>>> mMobDropMap = new HashMap<>();
     private static final HashSet<Class> mInternalClassKeyCache = new HashSet<>();
 
     /**
@@ -41,11 +40,11 @@ public class EntityDeathHandler implements IMobExtraInfoProvider {
      */
     public static void registerDropsForMob(Class aMobClass, ItemStack aStack, int aMaxAmount, int aChance) {
         Triplet<ItemStack, Integer, Integer> aData = new Triplet<>(aStack, aMaxAmount, aChance);
-        AutoMap<Triplet<ItemStack, Integer, Integer>> aDataMap = mMobDropMap.get(aMobClass);
+        ArrayList<Triplet<ItemStack, Integer, Integer>> aDataMap = mMobDropMap.get(aMobClass);
         if (aDataMap == null) {
-            aDataMap = new AutoMap<>();
+            aDataMap = new ArrayList<>();
         }
-        aDataMap.put(aData);
+        aDataMap.add(aData);
         mMobDropMap.put(aMobClass, aDataMap);
 
         Logger.INFO(
@@ -69,7 +68,7 @@ public class EntityDeathHandler implements IMobExtraInfoProvider {
     }
 
     private static boolean processDropsForMob(EntityLivingBase entityLiving) {
-        AutoMap<Triplet<ItemStack, Integer, Integer>> aMobData = mMobDropMap.get(entityLiving.getClass());
+        ArrayList<Triplet<ItemStack, Integer, Integer>> aMobData = mMobDropMap.get(entityLiving.getClass());
         boolean aDidDrop = false;
         if (aMobData != null) {
             if (!aMobData.isEmpty()) {
@@ -137,7 +136,7 @@ public class EntityDeathHandler implements IMobExtraInfoProvider {
     @Override
     public void provideExtraDropsInformation(@NotNull String entityString, @NotNull ArrayList<MobDrop> drops,
         @NotNull MobRecipe recipe) {
-        AutoMap<Triplet<ItemStack, Integer, Integer>> dropEntry = mMobDropMap.get(recipe.entity.getClass());
+        ArrayList<Triplet<ItemStack, Integer, Integer>> dropEntry = mMobDropMap.get(recipe.entity.getClass());
 
         if (dropEntry != null && !dropEntry.isEmpty()) {
             for (Triplet<ItemStack, Integer, Integer> data : dropEntry) {