From b60d6f8eb5df908ca730bb1d9c581d42f07c59ef Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 23 Jul 2025 05:13:11 -0400 Subject: [PATCH] Fix Logging --- src/main/java/noppes/npcs/config/ConfigDebug.java | 5 +++++ .../noppes/npcs/controllers/data/action/ActionLogger.java | 5 ++++- .../noppes/npcs/controllers/data/action/ActionManager.java | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/noppes/npcs/config/ConfigDebug.java b/src/main/java/noppes/npcs/config/ConfigDebug.java index addc10a6d..1934f7969 100644 --- a/src/main/java/noppes/npcs/config/ConfigDebug.java +++ b/src/main/java/noppes/npcs/config/ConfigDebug.java @@ -33,6 +33,8 @@ public class ConfigDebug { public static Property ScriptLogIgnoreTypeProperty; public static String ScriptLogIgnoreType = "TICK"; + public static boolean LogActionManager = false; + public static void init(File configFile) { config = new Configuration(configFile); @@ -59,6 +61,9 @@ public class ConfigDebug { "INIT,TICK,INTERACT,DIALOG,DAMAGED,KILLED,ATTACK,TARGET,COLLIDE,KILLS,DIALOG_CLOSE,TIMER"); ScriptLogIgnoreType = ScriptLogIgnoreTypeProperty.getString(); + LogActionManager = config.get(LOGGING, "Log Action Manager", LogActionManager, "Log the Performance of the Action Manager").getBoolean(LogActionManager); + + // Convert to Legacy if (CustomNpcs.legacyExist) { PlayerLogging = LegacyConfig.PlayerLogging; diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java b/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java index fc24c79e8..11a9b3344 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java @@ -3,6 +3,8 @@ package noppes.npcs.controllers.data.action; import noppes.npcs.LogWriter; import noppes.npcs.api.handler.data.IAction; import noppes.npcs.api.handler.data.IActionQueue; +import noppes.npcs.config.ConfigDebug; +import noppes.npcs.config.ConfigScript; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.exception.ExceptionUtils; @@ -136,7 +138,8 @@ public class ActionLogger { private static final String ANSI_RESET = "\u001B[0m"; public void println(String str) { - System.out.printf("[%tT] %s[%s]:%s %s%s%n", new Date(), ANSI_CYAN, Thread.currentThread().getName(), ANSI_GOLD, str, ANSI_RESET); + if(ConfigDebug.LogActionManager) + System.out.printf("[%tT] %s[%s]:%s %s%s%n", new Date(), ANSI_CYAN, Thread.currentThread().getName(), ANSI_GOLD, str, ANSI_RESET); } // public ActionLogger beginTick1(ActionManager manager) { 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 f4b7fc430..0b62ddce0 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -35,7 +35,7 @@ public class ActionManager implements IActionManager { protected final ActionQueue conditionalQueue = new ActionQueue(this, "mainConditional", true); protected final Map otherQueues = new HashMap<>(); - protected boolean debug; + protected boolean debug = false; protected ScriptContainer reportTo; public ActionManager() {}