match 25w02a to 1.21.4

QuiltMC · Jan 12, 2025 · 960316d · 960316d
1 parent 1a92e05
commit 960316d
Show file tree

Hide file tree

Showing 60 changed files with 211 additions and 1 deletion.
diff --git a/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping b/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping
@@ -30,6 +30,8 @@ CLASS net/minecraft/unmapped/C_hyeqtgvx net/minecraft/advancement/PlayerAdvancem
 		ARG 1 root
 		ARG 2 visibleAdvancements
 		ARG 3 hiddenAdvancements
+	METHOD m_ecvsrmhv sendUpdate (Lnet/minecraft/unmapped/C_mxrobsgg;Z)V
+		ARG 1 player
 	METHOD m_flsopqse (Lnet/minecraft/unmapped/C_unoypvme;Lnet/minecraft/unmapped/C_bvqakncm;)V
 		ARG 2 display
 	METHOD m_fzsuujvd (Ljava/util/Map;Lnet/minecraft/unmapped/C_unoypvme;Lnet/minecraft/unmapped/C_rpzbknxp;)V

diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping
@@ -89,6 +89,8 @@ CLASS net/minecraft/unmapped/C_mmxmpdoq net/minecraft/block/Block
 		ARG 3 blockEntity
 		ARG 4 entity
 		ARG 5 stack
+	METHOD m_eslctrgs (Lnet/minecraft/unmapped/C_vdvbsyle;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_sddaxwyk;)V
+		ARG 2 stack
 	METHOD m_fgtteebr hasDynamicBounds ()Z
 	METHOD m_fuvqealb onPlaced (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_sddaxwyk;)V
 		ARG 1 world
@@ -123,6 +125,8 @@ CLASS net/minecraft/unmapped/C_mmxmpdoq net/minecraft/block/Block
 		ARG 0 world
 		ARG 1 pos
 		ARG 2 side
+	METHOD m_jeqzqmog (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_sddaxwyk;)V
+		ARG 2 stack
 	METHOD m_jweqgtyb onLandedUpon (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_astfners;F)V
 		ARG 1 world
 		ARG 2 state

