Updated PlayerESP/AntiSocial Alerts, Bookbot, Etc

Author: cev-api

src/main/java/net/wurstclient/commands/NoGoZoneCmd.java

@@ -26,8 +26,8 @@ public NoGoZoneCmd()
 		super("nogozone",
 			"Manages NoGoZones - areas you cannot re-enter after leaving.\n"
 				+ "Use when NoGoZone hack is enabled.",
-			".nogozone add [x z]", ".nogozone list", ".nogozone remove <id>",
-			".nogozone clear");
+			".nogozone add [x z [radius]]", ".nogozone list",
+			".nogozone remove <id>", ".nogozone clear");
 	}
 
 	@Override
@@ -68,24 +68,30 @@ private void addZone(String[] args) throws CmdError
 			ChatUtils.error("You must be in a world to add a NoGoZone.");
 			return;
 		}
-		if(args.length != 1 && args.length != 3)
-			throw new CmdError("Usage: .nogozone add [x z]");
+		if(args.length != 1 && args.length != 3 && args.length != 4)
+			throw new CmdError("Usage: .nogozone add [x z [radius]]");
 
 		// Read the effective render distance (capped by server view distance)
 		int renderDistance = MC.options.getEffectiveRenderDistance();
 		// Add +3 as specified
-		int chunkRadius = renderDistance + 3;
+		int blockRadius = (renderDistance + 3) * 16;
 
 		BlockPos zonePos = args.length == 3
 			? parseXZ(args[1], args[2], MC.player.blockPosition().getY())
 			: MC.player.blockPosition();
-		int id = NoGoZoneHack.addZone(zonePos, chunkRadius);
+		if(args.length == 4)
+		{
+			zonePos =
+				parseXZ(args[1], args[2], MC.player.blockPosition().getY());
+			blockRadius = parseRadius(args[3]);
+		}
+		
+		int id = NoGoZoneHack.addZone(zonePos, blockRadius);
 		WURST.getHax().noGoZoneHack.setEnabled(true);
 
-		int blockRadius = chunkRadius * 16;
 		ChatUtils.message("NoGoZone #" + id + " created at " + zonePos.getX()
 			+ " " + zonePos.getY() + " " + zonePos.getZ() + " with radius "
-			+ blockRadius + " blocks (" + chunkRadius + " chunks).");
+			+ blockRadius + " blocks.");
 	}
 
 	private BlockPos parseXZ(String xStr, String zStr, int y) throws CmdError
@@ -101,6 +107,21 @@ private BlockPos parseXZ(String xStr, String zStr, int y) throws CmdError
 		}
 	}
 
+	private int parseRadius(String radiusStr) throws CmdError
+	{
+		try
+		{
+			int radius = Integer.parseInt(radiusStr);
+			if(radius < 1)
+				throw new CmdError("Radius must be at least 1 block.");
+			return radius;
+			
+		}catch(NumberFormatException e)
+		{
+			throw new CmdError("Invalid radius: " + radiusStr);
+		}
+	}
+	
 	private void listZones()
 	{
 		List<NoGoZone> zones = NoGoZoneHack.getZones();
@@ -116,8 +137,7 @@ private void listZones()
 		{
 			ChatUtils.message("  #" + zone.id + " | XYZ: " + zone.center.getX()
 				+ " " + zone.center.getY() + " " + zone.center.getZ()
-				+ " | Radius: " + zone.getBlockRadius() + " blocks ("
-				+ zone.chunkRadius + " chunks)");
+				+ " | Radius: " + zone.getBlockRadius() + " blocks");
 		}
 	}
 

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

@@ -120,18 +120,21 @@ public void onPlayerEnter(Player player,
 
 		String intruder =
 			player == null ? info.getName() : player.getName().getString();
+		Vec3 selfPos = MC.player == null ? null : MC.player.position();
 
 		Mode selectedMode = mode.getSelected();
 		ChatUtils.message("\u00a76Antisocial:\u00a7r " + intruder
 			+ " entered your range. Leaving via " + selectedMode + " mode.");
 
-		leave(selectedMode, intruder, info.getLastPos());
+		leave(selectedMode, intruder, selfPos, info.getLastPos());
 	}
 
-	private void leave(Mode selectedMode, String intruder, Vec3 intruderPos)
+	private void leave(Mode selectedMode, String intruder, Vec3 selfPos,
+		Vec3 intruderPos)
 	{
-		String details = "Detected player: " + intruder + "\nDetected at: "
-			+ formatVec(intruderPos);
+		String details = "Detected player: " + intruder + "\nDetected at:\n"
+			+ DisconnectContext.formatPlayerDetectionDetails(selfPos,
+				intruderPos);
 
 		switch(selectedMode)
 		{
@@ -189,13 +192,4 @@ public void onPlayerExit(PlayerRangeAlertManager.PlayerInfo info)
 	{
 		// not needed
 	}
-	
-	private static String formatVec(Vec3 vec)
-	{
-		if(vec == null)
-			return "unknown";
-		
-		return String.format(java.util.Locale.ROOT, "%.1f, %.1f, %.1f", vec.x,
-			vec.y, vec.z);
-	}
 }

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

@@ -1441,12 +1441,21 @@ public void onRenderGUI(GuiGraphicsExtractor context, float partialTicks)
 		if(info == null || info.isBlank())
 			return;
 
+		String eta = buildETAInfo();
+		
 		Font font = MC.font;
 		int centerX = context.guiWidth() / 2;
 		int y = context.guiHeight() / 2 + 10;
 		int textWidth = font.width(info);
 		int x = centerX - textWidth / 2;
 		context.text(font, info, x, y, 0xFFFFFFFF, true);
+		
+		if(eta != null && !eta.isBlank())
+		{
+			int etaWidth = font.width(eta);
+			int etaX = centerX - etaWidth / 2;
+			context.text(font, eta, etaX, y + 10, 0xFFAAAAAA, true);
+		}
 	}
 
 	@Override
