Advanced Flight and NoFall

Author: cev-api

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

@@ -14,6 +14,7 @@
 import net.minecraft.network.protocol.game.ClientboundPlayerPositionPacket;
 import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
 import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket.StatusOnly;
+import net.minecraft.world.entity.PositionMoveRotation;
 import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.item.Items;
@@ -125,18 +126,6 @@ public final class NoFallHack extends Hack implements UpdateListener,
 	private final SliderSetting mlgMinFallDistance = new SliderSetting(
 		"MLG MinFallDistance", 5, 2, 50, 0.5, ValueDisplay.DECIMAL);
 
-	private final CheckboxSetting mlgPickupWater =
-		new CheckboxSetting("MLG PickUpWater",
-			"Attempts to pick up placed water after landing.", true);
-	
-	private final SliderSetting mlgPickupSpanMin =
-		new SliderSetting("MLG PickupSpanMin", 200, 0, 10000, 10,
-			ValueDisplay.INTEGER.withSuffix(" ms"));
-	
-	private final SliderSetting mlgPickupSpanMax =
-		new SliderSetting("MLG PickupSpanMax", 1000, 0, 10000, 10,
-			ValueDisplay.INTEGER.withSuffix(" ms"));
-	
 	private final SliderSetting vulcanTpVoidLevel = new SliderSetting(
 		"VulcanTP VoidLevel", 0, -256, 0, 1, ValueDisplay.INTEGER);
 
@@ -174,15 +163,19 @@ public final class NoFallHack extends Hack implements UpdateListener,
 		"HypixelPacket OverVoid", "Bypass over void.", false);
 
 	private long lastSetbackMs;
-	private boolean grimPending;
+	private boolean grimSnapped;
+	private int grimSnapTicks;
+	private double grimSnapY = Double.NaN;
+	private double grimSnapX = Double.NaN;
+	private double grimSnapZ = Double.NaN;
+	private boolean grimAfterTeleport;
 	private boolean spoofLandingFlag;
 	private boolean packetJumpFalling;
 	private boolean hypixelDoJump;
 	private boolean blocksMcShouldClip;
 	private boolean blinkFall;
 	private boolean blinkWaitUntilGround = true;
 	private boolean blinkFlushing;
-	private int mlgPickupCooldown;
 	private int rettungsCooldown;
 	private int spartanCooldown;
 
@@ -222,10 +215,6 @@ public NoFallHack()
 		addSetting(packetJumpResetFallDistance);
 
 		addSetting(mlgMinFallDistance);
-		addSetting(mlgPickupWater);
-		addSetting(mlgPickupSpanMin);
-		addSetting(mlgPickupSpanMax);
-		
 		addSetting(vulcanTpVoidLevel);
 		addSetting(forceJumpBlockDistance);
 		addSetting(forceJumpFallDistance);
@@ -278,15 +267,19 @@ protected void onDisable()
 		EVENTS.remove(PacketInputListener.class, this);
 		EVENTS.remove(PreMotionListener.class, this);
 		EVENTS.remove(PacketOutputListener.class, this);
-		grimPending = false;
+		grimSnapped = false;
+		grimSnapTicks = 0;
+		grimSnapY = Double.NaN;
+		grimSnapX = Double.NaN;
+		grimSnapZ = Double.NaN;
+		grimAfterTeleport = false;
 		spoofLandingFlag = false;
 		packetJumpFalling = false;
 		hypixelDoJump = false;
 		blocksMcShouldClip = false;
 		blinkFall = false;
 		blinkWaitUntilGround = true;
 		blinkFlushing = false;
-		mlgPickupCooldown = 0;
 		rettungsCooldown = 0;
 		spartanCooldown = 0;
 		blinkQueue.clear();
@@ -302,12 +295,42 @@ public void onUpdate()
 		if(shouldPause(player))
 			return;
 
