pathing: snap yaw for jump-ready grounded handoffs

This commit is contained in:
BruceChen 2026-04-15 16:37:12 +00:00
parent 2be9b287a3
commit 8408a41398
3 changed files with 519 additions and 8 deletions

View file

@ -18,6 +18,7 @@ namespace MinecraftClient.Pathing.Execution.Templates
private int _tickCount;
private Location _lastPos;
private int _stuckTicks;
private bool _initiatedJump;
public AscendTemplate(PathSegment segment, PathSegment? nextSegment)
{
@ -37,15 +38,34 @@ namespace MinecraftClient.Pathing.Execution.Templates
double dy = ExpectedEnd.Y - pos.Y;
double horizDistSq = dx * dx + dz * dz;
bool groundedPrepareJumpHandoff = physics.OnGround
&& Math.Abs(dy) < 0.2
&& _segment.ExitTransition == PathTransitionType.PrepareJump
&& _segment.ExitHints.RequireJumpReady
&& TemplateFootingHelper.IsCenterInsideTargetBlock(pos, _segment.End);
float targetYaw = TemplateHelper.CalculateYaw(dx, dz);
float targetPitch = TemplateHelper.CalculatePitch(dx, dy, dz);
physics.Yaw = TemplateHelper.SmoothYaw(physics.Yaw, targetYaw);
bool snapYawForJumpCommit = !_initiatedJump && !groundedPrepareJumpHandoff;
physics.Yaw = TemplateHelper.AlignYaw(
physics.Yaw,
targetYaw,
snapYawForJumpCommit ? YawAlignmentMode.Snap : YawAlignmentMode.Smooth);
physics.Pitch = TemplateHelper.SmoothPitch(physics.Pitch, targetPitch);
input.Forward = true;
input.Sprint = true;
float headingPenalty = YawDifference(physics.Yaw, targetYaw);
bool headingReady = headingPenalty <= 8.0;
bool turnInPlace = !_initiatedJump && !headingReady;
input.Forward = !turnInPlace;
input.Sprint = !turnInPlace;
if (physics.OnGround && dy > 0.1)
bool diagonalAscend = _segment.HeadingX != 0 && _segment.HeadingZ != 0;
bool jumpReady = headingReady
&& (diagonalAscend || TemplateHelper.RemainingDistanceAlongSegment(pos, _segment) <= 1.05);
if (physics.OnGround && dy > 0.1 && jumpReady)
{
input.Jump = true;
_initiatedJump = true;
}
if (physics.OnGround && Math.Abs(dy) < 0.2)
{
@ -64,5 +84,13 @@ namespace MinecraftClient.Pathing.Execution.Templates
return TemplateState.InProgress;
}
private static float YawDifference(float current, float target)
{
float delta = target - current;
while (delta > 180f) delta -= 360f;
while (delta < -180f) delta += 360f;
return Math.Abs(delta);
}
}
}

View file

@ -1,4 +1,5 @@
using MinecraftClient.Mapping;
using MinecraftClient.Pathing.Core;
using MinecraftClient.Physics;
namespace MinecraftClient.Pathing.Execution.Templates
@ -9,6 +10,20 @@ namespace MinecraftClient.Pathing.Execution.Templates
internal static void Apply(PathSegment segment, PathSegment? nextSegment, Location pos, PlayerPhysics physics, MovementInput input, World world)
{
if (segment.ExitTransition == PathTransitionType.PrepareJump
&& segment.ExitHints.RequireJumpReady
&& physics.OnGround
&& TemplateFootingHelper.IsCenterInsideTargetBlock(pos, segment.End)
&& IsReadyToFreezeForTurn(segment, pos)
&& TemplateHelper.HeadingPenaltyDegrees(physics.Yaw, segment) > 8.0)
{
input.Forward = false;
input.Sprint = false;
input.Back = false;
TemplateHelper.FaceExitHeading(physics, segment, YawAlignmentMode.Snap);
return;
}
if (TemplateHelper.ShouldBiasTowardExitHeading(pos, segment))
TemplateHelper.FaceExitHeading(physics, segment);
@ -49,11 +64,19 @@ namespace MinecraftClient.Pathing.Execution.Templates
if (segment.ExitTransition == PathTransitionType.PrepareJump
&& physics.OnGround
&& segment.ExitHints.RequireJumpReady
&& segment.ExitHints.MinExitSpeed <= 0.0
&& TemplateFootingHelper.IsCenterInsideTargetBlock(pos, segment.End)
&& TemplateHelper.RemainingDistanceAlongSegment(pos, segment) <= 0.30)
&& TemplateFootingHelper.IsCenterInsideTargetBlock(pos, segment.End))
{
return true;
if (segment.MoveType == MoveType.Ascend)
return true;
if (segment.MoveType == MoveType.Parkour
|| (segment.HeadingX != 0 && segment.HeadingZ != 0))
{
return TemplateHelper.RemainingDistanceAlongSegment(pos, segment) <= 0.30;
}
if (segment.MoveType is not MoveType.Parkour)
return true;
}
if (exitSpeed < segment.ExitHints.MinExitSpeed)
@ -86,5 +109,19 @@ namespace MinecraftClient.Pathing.Execution.Templates
_ => physics.OnGround && TemplateHelper.IsSettledOnTargetBlock(pos, segment.End, physics)
};
}
private static bool IsReadyToFreezeForTurn(PathSegment segment, Location pos)
{
if (segment.MoveType == MoveType.Ascend)
return true;
if (segment.MoveType == MoveType.Parkour
|| (segment.HeadingX != 0 && segment.HeadingZ != 0))
{
return TemplateHelper.RemainingDistanceAlongSegment(pos, segment) <= 0.30;
}
return true;
}
}
}