Added Glow Outline to PlayerESP and MobSearch

Author: cev-api

README.md

@@ -40,9 +40,10 @@ Build without the flag to get the full CevAPI experience; build with the flag fo
 - Search mobs by fuzzy name/ID or exact type (e.g., `minecraft:zombie` or `zombie`).  
 - Added list mode with visual list of mobs.  
 - Multi-term queries: comma-separated (e.g., `skeleton, zombie`).  
-- Rendering: Boxes, Octahedrons, Lines, or Both. Rainbow or fixed color, filled or unfilled and configurable box size.
+- Rendering: Glow Outlines, Boxes, Octahedrons, Lines, or Both. Rainbow or fixed color, filled or unfilled and configurable box size.
 
 ![MobSearch](https://i.imgur.com/PeklZSq.png)
+![Glowing](https://i.imgur.com/nj29EQY.png)
 
 ### BedESP
 - Finds all bed types.  
@@ -275,6 +276,7 @@ Examples:
 - Added toggle for unique colors for each player (shared with Breadcrumbs)
 - Added box fill with transparency slider
 - Added static color option
+- Added glow outlines as an option 
 - Added Line of Sight Detection (LOS)
     - When you're spotted ESP and tracer will turn a bold red regardless of distance or color settings
     - Adjustable FOV and range
@@ -295,9 +297,9 @@ Examples:
 
 ### MobESP Improvements
 - Added rainbow/fixed color options for boxes/lines.  
-- Added octahedron shapes and set it as the new default.
-- Added glow outlines as an option
-- Added box color fill option
+- Added octahedron shapes.
+- Added glow outlines as an option and set it as the new default.
+- Added box color fill option.
 
 ![Mob](https://i.imgur.com/VXHW4qe.png)
 

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

@@ -254,14 +254,14 @@ private float[] getColorRgb()
 		return color.getColorF();
 	}
 
-	public boolean shouldGlow(LivingEntity entity)
-	{
-		return isEnabled() && style.getShape() == MobEspStyleSetting.Shape.GLOW
-			&& mobs.contains(entity);
-	}
-	
-	public int getGlowColor()
+	public Integer getGlowColor(LivingEntity entity)
 	{
+		if(!isEnabled())
+			return null;
+		if(style.getShape() != MobEspStyleSetting.Shape.GLOW)
+			return null;
+		if(!mobs.contains(entity))
+			return null;
 		return RenderUtils.toIntColor(getColorRgb(), 1F);
 	}
 
@@ -270,7 +270,7 @@ private static final class MobEspStyleSetting
 	{
 		private MobEspStyleSetting()
 		{
-			super("Style", Style.values(), Style.OCTAHEDRONS);
+			super("Style", Style.values(), Style.GLOW);
 		}
 
 		public Shape getShape()

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

@@ -257,7 +257,9 @@ public void onRender(MatrixStack matrixStack, float partialTicks)
 			return;
 
 		MobSearchStyleSetting.Shape shape = style.getShape();
-		boolean drawShape = shape != MobSearchStyleSetting.Shape.NONE;
+		boolean glowMode = shape == MobSearchStyleSetting.Shape.GLOW;
+		boolean drawShape =
+			!glowMode && shape != MobSearchStyleSetting.Shape.NONE;
 		boolean drawLines = style.hasLines();
 		boolean drawFill = drawShape && fillShapes.isChecked();
 
@@ -295,31 +297,34 @@ public void onRender(MatrixStack matrixStack, float partialTicks)
 			}
 		}
 
-		if(filledShapes != null && !filledShapes.isEmpty())
+		if(!glowMode)
 		{
-			switch(shape)
+			if(filledShapes != null && !filledShapes.isEmpty())
 			{
-				case BOX -> RenderUtils.drawSolidBoxes(matrixStack,
-					filledShapes, false);
-				case OCTAHEDRON -> RenderUtils.drawSolidOctahedrons(matrixStack,
-					filledShapes, false);
-				default ->
-					{
-					}
+				switch(shape)
+				{
+					case BOX -> RenderUtils.drawSolidBoxes(matrixStack,
+						filledShapes, false);
+					case OCTAHEDRON -> RenderUtils
+						.drawSolidOctahedrons(matrixStack, filledShapes, false);
+					default ->
+						{
+						}
+				}
 			}
-		}
-		
-		if(outlineShapes != null && !outlineShapes.isEmpty())
-		{
-			switch(shape)
+			
+			if(outlineShapes != null && !outlineShapes.isEmpty())
 			{
-				case BOX -> RenderUtils.drawOutlinedBoxes(matrixStack,
-					outlineShapes, false);
-				case OCTAHEDRON -> RenderUtils
-					.drawOutlinedOctahedrons(matrixStack, outlineShapes, false);
-				default ->
-					{
-					}
+				switch(shape)
+				{
+					case BOX -> RenderUtils.drawOutlinedBoxes(matrixStack,
+						outlineShapes, false);
+					case OCTAHEDRON -> RenderUtils.drawOutlinedOctahedrons(
+						matrixStack, outlineShapes, false);
+					default ->
+						{
+						}
+				}
 			}
 		}
 
@@ -392,13 +397,24 @@ private String abbreviate(String text)
 		return text.substring(0, 32) + "...";
 	}
 
