Cloud number suggestions by default & check sender type in node requi…

…rement
Incendo · Jan 21, 2024 · 516c878 · 516c878
1 parent b72edb7
commit 516c878
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/CloudSpongeCommand.java b/cloud-sponge/src/main/java/cloud/commandframework/sponge/CloudSpongeCommand.java
@@ -39,6 +39,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
@@ -250,17 +251,23 @@ private static <C> boolean canExecute(final @NonNull CommandNode<C> node) {
             || node.children().stream().noneMatch(c -> c.component().required());
     }
 
+    @SuppressWarnings("unchecked")
     private void addRequirement(
         final @NonNull CommandNode<C> cloud,
         final @NonNull CommandTreeNode<? extends CommandTreeNode<?>> node
     ) {
         final Permission permission = (Permission) cloud.nodeMeta()
             .getOrDefault(CommandNode.META_KEY_PERMISSION, Permission.empty());
-        if (permission == Permission.empty()) {
-            return;
-        }
-        node.requires(cause ->
-            this.commandManager.testPermission(this.commandManager.senderMapper().map(cause), permission).allowed());
+        final Set<Class<?>> senderTypes = (Set<Class<?>>) cloud.nodeMeta().get(CommandNode.META_KEY_SENDER_TYPES);
+        node.requires(cause -> {
+            final C c = this.commandManager.senderMapper().map(cause);
+            for (final Class<?> senderType : senderTypes) {
+                if (senderType.isInstance(c)) {
+                    return this.commandManager.testPermission(c, permission).allowed();
+                }
+            }
+            return false;
+        });
     }
 
     private String formatCommandForParsing(final @NonNull String arguments) {

diff --git a/cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeParserMapper.java b/cloud-sponge/src/main/java/cloud/commandframework/sponge/SpongeParserMapper.java
@@ -127,14 +127,14 @@ private void initStandardMappers() {
             node.min((int) byteParser.range().minByte());
             node.max((int) byteParser.range().maxByte());
             return node;
-        }));
+        }).cloudSuggestions(true));
         this.registerMapping(new TypeToken<ShortParser<C>>() {
         }, builder -> builder.to(shortParser -> {
             final CommandTreeNode.Range<Integer> node = CommandTreeNodeTypes.INTEGER.get().createNode();
             node.min((int) shortParser.range().minShort());
             node.max((int) shortParser.range().maxShort());
             return node;
-        }));
+        }).cloudSuggestions(true));
         this.registerMapping(new TypeToken<IntegerParser<C>>() {
         }, builder -> builder.to(integerParser -> {
             final CommandTreeNode.Range<Integer> node = CommandTreeNodeTypes.INTEGER.get().createNode();
@@ -145,7 +145,7 @@ private void initStandardMappers() {
                 node.max(integerParser.range().maxInt());
             }
             return node;
-        }));
+        }).cloudSuggestions(true));
         this.registerMapping(new TypeToken<FloatParser<C>>() {
         }, builder -> builder.to(floatParser -> {
             final CommandTreeNode.Range<Float> node = CommandTreeNodeTypes.FLOAT.get().createNode();
@@ -156,7 +156,7 @@ private void initStandardMappers() {
                 node.max(floatParser.range().maxFloat());
             }
             return node;
-        }));
+        }).cloudSuggestions(true));
         this.registerMapping(new TypeToken<DoubleParser<C>>() {
         }, builder -> builder.to(doubleParser -> {
             final CommandTreeNode.Range<Double> node = CommandTreeNodeTypes.DOUBLE.get().createNode();
@@ -167,7 +167,7 @@ private void initStandardMappers() {
                 node.max(doubleParser.range().maxDouble());
             }
             return node;
-        }));
+        }).cloudSuggestions(true));
         this.registerMapping(new TypeToken<LongParser<C>>() {
         }, builder -> builder.to(longParser -> {
             final CommandTreeNode.Range<Long> node = CommandTreeNodeTypes.LONG.get().createNode();
@@ -178,7 +178,7 @@ private void initStandardMappers() {
                 node.max(longParser.range().maxLong());
             }
             return node;
-        }));
+        }).cloudSuggestions(true));
         this.registerMapping(new TypeToken<BooleanParser<C>>() {
         }, builder -> builder.to(booleanParser -> {
             return CommandTreeNodeTypes.BOOL.get().createNode();