From dc511e64e2ffeb47fd0357eca0598f946704cb2a Mon Sep 17 00:00:00 2001
From: Matej Dipčár <492666@mail.muni.cz>
Date: Tue, 20 Sep 2022 22:02:17 +0200
Subject: Add Advanced Wireless Redstone Covers

---
 src/main/java/gregtech/api/GregTech_API.java     | 24 ++++++++++++++++++++++++
 src/main/java/gregtech/api/enums/ItemList.java   |  5 +++++
 src/main/java/gregtech/api/gui/GT_GUIScreen.java |  2 +-
 3 files changed, 30 insertions(+), 1 deletion(-)

(limited to 'src/main/java/gregtech/api')

diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java
index 7a52021eea..fefbe06518 100644
--- a/src/main/java/gregtech/api/GregTech_API.java
+++ b/src/main/java/gregtech/api/GregTech_API.java
@@ -53,6 +53,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiFunction;
 import java.util.function.IntFunction;
@@ -172,6 +173,29 @@ public class GregTech_API {
      * The Redstone Frequencies
      */
     public static final Map<Integer, Byte> sWirelessRedstone = new ConcurrentHashMap<>();
+    /**
+     * The Advanced Redstone Frequencies
+     */
+    public static final Map<String, Map<Integer, Byte>> sAdvancedWirelessRedstone = new ConcurrentHashMap<>();
+
+    public static Byte getAdvancedRedstone(UUID uuid, int frequency) {
+        Map<Integer, Byte> frequencies = GregTech_API.sAdvancedWirelessRedstone.get(String.valueOf(uuid));
+        if (frequencies == null) return 0;
+        return frequencies.getOrDefault(frequency, (byte) 0);
+    }
+
+    public static void removeAdvancedRedstone(UUID uuid, int frequency) {
+        Map<Integer, Byte> frequencies = GregTech_API.sAdvancedWirelessRedstone.get(String.valueOf(uuid));
+        if (frequencies == null) return;
+        frequencies.remove(frequency);
+    }
+
+    public static void setAdvancedRedstone(UUID uuid, int frequency, byte value) {
+        String key = String.valueOf(uuid);
+        Map<Integer, Byte> frequencies = GregTech_API.sAdvancedWirelessRedstone.computeIfAbsent(key, k -> new ConcurrentHashMap<>());
+        frequencies.put(frequency, value);
+    }
+
     /**
      * The IDSU Frequencies
      */
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index 279233d101..b8b457ad16 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -1529,6 +1529,11 @@ public enum ItemList implements IItemContainer {
     Hatch_Output_Bus_ME,
 
     NULL,
+    Cover_AdvancedRedstoneTransmitterExternal,
+    Cover_AdvancedRedstoneTransmitterInternal,
+    Cover_AdvancedRedstoneReceiverExternal,
+    Cover_AdvancedRedstoneReceiverInternal,
+
     Cover_RedstoneTransmitterExternal,
     Cover_RedstoneTransmitterInternal,
     Cover_RedstoneReceiverExternal,
diff --git a/src/main/java/gregtech/api/gui/GT_GUIScreen.java b/src/main/java/gregtech/api/gui/GT_GUIScreen.java
index 281be1e55d..d39a6b738e 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIScreen.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIScreen.java
@@ -28,8 +28,8 @@ public abstract class GT_GUIScreen extends GuiScreen implements GT_IToolTipRende
     protected int gui_height = 107;
     protected int guiTop, guiLeft;
     protected boolean drawButtons = true;
+    protected ResourceLocation mGUIbackgroundLocation;
 
-    private ResourceLocation mGUIbackgroundLocation;
     private GuiButton selectedButton;
     private GT_GUIColorOverride colorOverride;
     private final int textColor;
-- 
cgit 


From fe4a5eba58bbe30c5114319401c356127fb00263 Mon Sep 17 00:00:00 2001
From: Matej Dipčár <492666@mail.muni.cz>
Date: Tue, 20 Sep 2022 23:44:45 +0200
Subject: Add handling of multiple sources

---
 src/main/java/gregtech/api/GregTech_API.java | 47 ++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 10 deletions(-)

(limited to 'src/main/java/gregtech/api')

diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java
index fefbe06518..d4fd4206cf 100644
--- a/src/main/java/gregtech/api/GregTech_API.java
+++ b/src/main/java/gregtech/api/GregTech_API.java
@@ -20,6 +20,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.internal.IGT_RecipeAdder;
 import gregtech.api.interfaces.internal.IThaumcraftCompat;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineBlockUpdateable;
 import gregtech.api.items.GT_CoolantCellIC_Item;
 import gregtech.api.items.GT_CoolantCell_Item;
@@ -176,24 +177,50 @@ public class GregTech_API {
     /**
      * The Advanced Redstone Frequencies
      */
-    public static final Map<String, Map<Integer, Byte>> sAdvancedWirelessRedstone = new ConcurrentHashMap<>();
+    public static final Map<String, Map<Integer, Map<Long, Byte>>> sAdvancedWirelessRedstone = new ConcurrentHashMap<>();
 
     public static Byte getAdvancedRedstone(UUID uuid, int frequency) {
-        Map<Integer, Byte> frequencies = GregTech_API.sAdvancedWirelessRedstone.get(String.valueOf(uuid));
+        Map<Integer, Map<Long, Byte>> frequencies = GregTech_API.sAdvancedWirelessRedstone.get(String.valueOf(uuid));
         if (frequencies == null) return 0;
-        return frequencies.getOrDefault(frequency, (byte) 0);
+
+        // TODO: Implement All Modes
+        Map<Long, Byte> signals = frequencies.get(frequency);
+        if (signals == null) return 0;
+
+        return (byte) (signals.values().stream()
+            .map(signal -> signal > 0)
+            .reduce(true, (signalA, signalB) -> signalA && signalB) ? 15 : 0);
     }
 
-    public static void removeAdvancedRedstone(UUID uuid, int frequency) {
-        Map<Integer, Byte> frequencies = GregTech_API.sAdvancedWirelessRedstone.get(String.valueOf(uuid));
+    public static void removeAdvancedRedstone(UUID uuid, int frequency, long hash) {
+        Map<Integer, Map<Long, Byte>> frequencies = GregTech_API.sAdvancedWirelessRedstone.get(String.valueOf(uuid));
         if (frequencies == null) return;
-        frequencies.remove(frequency);
+        frequencies.computeIfPresent(frequency, (freq, longByteMap) -> {
+            longByteMap.remove(hash);
+            return longByteMap.isEmpty() ? null : longByteMap;
+        });
+    }
+
+    public static void setAdvancedRedstone(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<Long, Byte> signals = frequencies.computeIfAbsent(frequency, k -> new ConcurrentHashMap<>());
+        signals.put(hash, value);
     }
 
-    public static void setAdvancedRedstone(UUID uuid, int frequency, byte value) {
-        String key = String.valueOf(uuid);
-        Map<Integer, Byte> frequencies = GregTech_API.sAdvancedWirelessRedstone.computeIfAbsent(key, k -> new ConcurrentHashMap<>());
-        frequencies.put(frequency, 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
+     */
+    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;
     }
 
     /**
-- 
cgit 


From 16cf739469afd1332f6e3bd7c93e081dd60988e5 Mon Sep 17 00:00:00 2001
From: Matej Dipčár <492666@mail.muni.cz>
Date: Tue, 20 Sep 2022 23:58:31 +0200
Subject: Fix map not updating when transmitter TE gets destroyed

The map is reset when player opens cover GUI
---
 src/main/java/gregtech/api/GregTech_API.java | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/main/java/gregtech/api')

diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java
index d4fd4206cf..e6bd089027 100644
--- a/src/main/java/gregtech/api/GregTech_API.java
+++ b/src/main/java/gregtech/api/GregTech_API.java
@@ -192,6 +192,12 @@ public class GregTech_API {
             .reduce(true, (signalA, signalB) -> signalA && signalB) ? 15 : 0);
     }
 
+    public static void resetAdvancedRedstoneFrequency(UUID uuid, int frequency) {
+        Map<Integer, Map<Long, Byte>> frequencies = GregTech_API.sAdvancedWirelessRedstone.get(String.valueOf(uuid));
+        if (frequencies == null) return;
+        frequencies.computeIfPresent(frequency, (k, longByteMap) -> new ConcurrentHashMap<>());
+    }
+
     public static void removeAdvancedRedstone(UUID uuid, int frequency, long hash) {
         Map<Integer, Map<Long, Byte>> frequencies = GregTech_API.sAdvancedWirelessRedstone.get(String.valueOf(uuid));
         if (frequencies == null) return;
-- 
cgit 


From 5a3ce692c6da21cb45c12db9076cf344ad4b4f6e Mon Sep 17 00:00:00 2001
From: Matej Dipčár <492666@mail.muni.cz>
Date: Wed, 21 Sep 2022 02:58:15 +0200
Subject: Implement all advanced receiver modes

---
 src/main/java/gregtech/api/GregTech_API.java       | 31 +++++++++++++++++-----
 .../java/gregtech/api/gui/widgets/GT_GuiIcon.java  |  5 ++++
 2 files changed, 29 insertions(+), 7 deletions(-)

(limited to 'src/main/java/gregtech/api')

diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java
index e6bd089027..053d8c6236 100644
--- a/src/main/java/gregtech/api/GregTech_API.java
+++ b/src/main/java/gregtech/api/GregTech_API.java
@@ -42,6 +42,7 @@ import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
 import gregtech.api.world.GT_Worldgen;
+import gregtech.common.covers.redstone.GT_Cover_AdvancedRedstoneReceiverBase;
 import gregtech.common.items.GT_IntegratedCircuit_Item;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -179,17 +180,33 @@ public class GregTech_API {
      */
     public static final Map<String, Map<Integer, Map<Long, Byte>>> sAdvancedWirelessRedstone = new ConcurrentHashMap<>();
 
-    public static Byte getAdvancedRedstone(UUID uuid, int frequency) {
+    public static Byte getAdvancedRedstone(UUID uuid, int frequency, GT_Cover_AdvancedRedstoneReceiverBase.GateMode mode) {
         Map<Integer, Map<Long, Byte>> frequencies = GregTech_API.sAdvancedWirelessRedstone.get(String.valueOf(uuid));
         if (frequencies == null) return 0;
 
-        // TODO: Implement All Modes
         Map<Long, Byte> signals = frequencies.get(frequency);
-        if (signals == null) return 0;
-
-        return (byte) (signals.values().stream()
-            .map(signal -> signal > 0)
-            .reduce(true, (signalA, signalB) -> signalA && signalB) ? 15 : 0);
+        if (signals == null) signals = new ConcurrentHashMap<>();
+
+        switch (mode) {
+            case AND:
+                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);
+            case OR:
+                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);
+            default:
+                return 0;
+        }
     }
 
     public static void resetAdvancedRedstoneFrequency(UUID uuid, int frequency) {
diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java
index 37e1a6d960..2be46dfa14 100644
--- a/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java
+++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java
@@ -30,6 +30,11 @@ public enum GT_GuiIcon implements IGuiIcon {
     GREEN_ARROW_DOWN(0, 32 * 5, 32 * 2),
     CYCLIC(0, 32 * 6, 32 * 2),
 
+    AND_GATE(0, 0, 32 * 3),
+    NAND_GATE(0, 32, 32 * 3),
+    OR_GATE(0, 32 * 2, 32 * 3),
+    NOR_GATE(0, 32 * 3, 32 * 3),
+
     SLOT_DARKGRAY(1, 176, 0, 18, 18),
     SLOT_GRAY(1, 176, 18, 18, 18),
 
-- 
cgit 


From 2911e1e68afa0db6e615aca4b79b012bd6e08936 Mon Sep 17 00:00:00 2001
From: Matej Dipčár <492666@mail.muni.cz>
Date: Wed, 21 Sep 2022 14:00:15 +0200
Subject: Implement `onBaseTEDestroyed` hook for covers

---
 .../java/gregtech/api/metatileentity/BaseMetaPipeEntity.java   |  2 ++
 .../java/gregtech/api/metatileentity/BaseMetaTileEntity.java   |  2 ++
 .../java/gregtech/api/metatileentity/CoverableTileEntity.java  |  8 ++++++++
 .../gregtech/api/multitileentity/base/BaseMultiTileEntity.java |  2 ++
 src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java      | 10 ++++++++++
 5 files changed, 24 insertions(+)

(limited to 'src/main/java/gregtech/api')

diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
index 0fdaa90c1a..7c75bb97d4 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
@@ -776,6 +776,8 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity
         if (hasCover) tNBT.setIntArray("mCoverSides", mCoverSides);
         if (hasValidMetaTileEntity()) mMetaTileEntity.setItemNBT(tNBT);
         if (!tNBT.hasNoTags()) rStack.setTagCompound(tNBT);
+
+        onBaseTEDestroyed();
         return new ArrayList<>(Collections.singletonList(rStack));
     }
 
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
index cdc81220e6..08ead9a946 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
@@ -1423,6 +1423,8 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
 
         if (hasValidMetaTileEntity()) mMetaTileEntity.setItemNBT(tNBT);
         if (!tNBT.hasNoTags()) rStack.setTagCompound(tNBT);
+
+        onBaseTEDestroyed();
         return new ArrayList<>(Collections.singletonList(rStack));
     }
 
diff --git a/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java b/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java
index caf3c1b15f..5958b515be 100644
--- a/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java
@@ -320,6 +320,14 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov
         return false;
     }
 
+    protected void onBaseTEDestroyed() {
+        for (byte side = 0; side < 6; ++side) {
+            GT_CoverBehaviorBase<?> behavior = getCoverBehaviorAtSideNew(side);
+            if (behavior != GregTech_API.sNoBehavior)
+                behavior.onBaseTEDestroyed(side, getCoverIDAtSide(side), mCoverData[side], this);
+        }
+    }
+
     @Override
     public void setOutputRedstoneSignal(byte aSide, byte aStrength) {
         aStrength = (byte) Math.min(Math.max(0, aStrength), 15);
diff --git a/src/main/java/gregtech/api/multitileentity/base/BaseMultiTileEntity.java b/src/main/java/gregtech/api/multitileentity/base/BaseMultiTileEntity.java
index 18dc310bb7..385ae310f1 100644
--- a/src/main/java/gregtech/api/multitileentity/base/BaseMultiTileEntity.java
+++ b/src/main/java/gregtech/api/multitileentity/base/BaseMultiTileEntity.java
@@ -906,6 +906,8 @@ public abstract class BaseMultiTileEntity extends CoverableTileEntity
         final ArrayList<ItemStack> rList = new ArrayList<>();
         final MultiTileEntityRegistry tRegistry = MultiTileEntityRegistry.getRegistry(getMultiTileEntityRegistryID());
         if (tRegistry != null) rList.add(tRegistry.getItem(getMultiTileEntityID(), writeItemNBT(new NBTTagCompound())));
+
+        onBaseTEDestroyed();
         return rList;
     }
 
diff --git a/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java b/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java
index efbff79957..e0879cda86 100644
--- a/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java
+++ b/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java
@@ -221,6 +221,14 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> {
         return onCoverRemovalImpl(aSide, aCoverID, forceCast(aCoverVariable), aTileEntity, aForced);
     }
 
+    /**
+     * Called upon Base TE being destroyed (once getDrops is called),
+     * thus getting called only when destroyed in survival.
+     */
+    public final void onBaseTEDestroyed(byte aSide, int aCoverID, ISerializableObject aCoverVariable, ICoverable aTileEntity) {
+        onBaseTEDestroyedImpl(aSide, aCoverID, forceCast(aCoverVariable), aTileEntity);
+    }
+
     /**
      * Gives a small Text for the status of the Cover.
      */
@@ -412,6 +420,8 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> {
 
     protected void onDroppedImpl(byte aSide, int aCoverID, T aCoverVariable, ICoverable aTileEntity) {}
 
+    protected void onBaseTEDestroyedImpl(byte aSide, int aCoverID, T aCoverVariable, ICoverable aTileEntity) {}
+
     protected boolean isRedstoneSensitiveImpl(
             byte aSide, int aCoverID, T aCoverVariable, ICoverable aTileEntity, long aTimer) {
         return true;
-- 
cgit 


From 44024669c0f76e7c8e453dd4cbd0f36aee409be9 Mon Sep 17 00:00:00 2001
From: Matej Dipčár <492666@mail.muni.cz>
Date: Wed, 21 Sep 2022 15:00:05 +0200
Subject: Move advanced redstone API to Wireless Base

---
 src/main/java/gregtech/api/GregTech_API.java | 52 ----------------------------
 1 file changed, 52 deletions(-)

(limited to 'src/main/java/gregtech/api')

diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java
index 053d8c6236..ed8610982d 100644
--- a/src/main/java/gregtech/api/GregTech_API.java
+++ b/src/main/java/gregtech/api/GregTech_API.java
@@ -42,7 +42,6 @@ import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
 import gregtech.api.world.GT_Worldgen;
-import gregtech.common.covers.redstone.GT_Cover_AdvancedRedstoneReceiverBase;
 import gregtech.common.items.GT_IntegratedCircuit_Item;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -55,7 +54,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.TreeMap;
-import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiFunction;
 import java.util.function.IntFunction;
@@ -180,56 +178,6 @@ public class GregTech_API {
      */
     public static final Map<String, Map<Integer, Map<Long, Byte>>> sAdvancedWirelessRedstone = new ConcurrentHashMap<>();
 
-    public static Byte getAdvancedRedstone(UUID uuid, int frequency, GT_Cover_AdvancedRedstoneReceiverBase.GateMode mode) {
-        Map<Integer, Map<Long, Byte>> frequencies = GregTech_API.sAdvancedWirelessRedstone.get(String.valueOf(uuid));
-        if (frequencies == null) return 0;
-
-        Map<Long, Byte> signals = frequencies.get(frequency);
-        if (signals == null) signals = new ConcurrentHashMap<>();
-
-        switch (mode) {
-            case AND:
-                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);
-            case OR:
-                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);
-            default:
-                return 0;
-        }
-    }
-
-    public static void resetAdvancedRedstoneFrequency(UUID uuid, int frequency) {
-        Map<Integer, Map<Long, Byte>> frequencies = GregTech_API.sAdvancedWirelessRedstone.get(String.valueOf(uuid));
-        if (frequencies == null) return;
-        frequencies.computeIfPresent(frequency, (k, longByteMap) -> new ConcurrentHashMap<>());
-    }
-
-    public static void removeAdvancedRedstone(UUID uuid, int frequency, long hash) {
-        Map<Integer, Map<Long, Byte>> frequencies = GregTech_API.sAdvancedWirelessRedstone.get(String.valueOf(uuid));
-        if (frequencies == null) return;
-        frequencies.computeIfPresent(frequency, (freq, longByteMap) -> {
-            longByteMap.remove(hash);
-            return longByteMap.isEmpty() ? null : longByteMap;
-        });
-    }
-
-    public static void setAdvancedRedstone(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<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
-- 
cgit 


From 9c4f0a38eb85245732924c109a31e1edec878fb6 Mon Sep 17 00:00:00 2001
From: Matej Dipčár <492666@mail.muni.cz>
Date: Wed, 21 Sep 2022 16:35:17 +0200
Subject: Add new cover items

---
 src/main/java/gregtech/api/enums/ItemList.java | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/main/java/gregtech/api')

diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index b8b457ad16..a6d93af7a3 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -1534,6 +1534,10 @@ public enum ItemList implements IItemContainer {
     Cover_AdvancedRedstoneReceiverExternal,
     Cover_AdvancedRedstoneReceiverInternal,
 
+    Cover_WirelessFluidDetector,
+    Cover_WirelessItemDetector,
+    Cover_WirelessNeedsMaintainance,
+
     Cover_RedstoneTransmitterExternal,
     Cover_RedstoneTransmitterInternal,
     Cover_RedstoneReceiverExternal,
-- 
cgit 


From 1f37e091b74e64eb4ff989f60de5924b8d4cb922 Mon Sep 17 00:00:00 2001
From: Matej Dipčár <492666@mail.muni.cz>
Date: Wed, 21 Sep 2022 21:23:33 +0200
Subject: Implement logic in Wireless Fluid Detector

---
 src/main/java/gregtech/api/util/GT_Utility.java | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/main/java/gregtech/api')

diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index 5898e5fd14..706694d6dd 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -4254,6 +4254,12 @@ public class GT_Utility {
         return Textures.BlockIcons.ERROR_TEXTURE_INDEX;
     }
 
+    public static byte convertRatioToRedstone(long value, long max) {
+        if (value <= 0) return 0;               // Empty
+        if (value >= max) return 15;            // Full
+        return (byte) (1 + (14 * value) / max); // Range 1-14
+    }
+
     @AutoValue
     public abstract static class ItemId {
         /** This method copies NBT, as it is mutable. */
-- 
cgit 


From 16dc222b95a9b45258a678f7b884121c4ba25a8a Mon Sep 17 00:00:00 2001
From: Matej Dipčár <492666@mail.muni.cz>
Date: Thu, 22 Sep 2022 03:14:01 +0200
Subject: Abstract `convertRatioToRedstone` properly

---
 src/main/java/gregtech/api/util/GT_Utility.java | 27 +++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

(limited to 'src/main/java/gregtech/api')

diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index 706694d6dd..f7fd9ce914 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -4254,10 +4254,29 @@ public class GT_Utility {
         return Textures.BlockIcons.ERROR_TEXTURE_INDEX;
     }
 
-    public static byte convertRatioToRedstone(long value, long max) {
-        if (value <= 0) return 0;               // Empty
-        if (value >= max) return 15;            // Full
-        return (byte) (1 + (14 * value) / max); // Range 1-14
+    public static byte convertRatioToRedstone(long used, long max, int threshold, boolean inverted) {
+        byte signal;
+        if (used <= 0) {           // Empty
+            signal = 0;
+        } else if (used >= max) {  // Full
+            signal = 15;
+        } else {                    // Range 1-14
+            signal = (byte) (1 + (14 * used) / max);
+        }
+
+        if (inverted) {
+            signal = (byte) (15 - signal);
+        }
+
+        if (threshold > 0) {
+            if (inverted && used >= threshold) {
+                return 0;
+            } else if (!inverted && used < threshold) {
+                return 0;
+            }
+        }
+
+        return signal;
     }
 
     @AutoValue
-- 
cgit 


From d2c7530665e1bf7929be2f92218df8f7941a8d91 Mon Sep 17 00:00:00 2001
From: Matej Dipčár <492666@mail.muni.cz>
Date: Thu, 22 Sep 2022 04:02:16 +0200
Subject: Add new hook `preDataChanged`

---
 .../java/gregtech/api/metatileentity/CoverableTileEntity.java |  7 +++++--
 src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java     | 11 +++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'src/main/java/gregtech/api')

diff --git a/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java b/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java
index 5958b515be..e26d12f311 100644
--- a/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java
@@ -422,10 +422,13 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov
     public void receiveCoverData(
             byte aCoverSide, int aCoverID, ISerializableObject aCoverData, EntityPlayerMP aPlayer) {
         if ((aCoverSide >= 0 && aCoverSide < 6)) {
+            GT_CoverBehaviorBase<?> behaviorBase = getCoverBehaviorAtSideNew(aCoverSide);
+            behaviorBase.preDataChanged(aCoverSide, getCoverIDAtSide(aCoverSide), aCoverID, getComplexCoverDataAtSide(aCoverSide), aCoverData, this);
+            
             setCoverIDAtSideNoUpdate(aCoverSide, aCoverID);
             setCoverDataAtSide(aCoverSide, aCoverData);
-            if (isClientSide()) {
-                getCoverBehaviorAtSideNew(aCoverSide).onDataChanged(aCoverSide, aCoverID, aCoverData, this);
+            if (!isClientSide()) {
+                behaviorBase.onDataChanged(aCoverSide, aCoverID, aCoverData, this);
             }
         }
     }
diff --git a/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java b/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java
index e0879cda86..47cb866653 100644
--- a/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java
+++ b/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java
@@ -130,6 +130,14 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> {
         onDataChangedImpl(aSide, aCoverID, forceCast(aCoverVariable), aTileEntity);
     }
 
+    /**
+     * Called before receiving data from network. Use {@link ICoverable#isClientSide()} to determine the side.
+     */
+    public final void preDataChanged(
+            byte aSide, int aCoverID, int aNewCoverId, ISerializableObject aCoverVariable, ISerializableObject aNewCoverVariable, ICoverable aTileEntity) {
+        preDataChangedImpl(aSide, aCoverID, aNewCoverId, forceCast(aCoverVariable), forceCast(aNewCoverVariable), aTileEntity);
+    }
+
     /**
      * Called upon cover being removed. Called on both server and client.
      */
@@ -417,6 +425,9 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> {
     }
 
     protected void onDataChangedImpl(byte aSide, int aCoverID, T aCoverVariable, ICoverable aTileEntity) {}
+    
+    protected void preDataChangedImpl(
+            byte aSide, int aCoverID, int aNewCoverId, T aCoverVariable, T aNewCoverVariable, ICoverable aTileEntity) {}
 
     protected void onDroppedImpl(byte aSide, int aCoverID, T aCoverVariable, ICoverable aTileEntity) {}
 
-- 
cgit 


From 3203a9cf7b9b8198bcc97a1e4f3ffdb89991532b Mon Sep 17 00:00:00 2001
From: Matej Dipčár <492666@mail.muni.cz>
Date: Fri, 23 Sep 2022 00:53:16 +0200
Subject: Add cover textures

---
 src/main/java/gregtech/api/enums/Textures.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/main/java/gregtech/api')

diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java
index ee335c749e..2e3a1ac6a8 100644
--- a/src/main/java/gregtech/api/enums/Textures.java
+++ b/src/main/java/gregtech/api/enums/Textures.java
@@ -490,6 +490,16 @@ public class Textures {
         OVERLAY_ENERGYDETECTOR,
         OVERLAY_FLUIDDETECTOR,
         OVERLAY_ITEMDETECTOR,
+        
+        OVERLAY_REDSTONE_TRANSMITTER,
+        OVERLAY_REDSTONE_RECEIVER,
+        OVERLAY_MAINTENANCE_DETECTOR,
+
+        OVERLAY_ADVANCED_REDSTONE_TRANSMITTER,
+        OVERLAY_ADVANCED_REDSTONE_RECEIVER,
+        OVERLAY_WIRELESS_ITEM_DETECTOR,
+        OVERLAY_WIRELESS_FLUID_DETECTOR,
+        OVERLAY_WIRELESS_MAINTENANCE_DETECTOR,
 
         OVERLAY_FLUID_STORAGE_MONITOR0,
         OVERLAY_FLUID_STORAGE_MONITOR1,
-- 
cgit 


From b84e99b5a2f4071c0bd97524380f7aebd01811fe Mon Sep 17 00:00:00 2001
From: Matej Dipčár <492666@mail.muni.cz>
Date: Fri, 23 Sep 2022 01:09:13 +0200
Subject: Add new icon for the analog mode

---
 src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/main/java/gregtech/api')

diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java
index 2be46dfa14..43fbe0711c 100644
--- a/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java
+++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java
@@ -34,6 +34,7 @@ public enum GT_GuiIcon implements IGuiIcon {
     NAND_GATE(0, 32, 32 * 3),
     OR_GATE(0, 32 * 2, 32 * 3),
     NOR_GATE(0, 32 * 3, 32 * 3),
+    ANALOG_MODE(0, 32 * 4, 32 * 3),
 
     SLOT_DARKGRAY(1, 176, 0, 18, 18),
     SLOT_GRAY(1, 176, 18, 18, 18),
-- 
cgit 


From b0969c88904bc7465bef4d580d7387e1644f8c7e Mon Sep 17 00:00:00 2001
From: Matej Dipčár <492666@mail.muni.cz>
Date: Fri, 23 Sep 2022 02:25:01 +0200
Subject: Move `hashCoverCoords` to WirelessBase

---
 src/main/java/gregtech/api/GregTech_API.java | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'src/main/java/gregtech/api')

diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java
index ed8610982d..648c30d930 100644
--- a/src/main/java/gregtech/api/GregTech_API.java
+++ b/src/main/java/gregtech/api/GregTech_API.java
@@ -20,7 +20,6 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.internal.IGT_RecipeAdder;
 import gregtech.api.interfaces.internal.IThaumcraftCompat;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineBlockUpdateable;
 import gregtech.api.items.GT_CoolantCellIC_Item;
 import gregtech.api.items.GT_CoolantCell_Item;
@@ -178,22 +177,6 @@ public class GregTech_API {
      */
     public static final Map<String, Map<Integer, Map<Long, Byte>>> sAdvancedWirelessRedstone = new ConcurrentHashMap<>();
 
-    /**
-     *  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;
-    }
-
     /**
      * The IDSU Frequencies
      */
-- 
cgit 


From 29258562cbfdb0fe40e7f0577d0d84d33eeba204 Mon Sep 17 00:00:00 2001
From: Matej Dipčár <492666@mail.muni.cz>
Date: Fri, 23 Sep 2022 02:27:42 +0200
Subject: Fix previous oopsie

---
 src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/gregtech/api')

diff --git a/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java b/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java
index e26d12f311..d3a96efffe 100644
--- a/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java
@@ -427,7 +427,7 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov
             
             setCoverIDAtSideNoUpdate(aCoverSide, aCoverID);
             setCoverDataAtSide(aCoverSide, aCoverData);
-            if (!isClientSide()) {
+            if (isClientSide()) {
                 behaviorBase.onDataChanged(aCoverSide, aCoverID, aCoverData, this);
             }
         }
-- 
cgit 


From a4a4a950d2870ababec7f67f9bed6e69750a6cc4 Mon Sep 17 00:00:00 2001
From: Matej Dipčár <492666@mail.muni.cz>
Date: Fri, 23 Sep 2022 08:44:08 +0200
Subject: Spotless apply

---
 src/main/java/gregtech/api/enums/Textures.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/gregtech/api')

diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java
index 2e3a1ac6a8..77e28482ce 100644
--- a/src/main/java/gregtech/api/enums/Textures.java
+++ b/src/main/java/gregtech/api/enums/Textures.java
@@ -490,7 +490,7 @@ public class Textures {
         OVERLAY_ENERGYDETECTOR,
         OVERLAY_FLUIDDETECTOR,
         OVERLAY_ITEMDETECTOR,
-        
+
         OVERLAY_REDSTONE_TRANSMITTER,
         OVERLAY_REDSTONE_RECEIVER,
         OVERLAY_MAINTENANCE_DETECTOR,
-- 
cgit 


From 0268d287a9d165899ff456b674d56ba10d382d81 Mon Sep 17 00:00:00 2001
From: Martin Robertz <dream-master@gmx.net>
Date: Sat, 1 Oct 2022 12:37:34 +0200
Subject: spotless

---
 src/main/java/gregtech/api/GregTech_API.java              |  3 ++-
 .../gregtech/api/metatileentity/CoverableTileEntity.java  | 10 ++++++++--
 src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java | 15 +++++++++++----
 src/main/java/gregtech/api/util/GT_Utility.java           |  6 +++---
 4 files changed, 24 insertions(+), 10 deletions(-)

(limited to 'src/main/java/gregtech/api')

diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java
index 648c30d930..9b039409dc 100644
--- a/src/main/java/gregtech/api/GregTech_API.java
+++ b/src/main/java/gregtech/api/GregTech_API.java
@@ -175,7 +175,8 @@ public class GregTech_API {
     /**
      * The Advanced Redstone Frequencies
      */
-    public static final Map<String, Map<Integer, Map<Long, Byte>>> sAdvancedWirelessRedstone = new ConcurrentHashMap<>();
+    public static final Map<String, Map<Integer, Map<Long, Byte>>> sAdvancedWirelessRedstone =
+            new ConcurrentHashMap<>();
 
     /**
      * The IDSU Frequencies
diff --git a/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java b/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java
index d3a96efffe..9df38b2725 100644
--- a/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java
@@ -423,8 +423,14 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov
             byte aCoverSide, int aCoverID, ISerializableObject aCoverData, EntityPlayerMP aPlayer) {
         if ((aCoverSide >= 0 && aCoverSide < 6)) {
             GT_CoverBehaviorBase<?> behaviorBase = getCoverBehaviorAtSideNew(aCoverSide);
-            behaviorBase.preDataChanged(aCoverSide, getCoverIDAtSide(aCoverSide), aCoverID, getComplexCoverDataAtSide(aCoverSide), aCoverData, this);
-            
+            behaviorBase.preDataChanged(
+                    aCoverSide,
+                    getCoverIDAtSide(aCoverSide),
+                    aCoverID,
+                    getComplexCoverDataAtSide(aCoverSide),
+                    aCoverData,
+                    this);
+
             setCoverIDAtSideNoUpdate(aCoverSide, aCoverID);
             setCoverDataAtSide(aCoverSide, aCoverData);
             if (isClientSide()) {
diff --git a/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java b/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java
index 47cb866653..1092a24307 100644
--- a/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java
+++ b/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java
@@ -134,8 +134,14 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> {
      * Called before receiving data from network. Use {@link ICoverable#isClientSide()} to determine the side.
      */
     public final void preDataChanged(
-            byte aSide, int aCoverID, int aNewCoverId, ISerializableObject aCoverVariable, ISerializableObject aNewCoverVariable, ICoverable aTileEntity) {
-        preDataChangedImpl(aSide, aCoverID, aNewCoverId, forceCast(aCoverVariable), forceCast(aNewCoverVariable), aTileEntity);
+            byte aSide,
+            int aCoverID,
+            int aNewCoverId,
+            ISerializableObject aCoverVariable,
+            ISerializableObject aNewCoverVariable,
+            ICoverable aTileEntity) {
+        preDataChangedImpl(
+                aSide, aCoverID, aNewCoverId, forceCast(aCoverVariable), forceCast(aNewCoverVariable), aTileEntity);
     }
 
     /**
@@ -233,7 +239,8 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> {
      * Called upon Base TE being destroyed (once getDrops is called),
      * thus getting called only when destroyed in survival.
      */
-    public final void onBaseTEDestroyed(byte aSide, int aCoverID, ISerializableObject aCoverVariable, ICoverable aTileEntity) {
+    public final void onBaseTEDestroyed(
+            byte aSide, int aCoverID, ISerializableObject aCoverVariable, ICoverable aTileEntity) {
         onBaseTEDestroyedImpl(aSide, aCoverID, forceCast(aCoverVariable), aTileEntity);
     }
 
@@ -425,7 +432,7 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> {
     }
 
     protected void onDataChangedImpl(byte aSide, int aCoverID, T aCoverVariable, ICoverable aTileEntity) {}
-    
+
     protected void preDataChangedImpl(
             byte aSide, int aCoverID, int aNewCoverId, T aCoverVariable, T aNewCoverVariable, ICoverable aTileEntity) {}
 
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index f7fd9ce914..4371658b3a 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -4256,11 +4256,11 @@ public class GT_Utility {
 
     public static byte convertRatioToRedstone(long used, long max, int threshold, boolean inverted) {
         byte signal;
-        if (used <= 0) {           // Empty
+        if (used <= 0) { // Empty
             signal = 0;
-        } else if (used >= max) {  // Full
+        } else if (used >= max) { // Full
             signal = 15;
-        } else {                    // Range 1-14
+        } else { // Range 1-14
             signal = (byte) (1 + (14 * used) / max);
         }
 
-- 
cgit