From d52f0071a48d19f1810d6d3fab0f4369245de5c7 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 13 Mar 2020 22:29:10 -0500 Subject: [PATCH] Add /ping command --- .../net/minecraft/server/ArgumentEntity.java | 2 ++ .../minecraft/server/CommandDispatcher.java | 5 ++- .../server/CommandListenerWrapper.java | 1 + .../net/pl3x/purpur/command/PingCommand.java | 33 +++++++++++++++++++ src/main/resources/purpur.lang | 1 + 5 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 src/main/java/net/pl3x/purpur/command/PingCommand.java diff --git a/src/main/java/net/minecraft/server/ArgumentEntity.java b/src/main/java/net/minecraft/server/ArgumentEntity.java index 39a6a9ac00..5568649b7e 100644 --- a/src/main/java/net/minecraft/server/ArgumentEntity.java +++ b/src/main/java/net/minecraft/server/ArgumentEntity.java @@ -69,10 +69,12 @@ public class ArgumentEntity implements ArgumentType { return ((EntitySelector) commandcontext.getArgument(s, EntitySelector.class)).c((CommandListenerWrapper) commandcontext.getSource()); } + public static ArgumentEntity players() { return d(); } // Purpur - OBFHELPER public static ArgumentEntity d() { return new ArgumentEntity(false, true); } + public static Collection getPlayers(CommandContext commandcontext, String s) throws CommandSyntaxException { return f(commandcontext, s); } // Purpur - OBFHELPER public static Collection f(CommandContext commandcontext, String s) throws CommandSyntaxException { List list = ((EntitySelector) commandcontext.getArgument(s, EntitySelector.class)).d((CommandListenerWrapper) commandcontext.getSource()); diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java index c9d1f94100..3b15f953bc 100644 --- a/src/main/java/net/minecraft/server/CommandDispatcher.java +++ b/src/main/java/net/minecraft/server/CommandDispatcher.java @@ -30,7 +30,7 @@ import org.bukkit.event.server.ServerCommandEvent; public class CommandDispatcher { private static final Logger LOGGER = LogManager.getLogger(); - private final com.mojang.brigadier.CommandDispatcher b = new com.mojang.brigadier.CommandDispatcher(); + private final com.mojang.brigadier.CommandDispatcher b = new com.mojang.brigadier.CommandDispatcher(); private com.mojang.brigadier.CommandDispatcher getDispatcher() { return b; } // Purpur - OBFHELPER // CraftBukkit start public final CommandDispatcher init(boolean flag) { @@ -107,6 +107,7 @@ public class CommandDispatcher { CommandStop.a(this.b); CommandWhitelist.a(this.b); net.pl3x.purpur.command.MSPTCommand.register(getDispatcher()); // Purpur + net.pl3x.purpur.command.PingCommand.register(getDispatcher()); // Purpur } this.b.findAmbiguities((commandnode, commandnode1, commandnode2, collection) -> { @@ -316,10 +317,12 @@ public class CommandDispatcher { } + public static LiteralArgumentBuilder register(String s) { return a(s); } // Purpur - OBFHELPER public static LiteralArgumentBuilder a(String s) { return LiteralArgumentBuilder.literal(s); } + public static RequiredArgumentBuilder argument(String s, ArgumentType argumenttype) { return a(s, argumenttype); } // Purpur - OBFHELPER public static RequiredArgumentBuilder a(String s, ArgumentType argumenttype) { return RequiredArgumentBuilder.argument(s, argumenttype); } diff --git a/src/main/java/net/minecraft/server/CommandListenerWrapper.java b/src/main/java/net/minecraft/server/CommandListenerWrapper.java index 0b23a0548d..ab0cf8b561 100644 --- a/src/main/java/net/minecraft/server/CommandListenerWrapper.java +++ b/src/main/java/net/minecraft/server/CommandListenerWrapper.java @@ -159,6 +159,7 @@ public class CommandListenerWrapper implements ICompletionProvider { } } + public EntityPlayer getPlayerOrException() throws CommandSyntaxException { return h(); } // Purpur - OBFHELPER public EntityPlayer h() throws CommandSyntaxException { if (!(this.k instanceof EntityPlayer)) { throw CommandListenerWrapper.a.create(); diff --git a/src/main/java/net/pl3x/purpur/command/PingCommand.java b/src/main/java/net/pl3x/purpur/command/PingCommand.java new file mode 100644 index 0000000000..dac3083bf0 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/command/PingCommand.java @@ -0,0 +1,33 @@ +package net.pl3x.purpur.command; + +import net.minecraft.server.ArgumentEntity; +import net.minecraft.server.CommandDispatcher; +import net.minecraft.server.CommandListenerWrapper; +import net.minecraft.server.EntityPlayer; +import net.minecraft.server.LocaleLanguage; + +import java.util.Collection; +import java.util.Collections; + +public class PingCommand { + public static void register(com.mojang.brigadier.CommandDispatcher dispatcher) { + dispatcher.register(CommandDispatcher.register("ping") + .requires((listener) -> { + return listener.hasPermission(2); + }) + .executes((context) -> { + return execute(context.getSource(), Collections.singleton(context.getSource().getPlayerOrException())); + }) + .then(CommandDispatcher.argument("targets", ArgumentEntity.players()).executes((context) -> { + return execute(context.getSource(), ArgumentEntity.getPlayers(context, "targets")); + })) + ).setPermission("bukkit.command.ping"); + } + + private static int execute(CommandListenerWrapper sender, Collection targets) { + for (EntityPlayer player : targets) { + sender.sendMessage(LocaleLanguage.translate("commands.purpur.ping", player.getScoreboardDisplayName(), player.ping), false); + } + return targets.size(); + } +} diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang index 151ea90928..63a5ad0037 100644 --- a/src/main/resources/purpur.lang +++ b/src/main/resources/purpur.lang @@ -1,6 +1,7 @@ { "commands.purpur.mspt": "§6Server tick times §e(§7avg§e/§7min§e/§7max§e)§6 from last 5s§7,§6 10s§7,§6 1m§e:", "commands.purpur.mspt.times": "§6◴ %s§7/%s§7/%s§e, %s§7/%s§7/%s§e, %s§7/%s§7/%s", + "commands.purpur.ping": "§a%s's ping is %sms", "idle.timeout.broadcast.away": "§e§o%s is now AFK", "idle.timeout.broadcast.back": "§e§o%s is no longer AFK" } -- 2.24.0