aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/covers/redstone
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/covers/redstone
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/covers/redstone')
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java106
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverExternal.java10
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java6
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java42
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterExternal.java8
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterInternal.java8
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java114
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java38
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java102
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java48
10 files changed, 228 insertions, 254 deletions
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java
index bebedffaca..afd0f67b37 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java
+++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java
@@ -23,7 +23,7 @@ import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget
import io.netty.buffer.ByteBuf;
public abstract class GT_Cover_AdvancedRedstoneReceiverBase
- extends GT_Cover_AdvancedWirelessRedstoneBase<GT_Cover_AdvancedRedstoneReceiverBase.ReceiverData> {
+ extends GT_Cover_AdvancedWirelessRedstoneBase<GT_Cover_AdvancedRedstoneReceiverBase.ReceiverData> {
public GT_Cover_AdvancedRedstoneReceiverBase(ITexture coverTexture) {
super(ReceiverData.class, coverTexture);
@@ -71,10 +71,8 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase
protected void addUIWidgets(ModularWindow.Builder builder) {
super.addUIWidgets(builder);
builder.widget(
- new TextWidget(GT_Utility.trans("335", "Gate Mode")).setDefaultColor(COLOR_TEXT_GRAY.get())
- .setPos(
- startX + spaceX * 5,
- 4 + startY + spaceY * 2));
+ new TextWidget(GT_Utility.trans("335", "Gate Mode")).setDefaultColor(COLOR_TEXT_GRAY.get())
+ .setPos(startX + spaceX * 5, 4 + startY + spaceY * 2));
}
@SuppressWarnings("PointlessArithmeticExpression")
@@ -82,59 +80,59 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase
protected void addUIForDataController(CoverDataControllerWidget<ReceiverData> controller) {
super.addUIForDataController(controller);
controller.addFollower(
+ CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+ coverData -> coverData.mode == GateMode.AND,
+ (coverData, state) -> {
+ coverData.mode = GateMode.AND;
+ return coverData;
+ },
+ widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_AND)
+ .addTooltip(GT_Utility.trans("331", "AND Gate"))
+ .setPos(spaceX * 0, spaceY * 2))
+ .addFollower(
CoverDataFollower_ToggleButtonWidget.ofDisableable(),
- coverData -> coverData.mode == GateMode.AND,
+ coverData -> coverData.mode == GateMode.NAND,
(coverData, state) -> {
- coverData.mode = GateMode.AND;
+ coverData.mode = GateMode.NAND;
return coverData;
},
- widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_AND)
- .addTooltip(GT_Utility.trans("331", "AND Gate"))
- .setPos(spaceX * 0, spaceY * 2))
- .addFollower(
- CoverDataFollower_ToggleButtonWidget.ofDisableable(),
- coverData -> coverData.mode == GateMode.NAND,
- (coverData, state) -> {
- coverData.mode = GateMode.NAND;
- return coverData;
- },
- widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_NAND)
- .addTooltip(GT_Utility.trans("332", "NAND Gate"))
- .setPos(spaceX * 1, spaceY * 2))
- .addFollower(
- CoverDataFollower_ToggleButtonWidget.ofDisableable(),
- coverData -> coverData.mode == GateMode.OR,
- (coverData, state) -> {
- coverData.mode = GateMode.OR;
- return coverData;
- },
- widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_OR)
- .addTooltip(GT_Utility.trans("333", "OR Gate"))
- .setPos(spaceX * 2, spaceY * 2))
- .addFollower(
- CoverDataFollower_ToggleButtonWidget.ofDisableable(),
- coverData -> coverData.mode == GateMode.NOR,
- (coverData, state) -> {
- coverData.mode = GateMode.NOR;
- return coverData;
- },
- widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_NOR)
- .addTooltip(GT_Utility.trans("334", "NOR Gate"))
- .setPos(spaceX * 3, spaceY * 2))
- .addFollower(
- CoverDataFollower_ToggleButtonWidget.ofDisableable(),
- coverData -> coverData.mode == GateMode.SINGLE_SOURCE,
- (coverData, state) -> {
- coverData.mode = GateMode.SINGLE_SOURCE;
- return coverData;
- },
- widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_ANALOG)
- .addTooltips(
- Arrays.asList(
- "ANALOG Mode",
- "Only use this mode with ONE transmitter in total,",
- "no logic involved"))
- .setPos(spaceX * 4, spaceY * 2));
+ widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_NAND)
+ .addTooltip(GT_Utility.trans("332", "NAND Gate"))
+ .setPos(spaceX * 1, spaceY * 2))
+ .addFollower(
+ CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+ coverData -> coverData.mode == GateMode.OR,
+ (coverData, state) -> {
+ coverData.mode = GateMode.OR;
+ return coverData;
+ },
+ widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_OR)
+ .addTooltip(GT_Utility.trans("333", "OR Gate"))
+ .setPos(spaceX * 2, spaceY * 2))
+ .addFollower(
+ CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+ coverData -> coverData.mode == GateMode.NOR,
+ (coverData, state) -> {
+ coverData.mode = GateMode.NOR;
+ return coverData;
+ },
+ widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_NOR)
+ .addTooltip(GT_Utility.trans("334", "NOR Gate"))
+ .setPos(spaceX * 3, spaceY * 2))
+ .addFollower(
+ CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+ coverData -> coverData.mode == GateMode.SINGLE_SOURCE,
+ (coverData, state) -> {
+ coverData.mode = GateMode.SINGLE_SOURCE;
+ return coverData;
+ },
+ widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_ANALOG)
+ .addTooltips(
+ Arrays.asList(
+ "ANALOG Mode",
+ "Only use this mode with ONE transmitter in total,",
+ "no logic involved"))
+ .setPos(spaceX * 4, spaceY * 2));
}
}
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverExternal.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverExternal.java
index caf4b6bdcd..1e1c992bb1 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverExternal.java
+++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverExternal.java
@@ -11,23 +11,23 @@ public class GT_Cover_AdvancedRedstoneReceiverExternal extends GT_Cover_Advanced
@Override
public ReceiverData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID, ReceiverData aCoverVariable,
- ICoverable aTileEntity, long aTimer) {
+ ICoverable aTileEntity, long aTimer) {
aTileEntity.setOutputRedstoneSignal(
- aSide,
- getSignalAt(aCoverVariable.getUuid(), aCoverVariable.getFrequency(), aCoverVariable.getGateMode()));
+ aSide,
+ getSignalAt(aCoverVariable.getUuid(), aCoverVariable.getFrequency(), aCoverVariable.getGateMode()));
return aCoverVariable;
}
@Override
protected boolean isRedstoneSensitiveImpl(byte aSide, int aCoverID, ReceiverData aCoverVariable,
- ICoverable aTileEntity, long aTimer) {
+ ICoverable aTileEntity, long aTimer) {
return false;
}
@Override
protected boolean manipulatesSidedRedstoneOutputImpl(byte aSide, int aCoverID, ReceiverData aCoverVariable,
- ICoverable aTileEntity) {
+ ICoverable aTileEntity) {
return true;
}
}
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java
index 0ceaaeb887..899a97dca7 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java
+++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java
@@ -12,7 +12,7 @@ public class GT_Cover_AdvancedRedstoneReceiverInternal extends GT_Cover_Advanced
@Override
public ReceiverData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID, ReceiverData aCoverVariable,
- ICoverable aTileEntity, long aTimer) {
+ ICoverable aTileEntity, long aTimer) {
if (aTileEntity instanceof IMachineProgress machine) {
if (getRedstoneInput(aSide, aInputRedstone, aCoverID, aCoverVariable, aTileEntity) > 0) {
machine.enableWorking();
@@ -28,13 +28,13 @@ public class GT_Cover_AdvancedRedstoneReceiverInternal extends GT_Cover_Advanced
@Override
protected byte getRedstoneInputImpl(byte aSide, byte aInputRedstone, int aCoverID, ReceiverData aCoverVariable,
- ICoverable aTileEntity) {
+ ICoverable aTileEntity) {
return getSignalAt(aCoverVariable.getUuid(), aCoverVariable.getFrequency(), aCoverVariable.getGateMode());
}
@Override
protected boolean isRedstoneSensitiveImpl(byte aSide, int aCoverID, ReceiverData aCoverVariable,
- ICoverable aTileEntity, long aTimer) {
+ ICoverable aTileEntity, long aTimer) {
return true;
}
}
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java
index e74dffb102..237635eb7f 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java
+++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java
@@ -24,7 +24,7 @@ import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget
import io.netty.buffer.ByteBuf;
public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData>
- extends GT_Cover_AdvancedWirelessRedstoneBase<T> {
+ extends GT_Cover_AdvancedWirelessRedstoneBase<T> {
public GT_Cover_AdvancedRedstoneTransmitterBase(Class<T> typeToken, ITexture coverTexture) {
super(typeToken, coverTexture);
@@ -37,33 +37,33 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cove
@Override
public boolean onCoverRemovalImpl(byte aSide, int aCoverID, TransmitterData aCoverVariable, ICoverable aTileEntity,
- boolean aForced) {
+ boolean aForced) {
unregisterSignal(aSide, aCoverVariable, aTileEntity);
return true;
}
@Override
protected void onBaseTEDestroyedImpl(byte aSide, int aCoverID, TransmitterData aCoverVariable,
- ICoverable aTileEntity) {
+ ICoverable aTileEntity) {
unregisterSignal(aSide, aCoverVariable, aTileEntity);
}
@Override
protected T onCoverScrewdriverClickImpl(byte aSide, int aCoverID, T aCoverVariable, ICoverable aTileEntity,
- EntityPlayer aPlayer, float aX, float aY, float aZ) {
+ EntityPlayer aPlayer, float aX, float aY, float aZ) {
aCoverVariable.invert = !aCoverVariable.invert;
GT_Utility.sendChatToPlayer(
- aPlayer,
- aCoverVariable.invert ? GT_Utility.trans("054", "Inverted") : GT_Utility.trans("055", "Normal"));
+ aPlayer,
+ aCoverVariable.invert ? GT_Utility.trans("054", "Inverted") : GT_Utility.trans("055", "Normal"));
return aCoverVariable;
}
@Override
protected void preDataChangedImpl(byte aSide, int aCoverID, int aNewCoverId, T aCoverVariable, T aNewCoverVariable,
- ICoverable aTileEntity) {
+ ICoverable aTileEntity) {
if (aCoverVariable.frequency != aNewCoverVariable.frequency
- || !Objects.equals(aCoverVariable.uuid, aNewCoverVariable.uuid)) {
+ || !Objects.equals(aCoverVariable.uuid, aNewCoverVariable.uuid)) {
unregisterSignal(aSide, aCoverVariable, aTileEntity);
}
}
@@ -159,29 +159,29 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cove
T coverData = getCoverData();
if (coverData != null) {
return getCoverData().invert ? GT_Utility.trans("INVERTED", "Inverted")
- : GT_Utility.trans("NORMAL", "Normal");
+ : GT_Utility.trans("NORMAL", "Normal");
} else {
return "";
}
})
- .setSynced(false)
- .setDefaultColor(COLOR_TEXT_GRAY.get())
- .setPos(startX + spaceX * 10, 4 + startY + spaceY * getButtonRow()));
+ .setSynced(false)
+ .setDefaultColor(COLOR_TEXT_GRAY.get())
+ .setPos(startX + spaceX * 10, 4 + startY + spaceY * getButtonRow()));
}
@Override
protected void addUIForDataController(CoverDataControllerWidget<T> controller) {
super.addUIForDataController(controller);
controller.addFollower(
- CoverDataFollower_ToggleButtonWidget.ofRedstone(),
- coverData -> coverData.invert,
- (coverData, state) -> {
- coverData.invert = state;
- return coverData;
- },
- widget -> widget.addTooltip(0, GT_Utility.trans("NORMAL", "Normal"))
- .addTooltip(1, GT_Utility.trans("INVERTED", "Inverted"))
- .setPos(spaceX * 9, spaceY * getButtonRow()));
+ CoverDataFollower_ToggleButtonWidget.ofRedstone(),
+ coverData -> coverData.invert,
+ (coverData, state) -> {
+ coverData.invert = state;
+ return coverData;
+ },
+ widget -> widget.addTooltip(0, GT_Utility.trans("NORMAL", "Normal"))
+ .addTooltip(1, GT_Utility.trans("INVERTED", "Inverted"))
+ .setPos(spaceX * 9, spaceY * getButtonRow()));
}
}
}
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterExternal.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterExternal.java
index 52392b5f84..c693610318 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterExternal.java
+++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterExternal.java
@@ -4,7 +4,7 @@ import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.ICoverable;
public class GT_Cover_AdvancedRedstoneTransmitterExternal
- extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData> {
+ extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData> {
public GT_Cover_AdvancedRedstoneTransmitterExternal(ITexture coverTexture) {
super(TransmitterData.class, coverTexture);
@@ -22,7 +22,7 @@ public class GT_Cover_AdvancedRedstoneTransmitterExternal
@Override
public TransmitterData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID,
- TransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) {
+ TransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) {
byte outputRedstone = aInputRedstone;
if (aCoverVariable.isInvert()) {
if (outputRedstone > 0) outputRedstone = 0;
@@ -37,13 +37,13 @@ public class GT_Cover_AdvancedRedstoneTransmitterExternal
@Override
protected boolean isRedstoneSensitiveImpl(byte aSide, int aCoverID, TransmitterData aCoverVariable,
- ICoverable aTileEntity, long aTimer) {
+ ICoverable aTileEntity, long aTimer) {
return true;
}
@Override
public boolean letsRedstoneGoInImpl(byte aSide, int aCoverID, TransmitterData aCoverVariable,
- ICoverable aTileEntity) {
+ ICoverable aTileEntity) {
return true;
}
}
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterInternal.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterInternal.java
index 8cd288f8e2..353a579680 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterInternal.java
+++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterInternal.java
@@ -4,7 +4,7 @@ import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.ICoverable;
public class GT_Cover_AdvancedRedstoneTransmitterInternal
- extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData> {
+ extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData> {
public GT_Cover_AdvancedRedstoneTransmitterInternal(ITexture coverTexture) {
super(TransmitterData.class, coverTexture);
@@ -22,7 +22,7 @@ public class GT_Cover_AdvancedRedstoneTransmitterInternal
@Override
public TransmitterData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID,
- TransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) {
+ TransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) {
byte outputRedstone = aTileEntity.getOutputRedstoneSignal(aSide);
if (aCoverVariable.isInvert()) {
if (outputRedstone > 0) outputRedstone = 0;
@@ -36,13 +36,13 @@ public class GT_Cover_AdvancedRedstoneTransmitterInternal
@Override
public boolean letsRedstoneGoOutImpl(byte aSide, int aCoverID, TransmitterData aCoverVariable,
- ICoverable aTileEntity) {
+ ICoverable aTileEntity) {
return true;
}
@Override
protected boolean manipulatesSidedRedstoneOutputImpl(byte aSide, int aCoverID, TransmitterData aCoverVariable,
- ICoverable aTileEntity) {
+ ICoverable aTileEntity) {
return true;
}
}
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java
index fecb188214..843c7ab5e2 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java
+++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java
@@ -29,7 +29,7 @@ import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget
import io.netty.buffer.ByteBuf;
public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_AdvancedWirelessRedstoneBase.WirelessData>
- extends GT_CoverBehaviorBase<T> {
+ extends GT_CoverBehaviorBase<T> {
public GT_Cover_AdvancedWirelessRedstoneBase(Class<T> typeToken, ITexture coverTexture) {
super(typeToken, coverTexture);
@@ -45,36 +45,36 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A
switch (mode) {
case AND -> {
return (byte) (signals.values()
- .stream()
- .map(signal -> signal > 0)
- .reduce(true, (signalA, signalB) -> signalA && signalB) ? 15 : 0);
+ .stream()
+ .map(signal -> signal > 0)
+ .reduce(true, (signalA, signalB) -> signalA && signalB) ? 15 : 0);
}
case NAND -> {
return (byte) (signals.values()
- .stream()
- .map(signal -> signal > 0)
- .reduce(true, (signalA, signalB) -> signalA && signalB) ? 0 : 15);
+ .stream()
+ .map(signal -> signal > 0)
+ .reduce(true, (signalA, signalB) -> signalA && signalB) ? 0 : 15);
}
case OR -> {
return (byte) (signals.values()
- .stream()
- .map(signal -> signal > 0)
- .reduce(false, (signalA, signalB) -> signalA || signalB) ? 15 : 0);
+ .stream()
+ .map(signal -> signal > 0)
+ .reduce(false, (signalA, signalB) -> signalA || signalB) ? 15 : 0);
}
case NOR -> {
return (byte) (signals.values()
- .stream()
- .map(signal -> signal > 0)
- .reduce(false, (signalA, signalB) -> signalA || signalB) ? 0 : 15);
+ .stream()
+ .map(signal -> signal > 0)
+ .reduce(false, (signalA, signalB) -> signalA || signalB) ? 0 : 15);
}
case SINGLE_SOURCE -> {
if (signals.values()
- .isEmpty()) {
+ .isEmpty()) {
return 0;
}
return signals.values()
- .iterator()
- .next();
+ .iterator()
+ .next();
}
default -> {
return 0;
@@ -92,9 +92,8 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A
}
public static void setSignalAt(UUID uuid, int frequency, long hash, byte value) {
- Map<Integer, Map<Long, Byte>> frequencies = GregTech_API.sAdvancedWirelessRedstone.computeIfAbsent(
- String.valueOf(uuid),
- k -> new ConcurrentHashMap<>());
+ Map<Integer, Map<Long, Byte>> frequencies = GregTech_API.sAdvancedWirelessRedstone
+ .computeIfAbsent(String.valueOf(uuid), k -> new ConcurrentHashMap<>());
Map<Long, Byte> signals = frequencies.computeIfAbsent(frequency, k -> new ConcurrentHashMap<>());
signals.put(hash, value);
}
@@ -105,7 +104,7 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A
*/
public static long hashCoverCoords(ICoverable tile, byte side) {
return (((((long) tile.getXCoord() << 20) + tile.getZCoord() << 10) + tile.getYCoord() << 10)
- + tile.getWorld().provider.dimensionId << 4) + side;
+ + tile.getWorld().provider.dimensionId << 4) + side;
}
@Override
@@ -141,8 +140,8 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A
@Override
public String getDescriptionImpl(byte aSide, int aCoverID, T aCoverVariable, ICoverable aTileEntity) {
return GT_Utility.trans("081", "Frequency: ") + aCoverVariable.frequency
- + ", Transmission: "
- + (aCoverVariable.uuid == null ? "Public" : "Private");
+ + ", Transmission: "
+ + (aCoverVariable.uuid == null ? "Public" : "Private");
}
@Override
@@ -248,57 +247,48 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A
final int privateExtraColumn = isShiftPrivateLeft() ? 1 : 5;
CoverDataControllerWidget<T> dataController = new CoverDataControllerWidget<>(
- this::getCoverData,
- this::setCoverData,
- GT_Cover_AdvancedWirelessRedstoneBase.this);
+ this::getCoverData,
+ this::setCoverData,
+ GT_Cover_AdvancedWirelessRedstoneBase.this);
dataController.setPos(startX, startY);
addUIForDataController(dataController);
builder.widget(dataController)
- .widget(
- new TextWidget(GT_Utility.trans("246", "Frequency")).setDefaultColor(COLOR_TEXT_GRAY.get())
- .setPos(
- startX + spaceX * 5,
- 4 + startY
- + spaceY * getFrequencyRow()))
- .widget(
- new TextWidget(
- GT_Utility.trans("602", "Use Private Frequency"))
- .setDefaultColor(
- COLOR_TEXT_GRAY.get())
- .setPos(
- startX + spaceX
- * privateExtraColumn,
- 4 + startY
- + spaceY * getButtonRow()));
+ .widget(
+ new TextWidget(GT_Utility.trans("246", "Frequency")).setDefaultColor(COLOR_TEXT_GRAY.get())
+ .setPos(startX + spaceX * 5, 4 + startY + spaceY * getFrequencyRow()))
+ .widget(
+ new TextWidget(GT_Utility.trans("602", "Use Private Frequency"))
+ .setDefaultColor(COLOR_TEXT_GRAY.get())
+ .setPos(startX + spaceX * privateExtraColumn, 4 + startY + spaceY * getButtonRow()));
}
protected void addUIForDataController(CoverDataControllerWidget<T> controller) {
controller.addFollower(
- new CoverDataFollower_TextFieldWidget<>(),
- coverData -> String.valueOf(coverData.frequency),
+ new CoverDataFollower_TextFieldWidget<>(),
+ coverData -> String.valueOf(coverData.frequency),
+ (coverData, state) -> {
+ coverData.frequency = (int) MathExpression.parseMathExpression(state);
+ return coverData;
+ },
+ widget -> widget.setOnScrollNumbers()
+ .setNumbers(0, Integer.MAX_VALUE)
+ .setFocusOnGuiOpen(true)
+ .setPos(1, 2 + spaceY * getFrequencyRow())
+ .setSize(spaceX * 5 - 4, 12))
+ .addFollower(
+ CoverDataFollower_ToggleButtonWidget.ofCheck(),
+ coverData -> coverData.uuid != null,
(coverData, state) -> {
- coverData.frequency = (int) MathExpression.parseMathExpression(state);
+ if (state) {
+ coverData.uuid = getUIBuildContext().getPlayer()
+ .getUniqueID();
+ } else {
+ coverData.uuid = null;
+ }
return coverData;
},
- widget -> widget.setOnScrollNumbers()
- .setNumbers(0, Integer.MAX_VALUE)
- .setFocusOnGuiOpen(true)
- .setPos(1, 2 + spaceY * getFrequencyRow())
- .setSize(spaceX * 5 - 4, 12))
- .addFollower(
- CoverDataFollower_ToggleButtonWidget.ofCheck(),
- coverData -> coverData.uuid != null,
- (coverData, state) -> {
- if (state) {
- coverData.uuid = getUIBuildContext().getPlayer()
- .getUniqueID();
- } else {
- coverData.uuid = null;
- }
- return coverData;
- },
- widget -> widget.setPos(0, spaceY * getButtonRow()));
+ widget -> widget.setPos(0, spaceY * getButtonRow()));
}
protected abstract int getFrequencyRow();
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java
index af1afbe18d..f580877dea 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java
+++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java
@@ -24,7 +24,7 @@ import gregtech.common.gui.modularui.widget.CoverDataFollower_TextFieldWidget;
import io.netty.buffer.ByteBuf;
public class GT_Cover_WirelessFluidDetector
- extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_WirelessFluidDetector.FluidTransmitterData> {
+ extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_WirelessFluidDetector.FluidTransmitterData> {
public GT_Cover_WirelessFluidDetector(ITexture coverTexture) {
super(FluidTransmitterData.class, coverTexture);
@@ -42,11 +42,9 @@ public class GT_Cover_WirelessFluidDetector
@Override
public FluidTransmitterData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID,
- FluidTransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) {
- byte signal = GT_Cover_LiquidMeter.computeSignalBasedOnFluid(
- aTileEntity,
- aCoverVariable.invert,
- aCoverVariable.threshold);
+ FluidTransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) {
+ byte signal = GT_Cover_LiquidMeter
+ .computeSignalBasedOnFluid(aTileEntity, aCoverVariable.invert, aCoverVariable.threshold);
long hash = hashCoverCoords(aTileEntity, aSide);
setSignalAt(aCoverVariable.getUuid(), aCoverVariable.getFrequency(), hash, signal);
@@ -55,13 +53,13 @@ public class GT_Cover_WirelessFluidDetector
@Override
public boolean letsRedstoneGoOutImpl(byte aSide, int aCoverID, FluidTransmitterData aCoverVariable,
- ICoverable aTileEntity) {
+ ICoverable aTileEntity) {
return true;
}
@Override
protected boolean manipulatesSidedRedstoneOutputImpl(byte aSide, int aCoverID, FluidTransmitterData aCoverVariable,
- ICoverable aTileEntity) {
+ ICoverable aTileEntity) {
return true;
}
@@ -146,24 +144,24 @@ public class GT_Cover_WirelessFluidDetector
protected void addUIWidgets(ModularWindow.Builder builder) {
super.addUIWidgets(builder);
builder.widget(
- new TextWidget(GT_Utility.trans("222", "Fluid threshold")).setDefaultColor(COLOR_TEXT_GRAY.get())
- .setPos(startX + spaceX * 5, 4 + startY));
+ new TextWidget(GT_Utility.trans("222", "Fluid threshold")).setDefaultColor(COLOR_TEXT_GRAY.get())
+ .setPos(startX + spaceX * 5, 4 + startY));
}
@Override
protected void addUIForDataController(CoverDataControllerWidget<FluidTransmitterData> controller) {
super.addUIForDataController(controller);
controller.addFollower(
- new CoverDataFollower_TextFieldWidget<>(),
- coverData -> String.valueOf(coverData.threshold),
- (coverData, state) -> {
- coverData.threshold = (int) MathExpression.parseMathExpression(state);
- return coverData;
- },
- widget -> widget.setOnScrollNumbers()
- .setNumbers(0, Integer.MAX_VALUE)
- .setPos(1, 2)
- .setSize(spaceX * 5 - 4, 12));
+ new CoverDataFollower_TextFieldWidget<>(),
+ coverData -> String.valueOf(coverData.thres