From 5333808d65bb231cc48cc19ec2dfcd7a663c9e44 Mon Sep 17 00:00:00 2001 From: Glease <4586901+Glease@users.noreply.github.com> Date: Thu, 20 Mar 2025 22:30:06 +0800 Subject: [PATCH] add more information to help debug weird NPE (#26) --- .../HUDHandlerIAspectContainer.java | 2 +- .../waila/utils/WailaExceptionHandler.java | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java b/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java index 5c54b95..4be9910 100644 --- a/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java +++ b/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java @@ -112,7 +112,7 @@ public class HUDHandlerIAspectContainer implements IWailaDataProvider { } } - } catch (Exception e) { + } catch (ReflectiveOperationException e) { throw new RuntimeException(e); } diff --git a/src/main/java/mcp/mobius/waila/utils/WailaExceptionHandler.java b/src/main/java/mcp/mobius/waila/utils/WailaExceptionHandler.java index 4902487..f33ab0b 100644 --- a/src/main/java/mcp/mobius/waila/utils/WailaExceptionHandler.java +++ b/src/main/java/mcp/mobius/waila/utils/WailaExceptionHandler.java @@ -17,11 +17,20 @@ public class WailaExceptionHandler { if (!errs.contains(className)) { errs.add(className); - for (StackTraceElement elem : e.getStackTrace()) { - Waila.log.log( - Level.WARN, - String.format("%s.%s:%s", elem.getClassName(), elem.getMethodName(), elem.getLineNumber())); - if (elem.getClassName().contains("waila")) break; + Throwable working = e; + + while (working != null) { + if (working != e) { + Waila.log.log(Level.WARN, String.format("Caused by: %s", working)); + } + for (StackTraceElement elem : working.getStackTrace()) { + Waila.log.log( + Level.WARN, + String.format("%s.%s:%s", elem.getClassName(), elem.getMethodName(), elem.getLineNumber())); + if (working == e && elem.getClassName().contains("waila")) break; + } + + working = working.getCause(); } Waila.log.log(Level.WARN, String.format("Catched unhandled exception : [%s] %s", className, e));