24w40a more stuff (#4006)

* and some more * more
FabricMC · Oct 2, 2024 · e5b3afa · e5b3afa
1 parent fe0d9b9
commit e5b3afa
Show file tree

Hide file tree

Showing 35 changed files with 150 additions and 1 deletion.
diff --git a/mappings/net/minecraft/advancement/AdvancementRewards.mapping b/mappings/net/minecraft/advancement/AdvancementRewards.mapping
@@ -38,4 +38,6 @@ CLASS net/minecraft/class_170 net/minecraft/advancement/AdvancementRewards
 			ARG 0 experience
 		METHOD method_751 build ()Lnet/minecraft/class_170;
 		METHOD method_752 addRecipe (Lnet/minecraft/class_5321;)Lnet/minecraft/class_170$class_171;
+			ARG 1 recipeKey
 		METHOD method_753 recipe (Lnet/minecraft/class_5321;)Lnet/minecraft/class_170$class_171;
+			ARG 0 recipeKey
diff --git a/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping
@@ -3,6 +3,7 @@ CLASS net/minecraft/class_8508 net/minecraft/advancement/criterion/RecipeCrafted
 		ARG 2 conditions
 	METHOD method_51350 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_5321;Ljava/util/List;)V
 		ARG 1 player
+		ARG 2 recipeKey
 		ARG 3 ingredients
 	CLASS class_8509 Conditions
 		FIELD comp_2029 player Ljava/util/Optional;
@@ -11,10 +12,14 @@ CLASS net/minecraft/class_8508 net/minecraft/advancement/criterion/RecipeCrafted
 			ARG 1 playerPredicate
 			ARG 3 ingredients
 		METHOD method_51352 create (Lnet/minecraft/class_5321;)Lnet/minecraft/class_175;
+			ARG 0 recipeKey
 		METHOD method_51353 create (Lnet/minecraft/class_5321;Ljava/util/List;)Lnet/minecraft/class_175;
+			ARG 0 recipeKey
 			ARG 1 ingredients
 		METHOD method_51354 matches (Lnet/minecraft/class_5321;Ljava/util/List;)Z
+			ARG 1 recipeKey
 			ARG 2 ingredients
 		METHOD method_55106 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 			ARG 0 instance
 		METHOD method_58450 createCrafterRecipeCrafted (Lnet/minecraft/class_5321;)Lnet/minecraft/class_175;
+			ARG 0 recipeKey
diff --git a/mappings/net/minecraft/block/AbstractFurnaceBlock.mapping b/mappings/net/minecraft/block/AbstractFurnaceBlock.mapping
@@ -9,3 +9,8 @@ CLASS net/minecraft/class_2363 net/minecraft/block/AbstractFurnaceBlock
 		ARG 0 world
 		ARG 1 givenType
 		ARG 2 expectedType
+	METHOD method_64763 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2609;)V
+		ARG 1 world
+		ARG 2 pos
+		ARG 3 state
+		ARG 4 blockEntity
diff --git a/mappings/net/minecraft/block/CampfireBlock.mapping b/mappings/net/minecraft/block/CampfireBlock.mapping
@@ -40,3 +40,8 @@ CLASS net/minecraft/class_3922 net/minecraft/block/CampfireBlock
 		ARG 0 block
 	METHOD method_53988 (Lnet/minecraft/class_3922;)Ljava/lang/Boolean;
 		ARG 0 block
+	METHOD method_64781 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1863$class_7266;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3924;)V
+		ARG 2 world
+		ARG 3 pos
+		ARG 4 state
+		ARG 5 blockEntity
diff --git a/mappings/net/minecraft/block/CrafterBlock.mapping b/mappings/net/minecraft/block/CrafterBlock.mapping
@@ -8,6 +8,7 @@ CLASS net/minecraft/class_8886 net/minecraft/block/CrafterBlock
 	METHOD method_54474 (Lnet/minecraft/class_1799;)V
 		ARG 0 stack
 	METHOD method_54475 getCraftingRecipe (Lnet/minecraft/class_3218;Lnet/minecraft/class_9694;)Ljava/util/Optional;
+		ARG 0 world
 		ARG 1 input
 	METHOD method_54476 transferOrSpawnStack (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_8887;Lnet/minecraft/class_1799;Lnet/minecraft/class_2680;Lnet/minecraft/class_8786;)V
 		ARG 1 world

