Merge remote-tracking branch 'origin/beta' into beta

3 files changed, 9 insertions, 11 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/data/PurseAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/PurseAPI.kt
index 184d41567..a9c18c60c 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/PurseAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/PurseAPI.kt
@@ -15,7 +15,7 @@ object PurseAPI {
     private val patternGroup = RepoPattern.group("data.purse")
     private val coinsPattern by patternGroup.pattern(
         "coins",
-        "(Piggy|Purse): §6(?<coins>[\\d,]+).*"
+        "(§.)*(Piggy|Purse): §6(?<coins>[\\d,.]+)( ?(§.)*\\([+-](?<earned>[\\d,.]+)\\)?|.*)?$"
     )
     val piggyPattern by patternGroup.pattern(
         "piggy",
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
index d768bb844..75a4063a2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
@@ -25,10 +25,12 @@ import at.hannibal2.skyhanni.events.RenderItemTipEvent
 import at.hannibal2.skyhanni.features.garden.pests.PestAPI
 import at.hannibal2.skyhanni.utils.ConfigUtils
 import at.hannibal2.skyhanni.utils.InventoryUtils
+import at.hannibal2.skyhanni.utils.ItemCategory
 import at.hannibal2.skyhanni.utils.ItemUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.cleanName
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
+import at.hannibal2.skyhanni.utils.ItemUtils.getItemCategoryOrNull
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.LorenzUtils.between
@@ -39,6 +41,7 @@ import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimal
 import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimalIfNecessary
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getBottleOfJyrreSeconds
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getEdition
+import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getPetLevel
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getRanchersSpeed
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
@@ -120,15 +123,10 @@ object ItemDisplayOverlayFeatures {
         }
 
         if (PET_LEVEL.isSelected()) {
-            val containerName = InventoryUtils.openInventoryName()
-            if (!containerName.endsWith("Sea Creature Guide") && ItemUtils.isPet(itemName)) {
-                petLevelPattern.matchMatcher(itemName) {
-                    val rawLevel = group("level")
-                    val level = rawLevel.toIntOrNull()
-                        ?: throw IllegalStateException("pet level not found for item name '$itemName'")
-                    if (level != ItemUtils.maxPetLevel(itemName)) {
-                        return "$level"
-                    }
+            if (item.getItemCategoryOrNull() == ItemCategory.PET) {
+                val level = item.getPetLevel()
+                if (level != ItemUtils.maxPetLevel(itemName)) {
+                    return level.toString()
                 }
             }
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt b/src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt
index 5f466f33f..20a4f3db4 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt
@@ -43,7 +43,7 @@ object UtilsPatterns {
     )
     val petLevelPattern by patternGroup.pattern(
         "item.petlevel",
-        "(?:§f§f)?§7\\[Lvl (?<level>\\d+)] .*"
+        "(?:§f§f)?(?:§7)?\\[Lvl (?<level>\\d+)] .*"
     )
     val readAmountBeforePattern by patternGroup.pattern(
         "item.amount.front",