1 files changed, 59 insertions, 9 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index 93e1d8e9..0a7260f8 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -37,28 +37,79 @@ public class SkyblockerConfig implements ConfigData {
         public String apiKey;
 
         @ConfigEntry.Category("bars")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = true)
+        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
         public Bars bars = new Bars();
       
         @ConfigEntry.Category("itemList")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = true)
+        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
         public ItemList itemList = new ItemList();
 
         @ConfigEntry.Category("quicknav")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = true)
+        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
         public Quicknav quicknav = new Quicknav();
 
         @ConfigEntry.Category("itemTooltip")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = true)
+        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
         public ItemTooltip itemTooltip = new ItemTooltip();
 
+        @ConfigEntry.Category("hitbox")
+        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
+        public Hitbox hitbox = new Hitbox();
+
         @ConfigEntry.Gui.Excluded
         public List<Integer> lockedSlots = new ArrayList<>();
     }
 
     public static class Bars {
         public boolean enableBars = true;
+
+        @ConfigEntry.Category("barpositions")
+        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
+        public BarPositions barpositions = new BarPositions();
+    }
+
+    public static class BarPositions {
+        @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
+        public BarPosition healthBarPosition = BarPosition.LAYER1;
+        @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
+        public BarPosition manaBarPosition = BarPosition.LAYER1;
+        @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
+        public BarPosition defenceBarPosition = BarPosition.LAYER1;
+        @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
+        public BarPosition experienceBarPosition = BarPosition.LAYER1;
+
     }
+
+    public enum BarPosition {
+        LAYER1,
+        LAYER2,
+        RIGHT,
+        NONE;
+
+        public String toString() {
+            return switch (this) {
+                case LAYER1 -> "Layer 1";
+                case LAYER2 -> "Layer 2";
+                case RIGHT -> "Right";
+                case NONE -> "Disabled";
+            };
+        }
+
+        public int toInt() {
+            return switch (this) {
+                case LAYER1 -> 0;
+                case LAYER2 -> 1;
+                case RIGHT -> 2;
+                case NONE -> -1;
+            };
+        }
+    }
+
+    public static class Hitbox {
+        public boolean oldFarmlandHitbox = true;
+        public boolean oldLeverHitbox = false;
+    }
+
     public static class RichPresence {
         public boolean enableRichPresence = false;
         @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
@@ -103,11 +154,11 @@ public class SkyblockerConfig implements ConfigData {
 
     public static class Locations {
         @ConfigEntry.Category("dungeons")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = true)
+        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
         public Dungeons dungeons = new Dungeons();
 
         @ConfigEntry.Category("dwarvenmines")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = true)
+        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
         public DwarvenMines dwarvenMines = new DwarvenMines();
     }
 
@@ -116,8 +167,7 @@ public class SkyblockerConfig implements ConfigData {
         public boolean solveThreeWeirdos = true;
         public boolean blazesolver = true;
         public boolean solveTrivia = true;
-        public boolean oldLevers = false;
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = true)
+        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
         public Terminals terminals = new Terminals();
     }
 
@@ -131,7 +181,7 @@ public class SkyblockerConfig implements ConfigData {
         public boolean enableDrillFuel = true;
         public boolean solveFetchur = true;
         public boolean solvePuzzler = true;
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = true)
+        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
         public DwarvenHud dwarvenHud = new DwarvenHud();
     }