diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 659dbcd04..5ca7e86b5 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -354,7 +354,7 @@ public class Action implements IAction { @Override public IConditionalAction conditional(IConditionalAction after) { - return manager.scheduleAction(after); + return manager.schedule(after); } @Override @@ -389,7 +389,7 @@ public class Action implements IAction { @Override public IAction parallel(IAction after) { - return manager.scheduleParallelAction(after); + return manager.scheduleParallel(after); } @Override diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java b/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java index 572748a69..3f17e99eb 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java @@ -30,7 +30,7 @@ public class ActionChain implements IActionChain { IAction a = scriptedActionManager.create(name, offset, wrapper); index++; a.setUpdateEveryXTick(1); - scriptedActionManager.scheduleAction(a); + scriptedActionManager.schedule(a); return this; } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ParallelActionChain.java b/src/main/java/noppes/npcs/controllers/data/action/ParallelActionChain.java index d437d80b1..640316b66 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ParallelActionChain.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ParallelActionChain.java @@ -29,7 +29,7 @@ public class ParallelActionChain implements IActionChain { wrapper); idx++; a.setUpdateEveryXTick(1); - scriptedActionManager.scheduleParallelAction(a); + scriptedActionManager.scheduleParallel(a); return this; } diff --git a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java index 0e4d1ccc4..6da5d3254 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java +++ b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java @@ -104,38 +104,38 @@ public class ScriptedActionManager implements IActionManager { } @Override - public IAction scheduleAction(IAction action) { + public IAction schedule(IAction action) { actionQueue.addLast(action); return action; } @Override - public IAction scheduleAction(Consumer task) { - return scheduleAction(create(task)); + public IAction schedule(Consumer task) { + return schedule(create(task)); } @Override - public IAction scheduleAction(int delay, Consumer task) { - return scheduleAction(create(delay, task)); + public IAction schedule(int delay, Consumer task) { + return schedule(create(delay, task)); } @Override - public IAction scheduleAction(int maxDuration, int delay, Consumer task) { - return scheduleAction(create(maxDuration, delay, task)); + public IAction schedule(int maxDuration, int delay, Consumer task) { + return schedule(create(maxDuration, delay, task)); } @Override - public IAction scheduleAction(String name, Consumer task) { - return scheduleAction(create(name, task)); + public IAction schedule(String name, Consumer task) { + return schedule(create(name, task)); } @Override - public IAction scheduleAction(String name, int delay, Consumer task) { - return scheduleAction(create(name, delay, task)); + public IAction schedule(String name, int delay, Consumer task) { + return schedule(create(name, delay, task)); } @Override - public IAction scheduleAction(String name, int maxDuration, int delay, Consumer task) { - return scheduleAction(create(name, maxDuration, delay, task)); + public IAction schedule(String name, int maxDuration, int delay, Consumer task) { + return schedule(create(name, maxDuration, delay, task)); } @Override @@ -218,39 +218,39 @@ public class ScriptedActionManager implements IActionManager { /////////////////////////////////////////////////// // Conditionals @Override - public IConditionalAction scheduleAction(Function condition, Consumer task) { - return scheduleAction(new ConditionalAction(this, condition, task)); + public IConditionalAction schedule(Function condition, Consumer task) { + return schedule(new ConditionalAction(this, condition, task)); } @Override - public IConditionalAction scheduleAction(Function condition, Consumer task, Function terminateWhen) { - return scheduleAction(new ConditionalAction(this, condition, task, terminateWhen)); + public IConditionalAction schedule(Function condition, Consumer task, Function terminateWhen) { + return schedule(new ConditionalAction(this, condition, task, terminateWhen)); } @Override - public IConditionalAction scheduleAction(Function condition, Consumer task,Function terminateWhen, Consumer onTermination) { - return scheduleAction(new ConditionalAction(this, condition, task, terminateWhen, onTermination)); + public IConditionalAction schedule(Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { + return schedule(new ConditionalAction(this, condition, task, terminateWhen, onTermination)); } @Override - public IConditionalAction scheduleAction(String name,Function condition, Consumer task) { - return scheduleAction(new ConditionalAction(this, name, condition, task)); + public IConditionalAction schedule(String name, Function condition, Consumer task) { + return schedule(new ConditionalAction(this, name, condition, task)); } @Override - public IConditionalAction scheduleAction(String name,Function condition, Consumer task,Function terminateWhen) { - return scheduleAction(new ConditionalAction(this, name, condition, task, terminateWhen)); + public IConditionalAction schedule(String name, Function condition, Consumer task, Function terminateWhen) { + return schedule(new ConditionalAction(this, name, condition, task, terminateWhen)); } @Override - public IConditionalAction scheduleAction(String name,Function condition, Consumer task,Function terminateWhen, Consumer onTermination) { - return scheduleAction(new ConditionalAction(this, name, condition, task, terminateWhen, onTermination)); + public IConditionalAction schedule(String name, Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { + return schedule(new ConditionalAction(this, name, condition, task, terminateWhen, onTermination)); } @Override - public IConditionalAction scheduleAction(IConditionalAction action) { + public IConditionalAction schedule(IConditionalAction action) { conditionalActions.add(action); return action; } @@ -270,22 +270,22 @@ public class ScriptedActionManager implements IActionManager { } @Override - public IAction scheduleParallelAction(IAction action) { + public IAction scheduleParallel(IAction action) { parallelActions.add(action); return action; } @Override - public IAction scheduleParallelAction(String name, Consumer task) { - return scheduleParallelAction(create(name, task)); + public IAction scheduleParallel(String name, Consumer task) { + return scheduleParallel(create(name, task)); } @Override - public IAction scheduleParallelAction(String name, int delay, Consumer task) { - return scheduleParallelAction(create(name, delay, task)); + public IAction scheduleParallel(String name, int delay, Consumer task) { + return scheduleParallel(create(name, delay, task)); } @Override - public IAction scheduleParallelAction(String name, int maxDuration, int delay, Consumer task) { - return scheduleParallelAction(create(name, maxDuration, delay, task)); + public IAction scheduleParallel(String name, int maxDuration, int delay, Consumer task) { + return scheduleParallel(create(name, maxDuration, delay, task)); }