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

21 files changed, 836 insertions, 180 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java
index 894d834f2..9cffc4ed8 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.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.ConfigEditorBoolean;
@@ -11,6 +12,7 @@ public class AshfangConfig {
     @Expose
     @ConfigOption(name = "Freeze", desc = "Show the cooldown for how long Ashfang blocks your abilities.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean brrrrItsSoColdCooldownCooldown = false;
 
     @Expose
@@ -19,6 +21,7 @@ public class AshfangConfig {
     @Expose
     @ConfigOption(name = "Reset Time", desc = "Show the cooldown until Ashfang pulls his underlings back.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean nextResetCooldown = false;
 
     @Expose
@@ -27,6 +30,7 @@ public class AshfangConfig {
     @Expose
     @ConfigOption(name = "Gravity Orbs", desc = "Shows the Gravity Orbs more clearly.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean gravityOrbs = false;
 
     @Expose
@@ -37,6 +41,7 @@ public class AshfangConfig {
     @Expose
     @ConfigOption(name = "Blazing Souls", desc = "Shows the Blazing Souls more clearly.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean blazingSouls = false;
 
     @Expose
@@ -47,20 +52,24 @@ public class AshfangConfig {
     @Expose
     @ConfigOption(name = "Highlight Blazes", desc = "Highlight the different blazes in their respective colors.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean highlightBlazes = false;
 
     @Expose
     @ConfigOption(name = "Hide Particles", desc = "Hide particles around the Ashfang boss.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean hideParticles = false;
 
     @Expose
     @ConfigOption(name = "Hide Names", desc = "Hide the names of full health blazes around Ashfang (only useful when highlight blazes is enabled)")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean hideNames = false;
 
     @Expose
     @ConfigOption(name = "Hide Damage", desc = "Hide damage splashes around Ashfang.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean hideDamageSplash = false;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/BazaarConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/BazaarConfig.java
index 8f12ba667..8f60e5b28 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/BazaarConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/BazaarConfig.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.ConfigEditorBoolean;
@@ -10,16 +11,19 @@ public class BazaarConfig {
     @Expose
     @ConfigOption(name = "Purchase Helper", desc = "Highlights the item you are trying to buy in the Bazaar.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean purchaseHelper = true;
 
     @Expose
     @ConfigOption(name = "Order Helper", desc = "Show visual hints inside the Bazaar Manage Order view when items are ready to pickup or outbid.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean orderHelper = false;
 
     @Expose
     @ConfigOption(name = "Best Sell Method", desc = "Show the price difference between sell instantly and sell offer.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean bestSellMethod = false;
 
     @Expose
@@ -28,5 +32,12 @@ public class BazaarConfig {
     @Expose
     @ConfigOption(name = "Cancelled Buy Order Clipboard", desc = "Saves missing items from cancelled buy orders to clipboard for faster re-entry.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean cancelledBuyOrderClipboard = false;
+
+    @Expose
+    @ConfigOption(name = "Price Website", desc = "Adds a button to the bazaar product inventory that will open the item page in §cskyblock.bz§7.")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean openPriceWebsite = false;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/BingoConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/BingoConfig.java
index e083fbcbe..733b3a5a3 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/BingoConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/BingoConfig.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.Accordion;
@@ -16,16 +17,17 @@ public class BingoConfig {
 
     public static class BingoCard {
         @Expose
-        @ConfigOption(name = "Enable", desc = "Displays the bingo card.")
+        @ConfigOption(name = "Enable", desc = "Displays the Bingo Card.")
         @ConfigEditorBoolean
+        @FeatureToggle
         public boolean enabled = true;
         @Expose
-        @ConfigOption(name = "Quick Toggle", desc = "Quickly toggle the bingo card or the step helper by sneaking with SkyBlock menu in hand.")
+        @ConfigOption(name = "Quick Toggle", desc = "Quickly toggle the Bingo Card or the step helper by sneaking with SkyBlock Menu in hand.")
         @ConfigEditorBoolean
         public boolean quickToggle = true;
 
         @Expose
-        @ConfigOption(name = "Bingo Steps", desc = "Show help with the next step in bingo instead of the bingo card. " +
+        @ConfigOption(name = "Bingo Steps", desc = "Show help with the next step in Bingo instead of the Bingo Card. " +
                 "§cThis feature is in early development. Expect bugs and missing goals.")
         @ConfigEditorBoolean
         public boolean stepHelper = false;
@@ -38,10 +40,12 @@ public class BingoConfig {
         @Expose
         @ConfigOption(
                 name = "Show Guide",
-                desc = "Show tips and difficulty for bingo goals inside the bingo card inventory.\n" +
-                        "§eData from Bingo Splash Community§7, made by §cMayxo"
+                desc = "Show tips and difficulty for bingo goals inside the Bingo Card inventory.\n" +
+                        "These tips are made from inspirations and guides from the community,\n"+
+                        "aiming to help you to complete the bingo card."
         )
         @ConfigEditorBoolean
+        @FeatureToggle
         public boolean bingoSplashGuide = true;
 
         @Expose
@@ -57,24 +61,27 @@ public class BingoConfig {
 
         @Expose
         @ConfigOption(name = "Enable", desc = "Shortens chat messages about skill level ups, collection gains, " +
-                "new area discoveries and skyblock level up messages while on bingo.")
+                "new area discoveries and SkyBlock level up messages while on Bingo.")
         @ConfigEditorBoolean
+        @FeatureToggle
         public boolean enabled = true;
 
         @Expose
         @ConfigOption(name = "Hide Border", desc = "Hide the border messages before and after the compact level up messages.")
         @ConfigEditorBoolean
+        @FeatureToggle
         public boolean hideBorder = true;
 
         @Expose
-        @ConfigOption(name = "Outside Bingo", desc = "Compact the level up chat messages outside of an bingo profile as well.")
+        @ConfigOption(name = "Outside Bingo", desc = "Compact the level up chat messages outside of an Bingo profile as well.")
         @ConfigEditorBoolean
         public boolean outsideBingo = false;
     }
 
     @Expose
-    @ConfigOption(name = "Minion Craft Helper", desc = "Show how many more items you need to upgrade the minion in your inventory. Especially useful for bingo.")
+    @ConfigOption(name = "Minion Craft Helper", desc = "Show how many more items you need to upgrade the minion in your inventory. Especially useful for Bingo.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean minionCraftHelperEnabled = true;
 
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/ChatConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/ChatConfig.java
index ee46054f6..97d933ad6 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/ChatConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/ChatConfig.java
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.config.features;
 
+import at.hannibal2.skyhanni.config.FeatureToggle;
 import com.google.gson.annotations.Expose;
 import io.github.moulberry.moulconfig.annotations.*;
 import org.lwjgl.input.Keyboard;
@@ -21,61 +22,78 @@ public class ChatConfig {
     @ConfigOption(name = "Hypixel Hub", desc = "Block messages outside SkyBlock in the Hypixel lobby: player joins, loot boxes, prototype lobby messages, radiating generosity and Hypixel tournaments.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
+    @FeatureToggle
     public boolean hypixelHub = true;
 
     @Expose
     @ConfigOption(name = "Empty", desc = "Hide all the empty messages from the chat.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
+    @FeatureToggle
     public boolean empty = true;
 
     @Expose
-    @ConfigOption(name = "Warping", desc = "Block 'sending request to join...' and 'warping...' messages.")
+    @ConfigOption(name = "Warping", desc = "Block 'Sending request to join...' and 'Warping...' messages.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
+    @FeatureToggle
     public boolean warping = true;
 
     @Expose
-    @ConfigOption(name = "Welcome", desc = "Hide the 'welcome to SkyBlock' message.")
+    @ConfigOption(name = "Welcome", desc = "Hide the 'Welcome to SkyBlock' message.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
+    @FeatureToggle
     public boolean welcome = true;
 
     @Expose
-    @ConfigOption(name = "Guild Exp", desc = "Hide guild exp messages.")
+    @ConfigOption(name = "Guild Exp", desc = "Hide Guild EXP messages.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
+    @FeatureToggle
     public boolean guildExp = true;
 
     @Expose
-    @ConfigOption(name = "Winter Gifts", desc = "Hide useless winter gift messages.")
+    @ConfigOption(name = "Friend Join Left", desc = "Hide friend join/left messages.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
+    @FeatureToggle
+    public boolean friendJoinLeft = false;
+
+    @Expose
+    @ConfigOption(name = "Winter Gifts", desc = "Hide useless Winter Gift messages.")
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 0)
+    @FeatureToggle
     public boolean winterGift = false;
 
     @Expose
-    @ConfigOption(name = "Powder Mining", desc = "Hide messages while opening chests in crystal hollows. " +
+    @ConfigOption(name = "Powder Mining", desc = "Hide messages while opening chests in Crystal Hollows. " +
             "(Except powder numbers over 1k, Prehistoric Egg and Automaton Parts)")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
+    @FeatureToggle
     public boolean powderMining = true;
 
     @Expose
-    @ConfigOption(name = "Kill Combo", desc = "Hide messages about the current kill combo from the Grandma Wolf Pet.")
+    @ConfigOption(name = "Kill Combo", desc = "Hide messages about the current Kill Combo from the Grandma Wolf Pet.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
+    @FeatureToggle
     public boolean killCombo = false;
 
     @Expose
     @ConfigOption(name = "Watchdog", desc = "Hide the message where Hypixel is flexing how many players they have banned over the last week.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
+    @FeatureToggle
     public boolean watchDog = true;
 
     @Expose
     @ConfigOption(name = "Profile Join", desc = "Hide 'You are playing on profile' and 'Profile ID' chat messages")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
+    @FeatureToggle
     public boolean profileJoin = true;
 
     //TODO remove
@@ -83,6 +101,7 @@ public class ChatConfig {
     @ConfigOption(name = "Others", desc = "Hide other annoying messages.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
+    @FeatureToggle
     public boolean others = false;
 
     @Expose
@@ -94,48 +113,57 @@ public class ChatConfig {
     @ConfigOption(name = "Player Rank Hider", desc = "Hide player ranks in all chat messages.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 1)
+    @FeatureToggle
     public boolean playerRankHider = false;
 
     @Expose
     @ConfigOption(name = "Chat Filter", desc = "Scan messages sent by players for blacklisted words and grey out the message if any are found.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 1)
+    @FeatureToggle
     public boolean chatFilter = false;
 
     @Expose
-    @ConfigOption(name = "Dungeon Filter", desc = "Hide annoying messages in dungeons.")
+    @ConfigOption(name = "Dungeon Filter", desc = "Hide annoying messages in Dungeons.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean dungeonMessages = true;
 
     @Expose
-    @ConfigOption(name = "Dungeon Boss Messages", desc = "Hide messages from the watcher and bosses in the dungeon.")
+    @ConfigOption(name = "Dungeon Boss Messages", desc = "Hide messages from the Watcher and bosses in the dungeon.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean dungeonBossMessages = false;
 
     @Expose
     @ConfigOption(name = "Hide Far Deaths", desc = "Hide other players' death messages, " +
-            "except for players who are nearby or during dungeons/a Kuudra fight.")
+            "except for players who are nearby or during Dungeons/a Kuudra fight.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean hideFarDeathMessages = false;
     //TODO jawbus + thunder
 
     @Expose
     @ConfigOption(name = "Compact Potion Message", desc = "Shorten chat messages about player potion effects.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean compactPotionMessage = true;
 
     @Expose
-    @ConfigOption(name = "Compact Bestiary Message", desc = "Shorten the bestiary level up message, showing additional information when hovering.")
+    @ConfigOption(name = "Compact Bestiary Message", desc = "Shorten the Bestiary level up message, showing additional information when hovering.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean compactBestiaryMessage = true;
 
     @Expose
     @ConfigOption(name = "Arachne Hider", desc = "Hide chat messages about the Arachne Fight while outside of §eArachne's Sanctuary§7.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean hideArachneMessages = false;
 
     @Expose
     @ConfigOption(name = "Translator", desc = "Click on a message to translate it into English. Use /shcopytranslation to get the translation from English. Translation is not guaranteed to be 100% accurate.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean translator = false;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/CommandsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/CommandsConfig.java
index dd0668743..e7be4768f 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/CommandsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/CommandsConfig.java
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.config.features;
 
+import at.hannibal2.skyhanni.config.FeatureToggle;
 import com.google.gson.annotations.Expose;
 import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.moulberry.moulconfig.annotations.ConfigOption;
@@ -9,16 +10,19 @@ public class CommandsConfig {
     @Expose
     @ConfigOption(name = "Fandom Wiki", desc = "Use Fandom wiki (§ehypixel-skyblock.fandom.com§7) instead of the Hypixel wiki (§ewiki.hypixel.net§7).")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean useFandomWiki = false;
 
     @Expose
     @ConfigOption(name = "Party transfer", desc = "Allows §e/pt <player> §7as alias for §e/party transfer§7.\n" +
             "§7SkyBlock command §e/pt §7to check the play time still works.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean usePartyTransferAlias = true;
 
     @Expose
-    @ConfigOption(name = "Replace Warp Is", desc = "Replaces §e/warp is §7with §e/is§7. Idk why. Ask §cKaeso")
+    @ConfigOption(name = "Replace Warp Is", desc = "Adds §e/warp is §7alongside §e/is§7. Idk why. Ask §cKaeso")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean replaceWarpIs = false;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicatorConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicatorConfig.java
index d1f522a9e..210190bac 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicatorConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicatorConfig.java
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.config.features;
 
+import at.hannibal2.skyhanni.config.FeatureToggle;
 import com.google.gson.annotations.Expose;
 import io.github.moulberry.moulconfig.annotations.*;
 
@@ -12,6 +13,7 @@ public class DamageIndicatorConfig {
     @Expose
     @ConfigOption(name = "Damage Indicator Enabled", desc = "Show the boss' remaining health.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean enabled = false;
 
     @Expose
@@ -56,11 +58,12 @@ public class DamageIndicatorConfig {
                     "Dummy",
                     "§bArachne",
                     "§bThe Rift Bosses",
-                    "§bRiftstalker Bloodfiend"
+                    "§bRiftstalker Bloodfiend",
+                    "§6Reindrake"
             }
     )
     //TODO only show currently working and tested features
-    public List<Integer> bossesToShow = new ArrayList<>(Arrays.asList(0, 1, 2, 5, 6, 7, 8, 9, 18, 19, 21, 22, 23));
+    public List<Integer> bossesToShow = new ArrayList<>(Arrays.asList(0, 1, 2, 5, 6, 7, 8, 9, 18, 19, 21, 22, 23, 24));
 
     @Expose
     @ConfigOption(name = "Hide Damage Splash", desc = "Hiding damage splashes near the damage indicator.")
@@ -108,12 +111,12 @@ public class DamageIndicatorConfig {
 
     public static class VampireSlayerConfig {
         @Expose
-        @ConfigOption(name = "HP untill Steak", desc = "Show the amount of HP miss1ing untill the steak can be used on the vampire slayer on top of the boss.")
+        @ConfigOption(name = "HP until Steak", desc = "Show the amount of HP missing until the steak can be used on the Vampire Slayer on top of the boss.")
         @ConfigEditorBoolean
         public boolean hpTillSteak = false;
 
         @Expose
-        @ConfigOption(name = "Mania Circles", desc = "Show a timer until the boss leaves the invicible Mania Circles state.")
+        @ConfigOption(name = "Mania Circles", desc = "Show a timer until the boss leaves the invincible Mania Circles state.")
         @ConfigEditorBoolean
         public boolean maniaCircles = false;
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/DevConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/DevConfig.java
index 751e48a1c..2c5189bbc 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/DevConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/DevConfig.java
@@ -25,7 +25,7 @@ public class DevConfig {
     public boolean debugEnabled = false;
 
     @Expose
-    @ConfigOption(name = "Command Logging", desc = "Logs stack trace information into the console when a command gets sent to hypixel. (by any mod or the player)")
+    @ConfigOption(name = "Command Logging", desc = "Logs stack trace information into the console when a command gets sent to Hypixel. (by any mod or the player)")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
     public boolean commandLogs = false;
@@ -33,7 +33,7 @@ public class DevConfig {
     @Expose
     @ConfigOption(
             name = "Mod Menu Log",
-            desc = "Enables debug messages when the currently opened gui changes, with the path to the gui class. " +
+            desc = "Enables debug messages when the currently opened GUI changes, with the path to the gui class. " +
                     "Useful for adding more mods to quick mod menu switch."
     )
     @ConfigEditorBoolean
@@ -47,19 +47,25 @@ public class DevConfig {
     public boolean showInternalName = false;
 
     @Expose
-    @ConfigOption(name = "Show NPC Price", desc = "Show NPC price in item lore.")
+    @ConfigOption(name = "Show empty internal names", desc = "Shows internal name even for items with none.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
-    public boolean showNpcPrice = false;
+    public boolean showEmptyNames = false;
 
     @Expose
-    @ConfigOption(name = "Show empty internal names", desc = "Shows internal name even for items with none.")
+    @ConfigOption(name = "Copy Internal Name", desc = "Copies the internal name of an item on key press in the clipboard.")
+    @ConfigEditorKeybind(defaultKey = Keyboard.KEY_NONE)
+    @ConfigAccordionId(id = 0)
+    public int copyInternalName = Keyboard.KEY_NONE;
+
+    @Expose
+    @ConfigOption(name = "Show NPC Price", desc = "Show NPC price in item lore.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
-    public boolean showEmptyNames = false;
+    public boolean showNpcPrice = false;
 
     @Expose
-    @ConfigOption(name = "Show item UUID", desc = "Show the Unique Identifier of items. in the lore.")
+    @ConfigOption(name = "Show item UUID", desc = "Show the Unique Identifier of items in the lore.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
     public boolean showItemUuid = false;
@@ -71,13 +77,13 @@ public class DevConfig {
     public int copyNBTDataCompressed = Keyboard.KEY_NONE;
 
     @Expose
-    @ConfigOption(name = "Copy Rng Meter", desc = "Copies internal names and maxed xp needed from rng meter inventories in json format into the clipboard.")
+    @ConfigOption(name = "Copy Rng Meter", desc = "Copies internal names and maxed XP needed from rng meter inventories as json to clipboard.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
     public boolean copyRngMeter = false;
 
     @Expose
-    @ConfigOption(name = "Copy Bestiary Data", desc = "Copies the besiary data from the inventory as json in clipboard.")
+    @ConfigOption(name = "Copy Bestiary Data", desc = "Copies the besiary data from the inventory as json to clipboard.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
     public boolean copyBestiaryData = false;
@@ -121,6 +127,9 @@ public class DevConfig {
     public Position debugPos = new Position(10, 10, false, true);
 
     @Expose
+    public Position debugLocationPos = new Position(1, 160, false, true);
+
+    @Expose
     @ConfigOption(name = "Minecraft Console", desc = "")
     @ConfigEditorAccordion(id = 1)
     public boolean minecraftConsole = false;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/DianaConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/DianaConfig.java
index 99437bb83..990f29d17 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/DianaConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/DianaConfig.java
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.config.features;
 
+import at.hannibal2.skyhanni.config.FeatureToggle;
 import com.google.gson.annotations.Expose;
 import io.github.moulberry.moulconfig.annotations.*;
 import org.lwjgl.input.Keyboard;
@@ -9,11 +10,13 @@ public class DianaConfig {
     @Expose
     @ConfigOption(name = "Soopy Guess", desc = "Uses §eSoopy's Guess Logic §7to find the next burrow. Does not require SoopyV2 or ChatTriggers to be installed.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean burrowsSoopyGuess = false;
 
     @Expose
     @ConfigOption(name = "Nearby Detection", desc = "Show burrows near you.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean burrowsNearbyDetection = false;
 
     @Expose
@@ -32,6 +35,25 @@ public class DianaConfig {
     public int keyBindWarp = Keyboard.KEY_NONE;
 
     @Expose
+    @ConfigOption(name = "Ignored Warps", desc = "")
+    @Accordion
+    public IgnoredWarpsConfig ignoredWarps = new IgnoredWarpsConfig();
+
+    public static class IgnoredWarpsConfig {
+
+        @Expose
+        @ConfigOption(name = "Crypt", desc = "Ignore the Crypt warp point (Because it takes a long time to leave).")
+        @ConfigEditorBoolean
+        public boolean crypt = false;
+
+        @Expose
+        @ConfigOption(name = "Wizard", desc = "Ignore the Wizard Tower warp point (Because it is easy to fall into the rift).")
+        @ConfigEditorBoolean
+        public boolean wizard = false;
+
+    }
+
+    @Expose
     @ConfigOption(name = "Inquisitor Waypoint Sharing", desc = "")
     @Accordion
     @ConfigAccordionId(id = 9)
@@ -42,15 +64,16 @@ public class DianaConfig {
         @Expose
         @ConfigOption(name = "Enabled", desc = "Shares your Inquisitor and receiving other Inquisitors via Party Chat.")
         @ConfigEditorBoolean
+        @FeatureToggle
         public boolean enabled = true;
 
         @Expose
-        @ConfigOption(name = "Focus", desc = "Hide other waypoints when your party finds a inquisitor.")
+        @ConfigOption(name = "Focus", desc = "Hide other waypoints when your Party finds a Inquisitor.")
         @ConfigEditorBoolean
         public boolean focusInquisitor = false;
 
         @Expose
-        @ConfigOption(name = "Instant Share", desc = "Share the waypoint as soon as you find a inquisitor. As alternative, you can share it only via key press")
+        @ConfigOption(name = "Instant Share", desc = "Share the waypoint as soon as you find a Inquisitor. As alternative, you can share it only via key press")
         @ConfigEditorBoolean
         public boolean instantShare = true;
 
@@ -66,7 +89,8 @@ public class DianaConfig {
     }
 
     @Expose
-    @ConfigOption(name = "Griffin Pet Warning", desc = "Warn when holding an Ancestral Spade while no Griffin pet is selected.")
+    @ConfigOption(name = "Griffin Pet Warning", desc = "Warn when holding an Ancestral Spade if a Griffin pet is not equipped.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean petWarning = true;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/DungeonConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/DungeonConfig.java
index 3e086812e..c8033a642 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/DungeonConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/DungeonConfig.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.ConfigAccordionId;
@@ -10,21 +11,24 @@ import io.github.moulberry.moulconfig.annotations.ConfigOption;
 public class DungeonConfig {
 
     @Expose
-    @ConfigOption(name = "Clicked Blocks", desc = "Highlight levers, chests, and wither essence when clicked in dungeons.")
+    @ConfigOption(name = "Clicked Blocks", desc = "Highlight levers, chests, and Wither Essence when clicked in Dungeons.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean highlightClickedBlocks = false;
 
     @Expose
-    @ConfigOption(name = "Milestones Display", desc = "Show the current milestone in dungeons.")
+    @ConfigOption(name = "Milestones Display", desc = "Show the current milestone in Dungeons.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean showMilestonesDisplay = false;
 
     @Expose
     public Position showMileStonesDisplayPos = new Position(10, 10, false, true);
 
     @Expose
-    @ConfigOption(name = "Death Counter Display", desc = "Display the total amount of deaths in the current dungeon.")
+    @ConfigOption(name = "Death Counter Display", desc = "Display the total amount of deaths in the current Dungeon.")
     @ConfigEditorBoolean
+    @FeatureToggle
     public boolean deathCounterDisplay = false;
 
     @Expose
@@ -39,6 +43,7 @@ public class DungeonConfig {
             "particles are no longer displayed and the music stops playing, but the loot chests are still displayed.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 2)
+    @FeatureToggle
     public boolean cleanEndToggle = false;
 
     @Expose
@@ -51,63 +56,80 @@ public class DungeonConfig {
     @Expose
     @ConfigOption(name = "Boss Damage Splash", desc = "Hides damage splashes while inside the boss room (fixes a Skytils feature).")
     @ConfigEditorBoolean