+	public Integer getGlowColor(LivingEntity entity)
+	{
+		if(!isEnabled())
+			return null;
+		if(style.getShape() != MobSearchStyleSetting.Shape.GLOW)
+			return null;
+		if(!matches.contains(entity))
+			return null;
+		return getColorI(1F);
+	}
+	
 	// 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);
+			super("Style", Style.values(), Style.LINES_AND_GLOW);
 		}
 
 		public Shape getShape()
@@ -415,7 +431,8 @@ enum Shape
 		{
 			NONE,
 			BOX,
-			OCTAHEDRON;
+			OCTAHEDRON,
+			GLOW;
 		}
 
 		private enum Style
@@ -425,7 +442,9 @@ private enum Style
 			LINES("Lines only", Shape.NONE, true),
 			LINES_AND_BOXES("Lines and boxes", Shape.BOX, true),
 			LINES_AND_OCTAHEDRONS("Lines and octahedrons", Shape.OCTAHEDRON,
-				true);
+				true),
+			GLOW("Glow only", Shape.GLOW, false),
+			LINES_AND_GLOW("Lines and glow", Shape.GLOW, true);
 
 			private final String name;
 			private final Shape shape;

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

@@ -7,6 +7,7 @@
  */
 package net.wurstclient.hacks;
 
+import java.awt.Color;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
@@ -19,6 +20,7 @@
 
 import net.minecraft.client.network.AbstractClientPlayerEntity;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.math.Box;
 import net.minecraft.util.math.MathHelper;
@@ -29,36 +31,34 @@
 import net.minecraft.text.MutableText;
 import net.minecraft.text.TextColor;
 import net.minecraft.util.Formatting;
+import net.minecraft.world.RaycastContext;
 import net.wurstclient.Category;
 import net.wurstclient.SearchTags;
 import net.wurstclient.events.CameraTransformViewBobbingListener;
 import net.wurstclient.events.RenderListener;
 import net.wurstclient.events.UpdateListener;
 import net.wurstclient.hack.Hack;
+import net.wurstclient.settings.ColorSetting;
+import net.wurstclient.settings.CheckboxSetting;
+import net.wurstclient.settings.EnumSetting;
 import net.wurstclient.settings.EspBoxSizeSetting;
-import net.wurstclient.settings.EspStyleSetting;
-import net.wurstclient.settings.EspStyleSetting.EspStyle;
+import net.wurstclient.settings.SliderSetting;
 import net.wurstclient.settings.filterlists.EntityFilterList;
 import net.wurstclient.settings.filters.FilterInvisibleSetting;
 import net.wurstclient.settings.filters.FilterSleepingSetting;
-import net.wurstclient.settings.ColorSetting;
-import java.awt.Color;
-import net.wurstclient.settings.CheckboxSetting;
-import net.wurstclient.settings.SliderSetting;
+import net.wurstclient.util.ChatUtils;
 import net.wurstclient.util.EntityUtils;
 import net.wurstclient.util.FakePlayerEntity;
 import net.wurstclient.util.RenderUtils;
-import net.wurstclient.util.ChatUtils;
 import net.wurstclient.util.RenderUtils.ColoredBox;
 import net.wurstclient.util.RenderUtils.ColoredPoint;
