Updated AimAssist, AutoSign, SpearAssist, PearlESP

Author: cev-api

README.md

@@ -536,7 +536,7 @@ Reports number of waypoints changed.
 - You can optionally allow aim assist to work whilst holding right click or stay on while spear is being used.
 - Auto Attack, your jab attack will continue to auto hit once the cooldown has expired so long as you're hitting an entity.
 - Auto alignment flys you up or down to match the level of your target when AimAssist is enabled
-- Extended AimAssist range (Max 100 Blocks) while using SpearAssist
+- Extended AimAssist range (Max 128 Blocks) while using SpearAssist
 - Added AimAssist lock-on whilst using spear
 - Spear charging no longer interferes with interactive blocks
 
@@ -1215,6 +1215,10 @@ Examples:
 
 ### AimAssist Improved
 - Added lock-on targetting
+- Added right-click lock-on targetting with added vertical matching when in flight
+  - Optional auto-attack in the same method as MultiAura 
+  - Optional range override
+- Allowed new maximum 128 block range 
 
 ### HealthTags Improved
 - Now optionally uses the same hearts as the new MobHealth hack

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

@@ -11,13 +11,16 @@
 import java.util.function.Function;
 import java.util.stream.Stream;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
+import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.phys.EntityHitResult;
 import net.minecraft.world.phys.Vec3;
 import net.wurstclient.Category;
 import net.wurstclient.events.MouseUpdateListener;
 import net.wurstclient.events.UpdateListener;
 import net.wurstclient.hack.Hack;
+import net.wurstclient.settings.AttackSpeedSliderSetting;
 import net.wurstclient.settings.AimAtSetting;
 import net.wurstclient.settings.CheckboxSetting;
 import net.wurstclient.settings.SliderSetting;
