diff --git a/mappings/net/minecraft/client/gui/hud/MessageIndicator.mapping b/mappings/net/minecraft/client/gui/hud/MessageIndicator.mapping index 7963dd06c3..f17e570763 100644 --- a/mappings/net/minecraft/client/gui/hud/MessageIndicator.mapping +++ b/mappings/net/minecraft/client/gui/hud/MessageIndicator.mapping @@ -6,11 +6,13 @@ CLASS net/minecraft/class_7591 net/minecraft/client/gui/hud/MessageIndicator FIELD field_39759 MODIFIED_COLOR I FIELD field_39761 CHAT_TAGS_TEXTURE Lnet/minecraft/class_2960; FIELD field_39788 SYSTEM_COLOR I + FIELD field_39922 FILTERED_TEXT Lnet/minecraft/class_2561; METHOD comp_902 loggedName ()Ljava/lang/String; METHOD method_44709 notSecure ()Lnet/minecraft/class_7591; METHOD method_44710 modified (Ljava/lang/String;)Lnet/minecraft/class_7591; ARG 0 originalText METHOD method_44751 system ()Lnet/minecraft/class_7591; + METHOD method_45071 filtered ()Lnet/minecraft/class_7591; CLASS class_7592 Icon FIELD field_39764 u I FIELD field_39765 v I diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping index aefa56d3ed..7cb705ccb4 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping @@ -29,12 +29,15 @@ CLASS net/minecraft/class_5519 net/minecraft/client/gui/screen/multiplayer/Socia FIELD field_39737 REPORT_BUTTON_TEXTURE Lnet/minecraft/class_2960; FIELD field_39790 sentMessage Z FIELD field_39791 canSendReports Z + FIELD field_39936 NOT_REPORTABLE_TEXT Lnet/minecraft/class_2561; + FIELD field_39937 reportable Z METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_5522;Ljava/util/UUID;Ljava/lang/String;Ljava/util/function/Supplier;Z)V ARG 1 client ARG 2 parent ARG 3 uuid ARG 4 name ARG 5 skinTexture + ARG 6 reportable METHOD method_31326 (Lnet/minecraft/class_5520;Ljava/util/UUID;Ljava/lang/String;Lnet/minecraft/class_4185;)V ARG 4 button METHOD method_31328 renderTooltip (Lnet/minecraft/class_5522;Lnet/minecraft/class_4587;Ljava/util/List;II)V diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping index 34c07e92d7..ceabfd35db 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping @@ -30,6 +30,7 @@ CLASS net/minecraft/class_5521 net/minecraft/client/gui/screen/multiplayer/Socia ARG 2 scrollAmount METHOD method_44699 setPlayers (Ljava/util/Collection;Ljava/util/Map;)V ARG 1 playerUuids + ARG 2 entriesByUuids METHOD method_44758 (Lcom/mojang/authlib/GameProfile;Ljava/util/UUID;)Lnet/minecraft/class_5519; ARG 2 uuid METHOD method_44759 markOfflineMembers (Ljava/util/Map;Z)V diff --git a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping index f5631a46d8..efcd29c903 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping @@ -128,7 +128,9 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity COMMENT net.minecraft.client.gui.screen the chat screen} that has a preview. ARG 1 message ARG 2 preview - METHOD method_44097 sendChatMessagePacket (Ljava/lang/String;Lnet/minecraft/class_2561;)V + METHOD method_44097 sendChatMessageInternal (Ljava/lang/String;Lnet/minecraft/class_2561;)V + ARG 1 message + ARG 2 preview METHOD method_44098 sendCommand (Ljava/lang/String;Lnet/minecraft/class_2561;)V COMMENT Signs and sends {@code command} to the server. ARG 1 command @@ -152,5 +154,8 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity COMMENT @see ArgumentSignatureDataMap#hasSignedArgument ARG 1 command COMMENT the command (without the leading slash) + METHOD method_45081 toDecoratedContents (Ljava/lang/String;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7634; + ARG 1 message + ARG 2 preview METHOD method_7290 dropSelectedItem (Z)Z ARG 1 entireStack diff --git a/mappings/net/minecraft/client/network/message/MessageHandler.mapping b/mappings/net/minecraft/client/network/message/MessageHandler.mapping index bd46aa7b40..908b6fd4e8 100644 --- a/mappings/net/minecraft/client/network/message/MessageHandler.mapping +++ b/mappings/net/minecraft/client/network/message/MessageHandler.mapping @@ -94,6 +94,7 @@ CLASS net/minecraft/class_7594 net/minecraft/client/network/message/MessageHandl COMMENT COMMENT @see net.minecraft.client.util.NarratorManager#narrateChatMessage ARG 1 params + ARG 2 message METHOD method_44775 shouldDelay ()Z COMMENT {@return if the chat delay is set and the message should be delayed} METHOD method_44818 process (Lnet/minecraft/class_7594$class_7627;)V diff --git a/mappings/net/minecraft/command/argument/MessageArgumentType.mapping b/mappings/net/minecraft/command/argument/MessageArgumentType.mapping index 6038bb8afd..b3e328e991 100644 --- a/mappings/net/minecraft/command/argument/MessageArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/MessageArgumentType.mapping @@ -56,6 +56,10 @@ CLASS net/minecraft/class_2196 net/minecraft/command/argument/MessageArgumentTyp COMMENT

