diff --git a/src/api b/src/api index c0aae432d..f998e8feb 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit c0aae432d6a69b25a6f4b1c78fb46079383cef73 +Subproject commit f998e8feb4e45e130632df26a313016031ad82d0 diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 8ce816541..659dbcd04 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -10,7 +10,7 @@ import org.apache.commons.lang3.exception.ExceptionUtils; import java.util.HashMap; import java.util.Map; import java.util.function.Consumer; -import java.util.function.Supplier; +import java.util.function.Function; public class Action implements IAction { protected final ScriptedActionManager manager; @@ -225,7 +225,7 @@ public class Action implements IAction { } @Override - public void pauseUntil(Supplier until) { + public void pauseUntil(Function until) { if (isThreaded) actionThread.pauseUntil(until); else @@ -358,32 +358,32 @@ public class Action implements IAction { } @Override - public IConditionalAction conditional(Supplier condition, Consumer task) { + public IConditionalAction conditional(Function condition, Consumer task) { return conditional(manager.create(condition, task)); } @Override - public IConditionalAction conditional(String name, Supplier condition, Consumer task) { + public IConditionalAction conditional(String name, Function condition, Consumer task) { return conditional(manager.create(name, condition, task)); } @Override - public IConditionalAction conditional(Supplier condition, Consumer task, Supplier terminateWhen) { + public IConditionalAction conditional(Function condition, Consumer task, Function terminateWhen) { return conditional(manager.create(condition, task, terminateWhen)); } @Override - public IConditionalAction conditional(String name, Supplier condition, Consumer task, Supplier terminateWhen) { + public IConditionalAction conditional(String name, Function condition, Consumer task, Function terminateWhen) { return conditional(manager.create(name, condition, task, terminateWhen)); } @Override - public IConditionalAction conditional(Supplier condition, Consumer task, Supplier terminateWhen, Consumer onTermination) { + public IConditionalAction conditional(Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { return conditional(manager.create(condition, task, terminateWhen, onTermination)); } @Override - public IConditionalAction conditional(String name, Supplier condition, Consumer task, Supplier terminateWhen, Consumer onTermination) { + public IConditionalAction conditional(String name, Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { return conditional(manager.create(name, condition, task, terminateWhen, onTermination)); } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java index 9c0d29fd4..b8f5f3361 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java @@ -1,12 +1,17 @@ package noppes.npcs.controllers.data.action; +import noppes.npcs.api.handler.data.IAction; + import java.util.Queue; import java.util.Set; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Function; import java.util.function.Supplier; public class ActionThread { + private Action action; + private final Object lock = new Object(); private Thread thread; ExecutorService executor; @@ -16,9 +21,10 @@ public class ActionThread { private volatile boolean threadPaused, threadSleeping; - private Supplier pauseUntil; + private Function pauseUntil; public ActionThread(Action action) { + this.action = action; executor = Executors.newSingleThreadExecutor(r -> { thread = new Thread(r); thread.setName(String.format("ActionThread (%s)", action.getName())); @@ -69,7 +75,7 @@ public class ActionThread { } } - public void pauseUntil(Supplier until) { + public void pauseUntil(Function until) { this.pauseUntil = until; pause(); } @@ -99,7 +105,7 @@ public class ActionThread { } protected void execute(String taskKey, Runnable task) { - if (threadPaused && pauseUntil != null && pauseUntil.get()) + if (threadPaused && pauseUntil != null && pauseUntil.apply(action)) resume(); if (runningKeys.contains(taskKey)) 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 7d8a0e72e..c61b9cf6b 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java @@ -6,42 +6,43 @@ import noppes.npcs.scripted.ScriptedActionManager; import org.apache.commons.lang3.exception.ExceptionUtils; import java.util.function.Consumer; -import java.util.function.Supplier; +import java.util.function.Function; + public class ConditionalAction extends Action implements IConditionalAction { - private Supplier condition; - private Supplier terminateWhen; + private Function condition; + private Function terminateWhen; private Consumer onTermination; private int maxChecks = -1; private int checkCount; private boolean taskExecuted; - public ConditionalAction(ScriptedActionManager manager, Supplier condition, Consumer task) { + public ConditionalAction(ScriptedActionManager manager, Function condition, Consumer task) { super(manager, "conditional", task); this.condition = condition; } - public ConditionalAction(ScriptedActionManager manager, String name, Supplier condition, Consumer task) { + public ConditionalAction(ScriptedActionManager manager, String name, Function condition, Consumer task) { super(manager, name, task); this.condition = condition; } - public ConditionalAction(ScriptedActionManager manager, Supplier condition, Consumer task, Supplier terminateWhen) { + public ConditionalAction(ScriptedActionManager manager, Function condition, Consumer task, Function terminateWhen) { this(manager, condition, task); this.terminateWhen = terminateWhen; } - public ConditionalAction(ScriptedActionManager manager, String name, Supplier condition, Consumer task, Supplier terminateWhen) { + public ConditionalAction(ScriptedActionManager manager, String name, Function condition, Consumer task, Function terminateWhen) { this(manager, name, condition, task); this.terminateWhen = terminateWhen; } - public ConditionalAction(ScriptedActionManager manager, Supplier condition, Consumer task, Supplier terminateWhen, Consumer onTermination) { + public ConditionalAction(ScriptedActionManager manager, Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { this(manager, condition, task, terminateWhen); this.onTermination = onTermination; } - public ConditionalAction(ScriptedActionManager manager, String name, Supplier condition, Consumer task, Supplier terminateWhen, Consumer onTermination) { + public ConditionalAction(ScriptedActionManager manager, String name, Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { this(manager, name, condition, task, terminateWhen); this.onTermination = onTermination; } @@ -57,7 +58,7 @@ public class ConditionalAction extends Action implements IConditionalAction { } if (ticksExisted % updateEveryXTick == 0) { - if (condition != null && condition.get()) { + if (condition != null && condition.apply(this)) { if (isThreaded) actionThread.execute("task", this::executeTask); else @@ -113,7 +114,7 @@ public class ConditionalAction extends Action implements IConditionalAction { @Override public boolean isTerminated() { - return terminateWhen != null && terminateWhen.get(); + return terminateWhen != null && terminateWhen.apply(this); } @Override @@ -123,13 +124,13 @@ public class ConditionalAction extends Action implements IConditionalAction { } @Override - public IConditionalAction setCondition(Supplier condition) { + public IConditionalAction setCondition(Function condition) { this.condition = condition; return this; } @Override - public IConditionalAction terminateWhen(Supplier terminateWhen) { + public IConditionalAction terminateWhen(Function terminateWhen) { this.terminateWhen = terminateWhen; return this; }