24w37a stuff

Quite a bit to do still (notably all the Tracy profiler stuff, and client world creation things) but it's 4 AM now :)
Hopefully doesn't conflict too much with #3981

mappings/net/minecraft/advancement/criterion/Criteria.mapping

@@ -55,6 +55,7 @@ CLASS net/minecraft/class_174 net/minecraft/advancement/criterion/Criteria
 	FIELD field_48269 ANY_BLOCK_USE Lnet/minecraft/class_9104;
 	FIELD field_49922 CRAFTER_RECIPE_CRAFTED Lnet/minecraft/class_8508;
 	FIELD field_49923 FALL_AFTER_EXPLOSION Lnet/minecraft/class_9421;
+	FIELD field_54206 KILLED_BY_ARROW Lnet/minecraft/class_2076;
 	METHOD method_54933 getDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_179;
 		ARG 0 registry
 	METHOD method_767 register (Ljava/lang/String;Lnet/minecraft/class_179;)Lnet/minecraft/class_179;

mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping → mappings/net/minecraft/advancement/criterion/KilledByArrowCriterion.mapping

@@ -1,7 +1,10 @@
-CLASS net/minecraft/class_2076 net/minecraft/advancement/criterion/KilledByCrossbowCriterion
+CLASS net/minecraft/class_2076 net/minecraft/advancement/criterion/KilledByArrowCriterion
+	METHOD method_22478 (Ljava/util/List;Ljava/util/Set;Lnet/minecraft/class_1799;Lnet/minecraft/class_2076$class_2078;)Z
+		ARG 3 conditions
 	METHOD method_8980 trigger (Lnet/minecraft/class_3222;Ljava/util/Collection;Lnet/minecraft/class_1799;)V
 		ARG 1 player
 		ARG 2 piercingKilledEntities
+		ARG 3 weapon
 	CLASS class_2078 Conditions
 		FIELD comp_2029 player Ljava/util/Optional;
 		FIELD field_47268 CODEC Lcom/mojang/serialization/Codec;
@@ -11,8 +14,13 @@ CLASS net/minecraft/class_2076 net/minecraft/advancement/criterion/KilledByCross
 			ARG 3 uniqueEntityTypes
 		METHOD method_55005 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 			ARG 0 instance
