diff --git a/mappings/net/minecraft/block/DispenserBlock.mapping b/mappings/net/minecraft/block/DispenserBlock.mapping
index 7e6127849e..29c5c8b05a 100644
--- a/mappings/net/minecraft/block/DispenserBlock.mapping
+++ b/mappings/net/minecraft/block/DispenserBlock.mapping
@@ -5,6 +5,7 @@ CLASS net/minecraft/class_2315 net/minecraft/block/DispenserBlock
FIELD field_31082 SCHEDULED_TICK_DELAY I
FIELD field_46212 LOGGER Lorg/slf4j/Logger;
FIELD field_46336 CODEC Lcom/mojang/serialization/MapCodec;
+ FIELD field_51412 DEFAULT_BEHAVIOR Lnet/minecraft/class_2347;
METHOD method_10008 (Lit/unimi/dsi/fastutil/objects/Object2ObjectOpenHashMap;)V
ARG 0 map
METHOD method_10009 registerBehavior (Lnet/minecraft/class_1935;Lnet/minecraft/class_2357;)V
@@ -15,6 +16,8 @@ CLASS net/minecraft/class_2315 net/minecraft/block/DispenserBlock
ARG 1 facingOffset
ARG 3 constantOffset
METHOD method_10011 getBehaviorForItem (Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;)Lnet/minecraft/class_2357;
+ ARG 1 world
+ ARG 2 stack
METHOD method_10012 dispense (Lnet/minecraft/class_3218;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)V
ARG 1 world
ARG 2 state
diff --git a/mappings/net/minecraft/block/entity/BrewingStandBlockEntity.mapping b/mappings/net/minecraft/block/entity/BrewingStandBlockEntity.mapping
index ebff4f9ce2..f50490e54a 100644
--- a/mappings/net/minecraft/block/entity/BrewingStandBlockEntity.mapping
+++ b/mappings/net/minecraft/block/entity/BrewingStandBlockEntity.mapping
@@ -18,6 +18,8 @@ CLASS net/minecraft/class_2589 net/minecraft/block/entity/BrewingStandBlockEntit
ARG 1 pos
ARG 2 state
METHOD method_11027 canCraft (Lnet/minecraft/class_1845;Lnet/minecraft/class_2371;)Z
+ ARG 0 brewingRecipeRegistry
+ ARG 1 slots
METHOD method_11028 getSlotsEmpty ()[Z
METHOD method_11029 craft (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2371;)V
ARG 0 world
diff --git a/mappings/net/minecraft/block/spawner/MobSpawnerEntry.mapping b/mappings/net/minecraft/block/spawner/MobSpawnerEntry.mapping
index 59e6f00673..31ce079d87 100644
--- a/mappings/net/minecraft/block/spawner/MobSpawnerEntry.mapping
+++ b/mappings/net/minecraft/block/spawner/MobSpawnerEntry.mapping
@@ -18,6 +18,7 @@ CLASS net/minecraft/class_1952 net/minecraft/block/spawner/MobSpawnerEntry
ARG 0 entry
METHOD method_58679 (Lnet/minecraft/class_1952;)Ljava/util/Optional;
ARG 0 entry
+ METHOD method_59717 getEquipment ()Ljava/util/Optional;
CLASS class_6542 CustomSpawnRules
FIELD comp_66 blockLightLimit Lnet/minecraft/class_6497;
FIELD comp_67 skyLightLimit Lnet/minecraft/class_6497;
diff --git a/mappings/net/minecraft/class_9639.mapping b/mappings/net/minecraft/class_9639.mapping
deleted file mode 100644
index cd3672a6a5..0000000000
--- a/mappings/net/minecraft/class_9639.mapping
+++ /dev/null
@@ -1,7 +0,0 @@
-CLASS net/minecraft/class_9639
- CLASS class_9640
- FIELD comp_2611 a Ljava/util/List;
- METHOD comp_2611 a ()Ljava/util/List;
- CLASS class_9641
- FIELD comp_2612 a Ljava/util/function/Predicate;
- METHOD comp_2612 a ()Ljava/util/function/Predicate;
diff --git a/mappings/net/minecraft/class_9643.mapping b/mappings/net/minecraft/class_9643.mapping
deleted file mode 100644
index cd32c4c284..0000000000
--- a/mappings/net/minecraft/class_9643.mapping
+++ /dev/null
@@ -1,7 +0,0 @@
-CLASS net/minecraft/class_9643
- CLASS class_9645
- FIELD comp_2615 a Ljava/util/List;
- METHOD comp_2615 a ()Ljava/util/List;
- CLASS class_9646
- FIELD comp_2616 a Lnet/minecraft/class_9643$class_9644;
- METHOD comp_2616 a ()Lnet/minecraft/class_9643$class_9644;
diff --git a/mappings/net/minecraft/class_9652.mapping b/mappings/net/minecraft/class_9652.mapping
deleted file mode 100644
index 6fb18e3b58..0000000000
--- a/mappings/net/minecraft/class_9652.mapping
+++ /dev/null
@@ -1,5 +0,0 @@
-CLASS net/minecraft/class_9652
- FIELD comp_2621 c Lnet/minecraft/class_5321;
- FIELD comp_2622 d Ljava/util/Map;
- METHOD comp_2621 c ()Lnet/minecraft/class_5321;
- METHOD comp_2622 d ()Ljava/util/Map;
diff --git a/mappings/net/minecraft/class_9653.mapping b/mappings/net/minecraft/class_9653.mapping
deleted file mode 100644
index 6398fabd39..0000000000
--- a/mappings/net/minecraft/class_9653.mapping
+++ /dev/null
@@ -1,16 +0,0 @@
-CLASS net/minecraft/class_9653
- FIELD comp_2623 c Ljava/util/Optional;
- METHOD comp_2623 c ()Ljava/util/Optional;
- CLASS class_9654
- FIELD comp_2624 b Ljava/util/Optional;
- FIELD comp_2625 c Ljava/util/Optional;
- FIELD comp_2626 d Ljava/util/Optional;
- FIELD comp_2627 e Lnet/minecraft/class_2096$class_2099;
- FIELD comp_2628 f Ljava/util/Optional;
- FIELD comp_2629 g Ljava/util/Optional;
- METHOD comp_2624 b ()Ljava/util/Optional;
- METHOD comp_2625 c ()Ljava/util/Optional;
- METHOD comp_2626 d ()Ljava/util/Optional;
- METHOD comp_2627 e ()Lnet/minecraft/class_2096$class_2099;
- METHOD comp_2628 f ()Ljava/util/Optional;
- METHOD comp_2629 g ()Ljava/util/Optional;
diff --git a/mappings/net/minecraft/class_9655.mapping b/mappings/net/minecraft/class_9655.mapping
deleted file mode 100644
index 034031a369..0000000000
--- a/mappings/net/minecraft/class_9655.mapping
+++ /dev/null
@@ -1,3 +0,0 @@
-CLASS net/minecraft/class_9655
- FIELD comp_2630 c Ljava/util/Optional;
- METHOD comp_2630 c ()Ljava/util/Optional;
diff --git a/mappings/net/minecraft/class_9656.mapping b/mappings/net/minecraft/class_9656.mapping
deleted file mode 100644
index 31c1376389..0000000000
--- a/mappings/net/minecraft/class_9656.mapping
+++ /dev/null
@@ -1,3 +0,0 @@
-CLASS net/minecraft/class_9656
- FIELD comp_2631 c Ljava/util/Optional;
- METHOD comp_2631 c ()Ljava/util/Optional;
diff --git a/mappings/net/minecraft/class_9657.mapping b/mappings/net/minecraft/class_9657.mapping
deleted file mode 100644
index d7a619e2d8..0000000000
--- a/mappings/net/minecraft/class_9657.mapping
+++ /dev/null
@@ -1,10 +0,0 @@
-CLASS net/minecraft/class_9657
- FIELD comp_2632 c Lnet/minecraft/class_9657$class_9658;
- METHOD comp_2632 c ()Lnet/minecraft/class_9657$class_9658;
- CLASS class_9658
- FIELD comp_2633 b Ljava/util/Optional;
- FIELD comp_2634 c Ljava/util/Optional;
- FIELD comp_2635 d Ljava/util/Optional;
- METHOD comp_2633 b ()Ljava/util/Optional;
- METHOD comp_2634 c ()Ljava/util/Optional;
- METHOD comp_2635 d ()Ljava/util/Optional;
diff --git a/mappings/net/minecraft/class_9659.mapping b/mappings/net/minecraft/class_9659.mapping
deleted file mode 100644
index 94e6f1f157..0000000000
--- a/mappings/net/minecraft/class_9659.mapping
+++ /dev/null
@@ -1,5 +0,0 @@
-CLASS net/minecraft/class_9659
- FIELD comp_2636 c Ljava/util/Optional;
- FIELD comp_2637 d Lnet/minecraft/class_2096$class_2100;
- METHOD comp_2636 c ()Ljava/util/Optional;
- METHOD comp_2637 d ()Lnet/minecraft/class_2096$class_2100;
diff --git a/mappings/net/minecraft/class_9660.mapping b/mappings/net/minecraft/class_9660.mapping
deleted file mode 100644
index 8e4fb5302a..0000000000
--- a/mappings/net/minecraft/class_9660.mapping
+++ /dev/null
@@ -1,5 +0,0 @@
-CLASS net/minecraft/class_9660
- FIELD comp_2638 c Ljava/util/Optional;
- FIELD comp_2639 d Ljava/util/Optional;
- METHOD comp_2638 c ()Ljava/util/Optional;
- METHOD comp_2639 d ()Ljava/util/Optional;
diff --git a/mappings/net/minecraft/class_9661.mapping b/mappings/net/minecraft/class_9661.mapping
deleted file mode 100644
index 7f03dafec4..0000000000
--- a/mappings/net/minecraft/class_9661.mapping
+++ /dev/null
@@ -1,6 +0,0 @@
-CLASS net/minecraft/class_9661
- FIELD comp_2640 c Ljava/util/Optional;
- METHOD comp_2640 c ()Ljava/util/Optional;
- CLASS class_9662
- FIELD comp_2641 b Ljava/lang/String;
- METHOD comp_2641 b ()Ljava/lang/String;
diff --git a/mappings/net/minecraft/class_9663.mapping b/mappings/net/minecraft/class_9663.mapping
deleted file mode 100644
index aa40a6eebd..0000000000
--- a/mappings/net/minecraft/class_9663.mapping
+++ /dev/null
@@ -1,14 +0,0 @@
-CLASS net/minecraft/class_9663
- FIELD comp_2642 c Ljava/util/Optional;
- FIELD comp_2643 d Ljava/util/Optional;
- FIELD comp_2644 e Ljava/util/Optional;
- FIELD comp_2645 f Lnet/minecraft/class_2096$class_2100;
- FIELD comp_2646 g Ljava/util/Optional;
- METHOD comp_2642 c ()Ljava/util/Optional;
- METHOD comp_2643 d ()Ljava/util/Optional;
- METHOD comp_2644 e ()Ljava/util/Optional;
- METHOD comp_2645 f ()Lnet/minecraft/class_2096$class_2100;
- METHOD comp_2646 g ()Ljava/util/Optional;
- CLASS class_9664
- FIELD comp_2647 b Lnet/minecraft/class_2561;
- METHOD comp_2647 b ()Lnet/minecraft/class_2561;
diff --git a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping
index f8dc19bdbe..b6ec9a37d3 100644
--- a/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping
+++ b/mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping
@@ -21,6 +21,7 @@ CLASS net/minecraft/class_365 net/minecraft/client/gui/hud/SpectatorHud
METHOD method_1978 renderSpectatorMenu (Lnet/minecraft/class_332;)V
ARG 1 context
METHOD method_1979 render (Lnet/minecraft/class_332;)V
+ ARG 1 context
METHOD method_1980 isOpen ()Z
METHOD method_1981 getSpectatorMenuHeight ()F
METHOD method_1982 renderSpectatorCommand (Lnet/minecraft/class_332;IIFFLnet/minecraft/class_537;)V
diff --git a/mappings/net/minecraft/client/sound/ChannelList.mapping b/mappings/net/minecraft/client/sound/ChannelList.mapping
index d9bc9fb504..720d38a07e 100644
--- a/mappings/net/minecraft/client/sound/ChannelList.mapping
+++ b/mappings/net/minecraft/client/sound/ChannelList.mapping
@@ -8,3 +8,4 @@ CLASS net/minecraft/class_4229 net/minecraft/client/sound/ChannelList
METHOD method_19679 getBuffer ()Ljava/nio/ByteBuffer;
METHOD method_19680 addChannel (F)V
ARG 1 data
+ METHOD method_59756 getCurrentBufferSize ()I
diff --git a/mappings/net/minecraft/component/type/BookContent.mapping b/mappings/net/minecraft/component/type/BookContent.mapping
index eedd045282..097cc68996 100644
--- a/mappings/net/minecraft/component/type/BookContent.mapping
+++ b/mappings/net/minecraft/component/type/BookContent.mapping
@@ -1,4 +1,4 @@
CLASS net/minecraft/class_9364 net/minecraft/component/type/BookContent
- METHOD comp_2422 comp_2418 ()Ljava/util/List;
+ METHOD comp_2422 pages ()Ljava/util/List;
METHOD method_58186 withPages (Ljava/util/List;)Ljava/lang/Object;
ARG 1 pages
diff --git a/mappings/net/minecraft/component/type/BundleContentsComponent.mapping b/mappings/net/minecraft/component/type/BundleContentsComponent.mapping
index d810246252..5163f51d85 100644
--- a/mappings/net/minecraft/component/type/BundleContentsComponent.mapping
+++ b/mappings/net/minecraft/component/type/BundleContentsComponent.mapping
@@ -13,7 +13,7 @@ CLASS net/minecraft/class_9276 net/minecraft/component/type/BundleContentsCompon
ARG 2 occupancy
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
- METHOD method_57421 stream ()Ljava/lang/Iterable;
+ METHOD method_57421 iterate ()Ljava/lang/Iterable;
METHOD method_57422 get (I)Lnet/minecraft/class_1799;
ARG 1 index
METHOD method_57423 getOccupancy (Lnet/minecraft/class_1799;)Lorg/apache/commons/lang3/math/Fraction;
@@ -27,6 +27,8 @@ CLASS net/minecraft/class_9276 net/minecraft/component/type/BundleContentsCompon
ARG 0 component
METHOD method_57428 getOccupancy ()Lorg/apache/commons/lang3/math/Fraction;
METHOD method_57429 isEmpty ()Z
+ METHOD method_59707 stream ()Ljava/util/stream/Stream;
+ METHOD method_59708 iterateCopy ()Ljava/lang/Iterable;
CLASS class_9277 Builder
FIELD field_49296 stacks Ljava/util/List;
FIELD field_49297 occupancy Lorg/apache/commons/lang3/math/Fraction;
@@ -44,3 +46,4 @@ CLASS net/minecraft/class_9276 net/minecraft/component/type/BundleContentsCompon
METHOD method_57435 build ()Lnet/minecraft/class_9276;
METHOD method_57436 getMaxAllowed (Lnet/minecraft/class_1799;)I
ARG 1 stack
+ METHOD method_59709 clear ()Lnet/minecraft/class_9276$class_9277;
diff --git a/mappings/net/minecraft/component/type/ContainerComponent.mapping b/mappings/net/minecraft/component/type/ContainerComponent.mapping
index 550ab29838..ed0aad1abd 100644
--- a/mappings/net/minecraft/component/type/ContainerComponent.mapping
+++ b/mappings/net/minecraft/component/type/ContainerComponent.mapping
@@ -23,6 +23,15 @@ CLASS net/minecraft/class_9288 net/minecraft/component/type/ContainerComponent
METHOD method_57496 fromSlots (Ljava/util/List;)Lnet/minecraft/class_9288;
ARG 0 slots
METHOD method_58114 copyFirstStack ()Lnet/minecraft/class_1799;
+ METHOD method_59710 (Lnet/minecraft/class_1799;)Z
+ ARG 0 stack
+ METHOD method_59711 (Lnet/minecraft/class_1799;)Z
+ ARG 0 stack
+ METHOD method_59712 streamNonEmpty ()Ljava/util/stream/Stream;
+ METHOD method_59713 findFirstNonEmptyIndex (Ljava/util/List;)I
+ ARG 0 stacks
+ METHOD method_59714 iterateNonEmpty ()Ljava/lang/Iterable;
+ METHOD method_59715 iterateNonEmptyCopy ()Ljava/lang/Iterable;
CLASS class_9289 Slot
FIELD field_49339 CODEC Lcom/mojang/serialization/Codec;
METHOD method_57498 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
diff --git a/mappings/net/minecraft/component/type/FoodComponent.mapping b/mappings/net/minecraft/component/type/FoodComponent.mapping
index 84d8167710..c0941f2288 100644
--- a/mappings/net/minecraft/component/type/FoodComponent.mapping
+++ b/mappings/net/minecraft/component/type/FoodComponent.mapping
@@ -11,10 +11,10 @@ CLASS net/minecraft/class_4174 net/minecraft/component/type/FoodComponent
METHOD method_58400 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
CLASS class_4175 Builder
- FIELD field_18620 hunger I
+ FIELD field_18620 nutrition I
FIELD field_18621 saturationModifier F
- FIELD field_18623 alwaysEdible Z
- FIELD field_18625 statusEffects Lcom/google/common/collect/ImmutableList$Builder;
+ FIELD field_18623 canAlwaysEat Z
+ FIELD field_18625 effects Lcom/google/common/collect/ImmutableList$Builder;
FIELD field_49995 eatSeconds F
METHOD method_19237 saturationModifier (F)Lnet/minecraft/class_4174$class_4175;
COMMENT Specifies the saturation modifier of a food item.
@@ -22,11 +22,11 @@ CLASS net/minecraft/class_4174 net/minecraft/component/type/FoodComponent
COMMENT
This value is typically used to determine how long a player can sustain the current hunger value before the hunger is used.
ARG 1 saturationModifier
COMMENT the saturation modifier
- METHOD method_19238 hunger (I)Lnet/minecraft/class_4174$class_4175;
+ METHOD method_19238 nutrition (I)Lnet/minecraft/class_4174$class_4175;
COMMENT Specifies the amount of hunger a food item will fill.
COMMENT
COMMENT
One hunger is equivalent to half of a hunger bar icon.
- ARG 1 hunger
+ ARG 1 nutrition
COMMENT the amount of hunger
METHOD method_19239 statusEffect (Lnet/minecraft/class_1293;F)Lnet/minecraft/class_4174$class_4175;
COMMENT Specifies a status effect to apply to an entity when a food item is consumed.
diff --git a/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping b/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping
index 63870f39e0..9fd409c8af 100644
--- a/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping
+++ b/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping
@@ -9,6 +9,7 @@ CLASS net/minecraft/class_9304 net/minecraft/component/type/ItemEnchantmentsComp
FIELD field_49754 BASE_CODEC Lcom/mojang/serialization/Codec;
FIELD field_50014 MAX_ENCHANTMENT_LEVEL I
METHOD (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;Z)V
+ ARG 1 enchantments
ARG 2 showInTooltip
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
@@ -30,6 +31,10 @@ CLASS net/minecraft/class_9304 net/minecraft/component/type/ItemEnchantmentsComp
ARG 0 component
METHOD method_58449 withShowInTooltip (Z)Lnet/minecraft/class_9304;
ARG 1 showInTooltip
+ METHOD method_59716 getTooltipOrderList (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_5321;Lnet/minecraft/class_6862;)Lnet/minecraft/class_6885;
+ ARG 0 registryLookup
+ ARG 1 registryRef
+ ARG 2 tooltipOrderTag
CLASS class_9305 Builder
FIELD field_49391 enchantments Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;
FIELD field_49392 showInTooltip Z
diff --git a/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping b/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping
index 617e78a35d..8b464d90e9 100644
--- a/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping
+++ b/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping
@@ -1,5 +1,4 @@
CLASS net/minecraft/class_9302 net/minecraft/component/type/WrittenBookContentComponent
- FIELD comp_2422 comp_2418 Ljava/util/List;
FIELD field_49375 MAX_SERIALIZED_PAGE_LENGTH I
FIELD field_49378 MAX_TITLE_LENGTH I
FIELD field_49379 MAX_GENERATION I
diff --git a/mappings/net/minecraft/data/server/advancement/vanilla/VanillaHusbandryTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaHusbandryTabAdvancementGenerator.mapping
index cfd4bb9df0..5f1169db32 100644
--- a/mappings/net/minecraft/data/server/advancement/vanilla/VanillaHusbandryTabAdvancementGenerator.mapping
+++ b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaHusbandryTabAdvancementGenerator.mapping
@@ -34,3 +34,8 @@ CLASS net/minecraft/class_2414 net/minecraft/data/server/advancement/vanilla/Van
ARG 1 type
METHOD method_58572 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_2960;
ARG 0 entry
+ METHOD method_59775 requireAllWolvesTamed (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_161$class_162;
+ ARG 0 builder
+ ARG 1 registryLookup
+ METHOD method_59776 (Lnet/minecraft/class_7225$class_7226;Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_5321;)V
+ ARG 2 key
diff --git a/mappings/net/minecraft/data/server/tag/EnchantmentTagProvider.mapping b/mappings/net/minecraft/data/server/tag/EnchantmentTagProvider.mapping
new file mode 100644
index 0000000000..58c8207690
--- /dev/null
+++ b/mappings/net/minecraft/data/server/tag/EnchantmentTagProvider.mapping
@@ -0,0 +1,15 @@
+CLASS net/minecraft/class_9674 net/minecraft/data/server/tag/EnchantmentTagProvider
+ FIELD field_51467 enabledFeatures Lnet/minecraft/class_7699;
+ METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/class_7699;)V
+ ARG 1 output
+ ARG 2 registryLookupFuture
+ ARG 3 enabledFeatures
+ METHOD method_59778 (Lnet/minecraft/class_1887;)Lnet/minecraft/class_5321;
+ ARG 0 enchantment
+ METHOD method_59779 (Ljava/util/Set;Lnet/minecraft/class_6880$class_6883;)Z
+ ARG 1 entry
+ METHOD method_59780 (Lnet/minecraft/class_6880$class_6883;)Z
+ ARG 1 entry
+ METHOD method_59781 createTooltipOrderTag (Lnet/minecraft/class_7225$class_7874;[Lnet/minecraft/class_1887;)V
+ ARG 1 registryLookup
+ ARG 2 enchantments
diff --git a/mappings/net/minecraft/data/server/tag/onetwentyone/OneTwentyOneEnchantmentTagProvider.mapping b/mappings/net/minecraft/data/server/tag/onetwentyone/OneTwentyOneEnchantmentTagProvider.mapping
new file mode 100644
index 0000000000..70b197bacf
--- /dev/null
+++ b/mappings/net/minecraft/data/server/tag/onetwentyone/OneTwentyOneEnchantmentTagProvider.mapping
@@ -0,0 +1,4 @@
+CLASS net/minecraft/class_9675 net/minecraft/data/server/tag/onetwentyone/OneTwentyOneEnchantmentTagProvider
+ METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V
+ ARG 1 output
+ ARG 2 registryLookupFuture
diff --git a/mappings/net/minecraft/data/server/tag/vanilla/VanillaEnchantmentTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaEnchantmentTagProvider.mapping
new file mode 100644
index 0000000000..3bbeee47f6
--- /dev/null
+++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaEnchantmentTagProvider.mapping
@@ -0,0 +1,4 @@
+CLASS net/minecraft/class_9676 net/minecraft/data/server/tag/vanilla/VanillaEnchantmentTagProvider
+ METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V
+ ARG 1 output
+ ARG 2 registryLookupFuture
diff --git a/mappings/net/minecraft/datafixer/fix/EmptyItemInVillagerTradeFix.mapping b/mappings/net/minecraft/datafixer/fix/EmptyItemInVillagerTradeFix.mapping
new file mode 100644
index 0000000000..c22fce99f7
--- /dev/null
+++ b/mappings/net/minecraft/datafixer/fix/EmptyItemInVillagerTradeFix.mapping
@@ -0,0 +1,3 @@
+CLASS net/minecraft/class_9649 net/minecraft/datafixer/fix/EmptyItemInVillagerTradeFix
+ METHOD (Lcom/mojang/datafixers/schemas/Schema;)V
+ ARG 1 outputSchema
diff --git a/mappings/net/minecraft/datafixer/fix/ParticleUnflatteningFix.mapping b/mappings/net/minecraft/datafixer/fix/ParticleUnflatteningFix.mapping
new file mode 100644
index 0000000000..244d1ac1bd
--- /dev/null
+++ b/mappings/net/minecraft/datafixer/fix/ParticleUnflatteningFix.mapping
@@ -0,0 +1,21 @@
+CLASS net/minecraft/class_9650 net/minecraft/datafixer/fix/ParticleUnflatteningFix
+ FIELD field_51367 LOGGER Lorg/slf4j/Logger;
+ METHOD (Lcom/mojang/datafixers/schemas/Schema;)V
+ ARG 1 outputSchema
+ METHOD method_59627 fixParticle (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+ ARG 1 dynamic
+ METHOD method_59629 fixItemParticle (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic;
+ ARG 1 dynamic
+ METHOD method_59630 tryParse (Ljava/lang/String;)Lnet/minecraft/class_2487;
+ ARG 0 snbt
+ METHOD method_59631 fixBlockParticle (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic;
+ ARG 1 dynamic
+ METHOD method_59633 fixDustParticle (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic;
+ ARG 1 dynamic
+ METHOD method_59634 fixDustColorTransitionParticle (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic;
+ ARG 1 dynamic
+ METHOD method_59635 fixSculkChargeParticle (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic;
+ METHOD method_59636 fixVibrationParticle (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic;
+ ARG 1 dynamic
+ METHOD method_59637 fixShriekParticle (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic;
+ ARG 1 dynamic
diff --git a/mappings/net/minecraft/datafixer/schema/Schema3818_5.mapping b/mappings/net/minecraft/datafixer/schema/Schema3818_5.mapping
new file mode 100644
index 0000000000..27b7ce0062
--- /dev/null
+++ b/mappings/net/minecraft/datafixer/schema/Schema3818_5.mapping
@@ -0,0 +1 @@
+CLASS net/minecraft/class_9651 net/minecraft/datafixer/schema/Schema3818_5
diff --git a/mappings/net/minecraft/entity/EquipmentHolder.mapping b/mappings/net/minecraft/entity/EquipmentHolder.mapping
index 397fb17ef9..8e21a59516 100644
--- a/mappings/net/minecraft/entity/EquipmentHolder.mapping
+++ b/mappings/net/minecraft/entity/EquipmentHolder.mapping
@@ -2,16 +2,23 @@ CLASS net/minecraft/class_9460 net/minecraft/entity/EquipmentHolder
METHOD method_5673 equipStack (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V
ARG 1 slot
ARG 2 stack
- METHOD method_58631 setEquipmentFromLootTable (Lnet/minecraft/class_9652;Lnet/minecraft/class_8567;)V
+ METHOD method_58631 setEquipmentFromTable (Lnet/minecraft/class_9652;Lnet/minecraft/class_8567;)V
+ ARG 1 equipmentTable
ARG 2 parameters
- METHOD method_58632 setEquipmentFromLootTable (Lnet/minecraft/class_5321;Lnet/minecraft/class_8567;JLjava/util/Map;)V
+ METHOD method_58632 setEquipmentFromTable (Lnet/minecraft/class_5321;Lnet/minecraft/class_8567;JLjava/util/Map;)V
+ ARG 1 lootTable
ARG 2 parameters
ARG 3 seed
+ ARG 5 slotDropChances
METHOD method_58633 getSlotForStack (Lnet/minecraft/class_1799;Ljava/util/List;)Lnet/minecraft/class_1304;
ARG 1 stack
ARG 2 slotBlacklist
METHOD method_5946 setEquipmentDropChance (Lnet/minecraft/class_1304;F)V
ARG 1 slot
ARG 2 dropChance
+ METHOD method_59663 setEquipmentFromTable (Lnet/minecraft/class_5321;Lnet/minecraft/class_8567;Ljava/util/Map;)V
+ ARG 1 lootTable
+ ARG 2 parameters
+ ARG 3 slotDropChances
METHOD method_6118 getEquippedStack (Lnet/minecraft/class_1304;)Lnet/minecraft/class_1799;
ARG 1 slot
diff --git a/mappings/net/minecraft/entity/EquipmentTable.mapping b/mappings/net/minecraft/entity/EquipmentTable.mapping
new file mode 100644
index 0000000000..373165e8c7
--- /dev/null
+++ b/mappings/net/minecraft/entity/EquipmentTable.mapping
@@ -0,0 +1,10 @@
+CLASS net/minecraft/class_9652 net/minecraft/entity/EquipmentTable
+ FIELD field_51374 SLOT_DROP_CHANCES_CODEC Lcom/mojang/serialization/Codec;
+ FIELD field_51375 CODEC Lcom/mojang/serialization/Codec;
+ METHOD method_59658 createSlotDropChances (F)Ljava/util/Map;
+ ARG 0 dropChance
+ METHOD method_59660 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+ ARG 0 instance
+ METHOD method_59661 createSlotDropChances (Ljava/util/List;F)Ljava/util/Map;
+ ARG 0 slots
+ ARG 1 dropChance
diff --git a/mappings/net/minecraft/entity/effect/InfestedStatusEffect.mapping b/mappings/net/minecraft/entity/effect/InfestedStatusEffect.mapping
index 2bb7f0551f..e014b4adff 100644
--- a/mappings/net/minecraft/entity/effect/InfestedStatusEffect.mapping
+++ b/mappings/net/minecraft/entity/effect/InfestedStatusEffect.mapping
@@ -8,3 +8,7 @@ CLASS net/minecraft/class_9455 net/minecraft/entity/effect/InfestedStatusEffect
ARG 4 silverfishCountFunction
METHOD method_58615 spawnSilverfish (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;DDD)V
ARG 1 world
+ ARG 2 entity
+ ARG 3 x
+ ARG 5 y
+ ARG 7 z
diff --git a/mappings/net/minecraft/entity/effect/OozingStatusEffect.mapping b/mappings/net/minecraft/entity/effect/OozingStatusEffect.mapping
index 1eba1443ba..ca3f02fcd1 100644
--- a/mappings/net/minecraft/entity/effect/OozingStatusEffect.mapping
+++ b/mappings/net/minecraft/entity/effect/OozingStatusEffect.mapping
@@ -9,3 +9,9 @@ CLASS net/minecraft/class_9456 net/minecraft/entity/effect/OozingStatusEffect
ARG 2 x
ARG 4 y
ARG 6 z
+ METHOD method_59652 getSlimesToSpawn (III)I
+ ARG 0 maxEntityCramming
+ ARG 1 nearbySlimes
+ ARG 2 potentialSlimes
+ METHOD method_59653 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1621;)Z
+ ARG 1 entityx
diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping
index 0dcf8f0d8f..2bf6bec70b 100644
--- a/mappings/net/minecraft/entity/mob/MobEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping
@@ -159,7 +159,8 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
METHOD method_57296 hasComponentsOtherThanDamage (Lnet/minecraft/class_1799;)Z
ARG 0 stack
METHOD method_58151 mightBeLeashed ()Z
- METHOD method_58634 setEquipmentFromLootTable (Lnet/minecraft/class_9652;)V
+ METHOD method_58634 setEquipmentFromTable (Lnet/minecraft/class_9652;)V
+ ARG 1 equipmentTable
METHOD method_58635 createEquipmentLootParameters (Lnet/minecraft/class_3218;)Lnet/minecraft/class_8567;
ARG 1 world
METHOD method_5929 getDropChance (Lnet/minecraft/class_1304;)F
@@ -235,6 +236,9 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
METHOD method_5965 createNavigation (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1408;
ARG 1 world
METHOD method_5966 playAmbientSound ()V
+ METHOD method_59665 setEquipmentFromTable (Lnet/minecraft/class_5321;Ljava/util/Map;)V
+ ARG 1 lootTable
+ ARG 2 slotDropChances
METHOD method_5969 spawnsTooManyForEachTry (I)Z
ARG 1 count
METHOD method_5970 getMinAmbientSoundDelay ()I
diff --git a/mappings/net/minecraft/entity/player/HungerConstants.mapping b/mappings/net/minecraft/entity/player/HungerConstants.mapping
index 512c4c1d69..5db75704f9 100644
--- a/mappings/net/minecraft/entity/player/HungerConstants.mapping
+++ b/mappings/net/minecraft/entity/player/HungerConstants.mapping
@@ -22,3 +22,6 @@ CLASS net/minecraft/class_6075 net/minecraft/entity/player/HungerConstants
COMMENT slow healing mechanisms.
FIELD field_30713 STARVING_FOOD_LEVEL I
COMMENT The maximum food level ({@value}) permitted for the starving mechanism to run.
+ METHOD method_59683 calculateSaturation (IF)F
+ ARG 0 nutrition
+ ARG 1 saturationModifier
diff --git a/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping
index cffab55adb..b1fbb1a269 100644
--- a/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping
+++ b/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping
@@ -45,6 +45,7 @@ CLASS net/minecraft/class_1665 net/minecraft/entity/projectile/PersistentProject
COMMENT returns a copy of that stack which can be safely changed. Additionally,
COMMENT {@link #asItemStack} reflects changes to the entity data, such as custom potion ID.
METHOD method_57313 setStack (Lnet/minecraft/class_1799;)V
+ ARG 1 stack
METHOD method_57314 getDefaultItemStack ()Lnet/minecraft/class_1799;
METHOD method_7433 setNoClip (Z)V
ARG 1 noClip
diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping
index 7f242e7e3d..d2231f01fd 100644
--- a/mappings/net/minecraft/item/ItemStack.mapping
+++ b/mappings/net/minecraft/item/ItemStack.mapping
@@ -51,7 +51,9 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack
FIELD field_49268 OPTIONAL_PACKET_CODEC Lnet/minecraft/class_9139;
FIELD field_49269 OPTIONAL_LIST_PACKET_CODEC Lnet/minecraft/class_9139;
FIELD field_49270 components Lnet/minecraft/class_9335;
- FIELD field_49747 COOKING_RECIPE_RESULT_CODEC Lcom/mojang/serialization/Codec;
+ FIELD field_49747 UNCOUNTED_CODEC Lcom/mojang/serialization/Codec;
+ FIELD field_51397 VALIDATED_CODEC Lcom/mojang/serialization/Codec;
+ FIELD field_51398 VALIDATED_UNCOUNTED_CODEC Lcom/mojang/serialization/Codec;
FIELD field_8030 bobbingAnimationTime I
FIELD field_8031 count I
FIELD field_8033 LOGGER Lorg/slf4j/Logger;
@@ -328,6 +330,8 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack
ARG 1 maxCount
METHOD method_58657 getEnchantments ()Lnet/minecraft/class_9304;
METHOD method_58658 getDefaultComponents ()Lnet/minecraft/class_9323;
+ METHOD method_59691 validateComponents (Lnet/minecraft/class_9323;)Lcom/mojang/serialization/DataResult;
+ ARG 0 components
METHOD method_7909 getItem ()Lnet/minecraft/class_1792;
COMMENT {@return the item of this stack}
COMMENT
@@ -548,6 +552,8 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack
ARG 1 enchantment
ARG 2 level
METHOD method_7979 postHit (Lnet/minecraft/class_1309;Lnet/minecraft/class_1657;)V
+ ARG 1 target
+ ARG 2 player
METHOD method_7981 useOnBlock (Lnet/minecraft/class_1838;)Lnet/minecraft/class_1269;
ARG 1 context
METHOD method_7982 onCraftByPlayer (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;I)V
diff --git a/mappings/net/minecraft/item/ItemUsage.mapping b/mappings/net/minecraft/item/ItemUsage.mapping
index 0a92272d43..50deac1537 100644
--- a/mappings/net/minecraft/item/ItemUsage.mapping
+++ b/mappings/net/minecraft/item/ItemUsage.mapping
@@ -42,5 +42,6 @@ CLASS net/minecraft/class_5328 net/minecraft/item/ItemUsage
COMMENT
COMMENT @see Item#onItemEntityDestroyed
ARG 0 itemEntity
+ ARG 1 contents
METHOD method_33265 (Lnet/minecraft/class_1937;Lnet/minecraft/class_1542;Lnet/minecraft/class_1799;)V
ARG 2 stack
diff --git a/mappings/net/minecraft/item/TooltipAppender.mapping b/mappings/net/minecraft/item/TooltipAppender.mapping
index 50f1c94e5e..32dd8408e8 100644
--- a/mappings/net/minecraft/item/TooltipAppender.mapping
+++ b/mappings/net/minecraft/item/TooltipAppender.mapping
@@ -1,2 +1,5 @@
CLASS net/minecraft/class_9299 net/minecraft/item/TooltipAppender
METHOD method_57409 appendTooltip (Lnet/minecraft/class_1792$class_9635;Ljava/util/function/Consumer;Lnet/minecraft/class_1836;)V
+ ARG 1 context
+ ARG 2 tooltip
+ ARG 3 type
diff --git a/mappings/net/minecraft/loot/ContainerComponentModifier.mapping b/mappings/net/minecraft/loot/ContainerComponentModifier.mapping
new file mode 100644
index 0000000000..670f9a52da
--- /dev/null
+++ b/mappings/net/minecraft/loot/ContainerComponentModifier.mapping
@@ -0,0 +1,20 @@
+CLASS net/minecraft/class_9666 net/minecraft/loot/ContainerComponentModifier
+ METHOD method_59719 getComponentType ()Lnet/minecraft/class_9331;
+ METHOD method_59720 apply (Lnet/minecraft/class_1799;Ljava/lang/Object;Ljava/util/stream/Stream;)V
+ ARG 1 stack
+ ARG 2 component
+ ARG 3 contents
+ METHOD method_59721 apply (Lnet/minecraft/class_1799;Ljava/util/function/UnaryOperator;)V
+ ARG 1 stack
+ ARG 2 contentsOperator
+ METHOD method_59722 apply (Lnet/minecraft/class_1799;Ljava/util/stream/Stream;)V
+ ARG 1 stack
+ ARG 2 contents
+ METHOD method_59723 stream (Ljava/lang/Object;)Ljava/util/stream/Stream;
+ ARG 1 component
+ METHOD method_59724 create (Ljava/lang/Object;Ljava/util/stream/Stream;)Ljava/lang/Object;
+ ARG 1 component
+ ARG 2 contents
+ METHOD method_59725 (Ljava/util/function/UnaryOperator;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799;
+ ARG 1 contentStack
+ METHOD method_59726 getDefault ()Ljava/lang/Object;
diff --git a/mappings/net/minecraft/loot/ContainerComponentModifiers.mapping b/mappings/net/minecraft/loot/ContainerComponentModifiers.mapping
new file mode 100644
index 0000000000..0f059a0556
--- /dev/null
+++ b/mappings/net/minecraft/loot/ContainerComponentModifiers.mapping
@@ -0,0 +1,8 @@
+CLASS net/minecraft/class_9667 net/minecraft/loot/ContainerComponentModifiers
+ FIELD field_51416 CONTAINER Lnet/minecraft/class_9666;
+ FIELD field_51417 BUNDLE_CONTENTS Lnet/minecraft/class_9666;
+ FIELD field_51418 CHARGED_PROJECTILES Lnet/minecraft/class_9666;
+ FIELD field_51419 TYPE_TO_MODIFIER Ljava/util/Map;
+ FIELD field_51420 MODIFIER_CODEC Lcom/mojang/serialization/Codec;
+ METHOD method_59729 (Lnet/minecraft/class_9331;)Lcom/mojang/serialization/DataResult;
+ ARG 0 componentType
diff --git a/mappings/net/minecraft/loot/function/FilteredLootFunction.mapping b/mappings/net/minecraft/loot/function/FilteredLootFunction.mapping
new file mode 100644
index 0000000000..7c49ac9c74
--- /dev/null
+++ b/mappings/net/minecraft/loot/function/FilteredLootFunction.mapping
@@ -0,0 +1,14 @@
+CLASS net/minecraft/class_9668 net/minecraft/loot/function/FilteredLootFunction
+ FIELD field_51421 CODEC Lcom/mojang/serialization/MapCodec;
+ FIELD field_51422 itemFilter Lnet/minecraft/class_2073;
+ FIELD field_51423 modifier Lnet/minecraft/class_117;
+ METHOD (Ljava/util/List;Lnet/minecraft/class_2073;Lnet/minecraft/class_117;)V
+ ARG 1 conditions
+ ARG 2 itemFilter
+ ARG 3 modifier
+ METHOD method_59739 (Lnet/minecraft/class_9668;)Lnet/minecraft/class_117;
+ ARG 0 lootFunction
+ METHOD method_59740 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+ ARG 0 instance
+ METHOD method_59741 (Lnet/minecraft/class_9668;)Lnet/minecraft/class_2073;
+ ARG 0 lootFunction
diff --git a/mappings/net/minecraft/loot/function/ModifyContentsLootFunction.mapping b/mappings/net/minecraft/loot/function/ModifyContentsLootFunction.mapping
new file mode 100644
index 0000000000..b9a6d1b6da
--- /dev/null
+++ b/mappings/net/minecraft/loot/function/ModifyContentsLootFunction.mapping
@@ -0,0 +1,16 @@
+CLASS net/minecraft/class_9669 net/minecraft/loot/function/ModifyContentsLootFunction
+ FIELD field_51429 CODEC Lcom/mojang/serialization/MapCodec;
+ FIELD field_51430 component Lnet/minecraft/class_9666;
+ FIELD field_51431 modifier Lnet/minecraft/class_117;
+ METHOD (Ljava/util/List;Lnet/minecraft/class_9666;Lnet/minecraft/class_117;)V
+ ARG 1 conditions
+ ARG 2 component
+ ARG 3 modifier
+ METHOD method_59743 (Lnet/minecraft/class_47;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799;
+ ARG 2 content
+ METHOD method_59744 (Lnet/minecraft/class_9669;)Lnet/minecraft/class_117;
+ ARG 0 lootFunction
+ METHOD method_59745 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+ ARG 0 instance
+ METHOD method_59746 (Lnet/minecraft/class_9669;)Lnet/minecraft/class_9666;
+ ARG 0 lootFunction
diff --git a/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping b/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping
index 398173caaf..8f9bf46ca7 100644
--- a/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping
+++ b/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping
@@ -1,8 +1,10 @@
CLASS net/minecraft/class_134 net/minecraft/loot/function/SetContentsLootFunction
FIELD field_1103 entries Ljava/util/List;
FIELD field_45841 CODEC Lcom/mojang/serialization/MapCodec;
+ FIELD field_51432 component Lnet/minecraft/class_9666;
METHOD (Ljava/util/List;Lnet/minecraft/class_9666;Ljava/util/List;)V
ARG 1 conditions
+ ARG 2 component
ARG 3 entries
METHOD method_53363 (Lnet/minecraft/class_134;)Ljava/util/List;
ARG 0 function
@@ -15,7 +17,11 @@ CLASS net/minecraft/class_134 net/minecraft/loot/function/SetContentsLootFunctio
METHOD method_600 (Lnet/minecraft/class_47;Ljava/util/stream/Stream$Builder;Lnet/minecraft/class_82;)V
ARG 2 choice
METHOD method_601 builder (Lnet/minecraft/class_9666;)Lnet/minecraft/class_134$class_135;
+ ARG 0 componentModifier
CLASS class_135 Builder
FIELD field_1104 entries Lcom/google/common/collect/ImmutableList$Builder;
+ FIELD field_51433 componentModifier Lnet/minecraft/class_9666;
+ METHOD (Lnet/minecraft/class_9666;)V
+ ARG 1 componentModifier
METHOD method_602 withEntry (Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_134$class_135;
ARG 1 entryBuilder
diff --git a/mappings/net/minecraft/loot/function/SetCustomModelDataLootFunction.mapping b/mappings/net/minecraft/loot/function/SetCustomModelDataLootFunction.mapping
new file mode 100644
index 0000000000..b0c865aafe
--- /dev/null
+++ b/mappings/net/minecraft/loot/function/SetCustomModelDataLootFunction.mapping
@@ -0,0 +1,10 @@
+CLASS net/minecraft/class_9670 net/minecraft/loot/function/SetCustomModelDataLootFunction
+ FIELD field_51434 CODEC Lcom/mojang/serialization/MapCodec;
+ FIELD field_51435 value Lnet/minecraft/class_5658;
+ METHOD (Ljava/util/List;Lnet/minecraft/class_5658;)V
+ ARG 1 conditions
+ ARG 2 value
+ METHOD method_59747 (Lnet/minecraft/class_9670;)Lnet/minecraft/class_5658;
+ ARG 0 lootFunction
+ METHOD method_59748 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+ ARG 0 instance
diff --git a/mappings/net/minecraft/loot/function/SetItemLootFunction.mapping b/mappings/net/minecraft/loot/function/SetItemLootFunction.mapping
new file mode 100644
index 0000000000..1098d06867
--- /dev/null
+++ b/mappings/net/minecraft/loot/function/SetItemLootFunction.mapping
@@ -0,0 +1,10 @@
+CLASS net/minecraft/class_9671 net/minecraft/loot/function/SetItemLootFunction
+ FIELD field_51436 CODEC Lcom/mojang/serialization/MapCodec;
+ FIELD field_51437 item Lnet/minecraft/class_6880;
+ METHOD (Ljava/util/List;Lnet/minecraft/class_6880;)V
+ ARG 1 conditions
+ ARG 2 item
+ METHOD method_59749 (Lnet/minecraft/class_9671;)Lnet/minecraft/class_6880;
+ ARG 0 lootFunction
+ METHOD method_59750 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+ ARG 0 instance
diff --git a/mappings/net/minecraft/nbt/StringNbtReader.mapping b/mappings/net/minecraft/nbt/StringNbtReader.mapping
index 93ea018594..6915012e38 100644
--- a/mappings/net/minecraft/nbt/StringNbtReader.mapping
+++ b/mappings/net/minecraft/nbt/StringNbtReader.mapping
@@ -24,6 +24,7 @@ CLASS net/minecraft/class_2522 net/minecraft/nbt/StringNbtReader
FIELD field_33269 RIGHT_CURLY_BRACKET C
FIELD field_33270 LEFT_CURLY_BRACKET C
FIELD field_45952 STRINGIFIED_CODEC Lcom/mojang/serialization/Codec;
+ FIELD field_51469 NBT_COMPOUND_CODEC Lcom/mojang/serialization/Codec;
METHOD (Lcom/mojang/brigadier/StringReader;)V
ARG 1 reader
METHOD method_10716 readComma ()Z
diff --git a/mappings/net/minecraft/network/codec/PacketCodecs.mapping b/mappings/net/minecraft/network/codec/PacketCodecs.mapping
index ed42743a5f..78fc6c59aa 100644
--- a/mappings/net/minecraft/network/codec/PacketCodecs.mapping
+++ b/mappings/net/minecraft/network/codec/PacketCodecs.mapping
@@ -96,6 +96,11 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs
COMMENT @see net.minecraft.network.PacketByteBuf#writeNbt(NbtElement)
FIELD field_49678 PROPERTY_MAP Lnet/minecraft/class_9139;
FIELD field_49679 GAME_PROFILE Lnet/minecraft/class_9139;
+ FIELD field_51470 UNSIGNED_SHORT Lnet/minecraft/class_9139;
+ COMMENT A codec for an unsigned short value.
+ COMMENT
+ COMMENT @see io.netty.buffer.ByteBuf#readUnsignedShort
+ COMMENT @see io.netty.buffer.ByteBuf#writeShort
METHOD method_56363 toList ()Lnet/minecraft/class_9139$class_9140;
COMMENT Used to make a codec for a list of values using {@link PacketCodec#collect}.
COMMENT This creates an {@link java.util.ArrayList}, so the decoded result can be modified.
diff --git a/mappings/net/minecraft/particle/BlockStateParticleEffect.mapping b/mappings/net/minecraft/particle/BlockStateParticleEffect.mapping
index 8880f7e73f..ae01739e8a 100644
--- a/mappings/net/minecraft/particle/BlockStateParticleEffect.mapping
+++ b/mappings/net/minecraft/particle/BlockStateParticleEffect.mapping
@@ -1,6 +1,7 @@
CLASS net/minecraft/class_2388 net/minecraft/particle/BlockStateParticleEffect
FIELD field_11182 blockState Lnet/minecraft/class_2680;
FIELD field_11183 type Lnet/minecraft/class_2396;
+ FIELD field_51463 BLOCK_STATE_CODEC Lcom/mojang/serialization/Codec;
METHOD (Lnet/minecraft/class_2396;Lnet/minecraft/class_2680;)V
ARG 1 type
ARG 2 blockState
diff --git a/mappings/net/minecraft/particle/ItemStackParticleEffect.mapping b/mappings/net/minecraft/particle/ItemStackParticleEffect.mapping
index 01ffe1478b..b2e547ac36 100644
--- a/mappings/net/minecraft/particle/ItemStackParticleEffect.mapping
+++ b/mappings/net/minecraft/particle/ItemStackParticleEffect.mapping
@@ -1,7 +1,9 @@
CLASS net/minecraft/class_2392 net/minecraft/particle/ItemStackParticleEffect
FIELD field_11192 stack Lnet/minecraft/class_1799;
FIELD field_11193 type Lnet/minecraft/class_2396;
+ FIELD field_51464 ITEM_STACK_CODEC Lcom/mojang/serialization/Codec;
METHOD (Lnet/minecraft/class_2396;Lnet/minecraft/class_1799;)V
+ ARG 1 type
ARG 2 stack
METHOD method_10289 getItemStack ()Lnet/minecraft/class_1799;
METHOD method_29135 (Lnet/minecraft/class_2392;)Lnet/minecraft/class_1799;
diff --git a/mappings/net/minecraft/particle/ParticleType.mapping b/mappings/net/minecraft/particle/ParticleType.mapping
index 8e24943d79..852c47dfbb 100644
--- a/mappings/net/minecraft/particle/ParticleType.mapping
+++ b/mappings/net/minecraft/particle/ParticleType.mapping
@@ -1,5 +1,7 @@
CLASS net/minecraft/class_2396 net/minecraft/particle/ParticleType
FIELD field_11196 alwaysShow Z
+ METHOD (Z)V
+ ARG 1 alwaysShow
METHOD method_10299 shouldAlwaysSpawn ()Z
METHOD method_29138 getCodec ()Lcom/mojang/serialization/MapCodec;
METHOD method_56179 getPacketCodec ()Lnet/minecraft/class_9139;
diff --git a/mappings/net/minecraft/particle/VibrationParticleEffect.mapping b/mappings/net/minecraft/particle/VibrationParticleEffect.mapping
index f96788c533..ae75ba745f 100644
--- a/mappings/net/minecraft/particle/VibrationParticleEffect.mapping
+++ b/mappings/net/minecraft/particle/VibrationParticleEffect.mapping
@@ -3,6 +3,7 @@ CLASS net/minecraft/class_5745 net/minecraft/particle/VibrationParticleEffect
FIELD field_38361 destination Lnet/minecraft/class_5716;
FIELD field_38362 arrivalInTicks I
FIELD field_48461 PACKET_CODEC Lnet/minecraft/class_9139;
+ FIELD field_51465 POSITION_SOURCE_CODEC Lcom/mojang/serialization/Codec;
METHOD (Lnet/minecraft/class_5716;I)V
ARG 1 destination
ARG 2 arrivalInTicks
@@ -10,3 +11,5 @@ CLASS net/minecraft/class_5745 net/minecraft/particle/VibrationParticleEffect
METHOD method_42622 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD method_42624 getArrivalInTicks ()I
+ METHOD method_59773 (Lnet/minecraft/class_5716;)Lcom/mojang/serialization/DataResult;
+ ARG 0 positionSource
diff --git a/mappings/net/minecraft/predicate/collection/CollectionContainsPredicate.mapping b/mappings/net/minecraft/predicate/collection/CollectionContainsPredicate.mapping
new file mode 100644
index 0000000000..9f2e900628
--- /dev/null
+++ b/mappings/net/minecraft/predicate/collection/CollectionContainsPredicate.mapping
@@ -0,0 +1,19 @@
+CLASS net/minecraft/class_9639 net/minecraft/predicate/collection/CollectionContainsPredicate
+ METHOD method_59605 getPredicates ()Ljava/util/List;
+ METHOD method_59606 createCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
+ ARG 0 predicateCodec
+ METHOD method_59607 create (Ljava/util/List;)Lnet/minecraft/class_9639;
+ ARG 0 predicates
+ METHOD method_59608 create ([Ljava/util/function/Predicate;)Lnet/minecraft/class_9639;
+ ARG 0 predicates
+ CLASS class_9640 Multiple
+ METHOD method_59610 (Ljava/lang/Object;Ljava/util/function/Predicate;)Z
+ ARG 1 predicate
+ METHOD test (Ljava/lang/Object;)Z
+ ARG 1 collection
+ CLASS class_9641 Single
+ METHOD test (Ljava/lang/Object;)Z
+ ARG 1 collection
+ CLASS class_9642 Empty
+ METHOD test (Ljava/lang/Object;)Z
+ ARG 1 collection
diff --git a/mappings/net/minecraft/predicate/collection/CollectionCountsPredicate.mapping b/mappings/net/minecraft/predicate/collection/CollectionCountsPredicate.mapping
new file mode 100644
index 0000000000..2fb9585ff4
--- /dev/null
+++ b/mappings/net/minecraft/predicate/collection/CollectionCountsPredicate.mapping
@@ -0,0 +1,24 @@
+CLASS net/minecraft/class_9643 net/minecraft/predicate/collection/CollectionCountsPredicate
+ METHOD method_59613 getEntries ()Ljava/util/List;
+ METHOD method_59614 createCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
+ ARG 0 predicateCodec
+ METHOD method_59615 create (Ljava/util/List;)Lnet/minecraft/class_9643;
+ ARG 0 entries
+ METHOD method_59616 create ([Lnet/minecraft/class_9643$class_9644;)Lnet/minecraft/class_9643;
+ ARG 0 entries
+ CLASS class_9644 Entry
+ METHOD method_59617 createCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
+ ARG 0 predicateCodec
+ METHOD method_59618 (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+ ARG 1 instance
+ METHOD method_59619 test (Ljava/lang/Iterable;)Z
+ ARG 1 collecction
+ CLASS class_9645 Multiple
+ METHOD test (Ljava/lang/Object;)Z
+ ARG 1 collection
+ CLASS class_9646 Single
+ METHOD test (Ljava/lang/Object;)Z
+ ARG 1 collection
+ CLASS class_9647 Empty
+ METHOD test (Ljava/lang/Object;)Z
+ ARG 1 collection
diff --git a/mappings/net/minecraft/predicate/collection/CollectionPredicate.mapping b/mappings/net/minecraft/predicate/collection/CollectionPredicate.mapping
new file mode 100644
index 0000000000..6806ae2f58
--- /dev/null
+++ b/mappings/net/minecraft/predicate/collection/CollectionPredicate.mapping
@@ -0,0 +1,7 @@
+CLASS net/minecraft/class_9648 net/minecraft/predicate/collection/CollectionPredicate
+ METHOD method_59623 createCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
+ ARG 0 predicateCodec
+ METHOD method_59624 (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+ ARG 1 instance
+ METHOD test (Ljava/lang/Object;)Z
+ ARG 1 collection
diff --git a/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping
index fa7a272316..a05322c886 100644
--- a/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping
+++ b/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping
@@ -1,7 +1,5 @@
CLASS net/minecraft/class_3735 net/minecraft/predicate/entity/EntityEquipmentPredicate
- FIELD comp_2620 f Ljava/util/Optional;
FIELD field_45744 CODEC Lcom/mojang/serialization/Codec;
- METHOD comp_2620 f ()Ljava/util/Optional;
METHOD method_16226 test (Lnet/minecraft/class_1297;)Z
ARG 1 entity
METHOD method_53129 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
@@ -15,6 +13,7 @@ CLASS net/minecraft/class_3735 net/minecraft/predicate/entity/EntityEquipmentPre
FIELD field_24485 feet Ljava/util/Optional;
FIELD field_24486 mainhand Ljava/util/Optional;
FIELD field_24487 offhand Ljava/util/Optional;
+ FIELD field_51371 body Ljava/util/Optional;
METHOD method_27965 create ()Lnet/minecraft/class_3735$class_5278;
METHOD method_27966 head (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_3735$class_5278;
ARG 1 item
@@ -29,3 +28,5 @@ CLASS net/minecraft/class_3735 net/minecraft/predicate/entity/EntityEquipmentPre
ARG 1 item
METHOD method_35196 offhand (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_3735$class_5278;
ARG 1 item
+ METHOD method_59651 body (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_3735$class_5278;
+ ARG 1 item
diff --git a/mappings/net/minecraft/predicate/entity/EntitySubPredicateTypes.mapping b/mappings/net/minecraft/predicate/entity/EntitySubPredicateTypes.mapping
index 7a0d444c9d..7eaa7d8ca6 100644
--- a/mappings/net/minecraft/predicate/entity/EntitySubPredicateTypes.mapping
+++ b/mappings/net/minecraft/predicate/entity/EntitySubPredicateTypes.mapping
@@ -1,8 +1,4 @@
CLASS net/minecraft/class_7378 net/minecraft/predicate/entity/EntitySubPredicateTypes
- FIELD field_38725 LIGHTNING Lcom/mojang/serialization/MapCodec;
- FIELD field_38726 FISHING_HOOK Lcom/mojang/serialization/MapCodec;
- FIELD field_38727 PLAYER Lcom/mojang/serialization/MapCodec;
- FIELD field_38728 SLIME Lcom/mojang/serialization/MapCodec;
METHOD method_43100 (Lnet/minecraft/class_1297;)Ljava/util/Optional;
ARG 0 entity
METHOD method_43102 (Lnet/minecraft/class_1297;)Ljava/util/Optional;
@@ -46,6 +42,8 @@ CLASS net/minecraft/class_7378 net/minecraft/predicate/entity/EntitySubPredicate
METHOD method_58352 register (Ljava/lang/String;Lnet/minecraft/class_7378$class_9419;)Lnet/minecraft/class_7378$class_9419;
ARG 0 id
ARG 1 type
+ METHOD method_59667 wolfVariant (Lnet/minecraft/class_6885;)Lnet/minecraft/class_7376;
+ ARG 0 wolfVariant
CLASS class_7380 VariantType
FIELD field_38741 variantGetter Ljava/util/function/Function;
FIELD field_49794 codec Lcom/mojang/serialization/MapCodec;
diff --git a/mappings/net/minecraft/predicate/item/AttributeModifiersPredicate.mapping b/mappings/net/minecraft/predicate/item/AttributeModifiersPredicate.mapping
new file mode 100644
index 0000000000..71b5349aed
--- /dev/null
+++ b/mappings/net/minecraft/predicate/item/AttributeModifiersPredicate.mapping
@@ -0,0 +1,10 @@
+CLASS net/minecraft/class_9653 net/minecraft/predicate/item/AttributeModifiersPredicate
+ FIELD field_51378 CODEC Lcom/mojang/serialization/Codec;
+ METHOD method_59668 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+ ARG 0 instance
+ CLASS class_9654 AttributeModifierPredicate
+ FIELD field_51379 CODEC Lcom/mojang/serialization/Codec;
+ METHOD method_59670 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+ ARG 0 instance
+ METHOD test (Ljava/lang/Object;)Z
+ ARG 1 attributeModifier
diff --git a/mappings/net/minecraft/predicate/item/BundleContentsPredicate.mapping b/mappings/net/minecraft/predicate/item/BundleContentsPredicate.mapping
new file mode 100644
index 0000000000..e7249f5df7
--- /dev/null
+++ b/mappings/net/minecraft/predicate/item/BundleContentsPredicate.mapping
@@ -0,0 +1,4 @@
+CLASS net/minecraft/class_9655 net/minecraft/predicate/item/BundleContentsPredicate
+ FIELD field_51380 CODEC Lcom/mojang/serialization/Codec;
+ METHOD method_59672 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+ ARG 0 instance
diff --git a/mappings/net/minecraft/predicate/item/ContainerPredicate.mapping b/mappings/net/minecraft/predicate/item/ContainerPredicate.mapping
new file mode 100644
index 0000000000..cb0fbe2ec6
--- /dev/null
+++ b/mappings/net/minecraft/predicate/item/ContainerPredicate.mapping
@@ -0,0 +1,4 @@
+CLASS net/minecraft/class_9656 net/minecraft/predicate/item/ContainerPredicate
+ FIELD field_51381 CODEC Lcom/mojang/serialization/Codec;
+ METHOD method_59674 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+ ARG 0 instance
diff --git a/mappings/net/minecraft/predicate/item/FireworkExplosionPredicate.mapping b/mappings/net/minecraft/predicate/item/FireworkExplosionPredicate.mapping
new file mode 100644
index 0000000000..814b5d24d2
--- /dev/null
+++ b/mappings/net/minecraft/predicate/item/FireworkExplosionPredicate.mapping
@@ -0,0 +1,8 @@
+CLASS net/minecraft/class_9657 net/minecraft/predicate/item/FireworkExplosionPredicate
+ FIELD field_51382 CODEC Lcom/mojang/serialization/Codec;
+ CLASS class_9658 Predicate
+ FIELD field_51383 CODEC Lcom/mojang/serialization/Codec;
+ METHOD method_59677 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+ ARG 0 instance
+ METHOD test (Ljava/lang/Object;)Z
+ ARG 1 fireworkExplosionComponent
diff --git a/mappings/net/minecraft/predicate/item/FireworksPredicate.mapping b/mappings/net/minecraft/predicate/item/FireworksPredicate.mapping
new file mode 100644
index 0000000000..347f742449
--- /dev/null
+++ b/mappings/net/minecraft/predicate/item/FireworksPredicate.mapping
@@ -0,0 +1,4 @@
+CLASS net/minecraft/class_9659 net/minecraft/predicate/item/FireworksPredicate
+ FIELD field_51384 CODEC Lcom/mojang/serialization/Codec;
+ METHOD method_59680 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+ ARG 0 instance
diff --git a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping
index 3383415cee..f5a1725ce5 100644
--- a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping
+++ b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping
@@ -4,6 +4,8 @@ CLASS net/minecraft/class_2073 net/minecraft/predicate/item/ItemPredicate
ARG 0 instance
METHOD method_8970 test (Lnet/minecraft/class_1799;)Z
ARG 1 stack
+ METHOD test (Ljava/lang/Object;)Z
+ ARG 1 stack
CLASS class_2074 Builder
FIELD field_49235 componentPredicate Lnet/minecraft/class_9329;
FIELD field_49803 subPredicates Lcom/google/common/collect/ImmutableMap$Builder;
diff --git a/mappings/net/minecraft/predicate/item/TrimPredicate.mapping b/mappings/net/minecraft/predicate/item/TrimPredicate.mapping
new file mode 100644
index 0000000000..3b3aed9841
--- /dev/null
+++ b/mappings/net/minecraft/predicate/item/TrimPredicate.mapping
@@ -0,0 +1,4 @@
+CLASS net/minecraft/class_9660 net/minecraft/predicate/item/TrimPredicate
+ FIELD field_51394 CODEC Lcom/mojang/serialization/Codec;
+ METHOD method_59685 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+ ARG 0 instance
diff --git a/mappings/net/minecraft/predicate/item/WritableBookContentPredicate.mapping b/mappings/net/minecraft/predicate/item/WritableBookContentPredicate.mapping
new file mode 100644
index 0000000000..f918080c7e
--- /dev/null
+++ b/mappings/net/minecraft/predicate/item/WritableBookContentPredicate.mapping
@@ -0,0 +1,8 @@
+CLASS net/minecraft/class_9661 net/minecraft/predicate/item/WritableBookContentPredicate
+ FIELD field_51395 CODEC Lcom/mojang/serialization/Codec;
+ METHOD method_59687 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+ ARG 0 instance
+ CLASS class_9662 RawStringPredicate
+ FIELD field_51396 CODEC Lcom/mojang/serialization/Codec;
+ METHOD test (Ljava/lang/Object;)Z
+ ARG 1 string
diff --git a/mappings/net/minecraft/predicate/item/WrittenBookContentPredicate.mapping b/mappings/net/minecraft/predicate/item/WrittenBookContentPredicate.mapping
new file mode 100644
index 0000000000..89eb7a5b51
--- /dev/null
+++ b/mappings/net/minecraft/predicate/item/WrittenBookContentPredicate.mapping
@@ -0,0 +1,8 @@
+CLASS net/minecraft/class_9663 net/minecraft/predicate/item/WrittenBookContentPredicate
+ FIELD field_51400 CODEC Lcom/mojang/serialization/Codec;
+ METHOD method_59696 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+ ARG 0 instance
+ CLASS class_9664 RawTextPredicate
+ FIELD field_51401 CODEC Lcom/mojang/serialization/Codec;
+ METHOD test (Ljava/lang/Object;)Z
+ ARG 1 text
diff --git a/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping b/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping
index 0bc97b30da..c4937e755c 100644
--- a/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping
+++ b/mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping
@@ -1,13 +1,61 @@
CLASS net/minecraft/class_1845 net/minecraft/recipe/BrewingRecipeRegistry
+ FIELD field_51402 EMPTY Lnet/minecraft/class_1845;
+ FIELD field_51403 potionTypes Ljava/util/List;
+ FIELD field_51404 potionRecipes Ljava/util/List;
+ FIELD field_51405 itemRecipes Ljava/util/List;
+ METHOD (Ljava/util/List;Ljava/util/List;Ljava/util/List;)V
+ ARG 1 potionTypes
+ ARG 2 potionRecipes
+ ARG 3 itemRecipes
METHOD method_20361 isBrewable (Lnet/minecraft/class_6880;)Z
+ ARG 1 potion
+ METHOD method_59699 registerDefaults (Lnet/minecraft/class_1845$class_9665;)V
+ ARG 0 builder
+ METHOD method_59700 isPotionType (Lnet/minecraft/class_1799;)Z
+ ARG 1 stack
METHOD method_8069 isPotionRecipeIngredient (Lnet/minecraft/class_1799;)Z
+ ARG 1 stack
METHOD method_8070 hasItemRecipe (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z
+ ARG 1 input
+ ARG 2 ingredient
METHOD method_8072 hasRecipe (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z
+ ARG 1 input
+ ARG 2 ingredient
METHOD method_8075 hasPotionRecipe (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z
- METHOD method_8076 registerDefaults (Lnet/minecraft/class_7699;)Lnet/minecraft/class_1845;
+ ARG 1 input
+ ARG 2 ingredient
+ METHOD method_8076 create (Lnet/minecraft/class_7699;)Lnet/minecraft/class_1845;
+ ARG 0 enabledFeatures
METHOD method_8077 isValidIngredient (Lnet/minecraft/class_1799;)Z
+ ARG 1 stack
METHOD method_8078 craft (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799;
+ ARG 1 ingredient
+ ARG 2 input
METHOD method_8079 isItemRecipeIngredient (Lnet/minecraft/class_1799;)Z
+ ARG 1 stack
CLASS class_1846 Recipe
METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_1856;Lnet/minecraft/class_6880;)V
ARG 2 ingredient
+ CLASS class_9665 Builder
+ FIELD field_51406 potionTypes Ljava/util/List;
+ FIELD field_51407 potionRecipes Ljava/util/List;
+ FIELD field_51408 itemRecipes Ljava/util/List;
+ FIELD field_51409 enabledFeatures Lnet/minecraft/class_7699;
+ METHOD (Lnet/minecraft/class_7699;)V
+ ARG 1 enabledFeatures
+ METHOD method_59701 build ()Lnet/minecraft/class_1845;
+ METHOD method_59702 registerPotionType (Lnet/minecraft/class_1792;)V
+ ARG 1 item
+ METHOD method_59703 registerItemRecipe (Lnet/minecraft/class_1792;Lnet/minecraft/class_1792;Lnet/minecraft/class_1792;)V
+ ARG 1 input
+ ARG 2 ingredient
+ ARG 3 output
+ METHOD method_59704 registerRecipes (Lnet/minecraft/class_1792;Lnet/minecraft/class_6880;)V
+ ARG 1 ingredient
+ ARG 2 potion
+ METHOD method_59705 registerPotionRecipe (Lnet/minecraft/class_6880;Lnet/minecraft/class_1792;Lnet/minecraft/class_6880;)V
+ ARG 1 input
+ ARG 2 ingredient
+ ARG 3 output
+ METHOD method_59706 assertPotion (Lnet/minecraft/class_1792;)V
+ ARG 0 potionType
diff --git a/mappings/net/minecraft/registry/tag/EnchantmentTags.mapping b/mappings/net/minecraft/registry/tag/EnchantmentTags.mapping
new file mode 100644
index 0000000000..0614fd0b4d
--- /dev/null
+++ b/mappings/net/minecraft/registry/tag/EnchantmentTags.mapping
@@ -0,0 +1,3 @@
+CLASS net/minecraft/class_9636 net/minecraft/registry/tag/EnchantmentTags
+ METHOD method_59548 of (Ljava/lang/String;)Lnet/minecraft/class_6862;
+ ARG 0 id
diff --git a/mappings/net/minecraft/screen/slot/Slot.mapping b/mappings/net/minecraft/screen/slot/Slot.mapping
index 846c9f4a2b..d99780f6ca 100644
--- a/mappings/net/minecraft/screen/slot/Slot.mapping
+++ b/mappings/net/minecraft/screen/slot/Slot.mapping
@@ -10,6 +10,11 @@ CLASS net/minecraft/class_1735 net/minecraft/screen/slot/Slot
FIELD field_7873 x I
FIELD field_7874 id I
FIELD field_7875 index I
+ METHOD (Lnet/minecraft/class_1263;III)V
+ ARG 1 inventory
+ ARG 2 index
+ ARG 3 x
+ ARG 4 y
METHOD method_32753 takeStackRange (IILnet/minecraft/class_1657;)Lnet/minecraft/class_1799;
ARG 1 min
ARG 2 max
diff --git a/mappings/net/minecraft/test/StructureTestUtil.mapping b/mappings/net/minecraft/test/StructureTestUtil.mapping
index 510efc676b..713d119bd3 100644
--- a/mappings/net/minecraft/test/StructureTestUtil.mapping
+++ b/mappings/net/minecraft/test/StructureTestUtil.mapping
@@ -98,3 +98,16 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil
ARG 3 pos
METHOD method_57104 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;ZLnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V
ARG 4 pos
+ METHOD method_59782 findStructureBlocks (Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;Ljava/lang/String;)Ljava/util/stream/Stream;
+ ARG 0 pos
+ ARG 1 radius
+ ARG 2 world
+ ARG 3 templateName
+ METHOD method_59783 (Ljava/lang/String;Lnet/minecraft/class_2633;)Z
+ ARG 1 blockEntity
+ METHOD method_59784 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2633;
+ ARG 1 posx
+ METHOD method_59785 createBox (Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)Lnet/minecraft/class_3341;
+ ARG 0 pos
+ ARG 1 radius
+ ARG 2 world
diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping
index b56b4bf4d3..75c8224f8f 100644
--- a/mappings/net/minecraft/util/dynamic/Codecs.mapping
+++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping
@@ -35,6 +35,8 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs
COMMENT @see RuntimeOps
FIELD field_49012 UNSIGNED_BYTE Lcom/mojang/serialization/Codec;
FIELD field_49183 PLAYER_NAME Lcom/mojang/serialization/Codec;
+ FIELD field_51364 VECTOR_4F Lcom/mojang/serialization/Codec;
+ FIELD field_51365 ARGB Lcom/mojang/serialization/Codec;
METHOD method_36241 rangedInt (IILjava/util/function/Function;)Lcom/mojang/serialization/Codec;
ARG 0 min
ARG 1 max
@@ -237,6 +239,10 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs
ARG 0 codec
METHOD method_57156 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult;
ARG 0 name
+ METHOD method_59549 (Lorg/joml/Vector4f;)Ljava/lang/Integer;
+ ARG 0 vec4f
+ METHOD method_59550 (Lorg/joml/Vector4f;)Ljava/util/List;
+ ARG 0 vec4f
CLASS 1
METHOD apply (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Lcom/mojang/serialization/DataResult;)Lcom/mojang/serialization/DataResult;
ARG 1 ops
diff --git a/mappings/net/minecraft/util/dynamic/NullOps.mapping b/mappings/net/minecraft/util/dynamic/NullOps.mapping
new file mode 100644
index 0000000000..f1318def37
--- /dev/null
+++ b/mappings/net/minecraft/util/dynamic/NullOps.mapping
@@ -0,0 +1,5 @@
+CLASS net/minecraft/class_9637 net/minecraft/util/dynamic/NullOps
+ FIELD field_51366 INSTANCE Lnet/minecraft/class_9637;
+ METHOD convertTo (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Ljava/lang/Object;
+ ARG 1 ops
+ ARG 2 unit
diff --git a/mappings/net/minecraft/util/math/BlockBox.mapping b/mappings/net/minecraft/util/math/BlockBox.mapping
index 18a8fa75af..ebd6e2f4b0 100644
--- a/mappings/net/minecraft/util/math/BlockBox.mapping
+++ b/mappings/net/minecraft/util/math/BlockBox.mapping
@@ -130,3 +130,11 @@ CLASS net/minecraft/class_3341 net/minecraft/util/math/BlockBox
ARG 2 y
ARG 3 z
METHOD method_54883 streamChunkPos ()Ljava/util/stream/Stream;
+ METHOD method_59718 expand (III)Lnet/minecraft/class_3341;
+ COMMENT {@return a new box that is expanded by {@code x}, {@code y}, {@code z}
+ COMMENT on each axis}
+ COMMENT
+ COMMENT @see #expand(int)
+ ARG 1 x
+ ARG 2 y
+ ARG 3 z
diff --git a/mappings/net/minecraft/util/math/ColorHelper.mapping b/mappings/net/minecraft/util/math/ColorHelper.mapping
index e419593c59..0d6a7d4dfa 100644
--- a/mappings/net/minecraft/util/math/ColorHelper.mapping
+++ b/mappings/net/minecraft/util/math/ColorHelper.mapping
@@ -1,5 +1,6 @@
CLASS net/minecraft/class_5253 net/minecraft/util/math/ColorHelper
COMMENT Contains color-related helper methods.
+ METHOD method_59553 channelFromFloat (F)I
CLASS class_5254 Argb
COMMENT Contains color-related helper methods that use ARGB colors represented
COMMENT as {@code 0xAARRGGBB}.
@@ -45,6 +46,11 @@ CLASS net/minecraft/class_5253 net/minecraft/util/math/ColorHelper
METHOD method_58144 withAlpha (II)I
ARG 0 alpha
ARG 1 rgb
+ METHOD method_59554 fromFloats (FFFF)I
+ ARG 0 a
+ ARG 1 r
+ ARG 2 g
+ ARG 3 b
CLASS class_8045 Abgr
METHOD method_48342 getAlpha (I)I
ARG 0 abgr
diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping
index 5d4045a72c..82a6a29104 100644
--- a/mappings/net/minecraft/village/TradeOffers.mapping
+++ b/mappings/net/minecraft/village/TradeOffers.mapping
@@ -250,6 +250,8 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers
ARG 5 price
ARG 6 maxUses
ARG 7 experience
+ METHOD method_19203 (Lnet/minecraft/class_1297;Lnet/minecraft/class_6880$class_6883;)Z
+ ARG 1 entry
CLASS class_8640 TypedWrapperFactory
FIELD comp_1962 typeToFactory Ljava/util/Map;
METHOD comp_1962 typeToFactory ()Ljava/util/Map;
diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping
index 5ab4f4f3bf..322698e716 100644
--- a/mappings/net/minecraft/world/World.mapping
+++ b/mappings/net/minecraft/world/World.mapping
@@ -264,6 +264,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
ARG 10 power
ARG 11 createFire
ARG 12 explosionSourceType
+ METHOD method_59547 getBrewingRecipeRegistry ()Lnet/minecraft/class_1845;
METHOD method_8413 updateListeners (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;I)V
ARG 1 pos
ARG 2 oldState
diff --git a/mappings/net/minecraft/world/explosion/ExplosionBehavior.mapping b/mappings/net/minecraft/world/explosion/ExplosionBehavior.mapping
index 6654d6fb61..8795ce7658 100644
--- a/mappings/net/minecraft/world/explosion/ExplosionBehavior.mapping
+++ b/mappings/net/minecraft/world/explosion/ExplosionBehavior.mapping
@@ -18,3 +18,4 @@ CLASS net/minecraft/class_5362 net/minecraft/world/explosion/ExplosionBehavior
ARG 1 explosion
ARG 2 entity
METHOD method_57007 getKnockbackModifier (Lnet/minecraft/class_1297;)F
+ ARG 1 entity
diff --git a/mappings/net/minecraft/world/gen/StructureWeightSampler.mapping b/mappings/net/minecraft/world/gen/StructureWeightSampler.mapping
index beb6b7c9b5..58df098a0e 100644
--- a/mappings/net/minecraft/world/gen/StructureWeightSampler.mapping
+++ b/mappings/net/minecraft/world/gen/StructureWeightSampler.mapping
@@ -23,6 +23,9 @@ CLASS net/minecraft/class_5817 net/minecraft/world/gen/StructureWeightSampler
ARG 1 y
ARG 2 z
METHOD method_33832 getMagnitudeWeight (DDD)D
+ ARG 0 x
+ ARG 2 y
+ ARG 4 z
METHOD method_42692 indexInBounds (I)Z
ARG 0 i
METHOD method_42693 structureWeight (IDI)D