Added MiningEvidence and SpectatorMonitor

Author: cev-api

README.md

@@ -1045,6 +1045,21 @@ Purpose: helps you avoid and debug anticheat flags by cleaning risky movement pa
 ![1](https://i.imgur.com/Kuj4NT6.png)
 ![2](https://i.imgur.com/1Z50eSC.png)
 
+### MiningEvidence
+
+- Designed to compliment the TunnelHoleStairESP
+- Will highlight lines between dropped blocks which indicate recent mining activity
+- Designed to work even after blocks disappear
+- Fully adjustable to avoid false positives
+- Adjustable ESP timeout 
+
+![Evidenza](https://i.imgur.com/NrOsEfa.png)
+
+### SpectatorMonitor
+
+- Actively checks if and when another player enters Specator Mode
+- Will alert via chat and or sounds
+
 ## What's changed or improved in this fork?
 
 ### ChestESP

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

@@ -26,10 +26,11 @@ public MapaCmd()
 			".mapa open", ".mapa reset", ".mapa toggle",
 			".mapa enabled <true|false>", ".mapa size <72-256>",
 			".mapa zoom <0.25-10>", ".mapa samples <32-512>",
-			".mapa pos <x> <y>", ".mapa rotate <true|false>",
-			".mapa underground <true|false>", ".mapa invert <true|false>",
-			".mapa smallplants <true|false>", ".mapa trees <true|false>",
-			".mapa palette <true|false>", ".mapa surfaceLighting <true|false>",
+			".mapa textScale <0.5-4>", ".mapa pos <x> <y>",
+			".mapa rotate <true|false>", ".mapa underground <true|false>",
+			".mapa invert <true|false>", ".mapa smallplants <true|false>",
+			".mapa trees <true|false>", ".mapa palette <true|false>",
+			".mapa surfaceLighting <true|false>",
 			".mapa undergroundLighting <true|false>", ".mapa sharpness <0-3>",
 			".mapa relief <0.1-3>", ".mapa brightness <0.7-1.3>",
 			".mapa contrast <0.5-1.8>", ".mapa saturation <0.5-1.5>",
@@ -103,6 +104,14 @@ public void call(String[] args) throws CmdException
 				+ mapa.createConfig().minimapSamples + ".");
 			return;
 
+			case "textscale":
+			requireLength(args, 2);
+			mapa.setPlayerNameScale(parseDouble(args[1], 0.5, 4.0));
+			ChatUtils.message(String.format(Locale.ROOT,
+				"Mapa player_name_scale set to %.2f.",
+				mapa.createConfig().playerNameScale));
+			return;
+			
 			case "pos":
 			requireLength(args, 3);
 			mapa.setMapPosition(parseInt(args[1], 0, 10000),
@@ -352,6 +361,7 @@ private static String statusLine(MapaHack mapa)
 			+ String.format(Locale.ROOT, " waterAlpha=%.2f", cfg.waterOpacity)
 			+ String.format(Locale.ROOT, " chunk=%.2f",
 				cfg.chunkRefreshAggression)
+			+ String.format(Locale.ROOT, " textScale=%.2f", cfg.playerNameScale)
 			+ " samples=" + cfg.minimapSamples;
 	}
 

src/main/java/net/wurstclient/hack/HackList.java

@@ -173,6 +173,8 @@ public final class HackList implements UpdateListener
 	public final LsdHack lsdHack = new LsdHack();
 	public final MaceDmgHack maceDmgHack = new MaceDmgHack();
 	public final MentionHack mentionHack = new MentionHack();
+	public final MiningEvidenceHack miningEvidenceHack =
+		new MiningEvidenceHack();
 	public final SpearAssistHack spearAssistHack = new SpearAssistHack();
 	public final MassTpaHack massTpaHack = new MassTpaHack();
 	public final BedrockEscapeHack bedrockEscapeHack = new BedrockEscapeHack();
@@ -271,6 +273,8 @@ public final class HackList implements UpdateListener
 	public final TrueSightHack trueSightHack = new TrueSightHack();
 	public final TunnellerHack tunnellerHack = new TunnellerHack();
 	public final SurfaceXrayHack surfaceXrayHack = new SurfaceXrayHack();
+	public final SpectatorMonitorHack spectatorMonitorHack =
+		new SpectatorMonitorHack();
 	public final VeinMinerHack veinMinerHack = new VeinMinerHack();
 	public final XRayHack xRayHack = new XRayHack();
 	public final WaypointsHack waypointsHack = new WaypointsHack();

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

@@ -113,16 +113,17 @@ public String toString()
 			+ "Grid: Generate a square search grid from your current position.",
 		RouteType.values(), RouteType.WAYPOINTS);
 
-	private final SliderSetting gridSideLength =
-		new SliderSetting("Grid side length",
-			"Side length of the square search area (in blocks).\n\n"
-				+ "The grid starts at your position and extends in +X and +Z.",
-			500, 10, 50000, 10, ValueDisplay.INTEGER.withSuffix(" blocks"));
-	
-	private final SliderSetting gridPassSize =
-		new SliderSetting("Grid pass size",
-			"Distance between each back-and-forth pass (in blocks).", 50, 1,
-			1000, 1, ValueDisplay.INTEGER.withSuffix(" blocks"));
+	private final SliderSetting gridWidthChunks =
+		new SliderSetting("Grid width",
+			"How many chunks wide the search area should be.\n\n"
+				+ "AutoFly flies through the center of each chunk column.",
+			2, 1, 512, 1, ValueDisplay.INTEGER.withSuffix(" chunks"));
+	
+	private final SliderSetting gridDepthChunks = new SliderSetting(
+		"Grid depth",
+		"How many chunks deep the search area should be.\n\n"
+			+ "At the end of each column, AutoFly turns and flies back down the next one.",
+		2, 1, 512, 1, ValueDisplay.INTEGER.withSuffix(" chunks"));
 
 	private final CheckboxSetting showGridPath = new CheckboxSetting(
 		"Show grid path",
@@ -282,8 +283,8 @@ public AutoFlyHack()
 		setCategory(Category.MOVEMENT);
 		addSetting(waypointText);
 		addSetting(routeType);
-		addSetting(gridSideLength);
-		addSetting(gridPassSize);
+		addSetting(gridWidthChunks);
+		addSetting(gridDepthChunks);
 		addSetting(showGridPath);
 		addSetting(gridPathColor);
 		addSetting(gridPathThickness);
@@ -1041,56 +1042,50 @@ private void loadTargetsFromGrid(BlockPos start)
 		if(start == null)
 			return;
 
-		int side = (int)Math.round(gridSideLength.getValue());
-		int pass = (int)Math.round(gridPassSize.getValue());
-		
-		if(side < 1)
+		int widthChunks = gridWidthChunks.getValueI();
+		int depthChunks = gridDepthChunks.getValueI();
+		if(widthChunks < 1 || depthChunks < 1)
 		{
-			ChatUtils.error("Grid side length must be at least 1 block.");
+			ChatUtils
+				.error("Grid width and depth must both be at least 1 chunk.");
 			return;
 		}
-		if(pass < 1)
-			pass = 1;
 
-		int passes = (int)Math.ceil(side / (double)pass);
-		long estTargets = 2L * passes + 1L;
+		long estTargets = (long)widthChunks * depthChunks;
 		if(estTargets > 20000L)
 		{
-			ChatUtils.error("Grid is too dense (" + estTargets
-				+ " targets). Increase pass size or decrease side length.");
+			ChatUtils.error("Grid is too large (" + estTargets
+				+ " chunk centers). Reduce width or depth.");
 			return;
 		}
 
-		int x0 = start.getX();
-		int z0 = start.getZ();
-		int x1 = x0 + side;
-		int z1 = z0 + side;
+		int startChunkX = start.getX() >> 4;
+		int startChunkZ = start.getZ() >> 4;
 		int y = 0; // Not used when hasY=false
 
-		boolean toEnd = true;
-		int z = z0;
-		while(true)
+		for(int dx = 0; dx < widthChunks; dx++)
 		{
-			int xEnd = toEnd ? x1 : x0;
-			targets.add(new AutoFlyTarget(new BlockPos(xEnd, y, z), false));
-			
-			if(z == z1)
-				break;
-			
-			int nextZ = z + pass;
-			if(nextZ > z1)
-				nextZ = z1;
-			
-			// Shift over to the next pass while staying at the current X end.
-			targets.add(new AutoFlyTarget(new BlockPos(xEnd, y, nextZ), false));
-			
-			z = nextZ;
-			toEnd = !toEnd;
+			int chunkX = startChunkX + dx;
+			boolean ascending = (dx & 1) == 0;
+			for(int dz = 0; dz < depthChunks; dz++)
+			{
+				int depthIndex = ascending ? dz : depthChunks - 1 - dz;
+				int chunkZ = startChunkZ + depthIndex;
+				int centerX = (chunkX << 4) + 8;
+				int centerZ = (chunkZ << 4) + 8;
+				targets.add(new AutoFlyTarget(new BlockPos(centerX, y, centerZ),
+					false));
+			}
 		}
 
+		int minBlockX = (startChunkX << 4) + 8;
+		int minBlockZ = (startChunkZ << 4) + 8;
+		int maxBlockX = ((startChunkX + widthChunks - 1) << 4) + 8;
+		int maxBlockZ = ((startChunkZ + depthChunks - 1) << 4) + 8;
 		ChatUtils.message(String.format(Locale.ROOT,
-			"AutoFly grid: side=%d, pass=%d, targets=%d (%d,%d -> %d,%d)", side,
-			pass, targets.size(), x0, z0, x1, z1));
+			"AutoFly grid: %dx%d chunks, targets=%d (%d,%d -> %d,%d)",
+			widthChunks, depthChunks, targets.size(), minBlockX, minBlockZ,
+			maxBlockX, maxBlockZ));
 	}
 
 	private void restartWithExistingTargets()

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

