MobESP: add rainbow/fixed color options; Search: multi-term query; polish README notes; UI: sticky area + tracers updates

Author: cev-api

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

@@ -11,12 +11,12 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
+import java.awt.Color;
 
 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;
 import net.minecraft.util.math.Vec3d;
 import net.wurstclient.Category;
 import net.wurstclient.SearchTags;
@@ -26,6 +26,8 @@
 import net.wurstclient.hack.Hack;
 import net.wurstclient.settings.EspBoxSizeSetting;
 import net.wurstclient.settings.EspStyleSetting;
+import net.wurstclient.settings.CheckboxSetting;
+import net.wurstclient.settings.ColorSetting;
 import net.wurstclient.settings.filterlists.EntityFilterList;
 import net.wurstclient.settings.filters.*;
 import net.wurstclient.util.EntityUtils;
@@ -43,6 +45,13 @@ public final class MobEspHack extends Hack implements UpdateListener,
 		"\u00a7lAccurate\u00a7r mode shows the exact hitbox of each mob.\n"
 			+ "\u00a7lFancy\u00a7r mode shows slightly larger boxes that look better.");
 
+	// New color options to match MobSearch
+	private final CheckboxSetting useRainbow =
+		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);
+	
 	private final EntityFilterList entityFilters =
 		new EntityFilterList(FilterHostileSetting.genericVision(false),
 			FilterNeutralSetting
@@ -75,6 +84,9 @@ public MobEspHack()
 		setCategory(Category.RENDER);
 		addSetting(style);
 		addSetting(boxSize);
+		// Add new color settings
+		addSetting(useRainbow);
+		addSetting(color);
 		entityFilters.forEach(this::addSetting);
 	}
 
@@ -130,7 +142,7 @@ public void onRender(MatrixStack matrixStack, float partialTicks)
 			{
 				Box box = EntityUtils.getLerpedBox(e, partialTicks)
 					.offset(0, extraSize, 0).expand(extraSize);
-				boxes.add(new ColoredBox(box, getColor(e)));
+				boxes.add(new ColoredBox(box, getColorI(0.5F)));
 			}
 
 			RenderUtils.drawOutlinedBoxes(matrixStack, boxes, false);
@@ -143,19 +155,20 @@ public void onRender(MatrixStack matrixStack, float partialTicks)
 			{
 				Vec3d point =
 					EntityUtils.getLerpedBox(e, partialTicks).getCenter();
-				ends.add(new ColoredPoint(point, getColor(e)));
+				ends.add(new ColoredPoint(point, getColorI(0.5F)));
 			}
 
 			RenderUtils.drawTracers(matrixStack, partialTicks, ends, false);
 		}
 	}
 
-	private int getColor(LivingEntity e)
+	private int getColorI(float alpha)
 	{
-		float f = MC.player.distanceTo(e) / 20F;
-		float r = MathHelper.clamp(2 - f, 0, 1);
-		float g = MathHelper.clamp(f, 0, 1);
-		float[] rgb = {r, g, 0};
-		return RenderUtils.toIntColor(rgb, 0.5F);
+		if(useRainbow.isChecked())
+		{
+			float[] rgb = RenderUtils.getRainbowColor();
+			return RenderUtils.toIntColor(rgb, alpha);
+		}
+		return RenderUtils.toIntColor(color.getColorF(), alpha);
 	}
 }

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

@@ -181,6 +181,9 @@ private Predicate<LivingEntity> byExactType(String normalizedType)
 
 	private Predicate<LivingEntity> byFuzzyQuery(String q)
 	{
+		// Support multiple comma-separated terms, match if any term matches
+		String[] terms = Stream.of(q.split(",")).map(String::trim)
+			.filter(s -> !s.isEmpty()).toArray(String[]::new);
 		return e -> {
 			Identifier id = Registries.ENTITY_TYPE.getId(e.getType());
 			String s = id == null ? "" : id.toString();
@@ -189,10 +192,14 @@ private Predicate<LivingEntity> byFuzzyQuery(String q)
 			String localSpaced = local.replace('_', ' ');
 			String transKey = e.getType().getTranslationKey();
 			String display = e.getType().getName().getString();
-			return containsNormalized(s, q) || containsNormalized(local, q)
-				|| containsNormalized(localSpaced, q)
-				|| containsNormalized(transKey, q)
-				|| containsNormalized(display, q);
+			for(String term : terms)
+				if(containsNormalized(s, term)
+					|| containsNormalized(local, term)
+					|| containsNormalized(localSpaced, term)
+					|| containsNormalized(transKey, term)
+					|| containsNormalized(display, term))
+					return true;
+			return false;
 		};
 	}
 

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

@@ -12,6 +12,7 @@
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Locale;
+import java.util.Arrays;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.stream.Collectors;
@@ -75,7 +76,8 @@ public final class SearchHack extends Hack implements UpdateListener,
 
 	private final ChunkAreaSetting area = new ChunkAreaSetting("Area",
 		"The area around the player to search in.\n"
-			+ "Higher values require a faster computer.");
+			+ "Higher values require a faster computer.",
+		ChunkAreaSetting.ChunkArea.A33);
 
 	private final SliderSetting limit = new SliderSetting("Limit",
 		"The maximum number of blocks to display.\n"
@@ -313,12 +315,21 @@ private boolean blockMatchesQuery(Block block, String normalizedQuery)
 		String id = BlockUtils.getName(block);
 		String localId =
 			id.contains(":") ? id.substring(id.indexOf(":") + 1) : id;
-		
-		return containsNormalized(id, normalizedQuery)
-			|| containsNormalized(localId, normalizedQuery)
-			|| containsNormalized(localId.replace('_', ' '), normalizedQuery)
-			|| containsNormalized(block.getTranslationKey(), normalizedQuery)
-			|| containsNormalized(block.getName().getString(), normalizedQuery);
+		// Support multiple comma-separated terms; match if ANY term matches
+		String[] terms = Arrays.stream(normalizedQuery.split(","))
+			.map(String::trim).filter(s -> !s.isEmpty()).toArray(String[]::new);
+		if(terms.length == 0)
+			terms = new String[]{normalizedQuery};
+		String localSpaced = localId.replace('_', ' ');
+		String transKey = block.getTranslationKey();
+		String display = block.getName().getString();
+		for(String term : terms)
+			if(containsNormalized(id, term) || containsNormalized(localId, term)
+				|| containsNormalized(localSpaced, term)
+				|| containsNormalized(transKey, term)
+				|| containsNormalized(display, term))
+				return true;
+		return false;
 	}
 
 	private boolean containsNormalized(String haystack, String normalizedQuery)