Fix up most of the remaining event handlers

[no changelog]

3 files changed, 23 insertions, 13 deletions

diff --git a/src/main/kotlin/moe/nea/firmament/features/diana/AncestralSpadeSolver.kt b/src/main/kotlin/moe/nea/firmament/features/diana/AncestralSpadeSolver.kt
index b9c83e6..e80ef92 100644
--- a/src/main/kotlin/moe/nea/firmament/features/diana/AncestralSpadeSolver.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/diana/AncestralSpadeSolver.kt
@@ -10,17 +10,20 @@ import kotlin.time.Duration.Companion.seconds
 import net.minecraft.particle.ParticleTypes
 import net.minecraft.sound.SoundEvents
 import net.minecraft.util.math.Vec3d
+import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.ParticleSpawnEvent
 import moe.nea.firmament.events.SoundReceiveEvent
 import moe.nea.firmament.events.WorldKeyboardEvent
 import moe.nea.firmament.events.WorldReadyEvent
 import moe.nea.firmament.events.WorldRenderLastEvent
+import moe.nea.firmament.events.subscription.SubscriptionOwner
+import moe.nea.firmament.features.FirmamentFeature
 import moe.nea.firmament.util.SBData
 import moe.nea.firmament.util.TimeMark
 import moe.nea.firmament.util.WarpUtil
 import moe.nea.firmament.util.render.RenderInWorldContext
 
