log failing scripts and classes

Author: brachy84

src/main/java/com/cleanroommc/groovyscript/core/mixin/groovy/MetaClassImplMixin.java

@@ -1,8 +1,11 @@
 package com.cleanroommc.groovyscript.core.mixin.groovy;
 
 import com.cleanroommc.groovyscript.GroovyScript;
+import com.cleanroommc.groovyscript.sandbox.JavaBeanException;
 import com.cleanroommc.groovyscript.sandbox.meta.ClassMetaClass;
 import com.cleanroommc.groovyscript.sandbox.security.GroovySecurityManager;
+import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import groovy.lang.*;
 import org.codehaus.groovy.runtime.metaclass.MetaClassRegistryImpl;
 import org.spongepowered.asm.mixin.*;
@@ -140,4 +143,13 @@ private Object invokePropertyOrMissing(Object object,
 
         return invokeMissingMethod(object, methodName, originalArguments, null, isCallToSuper);
     }
+
+    @WrapMethod(method = "addProperties")
+    public void addProperties(Operation<Void> original) {
+        try {
+            original.call();
+        } catch (Throwable t) {
+            throw new JavaBeanException(t, (MetaClassImpl) (Object) this);
+        }
+    }
 }

src/main/java/com/cleanroommc/groovyscript/sandbox/CustomGroovyScriptEngine.java

@@ -260,8 +260,8 @@ protected Class<?> loadScriptClassInternal(File file, boolean isFileRelative) {
         Class<?> scriptClass = null;
         try {
             scriptClass = parseDynamicScript(file, isFileRelative);
-        } catch (Exception e) {
-            GroovyLog.get().exception("An error occurred while trying to load script class " + file.toString(), e);
+        } catch (Throwable e) {
+            GroovyLog.get().exception("An error occurred while trying to compile script class " + file.toString(), e);
         }
         return scriptClass;
     }

src/main/java/com/cleanroommc/groovyscript/sandbox/GroovyScriptSandbox.java

@@ -128,10 +128,12 @@ public void run(LoadStage currentLoadStage) {
         this.currentLoadStage = Objects.requireNonNull(currentLoadStage);
         try {
             load();
+        } catch (ScriptRunException e) {
+            GroovyLog.get().exception("Script '" + e.script.name + "' ran into an issue while executing.", e.parent);
         } catch (IOException | ScriptException | ResourceException e) {
             GroovyLog.get().exception("An exception occurred while trying to run groovy code! This is might be a internal groovy issue.", e);
         } catch (Throwable t) {
-            GroovyLog.get().exception(t);
+            GroovyLog.get().exception("An unknown error occurred while running scripts", t);
         } finally {
             GroovyLog.get().infoMC("Groovy scripts took {}ms to compile and {}ms to run in {}.", this.compileTime, this.runTime, currentLoadStage.getName());
             this.currentLoadStage = null;
@@ -257,7 +259,11 @@ protected void loadScripts(Binding binding, Set<String> executedClasses, boolean
                     // script is a class
                     if (run && shouldRunFile(compiledScript.path)) {
                         t = System.currentTimeMillis();
-                        runClass(compiledScript.clazz);
+                        try {
+                            runClass(compiledScript.clazz);
+                        } catch (Throwable e) {
+                            throw new ScriptRunException(e, compiledScript);
+                        }
                         this.runTime += System.currentTimeMillis() - t;
                     }
                     executedClasses.add(compiledScript.path);
@@ -266,7 +272,11 @@ protected void loadScripts(Binding binding, Set<String> executedClasses, boolean
                 if (run && shouldRunFile(compiledScript.path)) {
                     Script script = InvokerHelper.createScript(compiledScript.clazz, binding);
                     t = System.currentTimeMillis();
-                    runScript(script);
+                    try {
+                        runScript(script);
+                    } catch (Throwable e) {
+                        throw new ScriptRunException(e, compiledScript);
+                    }
                     this.runTime += System.currentTimeMillis() - t;
                 }
             }
@@ -370,4 +380,16 @@ public long getLastCompileTime() {
     public long getLastRunTime() {
         return runTime;
     }
+
+    static class ScriptRunException extends RuntimeException {
+
+        Throwable parent;
+        CompiledScript script;
+
+        ScriptRunException(Throwable parent, CompiledScript script) {
+            super();
+            this.parent = parent;
+            this.script = script;
+        }
+    }
 }

src/main/java/com/cleanroommc/groovyscript/sandbox/JavaBeanException.java

@@ -0,0 +1,15 @@
+package com.cleanroommc.groovyscript.sandbox;
+
+import groovy.lang.MetaClassImpl;
+
+public class JavaBeanException extends RuntimeException {
+
+    public final Throwable parent;
+    public final MetaClassImpl metaClass;
+
+    public JavaBeanException(Throwable parent, MetaClassImpl metaClass) {
+        super("An error occurred while trying to gather java properties for class " + metaClass.getTheClass().getName());
+        this.parent = parent;
+        this.metaClass = metaClass;
+    }
+}