moved features in category and package order around

6 files changed, 28 insertions, 18 deletions

diff --git a/src/main/java/at/lorenz/mod/LorenzMod.java b/src/main/java/at/lorenz/mod/LorenzMod.java
index 1dd6edaa4..4d70626e5 100644
--- a/src/main/java/at/lorenz/mod/LorenzMod.java
+++ b/src/main/java/at/lorenz/mod/LorenzMod.java
@@ -10,7 +10,9 @@ import at.lorenz.mod.dungeon.DungeonChatFilter;
 import at.lorenz.mod.dungeon.DungeonData;
 import at.lorenz.mod.dungeon.DungeonHighlightClickedBlocks;
 import at.lorenz.mod.dungeon.damageindicator.DungeonBossDamageIndicator;
-import at.lorenz.mod.items.ItemAbilityCooldown;
+import at.lorenz.mod.items.HideNotClickableItems;
+import at.lorenz.mod.items.abilitycooldown.ItemAbilityCooldown;
+import at.lorenz.mod.items.ItemDisplayOverlayFeatures;
 import at.lorenz.mod.misc.*;
 import at.lorenz.mod.test.LorenzTest;
 import com.google.gson.Gson;
diff --git a/src/main/java/at/lorenz/mod/config/Features.java b/src/main/java/at/lorenz/mod/config/Features.java
index 25c36d310..f1a1a0a21 100644
--- a/src/main/java/at/lorenz/mod/config/Features.java
+++ b/src/main/java/at/lorenz/mod/config/Features.java
@@ -63,10 +63,6 @@ public class Features {
     @Category(name = "Debug", desc = "Debug and test stuff.")
     public Debug debug = new Debug();
 
-    @Expose
-    @Category(name = "Abilities", desc = "Stuff about abilities.")
-    public Abilities abilities = new Abilities();
-
     public static class Chat {
 
         @Expose
@@ -132,44 +128,62 @@ public class Features {
     public static class Items {
 
         @Expose
+        @ConfigOption(name = "Item Number as Stack", desc = "")
+        @ConfigEditorAccordion(id = 2)
+        public boolean filterTypes = false;
+
+        @Expose
         @ConfigOption(name = "Not Clickable Items", desc = "Hide items that are not clickable in " + "the current inventory: ah, bz, accessory bag, etc")
         @ConfigEditorBoolean
+        @ConfigAccordionId(id = 2)
         public boolean hideNotClickableItems = false;
 
         @Expose
         @ConfigOption(name = "Master Star Number", desc = "Shows the Tier of the Master Star.")
         @ConfigEditorBoolean
+        @ConfigAccordionId(id = 2)
         public boolean displayMasterStarNumber = false;
 
         @Expose
         @ConfigOption(name = "Master Skull Number", desc = "Shows the tier of the Master Skull accessory.")
         @ConfigEditorBoolean
+        @ConfigAccordionId(id = 2)
         public boolean displayMasterSkullNumber = false;
 
         @Expose
         @ConfigOption(name = "Dungeon Head Floor", desc = "Shows the correct floor for golden and diamond heads.")
         @ConfigEditorBoolean
+        @ConfigAccordionId(id = 2)
         public boolean displayDungeonHeadFloor = false;
 
         @Expose
         @ConfigOption(name = "New Year Cake", desc = "Shows the Number of the Year of New Year Cakes.")
         @ConfigEditorBoolean
+        @ConfigAccordionId(id = 2)
         public boolean displayNewYearCakeNumber = false;
 
         @Expose
         @ConfigOption(name = "Pet Level", desc = "Shows the level of the pet when not maxed.")
         @ConfigEditorBoolean
+        @ConfigAccordionId(id = 2)
         public boolean displayPetLevel = false;
 
         @Expose
         @ConfigOption(name = "Sack Name", desc = "Shows an abbreviation of the Sack name.")
         @ConfigEditorBoolean
+        @ConfigAccordionId(id = 2)
         public boolean displaySackName = false;
 
         @Expose
         @ConfigOption(name = "Minion Tier", desc = "Shows the Minion Tier over Items.")
         @ConfigEditorBoolean
+        @ConfigAccordionId(id = 2)
         public boolean displayMinionTier = false;
+
+        @Expose
+        @ConfigOption(name = "Ability Cooldown", desc = "Shows the cooldown of item abilities.")
+        @ConfigEditorBoolean
+        public boolean itemAbilityCooldown = false;
     }
 
     public static class Bazaar {
@@ -215,12 +229,4 @@ public class Features {
         @ConfigEditorButton(runnableId = "testPos", buttonText = "Edit")
         public Position testPos = new Position(10, 10, false, true);
     }
-
-    public static class Abilities {
-
-        @Expose
-        @ConfigOption(name = "Item Cooldown", desc = "Shows the cooldown of item abilities.")
-        @ConfigEditorBoolean
-        public boolean itemAbilityCooldown = false;
-    }
 }
diff --git a/src/main/java/at/lorenz/mod/HideNotClickableItems.kt b/src/main/java/at/lorenz/mod/items/HideNotClickableItems.kt
index 325eb32af..75a49b578 100644
--- a/src/main/java/at/lorenz/mod/HideNotClickableItems.kt
+++ b/src/main/java/at/lorenz/mod/items/HideNotClickableItems.kt
@@ -1,5 +1,6 @@
-package at.lorenz.mod
+package at.lorenz.mod.items
 
+import at.lorenz.mod.LorenzMod
 import at.lorenz.mod.bazaar.BazaarApi
 import at.lorenz.mod.events.GuiContainerEvent
 import at.lorenz.mod.utils.ItemUtils
diff --git a/src/main/java/at/lorenz/mod/ItemDisplayOverlayFeatures.kt b/src/main/java/at/lorenz/mod/items/ItemDisplayOverlayFeatures.kt
index 3efd35dd5..c07b2fff4 100644
--- a/src/main/java/at/lorenz/mod/ItemDisplayOverlayFeatures.kt
+++ b/src/main/java/at/lorenz/mod/items/ItemDisplayOverlayFeatures.kt
@@ -1,5 +1,6 @@
-package at.lorenz.mod
+package at.lorenz.mod.items
 
+import at.lorenz.mod.LorenzMod
 import at.lorenz.mod.events.GuiRenderItemEvent
 import at.lorenz.mod.utils.ItemUtils
 import at.lorenz.mod.utils.ItemUtils.cleanName
diff --git a/src/main/java/at/lorenz/mod/items/ItemAbilityCooldown.kt b/src/main/java/at/lorenz/mod/items/abilitycooldown/ItemAbilityCooldown.kt
index 84ab089dc..2a0c215ab 100644
--- a/src/main/java/at/lorenz/mod/items/ItemAbilityCooldown.kt
+++ b/src/main/java/at/lorenz/mod/items/abilitycooldown/ItemAbilityCooldown.kt
@@ -1,4 +1,4 @@
-package at.lorenz.mod.items
+package at.lorenz.mod.items.abilitycooldown
 
 import at.lorenz.mod.LorenzMod
 import at.lorenz.mod.events.GuiRenderItemEvent
@@ -53,7 +53,7 @@ class ItemAbilityCooldown {
     }
 
     private fun isEnabled(): Boolean {
-        return LorenzUtils.inSkyblock && LorenzMod.feature.abilities.itemAbilityCooldown
+        return LorenzUtils.inSkyblock && LorenzMod.feature.items.itemAbilityCooldown
     }
 
     private fun click(ability: Ability) {
diff --git a/src/main/java/at/lorenz/mod/items/WitherImpactDetection.kt b/src/main/java/at/lorenz/mod/items/abilitycooldown/WitherImpactDetection.kt
index 5312e28a3..e9f1d7eed 100644
--- a/src/main/java/at/lorenz/mod/items/WitherImpactDetection.kt
+++ b/src/main/java/at/lorenz/mod/items/abilitycooldown/WitherImpactDetection.kt
@@ -1,4 +1,4 @@
-package at.lorenz.mod.items
+package at.lorenz.mod.items.abilitycooldown
 
 import at.lorenz.mod.events.PacketEvent
 import at.lorenz.mod.utils.ItemUtil.asStringSet