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

---
 .../bazaar/BazaarCancelledBuyOrderClipboard.kt     |  24 +-
 .../skyhanni/features/bazaar/BazaarOrderHelper.kt  |  18 +-
 .../hannibal2/skyhanni/features/bingo/BingoAPI.kt  |   5 +-
 .../skyhanni/features/bingo/CompactBingoChat.kt    |  27 ++-
 .../skyhanni/features/bingo/MinionCraftHelper.kt   |   8 +-
 .../features/bingo/card/BingoCardReader.kt         |  19 +-
 .../card/nextstephelper/BingoNextStepHelper.kt     |  29 ++-
 .../features/chat/ArachneChatMessageHider.kt       |  22 +-
 .../skyhanni/features/chat/PlayerDeathMessages.kt  |   7 +-
 .../skyhanni/features/combat/BestiaryData.kt       |  14 +-
 .../features/combat/ghostcounter/GhostCounter.kt   |  38 +++-
 .../skyhanni/features/combat/mobs/SpawnTimers.kt   |  19 +-
 .../features/event/diana/DianaProfitTracker.kt     |   9 +-
 .../event/diana/InquisitorWaypointShare.kt         |  15 +-
 .../event/diana/MythologicalCreatureTracker.kt     |  39 ++--
 .../event/jerry/frozentreasure/FrozenTreasure.kt   |   9 +-
 .../jerry/frozentreasure/FrozenTreasureTracker.kt  |  12 +-
 .../lobby/waypoints/christmas/PresentWaypoints.kt  |  18 +-
 .../features/event/winter/UniqueGiftCounter.kt     |   8 +-
 .../fishing/tracker/FishingProfitTracker.kt        |   6 +-
 .../features/fishing/tracker/SeaCreatureTracker.kt |   5 +-
 .../features/fishing/trophy/TrophyFishMessages.kt  |   9 +-
 .../features/garden/FarmingFortuneDisplay.kt       | 247 +++++++++++----------
 .../features/garden/GardenCropMilestoneFix.kt      |  13 +-
 .../skyhanni/features/garden/GardenLevelDisplay.kt |  22 +-
 .../features/garden/GardenNextJacobContest.kt      |  23 +-
 .../skyhanni/features/garden/GardenOptimalSpeed.kt |   8 +-
 .../skyhanni/features/garden/GardenPlotAPI.kt      |  11 +-
 .../skyhanni/features/garden/GardenWarpCommands.kt |   8 +-
 .../skyhanni/features/garden/ToolTooltipTweaks.kt  |   2 +-
 .../garden/composter/ComposterInventoryNumbers.kt  |  14 +-
 .../features/garden/contest/ContestBracket.kt      |   7 +-
 .../features/garden/contest/FarmingContestAPI.kt   |  25 ++-
 .../garden/contest/JacobContestFFNeededDisplay.kt  |   2 +-
 .../garden/contest/JacobContestTimeNeeded.kt       |   2 +-
 .../features/garden/farming/ArmorDropTracker.kt    |  10 +-
 .../features/garden/farming/DicerRngDropTracker.kt |  54 +++--
 .../garden/fortuneguide/CaptureFarmingGear.kt      | 142 ++++++------
 .../garden/inventory/AnitaExtraFarmingFortune.kt   |   9 +-
 .../garden/inventory/GardenInventoryNumbers.kt     |   8 +-
 .../garden/inventory/SkyMartCopperPrice.kt         |   7 +-
 .../skyhanni/features/garden/pests/PestFinder.kt   |  14 +-
 .../skyhanni/features/garden/pests/PestSpawn.kt    |  17 +-
 .../garden/visitor/GardenVisitorDropStatistics.kt  |  38 +++-
 .../garden/visitor/GardenVisitorFeatures.kt        |  30 ++-
 .../features/garden/visitor/GardenVisitorTimer.kt  |  10 +-
 .../features/garden/visitor/NPCVisitorFix.kt       |   6 +-
 .../features/inventory/AuctionsHighlighter.kt      |   1 +
 .../skyhanni/features/inventory/HarpFeatures.kt    |  17 +-
 .../inventory/ItemDisplayOverlayFeatures.kt        |  40 +++-
 .../skyhanni/features/inventory/ItemStars.kt       |   9 +-
 .../skyhanni/features/inventory/StatsTuning.kt     |   9 +-
 .../skyhanni/features/inventory/tiarelay/Relay.kt  |   6 +-
 .../abilitycooldown/ItemAbilityCooldown.kt         |  13 +-
 .../skyhanni/features/mining/KingTalismanHelper.kt |   8 +-
 .../mining/powdertracker/PowderChestReward.kt      |   5 +-
 .../skyhanni/features/minion/MinionFeatures.kt     |  21 +-
 .../skyhanni/features/misc/CurrentPetDisplay.kt    |  23 +-
 .../skyhanni/features/misc/InGameDateDisplay.kt    |   8 +-
 .../features/misc/NonGodPotEffectDisplay.kt        |   9 +-
 .../features/misc/PatcherSendCoordinates.kt        |   9 +-
 .../skyhanni/features/misc/PlayerChatSymbols.kt    |  13 +-
 .../skyhanni/features/misc/ServerRestartTitle.kt   |   9 +-
 .../misc/compacttablist/AdvancedPlayerList.kt      |   9 +-
 .../features/misc/compacttablist/TabListReader.kt  |  42 +++-
 .../misc/compacttablist/TabListRenderer.kt         |   5 +-
 .../features/misc/compacttablist/TabStringType.kt  |   7 +-
 .../misc/teleportpad/TeleportPadCompactName.kt     |  18 +-
 .../misc/teleportpad/TeleportPadInventoryNumber.kt |   9 +-
 .../features/misc/trevor/TrevorFeatures.kt         |  48 ++--
 .../skyhanni/features/misc/trevor/TrevorTracker.kt |  28 ++-
 .../nether/ashfang/AshfangFreezeCooldown.kt        |   7 +-
 .../area/stillgorechateau/RiftBloodEffigies.kt     |  17 +-
 .../rift/area/westvillage/VerminTracker.kt         |  28 ++-
 .../rift/area/westvillage/kloon/KloonHacking.kt    |   9 +-
 .../rift/everywhere/CruxTalismanDisplay.kt         |   8 +-
 .../skyhanni/features/rift/everywhere/RiftTimer.kt |   9 +-
 .../features/rift/everywhere/motes/RiftMotesOrb.kt |  11 +-
 .../rift/everywhere/motes/ShowMotesNpcSellPrice.kt |   9 +-
 .../features/slayer/SlayerBossSpawnSoon.kt         |  10 +-
 .../skyhanni/features/slayer/SlayerQuestWarning.kt |   8 +-
 .../features/slayer/SlayerRngMeterDisplay.kt       |  19 +-
 .../slayer/blaze/BlazeSlayerDaggerHelper.kt        |   7 +-
 .../features/stranded/HighlightPlaceableNpcs.kt    |   7 +-
 .../features/summonings/SummoningMobManager.kt     |  28 ++-
 85 files changed, 1119 insertions(+), 513 deletions(-)

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

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 {
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt
index a86a05c60..037233772 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt
@@ -27,7 +27,10 @@ object BingoAPI {
     val communityGoals get() = bingoGoals.values.filter { it.type == GoalType.COMMUNITY }
     var lastBingoCardOpenTime = SimpleTimeMark.farPast()
 
-    private val detectionPattern by RepoPattern.pattern("bingo.detection.scoreboard", " §.Ⓑ §.Bingo")
+    private val detectionPattern by RepoPattern.pattern(
+        "bingo.detection.scoreboard",
+        " §.Ⓑ §.Bingo"
+    )
 
     @SubscribeEvent
     fun onRepoReload(event: RepositoryReloadEvent) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt
index 7c0e74cae..814de64ef 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt
@@ -6,6 +6,7 @@ import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class CompactBingoChat {
@@ -16,20 +17,29 @@ class CompactBingoChat {
     private var inSkyBlockLevelUp = false
     private var inCollectionLevelUp = false
     private var collectionLevelUpLastLine: String? = null
-    private var newArea = 0// 0 = nothing, 1 = after first message, 2 = after second message
-    private val healthPattern = " {3}§r§7§8\\+§a.* §c❤ Health".toPattern()
-    private val strengthPattern = " {3}§r§7§8\\+§a. §c❁ Strength".toPattern()
+    private var newArea = 0 // 0 = nothing, 1 = after first message, 2 = after second message
+
+    private val patternGroup = RepoPattern.group("bingo.compactchat")
+    private val healthPattern by patternGroup.pattern(
+        "health",
+        " {3}§r§7§8\\+§a.* §c❤ Health"
+    )
+    private val strengthPattern by patternGroup.pattern(
+        "strength",
+        " {3}§r§7§8\\+§a. §c❁ Strength"
+    )
+    private val borderPattern by patternGroup.pattern(
+        "border",
+        "§[e3]§l▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬"
+    )
 
-    // TODO USE SH-REPO
     @SubscribeEvent
     fun onChat(event: LorenzChatEvent) {
         if (!config.enabled) return
         if (!LorenzUtils.isBingoProfile && !config.outsideBingo) return
 
         val message = event.message
-        if (message == "§3§l▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬" ||
-            message == "§e§l▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬"
-        ) {
+        borderPattern.matchMatcher(message) {
             inSkillLevelUp = false
             inSkyBlockLevelUp = false
             inCollectionLevelUp = false
@@ -45,6 +55,7 @@ class CompactBingoChat {
         if (onNewAreaDiscovered(message)) event.blockedReason = "compact_new_area_discovered"
     }
 
+    // TODO USE SH-REPO
     private fun onSkillLevelUp(message: String): Boolean {
         if (message.startsWith("  §r§b§lSKILL LEVEL UP ")) {
             inSkillLevelUp = true
@@ -74,7 +85,7 @@ class CompactBingoChat {
                 return true
             }
 
-            // No Bazaar and Community Shopin bingo
+            // No Bazaar and Community Shop in bingo
             if (message == "   §r§7§6Access to Bazaar") return true
             if (message == "   §r§7§bAccess to Community Shop") return true
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt
index 930ea6883..dbdf73535 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt
@@ -21,6 +21,7 @@ import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import io.github.moulberry.notenoughupdates.recipes.CraftingRecipe
 import net.minecraft.client.Minecraft
 import net.minecraft.item.ItemStack
@@ -31,8 +32,11 @@ class MinionCraftHelper {
 
     private val config get() = SkyHanniMod.feature.event.bingo
 
-    // TODO USE SH-REPO
-    private var minionNamePattern = "(?<name>.*) Minion (?<number>.*)".toPattern()
+    private val minionNamePattern by RepoPattern.pattern(
+        "bingo.minion.name",
+        "(?<name>.*) Minion (?<number>.*)"
+    )
+
     private var display = emptyList<String>()
     private var hasMinionInInventory = false
     private var hasItemsForMinion = false
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt
index be27e25a2..c0606ad54 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt
@@ -25,12 +25,19 @@ import kotlin.time.Duration
 class BingoCardReader {
 
     private val config get() = SkyHanniMod.feature.event.bingo.bingoCard
-
-    private val percentagePattern by RepoPattern.pattern("bingo.card.percentage", " {2}§8Top §.(?<percentage>.*)%")
-
-    // TODO USE SH-REPO
-    private val goalCompletePattern = "§6§lBINGO GOAL COMPLETE! §r§e(?<name>.*)".toPattern()
-    private val personalHiddenGoalPattern = ".*§7§eThe next hint will unlock in (?<time>.*)".toPattern()
+    private val patternGroup = RepoPattern.group("bingo.card")
+    private val percentagePattern by patternGroup.pattern(
+        "percentage",
+        " {2}§8Top §.(?<percentage>.*)%"
+    )
+    private val goalCompletePattern by patternGroup.pattern(
+        "goalcomplete",
+        "§6§lBINGO GOAL COMPLETE! §r§e(?<name>.*)"
+    )
+    private val personalHiddenGoalPattern by patternGroup.pattern(
+        "hiddengoal",
+        ".*§7§eThe next hint will unlock in (?<time>.*)"
+    )
 
     @SubscribeEvent
     fun onInventoryOpen(event: InventoryUpdatedEvent) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/BingoNextStepHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/BingoNextStepHelper.kt
index 6987edb82..be4a8c7a4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/BingoNextStepHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/BingoNextStepHelper.kt
@@ -24,6 +24,7 @@ import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class BingoNextStepHelper {
@@ -31,15 +32,31 @@ class BingoNextStepHelper {
     private val config get() = SkyHanniMod.feature.event.bingo.bingoCard
     private var dirty = true
 
-    // TODO USE SH-REPO
-    private val crystalObtainedPattern = " *§r§e(?<crystalName>Topaz|Sapphire|Jade|Amethyst|Amber) Crystal".toPattern()
+    private val patternGroup = RepoPattern.group("bingo.steps")
+    private val crystalObtainedPattern by patternGroup.pattern(
+        "crystal.obtained",
+        " *§r§e(?<crystalName>Topaz|Sapphire|Jade|Amethyst|Amber) Crystal"
+    )
+    private val collectionPattern by patternGroup.pattern(
+        "collection",
+        "Reach (?<amount>[0-9]+(?:,\\d+)*) (?<name>.*) Collection\\."
+    )
+    private val crystalPattern by patternGroup.pattern(
+        "crystal.obtain",
+        "Obtain a (?<name>\\w+) Crystal in the Crystal Hollows\\."
+    )
+    private val skillPattern by patternGroup.pattern(
+        "skill",
+        "Obtain level (?<level>.*) in the (?<skill>.*) Skill."
+    )
+    private val crystalFoundPattern by patternGroup.pattern(
+        "crystal.found",
+        " *§r§5§l✦ CRYSTAL FOUND §r§7\\(.§r§7/5§r§7\\)"
+    )
+
     private val itemIslandRequired = mutableMapOf<String, IslandVisitStep>()
     private val itemPreconditions = mutableMapOf<String, NextStep>()
     private val islands = mutableMapOf<IslandType, IslandVisitStep>()
-    private val collectionPattern = "Reach (?<amount>[0-9]+(?:,\\d+)*) (?<name>.*) Collection\\.".toPattern()
-    private val crystalPattern = "Obtain a (?<name>\\w+) Crystal in the Crystal Hollows\\.".toPattern()
-    private val skillPattern = "Obtain level (?<level>.*) in the (?<skill>.*) Skill.".toPattern()
-    private val crystalFoundPattern = " *§r§5§l✦ CRYSTAL FOUND §r§7\\(.§r§7/5§r§7\\)".toPattern()
     private val rhysTaskName = "30x Enchanted Minerals (Redstone, Lapis Lazuli, Coal) (for Rhys)"
 
     companion object {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ArachneChatMessageHider.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ArachneChatMessageHider.kt
index 54dc6bed0..57a9a5f9e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/ArachneChatMessageHider.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ArachneChatMessageHider.kt
@@ -5,6 +5,7 @@ import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class ArachneChatMessageHider {
@@ -12,9 +13,19 @@ class ArachneChatMessageHider {
     private val config get() = SkyHanniMod.feature.chat
     private var hideArachneDeadMessage = false
 
-    // TODO USE SH-REPO
-    private val arachneCallingPattern = "§4☄ §r.* §r§eplaced an §r§9Arachne's Calling§r§e!.*".toPattern()
-    private val arachneCrystalPattern = "§4☄ §r.* §r§eplaced an Arachne Crystal! Something is awakening!".toPattern()
+    private val patternGroup = RepoPattern.group("chat.arachne")
+    private val arachneCallingPattern by patternGroup.pattern(
+        "calling",
+        "§4☄ §r.* §r§eplaced an §r§9Arachne's Calling§r§e!.*"
+    )
+    private val arachneCrystalPattern by patternGroup.pattern(
+        "crystal",
+        "§4☄ §r.* §r§eplaced an Arachne Crystal! Something is awakening!"
+    )
+    private val arachneSpawnPattern by patternGroup.pattern(
+        "spawn",
+        "§c\\[BOSS] Arachne§r§f: (?:The Era of Spiders begins now\\.|Ahhhh\\.\\.\\.A Calling\\.\\.\\.)"
+    )
 
     @SubscribeEvent
     fun onChat(event: LorenzChatEvent) {
@@ -36,8 +47,9 @@ class ArachneChatMessageHider {
             return true
         }
 
-        if (message == "§c[BOSS] Arachne§r§f: Ahhhh...A Calling...") return true
-        if (message == "§c[BOSS] Arachne§r§f: The Era of Spiders begins now.") return true
+        arachneSpawnPattern.matchMatcher(message) {
+            return true
+        }
 
         if (message == "§a§l▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬") {
             hideArachneDeadMessage = !hideArachneDeadMessage
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
index 3f0c4b700..5516cbe77 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
@@ -11,6 +11,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.getLorenzVec
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraft.client.entity.EntityOtherPlayerMP
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
@@ -18,9 +19,11 @@ class PlayerDeathMessages {
 
     private val lastTimePlayerSeen = mutableMapOf<String, Long>()
 
-    // TODO USE SH-REPO
     //§c ☠ §r§7§r§bZeroHazel§r§7 was killed by §r§8§lAshfang§r§7§r§7.
-    private val deathMessagePattern = "§c ☠ §r§7§r§.(?<name>.+)§r§7 (?<reason>.+)".toPattern()
+    private val deathMessagePattern by RepoPattern.pattern(
+        "chat.player.death",
+        "§c ☠ §r§7§r§.(?<name>.+)§r§7 (?<reason>.+)"
+    )
 
     @SubscribeEvent
     fun onTick(event: LorenzTickEvent) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/BestiaryData.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/BestiaryData.kt
index a5b0cd386..bd1d58894 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/BestiaryData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/BestiaryData.kt
@@ -27,18 +27,28 @@ import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraft.item.ItemStack
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 object BestiaryData {
 
     private val config get() = SkyHanniMod.feature.combat.bestiary
+
+    private val patternGroup = RepoPattern.group("combat.bestiary.data")
+    private val progressPattern by patternGroup.pattern(
+        "progress",
+        "(?<current>[0-9kKmMbB,.]+)/(?<needed>[0-9kKmMbB,.]+\$)"
+    )
+    private val titlePattern by patternGroup.pattern(
+        "title",
+        "^(?:\\(\\d+/\\d+\\) )?(Bestiary|.+) ➜ (.+)\$"
+    )
+
     private var display = emptyList<List<Any>>()
     private val mobList = mutableListOf<BestiaryMob>()
     private val stackList = mutableMapOf<Int, ItemStack>()
     private val catList = mutableListOf<Category>()
-    private val progressPattern = "(?<current>[0-9kKmMbB,.]+)/(?<needed>[0-9kKmMbB,.]+$)".toPattern()
-    private val titlePattern = "^(?:\\(\\d+/\\d+\\) )?(Bestiary|.+) ➜ (.+)$".toPattern()
     private var inInventory = false
     private var isCategory = false
     private var overallProgressEnabled = false
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt
index 5c1e0976e..0364bda1a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt
@@ -52,6 +52,7 @@ import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import io.github.moulberry.notenoughupdates.util.Utils
 import io.github.moulberry.notenoughupdates.util.XPInformation
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -68,16 +69,33 @@ object GhostCounter {
     private var display = emptyList<List<Any>>()
     var ghostCounterV3File =
         File("." + File.separator + "config" + File.separator + "ChatTriggers" + File.separator + "modules" + File.separator + "GhostCounterV3" + File.separator + ".persistantData.json")
-    private val skillXPPattern = "[+](?<gained>[0-9,.]+) \\((?<current>[0-9,.]+)(?:/(?<total>[0-9,.]+))?\\)".toPattern()
-    private val combatSectionPattern =
-        ".*[+](?<gained>[0-9,.]+) (?<skillName>[A-Za-z]+) \\((?<progress>(?<current>[0-9.,]+)/(?<total>[0-9.,]+)|(?<percent>[0-9.]+)%)\\).*".toPattern()
-    private val killComboExpiredPattern =
-        "§cYour Kill Combo has expired! You reached a (?<combo>.*) Kill Combo!".toPattern()
-    private val ghostXPPattern =
-        "(?<current>\\d+(?:\\.\\d+)?(?:,\\d+)?[kK]?)/(?<total>\\d+(?:\\.\\d+)?(?:,\\d+)?[kKmM]?)".toPattern()
-    private val bestiaryPattern =
-        ".*(?:§\\d|§\\w)+BESTIARY (?:§\\d|§\\w)+Ghost (?:§\\d|§\\w)(?<previousLevel>\\d+)➜(?:§\\d|§\\w)(?<nextLevel>\\d+).*".toPattern() //   &3&lBESTIARY &b&lGhost &89➜&b10
-    private val skillLevelPattern = ".*§e§lSkills: §r§a(?<skillName>.*) (?<skillLevel>\\d+).*".toPattern()
+
+    private val patternGroup = RepoPattern.group("combat.ghostcounter")
+    private val skillXPPattern by patternGroup.pattern(
+        "skillxp",
+        "[+](?<gained>[0-9,.]+) \\((?<current>[0-9,.]+)(?:/(?<total>[0-9,.]+))?\\)"
+    )
+    private val combatSectionPattern by patternGroup.pattern(
+        "combatsection",
+        ".*[+](?<gained>[0-9,.]+) (?<skillName>[A-Za-z]+) \\((?<progress>(?<current>[0-9.,]+)/(?<total>[0-9.,]+)|(?<percent>[0-9.]+)%)\\).*"
+    )
+    private val killComboExpiredPattern by patternGroup.pattern(
+        "killcomboexpired",
+        "§cYour Kill Combo has expired! You reached a (?<combo>.*) Kill Combo!"
+    )
+    private val ghostXPPattern by patternGroup.pattern(
+        "ghostxp",
+        "(?<current>\\d+(?:\\.\\d+)?(?:,\\d+)?[kK]?)/(?<total>\\d+(?:\\.\\d+)?(?:,\\d+)?[kKmM]?)"
+    )
+    private val bestiaryPattern by patternGroup.pattern(
+        "bestiary",
+        ".*(?:§\\d|§\\w)+BESTIARY (?:§\\d|§\\w)+Ghost (?:§\\d|§\\w)(?<previousLevel>\\d+)➜(?:§\\d|§\\w)(?<nextLevel>\\d+).*"
+    )
+    private val skillLevelPattern by patternGroup.pattern(
+        "skilllevel",
+        ".*§e§lSkills: §r§a(?<skillName>.*) (?<skillLevel>\\d+).*"
+    )
+
     private val format = NumberFormat.getInstance()
     private var percent: Float = 0.0f
     private var totalSkillXp = 0
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/SpawnTimers.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/SpawnTimers.kt
index 08c8ddf31..f92e8dccd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/SpawnTimers.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/SpawnTimers.kt
@@ -14,6 +14,7 @@ import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.StringUtils.matches
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.TimeUtils.format
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import at.hannibal2.skyhanni.utils.toLorenzVec
 import net.minecraft.network.play.server.S2APacketParticles
 import net.minecraft.util.EnumParticleTypes
@@ -25,12 +26,18 @@ class SpawnTimers {
 
     private val config get() = SkyHanniMod.feature.combat.mobs
 
+    private val patternGroup = RepoPattern.group("combat.mobs.spawntime.arachne")
+    private val arachneFragmentPattern by patternGroup.pattern(
+        "fragment",
+        "^☄ [a-z0-9_]{2,22} placed an arachne's calling! something is awakening! \\(4/4\\)\$"
+    )
+    private val arachneCrystalPattern by patternGroup.pattern(
+        "crystal",
+        "^☄ [a-z0-9_]{2,22} placed an arachne crystal! something is awakening!$"
+    )
+
     private val arachneAltarLocation = LorenzVec(-283f, 51f, -179f)
     private var arachneSpawnTime = SimpleTimeMark.farPast()
-    private val arachneFragmentMessage =
-        "^☄ [a-z0-9_]{2,22} placed an arachne's calling! something is awakening! \\(4/4\\)\$".toPattern()
-    private val arachneCrystalMessage =
-        "^☄ [a-z0-9_]{2,22} placed an arachne crystal! something is awakening!$".toPattern()
     private var saveNextTickParticles = false
     private var particleCounter = 0
     private var tickTime: Long = 0
@@ -60,8 +67,8 @@ class SpawnTimers {
         if (!isEnabled()) return
         val message = event.message.removeColor().lowercase()
 
-        if (arachneFragmentMessage.matches(message) || arachneCrystalMessage.matches(message)) {
-            if (arachneCrystalMessage.matches(message)) {
+        if (arachneFragmentPattern.matches(message) || arachneCrystalPattern.matches(message)) {
+            if (arachneCrystalPattern.matches(message)) {
                 saveNextTickParticles = true
                 searchTime = System.currentTimeMillis()
                 particleCounter = 0
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt
index a41ee2689..7724d4c5d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt
@@ -28,12 +28,13 @@ object DianaProfitTracker {
     private val config get() = SkyHanniMod.feature.event.diana.dianaProfitTracker
     private var allowedDrops = listOf<NEUInternalName>()
 
-    private val chatDugOutPattern by RepoPattern.pattern(
-        "diana.chat.burrow.dug",
+    private val patternGroup = RepoPattern.group("diana.chat")
+    private val chatDugOutPattern by patternGroup.pattern(
+        "burrow.dug",
         "(§eYou dug out a Griffin Burrow!|§eYou finished the Griffin burrow chain!) .*"
     )
-    private val chatDugOutCoinsPattern by RepoPattern.pattern(
-        "diana.chat.coins",
+    private val chatDugOutCoinsPattern by patternGroup.pattern(
+        "coins",
         "§6§lWow! §r§eYou dug out §r§6(?<coins>.*) coins§r§e!"
     )
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt
index 9276823fe..66d4f2b85 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt
@@ -20,6 +20,7 @@ import at.hannibal2.skyhanni.utils.SoundUtils
 import at.hannibal2.skyhanni.utils.StringUtils.cleanPlayerName
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.getLorenzVec
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraft.client.Minecraft
 import net.minecraft.client.entity.EntityOtherPlayerMP
 import net.minecraft.network.play.server.S02PacketChat
@@ -32,10 +33,16 @@ object InquisitorWaypointShare {
 
     private val config get() = SkyHanniMod.feature.event.diana.inquisitorSharing
 
-    // TODO USE SH-REPO
-    private val partyPattern =
-        "§9Party §8> (?<playerName>.*)§f: §rx: (?<x>-?[0-9]{1,4}), y: (?<y>-?[0-9]{1,4}), z: (?<z>-?[0-9]{1,4})\\b".toPattern()
-    private val diedPattern = "§9Party §8> (?<playerName>.*)§f: §rInquisitor dead!".toPattern()
+    private val patternGroup = RepoPattern.group("diana.waypoints")
+    private val partyPattern by patternGroup.pattern(
+        "party",
+        "§9Party §8> (?<playerName>.*)§f: §rx: (?<x>-?[0-9]{1,4}), y: (?<y>-?[0-9]{1,4}), z: (?<z>-?[0-9]{1,4})\\b"
+    )
+    private val diedPattern by patternGroup.pattern(
+        "died",
+        "§9Party §8> (?<playerName>.*)§f: §rInquisitor dead!"
+    )
+
     private var time = 0L
     private var testTime = 0L
     private var lastInquisitorMessage = ""
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt
index dbcc1574e..001a96c4a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt
@@ -21,23 +21,36 @@ import java.util.regex.Pattern
 
 object MythologicalCreatureTracker {
 
-    private val group = RepoPattern.group("event.diana.mythological.tracker")
-
-    private val minotaurPattern by group.pattern("minotaur", ".* §r§eYou dug out a §r§2Minotaur§r§e!")
-    private val gaiaConstructPattern by group.pattern("gaiaconstruct", ".* §r§eYou dug out a §r§2Gaia Construct§r§e!")
-    private val minosChampionPattern by group.pattern("minoschampion", ".* §r§eYou dug out a §r§2Minos Champion§r§e!")
-    private val siameseLynxesPattern by group.pattern("siameselynxes", ".* §r§eYou dug out §r§2Siamese Lynxes§r§e!")
-    private val minosHunterPattern by group.pattern("minoshunter", ".* §r§eYou dug out a §r§2Minos Hunter§r§e!")
-    private val minosInquisitorPattern by group.pattern(
+    private val config get() = SkyHanniMod.feature.event.diana.mythologicalMobtracker
+
+    private val patternGroup = RepoPattern.group("event.diana.mythological.tracker")
+    private val minotaurPattern by patternGroup.pattern(
+        "minotaur",
+        ".* §r§eYou dug out a §r§2Minotaur§r§e!"
+    )
+    private val gaiaConstructPattern by patternGroup.pattern(
+        "gaiaconstruct",
+        ".* §r§eYou dug out a §r§2Gaia Construct§r§e!"
+    )
+    private val minosChampionPattern by patternGroup.pattern(
+        "minoschampion",
+        ".* §r§eYou dug out a §r§2Minos Champion§r§e!"
+    )
+    private val siameseLynxesPattern by patternGroup.pattern(
+        "siameselynxes",
+        ".* §r§eYou dug out §r§2Siamese Lynxes§r§e!"
+    )
+    private val minosHunterPattern by patternGroup.pattern(
+        "minoshunter",
+        ".* §r§eYou dug out a §r§2Minos Hunter§r§e!"
+    )
+    private val minosInquisitorPattern by patternGroup.pattern(
         "minosinquisitor",
         ".* §r§eYou dug out a §r§2Minos Inquisitor§r§e!"
     )
 
-    private val config get() = SkyHanniMod.feature.event.diana.mythologicalMobtracker
-
-    private val tracker =
-        SkyHanniTracker("Mythological Creature Tracker", { Data() }, { it.diana.mythologicalMobTracker })
-        { drawDisplay(it) }
+    private val tracker = SkyHanniTracker("Mythological Creature Tracker", { Data() }, { it.diana.mythologicalMobTracker })
+    { drawDisplay(it) }
 
     class Data : TrackerData() {
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasure.kt b/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasure.kt
index 219a22285..2511b2ee1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasure.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasure.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.event.jerry.frozentreasure
 
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 
 enum class FrozenTreasure(
     val internalName: String,
@@ -23,5 +24,11 @@ enum class FrozenTreasure(
     EINARY_RED_HOODIE("FROZEN_BAIT", "§cEinary's Red Hoodie", 1),
     ;
 
-    val pattern by lazy { "FROZEN TREASURE! You found ${displayName.removeColor()}!".toPattern() }
+    val chatPattern by RepoPattern.pattern(
+        "event.jerry.frozentreasure.item." + this.patternName(),
+        patternText()
+    )
+
+    private fun patternName() = name.lowercase().replace("_", "")
+    private fun patternText() = "FROZEN TREASURE! You found ${displayName.removeColor()}!"
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasureTracker.kt
index 7b3f236f0..f335b882c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasureTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/jerry/frozentreasure/FrozenTreasureTracker.kt
@@ -18,6 +18,7 @@ import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.StringUtils.matches
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
 import at.hannibal2.skyhanni.utils.tracker.TrackerData
 import com.google.gson.annotations.Expose
@@ -27,16 +28,23 @@ import kotlin.concurrent.fixedRateTimer
 object FrozenTreasureTracker {
 
     private val config get() = SkyHanniMod.feature.event.winter.frozenTreasureTracker
+
+    private val compactPattern by RepoPattern.pattern(
+        "event.jerry.frozentreasure.compact",
+        "COMPACT! You found an Enchanted Ice!"
+    )
+
     private var estimatedIce = 0L
     private var lastEstimatedIce = 0L
     private var icePerSecond = mutableListOf<Long>()
     private var icePerHour = 0
     private var stoppedChecks = 0
-    private var compactPattern = "COMPACT! You found an Enchanted Ice!".toPattern()
     private val tracker = SkyHanniTracker("Frozen Treasure Tracker", { Data() }, { it.frozenTreasureTracker })
     { formatDisplay(drawDisplay(it)) }
 
     init {
+        FrozenTreasure.entries.forEach { it.chatPattern }
+
         fixedRateTimer(name = "skyhanni-frozen-treasure-tracker", period = 1000) {
             if (!onJerryWorkshop()) return@fixedRateTimer
             calculateIcePerHour()
@@ -120,7 +128,7 @@ object FrozenTreasureTracker {
             if (config.hideMessages) event.blockedReason = "frozen treasure tracker"
         }
 
-        for (treasure in FrozenTreasure.entries.filter { it.pattern.matches(message) }) {
+        for (treasure in FrozenTreasure.entries.filter { it.chatPattern.matches(message) }) {
             tracker.modify {
                 it.treasuresMined += 1
                 it.treasureCount.addOrPut(treasure, 1)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt
index a6fa577e4..257e69f3d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt
@@ -17,6 +17,7 @@ import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
 import at.hannibal2.skyhanni.utils.StringUtils.matches
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 // todo: create abstract class for this and BasketWaypoints
@@ -30,10 +31,19 @@ class PresentWaypoints {
     private val presentSet get() = presentLocations[HypixelData.lobbyType]
     private val presentEntranceSet get() = presentEntranceLocations[HypixelData.lobbyType]
 
-    // TODO use repo pattern
-    private val presentAlreadyFoundPattern = "§cYou have already found this present!".toPattern()
-    private val presentFoundPattern = "§aYou found a.*present! §r§e\\(§r§b\\d+§r§e/§r§b\\d+§r§e\\)".toPattern()
-    private val allFoundPattern = "§aCongratulations! You found all the presents in every lobby!".toPattern()
+    private val patternGroup = RepoPattern.group("event.lobby.waypoint.presents")
+    private  val presentAlreadyFoundPattern by patternGroup.pattern(
+        "foundalready",
+        "§cYou have already found this present!"
+    )
+    private val presentFoundPattern by patternGroup.pattern(
+        "found",
+        "§aYou found a.*present! §r§e\\(§r§b\\d+§r§e/§r§b\\d+§r§e\\)"
+    )
+    private val allFoundPattern by patternGroup.pattern(
+        "foundall",
+        "§aCongratulations! You found all the presents in every lobby!"
+    )
 
     @SubscribeEvent
     fun onWorldChange(event: LorenzWorldChangeEvent) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/winter/UniqueGiftCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/event/winter/UniqueGiftCounter.kt
index a039bd339..107156f2e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/winter/UniqueGiftCounter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/winter/UniqueGiftCounter.kt
@@ -12,6 +12,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NumberUtil.formatNumber
 import at.hannibal2.skyhanni.utils.RenderUtils.renderString
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 object UniqueGiftCounter {
@@ -19,7 +20,10 @@ object UniqueGiftCounter {
     private val config get() = SkyHanniMod.feature.event.winter.uniqueGiftCounter
     private val storage get() = ProfileStorageData.playerSpecific?.winter
 
-    private val pattern = "§7Unique Players Gifted: §a(?<amount>.*)".toPattern()
+    private val giftedAmountPattern by RepoPattern.pattern(
+        "event.winter.uniqugifts.counter.amount",
+        "§7Unique Players Gifted: §a(?<amount>.*)"
+    )
 
     private var display = ""
 
@@ -31,7 +35,7 @@ object UniqueGiftCounter {
         val storage = storage ?: return
 
         for (line in item.getLore()) {
-            pattern.matchMatcher(line) {
+            giftedAmountPattern.matchMatcher(line) {
                 val amount = group("amount").formatNumber().toInt()
                 storage.amountGifted = amount
                 update()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt
index f8e5f8a2f..33ad68dcd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt
@@ -20,6 +20,7 @@ import at.hannibal2.skyhanni.utils.NumberUtil.formatNumber
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.renderables.Renderable
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import at.hannibal2.skyhanni.utils.tracker.ItemTrackerData
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniItemTracker
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
@@ -35,7 +36,10 @@ object FishingProfitTracker {
 
     val config get() = SkyHanniMod.feature.fishing.fishingProfitTracker
 
-    private val coinsChatPattern = ".* CATCH! §r§bYou found §r§6(?<coins>.*) Coins§r§b\\.".toPattern()
+    private val coinsChatPattern by RepoPattern.pattern(
+        "fishing.tracker.chat.coins",
+        ".* CATCH! §r§bYou found §r§6(?<coins>.*) Coins§r§b\\."
+    )
 
     private var lastCatchTime = SimpleTimeMark.farPast()
     private val tracker = SkyHanniItemTracker(
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
index 34c94d198..e39e8fb11 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
@@ -32,12 +32,13 @@ object SeaCreatureTracker {
 
     private val config get() = SkyHanniMod.feature.fishing.seaCreatureTracker
 
-    private val tracker = SkyHanniTracker("Sea Creature Tracker", { Data() }, { it.fishing.seaCreatureTracker })
-    { drawDisplay(it) }
     private val trophyArmorNames by RepoPattern.pattern(
         "fishing.trophyfishing.armor",
         "(BRONZE|SILVER|GOLD|DIAMOND)_HUNTER_(HELMET|CHESTPLATE|LEGGINGS|BOOTS)"
     )
+
+    private val tracker = SkyHanniTracker("Sea Creature Tracker", { Data() }, { it.fishing.seaCreatureTracker })
+    { drawDisplay(it) }
     private var lastArmorCheck = SimpleTimeMark.farPast()
     private var isTrophyFishing = false
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishMessages.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishMessages.kt
index 507e3e7bb..cd8f367dd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishMessages.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishMessages.kt
@@ -14,15 +14,18 @@ import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.ordinal
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraft.util.ChatComponentText
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class TrophyFishMessages {
-
-    private val trophyFishPattern =
-        "§6§lTROPHY FISH! §r§bYou caught an? §r(?<displayName>§[0-9a-f](?:§k)?[\\w -]+) §r(?<displayRarity>§[0-9a-f]§l\\w+)§r§b\\.".toPattern()
     private val config get() = SkyHanniMod.feature.fishing.trophyFishing.chatMessages
 
+    private val trophyFishPattern by RepoPattern.pattern(
+        "fishing.trophy.trophyfish",
+        "§6§lTROPHY FISH! §r§bYou caught an? §r(?<displayName>§[0-9a-f](?:§k)?[\\w -]+) §r(?<displayRarity>§[0-9a-f]§l\\w+)§r§b\\."
+    )
+
     @SubscribeEvent
     fun onStatusBar(event: LorenzChatEvent) {
         if (!LorenzUtils.inSkyBlock) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt
index 5b066b142..46cd544a1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt
@@ -29,23 +29,69 @@ import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getFarmingForDummie
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getHoeCounter
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraft.item.ItemStack
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.math.floor
 import kotlin.math.log10
 import kotlin.time.Duration.Companion.seconds
 
-class FarmingFortuneDisplay {
-
-    private val tabFortuneUniversalPattern = " Farming Fortune: §r§6☘(?<fortune>\\d+)".toPattern()
-    private val tabFortuneCropPattern =
-        " (?<crop>Wheat|Carrot|Potato|Pumpkin|Sugar Cane|Melon|Cactus|Cocoa Beans|Mushroom|Nether Wart) Fortune: §r§6☘(?<fortune>\\d+)".toPattern()
+object FarmingFortuneDisplay {
+    private val config get() = GardenAPI.config.farmingFortunes
+
+    private val patternGroup = RepoPattern.group("garden.fortunedisplay")
+    private val universalTabFortunePattern by patternGroup.pattern(
+        "tablist.universal",
+        " Farming Fortune: §r§6☘(?<fortune>\\d+)"
+    )
+    private val cropSpecificTabFortunePattern by patternGroup.pattern(
+        "tablist.cropspecific",
+        " (?<crop>Wheat|Carrot|Potato|Pumpkin|Sugar Cane|Melon|Cactus|Cocoa Beans|Mushroom|Nether Wart) Fortune: §r§6☘(?<fortune>\\d+)"
+    )
+    private val collectionPattern by patternGroup.pattern(
+        "collection",
+        "§7You have §6\\+(?<ff>\\d{1,3})☘ .*"
+    )
+    private val tooltipFortunePattern by patternGroup.pattern(
+        "tooltip",
+        "^§7Farming Fortune: §a\\+([\\d.]+)(?: §2\\(\\+\\d\\))?(?: §9\\(\\+(\\d+)\\))?\$"
+    )
+    private val armorAbilityPattern by patternGroup.pattern(
+        "armorability",
+        "Tiered Bonus: .* [(](?<pieces>.*)/4[)]"
+    )
+    private val lotusAbilityPattern by patternGroup.pattern(
+        "lotusability",
+        "§7Piece Bonus: §6+(?<bonus>.*)☘"
+    )
+    // todo make pattern work on Melon and Cropie armor
+    private val armorAbilityFortunePattern by patternGroup.pattern(
+        "armorabilityfortune",
+        "§7.*§7Grants §6(?<bonus>.*)☘.*"
+    )
 
     private var display = emptyList<List<Any>>()
     private var accessoryProgressDisplay = ""
 
     private var lastToolSwitch = SimpleTimeMark.farPast()
 
+    private val latestFF: MutableMap<CropType, Double>? get() = GardenAPI.storage?.latestTrueFarmingFortune
+
+    private var currentCrop: CropType? = null
+
+    private var tabFortuneUniversal: Double = 0.0
+    private var tabFortuneCrop: Double = 0.0
+    private val upgradeFortune: Double? get() = currentCrop?.getUpgradeLevel()?.let { it * 5.0 }
+    private val accessoryFortune: Double?
+        get() = currentCrop?.let {
+            CropAccessoryData.cropAccessory?.getFortune(it)
+        }
+
+    var displayedFortune = 0.0
+    var reforgeFortune = 0.0
+    var itemBaseFortune = 0.0
+    var greenThumbFortune = 0.0
+
     @SubscribeEvent
     fun onPreProfileSwitch(event: PreProfileSwitchEvent) {
         display = emptyList()
@@ -56,10 +102,10 @@ class FarmingFortuneDisplay {
     fun onTabListUpdate(event: TabListUpdateEvent) {
         if (!GardenAPI.inGarden()) return
         event.tabList.firstNotNullOfOrNull {
-            tabFortuneUniversalPattern.matchMatcher(it) {
+            universalTabFortunePattern.matchMatcher(it) {
                 tabFortuneUniversal = group("fortune").toDouble()
             }
-            tabFortuneCropPattern.matchMatcher(it) {
+            cropSpecificTabFortunePattern.matchMatcher(it) {
                 currentCrop = CropType.getByName(group("crop"))
                 tabFortuneCrop = group("fortune").toDouble()
             }
@@ -170,131 +216,102 @@ class FarmingFortuneDisplay {
         else -> 75
     }
 
-    companion object {
-
-        private val config get() = GardenAPI.config.farmingFortunes
-        private val latestFF: MutableMap<CropType, Double>? get() = GardenAPI.storage?.latestTrueFarmingFortune
-
-        private var currentCrop: CropType? = null
+    fun getToolFortune(tool: ItemStack?): Double = getToolFortune(tool?.getInternalName())
+    fun getToolFortune(internalName: NEUInternalName?): Double {
+        if (internalName == null) return 0.0
+        if (internalName.equals("THEORETICAL_HOE")) {
+            return 0.0
+        }
+        return if (internalName.startsWith("THEORETICAL_HOE")) {
+            listOf(10.0, 25.0, 50.0)[internalName.asString().last().digitToInt() - 1]
+        } else when (internalName.asString()) {
+            "FUNGI_CUTTER" -> 30.0
+            "COCO_CHOPPER" -> 20.0
+            else -> 0.0
+        }
+    }
 
-        private var tabFortuneUniversal: Double = 0.0
-        private var tabFortuneCrop: Double = 0.0
-        private val upgradeFortune: Double? get() = currentCrop?.getUpgradeLevel()?.let { it * 5.0 }
-        private val accessoryFortune: Double?
-            get() = currentCrop?.let {
-                CropAccessoryData.cropAccessory?.getFortune(it)
-            }
+    fun getTurboCropFortune(tool: ItemStack?, cropType: CropType?): Double {
+        val crop = cropType ?: return 0.0
+        return tool?.getEnchantments()?.get(crop.getTurboCrop())?.let { it * 5.0 } ?: 0.0
+    }
 
-        private val collectionPattern = "§7You have §6\\+(?<ff>\\d{1,3})☘ .*".toPattern()
-        private val tooltipFortunePattern =
-            "^§7Farming Fortune: §a\\+([\\d.]+)(?: §2\\(\\+\\d\\))?(?: §9\\(\\+(\\d+)\\))?$".toRegex()
-        private val armorAbilityPattern = "Tiered Bonus: .* [(](?<pieces>.*)/4[)]".toPattern()
-
-        var displayedFortune = 0.0
-        var reforgeFortune = 0.0
-        var itemBaseFortune = 0.0
-        var greenThumbFortune = 0.0
-
-        fun getToolFortune(tool: ItemStack?): Double = getToolFortune(tool?.getInternalName())
-        fun getToolFortune(internalName: NEUInternalName?): Double {
-            if (internalName == null) return 0.0
-            if (internalName.equals("THEORETICAL_HOE")) {
-                return 0.0
-            }
-            return if (internalName.startsWith("THEORETICAL_HOE")) {
-                listOf(10.0, 25.0, 50.0)[internalName.asString().last().digitToInt() - 1]
-            } else when (internalName.asString()) {
-                "FUNGI_CUTTER" -> 30.0
-                "COCO_CHOPPER" -> 20.0
-                else -> 0.0
-            }
-        }
+    fun getCollectionFortune(tool: ItemStack?): Double {
+        val string = tool?.getLore()?.nextAfter("§6Collection Analysis", 3) ?: return 0.0
+        return collectionPattern.matchMatcher(string) { group("ff").toDoubleOrNull() } ?: 0.0
+    }
 
-        fun getTurboCropFortune(tool: ItemStack?, cropType: CropType?): Double {
-            val crop = cropType ?: return 0.0
-            return tool?.getEnchantments()?.get(crop.getTurboCrop())?.let { it * 5.0 } ?: 0.0
-        }
+    fun getCounterFortune(tool: ItemStack?): Double {
+        val counter = tool?.getHoeCounter() ?: return 0.0
+        val digits = floor(log10(counter.toDouble()))
+        return (16 * digits - 48).coerceAtLeast(0.0)
+    }
 
-        fun getCollectionFortune(tool: ItemStack?): Double {
-            val string = tool?.getLore()?.nextAfter("§6Collection Analysis", 3) ?: return 0.0
-            return collectionPattern.matchMatcher(string) { group("ff").toDoubleOrNull() } ?: 0.0
-        }
+    fun getDedicationFortune(tool: ItemStack?, cropType: CropType?): Double {
+        if (cropType == null) return 0.0
+        val dedicationLevel = tool?.getEnchantments()?.get("dedication") ?: 0
+        val dedicationMultiplier = listOf(0.0, 0.5, 0.75, 1.0, 2.0)[dedicationLevel]
+        val cropMilestone = GardenCropMilestones.getTierForCropCount(
+            cropType.getCounter(), cropType
+        )
+        return dedicationMultiplier * cropMilestone
+    }
 
-        fun getCounterFortune(tool: ItemStack?): Double {
-            val counter = tool?.getHoeCounter() ?: return 0.0
-            val digits = floor(log10(counter.toDouble()))
-            return (16 * digits - 48).coerceAtLeast(0.0)
-        }
+    fun getSunderFortune(tool: ItemStack?) = (tool?.getEnchantments()?.get("sunder") ?: 0) * 12.5
+    fun getHarvestingFortune(tool: ItemStack?) = (tool?.getEnchantments()?.get("harvesting") ?: 0) * 12.5
+    fun getCultivatingFortune(tool: ItemStack?) = (tool?.getEnchantments()?.get("cultivating") ?: 0) * 2.0
 
-        fun getDedicationFortune(tool: ItemStack?, cropType: CropType?): Double {
-            if (cropType == null) return 0.0
-            val dedicationLevel = tool?.getEnchantments()?.get("dedication") ?: 0
-            val dedicationMultiplier = listOf(0.0, 0.5, 0.75, 1.0, 2.0)[dedicationLevel]
-            val cropMilestone = GardenCropMilestones.getTierForCropCount(
-                cropType.getCounter(), cropType
-            )
-            return dedicationMultiplier * cropMilestone
-        }
+    fun getAbilityFortune(item: ItemStack?) = item?.let {
+        getAbilityFortune(it.getInternalName(), it.getLore())
+    } ?: 0.0
 
-        fun getSunderFortune(tool: ItemStack?) = (tool?.getEnchantments()?.get("sunder") ?: 0) * 12.5
-        fun getHarvestingFortune(tool: ItemStack?) = (tool?.getEnchantments()?.get("harvesting") ?: 0) * 12.5
-        fun getCultivatingFortune(tool: ItemStack?) = (tool?.getEnchantments()?.get("cultivating") ?: 0) * 2.0
-
-        fun getAbilityFortune(item: ItemStack?) = item?.let {
-            getAbilityFortune(it.getInternalName(), it.getLore())
-        } ?: 0.0
-
-        fun getAbilityFortune(internalName: NEUInternalName, lore: List<String>): Double {
-            val lotusAbilityPattern = "§7Piece Bonus: §6+(?<bonus>.*)☘".toPattern()
-            // todo make it work on Melon and Cropie armor
-            val armorAbilityFortune = "§7.*§7Grants §6(?<bonus>.*)☘.*".toPattern()
-            var pieces = 0
-
-            lore.forEach { line ->
-                if (internalName.contains("LOTUS")) {
-                    lotusAbilityPattern.matchMatcher(line) {
-                        return group("bonus").toDouble()
-                    }
-                }
-                armorAbilityPattern.matchMatcher(line.removeColor()) {
-                    pieces = group("pieces").toInt()
-                }
+    fun getAbilityFortune(internalName: NEUInternalName, lore: List<String>): Double {
+        var pieces = 0
 
-                armorAbilityFortune.matchMatcher(line) {
-                    return if (pieces < 2) 0.0 else group("bonus").toDouble() / pieces
+        lore.forEach { line ->
+            if (internalName.contains("LOTUS")) {
+                lotusAbilityPattern.matchMatcher(line) {
+                    return group("bonus").toDouble()
                 }
             }
+            armorAbilityPattern.matchMatcher(line.removeColor()) {
+                pieces = group("pieces").toInt()
+            }
 
-            return 0.0
+            armorAbilityFortunePattern.matchMatcher(line) {
+                return if (pieces < 2) 0.0 else group("bonus").toDouble() / pieces
+            }
         }
 
-        fun loadFortuneLineData(tool: ItemStack?, enchantmentFortune: Double) {
-            displayedFortune = 0.0
-            reforgeFortune = 0.0
-            itemBaseFortune = 0.0
-            greenThumbFortune = 0.0
-            for (line in tool?.getLore()!!) {
-                val match = tooltipFortunePattern.matchEntire(line)?.groups ?: continue
-
-                displayedFortune = match[1]!!.value.toDouble()
-                reforgeFortune = match[2]?.value?.toDouble() ?: 0.0
-
-                itemBaseFortune = if (tool.getInternalName().contains("LOTUS")) {
-                    5.0
-                } else {
-                    val dummiesFF = (tool.getFarmingForDummiesCount() ?: 0) * 1.0
-                    displayedFortune - reforgeFortune - enchantmentFortune - dummiesFF
-                }
-                greenThumbFortune = if (tool.getInternalName().contains("LOTUS")) {
-                    displayedFortune - reforgeFortune - itemBaseFortune
-                } else 0.0
+        return 0.0
+    }
+
+    fun loadFortuneLineData(tool: ItemStack?, enchantmentFortune: Double) {
+        displayedFortune = 0.0
+        reforgeFortune = 0.0
+        itemBaseFortune = 0.0
+        greenThumbFortune = 0.0
+        for (line in tool?.getLore()!!) {
+            tooltipFortunePattern.matchMatcher(line) {
+                displayedFortune = group(1)!!.toDouble()
+                reforgeFortune = group(2)?.toDouble() ?: 0.0
+            } ?: continue
+
+            itemBaseFortune = if (tool.getInternalName().contains("LOTUS")) {
+                5.0
+            } else {
+                val dummiesFF = (tool.getFarmingForDummiesCount() ?: 0) * 1.0
+                displayedFortune - reforgeFortune - enchantmentFortune - dummiesFF
             }
+            greenThumbFortune = if (tool.getInternalName().contains("LOTUS")) {
+                displayedFortune - reforgeFortune - itemBaseFortune
+            } else 0.0
         }
+    }
 
-        fun getCurrentFarmingFortune() = tabFortuneUniversal + tabFortuneCrop
+    fun getCurrentFarmingFortune() = tabFortuneUniversal + tabFortuneCrop
 
-        fun CropType.getLatestTrueFarmingFortune() = latestFF?.get(this)
-    }
+    fun CropType.getLatestTrueFarmingFortune() = latestFF?.get(this)
 
     @SubscribeEvent
     fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenCropMilestoneFix.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenCropMilestoneFix.kt
index 838b3f6ce..bba86c595 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenCropMilestoneFix.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenCropMilestoneFix.kt
@@ -11,12 +11,19 @@ import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimalIfNecessary
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class GardenCropMilestoneFix {
-
-    private val tabListPattern = " Milestone: §r§a(?<crop>.*) (?<tier>.*): §r§3(?<percentage>.*)%".toPattern()
-    private val levelUpPattern = " {2}§r§b§lGARDEN MILESTONE §3(?<crop>.*) §8.*➜§3(?<tier>.*)".toPattern()
+    private val patternGroup = RepoPattern.group("garden.cropmilestone.fix")
+    private val tabListPattern by patternGroup.pattern(
+        "tablist",
+        " Milestone: §r§a(?<crop>.*) (?<tier>.*): §r§3(?<percentage>.*)%"
+    )
+    private val levelUpPattern by patternGroup.pattern(
+        "levelup",
+        " {2}§r§b§lGARDEN MILESTONE §3(?<crop>.*) §8.*➜§3(?<tier>.*)"
+    )
 
     private val tabListCropProgress = mutableMapOf<CropType, Long>()
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt
index 21fb1a78a..d69b92bb3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt
@@ -21,21 +21,27 @@ import kotlin.time.Duration.Companion.milliseconds
 class GardenLevelDisplay {
 
     private val config get() = GardenAPI.config.gardenLevels
-    private val expToNextLevelPattern by RepoPattern.pattern(
-        "garden.level.inventory.nextxp",
+
+    private val patternGroup = RepoPattern.group("garden.level")
+    private val expToNextLevelPattern by patternGroup.pattern(
+        "inventory.nextxp",
         ".* §e(?<nextLevelExp>.*)§6/.*"
     )
-    private val overflowPattern by RepoPattern.pattern("garden.level.inventory.overflow", ".*§r §6(?<overflow>.*)")
-    private val currentLevelPattern by RepoPattern.pattern(
-        "garden.level.inventory.currentlevel",
+    private val overflowPattern by patternGroup.pattern(
+        "inventory.overflow",
+        ".*§r §6(?<ove