From c1741aa37f03a8868b9dfabdbdb7134f6f2f4340 Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sat, 4 Apr 2020 14:32:33 +0200 Subject: [PATCH] Improved colors in purge-related messages --- .../api/commands/admin/purge/AdminPurgeCommand.java | 4 ++-- .../commands/admin/purge/AdminPurgeUnownedCommand.java | 2 +- src/main/resources/locales/en-US.yml | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeCommand.java index 30f32bf29..b3f68ef05 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeCommand.java @@ -45,7 +45,7 @@ public class AdminPurgeCommand extends CompositeCommand implements Listener { @Override public boolean canExecute(User user, String label, List args) { if (inPurge) { - user.sendMessage("commands.admin.purge.purge-in-progress"); + user.sendMessage("commands.admin.purge.purge-in-progress", TextVariables.LABEL, this.getTopLabel()); return false; } if (args.isEmpty()) { @@ -88,7 +88,7 @@ public class AdminPurgeCommand extends CompositeCommand implements Listener { void removeIslands() { inPurge = true; - user.sendMessage("commands.admin.purge.see-console-for-status"); + user.sendMessage("commands.admin.purge.see-console-for-status", TextVariables.LABEL, this.getTopLabel()); it = islands.iterator(); count = 0; // Delete first island diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeUnownedCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeUnownedCommand.java index 29f4d5894..7d9696d15 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeUnownedCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeUnownedCommand.java @@ -32,7 +32,7 @@ public class AdminPurgeUnownedCommand extends ConfirmableCommand { } AdminPurgeCommand parentCommand = ((AdminPurgeCommand)getParent()); if (parentCommand.isInPurge()) { - user.sendMessage("commands.admin.purge.purge-in-progress"); + user.sendMessage("commands.admin.purge.purge-in-progress", TextVariables.LABEL, this.getTopLabel()); return false; } Set unowned = getUnownedIslands(); diff --git a/src/main/resources/locales/en-US.yml b/src/main/resources/locales/en-US.yml index 42c6842fa..b3a371141 100644 --- a/src/main/resources/locales/en-US.yml +++ b/src/main/resources/locales/en-US.yml @@ -75,12 +75,12 @@ commands: parameters: "[days]" description: "purge islands abandoned for more than [days]" days-or-more: "Must be at least 1 day or more" - purgable-islands: "Found [number] purgable islands." - purge-in-progress: "&c Purging in progress. Use purge stop to cancel" + purgable-islands: "&a Found &b [number] &a purgable islands." + purge-in-progress: "&c Purging in progress. Use &b /[label] purge stop &c to cancel." number-error: "&c Argument must be a number of days" - confirm: "&d Type [label] purge confirm to start purging" - completed: "&a Purging stopped" - see-console-for-status: "Purge started. See console for status" + confirm: "&d Type &b /[label] purge confirm &d to start purging" + completed: "&a Purging stopped." + see-console-for-status: "&a Purge started. See console for status or use &b /[label] purge status&a." protect: description: "Toggle island purge protection" move-to-island: "&c Move to an island first!"