Fix bug with handle completable feature and add @async 2.3.0 Release

Author: Rollczi

litecommands-core/src/main/java/dev/rollczi/litecommands/command/async/Async.java

@@ -0,0 +1,16 @@
+package dev.rollczi.litecommands.command.async;
+
+import dev.rollczi.litecommands.factory.FactoryAnnotationResolver;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Async {
+
+    FactoryAnnotationResolver<Async> RESOLVER = new AsyncAnnotationResolver();
+
+}

litecommands-core/src/main/java/dev/rollczi/litecommands/command/async/AsyncAnnotationResolver.java

@@ -0,0 +1,20 @@
+package dev.rollczi.litecommands.command.async;
+
+import dev.rollczi.litecommands.factory.CommandState;
+import dev.rollczi.litecommands.factory.FactoryAnnotationResolver;
+import dev.rollczi.litecommands.meta.CommandMeta;
+import panda.std.Option;
+
+class AsyncAnnotationResolver implements FactoryAnnotationResolver<Async> {
+
+    @Override
+    public Option<CommandState> resolve(Async async, CommandState commandState) {
+        return Option.of(commandState.meta(meta -> meta.set(CommandMeta.ASYNCHRONOUS, true)));
+    }
+
+    @Override
+    public Class<Async> getAnnotationClass() {
+        return Async.class;
+    }
+
+}

litecommands-core/src/main/java/dev/rollczi/litecommands/command/permission/ExecutedPermissionAnnotationResolver.java

@@ -10,7 +10,7 @@ class ExecutedPermissionAnnotationResolver implements FactoryAnnotationResolver<
 
     @Override
     public Option<CommandState> resolve(ExecutedPermission permissions, CommandState commandState) {
-        return Option.of(commandState.executedPermission(permissions.value()));
+        return Option.of(commandState.meta(meta -> meta.addExcludedPermission(permissions.value())));
     }
 
     @Override

litecommands-core/src/main/java/dev/rollczi/litecommands/command/permission/ExecutedPermissionsAnnotationResolver.java

@@ -15,7 +15,7 @@ public Option<CommandState> resolve(ExecutedPermissions permissions, CommandStat
                 .flatMap(Arrays::stream)
                 .toArray(String[]::new);
 
-        return Option.of(commandState.executedPermission(perms));
+        return Option.of(commandState.meta(meta -> meta.addExcludedPermission(perms)));
     }
 
     @Override

litecommands-core/src/main/java/dev/rollczi/litecommands/command/permission/PermissionAnnotationResolver.java

@@ -16,7 +16,7 @@ public Option<CommandState> resolve(Permissions permissions, CommandState comman
                 .flatMap(Arrays::stream)
                 .toArray(String[]::new);
 
-        return Option.of(commandState.permission(perms));
+        return Option.of(commandState.meta(meta -> meta.addPermission(perms)));
     }
 
     @Override

litecommands-core/src/main/java/dev/rollczi/litecommands/command/permission/PermissionsAnnotationResolver.java

@@ -10,7 +10,7 @@ class PermissionsAnnotationResolver implements FactoryAnnotationResolver<Permiss
 
     @Override
     public Option<CommandState> resolve(Permission permissions, CommandState commandState) {
-        return Option.of(commandState.permission(permissions.value()));
+        return Option.of(commandState.meta(meta -> meta.addPermission(permissions.value())));
     }
 
     @Override

litecommands-core/src/main/java/dev/rollczi/litecommands/factory/CommandEditor.java

@@ -1,7 +1,11 @@
 package dev.rollczi.litecommands.factory;
 
+import dev.rollczi.litecommands.meta.CommandMeta;
+import dev.rollczi.litecommands.meta.Meta;
+
 import java.util.Collection;
 import java.util.Set;
+import java.util.function.Function;
 
 public interface CommandEditor {
 
@@ -39,6 +43,8 @@ default State permissionExcluded(Collection<String> permissions) {
 
         State cancel(boolean canceled);
 
+        State meta(Function<CommandMeta, CommandMeta> edit);
+
     }
 
 }

litecommands-core/src/main/java/dev/rollczi/litecommands/factory/CommandState.java

@@ -1,6 +1,7 @@
 package dev.rollczi.litecommands.factory;
 
 import dev.rollczi.litecommands.command.amount.AmountValidator;
