Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Start using lang asset for commands

Browse Source
This commit is contained in:
William Blake Galbreath
2020-03-26 14:29:04 -05:00
parent c0a4d03625
commit faf5e485c4
4 changed files with 71 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/server/0107-Add-ping-command.patch
View File

@@ -1,4 +1,4 @@
From 8468a0984bd94e3262646912f5b09e8c1216de60 Mon Sep 17 00:00:00 2001
From 0fa2b2131a54e8622238ab538933a0454a27b4d4 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
@@ -8,8 +8,9 @@ Subject: [PATCH] Add /ping command
.../minecraft/server/CommandDispatcher.java | 5 ++-
.../server/CommandListenerWrapper.java | 1 +
.../java/net/pl3x/purpur/PurpurConfig.java | 1 +
.../net/pl3x/purpur/command/PingCommand.java | 35 +++++++++++++++++++
5 files changed, 43 insertions(+), 1 deletion(-)
.../net/pl3x/purpur/command/PingCommand.java | 34 +++++++++++++++++++
.../assets/minecraft/lang/en_us.json | 1 +
6 files changed, 43 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
@@ -89,10 +90,10 @@ index 63a91e7b7a..f9f83e5b9a 100644
import org.bukkit.configuration.InvalidConfigurationException;
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..883b68a5cf
index 0000000000..3aea2a76db
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/command/PingCommand.java
@@ -0,0 +1,35 @@
@@ -0,0 +1,34 @@
+package net.pl3x.purpur.command;
+
+
@@ -102,7 +103,6 @@ index 0000000000..883b68a5cf
+import net.minecraft.server.CommandDispatcher;
+import net.minecraft.server.CommandListenerWrapper;
+import net.minecraft.server.EntityPlayer;
+import org.bukkit.ChatColor;
+
+import java.util.Collection;
+import java.util.Collections;
@@ -123,11 +123,23 @@ index 0000000000..883b68a5cf
+
+ private static int execute(CommandListenerWrapper sender, Collection<EntityPlayer> targets) throws CommandSyntaxException {
+ for (EntityPlayer player : targets) {
+ sender.sendMessage(new ChatMessage(ChatColor.GREEN + "%s's ping is %sms", player.getScoreboardDisplayName(), player.ping), false);
+ sender.sendMessage(new ChatMessage("commands.purpur.ping", player.getScoreboardDisplayName(), player.ping), false);
+ }
+ return targets.size();
+ }
+}
diff --git a/src/main/resources/assets/minecraft/lang/en_us.json b/src/main/resources/assets/minecraft/lang/en_us.json
index ae0b45fe41..2d7d38d2fb 100644
--- a/src/main/resources/assets/minecraft/lang/en_us.json
+++ b/src/main/resources/assets/minecraft/lang/en_us.json
@@ -4071,6 +4071,7 @@
"commands.spectate.success.started": "Now spectating %s",
"commands.spectate.not_spectator": "%s is not in spectator mode",
"commands.spectate.self": "Cannot spectate yourself",
+ "commands.purpur.ping": "§a%s's ping is %sms",
"argument.range.empty": "Expected value or range of values",
"argument.range.ints": "Only whole numbers allowed, not decimals",
"argument.range.swapped": "Min cannot be bigger than max",
--
2.24.0