Updated NoSlowDown and TrueSight

Author: cev-api

README.md

@@ -470,6 +470,10 @@ Examples:
 
 ### NoSlowDown Improved
 - Added no slowdown for lava
+- Added no slowdown for water
+
+### TrueSight Improved
+- Added customisable glow ESP for invisible entities
 
 ### Alt Manager Improved
 - Can now multi-select and delete alt accounts

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

@@ -11,42 +11,53 @@
 import net.wurstclient.SearchTags;
 import net.wurstclient.events.IsPlayerInLavaListener;
 import net.wurstclient.events.IsPlayerInLavaListener.IsPlayerInLavaEvent;
+import net.wurstclient.events.IsPlayerInWaterListener;
+import net.wurstclient.events.IsPlayerInWaterListener.IsPlayerInWaterEvent;
 import net.wurstclient.events.VelocityFromFluidListener;
 import net.wurstclient.events.VelocityFromFluidListener.VelocityFromFluidEvent;
 import net.wurstclient.hack.Hack;
 import net.wurstclient.settings.CheckboxSetting;
 
 @SearchTags({"no slowdown", "no slow down"})
-public final class NoSlowdownHack extends Hack
-	implements IsPlayerInLavaListener, VelocityFromFluidListener
+public final class NoSlowdownHack extends Hack implements
+	IsPlayerInLavaListener, IsPlayerInWaterListener, VelocityFromFluidListener
 {
 	private final CheckboxSetting lavaSpeed = new CheckboxSetting(
 		"No lava slowdown", "Removes lava movement penalties.\n"
 			+ "Some servers treat this like a speedhack.",
 		false);
+	private final CheckboxSetting waterSpeed = new CheckboxSetting(
+		"No water slowdown", "Removes water movement penalties.\n"
+			+ "Some servers treat this like a speedhack.",
+		false);
 
 	private boolean bypassingLava;
+	private boolean bypassingWater;
 
 	public NoSlowdownHack()
 	{
 		super("NoSlowdown");
 		setCategory(Category.MOVEMENT);
 		addSetting(lavaSpeed);
+		addSetting(waterSpeed);
 	}
 
 	@Override
 	protected void onEnable()
 	{
 		EVENTS.add(IsPlayerInLavaListener.class, this);
+		EVENTS.add(IsPlayerInWaterListener.class, this);
 		EVENTS.add(VelocityFromFluidListener.class, this);
 	}
 
 	@Override
 	protected void onDisable()
 	{
 		EVENTS.remove(IsPlayerInLavaListener.class, this);
+		EVENTS.remove(IsPlayerInWaterListener.class, this);
 		EVENTS.remove(VelocityFromFluidListener.class, this);
 		bypassingLava = false;
+		bypassingWater = false;
 	}
 
 	@Override
@@ -68,14 +79,38 @@ public void onIsPlayerInLava(IsPlayerInLavaEvent event)
 		bypassingLava = false;
 	}
 
+	@Override
+	public void onIsPlayerInWater(IsPlayerInWaterEvent event)
+	{
+		if(!waterSpeed.isChecked())
+		{
+			bypassingWater = false;
+			return;
+		}
+		
+		if(event.isNormallyInWater())
+		{
+			bypassingWater = true;
+			event.setInWater(false);
+			return;
+		}
+		
+		bypassingWater = false;
+	}
+	
 	@Override
 	public void onVelocityFromFluid(VelocityFromFluidEvent event)
 	{
-		if(!lavaSpeed.isChecked() || !bypassingLava)
+		boolean cancelLava = lavaSpeed.isChecked() && bypassingLava;
+		boolean cancelWater = waterSpeed.isChecked() && bypassingWater;
+		
+		if(!cancelLava && !cancelWater)
+			return;
+		
+		if(event.getEntity() != MC.player)
 			return;
 
-		if(event.getEntity() == MC.player)
-			event.cancel();
+		event.cancel();
 	}
 
 	// See BlockMixin.onGetVelocityMultiplier() and

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

