diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping index f23cf57215..a88049f095 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping @@ -31,6 +31,7 @@ CLASS net/minecraft/class_5519 net/minecraft/client/gui/screen/multiplayer/Socia FIELD field_39791 canSendReports Z FIELD field_39936 NOT_REPORTABLE_TEXT Lnet/minecraft/class_2561; FIELD field_39937 reportable Z + FIELD field_40796 hasDraftReport Z METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_5522;Ljava/util/UUID;Ljava/lang/String;Ljava/util/function/Supplier;Z)V ARG 1 client ARG 2 parent @@ -58,6 +59,8 @@ CLASS net/minecraft/class_5519 net/minecraft/client/gui/screen/multiplayer/Socia METHOD method_31389 getNarrationMessage (Lnet/minecraft/class_5250;)Lnet/minecraft/class_5250; ARG 1 text METHOD method_31390 getStatusText ()Lnet/minecraft/class_2561; + METHOD method_44525 (Lnet/minecraft/class_7574;Lnet/minecraft/class_310;Lnet/minecraft/class_5522;Ljava/util/UUID;Lnet/minecraft/class_4185;)V + ARG 4 button METHOD method_44753 setSentMessage (Z)V ARG 1 sentMessage METHOD method_44754 isOffline ()Z diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping index aca6cc39d0..2a14c5ddae 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping @@ -38,6 +38,8 @@ CLASS net/minecraft/class_5521 net/minecraft/client/gui/screen/multiplayer/Socia ARG 2 includeOffline METHOD method_44760 (Lnet/minecraft/class_5519;)Ljava/lang/Integer; ARG 0 player + 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/gui/screen/report/ChatReportScreen.mapping b/mappings/net/minecraft/client/gui/screen/report/ChatReportScreen.mapping index 29e97f1ccf..161f25c111 100644 --- a/mappings/net/minecraft/client/gui/screen/report/ChatReportScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/report/ChatReportScreen.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_7538 net/minecraft/client/gui/screen/report/ChatReportScreen FIELD field_39555 parent Lnet/minecraft/class_437; - FIELD field_39556 reporter Lnet/minecraft/class_7574; + FIELD field_39556 context Lnet/minecraft/class_7574; FIELD field_39557 reasonDescription Lnet/minecraft/class_5489; FIELD field_39558 editBox Lnet/minecraft/class_7529; FIELD field_39559 sendButton Lnet/minecraft/class_4185; @@ -22,10 +22,19 @@ CLASS net/minecraft/class_7538 net/minecraft/client/gui/screen/report/ChatReport FIELD field_39576 GENERIC_ERROR_TEXT Lnet/minecraft/class_2561; FIELD field_39748 REPORT_SENT_TITLE Lnet/minecraft/class_2561; FIELD field_39749 REPORT_ERROR_TITLE Lnet/minecraft/class_2561; + FIELD field_40793 report Lnet/minecraft/class_7566; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Ljava/util/UUID;)V ARG 1 parent ARG 2 reporter ARG 3 reportedPlayerUuid + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Lnet/minecraft/class_7566$class_7855;)V + ARG 1 parent + ARG 2 context + ARG 3 draft + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Lnet/minecraft/class_7566;)V + ARG 1 parent + ARG 2 context + ARG 3 report METHOD method_44456 getTop ()I METHOD method_44457 getBottom ()I METHOD method_44458 getSelectionButtonY ()I @@ -63,11 +72,18 @@ CLASS net/minecraft/class_7538 net/minecraft/client/gui/screen/report/ChatReport ARG 1 validationError METHOD method_45054 showErrorScreen (Lnet/minecraft/class_2561;)V ARG 1 message + METHOD method_46516 setDraft ()V + METHOD method_46517 clearDraft ()V CLASS class_7539 DiscardWarningScreen FIELD field_39723 TITLE Lnet/minecraft/class_2561; FIELD field_39724 MESSAGE Lnet/minecraft/class_2561; FIELD field_39725 RETURN_BUTTON_TEXT Lnet/minecraft/class_2561; FIELD field_39726 DISCARD_BUTTON_TEXT Lnet/minecraft/class_2561; + FIELD field_40794 DRAFT_BUTTON_TEXT Lnet/minecraft/class_2561; METHOD method_44483 (Lnet/minecraft/class_4185;)V ARG 1 button + METHOD method_46518 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_46519 (Lnet/minecraft/class_4185;)V + ARG 1 button CLASS class_7540 ValidationErrorTooltipSupplier diff --git a/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping index 6f7784ea88..5d5922bdda 100644 --- a/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping @@ -9,6 +9,9 @@ CLASS net/minecraft/class_635 net/minecraft/client/network/ClientLoginNetworkHan METHOD (Lnet/minecraft/class_2535;Lnet/minecraft/class_310;Lnet/minecraft/class_642;Lnet/minecraft/class_437;Ljava/util/function/Consumer;)V ARG 1 connection ARG 2 client + ARG 3 serverInfo + ARG 4 parentScreen + ARG 5 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 9ea1e0e44e..c657caa00a 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -28,12 +28,17 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand FIELD field_40483 signatureStorage Lnet/minecraft/class_7561; FIELD field_40485 INVALID_PACKET_TEXT Lnet/minecraft/class_2561; FIELD field_40486 CHAT_VALIDATION_FAILED_TEXT Lnet/minecraft/class_2561; + FIELD field_40487 ACKNOWLEDGMENT_BATCH_SIZE I FIELD field_40488 serverInfo Lnet/minecraft/class_642; FIELD field_40489 listedPlayerListEntries Ljava/util/Set; + FIELD field_40799 session Lnet/minecraft/class_7818; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_437;Lnet/minecraft/class_2535;Lnet/minecraft/class_642;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_6628;)V ARG 1 client ARG 2 screen ARG 3 connection + ARG 4 serverInfo + ARG 5 profile + ARG 6 telemetrySender METHOD method_16690 getSessionId ()Ljava/util/UUID; METHOD method_19691 getActiveTotemOfUndying (Lnet/minecraft/class_1657;)Lnet/minecraft/class_1799; ARG 0 player @@ -150,3 +155,14 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand METHOD method_45735 getEnabledFeatures ()Lnet/minecraft/class_7699; METHOD method_45736 refreshItemGroups ()V METHOD method_45737 sendAcknowledgment ()V + METHOD method_46524 updateKeyPair (Lnet/minecraft/class_7427;)V + ARG 1 keyPair + METHOD method_46525 (Ljava/util/Optional;)V + ARG 1 keyPair + METHOD method_46526 setSession (Lnet/minecraft/class_7818;)V + ARG 1 session + METHOD method_46527 (Lnet/minecraft/class_7427;)V + ARG 1 keys + METHOD method_46528 (Ljava/util/Optional;)V + ARG 1 keyPair + METHOD method_46529 isSecureChatEnforced ()Z diff --git a/mappings/net/minecraft/client/network/PlayerListEntry.mapping b/mappings/net/minecraft/client/network/PlayerListEntry.mapping index 32b391242d..25aa04e67b 100644 --- a/mappings/net/minecraft/client/network/PlayerListEntry.mapping +++ b/mappings/net/minecraft/client/network/PlayerListEntry.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_640 net/minecraft/client/network/PlayerListEntry FIELD field_40495 session Lnet/minecraft/class_7822; METHOD (Lcom/mojang/authlib/GameProfile;Z)V ARG 1 profile + ARG 2 secureChatEnforced 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 @@ -40,3 +41,7 @@ CLASS net/minecraft/class_640 net/minecraft/client/network/PlayerListEntry ARG 1 session METHOD method_45741 getSession ()Lnet/minecraft/class_7822; METHOD method_45742 hasPublicKey ()Z + METHOD method_46530 resetSession (Z)V + ARG 1 secureChatEnforced + METHOD method_46531 getInitialVerifier (Z)Lnet/minecraft/class_7615; + ARG 0 secureChatEnforced diff --git a/mappings/net/minecraft/client/report/AbuseReportContext.mapping b/mappings/net/minecraft/client/report/AbuseReportContext.mapping index daa3bdeda3..41ccde330d 100644 --- a/mappings/net/minecraft/client/report/AbuseReportContext.mapping +++ b/mappings/net/minecraft/client/report/AbuseReportContext.mapping @@ -1,7 +1,28 @@ CLASS net/minecraft/class_7574 net/minecraft/client/report/AbuseReportContext FIELD field_39675 MAX_LOGS I + FIELD field_40819 sender Lnet/minecraft/class_7563; + FIELD field_40820 environment Lnet/minecraft/class_7569; + FIELD field_40821 chatLog Lnet/minecraft/class_7555; + FIELD field_40822 draft Lnet/minecraft/class_7566$class_7855; + METHOD (Lnet/minecraft/class_7563;Lnet/minecraft/class_7569;Lnet/minecraft/class_7555;)V + ARG 1 sender + ARG 2 environment + ARG 3 chatLog METHOD method_44598 environmentEquals (Lnet/minecraft/class_7569;)Z ARG 1 environment METHOD method_44599 create (Lnet/minecraft/class_7569;Lcom/mojang/authlib/minecraft/UserApiService;)Lnet/minecraft/class_7574; ARG 0 environment ARG 1 userApiService + METHOD method_46550 getSender ()Lnet/minecraft/class_7563; + METHOD method_46551 (Lnet/minecraft/class_310;Lnet/minecraft/class_437;Lnet/minecraft/class_7566$class_7855;Z)V + ARG 4 confirmed + METHOD method_46552 tryShowDraftScreen (Lnet/minecraft/class_310;Lnet/minecraft/class_437;Z)Z + ARG 1 client + ARG 2 parent + ARG 3 quitting + METHOD method_46553 setDraft (Lnet/minecraft/class_7566$class_7855;)V + ARG 1 draft + METHOD method_46554 draftPlayerUuidEquals (Ljava/util/UUID;)Z + ARG 1 uuid + METHOD method_46555 getChatLog ()Lnet/minecraft/class_7555; + METHOD method_46556 hasDraft ()Z diff --git a/mappings/net/minecraft/client/report/ChatAbuseReport.mapping b/mappings/net/minecraft/client/report/ChatAbuseReport.mapping index d793fdc729..c7eca696b0 100644 --- a/mappings/net/minecraft/client/report/ChatAbuseReport.mapping +++ b/mappings/net/minecraft/client/report/ChatAbuseReport.mapping @@ -1,7 +1,12 @@ CLASS net/minecraft/class_7566 net/minecraft/client/report/ChatAbuseReport FIELD field_39651 limits Lcom/mojang/authlib/minecraft/report/AbuseReportLimits; + FIELD field_40811 draft Lnet/minecraft/class_7566$class_7855; METHOD (Ljava/util/UUID;Lcom/mojang/authlib/minecraft/report/AbuseReportLimits;)V ARG 1 reportedPlayerUuid + ARG 2 limits + METHOD (Lnet/minecraft/class_7566$class_7855;Lcom/mojang/authlib/minecraft/report/AbuseReportLimits;)V + ARG 1 draft + ARG 2 limits METHOD method_44568 getReportedPlayerUuid ()Ljava/util/UUID; METHOD method_44569 toggleMessageSelection (I)V ARG 1 index @@ -26,9 +31,28 @@ CLASS net/minecraft/class_7566 net/minecraft/client/report/ChatAbuseReport METHOD method_44962 (Ljava/util/List;ILnet/minecraft/class_7557$class_7558;)V ARG 2 index ARG 3 message + METHOD method_46545 getDraft ()Lnet/minecraft/class_7566$class_7855; + METHOD method_46546 hasContents ()Z 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; FIELD field_39657 TOO_MANY_MESSAGES Lnet/minecraft/class_7566$class_7567; FIELD field_39658 COMMENTS_TOO_LONG Lnet/minecraft/class_7566$class_7567; CLASS class_7568 ReportWithId + CLASS class_7855 Draft + FIELD field_40813 reportId Ljava/util/UUID; + FIELD field_40814 currentTime Ljava/time/Instant; + FIELD field_40815 reportedPlayerUuid Ljava/util/UUID; + FIELD field_40816 selections Lit/unimi/dsi/fastutil/ints/IntSet; + FIELD field_40817 opinionComments Ljava/lang/String; + FIELD field_40818 reason Lnet/minecraft/class_7573; + METHOD (Lnet/minecraft/class_7566;Ljava/util/UUID;Ljava/time/Instant;Ljava/util/UUID;)V + ARG 2 reportId + ARG 3 currentTime + ARG 4 reportedPlayerUuid + METHOD method_46547 copy ()Lnet/minecraft/class_7566$class_7855; + METHOD method_46548 toggleMessageSelection (ILcom/mojang/authlib/minecraft/report/AbuseReportLimits;)V + ARG 1 index + ARG 2 limits + METHOD method_46549 playerUuidEquals (Ljava/util/UUID;)Z + ARG 1 uuid diff --git a/mappings/net/minecraft/client/report/MessagesListAdder.mapping b/mappings/net/minecraft/client/report/MessagesListAdder.mapping index 102186a704..7407fd16be 100644 --- a/mappings/net/minecraft/client/report/MessagesListAdder.mapping +++ b/mappings/net/minecraft/client/report/MessagesListAdder.mapping @@ -5,12 +5,16 @@ CLASS net/minecraft/class_7541 net/minecraft/client/report/MessagesListAdder FIELD field_40440 maxLogIndex I FIELD field_40441 foldedMessageCount I FIELD field_40442 lastMessage Lnet/minecraft/class_7471; + FIELD field_40795 link Lnet/minecraft/class_7826; 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_7541$class_7542;Lnet/minecraft/class_7557$class_7558;)Z + ARG 1 messages + ARG 2 message CLASS class_7542 MessagesList METHOD method_44490 addMessage (ILnet/minecraft/class_7557$class_7558;)V ARG 1 index diff --git a/mappings/net/minecraft/client/report/log/ChatLog.mapping b/mappings/net/minecraft/client/report/log/ChatLog.mapping index 6c5e056bbd..52870493ab 100644 --- a/mappings/net/minecraft/client/report/log/ChatLog.mapping +++ b/mappings/net/minecraft/client/report/log/ChatLog.mapping @@ -7,7 +7,10 @@ CLASS net/minecraft/class_7555 net/minecraft/client/report/log/ChatLog FIELD field_40496 entries [Lnet/minecraft/class_7629; FIELD field_40497 currentIndex I METHOD (I)V + ARG 1 maxSize + METHOD (ILjava/util/List;)V ARG 1 size + ARG 2 entries 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} @@ -19,3 +22,11 @@ CLASS net/minecraft/class_7555 net/minecraft/client/report/log/ChatLog METHOD method_45752 getMaxIndex ()I METHOD method_45753 wrapIndex (I)I ARG 1 index + METHOD method_46533 createCodec (I)Lcom/mojang/serialization/Codec; + ARG 0 maxSize + METHOD method_46534 (II)[Lnet/minecraft/class_7629; + ARG 1 currentIndex + METHOD method_46535 (ILjava/util/List;)Lcom/mojang/serialization/DataResult; + ARG 1 entries + METHOD method_46536 toList ()Ljava/util/List; + METHOD method_46537 size ()I diff --git a/mappings/net/minecraft/client/report/log/ChatLogEntry.mapping b/mappings/net/minecraft/client/report/log/ChatLogEntry.mapping index 90fd34c59b..8be32ab644 100644 --- a/mappings/net/minecraft/client/report/log/ChatLogEntry.mapping +++ b/mappings/net/minecraft/client/report/log/ChatLogEntry.mapping @@ -1,2 +1,11 @@ CLASS net/minecraft/class_7629 net/minecraft/client/report/log/ChatLogEntry COMMENT An entry logged to {@link ChatLog}. + FIELD field_40803 CODEC Lcom/mojang/serialization/Codec; + METHOD method_46538 getType ()Lnet/minecraft/class_7629$class_7854; + CLASS class_7854 Type + FIELD field_40806 id Ljava/lang/String; + FIELD field_40807 codecSupplier Ljava/util/function/Supplier; + METHOD (Ljava/lang/String;ILjava/lang/String;Ljava/util/function/Supplier;)V + ARG 3 id + ARG 4 codecSupplier + METHOD method_46539 getCodec ()Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/client/report/log/ReceivedMessage.mapping b/mappings/net/minecraft/client/report/log/ReceivedMessage.mapping index 4c89b50eb3..b8ac2e788a 100644 --- a/mappings/net/minecraft/client/report/log/ReceivedMessage.mapping +++ b/mappings/net/minecraft/client/report/log/ReceivedMessage.mapping @@ -34,6 +34,7 @@ CLASS net/minecraft/class_7557 net/minecraft/client/report/log/ReceivedMessage COMMENT A chat message received by the client. FIELD comp_905 trustStatus Lnet/minecraft/class_7595; FIELD field_39637 DATE_TIME_FORMATTER Ljava/time/format/DateTimeFormatter; + FIELD field_40809 CHAT_MESSAGE_CODEC Lcom/mojang/serialization/Codec; METHOD comp_905 trustStatus ()Lnet/minecraft/class_7595; METHOD method_44556 getHeadingText ()Lnet/minecraft/class_2561; COMMENT {@return the heading text used by Chat Selection screen} @@ -43,7 +44,12 @@ CLASS net/minecraft/class_7557 net/minecraft/client/report/log/ReceivedMessage COMMENT {@return the UUID of the sender} METHOD method_44558 getFormattedTimestamp ()Lnet/minecraft/class_2561; COMMENT {@return the formatted timestamp text of this message} + METHOD method_46543 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance CLASS class_7559 GameMessage COMMENT A game message received by the client. FIELD comp_872 timestamp Ljava/time/Instant; + FIELD field_40810 GAME_MESSAGE_CODEC Lcom/mojang/serialization/Codec; METHOD comp_872 timestamp ()Ljava/time/Instant; + METHOD method_46544 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/client/util/ProfileKeys.mapping b/mappings/net/minecraft/client/util/ProfileKeys.mapping index 68c548556d..2f7f6c55df 100644 --- a/mappings/net/minecraft/client/util/ProfileKeys.mapping +++ b/mappings/net/minecraft/client/util/ProfileKeys.mapping @@ -1,40 +1,8 @@ -CLASS net/minecraft/class_7434 net/minecraft/client/util/ProfileKeys - COMMENT A class to fetch, load, and save the player's public and private keys. - FIELD field_39074 LOGGER Lorg/slf4j/Logger; - FIELD field_39075 PROFILE_KEYS_PATH Ljava/nio/file/Path; - FIELD field_39076 jsonPath Ljava/nio/file/Path; - FIELD field_39958 userApiService Lcom/mojang/authlib/minecraft/UserApiService; - FIELD field_39959 keyFuture Ljava/util/concurrent/CompletableFuture; - METHOD (Lcom/mojang/authlib/minecraft/UserApiService;Ljava/util/UUID;Ljava/nio/file/Path;)V - ARG 2 uuid - ARG 3 root - METHOD method_43600 saveKeyPairToFile (Lnet/minecraft/class_7427;)V - COMMENT Saves the {@code keyPair} to the cache file if {@link - COMMENT net.minecraft.SharedConstants#isDevelopment} is {@code true}; - COMMENT otherwise, just deletes the cache file. - ARG 1 keyPair - METHOD method_43601 (Lcom/google/gson/JsonElement;)V - ARG 1 json - METHOD method_43602 getKeyPair (Ljava/util/Optional;)Ljava/util/concurrent/CompletableFuture; - COMMENT Gets the key pair from the file cache, or if it is unavailable or expired, - COMMENT the Mojang server. - ARG 1 currentKey - METHOD method_43605 fetchKeyPair (Lcom/mojang/authlib/minecraft/UserApiService;)Lnet/minecraft/class_7427; - COMMENT {@return the key pair fetched from Mojang's server} - COMMENT - COMMENT @throws NetworkEncryptionException when the fetched key is malformed - COMMENT @throws IOException when fetching fails - ARG 1 userApiService - METHOD method_43606 loadKeyPairFromFile ()Ljava/util/Optional; - COMMENT {@return the profile keys from the local cache} - COMMENT - COMMENT

