25w04a stuff I missed (#4099)

There's still a couple things left that I've not touched (for example, a datafix I don't know what to name, a functional interface I can't find what it's used for, the item subpredicate stuff for which my brain's too fried right now to make heads or tails of, etc.) but this should likely be my last PR for this snapshot :)

mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping

@@ -40,7 +40,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
 	FIELD field_53032 syncedOptions Lnet/minecraft/class_8791;
 	FIELD field_54850 recipeManager Lnet/minecraft/class_10333;
 	FIELD field_54851 removedPlayerVehicleId Ljava/util/OptionalInt;
-	FIELD field_56354 modelDataToClean Ljava/util/List;
+	FIELD field_56354 cachedData Ljava/util/List;
 	METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_2535;Lnet/minecraft/class_8675;)V
 		ARG 1 client
 	METHOD method_16690 getSessionId ()Ljava/util/UUID;
@@ -161,4 +161,6 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
 	METHOD method_64898 refreshRecipeBook (Lnet/minecraft/class_299;)V
 		ARG 1 recipeBook
 	METHOD method_64899 getRecipeManager ()Lnet/minecraft/class_10286;
-	METHOD method_67268 cleanModelData ()V
+	METHOD method_67268 clearCachedData ()V
+	METHOD method_67269 registerForCleaning (Lnet/minecraft/class_10719;)V
+		ARG 1 dataCache

mappings/net/minecraft/client/network/ClientPlayerEntity.mapping

@@ -111,5 +111,7 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity
 	METHOD method_64376 getItemDropCooldown ()Lnet/minecraft/class_10222;
 	METHOD method_65525 isBlind ()Z
 	METHOD method_65949 shouldStopSprinting ()Z
+	METHOD method_67270 applyMovementSpeedFactors (Lnet/minecraft/class_241;)Lnet/minecraft/class_241;
+		ARG 1 input
 	METHOD method_7290 dropSelectedItem (Z)Z
 		ARG 1 entireStack

mappings/net/minecraft/client/render/entity/UndeadHorseEntityRenderer.mapping

@@ -2,3 +2,18 @@ CLASS net/minecraft/class_961 net/minecraft/client/render/entity/UndeadHorseEnti
 	FIELD field_53203 texture Lnet/minecraft/class_2960;
 	METHOD <init> (Lnet/minecraft/class_5617$class_5618;Lnet/minecraft/class_961$class_10651;)V
 		ARG 1 ctx
+		ARG 2 type
+	CLASS class_10651 Type
+		FIELD field_56106 texture Lnet/minecraft/class_2960;
+		FIELD field_56107 modelLayer Lnet/minecraft/class_5601;
+		FIELD field_56108 babyModelLayer Lnet/minecraft/class_5601;
+		FIELD field_56109 saddleLayerType Lnet/minecraft/class_10186$class_10190;
+		FIELD field_56110 saddleModelLayer Lnet/minecraft/class_5601;
+		FIELD field_56111 babySaddleModelLayer Lnet/minecraft/class_5601;
+		METHOD <init> (Ljava/lang/String;ILnet/minecraft/class_2960;Lnet/minecraft/class_5601;Lnet/minecraft/class_5601;Lnet/minecraft/class_10186$class_10190;Lnet/minecraft/class_5601;Lnet/minecraft/class_5601;)V
+			ARG 3 texture
+			ARG 4 modelLayer
+			ARG 5 babyModelLayer
+			ARG 6 saddleLayerType
+			ARG 7 saddleModelLayer
+			ARG 8 babySaddleModelLayer

mappings/net/minecraft/client/render/item/model/ConditionItemModelProperty.mapping → mappings/net/minecraft/client/render/item/property/PropertyTester.mapping

@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_10724 net/minecraft/client/render/item/model/ConditionItemModelProperty
+CLASS net/minecraft/class_10724 net/minecraft/client/render/item/property/PropertyTester
 	METHOD method_65638 test (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;ILnet/minecraft/class_811;)Z
 		ARG 1 stack
 		ARG 2 world

