code cleanup

54 files changed, 157 insertions, 152 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
index eff921734..357493f38 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt
@@ -21,7 +21,6 @@ object ConfigUpdaterMigrator {
         return obj?.at(chain.drop(1), init)
     }
 
-
     data class ConfigFixEvent(
         val old: JsonObject,
         val new: JsonObject,
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/ChatConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/ChatConfig.java
index e0324c32f..a2f8f78ad 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/ChatConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/ChatConfig.java
@@ -2,7 +2,10 @@ package at.hannibal2.skyhanni.config.features;
 
 import at.hannibal2.skyhanni.config.FeatureToggle;
 import com.google.gson.annotations.Expose;
-import io.github.moulberry.moulconfig.annotations.*;
+import io.github.moulberry.moulconfig.annotations.Accordion;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorKeybind;
+import io.github.moulberry.moulconfig.annotations.ConfigOption;
 import org.lwjgl.input.Keyboard;
 
 public class ChatConfig {
@@ -17,7 +20,7 @@ public class ChatConfig {
     @Accordion
     public FilterTypesConfig filterType = new FilterTypesConfig();
 
-    public static class FilterTypesConfig{
+    public static class FilterTypesConfig {
         @Expose
         @ConfigOption(name = "Hypixel Hub", desc = "Block messages outside SkyBlock in the Hypixel lobby: player joins, loot boxes, prototype lobby messages, radiating generosity and Hypixel tournaments.")
         @ConfigEditorBoolean
@@ -98,7 +101,7 @@ public class ChatConfig {
     @Accordion
     public PlayerMessagesConfig playerMessage = new PlayerMessagesConfig();
 
-    public static class PlayerMessagesConfig{
+    public static class PlayerMessagesConfig {
         @Expose
         @ConfigOption(name = "Player Rank Hider", desc = "Hide player ranks in all chat messages.")
         @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/DungeonConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/DungeonConfig.java
index 20b6e0295..db8e723df 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/DungeonConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/DungeonConfig.java
@@ -37,13 +37,13 @@ public class DungeonConfig {
     @ConfigOption(name = "Clean End", desc = "")
     @Accordion
     public CleanEndConfig cleanEnd = new CleanEndConfig();
-    public static class CleanEndConfig{
+    public static class CleanEndConfig {
         @Expose
-        @ConfigOption(name = "Clean Ending", desc = "After the last Dungeon boss has died, all entities and " +
+        @ConfigOption(name = "Enabled", desc = "After the last Dungeon boss has died, all entities and " +
                 "particles are no longer displayed and the music stops playing, but the loot chests are still displayed.")
         @ConfigEditorBoolean
         @FeatureToggle
-        public boolean toggle = false;
+        public boolean enabled = false;
 
         @Expose
         @ConfigOption(name = "Ignore Guardians", desc = "Ignore F3 and M3 Guardians from the clean end feature when " +
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/GardenConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/GardenConfig.java
index ad1643128..c2f4459a5 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/GardenConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/GardenConfig.java
@@ -29,7 +29,7 @@ public class GardenConfig {
     @ConfigOption(name = "SkyMart", desc = "")
     @Accordion
     public SkyMartConfig skyMart = new SkyMartConfig();
-    public static class SkyMartConfig{
+    public static class SkyMartConfig {
         @Expose
         @ConfigOption(name = "Copper Price", desc = "Show copper to coin prices inside the SkyMart inventory.")
         @ConfigEditorBoolean
@@ -49,12 +49,12 @@ public class GardenConfig {
     @ConfigOption(name = "Visitor", desc = "")
     @Accordion
     public VisitorConfig visitors = new VisitorConfig();
-    public static class VisitorConfig{
+    public static class VisitorConfig {
         @Expose
         @ConfigOption(name = "Visitor Timer", desc = "")
         @Accordion
         public TimerConfig timer = new TimerConfig();
-        public static class TimerConfig{
+        public static class TimerConfig {
             @Expose
             @ConfigOption(name = "Visitor Timer", desc = "Timer when the next visitor will appear, " +
                     "and a number for how many visitors are already waiting.")
@@ -82,7 +82,7 @@ public class GardenConfig {
         @ConfigOption(name = "Visitor Items Needed", desc = "")
         @Accordion
         public NeedsConfig needs = new NeedsConfig();
-        public static class NeedsConfig{
+        public static class NeedsConfig {
             @Expose
             @ConfigOption(name = "Items Needed", desc = "Show all items needed for the visitors.")
             @ConfigEditorBoolean
@@ -119,7 +119,7 @@ public class GardenConfig {
         @ConfigOption(name = "Visitor Inventory", desc = "")
         @Accordion
         public InventoryConfig inventory = new InventoryConfig();
-        public static class InventoryConfig{
+        public static class InventoryConfig {
             @Expose
             @ConfigOption(name = "Visitor Price", desc = "Show the Bazaar price of the items required for the visitors, like in NEU.")
             @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/InventoryConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/InventoryConfig.java
index 971985b74..71e916c0b 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/InventoryConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/InventoryConfig.java
@@ -22,7 +22,7 @@ public class InventoryConfig {
     @Accordion
     public HideNotClickableConfig hideNotClickable = new HideNotClickableConfig();
 
-    public static class HideNotClickableConfig{
+    public static class HideNotClickableConfig {
         @Expose
         @ConfigOption(name = "Enabled", desc = "Hide items that are not clickable in the current inventory: ah, bz, accessory bag, etc.")
         @ConfigEditorBoolean
@@ -62,7 +62,7 @@ public class InventoryConfig {
     @ConfigOption(name = "RNG Meter", desc = "")
     @Accordion
     public RngMeterConfig rngMeter = new RngMeterConfig();
-    public static class RngMeterConfig{
+    public static class RngMeterConfig {
         @Expose
         @ConfigOption(name = "Floor Names", desc = "Show the Floor names in the Catacombs RNG Meter inventory.")
         @ConfigEditorBoolean
@@ -86,7 +86,7 @@ public class InventoryConfig {
     @ConfigOption(name = "Stats Tuning", desc = "")
     @Accordion
     public StatsTuningConfig statsTuning = new StatsTuningConfig();
-    public static class StatsTuningConfig{
+    public static class StatsTuningConfig {
         @Expose
         @ConfigOption(name = "Selected Stats", desc = "Show the tuning stats in the Thaumaturgy inventory.")
         @ConfigEditorBoolean
@@ -116,7 +116,7 @@ public class InventoryConfig {
     @ConfigOption(name = "Jacob Farming Contest", desc = "")
     @Accordion
     public JacobFarmingContestConfig jacobFarmingContests = new JacobFarmingContestConfig();
-    public static class JacobFarmingContestConfig{
+    public static class JacobFarmingContestConfig {
         @Expose
         @ConfigOption(name = "Unclaimed Rewards", desc = "Highlight contests with unclaimed rewards in the Jacob inventory.")
         @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java
index 33eed59ae..16a9761b0 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java
@@ -25,7 +25,7 @@ public class MiscConfig {
     @ConfigOption(name = "Pet", desc = "")
     @Accordion
     public PetConfig pets = new PetConfig();
-    public static class PetConfig{
+    public static class PetConfig {
         @Expose
         @ConfigOption(name = "Pet Display", desc = "Show the currently active pet.")
         @ConfigEditorBoolean
@@ -84,7 +84,7 @@ public class MiscConfig {
     @ConfigOption(name = "Potion Effects", desc = "")
     @Accordion
     public PotionEffectsConfig potionEffect = new PotionEffectsConfig();
-    public static class PotionEffectsConfig{
+    public static class PotionEffectsConfig {
         @Expose
         @ConfigOption(name = "Non God Pot Effects", desc = "Display the active potion effects that are not part of the God Pot.")
         @ConfigEditorBoolean
@@ -105,7 +105,7 @@ public class MiscConfig {
     @ConfigOption(name = "Particle Hider", desc = "")
     @Accordion
     public ParticleHiderConfig particleHiders = new ParticleHiderConfig();
-    public static class ParticleHiderConfig{
+    public static class ParticleHiderConfig {
         @Expose
         @ConfigOption(name = "Blaze Particles", desc = "Hide Blaze particles.")
         @ConfigEditorBoolean
@@ -153,7 +153,7 @@ public class MiscConfig {
     @ConfigOption(name = "Estimated Item Value", desc = "(Prices for Enchantments, Reforge Stones, Gemstones, Drill Parts and more)")
     @Accordion
     public EstimatedItemValueConfig estimatedItemValues = new EstimatedItemValueConfig();
-    public static class EstimatedItemValueConfig{
+    public static class EstimatedItemValueConfig {
         @Expose
         @ConfigOption(name = "Enable Estimated Price", desc = "Displays an Estimated Item Value for the item you hover over.")
         @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/SlayerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/SlayerConfig.java
index b4fc1800d..e041c965e 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/SlayerConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/SlayerConfig.java
@@ -16,8 +16,8 @@ public class SlayerConfig {
     @Expose
     @ConfigOption(name = "Enderman Slayer Features", desc = "")
     @Accordion
-    public EndermanConfig endermen =  new EndermanConfig();
-    public static class EndermanConfig{
+    public EndermanConfig endermen = new EndermanConfig();
+    public static class EndermanConfig {
         @Expose
         @ConfigOption(name = "Yang Glyph (beacon)", desc = "")
         @Accordion
@@ -84,7 +84,7 @@ public class SlayerConfig {
     @ConfigOption(name = "Blaze", desc = "")
     @Accordion
     public BlazeConfig blazes = new BlazeConfig();
-    public static class BlazeConfig{
+    public static class BlazeConfig {
         @Expose
         @ConfigOption(name = "Hellion Shields", desc = "")
         @Accordion
diff --git a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
index f9f84f9f7..689c3d8c5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
@@ -854,7 +854,7 @@ class DamageIndicatorManager {
     @SubscribeEvent
     fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
         event.move(2, "damageIndicator", "combat.damageIndicator")
-        event.move(3,"slayer.endermanPhaseDisplay", "slayer.endermen.phaseDisplay")
+        event.move(3, "slayer.endermanPhaseDisplay", "slayer.endermen.phaseDisplay")
         event.move(3, "slayer.blazePhaseDisplay", "slayer.blazes.phaseDisplay")
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt
index 31e8c611e..d10122334 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt
@@ -28,7 +28,7 @@ class DungeonCleanEnd {
     @SubscribeEvent
     fun onChatMessage(event: LorenzChatEvent) {
         if (!LorenzUtils.inDungeons) return
-        if (!config.toggle) return
+        if (!config.enabled) return
 
         val message = event.message
 
@@ -39,7 +39,7 @@ class DungeonCleanEnd {
 
     private fun shouldBlock(): Boolean {
         if (!LorenzUtils.inDungeons) return false
-        if (!config.toggle) return false
+        if (!config.enabled) return false
 
         if (!bossDone) return false
 
@@ -66,7 +66,7 @@ class DungeonCleanEnd {
     @SubscribeEvent
     fun onEntityHealthUpdate(event: EntityHealthUpdateEvent) {
         if (!LorenzUtils.inDungeons) return
-        if (!config.toggle) return
+        if (!config.enabled) return
         if (bossDone) return
         if (lastBossId == -1) return
         if (event.entity.entityId != lastBossId) return
@@ -117,7 +117,7 @@ class DungeonCleanEnd {
 
     @SubscribeEvent
     fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
-        event.move(3, "dungeon.cleanEndToggle", "dungeon.cleanEnd.toggle")
+        event.move(3, "dungeon.cleanEndToggle", "dungeon.cleanEnd.enabled")
         event.move(3, "dungeon.cleanEndF3IgnoreGuardians", "dungeon.cleanEnd.F3IgnoreGuardians")
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt
index ddfd622a7..834cd8fd6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt
@@ -137,9 +137,9 @@ class DungeonCopilot {
     }
 
     @SubscribeEvent
-    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent){
+    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
         event.move(3, "dungeon.messageFilterKeysAndDoors", "dungeon.messageFilter.keysAndDoors")
-        event.move(3,"dungeon.copilotEnabled", "dungeon.dungeonCopilot.enabled")
-        event.move(3,"dungeon.copilotPos", "dungeon.dungeonCopilot.pos")
+        event.move(3, "dungeon.copilotEnabled", "dungeon.dungeonCopilot.enabled")
+        event.move(3, "dungeon.copilotPos", "dungeon.dungeonCopilot.pos")
     }
 }
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLevelColor.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLevelColor.kt
index 776a11a14..b15cdabb7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLevelColor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLevelColor.kt
@@ -37,7 +37,7 @@ class DungeonLevelColor {
     }
 
     @SubscribeEvent
-    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent){
+    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
         event.move(3, "dungeon.partyFinderColoredClassLevel", "dungeon.partyFinder.coloredClassLevel")
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt
index 1bb7cb1d5..2531b97bc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt
@@ -115,7 +115,7 @@ class FishingTimer {
     }
 
     @SubscribeEvent
-    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent){
+    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
         event.move(3, "fishing.barnTimer", "fishing.barnTimer.enabled")
         event.move(3, "fishing.barnTimerAlertTime", "fishing.barnTimer.alertTime")
         event.move(3, "fishing.barnTimerCrystalHollows", "fishing.barnTimer.crystalHollows")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt
index dca61807d..b0d0013a1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt
@@ -149,7 +149,7 @@ class AnitaMedalProfit {
     }
 
     @SubscribeEvent
-    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent){
+    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
         event.move(3,"garden.anitaMedalProfitEnabled", "garden.anitaShop.medalProfitEnabled")
         event.move(3,"garden.anitaMedalProfitPos", "garden.anitaShop.medalProfitPos")
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt
index 789c0f352..74defe1ad 100644
--- a/