@@ -33,7 +36,7 @@ public final class AimAssistHack extends Hack
 	implements UpdateListener, MouseUpdateListener
 {
 	private final SliderSetting range =
-		new SliderSetting("Range", 4.5, 1, 6, 0.05, ValueDisplay.DECIMAL);
+		new SliderSetting("Range", 4.5, 1, 128, 0.05, ValueDisplay.DECIMAL);
 
 	private final SliderSetting rotationSpeed =
 		new SliderSetting("Rotation Speed", 600, 10, 7200, 10,
@@ -62,6 +65,28 @@ public final class AimAssistHack extends Hack
 		new CheckboxSetting("Aim while blocking",
 			"description.wurst.setting.aimassist.aim_while_blocking", false);
 
+	private final CheckboxSetting rightClickLockOn = new CheckboxSetting(
+		"Right-click lock-on",
+		"While holding right-click, maintain full horizontal + vertical lock-on to the current target.",
+		false);
+	
+	private final CheckboxSetting rightClickLockOnRangeOverride =
+		new CheckboxSetting("Right-click range override",
+			"While holding right-click lock-on, use a separate range instead of AimAssist's normal range.",
+			false);
+	
+	private final SliderSetting rightClickLockOnRange = new SliderSetting(
+		"Right-click range", "Range used while right-click lock-on is active.",
+		12, 1, 128, 0.05, ValueDisplay.DECIMAL);
+	
+	private final CheckboxSetting rightClickAutoAttack = new CheckboxSetting(
+		"Right-click auto-attack",
+		"Automatically attack while right-click lock-on is active. Uses crosshair target first, then AimAssist target.",
+		false);
+	
+	private final AttackSpeedSliderSetting rightClickAttackSpeed =
+		new AttackSpeedSliderSetting();
+	
 	private final EntityFilterList entityFilters =
 		new EntityFilterList(FilterPlayersSetting.genericCombat(false),
 			FilterSleepingSetting.genericCombat(false),
@@ -113,6 +138,11 @@ public AimAssistHack()
 		addSetting(ignoreMouseInput);
 		addSetting(checkLOS);
 		addSetting(aimWhileBlocking);
+		addSetting(rightClickLockOn);
+		addSetting(rightClickLockOnRangeOverride);
+		addSetting(rightClickLockOnRange);
+		addSetting(rightClickAutoAttack);
+		addSetting(rightClickAttackSpeed);
 
 		entityFilters.forEach(this::addSetting);
 	}
@@ -131,6 +161,7 @@ protected void onEnable()
 		WURST.getHax().protectHack.setEnabled(false);
 		WURST.getHax().tpAuraHack.setEnabled(false);
 
+		rightClickAttackSpeed.resetTimer();
 		EVENTS.add(UpdateListener.class, this);
 		EVENTS.add(MouseUpdateListener.class, this);
 	}
@@ -152,13 +183,15 @@ protected void onDisable()
 	public void onUpdate()
 	{
 		target = null;
+		rightClickAttackSpeed.updateTimer();
 
 		// don't aim when a container/inventory screen is open
 		if(MC.screen instanceof AbstractContainerScreen)
 			return;
 
+		boolean useHeld = isUseKeyHeld();
 		boolean blockingAllowed =
-			aimWhileBlocking.isChecked() || temporaryAllowBlocking;
+			aimWhileBlocking.isChecked() || temporaryAllowBlocking || useHeld;
 		if(!blockingAllowed && MC.player.isUsingItem())
 			return;
 
@@ -181,6 +214,9 @@ public void onUpdate()
 			return;
 		}
 
+		updateRightClickVerticalAlignment();
+		updateRightClickAutoAttack();
+		
 		WURST.getHax().autoSwordHack.setSlot(target);
 
 		// get needed rotation
@@ -301,15 +337,33 @@ public Entity getCurrentTarget()
 
 	private double getRange()
 	{
+		if(isRightClickLockOnActive()
+			&& rightClickLockOnRangeOverride.isChecked())
+			return rightClickLockOnRange.getValue();
+		
 		return rangeOverride != null ? rangeOverride : range.getValue();
 	}
 
 	private boolean isLockOnEnabled()
 	{
+		if(isRightClickLockOnActive())
+			return true;
+		
 		return lockOnOverride != null ? lockOnOverride.booleanValue()
 			: lockOn.isChecked();
 	}
 
+	private boolean isRightClickLockOnActive()
+	{
+		return rightClickLockOn.isChecked() && isUseKeyHeld();
+	}
+	
+	private boolean isUseKeyHeld()
+	{
+		return MC.options != null && MC.options.keyUse != null
+			&& MC.options.keyUse.isDown();
+	}
+	
 	private double getRangeSq()
 	{
 		double value = getRange();
@@ -332,4 +386,91 @@ private boolean isValidForcedTarget(Entity entity)
 
 		return true;
 	}
+	
+	private void updateRightClickAutoAttack()
+	{
+		if(!rightClickAutoAttack.isChecked() || !isRightClickLockOnActive()
+			|| target == null || MC.player == null || MC.gameMode == null)
+			return;
+		
+		if(!rightClickAttackSpeed.isTimeToAttack())
+			return;
+		
+		Entity attackTarget = resolveRightClickAttackTarget();
+		if(attackTarget == null)
+			return;
+		
+		WURST.getHax().autoSwordHack.setSlot(attackTarget);
+		MC.gameMode.attack(MC.player, attackTarget);
+		MC.player.swing(InteractionHand.MAIN_HAND);
+		rightClickAttackSpeed.resetTimer();
+	}
+	
+	private Entity resolveRightClickAttackTarget()
+	{
+		if(MC.hitResult instanceof EntityHitResult hit)
+		{
+			Entity hitEntity = hit.getEntity();
+			if(hitEntity != null && isValidForcedTarget(hitEntity)
+				&& MC.player.distanceToSqr(hitEntity) <= getRangeSq())
+				return hitEntity;
+		}
+		
+		return target;
+	}
+	
+	private void updateRightClickVerticalAlignment()
+	{
+		if(WURST.getHax().flightHack.isEnabled())
+			return;
+		
+		Double step = getRightClickVerticalAlignmentStepInternal(null);
+		if(step == null || MC.player == null)
+			return;
+		
+		Vec3 motion = MC.player.getDeltaMovement();
+		MC.player.setDeltaMovement(motion.x, motion.y + step, motion.z);
+	}
+	
+	public Double getRightClickVerticalAlignmentStepForFlight()
+	{
+		return getRightClickVerticalAlignmentStepInternal(
+			WURST.getHax().flightHack.verticalSpeed.getValue());
+	}
+	
+	private Double getRightClickVerticalAlignmentStepInternal(
+		Double maxStepOverride)
+	{
+		if(MC.player == null || target == null || !isRightClickLockOnActive())
+			return null;
+		
+		boolean flying = MC.player.getAbilities().flying
+			|| WURST.getHax().flightHack.isEnabled();
+		if(!flying)
+			return null;
+		
+		if(target.onGround() && !MC.options.keyShift.isDown())
+		{
+			double feetDelta = target.getY() - MC.player.getY();
+			if(feetDelta < 0)
+				return null;
+		}
+		
+		double maxStep = maxStepOverride != null ? maxStepOverride
+			: MC.player.getAbilities().getFlyingSpeed();
+		if(maxStep <= 0)
+			return null;
+		
+		double targetY = target.getY();
+		double playerY = MC.player.getY();
+		double delta = targetY - playerY;
+		
+		if(MC.player.onGround() && delta < 0 && !MC.options.keyShift.isDown())
+			return null;
+		
+		if(Math.abs(delta) < 0.02)
+			return null;
+		
+		return Math.max(-maxStep, Math.min(maxStep, delta));
+	}
 }

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

@@ -450,7 +450,7 @@ private List<BlockPos> findNearbySigns()
 					if(!(state.getBlock() instanceof SignBlock))
 						continue;
 
-					boolean visible = BlockUtils.hasLineOfSight(center);
+					boolean visible = hasLineOfSightToSign(candidate, center);
 					if(!visible && canUseHandNoClip())
 						visible = true;
 					if(!visible)
@@ -464,6 +464,15 @@ private List<BlockPos> findNearbySigns()
 		return results;
 	}
 
