Refactored ScriptedActionManager to ActionManager, moved to same package as Actions

This commit is contained in:
bigguy345 committed 2025-06-30 18:13:31 +03:00
1 parent 2bb1df968b
commit 7ea05e4ecc
8 files changed
+27 -37

No files matched your search

@@ -2,7 +2,6 @@ package noppes.npcs.controllers.data.action;
import noppes.npcs.api.handler.data.IAction;
import noppes.npcs.api.handler.data.actions.IConditionalAction;
import noppes.npcs.scripted.ScriptedActionManager;
import org.apache.commons.lang3.exception.ExceptionUtils;
import java.util.function.Consumer;
@@ -17,32 +16,32 @@ public class ConditionalAction extends Action implements IConditionalAction {
private int checkCount;
private boolean taskExecuted;
public ConditionalAction(ScriptedActionManager manager, Function<IAction, Boolean> condition, Consumer<IAction> task) {
public ConditionalAction(ActionManager manager, Function<IAction, Boolean> condition, Consumer<IAction> task) {
super(manager, task);
this.condition = condition;
}
public ConditionalAction(ScriptedActionManager manager, String name, Function<IAction, Boolean> condition, Consumer<IAction> task) {
public ConditionalAction(ActionManager manager, String name, Function<IAction, Boolean> condition, Consumer<IAction> task) {
super(manager, name, task);
this.condition = condition;
}
public ConditionalAction(ScriptedActionManager manager, Function<IAction, Boolean> condition, Consumer<IAction> task, Function<IAction, Boolean> terminateWhen) {
public ConditionalAction(ActionManager 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, Function<IAction, Boolean> condition, Consumer<IAction> task, Function<IAction, Boolean> terminateWhen) {
public ConditionalAction(ActionManager 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, Function<IAction, Boolean> condition, Consumer<IAction> task, Function<IAction, Boolean> terminateWhen, Consumer<IAction> onTermination) {
public ConditionalAction(ActionManager 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, Function<IAction, Boolean> condition, Consumer<IAction> task, Function<IAction, Boolean> terminateWhen, Consumer<IAction> onTermination) {
public ConditionalAction(ActionManager 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;
}