From b35e6bb19986329a3c9d000caf7481c0b78f51cc Mon Sep 17 00:00:00 2001
From: Thunderblade73 <gaidermarkus@gmail.com>
Date: Sat, 9 Dec 2023 21:37:32 +0100
Subject: [PATCH] Fix: Bazaar showing Minion XP

---
 .../at/hannibal2/skyhanni/features/minion/MinionFeatures.kt  | 5 +++--
 src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt     | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt
index 5cf77b78046c..9aee4035d5fd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt
@@ -33,6 +33,7 @@ import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimalIfNecessary
 import at.hannibal2.skyhanni.utils.RenderUtils.drawString
 import at.hannibal2.skyhanni.utils.RenderUtils.renderString
 import at.hannibal2.skyhanni.utils.SpecialColour
+import at.hannibal2.skyhanni.utils.StringUtils.find
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.StringUtils.matches
 import at.hannibal2.skyhanni.utils.TimeUtils
@@ -64,7 +65,7 @@ class MinionFeatures {
     private var coinsPerDay = ""
     private val minionUpgradePattern by RepoPattern.pattern("minion.chat.upgrade", "§aYou have upgraded your Minion to Tier (?<tier>.*)")
     private val minionCoinPattern by RepoPattern.pattern("minion.chat.coin", "§aYou received §r§6(.*) coins§r§a!")
-    private val minionTitlePattern by RepoPattern.pattern("minion.title", "Minion ")
+    private val minionTitlePattern by RepoPattern.pattern("minion.title", "Minion [^➜]")
     private val minionCollectItemPattern by RepoPattern.pattern("minion.item.collect", "^§aCollect All$")
 
     @SubscribeEvent
@@ -129,7 +130,7 @@ class MinionFeatures {
     @SubscribeEvent
     fun onInventoryOpen(event: InventoryFullyOpenedEvent) {
         if (!enableWithHub()) return
-        if (!minionTitlePattern.matches(event.inventoryName)) return
+        if (!minionTitlePattern.find(event.inventoryName)) return
 
         event.inventoryItems[48]?.let {
             if (minionCollectItemPattern.matches(it.name ?: "")) {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
index cb7a0fa2353e..5cde8f6f9cfa 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
@@ -263,4 +263,6 @@ object StringUtils {
     }
 
     fun Pattern.matches(string: String) = matcher(string).matches()
+
+    fun Pattern.find(string: String) = matcher(string).find()
 }