Buildscript + Spotless (#318)

* Convert AES.java to readable class

* Buildscript

* Spotless

4 files changed, 432 insertions, 471 deletions

diff --git a/src/main/java/gtPlusPlus/core/commands/CommandDebugChunks.java b/src/main/java/gtPlusPlus/core/commands/CommandDebugChunks.java
index 8e86bcdcd6..f86476b91a 100644
--- a/src/main/java/gtPlusPlus/core/commands/CommandDebugChunks.java
+++ b/src/main/java/gtPlusPlus/core/commands/CommandDebugChunks.java
@@ -1,152 +1,138 @@
 package gtPlusPlus.core.commands;
 
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.Pair;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import gtPlusPlus.preloader.ChunkDebugger;
+import gtPlusPlus.preloader.asm.AsmConfig;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.World;
 
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.Pair;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import gtPlusPlus.preloader.ChunkDebugger;
-import gtPlusPlus.preloader.asm.AsmConfig;
-
-
-public class CommandDebugChunks implements ICommand
-{
-	private final List<String> aliases;
-
-	protected String fullEntityName;
-	protected Entity conjuredEntity;
-
-	public CommandDebugChunks(){
-		this.aliases = new ArrayList<>();
-		aliases.add("debugchunks");
-		aliases.add("DC");
-	}
-
-	@Override
-	public int compareTo(final Object o){
-		return 0;
-
-	}
-
-	@Override
-	public String getCommandName(){
-		return "DebugChunks";
-
-	}
-
-	@Override
-	public String getCommandUsage(final ICommandSender var1){
-		return "/DebugChunks";
-
-	}
-
-	@Override
-	public List<String> getCommandAliases(){
-		return this.aliases;
-
-	}
-
-	@Override
-	public void processCommand(final ICommandSender S, final String[] argString){
-		Logger.INFO("Debug Command");		
-
-		final World W = S.getEntityWorld();
-		final EntityPlayer P = CommandUtils.getPlayer(S);
-		
-		if (!AsmConfig.enableChunkDebugging) {
-			PlayerUtils.messagePlayer(P, "Chunk Debugging is disabled.");
-			return;
-		}
-		
-		
-		Map<String, Integer> aTicketCounter = new LinkedHashMap<String, Integer>();		
-		for (Pair<String, String> f : ChunkDebugger.mChunkTicketsMap.values()) {
-			String aMod = f.getKey();
-			String aDim = f.getValue();			
-			if (aMod != null) {
-				if (aTicketCounter.containsKey(aMod)) {
-					int aModTicketCount = aTicketCounter.get(aMod);
-					aModTicketCount++;
-					aTicketCounter.put(aMod, aModTicketCount);
-				}
-				else {
-					aTicketCounter.put(aMod, 1);					
-				}				
-			}
-		}	
-		if (aTicketCounter.isEmpty()) {
-			PlayerUtils.messagePlayer(P, "No forced chunk tickets active.");			
-		}		
-		for (String x : aTicketCounter.keySet()) {
-			PlayerUtils.messagePlayer(P, x+" has "+aTicketCounter.get(x)+" tickets active.");			
-		}
-		
-
-		Map<String, Integer> aChunkCounter = new LinkedHashMap<String, Integer>();
-		for (Pair<String, String> f : ChunkDebugger.mChunksLoadedByModsMap.values()) {
-			String aMod = f.getKey();
-			String aDim = f.getValue();	
-			if (aMod == null) {
-				aMod = "Bad ModId";
-			}
-			
-			if (aMod != null) {
-				//PlayerUtils.messagePlayer(P, aMod+" has "+aDim+" active.");	
-				if (aChunkCounter.containsKey(aMod)) {
-					int aModTicketCount = aChunkCounter.get(aMod);
-					aModTicketCount = aModTicketCount + 1;
-					aChunkCounter.put(aMod, aModTicketCount);
-					Logger.INFO("Counting +1 for "+aMod+", total of "+aModTicketCount);
-				}
-				else {
-					aChunkCounter.put(aMod, 1);	
-					Logger.INFO("Counting +1 for "+aMod);				
-				}				
-			}
-		}	
-		if (aChunkCounter.isEmpty()) {
-			PlayerUtils.messagePlayer(P, "No chunks force loaded.");			
-		}		
-		for (String x : aChunkCounter.keySet()) {
-			PlayerUtils.messagePlayer(P, x+" has "+aChunkCounter.get(x)+" chunks active.");			
-		}
-		
-	}
-
-	@Override
-	public boolean canCommandSenderUseCommand(final ICommandSender var1){
-		final EntityPlayer P = CommandUtils.getPlayer(var1);
-		if (P == null){
-			return false;
-		}
-		if (PlayerUtils.isPlayerOP(P)) {
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	public List<?> addTabCompletionOptions(final ICommandSender var1, final String[] var2){
-		return new ArrayList<>();
-	}
-
-	@Override
-	public boolean isUsernameIndex(final String[] var1, final int var2){
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	public boolean playerUsesCommand(final World W, final EntityPlayer P, final int cost){
-		return true;
-	}
-
-}
\ No newline at end of file
+public class CommandDebugChunks implements ICommand {
+    private final List<String> aliases;
+
+    protected String fullEntityName;
+    protected Entity conjuredEntity;
+
+    public CommandDebugChunks() {
+        this.aliases = new ArrayList<>();
+        aliases.add("debugchunks");
+        aliases.add("DC");
+    }
+
+    @Override
+    public int compareTo(final Object o) {
+        return 0;
+    }
+
+    @Override
+    public String getCommandName() {
+        return "DebugChunks";
+    }
+
+    @Override
+    public String getCommandUsage(final ICommandSender var1) {
+        return "/DebugChunks";
+    }
+
+    @Override
+    public List<String> getCommandAliases() {
+        return this.aliases;
+    }
+
+    @Override
+    public void processCommand(final ICommandSender S, final String[] argString) {
+        Logger.INFO("Debug Command");
+
+        final World W = S.getEntityWorld();
+        final EntityPlayer P = CommandUtils.getPlayer(S);
+
+        if (!AsmConfig.enableChunkDebugging) {
+            PlayerUtils.messagePlayer(P, "Chunk Debugging is disabled.");
+            return;
+        }
+
+        Map<String, Integer> aTicketCounter = new LinkedHashMap<String, Integer>();
+        for (Pair<String, String> f : ChunkDebugger.mChunkTicketsMap.values()) {
+            String aMod = f.getKey();
+            String aDim = f.getValue();
+            if (aMod != null) {
+                if (aTicketCounter.containsKey(aMod)) {
+                    int aModTicketCount = aTicketCounter.get(aMod);
+                    aModTicketCount++;
+                    aTicketCounter.put(aMod, aModTicketCount);
+                } else {
+                    aTicketCounter.put(aMod, 1);
+                }
+            }
+        }
+        if (aTicketCounter.isEmpty()) {
+            PlayerUtils.messagePlayer(P, "No forced chunk tickets active.");
+        }
+        for (String x : aTicketCounter.keySet()) {
+            PlayerUtils.messagePlayer(P, x + " has " + aTicketCounter.get(x) + " tickets active.");
+        }
+
+        Map<String, Integer> aChunkCounter = new LinkedHashMap<String, Integer>();
+        for (Pair<String, String> f : ChunkDebugger.mChunksLoadedByModsMap.values()) {
+            String aMod = f.getKey();
+            String aDim = f.getValue();
+            if (aMod == null) {
+                aMod = "Bad ModId";
+            }
+
+            if (aMod != null) {
+                // PlayerUtils.messagePlayer(P, aMod+" has "+aDim+" active.");
+                if (aChunkCounter.containsKey(aMod)) {
+                    int aModTicketCount = aChunkCounter.get(aMod);
+                    aModTicketCount = aModTicketCount + 1;
+                    aChunkCounter.put(aMod, aModTicketCount);
+                    Logger.INFO("Counting +1 for " + aMod + ", total of " + aModTicketCount);
+                } else {
+                    aChunkCounter.put(aMod, 1);
+                    Logger.INFO("Counting +1 for " + aMod);
+                }
+            }
+        }
+        if (aChunkCounter.isEmpty()) {
+            PlayerUtils.messagePlayer(P, "No chunks force loaded.");
+        }
+        for (String x : aChunkCounter.keySet()) {
+            PlayerUtils.messagePlayer(P, x + " has " + aChunkCounter.get(x) + " chunks active.");
+        }
+    }
+
+    @Override
+    public boolean canCommandSenderUseCommand(final ICommandSender var1) {
+        final EntityPlayer P = CommandUtils.getPlayer(var1);
+        if (P == null) {
+            return false;
+        }
+        if (PlayerUtils.isPlayerOP(P)) {
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public List<?> addTabCompletionOptions(final ICommandSender var1, final String[] var2) {
+        return new ArrayList<>();
+    }
+
+    @Override
+    public boolean isUsernameIndex(final String[] var1, final int var2) {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    public boolean playerUsesCommand(final World W, final EntityPlayer P, final int cost) {
+        return true;
+    }
+}
diff --git a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
index 4f5615b60a..43b9de8c58 100644
--- a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
+++ b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
@@ -1,13 +1,8 @@
 package gtPlusPlus.core.commands;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 import cpw.mods.fml.common.registry.GameRegistry;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -16,6 +11,9 @@ import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.preloader.CORE_Preloader;
 import gtPlusPlus.preloader.asm.AsmConfig;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayer;
@@ -27,245 +25,238 @@ import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
 
+public class CommandEnableDebugWhileRunning implements ICommand {
+    private final List<String> aliases;
 
-public class CommandEnableDebugWhileRunning implements ICommand
-{
-	private final List<String> aliases;
-
-	public CommandEnableDebugWhileRunning(){
-		this.aliases = new ArrayList<>();
-		this.aliases.add("gtplusplus");
-	}
-
-	@Override
-	public int compareTo(final Object o){
-		if (o instanceof Comparable<?>) {
-			@SuppressWarnings("unchecked")
-			Comparable<ICommand> a = (Comparable<ICommand>) o;	
-			if (a.equals(this)) {
-				return 0;
-			}
-			else {
-				return -1;
-			}
-		}
-		return -1;
-	}
-
-	@Override
-	public String getCommandName(){
-		return "gtpp";
-
-	}
+    public CommandEnableDebugWhileRunning() {
+        this.aliases = new ArrayList<>();
+        this.aliases.add("gtplusplus");
+    }
 
+    @Override
+    public int compareTo(final Object o) {
+        if (o instanceof Comparable<?>) {
+            @SuppressWarnings("unchecked")
+            Comparable<ICommand> a = (Comparable<ICommand>) o;
+            if (a.equals(this)) {
+                return 0;
+            } else {
+                return -1;
+            }
+        }
+        return -1;
+    }
 
-	// Use '/gtpp' along with 'logging' or 'debug' to toggle Debug mode and Logging.
-	// Using nothing after the command toggles both to their opposite states respectively.	
-	@Override
-	public String getCommandUsage(final ICommandSender var1){
-		return "/gtpp ?";
-	}
+    @Override
+    public String getCommandName() {
+        return "gtpp";
+    }
 
-	@Override
-	public List<String> getCommandAliases(){
-		return this.aliases;
-	}
+    // Use '/gtpp' along with 'logging' or 'debug' to toggle Debug mode and Logging.
+    // Using nothing after the command toggles both to their opposite states respectively.
+    @Override
+    public String getCommandUsage(final ICommandSender var1) {
+        return "/gtpp ?";
+    }
 
-	@Override
-	public void processCommand(final ICommandSender S, final String[] argString){
-		int aMaxArgumentsAllowed = 2;
+    @Override
+    public List<String> getCommandAliases() {
+        return this.aliases;
+    }
 
-		if ((argString == null || argString.length == 0 || argString.length > aMaxArgumentsAllowed) || argString[0].toLowerCase().equals("?")) {
-			Logger.INFO("Listing commands and their uses.");			
-			final EntityPlayer P = CommandUtils.getPlayer(S);
-			AsmConfig.disableAllLogging = Utils.invertBoolean(AsmConfig.disableAllLogging);
-			PlayerUtils.messagePlayer(P, "The following are valid args for the '/gtpp' command:");
-			PlayerUtils.messagePlayer(P, "?       - This help command.");
-			PlayerUtils.messagePlayer(P, "logging - Toggles ALL GT++ logging for current session.");
-			PlayerUtils.messagePlayer(P, "hand - Lists information about held item.");
-			PlayerUtils.messagePlayer(P, "fuid xxx - Tries to find the fluid in the FluidRegistry.");
-			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)) {
-				CORE_Preloader.DEBUG_MODE = Utils.invertBoolean(CORE_Preloader.DEBUG_MODE);
-				PlayerUtils.messagePlayer(P, "Toggled GT++ Debug Mode - Enabled: "+CORE_Preloader.DEBUG_MODE);
-			}
-		}
-		else if (argString[0].toLowerCase().equals("logging")) {
-			Logger.INFO("Toggling Logging.");			
-			final EntityPlayer P = CommandUtils.getPlayer(S);		
-			AsmConfig.disableAllLogging = Utils.invertBoolean(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));
-					}			
-				}*/
+    @Override
+    public void processCommand(final ICommandSender S, final String[] argString) {
+        int aMaxArgumentsAllowed = 2;
 
-		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());
-					}
-				}
-				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<String>();
+        if ((argString == null || argString.length == 0 || argString.length > aMaxArgumentsAllowed)
+                || argString[0].toLowerCase().equals("?")) {
+            Logger.INFO("Listing commands and their uses.");
+            final EntityPlayer P = CommandUtils.getPlayer(S);
+            AsmConfig.disableAllLogging = Utils.invertBoolean(AsmConfig.disableAllLogging);
+            PlayerUtils.messagePlayer(P, "The following are valid args for the '/gtpp' command:");
+            PlayerUtils.messagePlayer(P, "?       - This help command.");
+            PlayerUtils.messagePlayer(P, "logging - Toggles ALL GT++ logging for current session.");
+            PlayerUtils.messagePlayer(P, "hand - Lists information about held item.");
+            PlayerUtils.messagePlayer(P, "fuid xxx - Tries to find the fluid in the FluidRegistry.");
+            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)) {
+                CORE_Preloader.DEBUG_MODE = Utils.invertBoolean(CORE_Preloader.DEBUG_MODE);
+                PlayerUtils.messagePlayer(P, "Toggled GT++ Debug Mode - Enabled: " + CORE_Preloader.DEBUG_MODE);
+            }
+        } else if (argString[0].toLowerCase().equals("logging")) {
+            Logger.INFO("Toggling Logging.");
+            final EntityPlayer P = CommandUtils.getPlayer(S);
+            AsmConfig.disableAllLogging = Utils.invertBoolean(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));
+        	}
+        }*/
 
