Buildscript + Spotless (#318)

* Convert AES.java to readable class

* Buildscript

* Spotless

19 files changed, 1803 insertions, 1808 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java
index b1353cc481..bbda74449b 100644
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java
@@ -10,50 +10,51 @@ import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
-public class HANDLER_Thaumcraft {	
-
-	public static GTPP_AspectCompat sThaumcraftCompat;
-	public static Item mResearchNotes;
-	public static final AutoMap<Pair<ItemStack, GTPP_AspectStack[]>> sItemsToGetAspects = new AutoMap<Pair<ItemStack, GTPP_AspectStack[]>>();
-	
-	public static void preInit(){
-		if (LoadedMods.Thaumcraft){
-		}
-	}
-
-	public static void init(){
-		if (LoadedMods.Thaumcraft){
-			try {
-				mResearchNotes = (Item) ReflectionUtils.getField(ReflectionUtils.getClass("thaumcraft.common.config.ConfigItems"), "itemResearchNotes").get(null);
-			}
-			catch (IllegalArgumentException | IllegalAccessException e) {
-				mResearchNotes = Items.paper;
-			}
-		}
-	}
-
-	public static void postInit(){
-		if (LoadedMods.Thaumcraft){
-			//Add Custom Aspects	
-			
-			
-			//sThaumcraftCompat = (IThaumcraftCompat) GT_Utility.callConstructor("gtPlusPlus.xmod.thaumcraft.aspect.GTPP_AspectCompat", 0, null, GT_Values.D1, new Object[0]);
-			//sThaumcraftCompat = new GTPP_AspectCompat();	
-			
-			/*if (!sItemsToGetAspects.isEmpty() && false) {
-				for (Pair<ItemStack, GTPP_AspectStack[]> j : sItemsToGetAspects) {
-					if (j .getKey() != null && (j.getValue() != null && j.getValue().length > 0)) {
-						List<GTPP_AspectStack> list = Arrays.asList(j.getValue());
-						if (ThaumcraftUtils.registerThaumcraftAspectsToItem(j.getKey(), list, true)) {
-							Logger.WARNING("[Aspect] Successfully added Aspects to "+j.getKey().getDisplayName()+".");
-						}
-						else {
-							Logger.WARNING("[Aspect] Failed adding Aspects to "+j.getKey().getDisplayName()+".");
-						}
-					}
-				}
-			}*/
-		}
-	}
-	
+public class HANDLER_Thaumcraft {
+
+    public static GTPP_AspectCompat sThaumcraftCompat;
+    public static Item mResearchNotes;
+    public static final AutoMap<Pair<ItemStack, GTPP_AspectStack[]>> sItemsToGetAspects =
+            new AutoMap<Pair<ItemStack, GTPP_AspectStack[]>>();
+
+    public static void preInit() {
+        if (LoadedMods.Thaumcraft) {}
+    }
+
+    public static void init() {
+        if (LoadedMods.Thaumcraft) {
+            try {
+                mResearchNotes = (Item) ReflectionUtils.getField(
+                                ReflectionUtils.getClass("thaumcraft.common.config.ConfigItems"), "itemResearchNotes")
+                        .get(null);
+            } catch (IllegalArgumentException | IllegalAccessException e) {
+                mResearchNotes = Items.paper;
+            }
+        }
+    }
+
+    public static void postInit() {
+        if (LoadedMods.Thaumcraft) {
+            // Add Custom Aspects
+
+            // sThaumcraftCompat = (IThaumcraftCompat)
+            // GT_Utility.callConstructor("gtPlusPlus.xmod.thaumcraft.aspect.GTPP_AspectCompat", 0, null, GT_Values.D1,
+            // new Object[0]);
+            // sThaumcraftCompat = new GTPP_AspectCompat();
+
+            /*if (!sItemsToGetAspects.isEmpty() && false) {
+            	for (Pair<ItemStack, GTPP_AspectStack[]> j : sItemsToGetAspects) {
+            		if (j .getKey() != null && (j.getValue() != null && j.getValue().length > 0)) {
+            			List<GTPP_AspectStack> list = Arrays.asList(j.getValue());
+            			if (ThaumcraftUtils.registerThaumcraftAspectsToItem(j.getKey(), list, true)) {
+            				Logger.WARNING("[Aspect] Successfully added Aspects to "+j.getKey().getDisplayName()+".");
+            			}
+            			else {
+            				Logger.WARNING("[Aspect] Failed adding Aspects to "+j.getKey().getDisplayName()+".");
+            			}
+            		}
+            	}
+            }*/
+        }
+    }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java
index 56ad95c5e3..c3d256a132 100644
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java
@@ -1,11 +1,5 @@
 package gtPlusPlus.xmod.thaumcraft.aspect;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-
 import gregtech.api.enums.TC_Aspects;
 import gregtech.common.GT_ThaumcraftCompat;
 import gtPlusPlus.api.objects.Logger;
@@ -13,188 +7,167 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_AspectList_Wrapper;
 import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
 import net.minecraft.util.ResourceLocation;
 
 public class GTPP_AspectCompat {
-	
-	public static volatile Method m = null;
-	
-	private static HashMap<String, TC_Aspect_Wrapper> mAspectCache = new LinkedHashMap<String, TC_Aspect_Wrapper>();
-	
 
-	public static TC_Aspect_Wrapper ASPECT_BALANCE;
-	public static TC_Aspect_Wrapper ASPECT_LUST;
-	public static TC_Aspect_Wrapper ASPECT_STARBOUND;
-	public static TC_Aspect_Wrapper ASPECT_TOXIC;
-	public static TC_Aspect_Wrapper ASPECT_HEAVEN;
-	
-	
-/*	TC_Aspects.AER.mAspect = Aspect.AIR;
-	TC_Aspects.ALIENIS.mAspect = Aspect.ELDRITCH;
-	TC_Aspects.AQUA.mAspect = Aspect.WATER;
-	TC_Aspects.ARBOR.mAspect = Aspect.TREE;
-	TC_Aspects.AURAM.mAspect = Aspect.AURA;
-	TC_Aspects.BESTIA.mAspect = Aspect.BEAST;
-	TC_Aspects.COGNITIO.mAspect = Aspect.MIND;
-	TC_Aspects.CORPUS.mAspect = Aspect.FLESH;
-	TC_Aspects.EXANIMIS.mAspect = Aspect.UNDEAD;
-	TC_Aspects.FABRICO.mAspect = Aspect.CRAFT;
-	TC_Aspects.FAMES.mAspect = Aspect.HUNGER;
-	TC_Aspects.GELUM.mAspect = Aspect.COLD;
-	TC_Aspects.GRANUM.mAspect = Aspect.PLANT;
-	TC_Aspects.HERBA.mAspect = Aspect.PLANT;
-	TC_Aspects.HUMANUS.mAspect = Aspect.MAN;
-	TC_Aspects.IGNIS.mAspect = Aspect.FIRE;
-	TC_Aspects.INSTRUMENTUM.mAspect = Aspect.TOOL;
-	TC_Aspects.ITER.mAspect = Aspect.TRAVEL;
-	TC_Aspects.LIMUS.mAspect = Aspect.SLIME;
-	TC_Aspects.LUCRUM.mAspect = Aspect.GREED;
-	TC_Aspects.LUX.mAspect = Aspect.LIGHT;
-	TC_Aspects.MACHINA.mAspect = Aspect.MECHANISM;
-	TC_Aspects.MESSIS.mAspect = Aspect.CROP;
-	TC_Aspects.METALLUM.mAspect = Aspect.METAL;
-	TC_Aspects.METO.mAspect = Aspect.HARVEST;
-	TC_Aspects.MORTUUS.mAspect = Aspect.DEATH;
-	TC_Aspects.MOTUS.mAspect = Aspect.MOTION;
-	TC_Aspects.ORDO.mAspect = Aspect.ORDER;
-	TC_Aspects.PANNUS.mAspect = Aspect.CLOTH;
-	TC_Aspects.PERDITIO.mAspect = Aspect.ENTROPY;
-	TC_Aspects.PERFODIO.mAspect = Aspect.MINE;
-	TC_Aspects.PERMUTATIO.mAspect = Aspect.EXCHANGE;
-	TC_Aspects.POTENTIA.mAspect = Aspect.ENERGY;
-	TC_Aspects.PRAECANTATIO.mAspect = Aspect.MAGIC;
-	TC_Aspects.SANO.mAspect = Aspect.HEAL;
-	TC_Aspects.SENSUS.mAspect = Aspect.SENSES;
-	TC_Aspects.SPIRITUS.mAspect = Aspect.SOUL;
-	TC_Aspects.TELUM.mAspect = Aspect.WEAPON;
-	TC_Aspects.TERRA.mAspect = Aspect.EARTH;
-	TC_Aspects.TEMPESTAS.mAspect = Aspect.WEATHER;
-	TC_Aspects.TENEBRAE.mAspect = Aspect.DARKNESS;
-	TC_Aspects.TUTAMEN.mAspect = Aspect.ARMOR;
-	TC_Aspects.VACUOS.mAspect = Aspect.VOID;
-	TC_Aspects.VENENUM.mAspect = Aspect.POISON;
-	TC_Aspects.VICTUS.mAspect = Aspect.LIFE;
-	TC_Aspects.VINCULUM.mAspect = Aspect.TRAP;
-	TC_Aspects.VITIUM.mAspect = Aspect.TAINT;
-	TC_Aspects.VITREUS.mAspect = Aspect.CRYSTAL;
-	TC_Aspects.VOLATUS.mAspect = Aspect.FLIGHT;*/	
-	
-	
-	public GTPP_AspectCompat() {
-		
-		
-		// Generate all existing Aspects as TC_Aspects
-		LinkedHashMap<String, Object> h = TC_Aspect_Wrapper.getVanillaAspectList();
-		for (String g : h.keySet()) {
-			Object aBaseAspect = h.get(g);
-			if (aBaseAspect != null && TC_Aspect_Wrapper.isObjectAnAspect(aBaseAspect)) {
-				TC_Aspect_Wrapper aS = TC_Aspect_Wrapper.getAspect(g);
-				if (aS != null) {
-					mAspectCache.put(g, aS);
-					continue;
-				}
-			}
-		}
-		
-		
-		
-		
-		// Custom Aspects
-		ASPECT_BALANCE = 
-				new TC_Aspect_Wrapper(
-						"Sagrausten",
-						Utils.rgbtoHexValue(125, 125, 125),
-						new TC_Aspect_Wrapper[]{
-								ASPECT_STARBOUND,
-								get(TC_Aspects.RADIO)
-								},
-				new ResourceLocation(CORE.MODID+":textures/aspects/" + "Sagrausten.png"),
-				false,
-				1,
-				"Ancient Knowledge");
+    public static volatile Method m = null;
+
+    private static HashMap<String, TC_Aspect_Wrapper> mAspectCache = new LinkedHashMap<String, TC_Aspect_Wrapper>();
+
+    public static TC_Aspect_Wrapper ASPECT_BALANCE;
+    public static TC_Aspect_Wrapper ASPECT_LUST;
+    public static TC_Aspect_Wrapper ASPECT_STARBOUND;
+    public static TC_Aspect_Wrapper ASPECT_TOXIC;
+    public static TC_Aspect_Wrapper ASPECT_HEAVEN;
+
+    /*	TC_Aspects.AER.mAspect = Aspect.AIR;
+    TC_Aspects.ALIENIS.mAspect = Aspect.ELDRITCH;
+    TC_Aspects.AQUA.mAspect = Aspect.WATER;
+    TC_Aspects.ARBOR.mAspect = Aspect.TREE;
+    TC_Aspects.AURAM.mAspect = Aspect.AURA;
+    TC_Aspects.BESTIA.mAspect = Aspect.BEAST;
+    TC_Aspects.COGNITIO.mAspect = Aspect.MIND;
+    TC_Aspects.CORPUS.mAspect = Aspect.FLESH;
+    TC_Aspects.EXANIMIS.mAspect = Aspect.UNDEAD;
+    TC_Aspects.FABRICO.mAspect = Aspect.CRAFT;
+    TC_Aspects.FAMES.mAspect = Aspect.HUNGER;
+    TC_Aspects.GELUM.mAspect = Aspect.COLD;
+    TC_Aspects.GRANUM.mAspect = Aspect.PLANT;
+    TC_Aspects.HERBA.mAspect = Aspect.PLANT;
+    TC_Aspects.HUMANUS.mAspect = Aspect.MAN;
+    TC_Aspects.IGNIS.mAspect = Aspect.FIRE;
+    TC_Aspects.INSTRUMENTUM.mAspect = Aspect.TOOL;
+    TC_Aspects.ITER.mAspect = Aspect.TRAVEL;
+    TC_Aspects.LIMUS.mAspect = Aspect.SLIME;
+    TC_Aspects.LUCRUM.mAspect = Aspect.GREED;
+    TC_Aspects.LUX.mAspect = Aspect.LIGHT;
+    TC_Aspects.MACHINA.mAspect = Aspect.MECHANISM;
+    TC_Aspects.MESSIS.mAspect = Aspect.CROP;
+    TC_Aspects.METALLUM.mAspect = Aspect.METAL;
+    TC_Aspects.METO.mAspect = Aspect.HARVEST;
+    TC_Aspects.MORTUUS.mAspect = Aspect.DEATH;
+    TC_Aspects.MOTUS.mAspect = Aspect.MOTION;
+    TC_Aspects.ORDO.mAspect = Aspect.ORDER;
+    TC_Aspects.PANNUS.mAspect = Aspect.CLOTH;
+    TC_Aspects.PERDITIO.mAspect = Aspect.ENTROPY;
+    TC_Aspects.PERFODIO.mAspect = Aspect.MINE;
+    TC_Aspects.PERMUTATIO.mAspect = Aspect.EXCHANGE;
+    TC_Aspects.POTENTIA.mAspect = Aspect.ENERGY;
+    TC_Aspects.PRAECANTATIO.mAspect = Aspect.MAGIC;
+    TC_Aspects.SANO.mAspect = Aspect.HEAL;
+    TC_Aspects.SENSUS.mAspect = Aspect.SENSES;
+    TC_Aspects.SPIRITUS.mAspect = Aspect.SOUL;
+    TC_Aspects.TELUM.mAspect = Aspect.WEAPON;
+    TC_Aspects.TERRA.mAspect = Aspect.EARTH;
+    TC_Aspects.TEMPESTAS.mAspect = Aspect.WEATHER;
+    TC_Aspects.TENEBRAE.mAspect = Aspect.DARKNESS;
+    TC_Aspects.TUTAMEN.mAspect = Aspect.ARMOR;
+    TC_Aspects.VACUOS.mAspect = Aspect.VOID;
+    TC_Aspects.VENENUM.mAspect = Aspect.POISON;
+    TC_Aspects.VICTUS.mAspect = Aspect.LIFE;
+    TC_Aspects.VINCULUM.mAspect = Aspect.TRAP;
+    TC_Aspects.VITIUM.mAspect = Aspect.TAINT;
+    TC_Aspects.VITREUS.mAspect = Aspect.CRYSTAL;
+    TC_Aspects.VOLATUS.mAspect = Aspect.FLIGHT;*/
+
+    public GTPP_AspectCompat() {
+
+        // Generate all existing Aspects as TC_Aspects
+        LinkedHashMap<String, Object> h = TC_Aspect_Wrapper.getVanillaAspectList();
+        for (String g : h.keySet()) {
+            Object aBaseAspect = h.get(g);
+            if (aBaseAspect != null && TC_Aspect_Wrapper.isObjectAnAspect(aBaseAspect)) {
+                TC_Aspect_Wrapper aS = TC_Aspect_Wrapper.getAspect(g);
+                if (aS != null) {
+                    mAspectCache.put(g, aS);
+                    continue;
+                }
+            }
+        }
+
+        // Custom Aspects
+        ASPECT_BALANCE = new TC_Aspect_Wrapper(
+                "Sagrausten",
+                Utils.rgbtoHexValue(125, 125, 125),
+                new TC_Aspect_Wrapper[] {ASPECT_STARBOUND, get(TC_Aspects.RADIO)},
+                new ResourceLocation(CORE.MODID + ":textures/aspects/" + "Sagrausten.png"),
+                false,
+                1,
+                "Ancient Knowledge");
 
-		ASPECT_LUST = 
-				new TC_Aspect_Wrapper(
-						"Slusium",
-						Utils.rgbtoHexValue(175, 125, 25),
-						new TC_Aspect_Wrapper[]{
-								ASPECT_BALANCE,
-								get(TC_Aspects.NEBRISUM)
-								},
-				new ResourceLocation(CORE.MODID+":textures/aspects/" + "Slusium.png"),
-				false,
-				1,
-				"Warped Thoughts");
+        ASPECT_LUST = new TC_Aspect_Wrapper(
+                "Slusium",
+                Utils.rgbtoHexValue(175, 125, 25),
+                new TC_Aspect_Wrapper[] {ASPECT_BALANCE, get(TC_Aspects.NEBRISUM)},
+                new ResourceLocation(CORE.MODID + ":textures/aspects/" + "Slusium.png"),
+                false,
+                1,
+                "Warped Thoughts");
 
-		ASPECT_STARBOUND = 
-				new TC_Aspect_Wrapper(
-						"Xenil",
-						Utils.rgbtoHexValue(25, 25, 25),
-						new TC_Aspect_Wrapper[]{
-								get(TC_Aspects.MAGNETO),
-								get(TC_Aspects.RADIO)},
-				new ResourceLocation(CORE.MODID+":textures/aspects/" + "Xenil.png"),
-				false,
-				1,
-				"A beginning to something new");
+        ASPECT_STARBOUND = new TC_Aspect_Wrapper(
+                "Xenil",
+                Utils.rgbtoHexValue(25, 25, 25),
+                new TC_Aspect_Wrapper[] {get(TC_Aspects.MAGNETO), get(TC_Aspects.RADIO)},
+                new ResourceLocation(CORE.MODID + ":textures/aspects/" + "Xenil.png"),
+                false,
+                1,
+                "A beginning to something new");
 
-		ASPECT_TOXIC = 
-				new TC_Aspect_Wrapper(
-						"Xablum",
-						Utils.rgbtoHexValue(25, 185, 25),
-						new TC_Aspect_Wrapper[]{
-								ASPECT_STARBOUND,
-								ASPECT_LUST
-								},
-				new ResourceLocation(CORE.MODID+":textures/aspects/" + "Xablum.png"),
-				false,
-				1,
-				"Insanity");
+        ASPECT_TOXIC = new TC_Aspect_Wrapper(
+                "Xablum",
+                Utils.rgbtoHexValue(25, 185, 25),
+                new TC_Aspect_Wrapper[] {ASPECT_STARBOUND, ASPECT_LUST},
+                new ResourceLocation(CORE.MODID + ":textures/aspects/" + "Xablum.png"),
+                false,
+                1,
+                "Insanity");
 
-		ASPECT_HEAVEN = 
-				new TC_Aspect_Wrapper(
-						"Zetralt",
-						Utils.rgbtoHexValue(225, 225, 225),
-						new TC_Aspect_Wrapper[]{
-								get(TC_Aspects.AURAM),
-								ASPECT_TOXIC
-								},
-				new ResourceLocation(CORE.MODID+":textures/aspects/" + "Zetralt.png"),
-				false,
-				1,
-				"Control, Respect, Glory");	
-		
-		
-	}
-	
-	private TC_Aspect_Wrapper get(TC_Aspects aGtObjects) {
-		try {
-			return TC_Aspect_Wrapper.generate(aGtObjects.mAspect);
-		} catch (IllegalArgumentException e) {
-			e.printStackTrace();
-			return null;
-		}
-	}
+        ASPECT_HEAVEN = new TC_Aspect_Wrapper(
+                "Zetralt",
+                Utils.rgbtoHexValue(225, 225, 225),
+                new TC_Aspect_Wrapper[] {get(TC_Aspects.AURAM), ASPECT_TOXIC},
+                new ResourceLocation(CORE.MODID + ":textures/aspects/" + "Zetralt.png"),
+                false,
+                1,
+                "Control, Respect, Glory");
+    }
 
-	public static synchronized final TC_AspectList_Wrapper getTC_AspectList_Wrapper(final List<GTPP_AspectStack> aAspects) {
-		TC_AspectList_Wrapper o = null;
-		try {
-			if (m == null || (m != null && !m.isAccessible())) {
-				m = GT_ThaumcraftCompat.class.getDeclaredMethod("getTC_AspectList_Wrapper", List.class);
-				m.setAccessible(true);				
-			}
-			if (m != null) {
-				o = (TC_AspectList_Wrapper) m.invoke(null, aAspects);				
-			}
-		}
-		catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
-			e.printStackTrace();
-		}		
-		if (o == null) {
-			Logger.REFLECTION("[Aspect] Did not retrieve valid aspect list from reflective invocation.");
-		}
-		return o;
-	}
+    private TC_Aspect_Wrapper get(TC_Aspects aGtObjects) {
+        try {
+            return TC_Aspect_Wrapper.generate(aGtObjects.mAspect);
+        } catch (IllegalArgumentException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
 
-	
-}
\ No newline at end of file
+    public static final synchronized TC_AspectList_Wrapper getTC_AspectList_Wrapper(
+            final List<GTPP_AspectStack> aAspects) {
+        TC_AspectList_Wrapper o = null;
+        try {
+            if (m == null || (m != null && !m.isAccessible())) {
+                m = GT_ThaumcraftCompat.class.getDeclaredMethod("getTC_AspectList_Wrapper", List.class);
+                m.setAccessible(true);
+            }
+            if (m != null) {
+                o = (TC_AspectList_Wrapper) m.invoke(null, aAspects);
+            }
+        } catch (NoSuchMethodException
+                | SecurityException
+                | IllegalAccessException
+                | IllegalArgumentException
+                | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+        if (o == null) {
+            Logger.REFLECTION("[Aspect] Did not retrieve valid aspect list from reflective invocation.");
+        }
+        return o;
+    }
+}
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectStack.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectStack.java
index 23e9035f40..e48bd64e53 100644
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectStack.java
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectStack.java
@@ -4,12 +4,11 @@ import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper;
 
 public class GTPP_AspectStack {
 
-	public final TC_Aspect_Wrapper mAspect;
-	public final int mAmount;
-	
-	public GTPP_AspectStack(TC_Aspect_Wrapper aAspect, int aAmount) {
-		mAspect = aAspect;
-		mAmount= aAmount;
-	}
+    public final TC_Aspect_Wrapper mAspect;
+    public final int mAmount;
 
+    public GTPP_AspectStack(TC_Aspect_Wrapper aAspect, int aAmount) {
+        mAspect = aAspect;
+        mAmount = aAmount;
+    }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java
index dda5a62b27..6f1d53bc33 100644
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java
@@ -2,89 +2,90 @@ package gtPlusPlus.xmod.thaumcraft.commands;
 
 import static gtPlusPlus.core.util.minecraft.PlayerUtils.messagePlayer;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.commands.CommandUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.xmod.thaumcraft.objects.ThreadAspectScanner;
+import java.util.ArrayList;
+import java.util.List;
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayer;
 
 public class CommandDumpAspects implements ICommand {
-	private final List<String> aliases;
-	public static long mLastScanTime = System.currentTimeMillis();
-
-	public CommandDumpAspects() {
-		this.aliases = new ArrayList<>();
-		this.aliases.add("DA");
-		this.aliases.add("da");
-		this.aliases.add("dumpaspects");
-		this.aliases.add("dumptc");
-		Logger.INFO("Registered Aspect Dump Command.");
-	}
+    private final List<String> aliases;
+    public static long mLastScanTime = System.currentTimeMillis();
 
-	@Override
-	public int compareTo(final Object o) {
-		return 0;
-	}
+    public CommandDumpAspects() {
+        this.aliases = new ArrayList<>();
+        this.aliases.add("DA");
+        this.aliases.add("da");
+        this.aliases.add("dumpaspects");
+        this.aliases.add("dumptc");
+        Logger.INFO("Registered Aspect Dump Command.");
+    }
 
-	@Override
-	public String getCommandName() {
-		return "DumpAspects";
-	}
+    @Override
+    public int compareTo(final Object o) {
+        return 0;
+    }
 
-	@Override
-	public String getCommandUsage(final ICommandSender var1) {
-		return "/DumpAspects";
-	}
+    @Override
+    public String getCommandName() {
+        return "DumpAspects";
+    }
 
-	@Override
-	public List<String> getCommandAliases() {
-		return this.aliases;
-	}
+    @Override
+    public String getCommandUsage(final ICommandSender var1) {
+        return "/DumpAspects";
+    }
 
-	@Override
-	public void processCommand(final ICommandSender S, final String[] argString) {
-		final EntityPlayer P = CommandUtils.getPlayer(S);
-		final long T = System.currentTimeMillis();
-		final long D = T - mLastScanTime;
-		final int Z = (int) (D / 1000);
-		if (Z >= 30) {
-			// Lets process this in the Background on a new Thread.
-			Thread t = createNewThread();
-			messagePlayer(P, "Beginning to dump information about all items/blocks & their aspects to file.");
-			messagePlayer(P, "Please do not close your game during this process, you will be notified upon completion.");
-			t.start();
-		} else {
-			messagePlayer(P, "Your last run of DA was less than 30 seconds ago, please wait " + (30 - Z)
-					+ " seconds before trying again.");
-		}
-	}
+    @Override
+    public List<String> getCommandAliases() {
+        return this.aliases;
+    }
 
-	@Override
-	public boolean canCommandSenderUseCommand(final ICommandSender var1) {
-		final EntityPlayer P = CommandUtils.getPlayer(var1);
-		if (P == null || !PlayerUtils.isPlayerOP(P)) {
-			return false;
-		}
-		return true;
-	}
+    @Override
+    public void processCommand(final ICommandSender S, final String[] argString) {
+        final EntityPlayer P = CommandUtils.getPlayer(S);
+        final long T = System.currentTimeMillis();
+        final long D = T - mLastScanTime;
+        final int Z = (int) (D / 1000);
+        if (Z >= 30) {
+            // Lets process this in the Background on a new Thread.
+            Thread t = createNewThread();
+            messagePlayer(P, "Beginning to dump information about all items/blocks & their aspects to file.");
+            messagePlayer(
+                    P, "Please do not close your game during this process, you will be notified upon completion.");
+            t.start();
+        } else {
+            messagePlayer(
+                    P,
+                    "Your last run of DA was less than 30 seconds ago, please wait " + (30 - Z)
+                            + " seconds before trying again.");
+        }
+    }
 
-	@Override
-	public List<?> addTabCompletionOptions(final ICommandSender var1, final String[] var2) {
-		return null;
-	}
+    @Override
+    public boolean canCommandSenderUseCommand(final ICommandSender var1) {
+        final EntityPlayer P = CommandUtils.getPlayer(var1);
+        if (P == null || !PlayerUtils.isPlayerOP(P)) {
+            return false;
+        }
+        return true;
+    }
 
-	@Override
-	public boolean isUsernameIndex(final String[] var1, final int var2) {
-		return false;
-	}
+    @Override
+    public List<?> addTabCompletionOptions(final ICommandSender var1, final String[] var2) {
+        return null;
+    }
 
-	private static Thread createNewThread() {
-		return new ThreadAspectScanner();
-	}
+    @Override
+    public boolean isUsernameIndex(final String[] var1, final int var2) {
+        return false;
+    }
 
-}
\ No newline at end of file
+    private static Thread createNewThread() {
+        return new ThreadAspectScanner();
+    }
+}
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java
index fdcf7b8498..896c68aa3a 100644
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java
@@ -1,13 +1,5 @@
 package gtPlusPlus.xmod.thaumcraft.objects;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.data.Pair;
@@ -15,144 +7,150 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.data.FileUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.xmod.thaumcraft.commands.CommandDumpAspects;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
 public class ThreadAspectScanner extends Thread {
 
-	public static boolean mDoWeScan = false;
-	private static final Map<String, AutoMap<ItemStack>> mAllGameContent = new HashMap<String, AutoMap<ItemStack>>();
-	public final File mAspectCacheFile;
-
-	public ThreadAspectScanner() {
-		mAspectCacheFile = FileUtils.getFile("config/GTplusplus", "AspectInfo", "txt");
-		mDoWeScan = true;		
-	}
+    public static boolean mDoWeScan = false;
+    private static final Map<String, AutoMap<ItemStack>> mAllGameContent = new HashMap<String, AutoMap<ItemStack>>();
+    public final File mAspectCacheFile;
 
-	private void tryCacheObject(ItemStack aStack) {
-		if (aStack == null) {
-			return;
-		}
-		String nameKey;
-		try {
-			nameKey = ItemUtils.getUnlocalizedItemName(aStack);
-		} catch (NullPointerException n) {
-			try {
-				nameKey = Utils.sanitizeString(aStack.getDisplayName().toLowerCase());
-			} catch (NullPointerException n2) {
-				try {
-					nameKey = aStack.getItem().getUnlocalizedName();
-				} catch (NullPointerException n3) {
-					nameKey = "BadItemsGalore";
-				}
-			}
-		}
-		AutoMap<ItemStack> m = new AutoMap<ItemStack>();
-		if (mAllGameContent.containsKey(nameKey)) {
-			m = mAllGameContent.get(nameKey);
-		}
-		m.put(aStack);
-		mAllGameContent.put(nameKey, m);
-	}
+    public ThreadAspectScanner() {
+        mAspectCacheFile = FileUtils.getFile("config/GTplusplus", "AspectInfo", "txt");
+        mDoWeScan = true;
+    }
 
-	@SuppressWarnings({ "rawtypes" })
-	@Override
-	public void run() {
-		if (mDoWeScan) {
-			Iterator iterator;
-			Logger.INFO("Finding Blocks and Items to scan for Aspect data.");
-			long mBlocksCounter = 0;
-			long mItemsCounter = 0;
+    private void tryCacheObject(ItemStack aStack) {
+        if (aStack == null) {
+            return;
+        }
+        String nameKey;
+        try {
+            nameKey = ItemUtils.getUnlocalizedItemName(aStack);
+        } catch (NullPointerException n) {
+            try {
+                nameKey = Utils.sanitizeString(aStack.getDisplayName().toLowerCase());
+            } catch (NullPointerException n2) {
+                try {
+                    nameKey = aStack.getItem().getUnlocalizedName();
+                } catch (NullPointerException n3) {
+                    nameKey = "BadItemsGalore";
+                }
+            }
+        }
+        AutoMap<ItemStack> m = new AutoMap<ItemStack>();
+        if (mAllGameContent.containsKey(nameKey)) {
+            m = mAllGameContent.get(nameKey);
+        }
+        m.put(aStack);
+        mAllGameContent.put(nameKey, m);
+    }
 
-			// First, find blocks
-			iterator = Block.blockRegistry.getKeys().iterator();
-			while (iterator.hasNext()) {
-				String s = (String) iterator.next();
-				Block block = (Block) Block.blockRegistry.getObject(s);
-				if (block != null) {
-					tryCacheObject(ItemUtils.getSimpleStack(block));
-					mBlocksCounter++;
-				}
-			}
-			Logger.INFO("Completed Block Scan. Counted "+mBlocksCounter);
+    @SuppressWarnings({"rawtypes"})
+    @Override
+    public void run() {
+        if (mDoWeScan) {
+            Iterator iterator;
+            Logger.INFO("Finding Blocks and Items to scan for Aspect data.");
+            long mBlocksCounter = 0;
+            long mItemsCounter = 0;
 
-			// Second Find items, Skipping things that exist.
-			iterator = Item.itemRegistry.getKeys().iterator();
-			w