More MaceDMG Improvements

Author: cev-api

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

@@ -213,7 +213,10 @@ public void onHandleInput()
 		swingHand.swing(InteractionHand.MAIN_HAND);
 
 		target = null;
-		speed.resetTimer(speedRandMS.getValue());
+		if(shouldUseAuraSpeedAssist(maceDmg))
+			speed.resetTimer(0);
+		else
+			speed.resetTimer(speedRandMS.getValue());
 	}
 
 	@Override
@@ -240,6 +243,12 @@ public void onRender(PoseStack matrixStack, float partialTicks)
 		RenderUtils.drawOutlinedBox(matrixStack, box, lineColor, false);
 	}
 
+	private boolean shouldUseAuraSpeedAssist(MaceDmgHack maceDmg)
+	{
+		return maceDmg.isAuraSupportReady()
+			&& WURST.getHax().attributeSwapHack.isEnabled();
+	}
+	
 	private enum Priority
 	{
 		DISTANCE("Distance", EntityUtils::distanceToHitboxSq),

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

@@ -63,9 +63,11 @@ public final class MaceDmgHack extends Hack
 	private static final double MIN_FALL = 1.6;
 	private static final double SCAN_STEP = 0.25;
 	private static final int CONFIRM_TIMEOUT_TICKS = 20;
-	private static final int RECOVERY_TICKS = 2;
+	private static final int TOTEM_POP_FALLBACK_TICKS = 2;
+	private static final int SAFE_RECOVERY_TICKS = 2;
+	private static final int UNSAFE_RECOVERY_TICKS = 6;
 	private static final int TOTEM_BYPASS_GRACE_TICKS = 40;
-	private static final double FABRIC_MAX_HEIGHT = 22.0;
+	private static final double FABRIC_MAX_HEIGHT = 22.3;
 	private static final double PAPER_MAX_HEIGHT = 50.0;
 
 	private enum ServerType
@@ -113,8 +115,9 @@ public void setSelected(ServerType selected)
 		@Override
 		public void update()
 		{
-			if(isChecked())
+			if(isChecked() && !autoOptimizeWasChecked)
 				applyAutoOptimize();
+			autoOptimizeWasChecked = isChecked();
 		}
 	};
 
@@ -190,6 +193,7 @@ public void update()
 	private volatile int recentTotemPopEntityId = -1;
 	private volatile int recentTotemPopTicks;
 	private volatile boolean safetyListenersRegistered;
+	private boolean autoOptimizeWasChecked;
 	private final Map<UUID, TotemBypassState> totemBypassSteps =
 		new HashMap<>();
 	private final ArrayDeque<Integer> queuedTargetIds = new ArrayDeque<>();
@@ -236,7 +240,7 @@ public String getRenderName()
 		{
 			double h = base + i * inc;
 			if(fabric)
-				h = Math.min(h, 22.0);
+				h = Math.min(h, 22.3);
 			sb.append(i == 0 ? " " : "\u2192").append(String.format("%.0f", h));
 		}
 
