From ab74fb169d427b66c73da184ac5a07ec07b34e02 Mon Sep 17 00:00:00 2001
From: Walker Selby <git@walkerselby.com>
Date: Sun, 3 Dec 2023 19:30:48 -0800
Subject: Internal Change: Regex To Pattern in BazaarApi, CropAccessoryData,
 andDicerRngCounter (#647)

Misc pattern optimizations. #647
---
 .../java/at/hannibal2/skyhanni/data/CropAccessoryData.kt     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

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

diff --git a/src/main/java/at/hannibal2/skyhanni/data/CropAccessoryData.kt b/src/main/java/at/hannibal2/skyhanni/data/CropAccessoryData.kt
index 79202ffa2..ad5d01d3c 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/CropAccessoryData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/CropAccessoryData.kt
@@ -10,6 +10,7 @@ import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NEUItems
+import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
 import com.google.gson.JsonElement
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.CompressedStreamTools
@@ -20,7 +21,7 @@ import java.util.Base64
 
 class CropAccessoryData {
     // TODO USE SH-REPO
-    private val accessoryBagNamePattern = "Accessory Bag \\((\\d)/(\\d)\\)".toRegex()
+    private val accessoryBagNamePattern = "Accessory Bag \\((?<current>\\d)/(?<total>\\d)\\)".toPattern()
     private var loadedAccessoryThisProfile = false
     private var ticks = 0
     private var accessoryInBag: CropAccessory? = null
@@ -48,10 +49,11 @@ class CropAccessoryData {
             return
         }
 
-        val groups = accessoryBagNamePattern.matchEntire(event.inventoryName)?.groups ?: return
-        isLoadingAccessories = true
-        accessoryBagPageCount = groups[2]!!.value.toInt()
-        accessoryBagPageNumber = groups[1]!!.value.toInt()
+        accessoryBagNamePattern.matchMatcher(event.inventoryName) {
+            isLoadingAccessories = true
+            accessoryBagPageNumber = group("current").toInt()
+            accessoryBagPageCount = group("total").toInt()
+        } ?: return
     }
 
     @SubscribeEvent
-- 
cgit