Enhance Wireless Detectors with toggle-able sided redstone manipulation

src/main/java/gregtech/common/covers/redstone/CoverWirelessDoesWorkDetector.java

@@ -7,9 +7,11 @@
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.nbt.NBTBase;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.StatCollector;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import com.google.common.io.ByteArrayDataInput;
+import com.gtnewhorizons.modularui.api.math.Alignment;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
@@ -76,7 +78,11 @@ public ActivityTransmitterData doCoverThingsImpl(ForgeDirection side, byte aInpu
         final long hash = hashCoverCoords(aTileEntity, side);
         setSignalAt(aCoverVariable.getUuid(), aCoverVariable.getFrequency(), hash, signal);
 
-        aTileEntity.setOutputRedstoneSignal(side, signal);
+        if (aCoverVariable.physical) {
+            aTileEntity.setOutputRedstoneSignal(side, signal);
+        } else {
+            aTileEntity.setOutputRedstoneSignal(side, (byte) 0);
+        }
 
         return aCoverVariable;
     }
@@ -108,28 +114,33 @@ public enum ActivityMode {
     public static class ActivityTransmitterData extends CoverAdvancedRedstoneTransmitterBase.TransmitterData {
 
         private ActivityMode mode;
+        /** Whether the wireless detector cover also sets the tiles sided Redstone output */
+        private boolean physical;
 
-        public ActivityTransmitterData(int frequency, UUID uuid, boolean invert, ActivityMode mode) {
+        public ActivityTransmitterData(int frequency, UUID uuid, boolean invert, ActivityMode mode, boolean physical) {
             super(frequency, uuid, invert);
             this.mode = mode;
+            this.physical = physical;
         }
 
         public ActivityTransmitterData() {
             super();
             this.mode = ActivityMode.MACHINE_IDLE;
+            this.physical = true;
         }
 
         @Nonnull
         @Override
         public ISerializableObject copy() {
-            return new ActivityTransmitterData(frequency, uuid, invert, mode);
+            return new ActivityTransmitterData(frequency, uuid, invert, mode, physical);
         }
 
         @Nonnull
         @Override
         public NBTBase saveDataToNBT() {
             NBTTagCompound tag = (NBTTagCompound) super.saveDataToNBT();
             tag.setInteger("mode", mode.ordinal());
+            tag.setBoolean("physical", physical);
 
             return tag;
         }
@@ -138,6 +149,7 @@ public NBTBase saveDataToNBT() {
         public void writeToByteBuf(ByteBuf aBuf) {
             super.writeToByteBuf(aBuf);
             aBuf.writeInt(mode.ordinal());
+            aBuf.writeBoolean(physical);
         }
 
         @Override
@@ -146,13 +158,15 @@ public void loadDataFromNBT(NBTBase aNBT) {
 
             NBTTagCompound tag = (NBTTagCompound) aNBT;
             mode = ActivityMode.values()[tag.getInteger("mode")];
+            physical = tag.getBoolean("physical");
         }
 
         @Nonnull
         @Override
         public ISerializableObject readFromPacket(ByteArrayDataInput aBuf, EntityPlayerMP aPlayer) {
             super.readFromPacket(aBuf, aPlayer);
             mode = ActivityMode.values()[aBuf.readInt()];
+            physical = aBuf.readBoolean();
 
             return this;
         }
@@ -171,7 +185,7 @@ public WirelessActivityDetectorUIFactory(CoverUIBuildContext buildContext) {
 
         @Override
         protected int getGUIHeight() {
-            return 107;
+            return 123;
         }
 
         @Override
@@ -202,7 +216,22 @@ protected void addUIWidgets(ModularWindow.Builder builder) {
             })
                 .setSynced(false)
                 .setDefaultColor(COLOR_TEXT_GRAY.get())
-                .setPos(startX + spaceX * 3, 4 + startY + spaceY * 2));
+                .setPos(startX + spaceX * 3, 4 + startY + spaceY * 2))
+                .widget(TextWidget.dynamicString(() -> {
+                    ActivityTransmitterData coverData = getCoverData();
+                    if (coverData != null) {
+                        return getCoverData().physical
+                            ? StatCollector.translateToLocal("gt.cover.wirelessdetector.redstone.1")
+                            : StatCollector.translateToLocal("gt.cover.wirelessdetector.redstone.0");
+                    } else {
+                        return "";
+                    }
+                })
+                    .setSynced(false)
+                    .setDefaultColor(COLOR_TEXT_GRAY.get())
+                    .setTextAlignment(Alignment.CenterLeft)
+                    .setPos(startX + spaceX, 4 + startY + spaceY * 3)
+                    .setSize(spaceX * 10, 12));
         }
 
         @Override
@@ -238,7 +267,17 @@ protected void addUIForDataController(CoverDataControllerWidget<ActivityTransmit
                     },
                     widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_POWER_SWITCH_ON)
                         .addTooltip(GTUtility.trans("271", "Machine enabled"))
-                        .setPos(spaceX * 2, spaceY * 2));
+                        .setPos(spaceX * 2, spaceY * 2))
+                .addFollower(
+                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                    coverData -> coverData.physical,
+                    (coverData, state) -> {
+                        coverData.physical = state;
+                        return coverData;
+                    },
+                    widget -> widget
+                        .addTooltip(StatCollector.translateToLocal("gt.cover.wirelessdetector.redstone.tooltip"))
+                        .setPos(0, 1 + spaceY * 3));
         }
     }
 

src/main/java/gregtech/common/covers/redstone/CoverWirelessFluidDetector.java

@@ -8,11 +8,13 @@
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.nbt.NBTBase;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.StatCollector;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
 
 import com.google.common.io.ByteArrayDataInput;
