From 89061e6437f3828215805d4f4ecc6d0feb5b6170 Mon Sep 17 00:00:00 2001 From: Sxtanna Date: Fri, 24 Jul 2020 19:45:28 -0400 Subject: [PATCH] fixed ordering of methods --- .../cloud/CommandECloudExpansionList.java | 171 +++++++++--------- 1 file changed, 86 insertions(+), 85 deletions(-) diff --git a/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionList.java b/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionList.java index 0d05459..e597a8c 100644 --- a/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionList.java +++ b/src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionList.java @@ -40,91 +40,6 @@ public final class CommandECloudExpansionList extends PlaceholderCommand super("list"); } - @NotNull - private static List getPage(@NotNull final List expansions, final int page, final int pageSize) - { - if (expansions.isEmpty()) - { - return Collections.emptyList(); - } - - final int head = (page * pageSize); - final int tail = Math.min(expansions.size(), head + pageSize); - - if (expansions.size() < head) - { - return Collections.emptyList(); - } - - return IntStream.range(head, tail).mapToObj(expansions::get).filter(Objects::nonNull).collect(Collectors.toList()); - } - - @NotNull - private static Collection getExpansions(@NotNull final String target, @NotNull final PlaceholderAPIPlugin plugin) - { - switch (target.toLowerCase()) - { - case "all": - return plugin.getCloudExpansionManager().getCloudExpansions().values(); - case "installed": - return plugin.getCloudExpansionManager().getCloudExpansionsInstalled().values(); - default: - return plugin.getCloudExpansionManager().getCloudExpansionsByAuthor(target).values(); - } - } - - @NotNull - private static JSONMessage getMessage(@NotNull final List expansions, final int page) - { - final SimpleDateFormat format = PlaceholderAPIPlugin.getDateFormat(); - - final StringBuilder tooltip = new StringBuilder(); - final JSONMessage message = JSONMessage.create(); - - int index = ((page - 1) * PAGE_SIZE) + 1; - for (int i = 0; i < expansions.size(); i++) - { - final CloudExpansion expansion = expansions.get(i); - tooltip.append("&bClick to download this expansion!") - .append('\n') - .append('\n') - .append("&bAuthor: &f") - .append(expansion.getAuthor()) - .append('\n') - .append("&bVerified: ") - .append(expansion.isVerified() ? "&a&l✔&r" : "&c&l❌&r") - .append('\n') - .append("&bLatest Version: &f") - .append(expansion.getLatestVersion()) - .append('\n') - .append("&bReleased: &f") - .append(format.format(expansion.getLastUpdate())); - - final String description = expansion.getDescription(); - if (description != null && !description.isEmpty()) - { - tooltip.append('\n') - .append('\n') - .append("&f") - .append(description.replace("\r", "").trim()); - } - - message.then(Msg.color("&8" + (index++) + ".&r " + (expansion.shouldUpdate() ? "&6" : expansion.hasExpansion() ? "&a" : "&7") + expansion.getName())); - - message.tooltip(Msg.color(tooltip.toString())); - message.suggestCommand("/papi ecloud download " + expansion.getName()); - - if (i < expansions.size() - 1) - { - message.newline(); - } - - tooltip.setLength(0); - } - - return message; - } - @Override public void evaluate(@NotNull final PlaceholderAPIPlugin plugin, @NotNull final CommandSender sender, @NotNull final String alias, @NotNull @Unmodifiable final List params) { @@ -266,4 +181,90 @@ public final class CommandECloudExpansionList extends PlaceholderCommand suggestByParameter(IntStream.rangeClosed(1, (int) Math.ceil((double) getExpansions(params.get(0), plugin).size() / PAGE_SIZE)).mapToObj(Objects::toString), suggestions, params.get(1)); } + + @NotNull + private static Collection getExpansions(@NotNull final String target, @NotNull final PlaceholderAPIPlugin plugin) + { + switch (target.toLowerCase()) + { + case "all": + return plugin.getCloudExpansionManager().getCloudExpansions().values(); + case "installed": + return plugin.getCloudExpansionManager().getCloudExpansionsInstalled().values(); + default: + return plugin.getCloudExpansionManager().getCloudExpansionsByAuthor(target).values(); + } + } + + @NotNull + private static List getPage(@NotNull final List expansions, final int page, final int pageSize) + { + if (expansions.isEmpty()) + { + return Collections.emptyList(); + } + + final int head = (page * pageSize); + final int tail = Math.min(expansions.size(), head + pageSize); + + if (expansions.size() < head) + { + return Collections.emptyList(); + } + + return IntStream.range(head, tail).mapToObj(expansions::get).filter(Objects::nonNull).collect(Collectors.toList()); + } + + @NotNull + private static JSONMessage getMessage(@NotNull final List expansions, final int page) + { + final SimpleDateFormat format = PlaceholderAPIPlugin.getDateFormat(); + + final StringBuilder tooltip = new StringBuilder(); + final JSONMessage message = JSONMessage.create(); + + int index = ((page - 1) * PAGE_SIZE) + 1; + for (int i = 0; i < expansions.size(); i++) + { + final CloudExpansion expansion = expansions.get(i); + tooltip.append("&bClick to download this expansion!") + .append('\n') + .append('\n') + .append("&bAuthor: &f") + .append(expansion.getAuthor()) + .append('\n') + .append("&bVerified: ") + .append(expansion.isVerified() ? "&a&l✔&r" : "&c&l❌&r") + .append('\n') + .append("&bLatest Version: &f") + .append(expansion.getLatestVersion()) + .append('\n') + .append("&bReleased: &f") + .append(format.format(expansion.getLastUpdate())); + + final String description = expansion.getDescription(); + if (description != null && !description.isEmpty()) + { + tooltip.append('\n') + .append('\n') + .append("&f") + .append(description.replace("\r", "").trim()); + } + + message.then(Msg.color("&8" + (index++) + ".&r " + (expansion.shouldUpdate() ? "&6" : expansion.hasExpansion() ? "&a" : "&7") + expansion.getName())); + + message.tooltip(Msg.color(tooltip.toString())); + message.suggestCommand("/papi ecloud download " + expansion.getName()); + + if (i < expansions.size() - 1) + { + message.newline(); + } + + tooltip.setLength(0); + } + + return message; + } + }