mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-18 09:09:08 +00:00
ActionManager refactor + more features
This commit is contained in:
1 parent
624fd4e49e
commit
61cff33f13
1 file changed
+41
-19
@@ -1,6 +1,5 @@
|
||||
package noppes.npcs.scripted;
|
||||
|
||||
|
||||
import noppes.npcs.api.handler.IActionManager;
|
||||
import noppes.npcs.api.handler.data.IAction;
|
||||
|
||||
@@ -14,7 +13,7 @@ public class ScriptedActionManager implements IActionManager {
|
||||
private final Queue<IAction> actionQueue = new LinkedList<>();
|
||||
|
||||
@Override
|
||||
public IAction createAction(String name, int maxDuration, int startAfterTicks, Consumer<IAction> action) {
|
||||
public IAction create(String name, int maxDuration, int startAfterTicks, Consumer<IAction> action) {
|
||||
return new CustomAction(name, maxDuration, startAfterTicks, action);
|
||||
}
|
||||
|
||||
@@ -29,29 +28,22 @@ public class ScriptedActionManager implements IActionManager {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addScheduledAction(IAction action) {
|
||||
public void scheduleAction(IAction action) {
|
||||
actionQueue.add(action);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addScheduledAction(String name, int maxDuration, int startAfterTicks, Consumer<IAction> action) {
|
||||
addScheduledAction(createAction(name, maxDuration, startAfterTicks, action));
|
||||
public void scheduleAction(String name, int maxDuration, int startAfterTicks, Consumer<IAction> action) {
|
||||
scheduleAction(create(name, maxDuration, startAfterTicks, action));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addScheduledActionAt(int index, IAction action) {
|
||||
public void scheduleActionAt(int index, IAction action) {
|
||||
((LinkedList) actionQueue).add(index, action);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void scheduleActionAfter(IAction after, IAction toSchedule) {
|
||||
int index = getActionIndex(after);
|
||||
if (index != -1)
|
||||
addScheduledActionAt(index + 1, toSchedule);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getActionIndex(IAction action) {
|
||||
public int getIndex(IAction action) {
|
||||
if (action == null)
|
||||
return -1;
|
||||
return ((LinkedList) actionQueue).indexOf(action);
|
||||
@@ -141,8 +133,8 @@ public class ScriptedActionManager implements IActionManager {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setDone(boolean done) {
|
||||
isDone = done;
|
||||
public void markDone() {
|
||||
isDone = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -177,12 +169,42 @@ public class ScriptedActionManager implements IActionManager {
|
||||
|
||||
@Override
|
||||
public IAction create(String name, int maxDuration, int startAfterTicks, Consumer<IAction> action) {
|
||||
return createAction(name, maxDuration, startAfterTicks, action);
|
||||
return ScriptedActionManager.this.create(name, maxDuration, startAfterTicks, action);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void scheduleAfter(IAction action) {
|
||||
scheduleActionAfter(this, action);
|
||||
public IAction getNext() {
|
||||
int index = getIndex(this);
|
||||
if (index != -1 && index + 1 < actionQueue.size())
|
||||
return ((LinkedList<IAction>) actionQueue).get(index + 1);
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IAction getPrevious() {
|
||||
int index = getIndex(this);
|
||||
|
||||
if (index == 0)
|
||||
return null;
|
||||
else if (index != -1)
|
||||
return ((LinkedList<IAction>) actionQueue).get(index - 1);
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void scheduleAfter(IAction after) {
|
||||
int index = getIndex(this);
|
||||
if (index != -1)
|
||||
scheduleActionAt(index + 1, after);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void scheduleBefore(IAction before) {
|
||||
int index = getIndex(this);
|
||||
if (index != -1)
|
||||
scheduleActionAt(index == 0 ? 0 : index - 1, before);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user