Improve location and profile detection

2 files changed, 18 insertions, 10 deletions

diff --git a/src/main/kotlin/moe/nea/firmament/events/FirmamentCustomPayloadEvent.kt b/src/main/kotlin/moe/nea/firmament/events/FirmamentCustomPayloadEvent.kt
deleted file mode 100644
index 779ca51..0000000
--- a/src/main/kotlin/moe/nea/firmament/events/FirmamentCustomPayloadEvent.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-
-package moe.nea.firmament.events
-
-import moe.nea.firmament.apis.ingame.FirmamentCustomPayload
-
-data class FirmamentCustomPayloadEvent(
-    val payload: FirmamentCustomPayload
-) : FirmamentEvent() {
-    companion object : FirmamentEventBus<FirmamentCustomPayloadEvent>()
-}
diff --git a/src/main/kotlin/moe/nea/firmament/events/ServerConnectedEvent.kt b/src/main/kotlin/moe/nea/firmament/events/ServerConnectedEvent.kt
new file mode 100644
index 0000000..26897f2
--- /dev/null
+++ b/src/main/kotlin/moe/nea/firmament/events/ServerConnectedEvent.kt
@@ -0,0 +1,18 @@
+package moe.nea.firmament.events
+
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents
+import net.minecraft.client.MinecraftClient
+import net.minecraft.client.network.ClientPlayNetworkHandler
+import net.minecraft.network.ClientConnection
+
+data class ServerConnectedEvent(
+    val connection: ClientConnection
+) : FirmamentEvent() {
+    companion object : FirmamentEventBus<ServerConnectedEvent>() {
+        init {
+            ClientPlayConnectionEvents.INIT.register(ClientPlayConnectionEvents.Init { clientPlayNetworkHandler: ClientPlayNetworkHandler, minecraftClient: MinecraftClient ->
+                publishSync(ServerConnectedEvent(clientPlayNetworkHandler.connection))
+            })
+        }
+    }
+}