Merge branch 'beta' into frozen_treasure_tracker

3 files changed, 51 insertions, 1 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/Storage.java b/src/main/java/at/hannibal2/skyhanni/config/Storage.java
index c0a003aad..4a95871cb 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/Storage.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/Storage.java
@@ -274,5 +274,23 @@ public class Storage {
                 public boolean hidden;
             }
         }
+
+        @Expose
+        public Map<String, SlayerRngMeterStorage> slayerRngMeter = new HashMap<>();
+
+        public static class SlayerRngMeterStorage {
+
+            @Expose
+            public long currentMeter = -1;
+
+            @Expose
+            public long gainPerBoss = -1;
+
+            @Expose
+            public long goalNeeded = -1;
+
+            @Expose
+            public String itemGoal = "?";
+        }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java b/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java
index bd60e0eee..f149fc624 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java
@@ -122,10 +122,15 @@ public class Chat {
             "except for players who are nearby or during dungeons/a Kuudra fight.")
     @ConfigEditorBoolean
     public boolean hideFarDeathMessages = false;
-    //TODO jawbus + x
+    //TODO jawbus + thunder
 
     @Expose
     @ConfigOption(name = "Compact Potion Message", desc = "Shorten chat messages about player potion effects.")
     @ConfigEditorBoolean
     public boolean compactPotionMessage = true;
+
+    @Expose
+    @ConfigOption(name = "Arachne Hider", desc = "Hide chat messages about the Arachne Fight while outside of §eArachne's Sanctuary§7.")
+    @ConfigEditorBoolean
+    public boolean hideArachneMessages = false;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Slayer.java b/src/main/java/at/hannibal2/skyhanni/config/features/Slayer.java
index 00392bcc4..852b54970 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Slayer.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Slayer.java
@@ -144,6 +144,33 @@ public class Slayer {
     }
 
     @Expose
+    @ConfigOption(name = "RNG Meter Display", desc = "")
+    @Accordion
+    public RngMeterDisplay rngMeterDisplay = new RngMeterDisplay();
+
+    public static class RngMeterDisplay {
+
+        @Expose
+        @ConfigOption(name = "Enabled", desc = "Display amount of bosses needed until next rng meter drop.")
+        @ConfigEditorBoolean
+        public boolean enabled = true;
+
+        @Expose
+        @ConfigOption(name = "Warn Empty", desc = "Warn when no item is set in the rng meter.")
+        @ConfigEditorBoolean
+        public boolean warnEmpty = false;
+
+        @Expose
+        @ConfigOption(name = "Hide Chat", desc = "Hide the rng meter message from chat if current item is selected.")
+        @ConfigEditorBoolean
+        public boolean hideChat = true;
+
+        @Expose
+        public Position pos = new Position(410, 110, false, true);
+
+    }
+
+    @Expose
     @ConfigOption(name = "Broken Wither Impact",
             desc = "Warns when right-clicking with a Wither Impact weapon (e.g. Hyperion) no longer gains combat exp. " +
             "Kill a mob with melee-hits to fix this hypixel bug. §cOnly works while doing slayers!"