From 5ed74f2df49c93ed1617520a935078b59ad7e195 Mon Sep 17 00:00:00 2001
From: Linnea Gräf <nea@nea.moe>
Date: Sun, 1 Sep 2024 22:21:19 +0200
Subject: Add per compat project event listeners

[no changelog]
---
 src/main/kotlin/features/debug/DebugView.kt      | 11 +----------
 src/main/kotlin/features/debug/PowerUserTools.kt | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 18 deletions(-)

(limited to 'src/main/kotlin/features/debug')

diff --git a/src/main/kotlin/features/debug/DebugView.kt b/src/main/kotlin/features/debug/DebugView.kt
index 7e1b8ec..ee54260 100644
--- a/src/main/kotlin/features/debug/DebugView.kt
+++ b/src/main/kotlin/features/debug/DebugView.kt
@@ -3,6 +3,7 @@
 package moe.nea.firmament.features.debug
 
 import moe.nea.firmament.Firmament
+import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.TickEvent
 import moe.nea.firmament.features.FirmamentFeature
 import moe.nea.firmament.util.TimeMark
@@ -25,14 +26,4 @@ object DebugView : FirmamentFeature {
         }
     }
 
-    fun recalculateDebugWidget() {
-    }
-
-    override fun onLoad() {
-        TickEvent.subscribe {
-            synchronized(this) {
-                recalculateDebugWidget()
-            }
-        }
-    }
 }
diff --git a/src/main/kotlin/features/debug/PowerUserTools.kt b/src/main/kotlin/features/debug/PowerUserTools.kt
index 7893eff..dccf8f7 100644
--- a/src/main/kotlin/features/debug/PowerUserTools.kt
+++ b/src/main/kotlin/features/debug/PowerUserTools.kt
@@ -4,6 +4,7 @@ package moe.nea.firmament.features.debug
 
 import net.minecraft.block.SkullBlock
 import net.minecraft.block.entity.SkullBlockEntity
+import net.minecraft.client.gui.screen.Screen
 import net.minecraft.component.DataComponentTypes
 import net.minecraft.entity.Entity
 import net.minecraft.entity.LivingEntity
@@ -54,15 +55,16 @@ object PowerUserTools : FirmamentFeature {
         }
     var lastCopiedStackViewTime = false
 
-    override fun onLoad() {
-        TickEvent.subscribe {
-            if (!lastCopiedStackViewTime)
-                lastCopiedStack = null
-            lastCopiedStackViewTime = false
-        }
-        ScreenChangeEvent.subscribe {
+    @Subscribe
+    fun resetLastCopiedStack(event: TickEvent) {
+        if (!lastCopiedStackViewTime)
             lastCopiedStack = null
-        }
+        lastCopiedStackViewTime = false
+    }
+
+    @Subscribe
+    fun resetLastCopiedStackOnScreenChange(event: ScreenChangeEvent) {
+        lastCopiedStack = null
     }
 
     fun debugFormat(itemStack: ItemStack): Text {
-- 
cgit