add custom warp argument

Author: UrAvgCode

src/main/java/com/uravgcode/modernessentials/argument/WarpArgument.java

@@ -0,0 +1,43 @@
+package com.uravgcode.modernessentials.argument;
+
+import com.mojang.brigadier.StringReader;
+import com.mojang.brigadier.arguments.ArgumentType;
+import com.mojang.brigadier.arguments.StringArgumentType;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mojang.brigadier.suggestion.Suggestions;
+import com.mojang.brigadier.suggestion.SuggestionsBuilder;
+import com.uravgcode.modernessentials.module.WarpModule;
+import io.papermc.paper.command.brigadier.argument.CustomArgumentType;
+import org.jspecify.annotations.NullMarked;
+
+import java.util.concurrent.CompletableFuture;
+
+@NullMarked
+public class WarpArgument implements CustomArgumentType<String, String> {
+
+    @Override
+    public String parse(StringReader reader) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public <S> String parse(StringReader reader, S source) throws CommandSyntaxException {
+        return reader.readString();
+    }
+
+    @Override
+    public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
+        final var remaining = builder.getRemainingLowerCase();
+        for (final var warp : WarpModule.getWarps().tailMap(remaining).keySet()) {
+            if (!warp.toLowerCase().startsWith(remaining)) break;
+            builder.suggest(warp);
+        }
+        return builder.buildFuture();
+    }
+
+    @Override
+    public ArgumentType<String> getNativeType() {
+        return StringArgumentType.word();
+    }
+}

src/main/java/com/uravgcode/modernessentials/command/warp/DelWarpCommand.java

@@ -1,12 +1,11 @@
 package com.uravgcode.modernessentials.command.warp;
 
 import com.mojang.brigadier.Command;
-import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.tree.LiteralCommandNode;
+import com.uravgcode.modernessentials.argument.WarpArgument;
 import com.uravgcode.modernessentials.command.CommandBuilder;
 import com.uravgcode.modernessentials.event.warp.DelWarpEvent;
-import com.uravgcode.modernessentials.module.WarpModule;
 import io.papermc.paper.command.brigadier.CommandSourceStack;
 import io.papermc.paper.command.brigadier.Commands;
 
