From 0e54d23d6187fe45b4f193a6ec955b996be991c7 Mon Sep 17 00:00:00 2001
From: Kosma Moczek <kosma@kosma.pl>
Date: Sun, 27 Jun 2021 19:35:32 +0200
Subject: [PATCH] fabric-1.17: restore web chat functionality

---
 .../fabric_1_17/mixin/ServerPlayNetworkHandlerMixin.java | 9 +++++----
 fabric-1.17/src/main/resources/dynmap.mixins.json        | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/fabric-1.17/src/main/java/org/dynmap/fabric_1_17/mixin/ServerPlayNetworkHandlerMixin.java b/fabric-1.17/src/main/java/org/dynmap/fabric_1_17/mixin/ServerPlayNetworkHandlerMixin.java
index 41a3ca0f..e02a4992 100644
--- a/fabric-1.17/src/main/java/org/dynmap/fabric_1_17/mixin/ServerPlayNetworkHandlerMixin.java
+++ b/fabric-1.17/src/main/java/org/dynmap/fabric_1_17/mixin/ServerPlayNetworkHandlerMixin.java
@@ -1,5 +1,6 @@
 package org.dynmap.fabric_1_17.mixin;
 
+import net.minecraft.server.filter.TextStream;
 import net.minecraft.server.network.ServerPlayNetworkHandler;
 import net.minecraft.server.network.ServerPlayerEntity;
 import org.dynmap.fabric_1_17.event.ServerChatEvents;
@@ -15,14 +16,14 @@ public abstract class ServerPlayNetworkHandlerMixin {
     public ServerPlayerEntity player;
 
     @Inject(
-            method = "method_31286",
+            method = "handleMessage",
             at = @At(
                     value = "INVOKE",
-                    target = "Lnet/minecraft/server/PlayerManager;broadcastChatMessage(Lnet/minecraft/text/Text;Lnet/minecraft/network/MessageType;Ljava/util/UUID;)V",
+                    target = "Lnet/minecraft/server/PlayerManager;broadcast(Lnet/minecraft/text/Text;Ljava/util/function/Function;Lnet/minecraft/network/MessageType;Ljava/util/UUID;)V",
                     shift = At.Shift.BEFORE
             )
     )
-    public void onGameMessage(String string, CallbackInfo info) {
-        ServerChatEvents.EVENT.invoker().onChatMessage(player, string);
+    public void onGameMessage(TextStream.Message message, CallbackInfo info) {
+        ServerChatEvents.EVENT.invoker().onChatMessage(player, message.getRaw());
     }
 }
diff --git a/fabric-1.17/src/main/resources/dynmap.mixins.json b/fabric-1.17/src/main/resources/dynmap.mixins.json
index 548f8877..a8a013cc 100644
--- a/fabric-1.17/src/main/resources/dynmap.mixins.json
+++ b/fabric-1.17/src/main/resources/dynmap.mixins.json
@@ -8,6 +8,7 @@
     "MinecraftServerMixin",
     "PlayerManagerMixin",
     "ServerPlayerEntityMixin",
+    "ServerPlayNetworkHandlerMixin",
     "ThreadedAnvilChunkStorageAccessor",
     "ThreadedAnvilChunkStorageMixin",
     "WorldChunkMixin"