@@ -105,15 +105,15 @@ public final class SeedMapperHelperHack extends Hack
 	private final ButtonSetting applySeedResolutionOrderButton =
 		new ButtonSetting("Apply resolution order",
 			this::applySeedResolutionOrder);
-	private final CheckboxSetting oreAirCheckSetting =
-		new CheckboxSetting("Ore air check enabled", false);
-	private final ButtonSetting applyOreAirCheckButton =
-		new ButtonSetting("Apply OreAirCheck", this::applyOreAirCheck);
-	private final CheckboxSetting clearSeedMapCachesSetting =
-		new CheckboxSetting("Clear SeedMap caches on close", false);
-	private final ButtonSetting applyClearSeedMapCachesButton =
-		new ButtonSetting("Apply ClearSeedMapCachesOnClose",
-			this::applyClearSeedMapCaches);
+	private final CheckboxSetting oreAirCheckSetting =
+		new CheckboxSetting("Ore air check enabled", false);
+	private final ButtonSetting applyOreAirCheckButton =
+		new ButtonSetting("Apply OreAirCheck", this::applyOreAirCheck);
+	private final CheckboxSetting clearSeedMapCachesSetting =
+		new CheckboxSetting("Clear SeedMap caches on close", false);
+	private final ButtonSetting applyClearSeedMapCachesButton =
+		new ButtonSetting("Apply ClearSeedMapCachesOnClose",
+			this::applyClearSeedMapCaches);
 	private final SliderSetting seedMapThreadsSetting = new SliderSetting(
 		"Seed map threads", 4, 1, 32, 1, ValueDisplay.INTEGER);
 	private final ButtonSetting applySeedMapThreadsButton =
@@ -301,12 +301,12 @@ public SeedMapperHelperHack()
 		addSetting(addSavedSeedButton);
 		addSetting(seedResolutionOrderSetting);
 		addSetting(applySeedResolutionOrderButton);
-		addSetting(oreAirCheckSetting);
-		addSetting(applyOreAirCheckButton);
-		addSetting(clearSeedMapCachesSetting);
-		addSetting(applyClearSeedMapCachesButton);
-		addSetting(seedMapThreadsSetting);
-		addSetting(applySeedMapThreadsButton);
+		addSetting(oreAirCheckSetting);
+		addSetting(applyOreAirCheckButton);
+		addSetting(clearSeedMapCachesSetting);
+		addSetting(applyClearSeedMapCachesButton);
+		addSetting(seedMapThreadsSetting);
+		addSetting(applySeedMapThreadsButton);
 		addSetting(pixelsPerBiomeSetting);
 		addSetting(applyPixelsPerBiomeButton);
 		addSetting(toggledFeaturesSetting);
@@ -320,15 +320,15 @@ public SeedMapperHelperHack()
 			seedCheckInputSetting, applySeedInputButton, stopTaskButton,
 			showCommandFeedbackSetting);
 		addSection("SeedMapper config", "Convenience controls for /sm:config.",
-			savedSeedValueSetting, addSavedSeedButton,
-			seedResolutionOrderSetting, applySeedResolutionOrderButton,
-			oreAirCheckSetting, applyOreAirCheckButton,
-			clearSeedMapCachesSetting, applyClearSeedMapCachesButton,
-			seedMapThreadsSetting,
-			applySeedMapThreadsButton, pixelsPerBiomeSetting,
-			applyPixelsPerBiomeButton, toggledFeaturesSetting,
-			applyToggledFeaturesButton, devModeSetting, applyDevModeButton,
-			espTimeoutMinutesSetting, applyEspTimeoutMinutesButton);
+			savedSeedValueSetting, addSavedSeedButton,
+			seedResolutionOrderSetting, applySeedResolutionOrderButton,
+			oreAirCheckSetting, applyOreAirCheckButton,
+			clearSeedMapCachesSetting, applyClearSeedMapCachesButton,
+			seedMapThreadsSetting, applySeedMapThreadsButton,
+			pixelsPerBiomeSetting, applyPixelsPerBiomeButton,
+			toggledFeaturesSetting, applyToggledFeaturesButton, devModeSetting,
+			applyDevModeButton, espTimeoutMinutesSetting,
+			applyEspTimeoutMinutesButton);
 
 		addSetting(highlightModeSetting);
 		addSetting(highlightBlockSetting);
