Updated SpearAssist

Author: cev-api

README.md

@@ -406,7 +406,7 @@ I did not, nor could I copy their code directly as most are Meteor based mods. S
 - Allow reverse toggle lets you hold S/back while attacking to flip boosts so they launch you backward instead.
 - Highlighting: You can highlight near and far entities within your attack range. Near meaning the distance you can jab at them and far the distance you can charge at them. Default set to 7 for near and 8.5 blocks for far.
 - 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.
+- 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

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

@@ -103,7 +103,7 @@ protected void onEnable()
 		bufferUpToDate = false;
 		if(shaderSafeMode)
 			ChatUtils
-				.message("Shaders detected - using safe mode for CaveFinder.");
+				.message("Shaders detected - using safe mode for CaveFinder.");
 		EVENTS.add(UpdateListener.class, this);
 		EVENTS.add(PacketInputListener.class, coordinator);
 		EVENTS.add(RenderListener.class, this);
@@ -129,17 +129,17 @@ protected void onDisable()
 	@Override
 	public void onUpdate()
 	{
-		boolean currentShaderSafeMode = ShaderUtils.refreshShadersActive();
+		boolean currentShaderSafeMode = ShaderUtils.refreshShadersActive();
 		if(currentShaderSafeMode != shaderSafeMode)
 		{
 			shaderSafeMode = currentShaderSafeMode;
 			stopBuildingBuffer();
 			if(shaderSafeMode)
 				ChatUtils.message(
-					"Shaders detected - using safe mode for CaveFinder.");
+					"Shaders detected - using safe mode for CaveFinder.");
 			else
 				ChatUtils.message(
-					"Shaders disabled - returning CaveFinder to normal mode.");
+					"Shaders disabled - returning CaveFinder to normal mode.");
 		}
 
 		boolean searchersChanged = coordinator.update();
@@ -261,10 +261,10 @@ private void buildBufferSafeMode()
 	{
 		if(bufferUpToDate)
 			return;
-			
-		if(getMatchingBlocksTask != null || compileVerticesTask != null)
+		
+		if(getMatchingBlocksTask != null || compileVerticesTask != null)
 			stopBuildingBuffer();
-			
+		
 		BlockPos eyesPos = BlockPos.containing(RotationUtils.getEyesPos());
 		Comparator<BlockPos> comparator =
 			Comparator.comparingInt(pos -> eyesPos.distManhattan(pos));
@@ -302,7 +302,7 @@ private void setBufferFromTask()
 		setBufferFromVertices(vertices);
 	}
 
-	private void setBufferFromVertices(ArrayList<int[]> vertices)
+	private void setBufferFromVertices(ArrayList<int[]> vertices)
 	{
 		RegionPos region = RenderUtils.getCameraRegion();
 
@@ -320,6 +320,3 @@ private void setBufferFromVertices(ArrayList<int[]> vertices)
 		bufferRegion = region;
 	}
 }
-
-
-

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

@@ -253,7 +253,7 @@ public CoordLoggerHack()
 	{
 		super("CoordLogger");
 		setCategory(Category.OTHER);
-									
+		
 		// Settings in ClickGUI
 		addSetting(minDistance);
 		addSetting(playerTeleports);

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

@@ -105,7 +105,7 @@ protected void onEnable()
 		shaderSafeMode = ShaderUtils.refreshShadersActive();
 		if(shaderSafeMode)
 			ChatUtils
-				.message("Shaders detected - using safe mode for Excavator.");
+				.message("Shaders detected - using safe mode for Excavator.");
 		EVENTS.add(UpdateListener.class, this);
 		EVENTS.add(RenderListener.class, this);
 		EVENTS.add(GUIRenderListener.class, this);
@@ -135,16 +135,16 @@ protected void onDisable()
 	@Override
 	public void onUpdate()
 	{
-		boolean currentShaderSafeMode = ShaderUtils.refreshShadersActive();
+		boolean currentShaderSafeMode = ShaderUtils.refreshShadersActive();
 		if(currentShaderSafeMode != shaderSafeMode)
 		{
 			shaderSafeMode = currentShaderSafeMode;
 			if(shaderSafeMode)
 				ChatUtils.message(
-					"Shaders detected - using safe mode for Excavator.");
+					"Shaders detected - using safe mode for Excavator.");
 			else
 				ChatUtils.message(
-					"Shaders disabled - returning Excavator to normal mode.");
+					"Shaders disabled - returning Excavator to normal mode.");
 		}
 
 		if(step.selectPos)
