diff --git a/java/noppes/npcs/api/handler/IActionManager.java b/java/noppes/npcs/api/handler/IActionManager.java index 4900938..d5ba614 100644 --- a/java/noppes/npcs/api/handler/IActionManager.java +++ b/java/noppes/npcs/api/handler/IActionManager.java @@ -81,11 +81,11 @@ public interface IActionManager { * * @param predicate supplier checked every tick, if it returns true, task is fired * @param terminateWhen supplier checked every tick, if it returns true, action is terminated (gets marked done) - * @param onTermination code to run when the termination predicate returns true * @param task code to run once predicate first becomes true + * @param onTermination code to run when the termination predicate returns true * @return the action scheduled */ - IConditionalAction create(Supplier predicate, Supplier terminateWhen, Consumer onTermination, Consumer task); + IConditionalAction create(Supplier predicate, Supplier terminateWhen, Consumer task, Consumer onTermination); /** * Schedule a conditional action that gives up after at most maxChecks attempts. @@ -93,11 +93,11 @@ public interface IActionManager { * @param name unique name * @param predicate supplier checked every tick, if it returns true, task is fired * @param terminateWhen supplier checked every tick, if it returns true, action is terminated (gets marked done) - * @param onTermination code to run when the termination predicate returns true * @param task code to run once predicate first becomes true + * @param onTermination code to run when the termination predicate returns true * @return the action scheduled */ - IConditionalAction create(String name, Supplier predicate, Supplier terminateWhen, Consumer onTermination, Consumer task); + IConditionalAction create(String name, Supplier predicate, Supplier terminateWhen, Consumer task, Consumer onTermination); /** * Begin processing scheduled actions. Must be called once. diff --git a/java/noppes/npcs/api/handler/data/actions/IConditionalAction.java b/java/noppes/npcs/api/handler/data/actions/IConditionalAction.java index 35a46c0..a35d19f 100644 --- a/java/noppes/npcs/api/handler/data/actions/IConditionalAction.java +++ b/java/noppes/npcs/api/handler/data/actions/IConditionalAction.java @@ -60,7 +60,7 @@ public interface IConditionalAction extends IAction { IConditionalAction after(String name, Supplier predicate, Supplier terminate, Consumer task); - IConditionalAction after(Supplier predicate, Supplier terminateWhen, Consumer onTermination, Consumer task); + IConditionalAction after(Supplier predicate, Supplier terminateWhen, Consumer task, Consumer onTermination); - IConditionalAction after(String name, Supplier predicate, Supplier terminateWhen, Consumer onTermination, Consumer task); + IConditionalAction after(String name, Supplier predicate, Supplier terminateWhen, Consumer task, Consumer onTermination); }