From 6eb08b2c4e7a029a6ffaa6f678daa84ee5b3bea8 Mon Sep 17 00:00:00 2001
From: bigguy345 <monkeybar3200@gmail.com>
Date: Mon, 28 Apr 2025 10:47:15 +0300
Subject: [PATCH] Re-ordered ConditionAction constructor params

---
 java/noppes/npcs/api/handler/IActionManager.java          | 8 ++++----
 .../npcs/api/handler/data/actions/IConditionalAction.java | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

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<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination, Consumer<IAction> task);
+    IConditionalAction create(Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task, Consumer<IAction> 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<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination, Consumer<IAction> task);
+    IConditionalAction create(String name, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task, Consumer<IAction> 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<Boolean> predicate, Supplier<Boolean> terminate, Consumer<IAction> task);
 
-    IConditionalAction after(Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination, Consumer<IAction> task);
+    IConditionalAction after(Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task, Consumer<IAction> onTermination);
 
-    IConditionalAction after(String name, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination, Consumer<IAction> task);
+    IConditionalAction after(String name, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task, Consumer<IAction> onTermination);
 }