15 files changed, 73 insertions, 46 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/Features.java b/src/main/java/at/hannibal2/skyhanni/config/Features.java
index 2f2de9fc5..d43b3fe39 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/Features.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/Features.java
@@ -2,29 +2,29 @@ package at.hannibal2.skyhanni.config;
 
 import at.hannibal2.skyhanni.SkyHanniMod;
 import at.hannibal2.skyhanni.config.features.About;
-import at.hannibal2.skyhanni.config.features.Ashfang;
-import at.hannibal2.skyhanni.config.features.Bazaar;
-import at.hannibal2.skyhanni.config.features.Bingo;
+import at.hannibal2.skyhanni.config.features.AshfangConfig;
+import at.hannibal2.skyhanni.config.features.BazaarConfig;
+import at.hannibal2.skyhanni.config.features.BingoConfig;
 import at.hannibal2.skyhanni.config.features.ChatConfig;
-import at.hannibal2.skyhanni.config.features.CommandsFeatures;
+import at.hannibal2.skyhanni.config.features.CommandsConfig;
 import at.hannibal2.skyhanni.config.features.DamageIndicatorConfig;
 import at.hannibal2.skyhanni.config.features.DevConfig;
 import at.hannibal2.skyhanni.config.features.DianaConfig;
-import at.hannibal2.skyhanni.config.features.Dungeon;
-import at.hannibal2.skyhanni.config.features.Fishing;
-import at.hannibal2.skyhanni.config.features.GUI;
-import at.hannibal2.skyhanni.config.features.Garden;
+import at.hannibal2.skyhanni.config.features.DungeonConfig;
+import at.hannibal2.skyhanni.config.features.FishingConfig;
+import at.hannibal2.skyhanni.config.features.GUIConfig;
+import at.hannibal2.skyhanni.config.features.GardenConfig;
 import at.hannibal2.skyhanni.config.features.GhostCounterConfig;
-import at.hannibal2.skyhanni.config.features.Inventory;
-import at.hannibal2.skyhanni.config.features.ItemAbilities;
-import at.hannibal2.skyhanni.config.features.MarkedPlayers;
-import at.hannibal2.skyhanni.config.features.Minions;
+import at.hannibal2.skyhanni.config.features.InventoryConfig;
+import at.hannibal2.skyhanni.config.features.ItemAbilityConfig;
+import at.hannibal2.skyhanni.config.features.MarkedPlayerConfig;
+import at.hannibal2.skyhanni.config.features.MinionsConfig;
 import at.hannibal2.skyhanni.config.features.MiscConfig;
-import at.hannibal2.skyhanni.config.features.Mobs;
+import at.hannibal2.skyhanni.config.features.MobsConfig;
 import at.hannibal2.skyhanni.config.features.OldHidden;
 import at.hannibal2.skyhanni.config.features.RiftConfig;
 import at.hannibal2.skyhanni.config.features.SlayerConfig;
-import at.hannibal2.skyhanni.config.features.Summonings;
+import at.hannibal2.skyhanni.config.features.SummoningsConfig;
 import com.google.gson.annotations.Expose;
 import io.github.moulberry.moulconfig.Config;
 import io.github.moulberry.moulconfig.Social;
