Update buildscript & apply spotless (#1306)

* Update dependencies

* Update buildscript, apply spotless

6 files changed, 90 insertions, 51 deletions

diff --git a/src/main/java/gregtech/api/graphs/consumers/ConsumerNode.java b/src/main/java/gregtech/api/graphs/consumers/ConsumerNode.java
index e060c5c094..78b3c51928 100644
--- a/src/main/java/gregtech/api/graphs/consumers/ConsumerNode.java
+++ b/src/main/java/gregtech/api/graphs/consumers/ConsumerNode.java
@@ -1,15 +1,15 @@
 package gregtech.api.graphs.consumers;
 
 import gregtech.api.graphs.Node;
-import net.minecraft.tileentity.TileEntity;
-
 import java.util.ArrayList;
+import net.minecraft.tileentity.TileEntity;
 
 // node attached to a tile entity that can consume stuff from the network
 public class ConsumerNode extends Node {
     public byte mSide;
+
     public ConsumerNode(int aNodeValue, TileEntity aTileEntity, byte aSide, ArrayList<ConsumerNode> aConsumers) {
-        super(aNodeValue,aTileEntity,aConsumers);
+        super(aNodeValue, aTileEntity, aConsumers);
         this.mSide = aSide;
     }
 
diff --git a/src/main/java/gregtech/api/graphs/consumers/EmptyPowerConsumer.java b/src/main/java/gregtech/api/graphs/consumers/EmptyPowerConsumer.java
index 29f4fe8893..d5ff76c12b 100644
--- a/src/main/java/gregtech/api/graphs/consumers/EmptyPowerConsumer.java
+++ b/src/main/java/gregtech/api/graphs/consumers/EmptyPowerConsumer.java
@@ -2,12 +2,11 @@ package gregtech.api.graphs.consumers;
 
 import gregtech.api.graphs.paths.PowerNodePath;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
-import net.minecraft.tileentity.TileEntity;
-
 import java.util.ArrayList;
+import net.minecraft.tileentity.TileEntity;
 
-//this is here to apply voltage to dead ends
-public class EmptyPowerConsumer extends ConsumerNode{
+// this is here to apply voltage to dead ends
+public class EmptyPowerConsumer extends ConsumerNode {
     public EmptyPowerConsumer(int aNodeValue, TileEntity aTileEntity, byte aSide, ArrayList<ConsumerNode> aConsumers) {
         super(aNodeValue, aTileEntity, aSide, aConsumers);
     }
@@ -20,8 +19,8 @@ public class EmptyPowerConsumer extends ConsumerNode{
     @Override
     public int injectEnergy(long aVoltage, long aMaxAmps) {
         BaseMetaPipeEntity tPipe = (BaseMetaPipeEntity) mTileEntity;
-        PowerNodePath tPath =(PowerNodePath) tPipe.getNodePath();
-        tPath.applyVoltage(aVoltage,true);
+        PowerNodePath tPath = (PowerNodePath) tPipe.getNodePath();
+        tPath.applyVoltage(aVoltage, true);
         return 0;
     }
 }
diff --git a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyConnected.java b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyConnected.java
index 0b3c8e31fa..30582332e7 100644
--- a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyConnected.java
+++ b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyConnected.java
@@ -1,13 +1,13 @@
 package gregtech.api.graphs.consumers;
 
 import gregtech.api.interfaces.tileentity.IEnergyConnected;
-import net.minecraft.tileentity.TileEntity;
-
 import java.util.ArrayList;
+import net.minecraft.tileentity.TileEntity;
 
 public class NodeEnergyConnected extends ConsumerNode {
-    public NodeEnergyConnected(int aNodeValue, IEnergyConnected aTileEntity, byte aSide, ArrayList<ConsumerNode> aConsumers) {
-        super(aNodeValue,(TileEntity) aTileEntity, aSide, aConsumers);
+    public NodeEnergyConnected(
+            int aNodeValue, IEnergyConnected aTileEntity, byte aSide, ArrayList<ConsumerNode> aConsumers) {
+        super(aNodeValue, (TileEntity) aTileEntity, aSide, aConsumers);
     }
 
     @Override
@@ -17,6 +17,6 @@ public class NodeEnergyConnected extends ConsumerNode {
 
     @Override
     public int injectEnergy(long aVoltage, long aMaxAmps) {
-        return (int) ((IEnergyConnected)mTileEntity).injectEnergyUnits(mSide,aVoltage,aMaxAmps);
+        return (int) ((IEnergyConnected) mTileEntity).injectEnergyUnits(mSide, aVoltage, aMaxAmps);
     }
 }
diff --git a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java
index bd9e75945b..9c5e3f8aab 100644
--- a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java
+++ b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java
@@ -1,5 +1,7 @@
 package gregtech.api.graphs.consumers;
 
+import static gregtech.api.enums.GT_Values.V;
+
 import cofh.api.energy.IEnergyReceiver;
 import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
@@ -7,19 +9,18 @@ import gregtech.api.enums.SoundResource;
 import gregtech.api.util.GT_Utility;
 import gregtech.api.util.WorldSpawnedEventBuilder;
 import gregtech.common.GT_Pollution;
+import java.util.ArrayList;
 import net.minecraft.init.Blocks;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import java.util.ArrayList;
-
-import static gregtech.api.enums.GT_Values.V;
-
-//consumer for RF machines
+// consumer for RF machines
 public class NodeEnergyReceiver extends ConsumerNode {
     int mRestRF = 0;
-    public NodeEnergyReceiver(int aNodeValue, IEnergyReceiver aTileEntity, byte aSide, ArrayList<ConsumerNode> aConsumers) {
+
+    public NodeEnergyReceiver(
+            int aNodeValue, IEnergyReceiver aTileEntity, byte aSide, ArrayList<ConsumerNode> aConsumers) {
         super(aNodeValue, (TileEntity) aTileEntity, aSide, aConsumers);
     }
 
@@ -37,44 +38,82 @@ public class NodeEnergyReceiver extends ConsumerNode {
             mRestRF -= consumed;
             return ampsUsed;
         }
-        if (GregTech_API.mRFExplosions && GregTech_API.sMachineExplosions &&
-                ((IEnergyReceiver) mTileEntity).getMaxEnergyStored(tDirection) < rfOut * 600L) {
+        if (GregTech_API.mRFExplosions
+                && GregTech_API.sMachineExplosions
+                && ((IEnergyReceiver) mTileEntity).getMaxEnergyStored(tDirection) < rfOut * 600L) {
             explode(rfOut);
         }
         return 0;
     }
 
-    //copied from IEnergyConnected
+    // copied from IEnergyConnected
     private void explode(int aRfOut) {
         if (aRfOut > 32L * GregTech_API.mEUtoRF / 100L) {
             int aExplosionPower = aRfOut;
-            float tStrength =
-                aExplosionPower < V[0] ? 1.0F :
-                aExplosionPower < V[1] ? 2.0F :
-                aExplosionPower < V[2] ? 3.0F :
-                aExplosionPower < V[3] ? 4.0F :
-                aExplosionPower < V[4] ? 5.0F :
-                aExplosionPower < V[4] * 2 ? 6.0F :
-                aExplosionPower < V[5] ? 7.0F :
-                aExplosionPower < V[6] ? 8.0F :
-                aExplosionPower < V[7] ? 9.0F :
-                aExplosionPower < V[8] ? 10.0F :
-                aExplosionPower < V[8] * 2 ? 11.0F :
-                aExplosionPower < V[9] ? 12.0F :
-                aExplosionPower < V[10] ? 13.0F :
-                aExplosionPower < V[11] ? 14.0F :
-                aExplosionPower < V[12] ? 15.0F :
-                aExplosionPower < V[12] * 2 ? 16.0F :
-                aExplosionPower < V[13] ? 17.0F :
-                aExplosionPower < V[14] ? 18.0F :
-                aExplosionPower < V[15] ? 19.0F : 20.0F;
+            float tStrength = aExplosionPower < V[0]
+                    ? 1.0F
+                    : aExplosionPower < V[1]
+                            ? 2.0F
+                            : aExplosionPower < V[2]
+                                    ? 3.0F
+                                    : aExplosionPower < V[3]
+                                            ? 4.0F
+                                            : aExplosionPower < V[4]
+                                                    ? 5.0F
+                                                    : aExplosionPower < V[4] * 2
+                                                            ? 6.0F
+                                                            : aExplosionPower < V[5]
+                                                                    ? 7.0F
+                                                                    : aExplosionPower < V[6]
+                                                                            ? 8.0F
+                                                                            : aExplosionPower < V[7]
+                                                                                    ? 9.0F
+                                                                                    : aExplosionPower < V[8]
+                                                                                            ? 10.0F
+                                                                                            : aExplosionPower < V[8] * 2
+                                                                                                    ? 11.0F
+                                                                                                    : aExplosionPower
+                                                                                                                    < V[
+                                                                                                                            9]
+                                                                                                            ? 12.0F
+                                                                                                            : aExplosionPower
+                                                                                                                            < V[
+                                                                                                                                    10]
+                                                                                                                    ? 13.0F
+                                                                                                                    : aExplosionPower
+                                                                                                                                    < V[
+                                                                                                                                            11]
+                                                                                                                            ? 14.0F
+                                                                                                                            : aExplosionPower
+                                                                                                                                            < V[
+                                                                                                                                                    12]
+                                                                                                                                    ? 15.0F
+                                                                                                                                    : aExplosionPower
+                                                                                                                                                    < V[
+                                                                                                                                                                    12]
+                                                                                                                                                            * 2
+                                                                                                                                            ? 16.0F
+                                                                                                                                            : aExplosionPower
+                                                                                                                                                            < V[
+                                                                                                                                                                    13]
+                                                                                                                                                    ? 17.0F
+                                                                                                                                                    : aExplosionPower
+                                                                                                                                                                    < V[
+                                                                                                                                                                            14]
+                                                                                                                                                            ? 18.0F
+                                                                                                                                                            : aExplosionPower
+                                                                                                                                                                            < V[
+                                                                                                                                                                                    15]
+                                                                                                                                                                    ? 19.0F
+                                                                                                                                                                    : 20.0F;
             int tX = mTileEntity.xCoord, tY = mTileEntity.yCoord, tZ = mTileEntity.zCoord;
             World tWorld = mTileEntity.getWorldObj();
             GT_Utility.sendSoundToPlayers(tWorld, SoundResource.IC2_MACHINES_MACHINE_OVERLOAD, 1.0F, -1, tX, tY, tZ);
             tWorld.setBlock(tX, tY, tZ, Blocks.air);
             if (GregTech_API.sMachineExplosions)
                 if (GT_Mod.gregtechproxy.mPollution)
-                    GT_Pollution.addPollution(tWorld.getChunkFromBlockCoords(tX, tZ), GT_Mod.gregtechproxy.mPollutionOnExplosion);
+                    GT_Pollution.addPollution(
+                            tWorld.getChunkFromBlockCoords(tX, tZ), GT_Mod.gregtechproxy.mPollutionOnExplosion);
 
             new WorldSpawnedEventBuilder.ExplosionEffectEventBuilder()
                     .setStrength(tStrength)
diff --git a/src/main/java/gregtech/api/graphs/consumers/NodeEnergySink.java b/src/main/java/gregtech/api/graphs/consumers/NodeEnergySink.java
index d2c54e284f..95b16883af 100644
--- a/src/main/java/gregtech/api/graphs/consumers/NodeEnergySink.java
+++ b/src/main/java/gregtech/api/graphs/consumers/NodeEnergySink.java
@@ -1,11 +1,10 @@
 package gregtech.api.graphs.consumers;
 
 import ic2.api.energy.tile.IEnergySink;
+import java.util.ArrayList;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import java.util.ArrayList;
-
 // consumer for IC2 machines
 public class NodeEnergySink extends ConsumerNode {
     public NodeEnergySink(int nodeValue, IEnergySink tileEntity, byte side, ArrayList<ConsumerNode> consumers) {
@@ -20,9 +19,10 @@ public class NodeEnergySink extends ConsumerNode {
     @Override
     public int injectEnergy(long aVoltage, long aMaxAmps) {
         int tUsedAmps = 0;
-        while (aMaxAmps > tUsedAmps && ((IEnergySink) mTileEntity).getDemandedEnergy() > 0 &&
-                ((IEnergySink) mTileEntity).injectEnergy(ForgeDirection.getOrientation(mSide), aVoltage, aVoltage) < aVoltage)
-            tUsedAmps++;
+        while (aMaxAmps > tUsedAmps
+                && ((IEnergySink) mTileEntity).getDemandedEnergy() > 0
+                && ((IEnergySink) mTileEntity).injectEnergy(ForgeDirection.getOrientation(mSide), aVoltage, aVoltage)
+                        < aVoltage) tUsedAmps++;
         return tUsedAmps;
     }
 }
diff --git a/src/main/java/gregtech/api/graphs/consumers/NodeGTBaseMetaTile.java b/src/main/java/gregtech/api/graphs/consumers/NodeGTBaseMetaTile.java
index e9736df7f4..e367a5294e 100644
--- a/src/main/java/gregtech/api/graphs/consumers/NodeGTBaseMetaTile.java
+++ b/src/main/java/gregtech/api/graphs/consumers/NodeGTBaseMetaTile.java
@@ -6,13 +6,14 @@ import java.util.ArrayList;
 
 // consumer for gt machines
 public class NodeGTBaseMetaTile extends ConsumerNode {
-    public NodeGTBaseMetaTile(int aNodeValue, BaseMetaTileEntity aTileEntity, byte aSide, ArrayList<ConsumerNode> aConsumers) {
+    public NodeGTBaseMetaTile(
+            int aNodeValue, BaseMetaTileEntity aTileEntity, byte aSide, ArrayList<ConsumerNode> aConsumers) {
         super(aNodeValue, aTileEntity, aSide, aConsumers);
     }
 
     @Override
     public int injectEnergy(long aVoltage, long aMaxAmps) {
-        return (int)((IEnergyConnected) mTileEntity).injectEnergyUnits(mSide,aVoltage, aMaxAmps);
+        return (int) ((IEnergyConnected) mTileEntity).injectEnergyUnits(mSide, aVoltage, aMaxAmps);
     }
 
     @Override