Small rift config changes

27 files changed, 412 insertions, 317 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index 29746e638..c16efdb36 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -60,7 +60,23 @@ import at.hannibal2.skyhanni.features.mobs.AshfangMinisNametagHider
 import at.hannibal2.skyhanni.features.mobs.MobHighlight
 import at.hannibal2.skyhanni.features.nether.ashfang.*
 import at.hannibal2.skyhanni.features.nether.reputationhelper.CrimsonIsleReputationHelper
-import at.hannibal2.skyhanni.features.rift.*
+import at.hannibal2.skyhanni.features.rift.RiftTimer
+import at.hannibal2.skyhanni.features.rift.ShowMotesNpcSellPrice
+import at.hannibal2.skyhanni.features.rift.area.RiftLarva
+import at.hannibal2.skyhanni.features.rift.area.dreadfarm.RiftAgaricusCap
+import at.hannibal2.skyhanni.features.rift.area.dreadfarm.VoltHighlighter
+import at.hannibal2.skyhanni.features.rift.area.livingcave.LivingMetalSuitProgress
+import at.hannibal2.skyhanni.features.rift.area.mirrorverse.DanceRoomHelper
+import at.hannibal2.skyhanni.features.rift.area.mirrorverse.RiftLavaMazeParkour
+import at.hannibal2.skyhanni.features.rift.area.mirrorverse.RiftUpsideDownParkour
+import at.hannibal2.skyhanni.features.rift.area.mirrorverse.TubulatorParkour
+import at.hannibal2.skyhanni.features.rift.area.westvillage.KloonHacking
+import at.hannibal2.skyhanni.features.rift.area.wyldwoods.RiftOdonata
+import at.hannibal2.skyhanni.features.rift.area.wyldwoods.ShyCruxWarnings
+import at.hannibal2.skyhanni.features.rift.everywhere.CruxTalismanDisplay
+import at.hannibal2.skyhanni.features.rift.everywhere.EnigmaSoulWaypoints
+import at.hannibal2.skyhanni.features.rift.everywhere.HighlightRiftGuide
+import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
 import at.hannibal2.skyhanni.features.slayer.*
 import at.hannibal2.skyhanni.features.slayer.blaze.BlazeSlayerClearView
 import at.hannibal2.skyhanni.features.slayer.blaze.BlazeSlayerDaggerHelper
diff --git a/src/main/java/at/hannibal2/skyhanni/config/Storage.java b/src/main/java/at/hannibal2/skyhanni/config/Storage.java
index a1f9fbfb1..b55e410fe 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/Storage.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/Storage.java
@@ -7,7 +7,7 @@ import at.hannibal2.skyhanni.features.garden.fortuneguide.FarmingItems;
 import at.hannibal2.skyhanni.features.garden.visitor.VisitorReward;
 import at.hannibal2.skyhanni.features.misc.FrozenTreasure;
 import at.hannibal2.skyhanni.features.misc.GhostCounter.Option;
-import at.hannibal2.skyhanni.features.rift.KloonTerminal;
+import at.hannibal2.skyhanni.features.rift.area.westvillage.KloonTerminal;
 import at.hannibal2.skyhanni.utils.LorenzVec;
 import com.google.gson.annotations.Expose;
 import net.minecraft.item.ItemStack;
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 f164750e3..702791dc0 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/RiftConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/RiftConfig.java
@@ -34,40 +34,6 @@ public class RiftConfig {
 
     }
 
-    @ConfigOption(name = "Crux Warnings", desc = "")
-    @Accordion
-    @Expose
-    public CruxWarnings crux = new CruxWarnings();
-
-    public static class CruxWarnings {
-
-        @Expose
-        @ConfigOption(name = "Shy Warning", desc = "Shows a warning when a shy is going to steal your time. " +
-                "Useful if you play without volume.")
-        @ConfigEditorBoolean
-        public boolean shyWarning = true;
-
-        @Expose
-        @ConfigOption(name = "Volt Warning", desc = "Shows a warning while a volt is discharging lightning.")
-        @ConfigEditorBoolean
-        public boolean voltWarning = true;
-
-        @Expose
-        @ConfigOption(name = "Volt Range Highlighter", desc = "Shows the area in which a Volt might strike lightning.")
-        @ConfigEditorBoolean
-        public boolean voltRange = true;
-
-        @Expose
-        @ConfigOption(name = "Volt Range Highlighter Color", desc = "In which color should the volt range be highlighted?")
-        @ConfigEditorColour
-        public String voltColour = "0:60:0:0:255";
-
-        @Expose
-        @ConfigOption(name = "Volt mood color", desc = "Change the color of the volt enemy depending on their mood.")
-        @ConfigEditorBoolean
-        public boolean voltMoodMeter = false;
-    }
-
     @ConfigOption(name = "Crux Talisman Progress", desc = "")
     @Accordion
     @Expose
