to Pattern

37 files changed, 64 insertions, 99 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/api/CollectionAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/CollectionAPI.kt
index c2782a3c1..074120d66 100644
--- a/src/main/java/at/hannibal2/skyhanni/api/CollectionAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/api/CollectionAPI.kt
@@ -11,11 +11,10 @@ import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NEUItems
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import java.util.regex.Pattern
 
 class CollectionAPI {
-    private val counterPattern = Pattern.compile("(?:.*) §e(.*)§6\\/(?:.*)")
-    private val singleCounterPattern = Pattern.compile("§7Total Collected: §e(.*)")
+    private val counterPattern = "(?:.*) §e(.*)§6\\/(?:.*)".toPattern()
+    private val singleCounterPattern = "§7Total Collected: §e(.*)".toPattern()
 
 //    private val hypixelApiHasWrongItems = listOf(
 //        "WOOL",
@@ -99,7 +98,7 @@ class CollectionAPI {
 
     companion object {
         private val collectionValue = mutableMapOf<String, Long>()
-        private val collectionTier0Pattern = Pattern.compile("§7Progress to .* I: .*")
+        private val collectionTier0Pattern = "§7Progress to .* I: .*".toPattern()
 
         fun isCollectionTier0(lore: List<String>) = lore.map { collectionTier0Pattern.matcher(it) }.any { it.matches() }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt b/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt
index 5d9fb4713..251ec3ac2 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt
@@ -7,11 +7,10 @@ import at.hannibal2.skyhanni.features.garden.CropType
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import net.minecraftforge.event.world.WorldEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import java.util.regex.Pattern
 
 class GardenCropMilestones {
-    private val cropPattern = Pattern.compile("§7Harvest §f(.*) §7on .*")
-    private val totalPattern = Pattern.compile("§7Total: §a(.*)")
+    private val cropPattern = "§7Harvest §f(.*) §7on .*".toPattern()
+    private val totalPattern = "§7Total: §a(.*)".toPattern()
 
     // Add when api support is there
 //    @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/data/SkillExperience.kt b/src/main/java/at/hannibal2/skyhanni/data/SkillExperience.kt
index d910a26bc..c6d540ecb 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/SkillExperience.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/SkillExperience.kt
@@ -11,12 +11,11 @@ import at.hannibal2.skyhanni.utils.NumberUtil.formatNumber
 import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimal
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import java.util.regex.Pattern
 
 class SkillExperience {
 
-    private val actionBarPattern = Pattern.compile("(?:.*)§3\\+(?:.*) (.*) \\((.*)\\/(.*)\\)(?:.*)")
-    private val inventoryPattern = Pattern.compile("(?:.*) §e(.*)§6\\/(?:.*)")
+    private val actionBarPattern = "(?:.*)§3\\+(?:.*) (.*) \\((.*)\\/(.*)\\)(?:.*)".toPattern()
+    private val inventoryPattern = "(?:.*) §e(.*)§6\\/(?:.*)".toPattern()
 
     @SubscribeEvent
     fun onProfileDataLoad(event: ProfileApiDataLoadedEvent) {
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 c5fe44328..b7f343436 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarCancelledBuyOrderClipboard.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarCancelledBuyOrderClipboard.kt
@@ -14,7 +14,7 @@ class BazaarCancelledBuyOrderClipboard {
 
     private val patternLastAmount = Pattern.compile("§a(.*)§7x")
     private val patternCancelledMessage =
-        Pattern.compile("§6\\[Bazaar] §r§7§r§cCancelled! §r§7Refunded §r§6(.*) coins §r§7from cancelling Buy Order!")
+        "§6\\[Bazaar] §r§7§r§cCancelled! §r§7Refunded §r§6(.*) coins §r§7from cancelling Buy Order!".toPattern()
 
     private var latestAmount: String? = null
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardDisplay.kt
index b00a7de19..cc4faeaeb 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardDisplay.kt
@@ -18,7 +18,6 @@ import net.minecraft.client.gui.inventory.GuiChest
 import net.minecraft.inventory.ContainerChest
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import net.minecraftforge.fml.common.gameevent.TickEvent
-import java.util.regex.Pattern
 
 class BingoCardDisplay {
 
@@ -28,7 +27,7 @@ class BingoCardDisplay {
     private var tick = 0
     private var display = listOf<String>()
     private val config get() = SkyHanniMod.feature.bingo
-    private val goalCompletePattern = Pattern.compile("§6§lBINGO GOAL COMPLETE! §r§e(.*)")
+    private val goalCompletePattern = "§6§lBINGO GOAL COMPLETE! §r§e(.*)".toPattern()
 
     init {
         update()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt
index 2423ed85d..28faaf877 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt
@@ -14,7 +14,6 @@ import at.hannibal2.skyhanni.utils.StringUtils.matchRegex
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import net.minecraftforge.fml.common.gameevent.TickEvent
-import java.util.regex.Pattern
 
 class BingoNextStepHelper {
     private var tick = 0
@@ -23,8 +22,9 @@ class BingoNextStepHelper {
     private val itemIslandRequired = mutableMapOf<String, IslandVisitStep>()
     private val itemRequired = mutableMapOf<String, NextStep>()
     private val islands = mutableMapOf<IslandType, IslandVisitStep>()
-    private val collectionPattern = Pattern.compile("Reach ([0-9]+(?:,\\d+)*) (.*) Collection\\.")
-    private val crystalPattern = Pattern.compile("Obtain a (\\w+) Crystal in the Crystal Hollows\\.")
+    private val collectionPattern = "Reach ([0-9]+(?:,\\d+)*) (.*) Collection\\.".toPattern()
+    private val crystalPattern = "Obtain a (\\w+) Crystal in the Crystal Hollows\\.".toPattern()
+    private val skillPattern = "Obtain level (.*) in the (.*) Skill.".toPattern()
 
     companion object {
         private val finalSteps = mutableListOf<NextStep>()
@@ -251,8 +251,7 @@ class BingoNextStepHelper {
                 val crystal = crystalMatcher.group(1)
                 ChatMessageStep("Obtain a $crystal Crystal").apply { finalSteps.add(this) } requires IslandType.CRYSTAL_HOLLOWS.getStep()
             }
-            val pattern = Pattern.compile("Obtain level (.*) in the (.*) Skill.")
-            val matcher = pattern.matcher(description)
+            val matcher = skillPattern.matcher(description)
             if (matcher.matches()) {
                 val level = matcher.group(1).toInt()
                 val skillName = matcher.group(2)
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 72251046b..6fb885ff2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt
@@ -19,10 +19,9 @@ import net.minecraft.item.ItemStack
 import net.minecraftforge.event.world.WorldEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import net.minecraftforge.fml.common.gameevent.TickEvent
-import java.util.regex.Pattern
 
 class MinionCraftHelper {
-    private var minionNamePattern = Pattern.compile("(.*) Minion (.*)")
+    private var minionNamePattern = "(.*) Minion (.*)".toPattern()
     private var tick = 0
     private var display = listOf<String>()
     private var hasMinionInInventory = false
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 3c2e7306d..1de8f09a2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
@@ -11,7 +11,6 @@ import net.minecraft.client.Minecraft
 import net.minecraft.client.entity.EntityOtherPlayerMP
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import net.minecraftforge.fml.common.gameevent.TickEvent
-import java.util.regex.Pattern
 
 class PlayerDeathMessages {
 
@@ -19,7 +18,7 @@ class PlayerDeathMessages {
     private val lastTimePlayerSeen = mutableMapOf<String, Long>()
 
     //§c ☠ §r§7§r§bZeroHazel§r§7 was killed by §r§8§lAshfang§r§7§r§7.
-    private val pattern = Pattern.compile("§c ☠ §r§7§r§.(.+)§r§7 (.+)")
+    private val pattern = "§c ☠ §r§7§r§.(.+)§r§7 (.+)".toPattern()
 
     @SubscribeEvent
     fun onTick(event: TickEvent.ClientTickEvent) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
index 998106a48..ca053323f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
@@ -34,7 +34,6 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import net.minecraftforge.fml.common.gameevent.TickEvent
 import java.util.*
-import java.util.regex.Pattern
 import kotlin.math.max
 
 class DamageIndicatorManager {
@@ -45,7 +44,7 @@ class DamageIndicatorManager {
 
     companion object {
         private var data = mutableMapOf<UUID, EntityData>()
-        private val damagePattern = Pattern.compile("[✧✯]?(\\d+[⚔+✧❤♞☄✷ﬗ✯]*)")
+        private val damagePattern = "[✧✯]?(\\d+[⚔+✧❤♞☄✷ﬗ✯]*)".toPattern()
 
         fun isBoss(entity: EntityLivingBase): Boolean {
             return data.values.any { it.entity == entity }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonData.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonData.kt
index 9b5430b93..00db6d6b8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonData.kt
@@ -9,11 +9,10 @@ import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import net.minecraftforge.event.world.WorldEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import net.minecraftforge.fml.common.gameevent.TickEvent
-import java.util.regex.Pattern
 
 class DungeonData {
 
-    private val pattern = Pattern.compile(" §7⏣ §cThe Catacombs §7\\((.*)\\)")
+    private val pattern = " §7⏣ §cThe Catacombs §7\\((.*)\\)".toPattern()
 
     companion object {
         var dungeonFloor: String? = null
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLevelColor.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLevelColor.kt
index ff334737b..91b347145 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLevelColor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLevelColor.kt
@@ -6,11 +6,10 @@ import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import net.minecraftforge.event.entity.player.ItemTooltipEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import java.util.regex.Pattern
 
 class DungeonLevelColor {
 
-    private val pattern = Pattern.compile(" §.(.*)§f: §e(.*)§b \\(§e(.*)§b\\)")
+    private val pattern = " §.(.*)§f: §e(.*)§b \\(§e(.*)§b\\)".toPattern()
 
     @SubscribeEvent
     fun onItemTooltip(event: ItemTooltipEvent) {
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 54dbb21a4..112ef5a1f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt
@@ -12,20 +12,19 @@ import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimalIfNeeded
 import at.hannibal2.skyhanni.utils.RenderUtils.renderString
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import java.util.regex.Pattern
 import kotlin.math.roundToInt
 
 class GardenLevelDisplay {
     private val config get() = SkyHanniMod.feature.garden
-    private val overflowPattern = Pattern.compile("(?:.*) §e(.*)§6\\/(?:.*)")
-    private val namePattern = Pattern.compile("Garden Level (.*)")
+    private val overflowPattern = "(?:.*) §e(.*)§6\\/(?:.*)".toPattern()
+    private val namePattern = "Garden Level (.*)".toPattern()
     private var gardenExp
         get() = SkyHanniMod.feature.hidden.gardenExp
         set(value) {
             SkyHanniMod.feature.hidden.gardenExp = value
         }
     private var display = ""
-    private var visitorRewardPattern = Pattern.compile(" {4}§r§8\\+§r§2(.*) §r§7Garden Experience")
+    private var visitorRewardPattern = " {4}§r§8\\+§r§2(.*) §r§7Garden Experience".toPattern()
 
     @SubscribeEvent
     fun onProfileJoin(event: ProfileJoinEvent) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
index 1fcb470b4..c5c5d6978 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
@@ -15,7 +15,6 @@ import io.github.moulberry.notenoughupdates.util.SkyBlockTime
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import net.minecraftforge.fml.common.gameevent.TickEvent
 import java.time.Instant
-import java.util.regex.Pattern
 
 class GardenNextJacobContest {
     private var display = listOf<Any>()
@@ -23,9 +22,9 @@ class GardenNextJacobContest {
     private var tick = 0
     private var contests = mutableMapOf<Long, FarmingContest>()
     private var inCalendar = false
-    private val patternDay = Pattern.compile("§aDay (.*)")
-    private val patternMonth = Pattern.compile("(.*), Year (.*)")
-    private val patternCrop = Pattern.compile("§e○ §7(.*)")
+    private val patternDay = "§aDay (.*)".toPattern()
+    private val patternMonth = "(.*), Year (.*)".toPattern()
+    private val patternCrop = "§e○ §7(.*)".toPattern()
 
     private val maxContestsPerYear = 124
     private val contestDuration = 1_000 * 60 * 20
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt
index cab83ecb3..d131aa91a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt
@@ -16,14 +16,13 @@ import net.minecraft.client.gui.inventory.GuiEditSign
 import net.minecraftforge.client.event.GuiOpenEvent
 import net.minecraftforge.client.event.GuiScreenEvent.DrawScreenEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import java.util.regex.Pattern
 
 class GardenOptimalSpeed {
     private val config get() = SkyHanniMod.feature.garden
     private val configCustomSpeed get() = config.optimalSpeedCustom
     private var currentSpeed = 100
     private var optimalSpeed = -1
-    private val currentSpeedPattern = Pattern.compile(" Speed: §r§f✦(.*)")
+    private val currentSpeedPattern = " Speed: §r§f✦(.*)".toPattern()
     private var lastWarnTime = 0L
     private var cropInHand: CropType? = null
     private var rancherOverlayList: List<List<Any?>> = emptyList()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenTeleportPadCompactName.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenTeleportPadCompactName.kt
index 95e50dff2..4dcd73745 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenTeleportPadCompactName.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenTeleportPadCompactName.kt
@@ -6,11 +6,10 @@ import net.minecraft.entity.item.EntityArmorStand
 import net.minecraftforge.client.event.RenderLivingEvent
 import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import java.util.regex.Pattern
 
 class GardenTeleportPadCompactName {
-    private val patternName = Pattern.compile("§.✦ §aWarp To (.*)")
-    private val patternNoName = Pattern.compile("§.✦ §cNo Destination")
+    private val patternName = "§.✦ §aWarp To (.*)".toPattern()
+    private val patternNoName = "§.✦ §cNo Destination".toPattern()
 
     @SubscribeEvent(priority = EventPriority.HIGH)
     fun onRenderLivingB(event: RenderLivingEvent.Specials.Pre<EntityLivingBase>) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt
index 9914f756f..ba9cbe9a1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt
@@ -11,7 +11,6 @@ import at.hannibal2.skyhanni.utils.NEUItems
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
 import at.hannibal2.skyhanni.utils.TimeUtils
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import java.util.regex.Pattern
 import kotlin.time.Duration
 import kotlin.time.DurationUnit
 
@@ -23,7 +22,7 @@ class ComposterDisplay {
 
     private var tabListData by ComposterAPI::tabListData
 
-    enum class DataType(val pattern: String, val icon: String) {
+    enum class DataType(rawPattern: String, val icon: String) {
         ORGANIC_MATTER(" Organic Matter: §r(.*)", "WHEAT"),
         FUEL(" Fuel: §r(.*)", "OIL_BARREL"),
         TIME_LEFT(" Time Left: §r(.*)", "WATCH"),
@@ -33,6 +32,8 @@ class ComposterDisplay {
             NEUItems.getItemStack(icon)
         }
 
+        val pattern by lazy {rawPattern.toPattern()}
+
         fun addToList(map: Map<DataType, String>): List<Any> {
             return listOf(displayItem, map[this]!!)
         }
@@ -114,8 +115,7 @@ class ComposterDisplay {
             if (next) {
                 if (line == "") break
                 for (type in DataType.values()) {
-                    val pattern = Pattern.compile(type.pattern)
-                    val matcher = pattern.matcher(line)
+                    val matcher = type.pattern.matcher(line)
                     if (matcher.matches()) {
                         newData[type] = matcher.group(1)
                     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterInventoryNumbers.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterInventoryNumbers.kt
index 51e30ef16..1ebf0dfe3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterInventoryNumbers.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterInventoryNumbers.kt
@@ -7,11 +7,10 @@ import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.NumberUtil
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import java.util.regex.Pattern
 
 class ComposterInventoryNumbers {
-    private val valuePattern = Pattern.compile("(?:.*) §e(.*)§6\\/(.*)")
-    private val compostsPattern = Pattern.compile("§7§7Compost Available: §a(.*)")
+    private val valuePattern = "(?:.*) §e(.*)§6\\/(.*)".toPattern()
+    private val compostsPattern = "§7§7Compost Available: §a(.*)".toPattern()
 
     @SubscribeEvent
     fun onRenderItemTip(event: RenderInventoryItemTipEvent) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingArmorDrops.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingArmorDrops.kt
index 80b922af2..2423f1a62 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingArmorDrops.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingArmorDrops.kt
@@ -12,14 +12,13 @@ import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import net.minecraftforge.fml.common.gameevent.TickEvent
-import java.util.regex.Pattern
 
 class FarmingArmorDrops {
     private var display = listOf<String>()
     private val drops = mutableMapOf<ArmorDropType, Int>()
     private var hasArmor = false
     private var tick = 0
-    private val armorPattern = Pattern.compile("(FERMENTO|CROPIE|SQUASH|MELON)_(LEGGINGS|CHESTPLATE|BOOTS|HELMET)")
+    private val armorPattern = "(FERMENTO|CROPIE|SQUASH|MELON)_(LEGGINGS|CHESTPLATE|BOOTS|HELMET)".toPattern()
     private val config get() = SkyHanniMod.feature.garden
 
     enum class ArmorDropType(val dropName: String, val chatMessage: String) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenInventoryNumbers.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenInventoryNumbers.kt
index a68838876..c2003186a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenInventoryNumbers.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenInventoryNumbers.kt
@@ -9,11 +9,10 @@ import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.ItemUtils.name
 import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimalIfNeeded
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import java.util.regex.Pattern
 
 class GardenInventoryNumbers {
-    private var patternTierProgress = Pattern.comp