diff --git a/src/api b/src/api index 6141ae147..1b96a3dc8 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit 6141ae1472dcd944c3797927c66b1ad4892e2a53 +Subproject commit 1b96a3dc874a4b89ae751f63836a4257d3088d2e diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index 7305551fc..b80f19092 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -6,8 +6,6 @@ import noppes.npcs.api.handler.data.IActionChain; import noppes.npcs.api.handler.data.IActionQueue; import noppes.npcs.api.handler.data.actions.IConditionalAction; import noppes.npcs.controllers.data.action.action.ConditionalAction; -import noppes.npcs.controllers.data.action.chain.ActionChain; -import noppes.npcs.controllers.data.action.chain.ParallelActionChain; import java.util.function.Consumer; import java.util.function.Function; @@ -341,11 +339,11 @@ public class ActionManager implements IActionManager { @Override public IActionChain chain() { - return new ActionChain(this); + return sequentialQueue.chain(); } @Override public IActionChain parallelChain() { - return new ParallelActionChain(this); + return parallelQueue.chain(); } } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java index a1d06089c..cf64c17e4 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java @@ -1,7 +1,9 @@ package noppes.npcs.controllers.data.action; import noppes.npcs.api.handler.data.IAction; +import noppes.npcs.api.handler.data.IActionChain; import noppes.npcs.api.handler.data.IActionQueue; +import noppes.npcs.controllers.data.action.chain.ActionChain; import java.util.*; import java.util.concurrent.ConcurrentLinkedDeque; @@ -233,4 +235,10 @@ public class ActionQueue implements IActionQueue { queue.forEach((act) -> act.kill()); queue.clear(); } + + @Override + public IActionChain chain() { + return new ActionChain(manager, this, isParallel ? "parallel#" : "sequential#"); + } + } diff --git a/src/main/java/noppes/npcs/controllers/data/action/chain/ActionChain.java b/src/main/java/noppes/npcs/controllers/data/action/chain/ActionChain.java index acef1564a..3897f4091 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/chain/ActionChain.java +++ b/src/main/java/noppes/npcs/controllers/data/action/chain/ActionChain.java @@ -2,6 +2,7 @@ package noppes.npcs.controllers.data.action.chain; import noppes.npcs.api.handler.data.IAction; import noppes.npcs.api.handler.data.IActionChain; +import noppes.npcs.api.handler.data.IActionQueue; import noppes.npcs.controllers.data.action.ActionManager; import java.util.function.Consumer; @@ -11,31 +12,52 @@ import java.util.function.Consumer; */ public class ActionChain implements IActionChain { protected final ActionManager manager; - protected String defaultName = "sequential#"; - protected int index = 0; + protected final IActionQueue queue; + protected String name; + protected int index = 0, offset; - public ActionChain(ActionManager manager) { + public ActionChain(ActionManager manager, IActionQueue queue, String name) { this.manager = manager; + this.queue = queue; + this.name = name; } - /** - * schedule the next task ‘delay’ ticks after the previous one - */ @Override - public IActionChain after(int delay, String name, Consumer task) { - manager.schedule(name, delay, task).updateEvery(1).once(); - index++; + public IActionQueue getQueue() { + return queue; + } + + @Override + public String getName() { + return name; + } + + @Override + public IActionChain setName(String name) { + this.name = name; return this; } - @Override - public IActionChain after(int delay, Consumer task) { - return after(delay, defaultName + index, task); - } - @Override public IActionChain start() { manager.start(); return this; } + + /** + * schedule the next task ‘delay’ ticks after the previous one + */ + @Override + public IActionChain after(int delay, String name, Consumer task) { + offset = queue.isParallel() ? offset + delay : delay; + queue.schedule(name, offset, task).updateEvery(1).once(); + index++; + return this; + } + + @Override + public IActionChain after(int delay, Consumer task) { + return after(delay, name + index, task); + } + } diff --git a/src/main/java/noppes/npcs/controllers/data/action/chain/ParallelActionChain.java b/src/main/java/noppes/npcs/controllers/data/action/chain/ParallelActionChain.java deleted file mode 100644 index 88b76e8d4..000000000 --- a/src/main/java/noppes/npcs/controllers/data/action/chain/ParallelActionChain.java +++ /dev/null @@ -1,27 +0,0 @@ -package noppes.npcs.controllers.data.action.chain; - -import noppes.npcs.api.handler.data.IAction; -import noppes.npcs.api.handler.data.IActionChain; -import noppes.npcs.controllers.data.action.ActionManager; - -import java.util.function.Consumer; - -public class ParallelActionChain extends ActionChain implements IActionChain { - private int offset; - - public ParallelActionChain(ActionManager manager) { - super(manager); - defaultName = "parallel#"; - } - - /** - * schedule the next task ‘delay’ ticks after the previous one, fully in parallel - */ - @Override - public IActionChain after(int delay, String name, Consumer task) { - offset += delay; - manager.scheduleParallel(name, offset, task).updateEvery(1).once(); - index++; - return this; - } -}