zhdev/oblak
1
0
Fork 0
Code Issues Pull requests Activity

Fix double space in MinecraftHelp page commands

Browse source
This commit is contained in:
Jason Penilla 2022-12-01 11:16:58 -07:00 • committed by Jason
parent 0f4ad5d16a
commit 385453e1d5
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/minecraft/extras/MinecraftHelp.java
View file

@ -600,16 +600,14 @@ public final class MinecraftHelp<C> {
return this.line(this.headerFooterLength); return this.line(this.headerFooterLength);
} }
final String nextPageCommand = String.format("%s %s %s", this.commandPrefix, query, currentPage + 1); final Component nextPageButton = this.button('→', this.pageCommand(query, currentPage + 1),
final Component nextPageButton = this.button('→', nextPageCommand,
this.messageProvider.provide(sender, MESSAGE_CLICK_FOR_NEXT_PAGE).color(this.colors.text) this.messageProvider.provide(sender, MESSAGE_CLICK_FOR_NEXT_PAGE).color(this.colors.text)
); );
if (firstPage) { if (firstPage) {
return this.header(sender, nextPageButton); return this.header(sender, nextPageButton);
} }
final String previousPageCommand = String.format("%s %s %s", this.commandPrefix, query, currentPage - 1); final Component previousPageButton = this.button('←', this.pageCommand(query, currentPage - 1),
final Component previousPageButton = this.button('←', previousPageCommand,
this.messageProvider.provide(sender, MESSAGE_CLICK_FOR_PREVIOUS_PAGE).color(this.colors.text) this.messageProvider.provide(sender, MESSAGE_CLICK_FOR_PREVIOUS_PAGE).color(this.colors.text)
); );
if (lastPage) { if (lastPage) {
@ -623,6 +621,13 @@ public final class MinecraftHelp<C> {
return this.header(sender, buttons); 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( private @NonNull Component header(
final @NonNull C sender, final @NonNull C sender,
final @NonNull Component title final @NonNull Component title