Update buildscript & apply spotless (#1306)

* Update dependencies

* Update buildscript, apply spotless

6 files changed, 105 insertions, 40 deletions

diff --git a/src/main/java/gregtech/api/interfaces/metatileentity/IConfigurationCircuitSupport.java b/src/main/java/gregtech/api/interfaces/metatileentity/IConfigurationCircuitSupport.java
index 7d6923e93f..59a70b450d 100644
--- a/src/main/java/gregtech/api/interfaces/metatileentity/IConfigurationCircuitSupport.java
+++ b/src/main/java/gregtech/api/interfaces/metatileentity/IConfigurationCircuitSupport.java
@@ -1,11 +1,9 @@
 package gregtech.api.interfaces.metatileentity;
 
+import gregtech.api.GregTech_API;
 import java.util.List;
-
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.GregTech_API;
-
 /**
  *  Implement this interface if your metatileentity supports configuration circuits
  *  to resolve recipe conflicts.
@@ -23,7 +21,7 @@ public interface IConfigurationCircuitSupport {
      * This list is unmodifiable. Its elements are not supposed to be modified in any way!
      */
     default List<ItemStack> getConfigurationCircuits() {
-            return GregTech_API.getConfigurationCircuitList(100);
+        return GregTech_API.getConfigurationCircuitList(100);
     }
 
     /**
@@ -41,5 +39,6 @@ public interface IConfigurationCircuitSupport {
     }
 
     int getCircuitSlotX();
+
     int getCircuitSlotY();
 }
diff --git a/src/main/java/gregtech/api/interfaces/metatileentity/IConnectable.java b/src/main/java/gregtech/api/interfaces/metatileentity/IConnectable.java
index cffcb4c4ab..84c991ade9 100644
--- a/src/main/java/gregtech/api/interfaces/metatileentity/IConnectable.java
+++ b/src/main/java/gregtech/api/interfaces/metatileentity/IConnectable.java
@@ -4,17 +4,17 @@ package gregtech.api.interfaces.metatileentity;
  * For pipes, wires, and other MetaTiles which need to be decided whether they should connect to the block at each side.
  */
 public interface IConnectable {
-    int NO_CONNECTION    = 0b00000000;
-    int CONNECTED_DOWN   = 0b00000001;
-    int CONNECTED_UP     = 0b00000010;
-    int CONNECTED_NORTH  = 0b00000100;
-    int CONNECTED_SOUTH  = 0b00001000;
-    int CONNECTED_WEST   = 0b00010000;
-    int CONNECTED_EAST   = 0b00100000;
-    int CONNECTED_ALL    = 0b00111111;
-    int HAS_FRESHFOAM    = 0b01000000;
+    int NO_CONNECTION = 0b00000000;
+    int CONNECTED_DOWN = 0b00000001;
+    int CONNECTED_UP = 0b00000010;
+    int CONNECTED_NORTH = 0b00000100;
+    int CONNECTED_SOUTH = 0b00001000;
+    int CONNECTED_WEST = 0b00010000;
+    int CONNECTED_EAST = 0b00100000;
+    int CONNECTED_ALL = 0b00111111;
+    int HAS_FRESHFOAM = 0b01000000;
     int HAS_HARDENEDFOAM = 0b10000000;
-    int HAS_FOAM         = 0b11000000;
+    int HAS_FOAM = 0b11000000;
 
     /**
      * Try to connect to the Block at the specified side
diff --git a/src/main/java/gregtech/api/interfaces/metatileentity/IMachineCallback.java b/src/main/java/gregtech/api/interfaces/metatileentity/IMachineCallback.java
index e9ca4125a2..a1c00ebc97 100644
--- a/src/main/java/gregtech/api/interfaces/metatileentity/IMachineCallback.java
+++ b/src/main/java/gregtech/api/interfaces/metatileentity/IMachineCallback.java
@@ -2,6 +2,8 @@ package gregtech.api.interfaces.metatileentity;
 
 public interface IMachineCallback<Machinetype extends IMetaTileEntity> {
     Machinetype getCallbackBase();
+
     void setCallbackBase(Machinetype callback);
+
     Class<?> getType();
 }
diff --git a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java
index 65848fe96f..c9d23e1f71 100644
--- a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java
+++ b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java
@@ -9,6 +9,9 @@ import gregtech.api.interfaces.tileentity.IGregtechWailaProvider;
 import gregtech.api.interfaces.tileentity.IMachineBlockUpdateable;
 import gregtech.api.objects.GT_ItemStack;
 import gregtech.api.util.GT_Config;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -24,16 +27,18 @@ import net.minecraft.world.World;
 import net.minecraftforge.fluids.IFluidHandler;
 import net.minecraftforge.fluids.IFluidTank;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Warning, this Interface has just been made to be able to add multiple kinds of MetaTileEntities (Cables, Pipes, Transformers, but not the regular Blocks)
  * <p/>
  * Don't implement this yourself and expect it to work. Extend @MetaTileEntity itself.
  */
-public interface IMetaTileEntity extends ISidedInventory, IFluidTank, IFluidHandler, IGearEnergyTileEntity, IMachineBlockUpdateable, IGregtechWailaProvider {
+public interface IMetaTileEntity
+        extends ISidedInventory,
+                IFluidTank,
+                IFluidHandler,
+                IGearEnergyTileEntity,
+                IMachineBlockUpdateable,
+                IGregtechWailaProvider {
     /**
      * This determines the BaseMetaTileEntity belonging to this MetaTileEntity by using the Meta ID of the Block itself.
      * <p/>
@@ -143,7 +148,8 @@ public interface IMetaTileEntity extends ISidedInventory, IFluidTank, IFluidHand
     /**
      * When a Player rightclicks the Facing with a soldering iron.
      */
-    boolean onSolderingToolRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ);
+    boolean onSolderingToolRightClick(
+            byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ);
 
     /**
      * Called right before this Machine explodes
@@ -241,7 +247,8 @@ public interface IMetaTileEntity extends ISidedInventory, IFluidTank, IFluidHand
      *
      * @return
      */
-    boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ);
+    boolean onRightclick(
+            IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ);
 
     /**
      * a Player leftclicks the Machine
@@ -317,7 +324,8 @@ public interface IMetaTileEntity extends ISidedInventory, IFluidTank, IFluidHand
     /**
      * returns the DebugLog
      */
-    ArrayList<String> getSpecialDebugInfo(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, int aLogLevel, ArrayList<String> aList);
+    ArrayList<String> getSpecialDebugInfo(
+            IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, int aLogLevel, ArrayList<String> aList);
 
     /**
      * get a small Description
@@ -338,12 +346,18 @@ public interface IMetaTileEntity extends ISidedInventory, IFluidTank, IFluidHand
      * @param aActive     if the Machine is currently active (use this instead of calling mBaseMetaTileEntity.mActive!!!). Note: In case of Pipes this means if this Side is connected to something or not.
      * @param aRedstone   if the Machine is currently outputting a RedstoneSignal (use this instead of calling mBaseMetaTileEntity.mRedstone!!!)
      */
-    ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone);
+    ITexture[] getTexture(
+            IGregTechTileEntity aBaseMetaTileEntity,
+            byte aSide,
+            byte aFacing,
+            byte aColorIndex,
+            boolean aActive,
+            boolean aRedstone);
 
     /**
      * The Textures used for the Item rendering. Return null if you want the regular 3D Block Rendering.
      */
-    //public ITexture[] getItemTexture(ItemStack aStack);
+    // public ITexture[] getItemTexture(ItemStack aStack);
 
     /**
      * Register Icons here. This gets called when the Icons get initialized by the Base Block
@@ -389,7 +403,14 @@ public interface IMetaTileEntity extends ISidedInventory, IFluidTank, IFluidHand
 
     boolean allowGeneralRedstoneOutput();
 
-    void addCollisionBoxesToList(World aWorld, int aX, int aY, int aZ, AxisAlignedBB inputAABB, List<AxisAlignedBB> outputAABB, Entity collider);
+    void addCollisionBoxesToList(
+            World aWorld,
+            int aX,
+            int aY,
+            int aZ,
+            AxisAlignedBB inputAABB,
+            List<AxisAlignedBB> outputAABB,
+            Entity collider);
 
     AxisAlignedBB getCollisionBoundingBoxFromPool(World aWorld, int aX, int aY, int aZ);
 
@@ -420,7 +441,7 @@ public interface IMetaTileEntity extends ISidedInventory, IFluidTank, IFluidHand
      * just return in should recurse since we are already in meta tile...
      */
     @Override
-    default boolean isMachineBlockUpdateRecursive(){
+    default boolean isMachineBlockUpdateRecursive() {
         return true;
     }
 
@@ -433,5 +454,4 @@ public interface IMetaTileEntity extends ISidedInventory, IFluidTank, IFluidHand
     default void onRandomDisplayTick(IGregTechTileEntity aBaseMetaTileEntity) {
         /* do nothing */
     }
-
 }
diff --git a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityCable.java b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityCable.java
index 85237ac4f4..6b83ab4dba 100644
--- a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityCable.java
+++ b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityCable.java
@@ -1,13 +1,13 @@
 package gregtech.api.interfaces.metatileentity;
 
-import net.minecraft.tileentity.TileEntity;
-
 import java.util.ArrayList;
 import java.util.HashSet;
+import net.minecraft.tileentity.TileEntity;
 
 public interface IMetaTileEntityCable extends IMetaTileEntity {
     @Deprecated
-    long transferElectricity(byte aSide, long aVoltage, long aAmperage, ArrayList<TileEntity> aAlreadyPassedTileEntityList);
+    long transferElectricity(
+            byte aSide, long aVoltage, long aAmperage, ArrayList<TileEntity> aAlreadyPassedTileEntityList);
 
     default long transferElectricity(byte aSide, long aVoltage, long aAmperage, HashSet<TileEntity> aAlreadyPassedSet) {
         return transferElectricity(aSide, aVoltage, aAmperage, new ArrayList<>(aAlreadyPassedSet));
diff --git a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityItemPipe.java b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityItemPipe.java
index 90933b501f..1b1ce36871 100644
--- a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityItemPipe.java
+++ b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityItemPipe.java
@@ -3,7 +3,6 @@ package gregtech.api.interfaces.metatileentity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.util.GT_Utility;
-
 import java.util.Map;
 
 public interface IMetaTileEntityItemPipe extends IMetaTileEntity {
@@ -48,18 +47,30 @@ public interface IMetaTileEntityItemPipe extends IMetaTileEntity {
         /**
          * @return a List of connected Item Pipes
          */
-        public static Map<IMetaTileEntityItemPipe, Long> scanPipes(IMetaTileEntityItemPipe aMetaTileEntity, Map<IMetaTileEntityItemPipe, Long> aMap, long aStep, boolean aSuckItems, boolean aIgnoreCapacity) {
+        public static Map<IMetaTileEntityItemPipe, Long> scanPipes(
+                IMetaTileEntityItemPipe aMetaTileEntity,
+                Map<IMetaTileEntityItemPipe, Long> aMap,
+                long aStep,
+                boolean aSuckItems,
+                boolean aIgnoreCapacity) {
             aStep += aMetaTileEntity.getStepSize();
             if (aIgnoreCapacity || aMetaTileEntity.pipeCapacityCheck())
                 if (aMap.get(aMetaTileEntity) == null || aMap.get(aMetaTileEntity) > aStep) {
                     IGregTechTileEntity aBaseMetaTileEntity = aMetaTileEntity.getBaseMetaTileEntity();
                     aMap.put(aMetaTileEntity, aStep);
                     for (byte i = 0, j = 0; i < 6; i++) {
-                        if (aMetaTileEntity instanceof IConnectable && !((IConnectable) aMetaTileEntity).isConnectedAtSide(i))
-                            continue;
+                        if (aMetaTileEntity instanceof IConnectable
+                                && !((IConnectable) aMetaTileEntity).isConnectedAtSide(i)) continue;
                         j = GT_Utility.getOppositeSide(i);
                         if (aSuckItems) {
-                            if (aBaseMetaTileEntity.getCoverBehaviorAtSideNew(i).letsItemsIn(i, aBaseMetaTileEntity.getCoverIDAtSide(i), aBaseMetaTileEntity.getComplexCoverDataAtSide(i), -2, aBaseMetaTileEntity)) {
+                            if (aBaseMetaTileEntity
+                                    .getCoverBehaviorAtSideNew(i)
+                                    .letsItemsIn(
+                                            i,
+                                            aBaseMetaTileEntity.getCoverIDAtSide(i),
+                                            aBaseMetaTileEntity.getComplexCoverDataAtSide(i),
+                                            -2,
+                                            aBaseMetaTileEntity)) {
                                 IGregTechTileEntity tItemPipe = aBaseMetaTileEntity.getIGregTechTileEntityAtSide(i);
                                 if (aBaseMetaTileEntity.getColorization() >= 0) {
                                     byte tColor = tItemPipe.getColorization();
@@ -69,13 +80,33 @@ public interface IMetaTileEntityItemPipe extends IMetaTileEntity {
                                 }
                                 if (tItemPipe instanceof BaseMetaPipeEntity) {
                                     IMetaTileEntity tMetaTileEntity = tItemPipe.getMetaTileEntity();
-                                    if (tMetaTileEntity instanceof IMetaTileEntityItemPipe && tItemPipe.getCoverBehaviorAtSideNew(j).letsItemsOut(j, tItemPipe.getCoverIDAtSide(j), tItemPipe.getComplexCoverDataAtSide(j), -2, tItemPipe)) {
-                                        scanPipes((IMetaTileEntityItemPipe) tMetaTileEntity, aMap, aStep, aSuckItems, aIgnoreCapacity);
+                                    if (tMetaTileEntity instanceof IMetaTileEntityItemPipe
+                                            && tItemPipe
+                                                    .getCoverBehaviorAtSideNew(j)
+                                                    .letsItemsOut(
+                                                            j,
+                                                            tItemPipe.getCoverIDAtSide(j),
+                                                            tItemPipe.getComplexCoverDataAtSide(j),
+                                                            -2,
+                                                            tItemPipe)) {
+                                        scanPipes(
+                                                (IMetaTileEntityItemPipe) tMetaTileEntity,
+                                                aMap,
+                                                aStep,
+                                                aSuckItems,
+                                                aIgnoreCapacity);
                                     }
                                 }
                             }
                         } else {
-                            if (aBaseMetaTileEntity.getCoverBehaviorAtSideNew(i).letsItemsOut(i, aBaseMetaTileEntity.getCoverIDAtSide(i), aBaseMetaTileEntity.getComplexCoverDataAtSide(i), -2, aBaseMetaTileEntity)) {
+                            if (aBaseMetaTileEntity
+                                    .getCoverBehaviorAtSideNew(i)
+                                    .letsItemsOut(
+                                            i,
+                                            aBaseMetaTileEntity.getCoverIDAtSide(i),
+                                            aBaseMetaTileEntity.getComplexCoverDataAtSide(i),
+                                            -2,
+                                            aBaseMetaTileEntity)) {
                                 IGregTechTileEntity tItemPipe = aBaseMetaTileEntity.getIGregTechTileEntityAtSide(i);
                                 if (tItemPipe != null) {
                                     if (aBaseMetaTileEntity.getColorization() >= 0) {
@@ -86,8 +117,21 @@ public interface IMetaTileEntityItemPipe extends IMetaTileEntity {
                                     }
                                     if (tItemPipe instanceof BaseMetaPipeEntity) {
                                         IMetaTileEntity tMetaTileEntity = tItemPipe.getMetaTileEntity();
-                                        if (tMetaTileEntity instanceof IMetaTileEntityItemPipe && tItemPipe.getCoverBehaviorAtSideNew(j).letsItemsIn(j, tItemPipe.getCoverIDAtSide(j), tItemPipe.getComplexCoverDataAtSide(j), -2, tItemPipe)) {
-                                            scanPipes((IMetaTileEntityItemPipe) tMetaTileEntity, aMap, aStep, aSuckItems, aIgnoreCapacity);
+                                        if (tMetaTileEntity instanceof IMetaTileEntityItemPipe
+                                                && tItemPipe
+                                                        .getCoverBehaviorAtSideNew(j)
+                                                        .letsItemsIn(
+                                                                j,
+                                                                tItemPipe.getCoverIDAtSide(j),
+                                                                tItemPipe.getComplexCoverDataAtSide(j),
+                                                                -2,
+                                                                tItemPipe)) {
+                                            scanPipes(
+                                                    (IMetaTileEntityItemPipe) tMetaTileEntity,
+                                                    aMap,
+                                                    aStep,
+                                                    aSuckItems,
+                                                    aIgnoreCapacity);
                                         }
                                     }
                                 }