FabricMC · Shnupbups · Oct 4, 2024 · Oct 3, 2024 · Oct 3, 2024
diff --git a/mappings/net/minecraft/class_10297.mapping b/mappings/net/minecraft/class_10297.mapping
diff --git a/mappings/net/minecraft/class_10298.mapping b/mappings/net/minecraft/class_10298.mapping
diff --git a/mappings/net/minecraft/data/server/DynamicRegistriesProvider.mapping b/mappings/net/minecraft/data/server/DynamicRegistriesProvider.mapping
@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_5475 net/minecraft/data/server/DynamicRegistriesProvider
 	FIELD field_40665 output Lnet/minecraft/class_7784;
-	FIELD field_40952 registryLookupFuture Ljava/util/concurrent/CompletableFuture;
+	FIELD field_40952 registriesFuture Ljava/util/concurrent/CompletableFuture;
 	METHOD <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V
 		ARG 1 output
 		ARG 2 registriesFuture

diff --git a/...minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping b/...minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping
@@ -6,6 +6,8 @@ CLASS net/minecraft/class_2412 net/minecraft/data/server/advancement/vanilla/Van
 	FIELD field_35094 OVERWORLD_BEDROCK_LAYER_HEIGHT I
 	METHOD method_10336 requireListedMobsKilled (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_7871;Ljava/util/List;)Lnet/minecraft/class_161$class_162;
 		ARG 0 builder
+		ARG 1 entityTypeRegistry
+		ARG 2 entityTypes
 	METHOD method_10337 requireListedBiomesVisited (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_7225$class_7874;Ljava/util/List;)Lnet/minecraft/class_161$class_162;
 		ARG 0 builder
 		ARG 1 registries
