From f91973d60948d449cc45a4add901e6fe43aebd62 Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Fri, 16 Feb 2024 21:21:43 +1100
Subject: Moved many regex patterns in the repo and code cleanup. #871

---
 .../skyhanni/features/minion/MinionFeatures.kt      | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

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

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 5b1a9e64b..5f623359e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt
@@ -66,13 +66,24 @@ class MinionFeatures {
 
     private var lastInventoryClosed = 0L
     private var coinsPerDay = ""
-    private val minionUpgradePattern by RepoPattern.pattern(
-        "minion.chat.upgrade",
+
+    private val patternGroup = RepoPattern.group("minion")
+    private val minionUpgradePattern by patternGroup.pattern(
+        "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 minionCollectItemPattern by RepoPattern.pattern("minion.item.collect", "^§aCollect All$")
+    private val minionCoinPattern by patternGroup.pattern(
+        "chat.coin",
+        "§aYou received §r§6(.*) coins§r§a!"
+    )
+    private val minionTitlePattern by patternGroup.pattern(
+        "title",
+        "Minion [^➜]"
+    )
+    private val minionCollectItemPattern by patternGroup.pattern(
+        "item.collect",
+        "^§aCollect All$"
+    )
 
     @SubscribeEvent
     fun onPlayerInteract(event: PlayerInteractEvent) {
-- 
cgit