aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/misc
diff options
context:
space:
mode:
authorWalker Selby <git@walkerselby.com>2023-10-26 12:51:44 +0100
committerGitHub <noreply@github.com>2023-10-26 13:51:44 +0200
commit075368eb9d19578950fdb727bf2f195c63f41f3c (patch)
treea9f44aedbb32aa6805827d6d86766056cacf8ad2 /src/main/java/at/hannibal2/skyhanni/features/misc
parent7b6d04e280a55edc7aed23f7d34c3ad19cb48687 (diff)
downloadskyhanni-075368eb9d19578950fdb727bf2f195c63f41f3c.tar.gz
skyhanni-075368eb9d19578950fdb727bf2f195c63f41f3c.tar.bz2
skyhanni-075368eb9d19578950fdb727bf2f195c63f41f3c.zip
Add Repo TODOs (#585)
Add Repo TODOs #585
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/misc')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/ServerRestartTitle.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabListReader.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabStringType.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/teleportpad/TeleportPadCompactName.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/teleportpad/TeleportPadInventoryNumber.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorTracker.kt6
11 files changed, 25 insertions, 12 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt
index a89c6e69e..e4b962281 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt
@@ -17,6 +17,9 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
class CurrentPetDisplay {
+ // TODO USE SH-REPO
+ private val inventoryNamePattern = "(?:\\(\\d+/\\d+\\))? Pets".toPattern()
+
@SubscribeEvent
fun onChatMessage(event: LorenzChatEvent) {
val message = event.message
@@ -46,8 +49,6 @@ class CurrentPetDisplay {
@SubscribeEvent
fun onInventoryOpen(event: InventoryFullyOpenedEvent) {
val config = ProfileStorageData.profileSpecific ?: return
-
- val inventoryNamePattern = "(?:\\(\\d+/\\d+\\))? Pets".toPattern()
if (!inventoryNamePattern.matcher(event.inventoryName).matches()) return
val lore = event.inventoryItems[4]?.getLore() ?: return
@@ -60,7 +61,6 @@ class CurrentPetDisplay {
}
}
-
@SubscribeEvent
fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
if (!LorenzUtils.inSkyBlock) return
@@ -76,4 +76,4 @@ class CurrentPetDisplay {
fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
event.move(3, "misc.petDisplay", "misc.pets.display")
}
-} \ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
index 3e8626908..b5268a9bc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
@@ -51,7 +51,7 @@ class NonGodPotEffectDisplay {
DEEP_TERROR("DEEPTERROR", "§4Deepterror", true),
;
}
-
+ // TODO USE SH-REPO
private var patternEffectsCount = "§7You have §e(?<name>\\d+) §7non-god effects\\.".toPattern()
private var totalEffectsCount = 0
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt
index 355e27d49..dbc164fa0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt
@@ -21,8 +21,9 @@ class PatcherSendCoordinates {
private val patcherBeacon = mutableListOf<PatcherBeacon>()
private val logger = LorenzLogger("misc/patchercoords")
- private val pattern = "(?<playerName>.*): x: (?<x>.*), y: (?<y>.*), z: (?<z>.*)".toPattern()
+ // TODO USE SH-REPO
+ private val pattern = "(?<playerName>.*): x: (?<x>.*), y: (?<y>.*), z: (?<z>.*)".toPattern()
@SubscribeEvent
fun onPatcherCoordinates(event: LorenzChatEvent) {
@@ -78,4 +79,4 @@ class PatcherSendCoordinates {
}
data class PatcherBeacon(val location: LorenzVec, val name: String, val time: Long)
-} \ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/ServerRestartTitle.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/ServerRestartTitle.kt
index 5f8db82de..950ed60f3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/ServerRestartTitle.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/ServerRestartTitle.kt
@@ -11,6 +11,8 @@ import kotlin.time.Duration.Companion.seconds
class ServerRestartTitle {
private val config get() = SkyHanniMod.feature.misc
+
+ // TODO USE SH-REPO
private val pattern = "§cServer closing: (?<minutes>\\d+):(?<seconds>\\d+) §8.*".toPattern()
@SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt
index ee49b3023..05cb64605 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt
@@ -23,6 +23,9 @@ import kotlin.random.Random
object AdvancedPlayerList {
private val config get() = SkyHanniMod.feature.misc.compactTabList.advancedPlayerList
+ // TODO USE SH-REPO
+ private val pattern = ".*\\[(?<level>.*)] (?<name>.*)".toPattern()
+
private var playerDatas = mutableMapOf<String, PlayerData>()
fun createTabLine(text: String, type: TabStringType) = playerDatas[text]?.let {
@@ -34,8 +37,6 @@ object AdvancedPlayerList {
if (LorenzUtils.inDungeons) return original
if (ignoreCustomTabList()) return original
-
- val pattern = ".*\\[(?<level>.*)] (?<name>.*)".toPattern()
val newList = mutableListOf<String>()
val currentData = mutableMapOf<String, PlayerData>()
newList.add(original.first())
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabListReader.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabListReader.kt
index 9a328fc89..3f7f537ed 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabListReader.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabListReader.kt
@@ -13,6 +13,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
// heavily inspired by SBA code
object TabListReader {
private val config get() = SkyHanniMod.feature.misc.compactTabList
+ // TODO USE SH-REPO
var hypixelAdvertisingString = "HYPIXEL.NET"
private val godPotPattern = "You have a God Potion active! (?<timer>[\\w ]+)".toPattern()
private val activeEffectPattern = "Active Effects(?:§.)*(?:\\n(?:§.)*§7.+)*".toPattern()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabStringType.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabStringType.kt
index 344a21ae1..74eea4ff3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabStringType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabStringType.kt
@@ -9,6 +9,7 @@ enum class TabStringType {
PLAYER;
companion object {
+ // TODO USE SH-REPO
private val usernamePattern = "^\\[(?<sblevel>\\d+)] (?:\\[\\w+] )?(?<username>\\w+)".toPattern()
fun fromLine(line: String): TabStringType {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/teleportpad/TeleportPadCompactName.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/teleportpad/TeleportPadCompactName.kt
index d09beb3c1..73c2e3398 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/teleportpad/TeleportPadCompactName.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/teleportpad/TeleportPadCompactName.kt
@@ -11,6 +11,7 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
class TeleportPadCompactName {
+ // TODO USE SH-REPO
private val patternName = "§.✦ §aWarp To (?<name>.*)".toPattern()
private val patternNoName = "§.✦ §cNo Destination".toPattern()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/teleportpad/TeleportPadInventoryNumber.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/teleportpad/TeleportPadInventoryNumber.kt
index 5fd1a9116..7916fe6cb 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/teleportpad/TeleportPadInventoryNumber.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/teleportpad/TeleportPadInventoryNumber.kt
@@ -59,6 +59,8 @@ class TeleportPadInventoryNumber {
}
private var inTeleportPad = false
+
+ // TODO USE SH-REPO
private val pattern = "§.(?<number>.*) teleport pad".toPattern()
@SubscribeEvent
@@ -81,4 +83,4 @@ class TeleportPadInventoryNumber {
}
}
}
-} \ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt
index e4d1133ba..83fd1ac52 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt
@@ -38,6 +38,7 @@ import kotlin.time.Duration.Companion.milliseconds
import kotlin.time.Duration.Companion.seconds
object TrevorFeatures {
+ // TODO USE SH-REPO
private val trapperPattern =
"\\[NPC] Trevor: You can find your (?<rarity>.*) animal near the (?<location>.*).".toPattern()
private val talbotPatternAbove =
@@ -45,6 +46,7 @@ object TrevorFeatures {
private val talbotPatternBelow =
"The target is around (?<height>.*) blocks below, at a (?<angle>.*) degrees angle!".toPattern()
private val locationPattern = "Zone: (?<zone>.*)".toPattern()
+
private var timeUntilNextReady = 0
private var trapperReady: Boolean = true
private var currentStatus = TrapperStatus.READY
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorTracker.kt
index 7a4213a64..f2e36db59 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorTracker.kt
@@ -15,11 +15,13 @@ import java.util.regex.Matcher
object TrevorTracker {
private val config get() = SkyHanniMod.feature.misc.trevorTheTrapper
- private var display = emptyList<List<Any>>()
+ // TODO USE SH-REPO
private val selfKillMobPattern = "§aYour mob died randomly, you are rewarded §r§5(?<pelts>.*) pelts§r§a.".toPattern()
private val killMobPattern = "§aKilling the animal rewarded you §r§5(?<pelts>.*) pelts§r§a.".toPattern()
+ private var display = emptyList<List<Any>>()
+
private val peltsPerSecond = mutableListOf<Int>()
private var peltsPerHour = 0
private var stoppedChecks = 0
@@ -141,4 +143,4 @@ object TrevorTracker {
ENDANGERED("ENDANGERED"),
ELUSIVE("ELUSIVE")
}
-} \ No newline at end of file
+}