From ffd331fbc57aedac08788dfa15c41a9450b42c13 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Sun, 6 Jul 2025 23:29:25 +0300 Subject: [PATCH] More debugging stuff --- .../java/noppes/npcs/controllers/data/action/Action.java | 4 ++-- .../controllers/data/action/action/ConditionalAction.java | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) 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 de48ac9f0..d27efe140 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -265,7 +265,7 @@ public class Action implements IAction { task.accept(this); count++; } catch (Throwable t) { - String err = "IAction '" + name + "' threw an exception:"; + String err = "Task of " + this + " threw an exception:"; if (reportTo != null) reportTo.appendConsole(err + "\n" + ExceptionUtils.getStackTrace(t)); @@ -287,7 +287,7 @@ public class Action implements IAction { } public String toString() { - return String.format("Action '%s' [queue='%s', scheduled=%s, done=%s, paused=%s, updateEvery=%s, duration=%d/%d, count=%d/%d, threaded=%s]", name != null ? name : "unnamed", queue != null ? queue.getName() : "null", isScheduled, done, isPaused(), updateEveryXTick, duration, maxDuration, count, maxCount, isThreaded); + return String.format("IAction '%s' [queue='%s', scheduled=%s, done=%s, paused=%s, updateEvery=%s, duration=%d/%d, count=%d/%d, threaded=%s]", name != null ? name : "unnamed", queue != null ? queue.getName() : "null", isScheduled, done, isPaused(), updateEveryXTick, duration, maxDuration, count, maxCount, isThreaded); } /////////////////////////////////////////////////// ////////////////////////////////////////////////// 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 7d3d695a3..206be0ed0 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 @@ -134,7 +134,7 @@ public class ConditionalAction extends Action implements IConditionalAction { count++; taskExecuted = true; } catch (Throwable t) { - String err = "IConditionalAction '" + getName() + "' threw an exception:"; + String err = "Task of " + this + " threw an exception:"; if (reportTo != null) reportTo.appendConsole(err + "\n" + ExceptionUtils.getStackTrace(t)); @@ -149,7 +149,7 @@ public class ConditionalAction extends Action implements IConditionalAction { try { onTermination.accept(this); } catch (Throwable t) { - String err = "IConditionalAction's onTermination '" + getName() + "' threw an exception:"; + String err = "Termination Task of " + this + " threw an exception:"; if (reportTo != null) reportTo.appendConsole(err + "\n" + ExceptionUtils.getStackTrace(t)); @@ -161,8 +161,7 @@ public class ConditionalAction extends Action implements IConditionalAction { public String toString() { - return String.format( - "ConditionalAction '%s' [queue='%s', scheduled=%s, done=%s, paused=%s, updateEvery=%s, duration=%d/%d, count=%d/%d, checks=%d/%d, taskExecuted=%s, threaded=%s]", + return String.format("IConditionalAction '%s' [queue='%s', scheduled=%s, done=%s, paused=%s, updateEvery=%s, duration=%d/%d, count=%d/%d, checks=%d/%d, taskExecuted=%s, threaded=%s]", name != null ? name : "unnamed", queue != null ? queue.getName() : "null", isScheduled,