From d4ad1450e1b9012f1bebd148a30f31f247c19463 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 28 Apr 2025 08:08:38 +0300 Subject: [PATCH] Removed redundant args from creation methods/constructors --- .../npcs/api/handler/IActionManager.java | 38 +++++-------------- .../noppes/npcs/api/handler/data/IAction.java | 4 +- .../data/actions/IConditionalAction.java | 2 +- 3 files changed, 13 insertions(+), 31 deletions(-) diff --git a/java/noppes/npcs/api/handler/IActionManager.java b/java/noppes/npcs/api/handler/IActionManager.java index fee1b60..10277e8 100644 --- a/java/noppes/npcs/api/handler/IActionManager.java +++ b/java/noppes/npcs/api/handler/IActionManager.java @@ -94,42 +94,31 @@ public interface IActionManager { */ Queue getActionQueue(); - /** - * Schedule a “conditional” action: every {@code checkIntervalTicks}, evaluate - * the predicate, and as soon as it returns true, fire the action and remove it. - * - * @param name a unique name for this conditional action - * @param checkIntervalTicks number of ticks between each predicate check - * @param predicate no-arg boolean supplier deciding when to fire - * @param action logic to execute once when predicate first becomes true - * @return the action scheduled - */ - IAction scheduleConditionalAction(String name, int checkIntervalTicks, Supplier predicate, Consumer action); /** * Schedule a conditional action that gives up after at most maxChecks attempts. * * @param name unique name - * @param checkIntervalTicks ticks between predicate tests + * checkIntervalTicks ticks between predicate tests * @param predicate supplier returning true when it should fire * @param task logic to run once when predicate first becomes true - * @param maxChecks maximum times to test predicate before auto‐cancelling + * @ maxChecks maximum times to test predicate before auto‐cancelling * @return the action scheduled */ - IAction scheduleConditionalAction(String name, int checkIntervalTicks, Supplier predicate, Consumer task, int maxChecks); + IConditionalAction scheduleConditionalAction(String name, Supplier predicate, Consumer task); /** * Schedule a conditional action that gives up after at most maxChecks attempts. * * @param name unique name - * @param checkIntervalTicks ticks between predicate tests + * @ checkIntervalTicks ticks between predicate tests * @param predicate supplier returning true when it should fire * @param terminateWhen supplier returning true when it should terminate (gets marked done) * @param task logic to run once when predicate first becomes true - * @param maxChecks maximum times to test predicate before auto‐cancelling + * @ maxChecks maximum times to test predicate before auto‐cancelling * @return the action scheduled */ - IAction scheduleConditionalAction(String name, int checkIntervalTicks, Supplier predicate, Supplier terminateWhen, Consumer task, int maxChecks); + IConditionalAction scheduleConditionalAction(String name, Supplier predicate, Supplier terminateWhen, Consumer task); /** * Cancel (remove) the first queued action with the given name. @@ -180,22 +169,15 @@ public interface IActionManager { /** * Convenience: create & enqueue a conditional task that re-checks forever. */ - default void addConditionalTask(String name, - int checkIntervalTicks, - Supplier predicate, - Consumer task) { - scheduleConditionalAction(name, checkIntervalTicks, predicate, task); + default void addConditionalTask(String name, Supplier predicate, Consumer task) { + scheduleConditionalAction(name, predicate, task); } /** * Convenience: create & enqueue a conditional task that gives up after maxChecks. */ - default void addConditionalTask(String name, - int checkIntervalTicks, - Supplier predicate, - Consumer task, - int maxChecks) { - scheduleConditionalAction(name, checkIntervalTicks, predicate, task, maxChecks); + default void addConditionalTask(String name, Supplier predicate, Supplier terminateWhen, Consumer task) { + scheduleConditionalAction(name, predicate, terminateWhen, task); } IConditionalAction scheduleConditionalAction(IConditionalAction action); diff --git a/java/noppes/npcs/api/handler/data/IAction.java b/java/noppes/npcs/api/handler/data/IAction.java index 359aae1..b83cd27 100644 --- a/java/noppes/npcs/api/handler/data/IAction.java +++ b/java/noppes/npcs/api/handler/data/IAction.java @@ -53,7 +53,7 @@ public interface IAction { * @param key a string key * @param value any object to associate with this action */ - void addData(String key, Object value); + IAction addData(String key, Object value); /** * @return how many ticks between each invocation of the action callback @@ -65,7 +65,7 @@ public interface IAction { * * @param X tick interval (e.g. 1 = every tick, 20 = once per second) */ - void setUpdateEveryXTick(int X); + IAction setUpdateEveryXTick(int X); /** * @return how many ticks remain before the action begins (initial delay) diff --git a/java/noppes/npcs/api/handler/data/actions/IConditionalAction.java b/java/noppes/npcs/api/handler/data/actions/IConditionalAction.java index 9e11176..bc5065c 100644 --- a/java/noppes/npcs/api/handler/data/actions/IConditionalAction.java +++ b/java/noppes/npcs/api/handler/data/actions/IConditionalAction.java @@ -4,5 +4,5 @@ import noppes.npcs.api.handler.data.IAction; public interface IConditionalAction extends IAction { - + IConditionalAction setMaxChecks(int maxChecks); }