added drop down list for damage indicator and for item numbers as stack size

2 files changed, 48 insertions, 42 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java b/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java
index d234145aa..a85172d46 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java
@@ -1,11 +1,13 @@
 package at.hannibal2.skyhanni.config.features;
 
-import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigAccordionId;
-import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorAccordion;
 import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorBoolean;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorDraggableList;
 import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigOption;
 import com.google.gson.annotations.Expose;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class Inventory {
 
     @Expose
@@ -14,45 +16,21 @@ public class Inventory {
     public boolean hideNotClickableItems = false;
 
     @Expose
-    @ConfigOption(name = "Item number as stack size", desc = "")
-    @ConfigEditorAccordion(id = 1)
-    public boolean filterTypes = false;
-
-    @Expose
-    @ConfigOption(name = "Master Star Number", desc = "Show the Tier of the Master Star.")
-    @ConfigEditorBoolean
-    @ConfigAccordionId(id = 1)
-    public boolean displayMasterStarNumber = false;
-
-    @Expose
-    @ConfigOption(name = "Master Skull Number", desc = "Show the tier of the Master Skull accessory.")
-    @ConfigEditorBoolean
-    @ConfigAccordionId(id = 1)
-    public boolean displayMasterSkullNumber = false;
-
-    @Expose
-    @ConfigOption(name = "Dungeon Head Floor", desc = "Show the correct floor for golden and diamond heads.")
-    @ConfigEditorBoolean
-    @ConfigAccordionId(id = 1)
-    public boolean displayDungeonHeadFloor = false;
-
-    @Expose
-    @ConfigOption(name = "New Year Cake", desc = "Show the Number of the Year of New Year Cakes.")
-    @ConfigEditorBoolean
-    @ConfigAccordionId(id = 1)
-    public boolean displayNewYearCakeNumber = false;
-
-    @Expose
-    @ConfigOption(name = "Pet Level", desc = "Show the level of the pet when not maxed.")
-    @ConfigEditorBoolean
-    @ConfigAccordionId(id = 1)
-    public boolean displayPetLevel = false;
-
-    @Expose
-    @ConfigOption(name = "Minion Tier", desc = "Show the Minion Tier over Items.")
-    @ConfigEditorBoolean
-    @ConfigAccordionId(id = 1)
-    public boolean displayMinionTier = false;
+    @ConfigOption(
+            name = "Item number as stack size",
+            desc = ""
+    )
+    @ConfigEditorDraggableList(
+            exampleText = {
+                    "\u00a7bMaster Star Tier",
+                    "\u00a7bMaster Skull Tier",
+                    "\u00a7bDungeon Head Floor Number",
+                    "\u00a7bNew Year Cake",
+                    "\u00a7bPet Level",
+                    "\u00a7bMinion Tier"
+            }
+    )
+    public List<Integer> itemNumberAsStackSize = new ArrayList<>();
 
     @Expose
     @ConfigOption(name = "Sack Name", desc = "Show an abbreviation of the Sack name.")
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java
index 2baf33fff..05aa1b1f0 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java
@@ -4,6 +4,10 @@ import at.hannibal2.skyhanni.config.gui.core.config.Position;
 import at.hannibal2.skyhanni.config.gui.core.config.annotations.*;
 import com.google.gson.annotations.Expose;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 public class Misc {
 
     @Expose
@@ -29,7 +33,31 @@ public class Misc {
             desc = "Change how the boss name should be displayed")
     @ConfigEditorDropdown(values = {"Disabled", "Full Name", "Short Name"})
     @ConfigAccordionId(id = 1)
-    public int damageIndicatorBossName = 0;
+    public int damageIndicatorBossName = 1;
+    @Expose
+    @ConfigOption(
+            name = "Select Boss",
+            desc = "Change what type of boss you want the damage indicator be enabled for."
+    )
+    @ConfigEditorDraggableList(
+            exampleText = {
+                    "\u00a7bDungeon All",
+                    "\u00a7bNether Mini Bosses",
+                    "\u00a7bVanquisher",
+                    "\u00a7bEndstone Protector",
+                    "\u00a7bEnder Dragon",
+                    "\u00a7bRevenant Horror",
+                    "\u00a7bSpider Slayer",
+                    "\u00a7bWolf Slayer",
+                    "\u00a7bVoidgloom Seraph",
+                    "\u00a7bBlaze Slayer",
+                    "\u00a7bHeadless Horseman"
+            }
+    )
+    @ConfigAccordionId(id = 1)
+    //TODO only show currently working and tested features
+    public List<Integer> damageIndicatorBossesToShow = new ArrayList<>(Arrays.asList(0, 1, 2, 5, 8));
+
 
     @Expose
     @ConfigOption(name = "Pet Display", desc = "Show the currently active pet.")