From e6d4e1f3fde47bba8d6bd72bba63d44e406919d3 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 7 Jul 2025 13:21:39 +0300 Subject: [PATCH] ActionManager name --- .../npcs/controllers/data/action/ActionManager.java | 13 +++++++++++++ src/main/java/noppes/npcs/scripted/NpcAPI.java | 3 +++ .../java/noppes/npcs/scripted/entity/ScriptNpc.java | 3 +++ .../noppes/npcs/scripted/entity/ScriptPlayer.java | 3 +++ 4 files changed, 22 insertions(+) diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index 924fec103..e15ff9cf2 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -23,6 +23,7 @@ import java.util.function.Function; */ public class ActionManager implements IActionManager { protected boolean isWorking = false; + protected String name = ""; protected final ActionQueue sequentialQueue = new ActionQueue(this, "mainSequential"); protected final ActionQueue parallelQueue = new ActionQueue(this, "mainParallel", true); @@ -45,6 +46,18 @@ public class ActionManager implements IActionManager { return this; } + @Override + public String getName() { + return name; + } + + @Override + public IActionManager setName(String name) { + this.name = name; + return this; + } + + @Override public boolean inDebugMode() { return debug; diff --git a/src/main/java/noppes/npcs/scripted/NpcAPI.java b/src/main/java/noppes/npcs/scripted/NpcAPI.java index 76a9936c2..363c75d4e 100644 --- a/src/main/java/noppes/npcs/scripted/NpcAPI.java +++ b/src/main/java/noppes/npcs/scripted/NpcAPI.java @@ -559,6 +559,9 @@ public class NpcAPI extends AbstractNpcAPI { } public IActionManager getActionManager() { + if (actionManager.getName().isEmpty()) + actionManager.setName("Global Action Manager"); + return actionManager; } diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java index 7ba7136df..ab1d21f4e 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java @@ -1408,6 +1408,9 @@ public class ScriptNpc extends ScriptLiving imp } public IActionManager getActionManager() { + if (npc.actionManager.getName().isEmpty()) + npc.actionManager.setName(String.format("%s's Action Manager", npc.getCommandSenderName())); + return npc.actionManager; } diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java index cffd0696d..d3cf85e61 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java @@ -851,6 +851,9 @@ public class ScriptPlayer extends ScriptLivingBase @Override public IActionManager getActionManager() { + if (data.actionManager.getName().isEmpty()) + data.actionManager.setName(String.format("%s's Action Manager", player.getDisplayName())); + return data.actionManager; } }