From 075368eb9d19578950fdb727bf2f195c63f41f3c Mon Sep 17 00:00:00 2001
From: Walker Selby <git@walkerselby.com>
Date: Thu, 26 Oct 2023 12:51:44 +0100
Subject: Add Repo TODOs (#585)

Add Repo TODOs #585
---
 .../features/rift/area/stillgorechateau/RiftBloodEffigies.kt   |  2 +-
 .../skyhanni/features/rift/area/westvillage/KloonHacking.kt    |  9 ++++++---
 .../skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt   | 10 ++++++----
 .../hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt   |  9 ++++++---
 .../skyhanni/features/rift/everywhere/motes/RiftMotesOrb.kt    |  5 ++++-
 .../features/rift/everywhere/motes/ShowMotesNpcSellPrice.kt    |  5 ++++-
 6 files changed, 27 insertions(+), 13 deletions(-)

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

diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt
index 90e6c32ba..f6a4a607b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt
@@ -1,6 +1,5 @@
 package at.hannibal2.skyhanni.features.rift.area.stillgorechateau
 
-import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
@@ -35,6 +34,7 @@ class RiftBloodEffigies {
         5 to -1L,
     )
 
+    // TODO USE SH-REPO
     private val effigiesTimerPattern = "§eRespawn §c(?<time>.*) §7\\(or click!\\)".toPattern()
 
     @SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/KloonHacking.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/KloonHacking.kt
index 78c3c4275..3aaafc42a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/KloonHacking.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/KloonHacking.kt
@@ -24,6 +24,10 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class KloonHacking {
     private val config get() = RiftAPI.config.area.westVillageConfig.hacking
+
+    // TODO USE SH-REPO
+    val pattern = "You've set the color of this terminal to (?<colour>.*)!".toPattern()
+
     private var wearingHelmet = false
     private var inTerminalInventory = false
     private var inColourInventory = false
@@ -123,8 +127,7 @@ class KloonHacking {
     fun onChat(event: LorenzChatEvent) {
         if (!RiftAPI.inRift()) return
         if (!wearingHelmet) return
-
-        "You've set the color of this terminal to (?<colour>.*)!".toPattern().matchMatcher(event.message.removeColor()) {
+        pattern.matchMatcher(event.message.removeColor()) {
             val hidden = ProfileStorageData.profileSpecific?.rift ?: return
             val colour = group("colour")
             val completedTerminal = KloonTerminal.entries.firstOrNull { it.name == colour } ?: return
@@ -159,4 +162,4 @@ class KloonHacking {
         nearestTerminal = closestTerminal
         return closestTerminal
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt
index a3ac3cadb..03a630874 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt
@@ -16,14 +16,16 @@ import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 object CruxTalismanDisplay {
-
     private val config get() = RiftAPI.config.cruxTalisman
+
+    // TODO USE SH-REPO
+    private val progressPattern =
+        ".*(?<tier>§[0-9a-z][IV1-4-]+)\\s+(?<name>§[0-9a-z]\\w+)§[0-9a-z]:\\s*(?<progress>§[0-9a-z](?:§[0-9a-z])?MAXED|(?:§[0-9a-z]\\d+§[0-9a-z]\\/§[0-9a-z]\\d+)).*".toPattern()
+
     private val partialName = "CRUX_TALISMAN"
     private var display = emptyList<List<Any>>()
     private val displayLine = mutableListOf<Crux>()
     private val bonusesLine = mutableListOf<String>()
-    private val progressPattern =
-        ".*(?<tier>§[0-9a-z][IV1-4-]+)\\s+(?<name>§[0-9a-z]\\w+)§[0-9a-z]:\\s*(?<progress>§[0-9a-z](?:§[0-9a-z])?MAXED|(?:§[0-9a-z]\\d+§[0-9a-z]\\/§[0-9a-z]\\d+)).*".toPattern()
     private var maxed = false
     private var percentValue = 0.0
 
@@ -124,4 +126,4 @@ object CruxTalismanDisplay {
     data class Crux(val name: String, val tier: String, val progress: String, val maxed: Boolean)
 
     fun isEnabled() = RiftAPI.inRift() && config.enabled && LorenzUtils.skyBlockArea != "Mirrorverse"
-}
\ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt
index 880dc53ac..7858132f4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt
@@ -12,6 +12,10 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class RiftTimer {
     private val config get() = RiftAPI.config.timer
+
+    // TODO USE SH-REPO
+    val pattern = "§(?<color>[a7])(?<time>.*)ф Left.*".toPattern()
+
     private var display = emptyList<String>()
     private var maxTime = 0L
     private var latestTime = 0L
@@ -28,9 +32,8 @@ class RiftTimer {
     fun onActionBar(event: LorenzActionBarEvent) {
         if (!isEnabled()) return
 
-        val message = event.message
-        for (entry in message.split("     ")) {
-            "§(?<color>[a7])(?<time>.*)ф Left.*".toPattern().matchMatcher(entry) {
+        for (entry in event.message.split("     ")) {
+            pattern.matchMatcher(entry) {
                 val color = group("color")
                 if (color == "7") {
                     val currentTime = getTime(group("time"))
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/RiftMotesOrb.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/RiftMotesOrb.kt
index 730b028d4..abbea2a5a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/RiftMotesOrb.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/RiftMotesOrb.kt
@@ -17,9 +17,12 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class RiftMotesOrb {
     private val config get() = RiftAPI.config.motesOrbsConfig
-    private var motesOrbs = emptyList<MotesOrb>()
+
+    // TODO USE SH-REPO
     private val pattern = "§5§lORB! §r§dPicked up §r§5+.* Motes§r§d.*".toPattern()
 
+    private var motesOrbs = emptyList<MotesOrb>()
+
     class MotesOrb(
         var location: LorenzVec,
         var counter: Int = 0,
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/ShowMotesNpcSellPrice.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/ShowMotesNpcSellPrice.kt
index fe7cb2a73..364ef77a2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/ShowMotesNpcSellPrice.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/ShowMotesNpcSellPrice.kt
@@ -28,8 +28,11 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class ShowMotesNpcSellPrice {
     private val config get() = RiftAPI.config.motes
-    private var display = emptyList<List<Any>>()
+
+    // TODO USE SH-REPO
     private val pattern = ".*(?:§\\w)+You have (?:§\\w)+(?<amount>\\d) Grubber Stacks.*".toPattern()
+
+    private var display = emptyList<List<Any>>()
     private val itemMap = mutableMapOf<NEUInternalName, Pair<MutableList<Int>, Double>>()
     private var inInventory = false
     private val slotList = mutableListOf<Int>()
-- 
cgit