This should be called if the message could not be sent due to an exception. COMMENT See {@link net.minecraft.server.command.MessageCommand} for an example. ARG 1 source + METHOD method_44807 (Lnet/minecraft/class_2168;Lnet/minecraft/class_7471;)V + ARG 1 message METHOD method_44808 filterText (Lnet/minecraft/class_2168;Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture; ARG 1 source ARG 2 text + METHOD method_45070 (Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Ljava/util/function/Consumer;Ljava/lang/Void;)V + ARG 3 void_ diff --git a/mappings/net/minecraft/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping index 6a43dcd6f5..a653fb393e 100644 --- a/mappings/net/minecraft/network/ClientConnection.mapping +++ b/mappings/net/minecraft/network/ClientConnection.mapping @@ -61,6 +61,7 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection METHOD method_10751 sendQueuedPackets ()V METHOD method_10752 send (Lnet/minecraft/class_2596;Lnet/minecraft/class_7648;)V ARG 1 packet + ARG 2 callbacks METHOD method_10753 connect (Ljava/net/InetSocketAddress;Z)Lnet/minecraft/class_2535; ARG 0 address ARG 1 useEpoll @@ -95,6 +96,7 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection ARG 1 listener METHOD method_10764 sendImmediately (Lnet/minecraft/class_2596;Lnet/minecraft/class_7648;)V ARG 1 packet + ARG 2 callbacks METHOD method_10768 handleDisconnection ()V METHOD method_10769 connectLocal (Ljava/net/SocketAddress;)Lnet/minecraft/class_2535; ARG 0 address @@ -111,6 +113,7 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection COMMENT sent by this connection. METHOD method_36942 sendInternal (Lnet/minecraft/class_2596;Lnet/minecraft/class_7648;Lnet/minecraft/class_2539;Lnet/minecraft/class_2539;)V ARG 1 packet + ARG 2 callbacks ARG 3 packetState ARG 4 currentState METHOD method_40062 (Lorg/slf4j/Marker;)V @@ -119,6 +122,8 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection ARG 0 marker METHOD method_40064 (Lorg/slf4j/Marker;)V ARG 0 marker + METHOD method_45082 (Lnet/minecraft/class_7648;Lio/netty/util/concurrent/Future;)V + ARG 2 future CLASS 1 METHOD initChannel (Lio/netty/channel/Channel;)V ARG 1 channel @@ -127,6 +132,7 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection ARG 1 channel CLASS class_2536 QueuedPacket FIELD field_11661 packet Lnet/minecraft/class_2596; - FIELD field_11662 callback Lnet/minecraft/class_7648; + FIELD field_11662 callbacks Lnet/minecraft/class_7648; METHOD (Lnet/minecraft/class_2596;Lnet/minecraft/class_7648;)V ARG 1 packet + ARG 2 callbacks diff --git a/mappings/net/minecraft/network/PacketCallbacks.mapping b/mappings/net/minecraft/network/PacketCallbacks.mapping new file mode 100644 index 0000000000..5de78eea35 --- /dev/null +++ b/mappings/net/minecraft/network/PacketCallbacks.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_7648 net/minecraft/network/PacketCallbacks + COMMENT A set of callbacks for sending a packet. + METHOD method_45083 onSuccess ()V + COMMENT Called when packet is sent successfully. + METHOD method_45084 always (Ljava/lang/Runnable;)Lnet/minecraft/class_7648; + COMMENT {@return a callback that always runs {@code runnable}} + ARG 0 runnable + METHOD method_45085 of (Ljava/util/function/Supplier;)Lnet/minecraft/class_7648; + COMMENT {@return a callback that sends {@code failurePacket} when failed} + ARG 0 failurePacket + METHOD method_45086 getFailurePacket ()Lnet/minecraft/class_2596; + COMMENT {@return the packet to send on failure, or {@code null} if there is none} diff --git a/mappings/net/minecraft/network/message/FilterMask.mapping b/mappings/net/minecraft/network/message/FilterMask.mapping new file mode 100644 index 0000000000..bdb0ec6d1d --- /dev/null +++ b/mappings/net/minecraft/network/message/FilterMask.mapping @@ -0,0 +1,25 @@ +CLASS net/minecraft/class_7649 net/minecraft/network/message/FilterMask + FIELD field_39941 FULLY_FILTERED Lnet/minecraft/class_7649; + FIELD field_39942 PASS_THROUGH Lnet/minecraft/class_7649; + FIELD field_39943 FILTERED C + FIELD field_39944 mask Ljava/util/BitSet; + FIELD field_39945 status Lnet/minecraft/class_7649$class_7650; + METHOD (I)V + ARG 1 length + METHOD (Ljava/util/BitSet;Lnet/minecraft/class_7649$class_7650;)V + ARG 1 mask + ARG 2 status + METHOD method_45087 isPassThrough ()Z + METHOD method_45088 markFiltered (I)V + ARG 1 index + METHOD method_45089 filter (Ljava/lang/String;)Ljava/lang/String; + ARG 1 raw + METHOD method_45090 readMask (Lnet/minecraft/class_2540;)Lnet/minecraft/class_7649; + ARG 0 buf + METHOD method_45091 writeMask (Lnet/minecraft/class_2540;Lnet/minecraft/class_7649;)V + ARG 0 buf + ARG 1 mask + METHOD method_45092 filter (Lnet/minecraft/class_7634;)Lnet/minecraft/class_2561; + ARG 1 contents + METHOD method_45093 isFullyFiltered ()Z + CLASS class_7650 FilterStatus diff --git a/mappings/net/minecraft/network/message/MessageChain.mapping b/mappings/net/minecraft/network/message/MessageChain.mapping index 44a4c603f2..4f86bb88cc 100644 --- a/mappings/net/minecraft/network/message/MessageChain.mapping +++ b/mappings/net/minecraft/network/message/MessageChain.mapping @@ -46,9 +46,16 @@ CLASS net/minecraft/class_7610 net/minecraft/network/message/MessageChain COMMENT the resulting signed message. COMMENT COMMENT @see MessageChain#getUnpacker + FIELD field_39951 UNSIGNED Lnet/minecraft/class_7610$class_7611; + METHOD method_45101 (Lnet/minecraft/class_7610$class_7613;Lnet/minecraft/class_7470;Lnet/minecraft/class_7634;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7471; + ARG 0 signature + ARG 1 metadata + ARG 2 content + ARG 3 lastSeenMessages METHOD unpack (Lnet/minecraft/class_7610$class_7613;Lnet/minecraft/class_7470;Lnet/minecraft/class_7634;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7471; ARG 1 signature ARG 2 metadata + ARG 3 content ARG 4 lastSeenMessages CLASS class_7612 Packer COMMENT Packers sign a message on the client with its preceding message's signature. diff --git a/mappings/net/minecraft/network/message/MessageDecorator.mapping b/mappings/net/minecraft/network/message/MessageDecorator.mapping index 3f449bfc77..d184dec4b6 100644 --- a/mappings/net/minecraft/network/message/MessageDecorator.mapping +++ b/mappings/net/minecraft/network/message/MessageDecorator.mapping @@ -17,12 +17,18 @@ CLASS net/minecraft/class_7492 net/minecraft/network/message/MessageDecorator COMMENT run during message submission to decorate filtered parts of the message. FIELD field_39384 NOOP Lnet/minecraft/class_7492; COMMENT An empty message decorator that returns the original message. + METHOD attachIfNotDecorated (Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7471; + ARG 0 message + ARG 1 attached METHOD decorate (Lnet/minecraft/class_3222;Lnet/minecraft/class_2561;)Ljava/util/concurrent/CompletableFuture; COMMENT {@return the decorated {@code message}} ARG 1 sender COMMENT the player who sent the message, or {@code null} if {@code message} was not COMMENT sent by a player ARG 2 message + METHOD decorate (Lnet/minecraft/class_3222;Lnet/minecraft/class_7471;)Ljava/util/concurrent/CompletableFuture; + ARG 1 sender + ARG 2 message METHOD method_44303 (Lnet/minecraft/class_3222;Lnet/minecraft/class_2561;)Ljava/util/concurrent/CompletableFuture; ARG 0 sender ARG 1 message diff --git a/mappings/net/minecraft/network/message/MessageVerifier.mapping b/mappings/net/minecraft/network/message/MessageVerifier.mapping index 23ecc93dbf..bc41c29446 100644 --- a/mappings/net/minecraft/network/message/MessageVerifier.mapping +++ b/mappings/net/minecraft/network/message/MessageVerifier.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_7615 net/minecraft/network/message/MessageVerifier COMMENT as it affects the verification result. METHOD method_44885 create (Lnet/minecraft/class_7428;Z)Lnet/minecraft/class_7615; ARG 0 publicKey + ARG 1 secureChatEnforced METHOD method_44886 verify (Lnet/minecraft/class_7471;)Lnet/minecraft/class_7615$class_7646; COMMENT {@return the status of verifying the message} ARG 1 message @@ -24,13 +25,18 @@ CLASS net/minecraft/class_7615 net/minecraft/network/message/MessageVerifier ARG 1 signatureVerifier METHOD method_44996 verifyPrecedingSignature (Lnet/minecraft/class_7614;Lnet/minecraft/class_7469;Z)Z ARG 1 header + ARG 2 signature + ARG 3 fullMessage METHOD method_44997 verifyInternal (Lnet/minecraft/class_7614;Lnet/minecraft/class_7469;[BZ)Z ARG 1 header + ARG 2 signature ARG 3 bodyDigest + ARG 4 fullMessage METHOD method_45048 getStatus (Lnet/minecraft/class_7614;Lnet/minecraft/class_7469;[BZ)Lnet/minecraft/class_7615$class_7646; ARG 1 header ARG 2 signature ARG 3 bodyDigest + ARG 4 fullMessage CLASS class_7646 Status COMMENT The verification status of a message. FIELD field_39910 Lnet/minecraft/class_7615$class_7646; @@ -39,3 +45,9 @@ CLASS net/minecraft/class_7615 net/minecraft/network/message/MessageVerifier COMMENT The message cannot be verified. FIELD field_39912 Lnet/minecraft/class_7615$class_7646; COMMENT The message cannot be verified due to the last message not being verified. + CLASS class_7651 Unsigned + FIELD field_39952 secureChatEnforced Z + METHOD (Z)V + ARG 1 secureChatEnforced + METHOD method_45102 getStatus (Lnet/minecraft/class_7469;)Lnet/minecraft/class_7615$class_7646; + ARG 1 signature diff --git a/mappings/net/minecraft/network/message/SentMessage.mapping b/mappings/net/minecraft/network/message/SentMessage.mapping index bd893eb796..9b05a063d2 100644 --- a/mappings/net/minecraft/network/message/SentMessage.mapping +++ b/mappings/net/minecraft/network/message/SentMessage.mapping @@ -13,6 +13,10 @@ CLASS net/minecraft/class_7604 net/minecraft/network/message/SentMessage COMMENT {@return the wrapped {@code message}} ARG 0 message METHOD method_45039 getContent ()Lnet/minecraft/class_2561; + METHOD method_45095 send (Lnet/minecraft/class_3222;ZLnet/minecraft/class_2556$class_7602;)V + ARG 1 sender + ARG 2 filterMaskEnabled + ARG 3 params CLASS class_7606 Profileless COMMENT The wrapper used for messages without associated source profile. FIELD field_39814 message Lnet/minecraft/class_7471; diff --git a/mappings/net/minecraft/network/message/SignedCommandArguments.mapping b/mappings/net/minecraft/network/message/SignedCommandArguments.mapping index 51c697a905..acd48bc453 100644 --- a/mappings/net/minecraft/network/message/SignedCommandArguments.mapping +++ b/mappings/net/minecraft/network/message/SignedCommandArguments.mapping @@ -1,10 +1,9 @@ CLASS net/minecraft/class_7448 net/minecraft/network/message/SignedCommandArguments - COMMENT An interface wrapping {@link ArgumentSignatureDataMap} with metadata attached. + COMMENT An interface wrapping {@link ArgumentSignatureDataMap}. FIELD field_39901 EMPTY Lnet/minecraft/class_7448; COMMENT An empty signed command arguments that always returns {@code null} for - COMMENT {@link #createSignature}. - METHOD method_44907 createSignature (Ljava/lang/String;)Lnet/minecraft/class_7471; + COMMENT {@link #getMessage}. + METHOD method_44907 getMessage (Ljava/lang/String;)Lnet/minecraft/class_7471; ARG 1 argumentName CLASS class_7449 Impl - COMMENT A signature for command arguments, consisting of the sender, the timestamp, - COMMENT and the signature datas for the arguments. + COMMENT A basic implementation of {@link SignedCommandArguments}. diff --git a/mappings/net/minecraft/network/message/SignedMessage.mapping b/mappings/net/minecraft/network/message/SignedMessage.mapping index a730f3f965..e0df5f9cb2 100644 --- a/mappings/net/minecraft/network/message/SignedMessage.mapping +++ b/mappings/net/minecraft/network/message/SignedMessage.mapping @@ -44,6 +44,19 @@ CLASS net/minecraft/class_7471 net/minecraft/network/message/SignedMessage COMMENT

This does not actually verify that the message is, in fact, from {@code sender}. COMMENT Rather, this returns whether it's possible to verify that {@code sender} sent this COMMENT message. + ARG 1 sender METHOD method_45041 ofUnsigned (Lnet/minecraft/class_7634;)Lnet/minecraft/class_7471; COMMENT {@return a new signed message with empty signature} ARG 0 content + METHOD method_45097 withFilterMask (Lnet/minecraft/class_7649;)Lnet/minecraft/class_7471; + COMMENT {@return the signed chat message with {@code filterMask} added} + ARG 1 filterMask + METHOD method_45098 ofUnsigned (Lnet/minecraft/class_7470;Lnet/minecraft/class_7634;)Lnet/minecraft/class_7471; + COMMENT {@return a new signed message with given metadata and empty signature} + ARG 0 metadata + ARG 1 content + METHOD method_45099 withFilterMaskEnabled (Z)Lnet/minecraft/class_7471; + COMMENT {@return this signed chat message if {@code enabled} is {@code true}, + COMMENT otherwise a new signed chat message without filtered parts} + ARG 1 enabled + METHOD method_45100 isFullyFiltered ()Z diff --git a/mappings/net/minecraft/network/packet/s2c/play/MessageHeaderS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/MessageHeaderS2CPacket.mapping index 9083bcb30e..caeee93a3a 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/MessageHeaderS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/MessageHeaderS2CPacket.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_7618 net/minecraft/network/packet/s2c/play/MessageHeaderS2CPacket METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD (Lnet/minecraft/class_7471;)V + ARG 1 message diff --git a/mappings/net/minecraft/server/PlayerManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping index eda2dea062..7cde6b7ef1 100644 --- a/mappings/net/minecraft/server/PlayerManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -23,6 +23,7 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager FIELD field_24626 registryManager Lnet/minecraft/class_5455$class_6890; FIELD field_29790 LATENCY_UPDATE_INTERVAL I FIELD field_34895 simulationDistance I + FIELD field_39921 FILTERED_FULL_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_29;I)V ARG 1 server ARG 2 registryManager @@ -145,10 +146,8 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager COMMENT message can be sent to a different player. COMMENT COMMENT @see #broadcast(Text, boolean) - COMMENT @see #broadcast(FilteredMessage, ServerCommandSource, MessageType.Parameters) - COMMENT @see #broadcast(FilteredMessage, ServerPlayerEntity, MessageType.Parameters) - COMMENT @see #broadcast(SignedMessage, MessageSourceProfile, MessageType.Parameters) - COMMENT @see #broadcast(FilteredMessage, Predicate, MessageSourceProfile, MessageType.Parameters) + COMMENT @see #broadcast(SignedMessage, ServerCommandSource, MessageType.Parameters) + COMMENT @see #broadcast(SignedMessage, ServerPlayerEntity, MessageType.Parameters) ARG 1 message ARG 2 playerMessageFactory COMMENT a function that takes the player to send the message to @@ -162,10 +161,8 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager COMMENT message or a join/leave message. COMMENT COMMENT @see #broadcast(Text, Function, boolean) - COMMENT @see #broadcast(FilteredMessage, ServerCommandSource, MessageType.Parameters) - COMMENT @see #broadcast(FilteredMessage, ServerPlayerEntity, MessageType.Parameters) - COMMENT @see #broadcast(SignedMessage, MessageSourceProfile, MessageType.Parameters) - COMMENT @see #broadcast(FilteredMessage, Predicate, MessageSourceProfile, MessageType.Parameters) + COMMENT @see #broadcast(SignedMessage, ServerCommandSource, MessageType.Parameters) + COMMENT @see #broadcast(SignedMessage, ServerPlayerEntity, MessageType.Parameters) ARG 1 message ARG 2 overlay METHOD method_43670 (Lnet/minecraft/class_3222;Lnet/minecraft/server/MinecraftServer$class_7460;)V @@ -186,9 +183,8 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager COMMENT COMMENT @see #broadcast(Text, boolean) COMMENT @see #broadcast(Text, Function, boolean) - COMMENT @see #broadcast(FilteredMessage, ServerCommandSource, MessageType.Parameters) - COMMENT @see #broadcast(SignedMessage, MessageSourceProfile, MessageType.Parameters) - COMMENT @see #broadcast(FilteredMessage, Predicate, MessageSourceProfile, MessageType.Parameters) + COMMENT @see #broadcast(SignedMessage, ServerCommandSource, MessageType.Parameters) + ARG 1 message ARG 2 sender ARG 3 params METHOD method_44166 broadcast (Lnet/minecraft/class_7471;Lnet/minecraft/class_2168;Lnet/minecraft/class_2556$class_7602;)V @@ -200,9 +196,9 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager COMMENT COMMENT @see #broadcast(Text, boolean) COMMENT @see #broadcast(Text, Function, boolean) - COMMENT @see #broadcast(FilteredMessage, ServerPlayerEntity, MessageType.Parameters) - COMMENT @see #broadcast(SignedMessage, MessageSourceProfile, MessageType.Parameters) - COMMENT @see #broadcast(FilteredMessage, Predicate, MessageSourceProfile, MessageType.Parameters) + COMMENT @see #broadcast(SignedMessage, ServerPlayerEntity, MessageType.Parameters) + ARG 1 message + ARG 2 source ARG 3 params METHOD method_44791 broadcast (Lnet/minecraft/class_7471;Ljava/util/function/Predicate;Lnet/minecraft/class_3222;Lnet/minecraft/class_7436;Lnet/minecraft/class_2556$class_7602;)V COMMENT Broadcasts a chat message to all players and the server console. @@ -215,11 +211,14 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager COMMENT COMMENT @see #broadcast(Text, boolean) COMMENT @see #broadcast(Text, Function, boolean) - COMMENT @see #broadcast(FilteredMessage, ServerCommandSource, MessageType.Parameters) - COMMENT @see #broadcast(FilteredMessage, ServerPlayerEntity, MessageType.Parameters) - COMMENT @see #broadcast(SignedMessage, MessageSourceProfile, MessageType.Parameters) + COMMENT @see #broadcast(SignedMessage, ServerCommandSource, MessageType.Parameters) + COMMENT @see #broadcast(SignedMessage, ServerPlayerEntity, MessageType.Parameters) + ARG 1 message ARG 2 shouldSendFiltered COMMENT predicate that determines whether to send the filtered message for the given player + ARG 3 sender + ARG 4 sourceProfile + ARG 5 params METHOD method_44792 sendMessageHeader (Lnet/minecraft/class_7471;Ljava/util/Set;)V COMMENT Sends {@code message}'s headers (only) to all players except {@code except}. COMMENT diff --git a/mappings/net/minecraft/server/command/MeCommand.mapping b/mappings/net/minecraft/server/command/MeCommand.mapping index a275caabe1..53bf432044 100644 --- a/mappings/net/minecraft/server/command/MeCommand.mapping +++ b/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_3324;Lnet/minecraft/class_2168;Lnet/minecraft/class_7471;)V + ARG 2 message diff --git a/mappings/net/minecraft/server/command/MessageCommand.mapping b/mappings/net/minecraft/server/command/MessageCommand.mapping index 9da80fdfad..5d333b36db 100644 --- a/mappings/net/minecraft/server/command/MessageCommand.mapping +++ b/mappings/net/minecraft/server/command/MessageCommand.mapping @@ -2,6 +2,10 @@ CLASS net/minecraft/class_3082 net/minecraft/server/command/MessageCommand METHOD method_13461 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher METHOD method_13462 execute (Lnet/minecraft/class_2168;Ljava/util/Collection;Lnet/minecraft/class_2196$class_7515;)I + ARG 0 source + ARG 1 targets ARG 2 signedMessage METHOD method_13463 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context + METHOD method_44144 (Lnet/minecraft/class_2168;Ljava/util/Collection;Lnet/minecraft/class_2556$class_7602;Lnet/minecraft/class_7471;)V + ARG 3 message diff --git a/mappings/net/minecraft/server/command/SayCommand.mapping b/mappings/net/minecraft/server/command/SayCommand.mapping index 904ebf3b94..c03211b0a6 100644 --- a/mappings/net/minecraft/server/command/SayCommand.mapping +++ b/mappings/net/minecraft/server/command/SayCommand.mapping @@ -5,3 +5,5 @@ CLASS net/minecraft/class_3110 net/minecraft/server/command/SayCommand ARG 0 context METHOD method_13564 (Lnet/minecraft/class_2168;)Z ARG 0 source + METHOD method_43657 (Lnet/minecraft/class_3324;Lnet/minecraft/class_2168;Lnet/minecraft/class_7471;)V + ARG 2 message diff --git a/mappings/net/minecraft/server/command/ServerCommandSource.mapping b/mappings/net/minecraft/server/command/ServerCommandSource.mapping index 661a89725d..399ead66db 100644 --- a/mappings/net/minecraft/server/command/ServerCommandSource.mapping +++ b/mappings/net/minecraft/server/command/ServerCommandSource.mapping @@ -56,12 +56,25 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource 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_7604;ZLnet/minecraft/class_2556$class_7602;)V - COMMENT Sends {@code message} as the feedback to the command's executor, or to the server's log + COMMENT Sends {@code message} as a chat message to the command's executor, or to the server's log COMMENT if the command is not executed by a player. ARG 1 message + ARG 2 filterMaskEnabled + ARG 3 params METHOD method_44908 withMessageChainTaskQueue (Lnet/minecraft/class_7620;)Lnet/minecraft/class_2168; ARG 1 messageChainTaskQueue METHOD method_44909 getMessageChainTaskQueue ()Lnet/minecraft/class_7620; + METHOD method_45067 shouldFilterText (Lnet/minecraft/class_3222;)Z + COMMENT {@return whether to filter text sent to {@code recipient}} + COMMENT + COMMENT

