Update buildscript & apply spotless (#1306)

* Update dependencies

* Update buildscript, apply spotless

7 files changed, 67 insertions, 17 deletions

diff --git a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_BasicLogic.java b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_BasicLogic.java
index ab4f7eda69..41ccf9f98c 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_BasicLogic.java
+++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_BasicLogic.java
@@ -26,21 +26,41 @@ public class GT_Circuit_BasicLogic extends GT_CircuitryBehavior {
     @Override
     public void onTick(int[] aCircuitData, IRedstoneCircuitBlock aRedstoneCircuitBlock) {
         if (aCircuitData[0] < 2) {
-            aRedstoneCircuitBlock.setRedstone((byte) (aCircuitData[0] % 2 == (getAnyRedstone(aRedstoneCircuitBlock) ? 0 : 1) ? 15 : 0), aRedstoneCircuitBlock.getOutputFacing());
+            aRedstoneCircuitBlock.setRedstone(
+                    (byte) (aCircuitData[0] % 2 == (getAnyRedstone(aRedstoneCircuitBlock) ? 0 : 1) ? 15 : 0),
+                    aRedstoneCircuitBlock.getOutputFacing());
         } else if (aCircuitData[0] < 4) {
-            aRedstoneCircuitBlock.setRedstone((byte) (aCircuitData[0] % 2 == (getOneRedstone(aRedstoneCircuitBlock) ? 0 : 1) ? 15 : 0), aRedstoneCircuitBlock.getOutputFacing());
+            aRedstoneCircuitBlock.setRedstone(
+                    (byte) (aCircuitData[0] % 2 == (getOneRedstone(aRedstoneCircuitBlock) ? 0 : 1) ? 15 : 0),
+                    aRedstoneCircuitBlock.getOutputFacing());
         } else if (aCircuitData[0] < 6) {
-            aRedstoneCircuitBlock.setRedstone((byte) (aCircuitData[0] % 2 == (getAllRedstone(aRedstoneCircuitBlock) ? 0 : 1) ? 15 : 0), aRedstoneCircuitBlock.getOutputFacing());
+            aRedstoneCircuitBlock.setRedstone(
+                    (byte) (aCircuitData[0] % 2 == (getAllRedstone(aRedstoneCircuitBlock) ? 0 : 1) ? 15 : 0),
+                    aRedstoneCircuitBlock.getOutputFacing());
         } else if (aCircuitData[0] < 7) {
-            aRedstoneCircuitBlock.setRedstone((byte) (15 - getStrongestRedstone(aRedstoneCircuitBlock)), aRedstoneCircuitBlock.getOutputFacing());
+            aRedstoneCircuitBlock.setRedstone(
+                    (byte) (15 - getStrongestRedstone(aRedstoneCircuitBlock)), aRedstoneCircuitBlock.getOutputFacing());
         } else if (aCircuitData[0] < 9) {
-            aRedstoneCircuitBlock.setRedstone((byte) ((aCircuitData[0] % 2 == 0 ? 15 : 0) ^ (getStrongestRedstone(aRedstoneCircuitBlock) | getWeakestRedstone(aRedstoneCircuitBlock))), aRedstoneCircuitBlock.getOutputFacing());
+            aRedstoneCircuitBlock.setRedstone(
+                    (byte) ((aCircuitData[0] % 2 == 0 ? 15 : 0)
+                            ^ (getStrongestRedstone(aRedstoneCircuitBlock)
+                                    | getWeakestRedstone(aRedstoneCircuitBlock))),
+                    aRedstoneCircuitBlock.getOutputFacing());
         } else if (aCircuitData[0] < 11) {
-            aRedstoneCircuitBlock.setRedstone((byte) ((aCircuitData[0] % 2 == 0 ? 15 : 0) ^ getStrongestRedstone(aRedstoneCircuitBlock) ^ getWeakestRedstone(aRedstoneCircuitBlock)), aRedstoneCircuitBlock.getOutputFacing());
+            aRedstoneCircuitBlock.setRedstone(
+                    (byte) ((aCircuitData[0] % 2 == 0 ? 15 : 0)
+                            ^ getStrongestRedstone(aRedstoneCircuitBlock)
+                            ^ getWeakestRedstone(aRedstoneCircuitBlock)),
+                    aRedstoneCircuitBlock.getOutputFacing());
         } else if (aCircuitData[0] < 13) {
-            aRedstoneCircuitBlock.setRedstone((byte) ((aCircuitData[0] % 2 == 0 ? 15 : 0) ^ getStrongestRedstone(aRedstoneCircuitBlock) & getWeakestRedstone(aRedstoneCircuitBlock)), aRedstoneCircuitBlock.getOutputFacing());
+            aRedstoneCircuitBlock.setRedstone(
+                    (byte) ((aCircuitData[0] % 2 == 0 ? 15 : 0)
+                            ^ getStrongestRedstone(aRedstoneCircuitBlock) & getWeakestRedstone(aRedstoneCircuitBlock)),
+                    aRedstoneCircuitBlock.getOutputFacing());
         } else if (aCircuitData[0] < 14) {
-            aRedstoneCircuitBlock.setRedstone((byte) (getStrongestRedstone(aRedstoneCircuitBlock) ^ 0xF), aRedstoneCircuitBlock.getOutputFacing());
+            aRedstoneCircuitBlock.setRedstone(
+                    (byte) (getStrongestRedstone(aRedstoneCircuitBlock) ^ 0xF),
+                    aRedstoneCircuitBlock.getOutputFacing());
         }
     }
 
diff --git a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_BitAnd.java b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_BitAnd.java
index 2ea61ddf51..501f7b7785 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_BitAnd.java
+++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_BitAnd.java
@@ -46,7 +46,17 @@ public class GT_Circuit_BitAnd extends GT_CircuitryBehavior {
 
     @Override
     public void onTick(int[] aCircuitData, IRedstoneCircuitBlock aRedstoneCircuitBlock) {
-        aRedstoneCircuitBlock.setRedstone((byte) ((getStrongestRedstone(aRedstoneCircuitBlock) & (aCircuitData[0] | aCircuitData[1] << 1 | aCircuitData[2] << 2 | aCircuitData[3] << 3)) != 0 ? 15 : 0), aRedstoneCircuitBlock.getOutputFacing());
+        aRedstoneCircuitBlock.setRedstone(
+                (byte)
+                        ((getStrongestRedstone(aRedstoneCircuitBlock)
+                                                & (aCircuitData[0]
+                                                        | aCircuitData[1] << 1
+                                                        | aCircuitData[2] << 2
+                                                        | aCircuitData[3] << 3))
+                                        != 0
+                                ? 15
+                                : 0),
+                aRedstoneCircuitBlock.getOutputFacing());
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Equals.java b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Equals.java
index f5bd99e09e..c493e32e29 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Equals.java
+++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Equals.java
@@ -32,7 +32,12 @@ public class GT_Circuit_Equals extends GT_CircuitryBehavior {
 
     @Override
     public void onTick(int[] aCircuitData, IRedstoneCircuitBlock aRedstoneCircuitBlock) {
-        aRedstoneCircuitBlock.setRedstone(((byte) (((aCircuitData[1] != 0) == (getStrongestRedstone(aRedstoneCircuitBlock) == aCircuitData[0])) ? 0 : 15)), aRedstoneCircuitBlock.getOutputFacing());
+        aRedstoneCircuitBlock.setRedstone(
+                ((byte)
+                        (((aCircuitData[1] != 0) == (getStrongestRedstone(aRedstoneCircuitBlock) == aCircuitData[0]))
+                                ? 0
+                                : 15)),
+                aRedstoneCircuitBlock.getOutputFacing());
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Pulser.java b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Pulser.java
index d1360df7cb..844817e4c3 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Pulser.java
+++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Pulser.java
@@ -3,8 +3,7 @@ package gregtech.common.redstonecircuits;
 import gregtech.api.interfaces.IRedstoneCircuitBlock;
 import gregtech.api.util.GT_CircuitryBehavior;
 
-public class GT_Circuit_Pulser
-        extends GT_CircuitryBehavior {
+public class GT_Circuit_Pulser extends GT_CircuitryBehavior {
     public GT_Circuit_Pulser(int aIndex) {
         super(aIndex);
     }
@@ -34,7 +33,9 @@ public class GT_Circuit_Pulser
 
     @Override
     public void onTick(int[] aCircuitData, IRedstoneCircuitBlock aRedstoneCircuitBlock) {
-        byte tRedstone = aCircuitData[1] == 0 ? getWeakestNonZeroRedstone(aRedstoneCircuitBlock) : getStrongestRedstone(aRedstoneCircuitBlock);
+        byte tRedstone = aCircuitData[1] == 0
+                ? getWeakestNonZeroRedstone(aRedstoneCircuitBlock)
+                : getStrongestRedstone(aRedstoneCircuitBlock);
         if (aCircuitData[4] == 0) {
             aCircuitData[5] = tRedstone;
         }
@@ -47,7 +48,12 @@ public class GT_Circuit_Pulser
                 aCircuitData[4] = 0;
             }
         }
-        aRedstoneCircuitBlock.setRedstone((byte) ((aCircuitData[4] > 0) && (aCircuitData[4] <= aCircuitData[0]) ? (byte) aCircuitData[1] : (aCircuitData[1] <= 0) || (aCircuitData[1] > 15) ? (byte) aCircuitData[5] : 0), aRedstoneCircuitBlock.getOutputFacing());
+        aRedstoneCircuitBlock.setRedstone(
+                (byte)
+                        ((aCircuitData[4] > 0) && (aCircuitData[4] <= aCircuitData[0])
+                                ? (byte) aCircuitData[1]
+                                : (aCircuitData[1] <= 0) || (aCircuitData[1] > 15) ? (byte) aCircuitData[5] : 0),
+                aRedstoneCircuitBlock.getOutputFacing());
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Randomizer.java b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Randomizer.java
index a04e2e94d1..e666d50e99 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Randomizer.java
+++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Randomizer.java
@@ -45,7 +45,8 @@ public class GT_Circuit_Randomizer extends GT_CircuitryBehavior {
         }
         if (aCircuitData[4] >= aCircuitData[0]) {
             aCircuitData[4] = 0;
-            aRedstoneCircuitBlock.setRedstone((byte) aRedstoneCircuitBlock.getRandom(16), aRedstoneCircuitBlock.getOutputFacing());
+            aRedstoneCircuitBlock.setRedstone(
+                    (byte) aRedstoneCircuitBlock.getRandom(16), aRedstoneCircuitBlock.getOutputFacing());
         }
     }
 
diff --git a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_RedstoneMeter.java b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_RedstoneMeter.java
index 973e6f3963..2dd4f73bb5 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_RedstoneMeter.java
+++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_RedstoneMeter.java
@@ -50,7 +50,13 @@ public class GT_Circuit_RedstoneMeter extends GT_CircuitryBehavior {
     @Override
     public void onTick(int[] aCircuitData, IRedstoneCircuitBlock aRedstoneCircuitBlock) {
         byte tRedstone = getStrongestRedstone(aRedstoneCircuitBlock);
-        aRedstoneCircuitBlock.setRedstone((byte) (((tRedstone >= aCircuitData[0]) && (tRedstone <= aCircuitData[1]) ? 1 : 0) != (aCircuitData[2] != 0 ? 1 : 0) ? (byte) aCircuitData[3] : 0), aRedstoneCircuitBlock.getOutputFacing());
+        aRedstoneCircuitBlock.setRedstone(
+                (byte)
+                        (((tRedstone >= aCircuitData[0]) && (tRedstone <= aCircuitData[1]) ? 1 : 0)
+                                        != (aCircuitData[2] != 0 ? 1 : 0)
+                                ? (byte) aCircuitData[3]
+                                : 0),
+                aRedstoneCircuitBlock.getOutputFacing());
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Timer.java b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Timer.java
index 57af0c4598..f207609940 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Timer.java
+++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Timer.java
@@ -57,7 +57,9 @@ public class GT_Circuit_Timer extends GT_CircuitryBehavior {
                     aRedstoneCircuitBlock.setRedstone((byte) 15, aRedstoneCircuitBlock.getOutputFacing());
                     aCircuitData[4] = 0;
                 } else {
-                    aRedstoneCircuitBlock.setRedstone((byte) ((aCircuitData[4] - aCircuitData[0]) % aCircuitData[2] == 0 ? 15 : 0), aRedstoneCircuitBlock.getOutputFacing());
+                    aRedstoneCircuitBlock.setRedstone(
+                            (byte) ((aCircuitData[4] - aCircuitData[0]) % aCircuitData[2] == 0 ? 15 : 0),
+                            aRedstoneCircuitBlock.getOutputFacing());
                 }
             } else {
                 aRedstoneCircuitBlock.setRedstone((byte) 15, aRedstoneCircuitBlock.getOutputFacing());