Remove GT++ AutoMap (#3199)

1 files changed, 133 insertions, 146 deletions

diff --git a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
index 56ba05f21f..0001f825d8 100644
--- a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
+++ b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
@@ -17,7 +17,6 @@ import net.minecraftforge.oredict.OreDictionary;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.NBTUtils;
@@ -66,8 +65,7 @@ public class CommandEnableDebugWhileRunning implements ICommand {
         int aMaxArgumentsAllowed = 2;
 
         if ((argString == null || argString.length == 0 || argString.length > aMaxArgumentsAllowed)
-            || argString[0].toLowerCase()
-                .equals("?")) {
+            || argString[0].equalsIgnoreCase("?")) {
             Logger.INFO("Listing commands and their uses.");
             final EntityPlayer P = CommandUtils.getPlayer(S);
             AsmConfig.disableAllLogging = !AsmConfig.disableAllLogging;
@@ -79,143 +77,132 @@ public class CommandEnableDebugWhileRunning implements ICommand {
             PlayerUtils.messagePlayer(
                 P,
                 "debug   - Toggles GT++ Debug Mode. Only use when advised, may break everything. (OP)");
-        } else if (argString[0].toLowerCase()
-            .equals("debug")) {
-                Logger.INFO("Toggling Debug Mode.");
-                final EntityPlayer P = CommandUtils.getPlayer(S);
-                if (PlayerUtils.isPlayerOP(P)) {
-                    PreloaderCore.DEBUG_MODE = !PreloaderCore.DEBUG_MODE;
-                    PlayerUtils.messagePlayer(P, "Toggled GT++ Debug Mode - Enabled: " + PreloaderCore.DEBUG_MODE);
-                }
-            } else if (argString[0].toLowerCase()
-                .equals("logging")) {
-                    Logger.INFO("Toggling Logging.");
-                    final EntityPlayer P = CommandUtils.getPlayer(S);
-                    AsmConfig.disableAllLogging = !AsmConfig.disableAllLogging;
-                    PlayerUtils.messagePlayer(P, "Toggled GT++ Logging - Enabled: " + (!AsmConfig.disableAllLogging));
-                }
+        } else if (argString[0].equalsIgnoreCase("debug")) {
+            Logger.INFO("Toggling Debug Mode.");
+            final EntityPlayer P = CommandUtils.getPlayer(S);
+            if (PlayerUtils.isPlayerOP(P)) {
+                PreloaderCore.DEBUG_MODE = !PreloaderCore.DEBUG_MODE;
+                PlayerUtils.messagePlayer(P, "Toggled GT++ Debug Mode - Enabled: " + PreloaderCore.DEBUG_MODE);
+            }
+        } else if (argString[0].equalsIgnoreCase("logging")) {
+            Logger.INFO("Toggling Logging.");
+            final EntityPlayer P = CommandUtils.getPlayer(S);
+            AsmConfig.disableAllLogging = !AsmConfig.disableAllLogging;
+            PlayerUtils.messagePlayer(P, "Toggled GT++ Logging - Enabled: " + (!AsmConfig.disableAllLogging));
+        }
         /*
          * else if (argString[0].toLowerCase().equals("test")) { ItemStack mSemiFluidgen =
          * ItemUtils.simpleMetaStack("IC2:blockGenerator", 7, 1); final EntityPlayer P = CommandUtils.getPlayer(S);
          * if(mSemiFluidgen != null) { PlayerUtils.messagePlayer(P, ItemUtils.getItemName(mSemiFluidgen)); } }
          */
 
-        else if (argString[0].toLowerCase()
-            .equals("inv")) {
-                final EntityPlayer P = CommandUtils.getPlayer(S);
-                if (P != null && !P.worldObj.isRemote) {
-                    ItemStack[] aInv = P.inventory.mainInventory;
-                    for (ItemStack aItem : aInv) {
-                        if (aItem != null) {
-                            String aModID = GameRegistry.findUniqueIdentifierFor(aItem.getItem()).modId;
-                            String aRegistryName = GameRegistry.findUniqueIdentifierFor(aItem.getItem()).name;
-                            Logger.INFO(
-                                aModID + ":"
-                                    + aRegistryName
-                                    + ":"
-                                    + aItem.getItemDamage()
-                                    + " | "
-                                    + aItem.getDisplayName());
-                        }
+        else if (argString[0].equalsIgnoreCase("inv")) {
+            final EntityPlayer P = CommandUtils.getPlayer(S);
+            if (P != null && !P.worldObj.isRemote) {
+                ItemStack[] aInv = P.inventory.mainInventory;
+                for (ItemStack aItem : aInv) {
+                    if (aItem != null) {
+                        String aModID = GameRegistry.findUniqueIdentifierFor(aItem.getItem()).modId;
+                        String aRegistryName = GameRegistry.findUniqueIdentifierFor(aItem.getItem()).name;
+                        Logger.INFO(
+                            aModID + ":"
+                                + aRegistryName
+                                + ":"
+                                + aItem.getItemDamage()
+                                + " | "
+                                + aItem.getDisplayName());
                     }
-                    PlayerUtils.messagePlayer(P, "Dumped Inventory.");
                 }
-            } else if (argString[0].toLowerCase()
-                .equals("hand")) {
-                    final EntityPlayer P = CommandUtils.getPlayer(S);
-                    if (P != null) {
-                        ItemStack aHeldItem = PlayerUtils.getItemStackInPlayersHand(P);
-                        if (aHeldItem != null) {
-                            String aItemDisplayName = ItemUtils.getItemName(aHeldItem);
-                            String aItemUnlocalName = ItemUtils.getUnlocalizedItemName(aHeldItem);
-                            String aNbtString = tryIterateNBTData(aHeldItem);
-                            AutoMap<String> aOreDictNames = new AutoMap<>();
+                PlayerUtils.messagePlayer(P, "Dumped Inventory.");
+            }
+        } else if (argString[0].equalsIgnoreCase("hand")) {
+            final EntityPlayer P = CommandUtils.getPlayer(S);
+            if (P != null) {
+                ItemStack aHeldItem = PlayerUtils.getItemStackInPlayersHand(P);
+                if (aHeldItem != null) {
+                    String aItemDisplayName = ItemUtils.getItemName(aHeldItem);
+                    String aItemUnlocalName = ItemUtils.getUnlocalizedItemName(aHeldItem);
+                    String aNbtString = tryIterateNBTData(aHeldItem);
+                    ArrayList<String> aOreDictNames = new ArrayList<>();
 
-                            int[] aOreIDs = OreDictionary.getOreIDs(aHeldItem);
-                            for (int id : aOreIDs) {
-                                String aOreNameFromID = OreDictionary.getOreName(id);
-                                if (aOreNameFromID != null && aOreNameFromID.length() > 0
-                                    && !aOreNameFromID.equals("Unknown")) {
-                                    aOreDictNames.add(aOreNameFromID);
-                                }
-                            }
+                    int[] aOreIDs = OreDictionary.getOreIDs(aHeldItem);
+                    for (int id : aOreIDs) {
+                        String aOreNameFromID = OreDictionary.getOreName(id);
+                        if (aOreNameFromID != null && aOreNameFromID.length() > 0
+                            && !aOreNameFromID.equals("Unknown")) {
+                            aOreDictNames.add(aOreNameFromID);
+                        }
+                    }
 
-                            String aOreDictData = "";
-                            if (!aOreDictNames.isEmpty()) {
-                                for (String tag : aOreDictNames) {
-                                    aOreDictData += (tag + ", ");
-                                }
-                                if (aOreDictData.endsWith(", ")) {
-                                    aOreDictData = aOreDictData.substring(0, aOreDictData.length() - 2);
-                                }
-                            }
+                    String aOreDictData = "";
+                    if (!aOreDictNames.isEmpty()) {
+                        for (String tag : aOreDictNames) {
+                            aOreDictData += (tag + ", ");
+                        }
+                        if (aOreDictData.endsWith(", ")) {
+                            aOreDictData = aOreDictData.substring(0, aOreDictData.length() - 2);
+                        }
+                    }
 
-                            AutoMap<String> aFluidContainerData = new AutoMap<>();
-                            FluidStack aHeldItemFluid = FluidContainerRegistry.getFluidForFilledItem(aHeldItem);
-                            if (aHeldItemFluid != null) {
-                                aFluidContainerData
-                                    .put("FluidStack Unlocal Name: " + aHeldItemFluid.getUnlocalizedName());
-                                aFluidContainerData.put("FluidStack Local Name: " + aHeldItemFluid.getLocalizedName());
-                                aFluidContainerData.put(
-                                    "Fluid Unlocal Name: " + aHeldItemFluid.getFluid()
-                                        .getUnlocalizedName());
-                                aFluidContainerData.put("Fluid Local Name: " + aHeldItemFluid.getLocalizedName());
-                                aFluidContainerData.put(
-                                    "Fluid Name: " + aHeldItemFluid.getFluid()
-                                        .getName());
-                            }
+                    ArrayList<String> aFluidContainerData = new ArrayList<>();
+                    FluidStack aHeldItemFluid = FluidContainerRegistry.getFluidForFilledItem(aHeldItem);
+                    if (aHeldItemFluid != null) {
+                        aFluidContainerData.add("FluidStack Unlocal Name: " + aHeldItemFluid.getUnlocalizedName());
+                        aFluidContainerData.add("FluidStack Local Name: " + aHeldItemFluid.getLocalizedName());
+                        aFluidContainerData.add(
+                            "Fluid Unlocal Name: " + aHeldItemFluid.getFluid()
+                                .getUnlocalizedName());
+                        aFluidContainerData.add("Fluid Local Name: " + aHeldItemFluid.getLocalizedName());
+                        aFluidContainerData.add(
+                            "Fluid Name: " + aHeldItemFluid.getFluid()
+                                .getName());
+                    }
 
-                            PlayerUtils.messagePlayer(P, "[" + aItemUnlocalName + "]" + "[" + aItemDisplayName + "] ");
-                            if (aFluidContainerData.size() > 0) {
-                                for (String s : aFluidContainerData) {
-                                    PlayerUtils.messagePlayer(P, "" + s);
-                                }
-                            }
-                            if (!aOreDictNames.isEmpty()) {
-                                PlayerUtils.messagePlayer(P, "" + aOreDictData);
-                            }
-                            if (aNbtString.length() > 0) {
-                                PlayerUtils.messagePlayer(P, "" + aNbtString);
-                            }
-                        } else {
-                            PlayerUtils.messagePlayer(P, "No item held.");
+                    PlayerUtils.messagePlayer(P, "[" + aItemUnlocalName + "]" + "[" + aItemDisplayName + "] ");
+                    if (!aFluidContainerData.isEmpty()) {
+                        for (String s : aFluidContainerData) {
+                            PlayerUtils.messagePlayer(P, s);
                         }
                     }
-                } else if (argString[0].toLowerCase()
-                    .equals("fluid")) {
-                        if (argString.length > 1 && argString[1] != null && argString[1].length() > 0) {
-                            final EntityPlayer P = CommandUtils.getPlayer(S);
-                            FluidStack aFluid = FluidUtils.getWildcardFluidStack(argString[1], 1);
-                            if (P != null && aFluid != null) {
-                                PlayerUtils
-                                    .messagePlayer(P, "Found fluid stack: " + FluidRegistry.getFluidName(aFluid));
-                            } else if (P != null && aFluid == null) {
-                                PlayerUtils.messagePlayer(P, "Could not find any fluids.");
-                            }
-                        }
-                    } else if (argString[0].toLowerCase()
-                        .equals("item")) {
-                            if (argString.length > 1 && argString[1] != null && argString[1].length() > 0) {
-                                final EntityPlayer P = CommandUtils.getPlayer(S);
-                                ItemStack aTest = ItemUtils.getItemStackFromFQRN(argString[1], 1);
-                                if (P != null && aTest != null) {
-                                    PlayerUtils.messagePlayer(P, "Found fluid stack: " + ItemUtils.getItemName(aTest));
-                                } else if (P != null && aTest == null) {
-                                    PlayerUtils.messagePlayer(P, "Could not find valid item.");
-                                }
-                            }
-                        } else {
-                            final EntityPlayer P = CommandUtils.getPlayer(S);
-                            PlayerUtils.messagePlayer(P, "Invalid command, use '?' as an argument for help.'");
-                        }
+                    if (!aOreDictNames.isEmpty()) {
+                        PlayerUtils.messagePlayer(P, aOreDictData);
+                    }
+                    if (!aNbtString.isEmpty()) {
+                        PlayerUtils.messagePlayer(P, aNbtString);
+                    }
+                } else {
+                    PlayerUtils.messagePlayer(P, "No item held.");
+                }
+            }
+        } else if (argString[0].equalsIgnoreCase("fluid")) {
+            if (argString.length > 1 && argString[1] != null && !argString[1].isEmpty()) {
+                final EntityPlayer P = CommandUtils.getPlayer(S);
+                FluidStack aFluid = FluidUtils.getWildcardFluidStack(argString[1], 1);
+                if (P != null && aFluid != null) {
+                    PlayerUtils.messagePlayer(P, "Found fluid stack: " + FluidRegistry.getFluidName(aFluid));
+                } else if (P != null) {
+                    PlayerUtils.messagePlayer(P, "Could not find any fluids.");
+                }
+            }
+        } else if (argString[0].equalsIgnoreCase("item")) {
+            if (argString.length > 1 && argString[1] != null && !argString[1].isEmpty()) {
+                final EntityPlayer P = CommandUtils.getPlayer(S);
+                ItemStack aTest = ItemUtils.getItemStackFromFQRN(argString[1], 1);
+                if (P != null && aTest != null) {
+                    PlayerUtils.messagePlayer(P, "Found fluid stack: " + ItemUtils.getItemName(aTest));
+                } else if (P != null) {
+                    PlayerUtils.messagePlayer(P, "Could not find valid item.");
+                }
+            }
+        } else {
+            final EntityPlayer P = CommandUtils.getPlayer(S);
+            PlayerUtils.messagePlayer(P, "Invalid command, use '?' as an argument for help.'");
+        }
     }
 
     @Override
     public boolean canCommandSenderUseCommand(final ICommandSender var1) {
-        if (var1 == null || CommandUtils.getPlayer(var1) == null) {
-            return false;
-        }
-        return true;
+        return var1 != null && CommandUtils.getPlayer(var1) != null;
     }
 
     @Override
@@ -241,34 +228,34 @@ public class CommandEnableDebugWhileRunning implements ICommand {
 
     public static String tryIterateNBTData(ItemStack aStack) {
         try {
-            AutoMap<String> aItemDataTags = new AutoMap<>();
+            ArrayList<String> aItemDataTags = new ArrayList<>();
             NBTTagCompound aNBT = NBTUtils.getNBT(aStack);
-            if (aNBT != null) {
-                if (!aNBT.hasNoTags()) {
-                    Map<?, ?> mInternalMap = ReflectionUtils.getField(aNBT, "tagMap");
-                    if (mInternalMap != null) {
-                        for (Map.Entry<?, ?> e : mInternalMap.entrySet()) {
-                            aItemDataTags.add(
-                                e.getKey()
-                                    .toString() + ":"
-                                    + e.getValue());
-                        }
-                        int a = 0;
-                        String data = "";
-                        for (String tag : aItemDataTags) {
-                            data += (tag + ", ");
-                        }
-                        if (data.endsWith(", ")) {
-                            data = data.substring(0, data.length() - 2);
-                        }
-                        return data;
-                    } else {
-                        Logger.INFO("Data map reflected from NBTTagCompound was not valid.");
-                        return "Bad NBT";
+            if (!aNBT.hasNoTags()) {
+                Map<?, ?> mInternalMap = ReflectionUtils.getField(aNBT, "tagMap");
+                if (mInternalMap != null) {
+                    for (Map.Entry<?, ?> e : mInternalMap.entrySet()) {
+                        aItemDataTags.add(
+                            e.getKey()
+                                .toString() + ":"
+                                + e.getValue());
+                    }
+                    int a = 0;
+                    StringBuilder data = new StringBuilder();
+                    for (String tag : aItemDataTags) {
+                        data.append(tag)
+                            .append(", ");
+                    }
+                    if (data.toString()
+                        .endsWith(", ")) {
+                        data = new StringBuilder(data.substring(0, data.length() - 2));
                     }
+                    return data.toString();
+                } else {
+                    Logger.INFO("Data map reflected from NBTTagCompound was not valid.");
+                    return "Bad NBT";
                 }
             }
-        } catch (Throwable t) {}
+        } catch (Throwable ignored) {}
         return "";
     }
 }