diff --git a/mappings/net/minecraft/block/JigsawBlock.mapping b/mappings/net/minecraft/block/JigsawBlock.mapping
@@ -2,6 +2,8 @@ CLASS net/minecraft/class_3748 net/minecraft/block/JigsawBlock
 	FIELD field_23262 ORIENTATION Lnet/minecraft/class_2754;
 	FIELD field_46376 CODEC Lcom/mojang/serialization/MapCodec;
 	METHOD method_16546 attachmentMatches (Lnet/minecraft/class_3499$class_10326;Lnet/minecraft/class_3499$class_10326;)Z
+		ARG 0 info1
+		ARG 1 info2
 	METHOD method_26378 getFacing (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2350;
 		ARG 0 state
 	METHOD method_26379 getRotation (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2350;

diff --git a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping
@@ -25,12 +25,23 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn
 		ARG 3 state
 		ARG 4 recipeType
 	METHOD method_11192 canAcceptRecipeOutput (Lnet/minecraft/class_5455;Lnet/minecraft/class_8786;Lnet/minecraft/class_9696;Lnet/minecraft/class_2371;I)Z
+		ARG 0 dynamicRegistryManager
 		ARG 1 recipe
+		ARG 2 input
+		ARG 3 inventory
+		ARG 4 maxCount
 	METHOD method_11200 getFuelTime (Lnet/minecraft/class_9895;Lnet/minecraft/class_1799;)I
+		ARG 1 fuelRegistry
+		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 1 recipe
+		ARG 2 input
+		ARG 3 inventory
+		ARG 4 maxCount
 	METHOD method_17029 getCookTime (Lnet/minecraft/class_3218;Lnet/minecraft/class_2609;)I
+		ARG 0 world
 		ARG 1 furnace
 	METHOD method_17760 dropExperience (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;IF)V
 		ARG 0 world
@@ -42,11 +53,13 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn
 	METHOD method_17763 dropExperienceForRecipesUsed (Lnet/minecraft/class_3222;)V
 		ARG 1 player
 	METHOD method_24431 (Lnet/minecraft/class_2487;Lnet/minecraft/class_5321;Ljava/lang/Integer;)V
+		ARG 1 recipeKey
 		ARG 2 count
 	METHOD method_27354 getRecipesUsedAndDropExperience (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;)Ljava/util/List;
 		ARG 1 world
 		ARG 2 pos
 	METHOD method_31651 tick (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2609;)V
+		ARG 0 world
 		ARG 1 pos
 		ARG 2 state
 		ARG 3 blockEntity

diff --git a/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping b/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping
@@ -6,14 +6,20 @@ CLASS net/minecraft/class_3924 net/minecraft/block/entity/CampfireBlockEntity
 		ARG 1 pos
 		ARG 2 state
 	METHOD method_17503 addItem (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;)Z
+		ARG 1 world
+		ARG 2 entity
+		ARG 3 stack
 	METHOD method_17504 (Lnet/minecraft/class_9696;Lnet/minecraft/class_3218;Lnet/minecraft/class_8786;)Lnet/minecraft/class_1799;
 		ARG 2 recipe
 	METHOD method_17505 getItemsBeingCooked ()Lnet/minecraft/class_2371;
 	METHOD method_17506 spawnItemsBeingCooked ()V
 	METHOD method_17510 updateListeners ()V
 	METHOD method_31666 litServerTick (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3924;Lnet/minecraft/class_1863$class_7266;)V
+		ARG 0 world
 		ARG 1 pos
 		ARG 2 state
+		ARG 3 blockEntity
+		ARG 4 recipeMatchGetter
 	METHOD method_31667 unlitServerTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3924;)V
 		ARG 0 world
 		ARG 1 pos

diff --git a/mappings/net/minecraft/block/entity/JigsawBlockEntity.mapping b/mappings/net/minecraft/block/entity/JigsawBlockEntity.mapping
@@ -43,6 +43,7 @@ CLASS net/minecraft/class_3751 net/minecraft/block/entity/JigsawBlockEntity
 	METHOD method_54778 getSelectionPriority ()I
 	CLASS class_4991 Joint
 		FIELD field_23331 name Ljava/lang/String;
+		FIELD field_54790 CODEC Lnet/minecraft/class_3542$class_7292;
 		METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
 			ARG 3 name
 		METHOD method_32357 asText ()Lnet/minecraft/class_2561;
diff --git a/mappings/net/minecraft/block/enums/Orientation.mapping b/mappings/net/minecraft/block/enums/Orientation.mapping
@@ -2,6 +2,8 @@ CLASS net/minecraft/class_5000 net/minecraft/block/enums/Orientation
 	FIELD field_23394 name Ljava/lang/String;
 	FIELD field_23395 rotation Lnet/minecraft/class_2350;
 	FIELD field_23396 facing Lnet/minecraft/class_2350;
+	FIELD field_54867 DIRECTIONS I
+	FIELD field_54868 VALUES [Lnet/minecraft/class_5000;
 	METHOD <init> (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;)V
 		ARG 3 name
 		ARG 4 facing
@@ -11,4 +13,8 @@ CLASS net/minecraft/class_5000 net/minecraft/block/enums/Orientation
 		ARG 1 rotation
 	METHOD method_26426 getFacing ()Lnet/minecraft/class_2350;
 	METHOD method_26427 getIndex (Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;)I
+		ARG 0 facing
+		ARG 1 rotation
 	METHOD method_26428 getRotation ()Lnet/minecraft/class_2350;
+	METHOD method_35840 ([Lnet/minecraft/class_5000;)V
+		ARG 0 values
diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping
@@ -230,6 +230,8 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 	FIELD field_52760 inactivityFpsLimit Lnet/minecraft/class_7172;
 	FIELD field_52761 ROTATE_WITH_MINECART_TOOLTIP Lnet/minecraft/class_2561;
 	FIELD field_52762 rotateWithMinecart Lnet/minecraft/class_7172;
+	FIELD field_54812 HIGH_CONTRAST_BLOCK_OUTLINE_TOOLTIP Lnet/minecraft/class_2561;
+	FIELD field_54813 highContrastBlockOutline Lnet/minecraft/class_7172;
 	METHOD <init> (Lnet/minecraft/class_310;Ljava/io/File;)V
 		ARG 1 client
 		ARG 2 optionsFile
@@ -596,6 +598,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
 	METHOD method_61969 (Lnet/minecraft/class_9927;)Lnet/minecraft/class_7919;
 		ARG 0 option
 	METHOD method_61970 getInactivityFpsLimit ()Lnet/minecraft/class_7172;
+	METHOD method_64858 getHighContrastBlockOutline ()Lnet/minecraft/class_7172;
 	CLASS 2
 		METHOD method_33676 find (Ljava/lang/String;)Ljava/lang/String;
 			ARG 1 key

diff --git a/mappings/net/minecraft/client/render/RenderLayer.mapping b/mappings/net/minecraft/client/render/RenderLayer.mapping
@@ -262,11 +262,26 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer
 		ARG 0 texture
 	METHOD method_62280 getCrosshair (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921;
 		ARG 0 texture
+	METHOD method_62281 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921;
+		ARG 0 texture
+	METHOD method_62282 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921;
+		ARG 0 texture
+	METHOD method_62283 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921;
+		ARG 0 texture
 	METHOD method_62284 getGuiNauseaOverlay ()Lnet/minecraft/class_1921;
+	METHOD method_62285 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921;
+		ARG 0 texture
+	METHOD method_62286 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921;
+		ARG 0 texture
 	METHOD method_62287 getMojangLogo ()Lnet/minecraft/class_1921;
+	METHOD method_62288 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921;
+		ARG 0 texture
+	METHOD method_62289 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921;
+		ARG 0 texture
 	METHOD method_62290 getEntitySolidZOffsetForward (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921;
 		ARG 0 texture
 	METHOD method_62291 getNoCullingClouds ()Lnet/minecraft/class_1921;
+	METHOD method_64914 getSecondaryBlockOutline ()Lnet/minecraft/class_1921;
 	CLASS class_4687 MultiPhase
 		FIELD field_21403 phases Lnet/minecraft/class_1921$class_4688;
 		FIELD field_21697 affectedOutline Ljava/util/Optional;

diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping
@@ -66,6 +66,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
 		ARG 3 renderBlockOutline
 		ARG 4 camera
 		ARG 5 gameRenderer
+		ARG 6 lightmapTextureManager
 		ARG 7 positionMatrix
 		ARG 8 projectionMatrix
 	METHOD method_22712 drawBlockOutline (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_1297;DDDLnet/minecraft/class_2338;Lnet/minecraft/class_2680;I)V
@@ -227,6 +228,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
 		ARG 4 tickDelta
 		ARG 5 fog
 	METHOD method_62204 renderClouds (Lnet/minecraft/class_9909;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lnet/minecraft/class_4063;Lnet/minecraft/class_243;FIF)V
+		ARG 1 frameGraphBuilder
 		ARG 2 positionMatrix
 		ARG 3 projectionMatrix
 		ARG 4 renderMode
@@ -249,6 +251,8 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
 	METHOD method_62209 addWeatherParticlesAndSound (Lnet/minecraft/class_4184;)V
 		ARG 1 camera
 	METHOD method_62210 renderTargetBlockOutline (Lnet/minecraft/class_4184;Lnet/minecraft/class_4597$class_4598;Lnet/minecraft/class_4587;Z)V
+		ARG 1 camera
+		ARG 3 matrices
 	METHOD method_62211 getEntitiesToRender (Lnet/minecraft/class_4184;Lnet/minecraft/class_4604;Ljava/util/List;)Z
 		ARG 1 camera
 		ARG 2 frustum

diff --git a/mappings/net/minecraft/command/argument/RegistryKeyArgumentType.mapping b/mappings/net/minecraft/command/argument/RegistryKeyArgumentType.mapping
@@ -4,6 +4,8 @@ CLASS net/minecraft/class_7079 net/minecraft/command/argument/RegistryKeyArgumen
 	FIELD field_37272 registryRef Lnet/minecraft/class_5321;
 	FIELD field_39191 INVALID_STRUCTURE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD field_39192 INVALID_JIGSAW_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
+	FIELD field_54825 RECIPE_NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
+	FIELD field_54826 ADVANCEMENT_NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	METHOD <init> (Lnet/minecraft/class_5321;)V
 		ARG 1 registryRef
 	METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
@@ -39,6 +41,16 @@ CLASS net/minecraft/class_7079 net/minecraft/command/argument/RegistryKeyArgumen
 	METHOD method_43780 getStructurePoolEntry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_6880$class_6883;
 		ARG 0 context
 		ARG 1 name
+	METHOD method_64863 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
+		ARG 0 id
+	METHOD method_64865 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
+		ARG 0 id
+	METHOD method_64866 getRecipeEntry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_8786;
+		ARG 0 context
+		ARG 1 name
+	METHOD method_64867 getAdvancementEntry (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_8779;
+		ARG 0 context
+		ARG 1 name
 	METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object;
 		ARG 1 reader
 	CLASS class_7080 Serializer

diff --git a/mappings/net/minecraft/command/suggestion/SuggestionProviders.mapping b/mappings/net/minecraft/command/suggestion/SuggestionProviders.mapping
@@ -21,6 +21,11 @@ CLASS net/minecraft/class_2321 net/minecraft/command/suggestion/SuggestionProvid
 	METHOD method_10029 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 		ARG 0 context
 		ARG 1 builder
+	METHOD method_45916 (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_1299;)Z
+		ARG 1 entityType
+	METHOD method_64921 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
+		ARG 0 context
+		ARG 1 builder
 	CLASS class_2322 LocalProvider
 		FIELD field_10936 id Lnet/minecraft/class_2960;
 		FIELD field_10937 provider Lcom/mojang/brigadier/suggestion/SuggestionProvider;

diff --git a/mappings/net/minecraft/component/type/BundleContentsComponent.mapping b/mappings/net/minecraft/component/type/BundleContentsComponent.mapping
@@ -55,3 +55,5 @@ CLASS net/minecraft/class_9276 net/minecraft/component/type/BundleContentsCompon
 		METHOD method_57436 getMaxAllowed (Lnet/minecraft/class_1799;)I
 			ARG 1 stack
 		METHOD method_59709 clear ()Lnet/minecraft/class_9276$class_9277;
+		METHOD method_64662 setSelectedStackIndex (I)V
+			ARG 1 selectedStackIndex
diff --git a/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping b/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping
@@ -452,6 +452,9 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato
 		ARG 3 modelCollector
 	METHOD method_34633 (Lnet/minecraft/class_4935;)Lnet/minecraft/class_4935;
 		ARG 0 variant
+	METHOD method_34634 (Ljava/lang/Integer;Ljava/lang/Integer;)Ljava/util/List;
+		ARG 1 eggs
+		ARG 2 hatch
 	METHOD method_34636 (Lnet/minecraft/class_4944;)V
 		ARG 0 textures
 	METHOD method_34637 (Lnet/minecraft/class_4944;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944;
@@ -605,6 +608,26 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato
 		ARG 8 vaultState
 		ARG 9 ominous
 	METHOD method_56886 registerVault ()V
+	METHOD method_64940 registerPaleMossCarpet (Lnet/minecraft/class_2248;)V
+		ARG 1 block
+	METHOD method_64941 registerHangingMoss (Lnet/minecraft/class_2248;)V
+		ARG 1 block
+	METHOD method_64942 (Lnet/minecraft/class_2248;Ljava/lang/Boolean;)Lnet/minecraft/class_4935;
+		ARG 2 tip
+	METHOD method_64943 (Lnet/minecraft/class_2248;Lnet/minecraft/class_4918$class_4921;Lnet/minecraft/class_2350;)V
+		ARG 2 direction
+	METHOD method_64944 (Lnet/minecraft/class_2248;Lnet/minecraft/class_4944;)V
+		ARG 1 textureMap
+	METHOD method_64945 (Lnet/minecraft/class_2248;Lnet/minecraft/class_4944;)V
+		ARG 1 textureMap
+	METHOD method_64946 (Lnet/minecraft/class_2248;Lnet/minecraft/class_4944;)V
+		ARG 1 textureMap
+	METHOD method_64947 (Lnet/minecraft/class_2248;Lnet/minecraft/class_4944;)V
+		ARG 1 textureMap
+	METHOD method_64948 (Lnet/minecraft/class_2248;Lnet/minecraft/class_4946$class_4947;)Lnet/minecraft/class_2960;
+		ARG 2 factory
+	METHOD method_64949 registerCreakingHeart (Lnet/minecraft/class_2248;)V
+		ARG 1 block
 	CLASS class_4911 BuiltinModelPool
 		FIELD field_22835 modelId Lnet/minecraft/class_2960;
 		METHOD <init> (Lnet/minecraft/class_4910;Lnet/minecraft/class_2960;Lnet/minecraft/class_2248;)V

diff --git a/mappings/net/minecraft/data/client/TextureMap.mapping b/mappings/net/minecraft/data/client/TextureMap.mapping
@@ -168,3 +168,5 @@ CLASS net/minecraft/class_4944 net/minecraft/data/client/TextureMap
 		ARG 2 side
 		ARG 3 top
 		ARG 4 bottom
+	METHOD method_64950 side (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944;
+		ARG 0 block
diff --git a/mappings/net/minecraft/data/client/TexturedModel.mapping b/mappings/net/minecraft/data/client/TexturedModel.mapping
@@ -28,6 +28,7 @@ CLASS net/minecraft/class_4946 net/minecraft/data/client/TexturedModel
 	FIELD field_42954 FLOWERBED_3 Lnet/minecraft/class_4946$class_4947;
 	FIELD field_42955 FLOWERBED_4 Lnet/minecraft/class_4946$class_4947;
 	FIELD field_47502 CUBE_ALL_INNER_FACES Lnet/minecraft/class_4946$class_4947;
+	FIELD field_54879 MOSSY_CARPET_SIDE Lnet/minecraft/class_4946$class_4947;
 	METHOD <init> (Lnet/minecraft/class_4944;Lnet/minecraft/class_4942;)V
 		ARG 1 textures
 		ARG 2 model

diff --git a/mappings/net/minecraft/data/family/BlockFamilies.mapping b/mappings/net/minecraft/data/family/BlockFamilies.mapping
@@ -71,6 +71,7 @@ CLASS net/minecraft/class_5793 net/minecraft/data/family/BlockFamilies
 	FIELD field_47131 TUFF Lnet/minecraft/class_5794;
 	FIELD field_47132 POLISHED_TUFF Lnet/minecraft/class_5794;
 	FIELD field_47133 TUFF_BRICK Lnet/minecraft/class_5794;
+	FIELD field_54877 PALE_OAK Lnet/minecraft/class_5794;
 	METHOD method_33467 getFamilies ()Ljava/util/stream/Stream;
 	METHOD method_33468 register (Lnet/minecraft/class_2248;)Lnet/minecraft/class_5794$class_5795;
 		ARG 0 baseBlock
diff --git a/mappings/net/minecraft/data/server/recipe/ComplexRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/ComplexRecipeJsonBuilder.mapping
@@ -4,6 +4,7 @@ CLASS net/minecraft/class_2456 net/minecraft/data/server/recipe/ComplexRecipeJso
 		ARG 1 recipeFactory
 	METHOD method_10475 offerTo (Lnet/minecraft/class_8790;Lnet/minecraft/class_5321;)V
 		ARG 1 exporter
+		ARG 2 recipeKey
 	METHOD method_10476 create (Ljava/util/function/Function;)Lnet/minecraft/class_2456;
 		ARG 0 recipeFactory
 	METHOD method_53820 offerTo (Lnet/minecraft/class_8790;Ljava/lang/String;)V

diff --git a/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonBuilder.mapping
@@ -17,6 +17,7 @@ CLASS net/minecraft/class_2454 net/minecraft/data/server/recipe/CookingRecipeJso
 		ARG 6 cookingTime
 		ARG 7 recipeFactory
 	METHOD method_10471 validate (Lnet/minecraft/class_5321;)V
+		ARG 1 recipeKey
 	METHOD method_10473 createBlasting (Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;FI)Lnet/minecraft/class_2454;
 		ARG 0 input
 		ARG 1 category

diff --git a/mappings/net/minecraft/data/server/recipe/CraftingRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/CraftingRecipeJsonBuilder.mapping
@@ -4,6 +4,7 @@ CLASS net/minecraft/class_5797 net/minecraft/data/server/recipe/CraftingRecipeJs
 		ARG 1 exporter
 	METHOD method_17972 offerTo (Lnet/minecraft/class_8790;Lnet/minecraft/class_5321;)V
 		ARG 1 exporter
+		ARG 2 recipeKey
 	METHOD method_33529 group (Ljava/lang/String;)Lnet/minecraft/class_5797;
 		ARG 1 group
 	METHOD method_33530 criterion (Ljava/lang/String;Lnet/minecraft/class_175;)Lnet/minecraft/class_5797;

diff --git a/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonBuilder.mapping
@@ -17,6 +17,7 @@ CLASS net/minecraft/class_2447 net/minecraft/data/server/recipe/ShapedRecipeJson
 		ARG 1 c
 		ARG 2 ingredient
 	METHOD method_10432 validate (Lnet/minecraft/class_5321;)Lnet/minecraft/class_8957;
+		ARG 1 recipeKey
 	METHOD method_10433 input (Ljava/lang/Character;Lnet/minecraft/class_6862;)Lnet/minecraft/class_2447;
 		ARG 1 c
 		ARG 2 tag

diff --git a/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonBuilder.mapping
@@ -10,6 +10,7 @@ CLASS net/minecraft/class_2450 net/minecraft/data/server/recipe/ShapelessRecipeJ
 		ARG 2 category
 		ARG 3 output
 	METHOD method_10445 validate (Lnet/minecraft/class_5321;)V
+		ARG 1 recipeKey
 	METHOD method_10446 input (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2450;
 		ARG 1 tag
 	METHOD method_10447 create (Lnet/minecraft/class_7871;Lnet/minecraft/class_7800;Lnet/minecraft/class_1799;)Lnet/minecraft/class_2450;

diff --git a/mappings/net/minecraft/data/server/recipe/SmithingTransformRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/SmithingTransformRecipeJsonBuilder.mapping
@@ -12,6 +12,7 @@ CLASS net/minecraft/class_8074 net/minecraft/data/server/recipe/SmithingTransfor
 		ARG 4 category
 		ARG 5 result
 	METHOD method_48534 validate (Lnet/minecraft/class_5321;)V
+		ARG 1 recipeKey
 	METHOD method_48535 create (Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_7800;Lnet/minecraft/class_1792;)Lnet/minecraft/class_8074;
 		ARG 0 template
 		ARG 1 base
@@ -23,6 +24,7 @@ CLASS net/minecraft/class_8074 net/minecraft/data/server/recipe/SmithingTransfor
 		ARG 2 criterion
 	METHOD method_48537 offerTo (Lnet/minecraft/class_8790;Lnet/minecraft/class_5321;)V
 		ARG 1 exporter
+		ARG 2 recipeKey
 	METHOD method_48538 offerTo (Lnet/minecraft/class_8790;Ljava/lang/String;)V
 		ARG 1 exporter
 		ARG 2 recipeId