More Autofly Fixes

Author: cev-api

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

@@ -3823,6 +3823,9 @@ private void restoreVerticalIfBoosted()
 
 	private boolean shouldRepath(Vec3 playerPos, double distHoriz)
 	{
+		if(isDirectionalForwardMode())
+			return false;
+			
 		// Recovery pathing is designed for ground navigation. In mid-air it can
 		// cause oscillation/stalls, so keep using direct flight controls.
 		if(MC.player != null && !MC.player.onGround())
@@ -3845,6 +3848,8 @@ private void startRecoveryPath(Vec3 playerPos)
 	{
 		if(MC.level == null || MC.player == null)
 			return;
+		if(isDirectionalForwardMode())
+			return;
 
 		lastRepathMs = System.currentTimeMillis();
 		stuckRepathCount++;
@@ -3929,6 +3934,12 @@ private void clearPathingState()
 		lastProgressDist = Double.NaN;
 	}
 
+	private boolean isDirectionalForwardMode()
+	{
+		return commandForwardUnlimited
+			&& routeType.getSelected() != RouteType.CHUNKS;
+	}
+	
 	private void resetAfterTickGap(long now)
 	{
 		Vec3 playerPos = MC.player.position();

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

@@ -58,8 +58,8 @@ public final class PearlDropHack extends Hack
 	private static final double HONEY_SHAPE_INSET = 0.0625;
 	private static final double HONEY_SHAPE_TOP = 0.9375;
 
-	private static final Direction[] HORIZONTAL_DIRECTIONS = {
-		Direction.NORTH, Direction.SOUTH, Direction.WEST, Direction.EAST};
+	private static final Direction[] HORIZONTAL_DIRECTIONS =
+		{Direction.NORTH, Direction.SOUTH, Direction.WEST, Direction.EAST};
 
 	private BlockPos nearestColumn;
 	private BlockPos nearestHoney;
@@ -144,8 +144,8 @@ public void onRender(PoseStack matrixStack, float partialTicks)
 			ready ? 0xE022FF66 : hasSolution ? 0xE0FFE066 : 0xE0FF5555;
 		RenderUtils.drawSolidBox(matrixStack, new AABB(column), columnFill,
 			false);
-		RenderUtils.drawOutlinedBox(matrixStack, new AABB(column), columnOutline,
-			false);
+		RenderUtils.drawOutlinedBox(matrixStack, new AABB(column),
+			columnOutline, false);
 
 		if(honey != null)
 		{
@@ -240,26 +240,27 @@ private void updateSolution(boolean force)
 		for(int i = 0; i < checks; i++)
 		{
 			SetupCandidate setup = setups.get(i);
-			SimulationResult currentResult =
-				simulateTrajectory(currentYaw, currentPitch, setup.column,
-					setup.honey);
+			SimulationResult currentResult = simulateTrajectory(currentYaw,
+				currentPitch, setup.column, setup.honey);
 
 			if(currentResult != null)
 			{
-				TrajectorySolution solution = new TrajectorySolution(setup.column,
-					setup.honey, currentYaw, currentPitch, currentResult.score,
-					0);
+				TrajectorySolution solution =
+					new TrajectorySolution(setup.column, setup.honey,
+						currentYaw, currentPitch, currentResult.score, 0);
 
-				if(activeSolution == null || solution.score < activeSolution.score)
+				if(activeSolution == null
+					|| solution.score < activeSolution.score)
 					activeSolution = solution;
 			}
 
-			TrajectorySolution nearbySolution = solveNearCurrentAim(setup.column,
-				setup.honey, currentYaw, currentPitch);
+			TrajectorySolution nearbySolution = solveNearCurrentAim(
+				setup.column, setup.honey, currentYaw, currentPitch);
 
 			if(nearbySolution == null)
 				continue;
-			if(bestSolution == null || nearbySolution.score < bestSolution.score)
+			if(bestSolution == null
+				|| nearbySolution.score < bestSolution.score)
 				bestSolution = nearbySolution;
 		}
 
@@ -278,7 +279,8 @@ private void updateSolution(boolean force)
 	}
 
 	private void addSetupIfValid(ArrayList<SetupCandidate> setups, Vec3 eyes,
-		BlockPos column, BlockPos honey, ArrayList<BlockPos> standingHoneyBlocks)
+		BlockPos column, BlockPos honey,
+		ArrayList<BlockPos> standingHoneyBlocks)
 	{
 		if(!isHoney(honey))
 			return;
@@ -324,7 +326,8 @@ private void addHoneyBlockAt(ArrayList<BlockPos> honeyBlocks, double x,
 		honeyBlocks.add(pos.immutable());
 	}
 
-	private boolean containsBlockPos(ArrayList<BlockPos> positions, BlockPos pos)
+	private boolean containsBlockPos(ArrayList<BlockPos> positions,
+		BlockPos pos)
 	{
 		for(BlockPos current : positions)
 		{
@@ -335,8 +338,8 @@ private boolean containsBlockPos(ArrayList<BlockPos> positions, BlockPos pos)
 		return false;
 	}
 
-	private TrajectorySolution solveNearCurrentAim(BlockPos column, BlockPos honey,
-		float currentYaw, float currentPitch)
+	private TrajectorySolution solveNearCurrentAim(BlockPos column,
+		BlockPos honey, float currentYaw, float currentPitch)
 	{
 		SearchResult best = null;
 
@@ -346,8 +349,8 @@ private TrajectorySolution solveNearCurrentAim(BlockPos column, BlockPos honey,
 		if(best == null)
 			return null;
 
-		best = searchRotations(column, honey, currentYaw, currentPitch, best.yaw,
-			best.pitch, REFINE_RANGE, REFINE_STEP, best);
+		best = searchRotations(column, honey, currentYaw, currentPitch,
+			best.yaw, best.pitch, REFINE_RANGE, REFINE_STEP, best);
 
 		SimulationResult result =
 			simulateTrajectory(best.yaw, best.pitch, column, honey);
@@ -357,19 +360,19 @@ private TrajectorySolution solveNearCurrentAim(BlockPos column, BlockPos honey,
 		double aimError =
 			getAngleDifference(currentYaw, currentPitch, best.yaw, best.pitch);
 		double score = result.score + aimError * 0.08;
-		return new TrajectorySolution(column, honey, best.yaw, best.pitch, score,
-			aimError);
+		return new TrajectorySolution(column, honey, best.yaw, best.pitch,
+			score, aimError);
 	}
 
 	private SearchResult searchRotations(BlockPos column, BlockPos honey,
-		float currentYaw, float currentPitch, float centerYaw, float centerPitch,
-		double range, double step, SearchResult best)
+		float currentYaw, float currentPitch, float centerYaw,
+		float centerPitch, double range, double step, SearchResult best)
 	{
-		for(double yawOffset = -range; yawOffset <= range + 1.0E-7;
-			yawOffset += step)
+		for(double yawOffset = -range; yawOffset <= range + 1.0E-7; yawOffset +=
+			step)
 		{
-			for(double pitchOffset = -range; pitchOffset <= range + 1.0E-7;
-				pitchOffset += step)
+			for(double pitchOffset = -range; pitchOffset <= range
+				+ 1.0E-7; pitchOffset += step)
 			{
 				float yaw = wrapDegrees((float)(centerYaw + yawOffset));
 				float pitch = (float)(centerPitch + pitchOffset);
@@ -440,10 +443,8 @@ private CaptureResult getColumnCapture(Vec3 start, Vec3 end, Vec3 velocity,
 		BlockPos column, int tick)
 	{
 		AABB captureBox = new AABB(column.getX() + 0.5 - COLUMN_CAPTURE_RADIUS,
-			column.getY() + 0.03,
-			column.getZ() + 0.5 - COLUMN_CAPTURE_RADIUS,
-			column.getX() + 0.5 + COLUMN_CAPTURE_RADIUS,
-			column.getY() + 0.97,
+			column.getY() + 0.03, column.getZ() + 0.5 - COLUMN_CAPTURE_RADIUS,
+			column.getX() + 0.5 + COLUMN_CAPTURE_RADIUS, column.getY() + 0.97,
 			column.getZ() + 0.5 + COLUMN_CAPTURE_RADIUS);
 
 		Double hit = getSegmentBoxIntersection(start, end, captureBox);
@@ -457,8 +458,8 @@ private CaptureResult getColumnCapture(Vec3 start, Vec3 end, Vec3 velocity,
 		double dz = point.z - centerZ;
 		double horizontalDistance = Math.sqrt(dx * dx + dz * dz);
 		double speedPenalty = Math.max(0, velocity.length() - 0.36) * 0.18;
-		double verticalPenalty = Math.abs(point.y - (column.getY() + 0.45))
-			* 0.08;
+		double verticalPenalty =
+			Math.abs(point.y - (column.getY() + 0.45)) * 0.08;
 		double tickPenalty = tick * 0.0015;
 		double score =
 			horizontalDistance + speedPenalty + verticalPenalty + tickPenalty;
@@ -470,9 +471,8 @@ private boolean applyHoneySlide(Vec3 pos, Vec3 velocity, BlockPos honey,
 		AABB honeyCollision)
 	{
 		AABB pearlBox = getPearlBox(pos);
-		AABB honeyTouchBox = new AABB(honey.getX(), honey.getY(),
-			honey.getZ(), honey.getX() + 1, honey.getY() + HONEY_SHAPE_TOP,
-			honey.getZ() + 1);
+		AABB honeyTouchBox = new AABB(honey.getX(), honey.getY(), honey.getZ(),
+			honey.getX() + 1, honey.getY() + HONEY_SHAPE_TOP, honey.getZ() + 1);
 
 		if(!pearlBox.intersects(honeyTouchBox))
 			return false;
@@ -532,9 +532,8 @@ private InteractionHand getPearlHand()
 
 	private AABB getPearlBox(Vec3 pos)
 	{
-		return new AABB(pos.x - PEARL_RADIUS, pos.y,
-			pos.z - PEARL_RADIUS, pos.x + PEARL_RADIUS,
-			pos.y + PEARL_HEIGHT, pos.z + PEARL_RADIUS);
+		return new AABB(pos.x - PEARL_RADIUS, pos.y, pos.z - PEARL_RADIUS,
+			pos.x + PEARL_RADIUS, pos.y + PEARL_HEIGHT, pos.z + PEARL_RADIUS);
 	}
 
 	private AABB getHoneyCollisionBox(BlockPos honey)
@@ -722,4 +721,4 @@ private CaptureResult(Vec3 point, double score)
 			this.score = score;
 		}
 	}
-}
+}