+		if(mode.getSelected() == Mode.GRIM_2371 && player.onGround())
+		{
+			grimSnapped = false;
+			grimSnapTicks = 0;
+			grimSnapY = Double.NaN;
+			grimSnapX = Double.NaN;
+			grimSnapZ = Double.NaN;
+			grimAfterTeleport = false;
+		}
+		
+		if(mode.getSelected() == Mode.GRIM_2371 && grimSnapped
+			&& grimSnapTicks <= 0 && !player.onGround()
+			&& player.fallDistance > 3.0F)
+		{
+			grimSnapped = false;
+		}
+		
+		if(mode.getSelected() == Mode.GRIM_2371 && grimAfterTeleport
+			&& player.fallDistance >= 2.5F && player.getDeltaMovement().y < 0)
+		{
+			if(tryGrimSnap(player))
+				grimAfterTeleport = false;
+		}
+		
 		switch(mode.getSelected())
 		{
 			case GRIM_2371 ->
 			{
-				if(player.fallDistance >= 2.5F && !player.onGround())
-					grimPending = true;
+				if(player.fallDistance >= 2.5F && !player.onGround()
+					&& player.getDeltaMovement().y < 0)
+				{
+					if(grimSnapped)
+						break;
+					if(!tryGrimSnap(player))
+						break;
+				}
 			}
 
 			case PACKET ->
@@ -367,19 +390,6 @@ public void onPreMotion()
 	{
 		if(mode.getSelected() != Mode.GRIM_2371)
 			return;
-		
-		LocalPlayer player = MC.player;
-		if(player == null)
-			return;
-		
-		if(grimPending && player.onGround())
-		{
-			player.connection
-				.send(new StatusOnly(true, player.horizontalCollision));
-			player.fallDistance = 0;
-			player.jumpFromGround();
-			grimPending = false;
-		}
 	}
 
 	@Override
@@ -394,6 +404,8 @@ public void onSentPacket(PacketOutputEvent event)
 
 		switch(mode.getSelected())
 		{
+			case GRIM_2371 -> handleGrimPacket(event, packet, player);
+			
 			case SPOOF_GROUND -> handleSpoofGround(event, packet, player);
 
 			case SPOOF_LANDING -> handleSpoofLanding(event, packet, player);
@@ -454,6 +466,25 @@ public void onReceivedPacket(PacketInputEvent event)
 			}
 		}
 
