upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-12 13:07:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-ordered ConditionAction constructor params

Browse Source
This commit is contained in:
bigguy345 committed 2025-04-28 10:47:16 +03:00
1 parent 3d155a26fc
commit 186c56c79e
2 files changed
+10 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java
+6 -6
View File
@@ -35,12 +35,12 @@ public class ConditionalAction extends Action implements IConditionalAction {
this.terminateWhen = terminateWhen;
}
public ConditionalAction(ScriptedActionManager manager, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination, Consumer<IAction> task) {
public ConditionalAction(ScriptedActionManager manager, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task, Consumer<IAction> onTermination) {
this(manager, predicate, terminateWhen, task);
this.onTermination = onTermination;
}
public ConditionalAction(ScriptedActionManager manager, String name, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination, Consumer<IAction> task) {
public ConditionalAction(ScriptedActionManager manager, String name, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task, Consumer<IAction> onTermination) {
this(manager, name, predicate, terminateWhen, task);
this.onTermination = onTermination;
}
@@ -131,12 +131,12 @@ public class ConditionalAction extends Action implements IConditionalAction {
}
@Override
public IConditionalAction after(Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination, Consumer<IAction> task) {
return after(manager.create(predicate, terminateWhen, onTermination, task));
public IConditionalAction after(Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task, Consumer<IAction> onTermination) {
return after(manager.create(predicate, terminateWhen, task, onTermination));
}
@Override
public IConditionalAction after(String name, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination, Consumer<IAction> task) {
return after(manager.create(name, predicate, terminateWhen, onTermination, task));
public IConditionalAction after(String name, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task, Consumer<IAction> onTermination) {
return after(manager.create(name, predicate, terminateWhen, task, onTermination));
}
}
src/main/java/noppes/npcs/scripted/ScriptedActionManager.java
+4 -4
View File
@@ -79,13 +79,13 @@ public class ScriptedActionManager implements IActionManager {
}
@Override
public IConditionalAction create(Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination, Consumer<IAction> task) {
return new ConditionalAction(this, predicate, terminateWhen, onTermination, task);
public IConditionalAction create(Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task, Consumer<IAction> onTermination) {
return new ConditionalAction(this, predicate, terminateWhen, task, onTermination);
}
@Override
public IConditionalAction create(String name, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> onTermination, Consumer<IAction> task) {
return new ConditionalAction(this, name, predicate, terminateWhen, onTermination, task);
public IConditionalAction create(String name, Supplier<Boolean> predicate, Supplier<Boolean> terminateWhen, Consumer<IAction> task, Consumer<IAction> onTermination) {
return new ConditionalAction(this, name, predicate, terminateWhen, task, onTermination);
}
@Override