From e2225453c8de202ae43c74cfa8a55f3705e2ac17 Mon Sep 17 00:00:00 2001
From: bigguy345 <monkeybar3200@gmail.com>
Date: Tue, 29 Apr 2025 08:53:17 +0300
Subject: [PATCH] Re-ordered ConditionalAction's Supplier<Boolean>
 terminateWhen arg

---
 src/api                                       |  2 +-
 .../data/action/ConditionalAction.java        | 28 +++++++++----------
 .../npcs/scripted/ScriptedActionManager.java  | 20 ++++++-------
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/api b/src/api
index c9a970adc..28cc2d837 160000
--- a/src/api
+++ b/src/api
@@ -1 +1 @@
-Subproject commit c9a970adce7aa07d2edb81789cabf1ad2168f19e
+Subproject commit 28cc2d837bbf5caa6016e5a2c20cae7c02ad0319
diff --git a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java b/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java
index 211eeed64..975cbef1e 100644
--- a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java
+++ b/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java
@@ -25,23 +25,23 @@ public class ConditionalAction extends Action implements IConditionalAction {
         this.predicate = predicate;
     }
 
-    public ConditionalAction(ScriptedActionManager manager, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task) {
+    public ConditionalAction(ScriptedActionManager manager, Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
         this(manager, predicate, task);
         this.terminateWhen = terminateWhen;
     }
 
-    public ConditionalAction(ScriptedActionManager manager, String name, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task) {
+    public ConditionalAction(ScriptedActionManager manager, String name, Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
         this(manager, name, predicate, task);
         this.terminateWhen = terminateWhen;
     }
 
-    public ConditionalAction(ScriptedActionManager manager, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task, Consumer<IAction> onTermination) {
-        this(manager, predicate, terminateWhen, task);
+    public ConditionalAction(ScriptedActionManager manager, Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination) {
+        this(manager, predicate, task, terminateWhen);
         this.onTermination = onTermination;
     }
 
-    public ConditionalAction(ScriptedActionManager manager, String name, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task, Consumer<IAction> onTermination) {
-        this(manager, name, predicate, terminateWhen, task);
+    public ConditionalAction(ScriptedActionManager manager, String name, Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination) {
+        this(manager, name, predicate, task, terminateWhen);
         this.onTermination = onTermination;
     }
 
@@ -121,22 +121,22 @@ public class ConditionalAction extends Action implements IConditionalAction {
     }
 
     @Override
-    public IConditionalAction after(Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task) {
-        return after(manager.create(predicate, terminateWhen, task));
+    public IConditionalAction after(Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
+        return after(manager.create(predicate, task, terminateWhen));
     }
 
     @Override
-    public IConditionalAction after(String name, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task) {
-        return after(manager.create(name, predicate, terminateWhen, task));
+    public IConditionalAction after(String name, Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
+        return after(manager.create(name, predicate, task, terminateWhen));
     }
 
     @Override
-    public IConditionalAction after(Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task, Consumer<IAction> onTermination) {
-        return after(manager.create(predicate, terminateWhen, task, onTermination));
+    public IConditionalAction after(Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination) {
+        return after(manager.create(predicate, task, terminateWhen, onTermination));
     }
 
     @Override
-    public IConditionalAction after(String name, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task, Consumer<IAction> onTermination) {
-        return after(manager.create(name, predicate, terminateWhen, task, onTermination));
+    public IConditionalAction after(String name, Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination) {
+        return after(manager.create(name, predicate, task, terminateWhen, onTermination));
     }
 }
diff --git a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java
index 304f08df1..35486e92e 100644
--- a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java
+++ b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java
@@ -69,23 +69,23 @@ public class ScriptedActionManager implements IActionManager {
     }
 
     @Override
-    public IConditionalAction create(Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task) {
-        return new ConditionalAction(this, predicate, terminateWhen, task);
+    public IConditionalAction create(Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
+        return new ConditionalAction(this, predicate, task, terminateWhen);
     }
 
     @Override
-    public IConditionalAction create(String name, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task) {
-        return new ConditionalAction(this, name, predicate, terminateWhen, task);
+    public IConditionalAction create(String name, Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
+        return new ConditionalAction(this, name, predicate, task, terminateWhen);
     }
 
     @Override
-    public IConditionalAction create(Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task, Consumer<IAction> onTermination) {
-        return new ConditionalAction(this, predicate, terminateWhen, task, onTermination);
+    public IConditionalAction create(Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination) {
+        return new ConditionalAction(this, predicate, task, terminateWhen, onTermination);
     }
 
     @Override
-    public IConditionalAction create(String name, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task, Consumer<IAction> onTermination) {
-        return new ConditionalAction(this, name, predicate, terminateWhen, task, onTermination);
+    public IConditionalAction create(String name, Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination) {
+        return new ConditionalAction(this, name, predicate, task, terminateWhen, onTermination);
     }
 
     @Override
@@ -182,8 +182,8 @@ public class ScriptedActionManager implements IActionManager {
     }
 
     @Override
-    public IConditionalAction scheduleAction(String name, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task) {
-        return scheduleAction(new ConditionalAction(this, name, predicate, terminateWhen, task));
+    public IConditionalAction scheduleAction(String name, Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
+        return scheduleAction(new ConditionalAction(this, name, predicate, task, terminateWhen));
     }
 
     @Override