Fixes

Author: cev-api

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

@@ -27,8 +27,10 @@
 import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
 import net.minecraft.resources.Identifier;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.monster.Creeper;
 import net.minecraft.world.entity.monster.Enemy;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.entity.projectile.arrow.AbstractArrow;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.phys.AABB;
@@ -53,6 +55,7 @@ public final class UntouchableHack extends Hack
 	private static final int DIRECTION_SAMPLES = 16;
 	private static final long MACE_PACKET_CUE_MS = 500;
 	private static final long PRIMED_SPEAR_MEMORY_MS = 1200;
+	private static final long CHARGING_CREEPER_MEMORY_MS = 1200;
 
 	private enum KeepDistanceMode
 	{
@@ -160,12 +163,20 @@ public String toString()
 	private final CheckboxSetting avoidHostileMobs =
 		new CheckboxSetting("Avoid hostile mobs",
 			"description.wurst.setting.untouchable.avoid_hostile_mobs", false);
+	private final CheckboxSetting onlyChargingCreepers = new CheckboxSetting(
+		"Only charging creepers",
+		"description.wurst.setting.untouchable.only_charging_creepers", false);
+	private final CheckboxSetting avoidArrows =
+		new CheckboxSetting("Avoid arrows",
+			"description.wurst.setting.untouchable.avoid_arrows", true);
 
 	private final Map<Integer, Vec3> previousPositions = new HashMap<>();
 	private final Map<Integer, MacePacketCue> macePacketCues =
 		new ConcurrentHashMap<>();
 	private final Map<Integer, Long> primedSpearCues =
 		new ConcurrentHashMap<>();
+	private final Map<Integer, Long> chargingCreeperCues =
+		new ConcurrentHashMap<>();
 	private int cooldownTicksLeft;
 	private int statusTicksLeft;
 	private ThreatType activeThreat;
@@ -194,6 +205,8 @@ public UntouchableHack()
 		addSetting(teleportCooldown);
 		addSetting(avoidDrops);
 		addSetting(avoidHostileMobs);
+		addSetting(onlyChargingCreepers);
+		addSetting(avoidArrows);
 	}
 
 	@Override
@@ -223,6 +236,7 @@ private void reset()
 		previousPositions.clear();
 		macePacketCues.clear();
 		primedSpearCues.clear();
+		chargingCreeperCues.clear();
 		cooldownTicksLeft = 0;
 		statusTicksLeft = 0;
 		activeThreat = null;
@@ -449,6 +463,7 @@ public void onUpdate()
 		}
 
 		rememberPrimedSpears();
+		rememberChargingCreepers();
 		if(cooldownTicksLeft > 0)
 			cooldownTicksLeft--;
 
@@ -533,13 +548,35 @@ private Threat findMostUrgentThreat()
 				if(!(entity instanceof Enemy) || entity == MC.player
 					|| !entity.isAlive())
 					continue;
+				if(shouldSuppressDodging(entity.position()))
+					continue;
+				if(onlyChargingCreepers.isChecked()
+					&& !isChargingCreeper(entity))
+					continue;
 
 				Threat threat = getHostileMobThreat(entity);
 				if(threat != null
 					&& (best == null || threat.urgency > best.urgency))
 					best = threat;
 			}
 		}
+		if(avoidArrows.isChecked())
+		{
+			for(Entity entity : MC.level.entitiesForRendering())
+			{
+				if(!(entity instanceof AbstractArrow arrow) || !arrow.isAlive()
+					|| arrow.getOwner() == MC.player)
+					continue;
+				Entity owner = arrow.getOwner();
+				if(owner instanceof Player player && isIgnoredPlayer(player))
+					continue;
+				
+				Threat threat = getArrowThreat(arrow);
+				if(threat != null
+					&& (best == null || threat.urgency > best.urgency))
+					best = threat;
+			}
+		}
 		return best;
 	}
 
@@ -818,6 +855,59 @@ private Threat getHostileMobThreat(Entity mob)
 			250 + (playerDistance.getValue() - distance) * 10);
 	}
 
