23w41a

build.gradle

@@ -20,7 +20,7 @@ plugins {
 	id 'net.fabricmc.filament'
 }
 
-def minecraft_version = "23w40a"
+def minecraft_version = "23w41a"
 
 filament {
 	minecraftVersion = minecraft_version

mappings/net/minecraft/advancement/AdvancementRewards.mapping

@@ -1,10 +1,10 @@
 CLASS net/minecraft/class_170 net/minecraft/advancement/AdvancementRewards
-	FIELD field_1163 function Lnet/minecraft/class_2158$class_2159;
+	FIELD field_1163 function Lnet/minecraft/class_2159;
 	FIELD field_1164 loot [Lnet/minecraft/class_2960;
 	FIELD field_1165 experience I
 	FIELD field_1166 recipes [Lnet/minecraft/class_2960;
 	FIELD field_1167 NONE Lnet/minecraft/class_170;
-	METHOD <init> (I[Lnet/minecraft/class_2960;[Lnet/minecraft/class_2960;Lnet/minecraft/class_2158$class_2159;)V
+	METHOD <init> (I[Lnet/minecraft/class_2960;[Lnet/minecraft/class_2960;Lnet/minecraft/class_2159;)V
 		ARG 1 experience
 		ARG 2 loot
 		ARG 3 recipes

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

@@ -46,8 +46,6 @@ CLASS net/minecraft/class_2625 net/minecraft/block/entity/SignBlockEntity
 		ARG 1 backText
 	METHOD method_49843 getText (Z)Lnet/minecraft/class_8242;
 		ARG 1 front
-	METHOD method_49844 getTextFacing (Lnet/minecraft/class_1657;)Lnet/minecraft/class_8242;
-		ARG 1 player
 	METHOD method_49845 (Lnet/minecraft/class_1657;Ljava/util/List;Lnet/minecraft/class_8242;)Lnet/minecraft/class_8242;
 		ARG 3 text
 	METHOD method_49846 setFrontText (Lnet/minecraft/class_8242;)Z

mappings/net/minecraft/class_8836.mapping

@@ -0,0 +1,3 @@
+CLASS net/minecraft/class_8836
+	METHOD method_7516 dropItems (Lnet/minecraft/class_1282;)V
+	METHOD method_7557 asItem ()Lnet/minecraft/class_1792;

mappings/net/minecraft/class_8839.mapping

@@ -0,0 +1,2 @@
+CLASS net/minecraft/class_8839
+	METHOD method_9259 hasPermissionLevel (I)Z

mappings/net/minecraft/class_8868.mapping

@@ -0,0 +1,2 @@
+CLASS net/minecraft/class_8868
+	METHOD comp_1994 getId ()Lnet/minecraft/class_2960;

mappings/net/minecraft/class_8872.mapping

@@ -0,0 +1,2 @@
+CLASS net/minecraft/class_8872
+	FIELD comp_1994 getId Lnet/minecraft/class_2960;

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

@@ -1,4 +1 @@
 CLASS net/minecraft/class_7999 net/minecraft/client/gui/tooltip/FocusedTooltipPositioner
-	FIELD field_41686 widget Lnet/minecraft/class_339;
-	METHOD <init> (Lnet/minecraft/class_339;)V
-		ARG 1 widget

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

@@ -1,7 +1,4 @@
 CLASS net/minecraft/class_8092 net/minecraft/client/gui/tooltip/WidgetTooltipPositioner
-	FIELD field_42161 widget Lnet/minecraft/class_339;
-	METHOD <init> (Lnet/minecraft/class_339;)V
-		ARG 1 widget
 	METHOD method_48642 getOffsetY (III)I
 		ARG 0 tooltipY
 		ARG 1 widgetY

mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping

@@ -13,9 +13,6 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget
 	FIELD field_22764 visible Z
 	FIELD field_22765 alpha F
 	FIELD field_41095 tooltip Lnet/minecraft/class_7919;
-	FIELD field_41096 tooltipDelay I
-	FIELD field_41097 lastHoveredTime J
-	FIELD field_41098 wasHovered Z
 	FIELD field_42116 navigationOrder I
 	METHOD <init> (IIIILnet/minecraft/class_2561;)V
 		ARG 1 x
@@ -64,10 +61,8 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget
 		ARG 1 builder
 	METHOD method_47400 setTooltip (Lnet/minecraft/class_7919;)V
 		ARG 1 tooltip
-	METHOD method_47401 applyTooltip ()V
 	METHOD method_47402 setTooltipDelay (I)V
 		ARG 1 delay
-	METHOD method_47937 getTooltipPositioner ()Lnet/minecraft/class_8000;
 	METHOD method_48579 renderButton (Lnet/minecraft/class_332;IIF)V
 		ARG 1 context
 		ARG 2 mouseX

mappings/net/minecraft/client/realms/Request.mapping

@@ -54,9 +54,6 @@ CLASS net/minecraft/class_4346 net/minecraft/client/realms/Request
 	METHOD method_21054 connect ()Lnet/minecraft/class_4346;
 	METHOD method_21055 doConnect ()Lnet/minecraft/class_4346;
 	METHOD method_21056 dispose ()V
-	METHOD method_35685 withHeader (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_4346;
-		ARG 1 name
-		ARG 2 value
 	CLASS class_4347 Delete
 	CLASS class_4348 Get
 	CLASS class_4349 Post

mappings/net/minecraft/client/realms/dto/RealmsWorldResetDto.mapping

@@ -3,7 +3,7 @@ CLASS net/minecraft/class_4884 net/minecraft/client/realms/dto/RealmsWorldResetD
 	FIELD field_22648 worldTemplateId J
 	FIELD field_22649 levelType I
 	FIELD field_22650 generateStructures Z
-	METHOD <init> (Ljava/lang/String;JIZ)V
+	METHOD <init> (Ljava/lang/String;JIZLjava/util/Set;)V
 		ARG 1 seed
 		ARG 2 worldTemplateId
 		ARG 4 levelType

mappings/net/minecraft/client/realms/gui/screen/RealmsCreateRealmScreen.mapping

@@ -1,17 +1,11 @@
 CLASS net/minecraft/class_4390 net/minecraft/client/realms/gui/screen/RealmsCreateRealmScreen
-	FIELD field_19829 server Lnet/minecraft/class_4877;
 	FIELD field_19830 parent Lnet/minecraft/class_4325;
 	FIELD field_19831 nameBox Lnet/minecraft/class_342;
 	FIELD field_19832 descriptionBox Lnet/minecraft/class_342;
 	FIELD field_26487 WORLD_NAME_TEXT Lnet/minecraft/class_2561;
 	FIELD field_26488 WORLD_DESCRIPTION_TEXT Lnet/minecraft/class_2561;
 	FIELD field_45242 layout Lnet/minecraft/class_8132;
-	METHOD <init> (Lnet/minecraft/class_4877;Lnet/minecraft/class_4325;)V
+	METHOD method_21245 createWorld (Lnet/minecraft/class_4877;)V
-		ARG 1 server
-		ARG 2 parent
-	METHOD method_21245 createWorld ()V
-	METHOD method_25155 (Lnet/minecraft/class_4185;)V
-		ARG 1 button
 	METHOD method_52665 (Lnet/minecraft/class_4390;Lnet/minecraft/class_364;)V
 		ARG 1 child
 	METHOD method_52666 (Lnet/minecraft/class_4185;)V

mappings/net/minecraft/client/realms/gui/screen/RealmsCreateWorldScreen.mapping

@@ -31,7 +31,7 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsCrea
 	FIELD field_46125 CREATING_TEXT Lnet/minecraft/class_2561;
 	FIELD field_46126 layout Lnet/minecraft/class_8132;
 	FIELD field_46127 CREATE_REALM_TITLE Lnet/minecraft/class_2561;
-	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_4877;ILnet/minecraft/class_2561;Lnet/minecraft/class_2561;ILnet/minecraft/class_2561;Ljava/lang/Runnable;)V
+	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_4877;ILnet/minecraft/class_2561;Lnet/minecraft/class_2561;ILnet/minecraft/class_2561;Lnet/minecraft/class_4445;Ljava/lang/Runnable;)V
 		ARG 1 parent
 		ARG 2 serverData
 		ARG 3 slot
@@ -39,7 +39,6 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsCrea
 		ARG 5 subtitle
 		ARG 6 subtitleColor
 		ARG 7 taskTitle
-		ARG 8 callback
 	METHOD method_21377 switchSlot (Ljava/lang/Runnable;)V
 		ARG 1 callback
 	METHOD method_21384 frame (I)I
@@ -51,13 +50,7 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsCrea
 	METHOD method_25213 (Lnet/minecraft/class_4185;)V
 		ARG 1 button
 	METHOD method_32488 onSelectWorldTemplate (Lnet/minecraft/class_4890;)V
-		ARG 1 template
 	METHOD method_32489 onResetNormalWorld (Lnet/minecraft/class_4413;)V
-		ARG 1 info
-	METHOD method_32490 executeLongRunningTask (Lnet/minecraft/class_4358;)V
-		ARG 1 task
-	METHOD method_32493 switchSlotAndResetWorld (Ljava/lang/Runnable;)V
-		ARG 1 resetter
 	METHOD method_53799 (Lnet/minecraft/class_4410;Lnet/minecraft/class_364;)V
 		ARG 1 child
 	METHOD method_53800 (Lnet/minecraft/class_4185;)V
@@ -67,10 +60,9 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsCrea
 		ARG 1 slot
 		ARG 2 serverData
 		ARG 3 callback
-	METHOD method_53802 newRealm (Lnet/minecraft/class_437;Lnet/minecraft/class_4877;Ljava/lang/Runnable;)Lnet/minecraft/class_4410;
+	METHOD method_53802 newRealm (Lnet/minecraft/class_437;Lnet/minecraft/class_4877;Lnet/minecraft/class_4445;Ljava/lang/Runnable;)Lnet/minecraft/class_4410;
 		ARG 0 parent
 		ARG 1 serverData
-		ARG 2 callback
 	METHOD method_53804 (Lnet/minecraft/class_4185;)V
 		ARG 1 button
 	METHOD method_53805 resetWorld (Lnet/minecraft/class_437;Lnet/minecraft/class_4877;Ljava/lang/Runnable;)Lnet/minecraft/class_4410;

mappings/net/minecraft/client/realms/gui/screen/RealmsLongRunningMcoTaskScreen.mapping

@@ -2,13 +2,9 @@ CLASS net/minecraft/class_4398 net/minecraft/client/realms/gui/screen/RealmsLong
 	FIELD field_19909 LOGGER Lorg/slf4j/Logger;
 	FIELD field_19912 parent Lnet/minecraft/class_437;
 	FIELD field_19914 title Lnet/minecraft/class_2561;
-	FIELD field_19919 task Lnet/minecraft/class_4358;
 	FIELD field_33779 NARRATOR Lnet/minecraft/class_4907;
 	FIELD field_46111 layout Lnet/minecraft/class_8667;
 	FIELD field_46112 loading Lnet/minecraft/class_8661;
-	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_4358;)V
-		ARG 1 parent
-		ARG 2 task
 	METHOD method_25168 (Lnet/minecraft/class_4185;)V
 		ARG 1 button
 	METHOD method_53795 (Lnet/minecraft/class_4398;Lnet/minecraft/class_364;)V

mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping

@@ -13,7 +13,6 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain
 	FIELD field_26451 EXPIRED_LIST_TEXT Lnet/minecraft/class_2561;
 	FIELD field_26452 EXPIRED_RENEW_TEXT Lnet/minecraft/class_2561;
 	FIELD field_26453 EXPIRED_TRIAL_TEXT Lnet/minecraft/class_2561;
-	FIELD field_26455 MINIGAME_TEXT Lnet/minecraft/class_2561;
 	FIELD field_26457 EXPIRED_TEXT Lnet/minecraft/class_2561;
 	FIELD field_26458 EXPIRES_SOON_TEXT Lnet/minecraft/class_2561;
 	FIELD field_26459 EXPIRES_IN_A_DAY_TEXT Lnet/minecraft/class_2561;
@@ -89,12 +88,8 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain
 		ARG 2 news
 	METHOD method_44614 (Ljava/lang/Integer;)V
 		ARG 1 pendingInvitesCount
-	METHOD method_44615 (Ljava/util/List;)V
-		ARG 1 servers
 	METHOD method_49285 shouldConfigureButtonBeActive (Lnet/minecraft/class_4877;)Z
-		ARG 1 server
 	METHOD method_49288 shouldLeaveButtonBeActive (Lnet/minecraft/class_4877;)Z
-		ARG 1 server
 	METHOD method_49550 refresh ()V
 	METHOD method_49551 addNotificationEntry (Lnet/minecraft/class_8204;)Z
 		ARG 1 notification
@@ -164,27 +159,10 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain
 		FIELD field_19518 server Lnet/minecraft/class_4877;
 		METHOD <init> (Lnet/minecraft/class_4325;Lnet/minecraft/class_4877;)V
 			ARG 2 server
-		METHOD method_49291 drawServerState (Lnet/minecraft/class_4877;Lnet/minecraft/class_332;IIIIII)V
+		METHOD method_38506 getRealmsServer ()Lnet/minecraft/class_4877;
-			ARG 1 server
-			ARG 2 context
-			ARG 3 x
-			ARG 4 y
-			ARG 5 mouseX
-			ARG 6 mouseY
-			ARG 7 xOffset
-			ARG 8 yOffset
 		METHOD method_52653 play ()V
 		METHOD method_52654 createRealm ()V
-		METHOD method_53452 drawServerState (Lnet/minecraft/class_332;IIIILnet/minecraft/class_2960;Ljava/util/function/Supplier;)V
-			ARG 1 context
-			ARG 2 x
-			ARG 3 y
-			ARG 4 mouseX
-			ARG 5 mouseY
-			ARG 6 texture
-			ARG 7 tooltipGetter
 	CLASS class_4866 Entry
-		METHOD method_38506 getRealmsServer ()Lnet/minecraft/class_4877;
 	CLASS class_8200 VisitButtonEntry
 		FIELD field_42999 button Lnet/minecraft/class_4185;
 		METHOD <init> (Lnet/minecraft/class_4325;Lnet/minecraft/class_4185;)V

mappings/net/minecraft/client/realms/gui/screen/RealmsResetNormalWorldScreen.mapping

@@ -8,7 +8,6 @@ CLASS net/minecraft/class_4409 net/minecraft/client/realms/gui/screen/RealmsRese
 	FIELD field_45280 layout Lnet/minecraft/class_8132;
 	FIELD field_46114 TITLE Lnet/minecraft/class_2561;
 	METHOD <init> (Ljava/util/function/Consumer;Lnet/minecraft/class_2561;)V
-		ARG 1 callback
 		ARG 2 parentTitle
 	METHOD method_25202 (Lnet/minecraft/class_4185;)V
 		ARG 1 button

mappings/net/minecraft/client/realms/gui/screen/ResetWorldInfo.mapping

@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_4413 net/minecraft/client/realms/gui/screen/ResetWorldInfo
-	METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_5672;Z)V
+	METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_5672;ZLjava/util/Set;)V
 		ARG 1 seed
 		ARG 2 levelType
 		ARG 3 generateStructures

mappings/net/minecraft/client/realms/task/WorldCreationTask.mapping

@@ -2,11 +2,9 @@ CLASS net/minecraft/class_4445 net/minecraft/client/realms/task/WorldCreationTas
 	FIELD field_20249 name Ljava/lang/String;
 	FIELD field_20250 motd Ljava/lang/String;
 	FIELD field_20251 worldId J
-	FIELD field_20252 lastScreen Lnet/minecraft/class_437;
 	FIELD field_36362 LOGGER Lorg/slf4j/Logger;
 	FIELD field_46141 TITLE Lnet/minecraft/class_2561;
-	METHOD <init> (JLjava/lang/String;Ljava/lang/String;Lnet/minecraft/class_437;)V
+	METHOD <init> (JLjava/lang/String;Ljava/lang/String;)V
 		ARG 1 worldId
 		ARG 3 name
 		ARG 4 motd
-		ARG 5 lastScreen

mappings/net/minecraft/entity/Entity.mapping

@@ -1817,7 +1817,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 		COMMENT
 		COMMENT @return whether the command tag was successfully added
 		ARG 1 tag
-	METHOD method_5781 getScoreboardTeam ()Lnet/minecraft/class_270;
+	METHOD method_5781 getScoreboardTeam ()Lnet/minecraft/class_268;
 		COMMENT {@return the scoreboard team the entity belongs to, or {@code null} if there is none}
 	METHOD method_5782 hasPassengers ()Z
 		COMMENT {@return whether another entity is riding this entity}

mappings/net/minecraft/entity/ItemEntity.mapping

@@ -70,9 +70,8 @@ CLASS net/minecraft/class_1542 net/minecraft/entity/ItemEntity
 	METHOD method_6979 setStack (Lnet/minecraft/class_1799;)V
 		COMMENT Sets the item stack contained in this item entity to {@code stack}.
 		ARG 1 stack
-	METHOD method_6981 setThrower (Ljava/util/UUID;)V
+	METHOD method_6981 setThrower (Lnet/minecraft/class_1297;)V
 		COMMENT Sets the thrower of this item entity to {@code thrower}.
-		ARG 1 thrower
 	METHOD method_6982 setPickupDelay (I)V
 		COMMENT Sets the number of ticks before this item entity can be picked up
 		COMMENT to {@code pickupDelay}.

mappings/net/minecraft/entity/projectile/ProjectileUtil.mapping

@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_1675 net/minecraft/entity/projectile/ProjectileUtil
-	METHOD method_18074 getCollision (Lnet/minecraft/class_243;Lnet/minecraft/class_1297;Ljava/util/function/Predicate;Lnet/minecraft/class_243;Lnet/minecraft/class_1937;)Lnet/minecraft/class_239;
+	METHOD method_18074 getCollision (Lnet/minecraft/class_243;Lnet/minecraft/class_1297;Ljava/util/function/Predicate;Lnet/minecraft/class_243;Lnet/minecraft/class_1937;F)Lnet/minecraft/class_239;
 		ARG 0 pos
 		ARG 1 entity
 		ARG 2 predicate

mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping

@@ -13,10 +13,7 @@ CLASS net/minecraft/class_1688 net/minecraft/entity/vehicle/AbstractMinecartEnti
 	FIELD field_46219 VILLAGER_PASSENGER_ATTACHMENT_Y_OFFSET F
 	FIELD field_7660 yawFlipped Z
 	FIELD field_7661 CUSTOM_BLOCK_OFFSET Lnet/minecraft/class_2940;
-	FIELD field_7663 DAMAGE_WOBBLE_TICKS Lnet/minecraft/class_2940;
 	FIELD field_7664 ADJACENT_RAIL_POSITIONS_BY_SHAPE Ljava/util/Map;
-	FIELD field_7667 DAMAGE_WOBBLE_STRENGTH Lnet/minecraft/class_2940;
-	FIELD field_7668 DAMAGE_WOBBLE_SIDE Lnet/minecraft/class_2940;
 	FIELD field_7670 CUSTOM_BLOCK_PRESENT Lnet/minecraft/class_2940;
 	FIELD field_7671 CUSTOM_BLOCK_ID Lnet/minecraft/class_2940;
 	METHOD <init> (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;DDD)V
@@ -33,7 +30,6 @@ CLASS net/minecraft/class_1688 net/minecraft/entity/vehicle/AbstractMinecartEnti
 		ARG 0 map
 	METHOD method_30340 (Lnet/minecraft/class_2338;)Lnet/minecraft/class_265;
 		ARG 1 pos
-	METHOD method_42670 getItem ()Lnet/minecraft/class_1792;
 	METHOD method_7504 getMaxSpeed ()D
 	METHOD method_7505 snapPositionToRailWithOffset (DDDD)Lnet/minecraft/class_243;
 		COMMENT This method is used to determine the minecart's render orientation, by computing a position along the rail slightly before and slightly after the minecart's actual position.
@@ -46,13 +42,10 @@ CLASS net/minecraft/class_1688 net/minecraft/entity/vehicle/AbstractMinecartEnti
 		ARG 2 y
 		ARG 3 z
 		ARG 4 powered
-	METHOD method_7507 getDamageWobbleTicks ()I
 	METHOD method_7508 snapPositionToRail (DDD)Lnet/minecraft/class_243;
 		ARG 1 x
 		ARG 3 y
 		ARG 5 z
-	METHOD method_7509 setDamageWobbleTicks (I)V
-		ARG 1 wobbleTicks
 	METHOD method_7510 hasCustomBlock ()Z
 	METHOD method_7511 setCustomBlockPresent (Z)V
 		ARG 1 present
@@ -63,23 +56,14 @@ CLASS net/minecraft/class_1688 net/minecraft/entity/vehicle/AbstractMinecartEnti
 	METHOD method_7514 getBlockOffset ()I
 	METHOD method_7515 setCustomBlockOffset (I)V
 		ARG 1 offset
-	METHOD method_7516 dropItems (Lnet/minecraft/class_1282;)V
-		ARG 1 damageSource
 	METHOD method_7517 getDefaultContainedBlock ()Lnet/minecraft/class_2680;
 	METHOD method_7518 getMinecartType ()Lnet/minecraft/class_1688$class_1689;
 	METHOD method_7519 getContainedBlock ()Lnet/minecraft/class_2680;
-	METHOD method_7520 setDamageWobbleStrength (F)V
+	METHOD method_7523 create (Lnet/minecraft/class_3218;DDDLnet/minecraft/class_1688$class_1689;Lnet/minecraft/class_1799;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1688;
-		ARG 1 damageWobbleStrength
-	METHOD method_7521 getDamageWobbleStrength ()F
-	METHOD method_7522 getDamageWobbleSide ()I
-	METHOD method_7523 create (Lnet/minecraft/class_1937;DDDLnet/minecraft/class_1688$class_1689;)Lnet/minecraft/class_1688;
-		ARG 0 world
 		ARG 1 x
 		ARG 3 y
 		ARG 5 z
 		ARG 7 type
-	METHOD method_7524 setDamageWobbleSide (I)V
-		ARG 1 wobbleSide
 	METHOD method_7525 applySlowdown ()V
 	METHOD method_7526 getDefaultBlockOffset ()I
 	METHOD method_7527 setCustomBlock (Lnet/minecraft/class_2680;)V

mappings/net/minecraft/entity/vehicle/BoatEntity.mapping

@@ -6,7 +6,6 @@ CLASS net/minecraft/class_1690 net/minecraft/entity/vehicle/BoatEntity
 	FIELD field_7685 z D
 	FIELD field_7686 x D
 	FIELD field_7687 LEFT_PADDLE_MOVING Lnet/minecraft/class_2940;
-	FIELD field_7688 DAMAGE_WOBBLE_TICKS Lnet/minecraft/class_2940;
 	FIELD field_7689 onBubbleColumnSurface Z
 	FIELD field_7690 yawVelocity F
 	FIELD field_7691 BUBBLE_WOBBLE_TICKS Lnet/minecraft/class_2940;
@@ -23,9 +22,7 @@ CLASS net/minecraft/class_1690 net/minecraft/entity/vehicle/BoatEntity
 	FIELD field_7702 location Lnet/minecraft/class_1690$class_1691;
 	FIELD field_7703 bubbleColumnIsDrag Z
 	FIELD field_7704 paddlePhases [F
-	FIELD field_7705 DAMAGE_WOBBLE_STRENGTH Lnet/minecraft/class_2940;
 	FIELD field_7706 ticksUnderwater F
-	FIELD field_7707 DAMAGE_WOBBLE_SIDE Lnet/minecraft/class_2940;
 	FIELD field_7709 pressingForward Z
 	FIELD field_7710 pressingLeft Z
 	FIELD field_7711 lastBubbleWobble F
@@ -42,8 +39,6 @@ CLASS net/minecraft/class_1690 net/minecraft/entity/vehicle/BoatEntity
 		ARG 1 other
 	METHOD method_31552 (Lnet/minecraft/class_1297;)Z
 		ARG 0 entity
-	METHOD method_42279 dropItems (Lnet/minecraft/class_1282;)V
-		ARG 1 source
 	METHOD method_42280 getPassengerHorizontalOffset ()F
 	METHOD method_42281 getMaxPassengers ()I
 	METHOD method_49182 isSmallerThanBoat (Lnet/minecraft/class_1297;)Z
@@ -51,7 +46,6 @@ CLASS net/minecraft/class_1690 net/minecraft/entity/vehicle/BoatEntity
 	METHOD method_7531 setBubbleWobbleTicks (I)V
 		ARG 1 wobbleTicks
 	METHOD method_7532 getUnderWaterLocation ()Lnet/minecraft/class_1690$class_1691;
-	METHOD method_7533 getDamageWobbleTicks ()I
 	METHOD method_7534 updateVelocity ()V
 	METHOD method_7535 setInputs (ZZZZ)V
 		ARG 1 pressingLeft
@@ -63,11 +57,6 @@ CLASS net/minecraft/class_1690 net/minecraft/entity/vehicle/BoatEntity
 		ARG 1 leftMoving
 		ARG 2 rightMoving
 	METHOD method_7539 getBubbleWobbleTicks ()I
-	METHOD method_7540 setDamageWobbleSide (I)V
-		ARG 1 side
-	METHOD method_7542 setDamageWobbleStrength (F)V
-		ARG 1 wobbleStrength
-	METHOD method_7543 getDamageWobbleSide ()I
 	METHOD method_7544 getWaterHeightBelow ()F
 	METHOD method_7545 checkBoatInWater ()Z
 	METHOD method_7546 clampPassengerYaw (Lnet/minecraft/class_1297;)V
@@ -81,13 +70,9 @@ CLASS net/minecraft/class_1690 net/minecraft/entity/vehicle/BoatEntity
 		ARG 1 paddle
 		ARG 2 tickDelta
 	METHOD method_7552 checkLocation ()Lnet/minecraft/class_1690$class_1691;
-	METHOD method_7553 setDamageWobbleTicks (I)V
-		ARG 1 wobbleTicks
-	METHOD method_7554 getDamageWobbleStrength ()F
 	METHOD method_7555 updatePositionAndRotation ()V
 	METHOD method_7556 isPaddleMoving (I)Z
 		ARG 1 paddle
-	METHOD method_7557 asItem ()Lnet/minecraft/class_1792;
 	CLASS class_1691 Location
 	CLASS class_1692 Type
 		FIELD field_41599 CODEC Lnet/minecraft/class_3542$class_7292;

mappings/net/minecraft/item/BoatItem.mapping

@@ -6,6 +6,6 @@ CLASS net/minecraft/class_1749 net/minecraft/item/BoatItem
 		ARG 1 chest
 		ARG 2 type
 		ARG 3 settings
-	METHOD method_42296 createEntity (Lnet/minecraft/class_1937;Lnet/minecraft/class_239;)Lnet/minecraft/class_1690;
+	METHOD method_42296 createEntity (Lnet/minecraft/class_1937;Lnet/minecraft/class_239;Lnet/minecraft/class_1799;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1690;
 		ARG 1 world
 		ARG 2 hitResult

mappings/net/minecraft/item/BrushItem.mapping

@@ -1,14 +1,12 @@
 CLASS net/minecraft/class_8162 net/minecraft/item/BrushItem
 	FIELD field_42683 MAX_BRUSH_TIME I
-	FIELD field_44603 MAX_BRUSH_DISTANCE D
 	METHOD method_49184 addDustParticles (Lnet/minecraft/class_1937;Lnet/minecraft/class_3965;Lnet/minecraft/class_2680;Lnet/minecraft/class_243;Lnet/minecraft/class_1306;)V
 		ARG 1 world
 		ARG 2 hitResult
 		ARG 3 state
 		ARG 4 userRotation
 		ARG 5 arm
-	METHOD method_49999 getHitResult (Lnet/minecraft/class_1309;)Lnet/minecraft/class_239;
+	METHOD method_49999 getHitResult (Lnet/minecraft/class_1657;)Lnet/minecraft/class_239;
-		ARG 1 user
 	METHOD method_51163 (Lnet/minecraft/class_1304;Lnet/minecraft/class_1309;)V
 		ARG 1 userx
 	METHOD method_51309 (Lnet/minecraft/class_1297;)Z

mappings/net/minecraft/server/command/CommandManager.mapping

@@ -16,7 +16,7 @@ CLASS net/minecraft/class_2170 net/minecraft/server/command/CommandManager
 		ARG 2 child
 		ARG 3 sibling
 		ARG 4 inputs
-	METHOD method_44252 executeWithPrefix (Lnet/minecraft/class_2168;Ljava/lang/String;)I
+	METHOD method_44252 executeWithPrefix (Lnet/minecraft/class_2168;Ljava/lang/String;)V
 		COMMENT Executes {@code command}. Unlike {@link #execute} the command can be prefixed
 		COMMENT with a slash.
 		ARG 1 source
@@ -53,11 +53,7 @@ CLASS net/minecraft/class_2170 net/minecraft/server/command/CommandManager
 		ARG 0 context
 	METHOD method_9247 literal (Ljava/lang/String;)Lcom/mojang/brigadier/builder/LiteralArgumentBuilder;
 		ARG 0 literal
-	METHOD method_9248 (Lcom/mojang/brigadier/context/CommandContext;ZI)V
+	METHOD method_9249 execute (Lcom/mojang/brigadier/ParseResults;Ljava/lang/String;)V
-		ARG 0 context
-		ARG 1 success
-		ARG 2 result
-	METHOD method_9249 execute (Lcom/mojang/brigadier/ParseResults;Ljava/lang/String;)I
 		COMMENT Executes {@code command}. The command cannot be prefixed with a slash.
 		COMMENT
 		COMMENT @see #executeWithPrefix(ServerCommandSource, String)

mappings/net/minecraft/server/command/DebugCommand.mapping

@@ -12,13 +12,8 @@ CLASS net/minecraft/class_3032 net/minecraft/server/command/DebugCommand
 		ARG 0 source
 	METHOD method_13159 executeStart (Lnet/minecraft/class_2168;)I
 		ARG 0 source
-	METHOD method_21617 (Lcom/mojang/brigadier/context/CommandContext;)I
-		ARG 0 context
 	METHOD method_36353 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
-	METHOD method_36354 executeFunction (Lnet/minecraft/class_2168;Ljava/util/Collection;)I
-		ARG 0 source
-		ARG 1 functions
 	CLASS class_6347 Tracer
 		FIELD field_33550 MARGIN I
 		FIELD field_33551 writer Ljava/io/PrintWriter;

mappings/net/minecraft/server/command/ExecuteCommand.mapping

@@ -29,8 +29,7 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand
 		ARG 3 builder
 	METHOD method_13259 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2168;
 		ARG 0 context
-	METHOD method_13260 (Ljava/util/Collection;Lnet/minecraft/class_269;Lnet/minecraft/class_266;ZLcom/mojang/brigadier/context/CommandContext;ZI)V
+	METHOD method_13260 (Ljava/util/Collection;Lnet/minecraft/class_269;Lnet/minecraft/class_266;ZLnet/minecraft/class_2168;ZI)V
-		ARG 4 context
 		ARG 5 success
 		ARG 6 result
 	METHOD method_13261 testBlocksCondition (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Z)Ljava/util/OptionalInt;
@@ -76,17 +75,9 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand
 		ARG 1 result
 	METHOD method_13276 (Lcom/mojang/brigadier/context/CommandContext;I)Lnet/minecraft/class_2520;
 		ARG 1 result
-	METHOD method_13277 (ZZLnet/minecraft/class_3002;Lcom/mojang/brigadier/context/CommandContext;ZI)V
+	METHOD method_13277 (ZZLnet/minecraft/class_3002;Lnet/minecraft/class_2168;ZI)V
-		ARG 3 context
 		ARG 4 success
 		ARG 5 result
-	METHOD method_13278 (Lcom/mojang/brigadier/ResultConsumer;Lcom/mojang/brigadier/ResultConsumer;)Lcom/mojang/brigadier/ResultConsumer;
-		ARG 0 consumer
-		ARG 1 consumer2
-	METHOD method_13279 (Lcom/mojang/brigadier/ResultConsumer;Lcom/mojang/brigadier/ResultConsumer;Lcom/mojang/brigadier/context/CommandContext;ZI)V
-		ARG 2 context
-		ARG 3 success
-		ARG 4 result
 	METHOD method_13280 (Lcom/mojang/brigadier/context/CommandContext;)Z
 		ARG 0 context
 	METHOD method_13281 (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/Collection;
@@ -120,8 +111,7 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand
 		ARG 0 context
 	METHOD method_13293 (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/Collection;
 		ARG 0 context
-	METHOD method_13294 (Lnet/minecraft/class_3162;ZLnet/minecraft/class_2203$class_2209;Ljava/util/function/IntFunction;Lcom/mojang/brigadier/context/CommandContext;ZI)V
+	METHOD method_13294 (Lnet/minecraft/class_3162;ZLnet/minecraft/class_2203$class_2209;Ljava/util/function/IntFunction;Lnet/minecraft/class_2168;ZI)V
-		ARG 4 context
 		ARG 5 success
 		ARG 6 result
 	METHOD method_13295 (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/Collection;

mappings/net/minecraft/server/command/FunctionCommand.mapping

@@ -3,34 +3,15 @@ CLASS net/minecraft/class_3062 net/minecraft/server/command/FunctionCommand
 	FIELD field_44982 ARGUMENT_NOT_COMPOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	METHOD method_13380 register (Lcom/mojang/brigadier/CommandDispatcher;)V
 		ARG 0 dispatcher
-	METHOD method_13381 execute (Lnet/minecraft/class_2168;Ljava/util/Collection;Lnet/minecraft/class_2487;)I
-		ARG 0 source
-		ARG 1 functions
-		ARG 2 arguments
 	METHOD method_13382 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 		ARG 0 context
 		ARG 1 builder
-	METHOD method_13383 (Lcom/mojang/brigadier/context/CommandContext;)I
-		ARG 0 context
 	METHOD method_13384 (Lnet/minecraft/class_2168;)Z
 		ARG 0 source
-	METHOD method_51276 (Lorg/apache/commons/lang3/mutable/MutableObject;I)V
-		ARG 1 value
 	METHOD method_52309 (Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder;
 		ARG 1 builder
-	METHOD method_52310 (Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I
-		ARG 1 context
-	METHOD method_52311 (Lcom/mojang/brigadier/context/CommandContext;)I
-		ARG 0 context
-	METHOD method_52312 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_2158;Lnet/minecraft/class_2487;)Lnet/minecraft/class_3062$class_8601;
-		ARG 0 source
-		ARG 1 function
-		ARG 2 arguments
 	METHOD method_52313 getArgument (Lnet/minecraft/class_2203$class_2209;Lnet/minecraft/class_3162;)Lnet/minecraft/class_2487;
 		ARG 0 path
 		ARG 1 object
 	METHOD method_52314 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
 		ARG 0 argument
-	METHOD method_52315 (Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I
-		ARG 1 context
-	CLASS class_8601 FunctionResult

mappings/net/minecraft/server/command/ReturnCommand.mapping

@@ -1,10 +1,3 @@
 CLASS net/minecraft/class_8503 net/minecraft/server/command/ReturnCommand
 	METHOD method_51277 register (Lcom/mojang/brigadier/CommandDispatcher;)V
 		ARG 0 dispatcher
-	METHOD method_51278 (Lcom/mojang/brigadier/context/CommandContext;)I
-		ARG 0 context
-	METHOD method_51279 (Lnet/minecraft/class_2168;)Z
-		ARG 0 source
-	METHOD method_51280 execute (Lnet/minecraft/class_2168;I)I
-		ARG 0 source
-		ARG 1 value

mappings/net/minecraft/server/command/ServerCommandSource.mapping

@@ -12,7 +12,7 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource
 	FIELD field_9818 server Lnet/minecraft/server/MinecraftServer;
 	FIELD field_9819 output Lnet/minecraft/class_2165;
 	FIELD field_9820 entity Lnet/minecraft/class_1297;
-	FIELD field_9821 resultConsumer Lcom/mojang/brigadier/ResultConsumer;
+	FIELD field_9821 resultConsumer Lnet/minecraft/class_8838;
 	FIELD field_9822 rotation Lnet/minecraft/class_241;
 	FIELD field_9823 silent Z
 	FIELD field_9824 REQUIRES_PLAYER_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
@@ -30,7 +30,7 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource
 		ARG 7 displayName
 		ARG 8 server
 		ARG 9 entity
-	METHOD <init> (Lnet/minecraft/class_2165;Lnet/minecraft/class_243;Lnet/minecraft/class_241;Lnet/minecraft/class_3218;ILjava/lang/String;Lnet/minecraft/class_2561;Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_1297;ZLcom/mojang/brigadier/ResultConsumer;Lnet/minecraft/class_2183$class_2184;Lnet/minecraft/class_7448;Lnet/minecraft/class_7620;Ljava/util/function/IntConsumer;)V
+	METHOD <init> (Lnet/minecraft/class_2165;Lnet/minecraft/class_243;Lnet/minecraft/class_241;Lnet/minecraft/class_3218;ILjava/lang/String;Lnet/minecraft/class_2561;Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_1297;ZLnet/minecraft/class_8838;Lnet/minecraft/class_2183$class_2184;Lnet/minecraft/class_7448;Lnet/minecraft/class_7620;Ljava/util/function/IntConsumer;)V
 		ARG 1 output
 		ARG 2 pos
 		ARG 3 rot
@@ -41,7 +41,6 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource
 		ARG 8 server
 		ARG 9 entity
 		ARG 10 silent
-		ARG 11 consumer
 		ARG 12 entityAnchor
 		ARG 13 signedArguments
 		ARG 14 messageChainTaskQueue
@@ -77,7 +76,6 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource
 		ARG 1 message
 	METHOD method_51411 withReturnValueConsumer (Ljava/util/function/IntConsumer;)Lnet/minecraft/class_2168;
 		ARG 1 returnValueConsumer
-	METHOD method_51413 getReturnValueConsumer ()Ljava/util/function/IntConsumer;
 	METHOD method_9206 withLevel (I)Lnet/minecraft/class_2168;
 		ARG 1 level
 	METHOD method_9207 getPlayerOrThrow ()Lnet/minecraft/class_3222;
@@ -86,8 +84,7 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource
 		COMMENT @throws CommandSyntaxException if this command source is not a player
 	METHOD method_9208 withPosition (Lnet/minecraft/class_243;)Lnet/minecraft/class_2168;
 		ARG 1 position
-	METHOD method_9209 mergeConsumers (Lcom/mojang/brigadier/ResultConsumer;Ljava/util/function/BinaryOperator;)Lnet/minecraft/class_2168;
+	METHOD method_9209 mergeConsumers (Lnet/minecraft/class_8838;Ljava/util/function/BinaryOperator;)Lnet/minecraft/class_2168;
-		ARG 1 consumer
 		ARG 2 merger
 	METHOD method_9210 getRotation ()Lnet/minecraft/class_241;
 	METHOD method_9211 getServer ()Lnet/minecraft/server/MinecraftServer;
@@ -96,10 +93,6 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource
 	METHOD method_9213 sendError (Lnet/minecraft/class_2561;)V
 		ARG 1 message
 	METHOD method_9214 getName ()Ljava/lang/String;
-	METHOD method_9215 onCommandComplete (Lcom/mojang/brigadier/context/CommandContext;ZI)V
-		ARG 1 context
-		ARG 2 success
-		ARG 3 result
 	METHOD method_9216 withRotation (Lnet/minecraft/class_241;)Lnet/minecraft/class_2168;
 		ARG 1 rotation
 	METHOD method_9217 withSilent ()Lnet/minecraft/class_2168;
@@ -113,10 +106,6 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource
 		ARG 1 position
 	METHOD method_9222 getPosition ()Lnet/minecraft/class_243;
 	METHOD method_9223 getDisplayName ()Lnet/minecraft/class_2561;
-	METHOD method_9224 (Lcom/mojang/brigadier/context/CommandContext;ZI)V
-		ARG 0 context
-		ARG 1 success
-		ARG 2 result
 	METHOD method_9225 getWorld ()Lnet/minecraft/class_3218;
 	METHOD method_9226 sendFeedback (Ljava/util/function/Supplier;Z)V
 		ARG 1 feedbackSupplier
@@ -129,7 +118,6 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource
 		COMMENT Gets the entity from this command source or throws a command syntax exception if this command source is not an entity.
 	METHOD method_9230 withMaxLevel (I)Lnet/minecraft/class_2168;
 		ARG 1 level
-	METHOD method_9231 withConsumer (Lcom/mojang/brigadier/ResultConsumer;)Lnet/minecraft/class_2168;
+	METHOD method_9231 withConsumer (Lnet/minecraft/class_8838;)Lnet/minecraft/class_2168;
-		ARG 1 consumer
 	METHOD method_9232 withEntity (Lnet/minecraft/class_1297;)Lnet/minecraft/class_2168;
 		ARG 1 entity

mappings/net/minecraft/server/function/CommandFunction.mapping

@@ -1,98 +1,15 @@
 CLASS net/minecraft/class_2158 net/minecraft/server/function/CommandFunction
-	FIELD field_9805 elements [Lnet/minecraft/class_2158$class_2161;
+	METHOD comp_1994 getId ()Lnet/minecraft/class_2960;
-	FIELD field_9806 id Lnet/minecraft/class_2960;
-	METHOD <init> (Lnet/minecraft/class_2960;[Lnet/minecraft/class_2158$class_2161;)V
-		ARG 1 id
-		ARG 2 elements
 	METHOD method_52592 continuesToNextLine (Ljava/lang/CharSequence;)Z
 		ARG 0 string
-	METHOD method_52593 isValidMacroVariableName (Ljava/lang/String;)Z
+	METHOD method_52595 withMacroReplaced (Lnet/minecraft/class_2487;Lcom/mojang/brigadier/CommandDispatcher;Ljava/lang/Object;)Lnet/minecraft/class_8868;
-		ARG 0 name
-	METHOD method_52594 parseMacro (Ljava/lang/String;I)Lnet/minecraft/class_2158$class_8642;
-		ARG 0 macro
-		ARG 1 line
-	METHOD method_52595 withMacroReplaced (Lnet/minecraft/class_2487;Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_2168;)Lnet/minecraft/class_2158;
 		ARG 1 arguments
 		ARG 2 dispatcher
-		ARG 3 source
+	METHOD method_9195 create (Lnet/minecraft/class_2960;Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_8839;Ljava/util/List;)Lnet/minecraft/class_2158;
-	METHOD method_9193 getElements ()[Lnet/minecraft/class_2158$class_2161;
-	METHOD method_9194 getId ()Lnet/minecraft/class_2960;
-	METHOD method_9195 create (Lnet/minecraft/class_2960;Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_2168;Ljava/util/List;)Lnet/minecraft/class_2158;
 		COMMENT Parses a function in the context of {@code source}.
 		COMMENT
 		COMMENT <p>Any syntax errors, such as improper comment lines or unknown commands, will be thrown at this point.
 		ARG 0 id
 		ARG 1 dispatcher
-		ARG 2 source
 		ARG 3 lines
 			COMMENT the raw lines (including comments) read from a function file
-	CLASS class_2159 LazyContainer
-		COMMENT A lazy reference to another command function that may or may not exist.
-		COMMENT
-		COMMENT <p>Notice that such an instance does not refresh upon reloads and may become
-		COMMENT invalid.
-		FIELD field_9807 id Lnet/minecraft/class_2960;
-		FIELD field_9808 function Ljava/util/Optional;
-		FIELD field_9809 EMPTY Lnet/minecraft/class_2158$class_2159;
-		FIELD field_9810 initialized Z
-		METHOD <init> (Lnet/minecraft/class_2158;)V
-			ARG 1 function
-		METHOD <init> (Lnet/minecraft/class_2960;)V
-			ARG 1 id
-		METHOD method_17913 (Lnet/minecraft/class_2158;)Lnet/minecraft/class_2960;
-			ARG 0 f
-		METHOD method_9196 get (Lnet/minecraft/class_2991;)Ljava/util/Optional;
-			ARG 1 manager
-		METHOD method_9197 getId ()Lnet/minecraft/class_2960;
-	CLASS class_2160 CommandElement
-		COMMENT A standard element of a command function. Functions created by {@link
-		COMMENT CommandFunction#create} will only contain these elements.
-		FIELD field_9811 parsed Lcom/mojang/brigadier/ParseResults;
-		METHOD <init> (Lcom/mojang/brigadier/ParseResults;)V
-			ARG 1 parsed
-		METHOD method_36318 execute (Lnet/minecraft/class_2991;Lnet/minecraft/class_2168;)I
-			ARG 1 manager
-			ARG 2 source
-		METHOD method_45017 (Lnet/minecraft/class_2168;Lnet/minecraft/class_2168;)Lnet/minecraft/class_2168;
-			ARG 1 currentSource
-	CLASS class_2161 Element
-		METHOD method_9198 execute (Lnet/minecraft/class_2991;Lnet/minecraft/class_2168;Ljava/util/Deque;IILnet/minecraft/class_2991$class_6346;)V
-			ARG 1 manager
-			ARG 2 source
-			ARG 3 entries
-			ARG 4 maxChainLength
-			ARG 5 depth
-			ARG 6 tracer
-	CLASS class_2162 FunctionElement
-		COMMENT A synthetic element to be stored in a {@link CommandFunctionManager.Entry}.
-		COMMENT This is not present as parts of command functions, but created by {@link
-		COMMENT net.minecraft.server.function.CommandFunctionManager.Execution#recursiveRun}.
-		FIELD field_9812 function Lnet/minecraft/class_2158$class_2159;
-		METHOD <init> (Lnet/minecraft/class_2158;)V
-			ARG 1 function
-		METHOD method_17914 (Lnet/minecraft/class_2991$class_6346;IILjava/util/Deque;Lnet/minecraft/class_2168;Lnet/minecraft/class_2158;)V
-			ARG 5 f
-	CLASS class_8641 Macro
-		FIELD field_45149 variables Ljava/util/List;
-		FIELD field_45150 CACHE_SIZE I
-		FIELD field_45151 cache Lit/unimi/dsi/fastutil/objects/Object2ObjectLinkedOpenHashMap;
-		FIELD field_46190 DECIMAL_FORMAT Ljava/text/DecimalFormat;
-		METHOD <init> (Lnet/minecraft/class_2960;[Lnet/minecraft/class_2158$class_2161;Ljava/util/List;)V
-			ARG 1 id
-			ARG 2 elements
-			ARG 3 variables
-		METHOD method_52597 withMacroReplaced (Ljava/util/List;Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_2168;)Lnet/minecraft/class_2158;
-			ARG 1 arguments
-			ARG 2 dispatcher
-			ARG 3 source
-		METHOD method_53840 toString (Lnet/minecraft/class_2520;)Ljava/lang/String;
-			ARG 0 nbt
-	CLASS class_8642 MacroElement
-		FIELD field_45152 parts Ljava/util/List;
-		FIELD field_45153 variables Ljava/util/List;
-		METHOD <init> (Ljava/util/List;Ljava/util/List;)V
-			ARG 1 parts
-			ARG 2 variables
-		METHOD method_52598 getVariables ()Ljava/util/List;
-		METHOD method_52599 getCommand (Ljava/util/List;)Ljava/lang/String;
-			ARG 1 arguments

mappings/net/minecraft/server/function/CommandFunctionManager.mapping

@@ -13,11 +13,6 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana
 		COMMENT loaded} and should run all functions in the {@code minecraft:load} function tag.
 	FIELD field_25333 loader Lnet/minecraft/class_5349;
 		COMMENT The source of functions for this command function manager.
-	FIELD field_33542 NO_TRACE_IN_FUNCTION_TEXT Lnet/minecraft/class_2561;
-		COMMENT A localized piece of text indicating that calling the debug command to debug
-		COMMENT functions from within a function is not supported.
-	FIELD field_33543 execution Lnet/minecraft/class_2991$class_6345;
-		COMMENT The active execution within this manager.
 	METHOD <init> (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_5349;)V
 		ARG 1 server
 		ARG 2 loader
@@ -31,8 +26,7 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana
 		COMMENT silent} compared to the server's {@linkplain MinecraftServer#getCommandSource()
 		COMMENT command source}.
 	METHOD method_12900 getDispatcher ()Lcom/mojang/brigadier/CommandDispatcher;
-	METHOD method_12902 getMaxCommandChainLength ()I
+	METHOD method_12904 execute (Lnet/minecraft/class_2158;Lnet/minecraft/class_2168;)V
-	METHOD method_12904 execute (Lnet/minecraft/class_2158;Lnet/minecraft/class_2168;)I
 		COMMENT Executes a function.
 		COMMENT
 		COMMENT <p>This is same as calling {@link #execute(CommandFunction, ServerCommandSource,
@@ -42,8 +36,6 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana
 		COMMENT @see #execute(CommandFunction, ServerCommandSource, Tracer, NbtCompound)
 		ARG 1 function
 			COMMENT the function
-		ARG 2 source
-			COMMENT the command source to execute with
 	METHOD method_12905 getFunction (Lnet/minecraft/class_2960;)Ljava/util/Optional;
 		ARG 1 id
 	METHOD method_18699 tick ()V
@@ -60,97 +52,3 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana
 	METHOD method_29464 getFunctionTags ()Ljava/lang/Iterable;
 	METHOD method_29773 load (Lnet/minecraft/class_5349;)V
 		ARG 1 loader
-	METHOD method_36341 execute (Lnet/minecraft/class_2158;Lnet/minecraft/class_2168;Lnet/minecraft/class_2991$class_6346;Lnet/minecraft/class_2487;)I
-		COMMENT Executes a function. This may have two cases: new or recursive.
-		COMMENT
-		COMMENT <p>In a new execution, the {@link #execution execution == null}, and a custom
-		COMMENT {@code tracer} can be specified. The return value indicates the number of
-		COMMENT commands and nested functions ran.
-		COMMENT
-		COMMENT <p>In a recursive execution, {@link #execution execution != null}. It is
-		COMMENT required that {@code tracer == null}, or the execution reports an error and is
-		COMMENT skipped. The return value is {@code 0}.
-		COMMENT
-		COMMENT @return a non-zero value for a new execution, or {@code 0} for a recursive
-		COMMENT execution
-		COMMENT @see #execute(CommandFunction, ServerCommandSource)
-		ARG 1 function
-			COMMENT the function
-		ARG 2 source
-			COMMENT the command source to execute with
-		ARG 3 tracer
-			COMMENT a tracer for a non-recursive function execution
-		ARG 4 arguments
-			COMMENT arguments for macro substitution, if any
-	CLASS class_2992 Entry
-		FIELD field_13424 source Lnet/minecraft/class_2168;
-		FIELD field_13425 element Lnet/minecraft/class_2158$class_2161;
-		FIELD field_33549 depth I
-		METHOD <init> (Lnet/minecraft/class_2168;ILnet/minecraft/class_2158$class_2161;)V
-			ARG 1 source
-			ARG 2 depth
-			ARG 3 element
-		METHOD method_12914 execute (Lnet/minecraft/class_2991;Ljava/util/Deque;ILnet/minecraft/class_2991$class_6346;)V
-			ARG 1 manager
-			ARG 2 entries
-			ARG 3 maxChainLength
-			ARG 4 tracer
-	CLASS class_6345 Execution
-		COMMENT An active execution of functions. It uses two deques to simulate a stack for a
-		COMMENT depth-first expansion of functions, as the function call stack depth may exceed
-		COMMENT the allowed JVM stack size.
-		COMMENT
-		COMMENT @see CommandFunctionManager#execution
-		FIELD field_33545 depth I
-		FIELD field_33546 tracer Lnet/minecraft/class_2991$class_6346;
-		FIELD field_33547 queue Ljava/util/Deque;
-		FIELD field_33548 waitlist Ljava/util/List;
-		FIELD field_44584 returned Z
-		METHOD <init> (Lnet/minecraft/class_2991;Lnet/minecraft/class_2991$class_6346;)V
-			ARG 2 tracer
-		METHOD method_36343 recursiveRun (Lnet/minecraft/class_2158;Lnet/minecraft/class_2168;)V
-			COMMENT Handles a recursive case in {@link CommandFunctionManager#execute(CommandFunction,
-			COMMENT ServerCommandSource, CommandFunctionManager.Tracer, NbtCompound)}.
-			COMMENT
-			COMMENT <p>This effectively swaps an entry with a command element with {@code /function}
-			COMMENT command at the head of the deque with another entry with a function element
-			COMMENT containing the actual command elements referenced in that function.
-			ARG 1 function
-				COMMENT the function
-			ARG 2 source
-				COMMENT the command source
-		METHOD method_36344 reportError (Ljava/lang/String;)V
-			ARG 1 message
-		METHOD method_36346 run (Lnet/minecraft/class_2158;Lnet/minecraft/class_2168;)I
-			COMMENT Handles a new case in {@link CommandFunctionManager#execute(CommandFunction,
-			COMMENT ServerCommandSource, CommandFunctionManager.Tracer, NbtCompound)}.
-			COMMENT
-			COMMENT @return a value for the command result
-			ARG 1 function
-				COMMENT the function
-			ARG 2 source
-				COMMENT the command source
-		METHOD method_51275 addReturnConsumer (Lnet/minecraft/class_2168;)Lnet/minecraft/class_2168;
-			ARG 1 source
-		CLASS class_8502 ReturnValueConsumer
-			FIELD field_44586 delegate Ljava/util/function/IntConsumer;
-			METHOD <init> (Lnet/minecraft/class_2991$class_6345;Ljava/util/function/IntConsumer;)V
-				ARG 2 delegate
-			METHOD accept (I)V
-				ARG 1 value
-	CLASS class_6346 Tracer
-		COMMENT A tree-visitor-like tracer, useful for gaining insights on function execution.
-		METHOD method_36349 traceCommandStart (ILjava/lang/String;)V
-			ARG 1 depth
-			ARG 2 command
-		METHOD method_36350 traceCommandEnd (ILjava/lang/String;I)V
-			ARG 1 depth
-			ARG 2 command
-			ARG 3 result
-		METHOD method_36351 traceFunctionCall (ILnet/minecraft/class_2960;I)V
-			ARG 1 depth
-			ARG 2 function
-			ARG 3 size
-		METHOD method_36352 traceError (ILjava/lang/String;)V
-			ARG 1 depth
-			ARG 2 message

mappings/net/minecraft/server/function/LazyContainer.mapping

@@ -0,0 +1,12 @@
+CLASS net/minecraft/class_2159 net/minecraft/server/function/LazyContainer
+	COMMENT A lazy reference to another command function that may or may not exist.
+	COMMENT
+	COMMENT <p>Notice that such an instance does not refresh upon reloads and may become
+	COMMENT invalid.
+	FIELD field_9807 id Lnet/minecraft/class_2960;
+	FIELD field_9808 function Ljava/util/Optional;
+	FIELD field_9809 EMPTY Lnet/minecraft/class_2159;
+	FIELD field_9810 initialized Z
+	METHOD method_9196 get (Lnet/minecraft/class_2991;)Ljava/util/Optional;
+		ARG 1 manager
+	METHOD method_9197 getId ()Lnet/minecraft/class_2960;

mappings/net/minecraft/server/function/Macro.mapping

@@ -0,0 +1,10 @@
+CLASS net/minecraft/class_8641 net/minecraft/server/function/Macro
+	FIELD field_45149 variables Ljava/util/List;
+	FIELD field_45150 CACHE_SIZE I
+	FIELD field_45151 cache Lit/unimi/dsi/fastutil/objects/Object2ObjectLinkedOpenHashMap;
+	FIELD field_46190 DECIMAL_FORMAT Ljava/text/DecimalFormat;
+	METHOD <init> (Lnet/minecraft/class_2960;Ljava/util/List;Ljava/util/List;)V
+		ARG 1 id
+	METHOD method_52597 withMacroReplaced (Ljava/util/List;Ljava/util/List;Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_8839;)Lnet/minecraft/class_8868;
+	METHOD method_53840 toString (Lnet/minecraft/class_2520;)Ljava/lang/String;
+		ARG 0 nbt

mappings/net/minecraft/server/function/Tracer.mapping

@@ -0,0 +1,16 @@
+CLASS net/minecraft/class_6346 net/minecraft/server/function/Tracer
+	COMMENT A tree-visitor-like tracer, useful for gaining insights on function execution.
+	METHOD method_36349 traceCommandStart (ILjava/lang/String;)V
+		ARG 1 depth
+		ARG 2 command
+	METHOD method_36350 traceCommandEnd (ILjava/lang/String;I)V
+		ARG 1 depth
+		ARG 2 command
+		ARG 3 result
+	METHOD method_36351 traceFunctionCall (ILnet/minecraft/class_2960;I)V
+		ARG 1 depth
+		ARG 2 function
+		ARG 3 size
+	METHOD method_36352 traceError (ILjava/lang/String;)V
+		ARG 1 depth
+		ARG 2 message

mappings/net/minecraft/unused/packageinfo/PackageInfo8857.mapping

@@ -0,0 +1 @@
+CLASS net/minecraft/class_8857 net/minecraft/unused/packageinfo/PackageInfo8857

mappings/net/minecraft/unused/packageinfo/PackageInfo8866.mapping

@@ -0,0 +1 @@
+CLASS net/minecraft/class_8866 net/minecraft/unused/packageinfo/PackageInfo8866

mappings/net/minecraft/unused/packageinfo/PackageInfo8874.mapping

@@ -0,0 +1 @@
+CLASS net/minecraft/class_8874 net/minecraft/unused/packageinfo/PackageInfo8874

mappings/net/minecraft/world/CommandBlockExecutor.mapping

@@ -28,8 +28,7 @@ CLASS net/minecraft/class_1918 net/minecraft/world/CommandBlockExecutor
 		ARG 1 lastOutput
 	METHOD method_8292 getLastOutput ()Lnet/minecraft/class_2561;
 	METHOD method_8293 getWorld ()Lnet/minecraft/class_3218;
-	METHOD method_8294 (Lcom/mojang/brigadier/context/CommandContext;ZI)V
+	METHOD method_8294 (Lnet/minecraft/class_2168;ZI)V
-		ARG 1 context
 		ARG 2 success
 		ARG 3 result
 	METHOD method_8295 markDirty ()V