mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-19 15:29:10 +00:00
Overhauled IActionChain
This commit is contained in:
1 parent
c976b488f1
commit
c10b37f01d
5 files changed
+47
-46
No files matched your search
@@ -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();
|
||||
}
|
||||
}
|
||||
@@ -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#");
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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<IAction> 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<IAction> 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<IAction> 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<IAction> task) {
|
||||
return after(delay, name + index, task);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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<IAction> task) {
|
||||
offset += delay;
|
||||
manager.scheduleParallel(name, offset, task).updateEvery(1).once();
|
||||
index++;
|
||||
return this;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user