Add ping command

patches/server/0060-Add-ping-command.patch

@@ -1,77 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Fri, 13 Mar 2020 22:29:10 -0500
-Subject: [PATCH] Add ping command
-
-
-diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
-index 832930024b0d642496efe17f7e2f8e02413275f0..d4ca48d52c32c5dfb290936fdfc7268f0485aeaf 100644
---- a/net/minecraft/commands/Commands.java
-+++ b/net/minecraft/commands/Commands.java
-@@ -255,6 +255,7 @@ public class Commands {
-             StopCommand.register(this.dispatcher);
-             TransferCommand.register(this.dispatcher);
-             WhitelistCommand.register(this.dispatcher);
-+            org.purpurmc.purpur.command.PingCommand.register(this.dispatcher); // Purpur
-         }
- 
-         if (environment.includeIntegrated) {
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 46d06b6887eac6b2e7b3fd9834fdd9284a773f39..33bece7921477677370829c8d5243796bb52deb1 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -182,6 +182,7 @@ public class PurpurConfig {
-     public static boolean afkBroadcastUseDisplayName = false;
-     public static String afkTabListPrefix = "[AFK] ";
-     public static String afkTabListSuffix = "";
-+    public static String pingCommandOutput = "<green>%s's ping is %sms";
-     private static void messages() {
-         cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
-         afkBroadcastAway = getString("settings.messages.afk-broadcast-away", afkBroadcastAway);
-@@ -189,6 +190,7 @@ public class PurpurConfig {
-         afkBroadcastUseDisplayName = getBoolean("settings.messages.afk-broadcast-use-display-name", afkBroadcastUseDisplayName);
-         afkTabListPrefix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-prefix", afkTabListPrefix)));
-         afkTabListSuffix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix)));
-+        pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);
-     }
- 
-     public static String serverModName = io.papermc.paper.ServerBuildInfo.buildInfo().brandName();
-diff --git a/src/main/java/org/purpurmc/purpur/command/PingCommand.java b/src/main/java/org/purpurmc/purpur/command/PingCommand.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..f202b98a194604e39798fdb8e417c6d2835f71c8
---- /dev/null
-+++ b/src/main/java/org/purpurmc/purpur/command/PingCommand.java
-@@ -0,0 +1,33 @@
-+package org.purpurmc.purpur.command;
-+
-+import com.mojang.brigadier.CommandDispatcher;
-+import net.minecraft.commands.CommandSourceStack;
-+import net.minecraft.commands.Commands;
-+import net.minecraft.commands.arguments.EntityArgument;
-+import net.minecraft.server.level.ServerPlayer;
-+import org.purpurmc.purpur.PurpurConfig;
-+import org.bukkit.craftbukkit.util.CraftChatMessage;
-+
-+import java.util.Collection;
-+import java.util.Collections;
-+
-+public class PingCommand {
-+    public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
-+        dispatcher.register(Commands.literal("ping")
-+                .requires((listener) -> listener.hasPermission(2, "bukkit.command.ping"))
-+                .executes((context) -> execute(context.getSource(), Collections.singleton(context.getSource().getPlayerOrException())))
-+                .then(Commands.argument("targets", EntityArgument.players())
-+                        .requires(listener -> listener.hasPermission(2, "bukkit.command.ping.other"))
-+                        .executes((context) -> execute(context.getSource(), EntityArgument.getPlayers(context, "targets")))
-+                )
-+        );
-+    }
-+
-+    private static int execute(CommandSourceStack sender, Collection<ServerPlayer> targets) {
-+        for (ServerPlayer player : targets) {
-+            String output = String.format(PurpurConfig.pingCommandOutput, player.getGameProfile().getName(), player.connection.latency());
-+            sender.sendSuccess(output, false);
-+        }
-+        return targets.size();
-+    }
-+}

purpur-server/minecraft-patches/sources/net/minecraft/commands/Commands.java.patch

@@ -8,6 +8,14 @@
  import org.slf4j.Logger;
  
  public class Commands {
+@@ -245,6 +_,7 @@
+             StopCommand.register(this.dispatcher);
+             TransferCommand.register(this.dispatcher);
+             WhitelistCommand.register(this.dispatcher);
++            org.purpurmc.purpur.command.PingCommand.register(this.dispatcher); // Purpur - Add ping command
+         }
+ 
+         if (selection.includeIntegrated) {
 @@ -488,6 +_,7 @@
      private void runSync(ServerPlayer player, java.util.Collection<String> bukkit, RootCommandNode<SharedSuggestionProvider> rootCommandNode) {
          // Paper end - Perf: Async command map building

purpur-server/src/main/java/org/purpurmc/purpur/PurpurConfig.java

@@ -163,6 +163,7 @@ public class PurpurConfig {
     public static boolean afkBroadcastUseDisplayName = false;
     public static String afkTabListPrefix = "[AFK] ";
     public static String afkTabListSuffix = "";
+    public static String pingCommandOutput = "<green>%s's ping is %sms";
     private static void messages() {
         cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
         afkBroadcastAway = getString("settings.messages.afk-broadcast-away", afkBroadcastAway);
@@ -170,6 +171,7 @@ public class PurpurConfig {
         afkBroadcastUseDisplayName = getBoolean("settings.messages.afk-broadcast-use-display-name", afkBroadcastUseDisplayName);
         afkTabListPrefix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-prefix", afkTabListPrefix)));
         afkTabListSuffix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix)));
+        pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);
     }
 
     public static String serverModName = io.papermc.paper.ServerBuildInfo.buildInfo().brandName();

purpur-server/src/main/java/org/purpurmc/purpur/command/PingCommand.java

@@ -0,0 +1,32 @@
+package org.purpurmc.purpur.command;
+
+import com.mojang.brigadier.CommandDispatcher;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+import net.minecraft.commands.arguments.EntityArgument;
+import net.minecraft.server.level.ServerPlayer;
+import org.purpurmc.purpur.PurpurConfig;
+
+import java.util.Collection;
+import java.util.Collections;
+
+public class PingCommand {
+    public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
+        dispatcher.register(Commands.literal("ping")
+                .requires((listener) -> listener.hasPermission(2, "bukkit.command.ping"))
+                .executes((context) -> execute(context.getSource(), Collections.singleton(context.getSource().getPlayerOrException())))
+                .then(Commands.argument("targets", EntityArgument.players())
+                        .requires(listener -> listener.hasPermission(2, "bukkit.command.ping.other"))
+                        .executes((context) -> execute(context.getSource(), EntityArgument.getPlayers(context, "targets")))
+                )
+        );
+    }
+
+    private static int execute(CommandSourceStack sender, Collection<ServerPlayer> targets) {
+        for (ServerPlayer player : targets) {
+            String output = String.format(PurpurConfig.pingCommandOutput, player.getGameProfile().getName(), player.connection.latency());
+            sender.sendSuccess(output, false);
+        }
+        return targets.size();
+    }
+}