Autism-Development/Autism-Client
Autism-Development/Autism-Client
2
0
Fork 0
mirror of https://github.com/AutismDevelopment/Autism-Client.git synced 2026-10-28 19:39:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor: extract MacroRunLoop from MacroExecutor (upstream #4)

Browse source 
Move run/runInternal plus the wait primitives they own
(waitForCondition, waitForPredicate, guiClosePredicate x2,
runPacedTpAction, yieldToMainThread) verbatim into MacroRunLoop.
Shared members referenced as MacroExecutor.xxx (mechanical
qualification only); wait-primitive call sites re-pointed across all
helpers. All bodies verified identical against HEAD modulo that
qualification.
This commit is contained in:
sectersion 2026-10-11 16:31:51 +01:00
parent 6751b750a3
commit 45431ab136
7 changed files with 1346 additions and 1326 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/autismclient/util/macro/MacroWorldActions.java
View file

@ -136,7 +136,7 @@ final class MacroWorldActions {
if (resolvedTarget.hasIdentity()) {
MacroExecutor.setCurrentStatus("Waiting for item in GUI: " + itemLabel);
CompletableFuture<Void> waitFuture = MacroConditionRegistry.waitForItemInHandler(resolvedTarget);
MacroExecutor.waitForCondition(waitFuture);
MacroRunLoop.waitForCondition(waitFuture);
}
}
@ -216,7 +216,7 @@ final class MacroWorldActions {
}
if (MacroExecutor.isCurrentRunActive()) {
CompletableFuture<Void> tickFuture = MacroConditionRegistry.waitForNextTick();
MacroExecutor.waitForCondition(tickFuture);
MacroRunLoop.waitForCondition(tickFuture);
}
}
}
@ -264,7 +264,7 @@ final class MacroWorldActions {
}
CompletableFuture<Void> tickFuture = MacroConditionRegistry.waitForNextTick();
MacroExecutor.waitForCondition(tickFuture);
MacroRunLoop.waitForCondition(tickFuture);
}
} finally {
if (!MacroExecutor.isCurrentRunActive()) requestOwnedBaritoneStop(run, mc);
@ -356,7 +356,7 @@ final class MacroWorldActions {
}
CompletableFuture<Void> tickFuture = MacroConditionRegistry.waitForNextTick();
MacroExecutor.waitForCondition(tickFuture);
MacroRunLoop.waitForCondition(tickFuture);
}
} finally {
if (run != null && run.activeMineTracker == mineTracker) run.activeMineTracker = null;
@ -409,7 +409,7 @@ final class MacroWorldActions {
long waitStartMs = System.currentTimeMillis();
while (MacroExecutor.isCurrentRunActive() && AutismCompatManager.isBaritoneBusy() && System.currentTimeMillis() - waitStartMs < 3000L) {
CompletableFuture<Void> tickFuture = MacroConditionRegistry.waitForNextTick();
MacroExecutor.waitForCondition(tickFuture);
MacroRunLoop.waitForCondition(tickFuture);
}
}