@@ -77,7 +43,7 @@ public class RiftConfig {
         @Expose
         @ConfigOption(name = "Crux Talisman Display", desc = "Display progress of the Crux Talisman on screen.")
         @ConfigEditorBoolean
-        public boolean enabled = true;
+        public boolean enabled = false;
 
         @Expose
         @ConfigOption(name = "Compact", desc = "Show a compacted version of the overlay when the talisman is maxed.")
@@ -93,339 +59,452 @@ public class RiftConfig {
         public Position position = new Position(144, 139, false, true);
     }
 
-    @ConfigOption(name = "Larvas", desc = "")
+    @ConfigOption(name = "Enigma Soul Waypoints", desc = "")
     @Accordion
     @Expose
-    public LarvasConfig larvas = new LarvasConfig();
+    public EnigmaSoulConfig enigmaSoulWaypoints = new EnigmaSoulConfig();
 
-    public static class LarvasConfig {
+    public static class EnigmaSoulConfig {
 
         @Expose
-        @ConfigOption(name = "Highlight", desc = "Highlight §cLarvas on trees §7while holding a §eLarva Hook §7in the hand.")
+        @ConfigOption(name = "Enabled", desc = "Click on Enigma Souls in Rift Guides to highlight their location.")
         @ConfigEditorBoolean
-        public boolean highlight = true;
+        public boolean enabled = true;
 
         @Expose
-        @ConfigOption(name = "Color", desc = "Color of the Larvas.")
+        @ConfigOption(name = "Color", desc = "Color of the Enigma Souls.")
         @ConfigEditorColour
-        public String highlightColor = "0:120:13:49:255";
+        public String color = "0:120:13:49:255";
 
     }
 
-    @ConfigOption(name = "Odonatas", desc = "")
+    @ConfigOption(name = "Rift Areas", desc = "")
     @Accordion
     @Expose
-    public OdonataConfig odonata = new OdonataConfig();
+    public RiftAreasConfig area = new RiftAreasConfig();
 
-    public static class OdonataConfig {
+    public static class RiftAreasConfig {
 
+        @ConfigOption(name = "Wyld Woods", desc = "")
+        @Accordion
         @Expose
-        @ConfigOption(name = "Highlight", desc = "Highlight the small §cOdonatas §7flying around the trees while holding a " +
-                "§eEmpty Odonata Bottle §7in the hand.")
-        @ConfigEditorBoolean
-        public boolean highlight = true;
+        public WyldWoodsConfig wyldWoodsConfig = new WyldWoodsConfig();
 
-        @Expose
-        @ConfigOption(name = "Color", desc = "Color of the Odonatas.")
-        @ConfigEditorColour
-        public String highlightColor = "0:120:13:49:255";
+        public static class WyldWoodsConfig {
 
-    }
+            @Expose
+            @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
+            public boolean shyWarning = true;
 
-    @ConfigOption(name = "Enigma Soul Waypoints", desc = "")
-    @Accordion
-    @Expose
-    public EnigmaSoulConfig enigmaSoulWaypoints = new EnigmaSoulConfig();
+            @ConfigOption(name = "Larvas", desc = "")
+            @Accordion
+            @Expose
+            public LarvasConfig larvas = new LarvasConfig();
 
-    public static class EnigmaSoulConfig {
+            public static class LarvasConfig {
 
-        @Expose
-        @ConfigOption(name = "Enabled", desc = "Click on Enigma Souls in Rift Guides to highlight their location.")
-        @ConfigEditorBoolean
-        public boolean enabled = true;
+                @Expose
+                @ConfigOption(name = "Highlight", desc = "Highlight §cLarvas on trees §7while holding a §eLarva Hook §7in the hand.")
+                @ConfigEditorBoolean
+                public boolean highlight = true;
 
-        @Expose
-        @ConfigOption(name = "Color", desc = "Color of the Enigma Souls.")
-        @ConfigEditorColour
-        public String color = "0:120:13:49:255";
+                @Expose
+                @ConfigOption(name = "Color", desc = "Color of the Larvas.")
+                @ConfigEditorColour
+                public String highlightColor = "0:120:13:49:255";
 
-    }
+            }
 
-    @Expose
-    @ConfigOption(name = "Highlight Guide", desc = "Highlight things to do in the Rift Guide.")
-    @ConfigEditorBoolean
-    public boolean highlightGuide = true;
+            @ConfigOption(name = "Odonatas", desc = "")
+            @Accordion
+            @Expose
+            public OdonataConfig odonata = new OdonataConfig();
 
-    @Expose
-    @ConfigOption(name = "Agaricus Cap", desc = "Counts down the time until §eAgaricus Cap (Mushroom) " +
-            "§7changes color from brown to red and is breakable.")
-    @ConfigEditorBoolean
-    public boolean agaricusCap = true;
+            public static class OdonataConfig {
 
-    @ConfigOption(name = "Mirror Verse", desc = "")
-    @Accordion
-    @Expose
-    public MirrorVerse mirrorVerse = new MirrorVerse();
+                @Expose
+                @ConfigOption(name = "Highlight", desc = "Highlight the small §cOdonatas §7flying around the trees while holding a " +
+                        "§eEmpty Odonata Bottle §7in the hand.")
+                @ConfigEditorBoolean
+                public boolean highlight = true;
 
-    public static class MirrorVerse {
+                @Expose
+                @ConfigOption(name = "Color", desc = "Color of the Odonatas.")
+                @ConfigEditorColour
+                public String highlightColor = "0:120:13:49:255";
+
+            }
+        }
 
-        @ConfigOption(name = "Lava Maze", desc = "")
+        @ConfigOption(name = "West Village", desc = "")
         @Accordion
         @Expose
-        public LavaMazeConfig lavaMazeConfig = new LavaMazeConfig();
-        public static class LavaMazeConfig {
+        public WestVillageConfig westVillageConfig = new WestVillageConfig();
 
-            @Expose
-            @ConfigOption(name = "Enabled", desc = "Helps solving the lava maze in the mirror verse by showing the correct way.")
-            @ConfigEditorBoolean
-            public boolean enabled = true;
+        public static class WestVillageConfig {
 
+            @ConfigOption(name = "Kloon Hacking", desc = "")
+            @Accordion
             @Expose
-            @ConfigOption(name = "Look Ahead", desc = "Change how many platforms should be shown in front of you.")
-            @ConfigEditorSlider(minStep = 1, maxValue = 30, minValue = 1)
-            public Property<Integer> lookAhead = Property.of(3);
+            public KloonHacking hacking = new KloonHacking();
 
-            @Expose
-            @ConfigOption(name = "Rainbow Color", desc = "Show the rainbow color effect instead of a boring monochrome.")
-            @ConfigEditorBoolean
-            public Property<Boolean> rainbowColor = Property.of(true);
+            public static class KloonHacking {
 
-            @Expose
-            @ConfigOption(name = "Monochrome Color", desc = "Set a boring monochrome color for the parkour platforms.")
-            @ConfigEditorColour
-            public Property<String> monochromeColor = Property.of("0:60:0:0:255");
+                @Expose
+                @ConfigOption(name = "Hacking Solver", desc = "Highlights the correct button to click in the hacking inventory.")
+                @ConfigEditorBoolean
+                public boolean solver = true;
 
-            @Expose
-            @ConfigOption(name = "Hide others players", desc = "Hide other players while doing the lava maze.")
-            @ConfigEditorBoolean
-            public boolean hidePlayers = false;
-        }
+                @Expose
+                @ConfigOption(name = "Color Guide", desc = "Tells you which colour to pick.")
+                @ConfigEditorBoolean
+                public boolean colour = true;
 
+                @Expose
+                @ConfigOption(name = "Terminal Waypoints", desc = "While wearing the helmet, waypoints will appear at each terminal location.")
+                @ConfigEditorBoolean
+                public boolean waypoints = true;
+            }
+        }
 
-        @ConfigOption(name = "Upside Down Parkour", desc = "")
-        @Accordion
         @Expose
-        public UpsideDownParkour upsideDownParkour = new UpsideDownParkour();
-        public static class UpsideDownParkour {
+        @ConfigOption(name = "Dreadfarm", desc = "")
+        @Accordion
+        public DreadfarmConfig dreadfarmConfig = new DreadfarmConfig();
 
+        public static class DreadfarmConfig {
             @Expose
-            @ConfigOption(name = "Enabled", desc = "Helps solving the upside down parkour in the mirror verse by showing the correct way.")
+            @ConfigOption(name = "Agaricus Cap", desc = "Counts down the time until §eAgaricus Cap (Mushroom) " +
+                    "§7changes color from brown to red and is breakable.")
             @ConfigEditorBoolean
-            public boolean enabled = true;
+            public boolean agaricusCap = true;
 
+            @ConfigOption(name = "Volt Crux", desc = "")
+            @Accordion
             @Expose
-            @ConfigOption(name = "Look Ahead", desc = "Change how many platforms should be shown in front of you.")
-            @ConfigEditorSlider(minStep = 1, maxValue = 9, minValue = 1)
-            public Property<Integer> lookAhead = Property.of(3);
+            public VoltCruxConfig voltCrux = new VoltCruxConfig();
 
-            @Expose
-            @ConfigOption(name = "Outline", desc = "Outlines the top edge of the platforms.")
-            @ConfigEditorBoolean
-            public boolean outline = true;
+            public static class VoltCruxConfig {
 
-            @Expose
-            @ConfigOption(name = "Rainbow Color", desc = "Show the rainbow color effect instead of a boring monochrome.")
-            @ConfigEditorBoolean
-            public Property<Boolean> rainbowColor = Property.of(true);
+                @Expose
+                @ConfigOption(name = "Volt Warning", desc = "Shows a warning while a volt is discharging lightning.")
+                @ConfigEditorBoolean
+                public boolean voltWarning = true;
 
-            @Expose
-            @ConfigOption(name = "Monochrome Color", desc = "Set a boring monochrome color for the parkour platforms.")
-            @ConfigEditorColour
-            public Property<String> monochromeColor = Property.of("0:60:0:0:255");
+                @Expose
+                @ConfigOption(name = "Volt Range Highlighter", desc = "Shows the area in which a Volt might strike lightning.")
+                @ConfigEditorBoolean
+                public boolean voltRange = true;
 
-            @Expose
-            @ConfigOption(name = "Hide others players", desc = "Hide other players while doing the upside down parkour.")
-            @ConfigEditorBoolean
-            public boolean hidePlayers = false;
-        }
+                @Expose
+                @ConfigOption(name = "Volt Range Highlighter Color", desc = "In which color should the volt range be highlighted?")
+                @ConfigEditorColour
+                public String voltColour = "0:60:0:0:255";
 
+                @Expose
+                @ConfigOption(name = "Volt mood color", desc = "Change the color of the volt enemy depending on their mood.")
+                @ConfigEditorBoolean
+                public boolean voltMoodMeter = false;
+            }
+        }
 
-        @ConfigOption(name = "Dance Room Helper", desc = "")
+        @ConfigOption(name = "Mirror Verse", desc = "")
         @Accordion
         @Expose
-        public DanceRoomHelper danceRoomHelper = new DanceRoomHelper();
-        public static class DanceRoomHelper {
+        public MirrorVerse mirrorVerseConfig = new MirrorVerse();
 
-            @Expose
-            @ConfigOption(name = "Enabled", desc = "Helps to solve the dance room in the mirror verse by showing multiple tasks at once.")
-            @ConfigEditorBoolean
-            public boolean enabled = false;
+        public static class MirrorVerse {
 
+            @ConfigOption(name = "Lava Maze", desc = "")
+            @Accordion
             @Expose
-            @ConfigOption(name = "Lines to show", desc = "How many tasks you should see.")
-            @ConfigEditorSlider(minStep = 1, maxValue = 49, minValue = 1)
-            public int lineToShow = 3;
+            public LavaMazeConfig lavaMazeConfig = new LavaMazeConfig();
 
-            @Expose
-            @ConfigOption(name = "Space", desc = "Change the space between each line.")
-            @ConfigEditorSlider(minStep = 1, maxValue = 10, minValue = -5)
-            public int extraSpace = 0;
+            public static class LavaMazeConfig {
 
-            @Expose
-            @ConfigOption(name = "Hide others players", desc = "Hide other players inside the dance room.")
-            @ConfigEditorBoolean
-            public boolean hidePlayers = false;
+                @Expose
+                @ConfigOption(name = "Enabled", desc = "Helps solving the lava maze in the mirror verse by showing the correct way.")
+                @ConfigEditorBoolean
+                public boolean enabled = true;
+
+                @Expose
+                @ConfigOption(name = "Look Ahead", desc = "Change how many platforms should be shown in front of you.")
+                @ConfigEditorSlider(minStep = 1, maxValue = 30, minValue = 1)
+                public Property<Integer> lookAhead = Property.of(3);
+
+                @Expose
+                @ConfigOption(name = "Rainbow Color", desc = "Show the rainbow color effect instead of a boring monochrome.")
+                @ConfigEditorBoolean
+                public Property<Boolean> rainbowColor = Property.of(true);
+
+                @Expose
+                @ConfigOption(name = "Monochrome Color", desc = "Set a boring monochrome color for the parkour platforms.")
+                @ConfigEditorColour
+                public Property<String> monochromeColor = Property.of("0:60:0:0:255");
+
+                @Expose
+                @ConfigOption(name = "Hide others players", desc = "Hide other players while doing the lava maze.")
+                @ConfigEditorBoolean
+                public boolean hidePlayers = false;
+            }
 
-            @Expose
-            @ConfigOption(name = "Hide Title", desc = "Hide Instructions, \"§aIt's happening!\" §7and \"§aKeep it up!\" §7titles.")
-            @ConfigEditorBoolean
-            public boolean hideOriginalTitle = false;
 
+            @ConfigOption(name = "Upside Down Parkour", desc = "")
+            @Accordion
             @Expose
-            @ConfigOption(name = "Formatting", desc = "")
+            public UpsideDownParkour upsideDownParkour = new UpsideDownParkour();
+
+            public static class UpsideDownParkour {
+
+                @Expose
+                @ConfigOption(name = "Enabled", desc = "Helps solving the upside down parkour in the mirror verse by showing the correct way.")
+                @ConfigEditorBoolean
+                public boolean enabled = true;
+
+                @Expose
+                @ConfigOption(name = "Look Ahead", desc = "Change how many platforms should be shown in front of you.")
+                @ConfigEditorSlider(minStep = 1, maxValue = 9, minValue = 1)
+                public Property<Integer> lookAhead = Property.of(3);
+
+                @Expose
+                @ConfigOption(name = "Outline", desc = "Outlines the top edge of the platforms.")
+                @ConfigEditorBoolean
+                public boolean outline = true;
+
+                @Expose
+                @ConfigOption(name = "Rainbow Color", desc = "Show the rainbow color effect instead of a boring monochrome.")
+                @ConfigEditorBoolean
+                public Property<Boolean> rainbowColor = Property.of(true);
+
+                @Expose
+                @ConfigOption(name = "Monochrome Color", desc = "Set a boring monochrome color for the parkour platforms.")
+                @ConfigEditorColour
+                public Property<String> monochromeColor = Property.of("0:60:0:0:255");
+
+                @Expose
+                @ConfigOption(name = "Hide others players", desc = "Hide other players while doing the upside down parkour.")
+                @ConfigEditorBoolean
+                public boolean hidePlayers = false;
+            }
+
+
+            @ConfigOption(name = "Dance Room Helper", desc = "")
             @Accordion
-            public DanceRoomFormatting danceRoomFormatting = new DanceRoomFormatting();
+            @Expose
+            public DanceRoomHelper danceRoomHelper = new DanceRoomHelper();
 
-            public static class DanceRoomFormatting {
+            public static class DanceRoomHelper {
 
                 @Expose
-                @ConfigOption(name = "Now", desc = "Formatting for \"Now:\"")
-                @ConfigEditorText
-                public String now = "&7Now:";
+                @ConfigOption(name = "Enabled", desc = "Helps to solve the dance room in the mirror verse by showing multiple tasks at once.")
+                @ConfigEditorBoolean
+                public boolean enabled = false;
 
                 @Expose
-                @ConfigOption(name = "Next", desc = "Formatting for \"Next:\"")
-                @ConfigEditorText
-                public String next = "&7Next:";
+                @ConfigOption(name = "Lines to show", desc = "How many tasks you should see.")
+                @ConfigEditorSlider(minStep = 1, maxValue = 49, minValue = 1)
+                public int lineToShow = 3;
 
                 @Expose
-                @ConfigOption(name = "Later", desc = "Formatting for \"Later:\"")
-                @ConfigEditorText
-                public String later = "&7Later:";
+                @ConfigOption(name = "Space", desc = "Change the space between each line.")
+                @ConfigEditorSlider(minStep = 1, maxValue = 10, minValue = -5)
+                public int extraSpace = 0;
 
                 @Expose
-                @ConfigOption(name = "Color Option", desc = "")
-                @Accordion
-                public Color color = new Color();
-                public static class Color {
-                    @Expose
-                    @ConfigOption(name = "Move", desc = "Color for the Move instruction")
-                    @ConfigEditorText
-                    public String move = "&e";
+                @ConfigOption(name = "Hide others players", desc = "Hide other players inside the dance room.")
+                @ConfigEditorBoolean
+                public boolean hidePlayers = false;
 
-                    @Expose
-                    @ConfigOption(name = "Stand", desc = "Color for the Stand instruction")
-                    @ConfigEditorText
-                    public String stand = "&e";
+                @Expose
+                @ConfigOption(name = "Hide Title", desc = "Hide Instructions, \"§aIt's happening!\" §7and \"§aKeep it up!\" §7titles.")
+                @ConfigEditorBoolean
+                public boolean hideOriginalTitle = false;
 
-                    @Expose
-                    @ConfigOption(name = "Sneak", desc = "Color for the Sneak instruction")
-                    @ConfigEditorText
-                    public String sneak = "&5";
+                @Expose
+                @ConfigOption(name = "Formatting", desc = "")
+                @Accordion
+                public DanceRoomFormatting danceRoomFormatting = new DanceRoomFormatting();
+
+                public static class DanceRoomFormatting {
 
                     @Expose
-                    @ConfigOption(name = "Jump", desc = "Color for the Jump instruction")
+                    @ConfigOption(name = "Now", desc = "Formatting for \"Now:\"")
                     @ConfigEditorText
-                    public String jump = "&b";
+                    public String now = "&7Now:";
 
                     @Expose
-                    @ConfigOption(name = "Punch", desc = "Color for the Punch instruction")
+                    @ConfigOption(name = "Next", desc = "Formatting for \"Next:\"")
                     @ConfigEditorText
-                    public String punch = "&d";
+                    public String next = "&7Next:";
 
                     @Expose
-                    @ConfigOption(name = "Countdown", desc = "Color for the Countdown")
+                    @ConfigOption(name = "Later", desc = "Formatting for \"Later:\"")
                     @ConfigEditorText
-                    public String countdown = "&f";
+                    public String later = "&7Later:";
 
                     @Expose
-                    @ConfigOption(name = "Default", desc = "Fallback color")
-                    @ConfigEditorText
-                    public String fallback = "&f";
+                    @ConfigOption(name = "Color Option", desc = "")
+                    @Accordion
+                    public Color color = new Color();
+
+                    public static class Color {
+                        @Expose
+                        @ConfigOption(name = "Move", desc = "Color for the Move instruction")
+                        @ConfigEditorText
+                        public String move = "&e";
+
+                        @Expose
+                        @ConfigOption(name = "Stand", desc = "Color for the Stand instruction")
+                        @ConfigEditorText
+                        public String stand = "&e";
+
+                        @Expose
+                        @ConfigOption(name = "Sneak", desc = "Color for the Sneak instruction")
+                        @ConfigEditorText
+                        public String sneak = "&5";
+
+                        @Expose
+                        @ConfigOption(name = "Jump", desc = "Color for the Jump instruction")
+                        @ConfigEditorText
+                        public String jump = "&b";
+
+                        @Expose
+                        @ConfigOption(name = "Punch", desc = "Color for the Punch instruction")
+                        @ConfigEditorText
+                        public String punch = "&d";
+
+                        @Expose
+                        @ConfigOption(name = "Countdown", desc = "Color for the Countdown")
+                        @ConfigEditorText
+                        public String countdown = "&f";
+
+                        @Expose
+                        @ConfigOption(name = "Default", desc = "Fallback color")
+                        @ConfigEditorText
+                        public String fallback = "&f";
+                    }
                 }
+
+                @Expose
+                public Position position = new Position(442, 239, false, true);
             }
 
+
+            @ConfigOption(name = "Tubulator", desc = "")
+            @Accordion
             @Expose
-            public Position position = new Position(442, 239, false, true);
-        }
+            public TubulatorConfig tubulatorConfig = new TubulatorConfig();
 
+            public static class TubulatorConfig {
 
-        @ConfigOption(name = "Tubulator", desc = "")
-        @Accordion
-        @Expose
-        public TubulatorConfig tubulatorConfig = new TubulatorConfig();
-        public static class TubulatorConfig {
-
-            @Expose
-            @ConfigOption(name = "Enabled", desc = "Highlights the location of the invisible Tubulator blocks (Laser Parkour).")
-            @ConfigEditorBoolean
-            public boolean enabled = true;
+                @Expose
+                @ConfigOption(name = "Enabled", desc = "Highlights the location of the invisible Tubulator blocks (Laser Parkour).")
+                @ConfigEditorBoolean
+                public boolean enabled = true;
 
-            @Expose
-            @ConfigOption(name = "Look Ahead", desc = "Change how many platforms should be shown in front of you.")
-            @ConfigEditorSlider(minStep = 1, maxValue = 30, minValue = 1)
-            public Property<Integer> lookAhead = Property.of(2);
+                @Expose
+                @ConfigOption(name = "Look Ahead", desc = "Change how many platforms should be shown in front of you.")
+                @ConfigEditorSlider(minStep = 1, maxValue = 30, minValue = 1)
+                public Property<Integer> lookAhead = Property.of(2);
 
-            @Expose
-            @ConfigOption(name = "Outline", desc = "Outlines the top edge of the platforms.")
-            @ConfigEditorBoolean
-            public boolean outline = true;
+                @Expose
+                @ConfigOption(name = "Outline", desc = "Outlines the top edge of the platforms.")
+                @ConfigEditorBoolean
+                public boolean outline = true;
 
-            @Expose
-            @ConfigOption(name = "Rainbow Color", desc = "Show the rainbow color effect instead of a boring monochrome.")
-            @ConfigEditorBoolean
-            public Property<Boolean> rainbowColor = Property.of(true);
+                @Expose
+                @ConfigOption(name = "Rainbow Color", desc = "Show the rainbow color effect instead of a boring monochrome.")
+                @ConfigEditorBoolean
+                public Property<Boolean> rainbowColor = Property.of(true);
 
-            @Expose
-            @ConfigOption(name = "Monochrome Color", desc = "Set a boring monochrome color for the parkour platforms.")
-            @ConfigEditorColour
-            public Property<String> monochromeColor = Property.of("0:60:0:0:255");
+                @Expose
+                @ConfigOption(name = "Monochrome Color", desc = "Set a boring monochrome color for the parkour platforms.")
+                @ConfigEditorColour
+                public Property<String> monochromeColor = Property.of("0:60:0:0:255");
 
-            @Expose
-            @ConfigOption(name = "Hide others players", desc = "Hide other players while doing the lava maze.")
-            @ConfigEditorBoolean
-            public boolean hidePlayers = false;
+                @Expose
+                @ConfigOption(name = "Hide others players", desc = "Hide other players while doing the lava maze.")
+                @ConfigEditorBoolean
+                public boolean hidePlayers = false;
+            }
         }
-    }
 
-    @ConfigOption(name = "Kloon Hacking", desc = "")
-    @Accordion
-    @Expose
-    public KloonHacking hacking = new KloonHacking();
-
-    public static class KloonHacking {
+//        @Expose
+//        @ConfigOption(name = "Village Plaza", desc = "")
+//        @Accordion
+//        public VillagePlazaConfig villagePlazaConfig = new VillagePlazaConfig();
+//
+//        public static class VillagePlazaConfig {
+//
+//        }
 
         @Expose
-        @ConfigOption(name = "Hacking Solver", desc = "Highlights the correct button to click in the hacking inventory.")
-        @ConfigEditorBoolean
-        public boolean solver = true;
+        @ConfigOption(name = "Living Cave", desc = "")
+        @Accordion
+        public LivingCaveConfig livingCaveConfig = new LivingCaveConfig();
 
-        @Expose
-        @ConfigOption(name = "Color Guide", desc = "Tells you which colour to pick.")
-        @ConfigEditorBoolean
-        public boolean colour = true;
+        public static class LivingCaveConfig {
 
-        @Expose
-        @ConfigOption(name = "Terminal Waypoints", desc = "While wearing the helmet, waypoints will appear at each terminal location.")
-        @ConfigEditorBoolean
-        public boolean waypoints = true;
+            @Expose
+            @ConfigOption(name = "Living Metal Suit Progress", desc = "")
+            @Accordion
+            public LivingMetalSuitProgress livingMetalSuitProgress = new LivingMetalSuitProgress();
 
-    }
+            public static class LivingMetalSuitProgress {
 
-    @Expose
-    @ConfigOption(name = "Living Metal Suit Progress", desc = "")
-    @Accordion
-    public LivingMetalSuitProgress livingMetalSuitProgress = new LivingMetalSuitProgress();
+                @Expose
+                @ConfigOption(name = "Enabled", desc = "Display progress Living Metal Suit")
+                @ConfigEditorBoolean
+                public boolean enabled = false;
 
-    public static class LivingMetalSuitProgress {
+                @Expose
+                @ConfigOption(name = "Compact", desc = "Show a compacted version of the overlay when the set is maxed.")
+                @ConfigEditorBoolean
+                public boolean compactWhenMaxed = false;
 
-        @Expose
-        @ConfigOption(name = "Enabled", desc = "Display progress Living Metal Suit")
-        @ConfigEditorBoolean
-        public boolean enabled = true;
+                @Expose
+                public Position position = new Position(100, 100);
+            }
+        }
 
-        @Expose
-        @ConfigOption(name = "Compact", desc = "Show a compacted version of the overlay when the set is maxed.")
-        @ConfigEditorBoolean
-        public boolean compactWhenMaxed = false;
+//        @Expose
+//        @ConfigOption(name = "Colosseum", desc = "")
+//        @Accordion
+//        public ColosseumConfig colosseumConfig = new ColosseumConfig();
+//
+//        public static class ColosseumConfig {
+//
+//        }
+
+//        @Expose
+//        @ConfigOption(name = "Stillgore Chateau", desc = "")
+//        @Accordion
+//        public StillgoreChateauConfig stillgoreChateauConfig = new StillgoreChateauConfig();
+//
+//        public static class StillgoreChateauConfig {
+//
+//        }
+
+//        @Expose
+//        @ConfigOption(name = "Mountaintop", desc = "")
+//        @Accordion
+//        public MountaintopConfig mountaintopConfig = new MountaintopConfig();
+//
+//        public static class MountaintopConfig {
+//
+//        }
 
-        @Expose
-        public Position position = new Position(100, 100);
     }
 
     @Expose
+    @ConfigOption(name = "Highlight Guide", desc = "Highlight things to do in the Rift Guide.")
+    @ConfigEditorBoolean
+    public boolean highlightGuide = true;
+
+    @Expose
     @ConfigOption(name = "Show Motes Price", desc = "Show the Motes NPC price in the item lore.")
     @ConfigEditorBoolean
     public boolean showMotesPrice = true;
-
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataHolder.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataHolder.kt
index d359cebc1..4ee209670 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataHolder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataHolder.kt
@@ -1,7 +1,7 @@
 package at.hannibal2.skyhanni.features.bazaar
 
 import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.features.rift.RiftAPI
+import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
 import at.hannibal2.skyhanni.utils.APIUtil
 import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.LorenzUtils
diff --git a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt
index 6b1a4f41b..b8c20ddab 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt
@@ -4,7 +4,7 @@ import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.withAlpha
 import at.hannibal2.skyhanni.features.dungeon.DungeonData
 import at.hannibal2.skyhanni.features.dungeon.DungeonLividFinder
-import at.hannibal2.skyhanni.features.rift.RiftAPI
+import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
 import at.hannibal2.skyhanni.mixins.hooks.RenderLivingEntityHelper
 import at.hannibal2.skyhanni.utils.EntityUtils.hasBossHealth
 import at.hannibal2.skyhanni.utils.EntityUtils.hasMaxHealth
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt
index a90ba8a6f..f51b625e6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt
@@ -8,7 +8,7 @@ import at.hannibal2.skyhanni.events.RepositoryReloadEvent
 import at.hannibal2.skyhanni.features.bazaar.BazaarApi
 import at.hannibal2.skyhanni.features.garden.composter.ComposterOverlay
 import at.hannibal2.skyhanni.features.garden.visitor.GardenVisitorFeatures
-import at.hannibal2.skyhanni.features.rift.RiftAPI.motesNpcPrice
+import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI.motesNpcPrice
 import at.hannibal2.skyhanni.utils.*
 import at.hannibal2.skyhanni.utils.InventoryUtils.getInventoryName
 import at.hannibal2.skyhanni.utils.ItemUtils.cleanName
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt
index d1b2ace7e..328a4aa37 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt
@@ -5,7 +5,7 @@ import at.hannibal2.skyhanni.data.ProfileStorageData
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.InventoryOpenEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
-import at.hannibal2.skyhanni.features.rift.RiftAPI
+import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.between
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
index f6540e469..29cbfb837 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
@@ -2,7 +2,7 @@ package at.hannibal2.skyhanni.features.misc
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.*
-import at.hannibal2.skyhanni.features.rift.RiftAPI
+import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
 import at.hannibal2.skyhanni.test.command.CopyErrorCommand
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.ItemUtils.name
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
index c77776d5d..39f61f74b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt
@@ -8,7 +8,7 @@ import at.hannibal2.skyhanni.data.GardenCropMilestones.Companion.getCounter
 import at.hannibal2.skyhanni.data.GardenCropMilestones.Companion.getTierForCrops
 import at.hannibal2.skyhanni.data.GardenCropMilestones.Companion.progressToNextLevel
 import at.hannibal2.skyhanni.features.garden.GardenAPI.getCropType
-import at.hannibal2.skyhanni.features.rift.RiftAPI
+import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.colorCodeToRarity
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/RiftTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/RiftTimer.kt
index 42188244e..29919e940 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/RiftTimer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/RiftTimer.kt
@@ -1,8 +1,8 @@
 package at.hannibal2.skyhanni.features.rift
 
-import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzActionBarEvent
+import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
@@ -11,7 +11,7 @@ import net.minecraftforge.event.world.WorldEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class RiftTimer {
-    private val config get() = SkyHanniMod.feature.rift.timer
+    private val config get() = RiftAPI.config.timer
     private var display = emptyList<String>()
     private var maxTime = 0L
     private var latestTime = 0L
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/ShowMotesNpcSellPrice.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/ShowMotesNpcSellPrice.kt
index 41fb1f0b5..404e1f3e2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/ShowMotesNpcSellPrice.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/ShowMotesNpcSellPrice.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.rift
 
-import at.hannibal2.skyhanni.features.rift.RiftAPI.motesNpcPrice
+import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
+import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI.motesNpcPrice
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import net.minecraftforge.event.entity.player.ItemTooltipEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/RiftLarva.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/RiftLarva.kt
index 93df913c8..164faa446 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/RiftLarva.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/RiftLarva.kt
@@ -1,8 +1,8 @@
-package at.hannibal2.skyhanni.features.rift
+package at.hannibal2.skyhanni.features.rift.area
 
-import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.withAlpha
+import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
 import at.hannibal2.skyhanni.mixins.hooks.RenderLivingEntityHelper
 import at.hannibal2.skyhanni.utils.EntityUtils.hasSkullTexture
 import at.hannibal2.skyhanni.utils.InventoryUtils
@@ -13,7 +13,7 @@ import net.minecraft.entity.item.EntityArmorStand
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class RiftLarva {
-    private val config get() = SkyHanniMod.feature.rift.larvas
+    private val config get() = RiftAPI.config.area.wyldWoodsConfig.larvas
     private var hasHookInHand = false
     val larvaSkullTexture =
         "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTgzYjMwZTlkMTM1YjA1MTkwZWVhMmMzYWM2MWUyYWI1NWEyZDgxZTFhNThkYmIyNjk4M2ExNDA4MjY2NCJ9fX0="
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/RiftAgaricusCap.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftAgaricusCap.kt
index c4b452396..d7bbf541d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/RiftAgaricusCap.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftAgaricusCap.kt
@@ -1,7 +1,7 @@
-package at.hannibal2.skyhanni.features.rift
+package at.hannibal2.skyhanni.features.rift.area.dreadfarm
 
-import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.LorenzTickEvent
+import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
 import at.hannibal2.skyhanni.utils.*
 import at.hannibal2.skyhanni.utils.BlockUtils.getBlockStateAt
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
@@ -10,7 +10,7 @@ import net.minecraftforge.client.event.RenderWorldLastEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class RiftAgaricusCap {
-    private val config get() = SkyHanniMod.feature.rift
+    private val config get() = RiftAPI.config.area.dreadfarmConfig
     private var startTime = 0L
     private var location: LorenzVec? = null
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/VoltHighlighter.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt
index 4b03e9b6c..2e8bd9c0d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/VoltHighlighter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt
@@ -1,7 +1,7 @@
-package at.hannibal2.skyhanni.features.rift
+package at.hannibal2.skyhanni.features.rift.area.dreadfarm
 
-import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.EntityEquipmentChangeEvent
+import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
 import at.hannibal2.skyhanni.mixins.hooks.RenderLivingEntityHelper
 import at.hannibal2.skyhanni.utils.ItemUtils.getSkullTexture
 import at.hannibal2.skyhanni.utils.LorenzUtils.editCopy
@@ -23,7 +23,8 @@ import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
 class VoltHighlighter {
-    private val config get() = SkyHanniMod.feature.rift.crux
+
+    private val config get() = RiftAPI.config.area.dreadfarmConfig.voltCrux
 
     private val LIGHTNING_DISTANCE = 7F
     private val ARMOR_SLOT_HEAD = 3
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/LivingMetalSuitProgress.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingMetalSuitProgress.kt
index b6758a923..8005c2ee0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/LivingMetalSuitProgress.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingMetalSuitProgress.kt
@@ -1,8 +1,8 @@
-package at.hannibal2.skyhanni.features.rift
+package at.hannibal2.skyhanni.features.rift.area.livingcave
 
-import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
+import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList
@@ -14,7 +14,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class LivingMetalSuitProgress {
 
-    private val config get() = SkyHanniMod.feature.rift.livingMetalSuitProgress
+    private val config get() = RiftAPI.config.area.livingCaveConfig.livingMetalSuitProgress
     private var display = emptyList<List<Any>>()
     private var progressMap = mapOf<ItemStack, Double?>()
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/DanceRoomHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt
index 53b31902b..e84b668ed 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/DanceRoomHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt
@@ -1,8 +1,8 @@
-package at.hannibal2.skyhanni.features.rift
+package at.hannibal2.skyhanni.features.rift.area.mirrorverse
 
 
-import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.*
+import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
 import at.hannibal2.skyhanni.utils.LocationUtils.isPlayerInside
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
 import at.hannibal2.skyhanni.utils.StringUtils.firstLetterUppercase
@@ -17,7 +17,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 object DanceRoomHelper {
 
     private var display = emptyList<String>()
-    private val config get() = SkyHanniMod.feature.rift.mirrorVerse.danceRoomHelper
+    private val config get() = RiftAPI.config.area.mirrorVerseConfig.danceRoomHelper
     private var index = 0
     private var found = false
     private val danceRoom = AxisAlignedBB(-260.0, 32.0, -110.0, -267.0, 40.0, -102.0)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/RiftLavaMazeParkour.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftLavaMazeParkour.kt
index 20029f9b7..7bbcca209 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/RiftLavaMazeParkour.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftLavaMazeParkour.kt
@@ -1,10 +1,10 @@
-package at.hannibal2.skyhanni.features.rift
+package at.hannibal2.skyhanni.features.rift.area.mirrorverse
 
-import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.CheckRenderEntityEvent
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
+import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.toChromaColor
 import at.hannibal2.skyhanni.utils.ParkourHelper
@@ -13,7 +13,7 @@ import net.minecraftforge.client.event.RenderWorldLastEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class RiftLavaMazeParkour {
-    private val config get() = SkyHanniMod.feature.rift.mirrorVerse.lavaMazeConfig
+    private val config get() = RiftAPI.config.area.mirrorVerseConfig.lavaMazeConfig
     private var parkourHelper: ParkourHelper? = null
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/RiftUpsideDownParkour.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftUpsideDownParkour.kt
index 12f419a3a..bcf697a07 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/RiftUpsideDownParkour.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftUpsideDownParkour.kt
@@ -1,10 +1,10 @@
-package at.hannibal2.skyhanni.features.rift
+package at.hannibal2.skyhanni.features.rift.area.mirrorverse
 
-import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.CheckRenderEntityEvent
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
+import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.toChromaColor
 import at.hannibal2.skyhanni.utils.ParkourHelper
@@ -13,7 +13,7 @@ import net.minecraftforge.client.event.RenderWorldLastEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class RiftUpsideDownParkour {
-    private val config get() = SkyHanniMod.feature.rift.mirrorVerse.upsideDownParkour
+    private val config get() = RiftAPI.config.area.mirrorVerseConfig.upsideDownParkour
     private var parkourHelper: ParkourHelper? = null
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/TubulatorParkour.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/TubulatorParkour.kt
index 5b476962b..a25c91cd8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/TubulatorParkour.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/TubulatorParkour.kt
@@ -1,9 +1,9 @@
-package at.hannibal2.skyhanni.features.rift
+package at.hannibal2.skyhanni.features.rift.area.mirrorverse
 
-import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.CheckRenderEntityEvent
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
+import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
 import at.hannibal2.skyhanni.utils.LocationUtils.isPlayerInside
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.toChromaColor
@@ -14,7 +14,7 @@ import net.minecraftforge.client.event.RenderWorldLastEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class TubulatorParkour {
-    private val config get() = SkyHanniMod.feature.rift.mirrorVerse.tubulatorConfig
+    private val config get() = RiftAPI.config.area.mirrorVerseConfig.tubulatorConfig
     private var parkourHelper: ParkourHelper? = null
     private val puzzleRoom = AxisAlignedBB(-298.0, 0.0, -112.0, -309.0, 63.0, -101.0)
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/KloonHacking.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/KloonHacking.kt
index 3e6bc1dac..1b3e08953 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/KloonHacking.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/KloonHacking.kt
@@ -1,8 +1,8 @@
-package at.hannibal2.skyhanni.features.rift
+package at.hannibal2.skyhanni.features.rift.area.westvillage
 
-import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.data.ProfileStorageData
 import at.hannibal2.skyhanni.events.*
+import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
 import at.hannibal2.skyhanni.test.GriffinUtils.drawWaypointFilled
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
@@ -18,6 +18,7 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class KloonHacking {
+    private val config get() = RiftAPI.config.area.westVillageConfig.hacking
     private var wearingHelmet = false
     private var inTerminalInventory = false
     private var inColourInventory = false
@@ -42,7 +43,7 @@ class KloonHacking {
         inColourInventory = false
         nearestTerminal = null
         if (!RiftAPI.inRift()) return
-        if (!SkyHanniMod.feature.rift.hacking.solver) return
+        if (!config.solver) return
         if (event.inventoryName == "Hacking" || event.inventoryName == "Hacking (As seen on CSI)") {
             inTerminalInventory = true
             correctButtons.clear()
@@ -67,7 +68,7 @@ class KloonHacking {
     fun onBackgroundDrawn(event: GuiContainerEvent.BackgroundDrawnEvent) {
         if (!RiftAPI.inRift()) return
         if (inTerminalInventory) {
-            if (!SkyHanniMod.feature.rift.hacking.solver) return
+            if (!config.solver) return
             var i = 0
             for (slot in InventoryUtils.getItemsInOpenChest()) {
                 if (slot.slotIndex == 11 + 10 * i) {
@@ -86,7 +87,7 @@ class KloonHacking {
             }
         }
         if (inColourInventory) {
-            if (!SkyHanniMod.feature.rift.hacking.colour) return
+            if (!config.colour) return
             val targetColour = nearestTerminal ?: getNearestTerminal()
             for (slot in InventoryUtils.getItemsInOpenChest()) {
                 if (slot.stack.getLore().any { it.contains(targetColour?.name ?: "") }) {
@@ -105,7 +106,7 @@ class KloonHacking {
     @SubscribeEvent
     fun onRenderWorld(event: RenderWorldLastEvent) {
         if (!RiftAPI.inRift()) return
-        if (!SkyHanniMod.feature.rift.hacking.waypoints) return
+        if (!config.waypoints) return
         if (!wearingHelmet) return
         val hidden = ProfileStorageData.profileSpecific?.rift ?: return
         for (terminal in KloonTerminal.values()) {
@@ -133,7 +134,7 @@ class KloonHacking {
     fun onTooltip(event: LorenzToolTipEvent) {
         if (!RiftAPI.inRift()) return
         if (!inTerminalInventory) return
-        if (!SkyHanniMod.feature.rift.hacking.solver) return
+        if (!config.solver) return
 
         val neededTooltips = listOf(0, 2, 3, 4, 5, 6, 8, 9, 26, 27, 44, 45)
         if (event.slot.slotIndex !in neededTooltips) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/KloonTerminal.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/KloonTerminal.kt
index 320105f23..b5434d330 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/KloonTerminal.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/KloonTerminal.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.features.rift
+package at.hannibal2.skyhanni.features.rift.area.westvillage
 
 import at.hannibal2.skyhanni.utils.LorenzVec
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/RiftOdonata.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/wyldwoods/RiftOdonata.kt
index 7c3fae78b..8d0e93594 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/RiftOdonata.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/wyldwoods/RiftOdonata.kt
@@ -1,8 +1,8 @@
-package at.hannibal2.skyhanni.features.rift
+package at.hannibal2.skyhanni.features.rift.area.wyldwoods
 
-import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.withAlpha
+import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
 import at.hannibal2.skyhanni.mixins.hooks.RenderLivingEntityHelper
 import at.hannibal2.skyhanni.utils.EntityUtils.hasSkullTexture
 import at.hannibal2.skyhanni.utils.InventoryUtils
@@ -13,7 +13,7 @@ import net.minecraft.entity.item.EntityArmorStand
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class RiftOdonata {
-    private val config get() = SkyHanniMod.feature.rift.odonata
+    private val config get() = RiftAPI.config.area.wyldWoodsConfig.odonata
     private var hasBottleInHand = false
     val odonataSkullTexture =
         "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOWZkODA2ZGVmZGZkZjU5YjFmMjYwOWM4ZWUzNjQ2NjZkZTY2MTI3YTYyMzQxNWI1NDMwYzkzNThjNjAxZWY3YyJ9fX0="
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/ShyCruxWarnings.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/wyldwoods/ShyCruxWarnings.kt
index a8b46741e..7641cc6b7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/ShyCruxWarnings.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/wyldwoods/ShyCruxWarnings.kt
@@ -1,18 +1,19 @@
-package at.hannibal2.skyhanni.features.rift
+package at.hannibal2.skyhanni.features.rift.area.wyldwoods
 
-import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.data.TitleUtils
 import at.hannibal2.skyhanni.events.LorenzTickEvent
+import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI
 import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
 import net.minecraft.client.Minecraft
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class ShyCruxWarnings {
+    private val config get() = RiftAPI.config.area.wyldWoodsConfig
     private val shyNames = arrayOf("I'm ugly! :(", "Eek!", "Don't look at me!", "Look away!")
 
     @SubscribeEvent
     fun onTick(event: LorenzTickEvent) {
-        if (!RiftAPI.inRift() || !SkyHanniMod.feature.rift.crux.shyWarning) return
+        if (!RiftAPI.inRift() || !config.shyWarning) return
         if (event.isMod(2)) {
             checkForShy()
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/CruxTalismanDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt
index 632129d11..8d72af8d0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/CruxTalismanDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt
@@ -1,6 +1,5 @@
-package at.hannibal2.skyhanni.features.rift
+package at.hannibal2.skyhanni.features.rift.everywhere
 
-import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.ConfigLoadEvent
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
@@ -17,7 +16,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 object CruxTalismanDisplay {
 
-    private val config get() = SkyHanniMod.feature.rift.cruxTalisman
+    private val config get() = RiftAPI.config.cruxTalisman
     private val partialName = "CRUX_TALISMAN"
     private var display = emptyList<List<Any>>()
     private val displayLine = mutableListOf<Crux>()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/EnigmaSoulWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt
index a7d40580b..fa71103c2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/EnigmaSoulWaypoints.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt
@@ -1,6 +1,5 @@
-package at.hannibal2.skyhanni.features.rift
+package at.hannibal2.skyhanni.features.rift.everywhere
 
-import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.*
 import at.hannibal2.skyhanni.test.GriffinUtils.drawWaypointFilled
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
@@ -24,7 +23,7 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 object EnigmaSoulWaypoints {
-    private val config get() = SkyHanniMod.feature.rift.enigmaSoulWaypoints
+    private val config get() = RiftAPI.config.enigmaSoulWaypoints
     private var inInventory = false
     private var soulLocations = mapOf<String, LorenzVec>()
     private val trackedSouls = mutableListOf<String>()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/HighlightRiftGuide.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/HighlightRiftGuide.kt
index 4335077a5..b338e33e6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/HighlightRiftGuide.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/HighlightRiftGuide.kt
@@ -1,6 +1,5 @@
-package at.hannibal2.skyhanni.features.rift
+package at.hannibal2.skyhanni.features.rift.everywhere
 
-import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.GuiContainerEvent
 import at.hannibal2.skyhanni.events.InventoryCloseEvent
 import at.hannibal2.skyhanni.events.InventoryOpenEvent
@@ -12,7 +11,6 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class HighlightRiftGuide {
-    private val config get() = SkyHanniMod.feature.rift
     private var inInventory = false
     private var highlightedItems = emptyList<Int>()
 
@@ -59,5 +57,5 @@ class HighlightRiftGuide {
         }
     }
 
-    fun isEnabled() = RiftAPI.inRift() && config.highlightGuide
+    fun isEnabled() = RiftAPI.inRift() && RiftAPI.config.highlightGuide
 }
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/RiftAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftAPI.kt
index e0ff66926..5fa19f20e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/RiftAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftAPI.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.features.rift
+package at.hannibal2.skyhanni.features.rift.everywhere
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.features.RiftConfig