Update AutoFly

Author: cev-api

src/main/java/net/wurstclient/hacks/AutoFlyHack.java

@@ -112,6 +112,27 @@ public String toString()
 		}
 	}
 
+	public static enum ClickGuiStartMode
+	{
+		DIRECTIONAL("Directional (.autofly)"),
+		CHUNKS("Chunk trail (.autofly chunk)"),
+		GRID("Grid"),
+		WAYPOINTS("Waypoints");
+		
+		private final String name;
+		
+		ClickGuiStartMode(String name)
+		{
+			this.name = name;
+		}
+		
+		@Override
+		public String toString()
+		{
+			return name;
+		}
+	}
+	
 	public static enum StopOnType
 	{
 		OFF("Off"),
@@ -143,6 +164,13 @@ public String toString()
 		"Waypoints list. Format: x y z or x z (no Y). Separate by ';' or new lines.",
 		"");
 
+	private final EnumSetting<ClickGuiStartMode> clickGuiStartMode =
+		new EnumSetting<>("ClickGUI start mode",
+			"What AutoFly should start when enabled from ClickGUI.\n\n"
+				+ "Directional = same as .autofly\n"
+				+ "Chunk trail = same as .autofly chunk",
+			ClickGuiStartMode.values(), ClickGuiStartMode.DIRECTIONAL);
+	
 	private final EnumSetting<RouteType> routeType = new EnumSetting<>(
 		"Route type",
 		"Where AutoFly gets its targets from.\n\n"
@@ -402,6 +430,7 @@ public AutoFlyHack()
 	{
 		super("AutoFly");
 		setCategory(Category.MOVEMENT);
+		addSetting(clickGuiStartMode);
 		addSetting(waypointText);
 		addSetting(routeType);
 		addSetting(gridWidthChunks);
@@ -461,16 +490,7 @@ protected void onEnable()
 			useExistingTargetsOnEnable = false;
 		else
 		{
-			if(routeType.getSelected() == RouteType.GRID)
-				loadTargetsFromGrid(MC.player.blockPosition());
-			else if(routeType.getSelected() == RouteType.CHUNKS)
-			{
-				targets.clear();
-				currentTarget = null;
-				currentIndex = -1;
-				chunkTrailPath.clear();
-			}else
-				loadTargetsFromSettings();
+			startFromClickGuiMode();
 		}
 		if(targets.isEmpty())
 		{
@@ -701,24 +721,23 @@ public void onUpdate()
 		{
 			if(checkChunkTrailPortalStop())
 				return;
-		}else
-		{
-			if(checkStopOn(stopOn, stopKeyword, false))
-				return;
-			
-			if(checkStopOn(stopOn2, stopKeyword2, true))
-				return;
-			
-			if(checkStopOn(stopOn3, stopKeyword3, false))
-				return;
-			
-			if(checkStopOnPlayers())
-				return;
-			
-			if(checkDisableOnDamage())
-				return;
 		}
 
+		if(checkStopOn(stopOn, stopKeyword, false))
+			return;
+		
+		if(checkStopOn(stopOn2, stopKeyword2, true))
+			return;
+		
+		if(checkStopOn(stopOn3, stopKeyword3, false))
+			return;
+		
+		if(checkStopOnPlayers())
+			return;
+		
+		if(checkDisableOnDamage())
+			return;
+		
 		if(allowManualAdjust.isChecked() && isManualInputActive())
 		{
 			beginManualAdjust(MC.player.position());
@@ -1489,6 +1508,32 @@ private void loadTargetsFromSettings()
 		loadTargetsFromJson();
 	}
 
+	private void startFromClickGuiMode()
+	{
+		ClickGuiStartMode mode = clickGuiStartMode.getSelected();
+		if(mode == null)
+			mode = ClickGuiStartMode.DIRECTIONAL;
+		
+		switch(mode)
+		{
+			case DIRECTIONAL -> setForwardFromCommand(null, null, true);
+			
+			case CHUNKS -> setChunkTrailFromCommand();
+			
+			case GRID ->
+			{
+				routeType.setSelected(RouteType.GRID);
+				loadTargetsFromGrid(MC.player.blockPosition());
+			}
+			
+			case WAYPOINTS ->
+			{
+				routeType.setSelected(RouteType.WAYPOINTS);
+				loadTargetsFromSettings();
+			}
+		}
+	}
+	
 	private void startGridFromPlayer()
 	{
 		if(MC.player == null)

src/main/java/net/wurstclient/hud/GameStatsHud.java

@@ -36,8 +36,7 @@ public final class GameStatsHud
 	private static final float PADDING = 4F;
 	private static final float LINE_GAP = 2F;
 	private static final long SAMPLE_INTERVAL_MS = 1000L;
-	private static final long SPEED_WINDOW_MS = 600L;
-	private static final double SPEED_EMA_ALPHA = 0.5;
+	private static final long SPEED_WINDOW_MS = 3000L;
 	private static final double SPEED_MAX_PLAUSIBLE_BPS = 5000.0;
 	private static final float GRAPH_GAP = 4F;
 	private static final float GRAPH_TO_TEXT_GAP = 2F;
@@ -71,11 +70,7 @@ public final class GameStatsHud
 	private double lastY;
 	private double lastZ;
 	private long lastMovementSampleMs;
-	private final ArrayDeque<MovementSample> movementSamples =
-		new ArrayDeque<>();
-	private long movementWindowDurationMs;
-	private double movementWindowDistance;
-	private double liveSpeedBps;
+	private final ArrayDeque<MovementPoint> movementPoints = new ArrayDeque<>();
 	private double smoothedSpeedBps;
 	private int mobKillsBaseline = -1;
 	private int playerKillsBaseline = -1;
@@ -313,9 +308,7 @@ private void updateSessionTracking()
 			if(Double.isFinite(delta) && delta >= 0)
 			{
 				distanceTravelledMeters += delta;
-				long dtMs = Math.max(1L, now - lastMovementSampleMs);
-				double horizontalDelta = Math.hypot(dx, dz);
-				pushMovementSample(horizontalDelta, dtMs);
+				pushMovementSample(x, z, now);
 			}
 		}
 
@@ -424,41 +417,38 @@ private static String formatDistance(double meters)
 
 	private void resetMovementSpeed()
 	{
-		movementSamples.clear();
-		movementWindowDurationMs = 0L;
-		movementWindowDistance = 0;
-		liveSpeedBps = 0;
+		movementPoints.clear();
 		smoothedSpeedBps = 0;
 	}
 
-	private void pushMovementSample(double distance, long dtMs)
+	private void pushMovementSample(double x, double z, long nowMs)
 	{
-		if(dtMs <= 0L || !Double.isFinite(distance) || distance < 0)
+		if(!Double.isFinite(x) || !Double.isFinite(z))
 			return;
 
-		double dtSec = dtMs / 1000D;
-		double maxDistance = SPEED_MAX_PLAUSIBLE_BPS * dtSec;
-		distance = Math.min(distance, maxDistance);
-		
-		movementSamples.addLast(new MovementSample(distance, dtMs));
-		movementWindowDistance += distance;
-		movementWindowDurationMs += dtMs;
+		movementPoints.addLast(new MovementPoint(x, z, nowMs));
+		long minTime = nowMs - SPEED_WINDOW_MS;
+		while(movementPoints.size() > 2
+			&& movementPoints.peekFirst().timestampMs < minTime)
+			movementPoints.removeFirst();
 
-		while(movementWindowDurationMs > SPEED_WINDOW_MS
-			&& !movementSamples.isEmpty())
-		{
-			MovementSample oldest = movementSamples.removeFirst();
-			movementWindowDistance -= oldest.distance;
-			movementWindowDurationMs -= oldest.durationMs;
-		}
+		MovementPoint oldest = movementPoints.peekFirst();
+		MovementPoint newest = movementPoints.peekLast();
+		if(oldest == null || newest == null)
+			return;
 
-		if(movementWindowDurationMs <= 0L)
-			liveSpeedBps = 0;
-		else
-			liveSpeedBps =
-				movementWindowDistance / (movementWindowDurationMs / 1000D);
+		long dtMs = newest.timestampMs - oldest.timestampMs;
+		if(dtMs <= 0L)
+			return;
 
-		smoothedSpeedBps += SPEED_EMA_ALPHA * (liveSpeedBps - smoothedSpeedBps);
+		double dx = newest.x - oldest.x;
+		double dz = newest.z - oldest.z;
+		double netDistance = Math.hypot(dx, dz);
+		double dtSec = dtMs / 1000D;
+		double speed = netDistance / dtSec;
+		double maxDistance = SPEED_MAX_PLAUSIBLE_BPS * dtSec;
+		speed = Math.min(speed, maxDistance / dtSec);
+		smoothedSpeedBps = speed;
 	}
 
 	private static String getWorldTime24h()
@@ -1028,15 +1018,17 @@ private static int withAlpha(int rgb, int alpha)
 		return (Math.max(0, Math.min(255, alpha)) << 24) | (rgb & 0x00FFFFFF);
 	}
 
-	private static final class MovementSample
+	private static final class MovementPoint
 	{
-		private final double distance;
-		private final long durationMs;
+		private final double x;
+		private final double z;
+		private final long timestampMs;
 
-		private MovementSample(double distance, long durationMs)
+		private MovementPoint(double x, double z, long timestampMs)
 		{
-			this.distance = distance;
-			this.durationMs = durationMs;
+			this.x = x;
+			this.z = z;
+			this.timestampMs = timestampMs;
 		}
 	}
 }