Refactored scheduleConditionalAction into scheduleAction

This commit is contained in:
bigguy345 committed 2025-04-28 08:33:06 +03:00
1 parent fbcb990e3a
commit 4d9e15c7af
2 files changed
+15 -8

No files matched your search

@@ -131,23 +131,30 @@ public class ScriptedActionManager implements IActionManager {
return false;
}
///////////////////////////////////////////////////
///////////////////////////////////////////////////
// Conditionals
@Override
public IConditionalAction scheduleConditionalAction(String name, Supplier<Boolean> predicate, Consumer<IAction> task) {
return scheduleConditionalAction(new ConditionalAction(name, predicate, task));
public IConditionalAction scheduleAction(String name, Supplier<Boolean> predicate, Consumer<IAction> task) {
return scheduleAction(new ConditionalAction(name, predicate, task));
}
@Override
public IConditionalAction scheduleConditionalAction(String name, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task) {
return scheduleConditionalAction(new ConditionalAction(name, predicate, terminateWhen, task));
public IConditionalAction scheduleAction(String name, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task) {
return scheduleAction(new ConditionalAction(name, predicate, terminateWhen, task));
}
@Override
public IConditionalAction scheduleConditionalAction(IConditionalAction action) {
public IConditionalAction scheduleAction(IConditionalAction action) {
conditionalActions.add(action);
return action;
}
@Override
public List<IConditionalAction> getConditionalActions() {
return conditionalActions;
}
/**
* Call once per tick from your main loop.
*
@@ -486,7 +493,7 @@ public class ScriptedActionManager implements IActionManager {
// Chaining methods
@Override
public IConditionalAction after(IConditionalAction after) {
return scheduleConditionalAction(after);
return scheduleAction(after);
}
@Override