+	private Threat getArrowThreat(AbstractArrow arrow)
+	{
+		if(MC.player == null || MC.level == null)
+			return null;
+		
+		Vec3 playerCenter = MC.player.getBoundingBox().getCenter();
+		Vec3 arrowCenter = arrow.getBoundingBox().getCenter();
+		Vec3 velocity = getObservedVelocity(arrow);
+		if(velocity.lengthSqr() < 0.01)
+			velocity = arrow.getDeltaMovement();
+		if(velocity.lengthSqr() < 0.01)
+			return null;
+		
+		Vec3 toPlayer = playerCenter.subtract(arrowCenter);
+		if(velocity.dot(toPlayer) <= 0)
+			return null;
+		
+		double ticks = reactionTicks.getValue() + 2;
+		Vec3 end = arrowCenter.add(velocity.scale(ticks));
+		double missDistance = distanceToSegment(playerCenter, arrowCenter, end);
+		double effectiveRange = Math.max(detectionRange.getValue(),
+			velocity.length() * ticks + reachAllowance.getValue());
+		if(arrowCenter.distanceToSqr(playerCenter) > square(effectiveRange)
+			|| missDistance > reachAllowance.getValue() + 0.75)
+			return null;
+		
+		double urgency =
+			110 + Math.max(0, 6 - arrowCenter.distanceTo(playerCenter)) * 12
+				- missDistance * 5;
+		return new Threat(ThreatType.ARROW, arrowCenter, end, urgency);
+	}
+	
+	private boolean isChargingCreeper(Entity entity)
+	{
+		if(!(entity instanceof Creeper creeper))
+			return false;
+		
+		return isChargingCreeper(creeper);
+	}
+	
+	private boolean isChargingCreeper(Creeper creeper)
+	{
+		if(creeper == null || !creeper.isAlive())
+			return false;
+		
+		if(creeper.getSwellDir() > 0 || creeper.isIgnited()
+			|| creeper.isPowered())
+			return true;
+		
+		Long expiry = chargingCreeperCues.get(creeper.getId());
+		return expiry != null && expiry >= System.currentTimeMillis();
+	}
+	
 	private Vec3 chooseDodgeDestination(Threat threat)
 	{
 		Vec3 playerPos = MC.player.position();
@@ -833,12 +923,16 @@ private Vec3 chooseDodgeDestination(Threat threat)
 
 		ArrayList<DodgeCandidate> candidates = new ArrayList<>();
 		int verticalRange = verticalScan.getValueI();
-		double maxHorizontal = scanDistance.getValue();
+		double maxHorizontal =
+			threat.type == ThreatType.ARROW ? 1.0 : scanDistance.getValue();
+		double minHorizontal = threat.type == ThreatType.ARROW ? 1.0 : 0.5;
+		double horizontalStep = threat.type == ThreatType.ARROW ? 1.0 : 0.5;
 
 		for(int yOffset = -verticalRange; yOffset <= verticalRange; yOffset++)
 		{
-			for(double distance = maxHorizontal; distance >= 0.5; distance -=
-				0.5)
+			for(double distance =
+				maxHorizontal; distance >= minHorizontal; distance -=
+					horizontalStep)
 			{
 				for(int i = 0; i < DIRECTION_SAMPLES; i++)
 				{
@@ -966,6 +1060,24 @@ private void rememberPrimedSpears()
 		primedSpearCues.values().removeIf(expiry -> expiry < now);
 	}
 
+	private void rememberChargingCreepers()
+	{
+		if(MC.level == null)
+			return;
+		
+		long now = System.currentTimeMillis();
+		for(Entity entity : MC.level.entitiesForRendering())
+		{
+			if(!(entity instanceof Creeper creeper) || !creeper.isAlive())
+				continue;
+			if(creeper.getSwellDir() > 0 || creeper.isIgnited()
+				|| creeper.isPowered())
+				chargingCreeperCues.put(creeper.getId(),
+					now + CHARGING_CREEPER_MEMORY_MS);
+		}
+		chargingCreeperCues.values().removeIf(expiry -> expiry < now);
+	}
+	
 	private boolean wasRecentlyPrimed(Player player)
 	{
 		Long expiry = primedSpearCues.get(player.getId());
@@ -982,13 +1094,13 @@ private void prunePacketCues()
 		macePacketCues.values().removeIf(cue -> cue.timeMs < cutoff);
 	}
 
-	private Vec3 getObservedVelocity(Player player)
+	private Vec3 getObservedVelocity(Entity entity)
 	{
-		Vec3 networkVelocity = player.getDeltaMovement();
-		Vec3 previous = previousPositions.get(player.getId());
+		Vec3 networkVelocity = entity.getDeltaMovement();
+		Vec3 previous = previousPositions.get(entity.getId());
 		if(previous == null)
 			return networkVelocity;
-		Vec3 observed = player.position().subtract(previous);
+		Vec3 observed = entity.position().subtract(previous);
 		return observed.lengthSqr() > networkVelocity.lengthSqr() ? observed
 			: networkVelocity;
 	}
@@ -1160,6 +1272,7 @@ private enum ThreatType
 		SPEAR("Spear!"),
 		SWORD("Sword!"),
 		AXE("Axe!"),
+		ARROW("Arrow"),
 		MOB("Mob"),
 		SPACING("Spacing");
 

src/main/java/net/wurstclient/navigator/NavigatorFeatureScreen.java

@@ -605,10 +605,8 @@ protected void onRender(GuiGraphicsExtractor context, int mouseX,
 				partialTicks);
 		}
 		matrixStack.popMatrix();
-		context.disableScissor();
-		context.enableScissor(bgx1, bgy1, bgx2, bgy3);
-		
 		// buttons
+		context.disableScissor();
 		activeButton = null;
 		for(ButtonData buttonData : buttonDatas)
 		{
@@ -694,6 +692,32 @@ else if(mouseX >= bx1 && mouseX <= bx2 && mouseY >= by1
 				txtColor, false);
 		}
 
+		// Fallback primary action button rendering.
+		//
+		// In some builds the vanilla widget paint path can be visually absent
+		// even though the button still receives clicks. Drawing the button
+		// directly here keeps the enable/disable control visible.
+		if(primaryButton != null)
+		{
+			int bx1 = primaryButton.getX();
+			int bx2 = bx1 + primaryButton.getWidth();
+			int by1 = primaryButton.getY();
+			int by2 = by1 + 18;
+			boolean hovering = mouseX >= bx1 && mouseX <= bx2 && mouseY >= by1
+				&& mouseY <= by2;
+			int buttonColor;
+			if(feature.isEnabled())
+				buttonColor = hovering ? 0x9000FF00 : 0x9000E000;
+			else
+				buttonColor = hovering ? 0x90606060 : 0x90404040;
+			drawBox(context, bx1, by1, bx2, by2, buttonColor);
+			String buttonText = primaryButton.getMessage().getString();
+			context.guiRenderState.up();
+			context.text(minecraft.font, buttonText,
+				(bx1 + bx2 - minecraft.font.width(buttonText)) / 2, by1 + 5,
+				txtColor, false);
+		}
+		
 		// popups & tooltip
 		gui.closePopupsOutsideArea(window, bgx1, bgy1, bgx2, bgy3);
 		gui.renderPopups(context, mouseX, mouseY);

src/main/resources/assets/wurst/translations/en_us.json

@@ -140,6 +140,7 @@
   "hack.wurst.untouchable": "Untouchable",
   "description.wurst.hack.untouchable": "Dodges threatening mace, spear, sword, and axe attacks by teleporting to safer nearby positions.",
   "description.wurst.setting.untouchable.avoid_drops": "Rejects dodge destinations without solid ground when you are standing on the ground.",
+  "description.wurst.setting.untouchable.avoid_arrows": "Also dodges incoming arrows and other arrow-type projectiles.",
   "description.wurst.setting.untouchable.avoid_hostile_mobs": "Also dodges hostile mobs like zombies, skeletons, and other aggressive enemies.",
   "description.wurst.setting.untouchable.auto_distance_on_damage": "Automatically switches Keep distance mode to Always when another player damages you.",
   "description.wurst.setting.untouchable.auto_distance_on_totem_pop": "Automatically switches Keep distance mode to Always when you pop your own totem of undying.",
@@ -151,6 +152,7 @@
   "description.wurst.setting.untouchable.keep_distance": "Enables the distance-keeping behavior for nearby players.",
   "description.wurst.setting.untouchable.keep_distance_mode": "Always keeps the configured distance, or only while the hack is already dodging a weapon attack.",
   "description.wurst.setting.untouchable.move_pause_mode": "Stops dodging while you press any movement key, or only when you are moving toward the current target.",
+  "description.wurst.setting.untouchable.only_charging_creepers": "When avoiding hostile mobs, only dodge creepers that are already charging to explode.",
   "description.wurst.setting.untouchable.only_primed_spears": "Only dodges spears after they are fully primed or were just primed.",
   "description.wurst.setting.untouchable.player_distance": "Minimum distance to keep from other players.",
   "description.wurst.setting.untouchable.prediction": "How many ticks ahead to predict incoming attacks.",