+	private boolean hasLineOfSightToSign(BlockPos signPos, Vec3 signCenter)
+	{
+		BlockHitResult hit =
+			BlockUtils.raycast(MC.player.getEyePosition(1.0F), signCenter);
+		
+		return hit.getType() == net.minecraft.world.phys.HitResult.Type.MISS
+			|| signPos.equals(hit.getBlockPos());
+	}
+	
 	private boolean linesMatch(String[] current, String[] desired)
 	{
 		if(current == null || desired == null)

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

@@ -245,6 +245,9 @@ public void onUpdate()
 
 		Double alignStep =
 			WURST.getHax().spearAssistHack.getAutoAlignmentStepForFlight();
+		if(alignStep == null)
+			alignStep = WURST.getHax().aimAssistHack
+				.getRightClickVerticalAlignmentStepForFlight();
 		if(alignStep != null)
 		{
 			Vec3 current = player.getDeltaMovement();

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

@@ -116,7 +116,7 @@ public void update()
 
 	private final SliderSetting aimAssistRangeOverride = new SliderSetting(
 		"AimAssist range", "Overrides AimAssist range while holding a spear.",
-		6, 1, 100, 0.05, ValueDisplay.DECIMAL.withSuffix(" blocks"));
+		6, 1, 128, 0.05, ValueDisplay.DECIMAL.withSuffix(" blocks"));
 
 	private final CheckboxSetting aimAssistLockOnOverride = new CheckboxSetting(
 		"AimAssist lock-on",

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

@@ -237,14 +237,14 @@ private void pressRandomAltReconnect()
 					reconnectRandomAltButton.active = true;
 					reconnectRandomAltButton
 						.setMessage(error == null ? getRandomAltReconnectLabel()
-							: Component.literal("Random alt login failed"));
+							: Component.literal("Random Alt Login Failed"));
 				}
 
 				if(error != null)
 					return;
 
 				System.out.println(
-					"Reconnect random alt selected: " + alt.getDisplayName());
+					"Reconnect Random Alt Selected: " + alt.getDisplayName());
 				LastServerRememberer.reconnect(parent);
 			});
 		}, "Wurst Random Alt Reconnect");
@@ -256,7 +256,7 @@ private void pressRandomAltReconnect()
 	private Component getRandomAltReconnectLabel()
 	{
 		return Component.literal(randomAltReconnectInProgress
-			? "Trying random alts..." : "Reconnect as random alt");
+			? "Trying Random Alts..." : "Reconnect as Random Alt");
 	}
 
 	private void layoutOverlay()

src/main/java/net/wurstclient/util/RenderUtils.java

@@ -542,7 +542,7 @@ public static void drawCurvedLine(PoseStack matrices, List<Vec3> points,
 		RenderType layer = WurstRenderLayers.getLines(depthTest);
 		VertexConsumer buffer = vcp.getBuffer(layer);
 
-		drawCurvedLine(matrices, buffer, points2, color);
+		drawCurvedLine(matrices, buffer, points2, color, DEFAULT_LINE_WIDTH);
 
 		vcp.endBatch(layer);
 	}
@@ -564,18 +564,24 @@ public static void drawCurvedLine(PoseStack matrices, List<Vec3> points,
 		RenderType layer = WurstRenderLayers.getLineStrip(depthTest, width);
 		VertexConsumer buffer = vcp.getBuffer(layer);
 
-		drawCurvedLine(matrices, buffer, points2, color);
+		drawCurvedLine(matrices, buffer, points2, color, appliedWidth);
 
 		vcp.endBatch(layer);
 	}
 
 	public static void drawCurvedLine(PoseStack matrices, VertexConsumer buffer,
 		List<Vec3> points, int color)
+	{
+		drawCurvedLine(matrices, buffer, points, color, DEFAULT_LINE_WIDTH);
+	}
+	
+	public static void drawCurvedLine(PoseStack matrices, VertexConsumer buffer,
+		List<Vec3> points, int color, float lineWidth)
 	{
 		GlobalEspManager globalEsp = GlobalEspManager.getInstance();
 		if(globalEsp.shouldTakeOverBufferedLineCalls()
 			&& globalEsp.submitCurvedLine(matrices, points, color,
-				globalEsp.getRequestedLineDepth(), DEFAULT_LINE_WIDTH))
+				globalEsp.getRequestedLineDepth(), lineWidth))
 			return;
 
 		if(points.size() < 2)
@@ -589,9 +595,9 @@ public static void drawCurvedLine(PoseStack matrices, VertexConsumer buffer,
 			Vector3f current = points.get(i).toVector3f();
 			Vector3f normal = new Vector3f(current).sub(prev).normalize();
 			buffer.addVertex(entry, prev).setColor(color)
-				.setNormal(entry, normal).setLineWidth(2);
+				.setNormal(entry, normal).setLineWidth(lineWidth);
 			buffer.addVertex(entry, current).setColor(color)
-				.setNormal(entry, normal).setLineWidth(2);
+				.setNormal(entry, normal).setLineWidth(lineWidth);
 		}
 	}