diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index bebb138e7..8c12da222 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -67,6 +67,16 @@ public class Action implements IAction { this.maxDuration = maxDuration; } + @Override + public ActionManager getManager() { + return manager; + } + + @Override + public String getName() { + return name; + } + @Override public IActionQueue getQueue() { return queue; @@ -85,14 +95,117 @@ public class Action implements IAction { return this; } + @Override + public boolean isScheduled() { + return isScheduled; + } + @Override public IAction setTask(Consumer task) { this.task = task; return this; } + @Override + public int getDuration() { + return duration; + } + + + @Override + public int getMaxDuration() { + return maxDuration; + } + + @Override + public IAction setMaxDuration(int ticks) { + this.maxDuration = Math.max(-1, ticks); + return this; + } + + @Override + public int getStartAfterTicks() { + return startAfterTicks; + } + + @Override + public int getUpdateEvery() { + return updateEveryXTick; + } + + @Override + public IAction updateEvery(int x) { + this.updateEveryXTick = Math.max(1, x); + return this; + } + + @Override + public int getCount() { + return count; + } + + @Override + public int getMaxCount() { + return maxCount; + } + + @Override + public IAction times(int n) { + this.maxCount = Math.max(-1, n); + return this; + } + + @Override + public IAction once() { + this.maxCount = 1; + return this; + } + + @Override + public Object getData(String key) { + return dataStore.get(key); + } + + @Override + public IAction setData(String key, Object v) { + dataStore.put(key, v); + return this; + } + + @Override + public IAction removeData(String key) { + dataStore.remove(key); + return this; + } + + @Override + public boolean hasData(String key) { + return dataStore.containsKey(key); + } + + @Override + public void markDone() { + done = true; + } + + @Override + public boolean isDone() { + return done; + } + + /////////////////////////////////////////////////// + ////////////////////////////////////////////////// + // Handling + + @Override + public IAction start() { + manager.start(); + return this; + } + public void tick(int ticksExisted) { - if (done) return; + if (done) + return; if (startAfterTicks > 0) { startAfterTicks--; return; @@ -130,70 +243,6 @@ public class Action implements IAction { } } - @Override - public ActionManager getManager() { - return manager; - } - - @Override - public boolean isScheduled() { - return isScheduled; - } - - - @Override - public int getCount() { - return count; - } - - @Override - public int getDuration() { - return duration; - } - - @Override - public String getName() { - return name; - } - - @Override - public int getMaxDuration() { - return maxDuration; - } - - @Override - public IAction setMaxDuration(int ticks) { - this.maxDuration = Math.max(-1, ticks); - return this; - } - - @Override - public int getMaxCount() { - return maxCount; - } - - @Override - public IAction times(int n) { - this.maxCount = Math.max(-1, n); - return this; - } - - @Override - public IAction once() { - this.maxCount = 1; - return this; - } - - @Override - public void markDone() { - done = true; - } - - @Override - public boolean isDone() { - return done; - } - @Override public void kill() { if (actionThread != null) @@ -204,42 +253,32 @@ public class Action implements IAction { done = true; } - @Override - public Object getData(String key) { - return dataStore.get(key); - } + /////////////////////////////////////////////////// + ////////////////////////////////////////////////// + // Thread @Override - public IAction setData(String key, Object v) { - dataStore.put(key, v); + public IAction threadify() { + if (!isThreaded) { + isThreaded = true; + actionThread = new ActionThread(this); + } + return this; } @Override - public IAction removeData(String key) { - dataStore.remove(key); - return this; + public void resume() { + if (isThreaded) + actionThread.resume(); } @Override - public boolean hasData(String key) { - return dataStore.containsKey(key); - } - - @Override - public int getUpdateEvery() { - return updateEveryXTick; - } - - @Override - public IAction updateEvery(int x) { - this.updateEveryXTick = Math.max(1, x); - return this; - } - - @Override - public int getStartAfterTicks() { - return startAfterTicks; + public void pause() { + if (isThreaded) + actionThread.pause(); + else + throw new CustomNPCsException("Must threadify() IAction before pausing!"); } @Override @@ -262,14 +301,6 @@ public class Action implements IAction { return pauseFor((int) (millis / 50)); } - @Override - public void pause() { - if (isThreaded) - actionThread.pause(); - else - throw new CustomNPCsException("Must threadify() IAction before pausing!"); - } - @Override public void pauseUntil(Function until) { if (isThreaded) @@ -278,12 +309,6 @@ public class Action implements IAction { throw new CustomNPCsException("Must threadify() IAction before pausing!"); } - @Override - public void resume() { - if (isThreaded) - actionThread.resume(); - } - @Override public boolean isPaused() { if (isThreaded) @@ -292,23 +317,6 @@ public class Action implements IAction { return startAfterTicks > 0; } - @Override - public IAction threadify() { - if (!isThreaded) { - isThreaded = true; - actionThread = new ActionThread(this); - } - - return this; - } - - @Override - public IAction start() { - manager.start(); - return this; - } - - /////////////////////////////////////////////////// /////////////////////////////////////////////////// // Sequential @@ -494,46 +502,6 @@ public class Action implements IAction { return manager.schedule(after); } - /////////////////////////////////////////////////// - /////////////////////////////////////////////////// - // Conditionals - - @Override - public void conditional(IConditionalAction... actions) { - for (IConditionalAction act : actions) - conditional(act); - } - - @Override - public IConditionalAction conditional(Function condition, Consumer task) { - return conditional(manager.create(condition, task)); - } - - @Override - public IConditionalAction conditional(String name, Function condition, Consumer task) { - return conditional(manager.create(name, condition, task)); - } - - @Override - public IConditionalAction conditional(Function condition, Consumer task, Function terminateWhen) { - return conditional(manager.create(condition, task, terminateWhen)); - } - - @Override - public IConditionalAction conditional(String name, Function condition, Consumer task, Function terminateWhen) { - return conditional(manager.create(name, condition, task, terminateWhen)); - } - - @Override - public IConditionalAction conditional(Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { - return conditional(manager.create(condition, task, terminateWhen, onTermination)); - } - - @Override - public IConditionalAction conditional(String name, Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { - return conditional(manager.create(name, condition, task, terminateWhen, onTermination)); - } - /////////////////////////////////////////////////// /////////////////////////////////////////////////// // Parallels @@ -581,4 +549,45 @@ public class Action implements IAction { public IAction parallel(String name, int maxDuration, int delay, Consumer t) { return parallel(manager.create(name, maxDuration, delay, t)); } + + /////////////////////////////////////////////////// + /////////////////////////////////////////////////// + // Conditionals + + @Override + public void conditional(IConditionalAction... actions) { + for (IConditionalAction act : actions) + conditional(act); + } + + @Override + public IConditionalAction conditional(Function condition, Consumer task) { + return conditional(manager.create(condition, task)); + } + + @Override + public IConditionalAction conditional(String name, Function condition, Consumer task) { + return conditional(manager.create(name, condition, task)); + } + + @Override + public IConditionalAction conditional(Function condition, Consumer task, Function terminateWhen) { + return conditional(manager.create(condition, task, terminateWhen)); + } + + @Override + public IConditionalAction conditional(String name, Function condition, Consumer task, Function terminateWhen) { + return conditional(manager.create(name, condition, task, terminateWhen)); + } + + @Override + public IConditionalAction conditional(Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { + return conditional(manager.create(condition, task, terminateWhen, onTermination)); + } + + @Override + public IConditionalAction conditional(String name, Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { + return conditional(manager.create(name, condition, task, terminateWhen, onTermination)); + } + } diff --git a/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java index c7be5b407..b2e81d344 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java +++ b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java @@ -48,6 +48,50 @@ public class ConditionalAction extends Action implements IConditionalAction { this.onTermination = onTermination; } + @Override + public int getCheckCount() { + return checkCount; + } + + @Override + public int getMaxChecks() { + return maxChecks; + } + + @Override + public IConditionalAction setMaxChecks(int maxChecks) { + this.maxChecks = Math.max(-1, maxChecks); + return this; + } + + @Override + public IConditionalAction setCondition(Function condition) { + this.condition = condition; + return this; + } + + @Override + public IConditionalAction terminateWhen(Function terminateWhen) { + this.terminateWhen = terminateWhen; + return this; + } + + @Override + public IConditionalAction onTermination(Consumer onTermination) { + this.onTermination = onTermination; + return this; + } + + @Override + public boolean wasTaskExecuted() { + return taskExecuted; + } + + @Override + public boolean isTerminated() { + return terminateWhen != null && terminateWhen.apply(this); + } + @Override public void tick(int ticksExisted) { if (done) @@ -115,48 +159,4 @@ public class ConditionalAction extends Action implements IConditionalAction { } } - @Override - public boolean isTerminated() { - return terminateWhen != null && terminateWhen.apply(this); - } - - @Override - public IConditionalAction setMaxChecks(int maxChecks) { - this.maxChecks = Math.max(-1, maxChecks); - return this; - } - - @Override - public IConditionalAction setCondition(Function condition) { - this.condition = condition; - return this; - } - - @Override - public IConditionalAction terminateWhen(Function terminateWhen) { - this.terminateWhen = terminateWhen; - return this; - } - - @Override - public IConditionalAction onTermination(Consumer onTermination) { - this.onTermination = onTermination; - return this; - } - - @Override - public boolean wasTaskExecuted() { - return taskExecuted; - } - - @Override - public int getCheckCount() { - return checkCount; - } - - @Override - public int getMaxChecks() { - return maxChecks; - } - }