diff --git a/build.gradle b/build.gradle index ea3ec870dd..57148031da 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" +def minecraft_version = "1.19.2-rc1" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/net/minecraft/client/util/ProfileKeys.mapping b/mappings/net/minecraft/client/util/ProfileKeys.mapping index db884829ae..588de2188e 100644 --- a/mappings/net/minecraft/client/util/ProfileKeys.mapping +++ b/mappings/net/minecraft/client/util/ProfileKeys.mapping @@ -3,21 +3,16 @@ 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_39434 publicKeyFuture Ljava/util/concurrent/CompletableFuture; - FIELD field_39435 signerFuture Ljava/util/concurrent/CompletableFuture; 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. ARG 1 keyPair METHOD method_43601 (Lcom/google/gson/JsonElement;)V ARG 1 json - METHOD method_43602 getKeyPair (Lcom/mojang/authlib/minecraft/UserApiService;)Ljava/util/concurrent/CompletableFuture; + METHOD method_43602 getKeyPair ()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 userApiService 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} @@ -35,7 +30,6 @@ CLASS net/minecraft/class_7434 net/minecraft/client/util/ProfileKeys COMMENT

This can return expired keys. COMMENT COMMENT @implNote The cache file is stored at {@code .minecraft/profilekeys/.json}. - METHOD method_43784 getPublicKeyData ()Ljava/util/Optional; 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 @@ -43,9 +37,3 @@ 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_44288 (Ljava/util/Optional;)Ljava/util/Optional; - ARG 0 optionalKeyPair - METHOD method_44289 (Ljava/util/Optional;)Ljava/util/Optional; - ARG 0 optionalKeyPair - METHOD method_44290 (Lnet/minecraft/class_7427;)Lnet/minecraft/class_7501; - ARG 0 keyPair diff --git a/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping b/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping index 8d65c9cd28..af9b23e5ac 100644 --- a/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping +++ b/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping @@ -7,7 +7,7 @@ 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; - METHOD method_43550 verifyAndDecode (Lnet/minecraft/class_7500;Ljava/util/UUID;Lnet/minecraft/class_7428$class_7443;)Lnet/minecraft/class_7428; + 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

The checks whether the public key is present, signed with the Mojang's private key, @@ -20,10 +20,6 @@ CLASS net/minecraft/class_7428 net/minecraft/network/encryption/PlayerPublicKey ARG 1 playerUuid ARG 2 publicKeyData METHOD method_43697 createSignatureInstance ()Lnet/minecraft/class_7500; - METHOD method_43698 fromKeyData (Lnet/minecraft/class_7428$class_7443;)Lnet/minecraft/class_7428; - ARG 0 publicKeyData - METHOD method_43699 (Lnet/minecraft/class_7428$class_7443;)Lcom/mojang/serialization/DataResult; - ARG 0 publicKeyData CLASS class_7443 PublicKeyData FIELD field_39119 CODEC Lcom/mojang/serialization/Codec; FIELD field_39309 KEY_SIGNATURE_MAX_SIZE I diff --git a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping index 900ba358f5..3a5c4ec4c9 100644 --- a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping @@ -29,9 +29,6 @@ CLASS net/minecraft/class_3248 net/minecraft/server/network/ServerLoginNetworkHa FIELD field_14166 LOGGER Lorg/slf4j/Logger; FIELD field_14167 nonce [B FIELD field_29779 TIMEOUT_TICKS I - FIELD field_39020 MISSING_PUBLIC_KEY_TEXT Lnet/minecraft/class_2561; - FIELD field_39021 INVALID_PUBLIC_KEY_SIGNATURE_TEXT Lnet/minecraft/class_2561; - FIELD field_39022 INVALID_PUBLIC_KEY_TEXT Lnet/minecraft/class_2561; FIELD field_39743 publicKeyData Lnet/minecraft/class_7428$class_7443; METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;)V ARG 1 server @@ -62,4 +59,3 @@ CLASS net/minecraft/class_3248 net/minecraft/server/network/ServerLoginNetworkHa CLASS 1 METHOD method_14386 getClientAddress ()Ljava/net/InetAddress; CLASS class_3249 State - CLASS class_7423 LoginException diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index 2f9c632c81..8e66b2748d 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -221,7 +221,6 @@ 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;