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.

2 files changed, 33 insertions, 13 deletions

diff --git a/src/main/kotlin/moe/nea/notenoughupdates/util/ConfigHolder.kt b/src/main/kotlin/moe/nea/notenoughupdates/util/ConfigHolder.kt
index 7827708..50a3d9b 100644
--- a/src/main/kotlin/moe/nea/notenoughupdates/util/ConfigHolder.kt
+++ b/src/main/kotlin/moe/nea/notenoughupdates/util/ConfigHolder.kt
@@ -1,21 +1,20 @@
 package moe.nea.notenoughupdates.util
 
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.SerializationException
-import moe.nea.notenoughupdates.NotEnoughUpdates
-import moe.nea.notenoughupdates.events.NEUScreenEvents
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents
-import net.minecraft.client.MinecraftClient
-import net.minecraft.command.CommandSource
-import net.minecraft.server.command.CommandOutput
-import net.minecraft.text.Text
 import java.io.IOException
 import java.nio.file.Path
 import java.util.concurrent.CopyOnWriteArrayList
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.SerializationException
 import kotlin.io.path.exists
 import kotlin.io.path.readText
 import kotlin.io.path.writeText
 import kotlin.reflect.KClass
+import net.minecraft.client.MinecraftClient
+import net.minecraft.server.command.CommandOutput
+import net.minecraft.text.Text
+import moe.nea.notenoughupdates.NotEnoughUpdates
+import moe.nea.notenoughupdates.events.ScreenOpenEvent
 
 abstract class ConfigHolder<T>(
     val serializer: KSerializer<T>,
@@ -108,7 +107,7 @@ abstract class ConfigHolder<T>(
                 player.sendMessage(
                     Text.literal(
                         "The following configs have been reset: ${badLoads.joinToString(", ")}. " +
-                                "This can be intentional, but probably isn't."
+                            "This can be intentional, but probably isn't."
                     )
                 )
                 badLoads.clear()
@@ -116,14 +115,13 @@ abstract class ConfigHolder<T>(
         }
 
         fun registerEvents() {
-            NEUScreenEvents.SCREEN_OPEN.register(NEUScreenEvents.OnScreenOpen { old, new ->
+            ScreenOpenEvent.subscribe { event ->
                 performSaves()
                 val p = MinecraftClient.getInstance().player
                 if (p != null) {
                     warnForResetConfigs(p)
                 }
-                false
-            })
+            }
             ClientLifecycleEvents.CLIENT_STOPPING.register(ClientLifecycleEvents.ClientStopping {
                 performSaves()
             })
diff --git a/src/main/kotlin/moe/nea/notenoughupdates/util/MinecraftDispatcher.kt b/src/main/kotlin/moe/nea/notenoughupdates/util/MinecraftDispatcher.kt
new file mode 100644
index 0000000..366b81a
--- /dev/null
+++ b/src/main/kotlin/moe/nea/notenoughupdates/util/MinecraftDispatcher.kt
@@ -0,0 +1,22 @@
+package moe.nea.notenoughupdates.util
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.Runnable
+import kotlin.coroutines.CoroutineContext
+import net.minecraft.client.MinecraftClient
+
+object MinecraftDispatcher : CoroutineDispatcher() {
+    @ExperimentalCoroutinesApi
+    override fun limitedParallelism(parallelism: Int): CoroutineDispatcher {
+        throw UnsupportedOperationException("limitedParallelism is not supported for MinecraftDispatcher")
+    }
+
+    override fun isDispatchNeeded(context: CoroutineContext): Boolean =
+        !MinecraftClient.getInstance().isOnThread
+
+
+    override fun dispatch(context: CoroutineContext, block: Runnable) {
+        MinecraftClient.getInstance().execute(block)
+    }
+}