correctly send player location & disconnect

Author: PssbleTrngle

simulator/bun.lockb

@@ -1,11 +1,9 @@
 package com.possible_triangle.atheneum_connector
 
+import com.possible_triangle.atheneum.createContextualJson
 import com.possible_triangle.atheneum.messages.ServerStatus
 import com.possible_triangle.atheneum.messages.ServerStatusMessage
-import com.possible_triangle.atheneum.createContextualJson
 import com.possible_triangle.atheneum_connector.network.Network
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonBuilder
 import net.minecraftforge.event.server.ServerStartedEvent
 import net.minecraftforge.event.server.ServerStoppingEvent
 import net.minecraftforge.eventbus.api.SubscribeEvent

src/main/kotlin/com/possible_triangle/atheneum_connector/AtheneumConnector.kt

@@ -1,16 +1,18 @@
 package com.possible_triangle.atheneum_connector.events
 
-import com.possible_triangle.atheneum_connector.LocationCache
-import com.possible_triangle.atheneum_connector.RabbitMQ
+import com.possible_triangle.atheneum.messages.PlayerDisconnectMessage
 import com.possible_triangle.atheneum.messages.PlayerMoveMessage
 import com.possible_triangle.atheneum.models.Point
+import com.possible_triangle.atheneum_connector.LocationCache
+import com.possible_triangle.atheneum_connector.RabbitMQ
 import com.possible_triangle.atheneum_connector.network.DisplayTitlePaket
 import com.possible_triangle.atheneum_connector.network.Network
 import com.possible_triangle.atheneum_connector.publish
 import net.minecraft.network.chat.Component
 import net.minecraft.server.level.ServerPlayer
 import net.minecraftforge.api.distmarker.Dist
 import net.minecraftforge.event.TickEvent.PlayerTickEvent
+import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedOutEvent
 import net.minecraftforge.eventbus.api.SubscribeEvent
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber
 
@@ -24,13 +26,17 @@ object PlayerEvents {
 
         if (level.gameTime % 20 != 0L) return
 
-        RabbitMQ.publish(PlayerMoveMessage(
-            player.uuid,
-            Point(
-                player.level().dimension().location().path,
-                player.blockX, player.blockY, player.blockZ,
+        RabbitMQ.publish(
+            PlayerMoveMessage(
+                player.uuid,
+                Point(
+                    world = player.level().dimension().location().path,
+                    x = player.blockX,
+                    y = player.blockY,
+                    z = player.blockZ,
+                )
             )
-        ))
+        )
 
         val location = LocationCache.containing(level.dimension(), player.onPos) ?: return
 
@@ -39,8 +45,16 @@ object PlayerEvents {
         }
 
         location.ifRight {
-            Network.sendTo(player, DisplayTitlePaket(Component.literal("You are close to ${it.name}"), "place-${it.id}"))
+            Network.sendTo(
+                player,
+                DisplayTitlePaket(Component.literal("You are close to ${it.name}"), "place-${it.id}")
+            )
         }
     }
 
+    @SubscribeEvent
+    fun onPlayerDisconnect(event: PlayerLoggedOutEvent) {
+        RabbitMQ.publish(PlayerDisconnectMessage(event.entity.uuid))
+    }
+
 }