@@ -247,6 +251,7 @@ public String getRenderName()
 	@Override
 	protected void onEnable()
 	{
+		autoOptimizeWasChecked = false;
 		onServerTypeChanged();
 		EVENTS.add(PlayerAttacksEntityListener.class, this);
 		registerSafetyListeners();
@@ -255,6 +260,7 @@ protected void onEnable()
 	@Override
 	protected void onDisable()
 	{
+		autoOptimizeWasChecked = false;
 		EVENTS.remove(PlayerAttacksEntityListener.class, this);
 		totemBypassSteps.clear();
 		clearQueuedTargets();
@@ -439,6 +445,15 @@ public void onReceivedPacket(PacketInputEvent event)
 			recentTotemPopEntityId = poppedPlayer.getId();
 			recentTotemPopTicks = 2;
 			armTotemBypassBurst(poppedPlayer);
+			if(smashState == SmashState.WAITING_FOR_MACE_CONFIRM
+				&& poppedPlayer.getId() == pendingTargetId)
+			{
+				// Totem-pop shows the burst resolved, but not that the server
+				// safely cleared our fake fall state. Cut the wait short
+				// without
+				// releasing fall debt immediately.
+				confirmTicks = Math.min(confirmTicks, TOTEM_POP_FALLBACK_TICKS);
+			}
 		}
 
 		if((smashState != SmashState.WAITING_FOR_MACE_CONFIRM
@@ -455,21 +470,30 @@ public void onReceivedPacket(PacketInputEvent event)
 			damage.sourceType().is(DamageTypes.PLAYER_ATTACK);
 		if(!confirmedSmash && !confirmedRejectedSpoof)
 			return;
-		
-		if(confirmedSmash && smashSparkles.isChecked() && MC.level != null)
-		{
-			int targetId = damage.entityId();
-			MC.execute(() -> spawnSmashPartyEffects(targetId));
-		}
-		
+			
 		// MACE_SMASH proves that postHurtEnemy() reset server fall distance.
 		// PLAYER_ATTACK from the same pending mace attack proves that the
 		// server
 		// evaluated canSmashAttack() as false, so dangerous fake fall distance
 		// was not retained. Either result safely ends this attempt.
+		confirmCurrentSmash(confirmedSmash);
+	}
+	
+	private void confirmCurrentSmash(boolean spawnSparkles)
+	{
+		if(spawnSparkles && smashSparkles.isChecked() && MC.level != null
+			&& pendingTargetId != -1)
+		{
+			int targetId = pendingTargetId;
+			if(!MC.isSameThread())
+				MC.execute(() -> spawnSmashPartyEffects(targetId));
+			else
+				spawnSmashPartyEffects(targetId);
+		}
+		
 		smashState = SmashState.CONFIRMED_SAFE;
 		confirmTicks = 0;
-		recoveryTicks = RECOVERY_TICKS;
+		recoveryTicks = SAFE_RECOVERY_TICKS;
 	}
 
 	@Override
@@ -479,7 +503,7 @@ public void onUpdate()
 			&& --confirmTicks <= 0)
 		{
 			smashState = SmashState.FAILED_UNSAFE;
-			recoveryTicks = RECOVERY_TICKS;
+			recoveryTicks = UNSAFE_RECOVERY_TICKS;
 		}
 
 		if(recentTotemPopTicks > 0 && --recentTotemPopTicks <= 0)
@@ -569,9 +593,13 @@ private void executeQueuedTarget(Entity target)
 		try
 		{
 			selectQueuedMaceSlot(maceSlot);
-			performQueuedSmashBurst(target);
+			boolean burstSent = performQueuedSmashBurst(target);
+			if(burstSent)
+				restoreQueuedSlot();
 		}finally
 		{
+			if(queuedPreviousSlot != -1)
+				restoreQueuedSlot();
 			queuedAttackInProgress = false;
 		}
 	}
@@ -829,6 +857,7 @@ private void applyAutoOptimize()
 				height.setValue(FABRIC_MAX_HEIGHT);
 			break;
 		}
+		autoOptimizeWasChecked = true;
 	}
 
 	private void onServerTypeChanged()
@@ -857,6 +886,12 @@ private void sendFakeY(double offset)
 
 	private void spawnSmashPartyEffects(int entityId)
 	{
+		if(!MC.isSameThread())
+		{
+			MC.execute(() -> spawnSmashPartyEffects(entityId));
+			return;
+		}
+		
 		if(!isEnabled() || !smashSparkles.isChecked() || MC.level == null)
 			return;
 

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

@@ -149,7 +149,12 @@ public void onUpdate()
 		if(maceSupportActive)
 		{
 			if(maceDmg.queueTargets(entities))
-				speed.resetTimer();
+			{
+				if(shouldUseAuraSpeedAssist(maceDmg))
+					speed.resetTimer(0);
+				else
+					speed.resetTimer();
+			}
 			return;
 		}
 
@@ -198,4 +203,10 @@ public void onRender(PoseStack matrixStack, float partialTicks)
 		RenderUtils.drawTracers("multiaura_debug", matrixStack, partialTicks,
 			points, false, 2.0);
 	}
+	
+	private boolean shouldUseAuraSpeedAssist(MaceDmgHack maceDmg)
+	{
+		return maceDmg.isAuraSupportReady()
+			&& WURST.getHax().attributeSwapHack.isEnabled();
+	}
 }

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

@@ -177,8 +177,9 @@ public void afterLoadChunk(int x, int z)
 			return;
 
 		LevelChunk chunk = MC.level.getChunk(x, z);
-		new Thread(() -> checkLoadedChunk(chunk), "NewChunks " + chunk.getPos())
-			.start();
+		// This has to run on the client thread because chunk/world access is
+		// not thread-safe and can trip Minecraft's threading detector.
+		checkLoadedChunk(chunk);
 	}
 
 	private void checkLoadedChunk(LevelChunk chunk)