Fix incorrectly wrapped exceptions

Author: vaperion

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "io.github.vaperion.blade"
-version = "1.1.2"
+version = "1.1.3"
 
 subprojects {
     apply(plugin = "io.freefair.lombok")

core/src/main/java/me/vaperion/blade/impl/executor/CommandExecutor.java

@@ -29,6 +29,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -672,28 +673,36 @@ private void invoke0(@NotNull BladeCommand cmd,
                 cmd.instance(),
                 args
             );
+        } catch (InvocationTargetException e) {
+            throw invocationFailure(cmd, args, e.getTargetException());
         } catch (Throwable t) {
-            if (t instanceof BladeFatalError ||
-                t instanceof BladeImplementationError ||
-                t instanceof BladeInternalError ||
-                t instanceof BladeInvocationError ||
-                t instanceof BladeParseError ||
-                t instanceof BladeUsageMessage) {
-                // Rethrow internal errors as-is
-                throw (RuntimeException) t;
-            }
-
-            throw new BladeInvocationError(
-                String.format(
-                    "Command invocation failed (method: %s.%s, args: %s)",
-                    cmd.method().getDeclaringClass().getName(),
-                    cmd.method().getName(),
-                    Arrays.toString(args)
-                ),
-                t);
+            throw invocationFailure(cmd, args, t);
         }
     }
 
+    @NotNull
+    private RuntimeException invocationFailure(@NotNull BladeCommand cmd,
+                                               @NotNull Object[] args,
+                                               @NotNull Throwable cause) {
+        if (cause instanceof BladeFatalError ||
+            cause instanceof BladeImplementationError ||
+            cause instanceof BladeInternalError ||
+            cause instanceof BladeInvocationError ||
+            cause instanceof BladeParseError ||
+            cause instanceof BladeUsageMessage) {
+            return (RuntimeException) cause;
+        }
+
+        return new BladeInvocationError(
+            String.format(
+                "Command invocation failed (method: %s.%s, args: %s)",
+                cmd.method().getDeclaringClass().getName(),
+                cmd.method().getName(),
+                Arrays.toString(args)
+            ),
+            cause);
+    }
+
     @ApiStatus.Internal
     @NotNull
     public Object adaptSender(@NotNull BladeCommand cmd,