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

2 files changed, 11 insertions, 2 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/KingTalismanHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/KingTalismanHelper.kt
index 08f4c59e6..5a4bf0f89 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/KingTalismanHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/KingTalismanHelper.kt
@@ -17,6 +17,7 @@ import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.TimeUtils
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import io.github.moulberry.notenoughupdates.util.SkyBlockTime
 import net.minecraft.entity.item.EntityArmorStand
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -27,6 +28,11 @@ class KingTalismanHelper {
     private val config get() = SkyHanniMod.feature.mining.kingTalisman
     private val storage get() = ProfileStorageData.profileSpecific?.mining
 
+    private val kingPattern by RepoPattern.pattern(
+        "mining.kingtalisman.king",
+        "§6§lKing (?<name>.*)"
+    )
+
     companion object {
 
         private var currentOffset: Int? = null
@@ -88,7 +94,7 @@ class KingTalismanHelper {
     private fun checkOffset() {
         val king = EntityUtils.getEntitiesNearby<EntityArmorStand>(LorenzVec(129.6, 196.0, 196.7), 2.0)
             .filter { it.name.startsWith("§6§lKing ") }.firstOrNull() ?: return
-        val foundKing = "§6§lKing (?<name>.*)".toPattern().matchMatcher(king.name) {
+        val foundKing = kingPattern.matchMatcher(king.name) {
             group("name")
         } ?: return
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderChestReward.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderChestReward.kt
index 3df832563..b5abd78ea 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderChestReward.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderChestReward.kt
@@ -149,7 +149,10 @@ enum class PowderChestReward(val displayName: String, pattern: String) {
     GOLD_ESSENCE("§6Gold Essence", "§aYou received §r§6[+](?<amount>.*) Gold Essence§r§a."),
     ;
 
-    val chatPattern by RepoPattern.pattern("mining.powder.tracker.reward." + this.patternName(), pattern)
+    val chatPattern by RepoPattern.pattern(
+        "mining.powder.tracker.reward." + this.patternName(),
+        pattern
+    )
 
     private fun patternName() = name.lowercase().replace("_", "")
 }