INFINITE OVERLOADS !!!!!

This commit is contained in:
bigguy345 committed 2025-06-30 07:15:34 +03:00
1 parent f86db24def
commit 74198534af
4 files changed
+97 -66

No files matched your search

@@ -1,6 +1,7 @@
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.CustomNPCsException;
import noppes.npcs.scripted.ScriptedActionManager;
@@ -55,6 +56,11 @@ public class Action implements IAction {
this.startAfterTicks = startAfterTicks;
}
public Action(ScriptedActionManager manager, int maxDuration, int startAfterTicks, Consumer<IAction> task) {
this(manager, startAfterTicks, task);
this.maxDuration = maxDuration;
}
@Override
public IAction setTask(Consumer<IAction> task) {
this.task = task;
@@ -268,37 +274,6 @@ public class Action implements IAction {
return null;
}
@Override
public IAction parallel(IAction after) {
return manager.scheduleParallelAction(after);
}
@Override
public IAction parallel(Consumer<IAction> task) {
return parallel(manager.create(task));
}
@Override
public IAction parallel(int delay, Consumer<IAction> task) {
return parallel(manager.create(delay, task));
}
@Override
public IAction parallel(String name, Consumer<IAction> task) {
return parallel(manager.create(name, task));
}
@Override
public IAction parallel(String name, int startAfterTicks, Consumer<IAction> task) {
return parallel(manager.create(name, startAfterTicks, task));
}
@Override
public IAction parallel(String name, int maxDuration, int delay, Consumer<IAction> t) {
return parallel(manager.create(name, maxDuration, delay, t));
}
@Override
public IAction after(IAction after) {
int idx = manager.getIndex(this);
@@ -362,4 +337,69 @@ public class Action implements IAction {
public IAction before(Consumer<IAction> t) {
return before(manager.create(t));
}
@Override
public IConditionalAction conditional(IConditionalAction after) {
return manager.scheduleAction(after);
}
@Override
public IConditionalAction conditional(Supplier<Boolean> condition, Consumer<IAction> task) {
return conditional(manager.create(condition, task));
}
@Override
public IConditionalAction conditional(String name, Supplier<Boolean> condition, Consumer<IAction> task) {
return conditional(manager.create(name, condition, task));
}
@Override
public IConditionalAction conditional(Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
return conditional(manager.create(condition, task, terminateWhen));
}
@Override
public IConditionalAction conditional(String name, Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
return conditional(manager.create(name, condition, task, terminateWhen));
}
@Override
public IConditionalAction conditional(Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination) {
return conditional(manager.create(condition, task, terminateWhen, onTermination));
}
@Override
public IConditionalAction conditional(String name, Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination) {
return conditional(manager.create(name, condition, task, terminateWhen, onTermination));
}
@Override
public IAction parallel(IAction after) {
return manager.scheduleParallelAction(after);
}
@Override
public IAction parallel(Consumer<IAction> task) {
return parallel(manager.create(task));
}
@Override
public IAction parallel(int delay, Consumer<IAction> task) {
return parallel(manager.create(delay, task));
}
@Override
public IAction parallel(String name, Consumer<IAction> task) {
return parallel(manager.create(name, task));
}
@Override
public IAction parallel(String name, int startAfterTicks, Consumer<IAction> task) {
return parallel(manager.create(name, startAfterTicks, task));
}
@Override
public IAction parallel(String name, int maxDuration, int delay, Consumer<IAction> t) {
return parallel(manager.create(name, maxDuration, delay, t));
}
}
@@ -144,38 +144,4 @@ public class ConditionalAction extends Action implements IConditionalAction {
return maxChecks;
}
@Override
public IConditionalAction after(IConditionalAction after) {
return manager.scheduleAction(after);
}
@Override
public IConditionalAction after(Supplier<Boolean> condition, Consumer<IAction> task) {
return after(manager.create(condition, task));
}
@Override
public IConditionalAction after(String name, Supplier<Boolean> condition, Consumer<IAction> task) {
return after(manager.create(name, condition, task));
}
@Override
public IConditionalAction after(Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
return after(manager.create(condition, task, terminateWhen));
}
@Override
public IConditionalAction after(String name, Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
return after(manager.create(name, condition, task, terminateWhen));
}
@Override
public IConditionalAction after(Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination) {
return after(manager.create(condition, task, terminateWhen, onTermination));
}
@Override
public IConditionalAction after(String name, Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination) {
return after(manager.create(name, condition, task, terminateWhen, onTermination));
}
}
@@ -39,6 +39,10 @@ public class ScriptedActionManager implements IActionManager {
return new Action(this, t);
}
@Override
public IAction create(int maxDuration, int delay, Consumer<IAction> task) {
return new Action(this, maxDuration, delay, task);
}
@Override
public IAction create(String name, int maxDuration, int delay, Consumer<IAction> task) {
return new Action(this, name, maxDuration, delay, task);
@@ -115,6 +119,11 @@ public class ScriptedActionManager implements IActionManager {
return scheduleAction(create(delay, task));
}
@Override
public IAction scheduleAction(int maxDuration, int delay, Consumer<IAction> task) {
return scheduleAction(create(maxDuration, delay, task));
}
@Override
public IAction scheduleAction(String name, Consumer<IAction> task) {
return scheduleAction(create(name, task));
@@ -245,6 +254,22 @@ public class ScriptedActionManager implements IActionManager {
///////////////////////////////////////////////////
///////////////////////////////////////////////////
// Conditionals
@Override
public IConditionalAction scheduleAction(Supplier<Boolean> condition, Consumer<IAction> task) {
return scheduleAction(new ConditionalAction(this, condition, task));
}
@Override
public IConditionalAction scheduleAction(Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen) {
return scheduleAction(new ConditionalAction(this, condition, task, terminateWhen));
}
@Override
public IConditionalAction scheduleAction(Supplier<Boolean> condition, Consumer<IAction> task, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination) {
return scheduleAction(new ConditionalAction(this, condition, task, terminateWhen, onTermination));
}
@Override
public IConditionalAction scheduleAction(String name, Supplier<Boolean> condition, Consumer<IAction> task) {
return scheduleAction(new ConditionalAction(this, name, condition, task));