Merge branch 'master' into minor-updates

44 files changed, 320 insertions, 347 deletions

diff --git a/README.md b/README.md
index 2e1b59a3..b1137f37 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/in
 * Wiki Lookup: press f4 to open the wiki page about the held item
 * Discord Rich Presence: Allows user to show either their Piggy, Bits, or location. Along with a custom message
 * Quicknav: fast navigate between pets, armor, enderchest, skill, collection, crafting, enchant, envil, warp dungeon, warp hub
-* Recipe book: in the vanilla recipe book all skyblock items are listed and you can see the recipe of the item
+* Recipe book: in the vanilla recipe book all skyblock items are listed, and you can see the recipe of the item
 * Backpack preview: after you clicked your backpack or enderchest once you can hover over the backpack or enderchest and hold shift to preview
 * Update notification
 * Commission HUD: Dwarven Mines quests
@@ -67,16 +67,16 @@ Everyone can contribute to Skyblocker, read [this](https://github.com/Skyblocker
 
 |     [<img alt="Kraineff" src="https://github.com/Kraineff.png" width="100">](https://github.com/Kraineff)     |             [<img alt="d3dx9" src="https://github.com/d3dx9.png" width="100">](https://github.com/d3dx9)              | [<img alt="LifeIsAParadox" src="https://github.com/LifeIsAParadox.png" width="100">](https://github.com/LifeIsAParadox) | [<img alt="ExternalTime" src="https://github.com/ExternalTime.png" width="100">](https://github.com/ExternalTime) |
 |:-------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------:|
-|                                    [Kraineff](https://github.com/Kraineff)                                    |                                           [d3dx9](https://github.com/d3dx9)                                           |                                   [LifeIsAParadox](https://github.com/LifeIsAParadox)                                   |                     [ExternalTime](https://github.com/ExternalTime)                                               |
+|                                    [Kraineff](https://github.com/Kraineff)                                    |                                           [d3dx9](https://github.com/d3dx9)                                           |                                   [LifeIsAParadox](https://github.com/LifeIsAParadox)                                   |                                  [ExternalTime](https://github.com/ExternalTime)                                  |
 
 | [<img alt="Zailer43" src="https://github.com/Zailer43.png" width="100">](https://github.com/Zailer43) | [<img alt="TacoMonkey11" src="https://github.com/TacoMonkey11.png" width="100">](https://github.com/TacoMonkey11) |   [<img alt="KonaeAkira" src="https://github.com/KonaeAkira.png" width="100">](https://github.com/KonaeAkira)   | [<img alt="Fix3dll" src="https://github.com/Fix3dll.png" width="100">](https://github.com/Fix3dll) |
 |:-----------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------:|:--------------------------------------------------------------------------------------------------:|
-|                                [Zailer43](https://github.com/Zailer43)                                |                                  [TacoMonkey11](https://github.com/TacoMonkey11)                                  |                                   [KonaeAkira](https://github.com/KonaeAkira)                                   |                       [Fix3dll](https://github.com/Fix3dll)                                        |
+|                                [Zailer43](https://github.com/Zailer43)                                |                                  [TacoMonkey11](https://github.com/TacoMonkey11)                                  |                                   [KonaeAkira](https://github.com/KonaeAkira)                                   |                               [Fix3dll](https://github.com/Fix3dll)                                |
 
 
 | [<img alt="Zailer43" src="https://github.com/ADON15c.png" width="100">](https://github.com/ADON15c) |
 |:---------------------------------------------------------------------------------------------------:|
-|                       [ADON15c](https://github.com/ADON15c)                                         |
+|                                [ADON15c](https://github.com/ADON15c)                                |
 ### Translators
 German ([LifeIsAParadox](https://github.com/LifeIsAParadox)) \
 Indonesian ([null2264](https://github.com/null2264)) \
diff --git a/build.gradle b/build.gradle
index 3e80b24a..78e62bd9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ sourceCompatibility = JavaVersion.VERSION_17
 targetCompatibility = JavaVersion.VERSION_17
 
 archivesBaseName = project.archives_base_name
-version = "${project.mod_version}+${project.suported_version}"
+version = "${project.mod_version}+${project.minecraft_version}"
 group = project.maven_group
 
 repositories {
@@ -55,7 +55,7 @@ dependencies {
 	modImplementation "com.terraformersmc:modmenu:${project.mod_menu_version}"
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
 
 	// https://mvnrepository.com/artifact/org.eclipse.jgit/org.eclipse.jgit used pull data from the NEU item repo
 	include(implementation("org.eclipse.jgit:org.eclipse.jgit:6.4.0.202211300538-r"))
@@ -103,7 +103,7 @@ modrinth {
 	token = System.getenv('MODRINTH_TOKEN')
 	projectId = project.modrinth_id
 	versionNumber = "v${project.version}"
-	versionName = "Skyblocker ${project.mod_version} for ${project.suported_version}"
+	versionName = "Skyblocker ${project.mod_version} for ${project.minecraft_version}"
 	uploadFile = remapJar
 	gameVersions = ["1.19", "1.19.1", project.minecraft_version]
 	loaders = ["fabric"]
diff --git a/gradle.properties b/gradle.properties
index f1ea4278..139c0e46 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,29 +1,23 @@
 org.gradle.jvmargs=-Xmx1G -Dfile.encoding=UTF-8 -Duser.language=en -Duser.country=US
 
 # Fabric Properties (https://fabricmc.net/versions.html)
-## 1.19.3
-minecraft_version=1.19.3
-yarn_mappings=1.19.3+build.5
-## 1.19.2
-#minecraft_version=1.19.2
-#yarn_mappings=1.19.2+build.28
-loader_version=0.14.12
+## 1.19.4
+minecraft_version=1.19.4
+yarn_mappings=1.19.4+build.1
+loader_version=0.14.18
 
 #Fabric api
-## 1.19.3
-fabric_version=0.72.0+1.19.3
-## 1.19.2
-#fabric_version=0.72.0+1.19.2
+## 1.19.4
+fabric_api_version=0.76.0+1.19.4
 
 # Dependencies
 ## Cloth Api (https://www.curseforge.com/minecraft/mc-mods/cloth-config/files)
-clothconfig_version=9.0.94
+clothconfig_version=10.0.96
 ## Mod Menu (https://www.curseforge.com/minecraft/mc-mods/modmenu/files)
-mod_menu_version=5.0.2
+mod_menu_version=6.1.0-rc.4
 
 # Mod Properties
 mod_version = 1.8.3-beta
 maven_group = me.xmrvizzy
 archives_base_name = skyblocker
-modrinth_id=y6DuFGwJ
-suported_version=1.19.3
\ No newline at end of file
+modrinth_id=y6DuFGwJ
\ No newline at end of file
diff --git a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java
index e9af52f6..3d713727 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java
@@ -2,6 +2,7 @@ package me.xmrvizzy.skyblocker;
 
 import me.xmrvizzy.skyblocker.chat.ChatMessageListener;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+import me.xmrvizzy.skyblocker.discord.DiscordRPCManager;
 import me.xmrvizzy.skyblocker.skyblock.HotbarSlotLock;
 import me.xmrvizzy.skyblocker.skyblock.api.StatsCommand;
 import me.xmrvizzy.skyblocker.skyblock.dwarven.DwarvenHud;
@@ -23,6 +24,6 @@ public class SkyblockerInitializer implements ClientModInitializer {
         DwarvenHud.init();
         ChatMessageListener.init();
         UpdateChecker.init();
-        SkyblockerMod.getInstance().discordRPCManager.init();
+        DiscordRPCManager.init();
     }
 }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/ChatPatternListener.java b/src/main/java/me/xmrvizzy/skyblocker/chat/ChatPatternListener.java
index 19237de4..8a32715e 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/chat/ChatPatternListener.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/chat/ChatPatternListener.java
@@ -6,7 +6,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public abstract class ChatPatternListener implements ChatMessageListener {
-    protected static String NUMBER = "-?[0-9]{1,3}(?>,[0-9]{3})*(?:\\.[1-9])?";
+    protected static final String NUMBER = "-?[0-9]{1,3}(?>,[0-9]{3})*(?:\\.[1-9])?";
     public final Pattern pattern;
 
     public ChatPatternListener(String pattern) {
diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/AutopetFilter.java b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/AutopetFilter.java
index f8af49ce..f1545db4 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/AutopetFilter.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/AutopetFilter.java
@@ -4,7 +4,6 @@ import me.xmrvizzy.skyblocker.chat.ChatFilterResult;
 import me.xmrvizzy.skyblocker.chat.ChatPatternListener;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.text.LiteralTextContent;
 import net.minecraft.text.Text;
 
 import java.util.Objects;
diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index e711e681..138cc7c5 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -15,74 +15,74 @@ public class SkyblockerConfig implements ConfigData {
 
     @ConfigEntry.Category("general")
     @ConfigEntry.Gui.TransitiveObject
-    public General general = new General();
+    public final General general = new General();
 
     @ConfigEntry.Category("locations")
     @ConfigEntry.Gui.TransitiveObject
-    public Locations locations = new Locations();
+    public final Locations locations = new Locations();
 
     @ConfigEntry.Category("messages")
     @ConfigEntry.Gui.TransitiveObject
-    public Messages messages = new Messages();
+    public final Messages messages = new Messages();
 
     @ConfigEntry.Category("richPresence")
     @ConfigEntry.Gui.TransitiveObject
-    public RichPresence richPresence = new RichPresence();
+    public final RichPresence richPresence = new RichPresence();
 
     @ConfigEntry.Category("quickNav")
     @ConfigEntry.Gui.TransitiveObject
-    public QuickNav quickNav = new QuickNav();
+    public final QuickNav quickNav = new QuickNav();
 
     public static class QuickNav {
-        public boolean enableQuickNav = true;
+        public final boolean enableQuickNav = true;
 
         @ConfigEntry.Category("button1")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public QuickNavItem button1 = new QuickNavItem(true, new ItemData("diamond_sword"), "Your Skills", "/skills");
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final QuickNavItem button1 = new QuickNavItem(true, new ItemData("diamond_sword"), "Your Skills", "/skills");
 
         @ConfigEntry.Category("button2")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public QuickNavItem button2 = new QuickNavItem(true, new ItemData("painting"), "Collection", "/collection");
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final QuickNavItem button2 = new QuickNavItem(true, new ItemData("painting"), "Collection", "/collection");
 
         @ConfigEntry.Category("button3")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public QuickNavItem button3 = new QuickNavItem(false, new ItemData("air"), "", "");
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final QuickNavItem button3 = new QuickNavItem(false, new ItemData("air"), "", "");
 
         @ConfigEntry.Category("button4")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public QuickNavItem button4 = new QuickNavItem(true, new ItemData("bone"), "Pets", "/pets");
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final QuickNavItem button4 = new QuickNavItem(true, new ItemData("bone"), "Pets", "/pets");
 
         @ConfigEntry.Category("button5")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public QuickNavItem button5 = new QuickNavItem(true, new ItemData("leather_chestplate", 1, "tag:{display:{color:8991416}}"), "Wardrobe", "/wardrobe");
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final QuickNavItem button5 = new QuickNavItem(true, new ItemData("leather_chestplate", 1, "tag:{display:{color:8991416}}"), "Wardrobe", "/wardrobe");
 
         @ConfigEntry.Category("button6")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public QuickNavItem button6 = new QuickNavItem(true, new ItemData("ender_chest"),  "Storage", "/storage");
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final QuickNavItem button6 = new QuickNavItem(true, new ItemData("ender_chest"),  "Storage", "/storage");
 
         @ConfigEntry.Category("button7")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public QuickNavItem button7 = new QuickNavItem(true, new ItemData("player_head", 1, "tag:{SkullOwner:{Id:[I;-300151517,-631415889,-1193921967,-1821784279],Properties:{textures:[{Value:\"e3RleHR1cmVzOntTS0lOOnt1cmw6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZDdjYzY2ODc0MjNkMDU3MGQ1NTZhYzUzZTA2NzZjYjU2M2JiZGQ5NzE3Y2Q4MjY5YmRlYmVkNmY2ZDRlN2JmOCJ9fX0=\"}]}}}"), "none", "/hub");
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final QuickNavItem button7 = new QuickNavItem(true, new ItemData("player_head", 1, "tag:{SkullOwner:{Id:[I;-300151517,-631415889,-1193921967,-1821784279],Properties:{textures:[{Value:\"e3RleHR1cmVzOntTS0lOOnt1cmw6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZDdjYzY2ODc0MjNkMDU3MGQ1NTZhYzUzZTA2NzZjYjU2M2JiZGQ5NzE3Y2Q4MjY5YmRlYmVkNmY2ZDRlN2JmOCJ9fX0=\"}]}}}"), "none", "/hub");
 
         @ConfigEntry.Category("button8")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public QuickNavItem button8 = new QuickNavItem(true, new ItemData("player_head", 1, "tag:{SkullOwner:{Id:[I;1605800870,415127827,-1236127084,15358548],Properties:{textures:[{Value:\"e3RleHR1cmVzOntTS0lOOnt1cmw6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzg5MWQ1YjI3M2ZmMGJjNTBjOTYwYjJjZDg2ZWVmMWM0MGExYjk0MDMyYWU3MWU3NTQ3NWE1NjhhODI1NzQyMSJ9fX0=\"}]}}}"), "none", "/warp dungeon_hub");
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final QuickNavItem button8 = new QuickNavItem(true, new ItemData("player_head", 1, "tag:{SkullOwner:{Id:[I;1605800870,415127827,-1236127084,15358548],Properties:{textures:[{Value:\"e3RleHR1cmVzOntTS0lOOnt1cmw6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzg5MWQ1YjI3M2ZmMGJjNTBjOTYwYjJjZDg2ZWVmMWM0MGExYjk0MDMyYWU3MWU3NTQ3NWE1NjhhODI1NzQyMSJ9fX0=\"}]}}}"), "none", "/warp dungeon_hub");
 
         @ConfigEntry.Category("button9")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public QuickNavItem button9 = new QuickNavItem(false, new ItemData("air"), "", "");
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final QuickNavItem button9 = new QuickNavItem(false, new ItemData("air"), "", "");
 
         @ConfigEntry.Category("button10")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public QuickNavItem button10 = new QuickNavItem(true, new ItemData("enchanting_table"), "Enchant", "/etable");
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final QuickNavItem button10 = new QuickNavItem(true, new ItemData("enchanting_table"), "Enchant", "/etable");
 
         @ConfigEntry.Category("button11")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public QuickNavItem button11 = new QuickNavItem(true, new ItemData("anvil"), "Anvil", "/anvil");
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final QuickNavItem button11 = new QuickNavItem(true, new ItemData("anvil"), "Anvil", "/anvil");
 
         @ConfigEntry.Category("button12")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public QuickNavItem button12 = new QuickNavItem(true, new ItemData("crafting_table"), "Craft Item", "/craft");
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final QuickNavItem button12 = new QuickNavItem(true, new ItemData("crafting_table"), "Craft Item", "/craft");
     }
 
     public static class QuickNavItem {
@@ -93,14 +93,14 @@ public class SkyblockerConfig implements ConfigData {
             this.uiTitle = uiTitle;
         }
 
-        public Boolean render;
+        public final Boolean render;
 
         @ConfigEntry.Category("item")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public ItemData item;
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final ItemData item;
 
-        public String uiTitle;
-        public String clickEvent;
+        public final String uiTitle;
+        public final String clickEvent;
     }
 
     public static class ItemData {
@@ -116,55 +116,55 @@ public class SkyblockerConfig implements ConfigData {
             this.nbt = "";
         }
 
-        public String itemName;
-        public int count;
-        public String nbt;
+        public final String itemName;
+        public final int count;
+        public final String nbt;
     }
 
     public static class General {
-        public boolean enableUpdateNotification = true;
-        public boolean backpackPreviewWithoutShift = false;
+        public final boolean enableUpdateNotification = true;
+        public final boolean backpackPreviewWithoutShift = false;
 
         @ConfigEntry.Gui.Excluded
         public String apiKey;
 
         @ConfigEntry.Category("bars")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public Bars bars = new Bars();
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final Bars bars = new Bars();
       
         @ConfigEntry.Category("itemList")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public ItemList itemList = new ItemList();
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final ItemList itemList = new ItemList();
 
         @ConfigEntry.Category("itemTooltip")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public ItemTooltip itemTooltip = new ItemTooltip();
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final ItemTooltip itemTooltip = new ItemTooltip();
 
         @ConfigEntry.Category("hitbox")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public Hitbox hitbox = new Hitbox();
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final Hitbox hitbox = new Hitbox();
 
         @ConfigEntry.Gui.Excluded
-        public List<Integer> lockedSlots = new ArrayList<>();
+        public final List<Integer> lockedSlots = new ArrayList<>();
     }
 
     public static class Bars {
-        public boolean enableBars = true;
+        public final boolean enableBars = true;
 
         @ConfigEntry.Category("barpositions")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public BarPositions barpositions = new BarPositions();
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final BarPositions barpositions = new BarPositions();
     }
 
     public static class BarPositions {
         @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
-        public BarPosition healthBarPosition = BarPosition.LAYER1;
+        public final BarPosition healthBarPosition = BarPosition.LAYER1;
         @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
-        public BarPosition manaBarPosition = BarPosition.LAYER1;
+        public final BarPosition manaBarPosition = BarPosition.LAYER1;
         @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
-        public BarPosition defenceBarPosition = BarPosition.LAYER1;
+        public final BarPosition defenceBarPosition = BarPosition.LAYER1;
         @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
-        public BarPosition experienceBarPosition = BarPosition.LAYER1;
+        public final BarPosition experienceBarPosition = BarPosition.LAYER1;
 
     }
 
@@ -195,21 +195,21 @@ public class SkyblockerConfig implements ConfigData {
     }
 
     public static class Hitbox {
-        public boolean oldFarmlandHitbox = true;
-        public boolean oldLeverHitbox = false;
+        public final boolean oldFarmlandHitbox = true;
+        public final boolean oldLeverHitbox = false;
     }
 
     public static class RichPresence {
-        public boolean enableRichPresence = false;
+        public final boolean enableRichPresence = false;
         @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
         @ConfigEntry.Gui.Tooltip()
-        public Info info = Info.LOCATION;
-        public boolean cycleMode = false;
+        public final Info info = Info.LOCATION;
+        public final boolean cycleMode = false;
         public String customMessage;
     }
 
     public static class ItemList {
-        public boolean enableItemList = true;
+        public final boolean enableItemList = true;
     }
 
     public enum Average {
@@ -228,79 +228,79 @@ public class SkyblockerConfig implements ConfigData {
     }
 
     public static class ItemTooltip {
-        public boolean enableNPCPrice = true;
-        public boolean enableAvgBIN = true;
+        public final boolean enableNPCPrice = true;
+        public final boolean enableAvgBIN = true;
         @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
         @ConfigEntry.Gui.Tooltip()
-        public Average avg = Average.THREE_DAY;
-        public boolean enableLowestBIN = true;
-        public boolean enableBazaarPrice = true;
-        public boolean enableMuseumDate = true;
+        public final Average avg = Average.THREE_DAY;
+        public final boolean enableLowestBIN = true;
+        public final boolean enableBazaarPrice = true;
+        public final boolean enableMuseumDate = true;
     }
 
     public static class Locations {
         @ConfigEntry.Category("dungeons")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public Dungeons dungeons = new Dungeons();
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final Dungeons dungeons = new Dungeons();
 
         @ConfigEntry.Category("dwarvenmines")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public DwarvenMines dwarvenMines = new DwarvenMines();
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final DwarvenMines dwarvenMines = new DwarvenMines();
     }
 
     public static class Dungeons {
         @ConfigEntry.Gui.Tooltip()
-        public boolean croesusHelper = true;
-        public boolean enableMap = true;
-        public boolean solveThreeWeirdos = true;
-        public boolean blazesolver = true;
-        public boolean solveTrivia = true;
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public Terminals terminals = new Terminals();
+        public final boolean croesusHelper = true;
+        public final boolean enableMap = true;
+        public final boolean solveThreeWeirdos = true;
+        public final boolean blazesolver = true;
+        public final boolean solveTrivia = true;
+        @ConfigEntry.Gui.CollapsibleObject()
+        public final Terminals terminals = new Terminals();
     }
 
     public static class Terminals {
-        public boolean solveColor = true;
-        public boolean solveOrder = true;
-        public boolean solveStartsWith = true;
+        public final boolean solveColor = true;
+        public final boolean solveOrder = true;
+        public final boolean solveStartsWith = true;
     }
 
     public static class DwarvenMines {
-        public boolean enableDrillFuel = true;
-        public boolean solveFetchur = true;
-        public boolean solvePuzzler = true;
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public DwarvenHud dwarvenHud = new DwarvenHud();
+        public