From e943a26a5b8d4ff648d432b09fc1a7abe7b2e75e Mon Sep 17 00:00:00 2001
From: Kosma Moczek <kosma@kosma.pl>
Date: Sat, 30 Jul 2022 00:29:25 +0200
Subject: [PATCH] fabric-1.19.1: fix mixins for 1.19.1

---
 .../java/org/dynmap/fabric_1_19_1/FabricServer.java    |  2 +-
 .../mixin/ServerPlayNetworkHandlerMixin.java           | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/fabric-1.19.1/src/main/java/org/dynmap/fabric_1_19_1/FabricServer.java b/fabric-1.19.1/src/main/java/org/dynmap/fabric_1_19_1/FabricServer.java
index 9784402e..afe0b444 100644
--- a/fabric-1.19.1/src/main/java/org/dynmap/fabric_1_19_1/FabricServer.java
+++ b/fabric-1.19.1/src/main/java/org/dynmap/fabric_1_19_1/FabricServer.java
@@ -293,7 +293,7 @@ public class FabricServer extends DynmapServerInterface {
     @Override
     public void broadcastMessage(String msg) {
         Text component = Text.literal(msg);
-        server.getPlayerManager().broadcast(component, MessageType.SYSTEM);
+        server.getPlayerManager().broadcast(component, false);
         Log.info(stripChatColor(msg));
     }
 
diff --git a/fabric-1.19.1/src/main/java/org/dynmap/fabric_1_19_1/mixin/ServerPlayNetworkHandlerMixin.java b/fabric-1.19.1/src/main/java/org/dynmap/fabric_1_19_1/mixin/ServerPlayNetworkHandlerMixin.java
index 2c77bec7..5fcdd3ed 100644
--- a/fabric-1.19.1/src/main/java/org/dynmap/fabric_1_19_1/mixin/ServerPlayNetworkHandlerMixin.java
+++ b/fabric-1.19.1/src/main/java/org/dynmap/fabric_1_19_1/mixin/ServerPlayNetworkHandlerMixin.java
@@ -34,13 +34,11 @@ public abstract class ServerPlayNetworkHandlerMixin {
     @Inject(
             method = "handleDecoratedMessage",
             at = @At(
-                    value = "INVOKE",
-                    target = "Lnet/minecraft/server/PlayerManager;broadcast(Lnet/minecraft/server/filter/FilteredMessage;Lnet/minecraft/server/network/ServerPlayerEntity;Lnet/minecraft/util/registry/RegistryKey;)V",
-                    shift = At.Shift.BEFORE
+                    value = "HEAD"
             )
     )
-    public void onGameMessage(FilteredMessage<SignedMessage> message, CallbackInfo ci) {
-        ServerChatEvents.EVENT.invoker().onChatMessage(player, message.raw().getContent().getString());
+    public void onGameMessage(SignedMessage signedMessage, CallbackInfo ci) {
+        ServerChatEvents.EVENT.invoker().onChatMessage(player, signedMessage.getContent().getString());
     }
 
     @Inject(
@@ -52,7 +50,7 @@ public abstract class ServerPlayNetworkHandlerMixin {
             ),
             locals = LocalCapture.CAPTURE_FAILHARD
     )
-    public void onSignUpdate(UpdateSignC2SPacket packet, List<FilteredMessage<String>> signText, CallbackInfo info,
+    public void onSignUpdate(UpdateSignC2SPacket packet, List<FilteredMessage> signText, CallbackInfo info,
             ServerWorld serverWorld, BlockPos blockPos, BlockState blockState, BlockEntity blockEntity, SignBlockEntity signBlockEntity)
     {
         // Pull the raw text from the input.