diff --git a/mappings/net/minecraft/block/ConnectingBlock.mapping b/mappings/net/minecraft/block/ConnectingBlock.mapping
@@ -9,3 +9,5 @@ CLASS net/minecraft/unmapped/C_bgglkyxh net/minecraft/block/ConnectingBlock
 	METHOD <init> (FLnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V
 		ARG 1 radius
 		ARG 2 settings
+	METHOD m_rhbbmqca generateFacingsToShapeMap (F)Ljava/util/function/Function;
+		ARG 1 radius
diff --git a/mappings/net/minecraft/block/FluidDrainable.mapping b/mappings/net/minecraft/block/FluidDrainable.mapping
@@ -3,3 +3,4 @@ CLASS net/minecraft/unmapped/C_sddpnwlo net/minecraft/block/FluidDrainable
 		COMMENT {@return the sound played when filling a bucket with the fluid contained in this block}
 		COMMENT
 		COMMENT @see net.minecraft.fluid.Fluid#getBucketFillSound()
+	METHOD m_rdqcopzd tryDrainFluid (Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_vdvbsyle;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)Lnet/minecraft/unmapped/C_sddaxwyk;
diff --git a/mappings/net/minecraft/block/FluidFillable.mapping b/mappings/net/minecraft/block/FluidFillable.mapping
@@ -1,2 +1,3 @@
 CLASS net/minecraft/unmapped/C_gvnflrne net/minecraft/block/FluidFillable
+	METHOD m_wguzozcn canFillWithFluid (Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_rxhyurmy;)Z
 	METHOD m_ymsxgqxp tryFillWithFluid (Lnet/minecraft/unmapped/C_vdvbsyle;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_xqketiuf;)Z
diff --git a/mappings/net/minecraft/block/HorizontalConnectingBlock.mapping b/mappings/net/minecraft/block/HorizontalConnectingBlock.mapping
@@ -14,3 +14,9 @@ CLASS net/minecraft/unmapped/C_mxklsuxa net/minecraft/block/HorizontalConnecting
 		ARG 6 settings
 	METHOD m_erafjzrz (Ljava/util/Map$Entry;)Z
 		ARG 0 entry
+	METHOD m_oekhoibr createShapes (FFFFF)Ljava/util/function/Function;
+		ARG 1 radius1
+		ARG 2 radius2
+		ARG 3 height1
+		ARG 4 offset2
+		ARG 5 height2
diff --git a/mappings/net/minecraft/block/PointedDripstoneBlock.mapping b/mappings/net/minecraft/block/PointedDripstoneBlock.mapping
@@ -3,6 +3,7 @@ CLASS net/minecraft/unmapped/C_mqztguph net/minecraft/block/PointedDripstoneBloc
 	FIELD f_cizsryow STALACTITE_FLOOR_SEARCH_RANGE I
 	FIELD f_elvssjrw MAX_SEARCH_LENGTH_BETWEEN_STALACTITE_TIP_AND_CAULDRON I
 	FIELD f_fafmlqec MAX_SEARCH_LENGTH_WHEN_CHECKING_DRIP_TYPE I
+	FIELD f_fbahmvfg STALACTITE_DRIP_START_PIXEL D
 	FIELD f_geyyeqmy DELAY_BEFORE_FALLING I
 	FIELD f_gllsmtmr MAX_HORIZONTAL_OFFSET F
 	FIELD f_igqmwyaf WATERLOGGED Lnet/minecraft/unmapped/C_xhwijdsd;

diff --git a/mappings/net/minecraft/block/TrialSpawnerConfig.mapping b/mappings/net/minecraft/block/TrialSpawnerConfig.mapping
@@ -12,12 +12,15 @@ CLASS net/minecraft/unmapped/C_pocjjnjk net/minecraft/block/TrialSpawnerConfig
 		ARG 0 instance
 	CLASS C_vnrwaphu Builder
 		FIELD f_grofsmmd simultaneousMobs F
+		FIELD f_gurbcovz lootTablesToEject Lnet/minecraft/unmapped/C_bvkdjias;
+		FIELD f_jgjwrvli spawnPotentialsDefinition Lnet/minecraft/unmapped/C_bvkdjias;
 		FIELD f_jgmutzza ticksBetweenSpawn I
 		FIELD f_jqtdptyp simultaneousMobsAddedPerPlayer F
 		FIELD f_nblcrtjb totalMobsAddedPerPlayer F
 		FIELD f_reubvwnb itemsToDropWhenOminous Lnet/minecraft/unmapped/C_xhhleach;
 		FIELD f_tmgwtcsf spawnRange I
 		FIELD f_vfxijlzt totalMobs F
+		METHOD m_atarftzm spawnPotentialDefinition (Lnet/minecraft/unmapped/C_bvkdjias;)Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;
 		METHOD m_bdhifmhg spawnRange (I)Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;
 			ARG 1 range
 		METHOD m_cappnuim totalMobs (F)Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;
@@ -28,6 +31,7 @@ CLASS net/minecraft/unmapped/C_pocjjnjk net/minecraft/block/TrialSpawnerConfig
 			ARG 1 simultaneous
 		METHOD m_kavdpwjp ticksBetweenSpawn (I)Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;
 			ARG 1 ticks
+		METHOD m_oindwyhl lootTablesToEject (Lnet/minecraft/unmapped/C_bvkdjias;)Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;
 		METHOD m_rmwakhzj totalMobsAddedPerPlayer (F)Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu;
 			ARG 1 total
 		METHOD m_uitredfl build ()Lnet/minecraft/unmapped/C_pocjjnjk;

diff --git a/mappings/net/minecraft/block/TrialSpawnerData.mapping b/mappings/net/minecraft/block/TrialSpawnerData.mapping
@@ -10,6 +10,7 @@ CLASS net/minecraft/unmapped/C_kxkfzuix net/minecraft/block/TrialSpawnerData
 	FIELD f_tdzlonpc displayEntity Lnet/minecraft/unmapped/C_astfners;
 	FIELD f_toyfthwb BASE_TRIAL_OMEN_EFFECT_DURATION I
 	FIELD f_vhhqtdzo SPAWN_DATA_KEY Ljava/lang/String;
+	FIELD f_vvurntvw lootPool Lnet/minecraft/unmapped/C_bvkdjias;
 	FIELD f_wunezcil nextMobSpawnTime J
 	FIELD f_xnjazxxb PLAYER_DETECTION_INTERVAL I
 	FIELD f_yqqgmcxl cooldownEndTime J
@@ -50,6 +51,8 @@ CLASS net/minecraft/unmapped/C_kxkfzuix net/minecraft/block/TrialSpawnerData
 	METHOD m_pyggveyz getOrCreateNextSpawnData (Lnet/minecraft/unmapped/C_jelkcvqk;Lnet/minecraft/unmapped/C_rlomrsco;)Lnet/minecraft/unmapped/C_edcjbljn;
 		ARG 1 spawnerLogic
 	METHOD m_qacxasem reset ()V
+	METHOD m_qagcinaf getLootPool (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_pocjjnjk;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_bvkdjias;
+		ARG 2 config
 	METHOD m_qsauossa (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
 	METHOD m_rdtrxuhq hasSpawnedAllMobs (Lnet/minecraft/unmapped/C_pocjjnjk;I)Z

diff --git a/mappings/net/minecraft/block/WallBlock.mapping b/mappings/net/minecraft/block/WallBlock.mapping
@@ -21,6 +21,9 @@ CLASS net/minecraft/unmapped/C_duybclay net/minecraft/block/WallBlock
 		ARG 1 state
 		ARG 2 faceFullSquare
 		ARG 3 side
+	METHOD m_rxtmalgb getShapeMap (FF)Ljava/util/function/Function;
+		ARG 1 minX
+		ARG 2 minY
 	METHOD m_uavsfxkd isConnected (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_vzlztuyw;)Z
 		ARG 0 state
 		ARG 1 property

diff --git a/mappings/net/minecraft/block/entity/BlockEntity.mapping b/mappings/net/minecraft/block/entity/BlockEntity.mapping
@@ -47,6 +47,7 @@ CLASS net/minecraft/unmapped/C_kvegafmh net/minecraft/block/entity/BlockEntity
 		ARG 1 state
 		ARG 2 nbt
 		ARG 3 lookupProvider
+	METHOD m_ijpcosft tryParseCustomName (Lnet/minecraft/unmapped/C_oivssbvb;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_rdaqiwdt;
 	METHOD m_ivkmsjmy toComponentlessNbtWithIdAndPos (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_hhlwcnih;
 	METHOD m_jcglyghm writeIdAndPos (Lnet/minecraft/unmapped/C_hhlwcnih;)V
 		ARG 1 nbt

diff --git a/mappings/net/minecraft/block/entity/BrushableBlockEntity.mapping b/mappings/net/minecraft/block/entity/BrushableBlockEntity.mapping
@@ -18,13 +18,18 @@ CLASS net/minecraft/unmapped/C_tlzeicbt net/minecraft/block/entity/BrushableBloc
 		ARG 1 pos
 		ARG 2 state
 	METHOD m_ayzejxpo getBuriedStack ()Lnet/minecraft/unmapped/C_sddaxwyk;
+	METHOD m_bdpdffbi dropContent (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_sddaxwyk;)V
 	METHOD m_edqnpwap deserializeLootTable (Lnet/minecraft/unmapped/C_hhlwcnih;)Z
 		ARG 1 nbt
 	METHOD m_ghrzoxmo getCompletionStage ()I
 	METHOD m_hwiincya tickBrushCountReset (Lnet/minecraft/unmapped/C_bdwnwhiu;)V
+	METHOD m_kfybgynf checkLootInteraction (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_sddaxwyk;)V
 	METHOD m_llghgzmo setLootTable (Lnet/minecraft/unmapped/C_xhhleach;J)V
 		ARG 1 lootTable
 		ARG 2 lootTableSeed
 	METHOD m_otxeysvo getHitDirection ()Lnet/minecraft/unmapped/C_xpuuihxf;
 	METHOD m_ozsgysbr serializeLootTable (Lnet/minecraft/unmapped/C_hhlwcnih;)Z
 		ARG 1 nbt
+	METHOD m_rdawolkr completeBrushing (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_sddaxwyk;)V
+	METHOD m_xibosnri brush (JLnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_sddaxwyk;)Z
+		ARG 1 ticks
diff --git a/mappings/net/minecraft/block/piston/PistonBlock.mapping b/mappings/net/minecraft/block/piston/PistonBlock.mapping
@@ -5,6 +5,7 @@ CLASS net/minecraft/unmapped/C_tpdcefvs net/minecraft/block/piston/PistonBlock
 	FIELD f_kkrwbewr sticky Z
 	FIELD f_pvzpicqg EXTENDED Lnet/minecraft/unmapped/C_xhwijdsd;
 	FIELD f_tnkwsjri EXTEND_EVENT I
+	FIELD f_uodnnqjt PLATFORM_THICKNESS I
 	METHOD <init> (ZLnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V
 		ARG 1 sticky
 		ARG 2 settings

diff --git a/mappings/net/minecraft/block/piston/PistonHeadBlock.mapping b/mappings/net/minecraft/block/piston/PistonHeadBlock.mapping
@@ -1,4 +1,5 @@
 CLASS net/minecraft/unmapped/C_kovydcjx net/minecraft/block/piston/PistonHeadBlock
+	FIELD f_fsdkqqeh SHORT_HEAD_SHAPES Ljava/util/Map;
 	FIELD f_mlpracwk SHORT Lnet/minecraft/unmapped/C_xhwijdsd;
 	FIELD f_pfmwgbqv TYPE Lnet/minecraft/unmapped/C_cgckxfsw;
 	FIELD f_yycapthl CODEC Lcom/mojang/serialization/MapCodec;

diff --git a/mappings/net/minecraft/client/gui/screen/ingame/StructureBlockScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/StructureBlockScreen.mapping
@@ -41,11 +41,15 @@ CLASS net/minecraft/unmapped/C_svzcwkmk net/minecraft/client/gui/screen/ingame/S
 	FIELD f_zerouclp inputSizeZ Lnet/minecraft/unmapped/C_vopzcnhf;
 	METHOD <init> (Lnet/minecraft/unmapped/C_bfrzytnu;)V
 		ARG 1 structureBlock
+	METHOD m_acecyezl (Lnet/minecraft/unmapped/C_ikfvpkkf;Lnet/minecraft/unmapped/C_qomzaqud;)V
+		ARG 1 button
 	METHOD m_cqytswjo (Lnet/minecraft/unmapped/C_ikfvpkkf;Ljava/lang/Boolean;)V
 		ARG 1 button
 		ARG 2 includeEntities
 	METHOD m_csygkcin (Lnet/minecraft/unmapped/C_buwziidm;)V
 		ARG 1 button
+	METHOD m_faezmbkt (Lnet/minecraft/unmapped/C_ikfvpkkf;Ljava/lang/Boolean;)V
+		ARG 1 button
 	METHOD m_gkwwekhf (Lnet/minecraft/unmapped/C_ikfvpkkf;Lnet/minecraft/unmapped/C_uihldlpc;)V
 		ARG 1 button
 		ARG 2 mode

diff --git a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping
@@ -54,6 +54,7 @@ CLASS net/minecraft/unmapped/C_sjynkhfr net/minecraft/client/render/chunk/ChunkB
 		METHOD m_cejdjtap (Lnet/minecraft/unmapped/C_tizlwnnv;)Lnet/minecraft/unmapped/C_tizlwnnv;
 			ARG 0 layer
 		METHOD m_ektcraor needsRebuild ()Z
+		METHOD m_fpcfnjwg createVertexSorting (Lnet/minecraft/unmapped/C_zubvmeye;)Lnet/minecraft/unmapped/C_onfzhami;
 		METHOD m_fppyjbjj cancelTasks ()V
 		METHOD m_ggtdhlyn needsRebuild (Z)V
 			ARG 1 importantRebuild

diff --git a/mappings/net/minecraft/client/render/model/BakedModelManager.mapping b/mappings/net/minecraft/client/render/model/BakedModelManager.mapping
@@ -24,6 +24,8 @@ CLASS net/minecraft/unmapped/C_wosoicga net/minecraft/client/render/model/BakedM
 	METHOD m_nrawhhyn shouldRerender (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_txtbiemp;)Z
 		ARG 1 from
 		ARG 2 to
+	METHOD m_oppkkipg (Lnet/minecraft/unmapped/C_wosoicga$C_mogtdkcx;)Ljava/util/concurrent/CompletionStage;
+		ARG 0 reloadState
 	METHOD m_pfipxvmw apply (Lnet/minecraft/unmapped/C_wosoicga$C_mogtdkcx;Lnet/minecraft/unmapped/C_eslcbfsq;)V
 		ARG 1 reloadState
 	METHOD m_xzgzhjbz getAtlas (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_qwirmgcf;

diff --git a/mappings/net/minecraft/client/render/model/BasicBakedModel.mapping b/mappings/net/minecraft/client/render/model/BasicBakedModel.mapping
@@ -13,6 +13,7 @@ CLASS net/minecraft/unmapped/C_ubgawsaf net/minecraft/client/render/model/BasicB
 		FIELD f_hgfzxvkw quads Lcom/google/common/collect/ImmutableList$Builder;
 		FIELD f_igaqjesj transformation Lnet/minecraft/unmapped/C_ddhexvvo;
 		FIELD f_ukaoxykm particleTexture Lnet/minecraft/unmapped/C_uflrwbwt;
+		FIELD f_wnvgerkd faceQuads Ljava/util/Map;
 		METHOD m_bvprdyyl build ()Lnet/minecraft/unmapped/C_nnhmhkbv;
 		METHOD m_dxnftrhc setParticle (Lnet/minecraft/unmapped/C_uflrwbwt;)Lnet/minecraft/unmapped/C_ubgawsaf$C_ttlupuzu;
 			ARG 1 sprite

diff --git a/mappings/net/minecraft/client/render/model/WeightedBakedModel.mapping b/mappings/net/minecraft/client/render/model/WeightedBakedModel.mapping
@@ -1 +1,2 @@
 CLASS net/minecraft/unmapped/C_cdimqouc net/minecraft/client/render/model/WeightedBakedModel
+	FIELD f_jtqwvdjj models Lnet/minecraft/unmapped/C_bvkdjias;
diff --git a/mappings/net/minecraft/client/sound/WeightedSoundSet.mapping b/mappings/net/minecraft/client/sound/WeightedSoundSet.mapping
@@ -5,3 +5,4 @@ CLASS net/minecraft/unmapped/C_rjijmyov net/minecraft/client/sound/WeightedSound
 		ARG 1 id
 		ARG 2 subtitle
 	METHOD m_mgtqnjpv getSubtitle ()Lnet/minecraft/unmapped/C_rdaqiwdt;
+	METHOD m_ybogfmgf add (Lnet/minecraft/unmapped/C_wpxaonhn;)V
diff --git a/mappings/net/minecraft/component/type/PotionContentsComponent.mapping b/mappings/net/minecraft/component/type/PotionContentsComponent.mapping
@@ -4,6 +4,7 @@ CLASS net/minecraft/unmapped/C_xpqegwnr net/minecraft/component/type/PotionConte
 	FIELD f_odxdsbyn BASE_POTION_COLOR I
 	FIELD f_pfmdfdye CODEC Lcom/mojang/serialization/Codec;
 	FIELD f_ujtaryrq DEFAULT Lnet/minecraft/unmapped/C_xpqegwnr;
+	METHOD m_dfyuvtuy applyEffects (Lnet/minecraft/unmapped/C_usxaxydn;F)V
 	METHOD m_ftszwssd (Ljava/util/List;Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_hdbqsqsm;)V
 		ARG 1 attribute
 		ARG 2 modifier
@@ -23,6 +24,8 @@ CLASS net/minecraft/unmapped/C_xpqegwnr net/minecraft/component/type/PotionConte
 	METHOD m_piarfhar getColor ()I
 	METHOD m_rczavhbs (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_wpfizwve;)V
 		ARG 3 effect
+	METHOD m_rmuyvqjh forEachEffect (Ljava/util/function/Consumer;F)V
+		ARG 1 consumer
 	METHOD m_rzmobahm getColorOrDefault (I)I
 		ARG 1 defaultColor
 	METHOD m_wiewnncq hasEffects ()Z

diff --git a/mappings/net/minecraft/datafixer/fix/BlockEntityBannerNameComponentFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockEntityBannerNameComponentFix.mapping
@@ -1 +1,3 @@
 CLASS net/minecraft/unmapped/C_dnwxdepg net/minecraft/datafixer/fix/BlockEntityBannerNameComponentFix
+	METHOD m_biktrjir transform (Lcom/mojang/datafixers/Typed;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;)Lcom/mojang/datafixers/Typed;
+		ARG 1 inputType
diff --git a/mappings/net/minecraft/datafixer/fix/ItemNbtFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemNbtFix.mapping
@@ -5,3 +5,4 @@ CLASS net/minecraft/unmapped/C_vlkyyvnb net/minecraft/datafixer/fix/ItemNbtFix
 		ARG 1 schema
 		ARG 2 name
 		ARG 3 requiresFixPredicate
+	METHOD m_asfehvri update (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;
diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
@@ -94,6 +94,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
 	FIELD f_ssljujsr LOGGER Lorg/slf4j/Logger;
 	FIELD f_tigrjjuw DEFAULT_BOUNDING_BOX_WIDTH F
 	FIELD f_tklhtpht entityChangeListener Lnet/minecraft/unmapped/C_ylpvpknw;
+	FIELD f_ujgsyoqm collidingBlocks Ljava/util/List;
 	FIELD f_ujsjgylb fallDistance F
 	FIELD f_vdsiqqmt prevPitch F
 	FIELD f_vettyvgp hasVisualFire Z
@@ -573,6 +574,8 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
 	METHOD m_nhuepqoa getOppositeRotationVector (FF)Lnet/minecraft/unmapped/C_vgpupfxx;
 		ARG 1 pitch
 		ARG 2 yaw
+	METHOD m_nnymqfux onBubbleColumnSurfaceCollision (ZLnet/minecraft/unmapped/C_hynzadkk;)V
+		ARG 1 drag
 	METHOD m_nsggwems getSoundCategory ()Lnet/minecraft/unmapped/C_pqzizukq;
 	METHOD m_nstmjlot setAir (I)V
 		ARG 1 air
@@ -892,6 +895,8 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
 	METHOD m_wjodonhd isInvisible ()Z
 	METHOD m_wkqvrgdz canAddPassenger (Lnet/minecraft/unmapped/C_astfners;)Z
 		ARG 1 passenger
+	METHOD m_wmrqudhe checkBlockCollisions (Ljava/util/List;Ljava/util/List;)V
+		ARG 1 collisionChecks
 	METHOD m_wmxlrpiw getPos ()Lnet/minecraft/unmapped/C_vgpupfxx;
 		COMMENT {@return the position in the world of this entity}
 	METHOD m_wnmvwdkc playSwimSound ()V

diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping
@@ -56,6 +56,8 @@ CLASS net/minecraft/unmapped/C_ogavsvbr net/minecraft/entity/EntityType
 		ARG 1 world
 	METHOD m_hyyvvjps createChestBoatFactory (Ljava/util/function/Supplier;)Lnet/minecraft/unmapped/C_ogavsvbr$C_pasczndl;
 		ARG 0 dropItem
+	METHOD m_ijebmrdp appendCustomEntityStackSpawnConfig (Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_usxaxydn;)Ljava/util/function/Consumer;
+		ARG 0 previous
 	METHOD m_jwcfsqgu isSummonable ()Z
 	METHOD m_kkusvlru isSpawnableFarFromPlayer ()Z
 	METHOD m_krlwdzbt register (Ljava/lang/String;Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;)Lnet/minecraft/unmapped/C_ogavsvbr;
@@ -69,6 +71,8 @@ CLASS net/minecraft/unmapped/C_ogavsvbr net/minecraft/entity/EntityType
 		ARG 1 pos
 		ARG 2 invertY
 		ARG 3 boundingBox
+	METHOD m_mzwuvsgt appendDefaultStackSpawnConfig (Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_usxaxydn;)Ljava/util/function/Consumer;
+		ARG 0 previous
 	METHOD m_navxebru createChestRaftFactory (Ljava/util/function/Supplier;)Lnet/minecraft/unmapped/C_ogavsvbr$C_pasczndl;
 		ARG 0 dropItem
 	METHOD m_ncqhbjml getHeight ()F
@@ -81,10 +85,15 @@ CLASS net/minecraft/unmapped/C_ogavsvbr net/minecraft/entity/EntityType
 	METHOD m_pebhwwxb getId (Lnet/minecraft/unmapped/C_ogavsvbr;)Lnet/minecraft/unmapped/C_ncpywfca;
 		ARG 0 type
 	METHOD m_qprblwyz isSaveable ()Z
+	METHOD m_qwgbrbqg createDefaultStackSpawnConfig (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_usxaxydn;)Ljava/util/function/Consumer;
 	METHOD m_qxlrmhco getLootTable ()Ljava/util/Optional;
 	METHOD m_rdswxkej streamFromNbt (Ljava/util/List;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_bhyaesep;)Ljava/util/stream/Stream;
 		ARG 0 entityNbtList
 		ARG 1 world
+	METHOD m_teaexptf loadFromEntityNbt (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_incrreuu;)V
+		ARG 0 world
+		ARG 2 entity
+		ARG 3 nbt
 	METHOD m_tjmuaxwr create (Lnet/minecraft/unmapped/C_bdwnwhiu;Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_bhyaesep;ZZ)Lnet/minecraft/unmapped/C_astfners;
 		ARG 2 consumer
 		ARG 5 alignPosition

diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping
@@ -21,6 +21,7 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
 	FIELD f_glylybzo lastDamageTime J
 	FIELD f_gmsrgmfi leaningPitch F
 	FIELD f_hdvyydom MAX_VISIBILITY_TEST_RANGE D
+	FIELD f_hhueawxl attackingPlayer Lnet/minecraft/unmapped/C_xolbcmjn;
 	FIELD f_hkjqagmp DEFAULT_BABY_SCALE F
 	FIELD f_hoaujqhj handSwingTicks I
 	FIELD f_iiiqnngu SPRINTING_SPEED_BOOST Lnet/minecraft/unmapped/C_hdbqsqsm;
@@ -92,6 +93,7 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
 	FIELD f_ysdmvlsq equippedHand Lnet/minecraft/unmapped/C_rnrfftze;
 	FIELD f_zgtmqjrv HEALTH Lnet/minecraft/unmapped/C_rinmcaxy;
 	FIELD f_zkhdmkcl ARMOR_SLOT_OFFSET I
+	FIELD f_ztvierdp attacker Lnet/minecraft/unmapped/C_xolbcmjn;
 	FIELD f_zuarxhuv damageTracker Lnet/minecraft/unmapped/C_xkhemiqp;
 	FIELD f_zzzdmler OFF_HAND_ACTIVE_FLAG I
 	METHOD m_aabhytmz clearSleepingPosition ()V
@@ -393,6 +395,8 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
 	METHOD m_otdsojah tickNewAi ()V
 	METHOD m_oymopclz generateLoot (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sbxfkpyv;Z)V
 		ARG 3 fromPlayer
+	METHOD m_ozivsxrd turnHead (F)V
+		ARG 1 bodyRotation
 	METHOD m_pdfqoxex travel (Lnet/minecraft/unmapped/C_vgpupfxx;)V
 		COMMENT Allows you to do certain speed and velocity calculations. This is useful for custom vehicle behavior, or custom entity movement. This is not to be confused with AI.
 		COMMENT
@@ -570,6 +574,7 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
 	METHOD m_whvujbsh dropInventory (Lnet/minecraft/unmapped/C_bdwnwhiu;)V
 	METHOD m_widuipxk getAttributes ()Lnet/minecraft/unmapped/C_cohbwqne;
 	METHOD m_wjvypezh getRoll ()I
+	METHOD m_wkgrdcha fallFlyTravel (Lnet/minecraft/unmapped/C_vgpupfxx;)V
 	METHOD m_wmvelibz isHoldingOntoLadder ()Z
 		COMMENT @return {@code true} if this entity should not lose height while in a climbing state
 		COMMENT @see net.minecraft.entity.LivingEntity

diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping
@@ -87,6 +87,7 @@ CLASS net/minecraft/unmapped/C_wpfizwve net/minecraft/entity/effect/StatusEffect
 		ARG 1 that
 	METHOD m_yxwgbwgv endsWithin (I)Z
 		ARG 1 ticks
+	METHOD m_zhljuajd updateDuration ()V
 	METHOD m_zxegsuzr onEntityRemoved (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_astfners$C_emmohndu;)V
 	CLASS C_ivhzuvgd Details
 		METHOD m_frzuuwir create (IIZZLjava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_wpfizwve$C_ivhzuvgd;

diff --git a/mappings/net/minecraft/entity/mob/WaterCreatureEntity.mapping b/mappings/net/minecraft/entity/mob/WaterCreatureEntity.mapping
@@ -1,5 +1,7 @@
 CLASS net/minecraft/unmapped/C_cpqtqaen net/minecraft/entity/mob/WaterCreatureEntity
 	FIELD f_uznxfkln MIN_AMBIENT_SOUND_INTERVAL I
+	METHOD m_rjwsrbhx tickWaterBreathingAir (Lnet/minecraft/unmapped/C_bdwnwhiu;I)V
+		ARG 2 air
 	METHOD m_rlvqolvj canSpawn (Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_vdvbsyle;Lnet/minecraft/unmapped/C_bhyaesep;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_rlomrsco;)Z
 		ARG 0 entity
 		ARG 1 world
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		CLASS net/minecraft/unmapped/C_cdimqouc net/minecraft/client/render/model/WeightedBakedModel
		FIELD f_jtqwvdjj models Lnet/minecraft/unmapped/C_bvkdjias;