@@ -68,7 +68,7 @@ public class Features extends Config {
 
     @Expose
     @Category(name = "GUI Locations", desc = "Change the locations of GUI elements. (§e/sh gui§7)")
-    public GUI gui = new GUI();
+    public GUIConfig gui = new GUIConfig();
 
     @Expose
     @Category(name = "Chat", desc = "Change how the chat looks.")
@@ -76,35 +76,35 @@ public class Features extends Config {
 
     @Expose
     @Category(name = "Dungeon", desc = "Features that change the dungeon experience in catacombs.")
-    public Dungeon dungeon = new Dungeon();
+    public DungeonConfig dungeon = new DungeonConfig();
 
     @Expose
     @Category(name = "Inventory", desc = "Changing the behavior around items and the inventory.")
-    public Inventory inventory = new Inventory();
+    public InventoryConfig inventory = new InventoryConfig();
 
     @Expose
     @Category(name = "Item Abilities", desc = "Stuff about item abilities.")
-    public ItemAbilities itemAbilities = new ItemAbilities();
+    public ItemAbilityConfig itemAbilities = new ItemAbilityConfig();
 
     @Expose
     @Category(name = "Summonings", desc = "Mobs you revive.")
-    public Summonings summonings = new Summonings();
+    public SummoningsConfig summonings = new SummoningsConfig();
 
     @Expose
     @Category(name = "Ashfang", desc = "Ashfang fight in Crimson Isle.")
-    public Ashfang ashfang = new Ashfang();
+    public AshfangConfig ashfang = new AshfangConfig();
 
     @Expose
     @Category(name = "Minion", desc = "The minions at your private island.")
-    public Minions minions = new Minions();
+    public MinionsConfig minions = new MinionsConfig();
 
     @Expose
     @Category(name = "Bazaar", desc = "Bazaar settings.")
-    public Bazaar bazaar = new Bazaar();
+    public BazaarConfig bazaar = new BazaarConfig();
 
     @Expose
     @Category(name = "Fishing", desc = "Fishing stuff.")
-    public Fishing fishing = new Fishing();
+    public FishingConfig fishing = new FishingConfig();
 
     @Expose
     @Category(name = "Damage Indicator", desc = "Better damage overview in combat with bosses of all sorts.")
@@ -120,23 +120,23 @@ public class Features extends Config {
 
     @Expose
     @Category(name = "Commands", desc = "Enable or disable commands.")
-    public CommandsFeatures commands = new CommandsFeatures();
+    public CommandsConfig commands = new CommandsConfig();
 
     @Expose
     @Category(name = "Marked Players", desc = "Players that got marked with /shmarkplayer.")
-    public MarkedPlayers markedPlayers = new MarkedPlayers();
+    public MarkedPlayerConfig markedPlayers = new MarkedPlayerConfig();
 
     @Expose
     @Category(name = "Bingo", desc = "Features for the Bingo mode.")
-    public Bingo bingo = new Bingo();
+    public BingoConfig bingo = new BingoConfig();
 
     @Expose
     @Category(name = "Mobs", desc = "Visual help for Mobs")
-    public Mobs mobs = new Mobs();
+    public MobsConfig mobs = new MobsConfig();
 
     @Expose
     @Category(name = "Garden", desc = "Features on the Garden island.")
-    public Garden garden = new Garden();
+    public GardenConfig garden = new GardenConfig();
 
     @Expose
     @Category(name = "The Rift", desc = "Features for The Rift dimension.")
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Ashfang.java b/src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java
index 5b7536965..3515b9280 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Ashfang.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java
@@ -6,7 +6,7 @@ import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.moulberry.moulconfig.annotations.ConfigEditorColour;
 import io.github.moulberry.moulconfig.annotations.ConfigOption;
 
-public class Ashfang {
+public class AshfangConfig {
 
     @Expose
     @ConfigOption(name = "Freeze", desc = "Show the cooldown for how long Ashfang blocks your abilities.")
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Bazaar.java b/src/main/java/at/hannibal2/skyhanni/config/features/BazaarConfig.java
index f357e76fd..8f12ba667 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Bazaar.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/BazaarConfig.java
@@ -5,7 +5,7 @@ import com.google.gson.annotations.Expose;
 import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.moulberry.moulconfig.annotations.ConfigOption;
 
-public class Bazaar {
+public class BazaarConfig {
 
     @Expose
     @ConfigOption(name = "Purchase Helper", desc = "Highlights the item you are trying to buy in the Bazaar.")
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Bingo.java b/src/main/java/at/hannibal2/skyhanni/config/features/BingoConfig.java
index 6a6979b11..e083fbcbe 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Bingo.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/BingoConfig.java
@@ -7,7 +7,7 @@ import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.moulberry.moulconfig.annotations.ConfigOption;
 import io.github.moulberry.moulconfig.observer.Property;
 
-public class Bingo {
+public class BingoConfig {
 
     @Expose
     @ConfigOption(name = "Bingo Card", desc = "")
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/CommandsFeatures.java b/src/main/java/at/hannibal2/skyhanni/config/features/CommandsConfig.java
index c5be4a03b..dd0668743 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/CommandsFeatures.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/CommandsConfig.java
@@ -4,7 +4,7 @@ import com.google.gson.annotations.Expose;
 import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.moulberry.moulconfig.annotations.ConfigOption;
 
-public class CommandsFeatures {
+public class CommandsConfig {
 
     @Expose
     @ConfigOption(name = "Fandom Wiki", desc = "Use Fandom wiki (§ehypixel-skyblock.fandom.com§7) instead of the Hypixel wiki (§ewiki.hypixel.net§7).")
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java b/src/main/java/at/hannibal2/skyhanni/config/features/DungeonConfig.java
index b3021a63f..3e086812e 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/DungeonConfig.java
@@ -7,7 +7,7 @@ import io.github.moulberry.moulconfig.annotations.ConfigEditorAccordion;
 import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.moulberry.moulconfig.annotations.ConfigOption;
 
-public class Dungeon {
+public class DungeonConfig {
 
     @Expose
     @ConfigOption(name = "Clicked Blocks", desc = "Highlight levers, chests, and wither essence when clicked in dungeons.")
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java b/src/main/java/at/hannibal2/skyhanni/config/features/FishingConfig.java
index 8ff337693..b5018173c 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/FishingConfig.java
@@ -12,7 +12,7 @@ import io.github.moulberry.moulconfig.annotations.ConfigEditorSlider;
 import io.github.moulberry.moulconfig.annotations.ConfigOption;
 import io.github.moulberry.moulconfig.observer.Property;
 
-public class Fishing {
+public class FishingConfig {
 
     @ConfigOption(name = "Trophy Fishing", desc = "")
     @ConfigEditorAccordion(id = 0)
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/GUI.java b/src/main/java/at/hannibal2/skyhanni/config/features/GUIConfig.java
index e1a8f23c0..2e02156e3 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/GUI.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/GUIConfig.java
@@ -7,7 +7,7 @@ import io.github.moulberry.moulconfig.annotations.ConfigEditorKeybind;
 import io.github.moulberry.moulconfig.annotations.ConfigOption;
 import org.lwjgl.input.Keyboard;
 
-public class GUI {
+public class GUIConfig {
 
     @ConfigOption(name = "Edit GUI Locations", desc = "Change the position of SkyHanni's overlays")
     @ConfigEditorButton(buttonText = "Edit")
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java b/src/main/java/at/hannibal2/skyhanni/config/features/GardenConfig.java
index 5244aac76..a9360b814 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/GardenConfig.java
@@ -5,7 +5,17 @@ import at.hannibal2.skyhanni.config.core.config.Position;
 import at.hannibal2.skyhanni.features.garden.inventory.GardenPlotIcon;
 import at.hannibal2.skyhanni.utils.LorenzUtils;
 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.ConfigAccordionId;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorAccordion;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorButton;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorDraggableList;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorDropdown;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorKeybind;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorSlider;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorText;
+import io.github.moulberry.moulconfig.annotations.ConfigOption;
 import io.github.moulberry.moulconfig.observer.Property;
 import net.minecraft.client.Minecraft;
 import org.lwjgl.input.Keyboard;
@@ -15,7 +25,7 @@ import java.util.Arrays;
 import java.util.List;
 
 @SuppressWarnings("deprecation")
-public class Garden {
+public class GardenConfig {
 
     @Expose
     @ConfigOption(name = "SkyMart", desc = "")
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java b/src/main/java/at/hannibal2/skyhanni/config/features/InventoryConfig.java
index ffa412aff..883eb3a27 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/InventoryConfig.java
@@ -2,13 +2,20 @@ package at.hannibal2.skyhanni.config.features;
 
 import at.hannibal2.skyhanni.config.core.config.Position;
 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.ConfigAccordionId;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorAccordion;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorDraggableList;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorDropdown;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorSlider;
+import io.github.moulberry.moulconfig.annotations.ConfigOption;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-public class Inventory {
+public class InventoryConfig {
 
     @ConfigOption(name = "Not Clickable Items", desc = "")
     @ConfigEditorAccordion(id = 0)
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/ItemAbilities.java b/src/main/java/at/hannibal2/skyhanni/config/features/ItemAbilityConfig.java
index 0955081dd..e4fc4f186 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/ItemAbilities.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/ItemAbilityConfig.java
@@ -1,9 +1,14 @@
 package at.hannibal2.skyhanni.config.features;
 
 import com.google.gson.annotations.Expose;
-import io.github.moulberry.moulconfig.annotations.*;
+import io.github.moulberry.moulconfig.annotations.ConfigAccordionId;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorAccordion;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorColour;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorDropdown;
+import io.github.moulberry.moulconfig.annotations.ConfigOption;
 
-public class ItemAbilities {
+public class ItemAbilityConfig {
 
     @Expose
     @ConfigOption(name = "Ability Cooldown", desc = "Show the cooldown of item abilities.")
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/MarkedPlayers.java b/src/main/java/at/hannibal2/skyhanni/config/features/MarkedPlayerConfig.java
index 6cdb94590..e199f7c55 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/MarkedPlayers.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/MarkedPlayerConfig.java
@@ -5,7 +5,7 @@ import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.moulberry.moulconfig.annotations.ConfigOption;
 import io.github.moulberry.moulconfig.observer.Property;
 
-public class MarkedPlayers {
+public class MarkedPlayerConfig {
 
     @Expose
     @ConfigOption(name = "Highlight in World", desc = "Highlight marked players in the world.")
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Minions.java b/src/main/java/at/hannibal2/skyhanni/config/features/MinionsConfig.java
index 5d6f3b1bd..17abf034a 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Minions.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/MinionsConfig.java
@@ -2,9 +2,14 @@ package at.hannibal2.skyhanni.config.features;
 
 import at.hannibal2.skyhanni.config.core.config.Position;
 import com.google.gson.annotations.Expose;
-import io.github.moulberry.moulconfig.annotations.*;
+import io.github.moulberry.moulconfig.annotations.ConfigAccordionId;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorAccordion;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorColour;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorSlider;
+import io.github.moulberry.moulconfig.annotations.ConfigOption;
 
-public class Minions {
+public class MinionsConfig {
 
     @Expose
     @ConfigOption(name = "Name Display", desc = "Show the minion name and tier over the minion.")
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Mobs.java b/src/main/java/at/hannibal2/skyhanni/config/features/MobsConfig.java
index c051bf0dc..652ab67e2 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Mobs.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/MobsConfig.java
@@ -6,7 +6,7 @@ import io.github.moulberry.moulconfig.annotations.ConfigEditorAccordion;
 import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.moulberry.moulconfig.annotations.ConfigOption;
 
-public class Mobs {
+public class MobsConfig {
 
     @Expose
     @ConfigOption(name = "Highlighters", desc = "")
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Summonings.java b/src/main/java/at/hannibal2/skyhanni/config/features/SummoningsConfig.java
index f9c121fb7..20e8aaa45 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Summonings.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/SummoningsConfig.java
@@ -7,7 +7,7 @@ import io.github.moulberry.moulconfig.annotations.ConfigEditorAccordion;
 import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.moulberry.moulconfig.annotations.ConfigOption;
 
-public class Summonings {
+public class SummoningsConfig {
 
     @Expose
     @ConfigOption(name = "Summoning Soul Display", desc = "Show the name of dropped summoning souls laying on the ground. " +