+import dev.rollczi.litecommands.meta.CommandMeta;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -19,80 +20,62 @@ public class CommandState implements CommandEditor.State {
     private final String name;
     private final List<Route> routesBefore = new ArrayList<>();
     private final Set<String> aliases = new HashSet<>();
-    private final Set<String> permissions = new HashSet<>();
-    private final Set<String> executedPermissions = new HashSet<>();
     private final Set<CommandState> children = new HashSet<>();
     private final Map<Method, CommandState> executors = new HashMap<>();
-    private final AmountValidator validator;
+    private final CommandMeta meta;
     private final boolean canceled;
 
     public CommandState() {
         this.name = null;
-        this.validator = AmountValidator.none();
+        this.meta = CommandMeta.create();
         this.canceled = false;
     }
 
-    private CommandState(String name, List<Route> routesBefore, Set<String> aliases, Set<String> permissions, Set<String> executedPermissions, Set<CommandState> children, Map<Method, CommandState> executors, AmountValidator validator, boolean canceled) {
+    private CommandState(String name, List<Route> routesBefore, Set<String> aliases, Set<CommandState> children, Map<Method, CommandState> executors, CommandMeta meta, boolean canceled) {
         this.name = name;
+        this.meta = meta;
         this.canceled = canceled;
         this.routesBefore.addAll(routesBefore);
         this.aliases.addAll(aliases);
-        this.permissions.addAll(permissions);
-        this.executedPermissions.addAll(executedPermissions);
         this.children.addAll(children);
         this.executors.putAll(executors);
-        this.validator = validator;
     }
 
     @Override
     public CommandState name(String name) {
-        return new CommandState(name, routesBefore, aliases, permissions, executedPermissions, children, executors, validator, canceled);
+        return new CommandState(name, routesBefore, aliases, children, executors, meta, canceled);
     }
 
     public CommandState routeBefore(Route route) {
         ArrayList<Route> routes = new ArrayList<>(routesBefore);
         routes.add(route);
 
-        return new CommandState(name, routes, aliases, permissions, executedPermissions, children, executors, validator, canceled);
+        return new CommandState(name, routes, aliases, children, executors, meta, canceled);
     }
 
     public CommandState alias(String... alias) {
         Set<String> aliases = new HashSet<>(this.aliases);
         Collections.addAll(aliases, alias);
 
-        return new CommandState(name, routesBefore, aliases, permissions, executedPermissions, children, executors, validator, canceled);
-    }
-
-    public CommandState permission(String... permission) {
-        Set<String> permissions = new HashSet<>(this.permissions);
-        Collections.addAll(permissions, permission);
-
-        return new CommandState(name, routesBefore, aliases, permissions, executedPermissions, children, executors, validator, canceled);
-    }
-
-    public CommandState executedPermission(String... permission) {
-        Set<String> permissions = new HashSet<>(this.executedPermissions);
-        Collections.addAll(permissions, permission);
-
-        return new CommandState(name, routesBefore, aliases, permissions, executedPermissions, children, executors, validator, canceled);
+        return new CommandState(name, routesBefore, aliases, children, executors, meta, canceled);
     }
 
     public CommandState child(CommandState... child) {
         Set<CommandState> children = new HashSet<>(this.children);
         Collections.addAll(children, child);
 
-        return new CommandState(name, routesBefore, aliases, permissions, executedPermissions, children, executors, validator, canceled);
+        return new CommandState(name, routesBefore, aliases, children, executors, meta, canceled);
     }
 
     public CommandState executor(Method method, CommandState state) {
         Map<Method, CommandState> executors = new HashMap<>(this.executors);
         executors.put(method, state);
 
-        return new CommandState(name, routesBefore, aliases, permissions, executedPermissions, children, executors, validator, canceled);
+        return new CommandState(name, routesBefore, aliases, children, executors, meta, canceled);
     }
 
     public CommandState validator(Function<AmountValidator, AmountValidator> edit) {
-        return new CommandState(name, routesBefore, aliases, permissions, executedPermissions, children, executors, edit.apply(this.validator), canceled);
+        return this.meta(commandMeta -> commandMeta.applyAmountValidator(edit));
     }
 
     public String getName() {
@@ -107,14 +90,6 @@ public Set<String> getAliases() {
         return Collections.unmodifiableSet(aliases);
     }
 
-    public Set<String> getPermissions() {
-        return Collections.unmodifiableSet(permissions);
-    }
-
-    public Set<String> getExecutedPermissions() {
-        return Collections.unmodifiableSet(executedPermissions);
-    }
-
     public Set<CommandState> getChildren() {
         return Collections.unmodifiableSet(children);
     }
@@ -123,10 +98,6 @@ public Map<Method, CommandState> getExecutors() {
         return Collections.unmodifiableMap(executors);
     }
 
-    public AmountValidator getValidator() {
-        return validator;
-    }
-
     public CommandState mergeMethod(Method method, CommandState other) {
         return this.mergeMethod(other.routesBefore.iterator(), method, other);
     }
@@ -155,7 +126,7 @@ public CommandState alias(Collection<String> aliases) {
         Set<String> aliasesSet = new HashSet<>(this.aliases);
         aliasesSet.addAll(aliases);
 
-        return new CommandState(name, routesBefore, aliasesSet, permissions, executedPermissions, children, executors, validator, canceled);
+        return new CommandState(name, routesBefore, aliasesSet, children, executors, meta, canceled);
     }
 
     public boolean isCanceled() {
@@ -188,28 +159,50 @@ public CommandState aliases(Collection<String> aliases, boolean removeOld) {
         Set<String> aliasesSet = removeOld ? new HashSet<>() : new HashSet<>(this.aliases);
         aliasesSet.addAll(aliases);
 
-        return new CommandState(name, routesBefore, aliasesSet, permissions, executedPermissions, children, executors, validator, canceled);
+        return new CommandState(name, routesBefore, aliasesSet, children, executors, meta, canceled);
     }
 
     @Override
     public CommandState permission(Collection<String> permissions, boolean removeOld) {
-        Set<String> perm = removeOld ? new HashSet<>() : new HashSet<>(this.permissions);
-        perm.addAll(permissions);
+        return this.meta(commandMeta -> {
+            if (removeOld) {
+                commandMeta.clearPermissions();
+            }
 
-        return new CommandState(name, routesBefore, aliases, perm, executedPermissions, children, executors, validator, canceled);
+            commandMeta.addPermission(permissions);
+            return commandMeta;
+        });
     }
 
     @Override
     public CommandState permissionExcluded(Collection<String> executedPermissions, boolean removeOld) {
-        Set<String> executedPerm = removeOld ? new HashSet<>() : new HashSet<>(this.executedPermissions);
-        executedPerm.addAll(executedPermissions);
+        return this.meta(commandMeta -> {
+            if (removeOld) {
+                commandMeta.clearExcludedPermissions();
+            }
 
-        return new CommandState(name, routesBefore, aliases, permissions, executedPerm, children, executors, validator, canceled);
+            commandMeta.addExcludedPermission(executedPermissions);
+            return commandMeta;
+        });
     }
 
     @Override
     public CommandState cancel(boolean canceled) {
-        return new CommandState(name, routesBefore, aliases, permissions, executedPermissions, children, executors, validator, canceled);
+        return new CommandState(name, routesBefore, aliases, children, executors, meta, canceled);
+    }
+
+    @Override
+    public CommandState meta(Function<CommandMeta, CommandMeta> edit) {
+        CommandMeta newMeta = CommandMeta.create();
+        newMeta.apply(this.meta);
+
+        CommandMeta metaData = edit.apply(newMeta);
+
+        return new CommandState(name, routesBefore, aliases, children, executors, metaData, canceled);
+    }
+
+    public CommandMeta getMeta() {
+        return meta;
     }
 
     public static class Route {

litecommands-core/src/main/java/dev/rollczi/litecommands/factory/FactoryAnnotationResolver.java

@@ -16,11 +16,11 @@ default Option<CommandState> tryResolve(Annotation annotation, CommandState stat
     Class<A> getAnnotationClass();
 
     static <T extends Annotation> FactoryAnnotationResolver<T> of(Class<T> type, BiFunction<T, CommandState, CommandState> resolver) {
-        return new SimpleAnnotationResolver<T>(type, (t, commandState) -> Option.of(resolver.apply(t, commandState)));
+        return new SimpleAnnotationResolver<>(type, (t, commandState) -> Option.of(resolver.apply(t, commandState)));
     }
 
     static <T extends Annotation> FactoryAnnotationResolver<T> ofOption(Class<T> type, BiFunction<T, CommandState, Option<CommandState>> resolver) {
-        return new SimpleAnnotationResolver<T>(type, resolver);
+        return new SimpleAnnotationResolver<>(type, resolver);
     }
 
 }

litecommands-core/src/main/java/dev/rollczi/litecommands/handle/ExecuteResultHandler.java

@@ -40,10 +40,20 @@ public void handle(SENDER sender, LiteInvocation invocation, ExecuteResult resul
 
         if (object instanceof CompletableFuture<?>) {
             CompletableFuture<?> future = ((CompletableFuture<?>) object);
-            future.thenAccept(o -> handleResult(sender, invocation, result));
+
+            future.whenComplete((o, ex) -> {
+                if (ex != null) {
+                    ex.printStackTrace();
+                    return;
+                }
+
+                this.handleResult(sender, invocation, result);
+            });
+
             return;
         }
 
+
         this.handleResult(sender, invocation, object);
     }