Skip to content

Commit 3a6c133

Browse files
committed
Small improvements.
* NEW: the tooltip messages changed if the taret is not the sender. * BUG: fixed Pong catchphrase not displayed if the user enters the /ping:ping command. * NEW: the chat separators are only displayed for players.
1 parent 1583866 commit 3a6c133

File tree

2 files changed

+21
-10
lines changed

2 files changed

+21
-10
lines changed

src/main/java/fr/zcraft/Ping/Ping.java

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -169,14 +169,15 @@ else if (label.equalsIgnoreCase("ping"))
169169
final double[] tps = getServerTPS();
170170

171171

172-
sender.sendMessage(ChatColor.GRAY + "⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅");
172+
if (sender instanceof Player)
173+
sender.sendMessage(ChatColor.GRAY + "⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅");
173174

174175
if (!isSelf)
175176
{
176-
sender.sendMessage(I.t("{green}{bold}Ping, {0}!", target.getName()));
177+
sender.sendMessage(I.t("{green}{bold}{0}'s ping", target.getName()));
177178
sender.sendMessage("");
178179
}
179-
else if (label.equalsIgnoreCase("ping"))
180+
else if (label.toLowerCase().endsWith("ping"))
180181
{
181182
sender.sendMessage(I.t("{green}{bold}Pong!"));
182183
sender.sendMessage("");
@@ -186,10 +187,13 @@ else if (label.equalsIgnoreCase("ping"))
186187
.then(I.t("Latency: "))
187188
.color(ChatColor.GOLD)
188189
.hover(
189-
new ItemStackBuilder(Material.DIAMOND)
190+
new ItemStackBuilder(Material.POTATO_ITEM)
190191
.title(ChatColor.BOLD + I.t("Latency"))
191-
.longLore(ChatColor.RESET, I.t("The time needed to transfer data from you to the server."), 38)
192+
.longLore(ChatColor.RESET, isSelf
193+
? I.t("The time needed to transfer data from you to the server.")
194+
: I.t("The time needed to transfer data from {0} to the server.", target.getName()), 38)
192195
.loreLine(ChatColor.GREEN, I.t("The lower the better."))
196+
.hideAttributes()
193197
.item()
194198
)
195199

@@ -202,20 +206,22 @@ else if (label.equalsIgnoreCase("ping"))
202206
.then(I.t("Server load: "))
203207
.color(ChatColor.GOLD)
204208
.hover(
205-
new ItemStackBuilder(Material.DIAMOND)
209+
new ItemStackBuilder(Material.POTATO_ITEM)
206210
.title(ChatColor.BOLD + I.t("Ticks per second"))
207211
.longLore(ChatColor.RESET, I.t("The number of cycles the server executes per second. The best is 20; under 15, the server is experiencing difficulties."), 38)
208212
.longLore(ChatColor.GRAY, I.t("The three values are the average number of TPS during the last 1, 5 and 15 minutes."), 38)
209213
.loreLine(ChatColor.GREEN, I.t("The closest to 20 the better."))
210-
.item()
214+
.hideAttributes()
215+
.item()
211216
)
212217

213218
.then(tps != null ? formatTPS(tps) : I.t("{gray}(unable to retrieve server load)"))
214219

215220
.build()
216221
);
217222

218-
sender.sendMessage(ChatColor.GRAY + "⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅");
223+
if (sender instanceof Player)
224+
sender.sendMessage(ChatColor.GRAY + "⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅ ⋅");
219225

220226
return true;
221227
}

src/main/resources/i18n/fr_FR.po

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ msgid "{ce}You cannot execute this command from the console."
3131
msgstr "{ce}Vous ne pouvez exécuter cette commande depuis la console."
3232

3333
#: src/main/java/fr/zcraft/Ping/Ping.java:172
34-
msgid "{green}{bold}Ping, {0}!"
35-
msgstr "{green}{bold}Ping, {0} !"
34+
msgid "{green}{bold}{0}'s ping"
35+
msgstr "{green}{bold}Ping pour {0}"
3636

3737
#: src/main/java/fr/zcraft/Ping/Ping.java:176
3838
msgid "{green}{bold}Pong!"
@@ -51,6 +51,11 @@ msgid "The time needed to transfer data from you to the server."
5151
msgstr ""
5252
"Le temps nécessaire pour transférer des données entre vous et le serveur."
5353

54+
#: src/main/java/fr/zcraft/Ping/Ping.java:186
55+
msgid "The time needed to transfer data from {0} to the server."
56+
msgstr ""
57+
"Le temps nécessaire pour transférer des données entre {0} et le serveur."
58+
5459
#: src/main/java/fr/zcraft/Ping/Ping.java:187
5560
msgid "The lower the better."
5661
msgstr "Le plus bas est le mieux."

0 commit comments

Comments
 (0)