[ci skip] spotlessApply with the new settings

6 files changed, 80 insertions, 66 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java
index 896c68aa3a..8fb8e2fc7d 100644
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java
@@ -1,12 +1,5 @@
 package gtPlusPlus.xmod.thaumcraft.objects;
 
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.api.objects.data.Pair;
-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;
@@ -14,10 +7,19 @@ 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;
 
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.data.Pair;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.data.FileUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.xmod.thaumcraft.commands.CommandDumpAspects;
+
 public class ThreadAspectScanner extends Thread {
 
     public static boolean mDoWeScan = false;
@@ -55,7 +57,7 @@ public class ThreadAspectScanner extends Thread {
         mAllGameContent.put(nameKey, m);
     }
 
-    @SuppressWarnings({"rawtypes"})
+    @SuppressWarnings({ "rawtypes" })
     @Override
     public void run() {
         if (mDoWeScan) {
@@ -116,8 +118,8 @@ public class ThreadAspectScanner extends Thread {
                         continue;
                     }
                     for (ItemStack stack : group) {
-                        thaumcraft.api.aspects.AspectList a =
-                                thaumcraft.common.lib.crafting.ThaumcraftCraftingManager.getObjectTags(stack);
+                        thaumcraft.api.aspects.AspectList a = thaumcraft.common.lib.crafting.ThaumcraftCraftingManager
+                                .getObjectTags(stack);
                         if (a == null) {
                             continue;
                         } else {
@@ -129,8 +131,11 @@ public class ThreadAspectScanner extends Thread {
                             }
                             try {
                                 List<String> mList = new ArrayList<String>();
-                                mList.add(stack.getDisplayName() + " | Meta: " + stack.getItemDamage() + " | Unlocal: "
-                                        + stack.getUnlocalizedName());
+                                mList.add(
+                                        stack.getDisplayName() + " | Meta: "
+                                                + stack.getItemDamage()
+                                                + " | Unlocal: "
+                                                + stack.getUnlocalizedName());
                                 for (Pair<String, Integer> r : aspectPairs) {
                                     if (r != null) {
                                         mList.add(r.getKey() + " x" + r.getValue());
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java
index 6847fcfe69..c847953cd8 100644
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java
@@ -1,22 +1,24 @@
 package gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect;
 
-import gregtech.api.enums.TC_Aspects;
-import gregtech.api.util.GT_LanguageManager;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.xmod.thaumcraft.util.ThaumcraftUtils;
 import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.LinkedHashMap;
 import java.util.Map;
+
 import net.minecraft.util.ResourceLocation;
 
+import gregtech.api.enums.TC_Aspects;
+import gregtech.api.util.GT_LanguageManager;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.xmod.thaumcraft.util.ThaumcraftUtils;
+
 /**
- * Wrapper class for Thaumcraft Aspects.
- * Used to avoid compile time dependencies.
+ * Wrapper class for Thaumcraft Aspects. Used to avoid compile time dependencies.
+ * 
  * @author Alkalus
  *
  */
@@ -48,6 +50,7 @@ public class TC_Aspect_Wrapper {
 
     /**
      * Gets the total aspect list from Thaumcraft, which should contain all other registered aspects.
+     * 
      * @return - A LinkedHashMap(String, Aspect);
      */
     public static LinkedHashMap<String, Object> getVanillaAspectList() {
@@ -68,7 +71,8 @@ public class TC_Aspect_Wrapper {
 
     /**
      * Vanilla Aspect Constructor
-     * @param tag - Aspect Name
+     * 
+     * @param tag       - Aspect Name
      * @param color
      * @param chatcolor
      * @param blend
@@ -81,7 +85,8 @@ public class TC_Aspect_Wrapper {
     /**
      *
      * Vanilla Aspect Constructor
-     * @param tag - Aspect Name
+     * 
+     * @param tag        - Aspect Name
      * @param color
      * @param components
      */
@@ -92,7 +97,8 @@ public class TC_Aspect_Wrapper {
     /**
      *
      * Vanilla Aspect Constructor
-     * @param tag - Aspect Name
+     * 
+     * @param tag        - Aspect Name
      * @param color
      * @param components
      * @param blend
@@ -104,20 +110,20 @@ public class TC_Aspect_Wrapper {
     /**
      *
      * Vanilla Aspect Constructor
-     * @param tag - Aspect Name
+     * 
+     * @param tag        - Aspect Name
      * @param color
      * @param components
      * @param image
      * @param blend
      */
-    public TC_Aspect_Wrapper(
-            String tag, int color, TC_Aspect_Wrapper[] components, boolean vanilla, int blend, String aTooltip) {
+    public TC_Aspect_Wrapper(String tag, int color, TC_Aspect_Wrapper[] components, boolean vanilla, int blend,
+            String aTooltip) {
         this(
                 tag,
                 color,
                 components,
-                vanilla
-                        ? new ResourceLocation("thaumcraft", "textures/aspects/" + tag.toLowerCase() + ".png")
+                vanilla ? new ResourceLocation("thaumcraft", "textures/aspects/" + tag.toLowerCase() + ".png")
                         : new ResourceLocation(CORE.MODID, "textures/aspects/" + tag.toLowerCase() + ".png"),
                 vanilla,
                 blend,
@@ -126,14 +132,8 @@ public class TC_Aspect_Wrapper {
 
     private static int aInternalAspectIDAllocation = 1;
 
-    public TC_Aspect_Wrapper(
-            String tag,
-            int color,
-            TC_Aspect_Wrapper[] components,
-            ResourceLocation image,
-            boolean vanilla,
-            int blend,
-            String aTooltip) {
+    public TC_Aspect_Wrapper(String tag, int color, TC_Aspect_Wrapper[] components, ResourceLocation image,
+            boolean vanilla, int blend, String aTooltip) {
         if (components == null) {
             components = new TC_Aspect_Wrapper[] {};
         }
@@ -183,6 +183,7 @@ public class TC_Aspect_Wrapper {
 
     /**
      * Generates a TC_Aspect from an object, presummed to be a TC Aspect.
+     * 
      * @param aBaseAspect - The TC Aspect to generate from.
      * @return
      * @throws IllegalArgumentException
@@ -207,15 +208,14 @@ public class TC_Aspect_Wrapper {
                         aTag,
                         (int) ReflectionUtils.getField(mClass_Aspect, "color").get(aBaseAspect),
                         generateAspectArrayInternal(
-                                ReflectionUtils.getField(mClass_Aspect, "components"), (aBaseAspect)),
-                        (ResourceLocation)
-                                ReflectionUtils.getField(mClass_Aspect, "image").get(aBaseAspect),
+                                ReflectionUtils.getField(mClass_Aspect, "components"),
+                                (aBaseAspect)),
+                        (ResourceLocation) ReflectionUtils.getField(mClass_Aspect, "image").get(aBaseAspect),
                         true,
                         (int) ReflectionUtils.getField(mClass_Aspect, "blend").get(aBaseAspect),
                         "");
                 if (aTemp != null) {
-                    aTemp.chatcolor = (String)
-                            ReflectionUtils.getField(mClass_Aspect, "chatcolor").get(aBaseAspect);
+                    aTemp.chatcolor = (String) ReflectionUtils.getField(mClass_Aspect, "chatcolor").get(aBaseAspect);
                     return aTemp;
                 } else {
                     return null;
@@ -234,6 +234,7 @@ public class TC_Aspect_Wrapper {
 
     /**
      * Public getter for all TC_Aspects
+     * 
      * @param aAspectName - Aspect Name
      * @return - A GT++ Aspect wrapper or null. (TC_Aspect)
      */
@@ -270,8 +271,7 @@ public class TC_Aspect_Wrapper {
             if (aAspectArray.length > 0) {
                 int i = 0;
                 for (Object g : components) {
-                    aAspectArray[i] = getAspect((String)
-                            ReflectionUtils.getField(mClass_Aspect, "tag").get(g));
+                    aAspectArray[i] = getAspect((String) ReflectionUtils.getField(mClass_Aspect, "tag").get(g));
                     i++;
                 }
             }
@@ -284,6 +284,7 @@ public class TC_Aspect_Wrapper {
 
     /**
      * Tasty code to generate TC Aspects reflectively.
+     * 
      * @return
      */
     public Object generateTcAspect() {
@@ -298,7 +299,11 @@ public class TC_Aspect_Wrapper {
                 }
             }
             Constructor constructor = mClass_Aspect.getConstructor(
-                    String.class, int.class, aAspectArray.getClass(), ResourceLocation.class, int.class);
+                    String.class,
+                    int.class,
+                    aAspectArray.getClass(),
+                    ResourceLocation.class,
+                    int.class);
             Object myObject = constructor.newInstance(tag, color, aAspectArray, image, blend);
 
             // Set chat colour
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategories_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategories_Wrapper.java
index 0130ca3b96..5ed57574d2 100644
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategories_Wrapper.java
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategories_Wrapper.java
@@ -1,17 +1,19 @@
 package gtPlusPlus.xmod.thaumcraft.objects.wrapper.research;
 
-import cpw.mods.fml.common.FMLLog;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
+
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
+
 import org.apache.logging.log4j.Level;
 
+import cpw.mods.fml.common.FMLLog;
+
 public class TC_ResearchCategories_Wrapper {
 
-    public static LinkedHashMap<String, TC_ResearchCategoryList_Wrapper> researchCategories =
-            new LinkedHashMap<String, TC_ResearchCategoryList_Wrapper>();
+    public static LinkedHashMap<String, TC_ResearchCategoryList_Wrapper> researchCategories = new LinkedHashMap<String, TC_ResearchCategoryList_Wrapper>();
 
     public static TC_ResearchCategoryList_Wrapper getResearchList(String key) {
         return (TC_ResearchCategoryList_Wrapper) researchCategories.get(key);
@@ -60,7 +62,9 @@ public class TC_ResearchCategories_Wrapper {
                         FMLLog.log(
                                 Level.FATAL,
                                 "[Thaumcraft] Research [" + ri.getName()
-                                        + "] not added as it overlaps with existing research [" + rr.getName() + "]",
+                                        + "] not added as it overlaps with existing research ["
+                                        + rr.getName()
+                                        + "]",
                                 new Object[0]);
                         return;
                     }
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategoryList_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategoryList_Wrapper.java
index 08c69cdca5..f8066abe2d 100644
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategoryList_Wrapper.java
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategoryList_Wrapper.java
@@ -2,9 +2,11 @@ package gtPlusPlus.xmod.thaumcraft.objects.wrapper.research;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import net.minecraft.util.ResourceLocation;
 
 public class TC_ResearchCategoryList_Wrapper {
+
     public int minDisplayColumn;
     public int minDisplayRow;
     public int maxDisplayColumn;
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchItem_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchItem_Wrapper.java
index be0ae26e61..1baefdc465 100644
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchItem_Wrapper.java
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchItem_Wrapper.java
@@ -1,12 +1,13 @@
 package gtPlusPlus.xmod.thaumcraft.objects.wrapper.research;
 
-import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_AspectList_Wrapper;
-import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper;
-import gtPlusPlus.xmod.thaumcraft.util.ThaumcraftUtils;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
 
+import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_AspectList_Wrapper;
+import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper;
+import gtPlusPlus.xmod.thaumcraft.util.ThaumcraftUtils;
+
 public class TC_ResearchItem_Wrapper {
 
     public final String key;
@@ -45,14 +46,8 @@ public class TC_ResearchItem_Wrapper {
         this.setVirtual();
     }
 
-    public TC_ResearchItem_Wrapper(
-            String key,
-            String category,
-            TC_AspectList_Wrapper tags,
-            int col,
-            int row,
-            int complex,
-            ResourceLocation icon) {
+    public TC_ResearchItem_Wrapper(String key, String category, TC_AspectList_Wrapper tags, int col, int row,
+            int complex, ResourceLocation icon) {
         this.key = key;
         this.category = category;
         this.tags = tags;
@@ -70,8 +65,8 @@ public class TC_ResearchItem_Wrapper {
         }
     }
 
-    public TC_ResearchItem_Wrapper(
-            String key, String category, TC_AspectList_Wrapper tags, int col, int row, int complex, ItemStack icon) {
+    public TC_ResearchItem_Wrapper(String key, String category, TC_AspectList_Wrapper tags, int col, int row,
+            int complex, ItemStack icon) {
         this.key = key;
         this.category = category;
         this.tags = tags;
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchPage_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchPage_Wrapper.java
index 83ddd106a5..4632909620 100644
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchPage_Wrapper.java
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchPage_Wrapper.java
@@ -1,18 +1,21 @@
 package gtPlusPlus.xmod.thaumcraft.objects.wrapper.research;
 
-import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_AspectList_Wrapper;
-import gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe.TC_CrucibleRecipe_Wrapper;
-import gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe.TC_IArcaneRecipe_Wrapper;
-import gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe.TC_InfusionEnchantmentRecipe_Wrapper;
-import gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe.TC_InfusionRecipe_Wrapper;
 import java.util.List;
+
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.FurnaceRecipes;
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
 
+import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_AspectList_Wrapper;
+import gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe.TC_CrucibleRecipe_Wrapper;
+import gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe.TC_IArcaneRecipe_Wrapper;
+import gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe.TC_InfusionEnchantmentRecipe_Wrapper;
+import gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe.TC_InfusionRecipe_Wrapper;
+
 public class TC_ResearchPage_Wrapper {
+
     public TC_PageType_Wrapper type;
     public String text;
     public String research;