[ci skip] spotlessApply with the new settings

5 files changed, 23 insertions, 19 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_CopiedBlockTexture.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_CopiedBlockTexture.java
index 5336b60fc7..6a780d227c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_CopiedBlockTexture.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_CopiedBlockTexture.java
@@ -1,11 +1,13 @@
 package gtPlusPlus.xmod.gregtech.api.objects;
 
+import net.minecraft.block.Block;
+
 import gregtech.api.enums.Dyes;
 import gregtech.api.objects.GT_CopiedBlockTexture;
-import net.minecraft.block.Block;
 
 /**
  * Made this to get rid of deprecation warnings <i>everywhere</i>.
+ * 
  * @author Alkalus
  *
  */
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_RenderedTexture.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_RenderedTexture.java
index 6764a1e206..0da0136193 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_RenderedTexture.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_RenderedTexture.java
@@ -6,6 +6,7 @@ import gregtech.api.objects.GT_RenderedTexture;
 
 /**
  * Made this to get rid of deprecation warnings <i>everywhere</i>.
+ * 
  * @author Alkalus
  *
  */
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechFluid.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechFluid.java
index 40699aa108..32783ec437 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechFluid.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechFluid.java
@@ -1,10 +1,12 @@
 package gtPlusPlus.xmod.gregtech.api.objects;
 
+import net.minecraftforge.fluids.Fluid;
+
 import gregtech.api.GregTech_API;
 import gtPlusPlus.core.lib.CORE;
-import net.minecraftforge.fluids.Fluid;
 
 public class GregtechFluid extends Fluid implements Runnable {
+
     public final String mTextureName;
     private final short[] mRGBa;
 
@@ -17,8 +19,7 @@ public class GregtechFluid extends Fluid implements Runnable {
 
     @Override
     public int getColor() {
-        return (Math.max(0, Math.min(255, this.mRGBa[0])) << 16)
-                | (Math.max(0, Math.min(255, this.mRGBa[1])) << 8)
+        return (Math.max(0, Math.min(255, this.mRGBa[0])) << 16) | (Math.max(0, Math.min(255, this.mRGBa[1])) << 8)
                 | Math.max(0, Math.min(255, this.mRGBa[2]));
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java
index a26cfbb192..787299ef6b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java
@@ -1,12 +1,15 @@
 package gtPlusPlus.xmod.gregtech.api.objects;
 
+import java.util.*;
+
+import net.minecraft.item.ItemStack;
+
 import gregtech.api.objects.GT_ArrayList;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import java.util.*;
-import net.minecraft.item.ItemStack;
 
 public class GregtechItemData {
+
     private static final GregtechMaterialStack[] EMPTY_GT_MaterialStack_ARRAY = new GregtechMaterialStack[0];
 
     public final List<Object> mExtraData = new GT_ArrayList<>(false, 1);
@@ -16,14 +19,14 @@ public class GregtechItemData {
     public boolean mBlackListed = false;
     public ItemStack mUnificationTarget = null;
 
-    public GregtechItemData(
-            final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial, final boolean aBlackListed) {
+    public GregtechItemData(final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial,
+            final boolean aBlackListed) {
         this.mPrefix = aPrefix;
         this.mMaterial = aMaterial == null ? null : new GregtechMaterialStack(aMaterial, aPrefix.mMaterialAmount);
         this.mBlackListed = aBlackListed;
         this.mByProducts = (aPrefix.mSecondaryMaterial == null) || (aPrefix.mSecondaryMaterial.mMaterial == null)
                 ? EMPTY_GT_MaterialStack_ARRAY
-                : new GregtechMaterialStack[] {aPrefix.mSecondaryMaterial.clone()};
+                : new GregtechMaterialStack[] { aPrefix.mSecondaryMaterial.clone() };
     }
 
     public GregtechItemData(final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial) {
@@ -37,8 +40,7 @@ public class GregtechItemData {
         if (aByProducts == null) {
             this.mByProducts = EMPTY_GT_MaterialStack_ARRAY;
         } else {
-            final GregtechMaterialStack[] tByProducts = aByProducts.length < 1
-                    ? EMPTY_GT_MaterialStack_ARRAY
+            final GregtechMaterialStack[] tByProducts = aByProducts.length < 1 ? EMPTY_GT_MaterialStack_ARRAY
                     : new GregtechMaterialStack[aByProducts.length];
             int j = 0;
             for (int i = 0; i < aByProducts.length; i++) {
@@ -53,15 +55,12 @@ public class GregtechItemData {
         }
     }
 
-    public GregtechItemData(
-            final GT_Materials aMaterial, final long aAmount, final GregtechMaterialStack... aByProducts) {
+    public GregtechItemData(final GT_Materials aMaterial, final long aAmount,
+            final GregtechMaterialStack... aByProducts) {
         this(new GregtechMaterialStack(aMaterial, aAmount), aByProducts);
     }
 
-    public GregtechItemData(
-            final GT_Materials aMaterial,
-            final long aAmount,
-            final GT_Materials aByProduct,
+    public GregtechItemData(final GT_Materials aMaterial, final long aAmount, final GT_Materials aByProduct,
             final long aByProductAmount) {
         this(new GregtechMaterialStack(aMaterial, aAmount), new GregtechMaterialStack(aByProduct, aByProductAmount));
     }
@@ -100,6 +99,7 @@ public class GregtechItemData {
         }
 
         Collections.sort(rList, new Comparator<GregtechMaterialStack>() {
+
             @Override
             public int compare(final GregtechMaterialStack a, final GregtechMaterialStack b) {
                 return a.mAmount == b.mAmount ? 0 : a.mAmount > b.mAmount ? -1 : +1;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechMaterialStack.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechMaterialStack.java
index 107202a027..5ffdc4d20e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechMaterialStack.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechMaterialStack.java
@@ -3,6 +3,7 @@ package gtPlusPlus.xmod.gregtech.api.objects;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 
 public class GregtechMaterialStack implements Cloneable {
+
     public long mAmount;
     public GT_Materials mMaterial;
 
@@ -33,8 +34,7 @@ public class GregtechMaterialStack implements Cloneable {
         }
         if (aObject instanceof GregtechMaterialStack) {
             return (((GregtechMaterialStack) aObject).mMaterial == this.mMaterial)
-                    && ((this.mAmount < 0)
-                            || (((GregtechMaterialStack) aObject).mAmount < 0)
+                    && ((this.mAmount < 0) || (((GregtechMaterialStack) aObject).mAmount < 0)
                             || (((GregtechMaterialStack) aObject).mAmount == this.mAmount));
         }
         return false;