@@ -2177,6 +2186,47 @@ private String buildCrosshairInfo()
 			getStateLabel());
 	}
 
+	private String buildETAInfo()
+	{
+		if(currentTarget == null || MC.player == null || targets.isEmpty())
+			return null;
+		
+		if(commandForwardUnlimited)
+			return null;
+		
+		double speed = MC.player.getDeltaMovement().length() * 20.0;
+		if(speed < 0.01)
+			return null;
+		
+		// Sum remaining distance: current target + all subsequent targets
+		double totalDist = 0;
+		Vec3 lastPos = MC.player.position();
+		
+		for(int i = currentIndex; i < targets.size(); i++)
+		{
+			AutoFlyTarget t = targets.get(i);
+			Vec3 targetPos = Vec3.atCenterOf(t.pos);
+			totalDist += lastPos.distanceTo(targetPos);
+			lastPos = targetPos;
+		}
+		
+		double etaSeconds = totalDist / speed;
+		
+		if(etaSeconds < 60)
+			return String.format(Locale.ROOT, "ETA %.0fs", etaSeconds);
+		
+		if(etaSeconds < 3600)
+		{
+			int minutes = (int)(etaSeconds / 60);
+			int seconds = (int)(etaSeconds % 60);
+			return String.format(Locale.ROOT, "ETA %dm %ds", minutes, seconds);
+		}
+		
+		int hours = (int)(etaSeconds / 3600);
+		int minutes = (int)((etaSeconds % 3600) / 60);
+		return String.format(Locale.ROOT, "ETA %dh %dm", hours, minutes);
+	}
+	
 	private String getStateLabel()
 	{
 		if(pathFinder != null)

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

@@ -13,10 +13,12 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.PrimitiveIterator;
 import java.util.Random;
+import java.util.Set;
 
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.network.chat.Component;
@@ -102,7 +104,9 @@ private enum RandomType
 
 	private int delayTimer;
 	private int bookCount;
+	private int inventoryCooldown;
 	private Random random;
+	private final Set<Integer> unsignedWrittenSlots = new HashSet<>();
 
 	public BookBotHack()
 	{
@@ -137,7 +141,9 @@ protected void onEnable()
 
 		random = new Random();
 		delayTimer = delay.getValueI();
+		inventoryCooldown = 0;
 		bookCount = 0;
+		unsignedWrittenSlots.clear();
 
 		EVENTS.add(UpdateListener.class, this);
 	}
@@ -146,12 +152,19 @@ protected void onEnable()
 	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
+		unsignedWrittenSlots.clear();
 	}
 
 	@Override
 	public void onUpdate()
 	{
 		// Find an empty writable book in inventory
+		if(inventoryCooldown > 0)
+		{
+			inventoryCooldown--;
+			return;
+		}
+		
 		int slot = findWritableBookSlot();
 		if(slot == -1)
 		{
@@ -241,7 +254,7 @@ private int findWritableBookSlot()
 		for(int i = 0; i < MC.player.getInventory().getContainerSize(); i++)
 		{
 			ItemStack s = MC.player.getInventory().getItem(i);
-			if(s.is(Items.WRITABLE_BOOK))
+			if(s.is(Items.WRITABLE_BOOK) && !unsignedWrittenSlots.contains(i))
 			{
 				// Accept any writable book; server will accept updates
 				return i;
@@ -260,7 +273,18 @@ private void moveToMainHand(int slot)
 		if(slot < 9)
 			MC.player.getInventory().setSelectedSlot(slot);
 		else
-			InventoryUtils.selectItem(slot);
+			swapWithMainHand(slot);
+	}
+	
+	private void swapWithMainHand(int slot)
+	{
+		if(slot < 0 || slot == MC.player.getInventory().getSelectedSlot())
+			return;
+		
+		IMC.getInteractionManager().windowClick_SWAP(
+			InventoryUtils.toNetworkSlot(slot),
+			MC.player.getInventory().getSelectedSlot());
+		inventoryCooldown = 2;
 	}
 
 	private List<String> randomPages(PrimitiveIterator.OfInt chars)
@@ -398,6 +422,20 @@ private void writeBook(List<String> pages)
 				MC.player.getInventory().getSelectedSlot(), pages,
 				sign.isChecked() ? Optional.of(title) : Optional.empty()));
 
+		if(!sign.isChecked())
+		{
+			int selectedSlot = MC.player.getInventory().getSelectedSlot();
+			unsignedWrittenSlots.add(selectedSlot);
+			
+			int nextSlot = findWritableBookSlot();
+			if(nextSlot != -1)
+			{
+				swapWithMainHand(nextSlot);
+				unsignedWrittenSlots.add(nextSlot);
+				unsignedWrittenSlots.remove(selectedSlot);
+			}
+		}
+		
 		bookCount++;
 	}