Updated SpearAssist, AimAssist, KeyBinds

Author: cev-api

README.md

@@ -407,6 +407,10 @@ I did not, nor could I copy their code directly as most are Meteor based mods. S
 - Your charge is automatically and constantly resumed (no cooldown) so you can forever hold right click. It will be noisy but even if the spear is pointed down you will still be able to attack. 
 - You can optionally allow aim assist to work whilst holding right click.
 - 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
+- Added AimAssist lock-on whilst using spear
+- Spear charging no longer interferes with interactive blocks
 - Designed for elytra-free ground PvP/PvE, though may be even more interesting with one.
 
 ![Spear](https://i.imgur.com/XVypZML.png)
@@ -620,12 +624,16 @@ Examples:
 - Can input sign text directly into ClickUI/Nagivator
 - Can now save and manage a list of presets
 
+### AimAssist Improved
+- Added lock-on targetting
+
 ### HandNoClip Improved
 - Now shows a red X over your crosshair to remind you that you cannot place or interact with blocks (in front of you) while the hack is enabled
 - X is removed when using any combat weapon as they still function normally
 
 ### Keybind Manager Improved
 - Can now clear the entire keybinds instead of just resetting.
+- Fixed bug where typing your new key bind resulted in adding that character to the command input
 
 ### Alt Manager Improved
 - Can now multi-select and delete alt accounts

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

@@ -36,9 +36,12 @@ public final class AimAssistHack extends Hack
 		new SliderSetting("Range", 4.5, 1, 6, 0.05, ValueDisplay.DECIMAL);
 
 	private final SliderSetting rotationSpeed =
-		new SliderSetting("Rotation Speed", 600, 10, 3600, 10,
+		new SliderSetting("Rotation Speed", 600, 10, 7200, 10,
 			ValueDisplay.DEGREES.withSuffix("/s"));
 
+	private final CheckboxSetting lockOn = new CheckboxSetting("Lock-on",
+		"Instantly snaps to targets instead of smoothing rotation.", false);
+	
 	private final SliderSetting fov =
 		new SliderSetting("FOV", "description.wurst.setting.aimassist.fov", 120,
 			30, 360, 10, ValueDisplay.DEGREES);
@@ -93,7 +96,9 @@ public final class AimAssistHack extends Hack
 	private float nextPitch;
 	private Function<Entity, Vec3> overrideAimPoint;
 	private Entity externalTarget;
-	private boolean temporaryAllowBlocking;
+	private boolean temporaryAllowBlocking;
+	private Double rangeOverride;
+	private Boolean lockOnOverride;
 
 	public AimAssistHack()
 	{
@@ -102,6 +107,7 @@ public AimAssistHack()
 
 		addSetting(range);
 		addSetting(rotationSpeed);
+		addSetting(lockOn);
 		addSetting(fov);
 		addSetting(aimAt);
 		addSetting(ignoreMouseInput);
@@ -137,7 +143,9 @@ protected void onDisable()
 		target = null;
 		overrideAimPoint = null;
 		externalTarget = null;
-		temporaryAllowBlocking = false;
+		temporaryAllowBlocking = false;
+		rangeOverride = null;
+		lockOnOverride = null;
 	}
 
 	@Override
@@ -179,6 +187,15 @@ public void onUpdate()
 		Rotation needed = RotationUtils.getNeededRotations(hitVec);
 
 		// turn towards center of boundingBox
+		if(isLockOnEnabled())
+		{
+			needed.applyToClientPlayer();
+			needed.sendPlayerLookPacket();
+			nextYaw = needed.yaw();
+			nextPitch = needed.pitch();
+			return;
+		}
+		
 		Rotation next = RotationUtils.slowlyTurnTowards(needed,
 			rotationSpeed.getValueI() / 20F);
 		nextYaw = next.yaw();
@@ -190,11 +207,21 @@ public void setTemporarilyAllowBlocking(boolean allow)
 		temporaryAllowBlocking = allow;
 	}
 
+	public void setRangeOverride(Double override)
+	{
+		rangeOverride = override;
+	}
+	
+	public void setLockOnOverride(Boolean override)
+	{
+		lockOnOverride = override;
+	}
+	
 	private void chooseTarget()
 	{
 		Stream<Entity> stream = EntityUtils.getAttackableEntities();
 
-		double rangeSq = range.getValueSq();
+		double rangeSq = getRangeSq();
 		stream = stream.filter(e -> MC.player.distanceToSqr(e) <= rangeSq);
 
 		if(fov.getValue() < 360.0)
@@ -215,15 +242,22 @@ public void onMouseUpdate(MouseUpdateEvent event)
 		if(target == null || MC.player == null)
 			return;
 
+		if(isLockOnEnabled())
+		{
+			event.setDeltaX(0);
+			event.setDeltaY(0);
+			return;
+		}
+		
 		float curYaw = MC.player.getYRot();
 		float curPitch = MC.player.getXRot();
 		int diffYaw = (int)(nextYaw - curYaw);
 		int diffPitch = (int)(nextPitch - curPitch);
 
 		// If we are <1 degree off but still missing the hitbox,
 		// slightly exaggerate the difference to fix that.
-		if(diffYaw == 0 && diffPitch == 0 && !RotationUtils
-			.isFacingBox(target.getBoundingBox(), range.getValue()))
+		if(diffYaw == 0 && diffPitch == 0
+			&& !RotationUtils.isFacingBox(target.getBoundingBox(), getRange()))
 		{
 			diffYaw = nextYaw < curYaw ? -1 : 1;
 			diffPitch = nextPitch < curPitch ? -1 : 1;
@@ -260,6 +294,28 @@ public void clearExternalTarget()
 		externalTarget = null;
 	}
 
+	public Entity getCurrentTarget()
+	{
+		return target;
+	}
+	
+	private double getRange()
+	{
+		return rangeOverride != null ? rangeOverride : range.getValue();
+	}
+	
+	private boolean isLockOnEnabled()
+	{
+		return lockOnOverride != null ? lockOnOverride.booleanValue()
+			: lockOn.isChecked();
+	}
+	
+	private double getRangeSq()
+	{
+		double value = getRange();
+		return value * value;
+	}
+	
 	private boolean isValidForcedTarget(Entity entity)
 	{
 		if(entity == null)

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

@@ -150,7 +150,7 @@ protected void onDisable()
 	@Override
 	public void onRightClick(RightClickEvent event)
 	{
-		if(status != Status.IDLE)
+		if(status == Status.NO_TEMPLATE || status == Status.LOADING)
 			return;
 
 		HitResult hitResult = MC.hitResult;
@@ -159,7 +159,14 @@ public void onRightClick(RightClickEvent event)
 			return;
 
 		BlockPos hitResultPos = blockHitResult.getBlockPos();
-		if(!BlockUtils.canBeClicked(hitResultPos))
+		boolean clickable = BlockUtils.canBeClicked(hitResultPos);
+		if(clickable)
+			event.cancel();
+		
+		if(status != Status.IDLE)
+			return;
+		
+		if(!clickable)
 			return;
 
 		BlockPos startPos =

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

@@ -108,6 +108,14 @@ public void onUpdate()
 
 		if(antiKick.isChecked())
 			doAntiKick(velocity);
+		
+		Double alignStep =
+			WURST.getHax().spearAssistHack.getAutoAlignmentStepForFlight();
+		if(alignStep != null)
+		{
+			Vec3 current = player.getDeltaMovement();
+			player.setDeltaMovement(current.x, alignStep, current.z);
+		}
 	}
 
 	@Override