From 584cc58d8c680188b9cefd34138676b563f0af63 Mon Sep 17 00:00:00 2001 From: Alexander Date: Mon, 15 Jun 2020 19:39:46 +0300 Subject: [PATCH] Map UUID in GameMessageS2CPacket (#1466) --- mappings/net/minecraft/client/gui/ClientChatListener.mapping | 1 + mappings/net/minecraft/client/gui/hud/InGameHud.mapping | 3 +++ .../network/packet/s2c/play/GameMessageS2CPacket.mapping | 3 +++ mappings/net/minecraft/server/PlayerManager.mapping | 2 ++ mappings/net/minecraft/server/command/CommandOutput.mapping | 1 + .../net/minecraft/server/network/ServerPlayerEntity.mapping | 1 + 6 files changed, 11 insertions(+) diff --git a/mappings/net/minecraft/client/gui/ClientChatListener.mapping b/mappings/net/minecraft/client/gui/ClientChatListener.mapping index 8e9b93927f..cbf51ebb22 100644 --- a/mappings/net/minecraft/client/gui/ClientChatListener.mapping +++ b/mappings/net/minecraft/client/gui/ClientChatListener.mapping @@ -2,3 +2,4 @@ CLASS net/minecraft/class_334 net/minecraft/client/gui/ClientChatListener METHOD method_1794 onChatMessage (Lnet/minecraft/class_2556;Lnet/minecraft/class_2561;Ljava/util/UUID;)V ARG 1 messageType ARG 2 message + ARG 3 senderUuid diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index 1e4ed306f9..6fa34ecb72 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -61,6 +61,9 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud METHOD method_17534 shouldRenderSpectatorCrosshair (Lnet/minecraft/class_239;)Z METHOD method_1754 renderExperienceBar (Lnet/minecraft/class_4587;I)V METHOD method_1755 addChatMessage (Lnet/minecraft/class_2556;Lnet/minecraft/class_2561;Ljava/util/UUID;)V + ARG 1 type + ARG 2 text + ARG 3 senderUuid METHOD method_1756 getFontRenderer ()Lnet/minecraft/class_327; METHOD method_1757 renderScoreboardSidebar (Lnet/minecraft/class_4587;Lnet/minecraft/class_266;)V METHOD method_1758 setOverlayMessage (Lnet/minecraft/class_2561;Z)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping index ec1a7d8cfd..2e3dd21c54 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping @@ -1,9 +1,12 @@ CLASS net/minecraft/class_2635 net/minecraft/network/packet/s2c/play/GameMessageS2CPacket FIELD field_12112 message Lnet/minecraft/class_2561; FIELD field_12113 location Lnet/minecraft/class_2556; + FIELD field_25133 senderUuid Ljava/util/UUID; METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2556;Ljava/util/UUID;)V ARG 1 message ARG 2 location + ARG 3 senderUuid METHOD method_11387 isNonChat ()Z METHOD method_11388 getMessage ()Lnet/minecraft/class_2561; METHOD method_11389 getLocation ()Lnet/minecraft/class_2556; + METHOD method_29175 getSenderUuid ()Ljava/util/UUID; diff --git a/mappings/net/minecraft/server/PlayerManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping index e3b05e90d7..0f7f438294 100644 --- a/mappings/net/minecraft/server/PlayerManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -121,4 +121,6 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager ARG 3 world METHOD method_14616 broadcastChatMessage (Lnet/minecraft/class_2561;Lnet/minecraft/class_2556;Ljava/util/UUID;)V ARG 1 message + ARG 2 type + ARG 3 senderUuid METHOD method_14617 saveAllPlayerData ()V diff --git a/mappings/net/minecraft/server/command/CommandOutput.mapping b/mappings/net/minecraft/server/command/CommandOutput.mapping index 1ec3e3ea04..699cb36a25 100644 --- a/mappings/net/minecraft/server/command/CommandOutput.mapping +++ b/mappings/net/minecraft/server/command/CommandOutput.mapping @@ -6,3 +6,4 @@ CLASS net/minecraft/class_2165 net/minecraft/server/command/CommandOutput METHOD method_9202 shouldTrackOutput ()Z METHOD method_9203 sendSystemMessage (Lnet/minecraft/class_2561;Ljava/util/UUID;)V ARG 1 message + ARG 2 senderUuid diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 6d1c903502..e46018412f 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -102,6 +102,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_14254 sendMessage (Lnet/minecraft/class_2561;Lnet/minecraft/class_2556;Ljava/util/UUID;)V ARG 1 message ARG 2 type + ARG 3 senderUuid METHOD method_14255 sendResourcePackUrl (Ljava/lang/String;Ljava/lang/String;)V ARG 1 url ARG 2 hash