diff --git a/src/main/java/net/knarcraft/bookswithoutborders/command/CommandDelete.java b/src/main/java/net/knarcraft/bookswithoutborders/command/CommandDelete.java index f95afbb..c3e9458 100644 --- a/src/main/java/net/knarcraft/bookswithoutborders/command/CommandDelete.java +++ b/src/main/java/net/knarcraft/bookswithoutborders/command/CommandDelete.java @@ -4,6 +4,7 @@ import net.knarcraft.bookswithoutborders.BooksWithoutBorders; import net.knarcraft.bookswithoutborders.state.BookDirectory; import net.knarcraft.bookswithoutborders.utility.BookFileHelper; import net.knarcraft.bookswithoutborders.utility.BookHelper; +import net.knarcraft.bookswithoutborders.utility.InputCleaningHelper; import net.knarcraft.knarlib.util.TabCompletionHelper; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -39,13 +40,20 @@ public class CommandDelete implements TabExecutor { * @return
True if the book was deleted successfully
*/ boolean deleteBook(CommandSender sender, String[] args, boolean deletePublic) { + String command = deletePublic ? "deletepublicbook" : "deletebook"; //List deletable files if (args.length == 0) { - BookFileHelper.printBooks(sender, deletePublic); + BookFileHelper.printBooks(sender, deletePublic, command, 1); return true; } //Delete the file if (args.length == 1) { + int page = InputCleaningHelper.parsePageNumber(args[0]); + if (page > 0) { + BookFileHelper.printBooks(sender, deletePublic, command, page); + return true; + } + ListTrue if the book was given successfully
*/ boolean giveBook(CommandSender sender, String[] args, boolean givePublic, String folder) { + String command = givePublic ? "givepublicbook" : "givebook"; + if (args.length == 0) { + BookFileHelper.printBooks(sender, givePublic, command, 1); + return true; + } else if (args.length == 1) { + int page = InputCleaningHelper.parsePageNumber(args[0]); + if (page > 0) { + BookFileHelper.printBooks(sender, givePublic, command, page); + return true; + } + } + if (args.length == 1 || args.length > 4) { BooksWithoutBorders.sendErrorMessage(sender, "Incorrect number of arguments for this command!"); return false; } - if (args.length == 0) { - BookFileHelper.printBooks(sender, givePublic); - return true; - } - //Organize and parse input String bookIdentifier = args[0]; String receivingPlayerName = args[1]; diff --git a/src/main/java/net/knarcraft/bookswithoutborders/command/CommandLoad.java b/src/main/java/net/knarcraft/bookswithoutborders/command/CommandLoad.java index 7f81681..122666d 100644 --- a/src/main/java/net/knarcraft/bookswithoutborders/command/CommandLoad.java +++ b/src/main/java/net/knarcraft/bookswithoutborders/command/CommandLoad.java @@ -49,19 +49,26 @@ public class CommandLoad implements TabExecutor { int argumentCount = args.length; //Show books available to the player + String command = loadPublic ? "loadpublicbook" : "loadbook"; if (argumentCount == 0) { - BookFileHelper.printBooks(sender, loadPublic); + BookFileHelper.printBooks(sender, loadPublic, command, 1); return true; + } else if (argumentCount == 1) { + int page = InputCleaningHelper.parsePageNumber(args[0]); + if (page > 0) { + BookFileHelper.printBooks(sender, loadPublic, command, page); + return true; + } } //Organize and parse input String bookIdentifier = args[0]; String copies = "1"; String isSigned = "true"; - if (args.length == 3) { + if (argumentCount == 3) { copies = args[1]; isSigned = args[2]; - } else if (args.length == 2) { + } else if (argumentCount == 2) { if (args[1].equalsIgnoreCase("true") || args[1].equalsIgnoreCase("false")) { isSigned = args[1]; } else { diff --git a/src/main/java/net/knarcraft/bookswithoutborders/utility/BookFileHelper.java b/src/main/java/net/knarcraft/bookswithoutborders/utility/BookFileHelper.java index 79a7254..098c77b 100644 --- a/src/main/java/net/knarcraft/bookswithoutborders/utility/BookFileHelper.java +++ b/src/main/java/net/knarcraft/bookswithoutborders/utility/BookFileHelper.java @@ -4,7 +4,13 @@ import net.knarcraft.bookswithoutborders.BooksWithoutBorders; import net.knarcraft.bookswithoutborders.config.BooksWithoutBordersConfig; import net.knarcraft.bookswithoutborders.state.BookDirectory; import net.md_5.bungee.api.ChatColor; +import net.md_5.bungee.api.chat.ClickEvent; +import net.md_5.bungee.api.chat.ComponentBuilder; +import net.md_5.bungee.api.chat.HoverEvent; +import net.md_5.bungee.api.chat.TextComponent; +import net.md_5.bungee.api.chat.hover.content.Text; import org.bukkit.command.CommandSender; +import org.jetbrains.annotations.NotNull; import java.io.File; import java.util.ArrayList; @@ -19,6 +25,8 @@ import static net.knarcraft.bookswithoutborders.config.BooksWithoutBordersConfig */ public final class BookFileHelper { + private final static int booksPerPage = 10; + private BookFileHelper() { } @@ -106,27 +114,68 @@ public final class BookFileHelper { * * @param senderThe sender to display the books to
* @param listPublicWhether to display public books
+ * @param commandThe base command causing this to be called
+ * @param pageThe page of the book list to display
*/ - public static void printBooks(CommandSender sender, boolean listPublic) { + public static void printBooks(@NotNull CommandSender sender, boolean listPublic, @NotNull String command, int page) { ListThe command sender to show the list to
- * @param fileListThe files to list
+ * @param senderThe sender wanting to see the book menu
+ * @param commandThe main command used to trigger display of the book menu
+ * @param pageThe currently selected page
+ * @param totalPagesThe total amount of pages
+ * @param availableBooksAll books available to the sender
*/ - public static void printFiles(CommandSender sender, ListThe input to parse
+ * @returnThe page number, or 0 if not valid
+ */ + public static int parsePageNumber(@NotNull String input) { + try { + Pattern pattern = Pattern.compile("page([0-9])+"); + Matcher matcher = pattern.matcher(input); + if (matcher.matches()) { + return Integer.parseInt(matcher.group(1)); + } else { + return 0; + } + } catch (NumberFormatException exception) { + return 0; + } + } + }