@@ -393,7 +393,7 @@ Comparator.<BlockPos> comparingInt(pos -> pos.getY()).reversed()
 			? BlockUtils::canBeClicked : pos -> BlockUtils.canBeClicked(pos)
 				&& !BlockUtils.isUnbreakable(pos);
 		java.util.List<BlockPos> blocksSnapshot =
-			shaderSafeMode ? new ArrayList<>(area.blocksList) : null;
+			shaderSafeMode ? new ArrayList<>(area.blocksList) : null;
 		if(shaderSafeMode)
 			area.remainingBlocks =
 				(int)blocksSnapshot.stream().filter(pBreakable).count();
@@ -410,7 +410,7 @@ Comparator.<BlockPos> comparingInt(pos -> pos.getY()).reversed()
 		if(pathFinder == null)
 		{
 			java.util.stream.Stream<BlockPos> blockStream = shaderSafeMode
-				? blocksSnapshot.stream() : area.blocksList.parallelStream();
+				? blocksSnapshot.stream() : area.blocksList.parallelStream();
 			BlockPos closestBlock =
 				blockStream.filter(pBreakable).min(cNextTargetBlock).get();
 
@@ -580,6 +580,3 @@ protected boolean checkDone()
 		}
 	}
 }
-
-
-

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

@@ -208,7 +208,7 @@ protected void onEnable()
 		shaderSafeMode = ShaderUtils.refreshShadersActive();
 		if(shaderSafeMode)
 			ChatUtils
-				.message("Shaders detected - using safe mode for PlayerESP.");
+				.message("Shaders detected - using safe mode for PlayerESP.");
 	}
 
 	@Override
@@ -225,24 +225,24 @@ protected void onDisable()
 	@Override
 	public void onUpdate()
 	{
-		boolean currentShaderSafeMode = ShaderUtils.refreshShadersActive();
+		boolean currentShaderSafeMode = ShaderUtils.refreshShadersActive();
 		if(currentShaderSafeMode != shaderSafeMode)
 		{
 			shaderSafeMode = currentShaderSafeMode;
 			if(shaderSafeMode)
 				ChatUtils.message(
-					"Shaders detected - using safe mode for PlayerESP.");
+					"Shaders detected - using safe mode for PlayerESP.");
 			else
 				ChatUtils.message(
-					"Shaders disabled - returning PlayerESP to normal mode.");
+					"Shaders disabled - returning PlayerESP to normal mode.");
 		}
 
 		players.clear();
 
 		java.util.List<AbstractClientPlayer> playerSnapshot =
-			shaderSafeMode ? new ArrayList<>(MC.level.players()) : null;
+			shaderSafeMode ? new ArrayList<>(MC.level.players()) : null;
 		Stream<AbstractClientPlayer> stream = (shaderSafeMode
-			? playerSnapshot.stream() : MC.level.players().parallelStream())
+			? playerSnapshot.stream() : MC.level.players().parallelStream())
 				.filter(e -> !e.isRemoved() && e.getHealth() > 0)
 				.filter(e -> e != MC.player)
 				.filter(e -> !(e instanceof FakePlayerEntity))
@@ -939,6 +939,3 @@ public String toString()
 		}
 	}
 }
-
-
-

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

@@ -209,7 +209,7 @@ protected void onEnable()
 		lastMatchesVersion = coordinator.getMatchesVersion();
 		if(shaderSafeMode)
 			ChatUtils
