Implement SenderNodeSuggester to builders

Author: benwoo1110

src/main/java/org/mvplugins/multiverse/core/config/CoreConfigNodes.java

@@ -4,7 +4,6 @@
 import io.vavr.control.Try;
 import jakarta.inject.Inject;
 import jakarta.inject.Provider;
-import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.event.EventPriority;
 import org.bukkit.plugin.PluginManager;
@@ -19,7 +18,6 @@
 import org.mvplugins.multiverse.core.config.node.Node;
 import org.mvplugins.multiverse.core.config.node.NodeGroup;
 import org.mvplugins.multiverse.core.config.node.functions.NodeStringParser;
-import org.mvplugins.multiverse.core.config.node.functions.SenderNodeSuggester;
 import org.mvplugins.multiverse.core.config.node.serializer.NodeSerializer;
 import org.mvplugins.multiverse.core.destination.DestinationsProvider;
 import org.mvplugins.multiverse.core.destination.core.WorldDestination;
@@ -253,7 +251,7 @@ private <N extends Node> N node(N node) {
             .comment("This only applies if first-spawn-override is set to true.")
             .defaultValue("")
             .name("first-spawn-location")
-            .suggester((SenderNodeSuggester) this::suggestDestinations)
+            .suggester(this::suggestDestinations)
             .build());
 
     final ConfigNode<Boolean> enableJoinDestination = node(ConfigNode.builder("spawn.enable-join-destination", Boolean.class)
@@ -270,7 +268,7 @@ private <N extends Node> N node(N node) {
             .comment("Set the above enable-join-destination to false to disable")
             .defaultValue("")
             .name("join-destination")
-            .suggester((SenderNodeSuggester) this::suggestDestinations)
+            .suggester(this::suggestDestinations)
             .build());
 
     final ConfigNode<Boolean> defaultRespawnInOverworld = node(ConfigNode.builder("spawn.default-respawn-in-overworld", Boolean.class)

src/main/java/org/mvplugins/multiverse/core/config/node/ConfigNode.java

@@ -9,6 +9,7 @@
 import io.vavr.control.Option;
 import io.vavr.control.Try;
 import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -267,6 +268,20 @@ protected Builder(@NotNull String path, @NotNull Class<T> type) {
             return self();
         }
 
+        /**
+         * Sets the suggester for this node with sender context.
+         *
+         * @param suggester The suggester for this node.
+         * @return This builder.
+         *
+         * @since 5.1
+         */
+        @ApiStatus.AvailableSince("5.1")
+        public @NotNull B suggester(@NotNull SenderNodeSuggester suggester) {
+            this.suggester = suggester;
+            return self();
+        }
+
         /**
          * Sets the string parser for this node.
          *

src/main/java/org/mvplugins/multiverse/core/config/node/ListConfigNode.java

@@ -13,6 +13,7 @@
 import io.vavr.Value;
 import io.vavr.control.Try;
 import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -111,12 +112,12 @@ private void setDefaults() {
     }
 
     private void setDefaultSuggester() {
-        this.suggester = input -> {
-            if (input == null) {
-                return itemSuggester.suggest(null);
-            }
-            return StringFormatter.addonToCommaSeperated(input, itemSuggester.suggest(input));
-        };
+        if (itemSuggester instanceof SenderNodeSuggester senderItemSuggester) {
+            this.suggester = (SenderNodeSuggester)(sender, input) ->
+                    StringFormatter.addonToCommaSeperated(input, senderItemSuggester.suggest(sender, input));
+        } else {
+            this.suggester = input -> StringFormatter.addonToCommaSeperated(input, itemSuggester.suggest(input));
+        }
     }
 
     private void setDefaultStringParser() {
@@ -279,6 +280,20 @@ protected Builder(@NotNull String path, @NotNull Class<I> itemType) {
             return self();
         }
 
+        /**
+         * Sets the suggester for an individual item in the list with sender context.
+         *
+         * @param itemSuggester The suggester.
+         * @return This builder.
+         *
+         * @since 5.1
+         */
+        @ApiStatus.AvailableSince("5.1")
+        public @NotNull B itemSuggester(@NotNull SenderNodeSuggester itemSuggester) {
+            this.itemSuggester = itemSuggester;
+            return self();
+        }
+
         /**
          * Sets the string parser for an individual item in the list.
          *

src/main/java/org/mvplugins/multiverse/core/config/node/functions/SenderNodeSuggester.java

@@ -23,6 +23,8 @@ public interface SenderNodeSuggester extends NodeSuggester {
      * @param sender    The sender context.
      * @param input     The current partial user input
      * @return The possible values.
+     *
+     * @since 5.1
      */
     @ApiStatus.AvailableSince("5.1")
     @NotNull Collection<String> suggest(@NotNull CommandSender sender, @Nullable String input);