Replace JOIN event with our own mixin

Fixes a weird issue where packets can't be received during the `JOIN` event, making the client "miss" the server's response
DenizenScript · Jun 4, 2023 · b58b9ba · b58b9ba
1 parent 5aa9f89
commit b58b9ba
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/src/main/java/com/denizenscript/clientizen/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/com/denizenscript/clientizen/mixin/ClientPlayNetworkHandlerMixin.java
@@ -0,0 +1,17 @@
+package com.denizenscript.clientizen.mixin;
+
+import com.denizenscript.clientizen.network.NetworkManager;
+import net.minecraft.client.network.ClientPlayNetworkHandler;
+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;
+
+@Mixin(ClientPlayNetworkHandler.class)
+public class ClientPlayNetworkHandlerMixin {
+
+    @Inject(method = "onGameJoin", at = @At("TAIL"))
+    private void clientizen$onGameJoin(CallbackInfo ci) {
+        NetworkManager.onConnect();
+    }
+}
diff --git a/src/main/java/com/denizenscript/clientizen/network/NetworkManager.java b/src/main/java/com/denizenscript/clientizen/network/NetworkManager.java
@@ -2,7 +2,6 @@
 
 import com.denizenscript.denizencore.utilities.CoreConfiguration;
 import com.denizenscript.denizencore.utilities.debugging.Debug;
-import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
 import net.minecraft.util.Identifier;
@@ -11,13 +10,14 @@ public class NetworkManager {
 
     public static void init() {
         Debug.log("Initializing NetworkManager...");
-        ClientPlayConnectionEvents.JOIN.register(((handler, sender, client) -> {
-            debugNetwork("Sending join confirmation packet...");
-            send(Channels.SEND_CONFIRM, null);
-        }));
         ScriptNetworking.init();
     }
 
+    public static void onConnect() {
+        debugNetwork("Sending join confirmation packet...");
+        send(Channels.SEND_CONFIRM, null);
+    }
+
     public static void registerInChannel(Identifier channel, ClientizenReceiver receiver) {
         if (!ClientPlayNetworking.registerGlobalReceiver(channel, (client, handler, buf, responseSender) -> {
             debugNetwork("Received plugin message on channel " + channel);

diff --git a/src/main/resources/clientizen.mixins.json b/src/main/resources/clientizen.mixins.json
@@ -5,6 +5,7 @@
   "compatibilityLevel": "JAVA_17",
   "mixins": [],
   "client": [
+    "ClientPlayNetworkHandlerMixin",
     "KeyBindingMixin",
     "MinecraftClientMixin",
     "IntPropertyAccessor",