Added octahedrons to mobsearch, Shadows to hacklist, re-order waypoint settings

Author: cev-api

README.md

@@ -21,7 +21,6 @@
 import net.minecraft.registry.Registries;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.Box;
-import net.minecraft.util.math.Vec3d;
 import net.wurstclient.Category;
 import net.wurstclient.SearchTags;
 import net.wurstclient.events.CameraTransformViewBobbingListener;
@@ -31,7 +30,6 @@
 import net.wurstclient.settings.CheckboxSetting;
 import net.wurstclient.settings.ColorSetting;
 import net.wurstclient.settings.EspBoxSizeSetting;
-import net.wurstclient.settings.EspStyleSetting;
 import net.wurstclient.settings.TextFieldSetting;
 import net.wurstclient.util.EntityUtils;
 import net.wurstclient.util.RenderUtils;
@@ -56,10 +54,14 @@ private enum SearchMode
 	private final net.wurstclient.settings.EntityTypeListSetting entityList =
 		new net.wurstclient.settings.EntityTypeListSetting("Entity List",
 			"Entities to match when Mode is set to List.");
-	private final EspStyleSetting style = new EspStyleSetting();
-	private final EspBoxSizeSetting boxSize = new EspBoxSizeSetting(
+	private final MobSearchStyleSetting style = new MobSearchStyleSetting();
+	private final EspBoxSizeSetting boxSize = new EspBoxSizeSetting("Box size",
 		"\u00a7lAccurate\u00a7r mode shows the exact hitbox of each mob.\n"
-			+ "\u00a7lFancy\u00a7r mode shows slightly larger boxes that look better.");
+			+ "\u00a7lFancy\u00a7r mode shows slightly larger boxes that look better.",
+		EspBoxSizeSetting.BoxSize.ACCURATE);
+	
+	private final CheckboxSetting fillShapes = new CheckboxSetting(
+		"Fill shapes", "Render filled versions of the ESP shapes.", true);
 	private final TextFieldSetting typeId = new TextFieldSetting("Type",
 		"The entity type to match when Query is empty (e.g. minecraft:zombie or zombie).",
 		"minecraft:zombie", v -> v.length() <= MAX_TEXT_LENGTH);
@@ -70,7 +72,7 @@ private enum SearchMode
 		new CheckboxSetting("Rainbow colors",
 			"Use a rainbow color instead of the fixed color.", false);
 	private final ColorSetting color = new ColorSetting("Color",
-		"Fixed color used when Rainbow colors is disabled.", Color.RED);
+		"Fixed color used when Rainbow colors is disabled.", Color.PINK);
 
 	private final ArrayList<LivingEntity> matches = new ArrayList<>();
 	private SearchMode lastMode;
@@ -87,6 +89,7 @@ public MobSearchHack()
 		addSetting(entityList);
 		addSetting(style);
 		addSetting(boxSize);
+		addSetting(fillShapes);
 		addSetting(typeId);
 		addSetting(query);
 		addSetting(useRainbow);
@@ -220,31 +223,76 @@ public void onRender(MatrixStack matrixStack, float partialTicks)
 	{
 		if(matches.isEmpty())
 			return;
-		int colorI = getColorI(0.5F);
 
-		if(style.hasBoxes())
+		MobSearchStyleSetting.Shape shape = style.getShape();
+		boolean drawShape = shape != MobSearchStyleSetting.Shape.NONE;
+		boolean drawLines = style.hasLines();
+		boolean drawFill = drawShape && fillShapes.isChecked();
+		
+		ArrayList<ColoredBox> outlineShapes =
+			drawShape ? new ArrayList<>(matches.size()) : null;
+		ArrayList<ColoredBox> filledShapes =
+			drawFill ? new ArrayList<>(matches.size()) : null;
+		ArrayList<ColoredPoint> ends =
+			drawLines ? new ArrayList<>(matches.size()) : null;
+		
+		if(drawShape || drawLines)
 		{
-			double extra = boxSize.getExtraSize() / 2;
-			ArrayList<ColoredBox> boxes = new ArrayList<>(matches.size());
+			double extra = drawShape ? boxSize.getExtraSize() / 2D : 0;
+			
 			for(LivingEntity e : matches)
 			{
-				Box box = EntityUtils.getLerpedBox(e, partialTicks)
-					.offset(0, extra, 0).expand(extra);
-				boxes.add(new ColoredBox(box, colorI));
+				Box lerpedBox = EntityUtils.getLerpedBox(e, partialTicks);
+				int outlineColor = getColorI(0.5F);
+				
+				if(drawShape)
+				{
+					Box box = lerpedBox.offset(0, extra, 0).expand(extra);
+					outlineShapes.add(new ColoredBox(box, outlineColor));
+					
+					if(filledShapes != null)
+					{
+						int fillColor = getColorI(0.15F);
+						filledShapes.add(new ColoredBox(box, fillColor));
+					}
+				}
+				
+				if(drawLines && ends != null)
+					ends.add(
+						new ColoredPoint(lerpedBox.getCenter(), outlineColor));
 			}
-			RenderUtils.drawOutlinedBoxes(matrixStack, boxes, false);
 		}
 
-		if(style.hasLines())
+		if(filledShapes != null && !filledShapes.isEmpty())
 		{
-			ArrayList<ColoredPoint> ends = new ArrayList<>(matches.size());
-			for(LivingEntity e : matches)
+			switch(shape)
 			{
-				Vec3d p = EntityUtils.getLerpedBox(e, partialTicks).getCenter();
-				ends.add(new ColoredPoint(p, colorI));
+				case BOX -> RenderUtils.drawSolidBoxes(matrixStack,
+					filledShapes, false);
+				case OCTAHEDRON -> RenderUtils.drawSolidOctahedrons(matrixStack,
+					filledShapes, false);
+				default ->
+					{
+					}
 			}
-			RenderUtils.drawTracers(matrixStack, partialTicks, ends, false);
 		}
+		
+		if(outlineShapes != null && !outlineShapes.isEmpty())
+		{
+			switch(shape)
+			{
+				case BOX -> RenderUtils.drawOutlinedBoxes(matrixStack,
+					outlineShapes, false);
+				case OCTAHEDRON -> RenderUtils
+					.drawOutlinedOctahedrons(matrixStack, outlineShapes, false);
+				default ->
+					{
+					}
+			}
+		}
+		
+		if(ends != null && !ends.isEmpty())
+			RenderUtils.drawTracers(matrixStack, partialTicks, ends, false);
 	}
 
 	private int getColorI(float alpha)
