Fix media tabcomplete for region commands

Mindgamesnl · Feb 21, 2024 · 88527e0 · 88527e0
1 parent 22cd933
commit 88527e0
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 6 deletions.
diff --git a/modules/vistas-server/dependency-reduced-pom.xml b/modules/vistas-server/dependency-reduced-pom.xml
@@ -174,6 +174,12 @@
       <artifactId>junit</artifactId>
       <version>4.13.2</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>hamcrest-core</artifactId>
+          <groupId>org.hamcrest</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
   <properties>

diff --git 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/...ava/com/craftmend/openaudiomc/bungee/modules/commands/subcommand/BungeeRegionCommand.java b/...ava/com/craftmend/openaudiomc/bungee/modules/commands/subcommand/BungeeRegionCommand.java
@@ -27,10 +27,12 @@ public BungeeRegionCommand() {
         registerArguments(
                 new Argument("create <WG-region> <source> [volume]",
                         "Assigns a sound to a WorldGuard region by name, with optional volume")
+                        .addTabCompleteProvider(1, (sender) -> new String[]{"<region-name>"})
                         .addTabCompleteProvider(2, MediaTabcompleteProvider.getInstance()),
 
                 new Argument("temp <WG-region> <source> <duration>",
                         "Create a temporary region with it's own synced sound")
+                        .addTabCompleteProvider(1, (sender) -> new String[]{"<region-name>"})
                         .addTabCompleteProvider(2, MediaTabcompleteProvider.getInstance()),
 
                 new Argument("delete <WG-region>",

diff --git a/.../main/java/com/craftmend/openaudiomc/generic/commands/interfaces/TabCompleteProvider.java b/.../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/...java/com/craftmend/openaudiomc/spigot/modules/commands/subcommands/RegionsSubCommand.java b/...java/com/craftmend/openaudiomc/spigot/modules/commands/subcommands/RegionsSubCommand.java
@@ -28,10 +28,12 @@ public RegionsSubCommand(OpenAudioMcSpigot openAudioMcSpigot) {
         registerArguments(
                 new Argument("create <WG-region> <source> [volume]",
                         "Assigns a sound to a WorldGuard region by name, with optional volume")
+                        .addTabCompleteProvider(1, (sender) -> new String[]{"<region-name>"})
                         .addTabCompleteProvider(2, MediaTabcompleteProvider.getInstance()),
 
                 new Argument("temp <WG-region> <source> <duration>",
                         "Create a temporary region with it's own synced sound")
+                        .addTabCompleteProvider(1, (sender) -> new String[]{"<region-name>"})
                         .addTabCompleteProvider(2, MediaTabcompleteProvider.getInstance()),
 
                 new Argument("delete <WG-region>",

diff --git a/...com/craftmend/openaudiomc/velocity/modules/commands/subcommand/VelocityRegionCommand.java b/...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 <WG-region> <source> [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[]{"<region-name>"})
+                        .addTabCompleteProvider(2, MediaTabcompleteProvider.getInstance()),
 
                 new Argument("temp <WG-region> <source> <duration>",
-                        "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[]{"<region-name>"})
+                        .addTabCompleteProvider(2, MediaTabcompleteProvider.getInstance()),
 
                 new Argument("delete <WG-region>",
                         "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
@@ -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
@@ -1,3 +1,3 @@
-BUILD_VERSION="1386"
-BUILD_COMMIT="732bfd16a7a25b5a99d36d69d7a3962ed37e1a9c"
+BUILD_VERSION="1390"
+BUILD_COMMIT="22cd93317b49657bbf4ab646dd63cd09b973ce9e"
 BUILD_AUTHOR="Mats"