diff options
| author | Walker Selby <git@walkerselby.com> | 2023-12-03 19:30:48 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-04 04:30:48 +0100 |
| commit | ab74fb169d427b66c73da184ac5a07ec07b34e02 (patch) | |
| tree | 44509044a72ef8d41a3000ffb8f74b1e1393af81 /src/main/java/at/hannibal2/skyhanni/data | |
| parent | 4aab6d58e4c7a7b67acf8dac2dbff76fbe6a6ca1 (diff) | |
| download | skyhanni-ab74fb169d427b66c73da184ac5a07ec07b34e02.tar.gz skyhanni-ab74fb169d427b66c73da184ac5a07ec07b34e02.tar.bz2 skyhanni-ab74fb169d427b66c73da184ac5a07ec07b34e02.zip | |
Internal Change: Regex To Pattern in BazaarApi, CropAccessoryData, andDicerRngCounter (#647)
Misc pattern optimizations. #647
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/data')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/CropAccessoryData.kt | 12 |
1 files changed, 7 insertions, 5 deletions
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 |