mappings/net/minecraft/client/render/Atlases.mapping → mappings/net/minecraft/client/texture/atlas/Atlases.mapping

@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_10725 net/minecraft/client/render/Atlases
+CLASS net/minecraft/class_10725 net/minecraft/client/texture/atlas/Atlases
 	FIELD field_56379 ARMOR_TRIMS Lnet/minecraft/class_2960;
 	FIELD field_56380 BANNER_PATTERNS Lnet/minecraft/class_2960;
 	FIELD field_56381 BEDS Lnet/minecraft/class_2960;

mappings/net/minecraft/client/texture/atlas/DirectoryAtlasSource.mapping

@@ -1,12 +1,8 @@
 CLASS net/minecraft/class_7954 net/minecraft/client/texture/atlas/DirectoryAtlasSource
-	FIELD comp_3613 source Ljava/lang/String;
-	FIELD comp_3614 prefix Ljava/lang/String;
 	FIELD field_41399 CODEC Lcom/mojang/serialization/MapCodec;
 	METHOD <init> (Ljava/lang/String;Ljava/lang/String;)V
 		ARG 1 source
 		ARG 2 prefix
-	METHOD comp_3613 source ()Ljava/lang/String;
-	METHOD comp_3614 prefix ()Ljava/lang/String;
 	METHOD method_47683 (Lnet/minecraft/class_7654;Lnet/minecraft/class_7948$class_7949;Lnet/minecraft/class_2960;Lnet/minecraft/class_3298;)V
 		ARG 3 id
 		ARG 4 resource

mappings/net/minecraft/client/texture/atlas/FilterAtlasSource.mapping

@@ -4,3 +4,5 @@ CLASS net/minecraft/class_7956 net/minecraft/client/texture/atlas/FilterAtlasSou
 	METHOD <init> (Lnet/minecraft/class_7085;)V
 		ARG 1 pattern
 	METHOD comp_3621 pattern ()Lnet/minecraft/class_7085;
+	METHOD method_47690 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+		ARG 0 instance

mappings/net/minecraft/client/texture/atlas/PalettedPermutationsAtlasSource.mapping

@@ -1,7 +1,4 @@
 CLASS net/minecraft/class_8066 net/minecraft/client/texture/atlas/PalettedPermutationsAtlasSource
-	FIELD comp_3615 textures Ljava/util/List;
-	FIELD comp_3616 paletteKey Lnet/minecraft/class_2960;
-	FIELD comp_3617 permutations Ljava/util/Map;
 	FIELD field_42077 CODEC Lcom/mojang/serialization/MapCodec;
 	FIELD field_42078 LOGGER Lorg/slf4j/Logger;
 	FIELD field_56378 DEFAULT_SEPARATOR Ljava/lang/String;
@@ -12,9 +9,6 @@ CLASS net/minecraft/class_8066 net/minecraft/client/texture/atlas/PalettedPermut
 	METHOD <init> (Ljava/util/List;Lnet/minecraft/class_2960;Ljava/util/Map;Ljava/lang/String;)V
 		ARG 1 textures
 		ARG 3 permutations