-					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);
-						}
-					}
+        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());
+                    }
+                }
+                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<String>();
 
-					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<String>();
-					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.getFluid().getLocalizedName());
-						aFluidContainerData.put("Fluid Name: "+aHeldItemFluid.getFluid().getName());
-					}
+                    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);
+                        }
+                    }
 
-					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.");
-				}
-			}
-		}
-		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.'");
-		}
+                    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<String>();
+                    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.getFluid().getLocalizedName());
+                        aFluidContainerData.put(
+                                "Fluid Name: " + aHeldItemFluid.getFluid().getName());
+                    }
 
-	@Override
-	public boolean canCommandSenderUseCommand(final ICommandSender var1){	    
-		if (var1 == null || CommandUtils.getPlayer(var1) == null) {
-			return false;
-		}
-		return true;
-	}
+                    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.");
+                }
+            }
+        } 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.'");
+        }
+    }
 
-	@Override
-	public List<?> addTabCompletionOptions(final ICommandSender var1, final String[] var2){
-		ArrayList<String> aTabCompletes = new ArrayList<String>();
-		aTabCompletes.add("?");
-		aTabCompletes.add("logging");
-		aTabCompletes.add("debug");
-		aTabCompletes.add("hand");
-		aTabCompletes.add("fluid");
-		return aTabCompletes;
-	}
+    @Override
+    public boolean canCommandSenderUseCommand(final ICommandSender var1) {
+        if (var1 == null || CommandUtils.getPlayer(var1) == null) {
+            return false;
+        }
+        return true;
+    }
 