@@ -90,6 +90,8 @@ public final class MapaHack extends Hack
 		"Minimap icon size", 8, 4, 24, 1, ValueDisplay.INTEGER);
 	private final SliderSetting worldMapIconSize = new SliderSetting(
 		"World map icon size", 12, 4, 32, 1, ValueDisplay.INTEGER);
+	private final SliderSetting playerNameScale = new SliderSetting(
+		"Player name scale", 1.0, 0.5, 4.0, 0.1, ValueDisplay.DECIMAL);
 	private final CheckboxSetting iconOutline =
 		new CheckboxSetting("ESP icon outlines", true);
 	private final CheckboxSetting showCenterCross =
@@ -194,6 +196,7 @@ public MapaHack()
 		addSetting(mapEspGroup);
 		addSetting(minimapIconSize);
 		addSetting(worldMapIconSize);
+		addSetting(playerNameScale);
 		addSetting(iconOutline);
 		addSetting(showCenterCross);
 		addSetting(showFrame);
@@ -445,29 +448,29 @@ private void renderPlayerHeadMarker(GuiGraphicsExtractor context,
 		if(point == null)
 			return;
 		renderPlayerHeadMarker(context, point, skin, name, size, outlineColor,
-			cfg.showPlayerNames);
+			cfg.showPlayerNames, (float)cfg.playerNameScale);
 	}
 
 	private void renderPlayerHeadMarker(GuiGraphicsExtractor context,
 		MapPoint point, Identifier skin, String name, int size,
-		int outlineColor, boolean drawName)
+		int outlineColor, boolean drawName, float nameScale)
 	{
 		int x = Math.round(point.x()) - size / 2;
 		int y = Math.round(point.y()) - size / 2;
 		drawIconOutline(context, x, y, size, outlineColor);
 		context.blit(RenderPipelines.GUI_TEXTURED, skin, x, y, 8, 8, size, size,
-			64, 64, 0xFFFFFFFF);
+			8, 8, 64, 64, 0xFFFFFFFF);
 		context.blit(RenderPipelines.GUI_TEXTURED, skin, x, y, 40, 8, size,
-			size, 64, 64, 0xFFFFFFFF);
+			size, 8, 8, 64, 64, 0xFFFFFFFF);
 		if(drawName && !name.isEmpty())
 			drawMarkerLabel(context, name, x + size / 2, y + size + 2,
-				outlineColor, size);
+				outlineColor, size, nameScale);
 	}
 
 	private void drawMarkerLabel(GuiGraphicsExtractor context, String label,
-		int centerX, int y, int color, int iconSize)
+		int centerX, int y, int color, int iconSize, float nameScale)
 	{
-		float scale = Mth.clamp(iconSize / 8.0F, 0.5F, 2.0F);
+		float scale = Mth.clamp(iconSize / 8.0F * nameScale, 0.5F, 6.0F);
 		int width = Math.round(MC.font.width(label) * scale);
 		int x = centerX - width / 2;
 		int stroke = 0xFF000000;
@@ -631,6 +634,7 @@ public void resetToDefaults()
 		minimapZoom.setValue(2.0);
 		minimapIconSize.setValue(8);
 		worldMapIconSize.setValue(12);
+		playerNameScale.setValue(1.0);
 		iconOutline.setChecked(true);
 		showCenterCross.setChecked(true);
 		showFrame.setChecked(true);
@@ -689,6 +693,11 @@ public void setMapSamples(int value)
 		minimapSamples.setValue(value);
 	}
 
+	public void setPlayerNameScale(double value)
+	{
+		playerNameScale.setValue(value);
+	}
+	
 	public void setMapPosition(int x, int y)
 	{
 		minimapPosX.setValue(x);
@@ -836,6 +845,7 @@ public XMapConfig createConfig()
 		cfg.enabled = !noMap.isChecked();
 		cfg.showCenterCross = showCenterCross.isChecked();
 		cfg.showPlayerNames = showPlayerNames.isChecked();
+		cfg.playerNameScale = playerNameScale.getValue();
 		cfg.minimapSize = minimapSize.getValueI();
 		cfg.minimapZoom = minimapZoom.getValue();
 		cfg.minimapPosX = minimapPosX.getValueI();
@@ -1076,7 +1086,8 @@ private void renderFullscreenPlayers(GuiGraphicsExtractor context, int mapX,
 				renderPlayerHeadMarker(context, point, skin,
 					player.getName().getString(), markerSize,
 					WURST.getHax().playerEspHack.getMapaPlayerColor(player),
-					createConfig().showPlayerNames);
+					createConfig().showPlayerNames,
+					(float)createConfig().playerNameScale);
 		}
 	}