From a30ef5c8e6a78966d00173abb84ca4cc1f045113 Mon Sep 17 00:00:00 2001 From: extendedclip Date: Tue, 25 Aug 2020 09:57:19 -0400 Subject: [PATCH] Remove duplicate code --- .../papi/expansion/javascript/ExpansionUtils.java | 4 ++++ .../papi/expansion/javascript/JavascriptExpansion.java | 7 +------ .../papi/expansion/javascript/command/GitCommand.java | 6 +----- .../papi/expansion/javascript/command/ListCommand.java | 6 +----- .../papi/expansion/javascript/command/ReloadCommand.java | 6 +----- 5 files changed, 8 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/extendedclip/papi/expansion/javascript/ExpansionUtils.java b/src/main/java/com/extendedclip/papi/expansion/javascript/ExpansionUtils.java index dbd60b1..d2eaace 100644 --- a/src/main/java/com/extendedclip/papi/expansion/javascript/ExpansionUtils.java +++ b/src/main/java/com/extendedclip/papi/expansion/javascript/ExpansionUtils.java @@ -26,6 +26,10 @@ public class ExpansionUtils { sender.sendMessage(colorize(Arrays.stream(msg).filter(Objects::nonNull).collect(Collectors.joining("\n")))); } + public static String plural(final int amount) { + return amount > 1 ? "s" : ""; + } + public static void warnLog(String log, Throwable throwable) { warnLog(log, throwable, true); } diff --git a/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptExpansion.java b/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptExpansion.java index 36b64a2..3ed4c0a 100644 --- a/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptExpansion.java +++ b/src/main/java/com/extendedclip/papi/expansion/javascript/JavascriptExpansion.java @@ -28,7 +28,6 @@ import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.Command; import org.bukkit.command.CommandMap; -import org.bukkit.command.SimpleCommandMap; import org.jetbrains.annotations.NotNull; import javax.script.ScriptEngine; @@ -104,7 +103,7 @@ public class JavascriptExpansion extends PlaceholderExpansion implements Cacheab config = new JavascriptPlaceholdersConfig(this); int amountLoaded = config.loadPlaceholders(); - ExpansionUtils.infoLog(amountLoaded + " script" + plural(amountLoaded) + " loaded!"); + ExpansionUtils.infoLog(amountLoaded + " script" + ExpansionUtils.plural(amountLoaded) + " loaded!"); if (debug) { @@ -295,8 +294,4 @@ public class JavascriptExpansion extends PlaceholderExpansion implements Cacheab commandMap.register("papi" + commands.getName(), commands); commands.isRegistered(); } - - private String plural(final int amount) { - return amount > 1 ? "s" : ""; - } } diff --git a/src/main/java/com/extendedclip/papi/expansion/javascript/command/GitCommand.java b/src/main/java/com/extendedclip/papi/expansion/javascript/command/GitCommand.java index 26460d0..37743d8 100644 --- a/src/main/java/com/extendedclip/papi/expansion/javascript/command/GitCommand.java +++ b/src/main/java/com/extendedclip/papi/expansion/javascript/command/GitCommand.java @@ -47,7 +47,7 @@ public class GitCommand extends ICommand { final List availableScripts = manager.getAvailableScripts(); final Set scripts = availableScripts.stream().map(GithubScript::getName).collect(Collectors.toSet()); - ExpansionUtils.sendMsg(sender, availableScripts.size() + " &escript" + plural(availableScripts.size()) + " available on Github.", String.join(", ", scripts)); + ExpansionUtils.sendMsg(sender, availableScripts.size() + " &escript" + ExpansionUtils.plural(availableScripts.size()) + " available on Github.", String.join(", ", scripts)); return; } @@ -135,8 +135,4 @@ public class GitCommand extends ICommand { public @NotNull String getAlias() { return "git"; } - - private String plural(final int amount) { - return amount > 1 ? "s" : ""; - } } diff --git a/src/main/java/com/extendedclip/papi/expansion/javascript/command/ListCommand.java b/src/main/java/com/extendedclip/papi/expansion/javascript/command/ListCommand.java index 68d167e..fc77a97 100644 --- a/src/main/java/com/extendedclip/papi/expansion/javascript/command/ListCommand.java +++ b/src/main/java/com/extendedclip/papi/expansion/javascript/command/ListCommand.java @@ -19,7 +19,7 @@ public class ListCommand extends ICommand { public void execute(CommandSender sender, String[] args) { final List loaded = expansion.getLoadedIdentifiers(); - ExpansionUtils.sendMsg(sender,loaded.size() + " &7script" + plural(loaded.size()) + " loaded.", + ExpansionUtils.sendMsg(sender,loaded.size() + " &7script" + ExpansionUtils.plural(loaded.size()) + " loaded.", String.join(", ", loaded)); } @@ -28,8 +28,4 @@ public class ListCommand extends ICommand { public String getAlias() { return "list"; } - - private String plural(final int amount) { - return amount > 1 ? "s" : ""; - } } diff --git a/src/main/java/com/extendedclip/papi/expansion/javascript/command/ReloadCommand.java b/src/main/java/com/extendedclip/papi/expansion/javascript/command/ReloadCommand.java index 2b7c362..a33e7a1 100644 --- a/src/main/java/com/extendedclip/papi/expansion/javascript/command/ReloadCommand.java +++ b/src/main/java/com/extendedclip/papi/expansion/javascript/command/ReloadCommand.java @@ -18,7 +18,7 @@ public class ReloadCommand extends ICommand { ExpansionUtils.sendMsg(sender, "&aJavascriptExpansion reloading..."); final int scripts = expansion.reloadScripts(); - ExpansionUtils.sendMsg(sender, scripts + " &7script" + plural(scripts) + " loaded"); + ExpansionUtils.sendMsg(sender, scripts + " &7script" + ExpansionUtils.plural(scripts) + " loaded"); } @Override @@ -26,8 +26,4 @@ public class ReloadCommand extends ICommand { public String getAlias() { return "reload"; } - - private String plural(final int amount) { - return amount > 1 ? "s" : ""; - } }