SubCommand_Find: Add finding enchantments on enchanted books (PotatoCraft-Studio#306)

* SubCommand_Find: Add finding enchants on books

* Reduce nested if's into singular if statement using &&

* Combine getBooksEnchantments and listContainsString into single function

* Add missed imports

---------

Co-authored-by: sandtechnology <20417547+sandtechnology@users.noreply.github.com>

Author: SarahGreyWolf

src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Find.java

@@ -89,11 +89,11 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not
             double distance = shopVector.distance(playerVector);
             //Check distance
             if (distance <= maxDistance) {
-                //Collect valid shop that trading items we want
-                if (!Util.getItemStackName(shop.getItem()).toLowerCase().contains(lookFor)) {
-                    if (!shop.getItem().getType().name().toLowerCase().contains(lookFor)) {
-                        continue;
-                    }
+                // Collect valid shop that trading items we want
+                if (!Util.getItemStackName(shop.getItem()).toLowerCase().contains(lookFor)
+                        && !shop.getItem().getType().name().toLowerCase().contains(lookFor)
+                        && !Util.isBookEnchantmentsMatched(shop.getItem(), lookFor)) {
+                    continue;
                 }
                 if (excludeOutOfStock) {
                     if ((shop.isSelling() && shop.getRemainingStock() == 0) || (shop.isBuying() && shop.getRemainingSpace() == 0)) {

src/main/java/org/maxgamer/quickshop/util/Util.java

@@ -94,6 +94,7 @@
 import java.util.EnumSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Objects;
@@ -576,6 +577,34 @@ public static String getItemStackName(@NotNull ItemStack itemStack) {
         return result == null ? MsgUtil.getItemi18n(itemStack.getType().name()) : result;
     }
 
+    /**
+     * Check all enchantments on a book and return true if they contain the
+     * nameToMatch
+     * 
+     * @param itemStack The enchanted book itemstack
+     * @param String    The name of the enchant to check the book for
+     * @return The names of enchants contained on the enchanted book
+     */
+    @NotNull
+    public static boolean isBookEnchantmentsMatched(@NotNull ItemStack itemStack, @NotNull String nameToMatch) {
+        if (itemStack.getType() == Material.ENCHANTED_BOOK) {
+            ItemMeta itemMeta = itemStack.getItemMeta();
+            if (!(itemMeta instanceof EnchantmentStorageMeta))
+                return false;
+            EnchantmentStorageMeta enchantmentStorageMeta = (EnchantmentStorageMeta) itemStack.getItemMeta();
+            if (enchantmentStorageMeta.hasStoredEnchants()) {
+                for (Enchantment enchantment : enchantmentStorageMeta.getStoredEnchants().keySet()) {
+                    nameToMatch = nameToMatch.toUpperCase(Locale.ROOT);
+                    if (enchantment.getKey().getKey().toUpperCase(Locale.ROOT).contains(nameToMatch)
+                            || MsgUtil.getEnchi18n(enchantment).toUpperCase(Locale.ROOT).contains(nameToMatch)) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
     @NotNull
     public static String getFirstEnchantmentName(@NotNull EnchantmentStorageMeta meta) {
         if (!meta.hasStoredEnchants()) {