MobHealth Added

Author: cev-api

README.md

@@ -739,6 +739,16 @@ This hack is still undergoing development and has only been tested in the end. A
 - Allows you to setup a list of blocks that can only be broken by the player using a tool that has Silk Touch. 
 - Perfect for avoiding accidental breakage of Ender Chests and Amethyst Clusters.
 
+### MobHealth
+- Two dipslay modes; heart bar or a colored number. 
+- Uses ```hud/heart/*``` sprite IDs so it will change along with your resource pack.
+- Toggles for showing number, names or hostile mobs only.
+- Normalised to 10 max hearts.
+- Compatible with HealthTags so names don't conflict.
+- Conforms to vanilla health status effects (poison, wither, frozen, absorption, hardcore, low health jittering).
+
+![Hearts](https://i.imgur.com/FZ8Z0TK.png)
+
 ## What's changed or improved in this fork?
 
 ### ChestESP
@@ -939,6 +949,9 @@ Examples:
 ### AimAssist Improved
 - Added lock-on targetting
 
+### HealthTags Improved
+- Now optionally uses the same hearts as the new MobHealth hack
+
 ### HandNoClip Improved
 - Displays a red X on the crosshair when block placement or interaction is blocked while the hack is enabled.
 - The red X can also indicate blocks that can be interacted with when On-Target Mode is enabled; in this mode, HandNoClip remains disabled until you are within range of a valid block.

src/main/java/net/wurstclient/hack/HackList.java

@@ -168,6 +168,7 @@ public final class HackList implements UpdateListener
 	public final MileyCyrusHack mileyCyrusHack = new MileyCyrusHack();
 	public final MeasurementEspHack measurementEspHack =
 		new MeasurementEspHack();
+	public final MobHealthHack mobHealthHack = new MobHealthHack();
 	public final MobEspHack mobEspHack = new MobEspHack();
 	public final WardenEspHack wardenEspHack = new WardenEspHack();
 	public final MobSearchHack mobSearchHack = new MobSearchHack();

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

@@ -90,14 +90,14 @@ public final class FlightHack extends Hack implements UpdateListener,
 		new SliderSetting("Escape Drop Speed",
 			"description.wurst.setting.flight.escape_drop_speed", 3.9, 0.05,
 			3.9, 0.05, ValueDisplay.DECIMAL);
-	private final CheckboxSetting enableNoFallOnFlight = new CheckboxSetting(
-		"Enable NoFall with Flight",
-		"description.wurst.setting.flight.enable_nofall_with_flight", false);
-	
-	private final CheckboxSetting ignoreVinesWithFlight = new CheckboxSetting(
-		"Ignore vines with Flight",
-		"Temporarily enables NoSlowdown's \"Ignore vines\" while Flight is enabled.",
-		false);
+	private final CheckboxSetting enableNoFallOnFlight = new CheckboxSetting(
+		"Enable NoFall with Flight",
+		"description.wurst.setting.flight.enable_nofall_with_flight", false);
+	
+	private final CheckboxSetting ignoreVinesWithFlight = new CheckboxSetting(
+		"Ignore vines with Flight",
+		"Temporarily enables NoSlowdown's \"Ignore vines\" while Flight is enabled.",
+		false);
 
 	private final CheckboxSetting slowSneaking =
 		new CheckboxSetting("Slow sneaking",
@@ -114,12 +114,12 @@ public final class FlightHack extends Hack implements UpdateListener,
 	private int tickCounter = 0;
 	private final PlayerRangeAlertManager alertManager =
 		WURST.getPlayerRangeAlertManager();
-	private boolean escapeDropActive;
-	private double escapeTargetY;
-	private boolean triggered;
-	private boolean enabledNoFallByFlight;
-	private boolean enabledNoFallByEscape;
-	private boolean managedNoSlowdownVineIgnore;
+	private boolean escapeDropActive;
+	private double escapeTargetY;
+	private boolean triggered;
+	private boolean enabledNoFallByFlight;
+	private boolean enabledNoFallByEscape;
+	private boolean managedNoSlowdownVineIgnore;
 
 	public FlightHack()
 	{
@@ -137,13 +137,13 @@ public FlightHack()
 		addSetting(antiKickDistance);
 		addSetting(dontGetCaught);
 		addSetting(escapeDropSpeed);
-		addSetting(ignoreNpcs);
-		addSetting(ignoreFriends);
-		addSetting(enableNoFallOnFlight);
-		addSetting(ignoreVinesWithFlight);
-		addSetting(slowSneaking);
-		addSetting(ignoreShiftInGuis);
-	}
+		addSetting(ignoreNpcs);
+		addSetting(ignoreFriends);
+		addSetting(enableNoFallOnFlight);
+		addSetting(ignoreVinesWithFlight);
+		addSetting(slowSneaking);
+		addSetting(ignoreShiftInGuis);
+	}
 
 	@Override
 	public String getRenderName()
@@ -166,14 +166,14 @@ public String getRenderName()
 	@Override
 	protected void onEnable()
 	{
-		tickCounter = 0;
-		escapeDropActive = false;
-		triggered = false;
-		managedNoSlowdownVineIgnore = false;
-		
-		WURST.getHax().creativeFlightHack.setEnabled(false);
-		WURST.getHax().jetpackHack.setEnabled(false);
-		syncNoSlowdownVineIgnore();
+		tickCounter = 0;
+		escapeDropActive = false;
+		triggered = false;
+		managedNoSlowdownVineIgnore = false;
+		
+		WURST.getHax().creativeFlightHack.setEnabled(false);
+		WURST.getHax().jetpackHack.setEnabled(false);
+		syncNoSlowdownVineIgnore();
 
 		if(enableNoFallOnFlight.isChecked()
 			&& !WURST.getHax().noFallHack.isEnabled())
@@ -190,21 +190,21 @@ protected void onEnable()
 	}
 
 	@Override
-	protected void onDisable()
-	{
-		restoreNoSlowdownVineIgnore();
-		EVENTS.remove(UpdateListener.class, this);
-		EVENTS.remove(IsPlayerInWaterListener.class, this);
-		EVENTS.remove(AirStrafingSpeedListener.class, this);
+	protected void onDisable()
+	{
+		restoreNoSlowdownVineIgnore();
+		EVENTS.remove(UpdateListener.class, this);
+		EVENTS.remove(IsPlayerInWaterListener.class, this);
+		EVENTS.remove(AirStrafingSpeedListener.class, this);
 		alertManager.removeListener(this);
 		EVENTS.remove(MouseScrollListener.class, this);
 	}
 
 	@Override
-	public void onUpdate()
-	{
-		LocalPlayer player = MC.player;
-		syncNoSlowdownVineIgnore();
+	public void onUpdate()
+	{
+		LocalPlayer player = MC.player;
+		syncNoSlowdownVineIgnore();
 
 		if(enableNoFallOnFlight.isChecked()
 			&& !WURST.getHax().noFallHack.isEnabled())
@@ -250,49 +250,49 @@ public void onUpdate()
 			Vec3 current = player.getDeltaMovement();
 			player.setDeltaMovement(current.x, alignStep, current.z);
 		}
-	}
-	
-	private void syncNoSlowdownVineIgnore()
-	{
-		NoSlowdownHack noSlowdown = WURST.getHax().noSlowdownHack;
-		if(noSlowdown == null)
-			return;
-		
-		if(!ignoreVinesWithFlight.isChecked())
-		{
-			if(managedNoSlowdownVineIgnore)
-			{
-				noSlowdown.setIgnoreVines(false);
-				managedNoSlowdownVineIgnore = false;
-			}
-			return;
-		}
-		
-		if(!managedNoSlowdownVineIgnore)
-		{
-			if(noSlowdown.shouldIgnoreVines())
-				return;
-			
-			noSlowdown.setIgnoreVines(true);
-			managedNoSlowdownVineIgnore = true;
-			return;
-		}
-		
-		if(!noSlowdown.shouldIgnoreVines())
-			noSlowdown.setIgnoreVines(true);
-	}
-	
-	private void restoreNoSlowdownVineIgnore()
-	{
-		if(!managedNoSlowdownVineIgnore)
-			return;
-		
-		NoSlowdownHack noSlowdown = WURST.getHax().noSlowdownHack;
-		if(noSlowdown != null)
-			noSlowdown.setIgnoreVines(false);
-		
-		managedNoSlowdownVineIgnore = false;
-	}
+	}
+	
+	private void syncNoSlowdownVineIgnore()
+	{
+		NoSlowdownHack noSlowdown = WURST.getHax().noSlowdownHack;
+		if(noSlowdown == null)
+			return;
+		
+		if(!ignoreVinesWithFlight.isChecked())
+		{
+			if(managedNoSlowdownVineIgnore)
+			{
+				noSlowdown.setIgnoreVines(false);
+				managedNoSlowdownVineIgnore = false;
+			}
+			return;
+		}
+		
+		if(!managedNoSlowdownVineIgnore)
+		{
+			if(noSlowdown.shouldIgnoreVines())
+				return;
+			
+			noSlowdown.setIgnoreVines(true);
+			managedNoSlowdownVineIgnore = true;
+			return;
+		}
+		
+		if(!noSlowdown.shouldIgnoreVines())
+			noSlowdown.setIgnoreVines(true);
+	}
+	
+	private void restoreNoSlowdownVineIgnore()
+	{
+		if(!managedNoSlowdownVineIgnore)
+			return;
+		
+		NoSlowdownHack noSlowdown = WURST.getHax().noSlowdownHack;
+		if(noSlowdown != null)
+			noSlowdown.setIgnoreVines(false);
+		
+		managedNoSlowdownVineIgnore = false;
+	}
 
 	@Override
 	public void onGetAirStrafingSpeed(AirStrafingSpeedEvent event)

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

@@ -8,34 +8,75 @@
 package net.wurstclient.hacks;
 
 import net.minecraft.ChatFormatting;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.world.entity.LivingEntity;
 import net.wurstclient.Category;
 import net.wurstclient.SearchTags;
+import net.wurstclient.events.GUIRenderListener;
 import net.wurstclient.hack.Hack;
+import net.wurstclient.settings.CheckboxSetting;
+import net.wurstclient.util.EntityHealthRenderer;
 
 @SearchTags({"health tags"})
-public final class HealthTagsHack extends Hack
+public final class HealthTagsHack extends Hack implements GUIRenderListener
 {
+	private final CheckboxSetting heartsBelowName =
+		new CheckboxSetting("Hearts below name",
+			"Shows hearts on a second line below the nametag instead of"
+				+ " appending a numeric value to the name.",
+			false);
+	
+	private final java.util.Set<LivingEntity> entitiesToRender =
+		java.util.Collections.newSetFromMap(new java.util.WeakHashMap<>());
+	
 	public HealthTagsHack()
 	{
 		super("HealthTags");
 		setCategory(Category.RENDER);
+		addSetting(heartsBelowName);
+	}
+	
+	@Override
+	protected void onEnable()
+	{
+		EVENTS.add(GUIRenderListener.class, this);
+	}
+	
+	@Override
+	protected void onDisable()
+	{
+		EVENTS.remove(GUIRenderListener.class, this);
+		entitiesToRender.clear();
 	}
 
 	public Component addHealth(LivingEntity entity, MutableComponent nametag)
 	{
 		if(!isEnabled())
 			return nametag;
 
+		if(heartsBelowName.isChecked())
+			return nametag;
+		
 		int health = (int)entity.getHealth();
 
 		MutableComponent formattedHealth = Component.literal(" ")
 			.append(Integer.toString(health)).withStyle(getColor(health));
 		return nametag.append(formattedHealth);
 	}
 
+	public boolean shouldRenderHeartsBelowName()
+	{
+		return isEnabled() && heartsBelowName.isChecked();
+	}
+	
+	public void markForHeartRender(LivingEntity entity)
+	{
+		if(shouldRenderHeartsBelowName())
+			entitiesToRender.add(entity);
+	}
+	
 	private ChatFormatting getColor(int health)
 	{
 		if(health <= 5)
@@ -50,5 +91,20 @@ private ChatFormatting getColor(int health)
 		return ChatFormatting.GREEN;
 	}
 
+	@Override
+	public void onRenderGUI(GuiGraphics context, float partialTicks)
+	{
+		for(LivingEntity entity : entitiesToRender)
+		{
+			if(entity == null || !entity.isAlive())
+				continue;
+			
+			EntityHealthRenderer.drawHeartsAtEntity(context, entity,
+				partialTicks, -10F);
+		}
+		
+		entitiesToRender.clear();
+	}
+	
 	// See EntityRendererMixin
 }