From a837ae344b32a8d455315b0a30ee7eba4518d6da Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Mon, 24 Oct 2022 00:18:41 +0900 Subject: [PATCH] 22w42a networking (#3338) * 22w42a packet * 22w42a message * 22w42a misc networking * Map future queue * 22w42a client networking (wip) * Finish client networking * Finish mapping network * Update mappings/net/minecraft/network/encryption/NetworkEncryptionUtils.mapping Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com> * Rename player remove packet * Finish networking * Map some more networking * Rename DecoratableArgumentType * Fix javadoc Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com> --- mappings/net/minecraft/class_7757.mapping | 5 -- .../minecraft/client/gui/hud/ChatHud.mapping | 25 ++++++- .../client/gui/hud/MessageIndicator.mapping | 1 + ...SocialInteractionsPlayerListWidget.mapping | 2 + .../network/ClientLoginNetworkHandler.mapping | 6 ++ .../network/ClientPlayNetworkHandler.mapping | 43 ++++++++++- .../client/network/ClientPlayerEntity.mapping | 1 + .../network/LanServerQueryManager.mapping | 1 + .../client/network/PlayerListEntry.mapping | 7 ++ .../network/message/MessageHandler.mapping | 14 ++++ .../message/MessageTrustStatus.mapping | 11 +++ .../client/report/ChatAbuseReport.mapping | 5 ++ .../report/ContextMessageCollector.mapping | 28 +++++++ .../client/report/MessagesListAdder.mapping | 11 +++ .../client/report/log/ChatLog.mapping | 16 ++-- .../client/report/log/ChatLogImpl.mapping | 11 --- .../minecraft/client/util/ProfileKeys.mapping | 3 + .../argument/MessageArgumentType.mapping | 23 ++++++ ...ist.mapping => SignedArgumentList.mapping} | 8 +- .../minecraft/network/PacketByteBuf.mapping | 51 +++++++++++++ .../encryption/ClientPlayerSession.mapping | 7 ++ .../encryption/NetworkEncryptionUtils.mapping | 1 + .../encryption/PublicPlayerSession.mapping | 25 +++++++ .../encryption/SignatureVerifier.mapping | 3 + .../listener/ClientPlayPacketListener.mapping | 8 +- .../message/AcknowledgedMessage.mapping | 5 ++ .../message/AcknowledgmentValidator.mapping | 11 +++ .../message/ArgumentSignatureDataMap.mapping | 4 +- .../network/message/FilterMask.mapping | 3 + .../message/LastSeenMessageList.mapping | 16 ++++ .../message/LastSeenMessagesCollector.mapping | 21 +++++- .../network/message/MessageBody.mapping | 25 ++++++- .../network/message/MessageChain.mapping | 54 +++++++++++--- .../message/MessageChainTaskQueue.mapping | 7 ++ .../network/message/MessageDecorator.mapping | 16 ++-- .../network/message/MessageLink.mapping | 20 +++++ .../message/MessageSignatureData.mapping | 33 ++++++++- .../message/MessageSignatureStorage.mapping | 19 +++++ .../network/message/MessageVerifier.mapping | 11 ++- .../network/message/SentMessage.mapping | 1 - .../network/message/SignedMessage.mapping | 20 ++++- .../c2s/login/LoginHelloC2SPacket.mapping | 2 + .../c2s/login/LoginKeyC2SPacket.mapping | 1 + .../c2s/play/ChatMessageC2SPacket.mapping | 2 +- .../play/CommandExecutionC2SPacket.mapping | 2 +- .../PlayerInteractEntityC2SPacket.mapping | 2 + .../c2s/play/UpdateBeaconC2SPacket.mapping | 13 ++++ .../s2c/play/ChatMessageS2CPacket.mapping | 3 +- .../play/ChunkDeltaUpdateS2CPacket.mapping | 1 + .../packet/s2c/play/FeaturesS2CPacket.mapping | 3 + .../s2c/play/PlayerListS2CPacket.mapping | 74 +++++++++++++++++++ .../play/PlayerPositionLookS2CPacket.mapping | 2 + .../s2c/play/PlayerRemoveS2CPacket.mapping | 3 + .../ProfilelessChatMessageS2CPacket.mapping | 3 + ...mapping => RemoveMessageS2CPacket.mapping} | 2 +- .../minecraft/server/PlayerManager.mapping | 2 + .../server/command/MeCommand.mapping | 2 + .../server/command/MessageCommand.mapping | 5 ++ .../server/command/SayCommand.mapping | 2 + .../server/command/TeamMsgCommand.mapping | 9 +++ .../server/network/EntityTrackerEntry.mapping | 1 + .../network/ServerLoginNetworkHandler.mapping | 4 + .../network/ServerPlayNetworkHandler.mapping | 35 +++++++-- .../server/network/ServerPlayerEntity.mapping | 7 ++ .../minecraft/util/thread/FutureQueue.mapping | 8 ++ 65 files changed, 693 insertions(+), 77 deletions(-) delete mode 100644 mappings/net/minecraft/class_7757.mapping create mode 100644 mappings/net/minecraft/client/report/ContextMessageCollector.mapping delete mode 100644 mappings/net/minecraft/client/report/log/ChatLogImpl.mapping rename mappings/net/minecraft/command/argument/{DecoratableArgumentList.mapping => SignedArgumentList.mapping} (60%) create mode 100644 mappings/net/minecraft/network/encryption/ClientPlayerSession.mapping create mode 100644 mappings/net/minecraft/network/encryption/PublicPlayerSession.mapping create mode 100644 mappings/net/minecraft/network/message/AcknowledgedMessage.mapping create mode 100644 mappings/net/minecraft/network/message/MessageLink.mapping create mode 100644 mappings/net/minecraft/network/message/MessageSignatureStorage.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/play/FeaturesS2CPacket.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/play/PlayerRemoveS2CPacket.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/play/ProfilelessChatMessageS2CPacket.mapping rename mappings/net/minecraft/network/packet/s2c/play/{HideMessageS2CPacket.mapping => RemoveMessageS2CPacket.mapping} (81%) diff --git a/mappings/net/minecraft/class_7757.mapping b/mappings/net/minecraft/class_7757.mapping deleted file mode 100644 index 7eed2e4454..0000000000 --- a/mappings/net/minecraft/class_7757.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_7757 - CLASS class_7632 IndexedMessageConsumer - METHOD accept (ILnet/minecraft/class_7557$class_7558;)V - ARG 1 index - ARG 2 message diff --git a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping index 48dba7d775..9678a290e8 100644 --- a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping @@ -12,6 +12,10 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud FIELD field_2067 hasUnreadNewMessages Z FIELD field_32180 MAX_MESSAGES I FIELD field_39771 MISSING_MESSAGE_INDEX I + FIELD field_40391 DELETED_MARKER_TEXT Lnet/minecraft/class_2561; + FIELD field_40392 removalQueue Ljava/util/List; + METHOD (Lnet/minecraft/class_310;)V + ARG 1 client METHOD method_1802 scroll (I)V ARG 1 scroll METHOD method_1803 addToMessageHistory (Ljava/lang/String;)V @@ -19,6 +23,8 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud METHOD method_1805 render (Lnet/minecraft/class_4587;III)V ARG 1 matrices ARG 2 currentTick + ARG 3 mouseX + ARG 4 mouseY METHOD method_1806 getWidth (D)I ARG 0 widthOption METHOD method_1808 clear (Z)V @@ -69,14 +75,29 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud ARG 3 mouseY METHOD method_44724 toChatLineY (D)D ARG 1 y - METHOD method_44725 getMessageIndex (DD)I + METHOD method_44725 getMessageLineIndex (DD)I + ARG 1 chatLineX + ARG 3 chatLineY METHOD method_44752 getLineHeight ()I METHOD method_44811 addMessage (Lnet/minecraft/class_2561;Lnet/minecraft/class_7469;Lnet/minecraft/class_7591;)V ARG 1 message + ARG 2 signature ARG 3 indicator - METHOD method_44812 hideMessage (Lnet/minecraft/class_7469;)V + METHOD method_44812 removeMessage (Lnet/minecraft/class_7469;)V ARG 1 signature METHOD method_44813 refresh ()V METHOD method_45027 logChatMessage (Lnet/minecraft/class_2561;Lnet/minecraft/class_7591;)V ARG 1 message ARG 2 indicator + METHOD method_45584 tickRemovalQueueIfExists ()V + METHOD method_45585 (ILnet/minecraft/class_338$class_7731;)Z + ARG 2 message + METHOD method_45586 createRemovalMarker (Lnet/minecraft/class_303;)Lnet/minecraft/class_303; + ARG 1 original + METHOD method_45587 queueForRemoval (Lnet/minecraft/class_7469;)Lnet/minecraft/class_338$class_7731; + ARG 1 signature + METHOD method_45588 getMessageIndex (DD)I + ARG 1 chatLineX + ARG 3 chatLineY + METHOD method_45589 tickRemovalQueue ()V + CLASS class_7731 RemovalQueuedMessage diff --git a/mappings/net/minecraft/client/gui/hud/MessageIndicator.mapping b/mappings/net/minecraft/client/gui/hud/MessageIndicator.mapping index b86be6fb2a..b89df94d45 100644 --- a/mappings/net/minecraft/client/gui/hud/MessageIndicator.mapping +++ b/mappings/net/minecraft/client/gui/hud/MessageIndicator.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_7591 net/minecraft/client/gui/hud/MessageIndicator FIELD field_39758 NOT_SECURE_COLOR I FIELD field_39759 MODIFIED_COLOR I FIELD field_39761 CHAT_TAGS_TEXTURE Lnet/minecraft/class_2960; + FIELD field_40379 SYSTEM_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; diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping index ceabfd35db..2a14c5ddae 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping @@ -41,3 +41,5 @@ CLASS net/minecraft/class_5521 net/minecraft/client/gui/screen/multiplayer/Socia METHOD method_44761 (Lnet/minecraft/class_5519;)Ljava/lang/Integer; ARG 1 player METHOD method_44762 sortPlayers ()V + METHOD method_45665 collectReportableProfiles (Lnet/minecraft/class_7555;)Ljava/util/Collection; + ARG 0 log diff --git a/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping index 296c4ea951..b01d59562c 100644 --- a/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping @@ -5,9 +5,15 @@ CLASS net/minecraft/class_635 net/minecraft/client/network/ClientLoginNetworkHan FIELD field_3709 profile Lcom/mojang/authlib/GameProfile; FIELD field_3710 LOGGER Lorg/slf4j/Logger; FIELD field_3711 statusConsumer Ljava/util/function/Consumer; + FIELD field_40480 session Lnet/minecraft/class_7818; + FIELD field_40481 serverInfo Lnet/minecraft/class_642; METHOD (Lnet/minecraft/class_2535;Lnet/minecraft/class_310;Lnet/minecraft/class_7818;Lnet/minecraft/class_642;Lnet/minecraft/class_437;Ljava/util/function/Consumer;)V ARG 1 connection ARG 2 client + ARG 3 session + ARG 4 serverInfo + ARG 5 parentScreen + ARG 6 statusConsumer METHOD method_2891 getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; METHOD method_2892 joinServerSession (Ljava/lang/String;)Lnet/minecraft/class_2561; ARG 1 serverId diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 055ed1967a..c865bc16a5 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand FIELD field_16771 sessionId Ljava/util/UUID; FIELD field_19144 chunkLoadDistance I FIELD field_24321 worldProperties Lnet/minecraft/class_638$class_5271; - FIELD field_25063 registryManager Lnet/minecraft/class_7780; + FIELD field_25063 combinedDynamicRegistries Lnet/minecraft/class_7780; FIELD field_25273 worldKeys Ljava/util/Set; FIELD field_26620 DISCONNECT_LOST_TEXT Lnet/minecraft/class_2561; FIELD field_34963 telemetrySender Lnet/minecraft/class_6628; @@ -24,9 +24,21 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand FIELD field_39858 lastSeenMessagesCollector Lnet/minecraft/class_7637; FIELD field_39916 UNSECURE_SERVER_TOAST_TITLE Lnet/minecraft/class_2561; FIELD field_39917 UNSECURE_SERVER_TOAST_TEXT Lnet/minecraft/class_2561; + FIELD field_40482 featureSet Lnet/minecraft/class_7699; + FIELD field_40483 signatureStorage Lnet/minecraft/class_7561; + FIELD field_40484 unpacker Lnet/minecraft/class_7469$class_7821; + FIELD field_40485 INVALID_PACKET_TEXT Lnet/minecraft/class_2561; + FIELD field_40486 CHAT_VALIDATION_FAILED_TEXT Lnet/minecraft/class_2561; + FIELD field_40488 serverInfo Lnet/minecraft/class_642; + FIELD field_40489 listedPlayerListEntries Lnet/minecraft/class_4706; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_437;Lnet/minecraft/class_2535;Lnet/minecraft/class_7818;Lnet/minecraft/class_642;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_6628;)V + ARG 1 client ARG 2 screen ARG 3 connection + ARG 4 session + ARG 5 serverInfo + ARG 6 profile + ARG 7 telemetrySender METHOD method_16690 getSessionId ()Ljava/util/UUID; METHOD method_19691 getActiveTotemOfUndying (Lnet/minecraft/class_1657;)Lnet/minecraft/class_1799; ARG 0 player @@ -119,3 +131,32 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand METHOD method_44940 acknowledge (Lnet/minecraft/class_7471;Z)V ARG 1 message ARG 2 displayed + METHOD method_45720 hasFeature (Lnet/minecraft/class_7699;)Z + ARG 1 feature + METHOD method_45721 (Lnet/minecraft/class_640;)Ljava/lang/String; + ARG 0 entry + METHOD method_45722 (Ljava/time/Instant;JLnet/minecraft/class_7637$class_7816;Ljava/lang/String;)Lnet/minecraft/class_7469; + ARG 5 value + METHOD method_45723 toSession (Lnet/minecraft/class_7822$class_7823;Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/class_7822; + ARG 1 serialized + ARG 2 profile + METHOD method_45726 handlePlayerListAction (Lnet/minecraft/class_2703$class_5893;Lnet/minecraft/class_2703$class_2705;Lnet/minecraft/class_640;)V + ARG 1 action + ARG 2 receivedEntry + ARG 3 currentEntry + METHOD method_45727 setPublicSession (Lnet/minecraft/class_2703$class_2705;Lnet/minecraft/class_640;)V + ARG 1 receivedEntry + ARG 2 currentEntry + METHOD method_45729 sendChatMessage (Ljava/lang/String;)V + ARG 1 content + METHOD method_45730 sendChatCommand (Ljava/lang/String;)V + ARG 1 command + METHOD method_45731 sendCommand (Ljava/lang/String;)Z + ARG 1 command + METHOD method_45732 getListedPlayerListEntries ()Ljava/util/Collection; + METHOD method_45733 parse (Ljava/lang/String;)Lcom/mojang/brigadier/ParseResults; + ARG 1 command + METHOD method_45734 getServerInfo ()Lnet/minecraft/class_642; + METHOD method_45735 getFeatureSet ()Lnet/minecraft/class_7699; + METHOD method_45736 refreshItemGroups ()V + METHOD method_45737 sendAcknowledgment ()V diff --git a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping index bfe0bc5c30..d2b1008dfa 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping @@ -95,5 +95,6 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity METHOD method_3149 isAutoJumpEnabled ()Z METHOD method_3151 getMountJumpStrength ()F METHOD method_33689 init ()V + METHOD method_45773 getJumpingMount ()Lnet/minecraft/class_1316; METHOD method_7290 dropSelectedItem (Z)Z ARG 1 entireStack diff --git a/mappings/net/minecraft/client/network/LanServerQueryManager.mapping b/mappings/net/minecraft/client/network/LanServerQueryManager.mapping index 5a67441616..57f89433ea 100644 --- a/mappings/net/minecraft/client/network/LanServerQueryManager.mapping +++ b/mappings/net/minecraft/client/network/LanServerQueryManager.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_1134 net/minecraft/client/network/LanServerQueryManage CLASS class_1136 LanServerEntryList FIELD field_5536 serverEntries Ljava/util/List; FIELD field_5537 dirty Z + METHOD method_45912 getEntriesIfUpdated ()Ljava/util/List; METHOD method_4824 addServer (Ljava/lang/String;Ljava/net/InetAddress;)V ARG 1 announcement ARG 2 address diff --git a/mappings/net/minecraft/client/network/PlayerListEntry.mapping b/mappings/net/minecraft/client/network/PlayerListEntry.mapping index a4a78f602f..0423d2ec58 100644 --- a/mappings/net/minecraft/client/network/PlayerListEntry.mapping +++ b/mappings/net/minecraft/client/network/PlayerListEntry.mapping @@ -7,6 +7,9 @@ CLASS net/minecraft/class_640 net/minecraft/client/network/PlayerListEntry FIELD field_3744 gameMode Lnet/minecraft/class_1934; FIELD field_3745 model Ljava/lang/String; FIELD field_39809 messageVerifier Lnet/minecraft/class_7615; + FIELD field_40495 session Lnet/minecraft/class_7822; + METHOD (Lcom/mojang/authlib/GameProfile;)V + ARG 1 profile METHOD method_2955 getScoreboardTeam ()Lnet/minecraft/class_268; METHOD method_2956 (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/class_2960;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V ARG 1 type @@ -33,3 +36,7 @@ CLASS net/minecraft/class_640 net/minecraft/client/network/PlayerListEntry METHOD method_2979 getCapeTexture ()Lnet/minecraft/class_2960; METHOD method_35757 hasCape ()Z METHOD method_44817 getMessageVerifier ()Lnet/minecraft/class_7615; + METHOD method_45740 setSession (Lnet/minecraft/class_7822;)V + ARG 1 session + METHOD method_45741 getSession ()Lnet/minecraft/class_7822; + METHOD method_45742 hasPublicKey ()Z diff --git a/mappings/net/minecraft/client/network/message/MessageHandler.mapping b/mappings/net/minecraft/client/network/message/MessageHandler.mapping index 6b2d26ee32..08745e84b5 100644 --- a/mappings/net/minecraft/client/network/message/MessageHandler.mapping +++ b/mappings/net/minecraft/client/network/message/MessageHandler.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_7594 net/minecraft/client/network/message/MessageHandl COMMENT @see MessageTrustStatus#getStatus ARG 1 message ARG 2 decorated + ARG 3 receptionTimestamp METHOD method_44734 extractSender (Lnet/minecraft/class_2561;)Ljava/util/UUID; ARG 1 text METHOD method_44735 addToChatLog (Lnet/minecraft/class_2561;Ljava/time/Instant;)V @@ -30,6 +31,7 @@ CLASS net/minecraft/class_7594 net/minecraft/client/network/message/MessageHandl METHOD method_44737 addToChatLog (Lnet/minecraft/class_7471;Lnet/minecraft/class_2556$class_7602;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_7595;)V ARG 1 message ARG 2 params + ARG 3 sender ARG 4 trustStatus METHOD method_44738 isAlwaysTrusted (Ljava/util/UUID;)Z COMMENT {@return whether messages from {@code sender} are always trusted} @@ -56,6 +58,8 @@ CLASS net/minecraft/class_7594 net/minecraft/client/network/message/MessageHandl METHOD method_44818 process (Lnet/minecraft/class_7469;Ljava/util/function/BooleanSupplier;)V COMMENT Queues {@code processor} during {@linkplain #shouldDelay the chat delay}, COMMENT otherwise runs the processor. + ARG 1 signature + ARG 2 processor METHOD method_44819 removeDelayedMessage (Lnet/minecraft/class_7469;)Z COMMENT Removes a delayed message whose signature matches {@code signature}. COMMENT If this returns {@code false}, either the message is not received or it it @@ -80,6 +84,7 @@ CLASS net/minecraft/class_7594 net/minecraft/client/network/message/MessageHandl ARG 1 params ARG 2 message ARG 3 decorated + ARG 4 sender ARG 5 onlyShowSecureChat ARG 6 receptionTimestamp COMMENT the timestamp when the message was received by this client @@ -87,6 +92,15 @@ CLASS net/minecraft/class_7594 net/minecraft/client/network/message/MessageHandl COMMENT {@return the number of delayed messages that are not processed yet} METHOD method_44945 processAll ()V COMMENT Processes all delayed messages from the queue. + METHOD method_45746 onProfilelessMessage (Lnet/minecraft/class_2561;Lnet/minecraft/class_2556$class_7602;)V + ARG 1 content + ARG 2 params + METHOD method_45747 (Lnet/minecraft/class_7469;Lnet/minecraft/class_7594$class_7627;)Z + ARG 1 message + METHOD method_45748 onChatMessage (Lnet/minecraft/class_7471;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_2556$class_7602;)V + ARG 1 message + ARG 2 sender + ARG 3 params CLASS class_7627 ProcessableMessage COMMENT A message to be processed. An instance is created for each received message. METHOD method_45750 accept ()Z diff --git a/mappings/net/minecraft/client/network/message/MessageTrustStatus.mapping b/mappings/net/minecraft/client/network/message/MessageTrustStatus.mapping index bee91b28b4..0416be7598 100644 --- a/mappings/net/minecraft/client/network/message/MessageTrustStatus.mapping +++ b/mappings/net/minecraft/client/network/message/MessageTrustStatus.mapping @@ -5,3 +5,14 @@ CLASS net/minecraft/class_7595 net/minecraft/client/network/message/MessageTrust METHOD method_44742 getStatus (Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;Ljava/time/Instant;)Lnet/minecraft/class_7595; ARG 0 message ARG 1 decorated + ARG 2 receptionTimestamp + METHOD method_45754 isNotInDefaultFont (Lnet/minecraft/class_2561;)Z + ARG 0 content + METHOD method_45755 isModified (Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;)Z + ARG 0 message + ARG 1 decorated + METHOD method_45756 isNotInDefaultFont (Lnet/minecraft/class_2583;)Z + ARG 0 style + METHOD method_45757 (Lnet/minecraft/class_2583;Ljava/lang/String;)Ljava/util/Optional; + ARG 0 style + ARG 1 part diff --git a/mappings/net/minecraft/client/report/ChatAbuseReport.mapping b/mappings/net/minecraft/client/report/ChatAbuseReport.mapping index d48cab03bf..5c3c2b769a 100644 --- a/mappings/net/minecraft/client/report/ChatAbuseReport.mapping +++ b/mappings/net/minecraft/client/report/ChatAbuseReport.mapping @@ -18,6 +18,8 @@ CLASS net/minecraft/class_7566 net/minecraft/client/report/ChatAbuseReport METHOD method_44569 toggleMessageSelection (I)V ARG 1 index METHOD method_44570 toReportChatMessage (Lnet/minecraft/class_7557$class_7558;Z)Lcom/mojang/authlib/minecraft/report/ReportChatMessage; + ARG 1 message + ARG 2 selected METHOD method_44571 collectEvidence (Lnet/minecraft/class_7555;)Lcom/mojang/authlib/minecraft/report/ReportEvidence; ARG 1 log METHOD method_44574 setReason (Lnet/minecraft/class_7573;)V @@ -33,6 +35,9 @@ CLASS net/minecraft/class_7566 net/minecraft/client/report/ChatAbuseReport METHOD method_44583 getReason ()Lnet/minecraft/class_7573; METHOD method_44584 validate ()Lnet/minecraft/class_7566$class_7567; METHOD method_44585 copy ()Lnet/minecraft/class_7566; + METHOD method_44962 (Ljava/util/List;ILnet/minecraft/class_7557$class_7558;)V + ARG 2 index + ARG 3 message CLASS class_7567 ValidationError FIELD field_39655 NO_REASON Lnet/minecraft/class_7566$class_7567; FIELD field_39656 NO_REPORTED_MESSAGES Lnet/minecraft/class_7566$class_7567; diff --git a/mappings/net/minecraft/client/report/ContextMessageCollector.mapping b/mappings/net/minecraft/client/report/ContextMessageCollector.mapping new file mode 100644 index 0000000000..0891cb8013 --- /dev/null +++ b/mappings/net/minecraft/client/report/ContextMessageCollector.mapping @@ -0,0 +1,28 @@ +CLASS net/minecraft/class_7757 net/minecraft/client/report/ContextMessageCollector + FIELD field_40498 leadingContextMessageCount I + FIELD field_40499 contextMessages Ljava/util/List; + METHOD (I)V + ARG 1 leadingContextMessageCount + METHOD method_45758 hasContextMessage ()Z + METHOD method_45759 add (Lnet/minecraft/class_7555;Lit/unimi/dsi/fastutil/ints/IntCollection;Lnet/minecraft/class_7757$class_7632;)V + ARG 1 log + ARG 2 selections + ARG 3 consumer + METHOD method_45760 add (Lnet/minecraft/class_7471;)V + ARG 1 message + METHOD method_45761 tryLink (Lnet/minecraft/class_7471;)Z + ARG 1 message + CLASS class_7632 IndexedMessageConsumer + METHOD accept (ILnet/minecraft/class_7557$class_7558;)V + ARG 1 index + ARG 2 message + CLASS class_7758 ContextMessage + FIELD field_40501 lastSeenEntries Ljava/util/Set; + FIELD field_40502 message Lnet/minecraft/class_7471; + FIELD field_40503 linkSuccessful Z + FIELD field_40504 count I + METHOD (Lnet/minecraft/class_7757;Lnet/minecraft/class_7471;)V + ARG 2 message + METHOD method_45762 isInvalid ()Z + METHOD method_45763 linkTo (Lnet/minecraft/class_7471;)Z + ARG 1 message diff --git a/mappings/net/minecraft/client/report/MessagesListAdder.mapping b/mappings/net/minecraft/client/report/MessagesListAdder.mapping index 2470e54ec9..fecf6171b1 100644 --- a/mappings/net/minecraft/client/report/MessagesListAdder.mapping +++ b/mappings/net/minecraft/client/report/MessagesListAdder.mapping @@ -1,10 +1,21 @@ CLASS net/minecraft/class_7541 net/minecraft/client/report/MessagesListAdder FIELD field_39581 log Lnet/minecraft/class_7555; FIELD field_39582 reportablePredicate Ljava/util/function/Predicate; + FIELD field_40439 contextMessageCollector Lnet/minecraft/class_7757; + FIELD field_40440 maxLogIndex I + FIELD field_40441 foldedMessageCount I + FIELD field_40442 lastMessage Lnet/minecraft/class_7471; + METHOD (Lnet/minecraft/class_7574;Ljava/util/function/Predicate;)V + ARG 1 context + ARG 2 reportablePredicate METHOD method_44486 add (ILnet/minecraft/class_7541$class_7542;)V ARG 1 minAmount + ARG 2 messages + METHOD method_45664 tryAdd (Lnet/minecraft/class_7557$class_7558;)Z + ARG 1 message CLASS class_7542 MessagesList METHOD method_44490 addMessage (ILnet/minecraft/class_7557$class_7558;)V ARG 1 index + ARG 2 message METHOD method_44492 addText (Lnet/minecraft/class_2561;)V ARG 1 text diff --git a/mappings/net/minecraft/client/report/log/ChatLog.mapping b/mappings/net/minecraft/client/report/log/ChatLog.mapping index 8cb44c6a3b..6c5e056bbd 100644 --- a/mappings/net/minecraft/client/report/log/ChatLog.mapping +++ b/mappings/net/minecraft/client/report/log/ChatLog.mapping @@ -1,11 +1,13 @@ CLASS net/minecraft/class_7555 net/minecraft/client/report/log/ChatLog COMMENT A chat log holds received message entries with sequential indices, where - COMMENT newer entries receive bigger indices. An implementation using fixed-size array - COMMENT is available at {@link ChatLogImpl}. + COMMENT newer entries receive bigger indices. COMMENT - COMMENT

There are two types of entries. {@link HeaderEntry} is an entry containing only - COMMENT the message's header, and is used for censored messages. {@link ReceivedMessage} - COMMENT is an entry for full chat or game messages. + COMMENT

Currently there is only one type of entries; {@link ReceivedMessage}, which is + COMMENT an entry for full chat or game messages. + FIELD field_40496 entries [Lnet/minecraft/class_7629; + FIELD field_40497 currentIndex I + METHOD (I)V + ARG 1 size METHOD method_44532 get (I)Lnet/minecraft/class_7629; COMMENT {@return the entry with index {@code index}, or {@code null} if there is no COMMENT such entry in the log} @@ -13,3 +15,7 @@ CLASS net/minecraft/class_7555 net/minecraft/client/report/log/ChatLog METHOD method_44535 add (Lnet/minecraft/class_7629;)V COMMENT Adds {@code entry} to the log. ARG 1 entry + METHOD method_45751 getMinIndex ()I + METHOD method_45752 getMaxIndex ()I + METHOD method_45753 wrapIndex (I)I + ARG 1 index diff --git a/mappings/net/minecraft/client/report/log/ChatLogImpl.mapping b/mappings/net/minecraft/client/report/log/ChatLogImpl.mapping deleted file mode 100644 index 4f8a81c89f..0000000000 --- a/mappings/net/minecraft/client/report/log/ChatLogImpl.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS net/minecraft/class_7561 net/minecraft/client/report/log/ChatLogImpl - COMMENT An implementation of {@link ChatLog} using a fixed-size array and {@code 0} as the - COMMENT starting index. When adding a log, the index is incremented, and the entry at the - COMMENT index is overwritten. If the index goes above the array size, the array index wraps - COMMENT around but the entry index is still incremented. - COMMENT - COMMENT

For example, if the size is {@code 10}, after adding the 10th item, the next index is - COMMENT {@code 10} because the log is 0-indexed. However, the next message will be stored at - COMMENT {@code messages[0]}. Use {@link #wrapIndex} to calculate the wrapped index. - METHOD (I)V - ARG 1 maxEntries diff --git a/mappings/net/minecraft/client/util/ProfileKeys.mapping b/mappings/net/minecraft/client/util/ProfileKeys.mapping index 9c3606741e..385a58e152 100644 --- a/mappings/net/minecraft/client/util/ProfileKeys.mapping +++ b/mappings/net/minecraft/client/util/ProfileKeys.mapping @@ -39,3 +39,6 @@ CLASS net/minecraft/class_7434 net/minecraft/client/util/ProfileKeys ARG 0 keyPairResponse METHOD method_45109 (Lnet/minecraft/class_7427;)Z ARG 0 key + METHOD method_45743 getClientSession ()Ljava/util/concurrent/CompletableFuture; + METHOD method_45744 (Ljava/util/Optional;)Lnet/minecraft/class_7818; + ARG 0 key diff --git a/mappings/net/minecraft/command/argument/MessageArgumentType.mapping b/mappings/net/minecraft/command/argument/MessageArgumentType.mapping index e653f92bf7..620295f70d 100644 --- a/mappings/net/minecraft/command/argument/MessageArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/MessageArgumentType.mapping @@ -1,5 +1,28 @@ CLASS net/minecraft/class_2196 net/minecraft/command/argument/MessageArgumentType FIELD field_9876 EXAMPLES Ljava/util/Collection; + METHOD method_45562 getSignedMessage (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Ljava/util/function/Consumer;)V + ARG 0 context + ARG 1 name + ARG 2 callback + METHOD method_45563 filterText (Lnet/minecraft/class_2168;Lnet/minecraft/class_7471;)Ljava/util/concurrent/CompletableFuture; + ARG 0 source + ARG 1 message + METHOD method_45564 (Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/class_7471;Ljava/util/function/Consumer;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 4 executor + METHOD method_45565 (Ljava/util/concurrent/CompletableFuture;Ljava/util/function/Consumer;Lnet/minecraft/class_7471;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 3 executor + METHOD method_45566 chain (Ljava/util/function/Consumer;Lnet/minecraft/class_2168;Lnet/minecraft/class_7471;)V + ARG 0 callback + ARG 1 source + ARG 2 message + METHOD method_45567 (Ljava/util/function/Consumer;Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;)V + ARG 2 content + METHOD method_45568 (Lnet/minecraft/class_7471;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Ljava/util/function/Consumer;Ljava/lang/Void;)V + ARG 4 void_ + METHOD method_45569 chainUnsigned (Ljava/util/function/Consumer;Lnet/minecraft/class_2168;Lnet/minecraft/class_7471;)V + ARG 0 callback + ARG 1 source + ARG 2 message METHOD method_9339 getMessage (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2561; ARG 0 context ARG 1 name diff --git a/mappings/net/minecraft/command/argument/DecoratableArgumentList.mapping b/mappings/net/minecraft/command/argument/SignedArgumentList.mapping similarity index 60% rename from mappings/net/minecraft/command/argument/DecoratableArgumentList.mapping rename to mappings/net/minecraft/command/argument/SignedArgumentList.mapping index 1855fe2b71..6aef75252a 100644 --- a/mappings/net/minecraft/command/argument/DecoratableArgumentList.mapping +++ b/mappings/net/minecraft/command/argument/SignedArgumentList.mapping @@ -1,11 +1,13 @@ -CLASS net/minecraft/class_7644 net/minecraft/command/argument/DecoratableArgumentList - COMMENT A list of parsed {@linkplain DecoratableArgumentType decoratable arguments}. +CLASS net/minecraft/class_7644 net/minecraft/command/argument/SignedArgumentList + COMMENT A list of parsed {@linkplain SignedArgumentType signed arguments}. COMMENT COMMENT @see #of METHOD method_45043 of (Lcom/mojang/brigadier/ParseResults;)Lnet/minecraft/class_7644; COMMENT {@return a new instance of this list from {@code parseResults}} ARG 0 parseResults METHOD method_45044 collectDecoratableArguments (Ljava/lang/String;Lcom/mojang/brigadier/context/CommandContextBuilder;)Ljava/util/List; + ARG 0 argumentName + ARG 1 builder CLASS class_7645 ParsedArgument - COMMENT A parsed decoratable argument, also used as the entry of {@link DecoratableArgumentList}. + COMMENT A parsed signed argument, also used as the entry of {@link SignedArgumentList}. METHOD method_45046 getNodeName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping index 487b7deb46..487ceae1e2 100644 --- a/mappings/net/minecraft/network/PacketByteBuf.mapping +++ b/mappings/net/minecraft/network/PacketByteBuf.mapping @@ -24,6 +24,9 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT {@link Map}{@link #readMap(IntFunction, PacketByteBuf.PacketReader, PacketByteBuf.PacketReader)}{@link #writeMap(Map, PacketByteBuf.PacketWriter, PacketByteBuf.PacketWriter)} COMMENT COMMENT + COMMENT {@link EnumSet}{@link #readEnumSet(Class)}{@link #writeEnumSet(EnumSet, Class)} + COMMENT + COMMENT COMMENT {@code byte[]}{@link #readByteArray()}{@link #writeByteArray(byte[])} COMMENT COMMENT @@ -66,6 +69,9 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT {@index Property}{@link #readProperty()}{@link #writeProperty(Property)} COMMENT COMMENT + COMMENT {@index PropertyMap}{@link #readPropertyMap()}{@link #writePropertyMap(PropertyMap)} + COMMENT + COMMENT COMMENT {@link NbtCompound}{@link #readNbt()}{@link #writeNbt(NbtCompound)} COMMENT COMMENT @@ -1001,6 +1007,51 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see #writePublicKey(PublicKey) METHOD method_44302 toEncodedStringLength (I)I ARG 0 decodedLength + METHOD method_46249 writePropertyMap (Lcom/mojang/authlib/properties/PropertyMap;)V + COMMENT Writes an authlib property map to this buf. A property map is represented as a + COMMENT collection of properties. + COMMENT + COMMENT @see #readPropertyMap + ARG 1 propertyMap + METHOD method_46250 (Lcom/mojang/authlib/properties/PropertyMap;Lnet/minecraft/class_2540;)V + ARG 2 buf + METHOD method_46251 readEnumSet (Ljava/lang/Class;)Ljava/util/EnumSet; + COMMENT Reads an enum set from this buf. An enum set is represented by a bit set that indicates + COMMENT whether each element is in the set. + COMMENT + COMMENT @see #writeEnumSet + ARG 1 type + COMMENT the type of the enum + METHOD method_46252 writeBitSet (Ljava/util/BitSet;I)V + COMMENT Writes a bit set to this buf. A bit set is represented using its byte array representation. + COMMENT + COMMENT @throws io.netty.handler.codec.EncoderException if the bit set's length is above {@code size} + COMMENT + COMMENT @see BitSet#toByteArray + COMMENT @see #readBitSet + ARG 1 bitSet + ARG 2 size + COMMENT the maximum size of the bit set + METHOD method_46253 writeEnumSet (Ljava/util/EnumSet;Ljava/lang/Class;)V + COMMENT Writes an enum set to this buf. An enum set is represented by a bit set that indicates + COMMENT whether each element is in the set. + COMMENT + COMMENT @see #readEnumSet + ARG 1 enumSet + ARG 2 type + COMMENT the type of the enum + METHOD method_46254 readBitSet (I)Ljava/util/BitSet; + COMMENT Reads a bit set from this buf. A bit set is represented using its byte array representation. + COMMENT + COMMENT @see BitSet#valueOf + COMMENT @see #writeBitSet + ARG 1 size + COMMENT the maximum size of the bit set + METHOD method_46255 readPropertyMap ()Lcom/mojang/authlib/properties/PropertyMap; + COMMENT Reads an authlib property map from this buf. A property map is represented as a + COMMENT collection of properties. + COMMENT + COMMENT @see #writePropertyMap METHOD nioBuffer (II)Ljava/nio/ByteBuffer; ARG 1 index ARG 2 length diff --git a/mappings/net/minecraft/network/encryption/ClientPlayerSession.mapping b/mappings/net/minecraft/network/encryption/ClientPlayerSession.mapping new file mode 100644 index 0000000000..71694d3c66 --- /dev/null +++ b/mappings/net/minecraft/network/encryption/ClientPlayerSession.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_7818 net/minecraft/network/encryption/ClientPlayerSession + METHOD method_46272 createSigner ()Lnet/minecraft/class_7501; + METHOD method_46273 create (Lnet/minecraft/class_7427;)Lnet/minecraft/class_7818; + ARG 0 keyPair + METHOD method_46274 createPacker (Ljava/util/UUID;)Lnet/minecraft/class_7610$class_7612; + ARG 1 sender + METHOD method_46275 toPublicSession ()Lnet/minecraft/class_7822; diff --git a/mappings/net/minecraft/network/encryption/NetworkEncryptionUtils.mapping b/mappings/net/minecraft/network/encryption/NetworkEncryptionUtils.mapping index 22e60228dc..acd759810f 100644 --- a/mappings/net/minecraft/network/encryption/NetworkEncryptionUtils.mapping +++ b/mappings/net/minecraft/network/encryption/NetworkEncryptionUtils.mapping @@ -31,6 +31,7 @@ CLASS net/minecraft/class_3515 net/minecraft/network/encryption/NetworkEncryptio FIELD field_39039 RSA_PUBLIC_KEY_SUFFIX Ljava/lang/String; FIELD field_39109 SHA256_WITH_RSA Ljava/lang/String; FIELD field_39272 BASE64_ENCODER Ljava/util/Base64$Encoder; + FIELD field_40111 SHA256_BITS I METHOD method_15234 decryptSecretKey (Ljava/security/PrivateKey;[B)Ljavax/crypto/SecretKey; COMMENT Decrypts RSA-encrypted AES secret key. COMMENT diff --git a/mappings/net/minecraft/network/encryption/PublicPlayerSession.mapping b/mappings/net/minecraft/network/encryption/PublicPlayerSession.mapping new file mode 100644 index 0000000000..8934d6a59b --- /dev/null +++ b/mappings/net/minecraft/network/encryption/PublicPlayerSession.mapping @@ -0,0 +1,25 @@ +CLASS net/minecraft/class_7822 net/minecraft/network/encryption/PublicPlayerSession + FIELD comp_1086 publicKeyData Lnet/minecraft/class_7428; + FIELD field_40689 MISSING Lnet/minecraft/class_7822; + METHOD comp_1086 publicKeyData ()Lnet/minecraft/class_7428; + METHOD method_46296 createVerifier ()Lnet/minecraft/class_7615; + METHOD method_46297 createUnpacker (Ljava/util/UUID;)Lnet/minecraft/class_7610$class_7611; + ARG 1 sender + METHOD method_46298 toSerialized ()Lnet/minecraft/class_7822$class_7823; + METHOD method_46299 hasPublicKey ()Z + CLASS class_7823 Serialized + FIELD comp_1088 publicKeyData Lnet/minecraft/class_7428$class_7443; + FIELD field_40690 MISSING Lnet/minecraft/class_7822$class_7823; + METHOD comp_1088 publicKeyData ()Lnet/minecraft/class_7428$class_7443; + METHOD method_46300 toSession (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_7500;Ljava/time/Duration;)Lnet/minecraft/class_7822; + ARG 1 gameProfile + ARG 2 servicesSignatureVerifier + ARG 3 gracePeriod + METHOD method_46301 fromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_7822$class_7823; + ARG 0 buf + METHOD method_46302 (Lnet/minecraft/class_2540;Lnet/minecraft/class_7428$class_7443;)V + ARG 0 buf2 + ARG 1 publicKeyData + METHOD method_46303 write (Lnet/minecraft/class_2540;Lnet/minecraft/class_7822$class_7823;)V + ARG 0 buf + ARG 1 serialized diff --git a/mappings/net/minecraft/network/encryption/SignatureVerifier.mapping b/mappings/net/minecraft/network/encryption/SignatureVerifier.mapping index ef7ebf33cf..68109017e7 100644 --- a/mappings/net/minecraft/network/encryption/SignatureVerifier.mapping +++ b/mappings/net/minecraft/network/encryption/SignatureVerifier.mapping @@ -10,6 +10,9 @@ CLASS net/minecraft/class_7500 net/minecraft/network/encryption/SignatureVerifie ARG 2 signature METHOD method_44172 create (Lcom/mojang/authlib/yggdrasil/ServicesKeyInfo;)Lnet/minecraft/class_7500; ARG 0 servicesKeyInfo + METHOD method_44173 (Lcom/mojang/authlib/yggdrasil/ServicesKeyInfo;Lnet/minecraft/class_7498;[B)Z + ARG 1 updatable + ARG 2 signatureData METHOD method_44174 (Ljava/lang/String;Ljava/security/PublicKey;Lnet/minecraft/class_7498;[B)Z ARG 2 updatable ARG 3 signatureData diff --git a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping index f50065a8c4..d6fee7669e 100644 --- a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping @@ -205,5 +205,11 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_44763 onChatSuggestions (Lnet/minecraft/class_7597;)V ARG 1 packet - METHOD method_44814 onHideMessage (Lnet/minecraft/class_7617;)V + METHOD method_44814 onRemoveMessage (Lnet/minecraft/class_7617;)V + ARG 1 packet + METHOD method_45724 onProfilelessChatMessage (Lnet/minecraft/class_7827;)V + ARG 1 packet + METHOD method_45725 onPlayerRemove (Lnet/minecraft/class_7828;)V + ARG 1 packet + METHOD method_45728 onFeatures (Lnet/minecraft/class_7832;)V ARG 1 packet diff --git a/mappings/net/minecraft/network/message/AcknowledgedMessage.mapping b/mappings/net/minecraft/network/message/AcknowledgedMessage.mapping new file mode 100644 index 0000000000..8e11495e9d --- /dev/null +++ b/mappings/net/minecraft/network/message/AcknowledgedMessage.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_7817 net/minecraft/network/message/AcknowledgedMessage + COMMENT A message that is acknowledged. If {@link #pending} is {@code true}, the acknowledgment + COMMENT is not sent to the server yet. + METHOD method_46271 unmarkAsPending ()Lnet/minecraft/class_7817; + COMMENT {@return a new acknowledged message with {@link #pending} set to {@code false}} diff --git a/mappings/net/minecraft/network/message/AcknowledgmentValidator.mapping b/mappings/net/minecraft/network/message/AcknowledgmentValidator.mapping index 1356dc3c80..882e5da1ae 100644 --- a/mappings/net/minecraft/network/message/AcknowledgmentValidator.mapping +++ b/mappings/net/minecraft/network/message/AcknowledgmentValidator.mapping @@ -6,4 +6,15 @@ CLASS net/minecraft/class_7638 net/minecraft/network/message/AcknowledgmentValid COMMENT waiting for message acknowledgments (more than {@value COMMENT net.minecraft.server.network.ServerPlayNetworkHandler#MAX_PENDING_ACKNOWLEDGMENTS}), COMMENT or if the acknowledgment is incorrect, the client will be disconnected. + FIELD field_40680 size I + FIELD field_40681 messages Lit/unimi/dsi/fastutil/objects/ObjectList; + FIELD field_40682 lastSignature Lnet/minecraft/class_7469; + METHOD (I)V + ARG 1 size METHOD method_44989 addPending (Lnet/minecraft/class_7469;)V + ARG 1 signature + METHOD method_46268 getMessageCount ()I + METHOD method_46269 removeUntil (I)Z + ARG 1 index + METHOD method_46270 validate (Lnet/minecraft/class_7635$class_7636;)Ljava/util/Optional; + ARG 1 acknowledgment diff --git a/mappings/net/minecraft/network/message/ArgumentSignatureDataMap.mapping b/mappings/net/minecraft/network/message/ArgumentSignatureDataMap.mapping index 331156e74e..610ee811a3 100644 --- a/mappings/net/minecraft/network/message/ArgumentSignatureDataMap.mapping +++ b/mappings/net/minecraft/network/message/ArgumentSignatureDataMap.mapping @@ -21,6 +21,8 @@ CLASS net/minecraft/class_7450 net/minecraft/network/message/ArgumentSignatureDa METHOD method_44799 (Lnet/minecraft/class_2540;Lnet/minecraft/class_7450$class_7599;)V ARG 0 buf2 ARG 1 entry + METHOD method_45561 (Lnet/minecraft/class_7450$class_7600;Lnet/minecraft/class_7644$class_7645;)Lnet/minecraft/class_7450$class_7599; + ARG 1 argument CLASS class_7599 Entry COMMENT An entry of the signatures map, consisting of the argument's name and signature data. METHOD (Lnet/minecraft/class_2540;)V @@ -30,4 +32,4 @@ CLASS net/minecraft/class_7450 net/minecraft/network/message/ArgumentSignatureDa CLASS class_7600 ArgumentSigner COMMENT A functional interface that signs an argument of a command. METHOD sign (Ljava/lang/String;)Lnet/minecraft/class_7469; - ARG 1 argumentName + ARG 1 value diff --git a/mappings/net/minecraft/network/message/FilterMask.mapping b/mappings/net/minecraft/network/message/FilterMask.mapping index eaab196068..ad2577aa39 100644 --- a/mappings/net/minecraft/network/message/FilterMask.mapping +++ b/mappings/net/minecraft/network/message/FilterMask.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_7649 net/minecraft/network/message/FilterMask FIELD field_39943 FILTERED C FIELD field_39944 mask Ljava/util/BitSet; FIELD field_39945 status Lnet/minecraft/class_7649$class_7650; + FIELD field_40674 FILTERED_STYLE Lnet/minecraft/class_2583; METHOD (I)V ARG 1 length METHOD (Ljava/util/BitSet;Lnet/minecraft/class_7649$class_7650;)V @@ -20,4 +21,6 @@ CLASS net/minecraft/class_7649 net/minecraft/network/message/FilterMask ARG 0 buf ARG 1 mask METHOD method_45093 isFullyFiltered ()Z + METHOD method_46256 getFilteredText (Ljava/lang/String;)Lnet/minecraft/class_2561; + ARG 1 message CLASS class_7650 FilterStatus diff --git a/mappings/net/minecraft/network/message/LastSeenMessageList.mapping b/mappings/net/minecraft/network/message/LastSeenMessageList.mapping index d3219d09a2..ea5949ea07 100644 --- a/mappings/net/minecraft/network/message/LastSeenMessageList.mapping +++ b/mappings/net/minecraft/network/message/LastSeenMessageList.mapping @@ -2,6 +2,12 @@ CLASS net/minecraft/class_7635 net/minecraft/network/message/LastSeenMessageList COMMENT A list of messages a client has seen. FIELD field_39883 EMPTY Lnet/minecraft/class_7635; FIELD field_39884 MAX_ENTRIES I + METHOD method_46257 updateSignatures (Lnet/minecraft/class_7498$class_7499;)V + ARG 1 updater + METHOD method_46258 pack (Lnet/minecraft/class_7469$class_7820;)Lnet/minecraft/class_7635$class_7815; + ARG 1 packer + METHOD method_46259 (Lnet/minecraft/class_7469$class_7820;Lnet/minecraft/class_7469;)Lnet/minecraft/class_7469$class_7819; + ARG 1 signature CLASS class_7636 Acknowledgment COMMENT A record of messages acknowledged by a client. COMMENT @@ -11,3 +17,13 @@ CLASS net/minecraft/class_7635 net/minecraft/network/message/LastSeenMessageList ARG 1 buf METHOD method_44983 write (Lnet/minecraft/class_2540;)V ARG 1 buf + CLASS class_7815 Indexed + FIELD comp_1070 buf Ljava/util/List; + FIELD field_40675 EMPTY Lnet/minecraft/class_7635$class_7815; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD comp_1070 buf ()Ljava/util/List; + METHOD method_46260 write (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_46261 unpack (Lnet/minecraft/class_7469$class_7821;)Ljava/util/Optional; + ARG 1 unpacker diff --git a/mappings/net/minecraft/network/message/LastSeenMessagesCollector.mapping b/mappings/net/minecraft/network/message/LastSeenMessagesCollector.mapping index 996b22fdcd..d722373869 100644 --- a/mappings/net/minecraft/network/message/LastSeenMessagesCollector.mapping +++ b/mappings/net/minecraft/network/message/LastSeenMessagesCollector.mapping @@ -6,12 +6,27 @@ CLASS net/minecraft/class_7637 net/minecraft/network/message/LastSeenMessagesCol COMMENT when the client has enough messages received or when they send a message. COMMENT COMMENT @implNote The maximum amount of message entries are specified in the constructor. - COMMENT The vanilla clients collect 5 entries. Calling {@link #add} adds the message to - COMMENT the beginning of the entries list, and evicts the oldest message. If there are - COMMENT entries with the same sender profile ID, the older entry will be replaced with + COMMENT The vanilla clients collect 5 entries. Calling {@link #add(MessageSignatureData, boolean)} + COMMENT adds the message to the beginning of the entries list, and evicts the oldest message. + COMMENT If there are entries with the same sender profile ID, the older entry will be replaced with COMMENT {@code null} instead of filling the hole. COMMENT COMMENT @see AcknowledgmentValidator COMMENT @see LastSeenMessageList + FIELD field_40676 acknowledgedMessages [Lnet/minecraft/class_7817; + FIELD field_40677 nextIndex I + FIELD field_40678 messageCount I + FIELD field_40679 lastAdded Lnet/minecraft/class_7469; METHOD (I)V ARG 1 size + METHOD method_46262 resetMessageCount ()I + METHOD method_46263 add (Lnet/minecraft/class_7817;)V + ARG 1 message + METHOD method_46264 remove (Lnet/minecraft/class_7469;)V + ARG 1 signature + METHOD method_46265 add (Lnet/minecraft/class_7469;Z)Z + ARG 1 signature + ARG 2 displayed + METHOD method_46266 collect ()Lnet/minecraft/class_7637$class_7816; + METHOD method_46267 getMessageCount ()I + CLASS class_7816 LastSeenMessages diff --git a/mappings/net/minecraft/network/message/MessageBody.mapping b/mappings/net/minecraft/network/message/MessageBody.mapping index c21b4dae32..f6c0b09064 100644 --- a/mappings/net/minecraft/network/message/MessageBody.mapping +++ b/mappings/net/minecraft/network/message/MessageBody.mapping @@ -1,9 +1,28 @@ CLASS net/minecraft/class_7608 net/minecraft/network/message/MessageBody COMMENT A body of a message, including the content, timestamp, salt used for the digest - COMMENT (the hashed body), and the list of players' "last seen messages". Unlike {@link - COMMENT MessageHeader}, clients do not receive this if the message is censored; they receive - COMMENT the digest only. + COMMENT (the hashed body), and the list of players' "last seen messages". + COMMENT Other bits of information, such as sender, are included directly in the packet. FIELD comp_930 timestamp Ljava/time/Instant; FIELD comp_932 lastSeenMessages Lnet/minecraft/class_7635; METHOD comp_930 timestamp ()Ljava/time/Instant; METHOD comp_932 lastSeenMessages ()Lnet/minecraft/class_7635; + METHOD method_46304 update (Lnet/minecraft/class_7498$class_7499;)V + ARG 1 updater + METHOD method_46305 ofUnsigned (Ljava/lang/String;)Lnet/minecraft/class_7608; + ARG 0 content + METHOD method_46306 toSerialized (Lnet/minecraft/class_7469$class_7820;)Lnet/minecraft/class_7608$class_7824; + ARG 1 packer + CLASS class_7824 Serialized + COMMENT The serialized version of {@code MessageBody} used in networking. + COMMENT + COMMENT @see MessageBody#toSerialized + FIELD comp_1091 timestamp Ljava/time/Instant; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD comp_1091 timestamp ()Ljava/time/Instant; + METHOD method_46307 write (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_46308 (Lnet/minecraft/class_7635;)Lnet/minecraft/class_7608; + ARG 1 lastSeenMessages + METHOD method_46309 toBody (Lnet/minecraft/class_7469$class_7821;)Ljava/util/Optional; + ARG 1 unpacker diff --git a/mappings/net/minecraft/network/message/MessageChain.mapping b/mappings/net/minecraft/network/message/MessageChain.mapping index 1c588aa5f9..7fccc3ba58 100644 --- a/mappings/net/minecraft/network/message/MessageChain.mapping +++ b/mappings/net/minecraft/network/message/MessageChain.mapping @@ -1,27 +1,59 @@ CLASS net/minecraft/class_7610 net/minecraft/network/message/MessageChain COMMENT A class for handling the "message chain". COMMENT - COMMENT

{@link MessageHeader} includes the signature of the last message the client has seen. - COMMENT This can be used to verify the legitimacy of a chain of messages, since if the chain - COMMENT is valid, the last message's "previous signature" should be able to verify the preceding - COMMENT message. + COMMENT

A message chain (since 1.19.3) is implemented using an integer that is incremented + COMMENT for each message, called "index". {@link MessageLink} represents the link that a + COMMENT particular message has. COMMENT - COMMENT

Clients signing a message with its preceding message's signature is called + COMMENT

Clients signing a message with its preceding message's index is called COMMENT "packing", and the server creating a signed message with its preceding message's - COMMENT signature is called "unpacking". Unpacked messages can then be verified to check the + COMMENT index is called "unpacking". Unpacked messages can then be verified to check the COMMENT chain's legitimacy. + COMMENT + COMMENT @see MessageLink + FIELD field_40691 LOGGER Lorg/slf4j/Logger; + FIELD field_40692 link Lnet/minecraft/class_7826; + METHOD (Ljava/util/UUID;Ljava/util/UUID;)V + ARG 1 sender + ARG 2 sessionId METHOD method_44874 getUnpacker (Lnet/minecraft/class_7428;)Lnet/minecraft/class_7610$class_7611; + ARG 1 playerPublicKey METHOD method_44880 getPacker (Lnet/minecraft/class_7501;)Lnet/minecraft/class_7610$class_7612; + ARG 1 signer + METHOD method_46310 nextLink ()Lnet/minecraft/class_7826; + METHOD method_46311 (Lnet/minecraft/class_7501;Lnet/minecraft/class_7608;)Lnet/minecraft/class_7469; + ARG 2 body + METHOD method_46312 (Lnet/minecraft/class_7428;Lnet/minecraft/class_7500;Lnet/minecraft/class_7469;Lnet/minecraft/class_7608;)Lnet/minecraft/class_7471; + ARG 3 signature + ARG 4 body + METHOD method_46313 (Lnet/minecraft/class_7826;Lnet/minecraft/class_7608;Lnet/minecraft/class_7498$class_7499;)V + ARG 2 updatable CLASS class_7611 Unpacker COMMENT Unpacker creates a signed message on the server with the server's preceding message - COMMENT signature when they receive a message. Unpacked messages can then be verified to check + COMMENT index when they receive a message. Unpacked messages can then be verified to check COMMENT the message chain's legitimacy. COMMENT - COMMENT

Messages must be unpacked in the order of the message's reception, as it affects - COMMENT the resulting signed message. - COMMENT COMMENT @see MessageChain#getUnpacker + METHOD method_46315 (Ljava/util/UUID;Lnet/minecraft/class_7469;Lnet/minecraft/class_7608;)Lnet/minecraft/class_7471; + ARG 1 signature + ARG 2 body + METHOD unpack (Lnet/minecraft/class_7469;Lnet/minecraft/class_7608;)Lnet/minecraft/class_7471; + ARG 1 signature + ARG 2 body + METHOD unsigned (Ljava/util/UUID;)Lnet/minecraft/class_7610$class_7611; + ARG 0 uuid CLASS class_7612 Packer - COMMENT Packers sign a message on the client with its preceding message's signature. + COMMENT Packers sign a message on the client with its preceding message's index. COMMENT COMMENT @see MessageChain#getPacker + FIELD field_40694 NONE Lnet/minecraft/class_7610$class_7612; + METHOD method_46316 (Lnet/minecraft/class_7608;)Lnet/minecraft/class_7469; + ARG 0 body + METHOD pack (Lnet/minecraft/class_7608;)Lnet/minecraft/class_7469; + ARG 1 body + CLASS class_7825 MessageChainException + FIELD field_40693 shouldDisconnect Z + METHOD (Lnet/minecraft/class_2561;Z)V + ARG 1 message + ARG 2 shouldDisconnect + METHOD method_46314 shouldDisconnect ()Z diff --git a/mappings/net/minecraft/network/message/MessageChainTaskQueue.mapping b/mappings/net/minecraft/network/message/MessageChainTaskQueue.mapping index 1f310a64d0..e84ebbaff0 100644 --- a/mappings/net/minecraft/network/message/MessageChainTaskQueue.mapping +++ b/mappings/net/minecraft/network/message/MessageChainTaskQueue.mapping @@ -2,5 +2,12 @@ CLASS net/minecraft/class_7619 net/minecraft/network/message/MessageChainTaskQue COMMENT Queues a future that handles received messages on the server thread. FIELD field_39829 current Ljava/util/concurrent/CompletableFuture; FIELD field_39830 executor Ljava/util/concurrent/Executor; + FIELD field_40112 closed Z + METHOD (Ljava/util/concurrent/Executor;)V + ARG 1 executor + METHOD method_44903 (Lnet/minecraft/class_7620$class_7621;Ljava/lang/Object;)Ljava/util/concurrent/CompletionStage; + ARG 2 object METHOD method_44904 (Ljava/lang/Throwable;)Ljava/lang/Object; ARG 0 throwable + METHOD method_45308 (Ljava/util/concurrent/Executor;Ljava/lang/Runnable;)V + ARG 2 runnable diff --git a/mappings/net/minecraft/network/message/MessageDecorator.mapping b/mappings/net/minecraft/network/message/MessageDecorator.mapping index 5d059e1f10..560629c24a 100644 --- a/mappings/net/minecraft/network/message/MessageDecorator.mapping +++ b/mappings/net/minecraft/network/message/MessageDecorator.mapping @@ -4,21 +4,15 @@ CLASS net/minecraft/class_7492 net/minecraft/network/message/MessageDecorator COMMENT that is currently used can be obtained by COMMENT {@link net.minecraft.server.MinecraftServer#getMessageDecorator}. COMMENT - COMMENT

For the message decorator to produce a signed message, both the server - COMMENT and the sender's client need to have chat previews enabled, Otherwise, the decorated - COMMENT content is considered unsigned, and if the clients require chat messages to be signed - COMMENT via the {@linkplain net.minecraft.client.option.GameOptions#getOnlyShowSecureChat - COMMENT "Only Show Secure Chat" option}, they will see the undecorated message. Therefore, - COMMENT message decorator is not recommended for censoring messages. - COMMENT - COMMENT

Message decorator results are {@linkplain CachedDecoratorResult cached}, allowing - COMMENT non-pure decorators (i.e. ones affected by externally controlled variables) without - COMMENT affecting the signature verification process. Note that the decorator can still - COMMENT run during message submission to decorate filtered parts of the message. + COMMENT

Messages decorated using message decorator are still marked as verifiable + COMMENT if there is no change in its text or used fonts. If they change, the message cannot + COMMENT be verified. Before 1.19.2, chat previews allowed signing of such message; however + COMMENT that feature was removed in 1.19.3. FIELD field_39384 NOOP Lnet/minecraft/class_7492; COMMENT An empty message decorator that returns the original message. METHOD decorate (Lnet/minecraft/class_3222;Lnet/minecraft/class_2561;)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/MessageLink.mapping b/mappings/net/minecraft/network/message/MessageLink.mapping new file mode 100644 index 0000000000..49f4241456 --- /dev/null +++ b/mappings/net/minecraft/network/message/MessageLink.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/class_7826 net/minecraft/network/message/MessageLink + COMMENT Represents a link to the preceding message that a particular message has. + METHOD method_46317 next ()Lnet/minecraft/class_7826; + COMMENT {@return the next link used by the message's succeeding message} + COMMENT + COMMENT

This can return {@code null} in an extremely rare case, where the index is about + COMMENT to overflow. + METHOD method_46318 update (Lnet/minecraft/class_7498$class_7499;)V + ARG 1 updater + METHOD method_46319 of (Ljava/util/UUID;)Lnet/minecraft/class_7826; + ARG 0 sender + METHOD method_46320 of (Ljava/util/UUID;Ljava/util/UUID;)Lnet/minecraft/class_7826; + ARG 0 sender + ARG 1 sessionId + METHOD method_46321 linksTo (Lnet/minecraft/class_7826;)Z + COMMENT {@return whether this link links to the {@code preceding} link} + COMMENT + COMMENT

For the link to be considered valid, the two must have the same sender and session ID, + COMMENT and the newer link's index must be above the preceding link's index. + ARG 1 preceding diff --git a/mappings/net/minecraft/network/message/MessageSignatureData.mapping b/mappings/net/minecraft/network/message/MessageSignatureData.mapping index cc299b91ec..5a0ccadde1 100644 --- a/mappings/net/minecraft/network/message/MessageSignatureData.mapping +++ b/mappings/net/minecraft/network/message/MessageSignatureData.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_7469 net/minecraft/network/message/MessageSignatureData - COMMENT A message signature data that can be verified when given the header. + COMMENT A message signature data that can be verified. FIELD comp_925 data [B + FIELD field_40683 SIZE I METHOD comp_925 data ()[B METHOD equals (Ljava/lang/Object;)Z ARG 1 o @@ -8,7 +9,33 @@ CLASS net/minecraft/class_7469 net/minecraft/network/message/MessageSignatureDat COMMENT {@return whether the signature data is verified} ARG 1 verifier COMMENT the verifier that is created with the sender's public key + ARG 2 updatable METHOD method_44845 write (Lnet/minecraft/class_2540;Lnet/minecraft/class_7469;)V + ARG 0 buf + ARG 1 signature METHOD method_44994 toByteBuffer ()Ljava/nio/ByteBuffer; - COMMENT {@return the byte buffer containing the signature data, or {@code null} if this - COMMENT signature data is empty} + COMMENT {@return the byte buffer containing the signature data} + METHOD method_46276 fromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_7469; + ARG 0 buf + METHOD method_46277 pack (Lnet/minecraft/class_7469$class_7820;)Lnet/minecraft/class_7469$class_7819; + ARG 1 packer + CLASS class_7819 Indexed + FIELD field_40684 MISSING_ID I + METHOD (I)V + ARG 1 id + METHOD (Lnet/minecraft/class_7469;)V + ARG 1 signature + METHOD method_46278 fromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_7469$class_7819; + ARG 0 buf + METHOD method_46279 write (Lnet/minecraft/class_2540;Lnet/minecraft/class_7469$class_7819;)V + ARG 0 buf + ARG 1 indexed + METHOD method_46280 getSignature (Lnet/minecraft/class_7469$class_7821;)Ljava/util/Optional; + ARG 1 unpacker + CLASS class_7820 Packer + FIELD field_40685 MISSING I + METHOD pack (Lnet/minecraft/class_7469;)I + ARG 1 signature + CLASS class_7821 Unpacker + METHOD unpack (I)Lnet/minecraft/class_7469; + ARG 1 index diff --git a/mappings/net/minecraft/network/message/MessageSignatureStorage.mapping b/mappings/net/minecraft/network/message/MessageSignatureStorage.mapping new file mode 100644 index 0000000000..0a119fb50d --- /dev/null +++ b/mappings/net/minecraft/network/message/MessageSignatureStorage.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_7561 net/minecraft/network/message/MessageSignatureStorage + COMMENT Collects message signatures on the server to make a message chain. + FIELD field_40686 MAX_ENTRIES I + FIELD field_40687 signatures [Lnet/minecraft/class_7469; + METHOD (I)V + ARG 1 maxEntries + METHOD method_46281 create ()Lnet/minecraft/class_7561; + METHOD method_46282 (I)Lnet/minecraft/class_7469; + ARG 1 index + METHOD method_46283 addFrom (Ljava/util/ArrayDeque;)V + ARG 1 deque + METHOD method_46284 addFrom (Ljava/util/List;)V + ARG 1 signatures + METHOD method_46285 (Lnet/minecraft/class_7469;)I + ARG 1 signature + METHOD method_46286 add (Lnet/minecraft/class_7471;)V + ARG 1 message + METHOD method_46287 getPacker ()Lnet/minecraft/class_7469$class_7820; + METHOD method_46288 getUnpacker ()Lnet/minecraft/class_7469$class_7821; diff --git a/mappings/net/minecraft/network/message/MessageVerifier.mapping b/mappings/net/minecraft/network/message/MessageVerifier.mapping index d6e51241f4..c0eee9648a 100644 --- a/mappings/net/minecraft/network/message/MessageVerifier.mapping +++ b/mappings/net/minecraft/network/message/MessageVerifier.mapping @@ -3,10 +3,19 @@ CLASS net/minecraft/class_7615 net/minecraft/network/message/MessageVerifier COMMENT COMMENT

Methods in this interface must be called in the order of the message's reception, COMMENT as it affects the verification result. - METHOD method_45048 getStatus (Lnet/minecraft/class_7471;)Z + FIELD field_40695 NO_SIGNATURE Lnet/minecraft/class_7615; + FIELD field_40696 UNVERIFIED Lnet/minecraft/class_7615; + METHOD method_45048 isVerified (Lnet/minecraft/class_7471;)Z + ARG 1 message + METHOD method_46322 (Lnet/minecraft/class_7471;)Z + ARG 0 message + METHOD method_46323 (Lnet/minecraft/class_7471;)Z + ARG 0 message CLASS class_7616 Impl FIELD field_39821 lastMessageVerified Z FIELD field_39822 signatureVerifier Lnet/minecraft/class_7500; + FIELD field_40697 lastVerifiedMessage Lnet/minecraft/class_7471; METHOD (Lnet/minecraft/class_7500;)V ARG 1 signatureVerifier METHOD method_44996 verifyPrecedingSignature (Lnet/minecraft/class_7471;)Z + ARG 1 message diff --git a/mappings/net/minecraft/network/message/SentMessage.mapping b/mappings/net/minecraft/network/message/SentMessage.mapping index 6772d4f174..936d25b122 100644 --- a/mappings/net/minecraft/network/message/SentMessage.mapping +++ b/mappings/net/minecraft/network/message/SentMessage.mapping @@ -16,7 +16,6 @@ CLASS net/minecraft/class_7604 net/minecraft/network/message/SentMessage COMMENT The wrapper used for normal chat messages. COMMENT COMMENT

Text filtering can cause some players to not receive this kind of message. - COMMENT Message header is sent separately to those players. FIELD comp_1082 message Lnet/minecraft/class_7471; METHOD (Lnet/minecraft/class_7471;)V ARG 1 message diff --git a/mappings/net/minecraft/network/message/SignedMessage.mapping b/mappings/net/minecraft/network/message/SignedMessage.mapping index 1fec5d0af2..e57cce458e 100644 --- a/mappings/net/minecraft/network/message/SignedMessage.mapping +++ b/mappings/net/minecraft/network/message/SignedMessage.mapping @@ -1,11 +1,12 @@ CLASS net/minecraft/class_7471 net/minecraft/network/message/SignedMessage COMMENT A signed message, consisting of the signature, the signed content, - COMMENT and the optional unsigned content supplied when the chat decorator produced - COMMENT unsigned message due to the chat preview being disabled on either side. + COMMENT the message body, the link to its preceding message, and the optional + COMMENT unsigned content supplied when the message decorator modified the message. COMMENT COMMENT

Note that the signature itself might not be valid. FIELD field_39786 SERVERBOUND_TIME_TO_LIVE Ljava/time/Duration; FIELD field_39787 CLIENTBOUND_TIME_TO_LIVE Ljava/time/Duration; + FIELD field_40688 NIL_UUID Ljava/util/UUID; METHOD method_44607 withoutUnsigned ()Lnet/minecraft/class_7471; COMMENT {@return the signed chat message with {@link #unsignedContent} removed if it exists} COMMENT @@ -30,13 +31,26 @@ CLASS net/minecraft/class_7471 net/minecraft/network/message/SignedMessage ARG 1 sender METHOD method_45041 ofUnsigned (Ljava/lang/String;)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 (Ljava/util/UUID;Ljava/lang/String;)Lnet/minecraft/class_7471; - COMMENT {@return a new signed message with given metadata and empty signature} + COMMENT {@return a new signed message with given sender UUID and empty signature} + ARG 0 sender + 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 + METHOD method_46289 (Lnet/minecraft/class_7498$class_7499;)V + ARG 1 updater + METHOD method_46290 update (Lnet/minecraft/class_7498$class_7499;Lnet/minecraft/class_7826;Lnet/minecraft/class_7608;)V + ARG 0 updater + ARG 1 link + ARG 2 body + METHOD method_46291 getContent ()Lnet/minecraft/class_2561; + METHOD method_46292 getSender ()Ljava/util/UUID; + METHOD method_46293 isSenderMissing ()Z + METHOD method_46294 hasSignature ()Z diff --git a/mappings/net/minecraft/network/packet/c2s/login/LoginHelloC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/login/LoginHelloC2SPacket.mapping index 3071366e53..9bf98dc63d 100644 --- a/mappings/net/minecraft/network/packet/c2s/login/LoginHelloC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/login/LoginHelloC2SPacket.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_2915 net/minecraft/network/packet/c2s/login/LoginHelloC2SPacket + FIELD comp_984 session Lnet/minecraft/class_7822$class_7823; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD comp_984 session ()Lnet/minecraft/class_7822$class_7823; diff --git a/mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping index b74d645385..58984349b7 100644 --- a/mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping @@ -27,6 +27,7 @@ CLASS net/minecraft/class_2917 net/minecraft/network/packet/c2s/login/LoginKeyC2 ARG 0 encrypted METHOD method_43643 verifySignedNonce ([BLnet/minecraft/class_7500;)Z ARG 1 nonce + ARG 2 verifier METHOD method_43644 verifyEncryptedNonce ([BLjava/security/PrivateKey;)Z ARG 1 nonce ARG 2 privateKey diff --git a/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping index f745d4ba50..24420c7b43 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping @@ -19,7 +19,7 @@ CLASS net/minecraft/class_2797 net/minecraft/network/packet/c2s/play/ChatMessage COMMENT message is not considered secure anymore by the clients, and may be discarded COMMENT depending on the clients' options. COMMENT - COMMENT @see net.minecraft.client.network.ClientPlayerEntity#sendChatMessage + COMMENT @see net.minecraft.client.network.ClientPlayNetworkHandler#sendChatMessage COMMENT @see net.minecraft.server.network.ServerPlayNetworkHandler#onChatMessage FIELD comp_945 chatMessage Ljava/lang/String; FIELD comp_946 timestamp Ljava/time/Instant; diff --git a/mappings/net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket.mapping index 0a6ce73316..d56838efbd 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket.mapping @@ -19,7 +19,7 @@ CLASS net/minecraft/class_7472 net/minecraft/network/packet/c2s/play/CommandExec COMMENT is not considered secure anymore by the clients, and may be discarded depending COMMENT on the clients' options. COMMENT - COMMENT @see net.minecraft.client.network.ClientPlayerEntity#sendCommand + COMMENT @see net.minecraft.client.network.ClientPlayNetworkHandler#sendCommand(String) COMMENT @see net.minecraft.server.network.ServerPlayNetworkHandler#onCommandExecution FIELD comp_809 timestamp Ljava/time/Instant; FIELD comp_969 acknowledgment Lnet/minecraft/class_7635$class_7636; diff --git a/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractEntityC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractEntityC2SPacket.mapping index 38677c993b..67f019e798 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractEntityC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractEntityC2SPacket.mapping @@ -36,6 +36,8 @@ CLASS net/minecraft/class_2824 net/minecraft/network/packet/c2s/play/PlayerInter FIELD field_29174 handlerGetter Ljava/util/function/Function; METHOD (Ljava/lang/String;ILjava/util/function/Function;)V ARG 3 handlerGetter + METHOD method_34216 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2824$class_5906; + ARG 0 buf CLASS class_5908 Handler METHOD method_34218 attack ()V METHOD method_34219 interact (Lnet/minecraft/class_1268;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping index 8b9278cd0f..286249aa8f 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket.mapping @@ -1,7 +1,20 @@ CLASS net/minecraft/class_2866 net/minecraft/network/packet/c2s/play/UpdateBeaconC2SPacket FIELD field_13049 secondaryEffectId Ljava/util/Optional; FIELD field_13050 primaryEffectId Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 primaryEffectId + ARG 2 secondaryEffectId METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_12435 getSecondaryEffectId ()Ljava/util/Optional; METHOD method_12436 getPrimaryEffectId ()Ljava/util/Optional; + METHOD method_43364 (Lnet/minecraft/class_2540;Lnet/minecraft/class_1291;)V + ARG 0 buf2 + ARG 1 secondaryEffectId + METHOD method_43365 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1291; + ARG 0 buf2 + METHOD method_43366 (Lnet/minecraft/class_2540;Lnet/minecraft/class_1291;)V + ARG 0 buf2 + ARG 1 primaryEffectId + METHOD method_43367 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1291; + ARG 0 buf2 diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping index 91d8106d16..3a3b1c6135 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping @@ -11,7 +11,8 @@ CLASS net/minecraft/class_7438 net/minecraft/network/packet/s2c/play/ChatMessage COMMENT from the one sent by the client, or because the passed signature is invalid) the client COMMENT will show a warning and can discard it depending on the options. COMMENT - COMMENT

If the message takes more than {@link SignedMessage#CLIENTBOUND_TIME_TO_LIVE} + COMMENT

If the message takes more than {@link + COMMENT net.minecraft.network.message.SignedMessage#CLIENTBOUND_TIME_TO_LIVE} COMMENT to reach the clients (including the time it originally took to reach the server), COMMENT the message is not considered secure anymore by the clients, and may be discarded COMMENT depending on the clients' options. diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket.mapping index bad5f418d7..8ccbc125eb 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChunkDeltaUpdateS2CPacket.mapping @@ -16,4 +16,5 @@ CLASS net/minecraft/class_2637 net/minecraft/network/packet/s2c/play/ChunkDeltaU ARG 4 noLightingUpdates METHOD method_30621 visitUpdates (Ljava/util/function/BiConsumer;)V COMMENT Calls the given consumer for each pair of block position and block state contained in this packet. + ARG 1 visitor METHOD method_31179 shouldSkipLightingUpdates ()Z diff --git a/mappings/net/minecraft/network/packet/s2c/play/FeaturesS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/FeaturesS2CPacket.mapping new file mode 100644 index 0000000000..a8f4ed2dcd --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/FeaturesS2CPacket.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_7832 net/minecraft/network/packet/s2c/play/FeaturesS2CPacket + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping index 69e481a3d6..fb6cf9e061 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping @@ -1,19 +1,93 @@ CLASS net/minecraft/class_2703 net/minecraft/network/packet/s2c/play/PlayerListS2CPacket FIELD field_12369 entries Ljava/util/List; + FIELD field_40698 actions Ljava/util/EnumSet; METHOD (Ljava/util/EnumSet;Ljava/util/Collection;)V + ARG 1 actions ARG 2 players METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_2703$class_5893;Lnet/minecraft/class_3222;)V ARG 1 action + ARG 2 player METHOD method_43886 entryFromPlayer (Ljava/util/Collection;)Lnet/minecraft/class_2703; + ARG 0 players + METHOD method_46326 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V + ARG 1 buf2 + ARG 2 entry + METHOD method_46327 getActions ()Ljava/util/EnumSet; + METHOD method_46328 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2703$class_2705; + ARG 1 buf2 + METHOD method_46329 getEntries ()Ljava/util/List; + METHOD method_46330 getPlayerAdditionEntries ()Ljava/util/List; CLASS class_2705 Entry FIELD comp_1107 profile Lcom/mojang/authlib/GameProfile; FIELD comp_1109 latency I FIELD comp_1110 gameMode Lnet/minecraft/class_1934; FIELD comp_1111 displayName Lnet/minecraft/class_2561; + METHOD (Lnet/minecraft/class_3222;)V + ARG 1 player METHOD comp_1107 profile ()Lcom/mojang/authlib/GameProfile; METHOD comp_1109 latency ()I METHOD comp_1110 gameMode ()Lnet/minecraft/class_1934; METHOD comp_1111 displayName ()Lnet/minecraft/class_2561; CLASS class_5893 Action + FIELD field_40701 reader Lnet/minecraft/class_2703$class_5893$class_7829; + FIELD field_40702 writer Lnet/minecraft/class_2703$class_5893$class_7830; + METHOD (Ljava/lang/String;ILnet/minecraft/class_2703$class_5893$class_7829;Lnet/minecraft/class_2703$class_5893$class_7830;)V + ARG 3 reader + ARG 4 writer + METHOD method_46331 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V + ARG 0 buf + ARG 1 entry + METHOD method_46332 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_2540;)V + ARG 0 serialized + ARG 1 buf + METHOD method_46333 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V + ARG 0 buf + ARG 1 entry + METHOD method_46334 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_2540;)V + ARG 0 serialized + ARG 1 buf + METHOD method_46335 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V + ARG 0 buf + ARG 1 entry + METHOD method_46336 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_2540;)V + ARG 0 serialized + ARG 1 buf + METHOD method_46337 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V + ARG 0 buf + ARG 1 entry + METHOD method_46338 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_2540;)V + ARG 0 serialized + ARG 1 buf + METHOD method_46339 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V + ARG 0 buf + ARG 1 entry + METHOD method_46340 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_2540;)V + ARG 0 serialized + ARG 1 buf + METHOD method_46341 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V + ARG 0 buf + ARG 1 entry + METHOD method_46342 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_2540;)V + ARG 0 serialized + ARG 1 buf + CLASS class_7829 Reader + METHOD read (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_2540;)V + ARG 1 serialized + ARG 2 buf + CLASS class_7830 Writer + METHOD write (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V + ARG 1 buf + ARG 2 entry + CLASS class_7831 Serialized + FIELD field_40703 profileId Ljava/util/UUID; + FIELD field_40704 gameProfile Lcom/mojang/authlib/GameProfile; + FIELD field_40705 listed Z + FIELD field_40706 latency I + FIELD field_40707 gameMode Lnet/minecraft/class_1934; + FIELD field_40708 displayName Lnet/minecraft/class_2561; + FIELD field_40709 session Lnet/minecraft/class_7822$class_7823; + METHOD (Ljava/util/UUID;)V + ARG 1 profileId + METHOD method_46343 toEntry ()Lnet/minecraft/class_2703$class_2705; diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerPositionLookS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerPositionLookS2CPacket.mapping index 7a1547c009..79a884f7f0 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerPositionLookS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerPositionLookS2CPacket.mapping @@ -28,6 +28,8 @@ CLASS net/minecraft/class_2708 net/minecraft/network/packet/s2c/play/PlayerPosit METHOD method_33718 shouldDismount ()Z CLASS class_2709 Flag FIELD field_12399 shift I + FIELD field_40710 VALUES Ljava/util/Set; + FIELD field_40711 ROT Ljava/util/Set; METHOD (Ljava/lang/String;II)V ARG 3 shift METHOD method_11741 getBitfield (Ljava/util/Set;)I diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerRemoveS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerRemoveS2CPacket.mapping new file mode 100644 index 0000000000..896ad94019 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerRemoveS2CPacket.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_7828 net/minecraft/network/packet/s2c/play/PlayerRemoveS2CPacket + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/ProfilelessChatMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ProfilelessChatMessageS2CPacket.mapping new file mode 100644 index 0000000000..173b5c2601 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/ProfilelessChatMessageS2CPacket.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_7827 net/minecraft/network/packet/s2c/play/ProfilelessChatMessageS2CPacket + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/HideMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/RemoveMessageS2CPacket.mapping similarity index 81% rename from mappings/net/minecraft/network/packet/s2c/play/HideMessageS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/RemoveMessageS2CPacket.mapping index 0164007390..9b17f2dcec 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/HideMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/RemoveMessageS2CPacket.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_7617 net/minecraft/network/packet/s2c/play/HideMessageS2CPacket +CLASS net/minecraft/class_7617 net/minecraft/network/packet/s2c/play/RemoveMessageS2CPacket METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/server/PlayerManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping index 887da4cf6b..0f405b5821 100644 --- a/mappings/net/minecraft/server/PlayerManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -129,6 +129,7 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager ARG 1 player METHOD method_14613 createPlayer (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_7822;)Lnet/minecraft/class_3222; ARG 1 profile + ARG 2 session METHOD method_14614 isWhitelistEnabled ()Z METHOD method_14617 saveAllPlayerData ()V METHOD method_18241 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297; @@ -216,6 +217,7 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager ARG 2 shouldSendFiltered COMMENT predicate that determines whether to send the filtered message for the given player ARG 3 sender + ARG 4 params METHOD method_44793 verify (Lnet/minecraft/class_7471;)Z COMMENT {@return whether {@code message} is not expired and is verified} COMMENT diff --git a/mappings/net/minecraft/server/command/MeCommand.mapping b/mappings/net/minecraft/server/command/MeCommand.mapping index a275caabe1..e4f59ba7f4 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 (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_7471;)V + ARG 1 message diff --git a/mappings/net/minecraft/server/command/MessageCommand.mapping b/mappings/net/minecraft/server/command/MessageCommand.mapping index 508e6699d3..0e18a7ac47 100644 --- a/mappings/net/minecraft/server/command/MessageCommand.mapping +++ b/mappings/net/minecraft/server/command/MessageCommand.mapping @@ -2,5 +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_7471;)V + ARG 0 source + ARG 1 targets + ARG 2 message METHOD method_13463 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context + METHOD method_45153 (Lcom/mojang/brigadier/context/CommandContext;Ljava/util/Collection;Lnet/minecraft/class_7471;)V + ARG 2 message diff --git a/mappings/net/minecraft/server/command/SayCommand.mapping b/mappings/net/minecraft/server/command/SayCommand.mapping index 904ebf3b94..55dc8e8755 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 (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_7471;)V + ARG 1 message diff --git a/mappings/net/minecraft/server/command/TeamMsgCommand.mapping b/mappings/net/minecraft/server/command/TeamMsgCommand.mapping index 2ee31a8ae3..2b851329f6 100644 --- a/mappings/net/minecraft/server/command/TeamMsgCommand.mapping +++ b/mappings/net/minecraft/server/command/TeamMsgCommand.mapping @@ -2,7 +2,16 @@ CLASS net/minecraft/class_3945 net/minecraft/server/command/TeamMsgCommand FIELD field_17440 NO_TEAM_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_24380 STYLE Lnet/minecraft/class_2583; METHOD method_17599 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_268;Ljava/util/List;Lnet/minecraft/class_7471;)V + ARG 0 source + ARG 1 entity + ARG 2 team + ARG 3 recipients + ARG 4 message METHOD method_17600 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher METHOD method_17601 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context + METHOD method_45154 (Lnet/minecraft/class_1297;Lnet/minecraft/class_268;Lnet/minecraft/class_3222;)Z + ARG 2 player + METHOD method_45155 (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_268;Ljava/util/List;Lnet/minecraft/class_7471;)V + ARG 4 message diff --git a/mappings/net/minecraft/server/network/EntityTrackerEntry.mapping b/mappings/net/minecraft/server/network/EntityTrackerEntry.mapping index 949f6d7c04..e9609f6431 100644 --- a/mappings/net/minecraft/server/network/EntityTrackerEntry.mapping +++ b/mappings/net/minecraft/server/network/EntityTrackerEntry.mapping @@ -14,6 +14,7 @@ CLASS net/minecraft/class_3231 net/minecraft/server/network/EntityTrackerEntry FIELD field_18258 world Lnet/minecraft/class_3218; FIELD field_18259 receiver Ljava/util/function/Consumer; FIELD field_18278 velocity Lnet/minecraft/class_243; + FIELD field_39019 trackedPos Lnet/minecraft/class_7422; METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_1297;IZLjava/util/function/Consumer;)V ARG 1 world ARG 2 entity diff --git a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping index 73265ac928..9eefcefa66 100644 --- a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping @@ -29,7 +29,9 @@ CLASS net/minecraft/class_3248 net/minecraft/server/network/ServerLoginNetworkHa FIELD field_14166 LOGGER Lorg/slf4j/Logger; FIELD field_14167 nonce [B FIELD field_29779 TIMEOUT_TICKS I + FIELD field_39992 session Lnet/minecraft/class_7822$class_7823; METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;)V + ARG 1 server ARG 2 connection METHOD method_14375 toOfflineProfile (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile; ARG 1 profile @@ -50,6 +52,8 @@ CLASS net/minecraft/class_3248 net/minecraft/server/network/ServerLoginNetworkHa METHOD method_40085 isValidName (Ljava/lang/String;)Z ARG 0 name METHOD method_43510 getVerifiedPublicKey (Lnet/minecraft/class_7822$class_7823;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_7500;Z)Lnet/minecraft/class_7822; + ARG 0 session + ARG 1 gameProfile ARG 2 servicesSignatureVerifier ARG 3 shouldThrowOnMissingKey CLASS 1 diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index fceabe6ef6..e0b834ab6d 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -39,9 +39,14 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan FIELD field_39805 messageUnpacker Lnet/minecraft/class_7610$class_7611; FIELD field_39825 acknowledgmentValidator Lnet/minecraft/class_7638; FIELD field_39826 messageChainTaskQueue Lnet/minecraft/class_7619; + FIELD field_39987 signatureStorage Lnet/minecraft/class_7561; + FIELD field_39988 messagePacker Lnet/minecraft/class_7469$class_7820; + FIELD field_39989 MAX_PENDING_ACKNOWLEDGMENTS I + FIELD field_39990 CHAT_VALIDATION_FAILED_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;Lnet/minecraft/class_3222;)V ARG 1 server ARG 2 connection + ARG 3 player METHOD method_14360 requestTeleport (DDDFFLjava/util/Set;)V ARG 1 x ARG 3 y @@ -155,15 +160,12 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan COMMENT COMMENT

If {@code false}, the message will be discarded. ARG 1 timestamp - METHOD method_44337 canAcceptMessage (Ljava/lang/String;Ljava/time/Instant;Lnet/minecraft/class_7635$class_7636;)Ljava/util/Optional; - COMMENT {@return whether {@code message}, sent at {@code timestamp}, should be accepted} + METHOD method_44337 validateMessage (Ljava/lang/String;Ljava/time/Instant;Lnet/minecraft/class_7635$class_7636;)Ljava/util/Optional; + COMMENT {@return the validated acknowledgment if the message is valid, or an empty optional + COMMENT if it is not} COMMENT - COMMENT

This returns {@code false} if the message arrives in {@linkplain - COMMENT #isInProperOrder improper order}, if chat is disabled, or if {@linkplain - COMMENT AcknowledgmentValidator#validate acknowledgment validation fails}. - COMMENT Note that the signatures are verified in {@link #canAcceptMessage(SignedMessage)}. - COMMENT - COMMENT @see #canAcceptMessage(SignedMessage) + COMMENT

This disconnects the player if the message arrives in {@linkplain + COMMENT #isInProperOrder improper order} or if chat is disabled. ARG 1 message ARG 2 timestamp ARG 3 acknowledgment @@ -179,10 +181,27 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan COMMENT {@return a map of argument name and value as signed messages} ARG 1 packet ARG 2 arguments + ARG 3 lastSeenMessages METHOD method_45010 handleCommandExecution (Lnet/minecraft/class_7472;Lnet/minecraft/class_7635;)V ARG 1 packet + ARG 2 lastSeenMessages METHOD method_45011 getSignedMessage (Lnet/minecraft/class_2797;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7471; ARG 1 packet + ARG 2 lastSeenMessages + METHOD method_45064 (Lnet/minecraft/class_7471;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Ljava/lang/Void;)V + ARG 4 void_ + METHOD method_45167 (Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/class_7471;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 4 executor + METHOD method_45168 sendProfilelessChatMessage (Lnet/minecraft/class_2561;Lnet/minecraft/class_2556$class_7602;)V + ARG 1 message + ARG 2 params + METHOD method_45169 validateAcknowledgment (Lnet/minecraft/class_7635$class_7636;)Ljava/util/Optional; + ARG 1 acknowledgment + METHOD method_45170 sendChatMessage (Lnet/minecraft/class_7471;Lnet/minecraft/class_2556$class_7602;)V + ARG 1 message + ARG 2 params + METHOD method_45171 handleMessageChainException (Lnet/minecraft/class_7610$class_7825;)V + ARG 1 exception 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 eae969a78a..30781f115c 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -48,9 +48,13 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity FIELD field_35007 fallStartPos Lnet/minecraft/class_243; FIELD field_35008 vehicleInLavaRidingPos Lnet/minecraft/class_243; FIELD field_35566 allowServerListing Z + FIELD field_39985 sculkShriekerWarningManager Lnet/minecraft/class_7262; + FIELD field_39986 session Lnet/minecraft/class_7822; METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_3218;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_7822;)V ARG 1 server + ARG 2 world ARG 3 profile + ARG 4 session METHOD method_14203 copyFrom (Lnet/minecraft/class_3222;Z)V ARG 1 oldPlayer ARG 2 alive @@ -233,6 +237,9 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_44706 acceptsChatMessage ()Z METHOD method_44707 acceptsMessage (Z)Z ARG 1 overlay + METHOD method_45163 getSession ()Lnet/minecraft/class_7822; + METHOD method_45164 (Lnet/minecraft/class_7262;)V + ARG 1 sculkShriekerWarningManager METHOD method_7336 changeGameMode (Lnet/minecraft/class_1934;)Z ARG 1 gameMode CLASS 1 diff --git a/mappings/net/minecraft/util/thread/FutureQueue.mapping b/mappings/net/minecraft/util/thread/FutureQueue.mapping index 3320c45597..f2653ec084 100644 --- a/mappings/net/minecraft/util/thread/FutureQueue.mapping +++ b/mappings/net/minecraft/util/thread/FutureQueue.mapping @@ -3,5 +3,13 @@ CLASS net/minecraft/class_7620 net/minecraft/util/thread/FutureQueue FIELD field_39831 LOGGER Lorg/slf4j/Logger; METHOD append (Lnet/minecraft/class_7620$class_7621;)V ARG 1 future + METHOD immediate (Ljava/util/concurrent/Executor;)Lnet/minecraft/class_7620; + ARG 0 executor + METHOD method_45311 (Ljava/lang/Throwable;)Ljava/lang/Object; + ARG 0 throwable + METHOD method_45312 (Ljava/util/concurrent/Executor;Lnet/minecraft/class_7620$class_7621;)V + ARG 1 future CLASS class_7621 FutureSupplier COMMENT A functional interface supplying the queued future to {@link FutureQueue}. + METHOD submit (Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 1 executor