aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/redstonecircuits
diff options
context:
space:
mode:
authorRaven Szewczyk <git@eigenraven.me>2023-04-10 17:49:16 +0100
committerRaven Szewczyk <git@eigenraven.me>2023-04-10 17:49:16 +0100
commit8ac58626bd4caa9e49f58acc6b97ac031f6c2107 (patch)
tree0a8c7b737f1f2607fa6875309f4c6a5c2b8b3331 /src/main/java/gregtech/common/redstonecircuits
parentd795cf740c3b48b602d3bfb708ed9e6c492ad37d (diff)
downloadGT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.tar.gz
GT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.tar.bz2
GT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.zip
Update spotless config to 0.2.2
Diffstat (limited to 'src/main/java/gregtech/common/redstonecircuits')
-rw-r--r--src/main/java/gregtech/common/redstonecircuits/GT_Circuit_BasicLogic.java38
-rw-r--r--src/main/java/gregtech/common/redstonecircuits/GT_Circuit_BitAnd.java9
-rw-r--r--src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Equals.java7
-rw-r--r--src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Pulser.java8
-rw-r--r--src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Randomizer.java5
-rw-r--r--src/main/java/gregtech/common/redstonecircuits/GT_Circuit_RedstoneMeter.java5
-rw-r--r--src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Timer.java4
7 files changed, 37 insertions, 39 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 3e179aee11..34093a95de 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_BasicLogic.java
+++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_BasicLogic.java
@@ -28,39 +28,39 @@ public class GT_Circuit_BasicLogic extends GT_CircuitryBehavior {
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());
+ (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());
+ (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());
+ (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());
+ (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());
+ (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());
+ (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());
+ (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());
+ (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 f5d2fca824..f5f83a7e10 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_BitAnd.java
+++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_BitAnd.java
@@ -48,11 +48,10 @@ 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());
+ (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 5e230d3363..9e9af183e8 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Equals.java
+++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Equals.java
@@ -34,10 +34,9 @@ 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());
+ ((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 672fddf7fb..8663758535 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Pulser.java
+++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Pulser.java
@@ -35,7 +35,7 @@ public class GT_Circuit_Pulser extends GT_CircuitryBehavior {
@Override
public void onTick(int[] aCircuitData, IRedstoneCircuitBlock aRedstoneCircuitBlock) {
byte tRedstone = aCircuitData[1] == 0 ? getWeakestNonZeroRedstone(aRedstoneCircuitBlock)
- : getStrongestRedstone(aRedstoneCircuitBlock);
+ : getStrongestRedstone(aRedstoneCircuitBlock);
if (aCircuitData[4] == 0) {
aCircuitData[5] = tRedstone;
}
@@ -49,9 +49,9 @@ public class GT_Circuit_Pulser extends GT_CircuitryBehavior {
}
}
aRedstoneCircuitBlock.setRedstone(
- (aCircuitData[4] > 0) && (aCircuitData[4] <= aCircuitData[0]) ? (byte) aCircuitData[1]
- : (aCircuitData[1] <= 0) || (aCircuitData[1] > 15) ? (byte) aCircuitData[5] : 0,
- aRedstoneCircuitBlock.getOutputFacing());
+ (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 6557f0277c..336bf9928d 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Randomizer.java
+++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Randomizer.java
@@ -46,9 +46,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 491fe72c87..4db261fcf0 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_RedstoneMeter.java
+++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_RedstoneMeter.java
@@ -51,9 +51,10 @@ public class GT_Circuit_RedstoneMeter extends GT_CircuitryBehavior {
@Override
public void onTick(int[] aCircuitData, IRedstoneCircuitBlock aRedstoneCircuitBlock) {
byte tRedstone = getStrongestRedstone(aRedstoneCircuitBlock);
- aRedstoneCircuitBlock.setRedstone(
+ aRedstoneCircuitBlock
+ .setRedstone(
((tRedstone >= aCircuitData[0]) && (tRedstone <= aCircuitData[1]) ? 1 : 0)
- != (aCircuitData[2] != 0 ? 1 : 0) ? (byte) aCircuitData[3] : 0,
+ != (aCircuitData[2] != 0 ? 1 : 0) ? (byte) aCircuitData[3] : 0,
aRedstoneCircuitBlock.getOutputFacing());
}
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 b7ff2096c6..026c83dfbc 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Timer.java
+++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Timer.java
@@ -59,8 +59,8 @@ public class GT_Circuit_Timer extends GT_CircuitryBehavior {
aCircuitData[4] = 0;
} else {
aRedstoneCircuitBlock.setRedstone(
- (byte) ((aCircuitData[4] - aCircuitData[0]) % aCircuitData[2] == 0 ? 15 : 0),
- aRedstoneCircuitBlock.getOutputFacing());
+ (byte) ((aCircuitData[4] - aCircuitData[0]) % aCircuitData[2] == 0 ? 15 : 0),
+ aRedstoneCircuitBlock.getOutputFacing());
}
} else {
aRedstoneCircuitBlock.setRedstone((byte) 15, aRedstoneCircuitBlock.getOutputFacing());