-import net.minecraft.world.RaycastContext;
 
 @SearchTags({"player esp", "PlayerTracers", "player tracers"})
 public final class PlayerEspHack extends Hack implements UpdateListener,
 	CameraTransformViewBobbingListener, RenderListener
 {
-	private final EspStyleSetting style =
-		new EspStyleSetting(EspStyle.LINES_AND_BOXES);
+	private final PlayerEspStyleSetting style =
+		new PlayerEspStyleSetting(PlayerEspStyleSetting.Style.LINES_AND_GLOW);
 
 	private final EspBoxSizeSetting boxSize = new EspBoxSizeSetting(
 		"\u00a7lAccurate\u00a7r mode shows the exact hitbox of each player.\n"
@@ -429,6 +429,20 @@ public void onRender(MatrixStack matrixStack, float partialTicks)
 		}
 	}
 
+	public Integer getGlowColor(LivingEntity entity)
+	{
+		if(!isEnabled())
+			return null;
+		if(!style.hasGlow())
+			return null;
+		if(!(entity instanceof PlayerEntity player))
+			return null;
+		if(!players.contains(player))
+			return null;
+		
+		return makeOpaque(getBaseColor(player));
+	}
+	
 	private int getBaseColor(PlayerEntity e)
 	{
 		if(WURST.getFriends().contains(e.getName().getString()))
@@ -727,4 +741,57 @@ private void setLos(boolean value, long now)
 			}
 		}
 	}
+	
+	private static final class PlayerEspStyleSetting
+		extends EnumSetting<PlayerEspStyleSetting.Style>
+	{
+		private PlayerEspStyleSetting(Style defaultStyle)
+		{
+			super("Style", Style.values(), defaultStyle);
+		}
+		
+		public boolean hasBoxes()
+		{
+			return getSelected().boxes;
+		}
+		
+		public boolean hasLines()
+		{
+			return getSelected().lines;
+		}
+		
+		public boolean hasGlow()
+		{
+			return getSelected().glow;
+		}
+		
+		private enum Style
+		{
+			BOXES("Boxes only", true, false, false),
+			LINES("Lines only", false, true, false),
+			LINES_AND_BOXES("Lines and boxes", true, true, false),
+			GLOW("Glow only", false, false, true),
+			LINES_AND_GLOW("Lines and glow", false, true, true);
+			
+			private final String name;
+			private final boolean boxes;
+			private final boolean lines;
+			private final boolean glow;
+			
+			private Style(String name, boolean boxes, boolean lines,
+				boolean glow)
+			{
+				this.name = name;
+				this.boxes = boxes;
+				this.lines = lines;
+				this.glow = glow;
+			}
+			
+			@Override
+			public String toString()
+			{
+				return name;
+			}
+		}
+	}
 }

src/main/java/net/wurstclient/mixin/EntityMixin.java

@@ -86,8 +86,11 @@ private void onIsGlowing(CallbackInfoReturnable<Boolean> cir)
 		if(cir.getReturnValueZ())
 			return;
 
-		if((Object)this instanceof LivingEntity living
-			&& WurstClient.INSTANCE.getHax().mobEspHack.shouldGlow(living))
+		if(!((Object)this instanceof LivingEntity living))
+			return;
+		
+		Integer glowColor = getEspGlowColor(living);
+		if(glowColor != null)
 			cir.setReturnValue(true);
 	}
 
@@ -99,8 +102,23 @@ private void onGetTeamColorValue(CallbackInfoReturnable<Integer> cir)
 		if(!((Object)this instanceof LivingEntity living))
 			return;
 
-		if(WurstClient.INSTANCE.getHax().mobEspHack.shouldGlow(living))
-			cir.setReturnValue(
-				WurstClient.INSTANCE.getHax().mobEspHack.getGlowColor());
+		Integer glowColor = getEspGlowColor(living);
+		if(glowColor != null)
+			cir.setReturnValue(glowColor);
+	}
+	
+	private Integer getEspGlowColor(LivingEntity living)
+	{
+		var hax = WurstClient.INSTANCE.getHax();
+		
+		Integer color = hax.playerEspHack.getGlowColor(living);
+		if(color != null)
+			return color;
+		
+		color = hax.mobSearchHack.getGlowColor(living);
+		if(color != null)
+			return color;
+		
+		return hax.mobEspHack.getGlowColor(living);
 	}
 }