-	METHOD comp_3615 textures ()Ljava/util/List;
-	METHOD comp_3616 paletteKey ()Lnet/minecraft/class_2960;
-	METHOD comp_3617 permutations ()Ljava/util/Map;
 	METHOD method_48486 open (Lnet/minecraft/class_3300;Lnet/minecraft/class_2960;)[I
 		ARG 0 resourceManager
 		ARG 1 texture

mappings/net/minecraft/client/texture/atlas/SingleAtlasSource.mapping

@@ -1,10 +1,10 @@
 CLASS net/minecraft/class_7955 net/minecraft/client/texture/atlas/SingleAtlasSource
-	FIELD comp_3619 resource Lnet/minecraft/class_2960;
-	FIELD comp_3620 sprite Ljava/util/Optional;
 	FIELD field_41402 CODEC Lcom/mojang/serialization/MapCodec;
 	FIELD field_41403 LOGGER Lorg/slf4j/Logger;
+	METHOD <init> (Lnet/minecraft/class_2960;)V
+		ARG 1 resourceId
 	METHOD <init> (Lnet/minecraft/class_2960;Ljava/util/Optional;)V
 		ARG 1 resource
 		ARG 2 sprite
-	METHOD comp_3619 resource ()Lnet/minecraft/class_2960;
-	METHOD comp_3620 sprite ()Ljava/util/Optional;
+	METHOD method_47687 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+		ARG 0 instance

mappings/net/minecraft/client/texture/atlas/UnstitchAtlasSource.mapping

@@ -1,6 +1,4 @@
 CLASS net/minecraft/class_7957 net/minecraft/client/texture/atlas/UnstitchAtlasSource
-	FIELD comp_3622 resource Lnet/minecraft/class_2960;
-	FIELD comp_3623 regions Ljava/util/List;
 	FIELD comp_3624 divisorX D
 	FIELD comp_3625 divisorY D
 	FIELD field_41409 CODEC Lcom/mojang/serialization/MapCodec;
@@ -10,8 +8,6 @@ CLASS net/minecraft/class_7957 net/minecraft/client/texture/atlas/UnstitchAtlasS
 		ARG 2 regions
 		ARG 3 divisorX
 		ARG 5 divisorY
-	METHOD comp_3622 resource ()Lnet/minecraft/class_2960;
-	METHOD comp_3623 regions ()Ljava/util/List;
 	METHOD comp_3624 divisorX ()D
 	METHOD comp_3625 divisorY ()D
 	METHOD method_47692 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;

mappings/net/minecraft/client/world/DataCache.mapping

@@ -0,0 +1,12 @@
+CLASS net/minecraft/class_10719 net/minecraft/client/world/DataCache
+	FIELD field_56351 dataFunction Ljava/util/function/Function;
+	FIELD field_56352 context Lnet/minecraft/class_10719$class_10720;
+	FIELD field_56353 data Ljava/lang/Object;
+	METHOD <init> (Ljava/util/function/Function;)V
+		ARG 1 dataFunction
+	METHOD method_67266 clean ()V
+	METHOD method_67267 compute (Lnet/minecraft/class_10719$class_10720;)Ljava/lang/Object;
+		ARG 1 context
+	CLASS class_10720 CacheContext
+		METHOD registerForCleaning (Lnet/minecraft/class_10719;)V
+			ARG 1 dataCache

mappings/net/minecraft/command/argument/ArgumentReaderUtils.mapping

@@ -9,3 +9,9 @@ CLASS net/minecraft/class_9010 net/minecraft/command/argument/ArgumentReaderUtil
 		ARG 1 registries
 		ARG 2 exceptionType
 		ARG 3 reader
+	METHOD method_67244 readSnbtCodec (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;Lnet/minecraft/class_7225$class_7874;Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object;
+		ARG 0 ops
+		ARG 1 codec
+		ARG 2 registries
+		ARG 3 exceptionType
+		ARG 4 reader

mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping

@@ -27,12 +27,18 @@ CLASS net/minecraft/class_2293 net/minecraft/command/argument/ItemPredicateArgum
 		ARG 0 check
 	METHOD method_58527 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 predicate
+	METHOD method_58528 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
+		ARG 0 predicateId
+		ARG 1 predicate
 	METHOD method_58529 (Lnet/minecraft/class_2096$class_2100;)Ljava/util/function/Predicate;
 		ARG 0 range
 	METHOD method_58530 (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_1799;)Z
 		ARG 1 stack
 	METHOD method_58531 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 component
+	METHOD method_58532 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
+		ARG 0 componentId
+		ARG 1 component
 	METHOD method_58533 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 tag
 	METHOD method_58534 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
@@ -64,6 +70,7 @@ CLASS net/minecraft/class_2293 net/minecraft/command/argument/ItemPredicateArgum
 		FIELD field_50066 itemRegistryWrapper Lnet/minecraft/class_7225$class_7226;
 		FIELD field_50067 dataComponentTypeRegistryWrapper Lnet/minecraft/class_7225$class_7226;
 		FIELD field_50068 itemSubPredicateTypeRegistryWrapper Lnet/minecraft/class_7225$class_7226;
+		FIELD field_56366 registries Lnet/minecraft/class_7225$class_7874;
 		METHOD <init> (Lnet/minecraft/class_7225$class_7874;)V
 			ARG 1 registries
 		METHOD method_58544 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_2960;

mappings/net/minecraft/command/argument/ItemStringReader.mapping

@@ -10,7 +10,7 @@ CLASS net/minecraft/class_2291 net/minecraft/command/argument/ItemStringReader
 	FIELD field_50052 REPEATED_COMPONENT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD field_50053 SUGGEST_DEFAULT Ljava/util/function/Function;
 	FIELD field_50054 itemRegistry Lnet/minecraft/class_7225$class_7226;
-	FIELD field_50055 nbtOps Lnet/minecraft/class_6903;
+	FIELD field_50055 ops Lnet/minecraft/class_6903;
 	FIELD field_51458 MALFORMED_ITEM_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD field_51831 EXCLAMATION_MARK C
 	METHOD <init> (Lnet/minecraft/class_7225$class_7874;)V

mappings/net/minecraft/command/argument/packrat/NbtParsingRule.mapping

@@ -1 +1,4 @@
 CLASS net/minecraft/class_9416 net/minecraft/command/argument/packrat/NbtParsingRule
+	FIELD field_56253 ops Lcom/mojang/serialization/DynamicOps;
+	METHOD <init> (Lcom/mojang/serialization/DynamicOps;)V
+		ARG 1 ops

mappings/net/minecraft/command/argument/packrat/PackratParsing.mapping

@@ -37,6 +37,7 @@ CLASS net/minecraft/class_9437 net/minecraft/command/argument/packrat/PackratPar
 		METHOD method_58506 componentMatchPredicate (Lcom/mojang/brigadier/ImmutableStringReader;Ljava/lang/Object;Lcom/mojang/serialization/Dynamic;)Ljava/lang/Object;
 			ARG 1 reader
 			ARG 2 check
+			ARG 3 dynamic
 		METHOD method_58507 negate (Ljava/lang/Object;)Ljava/lang/Object;
 			ARG 1 predicate
 		METHOD method_58508 anyOf (Ljava/util/List;)Ljava/lang/Object;
@@ -48,6 +49,7 @@ CLASS net/minecraft/class_9437 net/minecraft/command/argument/packrat/PackratPar
 		METHOD method_58511 subPredicatePredicate (Lcom/mojang/brigadier/ImmutableStringReader;Ljava/lang/Object;Lcom/mojang/serialization/Dynamic;)Ljava/lang/Object;
 			ARG 1 reader
 			ARG 2 check
+			ARG 3 dynamic
 		METHOD method_58512 streamComponentIds ()Ljava/util/stream/Stream;
 		METHOD method_58513 componentCheck (Lcom/mojang/brigadier/ImmutableStringReader;Lnet/minecraft/class_2960;)Ljava/lang/Object;
 			ARG 1 reader

mappings/net/minecraft/data/advancement/vanilla/VanillaHusbandryTabAdvancementGenerator.mapping

@@ -7,34 +7,34 @@ CLASS net/minecraft/class_2414 net/minecraft/data/advancement/vanilla/VanillaHus
 	FIELD field_38467 EGG_LAYING_ANIMALS Ljava/util/List;
 	METHOD method_10339 requireListedFishCaught (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_7871;)Lnet/minecraft/class_161$class_162;
 		ARG 0 builder
-		ARG 1 itemRegistry
+		ARG 1 itemLookup
 	METHOD method_10340 requireListedFishBucketsFilled (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_7871;)Lnet/minecraft/class_161$class_162;
 		ARG 0 builder
-		ARG 1 itemRegistry
+		ARG 1 itemLookup
 	METHOD method_10341 requireFoodItemsEaten (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_7871;)Lnet/minecraft/class_161$class_162;
 		ARG 0 builder
-		ARG 1 itemRegistry
+		ARG 1 itemLookup
 	METHOD method_10342 requireListedAnimalsBred (Lnet/minecraft/class_161$class_162;Ljava/util/stream/Stream;Lnet/minecraft/class_7871;Ljava/util/stream/Stream;)Lnet/minecraft/class_161$class_162;
 		ARG 0 builder
 		ARG 1 breedableAnimals
-		ARG 2 entityTypeRegistry
+		ARG 2 entityTypeLookup
 		ARG 3 eggLayingAnimals
 	METHOD method_16117 (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_6880$class_6883;)V
 		ARG 1 entry
 	METHOD method_16118 requireAllCatsTamed (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_7225;)Lnet/minecraft/class_161$class_162;
 		ARG 0 builder
 		ARG 1 catVariantRegistry
 	METHOD method_43362 requireAllFrogsOnLeads (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;Lnet/minecraft/class_7225;Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162;
-		ARG 0 entityTypeRegistry
-		ARG 1 itemRegistry
+		ARG 0 entityTypeLookup
+		ARG 1 itemLookup
 		ARG 2 frogVariantRegistry
 		ARG 3 builder
 	METHOD method_43363 (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;Lnet/minecraft/class_6880$class_6883;)V
 		ARG 3 entry
 	METHOD method_47810 createBreedAllAnimalsAdvancement (Lnet/minecraft/class_8779;Ljava/util/function/Consumer;Lnet/minecraft/class_7871;Ljava/util/stream/Stream;Ljava/util/stream/Stream;)Lnet/minecraft/class_8779;
 		ARG 0 parent
 		ARG 1 exporter
-		ARG 2 entityTypeRegistry
+		ARG 2 entityTypeLookup
 		ARG 3 breedableAnimals
 		ARG 4 eggLayingAnimals
 	METHOD method_48497 (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_7871;Lnet/minecraft/class_1299;)V

mappings/net/minecraft/data/loottable/EntityLootTableGenerator.mapping

@@ -19,7 +19,9 @@ CLASS net/minecraft/class_7789 net/minecraft/data/loottable/EntityLootTableGener
 		ARG 1 entityType
 		ARG 2 lootTable
 	METHOD method_46030 killedByFrog (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;Lnet/minecraft/class_5321;)Lnet/minecraft/class_5341$class_210;
-		ARG 1 registryLookup
+		ARG 1 entityTypeLookup
+		ARG 2 frogVariantLookup
+		ARG 3 frogVariant
 	METHOD method_46031 createForSheep (Ljava/util/Map;)Lnet/minecraft/class_55$class_56;
 		ARG 0 colorLootTables
 	METHOD method_46032 (Ljava/util/Set;Lnet/minecraft/class_6880$class_6883;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5321;Lnet/minecraft/class_52$class_53;)V
@@ -28,7 +30,9 @@ CLASS net/minecraft/class_7789 net/minecraft/data/loottable/EntityLootTableGener
 	METHOD method_46033 (Ljava/util/Set;Ljava/util/function/BiConsumer;Lnet/minecraft/class_6880$class_6883;)V
 		ARG 3 entityType
 	METHOD method_46034 killedByFrog (Lnet/minecraft/class_7871;)Lnet/minecraft/class_5341$class_210;
-		ARG 1 registryLookup
+		ARG 1 entityTypeLookup
 	METHOD method_46035 (Lnet/minecraft/class_1299;)Ljava/util/Map;
 		ARG 0 type
+	METHOD method_58573 (Lnet/minecraft/class_5321;)Ljava/lang/String;
+		ARG 0 key
 	METHOD method_60394 createSmeltLootCondition ()Lnet/minecraft/class_8551$class_8552;

mappings/net/minecraft/data/recipe/RecipeGenerator.mapping

@@ -281,6 +281,9 @@ CLASS net/minecraft/class_2446 net/minecraft/data/recipe/RecipeGenerator
 		ARG 2 output
 		ARG 3 input
 	METHOD method_48530 offerSmithingTrimRecipe (Lnet/minecraft/class_1792;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)V
+		ARG 1 input
+		ARG 2 pattern
+		ARG 3 recipeKey
 	METHOD method_48533 offerSmithingTemplateCopyingRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V
 		ARG 1 template
 		ARG 2 resource

mappings/net/minecraft/data/recipe/SmithingTrimRecipeJsonBuilder.mapping

@@ -4,17 +4,21 @@ CLASS net/minecraft/class_8076 net/minecraft/data/recipe/SmithingTrimRecipeJsonB
 	FIELD field_42099 base Lnet/minecraft/class_1856;
 	FIELD field_42100 addition Lnet/minecraft/class_1856;
 	FIELD field_46153 criteria Ljava/util/Map;
+	FIELD field_56407 pattern Lnet/minecraft/class_6880;
 	METHOD <init> (Lnet/minecraft/class_7800;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_6880;)V
 		ARG 1 category
 		ARG 2 template
 		ARG 3 base
 		ARG 4 addition
+		ARG 5 pattern
 	METHOD method_48539 validate (Lnet/minecraft/class_5321;)V
 		ARG 1 recipeKey
 	METHOD method_48540 create (Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_6880;Lnet/minecraft/class_7800;)Lnet/minecraft/class_8076;
 		ARG 0 template
 		ARG 1 base
 		ARG 2 addition
+		ARG 3 pattern
+		ARG 4 category
 	METHOD method_48541 criterion (Ljava/lang/String;Lnet/minecraft/class_175;)Lnet/minecraft/class_8076;
 		ARG 1 name
 		ARG 2 criterion

mappings/net/minecraft/entity/passive/CatVariants.mapping

@@ -15,3 +15,4 @@ CLASS net/minecraft/class_10686 net/minecraft/entity/passive/CatVariants
 		ARG 0 registry
 		ARG 1 key
 		ARG 2 assetId
+		ARG 3 spawnConditions

mappings/net/minecraft/entity/passive/FrogVariants.mapping

@@ -19,3 +19,4 @@ CLASS net/minecraft/class_10689 net/minecraft/entity/passive/FrogVariants
 		ARG 0 registry
 		ARG 1 key
 		ARG 2 assetId
+		ARG 3 spawnConditions

mappings/net/minecraft/entity/passive/PigVariant.mapping

@@ -11,6 +11,6 @@ CLASS net/minecraft/class_10586 net/minecraft/entity/passive/PigVariant
 		ARG 0 instance
 	CLASS class_10587 Model
 		FIELD field_55690 CODEC Lcom/mojang/serialization/Codec;
-		FIELD field_55694 name Ljava/lang/String;
+		FIELD field_55694 id Ljava/lang/String;
 		METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
-			ARG 3 name
+			ARG 3 id

mappings/net/minecraft/entity/passive/PigVariants.mapping

@@ -22,3 +22,4 @@ CLASS net/minecraft/class_10588 net/minecraft/entity/passive/PigVariants
 		ARG 1 key
 		ARG 2 model
 		ARG 3 textureName
+		ARG 4 spawnConditions

mappings/net/minecraft/entity/passive/WolfVariants.mapping

@@ -18,9 +18,10 @@ CLASS net/minecraft/class_9347 net/minecraft/entity/passive/WolfVariants
 		ARG 0 registry
 		ARG 1 key
 		ARG 2 textureName
+		ARG 3 spawnConditions
 	METHOD method_67139 select (Lnet/minecraft/class_5819;Lnet/minecraft/class_5455;Lnet/minecraft/class_10701;)Ljava/util/Optional;
 		ARG 0 random
 		ARG 1 registries
 		ARG 2 context
-	METHOD method_67140 (Lnet/minecraft/class_6885;)Lnet/minecraft/class_10702;
+	METHOD method_67140 createSpawnConditions (Lnet/minecraft/class_6885;)Lnet/minecraft/class_10702;
 		ARG 0 requiredBiomes

mappings/net/minecraft/entity/projectile/thrown/LingeringPotionEntity.mapping

@@ -1,4 +1,10 @@
 CLASS net/minecraft/class_10690 net/minecraft/entity/projectile/thrown/LingeringPotionEntity
+	METHOD <init> (Lnet/minecraft/class_1937;DDDLnet/minecraft/class_1799;)V
+		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+		ARG 8 stack
 	METHOD <init> (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;)V
 		ARG 1 world
 		ARG 2 owner

mappings/net/minecraft/entity/projectile/thrown/PotionEntity.mapping

@@ -20,5 +20,6 @@ CLASS net/minecraft/class_1686 net/minecraft/entity/projectile/thrown/PotionEnti
 		ARG 2 stack
 		ARG 3 entityHit
 	METHOD method_67149 explodeWaterPotion (Lnet/minecraft/class_3218;)V
+		ARG 1 world
 	METHOD method_7499 extinguishFire (Lnet/minecraft/class_2338;)V
 		ARG 1 pos

mappings/net/minecraft/entity/projectile/thrown/SplashPotionEntity.mapping

@@ -1,5 +1,11 @@
 CLASS net/minecraft/class_10691 net/minecraft/entity/projectile/thrown/SplashPotionEntity
 	METHOD <init> (Lnet/minecraft/class_1937;DDDLnet/minecraft/class_1799;)V
 		ARG 1 world
+		ARG 2 x
+		ARG 4 y
+		ARG 6 z
+		ARG 8 stack
 	METHOD <init> (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;)V
 		ARG 1 world
+		ARG 2 owner
+		ARG 3 stack

mappings/net/minecraft/item/Item.mapping

@@ -31,6 +31,7 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item
 	FIELD field_49998 MAX_MAX_COUNT I
 	FIELD field_54952 ENTRY_CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_55708 ENTRY_PACKET_CODEC Lnet/minecraft/class_9139;
+	FIELD field_56296 DEFAULT_BLOCKS_ATTACKS_MAX_USE_TIME I
 	FIELD field_8001 BASE_ATTACK_SPEED_MODIFIER_ID Lnet/minecraft/class_2960;
 	FIELD field_8003 BLOCK_ITEMS Ljava/util/Map;
 	FIELD field_8006 BASE_ATTACK_DAMAGE_MODIFIER_ID Lnet/minecraft/class_2960;

mappings/net/minecraft/item/equipment/trim/ArmorTrim.mapping

@@ -9,3 +9,10 @@ CLASS net/minecraft/class_8053 net/minecraft/item/equipment/trim/ArmorTrim
 		ARG 2 pattern
 	METHOD comp_3179 material ()Lnet/minecraft/class_6880;
 	METHOD comp_3180 pattern ()Lnet/minecraft/class_6880;
+	METHOD method_67224 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+		ARG 0 instance
+	METHOD method_67225 getTextureId (Ljava/lang/String;Lnet/minecraft/class_5321;)Lnet/minecraft/class_2960;
+		ARG 1 trimsDirectory
+		ARG 2 equipmentAsset
+	METHOD method_67226 (Ljava/lang/String;Lnet/minecraft/class_10714$class_10715;Ljava/lang/String;)Ljava/lang/String;
+		ARG 2 patternId