From 88527e09d95b4ed8f108a047661b9a8c92e96fbf Mon Sep 17 00:00:00 2001 From: Mats Date: Wed, 21 Feb 2024 21:33:10 +0100 Subject: [PATCH] Fix media tabcomplete for region commands --- modules/vistas-server/dependency-reduced-pom.xml | 6 ++++++ plugin/src/main/bash/data.bin | 2 +- .../modules/commands/subcommand/BungeeRegionCommand.java | 2 ++ .../generic/commands/interfaces/TabCompleteProvider.java | 1 + .../modules/commands/subcommands/RegionsSubCommand.java | 2 ++ .../commands/subcommand/VelocityRegionCommand.java | 9 +++++++-- plugin/src/main/resources/data.bin | 2 +- plugin/src/main/resources/openaudiomc-build.properties | 4 ++-- 8 files changed, 22 insertions(+), 6 deletions(-) diff --git a/modules/vistas-server/dependency-reduced-pom.xml b/modules/vistas-server/dependency-reduced-pom.xml index 922179d83..3cb256284 100644 --- a/modules/vistas-server/dependency-reduced-pom.xml +++ b/modules/vistas-server/dependency-reduced-pom.xml @@ -174,6 +174,12 @@ junit 4.13.2 test + + + hamcrest-core + org.hamcrest + + diff --git a/plugin/src/main/bash/data.bin b/plugin/src/main/bash/data.bin index ba1ca5a7c..f9d500b58 100755 --- a/plugin/src/main/bash/data.bin +++ b/plugin/src/main/bash/data.bin @@ -1 +1 @@ -BUILD_NUM="1386" +BUILD_NUM="1390" diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/bungee/modules/commands/subcommand/BungeeRegionCommand.java b/plugin/src/main/java/com/craftmend/openaudiomc/bungee/modules/commands/subcommand/BungeeRegionCommand.java index 58b044126..8d4bff068 100644 --- a/plugin/src/main/java/com/craftmend/openaudiomc/bungee/modules/commands/subcommand/BungeeRegionCommand.java +++ b/plugin/src/main/java/com/craftmend/openaudiomc/bungee/modules/commands/subcommand/BungeeRegionCommand.java @@ -27,10 +27,12 @@ public BungeeRegionCommand() { registerArguments( new Argument("create [volume]", "Assigns a sound to a WorldGuard region by name, with optional volume") + .addTabCompleteProvider(1, (sender) -> new String[]{""}) .addTabCompleteProvider(2, MediaTabcompleteProvider.getInstance()), new Argument("temp ", "Create a temporary region with it's own synced sound") + .addTabCompleteProvider(1, (sender) -> new String[]{""}) .addTabCompleteProvider(2, MediaTabcompleteProvider.getInstance()), new Argument("delete ", diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/generic/commands/interfaces/TabCompleteProvider.java b/plugin/src/main/java/com/craftmend/openaudiomc/generic/commands/interfaces/TabCompleteProvider.java index 7d956a638..d984975d9 100644 --- a/plugin/src/main/java/com/craftmend/openaudiomc/generic/commands/interfaces/TabCompleteProvider.java +++ b/plugin/src/main/java/com/craftmend/openaudiomc/generic/commands/interfaces/TabCompleteProvider.java @@ -2,6 +2,7 @@ import com.craftmend.openaudiomc.generic.user.User; +@FunctionalInterface public interface TabCompleteProvider { String[] getOptions(User sender); diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/commands/subcommands/RegionsSubCommand.java b/plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/commands/subcommands/RegionsSubCommand.java index 204760f1c..e13e4827b 100644 --- a/plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/commands/subcommands/RegionsSubCommand.java +++ b/plugin/src/main/java/com/craftmend/openaudiomc/spigot/modules/commands/subcommands/RegionsSubCommand.java @@ -28,10 +28,12 @@ public RegionsSubCommand(OpenAudioMcSpigot openAudioMcSpigot) { registerArguments( new Argument("create [volume]", "Assigns a sound to a WorldGuard region by name, with optional volume") + .addTabCompleteProvider(1, (sender) -> new String[]{""}) .addTabCompleteProvider(2, MediaTabcompleteProvider.getInstance()), new Argument("temp ", "Create a temporary region with it's own synced sound") + .addTabCompleteProvider(1, (sender) -> new String[]{""}) .addTabCompleteProvider(2, MediaTabcompleteProvider.getInstance()), new Argument("delete ", diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/velocity/modules/commands/subcommand/VelocityRegionCommand.java b/plugin/src/main/java/com/craftmend/openaudiomc/velocity/modules/commands/subcommand/VelocityRegionCommand.java index 12bbf4052..d42596fd2 100644 --- a/plugin/src/main/java/com/craftmend/openaudiomc/velocity/modules/commands/subcommand/VelocityRegionCommand.java +++ b/plugin/src/main/java/com/craftmend/openaudiomc/velocity/modules/commands/subcommand/VelocityRegionCommand.java @@ -4,6 +4,7 @@ import com.craftmend.openaudiomc.OpenAudioMc; import com.craftmend.openaudiomc.generic.commands.interfaces.SubCommand; import com.craftmend.openaudiomc.generic.commands.objects.Argument; +import com.craftmend.openaudiomc.generic.media.tabcomplete.MediaTabcompleteProvider; import com.craftmend.openaudiomc.generic.node.enums.ProxiedCommand; import com.craftmend.openaudiomc.generic.node.packets.CommandProxyPacket; import com.craftmend.openaudiomc.generic.proxy.interfaces.UserHooks; @@ -17,10 +18,14 @@ public VelocityRegionCommand() { super("region"); registerArguments( new Argument("create [volume]", - "Assigns a sound to a WorldGuard region by name, with optional volume"), + "Assigns a sound to a WorldGuard region by name, with optional volume") + .addTabCompleteProvider(1, (sender) -> new String[]{""}) + .addTabCompleteProvider(2, MediaTabcompleteProvider.getInstance()), new Argument("temp ", - "Create a temporary region with it's own synced sound"), + "Create a temporary region with it's own synced sound") + .addTabCompleteProvider(1, (sender) -> new String[]{""}) + .addTabCompleteProvider(2, MediaTabcompleteProvider.getInstance()), new Argument("delete ", "Unlink the sound from a WorldGuard specific region by name"), diff --git a/plugin/src/main/resources/data.bin b/plugin/src/main/resources/data.bin index ba1ca5a7c..f9d500b58 100755 --- a/plugin/src/main/resources/data.bin +++ b/plugin/src/main/resources/data.bin @@ -1 +1 @@ -BUILD_NUM="1386" +BUILD_NUM="1390" diff --git a/plugin/src/main/resources/openaudiomc-build.properties b/plugin/src/main/resources/openaudiomc-build.properties index 1cb9835d9..079378f02 100644 --- a/plugin/src/main/resources/openaudiomc-build.properties +++ b/plugin/src/main/resources/openaudiomc-build.properties @@ -1,3 +1,3 @@ -BUILD_VERSION="1386" -BUILD_COMMIT="732bfd16a7a25b5a99d36d69d7a3962ed37e1a9c" +BUILD_VERSION="1390" +BUILD_COMMIT="22cd93317b49657bbf4ab646dd63cd09b973ce9e" BUILD_AUTHOR="Mats"