cdanesi/ajQueue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add {SERVER} placeholder to some more messages

Browse Source
This commit is contained in:
ajgeiss0702
2020-06-16 16:19:23 -07:00
parent 0463a0789a
commit 9ec0d4fa97
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/us/ajg0702/queue/Manager.java
+4
View File
@@ -146,6 +146,7 @@ public class Manager {
BungeeUtils.sendCustomData(ply, "actionbar", msgs.get("spigot.actionbar.offline") BungeeUtils.sendCustomData(ply, "actionbar", msgs.get("spigot.actionbar.offline")
.replaceAll("\\{POS\\}", pos+"") .replaceAll("\\{POS\\}", pos+"")
.replaceAll("\\{LEN\\}", len+"") .replaceAll("\\{LEN\\}", len+"")
.replaceAll("\\{SERVER\\}", s.getName())
.replaceAll("\\{STATUS\\}", or)+";time="+pl.timeBetweenPlayers); .replaceAll("\\{STATUS\\}", or)+";time="+pl.timeBetweenPlayers);
} else { } else {
int time = pos*pl.timeBetweenPlayers; int time = pos*pl.timeBetweenPlayers;
@@ -164,6 +165,7 @@ public class Manager {
BungeeUtils.sendCustomData(ply, "actionbar", msgs.get("spigot.actionbar.online") BungeeUtils.sendCustomData(ply, "actionbar", msgs.get("spigot.actionbar.online")
.replaceAll("\\{POS\\}", pos+"") .replaceAll("\\{POS\\}", pos+"")
.replaceAll("\\{LEN\\}", len+"") .replaceAll("\\{LEN\\}", len+"")
.replaceAll("\\{SERVER\\}", s.getName())
.replaceAll("\\{TIME\\}", timeStr)+";time="+pl.timeBetweenPlayers); .replaceAll("\\{TIME\\}", timeStr)+";time="+pl.timeBetweenPlayers);
} }
} }
@@ -198,6 +200,7 @@ public class Manager {
.replaceAll("\\{STATUS\\}", or) .replaceAll("\\{STATUS\\}", or)
.replaceAll("\\{POS\\}", pos+"") .replaceAll("\\{POS\\}", pos+"")
.replaceAll("\\{LEN\\}", len+"") .replaceAll("\\{LEN\\}", len+"")
.replaceAll("\\{SERVER\\}", s.getName())
)); ));
} else { } else {
int time = pos*pl.timeBetweenPlayers; int time = pos*pl.timeBetweenPlayers;
@@ -218,6 +221,7 @@ public class Manager {
.replaceAll("\\{POS\\}", pos+"") .replaceAll("\\{POS\\}", pos+"")
.replaceAll("\\{LEN\\}", len+"") .replaceAll("\\{LEN\\}", len+"")
.replaceAll("\\{TIME\\}", timeStr) .replaceAll("\\{TIME\\}", timeStr)
.replaceAll("\\{SERVER\\}", s.getName())
)); ));
} }
src/main/java/us/ajg0702/queue/utils/BungeeMessages.java
+3 -3
View File
@@ -59,7 +59,7 @@ public class BungeeMessages {
d.put("status.offline.full", "full"); d.put("status.offline.full", "full");
d.put("status.online.base", "&7You are in position &f{POS}&7 of &f{LEN}&7. Estimated time: {TIME}"); d.put("status.online.base", "&7You are in position &f{POS}&7 of &f{LEN}&7. Estimated time: {TIME}");
d.put("status.left-last-queue", "&aYou left the last queue you were in."); d.put("status.left-last-queue", "&aYou left the last queue you were in.");
d.put("status.now-in-queue", "&aYou are now queued! &7You are in position &f{POS}&7 of &f{LEN}&7.\n&7Type &f/leavequeue&7 to leave the queue!"); d.put("status.now-in-queue", "&aYou are now queued for {SERVER}! &7You are in position &f{POS}&7 of &f{LEN}&7.\n&7Type &f/leavequeue&7 to leave the queue!");
d.put("status.now-in-empty-queue", ""); d.put("status.now-in-empty-queue", "");
d.put("errors.server-not-exist", "&cThat server does not exist!"); d.put("errors.server-not-exist", "&cThat server does not exist!");
@@ -80,8 +80,8 @@ public class BungeeMessages {
d.put("list.total", "&7Total players in queues: &f{TOTAL}"); d.put("list.total", "&7Total players in queues: &f{TOTAL}");
d.put("list.none", "&7None"); d.put("list.none", "&7None");
d.put("spigot.actionbar.online", "&7You are in position &f{POS}&7 of &f{LEN}&7. Estimated time: {TIME}"); d.put("spigot.actionbar.online", "&7You are queued for &f{SERVER}&7. You are in position &f{POS}&7 of &f{LEN}&7. Estimated time: {TIME}");
d.put("spigot.actionbar.offline", "&7You are in position &f{POS}&7 of &f{LEN}&7."); d.put("spigot.actionbar.offline", "&7You are queued for &f{SERVER}&7. &7You are in position &f{POS}&7 of &f{LEN}&7.");
d.put("send", "&aAdded &f{PLAYER}&a to the queue for &f{SERVER}"); d.put("send", "&aAdded &f{PLAYER}&a to the queue for &f{SERVER}");