Moved many regex patterns in the repo and code cleanup. #871

2 files changed, 29 insertions, 13 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarCancelledBuyOrderClipboard.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarCancelledBuyOrderClipboard.kt
index b0e96ca1f..3c5403309 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarCancelledBuyOrderClipboard.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarCancelledBuyOrderClipboard.kt
@@ -8,15 +8,22 @@ import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.OSUtils
+import at.hannibal2.skyhanni.utils.StringUtils.findMatcher
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import java.util.regex.Pattern
 
 class BazaarCancelledBuyOrderClipboard {
 
-    private val patternLastAmount = Pattern.compile("§a(?<amount>.*)§7x")
-    private val patternCancelledMessage =
-        "§6\\[Bazaar] §r§7§r§cCancelled! §r§7Refunded §r§6(?<coins>.*) coins §r§7from cancelling Buy Order!".toPattern()
+    private val patternGroup = RepoPattern.group("bazaar.cancelledorder")
+    private val lastAmountPattern by patternGroup.pattern(
+        "lastamount",
+        "§a(?<amount>.*)§7x"
+    )
+    private val cancelledMessagePattern by patternGroup.pattern(
+        "cancelledmessage",
+        "§6\\[Bazaar] §r§7§r§cCancelled! §r§7Refunded §r§6(?<coins>.*) coins §r§7from cancelling Buy Order!"
+    )
 
     private var latestAmount: String? = null
 
@@ -29,9 +36,8 @@ class BazaarCancelledBuyOrderClipboard {
         if (!name.contains("Cancel Order")) return
 
         for (line in stack.getLore()) {
-            val matcher = patternLastAmount.matcher(line)
-            if (matcher.find()) {
-                latestAmount = matcher.group("amount")
+            lastAmountPattern.findMatcher(line) {
+                latestAmount = group("amount")
             }
         }
     }
@@ -40,8 +46,8 @@ class BazaarCancelledBuyOrderClipboard {
     fun onChat(event: LorenzChatEvent) {
         if (!isEnabled()) return
 
-        patternCancelledMessage.matchMatcher(event.message) {
-            event.blockedReason = "bazaar cancelled buy order clipbaord"
+        cancelledMessagePattern.matchMatcher(event.message) {
+            event.blockedReason = "bazaar cancelled buy order clipboard"
             val coins = group("coins")
             ChatUtils.chat("Bazaar buy order cancelled. $latestAmount saved to clipboard. ($coins coins)")
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarOrderHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarOrderHelper.kt
index da828ef31..6a42fe214 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarOrderHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarOrderHelper.kt
@@ -10,16 +10,26 @@ import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.RenderUtils.highlight
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraft.client.gui.inventory.GuiChest
 import net.minecraft.inventory.ContainerChest
 import net.minecraft.inventory.Slot
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class BazaarOrderHelper {
-
-    private val bazaarItemNamePattern = "§.§l(?<type>BUY|SELL) (?<name>.*)".toPattern()
-    private val filledPattern = "§7Filled: §[a6].*§7/.* §a§l100%!".toPattern()
-    private val pricePattern = "§7Price per unit: §6(?<number>.*) coins".toPattern()
+    private val patternGroup = RepoPattern.group("bazaar.orderhelper")
+    private val bazaarItemNamePattern by patternGroup.pattern(
+        "itemname",
+        "§.§l(?<type>BUY|SELL) (?<name>.*)"
+    )
+    private val filledPattern by patternGroup.pattern(
+        "filled",
+        "§7Filled: §[a6].*§7/.* §a§l100%!"
+    )
+    private val pricePattern by patternGroup.pattern(
+        "price",
+        "§7Price per unit: §6(?<number>.*) coins"
+    )
 
     companion object {