ItemHandler ESP Fix

Author: cev-api

README.md

@@ -293,6 +293,7 @@ Because so many of these mods are entirely original, I plan to release some of t
   - Pick: reject (drop) everything except the selected types (only selected types will be picked up).
   - Reject: reject the selected types and drop them.
 - Trace Selected Items: toggles tracing for selected types (uses ItemESP world render pass to draw rainbow tracer lines and ESP boxes).
+  - Works independantly of ItemESP
 - Adjustable distance for item detection.
 - Adjustable font scale setting (scales text and popup icon size).
 - Adjustable Popup HUD display offset X/Y

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

@@ -600,6 +600,15 @@ private int getSpecialARGB(int alpha)
 		return RenderUtils.toIntColor(rgb, alpha / 255f);
 	}
 
+	/**
+	 * Allows other features (like ItemHandler) to know if ItemESP will render
+	 * tracer lines in the current style configuration.
+	 */
+	public boolean rendersTracerLines()
+	{
+		return style.hasLines();
+	}
+	
 	private boolean isIgnored(ItemStack stack)
 	{
 		if(stack == null || stack.isEmpty())

src/main/java/net/wurstclient/hacks/itemhandler/ItemHandlerHack.java

@@ -723,14 +723,20 @@ public void onRender(PoseStack matrixStack, float partialTicks)
 	{
 		if(tracedItems.isEmpty())
 			return;
-		// Avoid duplicate rendering if ItemESP is enabled
+		
 		net.wurstclient.hacks.ItemEspHack esp =
 			net.wurstclient.WurstClient.INSTANCE.getHax().itemEspHack;
-		if(esp != null && esp.isEnabled())
+		boolean espEnabled = esp != null && esp.isEnabled();
+		boolean espHasTracerLines = espEnabled && esp.rendersTracerLines();
+		boolean shouldDrawBoxes = !espEnabled;
+		boolean shouldDrawTracers = !espHasTracerLines;
+		if(!shouldDrawBoxes && !shouldDrawTracers)
 			return;
 
-		java.util.ArrayList<AABB> boxes = new java.util.ArrayList<>();
-		java.util.ArrayList<Vec3> ends = new java.util.ArrayList<>();
+		java.util.ArrayList<AABB> boxes =
+			shouldDrawBoxes ? new java.util.ArrayList<>() : null;
+		java.util.ArrayList<Vec3> ends =
+			shouldDrawTracers ? new java.util.ArrayList<>() : null;
 		for(GroundItem gi : trackedItems)
 		{
 			String baseId =
@@ -748,22 +754,27 @@ public void onRender(PoseStack matrixStack, float partialTicks)
 			if(!traced)
 				continue;
 			Vec3 p = gi.position();
-			boxes.add(new AABB(p.x - 0.18, p.y - 0.18, p.z - 0.18, p.x + 0.18,
-				p.y + 0.18, p.z + 0.18));
-			ends.add(p);
+			if(shouldDrawBoxes)
+				boxes.add(new AABB(p.x - 0.18, p.y - 0.18, p.z - 0.18,
+					p.x + 0.18, p.y + 0.18, p.z + 0.18));
+			if(shouldDrawTracers)
+				ends.add(p);
 		}
-		if(boxes.isEmpty() && ends.isEmpty())
+		boolean hasBoxes = shouldDrawBoxes && boxes != null && !boxes.isEmpty();
+		boolean hasTracers =
+			shouldDrawTracers && ends != null && !ends.isEmpty();
+		if(!hasBoxes && !hasTracers)
 			return;
 		float[] rf = RenderUtils.getRainbowColor();
 		int traceLines = RenderUtils.toIntColor(rf, 0.5f);
 		int traceQuads = RenderUtils.toIntColor(rf, 0.35f);
-		if(!boxes.isEmpty())
+		if(hasBoxes)
 		{
 			RenderUtils.drawSolidBoxes(matrixStack, boxes, traceQuads, false);
 			RenderUtils.drawOutlinedBoxes(matrixStack, boxes, traceLines,
 				false);
 		}
-		if(!ends.isEmpty())
+		if(hasTracers)
 			RenderUtils.drawTracers(matrixStack, partialTicks, ends, traceLines,
 				false);
 	}