Merge branch '1.21.3' into 1.21.2-rc2-fixes

FabricMC · Oct 23, 2024 · 4c807a8 · 4c807a8
2 parents b008603 + e0948fe
commit 4c807a8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 1 deletion.
diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ plugins {
 	id 'net.fabricmc.filament'
 }
 
-def minecraft_version = "1.21.2-rc2"
+def minecraft_version = "1.21.3"
 
 filament {
 	minecraftVersion = minecraft_version

diff --git a/mappings/net/minecraft/datafixer/fix/EntitySalmonSizeFix.mapping b/mappings/net/minecraft/datafixer/fix/EntitySalmonSizeFix.mapping
@@ -0,0 +1,5 @@
+CLASS net/minecraft/class_10369 net/minecraft/datafixer/fix/EntitySalmonSizeFix
+	METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;)V
+		ARG 1 outputSchema
+	METHOD method_65079 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+		ARG 0 dynamic
diff --git a/mappings/net/minecraft/server/world/ChunkHolder.mapping b/mappings/net/minecraft/server/world/ChunkHolder.mapping
@@ -91,6 +91,7 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder
 	METHOD method_57117 (Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/class_9259;)V
 		ARG 1 optionalChunk
 	METHOD method_60436 isSavable ()Z
+	METHOD method_65077 hasPendingUpdates ()Z
 	CLASS class_3896 LevelUpdateListener
 		METHOD method_17209 updateLevel (Lnet/minecraft/class_1923;Ljava/util/function/IntSupplier;ILjava/util/function/IntConsumer;)V
 			ARG 1 pos

diff --git a/mappings/net/minecraft/server/world/ServerChunkLoadingManager.mapping b/mappings/net/minecraft/server/world/ServerChunkLoadingManager.mapping
@@ -263,6 +263,8 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ServerChunkLoadingMana
 		ARG 1 centerPos
 		ARG 2 radius
 	METHOD method_53686 sendToPlayers (Lnet/minecraft/class_3193;Lnet/minecraft/class_2818;)V
+		ARG 1 chunkHolder
+		ARG 2 chunk
 	METHOD method_53688 getPostProcessedChunk (J)Lnet/minecraft/class_2818;
 		ARG 1 pos
 	METHOD method_53689 (Lnet/minecraft/class_1923;)V

diff --git a/mappings/net/minecraft/server/world/ServerChunkManager.mapping b/mappings/net/minecraft/server/world/ServerChunkManager.mapping
@@ -124,6 +124,8 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager
 		ARG 1 chunks
 	METHOD method_61267 (Ljava/util/List;Lnet/minecraft/class_3193;)V
 		ARG 2 chunk
+	METHOD method_65078 markForUpdate (Lnet/minecraft/class_3193;)V
+		ARG 1 chunkHolder
 	CLASS class_4212 MainThreadExecutor
 		METHOD <init> (Lnet/minecraft/class_3215;Lnet/minecraft/class_1937;)V
 			ARG 2 world