Remove GT++ AutoMap (#3199)

6 files changed, 25 insertions, 22 deletions

diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java
index 113440e8b5..4b687f63af 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.tileentities.general;
 
+import java.util.ArrayList;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;
@@ -10,7 +12,6 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
 import net.minecraft.tileentity.TileEntity;
 
 import gregtech.api.util.GTUtility;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.inventories.InventoryCircuitProgrammer;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.slots.SlotIntegratedCircuit;
@@ -69,11 +70,11 @@ public class TileEntityCircuitProgrammer extends TileEntity implements ISidedInv
         if (aInputs[25] != null) {
             hasOutput = true;
         }
-        AutoMap<Integer> aValidSlots = new AutoMap<>();
+        ArrayList<Integer> aValidSlots = new ArrayList<>();
         int aSlotCount = 0;
         for (ItemStack i : aInputs) {
             if (i != null) {
-                aValidSlots.put(aSlotCount);
+                aValidSlots.add(aSlotCount);
             }
             aSlotCount++;
         }
diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java
index 7f1cde2476..14c337c088 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.tileentities.general;
 
+import java.util.ArrayList;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;
@@ -11,7 +13,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.fluids.FluidStack;
 
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.container.ContainerVolumetricFlaskSetter;
 import gtPlusPlus.core.inventories.InventoryVolumetricFlaskSetter;
 import gtPlusPlus.core.util.math.MathUtils;
@@ -130,11 +131,11 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide
                 return false;
             }
         }
-        AutoMap<Integer> aValidSlots = new AutoMap<>();
+        ArrayList<Integer> aValidSlots = new ArrayList<>();
         int aSlotCount = 0;
         for (ItemStack i : aInputs) {
             if (i != null) {
-                aValidSlots.put(aSlotCount);
+                aValidSlots.add(aSlotCount);
             }
             aSlotCount++;
         }
diff --git a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java
index 5e0aaf8370..6f0d5fcea2 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.tileentities.machines;
 
+import java.util.ArrayList;
+
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.passive.EntityAnimal;
 import net.minecraft.entity.passive.EntityChicken;
@@ -14,7 +16,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
 
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.item.chemistry.AgriculturalChem;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -63,10 +64,10 @@ public class TileEntityAdvPooCollector extends TileEntityBaseFluidCollector {
         return false;
     }
 
-    private static AutoMap<Class> aEntityToDrain = new AutoMap<>();
+    private static final ArrayList<Class> aEntityToDrain = new ArrayList<>();
 
     @Override
-    public AutoMap<Class> aThingsToLookFor() {
+    public ArrayList<Class> aThingsToLookFor() {
         if (aEntityToDrain.isEmpty()) {
             aEntityToDrain.add(EntityAnimal.class);
             aEntityToDrain.add(IAnimals.class);
diff --git a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java
index 6340415e82..988268f6e9 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java
@@ -1,5 +1,6 @@
 package gtPlusPlus.core.tileentities.machines;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.entity.item.EntityItem;
@@ -19,7 +20,6 @@ import net.minecraftforge.fluids.FluidTank;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
 
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.minecraft.BTF_FluidTank;
 import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.core.tileentities.base.TileEntityBase;
@@ -150,7 +150,7 @@ public abstract class TileEntityBaseFluidCollector extends TileEntityBase implem
         return MathUtils.randInt(200, 300);
     }
 
-    public abstract AutoMap<Class> aThingsToLookFor();
+    public abstract ArrayList<Class> aThingsToLookFor();
 
     public abstract void onPreLogicTick();
 
@@ -227,7 +227,7 @@ public abstract class TileEntityBaseFluidCollector extends TileEntityBase implem
 
     /**
      * Return the amount of fluid for this entity type
-     * 
+     *
      * @param aEntity
      * @return
      */
diff --git a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java
index c91476f556..08ceed597d 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java
@@ -28,7 +28,6 @@ import net.minecraftforge.oredict.OreDictionary;
 import forestry.lepidopterology.entities.EntityButterfly;
 import gregtech.api.enums.Mods;
 import gregtech.api.util.GTUtility;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.minecraft.BTF_FluidTank;
 import gtPlusPlus.core.inventories.InventoryPestKiller;
 import gtPlusPlus.core.material.MaterialMisc;
@@ -51,12 +50,12 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory,
     private boolean mNeedsUpdate = false;
     private String mCustomName;
 
-    private static final AutoMap<Class<?>> mEntityMap = new AutoMap<>();
+    private static final ArrayList<Class<?>> mEntityMap = new ArrayList<>();
 
     static {
-        mEntityMap.put(EntityBat.class);
+        mEntityMap.add(EntityBat.class);
         if (Mods.Forestry.isModLoaded()) {
-            mEntityMap.put(EntityButterfly.class);
+            mEntityMap.add(EntityButterfly.class);
         }
     }
 
@@ -102,7 +101,7 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory,
             // code block
         }
         int aChunkCount = 0;
-        AutoMap<Entity> entities = new AutoMap<>();
+        ArrayList<Entity> entities = new ArrayList<>();
         if (min != 0 && max != 0) {
             for (int x = min; x < max; x++) {
                 for (int z = min; z < max; z++) {
@@ -117,7 +116,7 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory,
                                         for (Class<?> C : mEntityMap) {
                                             if (e.getClass()
                                                 .equals(C) || C.isAssignableFrom(e.getClass())) {
-                                                entities.put((Entity) e);
+                                                entities.add((Entity) e);
                                             }
                                         }
                                     }
@@ -138,7 +137,7 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory,
                                 for (Class<?> C : mEntityMap) {
                                     if (e.getClass()
                                         .equals(C) || C.isAssignableFrom(e.getClass())) {
-                                        entities.put((Entity) e);
+                                        entities.add((Entity) e);
                                     }
                                 }
                             }
diff --git a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java
index d0d4ee3661..90864d1878 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.tileentities.machines;
 
+import java.util.ArrayList;
+
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.passive.EntityAnimal;
 import net.minecraft.entity.passive.EntityChicken;
@@ -12,7 +14,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
 
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.item.chemistry.AgriculturalChem;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -67,10 +68,10 @@ public class TileEntityPooCollector extends TileEntityBaseFluidCollector {
         return false;
     }
 
-    private static AutoMap<Class> aEntityToDrain = new AutoMap<>();
+    private static final ArrayList<Class> aEntityToDrain = new ArrayList<>();
 
     @Override
-    public AutoMap<Class> aThingsToLookFor() {
+    public ArrayList<Class> aThingsToLookFor() {
         if (aEntityToDrain.isEmpty()) {
             aEntityToDrain.add(EntityAnimal.class);
             aEntityToDrain.add(IAnimals.class);