1.20.3-pre3 stuff (#3744)

FabricMC · Nov 28, 2023 · 153266f · 153266f
1 parent fbc440d
commit 153266f
Show file tree

Hide file tree

Showing 21 changed files with 108 additions and 6 deletions.
diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping
@@ -186,6 +186,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 	FIELD field_46551 disconnecting Z
 	FIELD field_46552 startTime J
 	FIELD field_46553 uptimeInTicks J
+	FIELD field_47680 userPropertiesFuture Ljava/util/concurrent/CompletableFuture;
 	METHOD <init> (Lnet/minecraft/class_542;)V
 		ARG 1 args
 	METHOD method_1476 checkIs64Bit ()Z
@@ -548,6 +549,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 	METHOD method_54785 getTargetMillisPerTick (F)F
 		ARG 1 millis
 	METHOD method_55505 onDisconnected ()V
+	METHOD method_55606 providesProfileKeys ()Z
+	METHOD method_55607 getUserProperties ()Lcom/mojang/authlib/minecraft/UserApiService$UserProperties;
 	CLASS class_5859 ChatRestriction
 		COMMENT Represents the restrictions on chat on a Minecraft client.
 		COMMENT

diff --git a/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping
@@ -35,4 +35,29 @@ CLASS net/minecraft/class_8673 net/minecraft/client/network/ClientCommonNetworkH
 	METHOD method_52790 getBrand ()Ljava/lang/String;
 	METHOD method_55511 (Ljava/util/UUID;)V
 		ARG 1 id
+	METHOD method_55609 createConfirmServerResourcePackScreen (Ljava/util/UUID;Ljava/net/URL;Ljava/lang/String;ZLnet/minecraft/class_2561;)Lnet/minecraft/class_437;
+		ARG 1 id
+		ARG 2 url
+		ARG 3 hash
+		ARG 4 required
+		ARG 5 prompt
 	CLASS class_8137 QueuedPacket
+	CLASS class_9058 ConfirmServerResourcePackScreen
+		FIELD field_47682 packs Ljava/util/List;
+		FIELD field_47683 parent Lnet/minecraft/class_437;
+		METHOD <init> (Lnet/minecraft/class_8673;Lnet/minecraft/class_310;Lnet/minecraft/class_437;Ljava/util/List;ZLnet/minecraft/class_2561;)V
+			ARG 2 client
+			ARG 3 parent
+			ARG 4 pack
+			ARG 5 required
+			ARG 6 prompt
+		METHOD method_55612 (Lnet/minecraft/class_310;Lnet/minecraft/class_437;ZLjava/util/List;Lnet/minecraft/class_8673;Z)V
+			ARG 5 confirmed
+		METHOD method_55613 add (Lnet/minecraft/class_310;Ljava/util/UUID;Ljava/net/URL;Ljava/lang/String;ZLnet/minecraft/class_2561;)Lnet/minecraft/class_8673$class_9058;
+			ARG 1 client
+			ARG 2 id
+			ARG 3 url
+			ARG 4 hash
+			ARG 5 required
+			ARG 6 prompt
+		CLASS class_9059 Pack
diff --git a/mappings/net/minecraft/client/network/ServerInfo.mapping b/mappings/net/minecraft/client/network/ServerInfo.mapping
@@ -52,6 +52,7 @@ CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo
 	METHOD method_52811 isRealm ()Z
 	METHOD method_53885 validateFavicon ([B)[B
 		ARG 0 favicon
+	METHOD method_55616 getServerType ()Lnet/minecraft/class_642$class_8678;
 	CLASS class_643 ResourcePackPolicy
 		COMMENT The policy of the client when this server sends a {@linkplain
 		COMMENT net.minecraft.network.packet.s2c.common.ResourcePackSendS2CPacket server

diff --git a/mappings/net/minecraft/client/particle/ItemPickupParticle.mapping b/mappings/net/minecraft/client/particle/ItemPickupParticle.mapping
@@ -4,6 +4,12 @@ CLASS net/minecraft/class_693 net/minecraft/client/particle/ItemPickupParticle
 	FIELD field_3823 itemEntity Lnet/minecraft/class_1297;
 	FIELD field_3824 dispatcher Lnet/minecraft/class_898;
 	FIELD field_3826 ticksExisted I
+	FIELD field_47684 targetX D
+	FIELD field_47685 targetY D
+	FIELD field_47686 targetZ D
+	FIELD field_47687 lastTargetX D
+	FIELD field_47688 lastTargetY D
+	FIELD field_47689 lastTargetZ D
 	METHOD <init> (Lnet/minecraft/class_898;Lnet/minecraft/class_4599;Lnet/minecraft/class_638;Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)V
 		ARG 1 dispatcher
 		ARG 2 bufferStorage
@@ -19,3 +25,5 @@ CLASS net/minecraft/class_693 net/minecraft/client/particle/ItemPickupParticle
 		ARG 6 velocity
 	METHOD method_29358 getOrCopy (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297;
 		ARG 1 entity
+	METHOD method_55617 updateTargetPos ()V
+	METHOD method_55618 updateLastTargetPos ()V
diff --git a/mappings/net/minecraft/client/realms/task/RealmsPrepareConnectionTask.mapping b/mappings/net/minecraft/client/realms/task/RealmsPrepareConnectionTask.mapping
@@ -13,6 +13,13 @@ CLASS net/minecraft/class_4439 net/minecraft/client/realms/task/RealmsPrepareCon
 		ARG 1 address
 	METHOD method_32512 createResourcePackConfirmationScreen (Lnet/minecraft/class_4878;Ljava/util/UUID;Ljava/util/function/Function;)Lnet/minecraft/class_4396;
 		ARG 1 address
+		ARG 2 id
+		ARG 3 connectingScreenCreator
+	METHOD method_32513 (Lnet/minecraft/class_4878;Ljava/util/UUID;Ljava/util/function/Function;Z)V
+		ARG 4 confirmed
 	METHOD method_32515 downloadResourcePack (Lnet/minecraft/class_4878;Ljava/util/UUID;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 address
+		ARG 2 id
 	METHOD method_32516 join ()Lnet/minecraft/class_4878;
+	METHOD method_55605 getResourcePackId (Lnet/minecraft/class_4877;)Ljava/util/UUID;
+		ARG 0 server
diff --git a/mappings/net/minecraft/client/resource/server/PackStateChangeCallback.mapping b/mappings/net/minecraft/client/resource/server/PackStateChangeCallback.mapping
@@ -1,2 +1,9 @@
 CLASS net/minecraft/class_9039 net/minecraft/client/resource/server/PackStateChangeCallback
-	CLASS class_9040 State
+	METHOD method_55619 onFinish (Ljava/util/UUID;Lnet/minecraft/class_9039$class_9040;)V
+		ARG 1 id
+		ARG 2 state
+	METHOD method_55620 onStateChanged (Ljava/util/UUID;Lnet/minecraft/class_9039$class_9060;)V
+		ARG 1 id
+		ARG 2 state
+	CLASS class_9040 FinishState
+	CLASS class_9060 State
diff --git a/mappings/net/minecraft/client/resource/server/ServerResourcePackLoader.mapping b/mappings/net/minecraft/client/resource/server/ServerResourcePackLoader.mapping
@@ -9,6 +9,7 @@ CLASS net/minecraft/class_1066 net/minecraft/client/resource/server/ServerResour
 	FIELD field_47599 downloader Lnet/minecraft/class_9028;
 	FIELD field_47600 packSource Lnet/minecraft/class_5352;
 	FIELD field_47601 packStateChangeCallback Lnet/minecraft/class_9039;
+	FIELD field_47690 packIndex I
 	FIELD field_5296 SHA1_PATTERN Ljava/util/regex/Pattern;
 	FIELD field_5298 LOGGER Lorg/slf4j/Logger;
 	METHOD <init> (Lnet/minecraft/class_310;Ljava/nio/file/Path;Lnet/minecraft/class_542$class_547;)V
@@ -51,6 +52,7 @@ CLASS net/minecraft/class_1066 net/minecraft/client/resource/server/ServerResour
 	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 id
 	METHOD method_55534 (Ljava/util/function/Consumer;)V
 		ARG 0 profileAdder
 	METHOD method_55535 onForcedReloadFailure ()V
@@ -67,6 +69,7 @@ CLASS net/minecraft/class_1066 net/minecraft/client/resource/server/ServerResour
 		FIELD field_47606 toastDescription Lnet/minecraft/class_2561;
 		FIELD field_47607 current I
 		FIELD field_47608 contentLength Ljava/util/OptionalLong;
+		FIELD field_47692 failureCount I
 		METHOD method_55543 showProgress (J)V
 			ARG 1 writtenBytes
 		METHOD method_55544 showToast ()V

diff --git a/mappings/net/minecraft/client/session/telemetry/TelemetryManager.mapping b/mappings/net/minecraft/client/session/telemetry/TelemetryManager.mapping
@@ -6,8 +6,10 @@ CLASS net/minecraft/class_6628 net/minecraft/client/session/telemetry/TelemetryM
 	FIELD field_41428 logDirectory Ljava/nio/file/Path;
 	FIELD field_41429 logManager Ljava/util/concurrent/CompletableFuture;
 	FIELD field_44831 lazySenderSupplier Ljava/util/function/Supplier;
+	FIELD field_47702 client Lnet/minecraft/class_310;
 	METHOD <init> (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/data/server/advancement/AdvancementTabGenerator.mapping b/mappings/net/minecraft/data/server/advancement/AdvancementTabGenerator.mapping
@@ -4,7 +4,7 @@ CLASS net/minecraft/class_7785 net/minecraft/data/server/advancement/Advancement
 		ARG 2 exporter
 	METHOD method_55578 reference (Ljava/lang/String;)Lnet/minecraft/class_8779;
 		COMMENT {@return an advancement to use as a reference in {@link
-		COMMENT net.minecraft.advancement.Advancement$Builder#parent(net.minecraft.advancement.AdvancementEntry)}}
+		COMMENT net.minecraft.advancement.Advancement.Builder#parent(net.minecraft.advancement.AdvancementEntry)}}
 		COMMENT
 		COMMENT <p>The returned advancement itself should not be exported.
 		ARG 0 id
diff --git a/mappings/net/minecraft/network/listener/PacketListener.mapping b/mappings/net/minecraft/network/listener/PacketListener.mapping
@@ -26,3 +26,7 @@ CLASS net/minecraft/class_2547 net/minecraft/network/listener/PacketListener
 	METHOD method_52413 accepts (Lnet/minecraft/class_2596;)Z
 		ARG 1 packet
 	METHOD method_52895 getSide ()Lnet/minecraft/class_2598;
+	METHOD method_55597 addCustomCrashReportInfo (Lnet/minecraft/class_129;)V
+		ARG 1 section
+	METHOD method_55622 fillCrashReport (Lnet/minecraft/class_128;)V
+		ARG 1 report
diff --git a/mappings/net/minecraft/network/message/MessageChain.mapping b/mappings/net/minecraft/network/message/MessageChain.mapping
@@ -13,6 +13,10 @@ 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;
+	FIELD field_47703 lastTimestamp Ljava/time/Instant;
+	METHOD <init> (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;
@@ -31,9 +35,15 @@ CLASS net/minecraft/class_7610 net/minecraft/network/message/MessageChain
 		COMMENT the message chain's legitimacy.
 		COMMENT
 		COMMENT @see MessageChain#getUnpacker
+		METHOD method_46315 (Ljava/util/function/BooleanSupplier;Ljava/util/UUID;Lnet/minecraft/class_7469;Lnet/minecraft/class_7608;)Lnet/minecraft/class_7471;
+			ARG 2 signature
+			ARG 3 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;Ljava/util/function/BooleanSupplier;)Lnet/minecraft/class_7610$class_7611;
+			ARG 0 sender
+			ARG 1 secureProfileEnforced
 	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
@@ -11,6 +11,8 @@ CLASS net/minecraft/class_7561 net/minecraft/network/message/MessageSignatureSto
 	METHOD method_46284 addFrom (Ljava/util/List;)V
 		ARG 1 signatures
 	METHOD method_46286 add (Lnet/minecraft/class_7608;Lnet/minecraft/class_7469;)V
+		ARG 1 body
+		ARG 2 signature
 	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
@@ -6,8 +6,10 @@ 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;)Lnet/minecraft/class_7471;
+	METHOD method_45048 ensureVerified (Lnet/minecraft/class_7471;)Lnet/minecraft/class_7471;
 		ARG 1 message
+	METHOD method_55626 (Lnet/minecraft/class_7471;)Lnet/minecraft/class_7471;
+		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/network/message/SignedMessage.mapping b/mappings/net/minecraft/network/message/SignedMessage.mapping
@@ -67,3 +67,4 @@ CLASS net/minecraft/class_7471 net/minecraft/network/message/SignedMessage
 		ARG 4 filterMask
 	METHOD method_46611 (Lnet/minecraft/class_7471;)Ljava/util/Optional;
 		ARG 0 message
+	METHOD method_55625 stripSignature ()Lnet/minecraft/class_7471;
diff --git a/mappings/net/minecraft/network/packet/c2s/common/ResourcePackStatusC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/common/ResourcePackStatusC2SPacket.mapping
@@ -4,3 +4,4 @@ CLASS net/minecraft/class_2856 net/minecraft/network/packet/c2s/common/ResourceP
 		ARG 1 buf
 	METHOD comp_2164 status ()Lnet/minecraft/class_2856$class_2857;
 	CLASS class_2857 Status
+		METHOD method_55627 hasFinished ()Z
diff --git a/mappings/net/minecraft/server/command/AbstractServerCommandSource.mapping b/mappings/net/minecraft/server/command/AbstractServerCommandSource.mapping
@@ -2,7 +2,7 @@ CLASS net/minecraft/class_8839 net/minecraft/server/command/AbstractServerComman
 	METHOD method_54307 withReturnValueConsumer (Lnet/minecraft/class_8935;)Lnet/minecraft/class_8839;
 		ARG 1 returnValueConsumer
 	METHOD method_54310 getDispatcher ()Lcom/mojang/brigadier/CommandDispatcher;
-	METHOD method_54311 withDummyResultStorer ()Lnet/minecraft/class_8839;
+	METHOD method_54311 withDummyReturnValueConsumer ()Lnet/minecraft/class_8839;
 	METHOD method_54316 (Lcom/mojang/brigadier/context/CommandContext;ZI)V
 		ARG 0 context
 		ARG 1 success

diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping
@@ -138,8 +138,9 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan
 		COMMENT {@return the validated acknowledgment if the message is valid, or an empty optional
 		COMMENT if it is not}
 		COMMENT
-		COMMENT <p>This disconnects the player if the message arrives in {@linkplain
-		COMMENT #isInProperOrder improper order} or if chat is disabled.
+		COMMENT <p>This disconnects the player if the message arrives in
+		COMMENT improper order or if chat is disabled.
+		ARG 1 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;
@@ -159,6 +160,8 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan
 	METHOD method_45011 getSignedMessage (Lnet/minecraft/class_2797;Lnet/minecraft/class_7635;)Lnet/minecraft/class_7471;
 		ARG 1 packet
 		ARG 2 lastSeenMessages
+	METHOD method_45064 (Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;Lnet/minecraft/class_5837;)V
+		ARG 3 filtered
 	METHOD method_45168 sendProfilelessChatMessage (Lnet/minecraft/class_2561;Lnet/minecraft/class_2556$class_7602;)V
 		ARG 1 message
 		ARG 2 params
@@ -168,6 +171,7 @@ 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/ApiServices.mapping b/mappings/net/minecraft/util/ApiServices.mapping
@@ -14,3 +14,4 @@ CLASS net/minecraft/class_7497 net/minecraft/util/ApiServices
 		ARG 0 authenticationService
 		ARG 1 rootDirectory
 	METHOD method_51467 serviceSignatureVerifier ()Lnet/minecraft/class_7500;
+	METHOD method_55595 providesProfileKeys ()Z
diff --git a/mappings/net/minecraft/util/Downloader.mapping b/mappings/net/minecraft/util/Downloader.mapping
@@ -3,6 +3,7 @@ CLASS net/minecraft/class_9028 net/minecraft/util/Downloader
 	FIELD field_47573 directory Ljava/nio/file/Path;
 	FIELD field_47574 logWriter Lnet/minecraft/class_7935;
 	FIELD field_47575 executor Lnet/minecraft/class_3846;
+	FIELD field_47679 MAX_RETAINED_CACHE_FILES I
 	METHOD <init> (Ljava/nio/file/Path;)V
 		ARG 1 directory
 	METHOD method_55485 (Lnet/minecraft/class_9028$class_9029;Lnet/minecraft/class_9028$class_9030;Ljava/util/UUID;Lnet/minecraft/class_9028$class_9031;)V

diff --git a/mappings/net/minecraft/util/NetworkUtils.mapping b/mappings/net/minecraft/util/NetworkUtils.mapping
@@ -29,10 +29,13 @@ CLASS net/minecraft/class_3521 net/minecraft/util/NetworkUtils
 		ARG 5 maxBytes
 		ARG 6 proxy
 		ARG 7 listener
+	METHOD method_55603 updateModificationTime (Ljava/nio/file/Path;)V
+		ARG 0 path
 	CLASS class_9034 DownloadListener
 		METHOD method_55497 onStart ()V
 		METHOD method_55498 onProgress (J)V
 			ARG 1 writtenBytes
 		METHOD method_55499 onContentLength (Ljava/util/OptionalLong;)V
 			ARG 1 contentLength
 		METHOD method_55500 onFinish (Z)V
+			ARG 1 success
diff --git a/mappings/net/minecraft/util/path/CacheFiles.mapping b/mappings/net/minecraft/util/path/CacheFiles.mapping
@@ -0,0 +1,17 @@
+CLASS net/minecraft/class_9055 net/minecraft/util/path/CacheFiles
+	FIELD field_47674 LOGGER Lorg/slf4j/Logger;
+	METHOD method_55599 findCacheFiles (Ljava/nio/file/Path;)Ljava/util/List;
+		ARG 0 directory
+	METHOD method_55600 clear (Ljava/nio/file/Path;I)V
+		ARG 0 directory
+		ARG 1 maxRetained
+	METHOD method_55601 toCacheEntries (Ljava/util/List;)Ljava/util/List;
+		ARG 0 files
+	CLASS 1
+		METHOD visitFile (Ljava/lang/Object;Ljava/nio/file/attribute/BasicFileAttributes;)Ljava/nio/file/FileVisitResult;
+			ARG 1 path
+			ARG 2 attributes
+	CLASS class_9056 CacheEntry
+		FIELD field_47677 COMPARATOR Ljava/util/Comparator;
+	CLASS class_9057 CacheFile
+		FIELD field_47678 COMPARATOR Ljava/util/Comparator;