From c85d772e1b709bb0d65f9ff7de10879029805cf0 Mon Sep 17 00:00:00 2001 From: Lax Date: Wed, 8 Sep 2021 14:48:47 -0700 Subject: [PATCH] Add `/ess dump all` as alias for `/ess dump *` (#4517) Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com> --- .github/ISSUE_TEMPLATE/report-a-bug.yml | 4 ++-- .../com/earth2me/essentials/commands/Commandessentials.java | 6 +++--- Essentials/src/main/resources/messages.properties | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/report-a-bug.yml b/.github/ISSUE_TEMPLATE/report-a-bug.yml index abb2bea39..7c385ca3f 100644 --- a/.github/ISSUE_TEMPLATE/report-a-bug.yml +++ b/.github/ISSUE_TEMPLATE/report-a-bug.yml @@ -24,8 +24,8 @@ body: - type: input attributes: - label: "`/ess dump *` output" - description: Run `/ess dump *` in the console, then copy and paste the link from the output of the command into this box. (If this command doesn't work, you should [update EssentialsX](https://essentialsx.net/downloads.html) and try again.) + label: "`/ess dump all` output" + description: Run `/ess dump all` in the console, then copy and paste the link from the output of the command into this box. (If this command doesn't work, you should [update EssentialsX](https://essentialsx.net/downloads.html) and try again.) validations: required: true - type: input diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java index 984f9cb4c..2295294bb 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java @@ -266,7 +266,7 @@ public class Commandessentials extends EssentialsCommand { boolean kits = false; boolean log = false; for (final String arg : args) { - if (arg.equals("*")) { + if (arg.equals("*") || arg.equalsIgnoreCase("all")) { config = true; discord = true; kits = true; @@ -719,9 +719,9 @@ public class Commandessentials extends EssentialsCommand { } break; case "dump": - final List list = Lists.newArrayList("config", "kits", "log", "discord", "*"); + final List list = Lists.newArrayList("config", "kits", "log", "discord", "all"); for (String arg : args) { - if (arg.equals("*")) { + if (arg.equals("*") || arg.equalsIgnoreCase("all")) { list.clear(); return list; } diff --git a/Essentials/src/main/resources/messages.properties b/Essentials/src/main/resources/messages.properties index 16e282a8b..6a083cd7a 100644 --- a/Essentials/src/main/resources/messages.properties +++ b/Essentials/src/main/resources/messages.properties @@ -316,7 +316,7 @@ essentialsCommandUsage6=/ cleanup essentialsCommandUsage6Description=Cleans up old userdata essentialsCommandUsage7=/ homes essentialsCommandUsage7Description=Manages user homes -essentialsCommandUsage8=/ dump [*] [config] [discord] [kits] [log] +essentialsCommandUsage8=/ dump [all] [config] [discord] [kits] [log] essentialsCommandUsage8Description=Generates a server dump with the requested information essentialsHelp1=The file is broken and Essentials can''t open it. Essentials is now disabled. If you can''t fix the file yourself, go to http\://tiny.cc/EssentialsChat essentialsHelp2=The file is broken and Essentials can''t open it. Essentials is now disabled. If you can''t fix the file yourself, either type /essentialshelp in game or go to http\://tiny.cc/EssentialsChat