diff --git a/src/main/java/me/clip/placeholderapi/commands/PlaceholderCommandRouter.java b/src/main/java/me/clip/placeholderapi/commands/PlaceholderCommandRouter.java index 7ea3f42..63a0de0 100644 --- a/src/main/java/me/clip/placeholderapi/commands/PlaceholderCommandRouter.java +++ b/src/main/java/me/clip/placeholderapi/commands/PlaceholderCommandRouter.java @@ -52,7 +52,8 @@ import org.jetbrains.annotations.Unmodifiable; public final class PlaceholderCommandRouter implements CommandExecutor, TabCompleter { @Unmodifiable - private static final List COMMANDS = ImmutableList.of(new CommandHelp(), + private static final List COMMANDS = ImmutableList.of( + new CommandHelp(), new CommandInfo(), new CommandList(), new CommandDump(), 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 e5075bb..1971761 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 @@ -148,17 +148,9 @@ public final class CommandECloudExpansionList extends PlaceholderCommand { final int expansionNumber = index + ((page - 1) * PAGE_SIZE) + 1; line.append(text(expansionNumber + ". ", DARK_GRAY)); - final NamedTextColor expansionColour; - - if (expansion.shouldUpdate()) { - expansionColour = GOLD; - } else { - if (expansion.hasExpansion()) { - expansionColour = GREEN; - } else { - expansionColour = GRAY; - } - } + final NamedTextColor expansionColour = expansion.shouldUpdate() + ? GOLD + : (expansion.hasExpansion() ? GREEN : GRAY); line.append(text(expansion.getName(), expansionColour)); diff --git a/src/main/java/me/clip/placeholderapi/util/Futures.java b/src/main/java/me/clip/placeholderapi/util/Futures.java index deb0e46..624194f 100644 --- a/src/main/java/me/clip/placeholderapi/util/Futures.java +++ b/src/main/java/me/clip/placeholderapi/util/Futures.java @@ -40,11 +40,8 @@ public final class Futures { @NotNull final CompletableFuture future, @NotNull final BiConsumer consumer) { future.whenComplete((value, exception) -> { - if (Bukkit.isPrimaryThread()) { - consumer.accept(value, exception); - } else { - Bukkit.getScheduler().runTask(plugin, () -> consumer.accept(value, exception)); - } + if (Bukkit.isPrimaryThread()) consumer.accept(value, exception); + else Bukkit.getScheduler().runTask(plugin, () -> consumer.accept(value, exception)); }); } diff --git a/src/main/java/me/clip/placeholderapi/util/Msg.java b/src/main/java/me/clip/placeholderapi/util/Msg.java index 84307c7..13989bf 100644 --- a/src/main/java/me/clip/placeholderapi/util/Msg.java +++ b/src/main/java/me/clip/placeholderapi/util/Msg.java @@ -56,20 +56,15 @@ public final class Msg { } public static void msg(@NotNull final CommandSender sender, @NotNull final String... messages) { - if (messages.length == 0) { - return; - } + if (messages.length == 0) return; sender.sendMessage(Arrays.stream(messages).map(Msg::color).collect(Collectors.joining("\n"))); } public static void broadcast(@NotNull final String... messages) { - if (messages.length == 0) { - return; - } + if (messages.length == 0) return; - Bukkit.broadcastMessage( - Arrays.stream(messages).map(Msg::color).collect(Collectors.joining("\n"))); + Bukkit.broadcastMessage(Arrays.stream(messages).map(Msg::color).collect(Collectors.joining("\n"))); } public static String color(@NotNull final String text) {