diff --git a/src/main/java/org/mvplugins/multiverse/core/command/MVCommandCompletions.java b/src/main/java/org/mvplugins/multiverse/core/command/MVCommandCompletions.java index 71acc4e50..167ef6c5f 100644 --- a/src/main/java/org/mvplugins/multiverse/core/command/MVCommandCompletions.java +++ b/src/main/java/org/mvplugins/multiverse/core/command/MVCommandCompletions.java @@ -53,7 +53,7 @@ import org.mvplugins.multiverse.core.world.generators.GeneratorPlugin; import org.mvplugins.multiverse.core.world.generators.GeneratorProvider; -import static org.mvplugins.multiverse.core.utils.StringFormatter.addonToCommaSeperated; +import static org.mvplugins.multiverse.core.utils.StringFormatter.addOnToCommaSeparated; @Service public class MVCommandCompletions extends PaperCommandCompletions { @@ -163,7 +163,7 @@ private Collection completeWithPreconditions( } } if (context.hasConfig("multiple")) { - return addonToCommaSeperated(context.getInput(), handler.getCompletions(context)); + return addOnToCommaSeparated(context.getInput(), handler.getCompletions(context)); } return handler.getCompletions(context); } @@ -334,7 +334,7 @@ private Collection suggestPlayersArray(BukkitCommandCompletionContext co matchedPlayers.add(name); } } - return addonToCommaSeperated(context.getInput(), matchedPlayers); + return addOnToCommaSeparated(context.getInput(), matchedPlayers); } private Collection suggestSpawnCategoryPropsName(BukkitCommandCompletionContext context) { diff --git a/src/main/java/org/mvplugins/multiverse/core/config/node/ListConfigNode.java b/src/main/java/org/mvplugins/multiverse/core/config/node/ListConfigNode.java index 453c7a6e0..c68468bde 100644 --- a/src/main/java/org/mvplugins/multiverse/core/config/node/ListConfigNode.java +++ b/src/main/java/org/mvplugins/multiverse/core/config/node/ListConfigNode.java @@ -120,9 +120,9 @@ private void setDefaults() { private void setDefaultSuggester() { if (itemSuggester instanceof SenderNodeSuggester senderItemSuggester) { this.suggester = (SenderNodeSuggester)(sender, input) -> - StringFormatter.addonToCommaSeperated(input, senderItemSuggester.suggest(sender, input)); + StringFormatter.addOnToCommaSeparated(input, senderItemSuggester.suggest(sender, input)); } else { - this.suggester = input -> StringFormatter.addonToCommaSeperated(input, itemSuggester.suggest(input)); + this.suggester = input -> StringFormatter.addOnToCommaSeparated(input, itemSuggester.suggest(input)); } } diff --git a/src/main/java/org/mvplugins/multiverse/core/utils/StringFormatter.java b/src/main/java/org/mvplugins/multiverse/core/utils/StringFormatter.java index e4b34896a..b7f0c2291 100644 --- a/src/main/java/org/mvplugins/multiverse/core/utils/StringFormatter.java +++ b/src/main/java/org/mvplugins/multiverse/core/utils/StringFormatter.java @@ -2,6 +2,7 @@ import com.google.common.base.Strings; import com.google.common.collect.Sets; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -71,11 +72,30 @@ private StringFormatter() { /** * Appends a list of suggestions to the end of the input string, separated by commas. + * * @param input The current input * @param addons The autocomplete suggestions * @return A collection of suggestions with the next suggestion appended + * + * @deprecated Method name has a spelling error. Use {@link #addOnToCommaSeparated(String, Collection)} instead. */ + @Deprecated(forRemoval = true, since = "5.5") + @ApiStatus.ScheduledForRemoval(inVersion = "6.0") public static Collection addonToCommaSeperated(@Nullable String input, @NotNull Collection addons) { + return addOnToCommaSeparated(input, addons); + } + + /** + * Appends a list of suggestions to the end of the input string, separated by commas. + * + * @param input The current input + * @param addons The autocomplete suggestions + * @return A collection of suggestions with the next suggestion appended + * + * @since 5.5 + */ + @ApiStatus.AvailableSince("5.5") + public static Collection addOnToCommaSeparated(@Nullable String input, @NotNull Collection addons) { if (Strings.isNullOrEmpty(input)) { return addons; }