NiceWurst ESP Fix

Author: cev-api

src/main/java/net/wurstclient/WurstRenderLayers.java

@@ -67,6 +67,15 @@ public enum WurstRenderLayers
 		"wurst:quads", 1536, false, true, WurstShaderPipelines.QUADS,
 		RenderLayer.MultiPhaseParameters.builder().build(false));
 
+	/**
+	 * Similar to {@link RenderLayer#getDebugQuads()}, but without back-face
+	 * culling.
+	 */
+	public static final RenderLayer.MultiPhase QUADS_NO_CULLING =
+		RenderLayer.of("wurst:quads_no_culling", 1536, false, true,
+			WurstShaderPipelines.QUADS_NO_CULLING,
+			RenderLayer.MultiPhaseParameters.builder().build(false));
+	
 	/**
 	 * Similar to {@link RenderLayer#getDebugQuads()}, but with culling enabled
 	 * and no depth test.

src/main/java/net/wurstclient/WurstShaderPipelines.java

@@ -80,6 +80,17 @@ public enum WurstShaderPipelines
 			.withDepthTestFunction(DepthTestFunction.LEQUAL_DEPTH_TEST)
 			.build());
 
+	/**
+	 * Similar to the DEBUG_QUADS ShaderPipeline, but with no back-face culling.
+	 */
+	public static final RenderPipeline QUADS_NO_CULLING = RenderPipelines
+		.register(RenderPipeline.builder(RenderPipelines.POSITION_COLOR_SNIPPET)
+			.withLocation(
+				Identifier.of("wurst:pipeline/wurst_quads_no_culling"))
+			.withCull(false)
+			.withDepthTestFunction(DepthTestFunction.LEQUAL_DEPTH_TEST)
+			.build());
+	
 	/**
 	 * Similar to the DEBUG_QUADS ShaderPipeline, but with culling enabled
 	 * and no depth test.

src/main/java/net/wurstclient/nicewurst/NiceWurstModule.java

@@ -18,6 +18,13 @@
 import java.util.Set;
 import java.util.TreeMap;
 
+import net.minecraft.client.render.Camera;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.hit.HitResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.RaycastContext;
 import net.wurstclient.Category;
 import net.wurstclient.Feature;
 import net.wurstclient.WurstClient;
@@ -28,6 +35,7 @@
 import net.wurstclient.other_feature.OtfList;
 import net.wurstclient.other_feature.OtherFeature;
 import net.wurstclient.events.UpdateListener;
+import net.wurstclient.WurstRenderLayers;
 
 public final class NiceWurstModule
 {
@@ -53,6 +61,10 @@ public final class NiceWurstModule
 		"net.wurstclient.hacks.PortalEspHack",
 		"net.wurstclient.hacks.SearchHack",
 		"net.wurstclient.hacks.TridentEspHack");
+	private static final Set<String> ENTITY_OVERLAY_CALLERS =
+		Set.of("net.wurstclient.hacks.MobEspHack");
+	private static final Set<String> TRACER_VISIBILITY_EXCEPTIONS =
+		Set.of("net.wurstclient.hacks.WaypointsHack");
 
 	private static boolean applied;
 
@@ -138,6 +150,9 @@ public static boolean enforceDepthTest(boolean originalDepthTest)
 		if(originalDepthTest || !isActive())
 			return originalDepthTest;
 
+		if(isEntityOverlayCall())
+			return originalDepthTest;
+		
 		for(StackTraceElement element : Thread.currentThread().getStackTrace())
 		{
 			if(DEPTH_TEST_CALLERS.contains(element.getClassName()))
@@ -147,6 +162,99 @@ public static boolean enforceDepthTest(boolean originalDepthTest)
 		return originalDepthTest;
 	}
 
+	public static RenderLayer.MultiPhase enforceDepthTest(
+		RenderLayer.MultiPhase originalLayer)
+	{
+		if(!isActive() || originalLayer == null)
+			return originalLayer;
+		
+		if(isEntityOverlayCall())
+			return originalLayer;
+		
+		if(originalLayer == WurstRenderLayers.ESP_QUADS)
+			return WurstRenderLayers.QUADS;
+		
+		if(originalLayer == WurstRenderLayers.ESP_QUADS_NO_CULLING)
+			return WurstRenderLayers.QUADS_NO_CULLING;
+		
+		if(originalLayer == WurstRenderLayers.ESP_LINES)
+			return WurstRenderLayers.LINES;
+		
+		if(originalLayer == WurstRenderLayers.ESP_LINE_STRIP)
+			return WurstRenderLayers.LINE_STRIP;
+		
+		return originalLayer;
+	}
+	
+	public static boolean shouldEnforceTracerVisibility()
+	{
+		if(!isActive())
+			return false;
+		
+		for(StackTraceElement element : Thread.currentThread().getStackTrace())
+		{
+			if(TRACER_VISIBILITY_EXCEPTIONS.contains(element.getClassName()))
+				return false;
+		}
+		
+		return true;
+	}
+	
+	public static boolean shouldRenderTarget(Vec3d target)
+	{
+		if(!isActive() || target == null)
+			return true;
+		
+		if(WurstClient.MC.world == null || WurstClient.MC.player == null)
+			return true;
+		
+		Camera camera = WurstClient.MC.gameRenderer.getCamera();
+		if(camera == null)
+			return true;
+		
+		Vec3d from = camera.getPos();
+		if(from == null)
+			return true;
+		
+		if(from.squaredDistanceTo(target) < 1e-6)
+			return true;
+		
+		RaycastContext context =
+			new RaycastContext(from, target, RaycastContext.ShapeType.COLLIDER,
+				RaycastContext.FluidHandling.NONE, WurstClient.MC.player);
+		HitResult hit = WurstClient.MC.world.raycast(context);
+		if(hit == null || hit.getType() == HitResult.Type.MISS)
+			return true;
+		
+		if(hit.getType() != HitResult.Type.BLOCK)
+			return true;
+		
+		BlockPos hitPos = ((BlockHitResult)hit).getBlockPos();
+		BlockPos targetPos = BlockPos.ofFloored(target);
+		if(hitPos.equals(targetPos))
+			return true;
+		
+		double targetDistSq = from.squaredDistanceTo(target);
+		double hitDistSq = hit.getPos().squaredDistanceTo(from);
+		return hitDistSq >= targetDistSq - 1e-3;
+	}
+	
+	public static boolean shouldOverlayEntityShapes()
+	{
+		return isActive() && isEntityOverlayCall();
+	}
+	
+	private static boolean isEntityOverlayCall()
+	{
+		for(StackTraceElement element : Thread.currentThread().getStackTrace())
+		{
+			if(ENTITY_OVERLAY_CALLERS.contains(element.getClassName()))
+				return true;
+		}
+		
+		return false;
+	}
+	
 	private static void filterHackList(HackList hackList)
 	{
 		TreeMap<String, Hack> hackMap = getHackMap(hackList);

src/main/java/net/wurstclient/util/EasyVertexBuffer.java

@@ -31,6 +31,7 @@
 import net.minecraft.client.render.Tessellator;
 import net.minecraft.client.render.VertexConsumer;
 import net.minecraft.client.util.math.MatrixStack;
+import net.wurstclient.nicewurst.NiceWurstModule;
 
 /**
  * An abstraction of Minecraft 1.21.5's new {@code GpuBuffer} system that makes
@@ -111,18 +112,21 @@ public void draw(MatrixStack matrixStack, RenderLayer.MultiPhase layer,
 		if(vertexBuffer == null)
 			return;
 
+		RenderLayer.MultiPhase effectiveLayer =
+			NiceWurstModule.enforceDepthTest(layer);
+		
 		Matrix4fStack modelViewStack = RenderSystem.getModelViewStack();
 		modelViewStack.pushMatrix();
 		modelViewStack.mul(matrixStack.peek().getPositionMatrix());
 
-		layer.startDrawing();
+		effectiveLayer.startDrawing();
 		GpuBufferSlice gpuBufferSlice = RenderSystem.getDynamicUniforms().write(
 			RenderSystem.getModelViewMatrix(),
 			new Vector4f(red, green, blue, alpha), new Vector3f(),
 			RenderSystem.getTextureMatrix(), RenderSystem.getShaderLineWidth());
 
-		Framebuffer framebuffer = layer.phases.target.get();
-		RenderPipeline pipeline = layer.pipeline;
+		Framebuffer framebuffer = effectiveLayer.phases.target.get();
+		RenderPipeline pipeline = effectiveLayer.pipeline;
 		GpuBuffer indexBuffer = shapeIndexBuffer.getIndexBuffer(indexCount);
 
 		try(RenderPass renderPass =
@@ -140,7 +144,7 @@ public void draw(MatrixStack matrixStack, RenderLayer.MultiPhase layer,
 			renderPass.drawIndexed(0, 0, indexCount, 1);
 		}
 
-		layer.endDrawing();
+		effectiveLayer.endDrawing();
 		modelViewStack.popMatrix();
 	}