From a3e0cf717c234d54b9f909d29976b4fa01fea99c Mon Sep 17 00:00:00 2001 From: Mats Date: Fri, 22 Nov 2024 18:15:39 +0100 Subject: [PATCH] implement commands --- .tool-versions | 2 +- plugin/src/main/bash/data.bin | 2 +- .../commands/subcommands/AliasSubCommand.java | 14 ++++++++++---- plugin/src/main/resources/data.bin | 2 +- .../main/resources/openaudiomc-build.properties | 4 ++-- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.tool-versions b/.tool-versions index bb5e993457..8ad369382b 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -java openjdk-21 +java openjdk-17 diff --git a/plugin/src/main/bash/data.bin b/plugin/src/main/bash/data.bin index 3292e4462c..bbb6f890cb 100755 --- a/plugin/src/main/bash/data.bin +++ b/plugin/src/main/bash/data.bin @@ -1 +1 @@ -BUILD_NUM="1458" +BUILD_NUM="1464" diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/commands/subcommands/AliasSubCommand.java b/plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/commands/subcommands/AliasSubCommand.java index d283fbed81..5e791f0d9c 100644 --- a/plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/commands/subcommands/AliasSubCommand.java +++ b/plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/commands/subcommands/AliasSubCommand.java @@ -5,6 +5,7 @@ import com.craftmend.openaudiomc.generic.commands.interfaces.SubCommand; import com.craftmend.openaudiomc.generic.commands.objects.Argument; import com.craftmend.openaudiomc.generic.database.DatabaseService; +import com.craftmend.openaudiomc.generic.media.tabcomplete.MediaTabcompleteProvider; import com.craftmend.openaudiomc.generic.user.User; import com.craftmend.openaudiomc.spigot.modules.shortner.AliasService; import com.craftmend.openaudiomc.spigot.modules.shortner.completer.AliasNameTabCompleter; @@ -20,20 +21,25 @@ public AliasSubCommand() { registerArguments( new Argument(" ", "Register a Alias for a source URL so you can easaly memorize them and can paste them onto signs without having to type a complete dictionary." + - " When an alias like onride_music is set, you can trigger it by using a:onride_music as your source."), + " When an alias like onride_music is set, you can trigger it by using a:onride_music as your source.") + .addTabCompleteProvider(1, (sender) -> new String[]{""}) + .addTabCompleteProvider(2, MediaTabcompleteProvider.getInstance()), new Argument("delete ", "Delete a alias from the database. This will also remove it from the memory cache.") - .addTabCompleteProvider(1, AliasNameTabCompleter.getInstance()), + .addTabCompleteProvider(1, (sender) -> new String[]{""}) + .addTabCompleteProvider(2, AliasNameTabCompleter.getInstance()), new Argument("resolve ", "Resolve a alias to see what it's target is.") - .addTabCompleteProvider(1, AliasNameTabCompleter.getInstance()), + .addTabCompleteProvider(1, (sender) -> new String[]{""}) + .addTabCompleteProvider(2, AliasNameTabCompleter.getInstance()) ); } @Override public void onExecute(User sender, String[] args) { - if (args.length == 2) { + sender.sendMessage("Length: " + args.length); + if (args.length == 2 && !args[0].equalsIgnoreCase("delete") && !args[0].equalsIgnoreCase("resolve")) { String aliasName = args[0].toLowerCase(); String aliasSource = args[1]; diff --git a/plugin/src/main/resources/data.bin b/plugin/src/main/resources/data.bin index 3292e4462c..bbb6f890cb 100755 --- a/plugin/src/main/resources/data.bin +++ b/plugin/src/main/resources/data.bin @@ -1 +1 @@ -BUILD_NUM="1458" +BUILD_NUM="1464" diff --git a/plugin/src/main/resources/openaudiomc-build.properties b/plugin/src/main/resources/openaudiomc-build.properties index 00a7ad0c14..f15b36edbd 100644 --- a/plugin/src/main/resources/openaudiomc-build.properties +++ b/plugin/src/main/resources/openaudiomc-build.properties @@ -1,3 +1,3 @@ -BUILD_VERSION="1458" -BUILD_COMMIT="461fcc4bfc82654a0863e0b2fbd68555673c3bb1" +BUILD_VERSION="1464" +BUILD_COMMIT="dccddcdf334b1fd3fdbf9bd2d41215000b18c066" BUILD_AUTHOR="Mats"