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

@@ -22,6 +22,7 @@ import noppes.npcs.constants.EnumRoleType;
import noppes.npcs.controllers.CustomEffectController;
import noppes.npcs.controllers.PartyController;
import noppes.npcs.controllers.PlayerDataController;
import noppes.npcs.controllers.data.action.ActionManager;
import noppes.npcs.entity.EntityCustomNpc;
import noppes.npcs.entity.EntityNPCInterface;
import noppes.npcs.entity.data.DataSkinOverlays;
@@ -29,7 +30,6 @@ import noppes.npcs.entity.data.DataTimers;
import noppes.npcs.roles.RoleCompanion;
import noppes.npcs.scripted.NpcAPI;
import noppes.npcs.scripted.ScreenSize;
import noppes.npcs.scripted.ScriptedActionManager;
import noppes.npcs.util.CustomNPCsThreader;
import noppes.npcs.util.NBTJsonUtil;
@@ -52,7 +52,7 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData {
public DataSkinOverlays skinOverlays = new DataSkinOverlays(this);
public MagicData magicData = new MagicData();
public ScriptedActionManager actionManager = new ScriptedActionManager();
public ActionManager actionManager = new ActionManager();
public PlayerDataScript scriptData;
public EntityNPCInterface editingNpc;
@@ -4,7 +4,6 @@ import noppes.npcs.api.handler.data.IAction;
import noppes.npcs.api.handler.data.actions.IConditionalAction;
import noppes.npcs.controllers.ScriptContainer;
import noppes.npcs.scripted.CustomNPCsException;
import noppes.npcs.scripted.ScriptedActionManager;
import org.apache.commons.lang3.exception.ExceptionUtils;
import java.util.HashMap;
@@ -13,7 +12,7 @@ import java.util.function.Consumer;
import java.util.function.Function;
public class Action implements IAction {
protected final ScriptedActionManager manager;
protected final ActionManager manager;
protected final String name;
protected int startAfterTicks;
protected int count, maxCount = -1;
@@ -27,7 +26,7 @@ public class Action implements IAction {
protected ScriptContainer reportTo;
public Action(ScriptedActionManager manager, String name) {
public Action(ActionManager manager, String name) {
this.manager = manager;
this.name = name;
@@ -35,31 +34,31 @@ public class Action implements IAction {
reportTo = ScriptContainer.Current;
}
public Action(ScriptedActionManager manager, Consumer<IAction> task) {
public Action(ActionManager manager, Consumer<IAction> task) {
this(manager, task.toString(), task);
}
public Action(ScriptedActionManager manager, String name, Consumer<IAction> task) {
public Action(ActionManager manager, String name, Consumer<IAction> task) {
this(manager, name);
this.task = task;
}
public Action(ScriptedActionManager manager, int startAfterTicks, Consumer<IAction> task) {
public Action(ActionManager manager, int startAfterTicks, Consumer<IAction> task) {
this(manager, task);
this.startAfterTicks = startAfterTicks;
}
public Action(ScriptedActionManager manager, String name, int startAfterTicks, Consumer<IAction> task) {
public Action(ActionManager manager, String name, int startAfterTicks, Consumer<IAction> task) {
this(manager, name, task);
this.startAfterTicks = startAfterTicks;
}
public Action(ScriptedActionManager manager, int maxDuration, int startAfterTicks, Consumer<IAction> task) {
public Action(ActionManager manager, int maxDuration, int startAfterTicks, Consumer<IAction> task) {
this(manager, startAfterTicks, task);
this.maxDuration = maxDuration;
}
public Action(ScriptedActionManager manager, String name, int maxDuration, int startAfterTicks, Consumer<IAction> task) {
public Action(ActionManager manager, String name, int maxDuration, int startAfterTicks, Consumer<IAction> task) {
this(manager, name, startAfterTicks, task);
this.maxDuration = maxDuration;
}
@@ -113,7 +112,7 @@ public class Action implements IAction {
}
@Override
public ScriptedActionManager getManager() {
public ActionManager getManager() {
return manager;
}
@@ -2,7 +2,6 @@ package noppes.npcs.controllers.data.action;
import noppes.npcs.api.handler.data.IAction;
import noppes.npcs.api.handler.data.IActionChain;
import noppes.npcs.scripted.ScriptedActionManager;
import java.util.function.Consumer;
@@ -10,11 +9,11 @@ import java.util.function.Consumer;
* helper to build a back‐to‐back chain of one‐shot actions
*/
public class ActionChain implements IActionChain {
protected final ScriptedActionManager manager;
protected final ActionManager manager;
protected String defaultName = "sequential#";
protected int index = 0;
public ActionChain(ScriptedActionManager manager) {
public ActionChain(ActionManager manager) {
this.manager = manager;
}
@@ -0,0 +1,395 @@
package noppes.npcs.controllers.data.action;
import noppes.npcs.api.handler.IActionManager;
import noppes.npcs.api.handler.data.IAction;
import noppes.npcs.api.handler.data.IActionChain;
import noppes.npcs.api.handler.data.actions.IConditionalAction;
import java.util.*;
import java.util.concurrent.ConcurrentLinkedDeque;
import java.util.function.Consumer;
import java.util.function.Function;
/**
* Full-featured ActionManager:
* - delayed start, max-duration, tick-interval
* - chaining (getNext, getPrevious, scheduleAfter/Before)
* - per-action data
* - conditional actions
* - cancellation & clearing
*/
public class ActionManager implements IActionManager {
private boolean isWorking = false;
private final Deque<IAction> actionQueue = new ConcurrentLinkedDeque<>();
private final Deque<IAction> parallelActions = new ConcurrentLinkedDeque<>();
private final Deque<IConditionalAction> conditionalActions = new ConcurrentLinkedDeque<>();
@Override
public IAction create(String name) {
return new Action(this, name);
}
@Override
public IAction create(Consumer<IAction> t) {
return new Action(this, t);
}
@Override
public IAction create(int maxDuration, int delay, Consumer<IAction> task) {
return new Action(this, maxDuration, delay, task);
}
@Override
public IAction create(String name, int maxDuration, int delay, Consumer<IAction> task) {
return new Action(this, name, maxDuration, delay, task);
}
@Override
public IAction create(String name, int delay, Consumer<IAction> t) {
return new Action(this, name, delay, t);
}
@Override
public IAction create(int delay, Consumer<IAction> t) {
return new Action(this, delay, t);
}
@Override
public IAction create(String name, Consumer<IAction> t) {
return new Action(this, name, t);
}
@Override
public IConditionalAction create(Function<IAction,Boolean> condition, Consumer<IAction> task) {
return new ConditionalAction(this, condition, task);
}
@Override
public IConditionalAction create(String name,Function<IAction,Boolean> condition, Consumer<IAction> task) {
return new ConditionalAction(this, name, condition, task);
}
@Override
public IConditionalAction create(Function<IAction,Boolean> condition, Consumer<IAction> task,Function<IAction,Boolean> terminateWhen) {
return new ConditionalAction(this, condition, task, terminateWhen);
}
@Override
public IConditionalAction create(String name,Function<IAction,Boolean> condition, Consumer<IAction> task,Function<IAction,Boolean> terminateWhen) {
return new ConditionalAction(this, name, condition, task, terminateWhen);
}
@Override
public IConditionalAction create(Function<IAction,Boolean> condition, Consumer<IAction> task,Function<IAction,Boolean> terminateWhen, Consumer<IAction> onTermination) {
return new ConditionalAction(this, condition, task, terminateWhen, onTermination);
}
@Override
public IConditionalAction create(String name,Function<IAction,Boolean> condition, Consumer<IAction> task,Function<IAction,Boolean> terminateWhen, Consumer<IAction> onTermination) {
return new ConditionalAction(this, name, condition, task, terminateWhen, onTermination);
}
@Override
public void start() {
isWorking = true;
}
@Override
public void stop() {
isWorking = false;
}
@Override
public IAction schedule(IAction action) {
actionQueue.addLast(action);
return action;
}
@Override
public IAction schedule(Consumer<IAction> task) {
return schedule(create(task));
}
@Override
public IAction schedule(int delay, Consumer<IAction> task) {
return schedule(create(delay, task));
}
@Override
public IAction schedule(int maxDuration, int delay, Consumer<IAction> task) {
return schedule(create(maxDuration, delay, task));
}
@Override
public IAction schedule(String name, Consumer<IAction> task) {
return schedule(create(name, task));
}
@Override
public IAction schedule(String name, int delay, Consumer<IAction> task) {
return schedule(create(name, delay, task));
}
@Override
public IAction schedule(String name, int maxDuration, int delay, Consumer<IAction> task) {
return schedule(create(name, maxDuration, delay, task));
}
@Override
public IAction scheduleActionAt(int index, IAction action) {
int size = actionQueue.size();
if (index <= 0) {
actionQueue.addFirst(action);
} else if (index >= size) {
actionQueue.addLast(action);
} else {
List<IAction> tmp = new ArrayList<>(actionQueue);
tmp.add(index, action);
actionQueue.clear();
actionQueue.addAll(tmp);
}
return action;
}
@Override
public int getIndex(IAction action) {
int i = 0;
for (IAction a : actionQueue) {
if (a.equals(action)) return i;
i++;
}
return -1;
}
@Override
public IAction getCurrentAction() {
return actionQueue.peekFirst();
}
@Override
public IAction getAction(String name) {
for (IAction action : actionQueue) {
if (action.getName().equals(name))
return action;
}
for (IAction action : parallelActions) {
if (action.getName().equals(name))
return action;
}
for (IAction action : conditionalActions) {
if (action.getName().equals(name))
return action;
}
return null;
}
@Override
public Queue<IAction> getActionQueue() {
return actionQueue;
}
@Override
public boolean hasAction(String name) {
for (IAction act : actionQueue)
if (act.getName().equals(name))
return true;
return false;
}
@Override
public boolean hasAny(String name) {
if (hasAction(name))
return true;
else if (hasParallel(name))
return true;
else if (hasConditional(name))
return true;
return false;
}
///////////////////////////////////////////////////
///////////////////////////////////////////////////
// Conditionals
@Override
public IConditionalAction schedule(Function<IAction,Boolean> condition, Consumer<IAction> task) {
return schedule(new ConditionalAction(this, condition, task));
}
@Override
public IConditionalAction schedule(Function<IAction,Boolean> condition, Consumer<IAction> task, Function<IAction,Boolean> terminateWhen) {
return schedule(new ConditionalAction(this, condition, task, terminateWhen));
}
@Override
public IConditionalAction schedule(Function<IAction,Boolean> condition, Consumer<IAction> task, Function<IAction,Boolean> terminateWhen, Consumer<IAction> onTermination) {
return schedule(new ConditionalAction(this, condition, task, terminateWhen, onTermination));
}
@Override
public IConditionalAction schedule(String name, Function<IAction,Boolean> condition, Consumer<IAction> task) {
return schedule(new ConditionalAction(this, name, condition, task));
}
@Override
public IConditionalAction schedule(String name, Function<IAction,Boolean> condition, Consumer<IAction> task, Function<IAction,Boolean> terminateWhen) {
return schedule(new ConditionalAction(this, name, condition, task, terminateWhen));
}
@Override
public IConditionalAction schedule(String name, Function<IAction,Boolean> condition, Consumer<IAction> task, Function<IAction,Boolean> terminateWhen, Consumer<IAction> onTermination) {
return schedule(new ConditionalAction(this, name, condition, task, terminateWhen, onTermination));
}
@Override
public IConditionalAction schedule(IConditionalAction action) {
conditionalActions.add(action);
return action;
}
@Override
public List<IConditionalAction> getConditionalActions() {
return new ArrayList<>(conditionalActions);
}
@Override
public boolean hasConditional(String name) {
for (IAction act : conditionalActions)
if (act.getName().equals(name))
return true;
return false;
}
@Override
public IAction scheduleParallel(IAction action) {
parallelActions.add(action);
return action;
}
@Override
public IAction scheduleParallel(String name, Consumer<IAction> task) {
return scheduleParallel(create(name, task));
}
@Override
public IAction scheduleParallel(String name, int delay, Consumer<IAction> task) {
return scheduleParallel(create(name, delay, task));
}
@Override
public IAction scheduleParallel(String name, int maxDuration, int delay, Consumer<IAction> task) {
return scheduleParallel(create(name, maxDuration, delay, task));
}
/**
* Call once per tick from your main loop.
*
* @param ticksExisted the global tick count, used for modulo checks.
*/
public void tick(int ticksExisted) {
if (!isWorking) return;
// ─── Sequential (head only) ─────────────────────────────────
IAction current = getCurrentAction();
if (current instanceof Action) {
Action cab = (Action) current;
cab.tick(ticksExisted);
if (cab.isDone()) {
cab.kill();
actionQueue.pollFirst();
}
}
// ─── Parallel (all) ───────────────────────────────────────
Iterator<IAction> pit = parallelActions.iterator();
while (pit.hasNext()) {
Action a = (Action) pit.next();
a.tick(ticksExisted);
if (a.isDone()) {
a.kill();
pit.remove();
}
}
// ─── Conditionals ─────────────────────────────────────────
Iterator<IConditionalAction> cit = conditionalActions.iterator();
while (cit.hasNext()) {
ConditionalAction con = (ConditionalAction) cit.next();
con.tick(ticksExisted);
if (con.isDone()) {
con.kill();
cit.remove();
}
}
}
@Override
public void clear() {
actionQueue.forEach((act) -> act.kill());
actionQueue.clear();
parallelActions.forEach((act) -> act.kill());
parallelActions.clear();
conditionalActions.forEach((act) -> act.kill());
conditionalActions.clear();
}
@Override
public boolean cancelAction(String name) {
Iterator<IAction> acts = actionQueue.iterator();
while (acts.hasNext()) {
IAction act = acts.next();
if (act.getName().equals(name)) {
acts.remove();
return true;
}
}
Iterator<IAction> pit = parallelActions.iterator();
while (pit.hasNext()) {
if (pit.next().getName().equals(name)) {
pit.remove();
return true;
}
}
Iterator<IConditionalAction> cons = conditionalActions.iterator();
while (cons.hasNext()) {
IConditionalAction con = cons.next();
if (con.getName().equals(name)) {
cons.remove();
return true;
}
}
return false;
}
@Override
public IActionChain chain() {
return new ActionChain(this);
}
@Override
public IActionChain parallelChain() {
return new ParallelActionChain(this);
}
@Override
public Queue<IAction> getParallelActions() {
return parallelActions;
}
@Override
public boolean hasParallel(String name) {
for (IAction act : parallelActions)
if (act.getName().equals(name))
return true;
return false;
}
}
@@ -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;
}
@@ -2,14 +2,13 @@ package noppes.npcs.controllers.data.action;
import noppes.npcs.api.handler.data.IAction;
import noppes.npcs.api.handler.data.IActionChain;
import noppes.npcs.scripted.ScriptedActionManager;
import java.util.function.Consumer;
public class ParallelActionChain extends ActionChain implements IActionChain {
private int offset;
public ParallelActionChain(ScriptedActionManager manager) {
public ParallelActionChain(ActionManager manager) {
super(manager);
defaultName = "parallel#";
}