This returns {@code true} if either of the command executor or the recipient + COMMENT requires text filtering, unless {@code recipient} executed the command, where + COMMENT {@code false} is always returned. + ARG 1 recipient + METHOD method_45068 sendMessage (Lnet/minecraft/class_2561;)V + COMMENT Sends {@code message} as the feedback to the command's executor, or to the server's log + COMMENT if the command is not executed by a player. + ARG 1 message 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/server/command/TeamMsgCommand.mapping b/mappings/net/minecraft/server/command/TeamMsgCommand.mapping index bf636426f4..d33b2a95e1 100644 --- a/mappings/net/minecraft/server/command/TeamMsgCommand.mapping +++ b/mappings/net/minecraft/server/command/TeamMsgCommand.mapping @@ -10,3 +10,5 @@ CLASS net/minecraft/class_3945 net/minecraft/server/command/TeamMsgCommand ARG 0 context METHOD method_44147 (Lnet/minecraft/class_1297;Lnet/minecraft/class_268;Lnet/minecraft/class_3222;)Z ARG 2 player + METHOD method_44148 (Ljava/util/List;Lnet/minecraft/class_1297;Lnet/minecraft/class_2556$class_7602;Lnet/minecraft/class_2556$class_7602;Lnet/minecraft/class_2168;Lnet/minecraft/class_7471;)V + ARG 5 message diff --git a/mappings/net/minecraft/server/filter/FilteredMessage.mapping b/mappings/net/minecraft/server/filter/FilteredMessage.mapping index ef5eb2c746..7d97495b0e 100644 --- a/mappings/net/minecraft/server/filter/FilteredMessage.mapping +++ b/mappings/net/minecraft/server/filter/FilteredMessage.mapping @@ -4,3 +4,10 @@ CLASS net/minecraft/class_5837 net/minecraft/server/filter/FilteredMessage COMMENT the raw (or "original") message FIELD field_28863 EMPTY Lnet/minecraft/class_5837; METHOD comp_841 raw ()Ljava/lang/String; + METHOD method_45059 filter ()Ljava/lang/String; + METHOD method_45060 permitted (Ljava/lang/String;)Lnet/minecraft/class_5837; + ARG 0 raw + METHOD method_45061 getString ()Ljava/lang/String; + METHOD method_45062 censored (Ljava/lang/String;)Lnet/minecraft/class_5837; + ARG 0 raw + METHOD method_45063 isFiltered ()Z diff --git a/mappings/net/minecraft/server/filter/TextFilterer.mapping b/mappings/net/minecraft/server/filter/TextFilterer.mapping index f8b626db18..c701efe0f3 100644 --- a/mappings/net/minecraft/server/filter/TextFilterer.mapping +++ b/mappings/net/minecraft/server/filter/TextFilterer.mapping @@ -66,6 +66,10 @@ CLASS net/minecraft/class_5514 net/minecraft/server/filter/TextFilterer METHOD method_42113 (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/mojang/authlib/GameProfile;Ljava/lang/String;)Lcom/google/gson/JsonObject; ARG 3 profile ARG 4 message + METHOD method_45066 getMask (Ljava/lang/String;Lcom/google/gson/JsonArray;Lnet/minecraft/class_5514$class_5515;)Lnet/minecraft/class_7649; + ARG 1 message + ARG 2 mask + ARG 3 ignorer CLASS class_5515 HashIgnorer FIELD field_26834 NEVER_IGNORE Lnet/minecraft/class_5514$class_5515; FIELD field_26835 IGNORE_IF_MATCHES_ALL Lnet/minecraft/class_5514$class_5515; diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index 1b60c77807..2f9c632c81 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -59,10 +59,13 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan ARG 5 z ARG 7 yaw ARG 8 pitch + METHOD method_14365 (Lnet/minecraft/class_2805;Lcom/mojang/brigadier/suggestion/Suggestions;)V + ARG 2 suggestions METHOD method_14367 disconnect (Lnet/minecraft/class_2561;)V ARG 1 reason METHOD method_14369 sendPacket (Lnet/minecraft/class_2596;Lnet/minecraft/class_7648;)V ARG 1 packet + ARG 2 callbacks METHOD method_14371 isMovementInvalid (DDDFF)Z COMMENT {@return whether this movement is invalid} COMMENT @@ -94,6 +97,7 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan ARG 2 texts METHOD method_31275 filterText (Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/util/concurrent/CompletableFuture; ARG 1 text + ARG 2 filterer METHOD method_31276 addBook (Lnet/minecraft/class_5837;Ljava/util/List;I)V ARG 1 title ARG 2 pages @@ -110,6 +114,8 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan ARG 2 signText METHOD method_31283 (ILjava/util/List;)V ARG 2 texts + METHOD method_31284 (Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 filtered METHOD method_31285 (Lnet/minecraft/class_2877;Ljava/util/List;)V ARG 2 texts METHOD method_33562 requestTeleportAndDismount (DDDFF)V @@ -149,6 +155,7 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan METHOD method_44154 (ILnet/minecraft/class_2561;)V ARG 2 decorated METHOD method_44155 handleDecoratedMessage (Lnet/minecraft/class_7471;)V + ARG 1 message METHOD method_44156 decorateCommand (Lnet/minecraft/class_2168;Lnet/minecraft/class_7644;)Ljava/util/concurrent/CompletableFuture; ARG 1 source ARG 2 arguments @@ -225,9 +232,11 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan COMMENT @implNote This returns the {@linkplain CachedDecoratorResult#tryConsume consumed COMMENT cached result} if it exists, and otherwise returns a new {@link DecoratedContents} COMMENT without message decorators applied. This method does not execute message decorators; - COMMENT they are executed in {@link #onRequestChatPreview} (for normal messages) or {@link - COMMENT #handleMessage(SignedMessage, FilteredMessage)} (for filtered parts of messages). + COMMENT they are executed in {@link #onRequestChatPreview} (for previewed messages) or {@link + COMMENT #onChatMessage} (for unpreviewed messages). ARG 1 packet + METHOD method_45064 (Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Ljava/lang/Void;)V + ARG 3 void_ CLASS 1 METHOD method_33897 processInteract (Lnet/minecraft/class_1268;Lnet/minecraft/class_3244$class_5860;)V ARG 1 hand diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 66f929aca2..4245158897 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -229,6 +229,8 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity COMMENT @see #sendMessage(Text) COMMENT @see #sendMessage(Text, boolean) ARG 1 message + ARG 2 filterMaskEnabled + ARG 3 params METHOD method_43930 sendServerMetadata (Lnet/minecraft/class_2926;)V ARG 1 metadata METHOD method_44706 acceptsChatMessage ()Z