From 4d9e15c7af08088c1f41bef49d3042e6a0017b0a Mon Sep 17 00:00:00 2001
From: bigguy345 <monkeybar3200@gmail.com>
Date: Mon, 28 Apr 2025 08:33:06 +0300
Subject: [PATCH] Refactored scheduleConditionalAction into scheduleAction

---
 src/api                                       |  2 +-
 .../npcs/scripted/ScriptedActionManager.java  | 21 ++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/api b/src/api
index 5a12178a9..0bbb00f1e 160000
--- a/src/api
+++ b/src/api
@@ -1 +1 @@
-Subproject commit 5a12178a92962849de1d9bd0c48655ebd76864ed
+Subproject commit 0bbb00f1e1c61dc69e207c9aa22bf9b86a7d3f32
diff --git a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java
index 0441f09c1..42c57c9dd 100644
--- a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java
+++ b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java
@@ -131,23 +131,30 @@ public class ScriptedActionManager implements IActionManager {
         return false;
     }
 
-
+    ///////////////////////////////////////////////////
+    ///////////////////////////////////////////////////
+    // Conditionals
     @Override
-    public IConditionalAction scheduleConditionalAction(String name, Supplier<Boolean> predicate, Consumer<IAction> task) {
-        return scheduleConditionalAction(new ConditionalAction(name, predicate, task));
+    public IConditionalAction scheduleAction(String name, Supplier<Boolean> predicate, Consumer<IAction> task) {
+        return scheduleAction(new ConditionalAction(name, predicate, task));
     }
 
     @Override
-    public IConditionalAction scheduleConditionalAction(String name, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task) {
-        return scheduleConditionalAction(new ConditionalAction(name, predicate, terminateWhen, task));
+    public IConditionalAction scheduleAction(String name, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task) {
+        return scheduleAction(new ConditionalAction(name, predicate, terminateWhen, task));
     }
 
     @Override
-    public IConditionalAction scheduleConditionalAction(IConditionalAction action) {
+    public IConditionalAction scheduleAction(IConditionalAction action) {
         conditionalActions.add(action);
         return action;
     }
 
+    @Override
+    public List<IConditionalAction> getConditionalActions() {
+        return conditionalActions;
+    }
+
     /**
      * Call once per tick from your main loop.
      *
@@ -486,7 +493,7 @@ public class ScriptedActionManager implements IActionManager {
         // Chaining methods
         @Override
         public IConditionalAction after(IConditionalAction after) {
-            return scheduleConditionalAction(after);
+            return scheduleAction(after);
         }
 
         @Override