-object AncestralSpadeSolver {
+object AncestralSpadeSolver : SubscriptionOwner {
     var lastDing = TimeMark.farPast()
         private set
     private val pitches = mutableListOf<Float>()
@@ -33,6 +36,7 @@ object AncestralSpadeSolver {
     fun isEnabled() =
         DianaWaypoints.TConfig.ancestralSpadeSolver && SBData.skyblockLocation == "hub"
 
+    @Subscribe
     fun onKeyBind(event: WorldKeyboardEvent) {
         if (!isEnabled()) return
         if (!event.matches(DianaWaypoints.TConfig.ancestralSpadeTeleport)) return
@@ -42,6 +46,7 @@ object AncestralSpadeSolver {
         lastTeleportAttempt = TimeMark.now()
     }
 
+    @Subscribe
     fun onParticleSpawn(event: ParticleSpawnEvent) {
         if (!isEnabled()) return
         if (event.particleEffect != ParticleTypes.DRIPPING_LAVA) return
@@ -53,6 +58,7 @@ object AncestralSpadeSolver {
         }
     }
 
+    @Subscribe
     fun onPlaySound(event: SoundReceiveEvent) {
         if (!isEnabled()) return
         if (!SoundEvents.BLOCK_NOTE_BLOCK_HARP.matchesId(event.sound.value().id)) return
@@ -92,6 +98,7 @@ object AncestralSpadeSolver {
         nextGuess = event.position.add(lastParticleDirection.multiply(soundDistanceEstimate))
     }
 
+    @Subscribe
     fun onWorldRender(event: WorldRenderLastEvent) {
         if (!isEnabled()) return
         RenderInWorldContext.renderInWorld(event) {
@@ -108,6 +115,7 @@ object AncestralSpadeSolver {
         }
     }
 
+    @Subscribe
     fun onSwapWorld(event: WorldReadyEvent) {
         nextGuess = null
         particlePositions.clear()
@@ -115,4 +123,7 @@ object AncestralSpadeSolver {
         lastDing = TimeMark.farPast()
     }
 
+    override val delegateFeature: FirmamentFeature
+        get() = DianaWaypoints
+
 }
diff --git a/src/main/kotlin/moe/nea/firmament/features/diana/DianaWaypoints.kt b/src/main/kotlin/moe/nea/firmament/features/diana/DianaWaypoints.kt
index 9102497..b1f66c1 100644
--- a/src/main/kotlin/moe/nea/firmament/features/diana/DianaWaypoints.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/diana/DianaWaypoints.kt
@@ -28,23 +28,12 @@ object DianaWaypoints : FirmamentFeature {
     }
 
     override fun onLoad() {
-        ParticleSpawnEvent.subscribe(NearbyBurrowsSolver::onParticles)
-        WorldReadyEvent.subscribe(NearbyBurrowsSolver::onSwapWorld)
-        WorldRenderLastEvent.subscribe(NearbyBurrowsSolver::onRender)
         UseBlockEvent.subscribe {
             NearbyBurrowsSolver.onBlockClick(it.hitResult.blockPos)
         }
         AttackBlockEvent.subscribe {
             NearbyBurrowsSolver.onBlockClick(it.blockPos)
         }
-        ProcessChatEvent.subscribe(NearbyBurrowsSolver::onChatEvent)
-
-
-        WorldKeyboardEvent.subscribe(AncestralSpadeSolver::onKeyBind)
-        ParticleSpawnEvent.subscribe(AncestralSpadeSolver::onParticleSpawn)
-        SoundReceiveEvent.subscribe(AncestralSpadeSolver::onPlaySound)
-        WorldRenderLastEvent.subscribe(AncestralSpadeSolver::onWorldRender)
-        WorldReadyEvent.subscribe(AncestralSpadeSolver::onSwapWorld)
     }
 }
 
diff --git a/src/main/kotlin/moe/nea/firmament/features/diana/NearbyBurrowsSolver.kt b/src/main/kotlin/moe/nea/firmament/features/diana/NearbyBurrowsSolver.kt
index 1ab7e01..e6aeeae 100644
--- a/src/main/kotlin/moe/nea/firmament/features/diana/NearbyBurrowsSolver.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/diana/NearbyBurrowsSolver.kt
@@ -11,15 +11,18 @@ import net.minecraft.particle.ParticleTypes
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.MathHelper
 import net.minecraft.util.math.Position
+import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.ParticleSpawnEvent
 import moe.nea.firmament.events.ProcessChatEvent
 import moe.nea.firmament.events.WorldReadyEvent
 import moe.nea.firmament.events.WorldRenderLastEvent
+import moe.nea.firmament.events.subscription.SubscriptionOwner
+import moe.nea.firmament.features.FirmamentFeature
 import moe.nea.firmament.util.TimeMark
 import moe.nea.firmament.util.mutableMapWithMaxSize
 import moe.nea.firmament.util.render.RenderInWorldContext.Companion.renderInWorld
 
-object NearbyBurrowsSolver {
+object NearbyBurrowsSolver : SubscriptionOwner {
 
 
     private val recentlyDugBurrows: MutableMap<BlockPos, TimeMark> = mutableMapWithMaxSize(20)
@@ -32,6 +35,7 @@ object NearbyBurrowsSolver {
 
     val burrows = mutableMapOf<BlockPos, BurrowType>()
 
+    @Subscribe
     fun onChatEvent(event: ProcessChatEvent) {
         val lastClickedBurrow = lastBlockClick ?: return
         if (event.unformattedString.startsWith("You dug out a Griffin Burrow!") ||
@@ -62,6 +66,7 @@ object NearbyBurrowsSolver {
         recentEnchantParticles[blockPos] = TimeMark.now()
     }
 
+    @Subscribe
     fun onParticles(event: ParticleSpawnEvent) {
         if (!DianaWaypoints.TConfig.nearbyWaypoints) return
 
@@ -106,6 +111,7 @@ object NearbyBurrowsSolver {
         }
     }
 
+    @Subscribe
     fun onRender(event: WorldRenderLastEvent) {
         if (!DianaWaypoints.TConfig.nearbyWaypoints) return
         renderInWorld(event) {
@@ -120,6 +126,7 @@ object NearbyBurrowsSolver {
         }
     }
 
+    @Subscribe
     fun onSwapWorld(worldReadyEvent: WorldReadyEvent) {
         burrows.clear()
         recentEnchantParticles.clear()
@@ -132,6 +139,9 @@ object NearbyBurrowsSolver {
         burrows.remove(blockPos)
         lastBlockClick = blockPos
     }
+
+    override val delegateFeature: FirmamentFeature
+        get() = DianaWaypoints
 }
 
 fun Position.toBlockPos(): BlockPos {