From f181f8b226ac5c64dc937d9020f30a3c5856232b Mon Sep 17 00:00:00 2001 From: Player Date: Fri, 15 Jul 2022 16:41:50 +0200 Subject: [PATCH] 1.19.1-pre5 --- build.gradle | 2 +- mappings/net/minecraft/class_7633.mapping | 2 ++ mappings/net/minecraft/class_7635.mapping | 7 ++++ .../gui/screen/ChatInputSuggestor.mapping | 1 - .../client/gui/screen/ChatScreen.mapping | 9 ++---- .../ChatPreviewWarningScreen.mapping | 2 -- .../client/network/ChatPreviewer.mapping | 11 ++----- .../network/ClientPlayNetworkHandler.mapping | 1 - .../client/network/ClientPlayerEntity.mapping | 9 ++---- .../network/message/MessageHandler.mapping | 16 ++-------- .../message/MessageTrustStatus.mapping | 2 +- .../client/option/GameOptions.mapping | 1 - .../client/report/ChatAbuseReport.mapping | 8 ----- .../minecraft/client/report/ChatLog.mapping | 32 ++++++------------- .../client/report/ChatLogImpl.mapping | 2 +- .../report/GroupedMessagesCollector.mapping | 2 +- .../client/report/MessagesListAdder.mapping | 2 +- .../client/report/ReceivedMessage.mapping | 10 ++---- .../client/sound/SoundEngine.mapping | 2 +- .../client/util/ScreenshotRecorder.mapping | 1 - .../argument/MessageArgumentType.mapping | 7 ++-- .../TextConvertibleArgumentType.mapping | 2 +- .../message/ArgumentSignatureDataMap.mapping | 5 ++- .../network/message/MessageBody.mapping | 24 ++------------ .../network/message/MessageChain.mapping | 23 +++++-------- .../network/message/MessageDecorator.mapping | 12 ------- .../message/MessageSignatureData.mapping | 2 -- .../network/message/MessageType.mapping | 5 --- .../network/message/MessageVerifier.mapping | 4 --- .../message/SignedCommandArguments.mapping | 4 --- .../network/message/SignedMessage.mapping | 2 +- .../c2s/play/ChatMessageC2SPacket.mapping | 2 +- .../play/CommandExecutionC2SPacket.mapping | 2 +- .../command/ServerCommandSource.mapping | 2 +- .../server/command/TeamMsgCommand.mapping | 2 +- .../network/ServerLoginNetworkHandler.mapping | 8 ----- .../network/ServerPlayNetworkHandler.mapping | 20 +++--------- 37 files changed, 60 insertions(+), 188 deletions(-) create mode 100644 mappings/net/minecraft/class_7633.mapping create mode 100644 mappings/net/minecraft/class_7635.mapping diff --git a/build.gradle b/build.gradle index d3d22b014d..07daf8a1b8 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ plugins { id 'net.fabricmc.filament' version '0.3.0' } -def minecraft_version = "1.19.1-pre4" +def minecraft_version = "1.19.1-pre5" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/net/minecraft/class_7633.mapping b/mappings/net/minecraft/class_7633.mapping new file mode 100644 index 0000000000..c653f1b6a5 --- /dev/null +++ b/mappings/net/minecraft/class_7633.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_7633 + METHOD method_18784 tick ()V diff --git a/mappings/net/minecraft/class_7635.mapping b/mappings/net/minecraft/class_7635.mapping new file mode 100644 index 0000000000..0cc409df0a --- /dev/null +++ b/mappings/net/minecraft/class_7635.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_7635 + CLASS class_7609 LastSeenMessage + COMMENT A pair of a player's UUID and the signature of the last message they saw. + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_44873 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/client/gui/screen/ChatInputSuggestor.mapping b/mappings/net/minecraft/client/gui/screen/ChatInputSuggestor.mapping index 111553094e..e1bdac4b0f 100644 --- a/mappings/net/minecraft/client/gui/screen/ChatInputSuggestor.mapping +++ b/mappings/net/minecraft/client/gui/screen/ChatInputSuggestor.mapping @@ -107,7 +107,6 @@ CLASS net/minecraft/class_4717 net/minecraft/client/gui/screen/ChatInputSuggesto METHOD method_2374 select (I)V ARG 1 index METHOD method_2375 complete ()V - METHOD method_2376 discard ()V METHOD method_2377 keyPressed (III)Z ARG 1 keyCode ARG 2 scanCode diff --git a/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping b/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping index 41d479e668..262fdd2db4 100644 --- a/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping @@ -17,11 +17,8 @@ CLASS net/minecraft/class_408 net/minecraft/client/gui/screen/ChatScreen FIELD field_39343 PREVIEW_BOTTOM_MARGIN I FIELD field_39344 CHAT_PREVIEW_WARNING_TOAST_TITLE Lnet/minecraft/class_2561; FIELD field_39345 CHAT_PREVIEW_WARNING_TOAST_TEXT Lnet/minecraft/class_2561; - FIELD field_39346 CHAT_PREVIEW_PLACEHOLDER_TEXT Lnet/minecraft/class_2561; FIELD field_39347 chatPreviewer Lnet/minecraft/class_7479; FIELD field_39774 MAX_INDICATOR_TOOLTIP_WIDTH I - METHOD (Ljava/lang/String;)V - ARG 1 originalChatText METHOD method_2108 setText (Ljava/lang/String;)V ARG 1 text METHOD method_2114 setChatFromHistory (I)V @@ -33,14 +30,13 @@ CLASS net/minecraft/class_408 net/minecraft/client/gui/screen/ChatScreen METHOD method_44052 getTextStyleAt (DD)Lnet/minecraft/class_2583; ARG 1 x ARG 3 y - METHOD method_44053 renderChatPreview (Lnet/minecraft/class_4587;)V - ARG 1 matrices + METHOD method_44053 renderChatPreview (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;FZ)V METHOD method_44054 normalize (Ljava/lang/String;)Ljava/lang/String; COMMENT {@return the {@code message} normalized by trimming it and then normalizing spaces} ARG 1 chatText METHOD method_44055 getPreviewTop (I)I ARG 1 previewHeight - METHOD method_44056 sendMessage (Ljava/lang/String;Z)V + METHOD method_44056 sendMessage (Ljava/lang/String;Z)Z ARG 1 chatText ARG 2 addToHistory METHOD method_44057 getPreviewHeight (Ljava/util/List;)I @@ -58,7 +54,6 @@ CLASS net/minecraft/class_408 net/minecraft/client/gui/screen/ChatScreen COMMENT net.minecraft.client.option.GameOptions#getChatPreview the chat preview option}. COMMENT To check if the server allows chat previews, check {@link COMMENT net.minecraft.client.network.ServerInfo#shouldPreviewChat}. - METHOD method_44062 getPreviewText ()Ljava/util/List; METHOD method_44063 getPreviewWidth ()I METHOD method_44064 getPreviewBottom ()I METHOD method_44279 tryRequestPreview (Ljava/lang/String;)V diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/ChatPreviewWarningScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/ChatPreviewWarningScreen.mapping index 821efc6441..7a7fea896c 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/ChatPreviewWarningScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/ChatPreviewWarningScreen.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_7483 net/minecraft/client/gui/screen/multiplayer/ChatPreviewWarningScreen FIELD field_39348 TITLE Lnet/minecraft/class_2561; - FIELD field_39349 CONTENT Lnet/minecraft/class_2561; FIELD field_39350 CHECK_MESSAGE Lnet/minecraft/class_2561; - FIELD field_39351 NARRATED_TEXT Lnet/minecraft/class_2561; FIELD field_39352 serverInfo Lnet/minecraft/class_642; FIELD field_39433 parent Lnet/minecraft/class_437; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_642;)V diff --git a/mappings/net/minecraft/client/network/ChatPreviewer.mapping b/mappings/net/minecraft/client/network/ChatPreviewer.mapping index 8f227baaea..a80402fcbd 100644 --- a/mappings/net/minecraft/client/network/ChatPreviewer.mapping +++ b/mappings/net/minecraft/client/network/ChatPreviewer.mapping @@ -17,7 +17,6 @@ CLASS net/minecraft/class_7479 net/minecraft/client/network/ChatPreviewer COMMENT COMMENT @see #tryConsumeResponse FIELD field_39334 lastResponse Lnet/minecraft/class_7479$class_7481; - FIELD field_39429 shouldRenderPreview Z FIELD field_39430 lastPreviewedMessage Ljava/lang/String; FIELD field_39431 pendingRequestMessage Ljava/lang/String; COMMENT The message that is waiting for the previewer to request (i.e. the next query to be sent). @@ -35,10 +34,9 @@ CLASS net/minecraft/class_7479 net/minecraft/client/network/ChatPreviewer COMMENT @implNote This sets the last response if the requester {@linkplain COMMENT ChatPreviewRequester#handleResponse successfully handled} the response. ARG 1 id - ARG 2 response METHOD method_44036 clear ()V COMMENT Clears the last response and the requester's state. - METHOD method_44037 tryConsumeResponse (Ljava/lang/String;)Lnet/minecraft/class_2561; + METHOD method_44037 tryConsumeResponse (Ljava/lang/String;)Lnet/minecraft/class_7479$class_7481; COMMENT {@return the consumed response text, or {@code null} if the server responded as such, or COMMENT if the response could not be consumed} COMMENT @@ -49,7 +47,7 @@ CLASS net/minecraft/class_7479 net/minecraft/client/network/ChatPreviewer COMMENT has passed. It is also possible to get the response text without consuming by calling COMMENT {@link #getPreviewText}. ARG 1 message - METHOD method_44038 getPreviewText ()Lnet/minecraft/class_2561; + METHOD method_44038 getPreviewText ()Lnet/minecraft/class_7479$class_7481; COMMENT {@return the preview text (also known as the last response text), or {@code null} COMMENT if the server responded as such} COMMENT @@ -57,11 +55,6 @@ CLASS net/minecraft/class_7479 net/minecraft/client/network/ChatPreviewer METHOD method_44039 normalize (Ljava/lang/String;)Ljava/lang/String; COMMENT {@return the {@code message} normalized by trimming it and then normalizing spaces} ARG 0 message - METHOD method_44040 shouldRenderPreview ()Z - COMMENT {@return whether the preview should be rendered} - COMMENT - COMMENT @implNote A preview should be rendered if there is a response, a pending query, or - COMMENT a query waiting for the response. METHOD method_44274 tryRequest (Ljava/lang/String;)V COMMENT Tries to send the request to preview {@code message}. If the delay has passed, COMMENT it will send instantly; otherwise, it will set {@link #pendingRequestMessage} which diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index a29361cfe6..a455498aec 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -22,7 +22,6 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand FIELD field_3701 loginScreen Lnet/minecraft/class_437; FIELD field_39808 messagePacker Lnet/minecraft/class_7610$class_7612; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_437;Lnet/minecraft/class_2535;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_6628;)V - ARG 1 client ARG 2 screen ARG 3 connection ARG 4 profile diff --git a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping index 18aadcc41e..8cb33ffe1b 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping @@ -95,12 +95,11 @@ 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_43609 signChatMessage (Lnet/minecraft/class_7470;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7469; + METHOD method_43609 signChatMessage (Lnet/minecraft/class_7470;Lnet/minecraft/class_7634;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7469; COMMENT Signs the chat message. If the chat message cannot be signed, this will return COMMENT {@link MessageSignatureData#EMPTY}. ARG 1 metadata - ARG 2 preview - METHOD method_43786 signArguments (Lnet/minecraft/class_7470;Lcom/mojang/brigadier/ParseResults;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7450; + METHOD method_43786 signArguments (Lnet/minecraft/class_7470;Lcom/mojang/brigadier/ParseResults;Lnet/minecraft/class_2561;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7450; COMMENT Signs the command arguments. If the arguments cannot be signed or if there is no COMMENT arguments to sign, this will return {@link ArgumentSignatureDataMap#EMPTY}. ARG 1 signer @@ -128,7 +127,6 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity ARG 2 preview METHOD method_44097 sendChatMessagePacket (Ljava/lang/String;Lnet/minecraft/class_2561;)V ARG 1 content - ARG 2 preview METHOD method_44098 sendCommand (Ljava/lang/String;Lnet/minecraft/class_2561;)V COMMENT Signs and sends {@code command} to the server. ARG 1 command @@ -138,9 +136,6 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity COMMENT Sends an unsigned command to the server. ARG 1 command COMMENT the command (without the leading slash) - METHOD method_44297 (Lnet/minecraft/class_2561;Lnet/minecraft/class_7501;Lnet/minecraft/class_7470;Ljava/lang/String;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7469; - ARG 4 argumentName - ARG 5 value METHOD method_44826 createMessageMetadata ()Lnet/minecraft/class_7470; METHOD method_7290 dropSelectedItem (Z)Z ARG 1 entireStack diff --git a/mappings/net/minecraft/client/network/message/MessageHandler.mapping b/mappings/net/minecraft/client/network/message/MessageHandler.mapping index 51478fb887..3bbaa520a1 100644 --- a/mappings/net/minecraft/client/network/message/MessageHandler.mapping +++ b/mappings/net/minecraft/client/network/message/MessageHandler.mapping @@ -8,12 +8,11 @@ CLASS net/minecraft/class_7594 net/minecraft/client/network/message/MessageHandl ARG 1 client METHOD method_44731 getPlayerListEntry (Ljava/util/UUID;)Lnet/minecraft/class_640; ARG 1 sender - METHOD method_44732 getStatus (Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;Lnet/minecraft/class_640;)Lnet/minecraft/class_7595; + METHOD method_44732 getStatus (Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;Lnet/minecraft/class_640;Ljava/time/Instant;)Lnet/minecraft/class_7595; ARG 1 message ARG 2 decorated ARG 3 senderEntry METHOD method_44733 onChatMessage (Lnet/minecraft/class_7471;Lnet/minecraft/class_2556$class_7602;)V - ARG 1 message ARG 2 params METHOD method_44734 extractSender (Lnet/minecraft/class_2561;)Ljava/util/UUID; ARG 1 text @@ -41,29 +40,25 @@ CLASS net/minecraft/class_7594 net/minecraft/client/network/message/MessageHandl ARG 1 params ARG 2 message ARG 3 decorated - METHOD method_44768 processChatMessage (Lnet/minecraft/class_2556$class_7602;Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;Lnet/minecraft/class_640;Lnet/minecraft/class_7595;)Z + METHOD method_44768 processChatMessage (Lnet/minecraft/class_2556$class_7602;Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;Lnet/minecraft/class_640;ZLjava/time/Instant;)Z ARG 1 params ARG 2 message ARG 3 decorated ARG 4 senderEntry - ARG 5 trustStatus METHOD method_44769 process ()V COMMENT Processes one delayed message from the queue's beginning. METHOD method_44772 narrate (Lnet/minecraft/class_2556$class_7602;Lnet/minecraft/class_7471;)V ARG 1 params ARG 2 message - METHOD method_44773 getDelayedMessages ()Ljava/util/Collection; METHOD method_44775 shouldDelay ()Z COMMENT {@return if the chat delay is set and the message should be delayed} - METHOD method_44818 process (Lnet/minecraft/class_7594$class_7601;)V + METHOD method_44818 process (Lnet/minecraft/class_7594$class_7627;)V COMMENT Queues {@code processor} during {@linkplain #shouldDelay the chat delay}, COMMENT otherwise runs the processor. ARG 1 processor METHOD method_44819 removeDelayedMessage (Lnet/minecraft/class_7469;)Z ARG 1 signature METHOD method_44820 onMessageHeader (Lnet/minecraft/class_7614;Lnet/minecraft/class_7469;[B)V - ARG 1 header - ARG 2 signature ARG 3 bodyDigest METHOD method_44821 processHeader (Lnet/minecraft/class_7614;Lnet/minecraft/class_7469;[B)Z ARG 1 header @@ -73,8 +68,3 @@ CLASS net/minecraft/class_7594 net/minecraft/client/network/message/MessageHandl ARG 1 header ARG 2 signatures ARG 3 bodyDigest - CLASS class_7601 MessageProcessor - FIELD comp_917 processor Ljava/util/function/BooleanSupplier; - METHOD comp_917 processor ()Ljava/util/function/BooleanSupplier; - METHOD method_44824 process ()Z - METHOD method_44825 getHeaderSignature ()Lnet/minecraft/class_7469; diff --git a/mappings/net/minecraft/client/network/message/MessageTrustStatus.mapping b/mappings/net/minecraft/client/network/message/MessageTrustStatus.mapping index dfd13a293e..b95b5cb0e9 100644 --- a/mappings/net/minecraft/client/network/message/MessageTrustStatus.mapping +++ b/mappings/net/minecraft/client/network/message/MessageTrustStatus.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_7595 net/minecraft/client/network/message/MessageTrust METHOD method_44740 isInsecure ()Z METHOD method_44741 createIndicator (Lnet/minecraft/class_7471;)Lnet/minecraft/class_7591; ARG 1 message - METHOD method_44742 getStatus (Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;Lnet/minecraft/class_640;)Lnet/minecraft/class_7595; + METHOD method_44742 getStatus (Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;Lnet/minecraft/class_640;Ljava/time/Instant;)Lnet/minecraft/class_7595; ARG 0 message ARG 1 decorated ARG 2 sender diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index 989f4a745f..0ac678957f 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -205,7 +205,6 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions FIELD field_38298 HOLD_KEY_TEXT Lnet/minecraft/class_2561; FIELD field_38299 HIDE_MATCHED_NAMES_TOOLTIP Lnet/minecraft/class_2561; FIELD field_38300 MAX_FRAMERATE I - FIELD field_39318 CHAT_PREVIEW_TOOLTIP Lnet/minecraft/class_2561; FIELD field_39319 chatPreview Lnet/minecraft/class_7172; FIELD field_39320 ONLY_SHOW_SECURE_CHAT_TOOLTIP Lnet/minecraft/class_2561; FIELD field_39321 onlyShowSecureChat Lnet/minecraft/class_7172; diff --git a/mappings/net/minecraft/client/report/ChatAbuseReport.mapping b/mappings/net/minecraft/client/report/ChatAbuseReport.mapping index c425a6fa48..06e9a862d0 100644 --- a/mappings/net/minecraft/client/report/ChatAbuseReport.mapping +++ b/mappings/net/minecraft/client/report/ChatAbuseReport.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_7566 net/minecraft/client/report/ChatAbuseReport - FIELD field_39645 CHAT Ljava/lang/String; FIELD field_39648 id Ljava/util/UUID; FIELD field_39649 timestamp Ljava/time/Instant; FIELD field_39650 reportedPlayerUuid Ljava/util/UUID; @@ -23,11 +22,6 @@ CLASS net/minecraft/class_7566 net/minecraft/client/report/ChatAbuseReport ARG 2 message METHOD method_44571 collectEvidence (Lnet/minecraft/class_7555;)Lcom/mojang/authlib/minecraft/report/ReportEvidence; ARG 1 log - METHOD method_44572 streamNeighboringIndices (Lnet/minecraft/class_7555;I)Ljava/util/stream/IntStream; - ARG 1 log - ARG 2 index - METHOD method_44573 (Lnet/minecraft/class_7555;Lit/unimi/dsi/fastutil/ints/IntSortedSet;I)V - ARG 1 selectedIndex METHOD method_44574 setReason (Lnet/minecraft/class_7573;)V ARG 1 reason METHOD method_44575 finalizeReport (Lnet/minecraft/class_7574;)Lcom/mojang/datafixers/util/Either; @@ -39,8 +33,6 @@ CLASS net/minecraft/class_7566 net/minecraft/client/report/ChatAbuseReport METHOD method_44579 getSelections ()Lit/unimi/dsi/fastutil/ints/IntSet; METHOD method_44580 hasSelectedMessage (I)Z ARG 1 index - METHOD method_44581 (Lnet/minecraft/class_7555;I)Lcom/mojang/authlib/minecraft/report/ReportChatMessage; - ARG 2 index METHOD method_44582 getOpinionComments ()Ljava/lang/String; METHOD method_44583 getReason ()Lnet/minecraft/class_7573; METHOD method_44584 validate ()Lnet/minecraft/class_7566$class_7567; diff --git a/mappings/net/minecraft/client/report/ChatLog.mapping b/mappings/net/minecraft/client/report/ChatLog.mapping index 5abc18ab01..d46af83728 100644 --- a/mappings/net/minecraft/client/report/ChatLog.mapping +++ b/mappings/net/minecraft/client/report/ChatLog.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_7555 net/minecraft/client/report/ChatLog COMMENT COMMENT

This value changes every time a new message gets added. The message COMMENT associated with this index is the newest one in the log. - METHOD method_44532 get (I)Lnet/minecraft/class_7557; + METHOD method_44532 get (I)Lnet/minecraft/class_7629; COMMENT {@return the message with index {@code index}, or {@code null} if there is no COMMENT such message in the log} ARG 1 index @@ -25,7 +25,7 @@ CLASS net/minecraft/class_7555 net/minecraft/client/report/ChatLog ARG 2 nextIndexGetter COMMENT a function that, when given an index, returns the next index COMMENT or {@value #MISSING_NEXT_INDEX} to indicate the end of the stream - METHOD method_44535 add (Lnet/minecraft/class_7557;)V + METHOD method_44535 add (Lnet/minecraft/class_7629;)V COMMENT Adds {@code message} to the log. ARG 1 message METHOD method_44536 getMinIndex ()I @@ -33,18 +33,10 @@ CLASS net/minecraft/class_7555 net/minecraft/client/report/ChatLog COMMENT COMMENT

This value can change every time a new message gets added. The message COMMENT associated with this index is the oldest one in the log. - METHOD method_44537 getIndexed (I)Lnet/minecraft/class_7557$class_7560; + METHOD method_44537 getIndexed (I)Lnet/minecraft/class_7555$class_7560; COMMENT {@return the indexed message with index {@code index}, or {@code null} if there is no COMMENT such message in the log} ARG 1 index - METHOD method_44538 clampWithOffset (II)I - COMMENT {@return the index offset by {@code offset} and clamped between the minimum - COMMENT and the maximum indices} - COMMENT - COMMENT @see #getMaxIndex - COMMENT @see #getMinIndex - ARG 1 index - ARG 2 offset METHOD method_44539 streamForward ()Lnet/minecraft/class_7555$class_7556; COMMENT {@return the streams starting from {@linkplain #getMinIndex the smallest index COMMENT in the log} with entires ordered chronologically (in ascending order)} @@ -102,19 +94,15 @@ CLASS net/minecraft/class_7555 net/minecraft/client/report/ChatLog ARG 2 indicesIterator METHOD method_44548 streamIndices ()Ljava/util/stream/IntStream; COMMENT {@return the stream of message indices} - METHOD method_44549 streamMessages ()Ljava/util/stream/Stream; - COMMENT {@return the stream of messages} - COMMENT - COMMENT

If for some reason the index is no longer present in the log, such messages are - COMMENT ignored. - METHOD method_44550 streamIndexedMessages ()Ljava/util/stream/Stream; - COMMENT {@return the stream of indexed messages} - COMMENT - COMMENT

If for some reason the index is no longer present in the log, such messages are - COMMENT ignored. - METHOD method_44703 (Lnet/minecraft/class_7557;)Lcom/mojang/authlib/GameProfile; + METHOD method_44703 (Lnet/minecraft/class_7629;)Lcom/mojang/authlib/GameProfile; ARG 0 message METHOD method_44704 collectSenderProfiles ()Ljava/util/Collection; COMMENT {@return the collection of profiles of message senders} COMMENT COMMENT

This ignores game messages, and the returned collection has no duplicates. + CLASS class_7560 IndexedMessage + COMMENT A pair of the message's index and the message itself. + COMMENT + COMMENT @see ChatLog + FIELD comp_873 index I + METHOD comp_873 index ()I diff --git a/mappings/net/minecraft/client/report/ChatLogImpl.mapping b/mappings/net/minecraft/client/report/ChatLogImpl.mapping index 4ed9a86045..85067f48c3 100644 --- a/mappings/net/minecraft/client/report/ChatLogImpl.mapping +++ b/mappings/net/minecraft/client/report/ChatLogImpl.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_7561 net/minecraft/client/report/ChatLogImpl 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. - FIELD field_39638 messages [Lnet/minecraft/class_7557; + FIELD field_39638 messages [Lnet/minecraft/class_7629; FIELD field_39639 maxIndex I FIELD field_39640 minIndex I METHOD (I)V diff --git a/mappings/net/minecraft/client/report/GroupedMessagesCollector.mapping b/mappings/net/minecraft/client/report/GroupedMessagesCollector.mapping index fe04397cbd..ca9ac2fea9 100644 --- a/mappings/net/minecraft/client/report/GroupedMessagesCollector.mapping +++ b/mappings/net/minecraft/client/report/GroupedMessagesCollector.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_7535 net/minecraft/client/report/GroupedMessagesCollec METHOD (Ljava/util/function/Function;)V ARG 1 reportTypeGetter METHOD method_44452 collect ()Lnet/minecraft/class_7535$class_7537; - METHOD method_44453 add (Lnet/minecraft/class_7557$class_7560;)Z + METHOD method_44453 add (Lnet/minecraft/class_7555$class_7560;)Z ARG 1 message CLASS class_7536 ReportType METHOD method_44454 isContext ()Z diff --git a/mappings/net/minecraft/client/report/MessagesListAdder.mapping b/mappings/net/minecraft/client/report/MessagesListAdder.mapping index 9d78b2170a..895428d6a2 100644 --- a/mappings/net/minecraft/client/report/MessagesListAdder.mapping +++ b/mappings/net/minecraft/client/report/MessagesListAdder.mapping @@ -13,7 +13,7 @@ CLASS net/minecraft/class_7541 net/minecraft/client/report/MessagesListAdder METHOD method_44486 add (ILnet/minecraft/class_7541$class_7542;)V ARG 1 minAmount ARG 2 messagesList - METHOD method_44487 (Lnet/minecraft/class_7557$class_7560;)Lnet/minecraft/class_7535$class_7536; + METHOD method_44487 (Lnet/minecraft/class_7555$class_7560;)Lnet/minecraft/class_7535$class_7536; ARG 1 message METHOD method_44488 getReportType (Lnet/minecraft/class_7557;)Lnet/minecraft/class_7535$class_7536; ARG 1 message diff --git a/mappings/net/minecraft/client/report/ReceivedMessage.mapping b/mappings/net/minecraft/client/report/ReceivedMessage.mapping index c5071442a5..f3b51ff2ae 100644 --- a/mappings/net/minecraft/client/report/ReceivedMessage.mapping +++ b/mappings/net/minecraft/client/report/ReceivedMessage.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_7557 net/minecraft/client/report/ReceivedMessage COMMENT @implNote If the message is a chat message and it contains an unsigned part, the unsigned COMMENT part will be returned. Note that in vanilla, unsigned part is stripped prior to COMMENT construction of the received message instance if the client requires secure chat. - METHOD method_44552 of (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_2561;Lnet/minecraft/class_7471;Lnet/minecraft/class_7595;)Lnet/minecraft/class_7557; + METHOD method_44552 of (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_2561;Lnet/minecraft/class_7471;Lnet/minecraft/class_7595;)Lnet/minecraft/class_7557$class_7558; COMMENT {@return the received message constructed from a chat message's elements} ARG 0 gameProfile COMMENT the game profile of the message's sender @@ -22,7 +22,7 @@ CLASS net/minecraft/class_7557 net/minecraft/client/report/ReceivedMessage METHOD method_44553 isSentFrom (Ljava/util/UUID;)Z COMMENT {@return whether the sender's UUID equals {@code uuid}} ARG 1 uuid - METHOD method_44554 of (Lnet/minecraft/class_2561;Ljava/time/Instant;)Lnet/minecraft/class_7557; + METHOD method_44554 of (Lnet/minecraft/class_2561;Ljava/time/Instant;)Lnet/minecraft/class_7557$class_7559; COMMENT {@return the received message constructed from a game message's elements} ARG 0 message COMMENT the message content @@ -47,9 +47,3 @@ CLASS net/minecraft/class_7557 net/minecraft/client/report/ReceivedMessage COMMENT A game message received by the client. FIELD comp_872 timestamp Ljava/time/Instant; METHOD comp_872 timestamp ()Ljava/time/Instant; - CLASS class_7560 IndexedMessage - COMMENT A pair of the message's index and the message itself. - COMMENT - COMMENT @see ChatLog - FIELD comp_873 index I - METHOD comp_873 index ()I diff --git a/mappings/net/minecraft/client/sound/SoundEngine.mapping b/mappings/net/minecraft/client/sound/SoundEngine.mapping index 381050ca63..778ab8b89a 100644 --- a/mappings/net/minecraft/client/sound/SoundEngine.mapping +++ b/mappings/net/minecraft/client/sound/SoundEngine.mapping @@ -28,7 +28,7 @@ CLASS net/minecraft/class_4225 net/minecraft/client/sound/SoundEngine METHOD method_38722 getCurrentDeviceName ()Ljava/lang/String; METHOD method_38723 updateDeviceSpecifier ()Z METHOD method_38724 isDeviceUnavailable ()Z - METHOD method_41711 tryEnableDirectionalAudio ()V + METHOD method_41711 tryEnableDirectionalAudio (Z)V CLASS class_4105 RunMode CLASS class_4226 SourceSetImpl FIELD field_18903 maxSourceCount I diff --git a/mappings/net/minecraft/client/util/ScreenshotRecorder.mapping b/mappings/net/minecraft/client/util/ScreenshotRecorder.mapping index 6d65a095a5..06014d4763 100644 --- a/mappings/net/minecraft/client/util/ScreenshotRecorder.mapping +++ b/mappings/net/minecraft/client/util/ScreenshotRecorder.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_318 net/minecraft/client/util/ScreenshotRecorder COMMENT A screenshot recorder takes screenshots and saves them into tga file format. It also COMMENT holds a few utility methods for other types of screenshots. - FIELD field_1973 DATE_FORMAT Ljava/text/DateFormat; FIELD field_1974 LOGGER Lorg/slf4j/Logger; FIELD field_32157 unitHeight I FIELD field_32158 stream Ljava/io/DataOutputStream; diff --git a/mappings/net/minecraft/command/argument/MessageArgumentType.mapping b/mappings/net/minecraft/command/argument/MessageArgumentType.mapping index d14a26b4af..3a975c7a24 100644 --- a/mappings/net/minecraft/command/argument/MessageArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/MessageArgumentType.mapping @@ -47,8 +47,7 @@ CLASS net/minecraft/class_2196 net/minecraft/command/argument/MessageArgumentTyp METHOD method_9345 format (Lnet/minecraft/class_2168;)Lnet/minecraft/class_2561; ARG 1 source CLASS class_7515 SignedMessage - METHOD method_44262 decorate (Lnet/minecraft/class_2168;)Ljava/util/concurrent/CompletableFuture; - ARG 1 source + METHOD method_44262 decorate (Lnet/minecraft/class_2168;Ljava/util/function/Consumer;)V METHOD method_44801 (Lnet/minecraft/class_5837;Lnet/minecraft/class_5837;)Lnet/minecraft/class_5837; ARG 1 decoratedMessage METHOD method_44802 format (Lnet/minecraft/class_2168;Lnet/minecraft/class_5837;)Lnet/minecraft/class_5837; @@ -66,8 +65,6 @@ CLASS net/minecraft/class_2196 net/minecraft/command/argument/MessageArgumentTyp COMMENT {@return the parsed and formatted {@code filteredText}, or {@code null} if it fails} ARG 1 source ARG 2 filteredText - METHOD method_44805 (Lnet/minecraft/class_7610$class_7611;Lnet/minecraft/class_7610$class_7613;Lnet/minecraft/class_7470;Lnet/minecraft/class_5837;)Lnet/minecraft/class_5837; - ARG 3 decoratedMessage METHOD method_44806 sendHeader (Lnet/minecraft/class_2168;)V COMMENT Sends the message's header to all players. COMMENT @@ -79,7 +76,7 @@ CLASS net/minecraft/class_2196 net/minecraft/command/argument/MessageArgumentTyp METHOD method_44808 filterText (Lnet/minecraft/class_2168;Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture; ARG 1 source ARG 2 text - METHOD method_44809 (Lnet/minecraft/class_2168;Lnet/minecraft/class_5837;)V + METHOD method_44809 (Lnet/minecraft/class_2168;Lnet/minecraft/class_5837;)Lnet/minecraft/class_5837; ARG 1 message METHOD method_44810 (Lnet/minecraft/class_2168;Lnet/minecraft/class_5837;)Ljava/util/concurrent/CompletionStage; ARG 2 filtered diff --git a/mappings/net/minecraft/command/argument/TextConvertibleArgumentType.mapping b/mappings/net/minecraft/command/argument/TextConvertibleArgumentType.mapping index 8e9d12096f..2ccddd249e 100644 --- a/mappings/net/minecraft/command/argument/TextConvertibleArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/TextConvertibleArgumentType.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_7451 net/minecraft/command/argument/TextConvertibleArgumentType - METHOD method_43752 toText (Ljava/lang/Object;)Lnet/minecraft/class_2561; + METHOD method_43752 toText (Ljava/lang/Object;)Ljava/lang/String; ARG 1 value diff --git a/mappings/net/minecraft/network/message/ArgumentSignatureDataMap.mapping b/mappings/net/minecraft/network/message/ArgumentSignatureDataMap.mapping index c298ea1ef6..22e88d01fc 100644 --- a/mappings/net/minecraft/network/message/ArgumentSignatureDataMap.mapping +++ b/mappings/net/minecraft/network/message/ArgumentSignatureDataMap.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_7450 net/minecraft/network/message/ArgumentSignatureDa METHOD method_43746 collectArguments (Lcom/mojang/brigadier/context/CommandContextBuilder;)Ljava/util/List; COMMENT {@return the signable argument names and their values from {@code builder}} ARG 0 builder - METHOD method_43747 resultToText (Lnet/minecraft/class_7451;Lcom/mojang/brigadier/context/ParsedArgument;)Lnet/minecraft/class_2561; + METHOD method_43747 resultToText (Lnet/minecraft/class_7451;Lcom/mojang/brigadier/context/ParsedArgument;)Ljava/lang/String; ARG 0 type ARG 1 argument METHOD method_43748 get (Ljava/lang/String;)Lnet/minecraft/class_7469; @@ -37,6 +37,5 @@ CLASS net/minecraft/class_7450 net/minecraft/network/message/ArgumentSignatureDa ARG 1 buf CLASS class_7600 ArgumentSigner COMMENT A functional interface that signs an argument of a command. - METHOD sign (Ljava/lang/String;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7469; + METHOD sign (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_7469; ARG 1 argumentName - ARG 2 value diff --git a/mappings/net/minecraft/network/message/MessageBody.mapping b/mappings/net/minecraft/network/message/MessageBody.mapping index aafb594197..d4bc5006b5 100644 --- a/mappings/net/minecraft/network/message/MessageBody.mapping +++ b/mappings/net/minecraft/network/message/MessageBody.mapping @@ -4,36 +4,16 @@ CLASS net/minecraft/class_7608 net/minecraft/network/message/MessageBody COMMENT MessageHeader}, clients do not receive this if the message is censored; they receive COMMENT the digest only. FIELD comp_930 timestamp Ljava/time/Instant; - FIELD comp_932 lastSeenMessages Ljava/util/List; + FIELD comp_932 lastSeenMessages Lnet/minecraft/class_7635; FIELD field_39817 LAST_SEEN_SEPARATOR B METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD comp_930 timestamp ()Ljava/time/Instant; - METHOD comp_932 lastSeenMessages ()Ljava/util/List; + METHOD comp_932 lastSeenMessages ()Lnet/minecraft/class_7635; METHOD method_44867 digest ()Lcom/google/common/hash/HashCode; COMMENT {@return the digest of this body} COMMENT COMMENT @implNote This is a SHA-256 hash of the salt, the timestamp represented as the seconds COMMENT since the Unix epoch, {@linkplain #toBytes(Text) the content}, and COMMENT {@linkplain #toBytes(List) the list of each player's last seen message}. - METHOD method_44868 toBytes (Ljava/util/List;)[B - ARG 0 messages METHOD method_44869 write (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_44870 (Lnet/minecraft/class_2540;Lnet/minecraft/class_7608$class_7609;)V - ARG 0 buf2 - ARG 1 lastSeenMessages - METHOD method_44871 toBytes (Lnet/minecraft/class_2561;)[B - COMMENT {@return {@code content} converted to a byte array} - COMMENT - COMMENT @implNote This returns the UTF-8 encoded string representing the - COMMENT JSON serialized version of {@code content}. - ARG 0 content - METHOD method_44872 (Lnet/minecraft/class_7608$class_7609;)I - ARG 0 lastSeenMessage - CLASS class_7609 LastSeenMessage - COMMENT A pair of a player's UUID and the signature of the last message they saw. - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_44873 write (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/message/MessageChain.mapping b/mappings/net/minecraft/network/message/MessageChain.mapping index e7295a4369..1155687b58 100644 --- a/mappings/net/minecraft/network/message/MessageChain.mapping +++ b/mappings/net/minecraft/network/message/MessageChain.mapping @@ -12,24 +12,20 @@ CLASS net/minecraft/class_7610 net/minecraft/network/message/MessageChain COMMENT chain's legitimacy. FIELD field_39818 precedingSignature Lnet/minecraft/class_7469; METHOD method_44874 getUnpacker ()Lnet/minecraft/class_7610$class_7611; - METHOD method_44875 pack (Lnet/minecraft/class_7501;Lnet/minecraft/class_7470;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7610$class_7613; + METHOD method_44875 pack (Lnet/minecraft/class_7501;Lnet/minecraft/class_7470;Lnet/minecraft/class_7634;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7610$class_7613; ARG 1 signer ARG 2 metadata - ARG 3 content - METHOD method_44876 sign (Lnet/minecraft/class_7501;Lnet/minecraft/class_7470;Lnet/minecraft/class_7469;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7469; + METHOD method_44876 sign (Lnet/minecraft/class_7501;Lnet/minecraft/class_7470;Lnet/minecraft/class_7469;Lnet/minecraft/class_7634;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7469; ARG 0 signer ARG 1 metadata ARG 2 precedingSignature - ARG 3 content - METHOD method_44877 createMessage (Lnet/minecraft/class_7610$class_7613;Lnet/minecraft/class_7469;Lnet/minecraft/class_7470;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7471; + METHOD method_44877 createMessage (Lnet/minecraft/class_7610$class_7613;Lnet/minecraft/class_7469;Lnet/minecraft/class_7470;Lnet/minecraft/class_7634;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7471; ARG 0 signature ARG 1 precedingSignature ARG 2 metadata - ARG 3 content - METHOD method_44878 unpack (Lnet/minecraft/class_7610$class_7613;Lnet/minecraft/class_7470;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7471; + METHOD method_44878 unpack (Lnet/minecraft/class_7610$class_7613;Lnet/minecraft/class_7470;Lnet/minecraft/class_7634;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7471; ARG 1 signature ARG 2 metadata - ARG 3 content METHOD method_44879 (Lnet/minecraft/class_7614;[BLnet/minecraft/class_7498$class_7499;)V ARG 2 updatable METHOD method_44880 getPacker ()Lnet/minecraft/class_7610$class_7612; @@ -43,24 +39,21 @@ CLASS net/minecraft/class_7610 net/minecraft/network/message/MessageChain COMMENT COMMENT @see MessageChain#getUnpacker FIELD field_39819 UNSIGNED Lnet/minecraft/class_7610$class_7611; - METHOD method_44881 (Lnet/minecraft/class_7610$class_7613;Lnet/minecraft/class_7470;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7471; + METHOD method_44881 (Lnet/minecraft/class_7610$class_7613;Lnet/minecraft/class_7470;Lnet/minecraft/class_7634;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7471; ARG 0 signature ARG 1 metadata - ARG 2 content - METHOD unpack (Lnet/minecraft/class_7610$class_7613;Lnet/minecraft/class_7470;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7471; + METHOD unpack (Lnet/minecraft/class_7610$class_7613;Lnet/minecraft/class_7470;Lnet/minecraft/class_5837;Lnet/minecraft/class_7635;)Lnet/minecraft/class_5837; ARG 1 signature ARG 2 metadata ARG 3 content - METHOD unpack (Lnet/minecraft/class_7610$class_7613;Lnet/minecraft/class_7470;Lnet/minecraft/class_5837;)Lnet/minecraft/class_5837; + METHOD unpack (Lnet/minecraft/class_7610$class_7613;Lnet/minecraft/class_7470;Lnet/minecraft/class_7634;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7471; ARG 1 signature ARG 2 metadata - ARG 3 content CLASS class_7612 Packer COMMENT Packers sign a message on the client with its preceding message's signature. COMMENT COMMENT @see MessageChain#getPacker - METHOD pack (Lnet/minecraft/class_7501;Lnet/minecraft/class_7470;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7610$class_7613; + METHOD pack (Lnet/minecraft/class_7501;Lnet/minecraft/class_7470;Lnet/minecraft/class_7634;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7610$class_7613; ARG 1 signer ARG 2 metadata - ARG 3 content CLASS class_7613 Signature diff --git a/mappings/net/minecraft/network/message/MessageDecorator.mapping b/mappings/net/minecraft/network/message/MessageDecorator.mapping index d1c998692c..b82217c204 100644 --- a/mappings/net/minecraft/network/message/MessageDecorator.mapping +++ b/mappings/net/minecraft/network/message/MessageDecorator.mapping @@ -19,9 +19,6 @@ CLASS net/minecraft/class_7492 net/minecraft/network/message/MessageDecorator COMMENT a delay between the previewing and the submission. FIELD field_39384 NOOP Lnet/minecraft/class_7492; COMMENT An empty message decorator that returns the original message. - METHOD attachDecoration (Lnet/minecraft/class_5837;Lnet/minecraft/class_5837;)Lnet/minecraft/class_5837; - ARG 0 message - ARG 1 decoratedMessage METHOD decorate (Lnet/minecraft/class_3222;Lnet/minecraft/class_2561;)Ljava/util/concurrent/CompletableFuture; COMMENT {@return the decorated {@code message}} ARG 1 sender @@ -36,17 +33,8 @@ CLASS net/minecraft/class_7492 net/minecraft/network/message/MessageDecorator COMMENT is partially filtered, both the raw and the filtered message will be decorated. ARG 1 sender ARG 2 message - METHOD decorateSignedChat (Lnet/minecraft/class_3222;Lnet/minecraft/class_5837;)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 METHOD method_44305 (Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Ljava/lang/Void;)Lnet/minecraft/class_5837; ARG 2 void_ - METHOD method_44828 (Lnet/minecraft/class_5837;Lnet/minecraft/class_5837;)Lnet/minecraft/class_5837; - ARG 1 decoratedMessage - METHOD method_44829 (Lnet/minecraft/class_5837;Lnet/minecraft/class_7471;)Lnet/minecraft/class_7471; - ARG 1 filteredMessage - METHOD method_44830 (Lnet/minecraft/class_5837;Lnet/minecraft/class_7471;)Lnet/minecraft/class_7471; - ARG 1 rawMessage diff --git a/mappings/net/minecraft/network/message/MessageSignatureData.mapping b/mappings/net/minecraft/network/message/MessageSignatureData.mapping index 0f0cced082..275978b27b 100644 --- a/mappings/net/minecraft/network/message/MessageSignatureData.mapping +++ b/mappings/net/minecraft/network/message/MessageSignatureData.mapping @@ -25,7 +25,5 @@ CLASS net/minecraft/class_7469 net/minecraft/network/message/MessageSignatureDat ARG 1 buf METHOD method_44846 (Lnet/minecraft/class_7614;[BLnet/minecraft/class_7498$class_7499;)V ARG 2 updatable - METHOD method_44847 toStringOrNull ()Ljava/lang/String; - COMMENT {@return the base64-encoded data, or {@code null} if the data is empty} METHOD method_44848 (Lnet/minecraft/class_7614;[BLnet/minecraft/class_7498$class_7499;)V ARG 2 updatable diff --git a/mappings/net/minecraft/network/message/MessageType.mapping b/mappings/net/minecraft/network/message/MessageType.mapping index 10acd305f3..a9627dc09d 100644 --- a/mappings/net/minecraft/network/message/MessageType.mapping +++ b/mappings/net/minecraft/network/message/MessageType.mapping @@ -31,11 +31,6 @@ CLASS net/minecraft/class_2556 net/minecraft/network/message/MessageType COMMENT net.minecraft.server.command.SayCommand /say}. The message content is COMMENT {@linkplain Decoration#ofChat decorated} using the {@code chat.type.announcement} COMMENT text. - FIELD field_39230 Lnet/minecraft/class_5321; - COMMENT The registry key for the team message command message type, used by {@linkplain - COMMENT net.minecraft.server.command.TeamMsgCommand /teammsg}. The message content is - COMMENT {@linkplain Decoration#ofTeamMessage decorated} using the - COMMENT {@code chat.type.team.text} text. FIELD field_39231 Lnet/minecraft/class_5321; COMMENT The registry key for the emote command message type, used by {@linkplain COMMENT net.minecraft.server.command.MeCommand /me}. The message content is diff --git a/mappings/net/minecraft/network/message/MessageVerifier.mapping b/mappings/net/minecraft/network/message/MessageVerifier.mapping index 4f04f37572..d2bfe3a4b4 100644 --- a/mappings/net/minecraft/network/message/MessageVerifier.mapping +++ b/mappings/net/minecraft/network/message/MessageVerifier.mapping @@ -3,7 +3,6 @@ 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. - FIELD field_39820 NOOP Lnet/minecraft/class_7615; METHOD method_44885 create (Lnet/minecraft/class_7428;)Lnet/minecraft/class_7615; ARG 0 publicKey METHOD method_44886 verify (Lnet/minecraft/class_7471;)Z @@ -23,6 +22,3 @@ CLASS net/minecraft/class_7615 net/minecraft/network/message/MessageVerifier FIELD field_39823 precedingSignature Lnet/minecraft/class_7469; METHOD (Lnet/minecraft/class_7500;)V ARG 1 signatureVerifier - METHOD method_44888 verifyChain (Lnet/minecraft/class_7614;Lnet/minecraft/class_7469;)Z - ARG 1 header - ARG 2 signature diff --git a/mappings/net/minecraft/network/message/SignedCommandArguments.mapping b/mappings/net/minecraft/network/message/SignedCommandArguments.mapping index c81df3a218..beeaaf18e8 100644 --- a/mappings/net/minecraft/network/message/SignedCommandArguments.mapping +++ b/mappings/net/minecraft/network/message/SignedCommandArguments.mapping @@ -1,11 +1,7 @@ CLASS net/minecraft/class_7448 net/minecraft/network/message/SignedCommandArguments COMMENT An interface wrapping {@link ArgumentSignatureDataMap} with metadata attached. METHOD comp_911 metadata ()Lnet/minecraft/class_7470; - METHOD method_44250 isPreviewSigned (Ljava/lang/String;)Z - ARG 1 argumentName METHOD method_44795 none ()Lnet/minecraft/class_7448; - METHOD method_44796 getArgumentSignature (Ljava/lang/String;)Lnet/minecraft/class_7469; - ARG 1 argumentName CLASS class_7449 Impl COMMENT A signature for command arguments, consisting of the sender, the timestamp, COMMENT and the signature datas for the arguments. diff --git a/mappings/net/minecraft/network/message/SignedMessage.mapping b/mappings/net/minecraft/network/message/SignedMessage.mapping index 8862a90ef7..7e8f8cc545 100644 --- a/mappings/net/minecraft/network/message/SignedMessage.mapping +++ b/mappings/net/minecraft/network/message/SignedMessage.mapping @@ -37,7 +37,7 @@ CLASS net/minecraft/class_7471 net/minecraft/network/message/SignedMessage COMMENT {@return a new signed message without valid signatures} ARG 0 metadata ARG 1 content - METHOD method_44862 getSignedContent ()Lnet/minecraft/class_2561; + METHOD method_44862 getSignedContent ()Lnet/minecraft/class_7634; METHOD method_44863 withUnsignedContent (Lnet/minecraft/class_2561;)Lnet/minecraft/class_7471; ARG 1 unsignedContent METHOD method_44864 getTimestamp ()Ljava/time/Instant; diff --git a/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping index 31f85127e5..f6f4dbada0 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping @@ -23,7 +23,7 @@ CLASS net/minecraft/class_2797 net/minecraft/network/packet/c2s/play/ChatMessage COMMENT @see net.minecraft.server.network.ServerPlayNetworkHandler#onChatMessage FIELD comp_945 chatMessage Ljava/lang/String; FIELD comp_946 timestamp Ljava/time/Instant; - METHOD (Ljava/lang/String;Ljava/time/Instant;JLnet/minecraft/class_7469;Z)V + METHOD (Ljava/lang/String;Ljava/time/Instant;JLnet/minecraft/class_7469;ZLnet/minecraft/class_7635$class_7636;)V ARG 1 chatMessage ARG 2 timestamp ARG 3 salt diff --git a/mappings/net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket.mapping index 6253880740..64d29f7230 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket.mapping @@ -22,7 +22,7 @@ CLASS net/minecraft/class_7472 net/minecraft/network/packet/c2s/play/CommandExec COMMENT @see net.minecraft.client.network.ClientPlayerEntity#sendCommand COMMENT @see net.minecraft.server.network.ServerPlayNetworkHandler#onCommandExecution FIELD comp_809 timestamp Ljava/time/Instant; - METHOD (Ljava/lang/String;Ljava/time/Instant;JLnet/minecraft/class_7450;Z)V + METHOD (Ljava/lang/String;Ljava/time/Instant;JLnet/minecraft/class_7450;ZLnet/minecraft/class_7635$class_7636;)V ARG 1 command ARG 2 timestamp ARG 3 salt diff --git a/mappings/net/minecraft/server/command/ServerCommandSource.mapping b/mappings/net/minecraft/server/command/ServerCommandSource.mapping index 5417fd4ef3..6c838b3c1c 100644 --- a/mappings/net/minecraft/server/command/ServerCommandSource.mapping +++ b/mappings/net/minecraft/server/command/ServerCommandSource.mapping @@ -28,7 +28,7 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource ARG 7 displayName ARG 8 server ARG 9 entity - METHOD (Lnet/minecraft/class_2165;Lnet/minecraft/class_243;Lnet/minecraft/class_241;Lnet/minecraft/class_3218;ILjava/lang/String;Lnet/minecraft/class_2561;Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_1297;ZLcom/mojang/brigadier/ResultConsumer;Lnet/minecraft/class_2183$class_2184;Lnet/minecraft/class_7448;)V + METHOD (Lnet/minecraft/class_2165;Lnet/minecraft/class_243;Lnet/minecraft/class_241;Lnet/minecraft/class_3218;ILjava/lang/String;Lnet/minecraft/class_2561;Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_1297;ZLcom/mojang/brigadier/ResultConsumer;Lnet/minecraft/class_2183$class_2184;Lnet/minecraft/class_7448;Lnet/minecraft/class_7620;)V ARG 1 output ARG 2 pos ARG 3 rot diff --git a/mappings/net/minecraft/server/command/TeamMsgCommand.mapping b/mappings/net/minecraft/server/command/TeamMsgCommand.mapping index 7def04fd89..5baca01171 100644 --- a/mappings/net/minecraft/server/command/TeamMsgCommand.mapping +++ b/mappings/net/minecraft/server/command/TeamMsgCommand.mapping @@ -10,5 +10,5 @@ CLASS net/minecraft/class_3945 net/minecraft/server/command/TeamMsgCommand ARG 0 context METHOD method_44147 (Lnet/minecraft/class_1297;Lnet/minecraft/class_268;Lnet/minecraft/class_3222;)Z ARG 2 player - METHOD method_44148 (Lnet/minecraft/class_7436;Ljava/util/List;Lnet/minecraft/class_1297;Lnet/minecraft/class_2561;Lnet/minecraft/class_2168;Lnet/minecraft/class_2556$class_7602;Lnet/minecraft/class_5837;)V + METHOD method_44148 (Lnet/minecraft/class_7436;Ljava/util/List;Lnet/minecraft/class_1297;Lnet/minecraft/class_2556$class_7602;Lnet/minecraft/class_2168;Lnet/minecraft/class_2556$class_7602;Lnet/minecraft/class_5837;)V ARG 6 decoratedMessage diff --git a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping index 9692b8e61b..900ba358f5 100644 --- a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping @@ -48,14 +48,6 @@ CLASS net/minecraft/class_3248 net/minecraft/server/network/ServerLoginNetworkHa COMMENT player and transition to the delay accept state. COMMENT COMMENT @apiNote This method should only be called on the server thread. - METHOD method_18785 tick ()V - COMMENT Ticks this login network handler. - COMMENT - COMMENT

This accepts the player to the server if ready. If the state is delay - COMMENT accept, it checks if the old player with the same UUID is gone and - COMMENT admits the player. - COMMENT - COMMENT @apiNote This should only be called on the server thread. METHOD method_33800 addToServer (Lnet/minecraft/class_3222;)V ARG 1 player METHOD method_40084 (I)Z diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index 2a697b1368..59d0c5956f 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -38,7 +38,6 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan FIELD field_39394 lastMessageTimestamp Ljava/util/concurrent/atomic/AtomicReference; FIELD field_39805 messageUnpacker Lnet/minecraft/class_7610$class_7611; 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 @@ -74,7 +73,6 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan METHOD method_14372 syncWithPlayerPosition ()V METHOD method_17820 (Lnet/minecraft/class_2840;Lnet/minecraft/class_1860;)V ARG 2 recipe - METHOD method_18784 tick ()V METHOD method_19507 isHost ()Z METHOD method_20630 isPlayerNotCollidingWithBlocks (Lnet/minecraft/class_4538;Lnet/minecraft/class_238;)Z ARG 1 world @@ -89,17 +87,15 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan ARG 1 entity METHOD method_31274 (ILjava/util/List;)V ARG 2 texts - METHOD method_31275 filterText (Ljava/lang/Object;Ljava/util/function/Consumer;Ljava/util/function/BiFunction;)V + METHOD method_31275 filterText (Ljava/lang/Object;Ljava/util/function/Function;Ljava/util/function/BiFunction;)Ljava/util/concurrent/CompletableFuture; ARG 1 text - ARG 2 consumer ARG 3 backingFilterer METHOD method_31276 addBook (Lnet/minecraft/class_5837;Ljava/util/List;I)V ARG 1 title ARG 2 pages ARG 3 slotId - METHOD method_31277 filterText (Ljava/lang/String;Ljava/util/function/Consumer;)V + METHOD method_31277 filterText (Ljava/lang/String;Ljava/util/function/Function;)Ljava/util/concurrent/CompletableFuture; ARG 1 text - ARG 2 consumer METHOD method_31278 updateBookContent (Ljava/util/List;I)V ARG 1 pages ARG 2 slotId @@ -111,13 +107,9 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan ARG 2 signText METHOD method_31283 (ILjava/util/List;)V ARG 2 texts - METHOD method_31284 (Ljava/util/function/Consumer;Ljava/lang/Object;Ljava/lang/Object;)V - ARG 3 message METHOD method_31285 (Lnet/minecraft/class_2877;Ljava/util/List;)V ARG 2 texts - METHOD method_31286 handleMessage (Lnet/minecraft/class_2797;Lnet/minecraft/class_5837;)V - ARG 1 packet - ARG 2 message + METHOD method_31286 handleMessage (Lnet/minecraft/class_2797;Lnet/minecraft/class_5837;)Ljava/util/concurrent/CompletableFuture; METHOD method_33562 requestTeleportAndDismount (DDDFF)V ARG 1 x ARG 3 y @@ -151,8 +143,6 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan COMMENT COMMENT @see net.minecraft.SharedConstants#isValidChar(char) ARG 0 message - METHOD method_43509 (Lnet/minecraft/class_2797;Lnet/minecraft/class_5837;)V - ARG 2 message METHOD method_43669 checkForSpam ()V METHOD method_44154 (ILnet/minecraft/class_2561;)V ARG 2 decorated @@ -176,15 +166,13 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan METHOD method_44318 sendChatPreviewPacket (ILnet/minecraft/class_2561;)V ARG 1 queryId ARG 2 preview - METHOD method_44337 canAcceptMessage (Ljava/lang/String;Ljava/time/Instant;)Z + METHOD method_44337 canAcceptMessage (Ljava/lang/String;Ljava/time/Instant;Lnet/minecraft/class_7635$class_7636;)Z COMMENT {@return whether {@code message}, sent at {@code timestamp}, should be accepted} COMMENT COMMENT @implNote This returns {@code false} if the message arrives in {@linkplain COMMENT #isInProperOrder improper order} or if chat is disabled. ARG 1 message ARG 2 timestamp - METHOD method_44789 (Lnet/minecraft/class_7610$class_7613;Lnet/minecraft/class_7470;Lnet/minecraft/class_5837;)Lnet/minecraft/class_5837; - ARG 3 decoratedMessage METHOD method_44790 getMessageUnpacker ()Lnet/minecraft/class_7610$class_7611; CLASS 1 METHOD method_33897 processInteract (Lnet/minecraft/class_1268;Lnet/minecraft/class_3244$class_5860;)V