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

1 files changed, 15 insertions, 15 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/items/ItemDisplayOverlayFeatures.kt b/src/main/java/at/hannibal2/skyhanni/items/ItemDisplayOverlayFeatures.kt
index 592d94fad..30428157f 100644
--- a/src/main/java/at/hannibal2/skyhanni/items/ItemDisplayOverlayFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/items/ItemDisplayOverlayFeatures.kt
@@ -42,7 +42,7 @@ class ItemDisplayOverlayFeatures {
     private fun getStackTip(item: ItemStack): String {
         val name = item.cleanName()
 
-        if (SkyHanniMod.feature.inventory.displayMasterStarNumber) {
+        if (SkyHanniMod.feature.inventory.itemNumberAsStackSize.contains(0)) {
             when (name) {
                 "First Master Star" -> return "1"
                 "Second Master Star" -> return "2"
@@ -52,13 +52,13 @@ class ItemDisplayOverlayFeatures {
             }
         }
 
-        if (SkyHanniMod.feature.inventory.displayMasterSkullNumber) {
+        if (SkyHanniMod.feature.inventory.itemNumberAsStackSize.contains(1)) {
             if (name.matchRegex("(.*)Master Skull - Tier .")) {
                 return name.substring(name.length - 1)
             }
         }
 
-        if (SkyHanniMod.feature.inventory.displayDungeonHeadFloor) {
+        if (SkyHanniMod.feature.inventory.itemNumberAsStackSize.contains(2)) {
             if (name.contains("Golden ") || name.contains("Diamond ")) {
                 when {
                     name.contains("Bonzo") -> return "1"
@@ -72,13 +72,13 @@ class ItemDisplayOverlayFeatures {
             }
         }
 
-        if (SkyHanniMod.feature.inventory.displayNewYearCakeNumber) {
+        if (SkyHanniMod.feature.inventory.itemNumberAsStackSize.contains(3)) {
             if (name.startsWith("New Year Cake (")) {
                 return "§b" + name.between("(Year ", ")")
             }
         }
 
-        if (SkyHanniMod.feature.inventory.displayPetLevel) {
+        if (SkyHanniMod.feature.inventory.itemNumberAsStackSize.contains(4)) {
             if (ItemUtils.isPet(name)) {
                 val level = name.between("Lvl ", "] ").toInt()
                 if (level != ItemUtils.maxPetLevel(name)) {
@@ -87,6 +87,16 @@ class ItemDisplayOverlayFeatures {
             }
         }
 
+        if (SkyHanniMod.feature.inventory.itemNumberAsStackSize.contains(5)) {
+            if (name.contains(" Minion ")) {
+                if (item.getLore().any { it.contains("Place this minion") }) {
+                    val array = name.split(" ")
+                    val last = array[array.size - 1]
+                    return last.romanToDecimal().toString()
+                }
+            }
+        }
+
         if (SkyHanniMod.feature.inventory.displaySackName) {
             if (ItemUtils.isSack(name)) {
                 //TODO fix this and replace other
@@ -97,16 +107,6 @@ class ItemDisplayOverlayFeatures {
             }
         }
 
-        if (SkyHanniMod.feature.inventory.displayMinionTier) {
-            if (name.contains(" Minion ")) {
-                if (item.getLore().any { it.contains("Place this minion") }) {
-                    val array = name.split(" ")
-                    val last = array[array.size - 1]
-                    return last.romanToDecimal().toString()
-                }
-            }
-        }
-
         return ""
     }