Fix up most of the remaining event handlers

[no changelog]

2 files changed, 68 insertions, 58 deletions

diff --git a/src/main/kotlin/moe/nea/firmament/features/mining/PickaxeAbility.kt b/src/main/kotlin/moe/nea/firmament/features/mining/PickaxeAbility.kt
index 956ffc3..8e62172 100644
--- a/src/main/kotlin/moe/nea/firmament/features/mining/PickaxeAbility.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/mining/PickaxeAbility.kt
@@ -13,6 +13,7 @@ import net.minecraft.item.ItemStack
 import net.minecraft.util.DyeColor
 import net.minecraft.util.Hand
 import net.minecraft.util.Identifier
+import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.HudRenderEvent
 import moe.nea.firmament.events.ProcessChatEvent
 import moe.nea.firmament.events.SlotClickEvent
@@ -73,53 +74,57 @@ object PickaxeAbility : FirmamentFeature {
         return 1.0
     }
 
-    override fun onLoad() {
-        HudRenderEvent.subscribe(this::renderHud)
-        WorldReadyEvent.subscribe {
-            lastUsage.clear()
-            lobbyJoinTime = TimeMark.now()
-            abilityOverride = null
-        }
-        ProcessChatEvent.subscribe {
-            abilityUsePattern.useMatch(it.unformattedString) {
-                lastUsage[group("name")] = TimeMark.now()
-            }
-            abilitySwitchPattern.useMatch(it.unformattedString) {
-                abilityOverride = group("ability")
-            }
-        }
-        DurabilityBarEvent.subscribe {
-            if (!TConfig.drillFuelBar) return@subscribe
-            val lore = it.item.loreAccordingToNbt
-            if (lore.lastOrNull()?.unformattedString?.contains("DRILL") != true) return@subscribe
-            val maxFuel = lore.firstNotNullOfOrNull {
-                fuelPattern.useMatch(it.unformattedString) {
-                    parseShortNumber(group("maxFuel"))
+    @Subscribe
+    fun onSlotClick(it: SlotClickEvent) {
+        if (MC.screen?.title?.unformattedString == "Heart of the Mountain") {
+            val name = it.stack.displayNameAccordingToNbt?.unformattedString ?: return
+            val cooldown = it.stack.loreAccordingToNbt.firstNotNullOfOrNull {
+                cooldownPattern.useMatch(it.unformattedString) {
+                    parseTimePattern(group("cooldown"))
                 }
-            } ?: return@subscribe
-            val extra = it.item.extraAttributes
-            if (!extra.contains("drill_fuel")) return@subscribe
-            val fuel = extra.getInt("drill_fuel")
-            val percentage = fuel / maxFuel.toFloat()
-            it.barOverride = DurabilityBarEvent.DurabilityBar(
-                lerp(
-                    DyeColor.RED.toShedaniel(),
-                    DyeColor.GREEN.toShedaniel(),
-                    percentage
-                ), percentage
-            )
+            } ?: return
+            defaultAbilityDurations[name] = cooldown
         }
-        SlotClickEvent.subscribe {
-            if (MC.screen?.title?.unformattedString == "Heart of the Mountain") {
-                val name = it.stack.displayNameAccordingToNbt?.unformattedString ?: return@subscribe
-                val cooldown = it.stack.loreAccordingToNbt.firstNotNullOfOrNull {
-                    cooldownPattern.useMatch(it.unformattedString) {
-                        parseTimePattern(group("cooldown"))
-                    }
-                } ?: return@subscribe
-                defaultAbilityDurations[name] = cooldown
+    }
+
+    @Subscribe
+    fun onDurabilityBar(it: DurabilityBarEvent) {
+        if (!TConfig.drillFuelBar) return
+        val lore = it.item.loreAccordingToNbt
+        if (lore.lastOrNull()?.unformattedString?.contains("DRILL") != true) return
+        val maxFuel = lore.firstNotNullOfOrNull {
+            fuelPattern.useMatch(it.unformattedString) {
+                parseShortNumber(group("maxFuel"))
             }
+        } ?: return
+        val extra = it.item.extraAttributes
+        if (!extra.contains("drill_fuel")) return
+        val fuel = extra.getInt("drill_fuel")
+        val percentage = fuel / maxFuel.toFloat()
+        it.barOverride = DurabilityBarEvent.DurabilityBar(
+            lerp(
+                DyeColor.RED.toShedaniel(),
+                DyeColor.GREEN.toShedaniel(),
+                percentage
+            ), percentage
+        )
+    }
+
+    @Subscribe
+    fun onChatMessage(it: ProcessChatEvent) {
+        abilityUsePattern.useMatch(it.unformattedString) {
+            lastUsage[group("name")] = TimeMark.now()
         }
+        abilitySwitchPattern.useMatch(it.unformattedString) {
+            abilityOverride = group("ability")
+        }
+    }
+
+    @Subscribe
+    fun onWorldReady(event: WorldReadyEvent) {
+        lastUsage.clear()
+        lobbyJoinTime = TimeMark.now()
+        abilityOverride = null
     }
 
     val abilityUsePattern = Pattern.compile("You used your (?<name>.*) Pickaxe Ability!")
@@ -154,7 +159,8 @@ object PickaxeAbility : FirmamentFeature {
         Pattern.compile("You selected (?<ability>.*) as your Pickaxe Ability\\. This ability will apply to all of your pickaxes!")
 
 
-    private fun renderHud(event: HudRenderEvent) {
+    @Subscribe
+    fun renderHud(event: HudRenderEvent) {
         if (!TConfig.cooldownEnabled) return
         var ability = getCooldownFromLore(MC.player?.getStackInHand(Hand.MAIN_HAND) ?: return) ?: return
         defaultAbilityDurations[ability.name] = ability.cooldown
diff --git a/src/main/kotlin/moe/nea/firmament/features/mining/PristineProfitTracker.kt b/src/main/kotlin/moe/nea/firmament/features/mining/PristineProfitTracker.kt
index 89ef264..1597501 100644
--- a/src/main/kotlin/moe/nea/firmament/features/mining/PristineProfitTracker.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/mining/PristineProfitTracker.kt
@@ -12,6 +12,7 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.serializer
 import kotlin.time.Duration.Companion.seconds
 import net.minecraft.text.Text
+import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.ProcessChatEvent
 import moe.nea.firmament.features.FirmamentFeature
 import moe.nea.firmament.gui.config.ManagedConfig
@@ -62,7 +63,7 @@ object PristineProfitTracker : FirmamentFeature {
 
     val pristineRegex =
         "PRISTINE! You found . Flawed (?<kind>${
-            GemstoneKind.values().joinToString("|") { it.label }
+            GemstoneKind.entries.joinToString("|") { it.label }
         }) Gemstone x(?<count>[0-9,]+)!".toPattern()
 
     val collectionHistogram = Histogram<Double>(10000, 180.seconds)
@@ -97,9 +98,13 @@ object PristineProfitTracker : FirmamentFeature {
         val moneyPerSecond = moneyHistogram.averagePer({ it }, 1.seconds)
         if (collectionPerSecond == null || moneyPerSecond == null) return
         ProfitHud.collectionCurrent = collectionPerSecond
-        ProfitHud.collectionText = Text.stringifiedTranslatable("firmament.pristine-profit.collection", formatCurrency(collectionPerSecond * SECONDS_PER_HOUR, 1)).formattedString()
+        ProfitHud.collectionText = Text.stringifiedTranslatable("firmament.pristine-profit.collection",
+                                                                formatCurrency(collectionPerSecond * SECONDS_PER_HOUR,
+                                                                               1)).formattedString()
         ProfitHud.moneyCurrent = moneyPerSecond
-        ProfitHud.moneyText = Text.stringifiedTranslatable("firmament.pristine-profit.money", formatCurrency(moneyPerSecond * SECONDS_PER_HOUR, 1)).formattedString()
+        ProfitHud.moneyText = Text.stringifiedTranslatable("firmament.pristine-profit.money",
+                                                           formatCurrency(moneyPerSecond * SECONDS_PER_HOUR, 1))
+            .formattedString()
         val data = DConfig.data
         if (data != null) {
             if (data.maxCollectionPerSecond < collectionPerSecond && collectionHistogram.oldestUpdate()
@@ -118,17 +123,16 @@ object PristineProfitTracker : FirmamentFeature {
     }
 
 
-    override fun onLoad() {
-        ProcessChatEvent.subscribe {
-            pristineRegex.useMatch(it.unformattedString) {
-                val gemstoneKind = GemstoneKind.valueOf(group("kind").uppercase())
-                val flawedCount = parseIntWithComma(group("count"))
-                val moneyAmount = sellingStrategy.getSellPrice(gemstoneKind.flawedId) * flawedCount
-                moneyHistogram.record(moneyAmount)
-                val collectionAmount = flawedCount * ROUGHS_PER_FLAWED
-                collectionHistogram.record(collectionAmount.toDouble())
-                updateUi()
-            }
+    @Subscribe
+    fun onMessage(it: ProcessChatEvent) {
+        pristineRegex.useMatch(it.unformattedString) {
+            val gemstoneKind = GemstoneKind.valueOf(group("kind").uppercase())
+            val flawedCount = parseIntWithComma(group("count"))
+            val moneyAmount = sellingStrategy.getSellPrice(gemstoneKind.flawedId) * flawedCount
+            moneyHistogram.record(moneyAmount)
+            val collectionAmount = flawedCount * ROUGHS_PER_FLAWED
+            collectionHistogram.record(collectionAmount.toDouble())
+            updateUi()
         }
     }
 }