This can return expired keys. - COMMENT - COMMENT @implNote The cache file is stored at {@code .minecraft/profilekeys/.json}. - METHOD method_44076 decodeKeyPairResponse (Lcom/mojang/authlib/yggdrasil/response/KeyPairResponse;)Lnet/minecraft/class_7428$class_7443; - COMMENT {@return {@code keyPairResponse} decoded to {@link PlayerPublicKey.PublicKeyData}} - COMMENT - COMMENT @throws NetworkEncryptionException when the response is malformed - ARG 0 keyPairResponse - METHOD method_45109 (Lnet/minecraft/class_7427;)Z - ARG 0 key +CLASS net/minecraft/class_7853 net/minecraft/client/util/ProfileKeys + FIELD field_40800 MISSING Lnet/minecraft/class_7853; + METHOD method_46522 fetchKeyPair ()Ljava/util/concurrent/CompletableFuture; + METHOD method_46523 isExpired ()Z + METHOD method_46532 create (Lcom/mojang/authlib/minecraft/UserApiService;Lnet/minecraft/class_320;Ljava/nio/file/Path;)Lnet/minecraft/class_7853; + ARG 0 userApiService + ARG 1 session + ARG 2 root diff --git a/mappings/net/minecraft/client/util/ProfileKeysImpl.mapping b/mappings/net/minecraft/client/util/ProfileKeysImpl.mapping new file mode 100644 index 0000000000..1ee1d99a5f --- /dev/null +++ b/mappings/net/minecraft/client/util/ProfileKeysImpl.mapping @@ -0,0 +1,43 @@ +CLASS net/minecraft/class_7434 net/minecraft/client/util/ProfileKeysImpl + COMMENT A class to fetch, load, and save the player's public and private keys. + FIELD field_39074 LOGGER Lorg/slf4j/Logger; + FIELD field_39075 PROFILE_KEYS_PATH Ljava/nio/file/Path; + FIELD field_39076 jsonPath Ljava/nio/file/Path; + FIELD field_39958 userApiService Lcom/mojang/authlib/minecraft/UserApiService; + FIELD field_39959 keyFuture Ljava/util/concurrent/CompletableFuture; + FIELD field_40797 TIME_UNTIL_FIRST_EXPIRY_CHECK Ljava/time/Duration; + FIELD field_40798 expiryCheckTime Ljava/time/Instant; + METHOD (Lcom/mojang/authlib/minecraft/UserApiService;Ljava/util/UUID;Ljava/nio/file/Path;)V + ARG 1 userApiService + ARG 2 uuid + ARG 3 root + METHOD method_43600 saveKeyPairToFile (Lnet/minecraft/class_7427;)V + COMMENT Saves the {@code keyPair} to the cache file if {@link + COMMENT net.minecraft.SharedConstants#isDevelopment} is {@code true}; + COMMENT otherwise, just deletes the cache file. + ARG 1 keyPair + METHOD method_43601 (Lcom/google/gson/JsonElement;)V + ARG 1 json + METHOD method_43602 getKeyPair (Ljava/util/Optional;)Ljava/util/concurrent/CompletableFuture; + COMMENT Gets the key pair from the file cache, or if it is unavailable or expired, + COMMENT the Mojang server. + ARG 1 currentKey + METHOD method_43605 fetchKeyPair (Lcom/mojang/authlib/minecraft/UserApiService;)Lnet/minecraft/class_7427; + COMMENT {@return the key pair fetched from Mojang's server} + COMMENT + COMMENT @throws NetworkEncryptionException when the fetched key is malformed + COMMENT @throws IOException when fetching fails + ARG 1 userApiService + METHOD method_43606 loadKeyPairFromFile ()Ljava/util/Optional; + COMMENT {@return the profile keys from the local cache} + COMMENT + COMMENT

