Merge branch 'beta' into cumcum

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
#	src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java

1 files changed, 43 insertions, 4 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/RiftConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/RiftConfig.java
index 11cefd38e..bfa351fbd 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/RiftConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/RiftConfig.java
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.config.features;
 
+import at.hannibal2.skyhanni.config.FeatureToggle;
 import at.hannibal2.skyhanni.config.core.config.Position;
 import com.google.gson.annotations.Expose;
 import io.github.moulberry.moulconfig.annotations.*;
@@ -17,6 +18,7 @@ public class RiftConfig {
         @Expose
         @ConfigOption(name = "Enabled", desc = "Show the remaining rift time, max time, percentage, and extra time changes.")
         @ConfigEditorBoolean
+        @FeatureToggle
         public boolean enabled = true;
 
         @Expose
@@ -43,6 +45,7 @@ public class RiftConfig {
         @Expose
         @ConfigOption(name = "Crux Talisman Display", desc = "Display progress of the Crux Talisman on screen.")
         @ConfigEditorBoolean
+        @FeatureToggle
         public boolean enabled = false;
 
         @Expose
@@ -53,6 +56,7 @@ public class RiftConfig {
         @Expose
         @ConfigOption(name = "Show Bonuses", desc = "Show bonuses you get from the talisman.")
         @ConfigEditorBoolean
+        @FeatureToggle
         public Property<Boolean> showBonuses = Property.of(true);
 
         @Expose
@@ -69,6 +73,7 @@ public class RiftConfig {
         @Expose
         @ConfigOption(name = "Enabled", desc = "Click on Enigma Souls in Rift Guides to highlight their location.")
         @ConfigEditorBoolean
+        @FeatureToggle
         public boolean enabled = true;
 
         @Expose
@@ -96,6 +101,7 @@ public class RiftConfig {
             @ConfigOption(name = "Shy Crux Warning", desc = "Shows a warning when a Shy Crux is going to steal your time. " +
                     "Useful if you play without volume.")
             @ConfigEditorBoolean
+            @FeatureToggle
             public boolean shyWarning = true;
 
             @ConfigOption(name = "Larvas", desc = "")
@@ -108,6 +114,7 @@ public class RiftConfig {
                 @Expose
                 @ConfigOption(name = "Highlight", desc = "Highlight §cLarvas on trees §7while holding a §eLarva Hook §7in the hand.")
                 @ConfigEditorBoolean
+                @FeatureToggle
                 public boolean highlight = true;
 
                 @Expose
@@ -128,6 +135,7 @@ public class RiftConfig {
                 @ConfigOption(name = "Highlight", desc = "Highlight the small §cOdonatas §7flying around the trees while holding a " +
                         "§eEmpty Odonata Bottle §7in the hand.")
                 @ConfigEditorBoolean
+                @FeatureToggle
                 public boolean highlight = true;
 
                 @Expose
@@ -155,16 +163,19 @@ public class RiftConfig {
                 @Expose
                 @ConfigOption(name = "Hacking Solver", desc = "Highlights the correct button to click in the hacking inventory.")
                 @ConfigEditorBoolean
+                @FeatureToggle
                 public boolean solver = true;
 
                 @Expose
                 @ConfigOption(name = "Color Guide", desc = "Tells you which colour to pick.")
                 @ConfigEditorBoolean
+                @FeatureToggle
                 public boolean colour = true;
 
                 @Expose
                 @ConfigOption(name = "Terminal Waypoints", desc = "While wearing the helmet, waypoints will appear at each terminal location.")
                 @ConfigEditorBoolean
+                @FeatureToggle
                 public boolean waypoints = true;
             }
         }
@@ -179,6 +190,7 @@ public class RiftConfig {
             @ConfigOption(name = "Agaricus Cap", desc = "Counts down the time until §eAgaricus Cap (Mushroom) " +
                     "§7changes color from brown to red and is breakable.")
             @ConfigEditorBoolean
+            @FeatureToggle
             public boolean agaricusCap = true;
 
             @ConfigOption(name = "Volt Crux", desc = "")
@@ -191,11 +203,13 @@ public class RiftConfig {
                 @Expose
                 @ConfigOption(name = "Volt Warning", desc = "Shows a warning while a volt is discharging lightning.")
                 @ConfigEditorBoolean
+                @FeatureToggle
                 public boolean voltWarning = true;
 
                 @Expose
                 @ConfigOption(name = "Volt Range Highlighter", desc = "Shows the area in which a Volt might strike lightning.")
                 @ConfigEditorBoolean
+                @FeatureToggle
                 public boolean voltRange = true;
 
                 @Expose
@@ -206,6 +220,7 @@ public class RiftConfig {
                 @Expose
                 @ConfigOption(name = "Volt mood color", desc = "Change the color of the volt enemy depending on their mood.")
                 @ConfigEditorBoolean
+                @FeatureToggle
                 public boolean voltMoodMeter = false;
             }
 
@@ -219,6 +234,7 @@ public class RiftConfig {
                 @Expose
                 @ConfigOption(name = "Enabled", desc = "Show Wilted Berberis helper.")
                 @ConfigEditorBoolean
+                @FeatureToggle
                 public boolean enabled = true;
 
                 @Expose
@@ -234,7 +250,7 @@ public class RiftConfig {
             }
         }
 
-        @ConfigOption(name = "Mirror Verse", desc = "")
+        @ConfigOption(name = "Mirrorverse", desc = "")
         @Accordion
         @Expose
         public MirrorVerse mirrorVerseConfig = new MirrorVerse();
@@ -249,8 +265,9 @@ public class RiftConfig {
             public static class LavaMazeConfig {
 
                 @Expose
-                @ConfigOption(name = "Enabled", desc = "Helps solving the lava maze in the mirror verse by showing the correct way.")
+                @ConfigOption(name = "Enabled", desc = "Helps solving the lava maze in the Mirrorverse by showing the correct way.")
                 @ConfigEditorBoolean
+                @FeatureToggle
                 public boolean enabled = true;
 
                 @Expose
@@ -271,6 +288,7 @@ public class RiftConfig {
                 @Expose
                 @ConfigOption(name = "Hide others players", desc = "Hide other players while doing the lava maze.")
                 @ConfigEditorBoolean
+                @FeatureToggle
                 public boolean hidePlayers = false;
             }
 
@@ -283,8 +301,9 @@ public class RiftConfig {
             public static class UpsideDownParkour {
 
                 @Expose
-                @ConfigOption(name = "Enabled", desc = "Helps solving the upside down parkour in the mirror verse by showing the correct way.")
+                @ConfigOption(name = "Enabled", desc = "Helps solving the upside down parkour in the Mirrorverse by showing the correct way.")
                 @ConfigEditorBoolean
+                @FeatureToggle
                 public boolean enabled = true;
 
                 @Expose
@@ -310,6 +329,7 @@ public class RiftConfig {
                 @Expose
                 @ConfigOption(name = "Hide others players", desc = "Hide other players while doing the upside down parkour.")
                 @ConfigEditorBoolean
+                @FeatureToggle
                 public boolean hidePlayers = false;
             }
 
@@ -322,8 +342,9 @@ public class RiftConfig {
             public static class DanceRoomHelper {
 
                 @Expose
-                @ConfigOption(name = "Enabled", desc = "Helps to solve the dance room in the mirror verse by showing multiple tasks at once.")
+                @ConfigOption(name = "Enabled", desc = "Helps to solve the dance room in the Mirrorverse by showing multiple tasks at once.")
                 @ConfigEditorBoolean
+                @FeatureToggle
                 public boolean enabled = false;
 
                 @Expose
@@ -344,6 +365,7 @@ public class RiftConfig {
                 @Expose
                 @ConfigOption(name = "Hide Title", desc = "Hide Instructions, \"§aIt's happening!\" §7and \"§aKeep it up!\" §7titles.")
                 @ConfigEditorBoolean
+                @FeatureToggle
                 public boolean hideOriginalTitle = false;
 
                 @Expose
@@ -426,6 +448,7 @@ public class RiftConfig {
                 @Expose
                 @ConfigOption(name = "Enabled", desc = "Highlights the location of the invisible Tubulator blocks (Laser Parkour).")
                 @ConfigEditorBoolean
+                @FeatureToggle
                 public boolean enabled = true;
 
                 @Expose
@@ -451,6 +474,7 @@ public class RiftConfig {
                 @Expose
                 @ConfigOption(name = "Hide others players", desc = "Hide other players while doing the lava maze.")
                 @ConfigEditorBoolean
+                @FeatureToggle
                 public boolean hidePlayers = false;
             }
         }
@@ -481,6 +505,7 @@ public class RiftConfig {
                 @Expose
                 @ConfigOption(name = "Enabled", desc = "Display progress Living Metal Suit")
                 @ConfigEditorBoolean
+                @FeatureToggle
                 public boolean enabled = false;
 
                 @Expose
@@ -502,11 +527,13 @@ public class RiftConfig {
                 @Expose
                 @ConfigOption(name = "Enabled", desc = "Show a line between Defense blocks and the mob and highlight the blocks.")
                 @ConfigEditorBoolean
+                @FeatureToggle
                 public boolean enabled = true;
 
                 @Expose
                 @ConfigOption(name = "Hide Particles", desc = "Hide particles around Defense Blocks")
                 @ConfigEditorBoolean
+                @FeatureToggle
                 public boolean hideParticles = false;
 
                 @Expose
@@ -526,11 +553,13 @@ public class RiftConfig {
                 @Expose
                 @ConfigOption(name = "Living Metal", desc = "Show a moving animation between Living Metal and the next block.")
                 @ConfigEditorBoolean
+                @FeatureToggle
                 public boolean enabled = true;
 
                 @Expose
                 @ConfigOption(name = "Hide Particles", desc = "Hide Living Metal particles.")
                 @ConfigEditorBoolean
+                @FeatureToggle
                 public boolean hideParticles = false;
 
             }
@@ -546,6 +575,7 @@ public class RiftConfig {
             @Expose
             @ConfigOption(name = "Highlight Blobbercysts", desc = "Highlight Blobbercysts in Bacte fight.")
             @ConfigEditorBoolean
+            @FeatureToggle
             public boolean highlightBlobbercysts = true;
         }
 
@@ -566,11 +596,13 @@ public class RiftConfig {
                 @Expose
                 @ConfigOption(name = "Enabled", desc = "Show locations of inactive Blood Effigy.")
                 @ConfigEditorBoolean
+                @FeatureToggle
                 public boolean enabled = false;
 
                 @Expose
                 @ConfigOption(name = "Respawning Soon", desc = "Show effigies that are about to respawn.")
                 @ConfigEditorBoolean
+                @FeatureToggle
                 public boolean respawningSoon = false;
 
                 @Expose
@@ -585,6 +617,7 @@ public class RiftConfig {
                 @Expose
                 @ConfigOption(name = "Unknown Times", desc = "Show effigies without known time.")
                 @ConfigEditorBoolean
+                @FeatureToggle
                 public boolean unknownTime = false;
             }
         }
@@ -610,6 +643,7 @@ public class RiftConfig {
         @Expose
         @ConfigOption(name = "Show Motes Price", desc = "Show the Motes NPC price in the item lore.")
         @ConfigEditorBoolean
+        @FeatureToggle
         public boolean showPrice = true;
 
         @Expose
@@ -626,6 +660,7 @@ public class RiftConfig {
             @Expose
             @ConfigOption(name = "Inventory value", desc = "Show total Motes NPC price for the current opened inventory.")
             @ConfigEditorBoolean
+            @FeatureToggle
             public boolean enabled = true;
 
             @Expose
@@ -649,11 +684,13 @@ public class RiftConfig {
         @Expose
         @ConfigOption(name = "Highlight Motes Orbs", desc = "Highlight flying Motes Orbs.")
         @ConfigEditorBoolean
+        @FeatureToggle
         public boolean enabled = true;
 
         @Expose
         @ConfigOption(name = "Hide Particles", desc = "Hide normal motes orbs particles.")
         @ConfigEditorBoolean
+        @FeatureToggle
         public boolean hideParticles = false;
 
     }
@@ -661,10 +698,12 @@ public class RiftConfig {
     @Expose
     @ConfigOption(name = "Highlight Guide", desc = "Highlight things to do in the Rift Guide.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean highlightGuide = true;
 
     @Expose
     @ConfigOption(name = "Horsezooka Hider", desc = "Hide horses while holding the Horsezooka in the hand.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean horsezookaHider = false;
 }