From 4a531c6fab93786badf7c99119acf3945b30bdfa Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Sun, 31 Jul 2022 13:06:49 -0700 Subject: [PATCH 1/3] change status placeholer in title to use the placeholder displays in the config --- .../queue/commands/commands/listqueues/ListCommand.java | 4 ++-- .../main/java/us/ajg0702/queue/common/QueueManagerImpl.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/us/ajg0702/queue/commands/commands/listqueues/ListCommand.java b/common/src/main/java/us/ajg0702/queue/commands/commands/listqueues/ListCommand.java index 29d4e0e..53132e3 100644 --- a/common/src/main/java/us/ajg0702/queue/commands/commands/listqueues/ListCommand.java +++ b/common/src/main/java/us/ajg0702/queue/commands/commands/listqueues/ListCommand.java @@ -68,10 +68,10 @@ public class ListCommand extends BaseCommand { m = m.append(Component.text("\n")); m = m.append(main.getMessages().getComponent("commands.listqueues.format", - "COLOR:" + main.getMessages().color(color), + "COLOR:" + Messages.color(color), "NAME:" + s.getAlias(), "COUNT:" + s.getQueue().size(), - "STATUS:" + s.getStatusString(spp) + "STATUS:" + main.getMessages().getRawString("placeholders.status."+s.getStatus(spp)) )); } sender.sendMessage(m); diff --git a/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java b/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java index 22beb0f..5a3d953 100644 --- a/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java +++ b/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java @@ -380,7 +380,6 @@ public class QueueManagerImpl implements QueueManager { if(!main.getConfig().getBoolean("send-title")) return; for(QueueServer server : servers) { - String status = server.getStatusString(); for(QueuePlayer queuePlayer : server.getQueue()) { int pos = queuePlayer.getPosition(); @@ -394,6 +393,8 @@ public class QueueManagerImpl implements QueueManager { if(!getSingleServer(player).equals(server)) continue; + String status = main.getMessages().getRawString("placeholders.status."+server.getStatus(player)); + int time = (int) Math.round(pos * main.getTimeBetweenPlayers()); Component titleMessage = msgs.getComponent("title.title", From 76ab9ef098382dd0be95900c01f19f1589ae001a Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Sun, 31 Jul 2022 13:53:54 -0700 Subject: [PATCH 2/3] Fix color in title status --- .../src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java b/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java index 5a3d953..8c6c158 100644 --- a/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java +++ b/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java @@ -393,7 +393,7 @@ public class QueueManagerImpl implements QueueManager { if(!getSingleServer(player).equals(server)) continue; - String status = main.getMessages().getRawString("placeholders.status."+server.getStatus(player)); + String status = Messages.color(main.getMessages().getRawString("placeholders.status."+server.getStatus(player))); int time = (int) Math.round(pos * main.getTimeBetweenPlayers()); From fc4cf51081014148fa0e9526406574bf1791947e Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Sun, 31 Jul 2022 14:04:04 -0700 Subject: [PATCH 3/3] Added SERVER placeholder to wrong-version message --- .../main/java/us/ajg0702/queue/common/QueueManagerImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java b/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java index 8c6c158..9f67ff8 100644 --- a/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java +++ b/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java @@ -118,7 +118,11 @@ public class QueueManagerImpl implements QueueManager { versions.append(msgs.getString("errors.wrong-version.comma")); } } - player.sendMessage(msgs.getComponent("errors.wrong-version.base", "VERSIONS:" + versions)); + player.sendMessage(msgs.getComponent( + "errors.wrong-version.base", + "VERSIONS:" + versions, + "SERVER:"+server.getAlias() + )); return false; }