+		if(mode.getSelected() == Mode.GRIM_2371
+			&& event.getPacket() instanceof ClientboundPlayerPositionPacket pos)
+		{
+			LocalPlayer player = MC.player;
+			if(player != null)
+			{
+				PositionMoveRotation abs = PositionMoveRotation
+					.calculateAbsolute(PositionMoveRotation.of(player),
+						pos.change(), pos.relatives());
+				Vec3 target = abs.position();
+				Double groundY = findGroundYWithin(player, target.x, target.y,
+					target.z, 64.0);
+				if(groundY != null && target.y - groundY > 2.5)
+					tryGrimSnapAt(player, target.x, target.z, groundY);
+			}
+			
+			grimAfterTeleport = true;
+		}
+		
 		if(mode.getSelected() == Mode.CANCEL
 			&& event.getPacket() instanceof ClientboundPlayerPositionPacket)
 		{
@@ -661,9 +692,6 @@ private void handleBlocksMc(PacketOutputEvent event,
 
 	private void handleMlg(LocalPlayer player)
 	{
-		if(mlgPickupCooldown > 0)
-			mlgPickupCooldown--;
-		
 		if(player.fallDistance <= mlgMinFallDistance.getValueF())
 			return;
 
@@ -674,11 +702,79 @@ private void handleMlg(LocalPlayer player)
 		if(!tryMlgPlace(player, slot))
 			return;
 
-		if(!mlgPickupWater.isChecked())
+	}
+	
+	private void handleGrimPacket(PacketOutputEvent event,
+		ServerboundMovePlayerPacket packet, LocalPlayer player)
+	{
+		if(player.fallDistance < 2.5F)
 			return;
 
-		int maxMs = mlgPickupSpanMax.getValueI();
-		mlgPickupCooldown = Math.max(1, maxMs / 50);
+		if(player.getDeltaMovement().y >= 0)
+			return;
+		
+		if(grimSnapTicks > 0 && !Double.isNaN(grimSnapY))
+		{
+			double x = Double.isNaN(grimSnapX) ? player.getX() : grimSnapX;
+			double z = Double.isNaN(grimSnapZ) ? player.getZ() : grimSnapZ;
+			ServerboundMovePlayerPacket modified =
+				PacketUtils.modifyPosition(packet, x, grimSnapY, z);
+			modified = PacketUtils.modifyOnGround(modified, true);
+			event.setPacket(modified);
+			player.setPos(x, grimSnapY, z);
+			player.setDeltaMovement(player.getDeltaMovement().x, 0,
+				player.getDeltaMovement().z);
+			player.fallDistance = 0;
+			grimSnapTicks--;
+			return;
+		}
+		
+		Double groundY = findGroundYWithin(player, 64.0);
+		if(groundY == null)
+			return;
+		
+		double x = packet.getX(player.getX());
+		double z = packet.getZ(player.getZ());
+		ServerboundMovePlayerPacket modified =
+			PacketUtils.modifyPosition(packet, x, groundY, z);
+		modified = PacketUtils.modifyOnGround(modified, true);
+		event.setPacket(modified);
+		player.setPos(x, groundY, z);
+		player.setDeltaMovement(player.getDeltaMovement().x, 0,
+			player.getDeltaMovement().z);
+		grimSnapX = x;
+		grimSnapZ = z;
+	}
+	
+	private boolean tryGrimSnap(LocalPlayer player)
+	{
+		Double groundY = findGroundYWithin(player, 64.0);
+		if(groundY == null)
+			return false;
+		
+		return tryGrimSnapAt(player, player.getX(), player.getZ(), groundY);
+	}
+	
+	private boolean tryGrimSnapAt(LocalPlayer player, double x, double z,
+		double groundY)
+	{
+		ServerboundMovePlayerPacket packet =
+			MovePacketType.POSITION_AND_ON_GROUND.generatePacket();
+		packet = PacketUtils.modifyPosition(packet, x, groundY, z);
+		packet = PacketUtils.modifyOnGround(packet, true);
+		player.connection.send(packet);
+		player.connection
+			.send(new StatusOnly(true, player.horizontalCollision));
+		player.setPos(x, groundY, z);
+		player.setDeltaMovement(player.getDeltaMovement().x, 0,
+			player.getDeltaMovement().z);
+		player.fallDistance = 0;
+		grimSnapped = true;
+		grimSnapTicks = 10;
+		grimSnapY = groundY;
+		grimSnapX = x;
+		grimSnapZ = z;
+		return true;
 	}
 
 	private void handleRettungsplatform(LocalPlayer player)
@@ -876,6 +972,37 @@ private boolean collidesBottomVertical(LocalPlayer player)
 		return MC.level.getBlockCollisions(player, box).iterator().hasNext();
 	}
 
+	private Double findGroundYWithin(LocalPlayer player, double x, double y,
+		double z, double maxDrop)
+	{
+		AABB box = player.getBoundingBox().move(x - player.getX(),
+			y - player.getY(), z - player.getZ());
+		return findGroundYWithin(box, maxDrop);
+	}
+	
+	private Double findGroundYWithin(LocalPlayer player, double maxDrop)
+	{
+		return findGroundYWithin(player.getBoundingBox(), maxDrop);
+	}
+	
+	private Double findGroundYWithin(AABB box, double maxDrop)
+	{
+		double epsilon = 0.03;
+		AABB search = new AABB(box.minX, box.minY - maxDrop, box.minZ, box.maxX,
+			box.minY + 0.001, box.maxZ).inflate(epsilon, 0, epsilon);
+		
+		double[] best = new double[]{Double.NEGATIVE_INFINITY};
+		BlockUtils.getBlockCollisions(search).forEach(aabb -> {
+			if(aabb.maxY <= box.minY + 0.001 && box.minY - aabb.maxY <= maxDrop)
+				best[0] = Math.max(best[0], aabb.maxY);
+		});
+		
+		if(best[0] == Double.NEGATIVE_INFINITY)
+			return null;
+		
+		return best[0] + 0.001;
+	}
+	
 	private boolean isVoidBelow(LocalPlayer player, int depth)
 	{
 		return doesNotCollideBelow(player,