@@ -311,4 +359,58 @@ private String abbreviate(String text)
 			return text;
 		return text.substring(0, 32) + "...";
 	}
+	
+	// Local style setting that mirrors MobEsp's style but for MobSearch
+	private static final class MobSearchStyleSetting extends
+		net.wurstclient.settings.EnumSetting<MobSearchStyleSetting.Style>
+	{
+		private MobSearchStyleSetting()
+		{
+			super("Style", Style.values(), Style.OCTAHEDRONS);
+		}
+		
+		public Shape getShape()
+		{
+			return getSelected().shape;
+		}
+		
+		public boolean hasLines()
+		{
+			return getSelected().lines;
+		}
+		
+		enum Shape
+		{
+			NONE,
+			BOX,
+			OCTAHEDRON;
+		}
+		
+		private enum Style
+		{
+			BOXES("Boxes only", Shape.BOX, false),
+			OCTAHEDRONS("Octahedrons only", Shape.OCTAHEDRON, false),
+			LINES("Lines only", Shape.NONE, true),
+			LINES_AND_BOXES("Lines and boxes", Shape.BOX, true),
+			LINES_AND_OCTAHEDRONS("Lines and octahedrons", Shape.OCTAHEDRON,
+				true);
+			
+			private final String name;
+			private final Shape shape;
+			private final boolean lines;
+			
+			private Style(String name, Shape shape, boolean lines)
+			{
+				this.name = name;
+				this.shape = shape;
+				this.lines = lines;
+			}
+			
+			@Override
+			public String toString()
+			{
+				return name;
+			}
+		}
+	}
 }

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

@@ -74,7 +74,7 @@ public final class WaypointsHack extends Hack
 	private final SliderSetting labelScale = new SliderSetting("Label scale",
 		1.0, 0.5, 5.0, 0.1, ValueDisplay.DECIMAL);
 	private final CheckboxSetting chatOnDeath =
-		new CheckboxSetting("Chat", true);
+		new CheckboxSetting("Say death position in chat", true);
 	private final CheckboxSetting createDeathWaypoints =
 		new CheckboxSetting("Create death waypoints", true);
 	private final CheckboxSetting trackOtherDeaths =
@@ -117,20 +117,20 @@ public WaypointsHack()
 
 		addSetting(waypointRenderDistance);
 		addSetting(fadeDistance);
+		addSetting(beaconRenderDistance);
+		addSetting(labelScale);
 		addSetting(compassMode);
+		addSetting(showPlayerCoordsAboveCompass);
 		addSetting(compassIconRange);
-		addSetting(beaconRenderDistance);
 		addSetting(compassXPercent);
 		addSetting(compassYPercent);
-		addSetting(showPlayerCoordsAboveCompass);
 		addSetting(compassOpacity);
 		addSetting(compassBackgroundOpacity);
-		addSetting(maxDeathPositions);
-		addSetting(chatOnDeath);
 		addSetting(createDeathWaypoints);
+		addSetting(chatOnDeath);
 		addSetting(deathWaypointLines);
 		addSetting(trackOtherDeaths);
-		addSetting(labelScale);
+		addSetting(maxDeathPositions);
 		addSetting(deathColor);
 	}
 

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

