Merge branch '1.21.4' into fix-framerate

FabricMC · Dec 28, 2024 · 89c7335 · 89c7335
2 parents 43ba45f + a500b8f
commit 89c7335
Show file tree

Hide file tree

Showing 410 changed files with 2,661 additions and 592 deletions.
diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ plugins {
 	id 'net.fabricmc.filament'
 }
 
-def minecraft_version = "24w45a"
+def minecraft_version = "1.21.4"
 
 filament {
 	minecraftVersion = minecraft_version

diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping
@@ -721,6 +721,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 state
+		ARG 4 includeData
 	METHOD method_9575 getAmbientOcclusionLightLevel (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)F
 		COMMENT @see AbstractBlockState#getAmbientOcclusionLightLevel
 		ARG 1 state
@@ -1348,6 +1349,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
 		METHOD method_65171 getPickStack (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Z)Lnet/minecraft/class_1799;
 			ARG 1 world
 			ARG 2 pos
+			ARG 3 includeData
 		CLASS class_3752 ShapeCache
 			FIELD field_16559 DIRECTIONS [Lnet/minecraft/class_2350;
 			FIELD field_17651 exceedsCube Z

diff --git a/mappings/net/minecraft/block/CreakingHeartBlock.mapping b/mappings/net/minecraft/block/CreakingHeartBlock.mapping
@@ -17,3 +17,7 @@ CLASS net/minecraft/class_10319 net/minecraft/block/CreakingHeartBlock
 	METHOD method_65147 isNightAndNatural (Lnet/minecraft/class_1937;)Z
 		ARG 0 world
 	METHOD method_65148 dropExperienceOnBreak (Lnet/minecraft/class_1657;Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V
+		ARG 1 player
+		ARG 2 state
+		ARG 3 world
+		ARG 4 pos
diff --git a/mappings/net/minecraft/block/EyeblossomBlock.mapping b/mappings/net/minecraft/block/EyeblossomBlock.mapping
@@ -13,6 +13,8 @@ CLASS net/minecraft/class_10374 net/minecraft/block/EyeblossomBlock
 		ARG 4 otherPos
 	METHOD method_65150 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
+	METHOD method_65151 (Lnet/minecraft/class_10374;)Ljava/lang/Boolean;
+		ARG 0 block
 	METHOD method_65153 updateStateAndNotifyOthers (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 1 state
 		ARG 2 world
@@ -32,7 +34,6 @@ CLASS net/minecraft/class_10374 net/minecraft/block/EyeblossomBlock
 			ARG 6 longSound
 			ARG 7 sound
 			ARG 8 particleColor
-		METHOD method_65154 getToggledBlockState ()Lnet/minecraft/class_2680;
 		METHOD method_65155 spawnTrailParticle (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V
 			ARG 1 world
 			ARG 2 pos
@@ -41,3 +42,6 @@ CLASS net/minecraft/class_10374 net/minecraft/block/EyeblossomBlock
 			ARG 0 open
 		METHOD method_65157 isOpen ()Z
 		METHOD method_65158 getLongSound ()Lnet/minecraft/class_3414;
+		METHOD method_65369 getBlock ()Lnet/minecraft/class_2248;
+		METHOD method_65370 getBlockState ()Lnet/minecraft/class_2680;
+		METHOD method_65371 getOpposite ()Lnet/minecraft/class_10374$class_10375;
diff --git a/mappings/net/minecraft/block/GlowLichenBlock.mapping b/mappings/net/minecraft/block/GlowLichenBlock.mapping
@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_5777 net/minecraft/block/GlowLichenBlock
-	FIELD field_28412 WATERLOGGED Lnet/minecraft/class_2746;
 	FIELD field_37585 grower Lnet/minecraft/class_7118;
 	FIELD field_46363 CODEC Lcom/mojang/serialization/MapCodec;
 	METHOD method_34727 (Lnet/minecraft/class_2680;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z

diff --git a/mappings/net/minecraft/block/MultifaceBlock.mapping b/mappings/net/minecraft/block/MultifaceBlock.mapping
@@ -13,6 +13,7 @@ CLASS net/minecraft/class_5778 net/minecraft/block/MultifaceBlock
 	FIELD field_28424 canMirrorX Z
 	FIELD field_28425 canMirrorZ Z
 	FIELD field_55079 CODEC Lcom/mojang/serialization/MapCodec;
+	FIELD field_55497 WATERLOGGED Lnet/minecraft/class_2746;
 	METHOD method_33358 canGrowOn (Lnet/minecraft/class_1922;Lnet/minecraft/class_2350;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z
 		ARG 0 world
 		ARG 1 direction
@@ -42,7 +43,6 @@ CLASS net/minecraft/class_5778 net/minecraft/block/MultifaceBlock
 		ARG 0 shapes
 	METHOD method_33374 getProperty (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2746;
 		ARG 0 direction
-	METHOD method_33378 isWaterlogged ()Z
 	METHOD method_33380 getShapeForState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_265;
 		ARG 0 state
 	METHOD method_33381 hasAnyDirection (Lnet/minecraft/class_2680;)Z

diff --git a/mappings/net/minecraft/block/SculkVeinBlock.mapping b/mappings/net/minecraft/block/SculkVeinBlock.mapping
@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_7130 net/minecraft/block/SculkVeinBlock
-	FIELD field_37631 WATERLOGGED Lnet/minecraft/class_2746;
 	FIELD field_37632 allGrowTypeGrower Lnet/minecraft/class_7118;
 	FIELD field_37633 samePositionOnlyGrower Lnet/minecraft/class_7118;
 	FIELD field_46437 CODEC Lcom/mojang/serialization/MapCodec;

diff --git a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping
@@ -1,13 +1,10 @@
 CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEntity
-	FIELD field_11980 fuelTime I
-	FIELD field_11981 burnTime I
 	FIELD field_11982 BOTTOM_SLOTS [I
 	FIELD field_11983 SIDE_SLOTS [I
 	FIELD field_11984 inventory Lnet/minecraft/class_2371;
 	FIELD field_11986 recipesUsed Lit/unimi/dsi/fastutil/objects/Reference2IntOpenHashMap;
 	FIELD field_11987 TOP_SLOTS [I
-	FIELD field_11988 cookTimeTotal I
-	FIELD field_11989 cookTime I
+	FIELD field_11988 cookingTotalTime I
 	FIELD field_17374 propertyDelegate Lnet/minecraft/class_3913;
 	FIELD field_31286 INPUT_SLOT_INDEX I
 	FIELD field_31287 FUEL_SLOT_INDEX I
@@ -19,6 +16,9 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn
 	FIELD field_31293 PROPERTY_COUNT I
 	FIELD field_31294 DEFAULT_COOK_TIME I
 	FIELD field_38234 matchGetter Lnet/minecraft/class_1863$class_7266;
+	FIELD field_55574 litTimeRemaining I
+	FIELD field_55575 litTotalTime I
+	FIELD field_55576 cookingTimeSpent I
 	METHOD <init> (Lnet/minecraft/class_2591;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3956;)V
 		ARG 1 blockEntityType
 		ARG 2 pos
@@ -35,7 +35,7 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn
 		ARG 2 stack
 	METHOD method_11201 isBurning ()Z
 	METHOD method_11203 craftRecipe (Lnet/minecraft/class_5455;Lnet/minecraft/class_8786;Lnet/minecraft/class_9696;Lnet/minecraft/class_2371;I)Z
-		ARG 0 dynamicRegisryManager
+		ARG 0 dynamicRegistryManager
 		ARG 1 recipe
 		ARG 2 input
 		ARG 3 inventory

diff --git a/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping b/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping
@@ -11,6 +11,7 @@ CLASS net/minecraft/class_2573 net/minecraft/block/entity/BannerBlockEntity
 	METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1767;)V
 		ARG 1 pos
 		ARG 2 state
+		ARG 3 baseColor
 	METHOD method_10907 getPickStack ()Lnet/minecraft/class_1799;
 	METHOD method_10908 getColorForState ()Lnet/minecraft/class_1767;
 	METHOD method_57566 (Ljava/lang/String;)V

diff --git a/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping b/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping
@@ -12,7 +12,7 @@ CLASS net/minecraft/class_4482 net/minecraft/block/entity/BeehiveBlockEntity
 	METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
 		ARG 1 pos
 		ARG 2 state
-	METHOD method_21848 tryEnterHive (Lnet/minecraft/class_1297;)V
+	METHOD method_21848 tryEnterHive (Lnet/minecraft/class_4466;)V
 		ARG 1 entity
 	METHOD method_21850 angerBees (Lnet/minecraft/class_1657;Lnet/minecraft/class_2680;Lnet/minecraft/class_4482$class_4484;)V
 		ARG 1 player
@@ -75,6 +75,8 @@ CLASS net/minecraft/class_4482 net/minecraft/block/entity/BeehiveBlockEntity
 			ARG 1 beeEntity
 		METHOD method_57586 of (Lnet/minecraft/class_1297;)Lnet/minecraft/class_4482$class_9309;
 			ARG 0 entity
+		METHOD method_57587 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+			ARG 0 instance
 		METHOD method_57588 loadEntity (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1297;
 			ARG 1 world
 			ARG 2 pos

diff --git a/mappings/net/minecraft/block/entity/CreakingHeartBlockEntity.mapping b/mappings/net/minecraft/block/entity/CreakingHeartBlockEntity.mapping
@@ -1,17 +1,19 @@
 CLASS net/minecraft/class_10323 net/minecraft/block/entity/CreakingHeartBlockEntity
-	FIELD field_54786 creakingPuppet Lnet/minecraft/class_10281;
 	FIELD field_54787 creakingUpdateTimer I
 	FIELD field_54788 trailParticlesSpawnTimer I
 	FIELD field_54789 lastCreakingPuppetPos Lnet/minecraft/class_243;
 	FIELD field_54910 comparatorOutput I
+	FIELD field_55500 DEFAULT_CREAKING_PUPPET Ljava/util/Optional;
+	FIELD field_55501 creakingPuppet Lcom/mojang/datafixers/util/Either;
+	FIELD field_55502 ticks J
 	METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
 		ARG 1 pos
 		ARG 2 state
 	METHOD method_64800 spawnTrailParticles (Lnet/minecraft/class_3218;IZ)V
 		ARG 1 world
 		ARG 2 count
 		ARG 3 towardsPuppet
-	METHOD method_64801 spawnCreakingPuppet (Lnet/minecraft/class_3218;Lnet/minecraft/class_10323;)Lnet/minecraft/class_10281;
+	METHOD method_64801 spawnCreakingPuppet (Lnet/minecraft/class_3218;Lnet/minecraft/class_10323;)Lnet/minecraft/class_10275;
 		ARG 0 world
 		ARG 1 blockEntity
 	METHOD method_64802 killPuppet (Lnet/minecraft/class_1282;)V
@@ -27,9 +29,25 @@ CLASS net/minecraft/class_10323 net/minecraft/block/entity/CreakingHeartBlockEnt
 	METHOD method_65010 getComparatorOutput ()I
 	METHOD method_65011 calcComparatorOutput ()I
 	METHOD method_65012 getDistanceToPuppet ()D
+	METHOD method_65167 (Lnet/minecraft/class_2338;)V
+		ARG 1 pos
 	METHOD method_65168 (Lnet/minecraft/class_2338;Ljava/util/function/Consumer;)V
 		ARG 1 pos
 		ARG 2 consumer
 	METHOD method_65169 (Lorg/apache/commons/lang3/mutable/Mutable;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338$class_10384;
 		ARG 2 pos
 	METHOD method_65170 findResinGenerationPos ()Ljava/util/Optional;
+	METHOD method_65801 (Lnet/minecraft/class_10275;Lnet/minecraft/class_10275;)Ljava/lang/Boolean;
+		ARG 1 puppet
+	METHOD method_65802 (Lnet/minecraft/class_10323;Lnet/minecraft/class_10275;)V
+		ARG 1 creaking
+	METHOD method_65803 (Ljava/util/UUID;)Ljava/util/UUID;
+		ARG 0 uuid
+	METHOD method_65804 (Lnet/minecraft/class_10275;)Ljava/lang/Double;
+		ARG 1 creaking
+	METHOD method_65805 getCreakingPuppet ()Ljava/util/Optional;
+	METHOD method_65905 setCreakingPuppet (Lnet/minecraft/class_10275;)V
+		ARG 1 creakingPuppet
+	METHOD method_65906 setCreakingPuppetFromUuid (Ljava/util/UUID;)V
+		ARG 1 creakingPuppetUuid
+	METHOD method_65907 clearCreakingPuppet ()V
diff --git a/mappings/net/minecraft/block/spawner/TrialSpawnerConfig.mapping b/mappings/net/minecraft/block/spawner/TrialSpawnerConfig.mapping
@@ -12,6 +12,8 @@ CLASS net/minecraft/class_8965 net/minecraft/block/spawner/TrialSpawnerConfig
 		ARG 1 additionalPlayers
 	METHOD method_58712 getCooldownLength ()J
 	METHOD method_63466 builder ()Lnet/minecraft/class_8965$class_10165;
+	METHOD method_65373 withSpawnPotential (Lnet/minecraft/class_1299;)Lnet/minecraft/class_8965;
+		ARG 1 entityType
 	CLASS class_10165 Builder
 		FIELD field_53981 spawnRange I
 		FIELD field_53982 totalMobs F

diff --git a/mappings/net/minecraft/block/spawner/TrialSpawnerLogic.mapping b/mappings/net/minecraft/block/spawner/TrialSpawnerLogic.mapping
@@ -109,6 +109,9 @@ CLASS net/minecraft/class_8963 net/minecraft/block/spawner/TrialSpawnerLogic
 		ARG 3 data
 		ARG 4 cooldownLength
 		ARG 5 entityDetectionRange
+	METHOD method_65372 setEntityType (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)V
+		ARG 1 entityType
+		ARG 2 world
 	CLASS class_8964 TrialSpawner
 		METHOD method_55146 setSpawnerState (Lnet/minecraft/class_1937;Lnet/minecraft/class_8967;)V
 			ARG 1 world

diff --git a/mappings/net/minecraft/class_10415.mapping b/mappings/net/minecraft/class_10415.mapping
diff --git a/mappings/net/minecraft/client/ClientBootstrap.mapping b/mappings/net/minecraft/client/ClientBootstrap.mapping
@@ -0,0 +1,3 @@
+CLASS net/minecraft/class_10395 net/minecraft/client/ClientBootstrap
+	FIELD field_55225 initialized Z
+	METHOD method_65385 initialize ()V
diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping
@@ -185,6 +185,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 	FIELD field_52753 inactivityFpsLimiter Lnet/minecraft/class_9919;
 	FIELD field_53831 shaderLoader Lnet/minecraft/class_10151;
 	FIELD field_54267 tracyFrameCapturer Lnet/minecraft/class_10219;
+	FIELD field_55226 itemModelManager Lnet/minecraft/class_10442;
 	METHOD <init> (Lnet/minecraft/class_542;)V
 		ARG 1 args
 	METHOD method_1478 getResourceManager ()Lnet/minecraft/class_3300;
@@ -365,7 +366,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 	METHOD method_31382 createUserApiService (Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService;Lnet/minecraft/class_542;)Lcom/mojang/authlib/minecraft/UserApiService;
 		ARG 1 authService
 		ARG 2 runArgs
-	METHOD method_31974 getEntityModelLoader ()Lnet/minecraft/class_5599;
+	METHOD method_31974 getLoadedEntityModels ()Lnet/minecraft/class_5599;
 	METHOD method_31975 getBlockEntityRenderDispatcher ()Lnet/minecraft/class_824;
 	METHOD method_33883 shouldFilterText ()Z
 	METHOD method_33884 getChatRestriction ()Lnet/minecraft/class_310$class_5859;
@@ -528,6 +529,9 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 	METHOD method_62887 getShaderLoader ()Lnet/minecraft/class_10151;
 	METHOD method_63507 onShaderResourceReloadFailure (Ljava/lang/Exception;)V
 		ARG 1 exception
+	METHOD method_64035 (Lnet/minecraft/class_6880$class_6883;)V
+		ARG 0 item
+	METHOD method_65386 getItemModelManager ()Lnet/minecraft/class_10442;
 	CLASS 1
 		FIELD field_52756 closed Z
 	CLASS class_5859 ChatRestriction

diff --git a/mappings/net/minecraft/client/color/block/BlockColors.mapping b/mappings/net/minecraft/client/color/block/BlockColors.mapping
@@ -2,6 +2,8 @@ CLASS net/minecraft/class_324 net/minecraft/client/color/block/BlockColors
 	FIELD field_1995 providers Lnet/minecraft/class_2361;
 	FIELD field_20271 properties Ljava/util/Map;
 	FIELD field_32163 NO_COLOR I
+	FIELD field_55227 PLACED_LILY_PAD I
+	FIELD field_55228 LILY_PAD I
 	METHOD method_1684 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;I)I
 		ARG 0 state
 		ARG 1 world