Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2025-01-27 10:31:21 +01:00
Code Issues Projects Releases Wiki Activity

Improved colors in purge-related messages

Browse Source
This commit is contained in:
Florian CUNY 2020-04-04 14:32:33 +02:00
parent 960a8a7a00
commit c1741aa37f
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeCommand.java
View File

@ -45,7 +45,7 @@ public class AdminPurgeCommand extends CompositeCommand implements Listener {
@Override @Override
public boolean canExecute(User user, String label, List<String> args) { public boolean canExecute(User user, String label, List<String> args) {
if (inPurge) { if (inPurge) {
user.sendMessage("commands.admin.purge.purge-in-progress"); user.sendMessage("commands.admin.purge.purge-in-progress", TextVariables.LABEL, this.getTopLabel());
return false; return false;
} }
if (args.isEmpty()) { if (args.isEmpty()) {
@ -88,7 +88,7 @@ public class AdminPurgeCommand extends CompositeCommand implements Listener {
void removeIslands() { void removeIslands() {
inPurge = true; 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(); it = islands.iterator();
count = 0; count = 0;
// Delete first island // Delete first island

2
src/main/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeUnownedCommand.java
View File

@ -32,7 +32,7 @@ public class AdminPurgeUnownedCommand extends ConfirmableCommand {
} }
AdminPurgeCommand parentCommand = ((AdminPurgeCommand)getParent()); AdminPurgeCommand parentCommand = ((AdminPurgeCommand)getParent());
if (parentCommand.isInPurge()) { 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; return false;
} }
Set<String> unowned = getUnownedIslands(); Set<String> unowned = getUnownedIslands();

10
src/main/resources/locales/en-US.yml
View File

@ -75,12 +75,12 @@ commands:
parameters: "[days]" parameters: "[days]"
description: "purge islands abandoned for more than [days]" description: "purge islands abandoned for more than [days]"
days-or-more: "Must be at least 1 day or more" days-or-more: "Must be at least 1 day or more"
purgable-islands: "Found [number] purgable islands." purgable-islands: "&a Found &b [number] &a purgable islands."
purge-in-progress: "&c Purging in progress. Use purge stop to cancel" 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" number-error: "&c Argument must be a number of days"
confirm: "&d Type [label] purge confirm to start purging" confirm: "&d Type &b /[label] purge confirm &d to start purging"
completed: "&a Purging stopped" completed: "&a Purging stopped."
see-console-for-status: "Purge started. See console for status" see-console-for-status: "&a Purge started. See console for status or use &b /[label] purge status&a."
protect: protect:
description: "Toggle island purge protection" description: "Toggle island purge protection"
move-to-island: "&c Move to an island first!" move-to-island: "&c Move to an island first!"