@@ -177,8 +177,22 @@ private void drawString(DrawContext context, String s, int lineHeight,
 		int shadowY = (int)Math.round((baseSY + 1) * scale); // consistent 1px
 																// vertical
 																// offset
-		RenderUtils.drawScaledText(context, tr, s, shadowX, shadowY,
-			0x04000000 | alpha, false, scale);
+		if(WurstClient.INSTANCE.getOtfs().hackListOtf.useShadowBox())
+		{
+			int pad = (int)Math.max(1, Math.round(2 * scale));
+			int boxX1 = mainX - pad;
+			int boxY1 = mainY; // align to line top to avoid overlap
+			int boxX2 = mainX + stringWidth + pad;
+			int boxY2 = mainY + lineHeight; // align to line bottom
+			int fillAlpha = (int)(WurstClient.INSTANCE.getOtfs().hackListOtf
+				.getShadowBoxAlpha() * otf.getTransparency() * 255);
+			int boxColor = (fillAlpha << 24);
+			context.fill(boxX1, boxY1, boxX2, boxY2, boxColor);
+		}else
+		{
+			RenderUtils.drawScaledText(context, tr, s, shadowX, shadowY,
+				0x04000000 | alpha, false, scale);
+		}
 		context.state.goUpLayer();
 		RenderUtils.drawScaledText(context, tr, s, mainX, mainY,
 			(textColor | alpha), false, scale);
@@ -222,8 +236,22 @@ private void drawWithOffset(DrawContext context, HackListEntry e,
 		int mainY2 = (int)Math.round(baseSY2 * scale);
 		int shadowX2 = (int)Math.round((baseSX2 + 1) * scale);
 		int shadowY2 = (int)Math.round((baseSY2 + 1) * scale);
-		RenderUtils.drawScaledText(context, tr, s, shadowX2, shadowY2,
-			0x04000000 | alpha, false, scale);
+		if(WurstClient.INSTANCE.getOtfs().hackListOtf.useShadowBox())
+		{
+			int pad2 = (int)Math.max(1, Math.round(2 * scale));
+			int boxX12 = mainX2 - pad2;
+			int boxY12 = mainY2; // align to line top
+			int boxX22 = mainX2 + stringWidth + pad2;
+			int boxY22 = mainY2 + lineHeight; // align to line bottom
+			int fillAlpha2 = (int)(WurstClient.INSTANCE.getOtfs().hackListOtf
+				.getShadowBoxAlpha() * otf.getTransparency() * 255);
+			int boxColor2 = (fillAlpha2 << 24);
+			context.fill(boxX12, boxY12, boxX22, boxY22, boxColor2);
+		}else
+		{
+			RenderUtils.drawScaledText(context, tr, s, shadowX2, shadowY2,
+				0x04000000 | alpha, false, scale);
+		}
 		context.state.goUpLayer();
 		RenderUtils.drawScaledText(context, tr, s, mainX2, mainY2,
 			(textColor | alpha), false, scale);

src/main/java/net/wurstclient/hud/HackListHUD.java

@@ -41,6 +41,16 @@ public final class HackListOtf extends OtherFeature
 			+ "Only visible when \u00a76RainbowUI\u00a7r is disabled.",
 		Color.WHITE);
 
+	private final CheckboxSetting shadowBox = new CheckboxSetting("Shadow box",
+		"Replace the text shadow with a transparent black box background. Useful when scaled fonts produce ugly shadows.",
+		false);
+	
+	// Shadow box alpha (0.0 - 1.0)
+	private final net.wurstclient.settings.SliderSetting shadowBoxAlpha =
+		new net.wurstclient.settings.SliderSetting("Shadow box alpha", 0.5, 0.0,
+			1.0, 0.01,
+			net.wurstclient.settings.SliderSetting.ValueDisplay.DECIMAL);
+	
 	// Transparency (0.0 - 1.0)
 	private final net.wurstclient.settings.SliderSetting transparency =
 		new net.wurstclient.settings.SliderSetting("Transparency", 1.0, 0.0,
@@ -79,7 +89,7 @@ public final class HackListOtf extends OtherFeature
 
 	// New: spacing between entries in screen pixels (can be negative)
 	private final net.wurstclient.settings.SliderSetting entrySpacing =
-		new net.wurstclient.settings.SliderSetting("Entry spacing", 0.0, -8.0,
+		new net.wurstclient.settings.SliderSetting("Entry spacing", 0.0, 0,
 			24.0, 1.0,
 			net.wurstclient.settings.SliderSetting.ValueDisplay.INTEGER);
 
@@ -90,6 +100,8 @@ public HackListOtf()
 		addSetting(mode);
 		addSetting(position);
 		addSetting(color);
+		addSetting(shadowBox);
+		addSetting(shadowBoxAlpha);
 		addSetting(fontSize);
 		addSetting(entrySpacing);
 		addSetting(transparency);
@@ -141,6 +153,11 @@ public boolean isAnimations()
 		return animations.isChecked();
 	}
 
+	public boolean useShadowBox()
+	{
+		return shadowBox.isChecked();
+	}
+	
 	public Comparator<Hack> getComparator()
 	{
 		if(revSort.isChecked())
@@ -178,6 +195,11 @@ public int getColor(int alpha)
 		return color.getColorI(alpha);
 	}
 
+	public double getShadowBoxAlpha()
+	{
+		return shadowBoxAlpha.getValue();
+	}
+	
 	public static enum Mode
 	{
 		AUTO("Auto"),