-	@Override
-	public boolean isUsernameIndex(final String[] var1, final int var2){
-		// TODO Auto-generated method stub
-		return false;
-	}
+    @Override
+    public List<?> addTabCompletionOptions(final ICommandSender var1, final String[] var2) {
+        ArrayList<String> aTabCompletes = new ArrayList<String>();
+        aTabCompletes.add("?");
+        aTabCompletes.add("logging");
+        aTabCompletes.add("debug");
+        aTabCompletes.add("hand");
+        aTabCompletes.add("fluid");
+        return aTabCompletes;
+    }
 
-	public boolean playerUsesCommand(final World W, final EntityPlayer P, final int cost){
-		return true;
-	}
+    @Override
+    public boolean isUsernameIndex(final String[] var1, final int var2) {
+        // TODO Auto-generated method stub
+        return false;
+    }
 
-	public static String tryIterateNBTData(ItemStack aStack) {
-		try {
-			AutoMap<String> aItemDataTags = new AutoMap<String>();
-			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";
-					}
-				} 
-			} 
-		} catch (Throwable t) {}
-		return "";
-	}
+    public boolean playerUsesCommand(final World W, final EntityPlayer P, final int cost) {
+        return true;
+    }
 
-}
\ No newline at end of file
+    public static String tryIterateNBTData(ItemStack aStack) {
+        try {
+            AutoMap<String> aItemDataTags = new AutoMap<String>();
+            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";
+                    }
+                }
+            }
+        } catch (Throwable t) {
+        }
+        return "";
+    }
+}
diff --git a/src/main/java/gtPlusPlus/core/commands/CommandMath.java b/src/main/java/gtPlusPlus/core/commands/CommandMath.java
index 5ccfb3397f..b26f93c56a 100644
--- a/src/main/java/gtPlusPlus/core/commands/CommandMath.java
+++ b/src/main/java/gtPlusPlus/core/commands/CommandMath.java
@@ -1,100 +1,86 @@
 package gtPlusPlus.core.commands;
 
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.MiningUtils;
 import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
