3 files changed, 30 insertions, 1 deletions
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;
@@ -173,6 +174,29 @@ public class GregTech_API {
      */
     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
      */
     public static final Map<Integer, Integer> sIDSUList = new ConcurrentHashMap<>();
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;