From 62efc12ae194f8aee0bac3991ed584f9e426e549 Mon Sep 17 00:00:00 2001
From: Lorenz <ESs95s3P5z8Pheb>
Date: Sat, 23 Jul 2022 08:40:56 +0200
Subject: adding anvil combine helper feature

---
 .../at/hannibal2/skyhanni/items/HideNotClickableItems.kt   |  2 +-
 .../hannibal2/skyhanni/items/ItemDisplayOverlayFeatures.kt | 14 +++++++-------
 .../skyhanni/items/abilitycooldown/ItemAbilityCooldown.kt  |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/main/java/at/hannibal2/skyhanni/items')

diff --git a/src/main/java/at/hannibal2/skyhanni/items/HideNotClickableItems.kt b/src/main/java/at/hannibal2/skyhanni/items/HideNotClickableItems.kt
index 97eefe1ab..57b727791 100644
--- a/src/main/java/at/hannibal2/skyhanni/items/HideNotClickableItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/items/HideNotClickableItems.kt
@@ -164,7 +164,7 @@ class HideNotClickableItems {
     private fun isDisabled(): Boolean {
         if (bypassUntil > System.currentTimeMillis()) return true
 
-        return !SkyHanniMod.feature.items.hideNotClickableItems
+        return !SkyHanniMod.feature.inventory.hideNotClickableItems
     }
 
     private fun hide(chestName: String, stack: ItemStack): Boolean {
diff --git a/src/main/java/at/hannibal2/skyhanni/items/ItemDisplayOverlayFeatures.kt b/src/main/java/at/hannibal2/skyhanni/items/ItemDisplayOverlayFeatures.kt
index d5054ae47..6a3f7688c 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.items.displayMasterStarNumber) {
+        if (SkyHanniMod.feature.inventory.displayMasterStarNumber) {
             when (name) {
                 "First Master Star" -> return "1"
                 "Second Master Star" -> return "2"
@@ -52,13 +52,13 @@ class ItemDisplayOverlayFeatures {
             }
         }
 
-        if (SkyHanniMod.feature.items.displayMasterSkullNumber) {
+        if (SkyHanniMod.feature.inventory.displayMasterSkullNumber) {
             if (name.matchRegex("(.*)Master Skull - Tier .")) {
                 return name.substring(name.length - 1)
             }
         }
 
-        if (SkyHanniMod.feature.items.displayDungeonHeadFloor) {
+        if (SkyHanniMod.feature.inventory.displayDungeonHeadFloor) {
             if (name.contains("Golden ") || name.contains("Diamond ")) {
                 when {
                     name.contains("Bonzo") -> return "1"
@@ -72,13 +72,13 @@ class ItemDisplayOverlayFeatures {
             }
         }
 
-        if (SkyHanniMod.feature.items.displayNewYearCakeNumber) {
+        if (SkyHanniMod.feature.inventory.displayNewYearCakeNumber) {
             if (name.startsWith("New Year Cake (")) {
                 return "§b" + name.between("(Year ", ")")
             }
         }
 
-        if (SkyHanniMod.feature.items.displayPetLevel) {
+        if (SkyHanniMod.feature.inventory.displayPetLevel) {
             if (ItemUtils.isPet(name)) {
                 val level = name.between("Lvl ", "] ").toInt()
                 if (level != ItemUtils.maxPetLevel(name)) {
@@ -87,7 +87,7 @@ class ItemDisplayOverlayFeatures {
             }
         }
 
-        if (SkyHanniMod.feature.items.displaySackName) {
+        if (SkyHanniMod.feature.inventory.displaySackName) {
             if (ItemUtils.isSack(name)) {
                 //TODO fix this and replace other
 //                val sackName = grabSackName(name)
@@ -97,7 +97,7 @@ class ItemDisplayOverlayFeatures {
             }
         }
 
-        if (SkyHanniMod.feature.items.displayMinionTier) {
+        if (SkyHanniMod.feature.inventory.displayMinionTier) {
             if (name.contains(" Minion ")) {
                 if (item.getLore().any { it.contains("Place this minion") }) {
                     val array = name.split(" ")
diff --git a/src/main/java/at/hannibal2/skyhanni/items/abilitycooldown/ItemAbilityCooldown.kt b/src/main/java/at/hannibal2/skyhanni/items/abilitycooldown/ItemAbilityCooldown.kt
index 708b81693..726c3172f 100644
--- a/src/main/java/at/hannibal2/skyhanni/items/abilitycooldown/ItemAbilityCooldown.kt
+++ b/src/main/java/at/hannibal2/skyhanni/items/abilitycooldown/ItemAbilityCooldown.kt
@@ -53,7 +53,7 @@ class ItemAbilityCooldown {
     }
 
     private fun isEnabled(): Boolean {
-        return LorenzUtils.inSkyblock && SkyHanniMod.feature.items.itemAbilityCooldown
+        return LorenzUtils.inSkyblock && SkyHanniMod.feature.inventory.itemAbilityCooldown
     }
 
     private fun click(ability: Ability) {
-- 
cgit