22w15a stuff (#3091)

* 22w15a stuff

* Apply suggestions from code review

Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com>

Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com>

mappings/net/minecraft/SharedConstants.mapping

@@ -24,6 +24,7 @@ CLASS net/minecraft/class_155 net/minecraft/SharedConstants
 	FIELD field_34371 DEBUG_BIOME_SOURCE Z
 	FIELD field_34372 DEBUG_NOISE Z
 	FIELD field_34373 CURRENT_SERIES Ljava/lang/String;
+	FIELD field_38828 dataFixerPhase Lnet/minecraft/class_7395;
 	METHOD method_16673 getGameVersion ()Lnet/minecraft/class_6489;
 	METHOD method_31372 getProtocolVersion ()I
 	METHOD method_34872 setGameVersion (Lnet/minecraft/class_6489;)V

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

@@ -20,3 +20,6 @@ CLASS net/minecraft/class_5409 net/minecraft/advancement/criterion/PlayerInterac
 		METHOD method_30100 test (Lnet/minecraft/class_1799;Lnet/minecraft/class_47;)Z
 			ARG 1 stack
 			ARG 2 context
+		METHOD method_43278 create (Lnet/minecraft/class_2073$class_2074;Lnet/minecraft/class_2048$class_5258;)Lnet/minecraft/class_5409$class_5410;
+			ARG 0 itemBuilder
+			ARG 1 entity

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

@@ -1,5 +1,7 @@
 CLASS net/minecraft/class_5279 net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion
-	FIELD field_24492 ID Lnet/minecraft/class_2960;
+	FIELD field_24492 id Lnet/minecraft/class_2960;
+	METHOD <init> (Lnet/minecraft/class_2960;)V
+		ARG 1 id
 	METHOD method_27975 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;Lnet/minecraft/class_1297;)V
 		ARG 1 player
 		ARG 2 stack
@@ -9,10 +11,20 @@ CLASS net/minecraft/class_5279 net/minecraft/advancement/criterion/ThrownItemPic
 	CLASS class_5280 Conditions
 		FIELD field_24493 item Lnet/minecraft/class_2073;
 		FIELD field_24494 entity Lnet/minecraft/class_2048$class_5258;
-		METHOD method_27978 create (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2048$class_5258;)Lnet/minecraft/class_5279$class_5280;
+		METHOD <init> (Lnet/minecraft/class_2960;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2048$class_5258;)V
+			ARG 1 id
+			ARG 2 player
+			ARG 3 item
+			ARG 4 entity
+		METHOD method_27978 createThrownItemPickedUpByEntity (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2048$class_5258;)Lnet/minecraft/class_5279$class_5280;
 			ARG 0 player
+			ARG 1 item
 			ARG 2 entity
 		METHOD method_27979 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;Lnet/minecraft/class_47;)Z
 			ARG 1 player
 			ARG 2 stack
 			ARG 3 entityContext
+		METHOD method_43277 createThrownItemPickedUpByPlayer (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2048$class_5258;)Lnet/minecraft/class_5279$class_5280;
+			ARG 0 player
+			ARG 1 item
+			ARG 2 entity

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

@@ -16,3 +16,4 @@ CLASS net/minecraft/class_2135 net/minecraft/advancement/criterion/TickCriterion
 			ARG 0 location
 		METHOD method_43138 createSleptInBed ()Lnet/minecraft/class_2135$class_2137;
 		METHOD method_43139 createHeroOfTheVillage ()Lnet/minecraft/class_2135$class_2137;
+		METHOD method_43279 createAvoidVibration ()Lnet/minecraft/class_2135$class_2137;

mappings/net/minecraft/block/AbstractBlock.mapping

@@ -308,7 +308,9 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
 		FIELD field_23185 postProcessPredicate Lnet/minecraft/class_4970$class_4973;
 		FIELD field_23186 emissiveLightingPredicate Lnet/minecraft/class_4970$class_4973;
 		FIELD field_25185 toolRequired Z
+		FIELD field_38863 offsetType Ljava/util/function/Function;
 		METHOD <init> (Lnet/minecraft/class_3614;Ljava/util/function/Function;)V
+			ARG 1 material
 			ARG 2 mapColorProvider
 		METHOD <init> (Lnet/minecraft/class_3614;Lnet/minecraft/class_3620;)V
 			ARG 1 material
@@ -377,6 +379,14 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
 		METHOD method_36558 resistance (F)Lnet/minecraft/class_4970$class_2251;
 			ARG 1 resistance
 		METHOD method_42327 dropsNothing ()Lnet/minecraft/class_4970$class_2251;
+		METHOD method_43281 offsetType (Lnet/minecraft/class_4970$class_2250;)Lnet/minecraft/class_4970$class_2251;
+			ARG 1 offsetType
+		METHOD method_43282 (Lnet/minecraft/class_4970$class_2250;Lnet/minecraft/class_2680;)Lnet/minecraft/class_4970$class_2250;
+			ARG 1 state
+		METHOD method_43283 (Lnet/minecraft/class_2680;)Lnet/minecraft/class_4970$class_2250;
+			ARG 0 state
+		METHOD method_43284 offsetType (Ljava/util/function/Function;)Lnet/minecraft/class_4970$class_2251;
+			ARG 1 offsetType
 		METHOD method_9617 of (Lnet/minecraft/class_3614;Lnet/minecraft/class_1767;)Lnet/minecraft/class_4970$class_2251;
 			ARG 0 material
 			ARG 1 color
@@ -426,6 +436,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
 		FIELD field_23177 postProcessPredicate Lnet/minecraft/class_4970$class_4973;
 		FIELD field_23178 emissiveLightingPredicate Lnet/minecraft/class_4970$class_4973;
 		FIELD field_25184 toolRequired Z
+		FIELD field_38862 offsetType Lnet/minecraft/class_4970$class_2250;
 		METHOD <init> (Lnet/minecraft/class_2248;Lcom/google/common/collect/ImmutableMap;Lcom/mojang/serialization/MapCodec;)V
 			ARG 1 block
 			ARG 2 propertyMap
@@ -678,6 +689,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
 			ARG 1 blocks
 		METHOD method_40144 streamTags ()Ljava/util/stream/Stream;
 		METHOD method_41520 getRegistryEntry ()Lnet/minecraft/class_6880;
+		METHOD method_43280 getOffsetType ()Lnet/minecraft/class_4970$class_2250;
 		CLASS class_3752 ShapeCache
 			FIELD field_16555 lightSubtracted I
 			FIELD field_16556 translucent Z

mappings/net/minecraft/client/gui/hud/InGameHud.mapping

@@ -43,6 +43,9 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud
 	FIELD field_35428 autosaveIndicatorAlpha F
 	FIELD field_35429 lastAutosaveIndicatorAlpha F
 	FIELD field_35430 SAVING_LEVEL_TEXT Lnet/minecraft/class_2561;
+	METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_918;)V
+		ARG 1 client
+		ARG 2 itemRenderer
 	METHOD method_1731 updateVignetteDarkness (Lnet/minecraft/class_1297;)V
 		ARG 1 entity
 	METHOD method_1732 setRecordPlayingOverlay (Lnet/minecraft/class_2561;)V

mappings/net/minecraft/client/particle/GlowParticle.mapping

@@ -30,3 +30,7 @@ CLASS net/minecraft/class_5786 net/minecraft/client/particle/GlowParticle
 		FIELD field_29578 spriteProvider Lnet/minecraft/class_4002;
 		METHOD <init> (Lnet/minecraft/class_4002;)V
 			ARG 1 spriteProvider
+	CLASS class_7309 AllayDustFactory
+		FIELD field_38460 spriteProvider Lnet/minecraft/class_4002;
+		METHOD <init> (Lnet/minecraft/class_4002;)V
+			ARG 1 spriteProvider

mappings/net/minecraft/client/render/GameRenderer.mapping

@@ -97,6 +97,11 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer
 	FIELD field_4027 ticks I
 	FIELD field_4028 lightmapTextureManager Lnet/minecraft/class_765;
 	FIELD field_4029 floatingItemWidth F
+	METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_759;Lnet/minecraft/class_3300;Lnet/minecraft/class_4599;)V
+		ARG 1 client
+		ARG 2 heldItemRenderer
+		ARG 3 resourceManager
+		ARG 4 buffers
 	METHOD method_18144 (Lnet/minecraft/class_1297;)Z
 		ARG 0 entity
 	METHOD method_19418 getCamera ()Lnet/minecraft/class_4184;

mappings/net/minecraft/client/render/WorldRenderer.mapping

@@ -63,6 +63,11 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
 	FIELD field_4119 playingSongs Ljava/util/Map;
 	FIELD field_4120 lastCameraChunkUpdateY D
 	FIELD field_4121 cameraChunkZ I
+	METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_898;Lnet/minecraft/class_824;Lnet/minecraft/class_4599;)V
+		ARG 1 client
+		ARG 2 entityRenderDispatcher
+		ARG 3 blockEntityRenderDispatcher
+		ARG 4 bufferBuilders
 	METHOD method_16037 scheduleSectionRender (Lnet/minecraft/class_2338;Z)V
 		ARG 1 pos
 		ARG 2 important

mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping

@@ -46,6 +46,8 @@ CLASS net/minecraft/class_778 net/minecraft/client/render/block/BlockModelRender
 		ARG 9 ambientOcclusionCalculator
 		ARG 10 overlay
 	METHOD method_3364 getQuadDimensions (Lnet/minecraft/class_1920;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;[ILnet/minecraft/class_2350;[FLjava/util/BitSet;)V
+		ARG 1 world
+		ARG 2 state
 		ARG 3 pos
 		ARG 4 vertexData
 		ARG 5 face

mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping

@@ -1,14 +1,19 @@
 CLASS net/minecraft/class_824 net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher
 	FIELD field_27746 entityModelLoader Lnet/minecraft/class_5599;
 	FIELD field_27747 blockRenderManager Ljava/util/function/Supplier;
+	FIELD field_38880 itemRenderer Ljava/util/function/Supplier;
+	FIELD field_38881 entityRenderDispatcher Ljava/util/function/Supplier;
 	FIELD field_4342 textRenderer Lnet/minecraft/class_327;
 	FIELD field_4344 camera Lnet/minecraft/class_4184;
 	FIELD field_4345 renderers Ljava/util/Map;
 	FIELD field_4348 world Lnet/minecraft/class_1937;
 	FIELD field_4350 crosshairTarget Lnet/minecraft/class_239;
 	METHOD <init> (Lnet/minecraft/class_327;Lnet/minecraft/class_5599;Ljava/util/function/Supplier;Ljava/util/function/Supplier;Ljava/util/function/Supplier;)V
+		ARG 1 textRenderer
 		ARG 2 entityModelLoader
 		ARG 3 blockRenderManager
+		ARG 4 itemRenderer
+		ARG 5 entityRenderDispatcher
 	METHOD method_23077 renderEntity (Lnet/minecraft/class_2586;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;II)Z
 		ARG 1 entity
 		ARG 2 matrix

mappings/net/minecraft/client/render/block/entity/BlockEntityRendererFactory.mapping

@@ -6,12 +6,20 @@ CLASS net/minecraft/class_5614 net/minecraft/client/render/block/entity/BlockEnt
 		FIELD field_27749 renderManager Lnet/minecraft/class_776;
 		FIELD field_27750 layerRenderDispatcher Lnet/minecraft/class_5599;
 		FIELD field_27751 textRenderer Lnet/minecraft/class_327;
+		FIELD field_38882 itemRenderer Lnet/minecraft/class_918;
+		FIELD field_38883 entityRenderDispatcher Lnet/minecraft/class_898;
 		METHOD <init> (Lnet/minecraft/class_824;Lnet/minecraft/class_776;Lnet/minecraft/class_918;Lnet/minecraft/class_898;Lnet/minecraft/class_5599;Lnet/minecraft/class_327;)V
 			ARG 1 renderDispatcher
 			ARG 2 renderManager
+			ARG 3 itemRenderer
+			ARG 4 entityRenderDispatcher
+			ARG 5 layerRenderDispatcher
+			ARG 6 textRenderer
 		METHOD method_32139 getRenderDispatcher ()Lnet/minecraft/class_824;
 		METHOD method_32140 getLayerModelPart (Lnet/minecraft/class_5601;)Lnet/minecraft/class_630;
 			ARG 1 modelLayer
 		METHOD method_32141 getRenderManager ()Lnet/minecraft/class_776;
 		METHOD method_32142 getLayerRenderDispatcher ()Lnet/minecraft/class_5599;
 		METHOD method_32143 getTextRenderer ()Lnet/minecraft/class_327;
+		METHOD method_43334 getEntityRenderDIspatcher ()Lnet/minecraft/class_898;
+		METHOD method_43335 getItemRenderer ()Lnet/minecraft/class_918;

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

@@ -3,6 +3,8 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDis
 	FIELD field_21794 rotation Lnet/minecraft/class_1158;
 	FIELD field_27759 itemRenderer Lnet/minecraft/class_918;
 	FIELD field_27760 modelLoader Lnet/minecraft/class_5599;
+	FIELD field_38886 blockRenderManager Lnet/minecraft/class_776;
+	FIELD field_38887 heldItemRenderer Lnet/minecraft/class_759;
 	FIELD field_4678 targetedEntity Lnet/minecraft/class_1297;
 	FIELD field_4680 renderHitboxes Z
 	FIELD field_4681 renderShadows Z
@@ -13,6 +15,14 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDis
 	FIELD field_4689 textRenderer Lnet/minecraft/class_327;
 	FIELD field_4692 gameOptions Lnet/minecraft/class_315;
 	FIELD field_4696 renderers Ljava/util/Map;
+	METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_1060;Lnet/minecraft/class_918;Lnet/minecraft/class_776;Lnet/minecraft/class_327;Lnet/minecraft/class_315;Lnet/minecraft/class_5599;)V
+		ARG 1 client
+		ARG 2 textureManager
+		ARG 3 itemRenderer
+		ARG 4 blockRenderManager
+		ARG 5 textRenderer
+		ARG 6 gameOptions
+		ARG 7 modelLoader
 	METHOD method_23161 drawFireVertex (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;FFFFF)V
 		ARG 0 entry
 		ARG 1 vertices
@@ -98,3 +108,4 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDis
 		ARG 1 x
 		ARG 3 y
 		ARG 5 z
+	METHOD method_43336 getHeldItemRenderer ()Lnet/minecraft/class_759;

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

@@ -7,9 +7,16 @@ CLASS net/minecraft/class_5617 net/minecraft/client/render/entity/EntityRenderer
 		FIELD field_27764 resourceManager Lnet/minecraft/class_3300;
 		FIELD field_27765 modelLoader Lnet/minecraft/class_5599;
 		FIELD field_27766 textRenderer Lnet/minecraft/class_327;
+		FIELD field_38888 blockRenderManager Lnet/minecraft/class_776;
+		FIELD field_38889 heldItemRenderer Lnet/minecraft/class_759;
 		METHOD <init> (Lnet/minecraft/class_898;Lnet/minecraft/class_918;Lnet/minecraft/class_776;Lnet/minecraft/class_759;Lnet/minecraft/class_3300;Lnet/minecraft/class_5599;Lnet/minecraft/class_327;)V
 			ARG 1 renderDispatcher
 			ARG 2 itemRenderer
+			ARG 3 blockRenderManager
+			ARG 4 heldItemRenderer
+			ARG 5 resourceManager
+			ARG 6 modelLoader
+			ARG 7 textRenderer
 		METHOD method_32166 getRenderDispatcher ()Lnet/minecraft/class_898;
 		METHOD method_32167 getPart (Lnet/minecraft/class_5601;)Lnet/minecraft/class_630;
 			ARG 1 layer
@@ -17,3 +24,5 @@ CLASS net/minecraft/class_5617 net/minecraft/client/render/entity/EntityRenderer
 		METHOD method_32169 getResourceManager ()Lnet/minecraft/class_3300;
 		METHOD method_32170 getModelLoader ()Lnet/minecraft/class_5599;
 		METHOD method_32171 getTextRenderer ()Lnet/minecraft/class_327;
+		METHOD method_43337 getBlockRenderManager ()Lnet/minecraft/class_776;
+		METHOD method_43338 getHeldItemRenderer ()Lnet/minecraft/class_759;

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

@@ -2,6 +2,7 @@ CLASS net/minecraft/class_915 net/minecraft/client/render/entity/ItemFrameEntity
 	FIELD field_28462 GLOW_FRAME Lnet/minecraft/class_1091;
 	FIELD field_28463 MAP_GLOW_FRAME Lnet/minecraft/class_1091;
 	FIELD field_32932 GLOW_FRAME_BLOCK_LIGHT I
+	FIELD field_38891 blockRenderManager Lnet/minecraft/class_776;
 	FIELD field_4720 itemRenderer Lnet/minecraft/class_918;
 	FIELD field_4721 NORMAL_FRAME Lnet/minecraft/class_1091;
 	FIELD field_4723 MAP_FRAME Lnet/minecraft/class_1091;

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

@@ -1,4 +1,12 @@
 CLASS net/minecraft/class_957 net/minecraft/client/render/entity/TntMinecartEntityRenderer
+	FIELD field_38893 blockRenderManager Lnet/minecraft/class_776;
 	METHOD method_23190 renderFlashingBlock (Lnet/minecraft/class_776;Lnet/minecraft/class_2680;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IZ)V
 		COMMENT Renders a given block state into the given buffers either normally or with a bright white overlay.
 		COMMENT Used for rendering primed TNT either standalone or as part of a TNT minecart.
+		ARG 0 blockRenderManager
+		ARG 1 state
+		ARG 2 matrices
+		ARG 3 vertexConsumers
+		ARG 4 light
+		ARG 5 drawFlash
+			COMMENT whether a white semi-transparent overlay is added to the block to indicate the flash

mappings/net/minecraft/client/render/entity/animation/WardenAnimations.mapping

@@ -4,3 +4,4 @@ CLASS net/minecraft/class_7278 net/minecraft/client/render/entity/animation/Ward
 	FIELD field_38304 ROARING Lnet/minecraft/class_7184;
 	FIELD field_38305 SNIFFING Lnet/minecraft/class_7184;
 	FIELD field_38306 ATTACKING Lnet/minecraft/class_7184;
+	FIELD field_38879 CHARGING_SONIC_BOOM Lnet/minecraft/class_7184;

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

@@ -3,15 +3,18 @@ CLASS net/minecraft/class_976 net/minecraft/client/render/entity/feature/HeadFea
 	FIELD field_24475 scaleY F
 	FIELD field_24476 scaleZ F
 	FIELD field_27771 headModels Ljava/util/Map;
+	FIELD field_38897 heldItemRenderer Lnet/minecraft/class_759;
 	METHOD <init> (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;FFFLnet/minecraft/class_759;)V
 		ARG 1 context
 		ARG 2 loader
 		ARG 3 scaleX
 		ARG 4 scaleY
 		ARG 5 scaleZ
+		ARG 6 heldItemRenderer
 	METHOD <init> (Lnet/minecraft/class_3883;Lnet/minecraft/class_5599;Lnet/minecraft/class_759;)V
 		ARG 1 context
 		ARG 2 loader
+		ARG 3 heldItemRenderer
 	METHOD method_32798 translate (Lnet/minecraft/class_4587;Z)V
 		ARG 0 matrices
 		ARG 1 villager

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

@@ -1,6 +1,13 @@
 CLASS net/minecraft/class_991 net/minecraft/client/render/entity/feature/MooshroomMushroomFeatureRenderer
+	FIELD field_38902 blockRenderManager Lnet/minecraft/class_776;
+	METHOD <init> (Lnet/minecraft/class_3883;Lnet/minecraft/class_776;)V
+		ARG 1 context
+		ARG 2 blockRenderManager
 	METHOD method_37314 renderMushroom (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IZLnet/minecraft/class_2680;ILnet/minecraft/class_1087;)V
 		ARG 1 matrices
 		ARG 2 vertexConsumers
 		ARG 3 light
 		ARG 4 renderAsModel
+		ARG 5 mushroomState
+		ARG 6 overlay
+		ARG 7 mushroomModel

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

@@ -26,13 +26,17 @@ CLASS net/minecraft/class_759 net/minecraft/client/render/item/HeldItemRenderer
 	FIELD field_32758 ARM_HOLDING_ITEM_SECOND_Y_ANGLE_MULTIPLIER F
 	FIELD field_4043 equipProgressMainHand F
 	FIELD field_4044 itemRenderer Lnet/minecraft/class_918;
-	FIELD field_4046 renderManager Lnet/minecraft/class_898;
+	FIELD field_4046 entityRenderDispatcher Lnet/minecraft/class_898;
 	FIELD field_4047 mainHand Lnet/minecraft/class_1799;
 	FIELD field_4048 offHand Lnet/minecraft/class_1799;
 	FIELD field_4050 client Lnet/minecraft/class_310;
 	FIELD field_4051 prevEquipProgressOffHand F
 	FIELD field_4052 equipProgressOffHand F
 	FIELD field_4053 prevEquipProgressMainHand F
+	METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_898;Lnet/minecraft/class_918;)V
+		ARG 1 client
+		ARG 2 entityRenderDispatcher
+		ARG 3 itemRenderer
 	METHOD method_22976 renderItem (FLnet/minecraft/class_4587;Lnet/minecraft/class_4597$class_4598;Lnet/minecraft/class_746;I)V
 		ARG 1 tickDelta
 		ARG 2 matrices

mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping

@@ -41,6 +41,7 @@ CLASS net/minecraft/class_1066 net/minecraft/client/resource/ClientBuiltinResour
 		ARG 1 packZip
 		ARG 2 packSource
 	METHOD method_4640 download (Ljava/net/URL;Ljava/lang/String;Z)Ljava/util/concurrent/CompletableFuture;
+		ARG 1 url
 		ARG 2 packSha1
 		ARG 3 closeAfterDownload
 	METHOD method_4641 verifyFile (Ljava/lang/String;Ljava/io/File;)Z

mappings/net/minecraft/client/tutorial/FindTreeTutorialStepHandler.mapping

@@ -7,5 +7,9 @@ CLASS net/minecraft/class_1152 net/minecraft/client/tutorial/FindTreeTutorialSte
 	FIELD field_5633 toast Lnet/minecraft/class_372;
 	METHOD <init> (Lnet/minecraft/class_1156;)V
 		ARG 1 manager
+	METHOD method_43340 (Lnet/minecraft/class_1799;)Z
+		ARG 0 stack
+	METHOD method_43341 hasItem (Lnet/minecraft/class_746;)Z
+		ARG 0 player
 	METHOD method_4896 hasBrokenTreeBlocks (Lnet/minecraft/class_746;)Z
 		ARG 0 player

mappings/net/minecraft/client/util/NetworkUtils.mapping

@@ -8,6 +8,7 @@ CLASS net/minecraft/class_3521 net/minecraft/client/util/NetworkUtils
 	FIELD field_15665 LOGGER Lorg/slf4j/Logger;
 	METHOD method_15301 downloadResourcePack (Ljava/io/File;Ljava/net/URL;Ljava/util/Map;ILnet/minecraft/class_3536;Ljava/net/Proxy;)Ljava/util/concurrent/CompletableFuture;
 		ARG 0 file
+		ARG 1 url
 		ARG 2 headers
 		ARG 3 maxFileSize
 		ARG 4 progressListener

mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping

@@ -392,14 +392,24 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato
 		ARG 1 modelId
 		ARG 2 textures
 		ARG 3 modelCollector
+	METHOD method_34610 (Lnet/minecraft/class_2776;)Lnet/minecraft/class_4935;
+		ARG 1 mode
 	METHOD method_34612 (Lnet/minecraft/class_5794;)V
 		ARG 1 family
