Merge pull request #18 from kylepls/commands

continued work on #5 added #on method to PluginCommand

Author: Joshbpls

mcspring-api/mcspring-subcommands/src/main/java/in/kyle/mcspring/subcommands/PluginCommand.java

@@ -198,7 +198,70 @@ private Optional<Double> tryParseDouble(String intString) {
             return Optional.empty();
         }
     }
-    
+
+    protected void callOn(String command, Executors executors, int argSize) {
+        if(hasExecutablePart()) {
+            if(parts.get(0).equalsIgnoreCase(command)) {
+                parts.remove(0);
+                then(() -> invoke(executors, argSize));
+            }
+        } else {
+            state = State.MISSING_ARG;
+        }
+    }
+
+    public <A> void on(String command, Executors.O1<A> e) {
+        callOn(command, e, 1);
+    }
+
+    public <A, B> void on(String command, Executors.O2<A, B> e) {
+        callOn(command, e, 2);
+    }
+
+    public <A, B, C> void on(String command, Executors.O3<A, B, C> e) {
+        callOn(command, e, 3);
+    }
+
+    public <A, B, C, D> void on(String command, Executors.O4<A, B, C, D> e) {
+        callOn(command, e, 4);
+    }
+
+    public <A, B, C, D, E> void on(String command, Executors.O5<A, B, C, D, E> e) {
+        callOn(command, e, 5);
+    }
+
+    public <A, B, C, D, E, F> void on(String command, Executors.O6<A, B, C, D, E, F> e) {
+        callOn(command, e, 6);
+    }
+
+    public void on(String command, Executors.O0 executors) {
+        callOn(command, executors, 0);
+    }
+
+    public <A> void on(String command, Executors.E1<A> e) {
+        callOn(command, e, 1);
+    }
+
+    public <A, B> void on(String command, Executors.E2<A, B> e) {
+        callOn(command, e, 2);
+    }
+
+    public <A, B, C> void on(String command, Executors.E3<A, B, C> e) {
+        callOn(command, e, 3);
+    }
+
+    public <A, B, C, D> void on(String command, Executors.E4<A, B, C, D> e) {
+        callOn(command, e, 4);
+    }
+
+    public <A, B, C, D, E> void on(String command, Executors.E5<A, B, C, D, E> e) {
+        callOn(command, e, 5);
+    }
+
+    public <A, B, C, D, E, F> void on(String command, Executors.E6<A, B, C, D, E, F> e) {
+        callOn(command, e, 6);
+    }
+
     public <A> void then(Executors.O0 e) {
         then(() -> invoke(e, 0));
     }

mcspring-api/mcspring-subcommands/src/main/java/in/kyle/mcspring/subcommands/PluginCommandTabCompletable.java

@@ -72,6 +72,12 @@ public <T> void withMap(Map<String, T> options, Function<String, String> invalid
             tabCompletionOptions.addAll(options.keySet());
         }
     }
+
+    @Override
+    protected void callOn(String command, Executors executors, int argSize) {
+        tabCompletionOptions.add(command);
+        super.callOn(command, executors, argSize);
+    }
 
     @Override
     public void otherwise(Supplier<String> supplier) {

mcspring-api/mcspring-subcommands/src/test/java/in/kyle/mcspring/SpringSpigotSupport.java

@@ -30,6 +30,36 @@ void setup() {
         sender.getMessages().subscribe(outputMessages::add);
     }
 
+    @Test
+    void testDirectExecutor() {
+        class Test {
+
+            void exec1(PluginCommand command) {
+                command.on("test", this::handler1);
+            }
+
+            void exec2(PluginCommand command) {
+                command.withString();
+                command.on("test2", this::handler2);
+            }
+
+            void handler1(CommandSender sender) {
+                sender.sendMessage("Hello World");
+            }
+
+            void handler2(CommandSender sender, String string) {
+                sender.sendMessage(string);
+            }
+        }
+
+        Test test = new Test();
+        console.run(sender, "test", test::exec1);
+        assertThat(outputMessages).containsExactly("Hello World");
+        outputMessages.clear();
+        console.run(sender, "hello test2", test::exec2);
+        assertThat(outputMessages).containsExactly("hello");
+    }
+
     @Test
     void testSenderArg() {
         class Test {

mcspring-api/mcspring-subcommands/src/test/java/in/kyle/mcspring/subcommands/TestPluginCommand.java

@@ -1,5 +1,6 @@
 package in.kyle.mcspring.subcommands;
 
+import in.kyle.mcspring.test.MCSpringTest;
 import org.bukkit.command.CommandSender;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -18,7 +19,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
-@SpringBootTest
+@MCSpringTest
 public class TestTabCompletion {
 
     @Autowired
@@ -33,6 +34,23 @@ void setup() {
         sender.getMessages().subscribe(outputMessages::add);
     }
 
+    @Test
+    void testTabWithDirectExecution() {
+        class Test {
+
+            void root(PluginCommand command) {
+                command.on("test", this::exec);
+            }
+
+            void exec(String string) {
+                fail("Should not run");
+            }
+        }
+        Test test = new Test();
+        var completions = tabDiscovery.getCompletions(sender, "", test::root);
+        assertThat(completions).containsExactly("test");
+    }
+
     @Test
     void testNoTab() {
         class Test {

mcspring-api/mcspring-subcommands/src/test/java/in/kyle/mcspring/subcommands/TestTabCompletion.java

@@ -26,6 +26,7 @@
 @Component
 @RequiredArgsConstructor
 @ConditionalOnBean(Plugin.class)
+@SuppressWarnings("unchecked")
 class BukkitPluginUnloader {
 
     private final PluginManager pluginManager;