Enhance command argument suggestions based on world environment

Updated the WorldLinkCreateCommand and WorldLinkRemoveCommand to suggest arguments based on the world environment. This ensures that only appropriate worlds are suggested for source, destination, and relative arguments, improving the user experience and command accuracy.
TheNextLvl-net · Aug 14, 2024 · 328f745 · 328f745
1 parent a029352
commit 328f745
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/plugin/src/main/java/net/thenextlvl/worlds/command/WorldLinkCreateCommand.java b/plugin/src/main/java/net/thenextlvl/worlds/command/WorldLinkCreateCommand.java
@@ -20,8 +20,11 @@ public class WorldLinkCreateCommand {
         return Commands.literal("create")
                 .requires(source -> source.getSender().hasPermission("worlds.command.link.create"))
                 .then(Commands.argument("source", ArgumentTypes.world())
-                        .suggests(new WorldSuggestionProvider<>(plugin))
+                        .suggests(new WorldSuggestionProvider<>(plugin, world ->
+                                world.getEnvironment().equals(World.Environment.NORMAL)))
                         .then(Commands.argument("destination", ArgumentTypes.world())
+                                .suggests(new WorldSuggestionProvider<>(plugin, world ->
+                                        !world.getEnvironment().equals(World.Environment.NORMAL)))
                                 .executes(context -> {
                                     var source = context.getArgument("source", World.class);
                                     var destination = context.getArgument("destination", World.class);

diff --git a/plugin/src/main/java/net/thenextlvl/worlds/command/WorldLinkRemoveCommand.java b/plugin/src/main/java/net/thenextlvl/worlds/command/WorldLinkRemoveCommand.java
@@ -22,8 +22,10 @@ public class WorldLinkRemoveCommand {
         return Commands.literal("remove")
                 .requires(source -> source.getSender().hasPermission("worlds.command.link.remove"))
                 .then(Commands.argument("world", ArgumentTypes.world())
-                        .suggests(new WorldSuggestionProvider<>(plugin))
-                        .then(Commands.argument("relative", new RelativeArgument())
+                        .suggests(new WorldSuggestionProvider<>(plugin, world ->
+                                world.getEnvironment().equals(World.Environment.NORMAL)))
+                        .then(Commands.argument("relative", new RelativeArgument(relative ->
+                                        !relative.equals(Relative.OVERWORLD)))
                                 .executes(context -> {
                                     var world = context.getArgument("world", World.class);
                                     var relative = context.getArgument("relative", Relative.class);