Move Eventhandling around.

I still want to use fabric still "array backed" events, but these here are just a bit easier to use from kotlin.

1 files changed, 5 insertions, 4 deletions

diff --git a/src/main/kotlin/moe/nea/notenoughupdates/mixins/MixinMinecraft.kt b/src/main/kotlin/moe/nea/notenoughupdates/mixins/MixinMinecraft.kt
index 21834e9..3bc1a5f 100644
--- a/src/main/kotlin/moe/nea/notenoughupdates/mixins/MixinMinecraft.kt
+++ b/src/main/kotlin/moe/nea/notenoughupdates/mixins/MixinMinecraft.kt
@@ -1,19 +1,20 @@
 package moe.nea.notenoughupdates.mixins
 
-import moe.nea.notenoughupdates.events.NEUScreenEvents
-import net.minecraft.client.MinecraftClient
-import net.minecraft.client.gui.screen.Screen
 import org.spongepowered.asm.mixin.Mixin
 import org.spongepowered.asm.mixin.injection.At
 import org.spongepowered.asm.mixin.injection.Inject
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo
+import net.minecraft.client.MinecraftClient
+import net.minecraft.client.gui.screen.Screen
+import moe.nea.notenoughupdates.events.ScreenOpenEvent
 
 @Suppress("CAST_NEVER_SUCCEEDS")
 @Mixin(MinecraftClient::class)
 class MixinMinecraft {
     @Inject(method = ["setScreen"], at = [At("HEAD")], cancellable = true)
     fun onScreenChange(screen: Screen?, ci: CallbackInfo) {
-        if (NEUScreenEvents.SCREEN_OPEN.invoker().onScreenOpen((this as MinecraftClient).currentScreen, screen))
+        val event = ScreenOpenEvent((this as MinecraftClient).currentScreen, screen)
+        if (ScreenOpenEvent.publish(event).cancelled)
             ci.cancel()
     }
 }