@@ -28,12 +30,28 @@ CLASS net/minecraft/class_2412 net/minecraft/data/server/advancement/vanilla/Van
 	METHOD method_51691 requireTrimmedArmor (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162;
 		ARG 0 builder
 	METHOD method_51692 requireSalvagedSherd (Lnet/minecraft/class_7871;Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162;
+		ARG 0 itemRegistry
+		ARG 1 builder
 	METHOD method_51815 requirePlacedBlockReadByComparator (Lnet/minecraft/class_7871;Lnet/minecraft/class_2248;)Lnet/minecraft/class_175;
+		ARG 0 blockRegistry
+		ARG 1 block
+	METHOD method_51816 (Lnet/minecraft/class_7871;Lnet/minecraft/class_2248;Lnet/minecraft/class_2350;)Lnet/minecraft/class_8548$class_8549;
+		ARG 2 facing
+	METHOD method_51817 (Lnet/minecraft/class_7871;Lnet/minecraft/class_2350;)Lnet/minecraft/class_5341$class_210;
+		ARG 1 facing
 	METHOD method_51819 requirePlacedComparatorReadingBlock (Lnet/minecraft/class_7871;Lnet/minecraft/class_2248;)Lnet/minecraft/class_175;
+		ARG 0 blockRegistry
+		ARG 1 block
+	METHOD method_54650 (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_5321;)V
+		ARG 1 template
 	METHOD method_54651 (Lnet/minecraft/class_161$class_162;Lcom/mojang/datafixers/util/Pair;)V
 		ARG 1 pair
 	METHOD method_54652 (Ljava/util/Set;Lnet/minecraft/class_7803$class_8905;)Z
 		ARG 1 template
+	METHOD method_55580 (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_7871;Lnet/minecraft/class_1299;)V
+		ARG 2 entityType
 	METHOD method_55581 createKillMobAdvancements (Lnet/minecraft/class_8779;Ljava/util/function/Consumer;Lnet/minecraft/class_7871;Ljava/util/List;)Lnet/minecraft/class_8779;
 		ARG 0 parent
 		ARG 1 exporter
+		ARG 2 entityTypeRegistry
+		ARG 3 entityTypes
diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
@@ -2292,6 +2292,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 	METHOD method_64578 rotate (FF)V
 		ARG 1 yaw
 		ARG 2 pitch
+	METHOD method_64610 resetLerp ()V
 	METHOD method_64611 teleportSameDimension (Lnet/minecraft/class_3218;Lnet/minecraft/class_5454;)Lnet/minecraft/class_1297;
 		ARG 1 world
 		ARG 2 teleportTarget
@@ -2304,6 +2305,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		ARG 1 world
 		ARG 2 teleportTarget
 	METHOD method_64615 onRemove (Lnet/minecraft/class_1297$class_5529;)V
+		COMMENT Called when the entity is about to be removed.
 		ARG 1 reason
 	METHOD method_7325 isSpectator ()Z
 		COMMENT {@return whether the entity is a spectator}

diff --git a/mappings/net/minecraft/entity/ai/brain/task/MeleeAttackTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/MeleeAttackTask.mapping
@@ -7,9 +7,15 @@ CLASS net/minecraft/class_4816 net/minecraft/entity/ai/brain/task/MeleeAttackTas
 		ARG 0 cooldown
 	METHOD method_46988 (Ljava/util/function/Predicate;ILnet/minecraft/class_7898$class_7900;)Lcom/mojang/datafixers/kinds/App;
 		ARG 2 context
+	METHOD method_46989 (Lnet/minecraft/class_7898$class_7900;Ljava/util/function/Predicate;ILnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;)Lnet/minecraft/class_7911;
+		ARG 3 lookTarget
+		ARG 4 attackTarget
+		ARG 5 attackCoolingDown
+		ARG 6 visibleMobs
 	METHOD method_46990 (Lnet/minecraft/class_7898$class_7900;Lnet/minecraft/class_7906;Ljava/util/function/Predicate;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;Lnet/minecraft/class_7906;ILnet/minecraft/class_3218;Lnet/minecraft/class_1308;J)Z
 		ARG 7 world
 		ARG 8 entity
+		ARG 9 time
 	METHOD method_64622 create (Ljava/util/function/Predicate;I)Lnet/minecraft/class_7894;
 		ARG 0 targetPredicate
 		ARG 1 cooldown

diff --git a/mappings/net/minecraft/entity/passive/SheepEntity.mapping b/mappings/net/minecraft/entity/passive/SheepEntity.mapping
@@ -29,5 +29,8 @@ CLASS net/minecraft/class_1472 net/minecraft/entity/passive/SheepEntity
 	METHOD method_6638 (Lnet/minecraft/class_1767;)Lnet/minecraft/class_1767;
 		ARG 0 color
 	METHOD method_6639 getChildColor (Lnet/minecraft/class_3218;Lnet/minecraft/class_1472;Lnet/minecraft/class_1472;)Lnet/minecraft/class_1767;
+		ARG 1 world
+		ARG 2 firstParent
+		ARG 3 secondParent
 	METHOD method_6641 getHeadAngle (F)F
 		ARG 1 delta
diff --git a/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping
@@ -57,6 +57,8 @@ CLASS net/minecraft/class_1665 net/minecraft/entity/projectile/PersistentProject
 	METHOD method_63669 applyDrag ()V
 	METHOD method_63670 applyCollision (Lnet/minecraft/class_3965;)V
 		ARG 1 blockHitResult
+	METHOD method_64646 spawnBubbleParticles (Lnet/minecraft/class_243;)V
+		ARG 1 pos
 	METHOD method_7433 setNoClip (Z)V
 		ARG 1 noClip
 	METHOD method_7434 getEntityCollision (Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Lnet/minecraft/class_3966;

diff --git a/mappings/net/minecraft/entity/vehicle/MinecartController.mapping b/mappings/net/minecraft/entity/vehicle/MinecartController.mapping
@@ -56,3 +56,4 @@ CLASS net/minecraft/class_9878 net/minecraft/entity/vehicle/MinecartController
 		ARG 1 world
 	METHOD method_61599 getSpeedRetention ()D
 	METHOD method_62826 handleCollision ()Z
+	METHOD method_64647 resetLerp ()V
diff --git a/mappings/net/minecraft/network/codec/PacketCodecs.mapping b/mappings/net/minecraft/network/codec/PacketCodecs.mapping
@@ -302,6 +302,10 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs
 		ARG 0 registryRef
 	METHOD method_58002 unlimitedRegistryCodec (Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_9139;
 		ARG 0 codec
+	METHOD method_64959 (Ljava/lang/Integer;)Ljava/util/OptionalInt;
+		ARG 0 value
+	METHOD method_64960 (Ljava/util/OptionalInt;)Ljava/lang/Integer;
+		ARG 0 value
 	CLASS 14
 	CLASS 15
 		METHOD method_64547 (Lnet/minecraft/class_9139;Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_9139;Ljava/lang/Object;Ljava/lang/Object;)V

diff --git a/mappings/net/minecraft/particle/ParticleTypes.mapping b/mappings/net/minecraft/particle/ParticleTypes.mapping
@@ -29,3 +29,7 @@ CLASS net/minecraft/class_2398 net/minecraft/particle/ParticleTypes
 		ARG 0 type
 	METHOD method_56184 (Lnet/minecraft/class_2396;)Lnet/minecraft/class_9139;
 		ARG 0 type
+	METHOD method_64926 (Lnet/minecraft/class_2396;)Lnet/minecraft/class_9139;
+		ARG 0 type
+	METHOD method_64927 (Lnet/minecraft/class_2396;)Lcom/mojang/serialization/MapCodec;
+		ARG 0 type
diff --git a/mappings/net/minecraft/predicate/entity/PlayerPredicate.mapping b/mappings/net/minecraft/predicate/entity/PlayerPredicate.mapping
@@ -55,6 +55,7 @@ CLASS net/minecraft/class_4553 net/minecraft/predicate/entity/PlayerPredicate
 			ARG 1 id
 			ARG 2 criteria
 		METHOD method_35315 recipe (Lnet/minecraft/class_5321;Z)Lnet/minecraft/class_4553$class_4557;
+			ARG 1 recipeKey
 			ARG 2 unlocked
 		METHOD method_35316 advancement (Lnet/minecraft/class_2960;Z)Lnet/minecraft/class_4553$class_4557;
 			ARG 1 id

diff --git a/mappings/net/minecraft/recipe/CraftingRecipe.mapping b/mappings/net/minecraft/recipe/CraftingRecipe.mapping
@@ -1,2 +1,6 @@
 CLASS net/minecraft/class_3955 net/minecraft/recipe/CraftingRecipe
+	METHOD method_17704 getRecipeRemainders (Lnet/minecraft/class_9694;)Lnet/minecraft/class_2371;
+		ARG 1 input
 	METHOD method_45441 getCategory ()Lnet/minecraft/class_7710;
+	METHOD method_64671 collectRecipeRemainders (Lnet/minecraft/class_9694;)Lnet/minecraft/class_2371;
+		ARG 0 input
diff --git a/mappings/net/minecraft/recipe/NetworkRecipeId.mapping b/mappings/net/minecraft/recipe/NetworkRecipeId.mapping
@@ -0,0 +1,2 @@
+CLASS net/minecraft/class_10298 net/minecraft/recipe/NetworkRecipeId
+	FIELD field_54664 PACKET_CODEC Lnet/minecraft/class_9139;
diff --git a/mappings/net/minecraft/recipe/RecipeContents.mapping b/mappings/net/minecraft/recipe/RecipeContents.mapping
@@ -0,0 +1,8 @@
+CLASS net/minecraft/class_10297 net/minecraft/recipe/RecipeContents
+	COMMENT A recipe that is synced to the clients. Note that this does not include
+	COMMENT the recipe's registry key.
+	FIELD field_54663 PACKET_CODEC Lnet/minecraft/class_9139;
+	METHOD method_64729 (Lnet/minecraft/class_9875;)Z
+		ARG 1 finder
+	METHOD method_64730 getStacks (Lnet/minecraft/class_10302$class_10308;)Ljava/util/List;
+		ARG 1 context
diff --git a/mappings/net/minecraft/recipe/RecipePropertySet.mapping b/mappings/net/minecraft/recipe/RecipePropertySet.mapping
@@ -2,10 +2,10 @@ CLASS net/minecraft/class_10290 net/minecraft/recipe/RecipePropertySet
 	FIELD field_54646 REGISTRY Lnet/minecraft/class_5321;
 	FIELD field_54654 PACKET_CODEC Lnet/minecraft/class_9139;
 	FIELD field_54655 EMPTY Lnet/minecraft/class_10290;
-	FIELD field_54656 entries Ljava/util/Set;
+	FIELD field_54656 usableItems Ljava/util/Set;
 	METHOD <init> (Ljava/util/Set;)V
-		ARG 1 entries
-	METHOD method_64701 contains (Lnet/minecraft/class_1799;)Z
+		ARG 1 usableItems
+	METHOD method_64701 canUse (Lnet/minecraft/class_1799;)Z
 		ARG 1 stack
 	METHOD method_64702 (Lnet/minecraft/class_1856;)Ljava/util/stream/Stream;
 		ARG 0 ingredient

diff --git a/mappings/net/minecraft/recipe/ServerRecipeManager.mapping b/mappings/net/minecraft/recipe/ServerRecipeManager.mapping
@@ -6,6 +6,8 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/ServerRecipeManager
 	FIELD field_54638 preparedRecipes Lnet/minecraft/class_10289;
 	FIELD field_54639 propertySets Ljava/util/Map;
 	FIELD field_54640 stonecutterRecipes Lnet/minecraft/class_10291$class_10293;
+	FIELD field_54641 recipes Ljava/util/List;
+	FIELD field_54642 recipesByKey Ljava/util/Map;
 	FIELD field_9027 LOGGER Lorg/slf4j/Logger;
 	METHOD <init> (Lnet/minecraft/class_7225$class_7874;)V
 		ARG 1 registries
@@ -87,6 +89,7 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/ServerRecipeManager
 			COMMENT the input world
 	CLASS 1
 		FIELD field_38221 id Lnet/minecraft/class_5321;
+	CLASS class_10288 ServerRecipe
 	CLASS class_7266 MatchGetter
 		METHOD method_42303 getFirstMatch (Lnet/minecraft/class_9695;Lnet/minecraft/class_3218;)Ljava/util/Optional;
 			ARG 1 input

diff --git a/mappings/net/minecraft/registry/MutableRegistry.mapping b/mappings/net/minecraft/registry/MutableRegistry.mapping
@@ -9,7 +9,7 @@ CLASS net/minecraft/class_2385 net/minecraft/registry/MutableRegistry
 		ARG 3 info
 	METHOD method_35863 isEmpty ()Z
 		COMMENT {@return whether the registry is empty}
-	METHOD method_46769 createMutableEntryLookup ()Lnet/minecraft/class_7871;
+	METHOD method_46769 createMutableRegistryLookup ()Lnet/minecraft/class_7871;
 	METHOD method_62681 setEntries (Lnet/minecraft/class_6862;Ljava/util/List;)V
 		ARG 1 tag
 		ARG 2 entries
diff --git a/mappings/net/minecraft/registry/Registry.mapping b/mappings/net/minecraft/registry/Registry.mapping
@@ -261,3 +261,4 @@ CLASS net/minecraft/class_2378 net/minecraft/registry/Registry
 		METHOD method_62693 getKey ()Lnet/minecraft/class_5321;
 		METHOD method_62695 getLookup ()Lnet/minecraft/class_7225$class_7226;
 		METHOD method_62696 apply ()V
+		METHOD method_64925 size ()I
diff --git a/mappings/net/minecraft/registry/tag/TagGroupLoader.mapping b/mappings/net/minecraft/registry/tag/TagGroupLoader.mapping
@@ -1,7 +1,9 @@
 CLASS net/minecraft/class_3503 net/minecraft/registry/tag/TagGroupLoader
 	FIELD field_15605 dataType Ljava/lang/String;
 	FIELD field_15607 LOGGER Lorg/slf4j/Logger;
+	FIELD field_54556 entrySupplier Lnet/minecraft/class_3503$class_10272;
 	METHOD <init> (Lnet/minecraft/class_3503$class_10272;Ljava/lang/String;)V
+		ARG 1 entrySupplier
 		ARG 2 dataType
 	METHOD method_18242 buildGroup (Ljava/util/Map;)Ljava/util/Map;
 		ARG 1 tags
@@ -54,6 +56,20 @@ CLASS net/minecraft/class_3503 net/minecraft/registry/tag/TagGroupLoader
 	METHOD method_61314 (Lnet/minecraft/class_2385;Lnet/minecraft/class_5321;Lnet/minecraft/class_2960;Ljava/util/List;)V
 		ARG 2 id
 		ARG 3 entries
+	CLASS class_10272 EntrySupplier
+		METHOD get (Lnet/minecraft/class_2960;Z)Ljava/util/Optional;
+			ARG 1 id
+			ARG 2 required
+		METHOD method_64597 (Lnet/minecraft/class_7871;Lnet/minecraft/class_2385;Lnet/minecraft/class_2960;Z)Ljava/util/Optional;
+			ARG 2 id
+			ARG 3 required
+		METHOD method_64598 forReload (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3503$class_10272;
+			ARG 0 registry
+		METHOD method_64599 (Lnet/minecraft/class_2378;Lnet/minecraft/class_2960;Z)Ljava/util/Optional;
+			ARG 1 id
+			ARG 2 required
+		METHOD method_64600 forInitial (Lnet/minecraft/class_2385;)Lnet/minecraft/class_3503$class_10272;
+			ARG 0 registry
 	CLASS class_5145 TrackedEntry
 		FIELD comp_324 entry Lnet/minecraft/class_3497;
 		FIELD comp_325 source Ljava/lang/String;

diff --git a/mappings/net/minecraft/registry/tag/TagPacketSerializer.mapping b/mappings/net/minecraft/registry/tag/TagPacketSerializer.mapping
@@ -33,3 +33,4 @@ CLASS net/minecraft/class_6864 net/minecraft/registry/tag/TagPacketSerializer
 		METHOD method_61315 isEmpty ()Z
 		METHOD method_61316 toRegistryTags (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3503$class_6863;
 			ARG 1 registry
+		METHOD method_64601 size ()I
diff --git a/mappings/net/minecraft/screen/AbstractCraftingScreenHandler.mapping b/mappings/net/minecraft/screen/AbstractCraftingScreenHandler.mapping
@@ -10,6 +10,8 @@ CLASS net/minecraft/class_9884 net/minecraft/screen/AbstractCraftingScreenHandle
 		ARG 4 height
 	METHOD method_59963 onInputSlotFillStart ()V
 	METHOD method_59964 onInputSlotFillFinish (Lnet/minecraft/class_3218;Lnet/minecraft/class_8786;)V
+		ARG 1 world
+		ARG 2 recipe
 	METHOD method_61625 addResultSlot (Lnet/minecraft/class_1657;II)Lnet/minecraft/class_1735;
 		ARG 1 player
 		ARG 2 x

diff --git a/mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping b/mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping
@@ -2,14 +2,25 @@ CLASS net/minecraft/class_1720 net/minecraft/screen/AbstractFurnaceScreenHandler
 	FIELD field_17286 propertyDelegate Lnet/minecraft/class_3913;
 	FIELD field_17494 recipeType Lnet/minecraft/class_3956;
 	FIELD field_25762 category Lnet/minecraft/class_5421;
+	FIELD field_54593 recipePropertySet Lnet/minecraft/class_10290;
 	FIELD field_7822 world Lnet/minecraft/class_1937;
 	FIELD field_7824 inventory Lnet/minecraft/class_1263;
 	METHOD <init> (Lnet/minecraft/class_3917;Lnet/minecraft/class_3956;Lnet/minecraft/class_5321;Lnet/minecraft/class_5421;ILnet/minecraft/class_1661;)V
 		ARG 1 type
 		ARG 2 recipeType
+		ARG 3 recipePropertySetKey
+		ARG 4 category
+		ARG 5 syncId
+		ARG 6 platerInventory
 	METHOD <init> (Lnet/minecraft/class_3917;Lnet/minecraft/class_3956;Lnet/minecraft/class_5321;Lnet/minecraft/class_5421;ILnet/minecraft/class_1661;Lnet/minecraft/class_1263;Lnet/minecraft/class_3913;)V
 		ARG 1 type
 		ARG 2 recipeType
+		ARG 3 recipePropertySetKey
+		ARG 4 category
+		ARG 5 syncId
+		ARG 6 platerInventory
+		ARG 7 inventory
+		ARG 8 propertyDelegate
 	METHOD method_16945 isFuel (Lnet/minecraft/class_1799;)Z
 		ARG 1 item
 	METHOD method_17363 getCookProgress ()F

diff --git a/mappings/net/minecraft/screen/AbstractRecipeScreenHandler.mapping b/mappings/net/minecraft/screen/AbstractRecipeScreenHandler.mapping
@@ -3,6 +3,8 @@ CLASS net/minecraft/class_1729 net/minecraft/screen/AbstractRecipeScreenHandler
 		ARG 1 craftAll
 		ARG 2 creative
 		ARG 3 recipe
+		ARG 4 world
+		ARG 5 inventory
 	METHOD method_30264 getCategory ()Lnet/minecraft/class_5421;
 	METHOD method_7654 populateRecipeFinder (Lnet/minecraft/class_9875;)V
 		ARG 1 finder

diff --git a/mappings/net/minecraft/screen/CraftingScreenHandler.mapping b/mappings/net/minecraft/screen/CraftingScreenHandler.mapping
@@ -18,6 +18,7 @@ CLASS net/minecraft/class_1714 net/minecraft/screen/CraftingScreenHandler
 		ARG 3 context
 	METHOD method_17399 updateResult (Lnet/minecraft/class_1703;Lnet/minecraft/class_3218;Lnet/minecraft/class_1657;Lnet/minecraft/class_8566;Lnet/minecraft/class_1731;Lnet/minecraft/class_8786;)V
 		ARG 0 handler
+		ARG 1 world
 		ARG 2 player
 		ARG 3 craftingInventory
 		ARG 4 resultInventory

diff --git a/mappings/net/minecraft/screen/ForgingScreenHandler.mapping b/mappings/net/minecraft/screen/ForgingScreenHandler.mapping
@@ -9,6 +9,7 @@ CLASS net/minecraft/class_4861 net/minecraft/screen/ForgingScreenHandler
 		ARG 2 syncId
 		ARG 3 playerInventory
 		ARG 4 context
+		ARG 5 forgingSlotsManager
 	METHOD method_24923 onTakeOutput (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V
 		ARG 1 player
 		ARG 2 stack

diff --git a/mappings/net/minecraft/screen/SmithingScreenHandler.mapping b/mappings/net/minecraft/screen/SmithingScreenHandler.mapping
@@ -9,17 +9,29 @@ CLASS net/minecraft/class_4862 net/minecraft/screen/SmithingScreenHandler
 	FIELD field_41930 MATERIAL_X I
 	FIELD field_41931 SLOT_Y I
 	FIELD field_41932 OUTPUT_X I
+	FIELD field_54597 basePropertySet Lnet/minecraft/class_10290;
+	FIELD field_54598 templatePropertySet Lnet/minecraft/class_10290;
+	FIELD field_54599 additionPropertySet Lnet/minecraft/class_10290;
 	METHOD <init> (ILnet/minecraft/class_1661;)V
 		ARG 1 syncId
 		ARG 2 playerInventory
 	METHOD <init> (ILnet/minecraft/class_1661;Lnet/minecraft/class_3914;)V
 		ARG 1 syncId
 		ARG 2 playerInventory
 		ARG 3 context
+	METHOD <init> (ILnet/minecraft/class_1661;Lnet/minecraft/class_3914;Lnet/minecraft/class_1937;)V
+		ARG 1 syncId
+		ARG 2 playerInventory
+		ARG 3 context
+		ARG 4 world
 	METHOD method_24929 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V
 		ARG 0 world
 		ARG 1 pos
 	METHOD method_29539 decrementStack (I)V
 		ARG 1 slot
 	METHOD method_51307 getInputStacks ()Ljava/util/List;
 	METHOD method_59965 createRecipeInput ()Lnet/minecraft/class_9697;
+	METHOD method_64652 createForgingSlotsManager (Lnet/minecraft/class_10286;)Lnet/minecraft/class_8047;
+		ARG 0 recipeManager
+	METHOD method_64653 (Lnet/minecraft/class_9697;Lnet/minecraft/class_8786;)V
+		ARG 2 recipe
diff --git a/mappings/net/minecraft/screen/StonecutterScreenHandler.mapping b/mappings/net/minecraft/screen/StonecutterScreenHandler.mapping
@@ -35,6 +35,7 @@ CLASS net/minecraft/class_3971 net/minecraft/screen/StonecutterScreenHandler
 	METHOD method_17864 getAvailableRecipeCount ()I
 	METHOD method_17865 canCraft ()Z
 	METHOD method_17866 populateResult (I)V
+		ARG 1 selectedId
 	METHOD method_30160 isInBounds (I)Z
 		ARG 1 id
 	METHOD method_64655 (Lnet/minecraft/class_8786;)V

diff --git a/mappings/net/minecraft/screen/slot/CraftingResultSlot.mapping b/mappings/net/minecraft/screen/slot/CraftingResultSlot.mapping
@@ -9,3 +9,10 @@ CLASS net/minecraft/class_1734 net/minecraft/screen/slot/CraftingResultSlot
 		ARG 4 index
 		ARG 5 x
 		ARG 6 y
+	METHOD method_64648 copyInput (Lnet/minecraft/class_9694;)Lnet/minecraft/class_2371;
+		ARG 0 input
+	METHOD method_64649 (Lnet/minecraft/class_9694;Lnet/minecraft/class_8786;)Lnet/minecraft/class_2371;
+		ARG 1 recipe
+	METHOD method_64650 getRecipeRemainders (Lnet/minecraft/class_9694;Lnet/minecraft/class_1937;)Lnet/minecraft/class_2371;
+		ARG 1 input
+		ARG 2 world
diff --git a/mappings/net/minecraft/screen/slot/ForgingSlotsManager.mapping b/mappings/net/minecraft/screen/slot/ForgingSlotsManager.mapping
@@ -4,7 +4,7 @@ CLASS net/minecraft/class_8047 net/minecraft/screen/slot/ForgingSlotsManager
 	METHOD <init> (Ljava/util/List;Lnet/minecraft/class_8047$class_8049;)V
 		ARG 1 inputSlots
 		ARG 2 resultSlot
-	METHOD method_48364 create ()Lnet/minecraft/class_8047$class_8048;
+	METHOD method_48364 builder ()Lnet/minecraft/class_8047$class_8048;
 	METHOD method_48366 getResultSlot ()Lnet/minecraft/class_8047$class_8049;
 	METHOD method_48367 getInputSlot (I)Lnet/minecraft/class_8047$class_8049;
 		ARG 1 index
@@ -13,6 +13,7 @@ CLASS net/minecraft/class_8047 net/minecraft/screen/slot/ForgingSlotsManager
 	METHOD method_48370 getResultSlotIndex ()I
 	CLASS class_8048 Builder
 		FIELD field_41910 resultSlot Lnet/minecraft/class_8047$class_8049;
+		FIELD field_54596 inputs Ljava/util/List;
 		METHOD method_48372 build ()Lnet/minecraft/class_8047;
 		METHOD method_48373 output (III)Lnet/minecraft/class_8047$class_8048;
 			ARG 1 slotId

diff --git a/mappings/net/minecraft/server/command/ServerCommandSource.mapping b/mappings/net/minecraft/server/command/ServerCommandSource.mapping
@@ -73,6 +73,8 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource
 		COMMENT Sends {@code message} as the feedback to the command's executor, or to the server's log
 		COMMENT if the command is not executed by a player.
 		ARG 1 message
+	METHOD method_64830 (Lnet/minecraft/class_8786;)Lnet/minecraft/class_2960;
+		ARG 0 recipe
 	METHOD method_9206 withLevel (I)Lnet/minecraft/class_2168;
 		ARG 1 level
 	METHOD method_9207 getPlayerOrThrow ()Lnet/minecraft/class_3222;

diff --git a/mappings/net/minecraft/server/function/FunctionLoader.mapping b/mappings/net/minecraft/server/function/FunctionLoader.mapping
@@ -45,3 +45,6 @@ CLASS net/minecraft/class_5349 net/minecraft/server/function/FunctionLoader
 	METHOD method_29458 getTags ()Ljava/lang/Iterable;
 	METHOD method_29459 getTagOrEmpty (Lnet/minecraft/class_2960;)Ljava/util/List;
 		ARG 1 id
+	METHOD method_64567 (Lnet/minecraft/class_2960;Z)Ljava/util/Optional;
+		ARG 1 id
+		ARG 2 required
diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping
@@ -255,6 +255,8 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity
 		ARG 0 deltaX
 		ARG 2 deltaY
 		ARG 4 deltaZ
+	METHOD method_54934 (Lnet/minecraft/class_5321;)Ljava/util/stream/Stream;
+		ARG 1 recipeKey
 	METHOD method_55633 updateCreativeInteractionRangeModifiers ()V
 	METHOD method_58143 setSpawnExtraParticlesOnFall (Z)V
 		ARG 1 spawnExtraParticlesOnFall
@@ -326,6 +328,8 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity
 	METHOD method_64398 sendMessage (Lnet/minecraft/class_2561;)V
 		ARG 1 message
 	METHOD method_64401 getCommandOutput ()Lnet/minecraft/class_2165;
+	METHOD method_64580 (Lnet/minecraft/class_5321;)Z
+		ARG 1 recipeKey
 	METHOD method_7336 changeGameMode (Lnet/minecraft/class_1934;)Z
 		ARG 1 gameMode
 	CLASS 1
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		CLASS net/minecraft/class_10298 net/minecraft/recipe/NetworkRecipeId
		FIELD field_54664 PACKET_CODEC Lnet/minecraft/class_9139;