diff --git a/build.gradle b/build.gradle index 685b57dea8..d05f9ab903 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "1.20.3-pre2" +def minecraft_version = "1.20.3-pre3" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping index 4d6fb2d55c..02100fbfde 100644 --- a/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping @@ -18,16 +18,8 @@ CLASS net/minecraft/class_8673 net/minecraft/client/network/ClientCommonNetworkH METHOD method_52771 handleSynchronizedTagGroup (Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V ARG 1 registryRef ARG 2 tags - METHOD method_52772 (Lnet/minecraft/class_437;Ljava/util/UUID;Ljava/net/URL;Ljava/lang/String;ZZ)V - ARG 6 confirmed METHOD method_52773 getParsedResourcePackUrl (Ljava/lang/String;)Ljava/net/URL; ARG 0 url - METHOD method_52775 showPackConfirmationScreen (Ljava/util/UUID;Ljava/net/URL;Ljava/lang/String;ZLnet/minecraft/class_2561;)V - ARG 1 id - ARG 2 url - ARG 3 hash - ARG 4 required - ARG 5 prompt METHOD method_52778 getPrompt (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; ARG 0 requirementPrompt ARG 1 customPrompt diff --git a/mappings/net/minecraft/client/realms/task/RealmsPrepareConnectionTask.mapping b/mappings/net/minecraft/client/realms/task/RealmsPrepareConnectionTask.mapping index 36b42dbd4e..81b3132dad 100644 --- a/mappings/net/minecraft/client/realms/task/RealmsPrepareConnectionTask.mapping +++ b/mappings/net/minecraft/client/realms/task/RealmsPrepareConnectionTask.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_4439 net/minecraft/client/realms/task/RealmsPrepareCon FIELD field_36356 LOGGER Lorg/slf4j/Logger; FIELD field_46135 TITLE Lnet/minecraft/class_2561; FIELD field_47580 APPLYING_PACK_TEXT Lnet/minecraft/class_2561; - FIELD field_47581 REALMS_PACK_ID Ljava/util/UUID; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4877;)V ARG 1 lastScreen ARG 2 server @@ -12,11 +11,8 @@ CLASS net/minecraft/class_4439 net/minecraft/client/realms/task/RealmsPrepareCon ARG 2 throwable METHOD method_32511 createConnectingScreen (Lnet/minecraft/class_4878;)Lnet/minecraft/class_4398; ARG 1 address - METHOD method_32512 createResourcePackConfirmationScreen (Lnet/minecraft/class_4878;Ljava/util/function/Function;)Lnet/minecraft/class_4396; + METHOD method_32512 createResourcePackConfirmationScreen (Lnet/minecraft/class_4878;Ljava/util/UUID;Ljava/util/function/Function;)Lnet/minecraft/class_4396; ARG 1 address - ARG 2 connectingScreenCreator - METHOD method_32513 (Lnet/minecraft/class_4878;Ljava/util/function/Function;Z)V - ARG 3 confirmed - METHOD method_32515 downloadResourcePack (Lnet/minecraft/class_4878;)Ljava/util/concurrent/CompletableFuture; + METHOD method_32515 downloadResourcePack (Lnet/minecraft/class_4878;Ljava/util/UUID;)Ljava/util/concurrent/CompletableFuture; ARG 1 address METHOD method_32516 join ()Lnet/minecraft/class_4878; diff --git a/mappings/net/minecraft/client/resource/server/PackStateChangeCallback.mapping b/mappings/net/minecraft/client/resource/server/PackStateChangeCallback.mapping index 63128fd92c..8ff911ae96 100644 --- a/mappings/net/minecraft/client/resource/server/PackStateChangeCallback.mapping +++ b/mappings/net/minecraft/client/resource/server/PackStateChangeCallback.mapping @@ -1,5 +1,2 @@ CLASS net/minecraft/class_9039 net/minecraft/client/resource/server/PackStateChangeCallback - METHOD sendResponse (Ljava/util/UUID;Lnet/minecraft/class_9039$class_9040;)V - ARG 1 id - ARG 2 state CLASS class_9040 State diff --git a/mappings/net/minecraft/client/resource/server/ServerResourcePackLoader.mapping b/mappings/net/minecraft/client/resource/server/ServerResourcePackLoader.mapping index c3db72d254..4f36f6be2e 100644 --- a/mappings/net/minecraft/client/resource/server/ServerResourcePackLoader.mapping +++ b/mappings/net/minecraft/client/resource/server/ServerResourcePackLoader.mapping @@ -31,12 +31,6 @@ CLASS net/minecraft/class_1066 net/minecraft/client/resource/server/ServerResour ARG 1 packs METHOD method_55520 remove (Ljava/util/UUID;)V ARG 1 id - METHOD method_55521 (Ljava/util/UUID;Lnet/minecraft/class_9039$class_9040;)V - ARG 1 id - ARG 2 state - METHOD method_55522 (Ljava/util/UUID;Lnet/minecraft/class_9039;Ljava/util/concurrent/CompletableFuture;Ljava/util/UUID;Lnet/minecraft/class_9039$class_9040;)V - ARG 4 id - ARG 5 state METHOD method_55523 addResourcePack (Ljava/util/UUID;Ljava/net/URL;Ljava/lang/String;)V ARG 1 id ARG 2 url @@ -53,17 +47,10 @@ CLASS net/minecraft/class_1066 net/minecraft/client/resource/server/ServerResour METHOD method_55528 init (Lnet/minecraft/class_2535;Lnet/minecraft/class_9044$class_9047;)V ARG 1 connection ARG 2 acceptanceStatus - METHOD method_55529 (Lnet/minecraft/class_2535;Ljava/util/UUID;Lnet/minecraft/class_9039$class_9040;)V - ARG 1 id - ARG 2 state METHOD method_55530 onReloadFailure ()V METHOD method_55531 getPackProvider (Ljava/util/List;)Lnet/minecraft/class_3285; ARG 0 serverPacks METHOD method_55532 getPackLoadFuture (Ljava/util/UUID;)Ljava/util/concurrent/CompletableFuture; - ARG 1 expectedId - METHOD method_55533 (Ljava/util/UUID;Lnet/minecraft/class_9039$class_9040;)V - ARG 0 id - ARG 1 state METHOD method_55534 (Ljava/util/function/Consumer;)V ARG 0 profileAdder METHOD method_55535 onForcedReloadFailure ()V @@ -74,7 +61,7 @@ CLASS net/minecraft/class_1066 net/minecraft/client/resource/server/ServerResour METHOD method_55540 declineAll ()V METHOD method_55541 clear ()V METHOD method_55542 getReloadScheduler ()Lnet/minecraft/class_9041; - CLASS 1 + CLASS 3 FIELD field_47604 toastType Lnet/minecraft/class_370$class_9037; FIELD field_47605 toastTitle Lnet/minecraft/class_2561; FIELD field_47606 toastDescription Lnet/minecraft/class_2561; @@ -83,11 +70,11 @@ CLASS net/minecraft/class_1066 net/minecraft/client/resource/server/ServerResour METHOD method_55543 showProgress (J)V ARG 1 writtenBytes METHOD method_55544 showToast ()V - CLASS 2 + CLASS 4 FIELD field_47614 MAX_BYTES I FIELD field_47615 SHA1 Lcom/google/common/hash/HashFunction; METHOD method_55545 getHeaders ()Ljava/util/Map; - CLASS 3 + CLASS 5 FIELD field_47618 currentlyRunning Z FIELD field_47619 shouldKeepRunning Z METHOD method_55547 runOnExecutor ()V diff --git a/mappings/net/minecraft/client/session/telemetry/TelemetryManager.mapping b/mappings/net/minecraft/client/session/telemetry/TelemetryManager.mapping index 0656e49abc..be07d9bc36 100644 --- a/mappings/net/minecraft/client/session/telemetry/TelemetryManager.mapping +++ b/mappings/net/minecraft/client/session/telemetry/TelemetryManager.mapping @@ -8,7 +8,6 @@ CLASS net/minecraft/class_6628 net/minecraft/client/session/telemetry/TelemetryM FIELD field_44831 lazySenderSupplier Ljava/util/function/Supplier; METHOD (Lnet/minecraft/class_310;Lcom/mojang/authlib/minecraft/UserApiService;Lnet/minecraft/class_320;)V ARG 1 client - ARG 2 userApiService ARG 3 session METHOD method_38731 (Ljava/lang/Runnable;)Ljava/lang/Thread; ARG 0 runnable diff --git a/mappings/net/minecraft/network/message/MessageChain.mapping b/mappings/net/minecraft/network/message/MessageChain.mapping index e7377e545c..bac61a5733 100644 --- a/mappings/net/minecraft/network/message/MessageChain.mapping +++ b/mappings/net/minecraft/network/message/MessageChain.mapping @@ -13,9 +13,6 @@ CLASS net/minecraft/class_7610 net/minecraft/network/message/MessageChain COMMENT @see MessageLink FIELD field_40691 LOGGER Lorg/slf4j/Logger; FIELD field_40692 link Lnet/minecraft/class_7826; - METHOD (Ljava/util/UUID;Ljava/util/UUID;)V - ARG 1 sender - ARG 2 sessionId METHOD method_44874 getUnpacker (Lnet/minecraft/class_7428;)Lnet/minecraft/class_7610$class_7611; ARG 1 playerPublicKey METHOD method_44880 getPacker (Lnet/minecraft/class_7501;)Lnet/minecraft/class_7610$class_7612; @@ -34,20 +31,9 @@ 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 - METHOD unsigned (Ljava/util/UUID;)Lnet/minecraft/class_7610$class_7611; - ARG 0 uuid CLASS class_7612 Packer COMMENT Packers sign a message on the client with its preceding message's index. COMMENT diff --git a/mappings/net/minecraft/network/message/MessageSignatureStorage.mapping b/mappings/net/minecraft/network/message/MessageSignatureStorage.mapping index a57adbe6e3..7fdccc6cec 100644 --- a/mappings/net/minecraft/network/message/MessageSignatureStorage.mapping +++ b/mappings/net/minecraft/network/message/MessageSignatureStorage.mapping @@ -10,8 +10,7 @@ CLASS net/minecraft/class_7561 net/minecraft/network/message/MessageSignatureSto ARG 1 deque METHOD method_46284 addFrom (Ljava/util/List;)V ARG 1 signatures - METHOD method_46286 add (Lnet/minecraft/class_7471;)V - ARG 1 message + METHOD method_46286 add (Lnet/minecraft/class_7608;Lnet/minecraft/class_7469;)V METHOD method_46606 get (I)Lnet/minecraft/class_7469; ARG 1 index METHOD method_46607 indexOf (Lnet/minecraft/class_7469;)I diff --git a/mappings/net/minecraft/network/message/MessageVerifier.mapping b/mappings/net/minecraft/network/message/MessageVerifier.mapping index d6c22dc869..a1a0938a3f 100644 --- a/mappings/net/minecraft/network/message/MessageVerifier.mapping +++ b/mappings/net/minecraft/network/message/MessageVerifier.mapping @@ -6,12 +6,8 @@ CLASS net/minecraft/class_7615 net/minecraft/network/message/MessageVerifier FIELD field_40695 NO_SIGNATURE Lnet/minecraft/class_7615; FIELD field_40696 UNVERIFIED Lnet/minecraft/class_7615; FIELD field_45957 LOGGER Lorg/slf4j/Logger; - METHOD method_45048 isVerified (Lnet/minecraft/class_7471;)Z + METHOD method_45048 isVerified (Lnet/minecraft/class_7471;)Lnet/minecraft/class_7471; ARG 1 message - METHOD method_53507 (Lnet/minecraft/class_7471;)Z - ARG 0 message - METHOD method_53508 (Lnet/minecraft/class_7471;)Z - ARG 0 message CLASS class_7616 Impl FIELD field_39821 lastMessageVerified Z FIELD field_39822 signatureVerifier Lnet/minecraft/class_7500; diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index 501339b0f0..2cff563bfd 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -29,7 +29,6 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan FIELD field_37280 MAX_BREAK_SQUARED_DISTANCE D FIELD field_37281 DEFAULT_SEQUENCE I FIELD field_37282 sequence I - FIELD field_39394 lastMessageTimestamp Ljava/util/concurrent/atomic/AtomicReference; FIELD field_39805 messageUnpacker Lnet/minecraft/class_7610$class_7611; FIELD field_39825 acknowledgmentValidator Lnet/minecraft/class_7638; FIELD field_39826 messageChainTaskQueue Lnet/minecraft/class_7619; @@ -135,20 +134,12 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan METHOD method_43669 checkForSpam ()V METHOD method_44155 handleDecoratedMessage (Lnet/minecraft/class_7471;)V ARG 1 message - METHOD method_44160 isInProperOrder (Ljava/time/Instant;)Z - COMMENT {@return whether the message sent at {@code timestamp} is received in proper order} - COMMENT - COMMENT

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

This disconnects the player if the message arrives in {@linkplain COMMENT #isInProperOrder improper order} or if chat is disabled. - ARG 1 message - ARG 2 timestamp - ARG 3 acknowledgment METHOD method_44897 addPendingAcknowledgment (Lnet/minecraft/class_7471;)V ARG 1 message METHOD method_45002 (Lnet/minecraft/class_7448;Lnet/minecraft/class_2168;)Lnet/minecraft/class_2168; @@ -177,7 +168,6 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan ARG 1 message 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_48107 getConnectionAddress ()Ljava/net/SocketAddress; diff --git a/mappings/net/minecraft/util/NetworkUtils.mapping b/mappings/net/minecraft/util/NetworkUtils.mapping index c587197f7e..fac7c3bf17 100644 --- a/mappings/net/minecraft/util/NetworkUtils.mapping +++ b/mappings/net/minecraft/util/NetworkUtils.mapping @@ -35,4 +35,4 @@ CLASS net/minecraft/class_3521 net/minecraft/util/NetworkUtils ARG 1 writtenBytes METHOD method_55499 onContentLength (Ljava/util/OptionalLong;)V ARG 1 contentLength - METHOD method_55500 onFinish ()V + METHOD method_55500 onFinish (Z)V