This can return expired keys. + COMMENT + COMMENT @implNote The cache file is stored at {@code .minecraft/profilekeys/.json}. + METHOD method_44076 decodeKeyPairResponse (Lcom/mojang/authlib/yggdrasil/response/KeyPairResponse;)Lnet/minecraft/class_7428$class_7443; + COMMENT {@return {@code keyPairResponse} decoded to {@link PlayerPublicKey.PublicKeyData}} + COMMENT + COMMENT @throws NetworkEncryptionException when the response is malformed + ARG 0 keyPairResponse + METHOD method_45109 (Lnet/minecraft/class_7427;)Z + ARG 0 key diff --git a/mappings/net/minecraft/entity/data/DataTracker.mapping b/mappings/net/minecraft/entity/data/DataTracker.mapping index e3f072ee39..74ca0b69ea 100644 --- a/mappings/net/minecraft/entity/data/DataTracker.mapping +++ b/mappings/net/minecraft/entity/data/DataTracker.mapping @@ -24,6 +24,7 @@ CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker ARG 2 initialValue METHOD method_12785 copyToFrom (Lnet/minecraft/class_2945$class_2946;Lnet/minecraft/class_2945$class_7834;)V ARG 1 to + ARG 2 from METHOD method_12786 isDirty ()Z METHOD method_12789 get (Lnet/minecraft/class_2940;)Ljava/lang/Object; ARG 1 data @@ -32,10 +33,12 @@ CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker ARG 0 entityClass ARG 1 dataHandler METHOD method_12792 clearDirty ()V + METHOD method_46357 getChangedEntries ()Ljava/util/List; CLASS class_2946 Entry FIELD field_13336 dirty Z FIELD field_13337 data Lnet/minecraft/class_2940; FIELD field_13338 value Ljava/lang/Object; + FIELD field_40719 initialValue Ljava/lang/Object; METHOD (Lnet/minecraft/class_2940;Ljava/lang/Object;)V ARG 1 data ARG 2 value @@ -46,3 +49,20 @@ CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker METHOD method_12797 getData ()Lnet/minecraft/class_2940; METHOD method_12799 set (Ljava/lang/Object;)V ARG 1 value + METHOD method_46358 isUnchanged ()Z + METHOD method_46359 toSerialized ()Lnet/minecraft/class_2945$class_7834; + CLASS class_7834 SerializedEntry + FIELD comp_1116 handler Lnet/minecraft/class_2941; + METHOD comp_1116 handler ()Lnet/minecraft/class_2941; + METHOD method_46360 of (Lnet/minecraft/class_2940;Ljava/lang/Object;)Lnet/minecraft/class_2945$class_7834; + ARG 0 data + ARG 1 value + METHOD method_46361 write (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_46362 fromBuf (Lnet/minecraft/class_2540;I)Lnet/minecraft/class_2945$class_7834; + ARG 0 buf + ARG 1 id + METHOD method_46363 fromBuf (Lnet/minecraft/class_2540;ILnet/minecraft/class_2941;)Lnet/minecraft/class_2945$class_7834; + ARG 0 buf + ARG 1 id + ARG 2 handler diff --git a/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping b/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping index cd8385cd99..77f91e7580 100644 --- a/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping +++ b/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping @@ -27,6 +27,8 @@ CLASS net/minecraft/class_7428 net/minecraft/network/encryption/PlayerPublicKey FIELD field_39309 KEY_SIGNATURE_MAX_SIZE I METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o METHOD method_43701 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_43702 toSerializedString (Ljava/util/UUID;)[B diff --git a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping index 9984bc4976..25bebaea3a 100644 --- a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping @@ -94,3 +94,5 @@ CLASS net/minecraft/class_2792 net/minecraft/network/listener/ServerPlayPacketLi ARG 1 packet METHOD method_44898 onMessageAcknowledgment (Lnet/minecraft/class_7640;)V ARG 1 packet + METHOD method_46367 onPlayerSession (Lnet/minecraft/class_7861;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/message/FilterMask.mapping b/mappings/net/minecraft/network/message/FilterMask.mapping index ad2577aa39..0a84f2ffec 100644 --- a/mappings/net/minecraft/network/message/FilterMask.mapping +++ b/mappings/net/minecraft/network/message/FilterMask.mapping @@ -5,11 +5,19 @@ CLASS net/minecraft/class_7649 net/minecraft/network/message/FilterMask 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; + FIELD field_40837 CODEC Lcom/mojang/serialization/Codec; + FIELD field_40838 PASS_THROUGH_CODEC Lcom/mojang/serialization/Codec; + FIELD field_40839 FULLY_FILTERED_CODEC Lcom/mojang/serialization/Codec; + FIELD field_40840 PARTIALLY_FILTERED_CODEC Lcom/mojang/serialization/Codec; METHOD (I)V ARG 1 length + METHOD (Ljava/util/BitSet;)V + ARG 1 mask METHOD (Ljava/util/BitSet;Lnet/minecraft/class_7649$class_7650;)V ARG 1 mask ARG 2 status + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o METHOD method_45087 isPassThrough ()Z METHOD method_45088 markFiltered (I)V ARG 1 index @@ -23,4 +31,12 @@ CLASS net/minecraft/class_7649 net/minecraft/network/message/FilterMask METHOD method_45093 isFullyFiltered ()Z METHOD method_46256 getFilteredText (Ljava/lang/String;)Lnet/minecraft/class_2561; ARG 1 message + METHOD method_46600 getStatus ()Lnet/minecraft/class_7649$class_7650; + METHOD method_46601 getMask ()Ljava/util/BitSet; CLASS class_7650 FilterStatus + FIELD field_40841 id Ljava/lang/String; + FIELD field_40842 codecSupplier Ljava/util/function/Supplier; + METHOD (Ljava/lang/String;ILjava/lang/String;Ljava/util/function/Supplier;)V + ARG 3 id + ARG 4 codecSupplier + METHOD method_46602 getCodec ()Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/network/message/LastSeenMessageList.mapping b/mappings/net/minecraft/network/message/LastSeenMessageList.mapping index 6dea4747de..b6004c0aad 100644 --- a/mappings/net/minecraft/network/message/LastSeenMessageList.mapping +++ b/mappings/net/minecraft/network/message/LastSeenMessageList.mapping @@ -2,9 +2,11 @@ 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 + FIELD field_40843 CODEC Lcom/mojang/serialization/Codec; METHOD method_46257 updateSignatures (Lnet/minecraft/class_7498$class_7499;)V ARG 1 updater METHOD method_46258 pack (Lnet/minecraft/class_7561;)Lnet/minecraft/class_7635$class_7815; + ARG 1 storage METHOD method_46259 (Lnet/minecraft/class_7561;Lnet/minecraft/class_7469;)Lnet/minecraft/class_7469$class_7819; ARG 1 signature CLASS class_7636 Acknowledgment @@ -25,3 +27,4 @@ CLASS net/minecraft/class_7635 net/minecraft/network/message/LastSeenMessageList METHOD method_46260 write (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_46261 unpack (Lnet/minecraft/class_7561;)Ljava/util/Optional; + ARG 1 storage diff --git a/mappings/net/minecraft/network/message/MessageBody.mapping b/mappings/net/minecraft/network/message/MessageBody.mapping index c7325ef98d..213821e2cc 100644 --- a/mappings/net/minecraft/network/message/MessageBody.mapping +++ b/mappings/net/minecraft/network/message/MessageBody.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_7608 net/minecraft/network/message/MessageBody 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; + FIELD field_40847 CODEC Lcom/mojang/serialization/MapCodec; 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 @@ -11,6 +12,9 @@ CLASS net/minecraft/class_7608 net/minecraft/network/message/MessageBody METHOD method_46305 ofUnsigned (Ljava/lang/String;)Lnet/minecraft/class_7608; ARG 0 content METHOD method_46306 toSerialized (Lnet/minecraft/class_7561;)Lnet/minecraft/class_7608$class_7824; + ARG 1 storage + METHOD method_46612 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance CLASS class_7824 Serialized COMMENT The serialized version of {@code MessageBody} used in networking. COMMENT @@ -24,3 +28,4 @@ CLASS net/minecraft/class_7608 net/minecraft/network/message/MessageBody METHOD method_46308 (Lnet/minecraft/class_7635;)Lnet/minecraft/class_7608; ARG 1 lastSeenMessages METHOD method_46309 toBody (Lnet/minecraft/class_7561;)Ljava/util/Optional; + ARG 1 storage diff --git a/mappings/net/minecraft/network/message/MessageChain.mapping b/mappings/net/minecraft/network/message/MessageChain.mapping index 7fccc3ba58..e7377e545c 100644 --- a/mappings/net/minecraft/network/message/MessageChain.mapping +++ b/mappings/net/minecraft/network/message/MessageChain.mapping @@ -34,9 +34,15 @@ CLASS net/minecraft/class_7610 net/minecraft/network/message/MessageChain COMMENT the message chain's legitimacy. COMMENT COMMENT @see MessageChain#getUnpacker + FIELD field_40848 NOT_INITIALIZED Lnet/minecraft/class_7610$class_7611; + COMMENT An unpacker used when the session is not initialized yet and the secure profile + COMMENT is enforced. This always throws the missing profile key exception. 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 method_46613 (Lnet/minecraft/class_7469;Lnet/minecraft/class_7608;)Lnet/minecraft/class_7471; + ARG 0 signature + ARG 1 body METHOD unpack (Lnet/minecraft/class_7469;Lnet/minecraft/class_7608;)Lnet/minecraft/class_7471; ARG 1 signature ARG 2 body diff --git a/mappings/net/minecraft/network/message/MessageSignatureData.mapping b/mappings/net/minecraft/network/message/MessageSignatureData.mapping index 22a27c810d..89ebbe4dd8 100644 --- a/mappings/net/minecraft/network/message/MessageSignatureData.mapping +++ b/mappings/net/minecraft/network/message/MessageSignatureData.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_7469 net/minecraft/network/message/MessageSignatureDat COMMENT A message signature data that can be verified. FIELD comp_925 data [B FIELD field_40683 SIZE I + FIELD field_40844 CODEC Lcom/mojang/serialization/Codec; METHOD comp_925 data ()[B METHOD equals (Ljava/lang/Object;)Z ARG 1 o @@ -18,6 +19,7 @@ CLASS net/minecraft/class_7469 net/minecraft/network/message/MessageSignatureDat METHOD method_46276 fromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_7469; ARG 0 buf METHOD method_46277 pack (Lnet/minecraft/class_7561;)Lnet/minecraft/class_7469$class_7819; + ARG 1 storage CLASS class_7819 Indexed FIELD field_40684 MISSING_ID I METHOD (I)V @@ -30,3 +32,4 @@ CLASS net/minecraft/class_7469 net/minecraft/network/message/MessageSignatureDat ARG 0 buf ARG 1 indexed METHOD method_46280 getSignature (Lnet/minecraft/class_7561;)Ljava/util/Optional; + ARG 1 storage diff --git a/mappings/net/minecraft/network/message/MessageSignatureStorage.mapping b/mappings/net/minecraft/network/message/MessageSignatureStorage.mapping index 823d8c0c02..a57adbe6e3 100644 --- a/mappings/net/minecraft/network/message/MessageSignatureStorage.mapping +++ b/mappings/net/minecraft/network/message/MessageSignatureStorage.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_7561 net/minecraft/network/message/MessageSignatureSto 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; + FIELD field_40845 MISSING I METHOD (I)V ARG 1 maxEntries METHOD method_46281 create ()Lnet/minecraft/class_7561; @@ -11,3 +12,7 @@ CLASS net/minecraft/class_7561 net/minecraft/network/message/MessageSignatureSto ARG 1 signatures METHOD method_46286 add (Lnet/minecraft/class_7471;)V ARG 1 message + METHOD method_46606 get (I)Lnet/minecraft/class_7469; + ARG 1 index + METHOD method_46607 indexOf (Lnet/minecraft/class_7469;)I + ARG 1 signature diff --git a/mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping index 277263a1bc..baa1bdfec2 100644 --- a/mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/login/LoginKeyC2SPacket.mapping @@ -18,3 +18,4 @@ CLASS net/minecraft/class_2917 net/minecraft/network/packet/c2s/login/LoginKeyC2 ARG 1 privateKey METHOD method_43643 verifySignedNonce ([BLjava/security/PrivateKey;)Z ARG 1 nonce + ARG 2 privateKey diff --git a/mappings/net/minecraft/network/packet/c2s/play/PlayerSessionC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PlayerSessionC2SPacket.mapping new file mode 100644 index 0000000000..9f22bc5972 --- /dev/null +++ b/mappings/net/minecraft/network/packet/c2s/play/PlayerSessionC2SPacket.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_7861 net/minecraft/network/packet/c2s/play/PlayerSessionC2SPacket + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket.mapping index 862feb9b33..054f41216a 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket.mapping @@ -1,9 +1,15 @@ CLASS net/minecraft/class_2739 net/minecraft/network/packet/s2c/play/EntityTrackerUpdateS2CPacket FIELD comp_1127 id I FIELD comp_1128 trackedValues Ljava/util/List; + FIELD field_40850 MARKER_ID I METHOD (ILjava/util/List;)V ARG 1 id METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD comp_1127 id ()I METHOD comp_1128 trackedValues ()Ljava/util/List; + METHOD method_46615 write (Ljava/util/List;Lnet/minecraft/class_2540;)V + ARG 0 trackedValues + ARG 1 buf + METHOD method_46616 read (Lnet/minecraft/class_2540;)Ljava/util/List; + ARG 0 buf diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index 52b2eee360..9d8756d15a 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -42,6 +42,7 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan FIELD field_39987 signatureStorage Lnet/minecraft/class_7561; FIELD field_39989 MAX_PENDING_ACKNOWLEDGMENTS I FIELD field_39990 CHAT_VALIDATION_FAILED_TEXT Lnet/minecraft/class_2561; + FIELD field_40720 session Lnet/minecraft/class_7822; METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;Lnet/minecraft/class_3222;)V ARG 1 server ARG 2 connection @@ -201,6 +202,10 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan ARG 2 params METHOD method_45171 handleMessageChainException (Lnet/minecraft/class_7610$class_7825;)V ARG 1 exception + METHOD method_46365 setSession (Lnet/minecraft/class_7822;)V + ARG 1 session + METHOD method_46366 (Lnet/minecraft/class_7822;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 2 executor 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 e36e319f9a..6be3f119d4 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -239,6 +239,8 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_45163 getSession ()Lnet/minecraft/class_7822; METHOD method_45164 (Lnet/minecraft/class_7262;)V ARG 1 sculkShriekerWarningManager + METHOD method_46364 setSession (Lnet/minecraft/class_7822;)V + ARG 1 session METHOD method_7336 changeGameMode (Lnet/minecraft/class_1934;)Z ARG 1 gameMode CLASS 1