+import com.gtnewhorizons.modularui.api.math.Alignment;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
@@ -24,6 +26,7 @@
 import gregtech.common.covers.CoverLiquidMeter;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
 import gregtech.common.gui.modularui.widget.CoverDataFollowerNumericWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 import io.netty.buffer.ByteBuf;
 
 public class CoverWirelessFluidDetector
@@ -51,7 +54,11 @@ public FluidTransmitterData doCoverThingsImpl(ForgeDirection side, byte aInputRe
         final long hash = hashCoverCoords(aTileEntity, side);
         setSignalAt(aCoverVariable.getUuid(), aCoverVariable.getFrequency(), hash, signal);
 
-        aTileEntity.setOutputRedstoneSignal(side, signal);
+        if (aCoverVariable.physical) {
+            aTileEntity.setOutputRedstoneSignal(side, signal);
+        } else {
+            aTileEntity.setOutputRedstoneSignal(side, (byte) 0);
+        }
 
         return aCoverVariable;
     }
@@ -72,10 +79,13 @@ public static class FluidTransmitterData extends CoverAdvancedRedstoneTransmitte
 
         /** The special value {@code 0} means threshold check is disabled. */
         private int threshold;
+        /** Whether the wireless detector cover also sets the tiles sided Redstone output */
+        private boolean physical;
 
-        public FluidTransmitterData(int frequency, UUID uuid, boolean invert, int threshold) {
+        public FluidTransmitterData(int frequency, UUID uuid, boolean invert, int threshold, boolean physical) {
             super(frequency, uuid, invert);
             this.threshold = threshold;
+            this.physical = physical;
         }
 
         public FluidTransmitterData() {
@@ -86,14 +96,15 @@ public FluidTransmitterData() {
         @Nonnull
         @Override
         public ISerializableObject copy() {
-            return new FluidTransmitterData(frequency, uuid, invert, threshold);
+            return new FluidTransmitterData(frequency, uuid, invert, threshold, physical);
         }
 
         @Nonnull
         @Override
         public NBTBase saveDataToNBT() {
             NBTTagCompound tag = (NBTTagCompound) super.saveDataToNBT();
             tag.setInteger("threshold", threshold);
+            tag.setBoolean("physical", physical);
 
             return tag;
         }
@@ -102,6 +113,7 @@ public NBTBase saveDataToNBT() {
         public void writeToByteBuf(ByteBuf aBuf) {
             super.writeToByteBuf(aBuf);
             aBuf.writeInt(threshold);
+            aBuf.writeBoolean(physical);
         }
 
         @Override
@@ -110,13 +122,15 @@ public void loadDataFromNBT(NBTBase aNBT) {
 
             NBTTagCompound tag = (NBTTagCompound) aNBT;
             threshold = tag.getInteger("threshold");
+            physical = tag.getBoolean("physical");
         }
 
         @Nonnull
         @Override
         public ISerializableObject readFromPacket(ByteArrayDataInput aBuf, EntityPlayerMP aPlayer) {
             super.readFromPacket(aBuf, aPlayer);
             threshold = aBuf.readInt();
+            physical = aBuf.readBoolean();
 
             return this;
         }
@@ -137,6 +151,11 @@ public WirelessFluidDetectorUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
+        @Override
+        protected int getGUIHeight() {
+            return 123;
+        }
+
         @Override
         protected int getFrequencyRow() {
             return 0;
@@ -151,9 +170,25 @@ protected int getButtonRow() {
         protected void addUIWidgets(ModularWindow.Builder builder) {
             setMaxCapacity();
             super.addUIWidgets(builder);
-            builder.widget(
-                new TextWidget(GTUtility.trans("222", "Fluid threshold")).setDefaultColor(COLOR_TEXT_GRAY.get())
-                    .setPos(startX + spaceX * 5, 4 + startY + spaceY * 2));
+            builder
+                .widget(
+                    new TextWidget(GTUtility.trans("222", "Fluid threshold")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                        .setPos(startX + spaceX * 5, 4 + startY + spaceY * 2))
+                .widget(TextWidget.dynamicString(() -> {
+                    FluidTransmitterData coverData = getCoverData();
+                    if (coverData != null) {
+                        return getCoverData().physical
+                            ? StatCollector.translateToLocal("gt.cover.wirelessdetector.redstone.1")
+                            : StatCollector.translateToLocal("gt.cover.wirelessdetector.redstone.0");
+                    } else {
+                        return "";
+                    }
+                })
+                    .setSynced(false)
+                    .setDefaultColor(COLOR_TEXT_GRAY.get())
+                    .setTextAlignment(Alignment.CenterLeft)
+                    .setPos(startX + spaceX, 4 + startY + spaceY * 3)
+                    .setSize(spaceX * 10, 12));
         }
 
         @Override
@@ -170,7 +205,17 @@ protected void addUIForDataController(CoverDataControllerWidget<FluidTransmitter
                     .setScrollValues(1000, 144, 100000)
                     .setFocusOnGuiOpen(true)
                     .setPos(1, 2 + spaceY * 2)
-                    .setSize(spaceX * 5 - 4, 12));
+                    .setSize(spaceX * 5 - 4, 12))
+                .addFollower(
+                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                    coverData -> coverData.physical,
+                    (coverData, state) -> {
+                        coverData.physical = state;
+                        return coverData;
+                    },
+                    widget -> widget
+                        .addTooltip(StatCollector.translateToLocal("gt.cover.wirelessdetector.redstone.tooltip"))
+                        .setPos(0, 1 + spaceY * 3));
         }
 
         private void setMaxCapacity() {