Added Dungeons Master mode support

- fixed unexpected API-related exceptions voiding chat output

1 files changed, 20 insertions, 2 deletions

diff --git a/src/main/java/de/cowtipper/cowlection/command/exception/ThrowingConsumer.java b/src/main/java/de/cowtipper/cowlection/command/exception/ThrowingConsumer.java
index 0efd9c5..9eae1c3 100644
--- a/src/main/java/de/cowtipper/cowlection/command/exception/ThrowingConsumer.java
+++ b/src/main/java/de/cowtipper/cowlection/command/exception/ThrowingConsumer.java
@@ -1,6 +1,7 @@
 package de.cowtipper.cowlection.command.exception;
 
 import de.cowtipper.cowlection.Cowlection;
+import de.cowtipper.cowlection.util.MooChatComponent;
 import net.minecraft.command.CommandException;
 import net.minecraft.util.ChatComponentTranslation;
 import net.minecraft.util.EnumChatFormatting;
@@ -15,11 +16,28 @@ public interface ThrowingConsumer<T> extends Consumer<T> {
         try {
             acceptThrows(t);
         } catch (CommandException e) {
-            IChatComponent errorMsg = new ChatComponentTranslation(e.getMessage(), e.getErrorObjects());
+            ChatComponentTranslation errorMsg = new ChatComponentTranslation(e.getMessage(), e.getErrorObjects());
             errorMsg.getChatStyle().setColor(EnumChatFormatting.RED);
-            Cowlection.getInstance().getChatHelper().sendMessage(errorMsg);
+            handleException(e, errorMsg);
+        } catch (Exception e) {
+            String stackTraceInfo = null;
+            for (StackTraceElement traceElement : e.getStackTrace()) {
+                if (traceElement.getClassName().startsWith("de.cowtipper")) {
+                    stackTraceInfo = traceElement.getClassName()
+                            + EnumChatFormatting.WHITE + "#" + EnumChatFormatting.GRAY + traceElement.getMethodName()
+                            + EnumChatFormatting.WHITE + ":" + EnumChatFormatting.GRAY + traceElement.getLineNumber();
+                    break;
+                }
+            }
+            handleException(e, new MooChatComponent(EnumChatFormatting.DARK_RED + "Something went wrong: " + EnumChatFormatting.RED + e.toString()
+                    + (stackTraceInfo == null ? "" : EnumChatFormatting.GRAY + " (" + EnumChatFormatting.WHITE + "in " + EnumChatFormatting.GRAY + stackTraceInfo + EnumChatFormatting.GRAY + ")")));
         }
     }
 
+    default void handleException(Exception exception, IChatComponent errorMsg) {
+        Cowlection.getInstance().getChatHelper().sendMessage(errorMsg);
+        exception.printStackTrace();
+    }
+
     void acceptThrows(T t) throws CommandException;
 }