aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/redstonecircuits
diff options
context:
space:
mode:
authorJason Mitchell <mitchej@gmail.com>2023-01-30 10:56:42 -0800
committerJason Mitchell <mitchej@gmail.com>2023-01-30 10:56:42 -0800
commit0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a (patch)
tree1e2c649f3a6ce3f6b2babd0098a5f4819e9cd0b6 /src/main/java/gregtech/common/redstonecircuits
parentf8cc82edeb9810c45cba762d733a2c909a302faa (diff)
downloadGT5-Unofficial-0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a.tar.gz
GT5-Unofficial-0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a.tar.bz2
GT5-Unofficial-0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a.zip
[ci skip] spotlessApply with the new settings
Diffstat (limited to 'src/main/java/gregtech/common/redstonecircuits')
-rw-r--r--src/main/java/gregtech/common/redstonecircuits/GT_Circuit_BasicLogic.java12
-rw-r--r--src/main/java/gregtech/common/redstonecircuits/GT_Circuit_BitAnd.java10
-rw-r--r--src/main/java/gregtech/common/redstonecircuits/GT_Circuit_CombinationLock.java1
-rw-r--r--src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Equals.java8
-rw-r--r--src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Pulser.java10
-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.java8
-rw-r--r--src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Repeater.java1
-rw-r--r--src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Timer.java1
9 files changed, 26 insertions, 30 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 41ccf9f98c..ad9b0798dc 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_BasicLogic.java
+++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_BasicLogic.java
@@ -4,6 +4,7 @@ import gregtech.api.interfaces.IRedstoneCircuitBlock;
import gregtech.api.util.GT_CircuitryBehavior;
public class GT_Circuit_BasicLogic extends GT_CircuitryBehavior {
+
public GT_Circuit_BasicLogic(int aIndex) {
super(aIndex);
}
@@ -39,17 +40,16 @@ public class GT_Circuit_BasicLogic extends GT_CircuitryBehavior {
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))),
+ (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)
+ (byte) ((aCircuitData[0] % 2 == 0 ? 15 : 0) ^ getStrongestRedstone(aRedstoneCircuitBlock)
^ getWeakestRedstone(aRedstoneCircuitBlock)),
aRedstoneCircuitBlock.getOutputFacing());
} else if (aCircuitData[0] < 13) {
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 501f7b7785..f5d2fca824 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_BitAnd.java
+++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_BitAnd.java
@@ -4,6 +4,7 @@ import gregtech.api.interfaces.IRedstoneCircuitBlock;
import gregtech.api.util.GT_CircuitryBehavior;
public class GT_Circuit_BitAnd extends GT_CircuitryBehavior {
+
public GT_Circuit_BitAnd(int aIndex) {
super(aIndex);
}
@@ -47,13 +48,8 @@ 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
+ (byte) ((getStrongestRedstone(aRedstoneCircuitBlock)
+ & (aCircuitData[0] | aCircuitData[1] << 1 | aCircuitData[2] << 2 | aCircuitData[3] << 3)) != 0
? 15
: 0),
aRedstoneCircuitBlock.getOutputFacing());
diff --git a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_CombinationLock.java b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_CombinationLock.java
index 827e4a341e..67d8527606 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_CombinationLock.java
+++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_CombinationLock.java
@@ -4,6 +4,7 @@ import gregtech.api.interfaces.IRedstoneCircuitBlock;
import gregtech.api.util.GT_CircuitryBehavior;
public class GT_Circuit_CombinationLock extends GT_CircuitryBehavior {
+
public GT_Circuit_CombinationLock(int aIndex) {
super(aIndex);
}
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 c493e32e29..e162040f00 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Equals.java
+++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Equals.java
@@ -4,6 +4,7 @@ import gregtech.api.interfaces.IRedstoneCircuitBlock;
import gregtech.api.util.GT_CircuitryBehavior;
public class GT_Circuit_Equals extends GT_CircuitryBehavior {
+
public GT_Circuit_Equals(int aIndex) {
super(aIndex);
}
@@ -33,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)),
+ ((byte) (((aCircuitData[1] != 0) == (getStrongestRedstone(aRedstoneCircuitBlock) == aCircuitData[0]))
+ ? 0
+ : 15)),
aRedstoneCircuitBlock.getOutputFacing());
}
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 844817e4c3..7f6858b09f 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Pulser.java
+++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Pulser.java
@@ -4,6 +4,7 @@ import gregtech.api.interfaces.IRedstoneCircuitBlock;
import gregtech.api.util.GT_CircuitryBehavior;
public class GT_Circuit_Pulser extends GT_CircuitryBehavior {
+
public GT_Circuit_Pulser(int aIndex) {
super(aIndex);
}
@@ -33,8 +34,7 @@ public class GT_Circuit_Pulser extends GT_CircuitryBehavior {
@Override
public void onTick(int[] aCircuitData, IRedstoneCircuitBlock aRedstoneCircuitBlock) {
- byte tRedstone = aCircuitData[1] == 0
- ? getWeakestNonZeroRedstone(aRedstoneCircuitBlock)
+ byte tRedstone = aCircuitData[1] == 0 ? getWeakestNonZeroRedstone(aRedstoneCircuitBlock)
: getStrongestRedstone(aRedstoneCircuitBlock);
if (aCircuitData[4] == 0) {
aCircuitData[5] = tRedstone;
@@ -49,10 +49,8 @@ public class GT_Circuit_Pulser extends GT_CircuitryBehavior {
}
}
aRedstoneCircuitBlock.setRedstone(
- (byte)
- ((aCircuitData[4] > 0) && (aCircuitData[4] <= aCircuitData[0])
- ? (byte) aCircuitData[1]
- : (aCircuitData[1] <= 0) || (aCircuitData[1] > 15) ? (byte) aCircuitData[5] : 0),
+ (byte) ((aCircuitData[4] > 0) && (aCircuitData[4] <= aCircuitData[0]) ? (byte) aCircuitData[1]
+ : (aCircuitData[1] <= 0) || (aCircuitData[1] > 15) ? (byte) aCircuitData[5] : 0),
aRedstoneCircuitBlock.getOutputFacing());
}
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 e666d50e99..a8421d089b 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Randomizer.java
+++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Randomizer.java
@@ -4,6 +4,7 @@ import gregtech.api.interfaces.IRedstoneCircuitBlock;
import gregtech.api.util.GT_CircuitryBehavior;
public class GT_Circuit_Randomizer extends GT_CircuitryBehavior {
+
public GT_Circuit_Randomizer(int aIndex) {
super(aIndex);
}
@@ -45,8 +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 2dd4f73bb5..7755630b26 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_RedstoneMeter.java
+++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_RedstoneMeter.java
@@ -4,6 +4,7 @@ import gregtech.api.interfaces.IRedstoneCircuitBlock;
import gregtech.api.util.GT_CircuitryBehavior;
public class GT_Circuit_RedstoneMeter extends GT_CircuitryBehavior {
+
public GT_Circuit_RedstoneMeter(int aIndex) {
super(aIndex);
}
@@ -51,11 +52,8 @@ public class GT_Circuit_RedstoneMeter extends GT_CircuitryBehavior {
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),
+ (byte) (((tRedstone >= aCircuitData[0]) && (tRedstone <= aCircuitData[1]) ? 1 : 0)
+ != (aCircuitData[2] != 0 ? 1 : 0) ? (byte) aCircuitData[3] : 0),
aRedstoneCircuitBlock.getOutputFacing());
}
diff --git a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Repeater.java b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Repeater.java
index 61432610a9..b96762d73b 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Repeater.java
+++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Repeater.java
@@ -4,6 +4,7 @@ import gregtech.api.interfaces.IRedstoneCircuitBlock;
import gregtech.api.util.GT_CircuitryBehavior;
public class GT_Circuit_Repeater extends GT_CircuitryBehavior {
+
public GT_Circuit_Repeater(int aIndex) {
super(aIndex);
}
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 f207609940..c592d10e99 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Timer.java
+++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Timer.java
@@ -4,6 +4,7 @@ import gregtech.api.interfaces.IRedstoneCircuitBlock;
import gregtech.api.util.GT_CircuitryBehavior;
public class GT_Circuit_Timer extends GT_CircuitryBehavior {
+
public GT_Circuit_Timer(int aIndex) {
super(aIndex);
}