Added {SERVER} placeholder to the leavequeue message

This commit is contained in:
ajgeiss0702
2020-07-04 09:55:33 -07:00
parent ebddaebf3b
commit e37173c620
2 changed files with 10 additions and 3 deletions
@@ -27,7 +27,7 @@ public class LeaveCommand extends Command {
Server server = Manager.getInstance().findPlayerInQueue((ProxiedPlayer) sender); Server server = Manager.getInstance().findPlayerInQueue((ProxiedPlayer) sender);
if(server != null) { if(server != null) {
server.getQueue().remove(p); server.getQueue().remove(p);
p.sendMessage(msgs.getBC("commands.leave-queue")); p.sendMessage(msgs.getBC("commands.leave-queue", "SERVER:"+server.getName()));
} }
} }
} }
@@ -5,6 +5,7 @@ import java.io.IOException;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import net.md_5.bungee.api.plugin.Plugin; import net.md_5.bungee.api.plugin.Plugin;
@@ -72,7 +73,7 @@ public class BungeeMessages {
d.put("errors.player-only", "&cThis command can only be executed as a player!"); d.put("errors.player-only", "&cThis command can only be executed as a player!");
d.put("errors.already-connected", "&cYou are already connected to this server!"); d.put("errors.already-connected", "&cYou are already connected to this server!");
d.put("commands.leave-queue", "&aYou left the queue!"); d.put("commands.leave-queue", "&aYou left the queue for {SERVER}!");
d.put("commands.reload", "&aConfig and messages reloaded successfully!"); d.put("commands.reload", "&aConfig and messages reloaded successfully!");
d.put("commands.joinqueue.usage", "&cUsage: /joinqueue <server>"); d.put("commands.joinqueue.usage", "&cUsage: /joinqueue <server>");
@@ -115,8 +116,14 @@ public class BungeeMessages {
msg = color(msg); msg = color(msg);
return msg; return msg;
} }
public BaseComponent[] getBC(String key) { public BaseComponent[] getBC(String key, String... placeholders) {
String m = get(key); String m = get(key);
for(String sr : placeholders) {
//ProxyServer.getInstance().getLogger().info(sr);
String placeholder = sr.split(":")[0];
String value = sr.replaceFirst(Matcher.quoteReplacement(placeholder+":"), "");
m = m.replaceAll("\\{"+Matcher.quoteReplacement(placeholder)+"\\}", value);
}
return TextComponent.fromLegacyText(m); return TextComponent.fromLegacyText(m);
} }
public String color(String msg) { public String color(String msg) {