22w18a networking (#3142)

* 22w18a networking

* toText -> apply

* Document and rename MessageType stuff

* PacketByteBuf usage mapping, etc

* Fix javadoc

* Apply suggestions from code review

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>

* Revert rename for Display and Narration

* dequalify optional

* rename ChatMessageSender, etc

* rename applyDecoration

* Fix indent

* Apply suggestions from code review

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

* Rename Priority

Editing on phone sucks

* Apply suggestions from code review

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

* Update and rename ChatSigner.mapping to ChatMessageSigner.mapping

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>
Co-authored-by: liach <7806504+liach@users.noreply.github.com>

mappings/net/minecraft/advancement/Advancement.mapping

@@ -55,12 +55,16 @@ CLASS net/minecraft/class_161 net/minecraft/advancement/Advancement
 			ARG 8 hidden
 		METHOD method_34884 requirements ([[Ljava/lang/String;)Lnet/minecraft/class_161$class_162;
 			ARG 1 requirements
+		METHOD method_43662 (Lnet/minecraft/class_2540;Lnet/minecraft/class_185;)V
+			ARG 0 buf2
+			ARG 1 display
 		METHOD method_692 fromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5257;)Lnet/minecraft/class_161$class_162;
 			ARG 0 obj
 			ARG 1 predicateDeserializer
 		METHOD method_693 display (Lnet/minecraft/class_185;)Lnet/minecraft/class_161$class_162;
 			ARG 1 display
 		METHOD method_694 build (Ljava/util/function/Consumer;Ljava/lang/String;)Lnet/minecraft/class_161;
+			ARG 1 exporter
 			ARG 2 id
 		METHOD method_695 build (Lnet/minecraft/class_2960;)Lnet/minecraft/class_161;
 			ARG 1 id
@@ -77,6 +81,7 @@ CLASS net/minecraft/class_161 net/minecraft/advancement/Advancement
 			ARG 8 hidden
 		METHOD method_698 toJson ()Lcom/google/gson/JsonObject;
 		METHOD method_699 toPacket (Lnet/minecraft/class_2540;)V
+			ARG 1 buf
 		METHOD method_700 findParent (Ljava/util/function/Function;)Z
 			ARG 1 parentProvider
 		METHOD method_701 parent (Lnet/minecraft/class_161;)Lnet/minecraft/class_161$class_162;

mappings/net/minecraft/client/gui/GameInfoChatListener.mapping

@@ -2,3 +2,5 @@ CLASS net/minecraft/class_336 net/minecraft/client/gui/GameInfoChatListener
 	FIELD field_2057 client Lnet/minecraft/class_310;
 	METHOD <init> (Lnet/minecraft/class_310;)V
 		ARG 1 client
+	METHOD method_43772 (Lnet/minecraft/class_2561;Lnet/minecraft/class_7436;Lnet/minecraft/class_2556$class_7468;)V
+		ARG 3 displayRule

mappings/net/minecraft/client/gui/hud/ChatHudListener.mapping

@@ -2,3 +2,5 @@ CLASS net/minecraft/class_335 net/minecraft/client/gui/hud/ChatHudListener
 	FIELD field_2056 client Lnet/minecraft/class_310;
 	METHOD <init> (Lnet/minecraft/class_310;)V
 		ARG 1 client
+	METHOD method_43773 (Lnet/minecraft/class_2561;Lnet/minecraft/class_7436;Lnet/minecraft/class_2556$class_7468;)V
+		ARG 3 displayRule

mappings/net/minecraft/client/network/ClientPlayerEntity.mapping

@@ -112,6 +112,18 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity
 	METHOD method_33689 init ()V
 	METHOD method_43609 signChatMessage (Lnet/minecraft/class_7470;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7469;
 		COMMENT Signs the chat message. If the chat message cannot be signed, this will return
-		COMMENT {@link NetworkEncryptionUtils.SignatureData#NONE}.
+		COMMENT {@link ChatMessageSignature#none()}.
+		ARG 1 signer
+		ARG 2 message
+	METHOD method_43786 signArguments (Lnet/minecraft/class_7470;Lcom/mojang/brigadier/ParseResults;)Lnet/minecraft/class_7450;
+		COMMENT Signs the command arguments. If the arguments cannot be signed, this will return
+		COMMENT {@link ArgumentSignatures#none()}.
+		ARG 1 signer
+		ARG 2 parseResults
+	METHOD method_43787 sendCommand (Lnet/minecraft/class_7470;Ljava/lang/String;)V
+		COMMENT Signs and sends {@code command} to the server.
+		ARG 1 signer
+		ARG 2 command
+			COMMENT the command (excluding the leading slash)
 	METHOD method_7290 dropSelectedItem (Z)Z
 		ARG 1 entireStack

mappings/net/minecraft/client/option/NarratorMode.mapping

@@ -9,5 +9,7 @@ CLASS net/minecraft/class_4065 net/minecraft/client/option/NarratorMode
 	METHOD method_18510 byId (I)Lnet/minecraft/class_4065;
 		ARG 0 id
 	METHOD method_18511 getName ()Lnet/minecraft/class_2561;
-	METHOD method_43766 isCompatibleWith (Lnet/minecraft/class_2556$class_7466$class_7467;)Z
+	METHOD method_43766 shouldNarrate (Lnet/minecraft/class_2556$class_7466$class_7467;)Z
-		ARG 1 narrationKind
+		COMMENT {@return whether a message from the server should be narrated,
+		COMMENT given the message type's narration kind}
+		ARG 1 kind

mappings/net/minecraft/client/util/NarratorManager.mapping

@@ -15,3 +15,5 @@ CLASS net/minecraft/class_333 net/minecraft/client/util/NarratorManager
 		ARG 1 text
 	METHOD method_37016 debugPrintMessage (Ljava/lang/String;)V
 		ARG 1 message
+	METHOD method_43771 (Lnet/minecraft/class_4065;Lnet/minecraft/class_2561;Lnet/minecraft/class_7436;Lnet/minecraft/class_2556$class_7466;)V
+		ARG 4 narrationRule

mappings/net/minecraft/client/util/ProfileKeys.mapping

@@ -47,3 +47,4 @@ CLASS net/minecraft/class_7434 net/minecraft/client/util/ProfileKeys
 	METHOD method_43608 getPrivateKey ()Ljava/security/PrivateKey;
 		COMMENT {@return the private key, or {@code null} if there is no private key associated
 		COMMENT with the profile}
+	METHOD method_43784 getPublicKeyData ()Ljava/util/Optional;

mappings/net/minecraft/command/argument/MessageArgumentType.mapping

@@ -1,7 +1,13 @@
 CLASS net/minecraft/class_2196 net/minecraft/command/argument/MessageArgumentType
 	FIELD field_9876 EXAMPLES Ljava/util/Collection;
+	METHOD method_43768 format (Lnet/minecraft/class_2168;Lnet/minecraft/class_2196$class_2197;)Lnet/minecraft/class_2561;
+		ARG 0 source
+		ARG 1 format
+	METHOD method_43770 getSignedMessage (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_7471;
+		ARG 0 context
+		ARG 1 name
 	METHOD method_9339 getMessage (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2561;
-		ARG 0 command
+		ARG 0 context
 		ARG 1 name
 	METHOD method_9340 message ()Lnet/minecraft/class_2196;
 	METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object;

mappings/net/minecraft/command/argument/TextConvertibleArgumentType.mapping

@@ -0,0 +1,3 @@
+CLASS net/minecraft/class_7451 net/minecraft/command/argument/TextConvertibleArgumentType
+	METHOD method_43752 toText (Ljava/lang/Object;)Lnet/minecraft/class_2561;
+		ARG 1 value

mappings/net/minecraft/entity/Entity.mapping

@@ -486,6 +486,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		ARG 1 x
 		ARG 3 y
 		ARG 5 z
+	METHOD method_43688 asMessageSender ()Lnet/minecraft/class_7436;
 	METHOD method_5621 getMountedHeightOffset ()D
 	METHOD method_5622 onBlockCollision (Lnet/minecraft/class_2680;)V
 		ARG 1 state

mappings/net/minecraft/entity/player/PlayerEntity.mapping

@@ -4,6 +4,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity
 	FIELD field_19428 shoulderEntityAddedTime J
 	FIELD field_38198 sculkShriekerWarningManager Lnet/minecraft/class_7262;
 	FIELD field_38745 LAST_DEATH_POS Lnet/minecraft/class_2940;
+	FIELD field_39118 publicKey Lnet/minecraft/class_7428;
 	FIELD field_7483 strideDistance F
 	FIELD field_7484 itemCooldownManager Lnet/minecraft/class_1796;
 	FIELD field_7486 enderChestInventory Lnet/minecraft/class_1730;
@@ -43,6 +44,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity
 		ARG 2 pos
 		ARG 3 yaw
 		ARG 4 profile
+		ARG 5 publicKey
 	METHOD method_16354 openJigsawScreen (Lnet/minecraft/class_3751;)V
 		ARG 1 jigsaw
 	METHOD method_16475 spawnParticles (Lnet/minecraft/class_2394;)V
@@ -115,6 +117,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity
 	METHOD method_43120 setLastDeathPos (Ljava/util/Optional;)V
 		ARG 1 lastDeathPos
 	METHOD method_43122 getLastDeathPos ()Ljava/util/Optional;
+	METHOD method_43696 getPublicKey ()Lnet/minecraft/class_7428;
 	METHOD method_7254 unlockRecipes (Ljava/util/Collection;)I
 		ARG 1 recipes
 	METHOD method_7255 addExperience (I)V

mappings/net/minecraft/network/ChatMessageSender.mapping

@@ -1,9 +0,0 @@
-CLASS net/minecraft/class_7436 net/minecraft/network/ChatMessageSender
-	COMMENT The sender, or the source, of a chat message.
-	COMMENT
-	COMMENT <p>An instance can be obtained via
-	COMMENT {@link net.minecraft.entity.player.PlayerEntity#asChatMessageSender}.
-	METHOD <init> (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
-	METHOD method_43625 write (Lnet/minecraft/class_2540;)V
-		ARG 1 buf

mappings/net/minecraft/network/MessageSender.mapping

@@ -0,0 +1,15 @@
+CLASS net/minecraft/class_7436 net/minecraft/network/MessageSender
+	COMMENT The sender, or the source, of a message.
+	COMMENT
+	COMMENT <p>An instance can be obtained via {@link net.minecraft.entity.Entity#asMessageSender}.
+	METHOD <init> (Ljava/util/UUID;Lnet/minecraft/class_2561;)V
+		ARG 1 uuid
+		ARG 2 name
+	METHOD <init> (Lnet/minecraft/class_2540;)V
+		ARG 1 buf
+	METHOD method_43625 write (Lnet/minecraft/class_2540;)V
+		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

mappings/net/minecraft/network/MessageType.mapping

@@ -1,82 +1,148 @@
 CLASS net/minecraft/class_2556 net/minecraft/network/MessageType
-	COMMENT A message type, or chat type in registry, or chat style format per
+	COMMENT A message type (also known as "chat type") controls whether to display or narrate
-	COMMENT Minecraft blog, defines how a piece of text content should be rendered.
+	COMMENT the messages sent to the clients, and if so, how. Message types are registered
-	COMMENT It can direct messages to the chat hud, the in-game hud overlay, and the
+	COMMENT at {@link Registry#MESSAGE_TYPE}. When sending a message, the registry key of the
-	COMMENT narrator, and format them with the sender information.
+	COMMENT message type can be passed to indicate which message type should be used.
+	COMMENT
+	COMMENT <p>Message type has three fields, all of which are optional. If the field is empty,
+	COMMENT the message is not displayed or narrated there.
+	COMMENT <ul>
+	COMMENT <li>{@link #chat} controls the content displayed in the {@linkplain
+	COMMENT net.minecraft.client.gui.hud.ChatHud chat hud}.</li>
+	COMMENT <li>{@link #overlay} controls the content displayed as the overlay (above the hotbar).</li>
+	COMMENT <li>{@link #narration} controls the narrated content.</li>
+	COMMENT </ul>
+	COMMENT
+	COMMENT <p>The display rules and the narration rule can optionally have a "decoration", which is an
+	COMMENT instance of {@link Decoration}. Decorations are pre-defined message formatting and
+	COMMENT styling rules, which can be {@linkplain Decoration#apply applied} to the message to
+	COMMENT produce the displayed or narrated text. If there is no decoration, the message is used
+	COMMENT without any extra processing. See the documentation for {@link MessageType.DisplayRule}
+	COMMENT and {@link MessageType.NarrationRule} for details.
+	COMMENT
+	COMMENT @see net.minecraft.server.PlayerManager#broadcast(Text, RegistryKey)
 	FIELD comp_792 Ljava/util/Optional;
-		COMMENT the display rule of a message to the chat hud, or
+		COMMENT the display rule for the content displayed in the chat hud, or
-		COMMENT {@code Optional.empty()} if it is not displayed
+		COMMENT {@link Optional#empty()} if it should not be displayed in the chat hud
 	FIELD comp_793 Ljava/util/Optional;
-		COMMENT the display rule of a message to the in-game hud overlay, or
+		COMMENT the display rule for the content displayed as the overlay, or
-		COMMENT {@code Optional.empty()} if it is not displayed
+		COMMENT {@link Optional#empty()} if it should not be displayed as the overlay
 	FIELD comp_794 Ljava/util/Optional;
-		COMMENT the narration rule of a message, or {@code Optional.empty()} if it is
+		COMMENT the narration rule for the content, or {@link Optional#empty()}
-		COMMENT not narrated
+		COMMENT if it should not be narrated
+	FIELD field_11733 Lnet/minecraft/class_5321;
+		COMMENT The registry key for the game info message type. This appears on the overlay only
+		COMMENT and is not narrated at all. This message type does not have a decoration.
+		COMMENT
+		COMMENT @apiNote This is most often seen when the player uses a bed.
+	FIELD field_11735 Lnet/minecraft/class_5321;
+		COMMENT The registry key for the system message message type. This is also referred to
+		COMMENT as {@linkplain net.minecraft.network.packet.s2c.play.GameMessageS2CPacket game
+		COMMENT messages}. This message type does not have a decoration and its narrations will
+		COMMENT interrupt others.
+		COMMENT
+		COMMENT @apiNote System messages include join/leave messages, death messages,
+		COMMENT advancement messages, and other messages that are not sent by players.
+	FIELD field_11737 Lnet/minecraft/class_5321;
+		COMMENT The registry key for the message type used by {@link
+		COMMENT net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket chat messages}.
+		COMMENT The message content is {@linkplain Decoration#ofChat decorated} using the
+		COMMENT {@code chat.type.text} text.
 	FIELD field_39227 CODEC Lcom/mojang/serialization/Codec;
-		COMMENT The codec for the message type.
+	FIELD field_39228 Lnet/minecraft/class_5321;
+		COMMENT The registry key for the say command message type, used by {@linkplain
+		COMMENT net.minecraft.server.command.SayCommand /say}. The message content is
+		COMMENT {@linkplain Decoration#ofChat decorated} using the {@code chat.type.announcement}
+		COMMENT text.
+	FIELD field_39229 Lnet/minecraft/class_5321;
+		COMMENT The registry key for the message command message type, used by {@linkplain
+		COMMENT net.minecraft.server.command.MessageCommand /msg}. The message content is
+		COMMENT {@linkplain Decoration#ofDirectMessage decorated} using the
+		COMMENT {@code commands.message.display.incoming} text, and the text is italicized and colored
+		COMMENT gray.
+	FIELD field_39230 Lnet/minecraft/class_5321;
+		COMMENT The registry key for the team message command message type, used by {@linkplain
+		COMMENT net.minecraft.server.command.TeamMsgCommand /teammsg}. The message content is
+		COMMENT {@linkplain Decoration#ofTeamMessage decorated} using the
+		COMMENT {@code chat.type.team.text} text.
+	FIELD field_39231 Lnet/minecraft/class_5321;
+		COMMENT The registry key for the emote command message type, used by {@linkplain
+		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_39232 Lnet/minecraft/class_5321;
+		COMMENT The registry key for the tellraw command message type, used by {@linkplain
+		COMMENT net.minecraft.server.command.TellRawCommand /tellraw}. This message type
+		COMMENT does not have a decoration.
 	METHOD method_43843 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
 	METHOD method_43844 registerAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2556;
-		COMMENT Registers the built-in message types and returns the default "chat" type.
 		ARG 0 registry
-	METHOD method_43845 getKey (Ljava/lang/String;)Lnet/minecraft/class_5321;
+	METHOD method_43845 register (Ljava/lang/String;)Lnet/minecraft/class_5321;
 		ARG 0 id
 	CLASS class_7466 NarrationRule
-		COMMENT A narration rule for a message.
+		COMMENT The narration rule for the message type. This contains the decoration applied
+		COMMENT to the message and the kind of the narration ({@code priority} when serialized).
 		FIELD comp_795 Ljava/util/Optional;
-			COMMENT the formatting of a message, or {@code Optional.empty()} if the content
+			COMMENT the decoration applied to a message, or {@link Optional#empty()} if the content
-			COMMENT is displayed directly
+			COMMENT is narrated as is
-		FIELD comp_796 Lnet/minecraft/class_2556$class_7466$class_7467;
+		FIELD comp_796 kind Lnet/minecraft/class_2556$class_7466$class_7467;
-			COMMENT the narration kind, and if this narration can interrupt other ones
+			COMMENT the kind of the narration, also known as {@code priority} in the serialized
+			COMMENT format
 		FIELD field_39233 CODEC Lcom/mojang/serialization/Codec;
-			COMMENT The codec for the message narraton rule.
 		METHOD method_43846 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 			ARG 0 instance
 		METHOD method_43847 of (Lnet/minecraft/class_7463;Lnet/minecraft/class_2556$class_7466$class_7467;)Lnet/minecraft/class_2556$class_7466;
-			COMMENT {@return a rule that narrates a message after formatting} The message
+			COMMENT {@return the narration rule with the specified decoration and kind}
-			COMMENT is narrated as the given {@code kind}, and the narration can include
-			COMMENT sender information in addition to the message content.
 			ARG 0 decoration
 			ARG 1 kind
 		METHOD method_43848 of (Lnet/minecraft/class_2556$class_7466$class_7467;)Lnet/minecraft/class_2556$class_7466;
-			COMMENT {@return a rule that narrates a message's content directly} The message
+			COMMENT {@return the narration rule with no decoration and the specified kind}
-			COMMENT is narrated as the given {@code kind}, without any sender-related
+			COMMENT
-			COMMENT information.
+			COMMENT <p>This does not mean the message is not narrated; this means that the message
-			ARG 0 kind
+			COMMENT is narrated as is without any extra processing.
+			ARG 0 priority
 		METHOD method_43849 apply (Lnet/minecraft/class_2561;Lnet/minecraft/class_7436;)Lnet/minecraft/class_2561;
-			COMMENT {@return the text to narrate after applying this rule on the given
+			COMMENT {@return the message with the decoration applied, or {@code message} if there is
-			COMMENT content and sender}
+			COMMENT no decoration}
-			ARG 1 content
+			ARG 1 message
 			ARG 2 sender
+		METHOD method_43850 (Lnet/minecraft/class_2561;Lnet/minecraft/class_7436;Lnet/minecraft/class_7463;)Lnet/minecraft/class_2561;
+			ARG 2 decoration
 		CLASS class_7467 Kind
-			COMMENT The narration kind. It also determines if the narration can interrupt
+			COMMENT The kind of narration. This is also known as priority, because it determines
-			COMMENT previous ones.
+			COMMENT if the incoming narration should interrupt the current one. This is also used
+			COMMENT to check if the message {@linkplain net.minecraft.client.option.NarratorMode#shouldNarrate
+			COMMENT should be narrated} when the narrator option is set to "Chat" or "System".
 			FIELD field_39236 CODEC Lcom/mojang/serialization/Codec;
-				COMMENT The codec for the narration kind.
 			FIELD field_39237 name Ljava/lang/String;
 			FIELD field_39238 interrupt Z
 			METHOD <init> (Ljava/lang/String;ILjava/lang/String;Z)V
 				ARG 3 name
 				ARG 4 interrupt
 			METHOD method_43851 shouldInterrupt ()Z
+				COMMENT {@return whether the message has priority over others and should interrupt
+				COMMENT their narrations}
 	CLASS class_7468 DisplayRule
-		COMMENT A display rule for a message.
+		COMMENT The display rule for the message type. This contains the decoration applied
+		COMMENT to the message.
 		FIELD comp_797 Ljava/util/Optional;
-			COMMENT the formatting of a message, or {@code Optional.empty()} if the content
+			COMMENT the decoration applied to a message, or {@link Optional#empty()} if the content
-			COMMENT is displayed directly
+			COMMENT is displayed as is
 		FIELD field_39240 CODEC Lcom/mojang/serialization/Codec;
-			COMMENT The codec for the message display rule.
 		METHOD method_43853 of ()Lnet/minecraft/class_2556$class_7468;
-			COMMENT {@return a rule that displays a message's content directly} The message
+			COMMENT {@return the display rule with no decoration}
-			COMMENT is displayed without any sender-related information.
+			COMMENT
+			COMMENT <p>This does not mean the message is not displayed; this means that the message
+			COMMENT is displayed as is without any extra processing.
 		METHOD method_43854 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 			ARG 0 instance
 		METHOD method_43855 of (Lnet/minecraft/class_7463;)Lnet/minecraft/class_2556$class_7468;
-			COMMENT {@return a rule to format the message} It allows displaying the sender
+			COMMENT {@return the display rule with the specified decoration}
-			COMMENT information in addition to the message content.
+			ARG 0 decoration
-			ARG 0 format
 		METHOD method_43856 apply (Lnet/minecraft/class_2561;Lnet/minecraft/class_7436;)Lnet/minecraft/class_2561;
-			COMMENT {@return the text to display after applying this rule on the given
+			COMMENT {@return the message with the decoration applied, or {@code message} if there is
-			COMMENT content and sender}
+			COMMENT no decoration}
-			ARG 1 content
+			ARG 1 message
 			ARG 2 sender
+		METHOD method_43857 (Lnet/minecraft/class_2561;Lnet/minecraft/class_7436;Lnet/minecraft/class_7463;)Lnet/minecraft/class_2561;
+			ARG 2 decoration

mappings/net/minecraft/network/PacketByteBuf.mapping

@@ -15,13 +15,13 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf
 	COMMENT  <td>{@link net.minecraft.util.registry.Registry} value</td><td>{@link #readRegistryValue(IndexedIterable)}</td><td>{@link #writeRegistryValue(IndexedIterable, Object)}</td>
 	COMMENT </tr>
 	COMMENT <tr>
-	COMMENT  <td>{@link Collection}</td><td>{@link #readCollection(IntFunction, Function)}</td><td>{@link #writeCollection(Collection, BiConsumer)}</td>
+	COMMENT  <td>{@link Collection}</td><td>{@link #readCollection(IntFunction, PacketByteBuf.PacketReader)}</td><td>{@link #writeCollection(Collection, PacketByteBuf.PacketWriter)}</td>
 	COMMENT </tr>
 	COMMENT <tr>
 	COMMENT  <td>{@link IntList}</td><td>{@link #readIntList()}</td><td>{@link #writeIntList(IntList)}</td>
 	COMMENT </tr>
 	COMMENT <tr>
-	COMMENT  <td>{@link Map}</td><td>{@link #readMap(IntFunction, Function, Function)}</td><td>{@link #writeMap(Map, BiConsumer, BiConsumer)}</td>
+	COMMENT  <td>{@link Map}</td><td>{@link #readMap(IntFunction, PacketByteBuf.PacketReader, PacketByteBuf.PacketReader)}</td><td>{@link #writeMap(Map, PacketByteBuf.PacketWriter, PacketByteBuf.PacketWriter)}</td>
 	COMMENT </tr>
 	COMMENT <tr>
 	COMMENT  <td>{@code byte[]}</td><td>{@link #readByteArray()}</td><td>{@link #writeByteArray(byte[])}</td>
@@ -84,10 +84,13 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf
 	COMMENT  <td>{@link BitSet}</td><td>{@link #readBitSet()}</td><td>{@link #writeBitSet(BitSet)}</td>
 	COMMENT </tr>
 	COMMENT <tr>
-	COMMENT  <td>{@link Optional}</td><td>{@link #readOptional(Function)}</td><td>{@link #writeOptional(Optional, BiConsumer)}</td>
+	COMMENT  <td>{@link Optional}</td><td>{@link #readOptional(PacketByteBuf.PacketReader)}</td><td>{@link #writeOptional(Optional, PacketByteBuf.PacketWriter)}</td>
 	COMMENT </tr>
 	COMMENT <tr>
-	COMMENT  <td>{@index Either}</td><td>{@link #readEither(Function, Function)}</td><td>{@link #writeEither(Either, BiConsumer, BiConsumer)}</td>
+	COMMENT  <td>Nullable value</td><td>{@link #readNullable(PacketByteBuf.PacketReader)}</td><td>{@link #writeNullable(Object, PacketByteBuf.PacketWriter)}</td>
+	COMMENT </tr>
+	COMMENT <tr>
+	COMMENT  <td>{@index Either}</td><td>{@link #readEither(PacketByteBuf.PacketReader, PacketByteBuf.PacketReader)}</td><td>{@link #writeEither(Either, PacketByteBuf.PacketWriter, PacketByteBuf.PacketWriter)}</td>
 	COMMENT </tr>
 	COMMENT </table></div>
 	COMMENT
@@ -711,9 +714,10 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf
 		COMMENT sequentially.
 		COMMENT
 		COMMENT @param <T> the list's entry type
-		COMMENT @see #readCollection(IntFunction, Function)
+		COMMENT @see #readCollection(IntFunction, PacketByteBuf.PacketReader)
 		ARG 1 collection
 			COMMENT the collection to write
+		ARG 2 writer
 	METHOD method_34063 writeMap (Ljava/util/Map;Lnet/minecraft/class_2540$class_7462;Lnet/minecraft/class_2540$class_7462;)V
 		COMMENT Writes a map to this buf. The map is stored as a leading
 		COMMENT {@linkplain #readVarInt() var int} size followed by each key and value
@@ -721,9 +725,11 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf
 		COMMENT
 		COMMENT @param <K> the key type
 		COMMENT @param <V> the value type
-		COMMENT @see #readMap(IntFunction, Function, Function)
+		COMMENT @see #readMap(IntFunction, PacketByteBuf.PacketReader, PacketByteBuf.PacketReader)
 		ARG 1 map
 			COMMENT the map to write
+		ARG 2 keyWriter
+		ARG 3 valueWriter
 	METHOD method_34064 (Lnet/minecraft/class_2540$class_7462;Lnet/minecraft/class_2540$class_7462;Ljava/lang/Object;Ljava/lang/Object;)V
 		ARG 3 key
 		ARG 4 value
@@ -732,7 +738,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf
 		COMMENT {@linkplain #readVarInt() var int} {@code size} followed by the entries
 		COMMENT sequentially. The {@code consumer} will be called {@code size} times.
 		COMMENT
-		COMMENT @see #readCollection(IntFunction, Function)
+		COMMENT @see #readCollection(IntFunction, PacketByteBuf.PacketReader)
 		ARG 1 consumer
 			COMMENT the consumer to read entries
 	METHOD method_34066 readList (Lnet/minecraft/class_2540$class_7461;)Ljava/util/List;
@@ -740,14 +746,17 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf
 		COMMENT
 		COMMENT @param <T> the list's entry type
 		COMMENT @return the read list
-		COMMENT @see #readCollection(IntFunction, Function)
+		COMMENT @see #readCollection(IntFunction, PacketByteBuf.PacketReader)
+		ARG 1 reader
 	METHOD method_34067 readMap (Lnet/minecraft/class_2540$class_7461;Lnet/minecraft/class_2540$class_7461;)Ljava/util/Map;
 		COMMENT Reads a map from this buf as a hash map.
 		COMMENT
 		COMMENT @param <K> the key type
 		COMMENT @param <V> the value type
 		COMMENT @return the read map
-		COMMENT @see #readMap(IntFunction, Function, Function)
+		COMMENT @see #readMap(IntFunction, PacketByteBuf.PacketReader, PacketByteBuf.PacketReader)
+		ARG 1 keyReader
+		ARG 2 valueReader
 	METHOD method_34068 readCollection (Ljava/util/function/IntFunction;Lnet/minecraft/class_2540$class_7461;)Ljava/util/Collection;
 		COMMENT Reads a collection from this buf. The collection is stored as a leading
 		COMMENT {@linkplain #readVarInt() var int} size followed by the entries
@@ -756,10 +765,11 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf
 		COMMENT @param <T> the collection's entry type
 		COMMENT @param <C> the collection's type
 		COMMENT @return the read collection
-		COMMENT @see #writeCollection(Collection, BiConsumer)
+		COMMENT @see #writeCollection(Collection, PacketByteBuf.PacketWriter)
-		COMMENT @see #readList(Function)
+		COMMENT @see #readList(PacketByteBuf.PacketReader)
 		ARG 1 collectionFactory
 			COMMENT a factory that creates a collection with a given size
+		ARG 2 reader
 	METHOD method_34069 readMap (Ljava/util/function/IntFunction;Lnet/minecraft/class_2540$class_7461;Lnet/minecraft/class_2540$class_7461;)Ljava/util/Map;
 		COMMENT Reads a map from this buf. The map is stored as a leading
 		COMMENT {@linkplain #readVarInt() var int} size followed by each key and value
@@ -769,10 +779,12 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf
 		COMMENT @param <V> the value type
 		COMMENT @param <M> the map type
 		COMMENT @return the read map
-		COMMENT @see #writeMap(Map, BiConsumer, BiConsumer)
+		COMMENT @see #writeMap(Map, PacketByteBuf.PacketWriter, PacketByteBuf.PacketWriter)
-		COMMENT @see #readMap(Function, Function)
+		COMMENT @see #readMap(PacketByteBuf.PacketReader, PacketByteBuf.PacketReader)
 		ARG 1 mapFactory
 			COMMENT a factory that creates a map with a given size
+		ARG 2 keyReader
+		ARG 3 valueReader
 	METHOD method_34070 (Lnet/minecraft/class_2487;Lcom/mojang/serialization/DataResult$PartialResult;)V
 		ARG 1 partial
 	METHOD method_36129 getVarLongLength (J)I
@@ -813,15 +825,17 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf
 		COMMENT a boolean indicating if the value is present, followed by the value only if
 		COMMENT the value is present.
 		COMMENT
-		COMMENT @see #readOptional(Function)
+		COMMENT @see #readOptional(PacketByteBuf.PacketReader)
 		ARG 1 value
+		ARG 2 writer
 	METHOD method_37436 readOptional (Lnet/minecraft/class_2540$class_7461;)Ljava/util/Optional;
 		COMMENT Reads an optional value from this buf. An optional value is represented by
 		COMMENT a boolean indicating if the value is present, followed by the value only if
 		COMMENT the value is present.
 		COMMENT
 		COMMENT @return the read optional value
-		COMMENT @see #writeOptional(Optional, BiConsumer)
+		COMMENT @see #writeOptional(Optional, PacketByteBuf.PacketWriter)
+		ARG 1 reader
 	METHOD method_37452 (ILjava/util/function/IntFunction;I)Ljava/lang/Object;
 		ARG 2 value
 	METHOD method_37453 getMaxValidator (Ljava/util/function/IntFunction;I)Ljava/util/function/IntFunction;
@@ -873,8 +887,10 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf
 		COMMENT a boolean indicating if the left side or the right side of the either,
 		COMMENT followed by the value.
 		COMMENT
-		COMMENT @see #readEither(Function, Function)
+		COMMENT @see #readEither(PacketByteBuf.PacketReader, PacketByteBuf.PacketReader)
 		ARG 1 either
+		ARG 2 leftWriter
+		ARG 3 rightWriter
 	METHOD method_43620 (Lnet/minecraft/class_2540$class_7462;Ljava/lang/Object;)V
 		ARG 2 object
 	METHOD method_43621 (Lnet/minecraft/class_2540$class_7462;Ljava/lang/Object;)V
@@ -885,7 +901,9 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf
 		COMMENT followed by the value.
 		COMMENT
 		COMMENT @return the read either
-		COMMENT @see #writeEither(Either, BiConsumer, BiConsumer)
+		COMMENT @see #writeEither(Either, PacketByteBuf.PacketWriter, PacketByteBuf.PacketWriter)
+		ARG 1 leftReader
+		ARG 2 rightReader
 	METHOD method_43623 readGameProfile ()Lcom/mojang/authlib/GameProfile;
 		COMMENT Reads a game profile from this buf. A game profile is represented by a
 		COMMENT {@linkplain #readUuid() uuid}, a username string, and a collection of
@@ -901,6 +919,22 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf
 		COMMENT
 		COMMENT @return the property
 		COMMENT @see #writeProperty(Property)
+	METHOD method_43826 writeNullable (Ljava/lang/Object;Lnet/minecraft/class_2540$class_7462;)V
+		COMMENT Writes a nullable value to this buf. A nullable value is represented by
+		COMMENT a boolean indicating if the value is not null, followed by the value only if
+		COMMENT the value is not null.
+		COMMENT
+		COMMENT @see #readNullable(PacketByteBuf.PacketReader)
+		ARG 1 value
+		ARG 2 writer
+	METHOD method_43827 readNullable (Lnet/minecraft/class_2540$class_7461;)Ljava/lang/Object;
+		COMMENT Reads a nullable value from this buf. A nullable value is represented by
+		COMMENT a boolean indicating if the value is not null, followed by the value only if
+		COMMENT the value is not null.
+		COMMENT
+		COMMENT @return the read nullable value
+		COMMENT @see #writeNullable(Object, PacketByteBuf.PacketWriter)
+		ARG 1 reader
 	METHOD nioBuffer (II)Ljava/nio/ByteBuffer;
 		ARG 1 index
 		ARG 2 length
@@ -1112,3 +1146,12 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf
 		ARG 1 length
 	METHOD writerIndex (I)Lio/netty/buffer/ByteBuf;
 		ARG 1 index
+	CLASS class_7461 PacketReader
+		COMMENT A functional interface to read a value from {@link PacketByteBuf}.
+		METHOD method_43828 (Lnet/minecraft/class_2540;)Ljava/util/Optional;
+			ARG 1 buf
+	CLASS class_7462 PacketWriter
+		COMMENT A functional interface to write a value to {@link PacketByteBuf}.
+		METHOD method_43829 (Lnet/minecraft/class_2540;Ljava/util/Optional;)V
+			ARG 1 buf
+			ARG 2 value

mappings/net/minecraft/network/encryption/ArgumentSignatures.mapping

@@ -0,0 +1,19 @@
+CLASS net/minecraft/class_7450 net/minecraft/network/encryption/ArgumentSignatures
+	FIELD field_39185 MAX_ARGUMENT_NAME_LENGTH I
+	METHOD <init> (Lnet/minecraft/class_2540;)V
+		ARG 1 buf
+	METHOD method_43745 none ()Lnet/minecraft/class_7450;
+	METHOD method_43746 collectArguments (Lcom/mojang/brigadier/context/CommandContextBuilder;)Ljava/util/Map;
+		ARG 0 builder
+	METHOD method_43747 resultToText (Lnet/minecraft/class_7451;Lcom/mojang/brigadier/context/ParsedArgument;)Lnet/minecraft/class_2561;
+		ARG 0 type
+		ARG 1 argument
+	METHOD method_43748 createSignatureData (Ljava/lang/String;)Lnet/minecraft/class_3515$class_7425;
+		ARG 1 argumentName
+	METHOD method_43749 write (Lnet/minecraft/class_2540;)V
+		ARG 1 buf
+	METHOD method_43750 (Lnet/minecraft/class_2540;Ljava/lang/String;)V
+		ARG 0 buf
+		ARG 1 argumentName
+	METHOD method_43751 (Lnet/minecraft/class_2540;)Ljava/lang/String;
+		ARG 0 buf2

mappings/net/minecraft/network/encryption/ChatMessageSignature.mapping

@@ -0,0 +1,16 @@
+CLASS net/minecraft/class_7469 net/minecraft/network/encryption/ChatMessageSignature
+	METHOD method_43859 none ()Lnet/minecraft/class_7469;
+	METHOD method_43860 verify (Ljava/security/Signature;Ljava/lang/String;)Z
+		ARG 1 signature
+		ARG 2 message
+	METHOD method_43861 verify (Ljava/security/Signature;Lnet/minecraft/class_2561;)Z
+		ARG 1 signature
+		ARG 2 message
+	METHOD method_43862 updateSignature (Ljava/security/Signature;Lnet/minecraft/class_2561;Ljava/util/UUID;Ljava/time/Instant;J)V
+		ARG 0 signature
+		ARG 1 message
+		ARG 2 sender
+		ARG 3 time
+		ARG 4 salt
+	METHOD method_43863 toByteArray (Lnet/minecraft/class_2561;)[B
+		ARG 0 message

mappings/net/minecraft/network/encryption/ChatMessageSigner.mapping

@@ -0,0 +1,9 @@
+CLASS net/minecraft/class_7470 net/minecraft/network/encryption/ChatMessageSigner
+	METHOD method_43864 sign (Ljava/security/Signature;Ljava/lang/String;)Lnet/minecraft/class_7469;
+		ARG 1 signature
+		ARG 2 message
+	METHOD method_43865 sign (Ljava/security/Signature;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7469;
+		ARG 1 signature
+		ARG 2 message
+	METHOD method_43866 create (Ljava/util/UUID;)Lnet/minecraft/class_7470;
+		ARG 0 sender

mappings/net/minecraft/network/encryption/CommandArgumentSigner.mapping

@@ -0,0 +1,13 @@
+CLASS net/minecraft/class_7448 net/minecraft/network/encryption/CommandArgumentSigner
+	FIELD field_39182 NONE Lnet/minecraft/class_7448;
+	METHOD method_43731 (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7471;
+		ARG 0 context
+		ARG 1 argumentName
+		ARG 2 value
+	METHOD signArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7471;
+		ARG 1 context
+		ARG 2 argumentName
+		ARG 3 value
+	CLASS class_7449 Signatures
+		FIELD comp_776 time Ljava/time/Instant;
+		METHOD comp_776 time ()Ljava/time/Instant;

mappings/net/minecraft/network/encryption/NetworkEncryptionUtils.mapping

@@ -29,6 +29,7 @@ CLASS net/minecraft/class_3515 net/minecraft/network/encryption/NetworkEncryptio
 	FIELD field_39037 RSA_PRIVATE_KEY_PREFIX Ljava/lang/String;
 	FIELD field_39038 RSA_PRIVATE_KEY_SUFFIX Ljava/lang/String;
 	FIELD field_39039 RSA_PUBLIC_KEY_SUFFIX Ljava/lang/String;
+	FIELD field_39109 SHA256_WITH_RSA Ljava/lang/String;
 	METHOD method_15234 decryptSecretKey (Ljava/security/PrivateKey;[B)Ljavax/crypto/SecretKey;
 		COMMENT Decrypts RSA-encrypted AES secret key.
 		COMMENT

mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping

@@ -17,3 +17,18 @@ CLASS net/minecraft/class_7428 net/minecraft/network/encryption/PlayerPublicKey
 		COMMENT @throws InsecurePublicKeyException.MissingException when the key is missing or empty
 		COMMENT @throws InsecurePublicKeyException.InvalidException when the key is unsigned or expired
 		COMMENT @throws NetworkEncryptionException when the key is malformed
+		ARG 0 sessionService
+		ARG 1 publicKeyData
+	METHOD method_43697 createSignatureInstance ()Ljava/security/Signature;
+	METHOD method_43698 fromKeyData (Lnet/minecraft/class_7428$class_7443;)Lnet/minecraft/class_7428;
+		ARG 0 publicKeyData
+	METHOD method_43699 (Lnet/minecraft/class_7428$class_7443;)Lcom/mojang/serialization/DataResult;
+		ARG 0 publicKeyData
+	CLASS class_7443 PublicKeyData
+		FIELD field_39119 CODEC Lcom/mojang/serialization/Codec;
+		METHOD method_43700 toProperty ()Lcom/mojang/authlib/properties/Property;
+		METHOD method_43701 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+			ARG 0 instance
+		METHOD method_43702 toSerializedString ()Ljava/lang/String;
+		METHOD method_43703 decodeKey ()Ljava/security/PublicKey;
+		METHOD method_43704 isExpired ()Z

mappings/net/minecraft/network/encryption/SignedChatMessage.mapping

@@ -0,0 +1,8 @@
+CLASS net/minecraft/class_7471 net/minecraft/network/encryption/SignedChatMessage
+	METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_7469;)V
+		ARG 1 content
+		ARG 2 signature
+	METHOD method_43867 verify (Lnet/minecraft/class_7428;)Z
+		ARG 1 publicKey
+	METHOD method_43868 verify (Ljava/security/Signature;)Z
+		ARG 1 signature

mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping

@@ -90,3 +90,5 @@ CLASS net/minecraft/class_2792 net/minecraft/network/listener/ServerPlayPacketLi
 		ARG 1 packet
 	METHOD method_36580 onPong (Lnet/minecraft/class_6374;)V
 		ARG 1 packet
+	METHOD method_43667 onCommandExecution (Lnet/minecraft/class_7472;)V
+		ARG 1 packet

mappings/net/minecraft/network/packet/c2s/login/LoginHelloC2SPacket.mapping

@@ -1,3 +1,8 @@
 CLASS net/minecraft/class_2915 net/minecraft/network/packet/c2s/login/LoginHelloC2SPacket
 	METHOD <init> (Lnet/minecraft/class_2540;)V
 		ARG 1 buf
+	METHOD method_43638 (Lnet/minecraft/class_2540;Lnet/minecraft/class_7428$class_7443;)V
+		ARG 0 buf2
+		ARG 1 publicKey
+	METHOD method_43639 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_7428$class_7443;
+		ARG 0 buf2

mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping

@@ -24,7 +24,7 @@ CLASS net/minecraft/class_2917 net/minecraft/network/packet/c2s/login/LoginKeyC2
 	METHOD method_43640 (Lnet/minecraft/class_7428;[BLnet/minecraft/class_3515$class_7425;)Ljava/lang/Boolean;
 		ARG 2 signature
 	METHOD method_43641 (Lnet/minecraft/class_2540;Lnet/minecraft/class_3515$class_7425;)V
-		ARG 0 buf
+		ARG 0 buf2
 		ARG 1 signature
 	METHOD method_43642 ([B)Ljava/lang/Boolean;
 		ARG 0 encrypted

mappings/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.mapping

@@ -5,5 +5,12 @@ CLASS net/minecraft/class_2913 net/minecraft/network/packet/c2s/login/LoginQuery
 	METHOD <init> (ILnet/minecraft/class_2540;)V
 		ARG 1 queryId
 		ARG 2 response
+	METHOD <init> (Lnet/minecraft/class_2540;)V
+		ARG 1 buf
 	METHOD method_36178 getQueryId ()I
 	METHOD method_36179 getResponse ()Lnet/minecraft/class_2540;
+	METHOD method_43900 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2540;)V
+		ARG 0 buf2
+		ARG 1 response
+	METHOD method_43901 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2540;
+		ARG 0 buf2

mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping

@@ -13,14 +13,14 @@ CLASS net/minecraft/class_2820 net/minecraft/network/packet/c2s/play/BookUpdateC
 		ARG 1 buf
 	METHOD method_12235 getSlot ()I
 	METHOD method_37441 (Lnet/minecraft/class_2540;Ljava/lang/String;)V
-		ARG 0 buf
+		ARG 0 buf2
 		ARG 1 title
 	METHOD method_37442 getPages ()Ljava/util/List;
 	METHOD method_37443 (Lnet/minecraft/class_2540;)Ljava/lang/String;
-		ARG 0 buf
+		ARG 0 buf2
 	METHOD method_37444 (Lnet/minecraft/class_2540;Ljava/lang/String;)V
-		ARG 0 buf
+		ARG 0 buf2
 		ARG 1 page
 	METHOD method_37445 getTitle ()Ljava/util/Optional;
 	METHOD method_37446 (Lnet/minecraft/class_2540;)Ljava/lang/String;
-		ARG 0 buf
+		ARG 0 buf2

mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping

@@ -1,10 +1,9 @@
 CLASS net/minecraft/class_2797 net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket
 	COMMENT A packet used to send a chat message to the server.
 	COMMENT
-	COMMENT <p>This truncates the message to at most {@value #MAX_LENGTH} characters
+	COMMENT <p>This truncates the message to at most 256 characters before sending to
-	COMMENT before sending to the server on the client. If the server receives the
+	COMMENT the server on the client. If the server receives the message longer than
-	COMMENT message longer than {@value #MAX_LENGTH} characters, it will reject
+	COMMENT 256 characters, it will reject the message and disconnect the client.
-	COMMENT the message and disconnect the client.
 	COMMENT
 	COMMENT <p>If the message contains an invalid character (see {@link
 	COMMENT net.minecraft.SharedConstants#isValidChar isValidChar}), the server will
@@ -19,6 +18,9 @@ CLASS net/minecraft/class_2797 net/minecraft/network/packet/c2s/play/ChatMessage
 	FIELD field_39086 TIME_TO_LIVE Ljava/time/Duration;
 	FIELD field_39087 time Ljava/time/Instant;
 	FIELD field_39088 signature Lnet/minecraft/class_3515$class_7425;
+	METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_7469;)V
+		ARG 1 chatMessage
+		ARG 2 signature
 	METHOD <init> (Lnet/minecraft/class_2540;)V
 		ARG 1 buf
 	METHOD method_12114 getChatMessage ()Ljava/lang/String;
@@ -27,3 +29,5 @@ CLASS net/minecraft/class_2797 net/minecraft/network/packet/c2s/play/ChatMessage
 		ARG 1 currentTime
 	METHOD method_43637 getExpiryTime ()Ljava/time/Instant;
 		COMMENT {@return when the message is considered expired and should be discarded}
+	METHOD method_43899 createSignatureInstance (Ljava/util/UUID;)Lnet/minecraft/class_7469;
+		ARG 1 sender

mappings/net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket.mapping

@@ -0,0 +1,33 @@
+CLASS net/minecraft/class_7472 net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket
+	COMMENT A packet used to execute commands on the server.
+	COMMENT
+	COMMENT <p>This truncates the command to at most {@value #MAX_COMMAND_LENGTH} characters
+	COMMENT before sending to the server on the client. If the server receives the command
+	COMMENT longer than {@value #MAX_COMMAND_LENGTH} characters, it will reject the message
+	COMMENT and disconnect the client.
+	COMMENT
+	COMMENT <p>If the command contains an invalid character (see {@link
+	COMMENT net.minecraft.SharedConstants#isValidChar isValidChar}), the server will
+	COMMENT reject the command and disconnect the client.
+	COMMENT
+	COMMENT <p>Commands that took more than {@link ChatMessageC2SPacket#TIME_TO_LIVE} to reach
+	COMMENT the server are considered expired and will be discarded.
+	COMMENT
+	COMMENT @see net.minecraft.client.network.ClientPlayerEntity#sendCommand
+	COMMENT @see net.minecraft.server.network.ServerPlayNetworkHandler#onCommandExecution
+	FIELD comp_809 time Ljava/time/Instant;
+	FIELD field_39244 MAX_COMMAND_LENGTH I
+	METHOD <init> (Ljava/lang/String;Ljava/time/Instant;Lnet/minecraft/class_7450;)V
+		ARG 1 command
+		ARG 2 time
+		ARG 3 argumentSignatures
+	METHOD <init> (Lnet/minecraft/class_2540;)V
+		ARG 1 buf
+	METHOD comp_809 time ()Ljava/time/Instant;
+	METHOD method_43895 isExpired (Ljava/time/Instant;)Z
+		COMMENT {@return whether the command execution is considered expired and should be discarded}
+		ARG 1 currentTime
+	METHOD method_43896 createArgumentsSigner (Ljava/util/UUID;)Lnet/minecraft/class_7448;
+		ARG 1 sender
+	METHOD method_43898 getExpiryTime ()Ljava/time/Instant;
+		COMMENT {@return when the command execution is considered expired and should be discarded}

mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping

@@ -15,8 +15,8 @@ CLASS net/minecraft/class_2779 net/minecraft/network/packet/s2c/play/Advancement
 	METHOD method_11927 getAdvancementsToProgress ()Ljava/util/Map;
 	METHOD method_11928 getAdvancementsToEarn ()Ljava/util/Map;
 	METHOD method_34197 (Lnet/minecraft/class_2540;Lnet/minecraft/class_167;)V
-		ARG 0 buf
+		ARG 0 buf2
 		ARG 1 progress
 	METHOD method_34198 (Lnet/minecraft/class_2540;Lnet/minecraft/class_161$class_162;)V
-		ARG 0 buf
+		ARG 0 buf2
 		ARG 1 task

mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping

@@ -2,9 +2,8 @@ CLASS net/minecraft/class_7438 net/minecraft/network/packet/s2c/play/ChatMessage
 	COMMENT A packet used to send a chat message to the clients.
 	COMMENT
 	COMMENT <p>The content is not wrapped in any way (e.g. by {@code chat.type.text} text); the
-	COMMENT raw message content is sent to the clients, and they will wrap it (see {@link
+	COMMENT raw message content is sent to the clients, and they will wrap it. To register
-	COMMENT net.minecraft.client.gui.hud.ChatHudListener#format}.) If custom formats are needed,
+	COMMENT custom wrapping behaviors, check {@link MessageType#register}.
-	COMMENT either send it as a {@link GameMessageS2CPacket game message} or use a server resource pack.
 	COMMENT
 	COMMENT <p>Messages that took more than {@link #TIME_TO_LIVE} to reach the clients are
 	COMMENT considered expired. This is measured from the time the client sent the chat message
@@ -13,21 +12,30 @@ CLASS net/minecraft/class_7438 net/minecraft/network/packet/s2c/play/ChatMessage
 	COMMENT discarded by the clients; they instead log a warning.
 	COMMENT
 	COMMENT <p>Chat messages have signatures. It is possible to use a bogus signature - such as
-	COMMENT {@link NetworkEncryptionUtils.SignatureData#NONE} - to send a chat message; however
+	COMMENT {@link net.minecraft.network.encryption.ChatMessageSignature#none} - to send a chat
-	COMMENT if the signature is invalid (e.g. because the text's content differs from the one
+	COMMENT message; however if the signature is invalid (e.g. because the text's content differs
-	COMMENT sent by the client, or because the passed signature is invalid) the client will
+	COMMENT from the one sent by the client, or because the passed signature is invalid) the client
-	COMMENT log a warning. See {@link NetworkEncryptionUtils#updateSignature} for how the message
+	COMMENT will log a warning. See {@link
-	COMMENT is signed.
+	COMMENT net.minecraft.network.encryption.ChatMessageSignature#updateSignature} for how the
+	COMMENT message is signed.
 	COMMENT
 	COMMENT @see net.minecraft.server.network.ServerPlayerEntity#sendChatMessage
 	COMMENT @see net.minecraft.client.network.ClientPlayNetworkHandler#onChatMessage
 	FIELD comp_758 Lnet/minecraft/class_2561;
 		COMMENT the unwrapped chat message
+	FIELD comp_761 time Ljava/time/Instant;
 	FIELD field_39085 TIME_TO_LIVE Ljava/time/Duration;
 	METHOD <init> (Lnet/minecraft/class_2540;)V
 		ARG 1 buf
+	METHOD comp_761 time ()Ljava/time/Instant;
 	METHOD method_43628 isExpired (Ljava/time/Instant;)Z
 		COMMENT {@return whether the message is considered expired}
 		ARG 1 currentTime
 	METHOD method_43630 getExpiryTime ()Ljava/time/Instant;
 		COMMENT {@return when the message is considered expired}
+	METHOD method_43884 getMessageType (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2556;
+		COMMENT {@return the message type of the chat message}
+		COMMENT
+		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;

mappings/net/minecraft/network/packet/s2c/play/ChunkData.mapping

@@ -23,7 +23,7 @@ CLASS net/minecraft/class_6603 net/minecraft/network/packet/s2c/play/ChunkData
 		ARG 0 buf
 		ARG 1 chunk
 	METHOD method_38592 (Lnet/minecraft/class_2540;Lnet/minecraft/class_6603$class_6604;)V
-		ARG 0 buf
+		ARG 0 buf2
 		ARG 1 entry
 	METHOD method_38593 iterateBlockEntities (Lnet/minecraft/class_6603$class_6605;II)V
 		ARG 1 consumer
@@ -41,6 +41,8 @@ CLASS net/minecraft/class_6603 net/minecraft/network/packet/s2c/play/ChunkData
 			ARG 2 y
 			ARG 3 type
 			ARG 4 nbt
+		METHOD <init> (Lnet/minecraft/class_2540;)V
+			ARG 1 buf
 		METHOD method_38596 of (Lnet/minecraft/class_2586;)Lnet/minecraft/class_6603$class_6604;
 			ARG 0 blockEntity
 		METHOD method_38597 write (Lnet/minecraft/class_2540;)V

mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping

@@ -9,7 +9,10 @@ CLASS net/minecraft/class_2639 net/minecraft/network/packet/s2c/play/CommandSugg
 	METHOD method_11397 getSuggestions ()Lcom/mojang/brigadier/suggestion/Suggestions;
 	METHOD method_11399 getCompletionId ()I
 	METHOD method_34117 (Lcom/mojang/brigadier/context/StringRange;Lnet/minecraft/class_2540;)Lcom/mojang/brigadier/suggestion/Suggestion;
-		ARG 1 buf
+		ARG 1 buf2
 	METHOD method_34118 (Lnet/minecraft/class_2540;Lcom/mojang/brigadier/suggestion/Suggestion;)V
-		ARG 0 buf
+		ARG 0 buf2
 		ARG 1 suggestion
+	METHOD method_43880 (Lnet/minecraft/class_2540;Lcom/mojang/brigadier/Message;)V
+		ARG 0 buf3
+		ARG 1 tooltip

mappings/net/minecraft/network/packet/s2c/play/EntityAttributesS2CPacket.mapping

@@ -9,13 +9,13 @@ CLASS net/minecraft/class_2781 net/minecraft/network/packet/s2c/play/EntityAttri
 	METHOD method_11937 getEntityId ()I
 	METHOD method_11938 getEntries ()Ljava/util/List;
 	METHOD method_34199 (Lnet/minecraft/class_2540;Lnet/minecraft/class_1322;)V
-		ARG 0 buf
+		ARG 0 buf3
 		ARG 1 modifier
 	METHOD method_34200 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2781$class_2782;)V
-		ARG 0 buf
+		ARG 0 buf2
 		ARG 1 attribute
 	METHOD method_34201 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2781$class_2782;
-		ARG 0 buf
+		ARG 0 buf2
 	METHOD method_34202 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1322;
 		ARG 0 modifiers
 	CLASS class_2782 Entry

mappings/net/minecraft/network/packet/s2c/play/EntityStatusEffectS2CPacket.mapping

@@ -22,3 +22,8 @@ CLASS net/minecraft/class_2783 net/minecraft/network/packet/s2c/play/EntityStatu
 	METHOD method_11949 shouldShowParticles ()Z
 	METHOD method_11950 isAmbient ()Z
 	METHOD method_42625 getFactorCalculationData ()Lnet/minecraft/class_1293$class_7247;
+	METHOD method_43891 (Lnet/minecraft/class_2540;Lnet/minecraft/class_1293$class_7247;)V
+		ARG 0 buf2
+		ARG 1 factorCalculationData
+	METHOD method_43892 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1293$class_7247;
+		ARG 0 buf2

mappings/net/minecraft/network/packet/s2c/play/ExplosionS2CPacket.mapping

@@ -31,6 +31,8 @@ CLASS net/minecraft/class_2664 net/minecraft/network/packet/s2c/play/ExplosionS2
 	METHOD method_11477 getY ()D
 	METHOD method_11478 getZ ()D
 	METHOD method_11479 getAffectedBlocks ()Ljava/util/List;
+	METHOD method_34121 (IIILnet/minecraft/class_2540;)Lnet/minecraft/class_2338;
+		ARG 3 buf2
 	METHOD method_34122 (IIILnet/minecraft/class_2540;Lnet/minecraft/class_2338;)V
-		ARG 3 buf
+		ARG 3 buf2
 		ARG 4 pos

mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping

@@ -1,3 +1,8 @@
 CLASS net/minecraft/class_7439 net/minecraft/network/packet/s2c/play/GameMessageS2CPacket
 	METHOD <init> (Lnet/minecraft/class_2540;)V
 		ARG 1 buf
+	METHOD method_43890 getMessageType (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2556;
+		COMMENT {@return the message type of the chat message}
+		COMMENT
+		COMMENT @throws NullPointerException when the type ID is invalid (due to unsynced registry, etc)
+		ARG 1 registry

mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping

@@ -20,3 +20,10 @@ CLASS net/minecraft/class_2683 net/minecraft/network/packet/s2c/play/MapUpdateS2
 	METHOD method_34136 (Lnet/minecraft/class_2540;Lnet/minecraft/class_20;)V
 		ARG 0 b
 		ARG 1 icon
+	METHOD method_43881 (Lnet/minecraft/class_2540;Ljava/util/List;)V
+		ARG 0 buf2
+		ARG 1 icons
+	METHOD method_43882 (Lnet/minecraft/class_2540;)Ljava/util/List;
+		ARG 0 buf2
+	METHOD method_43883 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_20;
+		ARG 0 buf3

mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping

@@ -11,20 +11,25 @@ CLASS net/minecraft/class_2703 net/minecraft/network/packet/s2c/play/PlayerListS
 		ARG 2 players
 	METHOD method_11722 getEntries ()Ljava/util/List;
 	METHOD method_11723 getAction ()Lnet/minecraft/class_2703$class_5893;
+	METHOD method_43886 entryFromPlayer (Lnet/minecraft/class_3222;)Lnet/minecraft/class_2703$class_2705;
+		ARG 0 player
 	CLASS class_2705 Entry
 		FIELD field_12377 displayName Lnet/minecraft/class_2561;
 		FIELD field_12378 latency I
 		FIELD field_12379 gameMode Lnet/minecraft/class_1934;
 		FIELD field_12380 profile Lcom/mojang/authlib/GameProfile;
+		FIELD field_39243 publicKeyData Lnet/minecraft/class_7428$class_7443;
 		METHOD <init> (Lcom/mojang/authlib/GameProfile;ILnet/minecraft/class_1934;Lnet/minecraft/class_2561;Lnet/minecraft/class_7428$class_7443;)V
 			ARG 1 profile
 			ARG 2 latency
 			ARG 3 gameMode
 			ARG 4 displayName
+			ARG 5 publicKeyData
 		METHOD method_11724 getDisplayName ()Lnet/minecraft/class_2561;
 		METHOD method_11725 getGameMode ()Lnet/minecraft/class_1934;
 		METHOD method_11726 getProfile ()Lcom/mojang/authlib/GameProfile;
 		METHOD method_11727 getLatency ()I
+		METHOD method_43889 getPublicKeyData ()Lnet/minecraft/class_7428$class_7443;
 	CLASS class_5893 Action
 		METHOD method_34150 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2703$class_2705;
 			ARG 1 buf
@@ -32,3 +37,8 @@ CLASS net/minecraft/class_2703 net/minecraft/network/packet/s2c/play/PlayerListS
 			ARG 1 buf
 			ARG 2 entry
 		CLASS 1
+			METHOD method_43887 (Lnet/minecraft/class_2540;Lnet/minecraft/class_7428$class_7443;)V
+				ARG 0 buf2
+				ARG 1 publicKeyData
+			METHOD method_43888 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_7428$class_7443;
+				ARG 0 buf2

mappings/net/minecraft/network/packet/s2c/play/ResourcePackSendS2CPacket.mapping

@@ -9,6 +9,8 @@ CLASS net/minecraft/class_2720 net/minecraft/network/packet/s2c/play/ResourcePac
 		ARG 2 hash
 		ARG 3 required
 		ARG 4 prompt
+	METHOD <init> (Lnet/minecraft/class_2540;)V
+		ARG 1 buf
 	METHOD method_11772 getURL ()Ljava/lang/String;
 	METHOD method_11773 getSHA1 ()Ljava/lang/String;
 	METHOD method_32307 isRequired ()Z

mappings/net/minecraft/network/packet/s2c/play/SelectAdvancementTabS2CPacket.mapping

@@ -1,5 +1,7 @@
 CLASS net/minecraft/class_2729 net/minecraft/network/packet/s2c/play/SelectAdvancementTabS2CPacket
 	FIELD field_12440 tabId Lnet/minecraft/class_2960;
+	METHOD <init> (Lnet/minecraft/class_2540;)V
+		ARG 1 buf
 	METHOD <init> (Lnet/minecraft/class_2960;)V
 		ARG 1 tabId
 	METHOD method_11793 getTabId ()Lnet/minecraft/class_2960;

mappings/net/minecraft/server/MinecraftServer.mapping

@@ -207,8 +207,8 @@ CLASS net/minecraft/server/MinecraftServer
 		COMMENT <p>A dedicated singleplayer server always turns online mode off, regardless of the
 		COMMENT content of {@code server.properties}.
 		COMMENT
-		COMMENT @see #getSinglePlayerName
+		COMMENT @see #getHostProfile
-		COMMENT @see #setSinglePlayerName
+		COMMENT @see #setHostProfile
 	METHOD method_3725 getIconFile ()Ljava/util/Optional;
 	METHOD method_3727 hasGui ()Z
 	METHOD method_3728 kickNonWhitelistedPlayers (Lnet/minecraft/class_2168;)V
@@ -413,7 +413,7 @@ CLASS net/minecraft/server/MinecraftServer
 	METHOD method_43659 getResourcePackProperties ()Ljava/util/Optional;
 	METHOD method_43824 getHostProfile ()Lcom/mojang/authlib/GameProfile;
 	METHOD method_43825 setHostProfile (Lcom/mojang/authlib/GameProfile;)V
-		ARG 1 gameProfile
+		ARG 1 hostProfile
 	METHOD method_5387 isMainThread ()Z
 	CLASS class_6414 DebugStart
 		FIELD field_33980 time J

mappings/net/minecraft/server/PlayerManager.mapping

@@ -142,43 +142,98 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager
 		COMMENT Broadcasts a message to all players and the server console. A different
 		COMMENT message can be sent to a different player.
 		COMMENT
-		COMMENT @apiNote This is used by {@link net.minecraft.server.command.MeCommand}
+		COMMENT @see #broadcast(Text, RegistryKey)
-		COMMENT and {@link net.minecraft.server.command.SayCommand}.
+		COMMENT @see #broadcast(SignedChatMessage, ChatMessageSender, RegistryKey)
-		COMMENT
+		COMMENT @see #broadcast(SignedChatMessage, Function, ChatMessageSender, RegistryKey)
-		COMMENT @see #broadcast(Text, MessageType)
-		COMMENT @see #broadcast(Text, Function, MessageType, ChatMessageSender, Instant, NetworkEncryptionUtils.SignatureData)
 		ARG 1 message
 		ARG 2 playerMessageFactory
 			COMMENT a function that takes the player to send the message to
 			COMMENT and returns either the text to send to them or {@code null}
 			COMMENT to indicate the message should not be sent to them
+		ARG 3 typeKey
 	METHOD method_43513 broadcast (Lnet/minecraft/class_7471;Ljava/util/function/Function;Lnet/minecraft/class_7436;Lnet/minecraft/class_5321;)V
 		COMMENT Broadcasts a chat message to all players and the server console. A different
 		COMMENT message can be sent to a different player.
 		COMMENT
 		COMMENT <p>Chat messages have signatures. It is possible to use a bogus signature - such as
-		COMMENT {@link NetworkEncryptionUtils.SignatureData#NONE} - to send a chat message; however
+		COMMENT {@link net.minecraft.network.encryption.ChatMessageSignature#none} - to send a chat
-		COMMENT if the signature is invalid (e.g. because the text's content differs from the one
+		COMMENT message; however if the signature is invalid (e.g. because the text's content differs
-		COMMENT sent by the client, or because the passed signature is invalid) the client will
+		COMMENT from the one sent by the client, or because the passed signature is invalid) the client
-		COMMENT log a warning. See {@link NetworkEncryptionUtils#updateSignature} for how the message
+		COMMENT will log a warning. See {@link
-		COMMENT is signed.
+		COMMENT net.minecraft.network.encryption.ChatMessageSignature#updateSignature} for how the
+		COMMENT message is signed.
 		COMMENT
 		COMMENT @apiNote This method is used to broadcast a message sent by a player
-		COMMENT through {@linkplain net.minecraft.client.gui.screen.ChatScreen the chat screen}.
+		COMMENT through {@linkplain net.minecraft.client.gui.screen.ChatScreen the chat screen}
+		COMMENT as well as through commands like {@link net.minecraft.server.command.MeCommand} or
+		COMMENT {@link net.minecraft.server.command.SayCommand} .
 		COMMENT
-		COMMENT @see #broadcast(Text, MessageType)
+		COMMENT @see #broadcast(Text, RegistryKey)
-		COMMENT @see #broadcast(Text, Function, MessageType)
+		COMMENT @see #broadcast(Text, Function, RegistryKey)
+		COMMENT @see #broadcast(SignedChatMessage, ChatMessageSender, RegistryKey)
+		ARG 1 message
 		ARG 2 playerMessageFactory
 			COMMENT a function that takes the player to send the message to
-			COMMENT and returns either the text to send to them or {@code null}
+			COMMENT and returns either the message to send to them or {@code null}
 			COMMENT to indicate the message should not be sent to them
+		ARG 3 sender
+		ARG 4 typeKey
 	METHOD method_43514 broadcast (Lnet/minecraft/class_2561;Lnet/minecraft/class_5321;)V
 		COMMENT Broadcasts a message to all players and the server console.
 		COMMENT
 		COMMENT @apiNote This is used to send general messages such as a death
-		COMMENT message or a join/leave message. This is also used to send messages from
+		COMMENT message or a join/leave message.
-		COMMENT non-player-executed commands, such as ones from a command block or the server console.
 		COMMENT
-		COMMENT @see #broadcast(Text, Function, MessageType)
+		COMMENT @see #broadcast(Text, Function, RegistryKey)
-		COMMENT @see #broadcast(Text, Function, MessageType, ChatMessageSender, Instant, NetworkEncryptionUtils.SignatureData)
+		COMMENT @see #broadcast(SignedChatMessage, MessageSender, RegistryKey)
+		COMMENT @see #broadcast(SignedChatMessage, Function, MessageSender, RegistryKey)
 		ARG 1 message
+		ARG 2 typeKey
+	METHOD method_43671 (Lnet/minecraft/class_3222;Lnet/minecraft/class_7471;Lnet/minecraft/class_7471;Lnet/minecraft/class_3222;)Lnet/minecraft/class_7471;
+		ARG 3 player
+	METHOD method_43672 (Lnet/minecraft/class_7471;Lnet/minecraft/class_3222;)Lnet/minecraft/class_7471;
+		ARG 1 player
+	METHOD method_43673 broadcast (Lnet/minecraft/class_7471;Lnet/minecraft/class_5513$class_5837;Lnet/minecraft/class_3222;Lnet/minecraft/class_5321;)V
+		COMMENT Broadcasts a chat message to all players and the server console.
+		COMMENT
+		COMMENT <p>Chat messages have signatures. It is possible to use a bogus signature - such as
+		COMMENT {@link net.minecraft.network.encryption.ChatMessageSignature#none} - to send a chat
+		COMMENT message; however if the signature is invalid (e.g. because the text's content differs
+		COMMENT from the one sent by the client, or because the passed signature is invalid) the client
+		COMMENT will log a warning. See {@link
+		COMMENT net.minecraft.network.encryption.ChatMessageSignature#updateSignature} for how the
+		COMMENT message is signed.
+		COMMENT
+		COMMENT @apiNote This method is used to broadcast a message sent by a player
+		COMMENT through {@linkplain net.minecraft.client.gui.screen.ChatScreen the chat screen}
+		COMMENT as well as through commands like {@link net.minecraft.server.command.MeCommand} or
+		COMMENT {@link net.minecraft.server.command.SayCommand} .
+		COMMENT
+		COMMENT @see #broadcast(Text, RegistryKey)
+		COMMENT @see #broadcast(Text, Function, RegistryKey)
+		COMMENT @see #broadcast(SignedChatMessage, ChatMessageSender, RegistryKey)
+		COMMENT @see #broadcast(SignedChatMessage, Function, ChatMessageSender, RegistryKey)
+		ARG 1 message
+		ARG 2 filterableMessage
+		ARG 3 sender
+		ARG 4 typeKey
+	METHOD method_43674 broadcast (Lnet/minecraft/class_7471;Lnet/minecraft/class_7436;Lnet/minecraft/class_5321;)V
+		COMMENT Broadcasts a chat message to all players and the server console.
+		COMMENT
+		COMMENT <p>Chat messages have signatures. It is possible to use a bogus signature - such as
+		COMMENT {@link net.minecraft.network.encryption.ChatMessageSignature#none} - to send a chat
+		COMMENT message; however if the signature is invalid (e.g. because the text's content differs
+		COMMENT from the one sent by the client, or because the passed signature is invalid) the client
+		COMMENT will log a warning. See {@link
+		COMMENT net.minecraft.network.encryption.ChatMessageSignature#updateSignature} for how the
+		COMMENT message is signed.
+		COMMENT
+		COMMENT @apiNote This method is used to broadcast messages from commands like {@link
+		COMMENT net.minecraft.server.command.MeCommand} or {@link net.minecraft.server.command.SayCommand}.
+		COMMENT
+		COMMENT @see #broadcast(Text, RegistryKey)
+		COMMENT @see #broadcast(Text, Function, RegistryKey)
+		COMMENT @see #broadcast(SignedChatMessage, Function, ChatMessageSender, RegistryKey)
+		ARG 1 message
+		ARG 2 sender
+		ARG 3 typeKey

mappings/net/minecraft/server/command/MeCommand.mapping

@@ -3,3 +3,5 @@ CLASS net/minecraft/class_3045 net/minecraft/server/command/MeCommand
 		ARG 0 dispatcher
 	METHOD method_13238 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
+	METHOD method_43645 (Lnet/minecraft/class_2168;Lnet/minecraft/class_7471;Lnet/minecraft/class_3222;Lnet/minecraft/class_5513$class_5837;)V
+		ARG 3 message

mappings/net/minecraft/server/command/ServerCommandSource.mapping

@@ -3,6 +3,7 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource
 	COMMENT
 	COMMENT @see MinecraftServer#getCommandSource()
 	COMMENT @see Entity#getCommandSource()
+	FIELD field_39183 signer Lnet/minecraft/class_7448;
 	FIELD field_9815 level I
 	FIELD field_9816 entityAnchor Lnet/minecraft/class_2183$class_2184;
 	FIELD field_9817 position Lnet/minecraft/class_243;
@@ -40,10 +41,16 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource
 		ARG 10 silent
 		ARG 11 consumer
 		ARG 12 entityAnchor
+		ARG 13 signer
 	METHOD method_36321 withOutput (Lnet/minecraft/class_2165;)Lnet/minecraft/class_2168;
 		ARG 1 output
 	METHOD method_41212 (Lnet/minecraft/class_2172$class_7078;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture;
 		ARG 3 registry
+	METHOD method_43735 withSigner (Lnet/minecraft/class_7448;)Lnet/minecraft/class_2168;
+		ARG 1 signer
+	METHOD method_43736 getChatMessageSender ()Lnet/minecraft/class_7436;
+	METHOD method_43737 isExecutedByPlayer ()Z
+	METHOD method_43738 getSigner ()Lnet/minecraft/class_7448;
 	METHOD method_9206 withLevel (I)Lnet/minecraft/class_2168;
 		ARG 1 level
 	METHOD method_9207 getPlayer ()Lnet/minecraft/class_3222;

mappings/net/minecraft/server/network/DebugInfoSender.mapping

@@ -57,6 +57,7 @@ CLASS net/minecraft/class_4209 net/minecraft/server/network/DebugInfoSender
 	METHOD method_33139 sendGameEvent (Lnet/minecraft/class_1937;Lnet/minecraft/class_5712;Lnet/minecraft/class_243;)V
 		ARG 0 world
 		ARG 1 event
+		ARG 2 pos
 	METHOD method_33140 sendGameEventListener (Lnet/minecraft/class_1937;Lnet/minecraft/class_5714;)V
 		ARG 0 world
 		ARG 1 eventListener
@@ -87,8 +88,8 @@ CLASS net/minecraft/class_4209 net/minecraft/server/network/DebugInfoSender
 		ARG 0 buf
 		ARG 1 raid
 	METHOD method_36164 (Lnet/minecraft/class_2540;Lnet/minecraft/class_4168;)V
-		ARG 0 buf
+		ARG 0 buf2
 		ARG 1 activity
 	METHOD method_36165 (Lnet/minecraft/class_2540;Ljava/lang/String;)V
-		ARG 0 buf
+		ARG 0 buf2
 		ARG 1 memory

mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping

@@ -32,7 +32,7 @@ CLASS net/minecraft/class_3248 net/minecraft/server/network/ServerLoginNetworkHa
 	FIELD field_39020 MISSING_PUBLIC_KEY_TEXT Lnet/minecraft/class_2561;
 	FIELD field_39021 INVALID_PUBLIC_KEY_SIGNATURE_TEXT Lnet/minecraft/class_2561;
 	FIELD field_39022 INVALID_PUBLIC_KEY_TEXT Lnet/minecraft/class_2561;
-	FIELD field_39023 publicKeyInfo Lnet/minecraft/class_7428;
+	FIELD field_39023 publicKey Lnet/minecraft/class_7428;
 	METHOD <init> (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;)V
 		ARG 1 server
 		ARG 2 connection

mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping

@@ -82,6 +82,8 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan
 		ARG 1 stack
 	METHOD method_29780 isEntityOnAir (Lnet/minecraft/class_1297;)Z
 		ARG 1 entity
+	METHOD method_31274 (ILjava/util/List;)V
+		ARG 2 texts
 	METHOD method_31275 filterText (Ljava/lang/Object;Ljava/util/function/Consumer;Ljava/util/function/BiFunction;)V
 		ARG 1 text
 		ARG 2 consumer
@@ -102,6 +104,12 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan
 	METHOD method_31282 onSignUpdate (Lnet/minecraft/class_2877;Ljava/util/List;)V
 		ARG 1 packet
 		ARG 2 signText
+	METHOD method_31283 (ILjava/util/List;)V
+		ARG 2 texts
+	METHOD method_31284 (Ljava/util/function/Consumer;Ljava/lang/Object;Ljava/lang/Object;)V
+		ARG 3 message
+	METHOD method_31285 (Lnet/minecraft/class_2877;Ljava/util/List;)V
+		ARG 2 texts
 	METHOD method_31286 handleMessage (Lnet/minecraft/class_2797;Lnet/minecraft/class_5513$class_5837;)V
 		ARG 1 packet
 		ARG 2 message
@@ -125,6 +133,8 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan
 		ARG 3 book
 	METHOD method_33797 (Ljava/util/function/UnaryOperator;Lnet/minecraft/class_5513$class_5837;)Lnet/minecraft/class_2519;
 		ARG 1 message
+	METHOD method_33799 (Ljava/lang/String;)Ljava/lang/String;
+		ARG 0 text
 	METHOD method_34882 clampHorizontal (D)D
 		ARG 0 d
 	METHOD method_34883 clampVertical (D)D
@@ -138,6 +148,8 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan
 		ARG 0 message
 	METHOD method_43509 (Lnet/minecraft/class_2797;Lnet/minecraft/class_5513$class_5837;)V
 		ARG 2 message
+	METHOD method_43668 checkChatEnabled ()Z
+	METHOD method_43669 checkForSpam ()V
 	CLASS 1
 		METHOD method_33897 processInteract (Lnet/minecraft/class_1268;Lnet/minecraft/class_3244$class_5860;)V
 			ARG 1 hand

mappings/net/minecraft/server/network/ServerPlayerEntity.mapping

@@ -52,6 +52,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity
 		ARG 1 server
 		ARG 2 world
 		ARG 3 profile
+		ARG 4 publicKey
 	METHOD method_14203 copyFrom (Lnet/minecraft/class_3222;Z)V
 		ARG 1 oldPlayer
 		ARG 2 alive
@@ -201,6 +202,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity
 		ARG 1 nbt
 	METHOD method_33793 shouldFilterText ()Z
 	METHOD method_33794 acceptsMessage (Lnet/minecraft/class_5321;)Z
+		ARG 1 typeKey
 	METHOD method_33795 shouldFilterMessagesSentTo (Lnet/minecraft/class_3222;)Z
 		ARG 1 player
 	METHOD method_34225 onSpawn ()V
@@ -214,24 +216,32 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity
 		COMMENT Sends a message to the player.
 		COMMENT
 		COMMENT @see #sendMessage(Text)
-		COMMENT @see #sendChatMessage(Text, MessageType, ChatMessageSender, Instant, NetworkEncryptionUtils.SignatureData)
+		COMMENT @see #sendChatMessage(SignedChatMessage, ChatMessageSender, RegistryKey)
 		ARG 1 message
+		ARG 2 typeKey
 	METHOD method_43505 sendChatMessage (Lnet/minecraft/class_7471;Lnet/minecraft/class_7436;Lnet/minecraft/class_5321;)V
 		COMMENT Sends a chat message to the player.
 		COMMENT
 		COMMENT <p>Chat messages have signatures. It is possible to use a bogus signature - such as
-		COMMENT {@link NetworkEncryptionUtils.SignatureData#NONE} - to send a chat message; however
+		COMMENT {@link net.minecraft.network.encryption.ChatMessageSignature#none} - to send a chat
-		COMMENT if the signature is invalid (e.g. because the text's content differs from the one
+		COMMENT message; however if the signature is invalid (e.g. because the text's content differs
-		COMMENT sent by the client, or because the passed signature is invalid) the client will
+		COMMENT from the one sent by the client, or because the passed signature is invalid) the client
-		COMMENT log a warning. See {@link NetworkEncryptionUtils#updateSignature} for how the message
+		COMMENT will log a warning. See {@link
-		COMMENT is signed.
+		COMMENT net.minecraft.network.encryption.ChatMessageSignature#updateSignature} for how the
+		COMMENT message is signed.
 		COMMENT
 		COMMENT @see #sendMessage(Text)
-		COMMENT @see #sendMessage(Text, MessageType)
+		COMMENT @see #sendMessage(Text, RegistryKey)
+		ARG 1 message
+		ARG 2 sender
+		ARG 3 typeKey
 	METHOD method_43506 sendMessageDeliverError (Lnet/minecraft/class_2561;Lnet/minecraft/class_5321;)V
 		ARG 1 message
+		ARG 2 typeKey
 	METHOD method_43507 (Lnet/minecraft/class_2561;Lnet/minecraft/class_5321;Lio/netty/util/concurrent/Future;)V
 		ARG 3 future
+	METHOD method_43666 getMessageTypeId (Lnet/minecraft/class_5321;)I
+		ARG 1 typeKey
 	METHOD method_7336 changeGameMode (Lnet/minecraft/class_1934;)Z
 		ARG 1 gameMode
 	CLASS 1

mappings/net/minecraft/util/registry/Registry.mapping

@@ -159,6 +159,8 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry
 	FIELD field_38805 FROG_VARIANT Lnet/minecraft/class_2378;
 	FIELD field_38806 ROOT_PLACER_TYPE_KEY Lnet/minecraft/class_5321;
 	FIELD field_38807 ROOT_PLACER_TYPE Lnet/minecraft/class_2378;
+	FIELD field_39205 MESSAGE_TYPE_KEY Lnet/minecraft/class_5321;
+	FIELD field_39206 MESSAGE_TYPE Lnet/minecraft/class_2378;
 	FIELD field_39207 BANNER_PATTERN_KEY Lnet/minecraft/class_5321;
 	FIELD field_39208 BANNER_PATTERN Lnet/minecraft/class_2378;
 	FIELD field_39209 INSTRUMENT_KEY Lnet/minecraft/class_5321;

mappings/net/minecraft/village/TradeOfferList.mapping

@@ -1,6 +1,13 @@
 CLASS net/minecraft/class_1916 net/minecraft/village/TradeOfferList
+	METHOD <init> (I)V
+		ARG 1 size
 	METHOD <init> (Lnet/minecraft/class_2487;)V
 		ARG 1 nbt
+	METHOD method_43715 (Lnet/minecraft/class_2540;Lnet/minecraft/class_1914;)V
+		ARG 0 buf2
+		ARG 1 offer
+	METHOD method_43716 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1914;
+		ARG 0 buf2
 	METHOD method_8265 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1916;
 		ARG 0 buf
 	METHOD method_8267 getValidOffer (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;I)Lnet/minecraft/class_1914;