23w41a stuff (#3698)

* Improve some names mapped in #3694

- `VirtualMachine` sounds like an expensive object to construct. This isn't really a VM, so rename it to something
more neutral.
- `Control` conflicts with the class in entity.ai package. Add a prefix.
- Related changes.

* Rename inaccurate method names in VehicleEntity

* Map ProjectileUtil constant

* More command stuff

* Realms stuff

* Map everything else

* Apply suggestions from code review

* Update mappings/net/minecraft/entity/vehicle/VehicleEntity.mapping

mappings/net/minecraft/block/AbstractBlock.mapping

@@ -497,8 +497,14 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
 		COMMENT is removed, or to drop the contents of an inventory. The check {@code
 		COMMENT state.isOf(newState.getBlock())} can be used to see if the block was removed or not.
 		COMMENT
+		COMMENT <p>For most block entities, {@link net.minecraft.util.ItemScatterer#onStateReplaced}
+		COMMENT provides a good implementation of this method. Make sure to call {@code
+		COMMENT super.onStateReplaced(state, world, pos, newState, moved);} <strong>after</strong>
+		COMMENT invoking {@code ItemScatterer} methods.
+		COMMENT
 		COMMENT @deprecated Consider calling {@link AbstractBlockState#onStateReplaced} instead. See <a href="#deprecated-methods">why these methods are deprecated</a>.
 		COMMENT
+		COMMENT @see net.minecraft.util.ItemScatterer#onStateReplaced
 		COMMENT @see net.minecraft.util.ItemScatterer#spawn(World, BlockPos, net.minecraft.inventory.Inventory)
 		COMMENT @see #onBlockAdded
 		ARG 1 state

mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping

@@ -84,6 +84,8 @@ CLASS net/minecraft/class_528 net/minecraft/client/gui/screen/world/WorldListWid
 		METHOD method_35740 getLevelDisplayName ()Ljava/lang/String;
 		METHOD method_52205 loadIcon ()V
 		METHOD method_52265 validateIconPath ()V
+		METHOD method_54386 (Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583;
+			ARG 0 style
 	CLASS class_7414 Entry
 		METHOD method_43465 isAvailable ()Z
 	CLASS class_7415 LoadingEntry

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

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

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

@@ -3,6 +3,9 @@ CLASS net/minecraft/class_7919 net/minecraft/client/gui/tooltip/Tooltip
 	FIELD field_41102 content Lnet/minecraft/class_2561;
 	FIELD field_41103 lines Ljava/util/List;
 	FIELD field_41104 narration Lnet/minecraft/class_2561;
+	FIELD field_46719 delay I
+	FIELD field_46720 renderCheckTime J
+	FIELD field_46721 prevShouldRender Z
 	METHOD <init> (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V
 		ARG 1 content
 		ARG 2 narration
@@ -16,3 +19,13 @@ CLASS net/minecraft/class_7919 net/minecraft/client/gui/tooltip/Tooltip
 	METHOD method_47408 of (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_7919;
 		ARG 0 content
 		ARG 1 narration
+	METHOD method_54383 setDelay (I)V
+		ARG 1 delay
+	METHOD method_54384 render (ZZLnet/minecraft/class_8030;)V
+		ARG 1 hovered
+		ARG 2 focused
+		ARG 3 focus
+	METHOD method_54385 createPositioner (ZZLnet/minecraft/class_8030;)Lnet/minecraft/class_8000;
+		ARG 1 hovered
+		ARG 2 focused
+		ARG 3 focus

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

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

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

@@ -4,6 +4,8 @@ CLASS net/minecraft/class_4346 net/minecraft/client/realms/Request
 	FIELD field_19598 connected Z
 	FIELD field_32096 READ_TIMEOUT I
 	FIELD field_32097 CONNECT_TIMEOUT I
+	FIELD field_46690 IS_PRERELEASE_HEADER Ljava/lang/String;
+	FIELD field_46691 COOKIE_HEADER Ljava/lang/String;
 	METHOD <init> (Ljava/lang/String;II)V
 		ARG 1 url
 		ARG 2 connectTimeout
@@ -54,6 +56,8 @@ 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_54362 prerelease (Z)V
+		ARG 1 prerelease
 	CLASS class_4347 Delete
 	CLASS class_4348 Get
 	CLASS class_4349 Post

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

@@ -22,6 +22,7 @@ CLASS net/minecraft/class_4877 net/minecraft/client/realms/dto/RealmsServer
 	FIELD field_46693 parentWorldName Ljava/lang/String;
 	FIELD field_46694 activeVersion Ljava/lang/String;
 	FIELD field_46695 compatibility Lnet/minecraft/class_4877$class_8842;
+	FIELD field_46696 NO_PARENT I
 	METHOD equals (Ljava/lang/Object;)Z
 		ARG 1 o
 	METHOD method_25053 getDescription ()Ljava/lang/String;

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

@@ -31,6 +31,16 @@ 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;
+	FIELD field_46709 creationTask Lnet/minecraft/class_4445;
+	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
+		ARG 1 parent
+		ARG 2 serverData
+		ARG 3 slot
+		ARG 4 title
+		ARG 5 subtitle
+		ARG 6 subtitleColor
+		ARG 7 taskTitle
+		ARG 8 callback
 	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
@@ -39,6 +49,8 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsCrea
 		ARG 5 subtitle
 		ARG 6 subtitleColor
 		ARG 7 taskTitle
+		ARG 8 creationTask
+		ARG 9 callback
 	METHOD method_21377 switchSlot (Ljava/lang/Runnable;)V
 		ARG 1 callback
 	METHOD method_21384 frame (I)I
@@ -50,7 +62,9 @@ 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_53799 (Lnet/minecraft/class_4410;Lnet/minecraft/class_364;)V
 		ARG 1 child
 	METHOD method_53800 (Lnet/minecraft/class_4185;)V
@@ -63,6 +77,8 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsCrea
 	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 creationTask
+		ARG 3 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;
@@ -73,6 +89,8 @@ CLASS net/minecraft/class_4410 net/minecraft/client/realms/gui/screen/RealmsCrea
 		ARG 1 button
 	METHOD method_53807 (Lnet/minecraft/class_4185;)V
 		ARG 1 button
+	METHOD method_54380 runTasks (Lnet/minecraft/class_4358;)V
+		ARG 1 task
 	CLASS class_4411 FrameButton
 		FIELD field_20032 image Lnet/minecraft/class_2960;
 		METHOD <init> (Lnet/minecraft/class_4410;IILnet/minecraft/class_2561;Lnet/minecraft/class_2960;Lnet/minecraft/class_4185$class_4241;)V

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

@@ -5,6 +5,10 @@ CLASS net/minecraft/class_4398 net/minecraft/client/realms/gui/screen/RealmsLong
 	FIELD field_33779 NARRATOR Lnet/minecraft/class_4907;
 	FIELD field_46111 layout Lnet/minecraft/class_8667;
 	FIELD field_46112 loading Lnet/minecraft/class_8661;
+	FIELD field_46707 tasks Ljava/util/List;
+	METHOD <init> (Lnet/minecraft/class_437;[Lnet/minecraft/class_4358;)V
+		ARG 1 parent
+		ARG 2 tasks
 	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

@@ -163,19 +163,74 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain
 		ARG 2 result
 	METHOD method_54320 updateLoadStatus ()V
 	METHOD method_54324 resetPeriodicCheckers ()V
+	METHOD method_54326 showCompatibilityScreen (Lnet/minecraft/class_4877;Lnet/minecraft/class_437;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V
+		ARG 0 serverData
+		ARG 1 parent
+		ARG 2 title
+		ARG 3 description
+		ARG 4 confirmText
+	METHOD method_54327 play (Lnet/minecraft/class_4877;Lnet/minecraft/class_437;Z)V
+		ARG 0 serverData
+		ARG 1 parent
+		ARG 2 needsPreparation
 	METHOD method_54328 (Lnet/minecraft/class_5676;Ljava/lang/Boolean;)V
 		ARG 1 button
 		ARG 2 snapshot
+	METHOD method_54329 (Lnet/minecraft/class_437;Lnet/minecraft/class_4877;Z)V
+		ARG 2 confirmed
 	METHOD method_54330 isSnapshotRealmsEligible ()Z
+	METHOD method_54331 (Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583;
+		ARG 0 style
 	CLASS class_4329 RealmSelectionList
 	CLASS class_4330 RealmSelectionListEntry
 		FIELD field_19518 server Lnet/minecraft/class_4877;
+		FIELD field_46686 tooltip Lnet/minecraft/class_7919;
 		METHOD <init> (Lnet/minecraft/class_4325;Lnet/minecraft/class_4877;)V
 			ARG 2 server
 		METHOD method_38506 getRealmsServer ()Lnet/minecraft/class_4877;
 		METHOD method_52653 play ()V
 		METHOD method_52654 createRealm ()V
 	CLASS class_4866 Entry
+		METHOD method_54345 getNameY (I)I
+			ARG 1 y
+		METHOD method_54346 getVersionRight (IILnet/minecraft/class_2561;)I
+			ARG 1 x
+			ARG 2 width
+			ARG 3 version
+		METHOD method_54347 (ILnet/minecraft/class_2583;)Lnet/minecraft/class_2583;
+			ARG 1 style
+		METHOD method_54349 getActiveVersion (Lnet/minecraft/class_4877;I)Lnet/minecraft/class_2561;
+			ARG 1 server
+			ARG 2 color
+		METHOD method_54350 renderStatusIcon (Lnet/minecraft/class_4877;Lnet/minecraft/class_332;IIII)V
+			ARG 1 server
+			ARG 2 context
+			ARG 3 x
+			ARG 4 y
+			ARG 5 mouseX
+			ARG 6 mouseY
+		METHOD method_54351 drawTextureWithTooltip (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 tooltip
+		METHOD method_54352 drawTrimmedText (Lnet/minecraft/class_332;Ljava/lang/String;IIII)V
+			ARG 1 context
+			ARG 2 string
+			ARG 3 left
+			ARG 4 y
+			ARG 5 right
+			ARG 6 color
+		METHOD method_54353 getTextHeight ()I
+		METHOD method_54354 getNameX (I)I
+			ARG 1 x
+		METHOD method_54356 getDescriptionY (I)I
+			ARG 1 y
+		METHOD method_54357 getStatusY (I)I
+			ARG 1 y
 	CLASS class_8200 VisitButtonEntry
 		FIELD field_42999 button Lnet/minecraft/class_4185;
 		METHOD <init> (Lnet/minecraft/class_4325;Lnet/minecraft/class_4185;)V
@@ -193,8 +248,10 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain
 		FIELD field_43009 grid Lnet/minecraft/class_7845;
 		FIELD field_43010 textGrid Lnet/minecraft/class_7843;
 		FIELD field_43011 width I
+		FIELD field_46218 lines I
 		METHOD <init> (Lnet/minecraft/class_4325;Lnet/minecraft/class_2561;ILnet/minecraft/class_8204;)V
 			ARG 2 message
+			ARG 3 lines
 			ARG 4 notification
 		METHOD method_49564 setWidth (I)V
 			ARG 1 width
@@ -229,3 +286,11 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain
 		FIELD field_46679 server Lnet/minecraft/class_4877;
 		METHOD <init> (Lnet/minecraft/class_4325;Lnet/minecraft/class_4877;)V
 			ARG 2 server
+		METHOD method_54343 (Lnet/minecraft/class_8816;)V
+			ARG 1 screen
+		METHOD method_54344 showPopup ()V
+	CLASS class_8841 ParentRealmSelectionListEntry
+		FIELD field_46684 server Lnet/minecraft/class_4877;
+		FIELD field_46685 tooltip Lnet/minecraft/class_7919;
+		METHOD <init> (Lnet/minecraft/class_4325;Lnet/minecraft/class_4877;)V
+			ARG 2 server

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

@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_4438 net/minecraft/client/realms/task/RealmsConnectTask
-	FIELD field_20222 realmsConnect Lnet/minecraft/class_4902;
+	FIELD field_20222 realmsConnection Lnet/minecraft/class_4902;
 	FIELD field_20223 address Lnet/minecraft/class_4878;
 	FIELD field_26922 server Lnet/minecraft/class_4877;
 	FIELD field_46133 TITLE Lnet/minecraft/class_2561;

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

@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_4439 net/minecraft/client/realms/task/RealmsGetServerDetailsTask
+CLASS net/minecraft/class_4439 net/minecraft/client/realms/task/RealmsPrepareConnectionTask
 	FIELD field_20224 server Lnet/minecraft/class_4877;
 	FIELD field_20225 lastScreen Lnet/minecraft/class_437;
 	FIELD field_36356 LOGGER Lorg/slf4j/Logger;

mappings/net/minecraft/command/CommandAction.mapping

@@ -1,4 +1,4 @@
 CLASS net/minecraft/class_8853 net/minecraft/command/CommandAction
 	METHOD execute (Lnet/minecraft/class_8854;I)V
-		ARG 1 vm
+		ARG 1 context
 		ARG 2 depth

mappings/net/minecraft/command/CommandExecutionContext.mapping

@@ -1,7 +1,7 @@
-CLASS net/minecraft/class_8854 net/minecraft/command/VirtualMachine
+CLASS net/minecraft/class_8854 net/minecraft/command/CommandExecutionContext
 	FIELD field_46729 MAX_COMMAND_QUEUE_LENGTH I
 	FIELD field_46730 LOGGER Lorg/slf4j/Logger;
-	FIELD field_46731 commandsExecuted I
+	FIELD field_46731 maxCommandChainLength I
 	FIELD field_46732 forkLimit I
 	FIELD field_46733 profiler Lnet/minecraft/class_3695;
 	FIELD field_46734 tracer Lnet/minecraft/class_6346;
@@ -19,7 +19,7 @@ CLASS net/minecraft/class_8854 net/minecraft/command/VirtualMachine
 	METHOD method_54392 enqueueCommand (Lnet/minecraft/class_8847;)V
 		ARG 1 entry
 	METHOD method_54393 enqueueCommand (Lnet/minecraft/class_8854;Ljava/lang/String;Lcom/mojang/brigadier/context/ContextChain;Lnet/minecraft/class_8839;)V
-		ARG 0 vm
+		ARG 0 context
 		ARG 1 command
 		ARG 3 source
 	METHOD method_54394 setTracer (Lnet/minecraft/class_6346;)V

mappings/net/minecraft/command/CommandQueueEntry.mapping

@@ -1,3 +1,3 @@
 CLASS net/minecraft/class_8847 net/minecraft/command/CommandQueueEntry
 	METHOD method_54388 execute (Lnet/minecraft/class_8854;)V
-		ARG 1 vm
+		ARG 1 context

mappings/net/minecraft/command/ControlFlowAware.mapping

@@ -9,6 +9,7 @@ CLASS net/minecraft/class_8848 net/minecraft/command/ControlFlowAware
 			ARG 1 context
 	CLASS class_8850 Helper
 		METHOD method_54255 sendError (Lcom/mojang/brigadier/exceptions/CommandSyntaxException;Lnet/minecraft/class_8839;Z)V
+			ARG 1 exception
 			ARG 2 source
 			ARG 3 silent
 		METHOD method_54259 executeInner (Lnet/minecraft/class_8839;Lcom/mojang/brigadier/context/ContextChain;ZLnet/minecraft/class_8855;)V

mappings/net/minecraft/command/ExecutionControl.mapping

@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_8855 net/minecraft/command/Control
+CLASS net/minecraft/class_8855 net/minecraft/command/ExecutionControl
 	METHOD method_54401 doReturn ()V
 	METHOD method_54402 enqueueAction (Lnet/minecraft/class_8853;)V
 		ARG 1 action

mappings/net/minecraft/command/Forkable.mapping

@@ -5,3 +5,5 @@ CLASS net/minecraft/class_8851 net/minecraft/command/Forkable
 		ARG 3 forkedMode
 		ARG 4 control
 	CLASS class_8852 RedirectModifier
+		METHOD apply (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/Collection;
+			ARG 1 context

mappings/net/minecraft/command/SingleCommandAction.mapping

@@ -4,8 +4,9 @@ CLASS net/minecraft/class_8858 net/minecraft/command/SingleCommandAction
 	FIELD field_46741 contextChain Lcom/mojang/brigadier/context/ContextChain;
 	METHOD <init> (Ljava/lang/String;Lcom/mojang/brigadier/context/ContextChain;)V
 		ARG 1 command
+		ARG 2 contextChain
 	METHOD method_54407 traceCommandStart (Lnet/minecraft/class_8854;I)V
-		ARG 1 vm
+		ARG 1 context
 		ARG 2 depth
 	METHOD method_54408 (Lnet/minecraft/class_8865;ILnet/minecraft/class_8839;)Lnet/minecraft/class_8847;
 		ARG 1 depth
@@ -14,22 +15,24 @@ CLASS net/minecraft/class_8858 net/minecraft/command/SingleCommandAction
 		ARG 0 count
 	METHOD method_54410 execute (Ljava/util/List;Lnet/minecraft/class_8854;IZ)V
 		ARG 1 forks
-		ARG 2 vm
+		ARG 2 context
 		ARG 3 depth
 		ARG 4 silent
 	METHOD method_54411 fixAtDepth (Lnet/minecraft/class_8854;I)Lnet/minecraft/class_8855;
-		ARG 0 vm
+		ARG 0 context
 		ARG 1 depth
 	CLASS class_8859 MultiSource
 		FIELD field_46744 forkedMode Z
 		FIELD field_46745 sources Ljava/util/List;
 		METHOD <init> (Ljava/lang/String;Lcom/mojang/brigadier/context/ContextChain;ZLjava/util/List;)V
 			ARG 1 command
+			ARG 2 contextChain
 			ARG 3 forkedMode
 			ARG 4 sources
 	CLASS class_8860 SingleSource
 		FIELD field_46746 source Lnet/minecraft/class_8839;
 		METHOD <init> (Ljava/lang/String;Lcom/mojang/brigadier/context/ContextChain;Lnet/minecraft/class_8839;)V
 			ARG 1 command
+			ARG 2 contextChain
 			ARG 3 source
 	CLASS class_8861 Sourced

mappings/net/minecraft/command/SourcedCommandAction.mapping

@@ -3,8 +3,8 @@ CLASS net/minecraft/class_8856 net/minecraft/command/SourcedCommandAction
 		ARG 1 source
 	METHOD execute (Ljava/lang/Object;Lnet/minecraft/class_8854;I)V
 		ARG 1 source
-		ARG 2 vm
+		ARG 2 context
 		ARG 3 depth
 	METHOD method_54405 (Ljava/lang/Object;Lnet/minecraft/class_8854;I)V
-		ARG 2 vm
+		ARG 2 context
 		ARG 3 depth

mappings/net/minecraft/command/SteppedCommandAction.mapping

@@ -8,7 +8,7 @@ CLASS net/minecraft/class_8863 net/minecraft/command/SteppedCommandAction
 		ARG 2 actions
 		ARG 3 depth
 	METHOD method_54414 enqueueCommands (Lnet/minecraft/class_8854;ILjava/util/List;Lnet/minecraft/class_8863$class_8864;)V
-		ARG 0 vm
+		ARG 0 context
 		ARG 1 depth
 		ARG 2 actions
 		ARG 3 wrapper

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

@@ -1,4 +1,5 @@
 CLASS net/minecraft/class_1675 net/minecraft/entity/projectile/ProjectileUtil
+	FIELD field_46654 DEFAULT_MARGIN F
 	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

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

@@ -2,7 +2,7 @@ CLASS net/minecraft/class_8836 net/minecraft/entity/vehicle/VehicleEntity
 	FIELD field_46655 DAMAGE_WOBBLE_TICKS Lnet/minecraft/class_2940;
 	FIELD field_46656 DAMAGE_WOBBLE_SIDE Lnet/minecraft/class_2940;
 	FIELD field_46657 DAMAGE_WOBBLE_STRENGTH Lnet/minecraft/class_2940;
-	METHOD method_54293 shouldAlwaysDropItem ()Z
+	METHOD method_54293 shouldAlwaysKill ()Z
 	METHOD method_54294 getDamageWobbleStrength ()F
 	METHOD method_54295 getDamageWobbleTicks ()I
 	METHOD method_54296 getDamageWobbleSide ()I
@@ -14,6 +14,6 @@ CLASS net/minecraft/class_8836 net/minecraft/entity/vehicle/VehicleEntity
 		ARG 1 damageWobbleTicks
 	METHOD method_54300 setDamageWobbleSide (I)V
 		ARG 1 damageWobbleSide
-	METHOD method_7516 dropItems (Lnet/minecraft/class_1282;)V
+	METHOD method_7516 killAndDropSelf (Lnet/minecraft/class_1282;)V
-		ARG 1 damageSource
+		ARG 1 source
 	METHOD method_7557 asItem ()Lnet/minecraft/class_1792;

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

@@ -2,14 +2,14 @@ CLASS net/minecraft/class_8839 net/minecraft/server/command/AbstractServerComman
 	METHOD method_54306 consumeResult (ZI)V
 		ARG 1 success
 		ARG 2 result
-	METHOD method_54307 withResultConsumer (Lnet/minecraft/class_8838;)Lnet/minecraft/class_8839;
+	METHOD method_54307 withResultStorer (Lnet/minecraft/class_8838;)Lnet/minecraft/class_8839;
-		ARG 1 resultConsumer
+		ARG 1 resultStorer
 	METHOD method_54308 withReturnValueConsumer (Ljava/util/function/IntConsumer;)Lnet/minecraft/class_8839;
 		ARG 1 returnValueConsumer
 	METHOD method_54309 consumeResult (I)V
 		ARG 1 result
 	METHOD method_54310 getDispatcher ()Lcom/mojang/brigadier/CommandDispatcher;
-	METHOD method_54311 withDummyResultConsumer ()Lnet/minecraft/class_8839;
+	METHOD method_54311 withDummyResultStorer ()Lnet/minecraft/class_8839;
 	METHOD method_54316 (Lcom/mojang/brigadier/context/CommandContext;ZI)V
 		ARG 0 context
 		ARG 1 success

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

@@ -30,11 +30,11 @@ CLASS net/minecraft/class_2170 net/minecraft/server/command/CommandManager
 		ARG 0 registryLookup
 	METHOD method_54312 throwException (Lcom/mojang/brigadier/ParseResults;)V
 		ARG 0 parse
-	METHOD method_54313 callWithVm (Lnet/minecraft/class_2168;Ljava/util/function/Consumer;)V
+	METHOD method_54313 callWithContext (Lnet/minecraft/class_2168;Ljava/util/function/Consumer;)V
 		ARG 0 commandSource
 		ARG 1 callback
 	METHOD method_54314 (Ljava/lang/String;Lcom/mojang/brigadier/context/ContextChain;Lnet/minecraft/class_2168;Lnet/minecraft/class_8854;)V
-		ARG 3 vm
+		ARG 3 context
 	METHOD method_9235 getDispatcher ()Lcom/mojang/brigadier/CommandDispatcher;
 	METHOD method_9236 (Ljava/lang/String;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583;
 		ARG 1 style

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

@@ -13,6 +13,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_13161 (Lnet/minecraft/class_2168;)Z
+		ARG 0 source
 	METHOD method_36353 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
 	CLASS class_6347 Tracer
@@ -29,5 +31,5 @@ CLASS net/minecraft/class_3032 net/minecraft/server/command/DebugCommand
 		METHOD method_36357 writeNewLine ()V
 	CLASS class_8829 Command
 		METHOD method_54257 (Ljava/util/Collection;Lnet/minecraft/class_2168;ILjava/lang/String;Lnet/minecraft/class_8854;I)V
-			ARG 4 vm
+			ARG 4 context
 			ARG 5 depth

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

@@ -31,6 +31,7 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand
 	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;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;
@@ -77,6 +78,7 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand
 	METHOD method_13276 (Lcom/mojang/brigadier/context/CommandContext;I)Lnet/minecraft/class_2520;
 		ARG 1 result
 	METHOD method_13277 (ZZLnet/minecraft/class_3002;Lnet/minecraft/class_2168;ZI)V
+		ARG 3 context
 		ARG 4 success
 		ARG 5 result
 	METHOD method_13280 (Lcom/mojang/brigadier/context/CommandContext;)Z
@@ -113,6 +115,7 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand
 	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;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;
@@ -266,9 +269,10 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand
 		ARG 0 sources
 		ARG 1 sourceTransformer
 		ARG 2 resultPredicate
+		ARG 3 contextChain
 		ARG 4 arguments
 		ARG 5 control
-		ARG 6 getFunctionNames
+		ARG 6 functionNamesGetter
 		ARG 7 silent
 	METHOD method_54265 createExecutionSource (Ljava/util/function/Function;Ljava/util/function/IntPredicate;Ljava/util/List;Lnet/minecraft/class_8839;Z)Lnet/minecraft/class_8839;
 		ARG 0 sourceTransformer
@@ -286,10 +290,16 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand
 	CLASS class_3052 Condition
 		METHOD test (Lcom/mojang/brigadier/context/CommandContext;)Z
 			ARG 1 context
-	CLASS class_8830
+	CLASS class_8830 FunctionNamesGetter
 		METHOD get (Lcom/mojang/brigadier/context/CommandContext;)Ljava/lang/Object;
 			ARG 1 context
 	CLASS class_8831 IfUnlessRedirector
 		FIELD field_46643 predicate Ljava/util/function/IntPredicate;
 		METHOD <init> (Z)V
-			ARG 1 positive
+			ARG 1 success
+		METHOD method_54268 (I)Z
+			ARG 0 result
+		METHOD method_54269 (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/Collection;
+			ARG 0 context
+		METHOD method_54271 (I)Z
+			ARG 0 result

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

@@ -1,6 +1,8 @@
 CLASS net/minecraft/class_8503 net/minecraft/server/command/ReturnCommand
 	METHOD method_51277 register (Lcom/mojang/brigadier/CommandDispatcher;)V
 		ARG 0 dispatcher
+	METHOD method_54286 (Lnet/minecraft/class_8839;)Z
+		ARG 0 source
 	CLASS class_8834 ReturnRunRedirector
 		METHOD method_54287 (Lnet/minecraft/class_8855;Lnet/minecraft/class_8839;)Lnet/minecraft/class_8839;
 			ARG 1 source

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

@@ -13,7 +13,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 Lnet/minecraft/class_8838;
+	FIELD field_9821 resultStorer 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;
@@ -42,7 +42,7 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource
 		ARG 8 server
 		ARG 9 entity
 		ARG 10 silent
-		ARG 11 resultConsumer
+		ARG 11 resultStorer
 		ARG 12 entityAnchor
 		ARG 13 signedArguments
 		ARG 14 messageChainTaskQueue
@@ -78,6 +78,8 @@ 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_51412 (I)V
+		ARG 0 returnValue
 	METHOD method_54305 (Lnet/minecraft/class_2168;ZI)V
 		ARG 0 context
 		ARG 1 success
@@ -90,8 +92,8 @@ 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 (Lnet/minecraft/class_8838;Ljava/util/function/BinaryOperator;)Lnet/minecraft/class_2168;
+	METHOD method_9209 mergeStorers (Lnet/minecraft/class_8838;Ljava/util/function/BinaryOperator;)Lnet/minecraft/class_2168;
-		ARG 1 resultConsumer
+		ARG 1 resultStorer
 		ARG 2 merger
 	METHOD method_9210 getRotation ()Lnet/minecraft/class_241;
 	METHOD method_9211 getServer ()Lnet/minecraft/server/MinecraftServer;
@@ -125,6 +127,5 @@ 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 (Lnet/minecraft/class_8838;)Lnet/minecraft/class_2168;
 	METHOD method_9232 withEntity (Lnet/minecraft/class_1297;)Lnet/minecraft/class_2168;
 		ARG 1 entity

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

@@ -7,7 +7,9 @@ CLASS net/minecraft/class_2158 net/minecraft/server/function/CommandFunction
 		ARG 2 dispatcher
 		ARG 3 source
 	METHOD method_54417 parse (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_8839;Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_8856;
+		ARG 0 dispatcher
 		ARG 1 source
+		ARG 2 reader
 	METHOD method_9195 create (Lnet/minecraft/class_2960;Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_8839;Ljava/util/List;)Lnet/minecraft/class_2158;
 		COMMENT Parses a function in the context of {@code source}.
 		COMMENT

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

@@ -28,12 +28,6 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana
 	METHOD method_12900 getDispatcher ()Lcom/mojang/brigadier/CommandDispatcher;
 	METHOD method_12904 execute (Lnet/minecraft/class_2158;Lnet/minecraft/class_2168;)V
 		COMMENT Executes a function.
-		COMMENT
-		COMMENT <p>This is same as calling {@link #execute(CommandFunction, ServerCommandSource,
-		COMMENT Tracer, NbtCompound) execute(function, source, null, null)}.
-		COMMENT
-		COMMENT @return the command output value
-		COMMENT @see #execute(CommandFunction, ServerCommandSource, Tracer, NbtCompound)
 		ARG 1 function
 			COMMENT the function
 		ARG 2 source
@@ -54,4 +48,4 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana
 	METHOD method_29773 load (Lnet/minecraft/class_5349;)V
 		ARG 1 loader
 	METHOD method_54252 (Lnet/minecraft/class_8868;Lnet/minecraft/class_2168;Lnet/minecraft/class_8854;)V
-		ARG 2 vm
+		ARG 2 context

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

@@ -12,9 +12,12 @@ CLASS net/minecraft/class_8641 net/minecraft/server/function/Macro
 	METHOD method_52597 withMacroReplaced (Ljava/util/List;Ljava/util/List;Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_8839;)Lnet/minecraft/class_8868;
 		ARG 1 varNames
 		ARG 2 arguments
+		ARG 3 dispatcher
 		ARG 4 source
 	METHOD method_53840 toString (Lnet/minecraft/class_2520;)Ljava/lang/String;
 		ARG 0 nbt
+	METHOD method_54423 (Ljava/text/DecimalFormat;)V
+		ARG 0 format
 	METHOD method_54424 addArgumentsByIndices (Ljava/util/List;Lit/unimi/dsi/fastutil/ints/IntList;Ljava/util/List;)V
 		ARG 0 arguments
 		ARG 1 indices

mappings/net/minecraft/test/GameTestState.mapping

@@ -73,3 +73,7 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState
 	METHOD method_54145 shouldRerunUntilFailed ()Z
 	METHOD method_54146 setRerunUntilFailed (Z)V
 		ARG 1 rerunUntilFailed
+	METHOD method_54434 (Lnet/minecraft/class_1297;)V
+		ARG 0 entity
+	METHOD method_54435 (Lnet/minecraft/class_1297;)Z
+		ARG 0 entity

mappings/net/minecraft/util/Colors.mapping

@@ -10,3 +10,5 @@ CLASS net/minecraft/class_8012 net/minecraft/util/Colors
 		COMMENT Represents the color gray, {@code 0xFF808080}.
 	FIELD field_45073 LIGHT_GRAY I
 		COMMENT Represents the color light gray, {@code 0xFFA0A0A0}.
+	FIELD field_46652 LIGHT_RED I
+		COMMENT Represents the color light red, {@code 0xFFDF5050}.

mappings/net/minecraft/util/ItemScatterer.mapping

@@ -12,6 +12,13 @@ CLASS net/minecraft/class_1264 net/minecraft/util/ItemScatterer
 		ARG 1 pos
 		ARG 2 stacks
 	METHOD method_54291 onStateReplaced (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V
+		COMMENT Implementation {@link net.minecraft.block.AbstractBlock#onStateReplaced}.
+		COMMENT This assumes that the block has a corresponding block entity.
+		COMMENT
+		COMMENT <p>If the block changes, this {@linkplain #spawn(World, BlockPos, Inventory) spawns}
+		COMMENT item entities around the block and updates redstone comparators.
+		COMMENT
+		COMMENT @see net.minecraft.block.AbstractBlock#onStateReplaced
 		ARG 0 state
 		ARG 1 newState
 		ARG 2 world

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

@@ -4,7 +4,7 @@ CLASS net/minecraft/class_8806 net/minecraft/util/dynamic/RuntimeOps
 	COMMENT
 	COMMENT <p>The objects must be one of: numbers, booleans, string, {@link Map}, {@link List},
 	COMMENT {@link it.unimi.dsi.fastutil.bytes.ByteList}, {@link
-	COMMENT it.unimi.dsi.fastutil.bytes.IntList}, or {@link it.unimi.dsi.fastutil.bytes.LongList}.
+	COMMENT it.unimi.dsi.fastutil.ints.IntList}, or {@link it.unimi.dsi.fastutil.longs.LongList}.
 	COMMENT Arrays are not supported.
 	COMMENT
 	COMMENT @see Codecs#BASIC_OBJECT

mappings/net/minecraft/world/CommandBlockExecutor.mapping

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

mappings/net/minecraft/world/level/storage/LevelSummary.mapping

@@ -41,14 +41,14 @@ CLASS net/minecraft/class_34 net/minecraft/world/level/storage/LevelSummary
 		ARG 0 style
 	CLASS class_5781 ConversionWarning
 		FIELD field_28440 backup Z
-		FIELD field_28441 boldRedFormatting Z
+		FIELD field_28441 dangerous Z
 		FIELD field_28442 translationKeySuffix Ljava/lang/String;
 		METHOD <init> (Ljava/lang/String;IZZLjava/lang/String;)V
 			ARG 3 backup
-			ARG 4 boldRedFormatting
+			ARG 4 dangerous
 			ARG 5 translationKeySuffix
 		METHOD method_33406 promptsBackup ()Z
-		METHOD method_33407 needsBoldRedFormatting ()Z
+		METHOD method_33407 isDangerous ()Z
 		METHOD method_33408 getTranslationKeySuffix ()Ljava/lang/String;
 	CLASS class_8578 SymlinkLevelSummary
 		METHOD <init> (Ljava/lang/String;Ljava/nio/file/Path;)V