-				.message("Shaders detected - using safe mode for SearchHack.");
+				.message("Shaders detected - using safe mode for SearchHack.");
 		EVENTS.add(UpdateListener.class, this);
 		EVENTS.add(PacketInputListener.class, coordinator);
 		EVENTS.add(RenderListener.class, this);
@@ -239,17 +239,17 @@ protected void onDisable()
 	@Override
 	public void onUpdate()
 	{
-		boolean currentShaderSafeMode = ShaderUtils.refreshShadersActive();
+		boolean currentShaderSafeMode = ShaderUtils.refreshShadersActive();
 		if(currentShaderSafeMode != shaderSafeMode)
 		{
 			shaderSafeMode = currentShaderSafeMode;
 			stopBuildingBuffer(true);
 			if(shaderSafeMode)
 				ChatUtils.message(
-					"Shaders detected - using safe mode for SearchHack.");
+					"Shaders detected - using safe mode for SearchHack.");
 			else
 				ChatUtils.message(
-					"Shaders disabled - returning SearchHack to normal mode.");
+					"Shaders disabled - returning SearchHack to normal mode.");
 		}
 
 		SearchMode currentMode = mode.getSelected();
@@ -566,8 +566,8 @@ private void buildBufferSafeMode()
 	{
 		if(bufferUpToDate)
 			return;
-			
-		if(getMatchingBlocksTask != null || compileVerticesTask != null)
+		
+		if(getMatchingBlocksTask != null || compileVerticesTask != null)
 			stopBuildingBuffer(false);
 
 		// Use a bounded max-heap to keep only the closest N matches without
@@ -679,6 +679,3 @@ private void stopBuildingBuffer(boolean discardCurrent)
 		}
 	}
 }
-
-
-

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

@@ -86,9 +86,8 @@ public final class SpearAssistHack extends Hack
 		"Automatically re-presses use to keep the spear raised when it drops.",
 		true);
 
-	private final CheckboxSetting allowAimAssistWhileCharging =
-		new CheckboxSetting("Allow AimAssist while charging",
-			"Temporarily lets AimAssist run while you hold right-click.", true);
+	private final EnumSetting<AimAssistMode> aimAssistMode = new EnumSetting<>(
+		"AimAssist mode", AimAssistMode.values(), AimAssistMode.OFF);
 
 	private final SliderSetting aimAssistRangeOverride = new SliderSetting(
 		"AimAssist range", "Overrides AimAssist range while holding a spear.",
@@ -111,6 +110,7 @@ public final class SpearAssistHack extends Hack
 	private boolean attackKeyDown;
 	private double dashDistanceRemaining;
 	private boolean aimAssistTemporarilyAllowed;
+	private boolean aimAssistTemporarilyEnabled;
 	private final ArrayList<TargetHighlight> highlightTargets =
 		new ArrayList<>();
 	private boolean useGlowFallback = true;
@@ -134,7 +134,7 @@ public SpearAssistHack()
 		addSetting(nearHighlightColor);
 		addSetting(farHighlightColor);
 		addSetting(autoResumeCharge);
-		addSetting(allowAimAssistWhileCharging);
+		addSetting(aimAssistMode);
 		addSetting(aimAssistRangeOverride);
 		addSetting(aimAssistLockOnOverride);
 		addSetting(autoAlignment);
@@ -148,7 +148,7 @@ protected void onEnable()
 		EVENTS.add(RenderListener.class, this);
 		EVENTS.add(RightClickListener.class, this);
 		resetState();
-		updateAimAssist(false);
+		updateAimAssist(false, false);
 	}
 
 	@Override
@@ -159,8 +159,8 @@ protected void onDisable()
 		EVENTS.remove(RightClickListener.class, this);
 		clearAimAssistRangeOverride();
 		clearAimAssistLockOnOverride();
+		updateAimAssist(false, false);
 		resetState();
-		updateAimAssist(false);
 	}
 
 	@Override
@@ -209,9 +209,9 @@ public void onUpdate()
 
 		updateHighlights(holdingSpear);
 		updateHighlightMode();
