1.19.2-rc1/rc2 stuff (#3274)

* 1.19.2-rc1 stuff

* 1.19.1-rc2 stuff

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

Co-authored-by: andante <orrdaniel73@gmail.com>

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: andante <orrdaniel73@gmail.com>
This commit is contained in:
apple502j 2022-08-21 00:50:41 +09:00 committed by GitHub
parent 90105d0f8a
commit 1b0982025b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 4 deletions

View File

@ -3,19 +3,26 @@ CLASS net/minecraft/class_7434 net/minecraft/client/util/ProfileKeys
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 <init> (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.
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_43603 getPublicKey ()Ljava/util/Optional;
COMMENT {@return the public key, or {@code null} if there is no public key associated
COMMENT with the profile}
COMMENT {@return the public key, or {@link java.util.Optional#empty} if there is no
COMMENT public key associated with the profile}
METHOD method_43605 fetchKeyPair (Lcom/mojang/authlib/minecraft/UserApiService;)Lnet/minecraft/class_7427;
COMMENT {@return the key pair fetched from Mojang's server}
COMMENT
@ -35,3 +42,19 @@ CLASS net/minecraft/class_7434 net/minecraft/client/util/ProfileKeys
ARG 0 keyPairResponse
METHOD method_44287 getSigner ()Lnet/minecraft/class_7501;
COMMENT {@return the signer, or {@code null} if there is no key pair associated with the profile}
METHOD method_45104 refresh ()Ljava/util/concurrent/CompletableFuture;
METHOD method_45105 (Lnet/minecraft/class_7434$class_7653;)Lnet/minecraft/class_7428;
ARG 0 key
METHOD method_45106 (Ljava/util/Optional;)Ljava/util/Optional;
ARG 0 key
METHOD method_45107 (Lnet/minecraft/class_7434$class_7653;)Lnet/minecraft/class_7428$class_7443;
ARG 0 key
METHOD method_45108 (Ljava/util/Optional;)Ljava/util/Optional;
ARG 0 maybeKey
METHOD method_45109 (Lnet/minecraft/class_7427;)Z
ARG 0 key
METHOD method_45111 (Ljava/util/Optional;)Ljava/util/concurrent/CompletionStage;
ARG 1 key
CLASS class_7653 SignableKey
METHOD <init> (Lnet/minecraft/class_7427;)V
ARG 1 keyPair

View File

@ -7,11 +7,15 @@ CLASS net/minecraft/class_7428 net/minecraft/network/encryption/PlayerPublicKey
COMMENT @see net.minecraft.client.util.ProfileKeys
COMMENT @see PlayerKeyPair
FIELD field_39050 CODEC Lcom/mojang/serialization/Codec;
FIELD field_39953 MISSING_PUBLIC_KEY_TEXT Lnet/minecraft/class_2561;
FIELD field_39954 EXPIRED_PUBLIC_KEY_TEXT Lnet/minecraft/class_2561;
FIELD field_39955 EXPIRATION_GRACE_PERIOD Ljava/time/Duration;
FIELD field_39956 INVALID_PUBLIC_KEY_SIGNATURE_TEXT Lnet/minecraft/class_2561;
METHOD method_43550 verifyAndDecode (Lnet/minecraft/class_7500;Ljava/util/UUID;Lnet/minecraft/class_7428$class_7443;Ljava/time/Duration;)Lnet/minecraft/class_7428;
COMMENT Verifies the public key and decodes it.
COMMENT
COMMENT <p>The checks whether the public key is present, signed with the Mojang's private key,
COMMENT and not expired.
COMMENT and not expired (taking into account the provided grace period).
COMMENT
COMMENT @throws InsecurePublicKeyException.MissingException when the key is missing or empty
COMMENT @throws InsecurePublicKeyException.InvalidException when the key does not belong to the profile, is unsigned, or expired
@ -19,6 +23,7 @@ CLASS net/minecraft/class_7428 net/minecraft/network/encryption/PlayerPublicKey
ARG 0 servicesSignatureVerifier
ARG 1 playerUuid
ARG 2 publicKeyData
ARG 3 gracePeriod
METHOD method_43697 createSignatureInstance ()Lnet/minecraft/class_7500;
CLASS class_7443 PublicKeyData
FIELD field_39119 CODEC Lcom/mojang/serialization/Codec;
@ -35,3 +40,7 @@ CLASS net/minecraft/class_7428 net/minecraft/network/encryption/PlayerPublicKey
METHOD method_44205 verifyKey (Lnet/minecraft/class_7500;Ljava/util/UUID;)Z
ARG 1 servicesSignatureVerifier
ARG 2 playerUuid
METHOD method_45103 isExpired (Ljava/time/Duration;)Z
COMMENT {@return whether the key is expired, with the provided grace period taken into account}
ARG 1 gracePeriod
CLASS class_7652 PublicKeyException

View File

@ -221,6 +221,7 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan
COMMENT rejection of messages) for expired messages.
COMMENT
COMMENT @see #canAcceptMessage(String, Instant, LastSeenMessageList.Acknowledgment)
ARG 1 message
METHOD method_45010 handleCommandExecution (Lnet/minecraft/class_7472;)V
ARG 1 packet
METHOD method_45011 getSignedMessage (Lnet/minecraft/class_2797;)Lnet/minecraft/class_7471;