@@ -17,15 +16,14 @@ public final class DelWarpCommand implements CommandBuilder {
     public LiteralCommandNode<CommandSourceStack> build() {
         return Commands.literal("delwarp")
             .requires(permission("essentials.delwarp"))
-            .then(Commands.argument("name", StringArgumentType.word())
-                .suggests(WarpModule::suggestions)
+            .then(Commands.argument("name", new WarpArgument())
                 .executes(this::execute))
             .build();
     }
 
     private int execute(CommandContext<CommandSourceStack> context) {
         final var sender = context.getSource().getSender();
-        final var name = StringArgumentType.getString(context, "name");
+        final var name = context.getArgument("name", String.class);
         sender.getServer().getPluginManager().callEvent(new DelWarpEvent(sender, name));
         return Command.SINGLE_SUCCESS;
     }

src/main/java/com/uravgcode/modernessentials/command/warp/SetWarpCommand.java

@@ -1,13 +1,12 @@
 package com.uravgcode.modernessentials.command.warp;
 
 import com.mojang.brigadier.Command;
-import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.tree.LiteralCommandNode;
+import com.uravgcode.modernessentials.argument.WarpArgument;
 import com.uravgcode.modernessentials.command.CommandBuilder;
 import com.uravgcode.modernessentials.event.warp.SetWarpEvent;
 import com.uravgcode.modernessentials.exception.RequiresPlayerException;
-import com.uravgcode.modernessentials.module.WarpModule;
 import io.papermc.paper.command.brigadier.CommandSourceStack;
 import io.papermc.paper.command.brigadier.Commands;
 
@@ -18,15 +17,14 @@ public final class SetWarpCommand implements CommandBuilder {
     public LiteralCommandNode<CommandSourceStack> build() {
         return Commands.literal("setwarp")
             .requires(permission("essentials.setwarp"))
-            .then(Commands.argument("name", StringArgumentType.word())
-                .suggests(WarpModule::suggestions)
+            .then(Commands.argument("name", new WarpArgument())
                 .executes(this::execute))
             .build();
     }
 
     private int execute(CommandContext<CommandSourceStack> context) throws RequiresPlayerException {
         final var player = player(context);
-        final var name = StringArgumentType.getString(context, "name");
+        final var name = context.getArgument("name", String.class);
         player.getServer().getPluginManager().callEvent(new SetWarpEvent(player, name));
         return Command.SINGLE_SUCCESS;
     }

src/main/java/com/uravgcode/modernessentials/command/warp/WarpCommand.java

@@ -1,13 +1,12 @@
 package com.uravgcode.modernessentials.command.warp;
 
 import com.mojang.brigadier.Command;
-import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.tree.LiteralCommandNode;
+import com.uravgcode.modernessentials.argument.WarpArgument;
 import com.uravgcode.modernessentials.command.CommandBuilder;
 import com.uravgcode.modernessentials.event.warp.WarpEvent;
 import com.uravgcode.modernessentials.exception.RequiresPlayerException;
-import com.uravgcode.modernessentials.module.WarpModule;
 import io.papermc.paper.command.brigadier.CommandSourceStack;
 import io.papermc.paper.command.brigadier.Commands;
 
@@ -18,15 +17,14 @@ public final class WarpCommand implements CommandBuilder {
     public LiteralCommandNode<CommandSourceStack> build() {
         return Commands.literal("warp")
             .requires(permission("essentials.warp"))
-            .then(Commands.argument("name", StringArgumentType.word())
-                .suggests(WarpModule::suggestions)
+            .then(Commands.argument("name", new WarpArgument())
                 .executes(this::execute))
             .build();
     }
 
     private int execute(CommandContext<CommandSourceStack> context) throws RequiresPlayerException {
         final var player = player(context);
-        final var name = StringArgumentType.getString(context, "name");
+        final var name = context.getArgument("name", String.class);
         player.getServer().getPluginManager().callEvent(new WarpEvent(player, name));
         return Command.SINGLE_SUCCESS;
     }

src/main/java/com/uravgcode/modernessentials/module/WarpModule.java

@@ -1,13 +1,9 @@
 package com.uravgcode.modernessentials.module;
 
-import com.mojang.brigadier.context.CommandContext;
-import com.mojang.brigadier.suggestion.Suggestions;
-import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 import com.uravgcode.modernessentials.annotation.CommandModule;
 import com.uravgcode.modernessentials.event.warp.DelWarpEvent;
 import com.uravgcode.modernessentials.event.warp.SetWarpEvent;
 import com.uravgcode.modernessentials.event.warp.WarpEvent;
-import io.papermc.paper.command.brigadier.CommandSourceStack;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Location;
@@ -19,27 +15,25 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Collections;
 import java.util.Map;
-import java.util.TreeMap;
+import java.util.NavigableMap;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentNavigableMap;
+import java.util.concurrent.ConcurrentSkipListMap;
 
 @CommandModule(name = "warp")
 public final class WarpModule extends PluginModule {
-    private static final TreeMap<String, Location> warps = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+    private static final ConcurrentNavigableMap<String, Location> warps = new ConcurrentSkipListMap<>(String.CASE_INSENSITIVE_ORDER);
     private final File file;
 
     public WarpModule(@NotNull JavaPlugin plugin) {
         super(plugin);
         this.file = plugin.getDataPath().resolve("warps.yml").toFile();
     }
 
-    public static CompletableFuture<Suggestions> suggestions(CommandContext<CommandSourceStack> ignored, SuggestionsBuilder builder) {
-        final var remaining = builder.getRemainingLowerCase();
-        for (final var warp : warps.tailMap(remaining).keySet()) {
-            if (!warp.toLowerCase().startsWith(remaining)) break;
-            builder.suggest(warp);
-        }
-        return builder.buildFuture();
+    public static NavigableMap<String, Location> getWarps() {
+        return Collections.unmodifiableNavigableMap(warps);
     }
 
     @Override
@@ -60,7 +54,7 @@ public void reload() {
         }
     }
 
-    @EventHandler(priority = EventPriority.NORMAL)
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onWarp(WarpEvent event) {
         final var name = event.getName();
         final var player = event.getPlayer();
@@ -73,7 +67,7 @@ public void onWarp(WarpEvent event) {
         }
     }
 
-    @EventHandler(priority = EventPriority.NORMAL)
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onSetWarp(SetWarpEvent event) {
         final var name = event.getName();
         final var player = event.getPlayer();
@@ -88,7 +82,7 @@ public void onSetWarp(SetWarpEvent event) {
         saveWarps();
     }
 
-    @EventHandler(priority = EventPriority.NORMAL)
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onDelWarp(DelWarpEvent event) {
         final var name = event.getName();
         final var sender = event.getSender();