Makes commands return true when input is technically correct
All checks were successful
EpicKnarvik97/Books-Without-Borders/pipeline/head This commit looks good

This commit is contained in:
2025-09-03 13:33:01 +02:00
parent 0fbe3720aa
commit 12a2cd5a73
19 changed files with 46 additions and 50 deletions

View File

@@ -31,7 +31,7 @@ public class CommandAddTitlePage implements TabExecutor {
@NotNull String[] arguments) {
if (!(sender instanceof Player player)) {
new FormatBuilder(Translatable.ERROR_PLAYER_ONLY).error(sender);
return false;
return true;
}
// Note: There are two different book checks as an book is accepted normally, but a written book is required for

View File

@@ -27,11 +27,11 @@ public class CommandClear implements TabExecutor {
@NotNull String[] args) {
if (!(sender instanceof Player player)) {
new FormatBuilder(Translatable.ERROR_PLAYER_ONLY).error(sender);
return false;
return true;
}
if (InventoryUtil.notHoldingOneWritableBookCheck(player, Translatable.ACTION_CLEAR)) {
return false;
return true;
}
//Clear the player's held book
@@ -46,7 +46,7 @@ public class CommandClear implements TabExecutor {
BookMeta bookMeta = (BookMeta) heldBook.getItemMeta();
if (bookMeta == null) {
new FormatBuilder(Translatable.ERROR_METADATA_MISSING).error(sender);
return false;
return true;
}
bookMeta.setPages("");
bookMeta.setAuthor(null);

View File

@@ -32,12 +32,12 @@ public class CommandCopy implements TabExecutor {
@NotNull String[] arguments) {
if (!(sender instanceof Player player)) {
new FormatBuilder(Translatable.ERROR_PLAYER_ONLY).error(sender);
return false;
return true;
}
if (InventoryUtil.notHoldingOneWrittenBookCheck(player,
Translatable.ACTION_COPY)) {
return false;
return true;
}
if (arguments.length < 1) {

View File

@@ -30,19 +30,19 @@ public class CommandDecrypt implements TabExecutor {
@NotNull String[] arguments) {
if (!(sender instanceof Player player)) {
new FormatBuilder(Translatable.ERROR_PLAYER_ONLY).error(sender);
return false;
return true;
}
if (InventoryUtil.notHoldingOneWrittenBookCheck(player,
Translatable.ACTION_DECRYPT)) {
return false;
return true;
}
ItemStack heldItem = InventoryUtil.getHeldBook(player, true);
BookMeta bookMetadata = (BookMeta) heldItem.getItemMeta();
if (bookMetadata == null) {
new FormatBuilder(Translatable.ERROR_METADATA_MISSING).error(sender);
return false;
return true;
}
//Warning: admin decrypt only allows decrypting files created by the same player. Not sure if intended
@@ -63,11 +63,10 @@ public class CommandDecrypt implements TabExecutor {
if (book != null) {
InventoryUtil.setHeldWrittenBook(player, book);
new FormatBuilder(Translatable.SUCCESS_DECRYPTED).success(player);
return true;
} else {
new FormatBuilder(Translatable.ERROR_DECRYPT_FAILED).error(player);
return false;
}
return true;
}
/**

View File

@@ -29,7 +29,7 @@ public class CommandDelete implements TabExecutor {
@NotNull String[] arguments) {
if (!(sender instanceof Player)) {
new FormatBuilder(Translatable.ERROR_PLAYER_ONLY).error(sender);
return false;
return true;
}
return deleteBook(sender, arguments, false, label);
@@ -54,7 +54,7 @@ public class CommandDelete implements TabExecutor {
List<String> availableBooks = BooksWithoutBorders.getAvailableBooks(sender, deletePublic);
if (availableBooks.isEmpty()) {
new FormatBuilder(Translatable.ERROR_DELETE_EMPTY).error(sender);
return false;
return true;
}
performBookDeletion(sender, InputParsingUtil.mergeArguments(arguments, 0), deletePublic);

View File

@@ -25,7 +25,7 @@ public class CommandDeletePage implements TabExecutor {
@NotNull String[] arguments) {
if (!(sender instanceof Player player)) {
new FormatBuilder(Translatable.ERROR_PLAYER_ONLY).error(sender);
return false;
return true;
}
if (arguments.length == 0) {
@@ -36,7 +36,7 @@ public class CommandDeletePage implements TabExecutor {
ItemStack heldBook = InventoryUtil.getHeldBook(player);
if (heldBook == null) {
new FormatBuilder(Translatable.ERROR_NOT_HOLDING_ANY_BOOK).error(sender);
return false;
return true;
}
int index;
@@ -50,7 +50,7 @@ public class CommandDeletePage implements TabExecutor {
BookMeta bookMeta = (BookMeta) heldBook.getItemMeta();
if (bookMeta == null) {
new FormatBuilder(Translatable.ERROR_METADATA_MISSING).error(sender);
return false;
return true;
}
List<String> pages = new ArrayList<>(bookMeta.getPages());

View File

@@ -25,20 +25,20 @@ public class CommandFormat implements TabExecutor {
@NotNull String[] arguments) {
if (!(sender instanceof Player player)) {
new FormatBuilder(Translatable.ERROR_PLAYER_ONLY).error(sender);
return false;
return true;
}
ItemStack heldBook = InventoryUtil.getHeldBook(player);
if (heldBook == null) {
new FormatBuilder(Translatable.ERROR_NOT_HOLDING_ANY_BOOK).error(sender);
return false;
return true;
}
BookMeta meta = (BookMeta) heldBook.getItemMeta();
if (meta == null) {
new FormatBuilder(Translatable.ERROR_METADATA_MISSING).error(player);
return false;
return true;
}
heldBook.setItemMeta(BookFormatterUtil.formatPages(meta));

View File

@@ -40,7 +40,7 @@ public class CommandGive implements TabExecutor {
@NotNull String[] arguments) {
if (!(sender instanceof Player)) {
new FormatBuilder(Translatable.ERROR_PLAYER_ONLY).error(sender);
return false;
return true;
}
return giveBook(sender, arguments, false, BookDirectory.PLAYER, label);
@@ -173,7 +173,7 @@ public class CommandGive implements TabExecutor {
//Make sure the receiver is able to fit the book
if (receivingPlayer.getInventory().firstEmpty() == -1) {
new FormatBuilder(GiveMessage.ERROR_GIVE_RECIPIENT_FULL).error(sender);
return false;
return true;
}
//Load books available to the player

View File

@@ -22,21 +22,21 @@ public class CommandGroupEncrypt extends CommandEncrypt implements TabExecutor {
@NotNull String[] arguments) {
if (!(sender instanceof Player player)) {
new FormatBuilder(Translatable.ERROR_PLAYER_ONLY).error(sender);
return false;
return true;
}
BookMeta bookMetadata = performPreChecks(sender, arguments, 2, 1,
new FormatBuilder(Translatable.ERROR_GROUP_ENCRYPT_ARGUMENTS_MISSING).toString());
if (bookMetadata == null) {
return false;
return true;
}
//Check if book is already group encrypted
List<String> lore = bookMetadata.getLore();
if (bookMetadata.hasLore() && lore != null && lore.get(0).contains(" encrypted]")) {
new FormatBuilder(Translatable.ERROR_GROUP_ENCRYPTED_ALREADY).error(sender);
return false;
return true;
}
EncryptionStyle encryptionStyle = arguments.length == 3 ? EncryptionStyle.getFromString(arguments[2]) : EncryptionStyle.AES;

View File

@@ -49,12 +49,12 @@ public class CommandLoad implements TabExecutor {
boolean loadPublic, @NotNull String commandName) {
if (!(sender instanceof Player player)) {
new FormatBuilder(Translatable.ERROR_PLAYER_ONLY).error(sender);
return false;
return true;
}
if (player.getInventory().firstEmpty() == -1) {
new FormatBuilder(Translatable.ERROR_INVENTORY_FULL).error(player);
return false;
return true;
}
if (PagedBookIndex.displayPage(arguments, sender, loadPublic, commandName)) {

View File

@@ -30,7 +30,7 @@ public class CommandMigrate implements TabExecutor {
@NotNull String[] arguments) {
if (!(sender instanceof Player player)) {
new FormatBuilder(Translatable.ERROR_PLAYER_ONLY).error(sender);
return false;
return true;
}
File bookDirectory = new File(BooksWithoutBorders.getConfiguration().getBookFolder());
new FormatBuilder(Translatable.SUCCESS_MIGRATION_STARTED).neutral(player);

View File

@@ -52,18 +52,17 @@ public class CommandSave implements TabExecutor {
@NotNull String command) {
if (!(sender instanceof Player player)) {
new FormatBuilder(Translatable.ERROR_PLAYER_ONLY).error(sender);
return false;
return true;
}
ItemStack heldBook = InventoryUtil.getHeldBook(player);
if (heldBook != null) {
boolean duplicate = arguments.length == 1 && Boolean.parseBoolean(arguments[0]);
saveBook(player, heldBook, duplicate, savePublic, command);
return true;
} else {
new FormatBuilder(Translatable.ERROR_NOT_HOLDING_ANY_BOOK).error(sender);
return false;
}
return true;
}
/**

View File

@@ -30,7 +30,7 @@ public class CommandSetAuthor implements TabExecutor {
@NotNull String[] arguments) {
if (!(sender instanceof Player player)) {
new FormatBuilder(Translatable.ERROR_PLAYER_ONLY).error(sender);
return false;
return true;
}
if (arguments.length < 1) {
@@ -40,7 +40,7 @@ public class CommandSetAuthor implements TabExecutor {
if (InventoryUtil.notHoldingOneWrittenBookCheck(player,
Translatable.ACTION_SET_AUTHOR)) {
return false;
return true;
}
ItemSlot heldBookSlot = InventoryUtil.getHeldBookSlot(player, Material.WRITTEN_BOOK);
@@ -48,7 +48,7 @@ public class CommandSetAuthor implements TabExecutor {
BookMeta bookMetaData = InventoryUtil.getHeldBookMetadata(player, heldBookSlot);
if (bookMetaData == null) {
new FormatBuilder(Translatable.ERROR_METADATA_MISSING).error(player);
return false;
return true;
}
String author = ColorHelper.translateColorCodes(String.join(" ", arguments), ColorConversion.RGB);

View File

@@ -95,7 +95,7 @@ public class CommandSetBookPrice implements TabExecutor {
private boolean setItemPrice(@NotNull CommandSender sender, double price) {
if (!(sender instanceof Player player)) {
new FormatBuilder(Translatable.ERROR_PLAYER_ONLY).error(sender);
return false;
return true;
}
ItemStack heldItem = InventoryUtil.getHeldItem(player, ItemSlot.MAIN_HAND);
@@ -138,11 +138,10 @@ public class CommandSetBookPrice implements TabExecutor {
new FormatBuilder(CostMessage.SUCCESS_COST_ECONOMY_SET).replace(Placeholder.COST,
economyManager.getEconomy().format(newPriceQuantity)).success(sender);
return true;
} else {
new FormatBuilder(StaticMessage.EXCEPTION_VAULT_PRICE_NOT_CHANGED.toString()).error(sender);
return false;
}
return true;
}
@Override

View File

@@ -30,13 +30,13 @@ public class CommandSetBookshelfData implements TabExecutor {
@NotNull String[] arguments) {
if (!(sender instanceof Player player)) {
new FormatBuilder(Translatable.ERROR_PLAYER_ONLY).error(sender);
return false;
return true;
}
Block targetBlock = player.getTargetBlockExact(7);
if (targetBlock == null || targetBlock.getType() != Material.CHISELED_BOOKSHELF) {
new FormatBuilder(BookshelfMessage.ERROR_BOOKSHELF_NOT_FOUND).error(sender);
return false;
return true;
}
BookshelfHandler shelfHandler = BooksWithoutBorders.getBookshelfHandler();

View File

@@ -25,12 +25,12 @@ public class CommandSetGeneration implements TabExecutor {
@NotNull String[] arguments) {
if (!(sender instanceof Player player)) {
new FormatBuilder(Translatable.ERROR_PLAYER_ONLY).error(sender);
return false;
return true;
}
if (InventoryUtil.notHoldingOneWrittenBookCheck(player,
Translatable.ACTION_CHANGE_GENERATION)) {
return false;
return true;
}
if (arguments.length < 1) {
@@ -52,11 +52,10 @@ public class CommandSetGeneration implements TabExecutor {
bookMeta.setGeneration(generation);
heldBook.setItemMeta(bookMeta);
new FormatBuilder(Translatable.SUCCESS_GENERATION_CHANGED).success(player);
return true;
} else {
new FormatBuilder(Translatable.ERROR_METADATA_MISSING).error(player);
return false;
}
return true;
}
@Nullable

View File

@@ -30,7 +30,7 @@ public class CommandSetLore implements TabExecutor {
@NotNull String[] arguments) {
if (!(sender instanceof Player player)) {
new FormatBuilder(Translatable.ERROR_PLAYER_ONLY).error(sender);
return false;
return true;
}
if (arguments.length < 1) {
@@ -41,7 +41,7 @@ public class CommandSetLore implements TabExecutor {
ItemStack heldItem = InventoryUtil.getHeldItem(player, ItemSlot.MAIN_HAND);
if (heldItem.getType() == Material.AIR) {
new FormatBuilder(Translatable.ERROR_NO_ITEM).error(player);
return false;
return true;
}
//Treat all arguments as lore input
@@ -55,7 +55,7 @@ public class CommandSetLore implements TabExecutor {
ItemMeta meta = heldItem.getItemMeta();
if (meta == null) {
new FormatBuilder(Translatable.ERROR_METADATA_MISSING).error(player);
return false;
return true;
}
meta.setLore(newLore);
heldItem.setItemMeta(meta);

View File

@@ -29,7 +29,7 @@ public class CommandSetTitle implements TabExecutor {
@NotNull String[] arguments) {
if (!(sender instanceof Player player)) {
new FormatBuilder(Translatable.ERROR_PLAYER_ONLY).error(sender);
return false;
return true;
}
if (arguments.length < 1) {
@@ -40,7 +40,7 @@ public class CommandSetTitle implements TabExecutor {
ItemStack heldItem = InventoryUtil.getHeldItem(player, ItemSlot.MAIN_HAND);
if (heldItem.getType() == Material.AIR) {
new FormatBuilder(Translatable.ERROR_NO_ITEM).error(player);
return false;
return true;
}
boolean setDisplayName = false;
@@ -56,7 +56,7 @@ public class CommandSetTitle implements TabExecutor {
ItemMeta itemMetadata = heldItem.getItemMeta();
if (itemMetadata == null) {
new FormatBuilder(Translatable.ERROR_METADATA_MISSING).error(player);
return false;
return true;
}
//Get and change metadata

View File

@@ -30,12 +30,12 @@ public class CommandUnSign implements TabExecutor {
@NotNull String[] arguments) {
if (!(sender instanceof Player player)) {
new FormatBuilder(Translatable.ERROR_PLAYER_ONLY).error(sender);
return false;
return true;
}
if (InventoryUtil.notHoldingOneWrittenBookCheck(player,
Translatable.ACTION_UNSIGN)) {
return false;
return true;
}
//Find which hand the player is using to hold the book. If holding one in each, throw an error