mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-20 01:49:40 +00:00
Canged all the IConditionalAction Supplier<Boolean> instances (condition,terminateWhen,pauseUntil) to Function<IAction,Boolean>
This commit is contained in:
1 parent
bc2bab889d
commit
31a25acd20
4 files changed
+32
-25
No files matched your search
@@ -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<Boolean> until) {
|
||||
public void pauseUntil(Function<IAction, Boolean> until) {
|
||||
if (isThreaded)
|
||||
actionThread.pauseUntil(until);
|
||||
else
|
||||
@@ -358,32 +358,32 @@ public class Action implements IAction {
|
||||
}
|
||||
|
||||
@Override
|
||||
public IConditionalAction conditional(Supplier<Boolean> condition, Consumer<IAction> task) {
|
||||
public IConditionalAction conditional(Function<IAction, Boolean> condition, Consumer<IAction> task) {
|
||||
return conditional(manager.create(condition, task));
|
||||
}
|
||||
|
||||
@Override
|
||||
public IConditionalAction conditional(String name, Supplier<Boolean> condition, Consumer<IAction> task) {
|
||||
public IConditionalAction conditional(String name, Function<IAction, Boolean> condition, Consumer<IAction> task) {
|
||||
return conditional(manager.create(name, condition, task));
|
||||
}
|
||||
|
||||
@Override
|
||||
public IConditionalAction conditional(Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
|
||||
public IConditionalAction conditional(Function<IAction, Boolean> condition, Consumer<IAction> task, Function<IAction, Boolean> terminateWhen) {
|
||||
return conditional(manager.create(condition, task, terminateWhen));
|
||||
}
|
||||
|
||||
@Override
|
||||
public IConditionalAction conditional(String name, Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
|
||||
public IConditionalAction conditional(String name, Function<IAction, Boolean> condition, Consumer<IAction> task, Function<IAction, Boolean> terminateWhen) {
|
||||
return conditional(manager.create(name, condition, task, terminateWhen));
|
||||
}
|
||||
|
||||
@Override
|
||||
public IConditionalAction conditional(Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination) {
|
||||
public IConditionalAction conditional(Function<IAction, Boolean> condition, Consumer<IAction> task, Function<IAction, Boolean> terminateWhen, Consumer<IAction> onTermination) {
|
||||
return conditional(manager.create(condition, task, terminateWhen, onTermination));
|
||||
}
|
||||
|
||||
@Override
|
||||
public IConditionalAction conditional(String name, Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination) {
|
||||
public IConditionalAction conditional(String name, Function<IAction, Boolean> condition, Consumer<IAction> task, Function<IAction, Boolean> terminateWhen, Consumer<IAction> onTermination) {
|
||||
return conditional(manager.create(name, condition, task, terminateWhen, onTermination));
|
||||
}
|
||||
|
||||
|
||||
@@ -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<Boolean> pauseUntil;
|
||||
private Function<IAction, Boolean> 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<Boolean> until) {
|
||||
public void pauseUntil(Function<IAction, Boolean> 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))
|
||||
|
||||
@@ -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<Boolean> condition;
|
||||
private Supplier<Boolean> terminateWhen;
|
||||
private Function<IAction, Boolean> condition;
|
||||
private Function<IAction, Boolean> terminateWhen;
|
||||
private Consumer<IAction> onTermination;
|
||||
private int maxChecks = -1;
|
||||
private int checkCount;
|
||||
private boolean taskExecuted;
|
||||
|
||||
public ConditionalAction(ScriptedActionManager manager, Supplier<Boolean> condition, Consumer<IAction> task) {
|
||||
public ConditionalAction(ScriptedActionManager manager, Function<IAction, Boolean> condition, Consumer<IAction> task) {
|
||||
super(manager, "conditional", task);
|
||||
this.condition = condition;
|
||||
}
|
||||
|
||||
public ConditionalAction(ScriptedActionManager manager, String name, Supplier<Boolean> condition, Consumer<IAction> task) {
|
||||
public ConditionalAction(ScriptedActionManager manager, String name, Function<IAction, Boolean> condition, Consumer<IAction> task) {
|
||||
super(manager, name, task);
|
||||
this.condition = condition;
|
||||
}
|
||||
|
||||
public ConditionalAction(ScriptedActionManager manager, Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
|
||||
public ConditionalAction(ScriptedActionManager manager, Function<IAction, Boolean> condition, Consumer<IAction> task, Function<IAction, Boolean> terminateWhen) {
|
||||
this(manager, condition, task);
|
||||
this.terminateWhen = terminateWhen;
|
||||
}
|
||||
|
||||
public ConditionalAction(ScriptedActionManager manager, String name, Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
|
||||
public ConditionalAction(ScriptedActionManager manager, String name, Function<IAction, Boolean> condition, Consumer<IAction> task, Function<IAction, Boolean> terminateWhen) {
|
||||
this(manager, name, condition, task);
|
||||
this.terminateWhen = terminateWhen;
|
||||
}
|
||||
|
||||
public ConditionalAction(ScriptedActionManager manager, Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination) {
|
||||
public ConditionalAction(ScriptedActionManager manager, Function<IAction, Boolean> condition, Consumer<IAction> task, Function<IAction, Boolean> terminateWhen, Consumer<IAction> onTermination) {
|
||||
this(manager, condition, task, terminateWhen);
|
||||
this.onTermination = onTermination;
|
||||
}
|
||||
|
||||
public ConditionalAction(ScriptedActionManager manager, String name, Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination) {
|
||||
public ConditionalAction(ScriptedActionManager manager, String name, Function<IAction, Boolean> condition, Consumer<IAction> task, Function<IAction, Boolean> terminateWhen, Consumer<IAction> 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<Boolean> condition) {
|
||||
public IConditionalAction setCondition(Function<IAction, Boolean> condition) {
|
||||
this.condition = condition;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IConditionalAction terminateWhen(Supplier<Boolean> terminateWhen) {
|
||||
public IConditionalAction terminateWhen(Function<IAction, Boolean> terminateWhen) {
|
||||
this.terminateWhen = terminateWhen;
|
||||
return this;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user