Remove GT++ AutoMap (#3199)

3 files changed, 19 insertions, 22 deletions

diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
index bace2937fd..c546d2114e 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
@@ -27,7 +27,6 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.api.interfaces.ITileTooltip;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.minecraft.CubicObject;
 import gtPlusPlus.api.objects.minecraft.SafeTexture;
 import gtPlusPlus.core.lib.GTPPCore;
@@ -41,13 +40,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
      * Each mapped object holds the data for the six sides.
      */
     @SideOnly(Side.CLIENT)
-    private AutoMap<CubicObject<SafeTexture>> mSidedTextureArray;
-
-    /**
-     * Holds the data for the six sides, each side holds an array of data for each respective meta.
-     */
-    @SideOnly(Side.CLIENT)
-    private AutoMap<CubicObject<String>> mSidedTexturePathArray;
+    private ArrayList<CubicObject<SafeTexture>> mSidedTextureArray;
 
     /**
      * Does this block have any meta at all?
@@ -163,8 +156,11 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
         Logger.INFO("[TeTexture] Building Texture Maps for " + getTileEntityName() + ".");
 
         // Init on the Client side only, to prevent Field initialisers existing in the Server side bytecode.
-        mSidedTextureArray = new AutoMap<>();
-        mSidedTexturePathArray = new AutoMap<>();
+        mSidedTextureArray = new ArrayList<>();
+        /**
+         * Holds the data for the six sides, each side holds an array of data for each respective meta.
+         */
+        ArrayList<CubicObject<String>> sidedTexturePathArray = new ArrayList<>();
 
         // Store them in forge order
         // DOWN, UP, NORTH, SOUTH, WEST, EAST
@@ -191,7 +187,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
             Logger.INFO("[TeTexture] Found custom texture data, using this instead. Size: " + aDataMap.length);
             // Map each meta string data to the main map.
             for (int i = 0; i < aDataMap.length; i++) {
-                mSidedTexturePathArray.put(aDataMap[i]);
+                sidedTexturePathArray.add(aDataMap[i]);
                 Logger.INFO("Mapped value for meta " + i + ".");
             }
         } else {
@@ -231,17 +227,17 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
                     aStringFront,
                     aStringLeft,
                     aStringRight);
-                mSidedTexturePathArray.put(aMetaBlob);
+                sidedTexturePathArray.add(aMetaBlob);
                 Logger.INFO("[TeTexture] Added Texture Path data to map for meta " + i);
             }
         }
-        Logger.INFO("[TeTexture] Map size for pathing: " + mSidedTexturePathArray.size());
+        Logger.INFO("[TeTexture] Map size for pathing: " + sidedTexturePathArray.size());
 
         // Iteration Index
         int aIndex = 0;
 
         // Iterate each CubicObject, holding the six texture paths for each meta.
-        for (CubicObject<String> aMetaBlob : mSidedTexturePathArray) {
+        for (CubicObject<String> aMetaBlob : sidedTexturePathArray) {
             // Make a Safe Texture for each side
             SafeTexture aBottom = SafeTexture.register(aMetaBlob.DOWN);
             SafeTexture aTop = SafeTexture.register(aMetaBlob.UP);
@@ -254,7 +250,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
             // Convenience Blob
             CubicObject<SafeTexture> aMetaBlob2 = new CubicObject<>(aInjectBlob);
             // Store this Blob into
-            mSidedTextureArray.put(aMetaBlob2);
+            mSidedTextureArray.add(aMetaBlob2);
             Logger.INFO("[TeTexture] Added SafeTexture data to map for meta " + (aIndex++));
         }
         Logger.INFO("[TeTexture] Map size for registration: " + mSidedTextureArray.size());
diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java
index 4110c02fe3..e12e829260 100644
--- a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java
@@ -2,6 +2,8 @@ package gtPlusPlus.core.block.general;
 
 import static gregtech.api.enums.Mods.GTPlusPlus;
 
+import java.util.ArrayList;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockAir;
 import net.minecraft.block.BlockContainer;
@@ -18,7 +20,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.core.block.ModBlocks;
 
@@ -143,7 +144,7 @@ public class BlockSuperLight extends BlockContainer {
 
             aLitBlocks = new int[50][10][50][1];
             int aLitCounter = 0;
-            AutoMap<BlockPos> aBlocksToUpdate = new AutoMap<>();
+            ArrayList<BlockPos> aBlocksToUpdate = new ArrayList<>();
             Logger.INFO("Trying to relight area.");
 
             BlockPos aStartIterationPoint = new BlockPos(
@@ -169,14 +170,14 @@ public class BlockSuperLight extends BlockContainer {
                                 }
                                 // Turning Lights on
                                 else if (enable && aLight == 0) {
-                                    aBlocksToUpdate.put(new BlockPos(xOff, yOff, zOff, this.worldObj));
+                                    aBlocksToUpdate.add(new BlockPos(xOff, yOff, zOff, this.worldObj));
                                     this.worldObj
                                         .setBlock(xOff, yOff, zOff, ModBlocks.MatterFabricatorEffectBlock, 0, 3);
                                     aLitCounter++;
                                 }
                                 // Turning Lights off
                                 else if (!enable && aLight > 0) {
-                                    aBlocksToUpdate.put(new BlockPos(xOff, yOff, zOff, this.worldObj));
+                                    aBlocksToUpdate.add(new BlockPos(xOff, yOff, zOff, this.worldObj));
                                     if (aBlockGet instanceof BlockLightGlass) {
                                         Logger.INFO("Dimmed air.");
                                         this.worldObj.setBlock(xOff, yOff, zOff, Blocks.air, 0, 3);
diff --git a/src/main/java/gtPlusPlus/core/block/machine/BlockSuperJukebox.java b/src/main/java/gtPlusPlus/core/block/machine/BlockSuperJukebox.java
index 4440d2920a..be55db80a0 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/BlockSuperJukebox.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/BlockSuperJukebox.java
@@ -1,5 +1,6 @@
 package gtPlusPlus.core.block.machine;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.block.Block;
@@ -25,7 +26,6 @@ import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.util.GTUtility;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.handler.GuiHandler;
 import gtPlusPlus.core.inventories.InventorySuperJukebox;
 import gtPlusPlus.core.util.math.MathUtils;
@@ -315,12 +315,12 @@ public class BlockSuperJukebox extends BlockJukebox {
 
         // Determine which record to play
         public boolean selectRecordToPlayFromInventoryAndSetViaVanillaHandler() {
-            AutoMap<ItemStack> mValidRecords = new AutoMap<>();
+            ArrayList<ItemStack> mValidRecords = new ArrayList<>();
             for (ItemStack g : this.getInventory()
                 .getInventory()) {
                 if (g != null) {
                     if (g.getItem() instanceof ItemRecord) {
-                        mValidRecords.put(g);
+                        mValidRecords.add(g);
                     }
                 }
             }