+		updateAimAssist(charging, holdingSpear);
 		updateAimAssistRangeOverride(holdingSpear);
 		updateAimAssistLockOnOverride(holdingSpear);
-		updateAimAssist(charging);
 		updateAutoAlignment(charging, holdingSpear);
 		handleAutoAttack(holdingSpear, attackHeld);
 	}
@@ -441,6 +441,7 @@ private void resetState()
 		useGlowFallback = true;
 		currentStyle = null;
 		aimAssistTemporarilyAllowed = false;
+		aimAssistTemporarilyEnabled = false;
 		autoAttackPrimed = false;
 		reverseDashActive = false;
 		aimAssistRangeOverridden = false;
@@ -522,11 +523,35 @@ private void silentlyStartUseItem()
 			MC.player.setSilent(false);
 	}
 
-	private void updateAimAssist(boolean charging)
+	private void updateAimAssist(boolean charging, boolean holdingSpear)
 	{
 		var aimAssist = WURST.getHax().aimAssistHack;
-		if(aimAssist == null || !aimAssist.isEnabled()
-			|| !allowAimAssistWhileCharging.isChecked())
+		if(aimAssist == null)
+			return;
+		
+		boolean shouldEnable = switch(aimAssistMode.getSelected())
+		{
+			case OFF -> false;
+			case WHILE_HOLDING_SPEAR -> holdingSpear;
+			case WHILE_CHARGING -> charging;
+		};
+		
+		if(shouldEnable)
+		{
+			if(!aimAssist.isEnabled())
+			{
+				aimAssist.setEnabled(true);
+				aimAssistTemporarilyEnabled = true;
+			}
+		}else if(aimAssistTemporarilyEnabled)
+		{
+			if(aimAssist.isEnabled())
+				aimAssist.setEnabled(false);
+			
+			aimAssistTemporarilyEnabled = false;
+		}
+		
+		if(!aimAssist.isEnabled())
 		{
 			if(aimAssistTemporarilyAllowed && aimAssist != null)
 				aimAssist.setTemporarilyAllowBlocking(false);
@@ -756,6 +781,26 @@ public String toString()
 		}
 	}
 
+	private enum AimAssistMode
+	{
+		OFF("Off"),
+		WHILE_HOLDING_SPEAR("While holding spear"),
+		WHILE_CHARGING("While charging");
+		
+		private final String name;
+		
+		private AimAssistMode(String name)
+		{
+			this.name = name;
+		}
+		
+		@Override
+		public String toString()
+		{
+			return name;
+		}
+	}
+	
 	private static final class TargetHighlight
 	{
 		private final LivingEntity entity;

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

@@ -27,17 +27,17 @@ public enum BlockVertexCompiler
 
 	public static ArrayList<int[]> compile(HashSet<BlockPos> blocks)
 	{
-		Stream<BlockPos> stream = ShaderUtils.isShaderSafeMode()
-			? blocks.stream() : blocks.parallelStream();
+		Stream<BlockPos> stream = ShaderUtils.isShaderSafeMode()
+			? blocks.stream() : blocks.parallelStream();
 		return stream.flatMap(pos -> getVertices(pos, blocks))
 			.collect(Collectors.toCollection(ArrayList::new));
 	}
 
 	public static ArrayList<int[]> compile(HashSet<BlockPos> blocks,
 		RegionPos region)
 	{
-		Stream<BlockPos> stream = ShaderUtils.isShaderSafeMode()
-			? blocks.stream() : blocks.parallelStream();
+		Stream<BlockPos> stream = ShaderUtils.isShaderSafeMode()
+			? blocks.stream() : blocks.parallelStream();
 		return stream.flatMap(pos -> getVertices(pos, blocks))
 			.map(v -> applyRegionOffset(v, region))
 			.collect(Collectors.toCollection(ArrayList::new));
@@ -111,6 +111,3 @@ private static int[] getVertex(BlockPos pos, int x, int y, int z)
 		return new int[]{pos.getX() + x, pos.getY() + y, pos.getZ() + z};
 	}
 }
-
-
-