mirror of
https://github.com/AutismDevelopment/Autism-Client.git
synced 2026-10-28 18:29:47 +00:00
Refactor: extract MacroDispatcher from MacroExecutor (upstream #4)
Move the 530-line executeSingleActionWithWaits dispatch verbatim into MacroDispatcher. Shared members referenced as MacroExecutor.xxx (mechanical qualification only); the 7 call sites across MacroBreak, MacroRace and MacroRunLoop re-pointed. Body verified identical against HEAD modulo that qualification.
This commit is contained in:
sectersion
parent
45431ab136
commit
3ac299c1d5
5 changed files with 555 additions and 539 deletions
|
|
@ -483,7 +483,7 @@ final class MacroBreak {
|
||||||
for (MacroAction next : actions) {
|
for (MacroAction next : actions) {
|
||||||
if (next == null || !next.isEnabled() || !MacroExecutor.isCurrentRunActive()) continue;
|
if (next == null || !next.isEnabled() || !MacroExecutor.isCurrentRunActive()) continue;
|
||||||
try {
|
try {
|
||||||
MacroExecutor.executeSingleActionWithWaits(mc, next, module);
|
MacroDispatcher.executeSingleActionWithWaits(mc, next, module);
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
throw e;
|
throw e;
|
||||||
} catch (Throwable t) {
|
} catch (Throwable t) {
|
||||||
|
|
|
||||||
548
src/main/java/autismclient/util/macro/MacroDispatcher.java
Normal file
548
src/main/java/autismclient/util/macro/MacroDispatcher.java
Normal file
|
|
@ -0,0 +1,548 @@
|
||||||
|
package autismclient.util.macro;
|
||||||
|
|
||||||
|
import autismclient.modules.AutismModule;
|
||||||
|
import autismclient.util.AutismClientMessaging;
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import autismclient.util.macro.MacroActionResources.SharedClientResource;
|
||||||
|
|
||||||
|
import java.util.EnumSet;
|
||||||
|
import java.util.concurrent.CancellationException;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
final class MacroDispatcher {
|
||||||
|
private MacroDispatcher() {
|
||||||
|
}
|
||||||
|
static void executeSingleActionWithWaits(Minecraft mc, MacroAction action, AutismModule module) throws InterruptedException {
|
||||||
|
if (!MacroDynamicBindings.apply(action, mc)) return;
|
||||||
|
if (!MacroActionRunner.dynamicTextInputsAvailable(action, mc)) return;
|
||||||
|
MacroPrearm.clearOwnCaptureOutput(action);
|
||||||
|
EnumSet<SharedClientResource> heldResources = MacroExecutor.acquireClientResources(action);
|
||||||
|
try {
|
||||||
|
|
||||||
|
if (!MacroActionRunner.waitForGuiBeforeAction(mc, action)) return;
|
||||||
|
MacroActionRunner.beginRaycastAim(mc, action);
|
||||||
|
java.util.concurrent.CompletableFuture<Void> postGuiFuture =
|
||||||
|
(action instanceof ItemAction || action instanceof DropAction || MacroActionRunner.isTargetWaitInteractionAction(action)) ? null : MacroActionRunner.createPostGuiFuture(mc, action);
|
||||||
|
|
||||||
|
if (action instanceof DelayAction) {
|
||||||
|
DelayAction da = (DelayAction) action;
|
||||||
|
if (da.useTicks) {
|
||||||
|
for (int t = 0; t < da.delayTicks && MacroExecutor.isCurrentRunActive(); t++) {
|
||||||
|
CompletableFuture<Void> tf = MacroConditionRegistry.waitForNextTick();
|
||||||
|
MacroRunLoop.waitForCondition(tf);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Thread.sleep(da.delayMs);
|
||||||
|
}
|
||||||
|
} else if (action instanceof CustomMenuAction customMenu) {
|
||||||
|
MacroExecutor.setCurrentStatus(customMenu.getDisplayName());
|
||||||
|
customMenu.execute(mc);
|
||||||
|
} else if (action instanceof WaitForPacketAction packetAction) {
|
||||||
|
packetAction.matchedPacket = null;
|
||||||
|
packetAction.matchedDirection = "";
|
||||||
|
MacroExecutor.RunState packetRun = MacroExecutor.CURRENT_RUN.get();
|
||||||
|
if (packetRun != null) {
|
||||||
|
packetRun.lastMatchedPacket = null;
|
||||||
|
packetRun.lastMatchedPacketDirection = "";
|
||||||
|
}
|
||||||
|
java.util.List<String> targets = packetAction.effectiveList();
|
||||||
|
if (targets.isEmpty()) {
|
||||||
|
MacroPacketWait.awaitPacket("");
|
||||||
|
} else {
|
||||||
|
for (String target : targets) {
|
||||||
|
if (!MacroExecutor.isCurrentRunActive()) break;
|
||||||
|
MacroPacketWait.awaitPacket(target);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
MacroPrearm.copyLastMatchedPacket(packetAction);
|
||||||
|
} else if (action instanceof WaitPacketMatchAction wpma) {
|
||||||
|
MacroExecutor.setCurrentStatus(wpma.getDisplayName());
|
||||||
|
MacroPrearm.waitForPacketMatch(wpma);
|
||||||
|
} else if (action instanceof WaitInventoryPredicateAction wipa) {
|
||||||
|
MacroExecutor.setCurrentStatus(wipa.getDisplayName());
|
||||||
|
MacroRunLoop.waitForPredicate(() -> wipa.matches(mc), wipa.timeoutMs);
|
||||||
|
} else if (action instanceof WaitDurabilityAction wda) {
|
||||||
|
MacroExecutor.setCurrentStatus(wda.getDisplayName());
|
||||||
|
if (wda.useNext) MacroDurability.waitForDurabilityUseNext(mc, wda);
|
||||||
|
else MacroRunLoop.waitForPredicate(() -> wda.matches(mc), wda.timeoutMs);
|
||||||
|
} else if (action instanceof WaitFreeSlotsAction wfsa) {
|
||||||
|
MacroExecutor.setCurrentStatus(wfsa.getDisplayName());
|
||||||
|
MacroRunLoop.waitForPredicate(() -> wfsa.matches(mc), wfsa.timeoutMs);
|
||||||
|
} else if (action instanceof WaitEntityTargetAction weta) {
|
||||||
|
MacroExecutor.setCurrentStatus(weta.getDisplayName());
|
||||||
|
MacroRunLoop.waitForPredicate(() -> weta.matches(mc), weta.timeoutMs);
|
||||||
|
} else if (action instanceof WaitGuiTypeAction wgta) {
|
||||||
|
MacroExecutor.setCurrentStatus(wgta.getDisplayName());
|
||||||
|
MacroPrearm.clearCaptureOutputs(wgta);
|
||||||
|
if (wgta.waitMode == WaitGuiTypeAction.WaitMode.CLOSE) MacroRunLoop.waitForPredicate(MacroRunLoop.guiClosePredicate(wgta, mc), wgta.timeoutMs);
|
||||||
|
else MacroRunLoop.waitForPredicate(() -> {
|
||||||
|
var captured = wgta.capture(mc);
|
||||||
|
captured.ifPresent(values -> MacroPrearm.stageCapture(wgta, values));
|
||||||
|
return captured.isPresent();
|
||||||
|
}, wgta.timeoutMs);
|
||||||
|
MacroPrearm.commitStagedCapture(wgta);
|
||||||
|
} else if (action instanceof PacketGateAction pga) {
|
||||||
|
MacroRace.runPacketGateAction(mc, pga);
|
||||||
|
} else if (MacroActionRunner.isTargetWaitInteractionAction(action)) {
|
||||||
|
postGuiFuture = MacroActionRunner.runTargetWaitInteractionAction(mc, action);
|
||||||
|
} else if (action instanceof WaitForHealthAction) {
|
||||||
|
WaitForHealthAction wh = (WaitForHealthAction) action;
|
||||||
|
MacroExecutor.setCurrentStatus(wh.waitingStatusText());
|
||||||
|
try {
|
||||||
|
CompletableFuture<Void> future = MacroConditionRegistry.waitForHealth(wh.healthThreshold, wh.below);
|
||||||
|
MacroRunLoop.waitForCondition(future);
|
||||||
|
} catch (CancellationException e) { }
|
||||||
|
} else if (action instanceof WaitForBlockAction) {
|
||||||
|
WaitForBlockAction wba = (WaitForBlockAction) action;
|
||||||
|
MacroExecutor.setCurrentStatus(wba.getDisplayName());
|
||||||
|
try {
|
||||||
|
CompletableFuture<Void> future = MacroConditionRegistry.waitForBlock(wba);
|
||||||
|
MacroRunLoop.waitForCondition(future);
|
||||||
|
} catch (CancellationException e) { }
|
||||||
|
} else if (action instanceof WaitForGuiAction) {
|
||||||
|
WaitForGuiAction wga = (WaitForGuiAction) action;
|
||||||
|
MacroPrearm.clearCaptureOutputs(wga);
|
||||||
|
if (wga.waitMode == WaitForGuiAction.WaitMode.CLOSE) {
|
||||||
|
MacroExecutor.setCurrentStatus("Waiting for GUI close: " + wga.guiTitle);
|
||||||
|
MacroRunLoop.waitForPredicate(MacroRunLoop.guiClosePredicate(wga, mc), wga.timeoutMs);
|
||||||
|
} else {
|
||||||
|
MacroExecutor.setCurrentStatus("Waiting for GUI: " + wga.guiTitle);
|
||||||
|
MacroRunLoop.waitForPredicate(() -> {
|
||||||
|
var captured = wga.captureGui(mc.gui.screen());
|
||||||
|
captured.ifPresent(values -> MacroPrearm.stageCapture(wga, values));
|
||||||
|
return captured.isPresent();
|
||||||
|
}, wga.timeoutMs);
|
||||||
|
}
|
||||||
|
MacroPrearm.commitStagedCapture(wga);
|
||||||
|
} else if (action instanceof WaitForCooldownAction) {
|
||||||
|
WaitForCooldownAction wca = (WaitForCooldownAction) action;
|
||||||
|
ItemTarget cooldownTarget = MacroWorldActions.resolveItemTarget(wca.itemTarget, wca.itemName).resolveTemplate(mc);
|
||||||
|
if (cooldownTarget == null) return;
|
||||||
|
String cooldownLabel = MacroWorldActions.describeItemTarget(cooldownTarget);
|
||||||
|
MacroExecutor.setCurrentStatus("Waiting for cooldown: " +
|
||||||
|
(!cooldownLabel.isEmpty() ? cooldownLabel : (wca.checkMainInteractionHand ? "Main Hand" : "Off Hand")));
|
||||||
|
try {
|
||||||
|
CompletableFuture<Void> future = MacroConditionRegistry.waitForCooldown(cooldownTarget, wca.checkMainInteractionHand);
|
||||||
|
MacroRunLoop.waitForCondition(future);
|
||||||
|
} catch (CancellationException e) { }
|
||||||
|
} else if (action instanceof WaitPosAction) {
|
||||||
|
WaitPosAction wpa = (WaitPosAction) action;
|
||||||
|
MacroExecutor.setCurrentStatus("Waiting for Pos: " + String.format("%.0f, %.0f, %.0f", wpa.x, wpa.y, wpa.z));
|
||||||
|
try {
|
||||||
|
CompletableFuture<Void> future = MacroConditionRegistry.waitForPos(
|
||||||
|
wpa.x, wpa.y, wpa.z, wpa.leeway, wpa.checkRotation, wpa.yaw, wpa.pitch, wpa.rotLeeway);
|
||||||
|
MacroRunLoop.waitForCondition(future);
|
||||||
|
} catch (CancellationException e) { }
|
||||||
|
} else if (action instanceof CaptureValueAction captureValue) {
|
||||||
|
MacroCaptureAutofill.runCaptureValueAction(mc, captureValue);
|
||||||
|
} else if (action instanceof WaitForChatAction) {
|
||||||
|
WaitForChatAction wca = (WaitForChatAction) action;
|
||||||
|
MacroExecutor.setCurrentStatus("Waiting for chat: " + wca.pattern);
|
||||||
|
MacroPacketWait.awaitChat(wca);
|
||||||
|
} else if (action instanceof WaitForEntityAction) {
|
||||||
|
WaitForEntityAction wea = (WaitForEntityAction) action;
|
||||||
|
MacroExecutor.setCurrentStatus(wea.getDisplayName());
|
||||||
|
try {
|
||||||
|
MacroRunLoop.waitForPredicate(() -> wea.matchesEntityTarget(mc), wea.timeoutMs);
|
||||||
|
} catch (CancellationException e) { }
|
||||||
|
} else if (action instanceof WaitForSoundAction) {
|
||||||
|
WaitForSoundAction wsa = (WaitForSoundAction) action;
|
||||||
|
String sndDesc = wsa.soundIds.isEmpty() ? "any" : wsa.soundIds.get(0);
|
||||||
|
MacroExecutor.setCurrentStatus("Waiting for sound: " + sndDesc);
|
||||||
|
try {
|
||||||
|
CompletableFuture<Void> future = MacroConditionRegistry.waitForSound(wsa);
|
||||||
|
MacroRunLoop.waitForCondition(future);
|
||||||
|
} catch (CancellationException e) { }
|
||||||
|
} else if (action instanceof WaitForSlotChangeAction) {
|
||||||
|
WaitForSlotChangeAction wsca = (WaitForSlotChangeAction) action;
|
||||||
|
MacroExecutor.setCurrentStatus(wsca.getDisplayName());
|
||||||
|
try {
|
||||||
|
CompletableFuture<Void> future = MacroConditionRegistry.waitForSlotChange(wsca);
|
||||||
|
MacroRunLoop.waitForCondition(future);
|
||||||
|
} catch (CancellationException e) { }
|
||||||
|
} else if (action instanceof WaitForWorldChangeAction world) {
|
||||||
|
MacroExecutor.setCurrentStatus(world.getDisplayName());
|
||||||
|
try {
|
||||||
|
CompletableFuture<?> future = MacroRace.raceConditionFuture(mc, world);
|
||||||
|
MacroRace.waitForFutureDone(future, 0);
|
||||||
|
} catch (CancellationException e) { }
|
||||||
|
} else if (action instanceof WaitForPositionDeltaAction wpda) {
|
||||||
|
MacroExecutor.setCurrentStatus(wpda.getDisplayName());
|
||||||
|
try {
|
||||||
|
CompletableFuture<Void> future = MacroConditionRegistry.waitForPositionDelta(wpda.distance, wpda.horizontalOnly);
|
||||||
|
MacroRunLoop.waitForCondition(future);
|
||||||
|
} catch (CancellationException e) { }
|
||||||
|
} else if (action instanceof WaitForTeleportAction teleport) {
|
||||||
|
MacroExecutor.setCurrentStatus(teleport.getDisplayName());
|
||||||
|
try {
|
||||||
|
CompletableFuture<?> future = MacroRace.raceConditionFuture(mc, teleport);
|
||||||
|
MacroRace.waitForFutureDone(future, 0);
|
||||||
|
} catch (CancellationException e) { }
|
||||||
|
} else if (action instanceof WaitGamemodeChangeAction gm) {
|
||||||
|
MacroExecutor.setCurrentStatus(gm.getDisplayName());
|
||||||
|
try {
|
||||||
|
CompletableFuture<Void> future = MacroConditionRegistry.waitForGamemodeChange(gm);
|
||||||
|
MacroRace.waitForFutureDone(future, gm.timeoutMs);
|
||||||
|
} catch (CancellationException e) { }
|
||||||
|
} else if (action instanceof WaitMovementAction wm) {
|
||||||
|
MacroExecutor.setCurrentStatus(wm.getDisplayName());
|
||||||
|
try {
|
||||||
|
CompletableFuture<?> future = MacroRace.raceConditionFuture(mc, wm.resolveSubAction());
|
||||||
|
MacroRace.waitForFutureDone(future, 0);
|
||||||
|
} catch (CancellationException e) { }
|
||||||
|
} else if (action instanceof WaitForLanStepAction) {
|
||||||
|
WaitForLanStepAction wla = (WaitForLanStepAction) action;
|
||||||
|
MacroExecutor.setCurrentStatus(wla.getDisplayName());
|
||||||
|
try {
|
||||||
|
CompletableFuture<Void> future = MacroConditionRegistry.waitForLanStep(wla);
|
||||||
|
MacroRunLoop.waitForCondition(future);
|
||||||
|
} catch (CancellationException e) { }
|
||||||
|
} else if (action instanceof WaitForMacroStepAction) {
|
||||||
|
WaitForMacroStepAction wma = (WaitForMacroStepAction) action;
|
||||||
|
MacroExecutor.setCurrentStatus(wma.getDisplayName());
|
||||||
|
MacroRace.waitForMacroStep(wma);
|
||||||
|
} else if (action instanceof GoToAction) {
|
||||||
|
GoToAction ga = (GoToAction) action;
|
||||||
|
MacroWorldActions.runGoToAction(mc, ga);
|
||||||
|
} else if (action instanceof MoveAction) {
|
||||||
|
MoveAction ma = (MoveAction) action;
|
||||||
|
if (ma.nonBlocking) {
|
||||||
|
mc.execute(() -> ma.execute(mc));
|
||||||
|
MacroExecutor.currentBackgroundMoves().put(ma, new int[]{ma.durationTicks - 1});
|
||||||
|
} else {
|
||||||
|
for (int t = 0; t < ma.durationTicks && MacroExecutor.isCurrentRunActive(); t++) {
|
||||||
|
mc.execute(() -> ma.execute(mc));
|
||||||
|
CompletableFuture<Void> tickFuture = MacroConditionRegistry.waitForNextTick();
|
||||||
|
MacroRunLoop.waitForCondition(tickFuture);
|
||||||
|
}
|
||||||
|
MacroExecutor.RunState movementRun = MacroExecutor.CURRENT_RUN.get();
|
||||||
|
mc.execute(() -> MacroExecutor.releaseMoveIfUnused(movementRun, ma, mc));
|
||||||
|
}
|
||||||
|
} else if (action instanceof LookAtBlockAction) {
|
||||||
|
LookAtBlockAction la = (LookAtBlockAction) action;
|
||||||
|
LookAtBlockAction.RotationTarget rotationTarget = MacroExecutor.resolveLookAtTargetOnClient(mc, la);
|
||||||
|
if (rotationTarget == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (la.smooth) {
|
||||||
|
MacroExecutor.startSmoothRotation(rotationTarget.yaw(), rotationTarget.pitch(), la.getRotationStep());
|
||||||
|
if (la.waitForCompletion) {
|
||||||
|
MacroExecutor.waitForSmoothRotationCompletion();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
mc.execute(() -> {
|
||||||
|
if (mc.player == null) return;
|
||||||
|
mc.player.setYRot(rotationTarget.yaw());
|
||||||
|
mc.player.setXRot(rotationTarget.pitch());
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} else if (action instanceof RotateAction) {
|
||||||
|
RotateAction ra = (RotateAction) action;
|
||||||
|
if (ra.smooth) {
|
||||||
|
MacroExecutor.startSmoothRotation(ra.yaw, ra.pitch, ra.getRotationStep());
|
||||||
|
if (ra.waitForCompletion) {
|
||||||
|
MacroExecutor.waitForSmoothRotationCompletion();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
mc.execute(() -> action.execute(mc));
|
||||||
|
}
|
||||||
|
} else if (action instanceof MineAction) {
|
||||||
|
MineAction mna = (MineAction) action;
|
||||||
|
MacroWorldActions.runMineAction(mc, mna);
|
||||||
|
} else if (action instanceof InstaBreakAction) {
|
||||||
|
MacroBreak.runInstaBreakAction(mc, (InstaBreakAction) action);
|
||||||
|
} else if (action instanceof BreakAction) {
|
||||||
|
MacroBreak.runBreakAction(mc, (BreakAction) action);
|
||||||
|
} else if (action instanceof PlaceAction) {
|
||||||
|
MacroWorldActions.runPlaceAction(mc, (PlaceAction) action);
|
||||||
|
} else if (action instanceof UseItemAction) {
|
||||||
|
MacroActionRunner.runUseItemAction(mc, (UseItemAction) action);
|
||||||
|
} else if (action instanceof JumpAction) {
|
||||||
|
JumpAction ja = (JumpAction) action;
|
||||||
|
mc.execute(() -> ja.execute(mc));
|
||||||
|
if (ja.tap) {
|
||||||
|
CompletableFuture<Void> tickFuture = MacroConditionRegistry.waitForNextTick();
|
||||||
|
MacroRunLoop.waitForCondition(tickFuture);
|
||||||
|
} else {
|
||||||
|
for (int t = 0; t < ja.durationTicks && MacroExecutor.isCurrentRunActive(); t++) {
|
||||||
|
CompletableFuture<Void> tickFuture = MacroConditionRegistry.waitForNextTick();
|
||||||
|
MacroRunLoop.waitForCondition(tickFuture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
mc.execute(() -> ja.release(mc));
|
||||||
|
} else if (action instanceof SneakAction) {
|
||||||
|
SneakAction sna = (SneakAction) action;
|
||||||
|
if (sna.persistent && sna.sneak) {
|
||||||
|
MacroExecutor.currentPersistentActions().removeIf(p -> p instanceof SneakAction);
|
||||||
|
MacroExecutor.currentPersistentActions().add(sna);
|
||||||
|
} else if (!sna.sneak) {
|
||||||
|
MacroExecutor.currentPersistentActions().removeIf(p -> p instanceof SneakAction);
|
||||||
|
}
|
||||||
|
if (sna.persistent || !sna.sneak) MacroClientThread.postOnClientThread(mc, () -> MacroExecutor.applyAggregateSneakState(mc), sna.isTickAligned());
|
||||||
|
else MacroClientThread.postOnClientThread(mc, () -> sna.execute(mc), sna.isTickAligned());
|
||||||
|
} else if (action instanceof SprintAction) {
|
||||||
|
SprintAction spa = (SprintAction) action;
|
||||||
|
if (spa.persistent && spa.sprint) {
|
||||||
|
MacroExecutor.currentPersistentActions().removeIf(p -> p instanceof SprintAction);
|
||||||
|
MacroExecutor.currentPersistentActions().add(spa);
|
||||||
|
} else if (!spa.sprint) {
|
||||||
|
MacroExecutor.currentPersistentActions().removeIf(p -> p instanceof SprintAction);
|
||||||
|
}
|
||||||
|
if (spa.persistent || !spa.sprint) MacroClientThread.postOnClientThread(mc, () -> MacroExecutor.applyAggregateSprintState(mc), spa.isTickAligned());
|
||||||
|
else MacroClientThread.postOnClientThread(mc, () -> spa.execute(mc), spa.isTickAligned());
|
||||||
|
} else if (action instanceof NbtBookAction nba) {
|
||||||
|
int totalBooks = Math.max(1, nba.bookCount);
|
||||||
|
long delayMs = Math.max(1, nba.delayTicks) * 50L;
|
||||||
|
boolean signedAny = false;
|
||||||
|
for (int b = 0; b < totalBooks; b++) {
|
||||||
|
if (!MacroExecutor.isCurrentRunActive()) break;
|
||||||
|
final int bookIdx = b;
|
||||||
|
java.util.concurrent.CompletableFuture<Boolean> result = new java.util.concurrent.CompletableFuture<>();
|
||||||
|
mc.execute(() -> result.complete(nba.executeSingleBook(mc, bookIdx, totalBooks)));
|
||||||
|
try {
|
||||||
|
Boolean success = result.get();
|
||||||
|
if (!success) break;
|
||||||
|
signedAny = true;
|
||||||
|
} catch (java.util.concurrent.ExecutionException e) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (b < totalBooks - 1) {
|
||||||
|
Thread.sleep(delayMs);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (signedAny && nba.disconnectAfter) {
|
||||||
|
mc.execute(() -> nba.afterSigning(mc));
|
||||||
|
}
|
||||||
|
} else if (action instanceof ItemAction) {
|
||||||
|
ItemAction ia = (ItemAction) action;
|
||||||
|
if (ia.waitForItem) {
|
||||||
|
try {
|
||||||
|
MacroWorldActions.waitForItemActionTargets(mc, ia);
|
||||||
|
} catch (java.util.concurrent.CancellationException e) { }
|
||||||
|
}
|
||||||
|
postGuiFuture = MacroActionRunner.createPostGuiFuture(mc, ia);
|
||||||
|
MacroActionRunner.runMacroActionOnClientThread(mc, action, "ItemAction");
|
||||||
|
} else if (action instanceof DropAction || action instanceof SwapSlotsAction) {
|
||||||
|
if (action instanceof DropAction dropAction) {
|
||||||
|
postGuiFuture = MacroActionRunner.createPostGuiFuture(mc, dropAction);
|
||||||
|
}
|
||||||
|
MacroActionRunner.runMacroActionOnClientThread(mc, action, action.getDisplayName());
|
||||||
|
} else if (action instanceof SendPacketAction) {
|
||||||
|
if (module != null && module.useInstantExecutionMode()) {
|
||||||
|
try {
|
||||||
|
action.execute(mc);
|
||||||
|
} catch (Exception e) {
|
||||||
|
AutismClientMessaging.sendPrefixed("\u00a7cError in SendPacket: " + e.getMessage());
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
mc.execute(() -> {
|
||||||
|
try {
|
||||||
|
action.execute(mc);
|
||||||
|
} catch (Exception e) {
|
||||||
|
AutismClientMessaging.sendPrefixed("\u00a7cError in SendPacket: " + e.getMessage());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} else if (action instanceof ClickAction) {
|
||||||
|
ClickAction ca = (ClickAction) action;
|
||||||
|
MacroActionRunner.runClickActionBurst(mc, ca);
|
||||||
|
} else if (action instanceof PayAction) {
|
||||||
|
MacroWorldActions.runPayAction(mc, (PayAction) action);
|
||||||
|
} else if (action instanceof XCarryAction xsa) {
|
||||||
|
if (xsa.mode == XCarryAction.Mode.PUT_IN
|
||||||
|
&& (xsa.transferMode == XCarryAction.TransferMode.CLICK
|
||||||
|
|| xsa.transferMode == XCarryAction.TransferMode.SAFE_CLICK)) {
|
||||||
|
if (xsa.transferMode == XCarryAction.TransferMode.SAFE_CLICK) {
|
||||||
|
MacroExecutor.setCurrentStatus("XCarry Safe");
|
||||||
|
MacroXCarry.runXCarrySafeClickPutIn(mc, xsa);
|
||||||
|
} else {
|
||||||
|
MacroExecutor.setCurrentStatus("XCarry Click");
|
||||||
|
MacroXCarry.runXCarryClickPutIn(mc, xsa);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
MacroExecutor.setCurrentStatus(switch (xsa.mode) {
|
||||||
|
case PUT_IN -> "XCarry";
|
||||||
|
case TAKE_OUT -> "XCarry Out";
|
||||||
|
case DROP -> "XCarry Drop";
|
||||||
|
});
|
||||||
|
MacroClientThread.runOnClientThread(mc, () -> {
|
||||||
|
try {
|
||||||
|
xsa.execute(mc);
|
||||||
|
} catch (Exception e) {
|
||||||
|
AutismClientMessaging.sendPrefixed("\u00a7cXCarry: " + e.getMessage());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} else if (action instanceof CraftAction) {
|
||||||
|
MacroWorldActions.runCraftAction(mc, (CraftAction) action);
|
||||||
|
} else if (action instanceof autismclient.util.macro.StoreItemAction) {
|
||||||
|
autismclient.util.macro.StoreItemAction sia = (autismclient.util.macro.StoreItemAction) action;
|
||||||
|
MacroExecutor.setCurrentStatus((sia.mode == autismclient.util.macro.StoreItemAction.Mode.LOOT ? "Looting" : "Storing")
|
||||||
|
+ (sia.persistent ? " \u221e" : ""));
|
||||||
|
if (sia.persistent) {
|
||||||
|
while (MacroExecutor.isCurrentRunActive()) {
|
||||||
|
try { MacroActionRunner.runStoreItemAction(mc, sia); }
|
||||||
|
catch (InterruptedException e) { Thread.currentThread().interrupt(); break; }
|
||||||
|
catch (Exception e) { AutismClientMessaging.sendPrefixed("Store error: " + e.getMessage()); }
|
||||||
|
CompletableFuture<Void> siTick = MacroConditionRegistry.waitForNextTick();
|
||||||
|
MacroRunLoop.waitForCondition(siTick);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
try { MacroActionRunner.runStoreItemAction(mc, sia); }
|
||||||
|
catch (InterruptedException e) { Thread.currentThread().interrupt(); }
|
||||||
|
catch (Exception e) { AutismClientMessaging.sendPrefixed("Store error: " + e.getMessage()); }
|
||||||
|
}
|
||||||
|
} else if (action instanceof InventoryAuditAction auditAction
|
||||||
|
&& (auditAction.mode == InventoryAuditAction.Mode.DUPE
|
||||||
|
|| auditAction.mode == InventoryAuditAction.Mode.DUPE_SPAM)) {
|
||||||
|
MacroExecutor.setCurrentStatus("Dupe: " + auditAction.dupeVector.name() + " " + auditAction.openMode.name());
|
||||||
|
try {
|
||||||
|
auditAction.executeDupe(mc);
|
||||||
|
} catch (InterruptedException ie) {
|
||||||
|
Thread.currentThread().interrupt();
|
||||||
|
} catch (Throwable t) {
|
||||||
|
AutismClientMessaging.sendPrefixed("\u00a7cDupe error: "
|
||||||
|
+ (t.getMessage() == null ? t.getClass().getSimpleName() : t.getMessage()));
|
||||||
|
}
|
||||||
|
} else if (action instanceof ContainerClickSequenceAction sequence) {
|
||||||
|
MacroActionRunner.runContainerClickSequenceAction(mc, sequence);
|
||||||
|
} else if (action instanceof PacketBurstAction burst) {
|
||||||
|
MacroActionRunner.runPacketBurstAction(mc, burst);
|
||||||
|
} else if (action instanceof TickSyncAction tsa) {
|
||||||
|
if (mc.level == null) return;
|
||||||
|
java.util.List<net.minecraft.network.protocol.Packet<?>> preGenerated =
|
||||||
|
MacroActionRunner.preGeneratePacketsForRepeat(tsa.preGenCount, mc);
|
||||||
|
long targetTick = mc.level.getGameTime() + tsa.tickOffset;
|
||||||
|
MacroExecutor.setCurrentStatus("Tick Sync -> " + targetTick + " (" + preGenerated.size() + " pkts)");
|
||||||
|
while (MacroExecutor.isCurrentRunActive() && mc.level.getGameTime() < targetTick) {
|
||||||
|
java.util.concurrent.locks.LockSupport.parkNanos(1_000_000L);
|
||||||
|
}
|
||||||
|
if (MacroExecutor.isCurrentRunActive()) {
|
||||||
|
MacroExecutor.executePreGeneratedBurst(mc, preGenerated);
|
||||||
|
MacroExecutor.RepeatPacketContext context = MacroExecutor.REPEAT_PACKET_CONTEXT.get();
|
||||||
|
if (context != null) MacroExecutor.REPEAT_PACKET_SKIP.set(MacroExecutor.countPreGeneratedActions(context.macro(), context.startIdx(), preGenerated.size(), context.endIdx()));
|
||||||
|
AutismClientMessaging.sendPrefixed("Tick sync: " + preGenerated.size() + " pkts sent");
|
||||||
|
}
|
||||||
|
} else if (action instanceof RevisionSyncAction rsa) {
|
||||||
|
if (mc.player == null || mc.player.containerMenu == null) return;
|
||||||
|
java.util.List<net.minecraft.network.protocol.Packet<?>> preGenerated =
|
||||||
|
MacroActionRunner.preGeneratePacketsForRepeat(rsa.preGenCount, mc);
|
||||||
|
int baseRevision = mc.player.containerMenu.getStateId();
|
||||||
|
int targetRevision = baseRevision + rsa.revisionOffset;
|
||||||
|
MacroExecutor.setCurrentStatus("Rev Sync -> " + targetRevision + " (" + preGenerated.size() + " pkts)");
|
||||||
|
while (MacroExecutor.isCurrentRunActive()) {
|
||||||
|
if (mc.player == null || mc.player.containerMenu == null) break;
|
||||||
|
if (mc.player.containerMenu.getStateId() >= targetRevision) break;
|
||||||
|
java.util.concurrent.locks.LockSupport.parkNanos(500_000L);
|
||||||
|
}
|
||||||
|
if (MacroExecutor.isCurrentRunActive() && mc.player != null && mc.player.containerMenu != null) {
|
||||||
|
MacroExecutor.executePreGeneratedBurst(mc, preGenerated);
|
||||||
|
MacroExecutor.RepeatPacketContext context = MacroExecutor.REPEAT_PACKET_CONTEXT.get();
|
||||||
|
if (context != null) MacroExecutor.REPEAT_PACKET_SKIP.set(MacroExecutor.countPreGeneratedActions(context.macro(), context.startIdx(), preGenerated.size(), context.endIdx()));
|
||||||
|
AutismClientMessaging.sendPrefixed("Rev sync: " + preGenerated.size() + " pkts sent");
|
||||||
|
}
|
||||||
|
} else if (action instanceof ServerTickSyncAction stsa) {
|
||||||
|
if (mc.getConnection() == null) return;
|
||||||
|
java.util.List<net.minecraft.network.protocol.Packet<?>> preGenerated =
|
||||||
|
MacroActionRunner.preGeneratePacketsForRepeat(stsa.preGenCount, mc);
|
||||||
|
int sampleWaitMs = 0;
|
||||||
|
while (MacroExecutor.isCurrentRunActive() && !ServerTickTracker.isReady() && sampleWaitMs < stsa.maxWaitMs) {
|
||||||
|
float progress = ServerTickTracker.getWarmupProgress();
|
||||||
|
MacroExecutor.setCurrentStatus(String.format("ServerSync warmup %.0f%% (%d samples, %dms)",
|
||||||
|
progress * 100, ServerTickTracker.getSampleCount(), ServerTickTracker.getTrackingTimeMs()));
|
||||||
|
Thread.sleep(50);
|
||||||
|
sampleWaitMs += 50;
|
||||||
|
}
|
||||||
|
if (!MacroExecutor.isCurrentRunActive()) return;
|
||||||
|
long optimalTime = ServerTickTracker.getOptimalSendTime(stsa.bufferMs, stsa.ignorePing);
|
||||||
|
long msUntil = (optimalTime - System.nanoTime()) / 1_000_000L;
|
||||||
|
int ping = ServerTickTracker.getPingMs();
|
||||||
|
String pingStr = stsa.ignorePing ? " (no ping)" : " ping:" + ping + "ms";
|
||||||
|
MacroExecutor.setCurrentStatus("ServerSync in " + Math.max(0, msUntil) + "ms" + pingStr + " (" + preGenerated.size() + " pkts)");
|
||||||
|
long startWait = System.nanoTime();
|
||||||
|
long maxWaitNanos = stsa.maxWaitMs * 1_000_000L;
|
||||||
|
while (MacroExecutor.isCurrentRunActive()) {
|
||||||
|
long now = System.nanoTime();
|
||||||
|
if ((now - startWait) >= maxWaitNanos) break;
|
||||||
|
if (now >= optimalTime) break;
|
||||||
|
long remaining = optimalTime - now;
|
||||||
|
if (remaining > 2_000_000L) {
|
||||||
|
java.util.concurrent.locks.LockSupport.parkNanos(remaining - 2_000_000L);
|
||||||
|
} else {
|
||||||
|
Thread.onSpinWait();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (MacroExecutor.isCurrentRunActive()) {
|
||||||
|
MacroExecutor.executePreGeneratedBurst(mc, preGenerated);
|
||||||
|
MacroExecutor.RepeatPacketContext context = MacroExecutor.REPEAT_PACKET_CONTEXT.get();
|
||||||
|
if (context != null) MacroExecutor.REPEAT_PACKET_SKIP.set(MacroExecutor.countPreGeneratedActions(context.macro(), context.startIdx(), preGenerated.size(), context.endIdx()));
|
||||||
|
long actualDelay = (System.nanoTime() - optimalTime) / 1_000_000L;
|
||||||
|
AutismClientMessaging.sendPrefixed("ServerSync: " + preGenerated.size() + " pkts (+" + actualDelay + "ms)");
|
||||||
|
}
|
||||||
|
} else if (action instanceof BundleDupeV2Action bundleV2) {
|
||||||
|
MacroExecutor.setCurrentStatus("Bundle Dupe V2");
|
||||||
|
bundleV2.execute(mc);
|
||||||
|
} else if (action instanceof RollbackAction rollback) {
|
||||||
|
MacroExecutor.setCurrentStatus("Rollback");
|
||||||
|
try {
|
||||||
|
rollback.executeRollback(mc);
|
||||||
|
} catch (InterruptedException e) {
|
||||||
|
AutismClientMessaging.sendPrefixed("\u00a7eRollback canceled safely.");
|
||||||
|
} catch (Exception e) {
|
||||||
|
AutismClientMessaging.sendPrefixed("\u00a7cRollback failed: " + MacroRace.safeThrowableMessage(e));
|
||||||
|
}
|
||||||
|
} else if (action instanceof StopMacroAction) {
|
||||||
|
StopMacroAction stopAction = (StopMacroAction) action;
|
||||||
|
if (stopAction.target == StopMacroAction.StopTarget.SELF) MacroExecutor.stopCurrentRun();
|
||||||
|
else stopAction.execute(mc);
|
||||||
|
} else if (action instanceof UseItemPhaseAction phaseAction) {
|
||||||
|
MacroActionRunner.runUseItemPhaseAction(mc, phaseAction);
|
||||||
|
} else if (action instanceof autismclient.api.macro.ContextMacroAction contextAction) {
|
||||||
|
MacroActionRunner.runContextMacroAction(contextAction);
|
||||||
|
} else {
|
||||||
|
|
||||||
|
if (MacroActionRunner.usesTickAlignedDispatch(action)) {
|
||||||
|
|
||||||
|
MacroActionRunner.runMacroActionOnClientThread(mc, action, action.getDisplayName());
|
||||||
|
} else if (module != null && module.useInstantExecutionMode()) {
|
||||||
|
java.util.concurrent.CountDownLatch latch = new java.util.concurrent.CountDownLatch(1);
|
||||||
|
MacroExecutor.RunState scheduledRun = MacroExecutor.CURRENT_RUN.get();
|
||||||
|
mc.execute(() -> MacroExecutor.withRunContext(scheduledRun, () -> {
|
||||||
|
try {
|
||||||
|
action.execute(mc);
|
||||||
|
} catch (Exception e) {
|
||||||
|
AutismClientMessaging.sendPrefixed("\u00a7cError in action: " + e.getMessage());
|
||||||
|
} finally {
|
||||||
|
latch.countDown();
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
try {
|
||||||
|
latch.await(100, TimeUnit.MILLISECONDS);
|
||||||
|
} catch (InterruptedException e) {
|
||||||
|
Thread.currentThread().interrupt();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
MacroActionRunner.runMacroActionOnClientThread(mc, action, action.getDisplayName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
MacroPrearm.commitConditionOutput(action, mc);
|
||||||
|
|
||||||
|
if (postGuiFuture != null && MacroExecutor.isCurrentRunActive()) {
|
||||||
|
try {
|
||||||
|
MacroRunLoop.waitForCondition(postGuiFuture);
|
||||||
|
} catch (java.util.concurrent.CancellationException e) { }
|
||||||
|
}
|
||||||
|
|
||||||
|
if (MacroExecutor.isCurrentRunActive() && !MacroActionRunner.isInstantInventoryAction(action) && module != null && module.useInstantExecutionMode()) {
|
||||||
|
int delayUs = module.getActionDelayUs();
|
||||||
|
if (delayUs > 0) java.util.concurrent.locks.LockSupport.parkNanos(delayUs * 1000L);
|
||||||
|
else Thread.onSpinWait();
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
MacroRaycastAim.release();
|
||||||
|
MacroExecutor.releaseClientResources(heldResources);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -881,538 +881,6 @@ public class MacroExecutor {
|
||||||
return MacroCaptureAutofill.buildAutofillQuery(resolvedCommand, filter, filterText);
|
return MacroCaptureAutofill.buildAutofillQuery(resolvedCommand, filter, filterText);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void executeSingleActionWithWaits(Minecraft mc, MacroAction action, AutismModule module) throws InterruptedException {
|
|
||||||
if (!MacroDynamicBindings.apply(action, mc)) return;
|
|
||||||
if (!MacroActionRunner.dynamicTextInputsAvailable(action, mc)) return;
|
|
||||||
MacroPrearm.clearOwnCaptureOutput(action);
|
|
||||||
EnumSet<SharedClientResource> heldResources = acquireClientResources(action);
|
|
||||||
try {
|
|
||||||
|
|
||||||
if (!MacroActionRunner.waitForGuiBeforeAction(mc, action)) return;
|
|
||||||
MacroActionRunner.beginRaycastAim(mc, action);
|
|
||||||
java.util.concurrent.CompletableFuture<Void> postGuiFuture =
|
|
||||||
(action instanceof ItemAction || action instanceof DropAction || MacroActionRunner.isTargetWaitInteractionAction(action)) ? null : MacroActionRunner.createPostGuiFuture(mc, action);
|
|
||||||
|
|
||||||
if (action instanceof DelayAction) {
|
|
||||||
DelayAction da = (DelayAction) action;
|
|
||||||
if (da.useTicks) {
|
|
||||||
for (int t = 0; t < da.delayTicks && isCurrentRunActive(); t++) {
|
|
||||||
CompletableFuture<Void> tf = MacroConditionRegistry.waitForNextTick();
|
|
||||||
MacroRunLoop.waitForCondition(tf);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
Thread.sleep(da.delayMs);
|
|
||||||
}
|
|
||||||
} else if (action instanceof CustomMenuAction customMenu) {
|
|
||||||
setCurrentStatus(customMenu.getDisplayName());
|
|
||||||
customMenu.execute(mc);
|
|
||||||
} else if (action instanceof WaitForPacketAction packetAction) {
|
|
||||||
packetAction.matchedPacket = null;
|
|
||||||
packetAction.matchedDirection = "";
|
|
||||||
RunState packetRun = CURRENT_RUN.get();
|
|
||||||
if (packetRun != null) {
|
|
||||||
packetRun.lastMatchedPacket = null;
|
|
||||||
packetRun.lastMatchedPacketDirection = "";
|
|
||||||
}
|
|
||||||
java.util.List<String> targets = packetAction.effectiveList();
|
|
||||||
if (targets.isEmpty()) {
|
|
||||||
MacroPacketWait.awaitPacket("");
|
|
||||||
} else {
|
|
||||||
for (String target : targets) {
|
|
||||||
if (!isCurrentRunActive()) break;
|
|
||||||
MacroPacketWait.awaitPacket(target);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
MacroPrearm.copyLastMatchedPacket(packetAction);
|
|
||||||
} else if (action instanceof WaitPacketMatchAction wpma) {
|
|
||||||
setCurrentStatus(wpma.getDisplayName());
|
|
||||||
MacroPrearm.waitForPacketMatch(wpma);
|
|
||||||
} else if (action instanceof WaitInventoryPredicateAction wipa) {
|
|
||||||
setCurrentStatus(wipa.getDisplayName());
|
|
||||||
MacroRunLoop.waitForPredicate(() -> wipa.matches(mc), wipa.timeoutMs);
|
|
||||||
} else if (action instanceof WaitDurabilityAction wda) {
|
|
||||||
setCurrentStatus(wda.getDisplayName());
|
|
||||||
if (wda.useNext) MacroDurability.waitForDurabilityUseNext(mc, wda);
|
|
||||||
else MacroRunLoop.waitForPredicate(() -> wda.matches(mc), wda.timeoutMs);
|
|
||||||
} else if (action instanceof WaitFreeSlotsAction wfsa) {
|
|
||||||
setCurrentStatus(wfsa.getDisplayName());
|
|
||||||
MacroRunLoop.waitForPredicate(() -> wfsa.matches(mc), wfsa.timeoutMs);
|
|
||||||
} else if (action instanceof WaitEntityTargetAction weta) {
|
|
||||||
setCurrentStatus(weta.getDisplayName());
|
|
||||||
MacroRunLoop.waitForPredicate(() -> weta.matches(mc), weta.timeoutMs);
|
|
||||||
} else if (action instanceof WaitGuiTypeAction wgta) {
|
|
||||||
setCurrentStatus(wgta.getDisplayName());
|
|
||||||
MacroPrearm.clearCaptureOutputs(wgta);
|
|
||||||
if (wgta.waitMode == WaitGuiTypeAction.WaitMode.CLOSE) MacroRunLoop.waitForPredicate(MacroRunLoop.guiClosePredicate(wgta, mc), wgta.timeoutMs);
|
|
||||||
else MacroRunLoop.waitForPredicate(() -> {
|
|
||||||
var captured = wgta.capture(mc);
|
|
||||||
captured.ifPresent(values -> MacroPrearm.stageCapture(wgta, values));
|
|
||||||
return captured.isPresent();
|
|
||||||
}, wgta.timeoutMs);
|
|
||||||
MacroPrearm.commitStagedCapture(wgta);
|
|
||||||
} else if (action instanceof PacketGateAction pga) {
|
|
||||||
MacroRace.runPacketGateAction(mc, pga);
|
|
||||||
} else if (MacroActionRunner.isTargetWaitInteractionAction(action)) {
|
|
||||||
postGuiFuture = MacroActionRunner.runTargetWaitInteractionAction(mc, action);
|
|
||||||
} else if (action instanceof WaitForHealthAction) {
|
|
||||||
WaitForHealthAction wh = (WaitForHealthAction) action;
|
|
||||||
setCurrentStatus(wh.waitingStatusText());
|
|
||||||
try {
|
|
||||||
CompletableFuture<Void> future = MacroConditionRegistry.waitForHealth(wh.healthThreshold, wh.below);
|
|
||||||
MacroRunLoop.waitForCondition(future);
|
|
||||||
} catch (CancellationException e) { }
|
|
||||||
} else if (action instanceof WaitForBlockAction) {
|
|
||||||
WaitForBlockAction wba = (WaitForBlockAction) action;
|
|
||||||
setCurrentStatus(wba.getDisplayName());
|
|
||||||
try {
|
|
||||||
CompletableFuture<Void> future = MacroConditionRegistry.waitForBlock(wba);
|
|
||||||
MacroRunLoop.waitForCondition(future);
|
|
||||||
} catch (CancellationException e) { }
|
|
||||||
} else if (action instanceof WaitForGuiAction) {
|
|
||||||
WaitForGuiAction wga = (WaitForGuiAction) action;
|
|
||||||
MacroPrearm.clearCaptureOutputs(wga);
|
|
||||||
if (wga.waitMode == WaitForGuiAction.WaitMode.CLOSE) {
|
|
||||||
setCurrentStatus("Waiting for GUI close: " + wga.guiTitle);
|
|
||||||
MacroRunLoop.waitForPredicate(MacroRunLoop.guiClosePredicate(wga, mc), wga.timeoutMs);
|
|
||||||
} else {
|
|
||||||
setCurrentStatus("Waiting for GUI: " + wga.guiTitle);
|
|
||||||
MacroRunLoop.waitForPredicate(() -> {
|
|
||||||
var captured = wga.captureGui(mc.gui.screen());
|
|
||||||
captured.ifPresent(values -> MacroPrearm.stageCapture(wga, values));
|
|
||||||
return captured.isPresent();
|
|
||||||
}, wga.timeoutMs);
|
|
||||||
}
|
|
||||||
MacroPrearm.commitStagedCapture(wga);
|
|
||||||
} else if (action instanceof WaitForCooldownAction) {
|
|
||||||
WaitForCooldownAction wca = (WaitForCooldownAction) action;
|
|
||||||
ItemTarget cooldownTarget = MacroWorldActions.resolveItemTarget(wca.itemTarget, wca.itemName).resolveTemplate(mc);
|
|
||||||
if (cooldownTarget == null) return;
|
|
||||||
String cooldownLabel = MacroWorldActions.describeItemTarget(cooldownTarget);
|
|
||||||
setCurrentStatus("Waiting for cooldown: " +
|
|
||||||
(!cooldownLabel.isEmpty() ? cooldownLabel : (wca.checkMainInteractionHand ? "Main Hand" : "Off Hand")));
|
|
||||||
try {
|
|
||||||
CompletableFuture<Void> future = MacroConditionRegistry.waitForCooldown(cooldownTarget, wca.checkMainInteractionHand);
|
|
||||||
MacroRunLoop.waitForCondition(future);
|
|
||||||
} catch (CancellationException e) { }
|
|
||||||
} else if (action instanceof WaitPosAction) {
|
|
||||||
WaitPosAction wpa = (WaitPosAction) action;
|
|
||||||
setCurrentStatus("Waiting for Pos: " + String.format("%.0f, %.0f, %.0f", wpa.x, wpa.y, wpa.z));
|
|
||||||
try {
|
|
||||||
CompletableFuture<Void> future = MacroConditionRegistry.waitForPos(
|
|
||||||
wpa.x, wpa.y, wpa.z, wpa.leeway, wpa.checkRotation, wpa.yaw, wpa.pitch, wpa.rotLeeway);
|
|
||||||
MacroRunLoop.waitForCondition(future);
|
|
||||||
} catch (CancellationException e) { }
|
|
||||||
} else if (action instanceof CaptureValueAction captureValue) {
|
|
||||||
MacroCaptureAutofill.runCaptureValueAction(mc, captureValue);
|
|
||||||
} else if (action instanceof WaitForChatAction) {
|
|
||||||
WaitForChatAction wca = (WaitForChatAction) action;
|
|
||||||
setCurrentStatus("Waiting for chat: " + wca.pattern);
|
|
||||||
MacroPacketWait.awaitChat(wca);
|
|
||||||
} else if (action instanceof WaitForEntityAction) {
|
|
||||||
WaitForEntityAction wea = (WaitForEntityAction) action;
|
|
||||||
setCurrentStatus(wea.getDisplayName());
|
|
||||||
try {
|
|
||||||
MacroRunLoop.waitForPredicate(() -> wea.matchesEntityTarget(mc), wea.timeoutMs);
|
|
||||||
} catch (CancellationException e) { }
|
|
||||||
} else if (action instanceof WaitForSoundAction) {
|
|
||||||
WaitForSoundAction wsa = (WaitForSoundAction) action;
|
|
||||||
String sndDesc = wsa.soundIds.isEmpty() ? "any" : wsa.soundIds.get(0);
|
|
||||||
setCurrentStatus("Waiting for sound: " + sndDesc);
|
|
||||||
try {
|
|
||||||
CompletableFuture<Void> future = MacroConditionRegistry.waitForSound(wsa);
|
|
||||||
MacroRunLoop.waitForCondition(future);
|
|
||||||
} catch (CancellationException e) { }
|
|
||||||
} else if (action instanceof WaitForSlotChangeAction) {
|
|
||||||
WaitForSlotChangeAction wsca = (WaitForSlotChangeAction) action;
|
|
||||||
setCurrentStatus(wsca.getDisplayName());
|
|
||||||
try {
|
|
||||||
CompletableFuture<Void> future = MacroConditionRegistry.waitForSlotChange(wsca);
|
|
||||||
MacroRunLoop.waitForCondition(future);
|
|
||||||
} catch (CancellationException e) { }
|
|
||||||
} else if (action instanceof WaitForWorldChangeAction world) {
|
|
||||||
setCurrentStatus(world.getDisplayName());
|
|
||||||
try {
|
|
||||||
CompletableFuture<?> future = MacroRace.raceConditionFuture(mc, world);
|
|
||||||
MacroRace.waitForFutureDone(future, 0);
|
|
||||||
} catch (CancellationException e) { }
|
|
||||||
} else if (action instanceof WaitForPositionDeltaAction wpda) {
|
|
||||||
setCurrentStatus(wpda.getDisplayName());
|
|
||||||
try {
|
|
||||||
CompletableFuture<Void> future = MacroConditionRegistry.waitForPositionDelta(wpda.distance, wpda.horizontalOnly);
|
|
||||||
MacroRunLoop.waitForCondition(future);
|
|
||||||
} catch (CancellationException e) { }
|
|
||||||
} else if (action instanceof WaitForTeleportAction teleport) {
|
|
||||||
setCurrentStatus(teleport.getDisplayName());
|
|
||||||
try {
|
|
||||||
CompletableFuture<?> future = MacroRace.raceConditionFuture(mc, teleport);
|
|
||||||
MacroRace.waitForFutureDone(future, 0);
|
|
||||||
} catch (CancellationException e) { }
|
|
||||||
} else if (action instanceof WaitGamemodeChangeAction gm) {
|
|
||||||
setCurrentStatus(gm.getDisplayName());
|
|
||||||
try {
|
|
||||||
CompletableFuture<Void> future = MacroConditionRegistry.waitForGamemodeChange(gm);
|
|
||||||
MacroRace.waitForFutureDone(future, gm.timeoutMs);
|
|
||||||
} catch (CancellationException e) { }
|
|
||||||
} else if (action instanceof WaitMovementAction wm) {
|
|
||||||
setCurrentStatus(wm.getDisplayName());
|
|
||||||
try {
|
|
||||||
CompletableFuture<?> future = MacroRace.raceConditionFuture(mc, wm.resolveSubAction());
|
|
||||||
MacroRace.waitForFutureDone(future, 0);
|
|
||||||
} catch (CancellationException e) { }
|
|
||||||
} else if (action instanceof WaitForLanStepAction) {
|
|
||||||
WaitForLanStepAction wla = (WaitForLanStepAction) action;
|
|
||||||
setCurrentStatus(wla.getDisplayName());
|
|
||||||
try {
|
|
||||||
CompletableFuture<Void> future = MacroConditionRegistry.waitForLanStep(wla);
|
|
||||||
MacroRunLoop.waitForCondition(future);
|
|
||||||
} catch (CancellationException e) { }
|
|
||||||
} else if (action instanceof WaitForMacroStepAction) {
|
|
||||||
WaitForMacroStepAction wma = (WaitForMacroStepAction) action;
|
|
||||||
setCurrentStatus(wma.getDisplayName());
|
|
||||||
MacroRace.waitForMacroStep(wma);
|
|
||||||
} else if (action instanceof GoToAction) {
|
|
||||||
GoToAction ga = (GoToAction) action;
|
|
||||||
MacroWorldActions.runGoToAction(mc, ga);
|
|
||||||
} else if (action instanceof MoveAction) {
|
|
||||||
MoveAction ma = (MoveAction) action;
|
|
||||||
if (ma.nonBlocking) {
|
|
||||||
mc.execute(() -> ma.execute(mc));
|
|
||||||
currentBackgroundMoves().put(ma, new int[]{ma.durationTicks - 1});
|
|
||||||
} else {
|
|
||||||
for (int t = 0; t < ma.durationTicks && isCurrentRunActive(); t++) {
|
|
||||||
mc.execute(() -> ma.execute(mc));
|
|
||||||
CompletableFuture<Void> tickFuture = MacroConditionRegistry.waitForNextTick();
|
|
||||||
MacroRunLoop.waitForCondition(tickFuture);
|
|
||||||
}
|
|
||||||
RunState movementRun = CURRENT_RUN.get();
|
|
||||||
mc.execute(() -> releaseMoveIfUnused(movementRun, ma, mc));
|
|
||||||
}
|
|
||||||
} else if (action instanceof LookAtBlockAction) {
|
|
||||||
LookAtBlockAction la = (LookAtBlockAction) action;
|
|
||||||
LookAtBlockAction.RotationTarget rotationTarget = resolveLookAtTargetOnClient(mc, la);
|
|
||||||
if (rotationTarget == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (la.smooth) {
|
|
||||||
startSmoothRotation(rotationTarget.yaw(), rotationTarget.pitch(), la.getRotationStep());
|
|
||||||
if (la.waitForCompletion) {
|
|
||||||
waitForSmoothRotationCompletion();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
mc.execute(() -> {
|
|
||||||
if (mc.player == null) return;
|
|
||||||
mc.player.setYRot(rotationTarget.yaw());
|
|
||||||
mc.player.setXRot(rotationTarget.pitch());
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} else if (action instanceof RotateAction) {
|
|
||||||
RotateAction ra = (RotateAction) action;
|
|
||||||
if (ra.smooth) {
|
|
||||||
startSmoothRotation(ra.yaw, ra.pitch, ra.getRotationStep());
|
|
||||||
if (ra.waitForCompletion) {
|
|
||||||
waitForSmoothRotationCompletion();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
mc.execute(() -> action.execute(mc));
|
|
||||||
}
|
|
||||||
} else if (action instanceof MineAction) {
|
|
||||||
MineAction mna = (MineAction) action;
|
|
||||||
MacroWorldActions.runMineAction(mc, mna);
|
|
||||||
} else if (action instanceof InstaBreakAction) {
|
|
||||||
MacroBreak.runInstaBreakAction(mc, (InstaBreakAction) action);
|
|
||||||
} else if (action instanceof BreakAction) {
|
|
||||||
MacroBreak.runBreakAction(mc, (BreakAction) action);
|
|
||||||
} else if (action instanceof PlaceAction) {
|
|
||||||
MacroWorldActions.runPlaceAction(mc, (PlaceAction) action);
|
|
||||||
} else if (action instanceof UseItemAction) {
|
|
||||||
MacroActionRunner.runUseItemAction(mc, (UseItemAction) action);
|
|
||||||
} else if (action instanceof JumpAction) {
|
|
||||||
JumpAction ja = (JumpAction) action;
|
|
||||||
mc.execute(() -> ja.execute(mc));
|
|
||||||
if (ja.tap) {
|
|
||||||
CompletableFuture<Void> tickFuture = MacroConditionRegistry.waitForNextTick();
|
|
||||||
MacroRunLoop.waitForCondition(tickFuture);
|
|
||||||
} else {
|
|
||||||
for (int t = 0; t < ja.durationTicks && isCurrentRunActive(); t++) {
|
|
||||||
CompletableFuture<Void> tickFuture = MacroConditionRegistry.waitForNextTick();
|
|
||||||
MacroRunLoop.waitForCondition(tickFuture);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
mc.execute(() -> ja.release(mc));
|
|
||||||
} else if (action instanceof SneakAction) {
|
|
||||||
SneakAction sna = (SneakAction) action;
|
|
||||||
if (sna.persistent && sna.sneak) {
|
|
||||||
currentPersistentActions().removeIf(p -> p instanceof SneakAction);
|
|
||||||
currentPersistentActions().add(sna);
|
|
||||||
} else if (!sna.sneak) {
|
|
||||||
currentPersistentActions().removeIf(p -> p instanceof SneakAction);
|
|
||||||
}
|
|
||||||
if (sna.persistent || !sna.sneak) MacroClientThread.postOnClientThread(mc, () -> applyAggregateSneakState(mc), sna.isTickAligned());
|
|
||||||
else MacroClientThread.postOnClientThread(mc, () -> sna.execute(mc), sna.isTickAligned());
|
|
||||||
} else if (action instanceof SprintAction) {
|
|
||||||
SprintAction spa = (SprintAction) action;
|
|
||||||
if (spa.persistent && spa.sprint) {
|
|
||||||
currentPersistentActions().removeIf(p -> p instanceof SprintAction);
|
|
||||||
currentPersistentActions().add(spa);
|
|
||||||
} else if (!spa.sprint) {
|
|
||||||
currentPersistentActions().removeIf(p -> p instanceof SprintAction);
|
|
||||||
}
|
|
||||||
if (spa.persistent || !spa.sprint) MacroClientThread.postOnClientThread(mc, () -> applyAggregateSprintState(mc), spa.isTickAligned());
|
|
||||||
else MacroClientThread.postOnClientThread(mc, () -> spa.execute(mc), spa.isTickAligned());
|
|
||||||
} else if (action instanceof NbtBookAction nba) {
|
|
||||||
int totalBooks = Math.max(1, nba.bookCount);
|
|
||||||
long delayMs = Math.max(1, nba.delayTicks) * 50L;
|
|
||||||
boolean signedAny = false;
|
|
||||||
for (int b = 0; b < totalBooks; b++) {
|
|
||||||
if (!isCurrentRunActive()) break;
|
|
||||||
final int bookIdx = b;
|
|
||||||
java.util.concurrent.CompletableFuture<Boolean> result = new java.util.concurrent.CompletableFuture<>();
|
|
||||||
mc.execute(() -> result.complete(nba.executeSingleBook(mc, bookIdx, totalBooks)));
|
|
||||||
try {
|
|
||||||
Boolean success = result.get();
|
|
||||||
if (!success) break;
|
|
||||||
signedAny = true;
|
|
||||||
} catch (java.util.concurrent.ExecutionException e) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (b < totalBooks - 1) {
|
|
||||||
Thread.sleep(delayMs);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (signedAny && nba.disconnectAfter) {
|
|
||||||
mc.execute(() -> nba.afterSigning(mc));
|
|
||||||
}
|
|
||||||
} else if (action instanceof ItemAction) {
|
|
||||||
ItemAction ia = (ItemAction) action;
|
|
||||||
if (ia.waitForItem) {
|
|
||||||
try {
|
|
||||||
MacroWorldActions.waitForItemActionTargets(mc, ia);
|
|
||||||
} catch (java.util.concurrent.CancellationException e) { }
|
|
||||||
}
|
|
||||||
postGuiFuture = MacroActionRunner.createPostGuiFuture(mc, ia);
|
|
||||||
MacroActionRunner.runMacroActionOnClientThread(mc, action, "ItemAction");
|
|
||||||
} else if (action instanceof DropAction || action instanceof SwapSlotsAction) {
|
|
||||||
if (action instanceof DropAction dropAction) {
|
|
||||||
postGuiFuture = MacroActionRunner.createPostGuiFuture(mc, dropAction);
|
|
||||||
}
|
|
||||||
MacroActionRunner.runMacroActionOnClientThread(mc, action, action.getDisplayName());
|
|
||||||
} else if (action instanceof SendPacketAction) {
|
|
||||||
if (module != null && module.useInstantExecutionMode()) {
|
|
||||||
try {
|
|
||||||
action.execute(mc);
|
|
||||||
} catch (Exception e) {
|
|
||||||
AutismClientMessaging.sendPrefixed("\u00a7cError in SendPacket: " + e.getMessage());
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
mc.execute(() -> {
|
|
||||||
try {
|
|
||||||
action.execute(mc);
|
|
||||||
} catch (Exception e) {
|
|
||||||
AutismClientMessaging.sendPrefixed("\u00a7cError in SendPacket: " + e.getMessage());
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} else if (action instanceof ClickAction) {
|
|
||||||
ClickAction ca = (ClickAction) action;
|
|
||||||
MacroActionRunner.runClickActionBurst(mc, ca);
|
|
||||||
} else if (action instanceof PayAction) {
|
|
||||||
MacroWorldActions.runPayAction(mc, (PayAction) action);
|
|
||||||
} else if (action instanceof XCarryAction xsa) {
|
|
||||||
if (xsa.mode == XCarryAction.Mode.PUT_IN
|
|
||||||
&& (xsa.transferMode == XCarryAction.TransferMode.CLICK
|
|
||||||
|| xsa.transferMode == XCarryAction.TransferMode.SAFE_CLICK)) {
|
|
||||||
if (xsa.transferMode == XCarryAction.TransferMode.SAFE_CLICK) {
|
|
||||||
setCurrentStatus("XCarry Safe");
|
|
||||||
MacroXCarry.runXCarrySafeClickPutIn(mc, xsa);
|
|
||||||
} else {
|
|
||||||
setCurrentStatus("XCarry Click");
|
|
||||||
MacroXCarry.runXCarryClickPutIn(mc, xsa);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
setCurrentStatus(switch (xsa.mode) {
|
|
||||||
case PUT_IN -> "XCarry";
|
|
||||||
case TAKE_OUT -> "XCarry Out";
|
|
||||||
case DROP -> "XCarry Drop";
|
|
||||||
});
|
|
||||||
MacroClientThread.runOnClientThread(mc, () -> {
|
|
||||||
try {
|
|
||||||
xsa.execute(mc);
|
|
||||||
} catch (Exception e) {
|
|
||||||
AutismClientMessaging.sendPrefixed("\u00a7cXCarry: " + e.getMessage());
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} else if (action instanceof CraftAction) {
|
|
||||||
MacroWorldActions.runCraftAction(mc, (CraftAction) action);
|
|
||||||
} else if (action instanceof autismclient.util.macro.StoreItemAction) {
|
|
||||||
autismclient.util.macro.StoreItemAction sia = (autismclient.util.macro.StoreItemAction) action;
|
|
||||||
setCurrentStatus((sia.mode == autismclient.util.macro.StoreItemAction.Mode.LOOT ? "Looting" : "Storing")
|
|
||||||
+ (sia.persistent ? " \u221e" : ""));
|
|
||||||
if (sia.persistent) {
|
|
||||||
while (isCurrentRunActive()) {
|
|
||||||
try { MacroActionRunner.runStoreItemAction(mc, sia); }
|
|
||||||
catch (InterruptedException e) { Thread.currentThread().interrupt(); break; }
|
|
||||||
catch (Exception e) { AutismClientMessaging.sendPrefixed("Store error: " + e.getMessage()); }
|
|
||||||
CompletableFuture<Void> siTick = MacroConditionRegistry.waitForNextTick();
|
|
||||||
MacroRunLoop.waitForCondition(siTick);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
try { MacroActionRunner.runStoreItemAction(mc, sia); }
|
|
||||||
catch (InterruptedException e) { Thread.currentThread().interrupt(); }
|
|
||||||
catch (Exception e) { AutismClientMessaging.sendPrefixed("Store error: " + e.getMessage()); }
|
|
||||||
}
|
|
||||||
} else if (action instanceof InventoryAuditAction auditAction
|
|
||||||
&& (auditAction.mode == InventoryAuditAction.Mode.DUPE
|
|
||||||
|| auditAction.mode == InventoryAuditAction.Mode.DUPE_SPAM)) {
|
|
||||||
setCurrentStatus("Dupe: " + auditAction.dupeVector.name() + " " + auditAction.openMode.name());
|
|
||||||
try {
|
|
||||||
auditAction.executeDupe(mc);
|
|
||||||
} catch (InterruptedException ie) {
|
|
||||||
Thread.currentThread().interrupt();
|
|
||||||
} catch (Throwable t) {
|
|
||||||
AutismClientMessaging.sendPrefixed("\u00a7cDupe error: "
|
|
||||||
+ (t.getMessage() == null ? t.getClass().getSimpleName() : t.getMessage()));
|
|
||||||
}
|
|
||||||
} else if (action instanceof ContainerClickSequenceAction sequence) {
|
|
||||||
MacroActionRunner.runContainerClickSequenceAction(mc, sequence);
|
|
||||||
} else if (action instanceof PacketBurstAction burst) {
|
|
||||||
MacroActionRunner.runPacketBurstAction(mc, burst);
|
|
||||||
} else if (action instanceof TickSyncAction tsa) {
|
|
||||||
if (mc.level == null) return;
|
|
||||||
java.util.List<net.minecraft.network.protocol.Packet<?>> preGenerated =
|
|
||||||
MacroActionRunner.preGeneratePacketsForRepeat(tsa.preGenCount, mc);
|
|
||||||
long targetTick = mc.level.getGameTime() + tsa.tickOffset;
|
|
||||||
setCurrentStatus("Tick Sync -> " + targetTick + " (" + preGenerated.size() + " pkts)");
|
|
||||||
while (isCurrentRunActive() && mc.level.getGameTime() < targetTick) {
|
|
||||||
java.util.concurrent.locks.LockSupport.parkNanos(1_000_000L);
|
|
||||||
}
|
|
||||||
if (isCurrentRunActive()) {
|
|
||||||
executePreGeneratedBurst(mc, preGenerated);
|
|
||||||
RepeatPacketContext context = REPEAT_PACKET_CONTEXT.get();
|
|
||||||
if (context != null) REPEAT_PACKET_SKIP.set(countPreGeneratedActions(context.macro(), context.startIdx(), preGenerated.size(), context.endIdx()));
|
|
||||||
AutismClientMessaging.sendPrefixed("Tick sync: " + preGenerated.size() + " pkts sent");
|
|
||||||
}
|
|
||||||
} else if (action instanceof RevisionSyncAction rsa) {
|
|
||||||
if (mc.player == null || mc.player.containerMenu == null) return;
|
|
||||||
java.util.List<net.minecraft.network.protocol.Packet<?>> preGenerated =
|
|
||||||
MacroActionRunner.preGeneratePacketsForRepeat(rsa.preGenCount, mc);
|
|
||||||
int baseRevision = mc.player.containerMenu.getStateId();
|
|
||||||
int targetRevision = baseRevision + rsa.revisionOffset;
|
|
||||||
setCurrentStatus("Rev Sync -> " + targetRevision + " (" + preGenerated.size() + " pkts)");
|
|
||||||
while (isCurrentRunActive()) {
|
|
||||||
if (mc.player == null || mc.player.containerMenu == null) break;
|
|
||||||
if (mc.player.containerMenu.getStateId() >= targetRevision) break;
|
|
||||||
java.util.concurrent.locks.LockSupport.parkNanos(500_000L);
|
|
||||||
}
|
|
||||||
if (isCurrentRunActive() && mc.player != null && mc.player.containerMenu != null) {
|
|
||||||
executePreGeneratedBurst(mc, preGenerated);
|
|
||||||
RepeatPacketContext context = REPEAT_PACKET_CONTEXT.get();
|
|
||||||
if (context != null) REPEAT_PACKET_SKIP.set(countPreGeneratedActions(context.macro(), context.startIdx(), preGenerated.size(), context.endIdx()));
|
|
||||||
AutismClientMessaging.sendPrefixed("Rev sync: " + preGenerated.size() + " pkts sent");
|
|
||||||
}
|
|
||||||
} else if (action instanceof ServerTickSyncAction stsa) {
|
|
||||||
if (mc.getConnection() == null) return;
|
|
||||||
java.util.List<net.minecraft.network.protocol.Packet<?>> preGenerated =
|
|
||||||
MacroActionRunner.preGeneratePacketsForRepeat(stsa.preGenCount, mc);
|
|
||||||
int sampleWaitMs = 0;
|
|
||||||
while (isCurrentRunActive() && !ServerTickTracker.isReady() && sampleWaitMs < stsa.maxWaitMs) {
|
|
||||||
float progress = ServerTickTracker.getWarmupProgress();
|
|
||||||
setCurrentStatus(String.format("ServerSync warmup %.0f%% (%d samples, %dms)",
|
|
||||||
progress * 100, ServerTickTracker.getSampleCount(), ServerTickTracker.getTrackingTimeMs()));
|
|
||||||
Thread.sleep(50);
|
|
||||||
sampleWaitMs += 50;
|
|
||||||
}
|
|
||||||
if (!isCurrentRunActive()) return;
|
|
||||||
long optimalTime = ServerTickTracker.getOptimalSendTime(stsa.bufferMs, stsa.ignorePing);
|
|
||||||
long msUntil = (optimalTime - System.nanoTime()) / 1_000_000L;
|
|
||||||
int ping = ServerTickTracker.getPingMs();
|
|
||||||
String pingStr = stsa.ignorePing ? " (no ping)" : " ping:" + ping + "ms";
|
|
||||||
setCurrentStatus("ServerSync in " + Math.max(0, msUntil) + "ms" + pingStr + " (" + preGenerated.size() + " pkts)");
|
|
||||||
long startWait = System.nanoTime();
|
|
||||||
long maxWaitNanos = stsa.maxWaitMs * 1_000_000L;
|
|
||||||
while (isCurrentRunActive()) {
|
|
||||||
long now = System.nanoTime();
|
|
||||||
if ((now - startWait) >= maxWaitNanos) break;
|
|
||||||
if (now >= optimalTime) break;
|
|
||||||
long remaining = optimalTime - now;
|
|
||||||
if (remaining > 2_000_000L) {
|
|
||||||
java.util.concurrent.locks.LockSupport.parkNanos(remaining - 2_000_000L);
|
|
||||||
} else {
|
|
||||||
Thread.onSpinWait();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (isCurrentRunActive()) {
|
|
||||||
executePreGeneratedBurst(mc, preGenerated);
|
|
||||||
RepeatPacketContext context = REPEAT_PACKET_CONTEXT.get();
|
|
||||||
if (context != null) REPEAT_PACKET_SKIP.set(countPreGeneratedActions(context.macro(), context.startIdx(), preGenerated.size(), context.endIdx()));
|
|
||||||
long actualDelay = (System.nanoTime() - optimalTime) / 1_000_000L;
|
|
||||||
AutismClientMessaging.sendPrefixed("ServerSync: " + preGenerated.size() + " pkts (+" + actualDelay + "ms)");
|
|
||||||
}
|
|
||||||
} else if (action instanceof BundleDupeV2Action bundleV2) {
|
|
||||||
setCurrentStatus("Bundle Dupe V2");
|
|
||||||
bundleV2.execute(mc);
|
|
||||||
} else if (action instanceof RollbackAction rollback) {
|
|
||||||
setCurrentStatus("Rollback");
|
|
||||||
try {
|
|
||||||
rollback.executeRollback(mc);
|
|
||||||
} catch (InterruptedException e) {
|
|
||||||
AutismClientMessaging.sendPrefixed("\u00a7eRollback canceled safely.");
|
|
||||||
} catch (Exception e) {
|
|
||||||
AutismClientMessaging.sendPrefixed("\u00a7cRollback failed: " + MacroRace.safeThrowableMessage(e));
|
|
||||||
}
|
|
||||||
} else if (action instanceof StopMacroAction) {
|
|
||||||
StopMacroAction stopAction = (StopMacroAction) action;
|
|
||||||
if (stopAction.target == StopMacroAction.StopTarget.SELF) stopCurrentRun();
|
|
||||||
else stopAction.execute(mc);
|
|
||||||
} else if (action instanceof UseItemPhaseAction phaseAction) {
|
|
||||||
MacroActionRunner.runUseItemPhaseAction(mc, phaseAction);
|
|
||||||
} else if (action instanceof autismclient.api.macro.ContextMacroAction contextAction) {
|
|
||||||
MacroActionRunner.runContextMacroAction(contextAction);
|
|
||||||
} else {
|
|
||||||
|
|
||||||
if (MacroActionRunner.usesTickAlignedDispatch(action)) {
|
|
||||||
|
|
||||||
MacroActionRunner.runMacroActionOnClientThread(mc, action, action.getDisplayName());
|
|
||||||
} else if (module != null && module.useInstantExecutionMode()) {
|
|
||||||
java.util.concurrent.CountDownLatch latch = new java.util.concurrent.CountDownLatch(1);
|
|
||||||
RunState scheduledRun = CURRENT_RUN.get();
|
|
||||||
mc.execute(() -> withRunContext(scheduledRun, () -> {
|
|
||||||
try {
|
|
||||||
action.execute(mc);
|
|
||||||
} catch (Exception e) {
|
|
||||||
AutismClientMessaging.sendPrefixed("\u00a7cError in action: " + e.getMessage());
|
|
||||||
} finally {
|
|
||||||
latch.countDown();
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
try {
|
|
||||||
latch.await(100, TimeUnit.MILLISECONDS);
|
|
||||||
} catch (InterruptedException e) {
|
|
||||||
Thread.currentThread().interrupt();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
MacroActionRunner.runMacroActionOnClientThread(mc, action, action.getDisplayName());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
MacroPrearm.commitConditionOutput(action, mc);
|
|
||||||
|
|
||||||
if (postGuiFuture != null && isCurrentRunActive()) {
|
|
||||||
try {
|
|
||||||
MacroRunLoop.waitForCondition(postGuiFuture);
|
|
||||||
} catch (java.util.concurrent.CancellationException e) { }
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isCurrentRunActive() && !MacroActionRunner.isInstantInventoryAction(action) && module != null && module.useInstantExecutionMode()) {
|
|
||||||
int delayUs = module.getActionDelayUs();
|
|
||||||
if (delayUs > 0) java.util.concurrent.locks.LockSupport.parkNanos(delayUs * 1000L);
|
|
||||||
else Thread.onSpinWait();
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
MacroRaycastAim.release();
|
|
||||||
releaseClientResources(heldResources);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -80,7 +80,7 @@ final class MacroRace {
|
||||||
for (MacroAction action : actions) {
|
for (MacroAction action : actions) {
|
||||||
if (action == null || !action.isEnabled()) continue;
|
if (action == null || !action.isEnabled()) continue;
|
||||||
try {
|
try {
|
||||||
MacroExecutor.executeSingleActionWithWaits(mc, action, AutismModule.get());
|
MacroDispatcher.executeSingleActionWithWaits(mc, action, AutismModule.get());
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
Thread.currentThread().interrupt();
|
Thread.currentThread().interrupt();
|
||||||
return;
|
return;
|
||||||
|
|
@ -220,7 +220,7 @@ final class MacroRace {
|
||||||
String label = report.reportLabel == null || report.reportLabel.isBlank() ? "Report" : report.reportLabel.trim();
|
String label = report.reportLabel == null || report.reportLabel.isBlank() ? "Report" : report.reportLabel.trim();
|
||||||
MacroExecutor.setCurrentStatus("Report: start " + startCondition.getDisplayName());
|
MacroExecutor.setCurrentStatus("Report: start " + startCondition.getDisplayName());
|
||||||
CompletableFuture<MacroExecutor.MacroEvent> startAnchor = startActionAnchorFuture(startCondition);
|
CompletableFuture<MacroExecutor.MacroEvent> startAnchor = startActionAnchorFuture(startCondition);
|
||||||
MacroExecutor.executeSingleActionWithWaits(mc, startCondition, null);
|
MacroDispatcher.executeSingleActionWithWaits(mc, startCondition, null);
|
||||||
if (!MacroExecutor.isCurrentRunActive()) return conditionCount;
|
if (!MacroExecutor.isCurrentRunActive()) return conditionCount;
|
||||||
MacroExecutor.MacroEvent startEvent = waitForAnchorOrNow(startAnchor, 250, startCondition.getDisplayName(), "client action");
|
MacroExecutor.MacroEvent startEvent = waitForAnchorOrNow(startAnchor, 250, startCondition.getDisplayName(), "client action");
|
||||||
|
|
||||||
|
|
@ -445,7 +445,7 @@ final class MacroRace {
|
||||||
if (trigger == null) return true;
|
if (trigger == null) return true;
|
||||||
CompletableFuture<?> future = raceConditionFuture(mc, trigger);
|
CompletableFuture<?> future = raceConditionFuture(mc, trigger);
|
||||||
if (future == null) {
|
if (future == null) {
|
||||||
MacroExecutor.executeSingleActionWithWaits(mc, trigger, null);
|
MacroDispatcher.executeSingleActionWithWaits(mc, trigger, null);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
boolean fired = waitForFutureDone(future, timeoutMs);
|
boolean fired = waitForFutureDone(future, timeoutMs);
|
||||||
|
|
@ -695,7 +695,7 @@ final class MacroRace {
|
||||||
MacroExecutor.RunState run = MacroExecutor.CURRENT_RUN.get();
|
MacroExecutor.RunState run = MacroExecutor.CURRENT_RUN.get();
|
||||||
mc.execute(() -> MacroExecutor.withRunContext(run, () -> {
|
mc.execute(() -> MacroExecutor.withRunContext(run, () -> {
|
||||||
try {
|
try {
|
||||||
MacroExecutor.executeSingleActionWithWaits(mc, trigger, null);
|
MacroDispatcher.executeSingleActionWithWaits(mc, trigger, null);
|
||||||
done.complete(new MacroExecutor.MacroEvent(null, trigger.getDisplayName(), System.nanoTime(), null));
|
done.complete(new MacroExecutor.MacroEvent(null, trigger.getDisplayName(), System.nanoTime(), null));
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
Thread.currentThread().interrupt();
|
Thread.currentThread().interrupt();
|
||||||
|
|
@ -902,7 +902,7 @@ final class MacroRace {
|
||||||
MacroExecutor.RunState run = MacroExecutor.CURRENT_RUN.get();
|
MacroExecutor.RunState run = MacroExecutor.CURRENT_RUN.get();
|
||||||
return CompletableFuture.runAsync(() -> MacroExecutor.withRunContext(run, () -> {
|
return CompletableFuture.runAsync(() -> MacroExecutor.withRunContext(run, () -> {
|
||||||
try {
|
try {
|
||||||
MacroExecutor.executeSingleActionWithWaits(mc, trigger, null);
|
MacroDispatcher.executeSingleActionWithWaits(mc, trigger, null);
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
Thread.currentThread().interrupt();
|
Thread.currentThread().interrupt();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -608,7 +608,7 @@ final class MacroRunLoop {
|
||||||
MacroExecutor.REPEAT_PACKET_CONTEXT.set(new MacroExecutor.RepeatPacketContext(macro, j + 1, endIdx));
|
MacroExecutor.REPEAT_PACKET_CONTEXT.set(new MacroExecutor.RepeatPacketContext(macro, j + 1, endIdx));
|
||||||
MacroExecutor.REPEAT_PACKET_SKIP.set(0);
|
MacroExecutor.REPEAT_PACKET_SKIP.set(0);
|
||||||
try {
|
try {
|
||||||
MacroExecutor.executeSingleActionWithWaits(mc, subAction, module);
|
MacroDispatcher.executeSingleActionWithWaits(mc, subAction, module);
|
||||||
j += Math.max(0, MacroExecutor.REPEAT_PACKET_SKIP.get());
|
j += Math.max(0, MacroExecutor.REPEAT_PACKET_SKIP.get());
|
||||||
} finally {
|
} finally {
|
||||||
MacroExecutor.REPEAT_PACKET_SKIP.set(0);
|
MacroExecutor.REPEAT_PACKET_SKIP.set(0);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue