From aaf8e7e80345bf8d0563e3028468e0d1e3a42e15 Mon Sep 17 00:00:00 2001
From: gnembon <gnembonmc@gmail.com>
Date: Wed, 27 Apr 2022 19:51:37 +0200
Subject: [PATCH] 22w17a

---
 gradle.properties                                    |  2 +-
 src/main/java/carpet/logging/Logger.java             |  2 +-
 ...verGamePacketListenerImpl_scarpetEventsMixin.java |  5 +++--
 src/main/java/carpet/utils/Messenger.java            | 12 ++++++------
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 0cca0348..587b3b96 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 	# check these on https://fabricmc.net/use
     # or better: https://modmuss50.me/fabric.html
-	minecraft_version=22w16b
+	minecraft_version=22w17a
 	loader_version=0.13.3
 	fabric_version=0.49.4+1.19
 
diff --git a/src/main/java/carpet/logging/Logger.java b/src/main/java/carpet/logging/Logger.java
index b3017b33..94bd14ff 100644
--- a/src/main/java/carpet/logging/Logger.java
+++ b/src/main/java/carpet/logging/Logger.java
@@ -194,7 +194,7 @@ public class Logger
 
     public void sendPlayerMessage(ServerPlayer player, Component ... messages)
     {
-        Arrays.stream(messages).forEach(message -> player.sendMessage(message, Util.NIL_UUID));
+        Arrays.stream(messages).forEach(player::sendSystemMessage);
     }
 
     /**
diff --git a/src/main/java/carpet/mixins/ServerGamePacketListenerImpl_scarpetEventsMixin.java b/src/main/java/carpet/mixins/ServerGamePacketListenerImpl_scarpetEventsMixin.java
index 7750cfde..6ef09fbc 100644
--- a/src/main/java/carpet/mixins/ServerGamePacketListenerImpl_scarpetEventsMixin.java
+++ b/src/main/java/carpet/mixins/ServerGamePacketListenerImpl_scarpetEventsMixin.java
@@ -1,5 +1,6 @@
 package carpet.mixins;
 
+import net.minecraft.network.protocol.game.ServerboundChatPacket;
 import net.minecraft.server.network.TextFilter;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -282,11 +283,11 @@ public class ServerGamePacketListenerImpl_scarpetEventsMixin
         }
     }
 
-    @Inject(method = "handleChat(Lnet/minecraft/server/network/TextFilter$FilteredText;)V",
+    @Inject(method = "handleChat(Lnet/minecraft/network/protocol/game/ServerboundChatPacket;Lnet/minecraft/server/network/TextFilter$FilteredText;)V",
             at = @At(value = "INVOKE", target = "Ljava/lang/String;startsWith(Ljava/lang/String;)Z"),
             locals = LocalCapture.CAPTURE_FAILHARD
     )
-    private void onChatMessage(TextFilter.FilteredText filteredText, CallbackInfo ci, String string) {
+    private void onChatMessage(ServerboundChatPacket serverboundChatPacket, TextFilter.FilteredText filteredText, CallbackInfo ci, String string) {
         if (PLAYER_MESSAGE.isNeeded())
         {
             PLAYER_MESSAGE.onPlayerMessage(player,string);
diff --git a/src/main/java/carpet/utils/Messenger.java b/src/main/java/carpet/utils/Messenger.java
index e20fd76e..36b9fce5 100644
--- a/src/main/java/carpet/utils/Messenger.java
+++ b/src/main/java/carpet/utils/Messenger.java
@@ -237,7 +237,7 @@ public class Messenger
     }
     public static void m(Player player, Object ... fields)
     {
-        player.sendMessage(Messenger.c(fields), Util.NIL_UUID);
+        player.sendSystemMessage(Messenger.c(fields));
     }
 
     /*
@@ -281,7 +281,7 @@ public class Messenger
 
     public static void send(Player player, Collection<Component> lines)
     {
-        lines.forEach(message -> player.sendMessage(message, Util.NIL_UUID));
+        lines.forEach(message -> player.sendSystemMessage(message));
     }
     public static void send(CommandSourceStack source, Collection<Component> lines)
     {
@@ -293,21 +293,21 @@ public class Messenger
     {
         if (server == null)
             LOG.error("Message not delivered: "+message);
-        server.sendMessage(Component.literal(message), Util.NIL_UUID);
+        server.sendSystemMessage(Component.literal(message));
         Component txt = c("gi "+message);
         for (Player entityplayer : server.getPlayerList().getPlayers())
         {
-            entityplayer.sendMessage(txt, Util.NIL_UUID);
+            entityplayer.sendSystemMessage(txt);
         }
     }
     public static void print_server_message(MinecraftServer server, Component message)
     {
         if (server == null)
             LOG.error("Message not delivered: "+message.getString());
-        server.sendMessage(message, Util.NIL_UUID);
+        server.sendSystemMessage(message);
         for (Player entityplayer : server.getPlayerList().getPlayers())
         {
-            entityplayer.sendMessage(message, Util.NIL_UUID);
+            entityplayer.sendSystemMessage(message);
         }
     }
 }