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

---
 .../controllers/data/action/ConditionalAction.java   | 12 ++++++------
 .../noppes/npcs/scripted/ScriptedActionManager.java  |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

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 f3b50d4c6..211eeed64 100644
--- a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java
+++ b/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java
@@ -35,12 +35,12 @@ public class ConditionalAction extends Action implements IConditionalAction {
         this.terminateWhen = terminateWhen;
     }
 
-    public ConditionalAction(ScriptedActionManager manager, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination, Consumer<IAction> task) {
+    public ConditionalAction(ScriptedActionManager manager, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task, Consumer<IAction> onTermination) {
         this(manager, predicate, terminateWhen, task);
         this.onTermination = onTermination;
     }
 
-    public ConditionalAction(ScriptedActionManager manager, String name, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination, Consumer<IAction> task) {
+    public ConditionalAction(ScriptedActionManager manager, String name, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task, Consumer<IAction> onTermination) {
         this(manager, name, predicate, terminateWhen, task);
         this.onTermination = onTermination;
     }
@@ -131,12 +131,12 @@ public class ConditionalAction extends Action implements IConditionalAction {
     }
 
     @Override
-    public IConditionalAction after(Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination, Consumer<IAction> task) {
-        return after(manager.create(predicate, terminateWhen, onTermination, task));
+    public IConditionalAction after(Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task, Consumer<IAction> onTermination) {
+        return after(manager.create(predicate, terminateWhen, task, onTermination));
     }
 
     @Override
-    public IConditionalAction after(String name, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination, Consumer<IAction> task) {
-        return after(manager.create(name, predicate, terminateWhen, onTermination, task));
+    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));
     }
 }
diff --git a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java
index d3ddc7cd2..304f08df1 100644
--- a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java
+++ b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java
@@ -79,13 +79,13 @@ public class ScriptedActionManager implements IActionManager {
     }
 
     @Override
-    public IConditionalAction create(Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination, Consumer<IAction> task) {
-        return new ConditionalAction(this, predicate, terminateWhen, onTermination, task);
+    public IConditionalAction create(Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task, Consumer<IAction> onTermination) {
+        return new ConditionalAction(this, predicate, terminateWhen, task, onTermination);
     }
 
     @Override
-    public IConditionalAction create(String name, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination, Consumer<IAction> task) {
-        return new ConditionalAction(this, name, predicate, terminateWhen, onTermination, task);
+    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);
     }
 
     @Override