From 385453e1d5808dd446c9904c6e1c91a99628c853 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Thu, 1 Dec 2022 11:16:58 -0700 Subject: [PATCH] Fix double space in MinecraftHelp page commands --- .../minecraft/extras/MinecraftHelp.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/MinecraftHelp.java b/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/MinecraftHelp.java index 91b0d87f..27341d8a 100644 --- a/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/MinecraftHelp.java +++ b/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/MinecraftHelp.java @@ -600,16 +600,14 @@ public final class MinecraftHelp { return this.line(this.headerFooterLength); } - final String nextPageCommand = String.format("%s %s %s", this.commandPrefix, query, currentPage + 1); - final Component nextPageButton = this.button('→', nextPageCommand, + final Component nextPageButton = this.button('→', this.pageCommand(query, currentPage + 1), this.messageProvider.provide(sender, MESSAGE_CLICK_FOR_NEXT_PAGE).color(this.colors.text) ); if (firstPage) { return this.header(sender, nextPageButton); } - final String previousPageCommand = String.format("%s %s %s", this.commandPrefix, query, currentPage - 1); - final Component previousPageButton = this.button('←', previousPageCommand, + final Component previousPageButton = this.button('←', this.pageCommand(query, currentPage - 1), this.messageProvider.provide(sender, MESSAGE_CLICK_FOR_PREVIOUS_PAGE).color(this.colors.text) ); if (lastPage) { @@ -623,6 +621,13 @@ public final class MinecraftHelp { return this.header(sender, buttons); } + private String pageCommand(final String query, final int page) { + if (query.isEmpty()) { + return String.format("%s %s", this.commandPrefix, page); + } + return String.format("%s %s %s", this.commandPrefix, query, page); + } + private @NonNull Component header( final @NonNull C sender, final @NonNull Component title