Changed every instance of the word "predicate" to "condition"

java/noppes/npcs/api/handler/IActionManager.java

@@ -39,65 +39,65 @@ public interface IActionManager {
     /**
      * Schedule a conditional action that gives up after at most maxChecks attempts.
      *
-     * @param predicate supplier checked every tick, if it returns true, task is fired
-     * @param task      code to run once predicate first becomes true
+     * @param condition supplier checked every tick, if it returns true, task is fired
+     * @param task      code to run once condition first becomes true
      * @return the action scheduled
      */
-    IConditionalAction create(Supplier<Boolean> predicate, Consumer<IAction> task);
+    IConditionalAction create(Supplier<Boolean> condition, Consumer<IAction> task);
 
     /**
      * Schedule a conditional action that gives up after at most maxChecks attempts.
      *
      * @param name      unique name
-     * @param predicate supplier checked every tick, if it returns true, task is fired
-     * @param task      code to run once predicate first becomes true
+     * @param condition supplier checked every tick, if it returns true, task is fired
+     * @param task      code to run once condition first becomes true
      * @return the action scheduled
      */
-    IConditionalAction create(String name, Supplier<Boolean> predicate, Consumer<IAction> task);
+    IConditionalAction create(String name, Supplier<Boolean> condition, Consumer<IAction> task);
 
     /**
      * Schedule a conditional action that gives up after at most maxChecks attempts.
      *
-     * @param predicate     supplier checked every tick, if it returns true, task is fired
-     * @param task          code to run once predicate first becomes true
+     * @param condition     supplier checked every tick, if it returns true, task is fired
+     * @param task          code to run once condition first becomes true
      * @param terminateWhen supplier checked every tick, if it returns true, action is terminated (gets marked done)
      * @return the action scheduled
      */
-    IConditionalAction create(Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen);
+    IConditionalAction create(Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen);
 
     /**
      * Schedule a conditional action that gives up after at most maxChecks attempts.
      *
      * @param name          unique name
-     * @param predicate     supplier checked every tick, if it returns true, task is fired
-     * @param task          code to run once predicate first becomes true
+     * @param condition     supplier checked every tick, if it returns true, task is fired
+     * @param task          code to run once condition first becomes true
      * @param terminateWhen supplier checked every tick, if it returns true, action is terminated (gets marked done)
      * @return the action scheduled
      */
-    IConditionalAction create(String name, Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen);
+    IConditionalAction create(String name, Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen);
 
     /**
      * Schedule a conditional action that gives up after at most maxChecks attempts.
      *
-     * @param predicate     supplier checked every tick, if it returns true, task is fired
-     * @param task          code to run once predicate first becomes true
+     * @param condition     supplier checked every tick, if it returns true, task is fired
+     * @param task          code to run once condition first becomes true
      * @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 onTermination code to run when the termination condition returns true
      * @return the action scheduled
      */
-    IConditionalAction create(Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination);
+    IConditionalAction create(Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination);
 
     /**
      * Schedule a conditional action that gives up after at most maxChecks attempts.
      *
      * @param name          unique name
-     * @param predicate     supplier checked every tick, if it returns true, task is fired
-     * @param task          code to run once predicate first becomes true
+     * @param condition     supplier checked every tick, if it returns true, task is fired
+     * @param task          code to run once condition first becomes true
      * @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 onTermination code to run when the termination condition returns true
      * @return the action scheduled
      */
-    IConditionalAction create(String name, Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination);
+    IConditionalAction create(String name, Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination);
 
     /**
      * Begin processing scheduled actions.  Must be called once.
@@ -164,35 +164,35 @@ public interface IActionManager {
     /**
      * Schedule a conditional action that gives up after at most maxChecks attempts.
      *
-     * @param name               unique name
-     * @param predicate          supplier checked every tick, if it returns true, task is fired
-     * @param task               code to run once predicate first becomes true
+     * @param name      unique name
+     * @param condition supplier checked every tick, if it returns true, task is fired
+     * @param task      code to run once condition first becomes true
      * @return the action scheduled
      */
-    IConditionalAction scheduleAction(String name, Supplier<Boolean> predicate, Consumer<IAction> task);
+    IConditionalAction scheduleAction(String name, Supplier<Boolean> condition, Consumer<IAction> task);
 
     /**
      * Schedule a conditional action that gives up after at most maxChecks attempts.
      *
      * @param name          unique name
-     * @param predicate     supplier checked every tick, if it returns true, task is fired
-     * @param task          code to run once predicate first becomes true
+     * @param condition     supplier checked every tick, if it returns true, task is fired
+     * @param task          code to run once condition first becomes true
      * @param terminateWhen supplier checked every tick, if it returns true, action is terminated (gets marked done)
      * @return the action scheduled
      */
-    IConditionalAction scheduleAction(String name, Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen);
+    IConditionalAction scheduleAction(String name, Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen);
 
     /**
      * Schedule a conditional action that gives up after at most maxChecks attempts.
      *
      * @param name          unique name
-     * @param predicate     supplier checked every tick, if it returns true, task is fired
-     * @param task          code to run once predicate first becomes true
+     * @param condition     supplier checked every tick, if it returns true, task is fired
+     * @param task          code to run once condition first becomes true
      * @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 onTermination code to run when the termination condition returns true
      * @return the action scheduled
      */
-    IConditionalAction scheduleAction(String name, Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination);
+    IConditionalAction scheduleAction(String name, Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination);
 
     IConditionalAction scheduleAction(IConditionalAction action);
 
@@ -251,15 +251,15 @@ public interface IActionManager {
     /**
      * Convenience: create & enqueue a conditional task that re-checks forever.
      */
-    default void addConditionalTask(String name, Supplier<Boolean> predicate, Consumer<IAction> task) {
-        scheduleAction(name, predicate, task);
+    default void addConditionalTask(String name, Supplier<Boolean> condition, Consumer<IAction> task) {
+        scheduleAction(name, condition, task);
     }
 
     /**
      * Convenience: create & enqueue a conditional task that gives up after maxChecks.
      */
-    default void addConditionalTask(String name, Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
-        scheduleAction(name, predicate, task, terminateWhen);
+    default void addConditionalTask(String name, Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
+        scheduleAction(name, condition, task, terminateWhen);
     }
 
 

java/noppes/npcs/api/handler/data/actions/IConditionalAction.java

@@ -8,32 +8,32 @@ import java.util.function.Supplier;
 public interface IConditionalAction extends IAction {
 
     /**
-     * @param predicate supplier checked every tick, if it returns true, task is fired
+     * @param condition supplier checked every tick, if it returns true, task is fired
      * @return
      */
-    IConditionalAction setPredicate(Supplier<Boolean> predicate);
+    IConditionalAction setCondition(Supplier<Boolean> condition);
 
     /**
      * @param terminateWhen supplier checked every tick, if it returns true, action is terminated (gets marked done)
      * @return this action
      */
-    IConditionalAction setTerminationPredicate(Supplier<Boolean> terminateWhen);
+    IConditionalAction terminateWhen(Supplier<Boolean> terminateWhen);
 
     /**
-     * @param onTermination code to run when the termination predicate returns true
+     * @param onTermination code to run when the termination condition returns true
      * @return this action
      */
-    IConditionalAction setTerminationTask(Consumer<IAction> onTermination);
+    IConditionalAction onTermination(Consumer<IAction> onTermination);
 
     /**
-     * @return true if predicate was satisfied and task ran  (i.e can be called in termination task to see if original task was executed
+     * @return true if condition was satisfied and task ran  (i.e can be called in termination task to see if original task was executed
      * then do code based on that, if not return early)
      */
     boolean wasTaskExecuted();
 
     /**
      * Note: Only for Conditional Actions
-     * @return how many times this conditional action has tested its predicate
+     * @return how many times this conditional action has tested its condition
      */
     int getCheckCount();
 
@@ -45,22 +45,22 @@ public interface IConditionalAction extends IAction {
 
 
     /**
-     * @param maxChecks maximum times to test predicate before auto‐cancelling
+     * @param maxChecks maximum times to test condition before auto‐cancelling
      * @return this action
      */
     IConditionalAction setMaxChecks(int maxChecks);
 
     IConditionalAction after(IConditionalAction after);
 
-    IConditionalAction after(Supplier<Boolean> predicate, Consumer<IAction> task);
+    IConditionalAction after(Supplier<Boolean> condition, Consumer<IAction> task);
 
-    IConditionalAction after(String name, Supplier<Boolean> predicate, Consumer<IAction> task);
+    IConditionalAction after(String name, Supplier<Boolean> condition, Consumer<IAction> task);
 
-    IConditionalAction after(Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminate);
+    IConditionalAction after(Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminate);
 
-    IConditionalAction after(String name, Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminate);
+    IConditionalAction after(String name, Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminate);
 
-    IConditionalAction after(Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination);
+    IConditionalAction after(Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination);
 
-    IConditionalAction after(String name, Supplier<Boolean> predicate, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination);
+    IConditionalAction after(String name, Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination);
 }