Merge branch 'master' into utils-cleanup

# Conflicts:
#	src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
#	src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonBlaze.java
#	src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java
#	src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java
#	src/main/java/me/xmrvizzy/skyblocker/utils/RenderHelper.java

1 files changed, 26 insertions, 2 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index c9a67ade..55fffa9c 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -12,8 +12,8 @@ import me.shedaniel.autoconfig.annotation.ConfigEntry;
 import me.shedaniel.autoconfig.serializer.ConfigSerializer;
 import me.shedaniel.autoconfig.serializer.GsonConfigSerializer;
 import me.xmrvizzy.skyblocker.SkyblockerMod;
-import me.xmrvizzy.skyblocker.utils.chat.ChatFilterResult;
 import me.xmrvizzy.skyblocker.skyblock.item.CustomArmorTrims;
+import me.xmrvizzy.skyblocker.utils.chat.ChatFilterResult;
 import me.xmrvizzy.skyblocker.utils.scheduler.Scheduler;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
@@ -79,7 +79,7 @@ public class SkyblockerConfig implements ConfigData {
 
         @ConfigEntry.Category("button6")
         @ConfigEntry.Gui.CollapsibleObject()
-        public QuickNavItem button6 = new QuickNavItem(true, new ItemData("ender_chest"), "Storage", "/storage");
+        public QuickNavItem button6 = new QuickNavItem(true, new ItemData("ender_chest"), "(?:Rift )?Storage(?: \\(1/2\\))?", "/storage");
 
         @ConfigEntry.Category("button7")
         @ConfigEntry.Gui.CollapsibleObject()
@@ -407,22 +407,46 @@ public class SkyblockerConfig implements ConfigData {
     }
 
     public static class Dungeons {
+        @ConfigEntry.Gui.CollapsibleObject
+        public SecretWaypoints secretWaypoints = new SecretWaypoints();
         @ConfigEntry.Gui.Tooltip()
         public boolean croesusHelper = true;
         public boolean enableMap = true;
         public float mapScaling = 1f;
         public int mapX = 2;
         public int mapY = 2;
+        @ConfigEntry.Gui.Tooltip
+        public boolean starredMobGlow = false;
         public boolean solveThreeWeirdos = true;
         @ConfigEntry.Gui.Tooltip
         public boolean blazesolver = true;
         public boolean solveTrivia = true;
+        @ConfigEntry.Gui.Tooltip
+        public boolean solveTicTacToe = true;
         @ConfigEntry.Gui.CollapsibleObject
         public LividColor lividColor = new LividColor();
         @ConfigEntry.Gui.CollapsibleObject()
         public Terminals terminals = new Terminals();
     }
 
+    public static class SecretWaypoints {
+
+        public boolean enableSecretWaypoints = true;
+        @ConfigEntry.Gui.Tooltip()
+        public boolean noInitSecretWaypoints = false;
+        public boolean enableEntranceWaypoints = true;
+        public boolean enableSuperboomWaypoints = true;
+        public boolean enableChestWaypoints = true;
+        public boolean enableItemWaypoints = true;
+        public boolean enableBatWaypoints = true;
+        public boolean enableWitherWaypoints = true;
+        public boolean enableLeverWaypoints = true;
+        public boolean enableFairySoulWaypoints = true;
+        public boolean enableStonkWaypoints = true;
+        @ConfigEntry.Gui.Tooltip()
+        public boolean enableDefaultWaypoints = true;
+    }
+
     public static class LividColor {
         @ConfigEntry.Gui.Tooltip()
         public boolean enableLividColor = true;