-		METHOD method_8986 create (Lnet/minecraft/class_7871;[Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175;
-		METHOD method_8987 create (Lnet/minecraft/class_7871;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_175;
+		METHOD method_8986 createCrossbow (Lnet/minecraft/class_7871;[Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175;
+			ARG 0 itemRegistry
+			ARG 1 victims
+		METHOD method_8987 createCrossbow (Lnet/minecraft/class_7871;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_175;
+			ARG 0 itemRegistry
+			ARG 1 uniqueEntityTypeCount
 		METHOD method_8988 matches (Ljava/util/Collection;ILnet/minecraft/class_1799;)Z
 			ARG 1 victimContexts
 			ARG 2 uniqueEntityTypeCount
+			ARG 3 weapon

mappings/net/minecraft/block/dispenser/ShearsDispenserBehavior.mapping

@@ -5,6 +5,7 @@ CLASS net/minecraft/class_5168 net/minecraft/block/dispenser/ShearsDispenserBeha
 	METHOD method_27163 tryShearEntity (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)Z
 		ARG 0 world
 		ARG 1 pos
+		ARG 2 shears
 	METHOD method_40054 (Lnet/minecraft/class_4970$class_4971;)Z
 		ARG 0 state
 	METHOD method_56167 (Lnet/minecraft/class_1792;)V

mappings/net/minecraft/block/entity/BrushableBlockEntity.mapping

@@ -16,13 +16,27 @@ CLASS net/minecraft/class_8174 net/minecraft/block/entity/BrushableBlockEntity
 		ARG 2 state
 	METHOD method_49215 brush (JLnet/minecraft/class_3218;Lnet/minecraft/class_1657;Lnet/minecraft/class_2350;Lnet/minecraft/class_1799;)Z
 		ARG 1 worldTime
+		ARG 3 world
+		ARG 4 player
+		ARG 5 hitDirection
+		ARG 6 brush
 	METHOD method_49216 setLootTable (Lnet/minecraft/class_5321;J)V
 		ARG 1 lootTable
 		ARG 2 seed
 	METHOD method_49217 generateItem (Lnet/minecraft/class_3218;Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V
+		ARG 1 world
+		ARG 2 player
+		ARG 3 brush
 	METHOD method_49218 finishBrushing (Lnet/minecraft/class_3218;Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V
+		ARG 1 world
+		ARG 2 player
+		ARG 3 brush
 	METHOD method_49219 scheduledTick (Lnet/minecraft/class_3218;)V
+		ARG 1 world
 	METHOD method_49220 spawnItem (Lnet/minecraft/class_3218;Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V
+		ARG 1 world
+		ARG 2 player
+		ARG 3 brush
 	METHOD method_49222 readLootTableFromNbt (Lnet/minecraft/class_2487;)Z
 		ARG 1 nbt
 	METHOD method_49223 writeLootTableToNbt (Lnet/minecraft/class_2487;)Z

mappings/net/minecraft/block/entity/LecternBlockEntity.mapping

@@ -11,12 +11,14 @@ CLASS net/minecraft/class_3722 net/minecraft/block/entity/LecternBlockEntity
 		ARG 1 currentPage
 	METHOD method_17512 getCommandSource (Lnet/minecraft/class_1657;Lnet/minecraft/class_3218;)Lnet/minecraft/class_2168;
 		ARG 1 player
+		ARG 2 world
 	METHOD method_17513 setBook (Lnet/minecraft/class_1799;)V
 		ARG 1 book
 	METHOD method_17514 setBook (Lnet/minecraft/class_1799;Lnet/minecraft/class_1657;)V
 		ARG 1 book
 		ARG 2 player
 	METHOD method_17518 resolveBook (Lnet/minecraft/class_1799;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1799;
+		ARG 1 book
 		ARG 2 player
 	METHOD method_17520 getBook ()Lnet/minecraft/class_1799;
 	METHOD method_17522 hasBook ()Z

mappings/net/minecraft/block/entity/VaultBlockEntity.mapping

@@ -83,6 +83,7 @@ CLASS net/minecraft/class_9199 net/minecraft/block/entity/VaultBlockEntity
 			ARG 1 config
 			ARG 2 pos
 			ARG 3 player
+			ARG 4 key
 		METHOD method_56752 playFailedUnlockSound (Lnet/minecraft/class_3218;Lnet/minecraft/class_9204;Lnet/minecraft/class_2338;Lnet/minecraft/class_3414;)V
 			ARG 0 world
 			ARG 1 serverData

mappings/net/minecraft/client/gui/DrawContext.mapping

@@ -478,6 +478,18 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext
 		ARG 12 textureWidth
 		ARG 13 textureHeight
 		ARG 14 color
+	METHOD method_64235 drawTooltip (Lnet/minecraft/class_327;Lnet/minecraft/class_2561;IILnet/minecraft/class_2960;)V
+		ARG 1 textRenderer
+		ARG 2 text
+		ARG 3 x
+		ARG 4 y
+		ARG 5 texture
+	METHOD method_64236 drawOrderedTooltip (Lnet/minecraft/class_327;Ljava/util/List;IILnet/minecraft/class_2960;)V
+		ARG 1 textRenderer
+		ARG 2 text
+		ARG 3 x
+		ARG 4 y
+		ARG 5 texture
 	CLASS class_8214 ScissorStack
 		FIELD field_43099 stack Ljava/util/Deque;
 		METHOD method_49699 pop ()Lnet/minecraft/class_8030;

mappings/net/minecraft/client/gui/screen/TitleScreen.mapping

@@ -47,5 +47,12 @@ CLASS net/minecraft/class_442 net/minecraft/client/gui/screen/TitleScreen
 	METHOD method_41198 (Lnet/minecraft/class_4185;)V
 		ARG 1 button
 	METHOD method_44692 getMultiplayerDisabledText ()Lnet/minecraft/class_2561;
+	METHOD method_55814 (Lnet/minecraft/class_4185;)V
+		ARG 1 button
 	METHOD method_59752 setWidgetAlpha (F)V
 		ARG 1 alpha
+	METHOD method_64237 initWidgetsDevelopment (II)I
+		ARG 1 y
+		ARG 2 spacingY
+	METHOD method_64238 (Lnet/minecraft/class_4185;)V
+		ARG 1 button

mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping

@@ -15,7 +15,7 @@ CLASS net/minecraft/class_473 net/minecraft/client/gui/screen/ingame/BookEditScr
 	FIELD field_2830 lastClickTime J
 	FIELD field_2831 signButton Lnet/minecraft/class_4185;
 	FIELD field_2832 hand Lnet/minecraft/class_1268;
-	FIELD field_2835 itemStack Lnet/minecraft/class_1799;
+	FIELD field_2835 stack Lnet/minecraft/class_1799;
 	FIELD field_2837 dirty Z
 	FIELD field_2839 previousPageButton Lnet/minecraft/class_474;
 	FIELD field_2840 currentPage I
@@ -31,7 +31,9 @@ CLASS net/minecraft/class_473 net/minecraft/client/gui/screen/ingame/BookEditScr
 	FIELD field_32327 HEIGHT I
 	METHOD <init> (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;Lnet/minecraft/class_1268;Lnet/minecraft/class_9301;)V
 		ARG 1 player
+		ARG 2 stack
 		ARG 3 hand
+		ARG 4 writableBookContent
 	METHOD method_17046 countPages ()I
 	METHOD method_17047 removeEmptyPages ()V
 	METHOD method_19878 (Lnet/minecraft/class_4185;)V

mappings/net/minecraft/client/gui/screen/ingame/HandledScreen.mapping

@@ -33,6 +33,8 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/HandledScre
 	FIELD field_2803 draggedStackRemainder I
 	FIELD field_29347 playerInventoryTitle Lnet/minecraft/class_2561;
 	FIELD field_52801 tooltipSubmenuHandlers Ljava/util/List;
+	FIELD field_54268 SLOT_HIGHLIGHT_BACK_TEXTURE Lnet/minecraft/class_2960;
+	FIELD field_54269 SLOT_HIGHLIGHT_FRONT_TEXTURE Lnet/minecraft/class_2960;
 	METHOD <init> (Lnet/minecraft/class_1703;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V
 		ARG 1 handler
 		ARG 2 inventory
@@ -102,3 +104,13 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/HandledScre
 		ARG 1 handler
 	METHOD method_62001 isItemTooltipSticky (Lnet/minecraft/class_1799;)Z
 		ARG 1 item
+	METHOD method_64239 onMouseClick (Lnet/minecraft/class_1735;Lnet/minecraft/class_1713;)V
+		ARG 1 slot
+		ARG 2 actionType
+	METHOD method_64240 getSlotAt (DD)Lnet/minecraft/class_1735;
+		ARG 1 mouseX
+		ARG 3 mouseY
+	METHOD method_64241 drawSlotHighlightBack (Lnet/minecraft/class_332;)V
+		ARG 1 context
+	METHOD method_64242 drawSlotHighlightFront (Lnet/minecraft/class_332;)V
+		ARG 1 context

mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping

@@ -10,6 +10,8 @@ CLASS net/minecraft/class_5682 net/minecraft/client/gui/tooltip/BundleTooltipCom
 	FIELD field_52823 BUNDLE_EMPTY_DESCRIPTION Lnet/minecraft/class_2561;
 	FIELD field_54011 BUNDLE_PROGRESS_BAR_FILL_TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_54012 BUNDLE_PROGRESS_BAR_FULL_TEXTURE Lnet/minecraft/class_2960;
+	FIELD field_54270 BUNDLE_SLOT_HIGHLIGHT_BACK_TEXTURE Lnet/minecraft/class_2960;
+	FIELD field_54271 BUNDLE_SLOT_HIGHLIGHT_FRONT_TEXTURE Lnet/minecraft/class_2960;
 	METHOD <init> (Lnet/minecraft/class_9276;)V
 		ARG 1 bundleContents
 	METHOD method_33290 getRows ()I
@@ -26,6 +28,7 @@ CLASS net/minecraft/class_5682 net/minecraft/client/gui/tooltip/BundleTooltipCom
 		ARG 1 index
 		ARG 2 x
 		ARG 3 y
+		ARG 4 stacks
 		ARG 5 seed
 		ARG 6 textRenderer
 		ARG 7 drawContext

mappings/net/minecraft/client/gui/tooltip/TooltipSubmenuHandler.mapping

@@ -8,3 +8,6 @@ CLASS net/minecraft/class_9930 net/minecraft/client/gui/tooltip/TooltipSubmenuHa
 		ARG 1 slot
 	METHOD method_61978 reset (Lnet/minecraft/class_1735;)V
 		ARG 1 slot
+	METHOD method_64234 onMouseClick (Lnet/minecraft/class_1735;Lnet/minecraft/class_1713;)V
+		ARG 1 slot
+		ARG 2 actionType

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

@@ -42,3 +42,6 @@ CLASS net/minecraft/class_1007 net/minecraft/client/render/entity/PlayerEntityRe
 		ARG 0 player
 		ARG 1 state
 		ARG 2 tickDelta
+	METHOD method_64258 getArmPose (Lnet/minecraft/class_10055;Lnet/minecraft/class_1306;)Lnet/minecraft/class_572$class_573;
+		ARG 0 state
+		ARG 1 arm

mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping

@@ -19,6 +19,10 @@ CLASS net/minecraft/class_970 net/minecraft/client/render/entity/feature/ArmorFe
 	METHOD method_4169 renderArmor (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1799;Lnet/minecraft/class_1304;ILnet/minecraft/class_572;)V
 		ARG 1 matrices
 		ARG 2 vertexConsumers
+		ARG 3 stack
+		ARG 4 slot
+		ARG 5 light
+		ARG 6 armorModel
 	METHOD method_4170 setVisible (Lnet/minecraft/class_572;Lnet/minecraft/class_1304;)V
 		ARG 1 bipedModel
 		ARG 2 slot

mappings/net/minecraft/client/render/entity/feature/CapeFeatureRenderer.mapping

@@ -1,5 +1,10 @@
 CLASS net/minecraft/class_972 net/minecraft/client/render/entity/feature/CapeFeatureRenderer
 	FIELD field_53206 model Lnet/minecraft/class_572;
+	FIELD field_54177 equipmentModelLoader Lnet/minecraft/class_10201;
 	METHOD <init> (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;Lnet/minecraft/class_10201;)V
 		ARG 1 context
 		ARG 2 modelLoader
+		ARG 3 equipmentModelLoader
+	METHOD method_64257 hasCustomModelForLayer (Lnet/minecraft/class_1799;Lnet/minecraft/class_10186$class_10190;)Z
+		ARG 1 stack
+		ARG 2 layerType

mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping

@@ -63,6 +63,8 @@ CLASS net/minecraft/class_572 net/minecraft/client/render/entity/model/BipedEnti
 	METHOD method_62081 getArmPose (Lnet/minecraft/class_10034;Lnet/minecraft/class_1306;)Lnet/minecraft/class_572$class_573;
 		ARG 1 state
 		ARG 2 arm
+	METHOD method_64254 copyTransforms (Lnet/minecraft/class_572;)V
+		ARG 1 model
 	CLASS class_573 ArmPose
 		FIELD field_25722 twoHanded Z
 		METHOD <init> (Ljava/lang/String;IZ)V

mappings/net/minecraft/client/render/item/ItemRenderer.mapping

@@ -35,6 +35,7 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer
 		ARG 8 seed
 	METHOD method_23179 renderItem (Lnet/minecraft/class_1799;Lnet/minecraft/class_811;ZLnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_1087;)V
 		ARG 1 stack
+		ARG 2 transformationMode
 		ARG 3 leftHanded
 		ARG 4 matrices
 		ARG 5 vertexConsumers
@@ -70,6 +71,7 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer
 		ARG 2 entry
 	METHOD method_4019 getModel (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;I)Lnet/minecraft/class_1087;
 		ARG 1 stack
+		ARG 2 world
 		ARG 3 entity
 		ARG 4 seed
 	METHOD method_51795 usesDynamicDisplay (Lnet/minecraft/class_1799;)Z
@@ -86,7 +88,19 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer
 		ARG 5 light
 		ARG 6 overlay
 		ARG 7 model
+		ARG 8 useInventoryModel
 	METHOD method_62477 renderBundle (Lnet/minecraft/class_1799;Lnet/minecraft/class_811;ZLnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_1087;Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;I)V
+		ARG 1 stack
+		ARG 2 transformationMode
+		ARG 3 leftHanded
+		ARG 4 matrices
+		ARG 5 vertexConsumers
+		ARG 6 light
+		ARG 7 overlay
+		ARG 8 model
+		ARG 9 world
+		ARG 10 entity
+		ARG 11 seed
 	METHOD method_64073 renderItem (Lnet/minecraft/class_1799;Lnet/minecraft/class_811;ZLnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_1087;Z)V
 		ARG 1 stack
 		ARG 2 transformationMode
@@ -96,6 +110,7 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer
 		ARG 6 light
 		ARG 7 overlay
 		ARG 8 model
+		ARG 9 useInventoryModel
 	METHOD method_64074 renderItem (Lnet/minecraft/class_1799;Lnet/minecraft/class_811;ZLnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_1087;ZF)V
 		ARG 1 stack
 		ARG 2 transformationMode
@@ -105,3 +120,13 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer
 		ARG 6 light
 		ARG 7 overlay
 		ARG 8 model
+		ARG 9 useInventoryModel
+		ARG 10 z
+	METHOD method_64255 shouldUseInventoryModel (Lnet/minecraft/class_811;)Z
+		ARG 0 transformationMode
+	METHOD method_64256 getModelOrOverride (Lnet/minecraft/class_1087;Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;I)Lnet/minecraft/class_1087;
+		ARG 1 model
+		ARG 2 stack
+		ARG 3 world
+		ARG 4 entity
+		ARG 5 seed

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

@@ -28,6 +28,10 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld
 		ARG 4 dimensionType
 		ARG 5 loadDistance
 		ARG 6 simulationDistance
+		ARG 7 worldRenderer
+		ARG 8 debugWorld
+		ARG 9 seed
+		ARG 11 seaLevel
 	METHOD method_18110 unloadBlockEntities (Lnet/minecraft/class_2818;)V
 		ARG 1 chunk
 	METHOD method_18112 getEntities ()Ljava/lang/Iterable;

mappings/net/minecraft/command/CommandRegistryAccess.mapping

@@ -8,6 +8,7 @@ CLASS net/minecraft/class_7157 net/minecraft/command/CommandRegistryAccess
 	METHOD method_46722 of (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_7699;)Lnet/minecraft/class_7157;
 		ARG 0 registries
 		ARG 1 enabledFeatures
+	METHOD method_64226 getEnabledFeatures ()Lnet/minecraft/class_7699;
 	CLASS 1
 		METHOD method_56810 (Lnet/minecraft/class_7699;Lnet/minecraft/class_7225$class_7226;)Lnet/minecraft/class_7225$class_7226;
 			ARG 1 wrapper

mappings/net/minecraft/component/DataComponentTypes.mapping

@@ -138,3 +138,5 @@ CLASS net/minecraft/class_9334 net/minecraft/component/DataComponentTypes
 		ARG 0 builder
 	METHOD method_64101 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332;
 		ARG 0 builder
+	METHOD method_64260 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332;
+		ARG 0 builder

mappings/net/minecraft/component/type/DamageResistantComponent.mapping

@@ -0,0 +1,7 @@
+CLASS net/minecraft/class_10215 net/minecraft/component/type/DamageResistantComponent
+	FIELD field_54229 CODEC Lcom/mojang/serialization/Codec;
+	FIELD field_54230 PACKET_CODEC Lnet/minecraft/class_9139;
+	METHOD method_64198 resists (Lnet/minecraft/class_1282;)Z
+		ARG 1 damageSource
+	METHOD method_64199 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+		ARG 0 instance

mappings/net/minecraft/component/type/DeathProtectionComponent.mapping

@@ -0,0 +1,9 @@
+CLASS net/minecraft/class_10216 net/minecraft/component/type/DeathProtectionComponent
+	FIELD field_54231 CODEC Lcom/mojang/serialization/Codec;
+	FIELD field_54232 PACKET_CODEC Lnet/minecraft/class_9139;
+	FIELD field_54233 TOTEM_OF_UNDYING Lnet/minecraft/class_10216;
+	METHOD method_64200 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+		ARG 0 instance
+	METHOD method_64201 applyDeathEffects (Lnet/minecraft/class_1799;Lnet/minecraft/class_1309;)V
+		ARG 1 stack
+		ARG 2 entity

mappings/net/minecraft/component/type/EquippableComponent.mapping

@@ -10,3 +10,30 @@ CLASS net/minecraft/class_10192 net/minecraft/component/type/EquippableComponent
 	METHOD method_64018 equip (Lnet/minecraft/class_1799;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1269;
 		ARG 1 stack
 		ARG 2 player
+	METHOD method_64202 builder (Lnet/minecraft/class_1304;)Lnet/minecraft/class_10192$class_10217;
+		ARG 0 slot
+	CLASS class_10217 Builder
+		FIELD field_54234 slot Lnet/minecraft/class_1304;
+		FIELD field_54235 equipSound Lnet/minecraft/class_6880;
+		FIELD field_54236 model Ljava/util/Optional;
+		FIELD field_54237 allowedEntities Ljava/util/Optional;
+		FIELD field_54238 dispensable Z
+		FIELD field_54239 swappable Z
+		FIELD field_54240 damageOnHurt Z
+		METHOD <init> (Lnet/minecraft/class_1304;)V
+			ARG 1 slot
+		METHOD method_64203 build ()Lnet/minecraft/class_10192;
+		METHOD method_64204 model (Lnet/minecraft/class_2960;)Lnet/minecraft/class_10192$class_10217;
+			ARG 1 model
+		METHOD method_64205 equipSound (Lnet/minecraft/class_6880;)Lnet/minecraft/class_10192$class_10217;
+			ARG 1 equipSound
+		METHOD method_64206 allowedEntities (Lnet/minecraft/class_6885;)Lnet/minecraft/class_10192$class_10217;
+			ARG 1 allowedEntities
+		METHOD method_64207 dispensable (Z)Lnet/minecraft/class_10192$class_10217;
+			ARG 1 dispensable
+		METHOD method_64208 allowedEntities ([Lnet/minecraft/class_1299;)Lnet/minecraft/class_10192$class_10217;
+			ARG 1 allowedEntities
+		METHOD method_64209 swappable (Z)Lnet/minecraft/class_10192$class_10217;
+			ARG 1 swappable
+		METHOD method_64210 damageOnHurt (Z)Lnet/minecraft/class_10192$class_10217;
+			ARG 1 damageOnHurt

mappings/net/minecraft/component/type/PotionContentsComponent.mapping

@@ -35,6 +35,10 @@ CLASS net/minecraft/class_1844 net/minecraft/component/type/PotionContentsCompon
 		ARG 1 user
 	METHOD method_62840 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1309;Lnet/minecraft/class_1293;)V
 		ARG 2 effect
+	METHOD method_64195 getName (Ljava/lang/String;)Lnet/minecraft/class_2561;
+		ARG 1 prefix
+	METHOD method_64196 (Lnet/minecraft/class_6880;)Ljava/lang/String;
+		ARG 0 potionEntry
 	METHOD method_8055 getColor (Ljava/lang/Iterable;)I
 		ARG 0 effects
 	METHOD method_8062 getColor (Lnet/minecraft/class_6880;)I

mappings/net/minecraft/datafixer/fix/FireResistantToDamageResistantComponentFix.mapping

@@ -0,0 +1,3 @@
+CLASS net/minecraft/class_10208 net/minecraft/datafixer/fix/FireResistantToDamageResistantComponentFix
+	METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;)V
+		ARG 1 outputSchema

mappings/net/minecraft/entity/Entity.mapping

@@ -2288,6 +2288,9 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		ARG 2 prevPitch
 	METHOD method_63618 setPrevPosition (Lnet/minecraft/class_243;)V
 		ARG 1 pos
+	METHOD method_64166 tickBlockCollision (Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V
+		ARG 1 lastRenderPos
+		ARG 2 pos
 	METHOD method_7325 isSpectator ()Z
 		COMMENT {@return whether the entity is a spectator}
 		COMMENT