+	METHOD method_34618 (Ljava/lang/Integer;)Lnet/minecraft/class_4935;
+		ARG 1 stage
+	METHOD method_34619 (Ljava/lang/Integer;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lnet/minecraft/class_4935;
+		ARG 0 tick
+		ARG 1 locked
+		ARG 2 on
 	METHOD method_34622 (Ljava/util/HashMap;)V
 		ARG 0 map
 	METHOD method_34623 (Lnet/minecraft/class_4944;)V
 		ARG 0 textures
 	METHOD method_34624 (Lnet/minecraft/class_4944;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944;
 		ARG 1 id
+	METHOD method_34625 (Lnet/minecraft/class_2960;Ljava/lang/Integer;)Lnet/minecraft/class_4935;
+		ARG 1 height
 	METHOD method_34626 (Lnet/minecraft/class_2960;Lnet/minecraft/class_4944;)V
 		ARG 1 textures
 	METHOD method_34628 (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Ljava/lang/Boolean;Lnet/minecraft/class_2768;)Lnet/minecraft/class_4935;
@@ -427,6 +437,8 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato
 		ARG 0 id
 	METHOD method_34654 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4935;
 		ARG 0 id
+	METHOD method_34657 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4935;
+		ARG 0 modelId
 	METHOD method_34852 registerLightningRod ()V
 	METHOD method_35868 registerSingleton (Lnet/minecraft/class_2248;Lnet/minecraft/class_4944;Lnet/minecraft/class_4942;)V
 		ARG 1 block
@@ -489,6 +501,7 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato
 		METHOD method_32230 same ([Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912;
 			ARG 1 blocks
 		METHOD method_33521 (Lnet/minecraft/class_5794$class_5796;Lnet/minecraft/class_2248;)V
+			ARG 1 variant
 			ARG 2 block
 		METHOD method_33522 family (Lnet/minecraft/class_5794;)Lnet/minecraft/class_4910$class_4912;
 			ARG 1 family

mappings/net/minecraft/data/client/TextureMap.mapping

@@ -135,3 +135,5 @@ CLASS net/minecraft/class_4944 net/minecraft/data/client/TextureMap
 		ARG 1 bottom
 	METHOD method_35911 wool (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944;
 		ARG 0 id
+	METHOD method_42753 sculkShrieker (Z)Lnet/minecraft/class_4944;
+		ARG 0 canSummon

mappings/net/minecraft/data/server/HusbandryTabAdvancementGenerator.mapping

@@ -17,3 +17,7 @@ CLASS net/minecraft/class_2414 net/minecraft/data/server/HusbandryTabAdvancement
 		ARG 1 builder
 	METHOD method_16118 requireAllCatsTamed (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162;
 		ARG 1 builder
+	METHOD method_43362 requireAllFrogsOnLeads (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162;
+		ARG 1 builder
+	METHOD method_43363 (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_6880$class_6883;)V
+		ARG 1 variant

mappings/net/minecraft/datafixer/DataFixerPhase.mapping

@@ -0,0 +1 @@
+CLASS net/minecraft/class_7395 net/minecraft/datafixer/DataFixerPhase

mappings/net/minecraft/entity/Entity.mapping

@@ -268,6 +268,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 	METHOD method_24516 isInRange (Lnet/minecraft/class_1297;D)Z
 		COMMENT Checks if the distance between this entity and the {@code other} entity is less
 		COMMENT than {@code radius}.
+		ARG 1 entity
 		ARG 2 radius
 	METHOD method_24826 getPassengerDismountOffset (DDF)Lnet/minecraft/class_243;
 		ARG 0 vehicleWidth
@@ -464,6 +465,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 	METHOD method_43258 getPosWithYOffset (F)Lnet/minecraft/class_2338;
 		ARG 1 offset
 	METHOD method_43259 isInRange (Lnet/minecraft/class_1297;DD)Z
+		ARG 1 entity
 		ARG 2 horizontalRadius
 		ARG 4 verticalRadius
 	METHOD method_43260 getLandingPos ()Lnet/minecraft/class_2338;

mappings/net/minecraft/entity/EntityStatuses.mapping

@@ -59,3 +59,4 @@ CLASS net/minecraft/class_6024 net/minecraft/entity/EntityStatuses
 	FIELD field_33455 FINISH_RAM B
 	FIELD field_33691 ADD_DEATH_PARTICLES B
 	FIELD field_38094 EARS_TWITCH B
+	FIELD field_38847 SONIC_BOOM B

mappings/net/minecraft/entity/ai/brain/task/SonicBoomTask.mapping

@@ -0,0 +1,13 @@
+CLASS net/minecraft/class_7396 net/minecraft/entity/ai/brain/task/SonicBoomTask
+	FIELD field_38849 COOLDOWN I
+	FIELD field_38850 HORIZONTAL_RANGE I
+	FIELD field_38851 VERTICAL_RANGE I
+	FIELD field_38854 SOUND_DELAY I
+	FIELD field_38855 RUN_TIME I
+	METHOD method_43264 cooldown (Lnet/minecraft/class_1309;I)V
+		ARG 0 warden
+		ARG 1 cooldown
+	METHOD method_43265 (Lnet/minecraft/class_7260;Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)V
+		ARG 2 target
+	METHOD method_43266 (Lnet/minecraft/class_7260;Lnet/minecraft/class_1309;)Z
+		ARG 1 target

mappings/net/minecraft/entity/ai/brain/task/UpdateAttackTargetTask.mapping

@@ -13,3 +13,7 @@ CLASS net/minecraft/class_4824 net/minecraft/entity/ai/brain/task/UpdateAttackTa
 	METHOD method_24611 (Lnet/minecraft/class_1308;)Z
 		ARG 0 entity
 	METHOD method_24612 updateAttackTarget (Lnet/minecraft/class_1308;Lnet/minecraft/class_1309;)V
+		ARG 0 entity
+		ARG 1 target
+	METHOD method_24615 (Lnet/minecraft/class_1308;Lnet/minecraft/class_1309;)V
+		ARG 1 target

mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping

@@ -19,6 +19,10 @@ CLASS net/minecraft/class_1533 net/minecraft/entity/decoration/ItemFrameEntity
 	METHOD method_34242 getPlaceSound ()Lnet/minecraft/class_3414;
 	METHOD method_34243 getAddItemSound ()Lnet/minecraft/class_3414;
 	METHOD method_34244 getRotateItemSound ()Lnet/minecraft/class_3414;
+	METHOD method_43271 setAsStackHolder (Lnet/minecraft/class_1799;)V
+		ARG 1 stack
+	METHOD method_43272 getMapId ()Ljava/util/OptionalInt;
+	METHOD method_43273 containsMap ()Z
 	METHOD method_6933 setHeldItemStack (Lnet/minecraft/class_1799;Z)V
 		ARG 1 value
 		ARG 2 update

mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping

@@ -14,6 +14,8 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance
 	FIELD field_5895 duration I
 	FIELD field_5896 type Lnet/minecraft/class_1291;
 	FIELD field_5897 LOGGER Lorg/slf4j/Logger;
+	METHOD <init> (Lnet/minecraft/class_1291;)V
+		ARG 1 type
 	METHOD <init> (Lnet/minecraft/class_1291;I)V
 		ARG 1 type
 		ARG 2 duration
@@ -43,6 +45,8 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance
 		ARG 6 showIcon
 		ARG 7 hiddenEffect
 		ARG 8 factorCalculationData
+	METHOD <init> (Lnet/minecraft/class_1293;)V
+		ARG 1 instance
 	METHOD compareTo (Ljava/lang/Object;)I
 		ARG 1 that
 	METHOD equals (Ljava/lang/Object;)Z

mappings/net/minecraft/entity/mob/MobEntity.mapping

@@ -108,6 +108,10 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
 	METHOD method_26320 prefersNewDamageableItem (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z
 		ARG 1 newStack
 		ARG 2 oldStack
+	METHOD method_26321 (Ljava/lang/String;)Z
+		ARG 0 key
+	METHOD method_26322 (Ljava/lang/String;)Z
+		ARG 0 key
 	METHOD method_26323 movesIndependently ()Z
 		COMMENT When true, causes this entity to take over pathfinding for its controlling passenger.
 	METHOD method_26828 createMobAttributes ()Lnet/minecraft/class_5132$class_5133;
@@ -128,7 +132,12 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
 		ARG 1 player
 		ARG 2 hand
 	METHOD method_30758 enchantEquipment (Lnet/minecraft/class_5819;FLnet/minecraft/class_1304;)V
+		ARG 1 random
+		ARG 2 power
+		ARG 3 slot
 	METHOD method_30759 enchantMainHandItem (Lnet/minecraft/class_5819;F)V
+		ARG 1 random
+		ARG 2 power
 	METHOD method_33191 squaredAttackRange (Lnet/minecraft/class_1309;)D
 		ARG 1 target
 	METHOD method_35055 clearPositionTarget ()V
@@ -207,6 +216,8 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
 	METHOD method_5962 getMoveControl ()Lnet/minecraft/class_1335;
 	METHOD method_5963 createBodyControl ()Lnet/minecraft/class_1330;
 	METHOD method_5964 initEquipment (Lnet/minecraft/class_5819;Lnet/minecraft/class_1266;)V
+		ARG 1 random
+		ARG 2 localDifficulty
 	METHOD method_5965 createNavigation (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1408;
 		ARG 1 world
 	METHOD method_5966 playAmbientSound ()V
@@ -238,6 +249,8 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
 		ARG 1 target
 	METHOD method_5983 onEatingGrass ()V
 	METHOD method_5984 updateEnchantments (Lnet/minecraft/class_5819;Lnet/minecraft/class_1266;)V
+		ARG 1 random
+		ARG 2 localDifficulty
 	METHOD method_5985 getVisibilityCache ()Lnet/minecraft/class_1413;
 	METHOD method_5986 getMaxHeadRotation ()I
 		COMMENT {@return the maximum degrees which the head yaw can differ from the body yaw}

mappings/net/minecraft/entity/mob/PiglinBrain.mapping

@@ -12,6 +12,8 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain
 	METHOD method_24718 makeRandomWanderTask ()Lnet/minecraft/class_4118;
 	METHOD method_24719 wearsGoldArmor (Lnet/minecraft/class_1309;)Z
 		ARG 0 entity
+	METHOD method_24720 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z
+		ARG 1 preferredTarget
 	METHOD method_24721 (Lnet/minecraft/class_1309;Lnet/minecraft/class_5418;)V
 		ARG 1 piglin
 	METHOD method_24722 tickActivities (Lnet/minecraft/class_4836;)V
@@ -53,10 +55,14 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain
 	METHOD method_24735 isGoldenItem (Lnet/minecraft/class_1799;)Z
 		ARG 0 stack
 	METHOD method_24736 setHuntedRecently (Lnet/minecraft/class_4836;Lnet/minecraft/class_5819;)V
+		ARG 0 piglin
+		ARG 1 random
 	METHOD method_24737 makeRememberRideableHoglinTask ()Lnet/minecraft/class_4821;
 	METHOD method_24738 makeGoToSoulFireTask ()Lnet/minecraft/class_4121;
 	METHOD method_24739 isGoldHoldingPlayer (Lnet/minecraft/class_1309;)Z
 		ARG 0 target
+	METHOD method_24740 (Lnet/minecraft/class_1309;Lnet/minecraft/class_5418;)V
+		ARG 1 nearbyPiglin
 	METHOD method_24741 consumeOffHandItem (Lnet/minecraft/class_4836;Z)V
 		ARG 0 piglin
 		ARG 1 barter
@@ -65,6 +71,8 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain
 		ARG 1 target
 	METHOD method_24743 addIdleActivities (Lnet/minecraft/class_4095;)V
 		ARG 0 piglin
+	METHOD method_24745 (ZLnet/minecraft/class_1657;Lnet/minecraft/class_4836;)Z
+		ARG 2 piglin
 	METHOD method_24746 acceptsForBarter (Lnet/minecraft/class_1799;)Z
 		ARG 0 stack
 	METHOD method_24747 makeGoToZombifiedPiglinTask ()Lnet/minecraft/class_4809;
@@ -177,12 +185,18 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain
 		ARG 0 piglin
 	METHOD method_29534 isZombified (Lnet/minecraft/class_1299;)Z
 		ARG 0 entityType
+	METHOD method_29535 (Lnet/minecraft/class_1309;Lnet/minecraft/class_4095;Lnet/minecraft/class_1309;)V
+		ARG 2 avoiding
 	METHOD method_29536 getAvoiding (Lnet/minecraft/class_4836;)Ljava/util/Optional;
 		ARG 0 piglin
 	METHOD method_29537 getNearestZombifiedPiglin (Lnet/minecraft/class_4836;)Z
 		ARG 0 piglin
 	METHOD method_29538 hasTargetToAvoid (Lnet/minecraft/class_4836;)Z
 		ARG 0 piglin
+	METHOD method_29943 (Lnet/minecraft/class_5418;)V
+		ARG 0 nearbyPiglin
+	METHOD method_29944 (Lnet/minecraft/class_5418;Lnet/minecraft/class_1657;)V
+		ARG 1 player
 	METHOD method_29945 angerNearbyPiglins (Lnet/minecraft/class_5418;)V
 		ARG 0 piglin
 	METHOD method_29946 becomeAngryWithPlayer (Lnet/minecraft/class_5418;Lnet/minecraft/class_1309;)V
@@ -201,5 +215,7 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain
 	METHOD method_30090 goToNemesisTask ()Lnet/minecraft/class_4809;
 	METHOD method_30091 getCurrentActivitySound (Lnet/minecraft/class_4836;)Ljava/util/Optional;
 		ARG 0 piglin
+	METHOD method_30241 (Lnet/minecraft/class_5418;)Z
+		ARG 0 nearbyVisiblePiglin
 	METHOD method_35197 hasNearestPlayerHoldingWantedItem (Lnet/minecraft/class_4836;)Z
 		ARG 0 piglin

mappings/net/minecraft/entity/mob/PiglinEntity.mapping

@@ -17,6 +17,7 @@ CLASS net/minecraft/class_4836 net/minecraft/entity/mob/PiglinEntity
 	METHOD method_24696 equipAtChance (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;Lnet/minecraft/class_5819;)V
 		ARG 1 slot
 		ARG 2 stack
+		ARG 3 random
 	METHOD method_24702 makeInitialWeapon ()Lnet/minecraft/class_1799;
 	METHOD method_24703 isCharging ()Z
 	METHOD method_24711 addItem (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799;

mappings/net/minecraft/entity/mob/WardenEntity.mapping

@@ -7,6 +7,7 @@ CLASS net/minecraft/class_7260 net/minecraft/entity/mob/WardenEntity
 	FIELD field_38166 gameEventHandler Lnet/minecraft/class_5715;
 	FIELD field_38168 roaringAnimationState Lnet/minecraft/class_7094;
 	FIELD field_38169 sniffingAnimationState Lnet/minecraft/class_7094;
+	FIELD field_38859 chargingSonicBoomAnimationState Lnet/minecraft/class_7094;
 	METHOD method_42202 getHeartPitch (F)F
 		ARG 1 tickDelta
 	METHOD method_42204 addDarknessToClosePlayers (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_1297;I)V
@@ -45,3 +46,5 @@ CLASS net/minecraft/class_7260 net/minecraft/entity/mob/WardenEntity
 	METHOD method_42223 getTendrilPitch (F)F
 		ARG 1 tickDelta
 	METHOD method_43113 isDiggingOrEmerging ()Z
+	METHOD method_43274 updateAttackTarget (Lnet/minecraft/class_1309;)V
+		ARG 1 entity

mappings/net/minecraft/entity/passive/AllayEntity.mapping

@@ -1,5 +1,6 @@
 CLASS net/minecraft/class_7298 net/minecraft/entity/passive/AllayEntity
 	FIELD field_38398 SENSORS Lcom/google/common/collect/ImmutableList;
+	FIELD field_38399 ITEM_PICKUP_RANGE_EXPANDER Lnet/minecraft/class_2382;
 	FIELD field_38400 positionSource Lnet/minecraft/class_5709;
 	FIELD field_38401 gameEventHandler Lnet/minecraft/class_5715;
 	FIELD field_38402 inventory Lnet/minecraft/class_1277;

mappings/net/minecraft/entity/passive/FrogBrain.mapping

@@ -6,6 +6,8 @@ CLASS net/minecraft/class_7107 net/minecraft/entity/passive/FrogBrain
 	METHOD method_41368 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095;
 		ARG 0 brain
 	METHOD method_41369 coolDownLongJump (Lnet/minecraft/class_7102;Lnet/minecraft/class_5819;)V
+		ARG 0 frog
+		ARG 1 random
 	METHOD method_41370 (Lnet/minecraft/class_2680;)Z
 		ARG 0 state
 	METHOD method_41371 (Lnet/minecraft/class_1309;)Ljava/lang/Float;

mappings/net/minecraft/entity/passive/GoatBrain.mapping

@@ -25,6 +25,8 @@ CLASS net/minecraft/class_6054 net/minecraft/entity/passive/GoatBrain
 	METHOD method_35183 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095;
 		ARG 0 brain
 	METHOD method_35184 resetLongJumpCooldown (Lnet/minecraft/class_6053;Lnet/minecraft/class_5819;)V
+		ARG 0 goat
+		ARG 1 random
 	METHOD method_35185 addCoreActivities (Lnet/minecraft/class_4095;)V
 		ARG 0 brain
 	METHOD method_35186 updateActivities (Lnet/minecraft/class_6053;)V

mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping

@@ -45,6 +45,7 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/HorseBaseEntity
 	METHOD method_33338 areInventoriesDifferent (Lnet/minecraft/class_1263;)Z
 		ARG 1 inventory
 	METHOD method_6001 initAttributes (Lnet/minecraft/class_5819;)V
+		ARG 1 random
 	METHOD method_6721 onChestedStatusChanged ()V
 	METHOD method_6722 (Lnet/minecraft/class_1657;)V
 		ARG 1 player
@@ -54,6 +55,7 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/HorseBaseEntity
 		ARG 1 player
 	METHOD method_6727 isTame ()Z
 	METHOD method_6728 getChildMovementSpeedBonus (Lnet/minecraft/class_5819;)D
+		ARG 1 random
 	METHOD method_6729 getTemper ()I
 	METHOD method_6730 getHorseFlag (I)Z
 		ARG 1 bitmask
@@ -106,6 +108,7 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/HorseBaseEntity
 		COMMENT
 		COMMENT @see #hasArmorSlot()
 	METHOD method_6754 getChildHealthBonus (Lnet/minecraft/class_5819;)F
+		ARG 1 random
 	METHOD method_6755 getMaxTemper ()I
 	METHOD method_6757 playAngrySound ()V
 	METHOD method_6758 setInAir (Z)V
@@ -135,3 +138,4 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/HorseBaseEntity
 		COMMENT @see #hasArmorSlot()
 		ARG 1 item
 	METHOD method_6774 getChildJumpStrengthBonus (Lnet/minecraft/class_5819;)D
+		ARG 1 random

mappings/net/minecraft/entity/passive/LlamaEntity.mapping

@@ -18,6 +18,7 @@ CLASS net/minecraft/class_1501 net/minecraft/entity/passive/LlamaEntity
 	METHOD method_6794 getColorFromCarpet (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1767;
 		ARG 0 color
 	METHOD method_6796 initializeStrength (Lnet/minecraft/class_5819;)V
+		ARG 1 random
 	METHOD method_6797 stopFollowing ()V
 	METHOD method_6798 setVariant (I)V
 		ARG 1 variant

mappings/net/minecraft/inventory/Inventory.mapping

@@ -6,6 +6,10 @@ CLASS net/minecraft/class_1263 net/minecraft/inventory/Inventory
 	METHOD method_18862 containsAny (Ljava/util/Set;)Z
 		COMMENT Determines whether this inventory contains any of the given candidate items.
 		ARG 1 items
+	METHOD method_43255 (Ljava/util/Set;Lnet/minecraft/class_1799;)Z
+		ARG 1 stack
+	METHOD method_43256 containsAny (Ljava/util/function/Predicate;)Z
+		ARG 1 predicate
 	METHOD method_5431 markDirty ()V
 	METHOD method_5432 onClose (Lnet/minecraft/class_1657;)V
 		ARG 1 player

mappings/net/minecraft/loot/LootTable.mapping

@@ -33,6 +33,7 @@ CLASS net/minecraft/class_52 net/minecraft/loot/LootTable
 	METHOD method_332 processStacks (Ljava/util/function/Consumer;)Ljava/util/function/Consumer;
 		ARG 0 lootConsumer
 	METHOD method_333 shuffle (Lit/unimi/dsi/fastutil/objects/ObjectArrayList;ILnet/minecraft/class_5819;)V
+		ARG 1 drops
 		ARG 2 freeSlots
 		ARG 3 random
 	CLASS class_53 Builder

mappings/net/minecraft/screen/BeaconScreenHandler.mapping

@@ -12,6 +12,8 @@ CLASS net/minecraft/class_1704 net/minecraft/screen/BeaconScreenHandler
 		ARG 3 propertyDelegate
 		ARG 4 context
 	METHOD method_17372 setEffects (Ljava/util/Optional;Ljava/util/Optional;)V
+		ARG 1 primary
+		ARG 2 secondary
 	METHOD method_17373 getProperties ()I
 	METHOD method_17374 getPrimaryEffect ()Lnet/minecraft/class_1291;
 	METHOD method_17375 getSecondaryEffect ()Lnet/minecraft/class_1291;

mappings/net/minecraft/util/Util.mapping

@@ -171,8 +171,19 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util
 		ARG 0 supplier
 		ARG 1 messageSupplier
 	METHOD method_43027 copyShuffled (Lit/unimi/dsi/fastutil/objects/ObjectArrayList;Lnet/minecraft/class_5819;)Ljava/util/List;
+		ARG 0 list
 		ARG 1 random
 	METHOD method_43028 shuffle (Lit/unimi/dsi/fastutil/objects/ObjectArrayList;Lnet/minecraft/class_5819;)V
+		ARG 0 list
+		ARG 1 random
+	METHOD method_43251 shuffle (Ljava/util/stream/IntStream;Lnet/minecraft/class_5819;)Lit/unimi/dsi/fastutil/ints/IntArrayList;
+		ARG 0 stream
+		ARG 1 random
+	METHOD method_43252 copyShuffled (Ljava/util/stream/Stream;Lnet/minecraft/class_5819;)Ljava/util/List;
+		ARG 0 stream
+		ARG 1 random
+	METHOD method_43253 copyShuffled ([Ljava/lang/Object;Lnet/minecraft/class_5819;)Ljava/util/List;
+		ARG 0 array
 		ARG 1 random
 	METHOD method_645 previous (Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/lang/Object;
 		ARG 0 iterable

mappings/net/minecraft/util/dynamic/DynamicSerializableUuid.mapping

@@ -1,5 +1,6 @@
 CLASS net/minecraft/class_4844 net/minecraft/util/dynamic/DynamicSerializableUuid
 	FIELD field_25122 CODEC Lcom/mojang/serialization/Codec;
+	FIELD field_38907 OFFLINE_PLAYER_UUID_PREFIX Ljava/lang/String;
 	METHOD method_26274 toIntArray (JJ)[I
 		ARG 0 uuidMost
 		ARG 2 uuidLeast
@@ -13,3 +14,7 @@ CLASS net/minecraft/class_4844 net/minecraft/util/dynamic/DynamicSerializableUui
 		ARG 0 uuid
 	METHOD method_35848 toUuid (Lcom/mojang/serialization/Dynamic;)Ljava/util/UUID;
 		ARG 0 dynamic
+	METHOD method_43343 getUuidFromProfile (Lcom/mojang/authlib/GameProfile;)Ljava/util/UUID;
+		ARG 0 profile
+	METHOD method_43344 getOfflinePlayerUuid (Ljava/lang/String;)Ljava/util/UUID;
+		ARG 0 nickname

mappings/net/minecraft/world/WorldAccess.mapping

@@ -5,7 +5,13 @@ CLASS net/minecraft/class_1936 net/minecraft/world/WorldAccess
 		ARG 3 data
 	METHOD method_32888 emitGameEvent (Lnet/minecraft/class_5712;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;)V
 		COMMENT Emits an game event.
+		ARG 1 event
+		ARG 2 pos
+		ARG 3 emitter
 	METHOD method_33596 emitGameEvent (Lnet/minecraft/class_1297;Lnet/minecraft/class_5712;Lnet/minecraft/class_2338;)V
+		ARG 1 entity
+		ARG 2 event
+		ARG 3 pos
 	METHOD method_39224 getTickOrder ()J
 	METHOD method_39279 createAndScheduleBlockTick (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;I)V
 		ARG 1 pos
@@ -41,6 +47,14 @@ CLASS net/minecraft/class_1936 net/minecraft/world/WorldAccess
 		ARG 4 neighborPos
 		ARG 5 flags
 		ARG 6 maxUpdateDepth
+	METHOD method_43275 emitGameEvent (Lnet/minecraft/class_1297;Lnet/minecraft/class_5712;Lnet/minecraft/class_243;)V
+		ARG 1 entity
+		ARG 2 event
+		ARG 3 pos
+	METHOD method_43276 emitGameEvent (Lnet/minecraft/class_5712;Lnet/minecraft/class_2338;Lnet/minecraft/class_5712$class_7397;)V
+		ARG 1 event
+		ARG 2 pos
+		ARG 3 emitter
 	METHOD method_8396 playSound (Lnet/minecraft/class_1657;Lnet/minecraft/class_2338;Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FF)V
 		ARG 1 player
 		ARG 2 pos

mappings/net/minecraft/world/event/GameEvent.mapping

@@ -16,3 +16,11 @@ CLASS net/minecraft/class_5712 net/minecraft/world/event/GameEvent
 	METHOD method_40156 isIn (Lnet/minecraft/class_6862;)Z
 		ARG 1 tag
 	METHOD method_40157 getRegistryEntry ()Lnet/minecraft/class_6880$class_6883;
+	CLASS class_7397 Emitter
+		METHOD method_43285 of (Lnet/minecraft/class_1297;)Lnet/minecraft/class_5712$class_7397;
+			ARG 0 sourceEntity
+		METHOD method_43286 of (Lnet/minecraft/class_1297;Lnet/minecraft/class_2680;)Lnet/minecraft/class_5712$class_7397;
+			ARG 0 sourceEntity
+			ARG 1 affectedState
+		METHOD method_43287 of (Lnet/minecraft/class_2680;)Lnet/minecraft/class_5712$class_7397;
+			ARG 0 affectedState

mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping

@@ -8,6 +8,8 @@ CLASS net/minecraft/class_5713 net/minecraft/world/event/listener/GameEventDispa
 		COMMENT Dispatches an event to all the listeners in this dispatcher.
 		ARG 1 event
 			COMMENT the event
+		ARG 2 pos
+		ARG 3 emitter
 	METHOD method_32944 addListener (Lnet/minecraft/class_5714;)V
 		COMMENT Adds a listener to this dispatcher.
 		ARG 1 listener

mappings/net/minecraft/world/event/listener/GameEventListener.mapping

@@ -8,6 +8,7 @@ CLASS net/minecraft/class_5714 net/minecraft/world/event/listener/GameEventListe
 		COMMENT @return {@code true} if the game event has been accepted by this listener
 		ARG 1 world
 		ARG 2 event
+		ARG 3 emitter
 		ARG 4 pos
 	METHOD method_32948 getRange ()I
 		COMMENT Returns the range, in blocks, of the listener.

mappings/net/minecraft/world/event/listener/SculkSensorListener.mapping

@@ -23,6 +23,7 @@ CLASS net/minecraft/class_5718 net/minecraft/world/event/listener/SculkSensorLis
 	METHOD method_42339 listen (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V
 		ARG 1 world
 		ARG 2 gameEvent
+		ARG 3 emitter
 		ARG 4 start
 		ARG 5 end
 	METHOD method_42340 createCodec (Lnet/minecraft/class_5718$class_5719;)Lcom/mojang/serialization/Codec;
@@ -61,9 +62,11 @@ CLASS net/minecraft/class_5718 net/minecraft/world/event/listener/SculkSensorLis
 			ARG 2 listener
 			ARG 3 pos
 			ARG 4 event
+			ARG 5 emitter
 		METHOD method_42210 getTag ()Lnet/minecraft/class_6862;
 		METHOD method_42324 canAccept (Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;)Z
 			ARG 1 gameEvent
+			ARG 2 emitter
 		METHOD method_42672 onListen ()V
 	CLASS class_7269 Vibration
 		FIELD field_38245 CODEC Lcom/mojang/serialization/Codec;

mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping

@@ -13,5 +13,6 @@ CLASS net/minecraft/class_5711 net/minecraft/world/event/listener/SimpleGameEven
 	METHOD method_32936 dispatchTo (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_243;Lnet/minecraft/class_5714;)Z
 		ARG 0 world
 		ARG 1 event
+		ARG 2 emitter
 		ARG 3 pos
 		ARG 4 listener

mappings/net/minecraft/world/gen/blockpredicate/BlockPredicate.mapping

@@ -49,3 +49,13 @@ CLASS net/minecraft/class_6646 net/minecraft/world/gen/blockpredicate/BlockPredi
 		ARG 0 blocks
 	METHOD method_39930 hasSturdyFace (Lnet/minecraft/class_2350;)Lnet/minecraft/class_6646;
 		ARG 0 face
+	METHOD method_43288 matchingBlocks (Lnet/minecraft/class_2382;[Lnet/minecraft/class_2248;)Lnet/minecraft/class_6646;
+		ARG 0 offset
+		ARG 1 blocks
+	METHOD method_43289 matchingFluids (Lnet/minecraft/class_2382;[Lnet/minecraft/class_3611;)Lnet/minecraft/class_6646;
+		ARG 0 offset
+		ARG 1 fluids
+	METHOD method_43290 matchingBlocks ([Lnet/minecraft/class_2248;)Lnet/minecraft/class_6646;
+		ARG 0 blocks
+	METHOD method_43291 matchingFluids ([Lnet/minecraft/class_3611;)Lnet/minecraft/class_6646;
+		ARG 0 fluids

mappings/net/minecraft/world/gen/carver/Carver.mapping

@@ -24,6 +24,8 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver
 		ARG 1 config
 		ARG 2 random
 	METHOD method_12709 canAlwaysCarveBlock (Lnet/minecraft/class_5871;Lnet/minecraft/class_2680;)Z
+		ARG 1 config
+		ARG 2 state
 	METHOD method_12710 getBranchFactor ()I
 	METHOD method_16581 carveAtPoint (Lnet/minecraft/class_5873;Lnet/minecraft/class_5871;Lnet/minecraft/class_2791;Ljava/util/function/Function;Lnet/minecraft/class_6643;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_6350;Lorg/apache/commons/lang3/mutable/MutableBoolean;)Z
 		ARG 1 context

mappings/net/minecraft/world/gen/carver/CarverConfig.mapping

@@ -4,12 +4,14 @@ CLASS net/minecraft/class_5871 net/minecraft/world/gen/carver/CarverConfig
 	FIELD field_31488 y Lnet/minecraft/class_6122;
 	FIELD field_31489 yScale Lnet/minecraft/class_5863;
 	FIELD field_31490 lavaLevel Lnet/minecraft/class_5843;
+	FIELD field_38864 replaceable Lnet/minecraft/class_6885;
 	METHOD <init> (FLnet/minecraft/class_6122;Lnet/minecraft/class_5863;Lnet/minecraft/class_5843;Lnet/minecraft/class_5872;Lnet/minecraft/class_6885;)V
 		ARG 1 probability
 		ARG 2 y
 		ARG 3 yScale
 		ARG 4 lavaLevel
 		ARG 5 debugConfig
+		ARG 6 replaceable
 	METHOD method_33968 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
 	METHOD method_35348 (Lnet/minecraft/class_5871;)Lnet/minecraft/class_5843;
@@ -22,3 +24,5 @@ CLASS net/minecraft/class_5871 net/minecraft/world/gen/carver/CarverConfig
 		ARG 0 config
 	METHOD method_36411 (Lnet/minecraft/class_5871;)Lnet/minecraft/class_5872;
 		ARG 0 config
+	METHOD method_43292 (Lnet/minecraft/class_5871;)Lnet/minecraft/class_6885;
+		ARG 0 config

mappings/net/minecraft/world/gen/carver/CaveCarverConfig.mapping

@@ -9,11 +9,19 @@ CLASS net/minecraft/class_6108 net/minecraft/world/gen/carver/CaveCarverConfig
 		ARG 3 yScale
 		ARG 4 lavaLevel
 		ARG 5 debugConfig
+		ARG 6 replaceable
+		ARG 7 horizontalRadiusMultiplier
+		ARG 8 verticalRadiusMultiplier
+		ARG 9 floorLevel
 	METHOD <init> (FLnet/minecraft/class_6122;Lnet/minecraft/class_5863;Lnet/minecraft/class_5843;Lnet/minecraft/class_6885;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;)V
 		ARG 1 probability
 		ARG 2 y
 		ARG 3 yScale
 		ARG 4 lavaLevel
+		ARG 5 replaceable
+		ARG 6 horizontalRadiusMultiplier
+		ARG 7 verticalRadiusMultiplier
+		ARG 8 floorLevel
 	METHOD <init> (Lnet/minecraft/class_5871;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;)V
 		ARG 1 config
 		ARG 2 horizontalRadiusMultiplier

mappings/net/minecraft/world/gen/carver/RavineCarverConfig.mapping

@@ -8,6 +8,9 @@ CLASS net/minecraft/class_5869 net/minecraft/world/gen/carver/RavineCarverConfig
 		ARG 3 yScale
 		ARG 4 lavaLevel
 		ARG 5 debugConfig
+		ARG 6 replaceable
+		ARG 7 verticalRotation
+		ARG 8 shape
 	METHOD <init> (Lnet/minecraft/class_5871;Lnet/minecraft/class_5863;Lnet/minecraft/class_5869$class_6107;)V
 		ARG 1 config
 		ARG 2 verticalRotation

mappings/net/minecraft/world/gen/feature/DiskFeature.mapping

@@ -1,2 +1,8 @@
 CLASS net/minecraft/class_3011 net/minecraft/world/gen/feature/DiskFeature
 	METHOD method_43160 placeBlock (Lnet/minecraft/class_6577;Lnet/minecraft/class_5281;Lnet/minecraft/class_5819;IILnet/minecraft/class_2338$class_2339;)Z
+		ARG 1 config
+		ARG 2 world
+		ARG 3 random
+		ARG 4 topY
+		ARG 5 bottomY
+		ARG 6 pos

mappings/net/minecraft/world/gen/feature/MultifaceGrowthFeature.mapping

@@ -4,6 +4,7 @@ CLASS net/minecraft/class_5779 net/minecraft/world/gen/feature/MultifaceGrowthFe
 		ARG 1 pos
 		ARG 2 state
 		ARG 3 config
+		ARG 4 random
 		ARG 5 directions
 	METHOD method_33395 isAirOrWater (Lnet/minecraft/class_2680;)Z
 		ARG 0 state

mappings/net/minecraft/world/gen/feature/MultifaceGrowthFeatureConfig.mapping

@@ -34,3 +34,10 @@ CLASS net/minecraft/class_5780 net/minecraft/world/gen/feature/MultifaceGrowthFe
 		ARG 0 block
 	METHOD method_41574 (Lnet/minecraft/class_5780;)Lnet/minecraft/class_5778;
 		ARG 0 config
+	METHOD method_43295 shuffleDirections (Lnet/minecraft/class_5819;)Ljava/util/List;
+		ARG 1 random
+	METHOD method_43296 shuffleDirections (Lnet/minecraft/class_5819;Lnet/minecraft/class_2350;)Ljava/util/List;
+		ARG 1 random
+		ARG 2 excluded
+	METHOD method_43297 (Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;)Z
+		ARG 1 direction

mappings/net/minecraft/world/gen/feature/TreeConfiguredFeatures.mapping

@@ -38,6 +38,7 @@ CLASS net/minecraft/class_6808 net/minecraft/world/gen/feature/TreeConfiguredFea
 	FIELD field_35924 OAK_BEES_005 Lnet/minecraft/class_6880;
 	FIELD field_38810 MANGROVE Lnet/minecraft/class_6880;
 	FIELD field_38811 TALL_MANGROVE Lnet/minecraft/class_6880;
+	FIELD field_38922 BEES_001 Lnet/minecraft/class_4659;
 	METHOD method_39710 oak ()Lnet/minecraft/class_4643$class_4644;
 	METHOD method_39711 builder (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;IIII)Lnet/minecraft/class_4643$class_4644;
 		ARG 0 log

mappings/net/minecraft/world/gen/feature/TreeFeature.mapping

@@ -35,6 +35,8 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/TreeFeature
 		ARG 1 box
 		ARG 2 trunkPositions
 		ARG 3 decorationPositions
+	METHOD method_23381 (Lnet/minecraft/class_4662$class_7402;Lnet/minecraft/class_4662;)V
+		ARG 1 decorator
 	METHOD method_23384 (Lnet/minecraft/class_2680;)Z
 		ARG 0 state
 	METHOD method_27371 canReplace (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z
@@ -61,3 +63,5 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/TreeFeature
 	METHOD method_43162 (Ljava/util/Set;Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
 		ARG 2 pos
 		ARG 3 state
+	METHOD method_43293 (Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;Lnet/minecraft/class_7387;)Lnet/minecraft/class_2338;
+		ARG 2 rootPlacer

mappings/net/minecraft/world/gen/root/AboveRootPlacement.mapping

@@ -0,0 +1,6 @@
+CLASS net/minecraft/class_7398 net/minecraft/world/gen/root/AboveRootPlacement
+	FIELD field_38865 CODEC Lcom/mojang/serialization/Codec;
+	METHOD method_43299 (Lnet/minecraft/class_7398;)Ljava/lang/Float;
+		ARG 0 aboveRootPlacement
+	METHOD method_43300 (Lnet/minecraft/class_7398;)Lnet/minecraft/class_4651;
+		ARG 0 aboveRootPlacement

mappings/net/minecraft/world/gen/root/MangroveRootPlacement.mapping

@@ -0,0 +1,14 @@
+CLASS net/minecraft/class_7399 net/minecraft/world/gen/root/MangroveRootPlacement
+	FIELD field_38866 CODEC Lcom/mojang/serialization/Codec;
+	METHOD method_43302 (Lnet/minecraft/class_7399;)Ljava/lang/Float;
+		ARG 0 rootPlacement
+	METHOD method_43303 (Lnet/minecraft/class_7399;)Ljava/lang/Integer;
+		ARG 0 rootPlacement
+	METHOD method_43304 (Lnet/minecraft/class_7399;)Ljava/lang/Integer;
+		ARG 0 rootPlacement
+	METHOD method_43305 (Lnet/minecraft/class_7399;)Lnet/minecraft/class_4651;
+		ARG 0 rootPlacement
+	METHOD method_43306 (Lnet/minecraft/class_7399;)Lnet/minecraft/class_6885;
+		ARG 0 rootPlacement
+	METHOD method_43307 (Lnet/minecraft/class_7399;)Lnet/minecraft/class_6885;
+		ARG 0 rootPlacement

mappings/net/minecraft/world/gen/root/MangroveRootPlacer.mapping

@@ -1,5 +1,11 @@
 CLASS net/minecraft/class_7386 net/minecraft/world/gen/root/MangroveRootPlacer
 	FIELD field_38771 CODEC Lcom/mojang/serialization/Codec;
+	FIELD field_38867 mangroveRootPlacement Lnet/minecraft/class_7399;
+	METHOD <init> (Lnet/minecraft/class_6017;Lnet/minecraft/class_4651;Ljava/util/Optional;Lnet/minecraft/class_7399;)V
+		ARG 1 trunkOffsetY
+		ARG 2 rootProvider
+		ARG 3 aboveRootPlacement
+		ARG 4 mangroveRootPlacement
 	METHOD method_43166 canGrow (Lnet/minecraft/class_3746;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_2338;Ljava/util/List;I)Z
 		ARG 1 world
 		ARG 2 random

mappings/net/minecraft/world/gen/root/RootPlacer.mapping

@@ -1,12 +1,20 @@
 CLASS net/minecraft/class_7387 net/minecraft/world/gen/root/RootPlacer
 	FIELD field_38779 TYPE_CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_38780 rootProvider Lnet/minecraft/class_4651;
+	FIELD field_38868 trunkOffsetY Lnet/minecraft/class_6017;
+	FIELD field_38869 aboveRootPlacement Ljava/util/Optional;
+	METHOD <init> (Lnet/minecraft/class_6017;Lnet/minecraft/class_4651;Ljava/util/Optional;)V
+		ARG 1 trunkOffsetY
+		ARG 2 rootProvider
+		ARG 3 aboveRootPlacement
 	METHOD method_43165 getType ()Lnet/minecraft/class_7388;
 	METHOD method_43168 generate (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_4643;)Z
 		ARG 1 world
 		ARG 2 replacer
 		ARG 3 random
 		ARG 4 pos
+		ARG 5 trunkPos
+		ARG 6 config
 	METHOD method_43172 placeRoots (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_4643;)V
 		ARG 1 world
 		ARG 2 replacer
@@ -21,3 +29,10 @@ CLASS net/minecraft/class_7387 net/minecraft/world/gen/root/RootPlacer
 		ARG 0 rootPlacer
 	METHOD method_43184 (Lnet/minecraft/class_3610;)Z
 		ARG 0 fluidState
+	METHOD method_43308 (Lnet/minecraft/class_7387;)Ljava/util/Optional;
+		ARG 0 rootPlacer
+	METHOD method_43309 trunkOffset (Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Lnet/minecraft/class_2338;
+		ARG 1 pos
+		ARG 2 random
+	METHOD method_43310 (Lnet/minecraft/class_7387;)Lnet/minecraft/class_6017;
+		ARG 0 rootPlacer

mappings/net/minecraft/world/gen/stateprovider/BlockStateProvider.mapping

@@ -3,6 +3,7 @@ CLASS net/minecraft/class_4651 net/minecraft/world/gen/stateprovider/BlockStateP
 	FIELD field_24937 TYPE_CODEC Lcom/mojang/serialization/Codec;
 	METHOD method_23455 getBlockState (Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680;
 		COMMENT {@return a provided block state}
+		ARG 1 random
 		ARG 2 pos
 	METHOD method_28862 getType ()Lnet/minecraft/class_4652;
 		COMMENT {@return the type of this block state provider}

mappings/net/minecraft/world/gen/stateprovider/PredicatedStateProvider.mapping

@@ -0,0 +1,12 @@
+CLASS net/minecraft/class_7400 net/minecraft/world/gen/stateprovider/PredicatedStateProvider
+	FIELD field_38870 CODEC Lcom/mojang/serialization/Codec;
+	METHOD method_43311 getBlockState (Lnet/minecraft/class_5281;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680;
+		ARG 1 world
+		ARG 2 random
+		ARG 3 pos
+	METHOD method_43312 of (Lnet/minecraft/class_2248;)Lnet/minecraft/class_7400;
+		ARG 0 block
+	METHOD method_43314 of (Lnet/minecraft/class_4651;)Lnet/minecraft/class_7400;
+		ARG 0 stateProvider
+	CLASS class_7401 Rule
+		FIELD field_38871 CODEC Lcom/mojang/serialization/Codec;

mappings/net/minecraft/world/gen/surfacebuilder/VanillaSurfaceRules.mapping

@@ -33,6 +33,7 @@ CLASS net/minecraft/class_6725 net/minecraft/world/gen/surfacebuilder/VanillaSur
 	FIELD field_35562 SANDSTONE Lnet/minecraft/class_6686$class_6708;
 	FIELD field_35639 BEDROCK Lnet/minecraft/class_6686$class_6708;
 	FIELD field_35640 DEEPSLATE Lnet/minecraft/class_6686$class_6708;
+	FIELD field_38808 MUD Lnet/minecraft/class_6686$class_6708;
 	METHOD method_39134 createOverworldSurfaceRule ()Lnet/minecraft/class_6686$class_6708;
 	METHOD method_39135 surfaceNoiseThreshold (D)Lnet/minecraft/class_6686$class_6693;
 		ARG 0 min

mappings/net/minecraft/world/gen/treedecorator/AlterGroundTreeDecorator.mapping

@@ -5,7 +5,13 @@ CLASS net/minecraft/class_4658 net/minecraft/world/gen/treedecorator/AlterGround
 		ARG 1 provider
 	METHOD method_23460 (ILnet/minecraft/class_2338;)Z
 		ARG 1 pos
+	METHOD method_23461 (Lnet/minecraft/class_4662$class_7402;Lnet/minecraft/class_2338;)V
+		ARG 2 pos
 	METHOD method_23462 setArea (Lnet/minecraft/class_4662$class_7402;Lnet/minecraft/class_2338;)V
+		ARG 1 generator
+		ARG 2 origin
 	METHOD method_23463 setColumn (Lnet/minecraft/class_4662$class_7402;Lnet/minecraft/class_2338;)V
+		ARG 1 generator
+		ARG 2 origin
 	METHOD method_28889 (Lnet/minecraft/class_4658;)Lnet/minecraft/class_4651;
 		ARG 0 decorator

mappings/net/minecraft/world/gen/treedecorator/AttachedToLeavesTreeDecorator.mapping

@@ -14,6 +14,7 @@ CLASS net/minecraft/class_7389 net/minecraft/world/gen/treedecorator/AttachedToL
 		ARG 5 requiredEmptyBlocks
 		ARG 6 directions
 	METHOD method_43187 meetsRequiredEmptyBlocks (Lnet/minecraft/class_4662$class_7402;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z
+		ARG 1 generator
 		ARG 2 pos
 		ARG 3 direction
 	METHOD method_43189 (Lnet/minecraft/class_7389;)Ljava/util/List;

mappings/net/minecraft/world/gen/treedecorator/CocoaBeansTreeDecorator.mapping

@@ -5,5 +5,7 @@ CLASS net/minecraft/class_4660 net/minecraft/world/gen/treedecorator/CocoaBeansT
 		ARG 1 probability
 	METHOD method_23465 (ILnet/minecraft/class_2338;)Z
 		ARG 1 pos
+	METHOD method_23466 (Lnet/minecraft/class_5819;Lnet/minecraft/class_4662$class_7402;Lnet/minecraft/class_2338;)V
+		ARG 2 pos
 	METHOD method_28891 (Lnet/minecraft/class_4660;)Ljava/lang/Float;
 		ARG 0 decorator

mappings/net/minecraft/world/gen/treedecorator/LeavesVineTreeDecorator.mapping

@@ -5,5 +5,10 @@ CLASS net/minecraft/class_4661 net/minecraft/world/gen/treedecorator/LeavesVineT
 		ARG 1 probability
 	METHOD method_23467 placeVines (Lnet/minecraft/class_2338;Lnet/minecraft/class_2746;Lnet/minecraft/class_4662$class_7402;)V
 		COMMENT Places a vine at a given position and then up to 4 more vines going downwards.
+		ARG 0 pos
+		ARG 1 faceProperty
+		ARG 2 generator
+	METHOD method_23468 (Lnet/minecraft/class_5819;Lnet/minecraft/class_4662$class_7402;Lnet/minecraft/class_2338;)V
+		ARG 3 pos
 	METHOD method_43195 (Lnet/minecraft/class_4661;)Ljava/lang/Float;
 		ARG 0 treeDecorator

mappings/net/minecraft/world/gen/treedecorator/TreeDecorator.mapping

@@ -2,4 +2,32 @@ CLASS net/minecraft/class_4662 net/minecraft/world/gen/treedecorator/TreeDecorat
 	COMMENT Tree decorators can add additional blocks to trees, such as vines or beehives.
 	FIELD field_24962 TYPE_CODEC Lcom/mojang/serialization/Codec;
 	METHOD method_23469 generate (Lnet/minecraft/class_4662$class_7402;)V
+		ARG 1 generator
 	METHOD method_28893 getType ()Lnet/minecraft/class_4663;
+	CLASS class_7402 Generator
+		FIELD field_38872 world Lnet/minecraft/class_3746;
+		FIELD field_38873 replacer Ljava/util/function/BiConsumer;
+		FIELD field_38874 random Lnet/minecraft/class_5819;
+		FIELD field_38875 logPositions Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
+		FIELD field_38876 leavesPositions Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
+		FIELD field_38877 rootPositions Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
+		METHOD <init> (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;)V
+			ARG 1 world
+			ARG 2 replacer
+			ARG 3 random
+			ARG 4 logPositions
+			ARG 5 leavesPositions
+			ARG 6 rootPositions
+		METHOD method_43316 getWorld ()Lnet/minecraft/class_3746;
+		METHOD method_43317 isAir (Lnet/minecraft/class_2338;)Z
+			ARG 1 poa
+		METHOD method_43318 replace (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
+			ARG 1 pos
+			ARG 2 state
+		METHOD method_43319 replaceWithVine (Lnet/minecraft/class_2338;Lnet/minecraft/class_2746;)V
+			ARG 1 pos
+			ARG 2 faceProperty
+		METHOD method_43320 getRandom ()Lnet/minecraft/class_5819;
+		METHOD method_43321 getLogPositions ()Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
+		METHOD method_43322 getLeavesPositions ()Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
+		METHOD method_43323 getRootPositions ()Lit/unimi/dsi/fastutil/objects/ObjectArrayList;

mappings/net/minecraft/world/gen/treedecorator/TrunkVineTreeDecorator.mapping

@@ -1,3 +1,5 @@
 CLASS net/minecraft/class_4664 net/minecraft/world/gen/treedecorator/TrunkVineTreeDecorator
 	FIELD field_24964 CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_24965 INSTANCE Lnet/minecraft/class_4664;
+	METHOD method_23474 (Lnet/minecraft/class_5819;Lnet/minecraft/class_4662$class_7402;Lnet/minecraft/class_2338;)V
+		ARG 2 pos

unpick-definitions/entity_status.unpick

@@ -60,6 +60,7 @@ constant entity_statuses net/minecraft/entity/EntityStatuses PREPARE_RAM
 constant entity_statuses net/minecraft/entity/EntityStatuses FINISH_RAM
 constant entity_statuses net/minecraft/entity/EntityStatuses ADD_DEATH_PARTICLES
 constant entity_statuses net/minecraft/entity/EntityStatuses EARS_TWITCH
+constant entity_statuses net/minecraft/entity/EntityStatuses SONIC_BOOM
 
 target_method net/minecraft/entity/Entity handleStatus (B)V
 	param 0 entity_statuses