Remove GT++ AutoMap (#3199)

3 files changed, 13 insertions, 10 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchCatalysts.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchCatalysts.java
index 13bb4b44f1..ca8624a7d2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchCatalysts.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchCatalysts.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers;
 
+import java.util.ArrayList;
+
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 
@@ -9,7 +11,6 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.objects.GTRenderedTexture;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -55,8 +56,8 @@ public class MTEHatchCatalysts extends MTEHatchNbtConsumable {
     }
 
     @Override
-    public AutoMap<ItemStack> getItemsValidForUsageSlots() {
-        return new AutoMap<>();
+    public ArrayList<ItemStack> getItemsValidForUsageSlots() {
+        return new ArrayList<>();
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchMillingBalls.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchMillingBalls.java
index a40ea08ec1..9f50f9846e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchMillingBalls.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchMillingBalls.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers;
 
+import java.util.ArrayList;
+
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 
@@ -9,7 +11,6 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.objects.GTRenderedTexture;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -55,8 +56,8 @@ public class MTEHatchMillingBalls extends MTEHatchNbtConsumable {
     }
 
     @Override
-    public AutoMap<ItemStack> getItemsValidForUsageSlots() {
-        return new AutoMap<>();
+    public ArrayList<ItemStack> getItemsValidForUsageSlots() {
+        return new ArrayList<>();
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchNbtConsumable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchNbtConsumable.java
index dbcef2d9e7..b626bcc8ba 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchNbtConsumable.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchNbtConsumable.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers;
 
+import java.util.ArrayList;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
@@ -18,7 +20,6 @@ import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.MTEHatch;
 import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public abstract class MTEHatchNbtConsumable extends MTEHatch implements IAddGregtechLogo {
@@ -165,8 +166,8 @@ public abstract class MTEHatchNbtConsumable extends MTEHatch implements IAddGreg
         return mTotalSlotCount - 1;
     }
 
-    public final AutoMap<ItemStack> getContentUsageSlots() {
-        AutoMap<ItemStack> aItems = new AutoMap<>();
+    public final ArrayList<ItemStack> getContentUsageSlots() {
+        ArrayList<ItemStack> aItems = new ArrayList<>();
         for (int i = mInputslotCount; i < mTotalSlotCount; i++) {
             if (mInventory[i] != null) {
                 aItems.add(mInventory[i]);
@@ -248,7 +249,7 @@ public abstract class MTEHatchNbtConsumable extends MTEHatch implements IAddGreg
      *
      * @return
      */
-    public abstract AutoMap<ItemStack> getItemsValidForUsageSlots();
+    public abstract ArrayList<ItemStack> getItemsValidForUsageSlots();
 
     /**
      * Checks if the given item is valid for Usage Slots. Can be overridden for easier handling if you already have