From 6844ca11ec5fc77086b6f1ee4a248b8e67a43a2b Mon Sep 17 00:00:00 2001 From: mschae23 <46165762+mschae23@users.noreply.github.com> Date: Thu, 7 Jul 2022 22:49:57 +0200 Subject: [PATCH] 1.19.1-pre3 chat mappings (#3232) * 1.19.1-pre3 chat mappings * Applied review suggestions --- .../client/network/ClientCommandSource.mapping | 5 +++++ .../net/minecraft/command/CommandSource.mapping | 1 + .../listener/ClientPlayPacketListener.mapping | 2 ++ .../network/message/MessageSender.mapping | 5 +++-- .../minecraft/network/message/MessageType.mapping | 10 ++++++++++ .../network/message/SignedMessage.mapping | 2 ++ .../packet/s2c/play/ChatMessageS2CPacket.mapping | 5 +++++ .../s2c/play/ChatSuggestionsS2CPacket.mapping | 4 ++++ .../net/minecraft/server/MinecraftServer.mapping | 6 ++++++ .../server/command/MessageCommand.mapping | 2 ++ .../server/command/ServerCommandSource.mapping | 4 ++++ mappings/net/minecraft/text/Decoration.mapping | 14 ++++++++++++-- 12 files changed, 56 insertions(+), 4 deletions(-) create mode 100644 mappings/net/minecraft/network/packet/s2c/play/ChatSuggestionsS2CPacket.mapping diff --git a/mappings/net/minecraft/client/network/ClientCommandSource.mapping b/mappings/net/minecraft/client/network/ClientCommandSource.mapping index 356116a72a..c1ad7238d9 100644 --- a/mappings/net/minecraft/client/network/ClientCommandSource.mapping +++ b/mappings/net/minecraft/client/network/ClientCommandSource.mapping @@ -3,7 +3,9 @@ CLASS net/minecraft/class_637 net/minecraft/client/network/ClientCommandSource FIELD field_3723 pendingCompletion Ljava/util/concurrent/CompletableFuture; FIELD field_3724 completionId I FIELD field_3725 client Lnet/minecraft/class_310; + FIELD field_39794 chatSuggestions Ljava/util/Set; METHOD (Lnet/minecraft/class_634;Lnet/minecraft/class_310;)V + ARG 1 networkHandler ARG 2 client METHOD method_2929 format (D)Ljava/lang/String; ARG 0 d @@ -14,3 +16,6 @@ CLASS net/minecraft/class_637 net/minecraft/client/network/ClientCommandSource ARG 2 suggestions METHOD method_41232 (Lnet/minecraft/class_2172$class_7078;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture; ARG 3 registry + METHOD method_44764 changeChatSuggestions (Lnet/minecraft/class_7597$class_7598;Ljava/util/List;)V + ARG 1 action + ARG 2 entries diff --git a/mappings/net/minecraft/command/CommandSource.mapping b/mappings/net/minecraft/command/CommandSource.mapping index e44712f30a..f572b59de6 100644 --- a/mappings/net/minecraft/command/CommandSource.mapping +++ b/mappings/net/minecraft/command/CommandSource.mapping @@ -28,6 +28,7 @@ CLASS net/minecraft/class_2172 net/minecraft/command/CommandSource ARG 1 registry ARG 2 suggestedIdType ARG 3 builder + METHOD method_44750 getChatSuggestions ()Ljava/util/Collection; METHOD method_9250 forEachMatching (Ljava/lang/Iterable;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Function;Ljava/util/function/Consumer;)V ARG 0 candidates ARG 1 remaining diff --git a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping index e5fac23bbd..4defd9dd2e 100644 --- a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping @@ -207,3 +207,5 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_44286 onChatPreviewStateChange (Lnet/minecraft/class_7519;)V ARG 1 packet + METHOD method_44763 onChatSuggestions (Lnet/minecraft/class_7597;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/message/MessageSender.mapping b/mappings/net/minecraft/network/message/MessageSender.mapping index 7baf6535ac..eaf32e9335 100644 --- a/mappings/net/minecraft/network/message/MessageSender.mapping +++ b/mappings/net/minecraft/network/message/MessageSender.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_7436 net/minecraft/network/message/MessageSender ARG 1 buf METHOD method_43841 of (Lnet/minecraft/class_2561;)Lnet/minecraft/class_7436; ARG 0 name - METHOD method_43842 withTeamName (Lnet/minecraft/class_2561;)Lnet/minecraft/class_7436; - ARG 1 teamName + METHOD method_43842 withTargetName (Lnet/minecraft/class_2561;)Lnet/minecraft/class_7436; + ARG 1 targetName METHOD method_44744 hasProfileId ()Z + METHOD method_44778 withoutProfileId ()Lnet/minecraft/class_7436; diff --git a/mappings/net/minecraft/network/message/MessageType.mapping b/mappings/net/minecraft/network/message/MessageType.mapping index 3cca45d561..5b94548b71 100644 --- a/mappings/net/minecraft/network/message/MessageType.mapping +++ b/mappings/net/minecraft/network/message/MessageType.mapping @@ -43,6 +43,16 @@ CLASS net/minecraft/class_2556 net/minecraft/network/message/MessageType COMMENT net.minecraft.server.command.MeCommand /me}. The message content is COMMENT {@linkplain Decoration#ofChat decorated} using the {@code chat.type.emote} text. FIELD field_39677 CHAT_TEXT_DECORATION Lnet/minecraft/class_7463; + FIELD field_39799 Lnet/minecraft/class_5321; + COMMENT The registry key for the msg command message type, used by {@linkplain + COMMENT net.minecraft.server.command.MessageCommand /msg} for incoming messages. + COMMENT The message content is {@linkplain Decoration#ofIncomingMessage decorated} using + COMMENT the {@code commands.message.display.incoming} text. + FIELD field_39800 Lnet/minecraft/class_5321; + COMMENT The registry key for the msg command message type, used by {@linkplain + COMMENT net.minecraft.server.command.MessageCommand /msg} for outgoing messages. + COMMENT The message content is {@linkplain Decoration#ofOutgoingMessage decorated} using + COMMENT the {@code commands.message.display.outgoing} text. METHOD method_43843 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_43844 initialize (Lnet/minecraft/class_2378;)Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/network/message/SignedMessage.mapping b/mappings/net/minecraft/network/message/SignedMessage.mapping index 496b685c55..4350705ff0 100644 --- a/mappings/net/minecraft/network/message/SignedMessage.mapping +++ b/mappings/net/minecraft/network/message/SignedMessage.mapping @@ -62,3 +62,5 @@ CLASS net/minecraft/class_7471 net/minecraft/network/message/SignedMessage ARG 1 currentTime METHOD method_44748 isExpiredOnClient (Ljava/time/Instant;)Z ARG 1 currentTime + METHOD method_44781 (Lnet/minecraft/class_7436;)Z + ARG 1 sender diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping index f260bc5994..960c15d57d 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping @@ -30,3 +30,8 @@ CLASS net/minecraft/class_7438 net/minecraft/network/packet/s2c/play/ChatMessage COMMENT @throws NullPointerException when the type ID is invalid (due to unsynced registry, etc) ARG 1 registry METHOD method_43885 getSignedMessage ()Lnet/minecraft/class_7471; + METHOD method_44785 ofUnsigned (Lnet/minecraft/class_2561;ILnet/minecraft/class_7436;Ljava/time/Instant;)Lnet/minecraft/class_7438; + ARG 0 text + ARG 1 typeId + ARG 2 sender + ARG 3 timestamp diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChatSuggestionsS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChatSuggestionsS2CPacket.mapping new file mode 100644 index 0000000000..a92529fc5a --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/ChatSuggestionsS2CPacket.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_7597 net/minecraft/network/packet/s2c/play/ChatSuggestionsS2CPacket + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + CLASS class_7598 Action diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 883655f8e2..e2ac288edf 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -420,6 +420,12 @@ CLASS net/minecraft/server/MinecraftServer COMMENT COMMENT @see MessageDecorator METHOD method_44301 getServicesSignatureVerifier ()Lnet/minecraft/class_7500; + METHOD method_44776 (Lnet/minecraft/class_5321;Lnet/minecraft/class_2378;)Lnet/minecraft/class_2556; + ARG 1 registry + METHOD method_44777 applyDecoration (Lnet/minecraft/class_7436;Lnet/minecraft/class_2561;Lnet/minecraft/class_5321;)Lnet/minecraft/class_2561; + ARG 1 sender + ARG 2 text + ARG 3 typeKey METHOD method_5387 isMainThread ()Z CLASS class_6414 DebugStart FIELD field_33980 time J diff --git a/mappings/net/minecraft/server/command/MessageCommand.mapping b/mappings/net/minecraft/server/command/MessageCommand.mapping index c7f4861bcc..e1879b3e2a 100644 --- a/mappings/net/minecraft/server/command/MessageCommand.mapping +++ b/mappings/net/minecraft/server/command/MessageCommand.mapping @@ -7,3 +7,5 @@ CLASS net/minecraft/class_3082 net/minecraft/server/command/MessageCommand ARG 2 signedMessage METHOD method_13463 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context + METHOD method_44144 (Ljava/util/Collection;Lnet/minecraft/class_7436;Lnet/minecraft/class_2168;Lnet/minecraft/class_5837;)V + ARG 3 decoratedMessage diff --git a/mappings/net/minecraft/server/command/ServerCommandSource.mapping b/mappings/net/minecraft/server/command/ServerCommandSource.mapping index a75bde6527..bbabeec573 100644 --- a/mappings/net/minecraft/server/command/ServerCommandSource.mapping +++ b/mappings/net/minecraft/server/command/ServerCommandSource.mapping @@ -53,6 +53,10 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource METHOD method_43738 getSigner ()Lnet/minecraft/class_7448; METHOD method_44023 getPlayer ()Lnet/minecraft/class_3222; COMMENT {@return the player from this command source, or {@code null} if the source is not a player} + METHOD method_44749 sendChatMessage (Lnet/minecraft/class_7436;Lnet/minecraft/class_7471;Lnet/minecraft/class_5321;)V + ARG 1 sender + ARG 2 message + ARG 3 typeKey METHOD method_9206 withLevel (I)Lnet/minecraft/class_2168; ARG 1 level METHOD method_9207 getPlayerOrThrow ()Lnet/minecraft/class_3222; diff --git a/mappings/net/minecraft/text/Decoration.mapping b/mappings/net/minecraft/text/Decoration.mapping index 35385f8956..83bfc05c30 100644 --- a/mappings/net/minecraft/text/Decoration.mapping +++ b/mappings/net/minecraft/text/Decoration.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_7463 net/minecraft/text/Decoration METHOD method_43831 ofChat (Ljava/lang/String;)Lnet/minecraft/class_7463; COMMENT {@return the decoration used in chat messages} COMMENT - COMMENT @implNote This decoration allows use of the sender and the content parameters. It has no style. + COMMENT @implNote This decoration allows using the sender and the content parameters. It has no style. ARG 0 translationKey METHOD method_43832 apply (Lnet/minecraft/class_2561;Lnet/minecraft/class_7436;)Lnet/minecraft/class_2561; COMMENT {@return the text obtained by applying the passed values to the decoration} @@ -27,9 +27,19 @@ CLASS net/minecraft/class_7463 net/minecraft/text/Decoration METHOD method_43835 ofTeamMessage (Ljava/lang/String;)Lnet/minecraft/class_7463; COMMENT {@return the decoration used in chat messages} COMMENT - COMMENT @implNote This decoration allows use of the team name, the sender, and the + COMMENT @implNote This decoration allows using the target (team name), the sender, and the COMMENT content parameters. It has no style. ARG 0 translationKey + METHOD method_44779 ofIncomingMessage (Ljava/lang/String;)Lnet/minecraft/class_7463; + COMMENT {@return the decoration used in chat messages} + COMMENT + COMMENT @implNote This decoration allows using the sender and the content parameters. It is gray and italic. + ARG 0 translationKey + METHOD method_44780 ofOutgoingMessage (Ljava/lang/String;)Lnet/minecraft/class_7463; + COMMENT {@return the decoration used in chat messages} + COMMENT + COMMENT @implNote This decoration allows using the target and the content parameters. It is gray and italic. + ARG 0 translationKey CLASS class_7464 Parameter COMMENT Represents a parameter that the decoration uses. FIELD field_39223 CODEC Lcom/mojang/serialization/Codec;