-
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.World;
 
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.Pair;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.minecraft.MiningUtils;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import gtPlusPlus.preloader.ChunkDebugger;
-
-
-public class CommandMath implements ICommand
-{
-	private final List<String> aliases;
-
-	protected String fullEntityName;
-	protected Entity conjuredEntity;
-
-	public CommandMath(){
-		this.aliases = new ArrayList<>();
-		//this.aliases.add("hometele");
-		//this.aliases.add("warphome");
-	}
-
-	@Override
-	public int compareTo(final Object o){
-		return 0;
-
-	}
-
-	@Override
-	public String getCommandName(){
-		return "alkalus";
-
-	}
-
-	@Override
-	public String getCommandUsage(final ICommandSender var1){
-		return "/alkalus [Dev Command]";
-
-	}
-
-	@Override
-	public List<String> getCommandAliases(){
-		return this.aliases;
-
-	}
-
-	@Override
-	public void processCommand(final ICommandSender S, final String[] argString){
-		Logger.INFO("Debug Command");	
-		final World W = S.getEntityWorld();
-		final EntityPlayer P = CommandUtils.getPlayer(S);
-		if (P.getDisplayName().equalsIgnoreCase("draknyte1")) {
-			Logger.INFO("[Bedrock Miner] OreType Scan");	
-			MiningUtils.iterateAllOreTypes();
-		}		
-		
-	}
-
-	@Override
-	public boolean canCommandSenderUseCommand(final ICommandSender var1){
-		final EntityPlayer P = CommandUtils.getPlayer(var1);
-		if (P == null){
-			return false;
-		}
-		if (P.getDisplayName().toLowerCase().equals("draknyte1") || P.getCommandSenderName().toLowerCase().equals("draknyte1") || CORE.DEVENV) {
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	public List<?> addTabCompletionOptions(final ICommandSender var1, final String[] var2){
-		return null;
-	}
-
-	@Override
-	public boolean isUsernameIndex(final String[] var1, final int var2){
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	public boolean playerUsesCommand(final World W, final EntityPlayer P, final int cost){
-
-
-		return true;
-	}
-
-}
\ No newline at end of file
+public class CommandMath implements ICommand {
+    private final List<String> aliases;
+
+    protected String fullEntityName;
+    protected Entity conjuredEntity;
+
+    public CommandMath() {
+        this.aliases = new ArrayList<>();
+        // this.aliases.add("hometele");
+        // this.aliases.add("warphome");
+    }
+
+    @Override
+    public int compareTo(final Object o) {
+        return 0;
+    }
+
+    @Override
+    public String getCommandName() {
+        return "alkalus";
+    }
+
+    @Override
+    public String getCommandUsage(final ICommandSender var1) {
+        return "/alkalus [Dev Command]";
+    }
+
+    @Override
+    public List<String> getCommandAliases() {
+        return this.aliases;
+    }
+
+    @Override
+    public void processCommand(final ICommandSender S, final String[] argString) {
+        Logger.INFO("Debug Command");
+        final World W = S.getEntityWorld();
+        final EntityPlayer P = CommandUtils.getPlayer(S);
+        if (P.getDisplayName().equalsIgnoreCase("draknyte1")) {
+            Logger.INFO("[Bedrock Miner] OreTyp