From 18ad1a470564ec278a523e087703f1c4aa32d377 Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Fri, 12 Sep 2025 02:40:51 +0200 Subject: [PATCH] Updates KnarLib, and removes unnecessary String.valueOf calls --- pom.xml | 2 +- .../command/CommandBooksWithoutBorders.java | 4 ++-- .../command/CommandEditConfig.java | 12 ++++++------ .../knarcraft/bookswithoutborders/gui/BookIndex.java | 6 +++--- .../bookswithoutborders/gui/PagedBookIndex.java | 2 +- .../listener/BookshelfListener.java | 2 +- .../bookswithoutborders/manager/EconomyManager.java | 11 ++++++----- .../bookswithoutborders/utility/EncryptionUtil.java | 1 + .../bookswithoutborders/encryption/AESTest.java | 1 + 9 files changed, 22 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index a47340f..cc76d1d 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ net.knarcraft knarlib - 1.2.14-SNAPSHOT + 1.2.15-SNAPSHOT compile diff --git a/src/main/java/net/knarcraft/bookswithoutborders/command/CommandBooksWithoutBorders.java b/src/main/java/net/knarcraft/bookswithoutborders/command/CommandBooksWithoutBorders.java index cb030b7..06ef080 100644 --- a/src/main/java/net/knarcraft/bookswithoutborders/command/CommandBooksWithoutBorders.java +++ b/src/main/java/net/knarcraft/bookswithoutborders/command/CommandBooksWithoutBorders.java @@ -88,7 +88,7 @@ public class CommandBooksWithoutBorders implements TabExecutor { double bookPriceQuantity = config.getBookPriceQuantity(); if (bookPriceType != Material.AIR) { return new FormatBuilder(Formatting.NEUTRAL_COMMANDS_BOOK_PRICE_ITEM).replace(Placeholder.QUANTITY, - String.valueOf((int) bookPriceQuantity)).replace(Placeholder.TYPE, bookPriceType.toString()).toString(); + (int) bookPriceQuantity).replace(Placeholder.TYPE, bookPriceType).toString(); } else { EconomyManager economyManager = BooksWithoutBorders.getConfiguration().getEconomyManager(); if (economyManager.getEconomy() == null) { @@ -163,7 +163,7 @@ public class CommandBooksWithoutBorders implements TabExecutor { commandUsage = pluginCommand.getUsage().replace("", pluginCommand.getName()); description = pluginCommand.getDescription(); aliases = new FormatBuilder(Formatting.NEUTRAL_COMMANDS_ALIASES).replace(Placeholder.ALIASES, - String.join(",", pluginCommand.getAliases())).toString(); + pluginCommand.getAliases()).toString(); } String commandDescription = new FormatBuilder(Formatting.NEUTRAL_COMMANDS_COMMAND).replace(Placeholder.USAGE, diff --git a/src/main/java/net/knarcraft/bookswithoutborders/command/CommandEditConfig.java b/src/main/java/net/knarcraft/bookswithoutborders/command/CommandEditConfig.java index 8091043..2864f06 100644 --- a/src/main/java/net/knarcraft/bookswithoutborders/command/CommandEditConfig.java +++ b/src/main/java/net/knarcraft/bookswithoutborders/command/CommandEditConfig.java @@ -168,15 +168,15 @@ public class CommandEditConfig implements TabExecutor { FileConfiguration configuration = BooksWithoutBorders.getInstance().getConfig(); if (option == ConfigOption.PRICE_QUANTITY || option == ConfigOption.PRICE_ITEM_TYPE) { new FormatBuilder(Translatable.SUCCESS_CONFIGURATION_PRICE_CURRENT_VALUE). - replace(Placeholder.QUANTITY, String.valueOf(configuration.getDouble(ConfigOption.PRICE_QUANTITY.getConfigNode()))). + replace(Placeholder.QUANTITY, configuration.getDouble(ConfigOption.PRICE_QUANTITY.getConfigNode())). replace(Placeholder.TYPE, configuration.getString(ConfigOption.PRICE_ITEM_TYPE.getConfigNode(), "")). - replace(Placeholder.DEFAULT_COST, String.valueOf(ConfigOption.PRICE_ITEM_TYPE.getDefaultValue())). - replace(Placeholder.DEFAULT_QUANTITY, String.valueOf(ConfigOption.PRICE_QUANTITY.getDefaultValue())).success(sender); + replace(Placeholder.DEFAULT_COST, ConfigOption.PRICE_ITEM_TYPE.getDefaultValue()). + replace(Placeholder.DEFAULT_QUANTITY, ConfigOption.PRICE_QUANTITY.getDefaultValue()).success(sender); } else { String node = option.getConfigNode(); new FormatBuilder(Translatable.SUCCESS_CONFIGURATION_CURRENT_VALUE).replace(Placeholder.OPTION, node). - replace(Placeholder.VALUE, String.valueOf(configuration.get(node))). - replace(Placeholder.DEFAULT, String.valueOf(option.getDefaultValue())).success(sender); + replace(Placeholder.VALUE, configuration.get(node, "")). + replace(Placeholder.DEFAULT, option.getDefaultValue()).success(sender); } } @@ -400,7 +400,7 @@ public class CommandEditConfig implements TabExecutor { updateValueAndReload(ConfigOption.PRICE_ITEM_TYPE, heldItem.getType(), false); updateValueAndReload(ConfigOption.PRICE_QUANTITY, price, true); new FormatBuilder(CostMessage.SUCCESS_COST_ITEM_SET).replace(Placeholder.QUANTITY, - String.valueOf((int) price)).replace(Placeholder.COST, heldItem.getType().toString()).success(sender); + (int) price).replace(Placeholder.COST, heldItem.getType().toString()).success(sender); return true; } diff --git a/src/main/java/net/knarcraft/bookswithoutborders/gui/BookIndex.java b/src/main/java/net/knarcraft/bookswithoutborders/gui/BookIndex.java index 32d5e83..7ee2db6 100644 --- a/src/main/java/net/knarcraft/bookswithoutborders/gui/BookIndex.java +++ b/src/main/java/net/knarcraft/bookswithoutborders/gui/BookIndex.java @@ -86,7 +86,7 @@ public abstract class BookIndex { protected static void displayTotalPages(@NotNull ComponentBuilder componentBuilder, @NotNull String command, int page, int totalPages) { String pageDisplay = new FormatBuilder(Formatting.NEUTRAL_BOOK_LIST_TOTAL_PAGES).replace(Placeholder.CURRENT, - String.valueOf(page)).replace(Placeholder.TOTAL, String.valueOf(totalPages)).color().toString(); + page).replace(Placeholder.TOTAL, totalPages).color().toString(); componentBuilder.append(pageDisplay, ComponentBuilder.FormatRetention.NONE).color(interactColor).event(new HoverEvent( HoverEvent.Action.SHOW_TEXT, new Text("/" + command + " page" + page))).event( @@ -133,7 +133,7 @@ public abstract class BookIndex { if (page > 1) { String fullCommand = "/" + command + " page" + (page - 1); HoverEvent prevPagePreview = new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text( - new FormatBuilder(Formatting.NEUTRAL_BOOK_LIST_TO_PAGE).replace(Placeholder.PAGE, String.valueOf(page - 1)).color().toString())); + new FormatBuilder(Formatting.NEUTRAL_BOOK_LIST_TO_PAGE).replace(Placeholder.PAGE, page - 1).color().toString())); ClickEvent prevPageClick = new ClickEvent(ClickEvent.Action.RUN_COMMAND, fullCommand); componentBuilder.append(previousPage, ComponentBuilder.FormatRetention.NONE).color(interactColor). event(prevPagePreview).event(prevPageClick); @@ -156,7 +156,7 @@ public abstract class BookIndex { if (page < totalPages) { String fullCommand = "/" + command + " page" + (page + 1); HoverEvent nextPagePreview = new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text( - new FormatBuilder(Formatting.NEUTRAL_BOOK_LIST_TO_PAGE).replace(Placeholder.PAGE, String.valueOf(page + 1)).color().toString())); + new FormatBuilder(Formatting.NEUTRAL_BOOK_LIST_TO_PAGE).replace(Placeholder.PAGE, page + 1).color().toString())); ClickEvent nextPageClick = new ClickEvent(ClickEvent.Action.RUN_COMMAND, fullCommand); componentBuilder.append(nextPage, ComponentBuilder.FormatRetention.NONE).color(interactColor) .event(nextPagePreview).event(nextPageClick); diff --git a/src/main/java/net/knarcraft/bookswithoutborders/gui/PagedBookIndex.java b/src/main/java/net/knarcraft/bookswithoutborders/gui/PagedBookIndex.java index f560762..99c438f 100644 --- a/src/main/java/net/knarcraft/bookswithoutborders/gui/PagedBookIndex.java +++ b/src/main/java/net/knarcraft/bookswithoutborders/gui/PagedBookIndex.java @@ -107,7 +107,7 @@ public class PagedBookIndex extends BookIndex { new Text(new FormatBuilder(Formatting.NEUTRAL_BOOK_LIST_AUTHOR_HOVER).replace(Placeholder.AUTHOR, InputCleaningUtil.stripColor(author)).color().toString())); componentBuilder.append(new FormatBuilder(Formatting.NEUTRAL_BOOK_LIST_BOOK_INDEX_NUMBER).replace(Placeholder.INDEX, - String.valueOf(bookIndex + 1)).color().toString()).color(interactColor).event(indexClick).event(indexHover); + bookIndex + 1).color().toString()).color(interactColor).event(indexClick).event(indexHover); componentBuilder.append(" ", ComponentBuilder.FormatRetention.NONE); componentBuilder.append(title).color(ChatColor.WHITE).event(pathClick).event(pathHover); componentBuilder.append(new FormatBuilder(Formatting.NEUTRAL_BOOK_LIST_AUTHOR_SEPARATOR).color().toString(), diff --git a/src/main/java/net/knarcraft/bookswithoutborders/listener/BookshelfListener.java b/src/main/java/net/knarcraft/bookswithoutborders/listener/BookshelfListener.java index 7dcd184..4c9ca5d 100644 --- a/src/main/java/net/knarcraft/bookswithoutborders/listener/BookshelfListener.java +++ b/src/main/java/net/knarcraft/bookswithoutborders/listener/BookshelfListener.java @@ -126,7 +126,7 @@ public class BookshelfListener implements Listener { builder.append(new FormatBuilder(Formatting.NEUTRAL_BOOKSHELF_HEADER_BOTTOM)); } - builder.append(new FormatBuilder(Formatting.NEUTRAL_BOOKSHELF_ENTRY_INDEX).replace(Placeholder.INDEX, String.valueOf(index))); + builder.append(new FormatBuilder(Formatting.NEUTRAL_BOOKSHELF_ENTRY_INDEX).replace(Placeholder.INDEX, index)); ItemStack itemStack = bookshelfInventory.getItem(counter); if (itemStack == null) { diff --git a/src/main/java/net/knarcraft/bookswithoutborders/manager/EconomyManager.java b/src/main/java/net/knarcraft/bookswithoutborders/manager/EconomyManager.java index 498d7ac..febc1b1 100644 --- a/src/main/java/net/knarcraft/bookswithoutborders/manager/EconomyManager.java +++ b/src/main/java/net/knarcraft/bookswithoutborders/manager/EconomyManager.java @@ -85,7 +85,7 @@ public class EconomyManager { return false; } else { new FormatBuilder(CostMessage.ERROR_COST_INSUFFICIENT_AMOUNT).replace(Placeholder.COST, - String.valueOf(itemCost)).replace(Placeholder.CURRENCY, bookCurrency.toString()).error(player); + itemCost).replace(Placeholder.CURRENCY, bookCurrency.toString()).error(player); return true; } } @@ -101,7 +101,7 @@ public class EconomyManager { List books = getPlayersEmptyBooks(player); if (countItems(books) < itemCost) { new FormatBuilder(CostMessage.ERROR_COST_INSUFFICIENT_WRITABLE_BOOK). - replace(Placeholder.COST, String.valueOf(itemCost)).error(player); + replace(Placeholder.COST, itemCost).error(player); return false; } else { int clearedAmount = 0; @@ -175,11 +175,12 @@ public class EconomyManager { if ((economy.getBalance(player) - cost) >= 0) { economy.withdrawPlayer(player, cost); new FormatBuilder(CostMessage.SUCCESS_COST_PAID).replace(Placeholder.COST, economy.format(cost)). - replace(Placeholder.COPIES, String.valueOf(numCopies)). - replace(Placeholder.BALANCE, economy.format(economy.getBalance(player))).success(player); + replace(Placeholder.COPIES, numCopies).replace(Placeholder.BALANCE, economy. + format(economy.getBalance(player))).success(player); return true; } else { - new FormatBuilder(CostMessage.ERROR_COST_INSUFFICIENT_ECONOMY).replace(Placeholder.COST, economy.format(cost)).error(player); + new FormatBuilder(CostMessage.ERROR_COST_INSUFFICIENT_ECONOMY). + replace(Placeholder.COST, economy.format(cost)).error(player); return false; } } diff --git a/src/main/java/net/knarcraft/bookswithoutborders/utility/EncryptionUtil.java b/src/main/java/net/knarcraft/bookswithoutborders/utility/EncryptionUtil.java index da439b5..b78e28b 100644 --- a/src/main/java/net/knarcraft/bookswithoutborders/utility/EncryptionUtil.java +++ b/src/main/java/net/knarcraft/bookswithoutborders/utility/EncryptionUtil.java @@ -17,6 +17,7 @@ import java.util.List; */ public final class EncryptionUtil { + @SuppressWarnings("SpellCheckingInspection") private static final byte[] HEX_ARRAY = "0123456789ABCDEF".getBytes(StandardCharsets.US_ASCII); private EncryptionUtil() { diff --git a/src/test/java/net/knarcraft/bookswithoutborders/encryption/AESTest.java b/src/test/java/net/knarcraft/bookswithoutborders/encryption/AESTest.java index b9fac51..e226df7 100644 --- a/src/test/java/net/knarcraft/bookswithoutborders/encryption/AESTest.java +++ b/src/test/java/net/knarcraft/bookswithoutborders/encryption/AESTest.java @@ -6,6 +6,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; +@SuppressWarnings("SpellCheckingInspection") public class AESTest { @Test