@@ -750,19 +750,20 @@ private void applySeedResolutionOrder()
 			"set SeedResolutionOrder");
 	}
 
-	private void applyOreAirCheck()
-	{
-		runSimpleCommand(
-			"sm:config OreAirCheck set " + oreAirCheckSetting.isChecked(),
-			"set OreAirCheck");
-	}
-	
-	private void applyClearSeedMapCaches()
-	{
-		runSimpleCommand("sm:config ClearSeedMapCachesOnClose set "
-			+ clearSeedMapCachesSetting.isChecked(),
-			"set ClearSeedMapCachesOnClose");
-	}
+	private void applyOreAirCheck()
+	{
+		runSimpleCommand(
+			"sm:config OreAirCheck set " + oreAirCheckSetting.isChecked(),
+			"set OreAirCheck");
+	}
+	
+	private void applyClearSeedMapCaches()
+	{
+		runSimpleCommand(
+			"sm:config ClearSeedMapCachesOnClose set "
+				+ clearSeedMapCachesSetting.isChecked(),
+			"set ClearSeedMapCachesOnClose");
+	}
 
 	private void applySeedMapThreads()
 	{

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

@@ -7,10 +7,14 @@
  */
 package net.wurstclient.hacks;
 
+import java.awt.Color;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
 import net.wurstclient.Category;
 import net.wurstclient.SearchTags;
 import net.wurstclient.hack.Hack;
+import net.wurstclient.settings.CheckboxSetting;
+import net.wurstclient.settings.ColorSetting;
 import net.wurstclient.settings.filterlists.EntityFilterList;
 import net.wurstclient.settings.filters.*;
 
@@ -39,11 +43,19 @@ public final class TrueSightHack extends Hack
 			FilterAllaysSetting.genericVision(false),
 			FilterNamedSetting.genericVision(false),
 			FilterArmorStandsSetting.genericVision(false));
+	private final CheckboxSetting glowInvisible = new CheckboxSetting(
+		"Glow invisible entities",
+		"Adds a glow outline around invisible entities that pass your filters.",
+		false);
+	private final ColorSetting glowColor = new ColorSetting("Glow color",
+		"Color used for the glow outline.", new Color(0, 255, 255));
 
 	public TrueSightHack()
 	{
 		super("TrueSight");
 		setCategory(Category.RENDER);
+		addSetting(glowInvisible);
+		addSetting(glowColor);
 		entityFilters.forEach(this::addSetting);
 	}
 
@@ -52,5 +64,19 @@ public boolean shouldBeVisible(Entity entity)
 		return isEnabled() && entityFilters.testOne(entity);
 	}
 
+	public Integer getGlowColor(LivingEntity entity)
+	{
+		if(!glowInvisible.isChecked())
+			return null;
+		
+		if(!isEnabled() || !shouldBeVisible(entity))
+			return null;
+		
+		if(!entity.isInvisible())
+			return null;
+		
+		return glowColor.getColorI();
+	}
+	
 	// See EntityMixin.onIsInvisibleTo()
 }

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

@@ -122,7 +122,12 @@ private Integer getEspGlowColor(LivingEntity living)
 		if(color != null)
 			return color;
 
-		return NiceWurstModule.filterGlowColor(living,
+		color = NiceWurstModule.filterGlowColor(living,
 			hax.mobEspHack.getGlowColor(living));
+		if(color != null)
+			return color;
+		
+		return NiceWurstModule.filterGlowColor(living,
+			hax.trueSightHack.getGlowColor(living));
 	}
 }