aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/covers/redstone
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/covers/redstone
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/covers/redstone')
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java61
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverExternal.java17
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java17
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java64
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterExternal.java13
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterInternal.java17
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java117
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java46
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java110
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java70
10 files changed, 242 insertions, 290 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 6b7c7f282e..e296785cd8 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
@@ -1,8 +1,18 @@
package gregtech.common.covers.redstone;
+import java.util.Arrays;
+import java.util.UUID;
+
+import javax.annotation.Nonnull;
+
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTBase;
+import net.minecraft.nbt.NBTTagCompound;
+
import com.google.common.io.ByteArrayDataInput;
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.common.widget.TextWidget;
+
import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
import gregtech.api.gui.modularui.GT_UITextures;
import gregtech.api.interfaces.ITexture;
@@ -11,12 +21,6 @@ import gregtech.api.util.ISerializableObject;
import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
import io.netty.buffer.ByteBuf;
-import java.util.Arrays;
-import java.util.UUID;
-import javax.annotation.Nonnull;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.nbt.NBTBase;
-import net.minecraft.nbt.NBTTagCompound;
public abstract class GT_Cover_AdvancedRedstoneReceiverBase
extends GT_Cover_AdvancedWirelessRedstoneBase<GT_Cover_AdvancedRedstoneReceiverBase.ReceiverData> {
@@ -66,26 +70,24 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase
@Override
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));
+ builder.widget(
+ new TextWidget(GT_Utility.trans("335", "Gate Mode")).setDefaultColor(COLOR_TEXT_GRAY.get())
+ .setPos(startX + spaceX * 5, 4 + startY + spaceY * 2));
}
@SuppressWarnings("PointlessArithmeticExpression")
@Override
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))
+ 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.NAND,
@@ -94,8 +96,7 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase
return coverData;
},
widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_NAND)
- .addTooltip(GT_Utility.trans("332", "NAND Gate"))
- .setPos(spaceX * 1, spaceY * 2))
+ .addTooltip(GT_Utility.trans("332", "NAND Gate")).setPos(spaceX * 1, spaceY * 2))
.addFollower(
CoverDataFollower_ToggleButtonWidget.ofDisableable(),
coverData -> coverData.mode == GateMode.OR,
@@ -104,8 +105,7 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase
return coverData;
},
widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_OR)
- .addTooltip(GT_Utility.trans("333", "OR Gate"))
- .setPos(spaceX * 2, spaceY * 2))
+ .addTooltip(GT_Utility.trans("333", "OR Gate")).setPos(spaceX * 2, spaceY * 2))
.addFollower(
CoverDataFollower_ToggleButtonWidget.ofDisableable(),
coverData -> coverData.mode == GateMode.NOR,
@@ -114,8 +114,7 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase
return coverData;
},
widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_NOR)
- .addTooltip(GT_Utility.trans("334", "NOR Gate"))
- .setPos(spaceX * 3, spaceY * 2))
+ .addTooltip(GT_Utility.trans("334", "NOR Gate")).setPos(spaceX * 3, spaceY * 2))
.addFollower(
CoverDataFollower_ToggleButtonWidget.ofDisableable(),
coverData -> coverData.mode == GateMode.SINGLE_SOURCE,
@@ -124,10 +123,11 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase
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"))
+ .addTooltips(
+ Arrays.asList(
+ "ANALOG Mode",
+ "Only use this mode with ONE transmitter in total,",
+ "no logic involved"))
.setPos(spaceX * 4, spaceY * 2));
}
}
@@ -141,6 +141,7 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase
}
public static class ReceiverData extends GT_Cover_AdvancedWirelessRedstoneBase.WirelessData {
+
private GateMode mode;
public ReceiverData(int frequency, UUID uuid, GateMode mode) {
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 56b7fadd24..caf4b6bdcd 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
@@ -10,13 +10,8 @@ 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) {
+ public ReceiverData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID, ReceiverData aCoverVariable,
+ ICoverable aTileEntity, long aTimer) {
aTileEntity.setOutputRedstoneSignal(
aSide,
getSignalAt(aCoverVariable.getUuid(), aCoverVariable.getFrequency(), aCoverVariable.getGateMode()));
@@ -25,14 +20,14 @@ public class GT_Cover_AdvancedRedstoneReceiverExternal extends GT_Cover_Advanced
}
@Override
- protected boolean isRedstoneSensitiveImpl(
- byte aSide, int aCoverID, ReceiverData aCoverVariable, ICoverable aTileEntity, long aTimer) {
+ protected boolean isRedstoneSensitiveImpl(byte aSide, int aCoverID, ReceiverData aCoverVariable,
+ ICoverable aTileEntity, long aTimer) {
return false;
}
@Override
- protected boolean manipulatesSidedRedstoneOutputImpl(
- byte aSide, int aCoverID, ReceiverData aCoverVariable, ICoverable aTileEntity) {
+ protected boolean manipulatesSidedRedstoneOutputImpl(byte aSide, int aCoverID, ReceiverData aCoverVariable,
+ 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 61dbb7859c..f80fdc8e65 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
@@ -11,13 +11,8 @@ 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) {
+ public ReceiverData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID, ReceiverData aCoverVariable,
+ ICoverable aTileEntity, long aTimer) {
if (aTileEntity instanceof IMachineProgress) {
IMachineProgress machine = ((IMachineProgress) aTileEntity);
if (getRedstoneInput(aSide, aInputRedstone, aCoverID, aCoverVariable, aTileEntity) > 0) {
@@ -33,14 +28,14 @@ public class GT_Cover_AdvancedRedstoneReceiverInternal extends GT_Cover_Advanced
}
@Override
- protected byte getRedstoneInputImpl(
- byte aSide, byte aInputRedstone, int aCoverID, ReceiverData aCoverVariable, ICoverable aTileEntity) {
+ protected byte getRedstoneInputImpl(byte aSide, byte aInputRedstone, int aCoverID, ReceiverData aCoverVariable,
+ ICoverable aTileEntity) {
return getSignalAt(aCoverVariable.getUuid(), aCoverVariable.getFrequency(), aCoverVariable.getGateMode());
}
@Override
- protected boolean isRedstoneSensitiveImpl(
- byte aSide, int aCoverID, ReceiverData aCoverVariable, ICoverable aTileEntity, long aTimer) {
+ protected boolean isRedstoneSensitiveImpl(byte aSide, int aCoverID, ReceiverData aCoverVariable,
+ 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 c065c085b2..f39b573742 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
@@ -1,8 +1,19 @@
package gregtech.common.covers.redstone;
+import java.util.Objects;
+import java.util.UUID;
+
+import javax.annotation.Nonnull;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTBase;
+import net.minecraft.nbt.NBTTagCompound;
+
import com.google.common.io.ByteArrayDataInput;
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.common.widget.TextWidget;
+
import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.ICoverable;
@@ -11,16 +22,8 @@ import gregtech.api.util.ISerializableObject;
import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
import io.netty.buffer.ByteBuf;
-import java.util.Objects;
-import java.util.UUID;
-import javax.annotation.Nonnull;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.nbt.NBTBase;
-import net.minecraft.nbt.NBTTagCompound;
-public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<
- T extends GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData>
+public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData>
extends GT_Cover_AdvancedWirelessRedstoneBase<T> {
public GT_Cover_AdvancedRedstoneTransmitterBase(Class<T> typeToken, ITexture coverTexture) {
@@ -33,28 +36,21 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<
}
@Override
- public boolean onCoverRemovalImpl(
- byte aSide, int aCoverID, TransmitterData aCoverVariable, ICoverable aTileEntity, boolean aForced) {
+ public boolean onCoverRemovalImpl(byte aSide, int aCoverID, TransmitterData aCoverVariable, ICoverable aTileEntity,
+ boolean aForced) {
unregisterSignal(aSide, aCoverVariable, aTileEntity);
return true;
}
@Override
- protected void onBaseTEDestroyedImpl(
- byte aSide, int aCoverID, TransmitterData aCoverVariable, ICoverable aTileEntity) {
+ protected void onBaseTEDestroyedImpl(byte aSide, int aCoverID, TransmitterData aCoverVariable,
+ 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) {
+ protected T onCoverScrewdriverClickImpl(byte aSide, int aCoverID, T aCoverVariable, ICoverable aTileEntity,
+ EntityPlayer aPlayer, float aX, float aY, float aZ) {
aCoverVariable.invert = !aCoverVariable.invert;
GT_Utility.sendChatToPlayer(
aPlayer,
@@ -64,8 +60,8 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<
}
@Override
- protected void preDataChangedImpl(
- byte aSide, int aCoverID, int aNewCoverId, T aCoverVariable, T aNewCoverVariable, ICoverable aTileEntity) {
+ protected void preDataChangedImpl(byte aSide, int aCoverID, int aNewCoverId, T aCoverVariable, T aNewCoverVariable,
+ ICoverable aTileEntity) {
if (aCoverVariable.frequency != aNewCoverVariable.frequency
|| !Objects.equals(aCoverVariable.uuid, aNewCoverVariable.uuid)) {
unregisterSignal(aSide, aCoverVariable, aTileEntity);
@@ -73,6 +69,7 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<
}
public static class TransmitterData extends GT_Cover_AdvancedWirelessRedstoneBase.WirelessData {
+
protected boolean invert;
public TransmitterData(int frequency, UUID uuid, boolean invert) {
@@ -159,17 +156,14 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<
protected void addUIWidgets(ModularWindow.Builder builder) {
super.addUIWidgets(builder);
builder.widget(TextWidget.dynamicString(() -> {
- T coverData = getCoverData();
- if (coverData != null) {
- return getCoverData().invert
- ? GT_Utility.trans("INVERTED", "Inverted")
- : GT_Utility.trans("NORMAL", "Normal");
- } else {
- return "";
- }
- })
- .setSynced(false)
- .setDefaultColor(COLOR_TEXT_GRAY.get())
+ T coverData = getCoverData();
+ if (coverData != null) {
+ return getCoverData().invert ? GT_Utility.trans("INVERTED", "Inverted")
+ : GT_Utility.trans("NORMAL", "Normal");
+ } else {
+ return "";
+ }
+ }).setSynced(false).setDefaultColor(COLOR_TEXT_GRAY.get())
.setPos(startX + spaceX * 10, 4 + startY + 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 aaa526e565..05c4105eb4 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
@@ -21,13 +21,8 @@ public class GT_Cover_AdvancedRedstoneTransmitterExternal
}
@Override
- public TransmitterData doCoverThingsImpl(
- byte aSide,
- byte aInputRedstone,
- int aCoverID,
- TransmitterData aCoverVariable,
- ICoverable aTileEntity,
- long aTimer) {
+ public TransmitterData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID,
+ TransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) {
byte outputRedstone = aInputRedstone;
if (aCoverVariable.isInvert()) {
if (outputRedstone > 0) outputRedstone = 0;
@@ -41,8 +36,8 @@ public class GT_Cover_AdvancedRedstoneTransmitterExternal
}
@Override
- public boolean letsRedstoneGoInImpl(
- byte aSide, int aCoverID, TransmitterData aCoverVariable, ICoverable aTileEntity) {
+ public boolean letsRedstoneGoInImpl(byte aSide, int aCoverID, TransmitterData aCoverVariable,
+ 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 1d21b7060f..8cd288f8e2 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
@@ -21,13 +21,8 @@ public class GT_Cover_AdvancedRedstoneTransmitterInternal
}
@Override
- public TransmitterData doCoverThingsImpl(
- byte aSide,
- byte aInputRedstone,
- int aCoverID,
- TransmitterData aCoverVariable,
- ICoverable aTileEntity,
- long aTimer) {
+ public TransmitterData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID,
+ TransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) {
byte outputRedstone = aTileEntity.getOutputRedstoneSignal(aSide);
if (aCoverVariable.isInvert()) {
if (outputRedstone > 0) outputRedstone = 0;
@@ -40,14 +35,14 @@ public class GT_Cover_AdvancedRedstoneTransmitterInternal
}
@Override
- public boolean letsRedstoneGoOutImpl(
- byte aSide, int aCoverID, TransmitterData aCoverVariable, ICoverable aTileEntity) {
+ public boolean letsRedstoneGoOutImpl(byte aSide, int aCoverID, TransmitterData aCoverVariable,
+ ICoverable aTileEntity) {
return true;
}
@Override
- protected boolean manipulatesSidedRedstoneOutputImpl(
- byte aSide, int aCoverID, TransmitterData aCoverVariable, ICoverable aTileEntity) {
+ protected boolean manipulatesSidedRedstoneOutputImpl(byte aSide, int aCoverID, TransmitterData aCoverVariable,
+ 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 b62d086cb2..50302bade0 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
@@ -1,9 +1,21 @@
package gregtech.common.covers.redstone;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.annotation.Nonnull;
+
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTBase;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fluids.Fluid;
+
import com.google.common.io.ByteArrayDataInput;
import com.gtnewhorizons.modularui.api.math.MathExpression;
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.common.widget.TextWidget;
+
import gregtech.api.GregTech_API;
import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
import gregtech.api.interfaces.ITexture;
@@ -15,17 +27,8 @@ import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
import gregtech.common.gui.modularui.widget.CoverDataFollower_TextFieldWidget;
import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
import io.netty.buffer.ByteBuf;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import javax.annotation.Nonnull;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.nbt.NBTBase;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.fluids.Fluid;
-public abstract class GT_Cover_AdvancedWirelessRedstoneBase<
- T extends GT_Cover_AdvancedWirelessRedstoneBase.WirelessData>
+public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_AdvancedWirelessRedstoneBase.WirelessData>
extends GT_CoverBehaviorBase<T> {
public GT_Cover_AdvancedWirelessRedstoneBase(Class<T> typeToken, ITexture coverTexture) {
@@ -41,33 +44,17 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<
switch (mode) {
case AND:
- return (byte)
- (signals.values().stream()
- .map(signal -> signal > 0)
- .reduce(true, (signalA, signalB) -> signalA && signalB)
- ? 15
- : 0);
+ return (byte) (signals.values().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);
+ return (byte) (signals.values().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);
+ return (byte) (signals.values().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);
+ return (byte) (signals.values().stream().map(signal -> signal > 0)
+ .reduce(false, (signalA, signalB) -> signalA || signalB) ? 0 : 15);
case SINGLE_SOURCE:
if (signals.values().isEmpty()) {
return 0;
@@ -89,24 +76,19 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<
}
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);
}
/**
- * x hashed into first 20 bytes
- * y hashed into second 20 bytes
- * z hashed into fifth 10 bytes
- * dim hashed into sixth 10 bytes
- * side hashed into last 4 bytes
+ * x hashed into first 20 bytes y hashed into second 20 bytes z hashed into fifth 10 bytes dim hashed into sixth 10
+ * bytes side hashed into last 4 bytes
*/
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,7 +123,8 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<
@Override
public String getDescriptionImpl(byte aSide, int aCoverID, T aCoverVariable, ICoverable aTileEntity) {
- return GT_Utility.trans("081", "Frequency: ") + aCoverVariable.frequency + ", Transmission: "
+ return GT_Utility.trans("081", "Frequency: ") + aCoverVariable.frequency
+ + ", Transmission: "
+ (aCoverVariable.uuid == null ? "Public" : "Private");
}
@@ -151,6 +134,7 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<
}
public abstract static class WirelessData implements ISerializableObject {
+
protected int frequency;
/**
@@ -247,40 +231,39 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<
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),
- (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))
+ controller.addFollower(
+ 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) -> {
if (state) {
- coverData.uuid =
- getUIBuildContext().getPlayer().getUniqueID();
+ coverData.uuid = getUIBuildContext().getPlayer().getUniqueID();
} else {
coverData.uuid = null;
}
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 67b931dd99..06388602c0 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
@@ -1,9 +1,18 @@
package gregtech.common.covers.redstone;
+import java.util.UUID;
+
+import javax.annotation.Nonnull;
+
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTBase;
+import net.minecraft.nbt.NBTTagCompound;
+
import com.google.common.io.ByteArrayDataInput;
import com.gtnewhorizons.modularui.api.math.MathExpression;
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.common.widget.TextWidget;
+
import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.ICoverable;
@@ -13,11 +22,6 @@ import gregtech.common.covers.GT_Cover_LiquidMeter;
import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
import gregtech.common.gui.modularui.widget.CoverDataFollower_TextFieldWidget;
import io.netty.buffer.ByteBuf;
-import java.util.UUID;
-import javax.annotation.Nonnull;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.nbt.NBTBase;
-import net.minecraft.nbt.NBTTagCompound;
public class GT_Cover_WirelessFluidDetector
extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_WirelessFluidDetector.FluidTransmitterData> {
@@ -37,15 +41,10 @@ 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);
+ 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);
long hash = hashCoverCoords(aTileEntity, aSide);
setSignalAt(aCoverVariable.getUuid(), aCoverVariable.getFrequency(), hash, signal);
@@ -53,18 +52,19 @@ public class GT_Cover_WirelessFluidDetector
}
@Override
- public boolean letsRedstoneGoOutImpl(
- byte aSide, int aCoverID, FluidTransmitterData aCoverVariable, ICoverable aTileEntity) {
+ public boolean letsRedstoneGoOutImpl(byte aSide, int aCoverID, FluidTransmitterData aCoverVariable,
+ ICoverable aTileEntity) {
return true;
}
@Override
- protected boolean manipulatesSidedRedstoneOutputImpl(
- byte aSide, int aCoverID, FluidTransmitterData aCoverVariable, ICoverable aTileEntity) {
+ protected boolea