From 37136d67808f70caa39e6902c861b7a1e10cc258 Mon Sep 17 00:00:00 2001
From: jimchen5209 <jimchen5209@gmail.com>
Date: Sun, 16 Jun 2024 15:07:37 +0800
Subject: [PATCH] refactor: move packet register of chat to main

---
 src/main/kotlin/one/oktw/galaxy/Main.kt          | 3 +++
 src/main/kotlin/one/oktw/galaxy/chat/Exchange.kt | 6 ------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/kotlin/one/oktw/galaxy/Main.kt b/src/main/kotlin/one/oktw/galaxy/Main.kt
index 741b91765..634759674 100644
--- a/src/main/kotlin/one/oktw/galaxy/Main.kt
+++ b/src/main/kotlin/one/oktw/galaxy/Main.kt
@@ -41,6 +41,7 @@ import one.oktw.galaxy.event.type.ProxyResponseEvent
 import one.oktw.galaxy.item.event.CustomItemEventHandler
 import one.oktw.galaxy.item.event.Wrench
 import one.oktw.galaxy.network.ProxyAPIPayload
+import one.oktw.galaxy.network.ProxyChatPayload
 import one.oktw.galaxy.player.Harvest
 import one.oktw.galaxy.proxy.api.ProxyAPI
 import one.oktw.galaxy.recipe.RecipeRegistry
@@ -93,6 +94,8 @@ class Main : DedicatedServerModInitializer, CoroutineScope {
             ServerPlayNetworking.registerGlobalReceiver(ProxyAPIPayload.ID) { payload, context ->
                 eventManager.emit(ProxyResponseEvent(context.player(), payload.packet))
             }
+            // Register Proxy Chat Packet
+            PayloadTypeRegistry.playS2C().register(ProxyChatPayload.ID, ProxyChatPayload.CODEC)
 
             //Events
             eventManager.register(Exchange())
diff --git a/src/main/kotlin/one/oktw/galaxy/chat/Exchange.kt b/src/main/kotlin/one/oktw/galaxy/chat/Exchange.kt
index cace6ef56..606b43119 100644
--- a/src/main/kotlin/one/oktw/galaxy/chat/Exchange.kt
+++ b/src/main/kotlin/one/oktw/galaxy/chat/Exchange.kt
@@ -30,12 +30,6 @@ import one.oktw.galaxy.proxy.api.ProxyAPI
 import one.oktw.galaxy.proxy.api.packet.MessageSend
 
 class Exchange {
-    companion object {
-        init {
-            PayloadTypeRegistry.playS2C().register(ProxyChatPayload.ID, ProxyChatPayload.CODEC)
-        }
-    }
-
     @EventListener(true)
     fun handleChat(event: PlayerChatEvent) {
         if (Main.selfUUID == ProxyAPI.dummyUUID) return