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;
}
@@ -1,13 +1,9 @@
package noppes.npcs.scripted;
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 noppes.npcs.controllers.data.action.Action;
import noppes.npcs.controllers.data.action.ActionChain;
import noppes.npcs.controllers.data.action.ConditionalAction;
import noppes.npcs.controllers.data.action.ParallelActionChain;
import java.util.*;
import java.util.concurrent.ConcurrentLinkedDeque;
@@ -22,7 +18,7 @@ import java.util.function.Function;
* - conditional actions
* - cancellation & clearing
*/
public class ScriptedActionManager implements IActionManager {
public class ActionManager implements IActionManager {
private boolean isWorking = false;
private final Deque<IAction> actionQueue = new ConcurrentLinkedDeque<>();
@@ -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#";
}
@@ -72,10 +72,10 @@ import noppes.npcs.controllers.FactionController;
import noppes.npcs.controllers.LinkedNpcController;
import noppes.npcs.controllers.LinkedNpcController.LinkedData;
import noppes.npcs.controllers.data.*;
import noppes.npcs.controllers.data.action.ActionManager;
import noppes.npcs.entity.data.DataTimers;
import noppes.npcs.roles.*;
import noppes.npcs.scripted.NpcAPI;
import noppes.npcs.scripted.ScriptedActionManager;
import noppes.npcs.scripted.entity.ScriptNpc;
import noppes.npcs.scripted.event.NpcEvent;
import noppes.npcs.util.GameProfileAlt;
@@ -98,7 +98,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
public DataTimers timers;
public CombatHandler combatHandler = new CombatHandler(this);
public ScriptedActionManager actionManager = new ScriptedActionManager();
public ActionManager actionManager = new ActionManager();
public String linkedName = "";
public long linkedLast = 0;
@@ -51,10 +51,8 @@ import noppes.npcs.config.ConfigScript;
import noppes.npcs.constants.EnumAnimationPart;
import noppes.npcs.containers.ContainerNpcInterface;
import noppes.npcs.controllers.*;
import noppes.npcs.controllers.data.Animation;
import noppes.npcs.controllers.data.Frame;
import noppes.npcs.controllers.data.FramePart;
import noppes.npcs.controllers.data.SkinOverlay;
import noppes.npcs.controllers.data.*;
import noppes.npcs.controllers.data.action.ActionManager;
import noppes.npcs.entity.EntityCustomNpc;
import noppes.npcs.entity.EntityNPCInterface;
import noppes.npcs.entity.EntityProjectile;
@@ -79,7 +77,7 @@ public class NpcAPI extends AbstractNpcAPI {
private static final CacheHashMap<ItemStack, CacheHashMap.CachedObject<ScriptItemStack>> scriptItemCache = new CacheHashMap<>(60 * 1000);
public static final HashMap<String, Object> engineObjects = new HashMap<>();
public static final EventBus EVENT_BUS = new EventBus();
public static final ScriptedActionManager actionManager = new ScriptedActionManager();
public static final ActionManager actionManager = new ActionManager();
private static AbstractNpcAPI instance = null;
private final static String API_USER_AGENT = "CNPC+API";