Port mspt command to brigadier (#12630)

Author: NonSwag

paper-server/src/main/java/io/papermc/paper/command/PaperCommands.java

@@ -23,7 +23,6 @@ private PaperCommands() {
 
     public static void registerCommands(final MinecraftServer server) {
         COMMANDS.put("paper", new PaperCommand("paper"));
-        COMMANDS.put("mspt", new MSPTCommand("mspt"));
 
         COMMANDS.forEach((s, command) -> {
             server.server.getCommandMap().register(s, "Paper", command);
@@ -32,6 +31,7 @@ public static void registerCommands(final MinecraftServer server) {
 
     public static void registerCommands() {
         // Paper commands go here
+        registerInternalCommand(PaperMSPTCommand.create(), "paper", PaperMSPTCommand.DESCRIPTION, List.of(), Set.of());
         registerInternalCommand(PaperVersionCommand.create(), "bukkit", PaperVersionCommand.DESCRIPTION, List.of("ver", "about"), Set.of());
         registerInternalCommand(PaperPluginsCommand.create(), "bukkit", PaperPluginsCommand.DESCRIPTION, List.of("pl"), Set.of());
     }

…o/papermc/paper/command/MSPTCommand.java …ermc/paper/command/PaperMSPTCommand.javapaper-server/src/main/java/io/papermc/paper/command/MSPTCommand.java renamed to paper-server/src/main/java/io/papermc/paper/command/PaperMSPTCommand.java paper-server/src/main/java/io/papermc/paper/command/MSPTCommand.java renamed to paper-server/src/main/java/io/papermc/paper/command/PaperMSPTCommand.java

@@ -1,19 +1,19 @@
 package io.papermc.paper.command;
 
 import ca.spottedleaf.common.time.TickData;
-import net.kyori.adventure.text.Component;
-import net.minecraft.server.MinecraftServer;
-import org.bukkit.Location;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-
+import com.mojang.brigadier.Command;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.tree.LiteralCommandNode;
+import io.papermc.paper.command.brigadier.CommandSourceStack;
+import io.papermc.paper.command.brigadier.Commands;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.framework.qual.DefaultQualifier;
+import net.kyori.adventure.text.Component;
+import net.minecraft.server.MinecraftServer;
+import org.bukkit.command.CommandSender;
+import org.jspecify.annotations.NullMarked;
 
 import static net.kyori.adventure.text.Component.text;
 import static net.kyori.adventure.text.format.NamedTextColor.GOLD;
@@ -22,30 +22,24 @@
 import static net.kyori.adventure.text.format.NamedTextColor.RED;
 import static net.kyori.adventure.text.format.NamedTextColor.YELLOW;
 
-@DefaultQualifier(NonNull.class)
-public final class MSPTCommand extends Command {
-    private static final ThreadLocal<DecimalFormat> ONE_DECIMAL_PLACES = ThreadLocal.withInitial(() -> {
-        return new DecimalFormat("########0.0");
-    });
+@NullMarked
+public class PaperMSPTCommand {
+    public static final String DESCRIPTION = "View server tick times";
 
+    private static final DecimalFormat DF = new DecimalFormat("########0.0");
     private static final Component SLASH = text("/");
 
-    public MSPTCommand(final String name) {
-        super(name);
-        this.description = "View server tick times";
-        this.usageMessage = "/mspt";
-        this.setPermission("bukkit.command.mspt");
-    }
+    public static LiteralCommandNode<CommandSourceStack> create() {
+        final PaperMSPTCommand command = new PaperMSPTCommand();
 
-    @Override
-    public List<String> tabComplete(CommandSender sender, String alias, String[] args, Location location) throws IllegalArgumentException {
-        return Collections.emptyList();
+        return Commands.literal("mspt")
+            .requires(source -> source.getSender().hasPermission("bukkit.command.mspt"))
+            .executes(command::execute)
+            .build();
     }
 
-    @Override
-    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
-        if (!testPermission(sender)) return true;
-
+    private int execute(CommandContext<CommandSourceStack> context) {
+        CommandSender sender = context.getSource().getSender();
         MinecraftServer server = MinecraftServer.getServer();
 
         List<Component> times = new ArrayList<>();
@@ -82,7 +76,7 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args)
                 )
             )
         );
-        return true;
+        return Command.SINGLE_SUCCESS;
     }
 
     private static List<Component> eval(TickData tickData) {
@@ -94,6 +88,6 @@ private static List<Component> eval(TickData tickData) {
     }
 
     private static Component getColor(double avg) {
-        return text(ONE_DECIMAL_PLACES.get().format(avg), avg >= 50 ? RED : avg >= 40 ? YELLOW : GREEN);
+        return text(DF.format(avg), avg >= 50 ? RED : avg >= 40 ? YELLOW : GREEN);
     }
 }