Fixed crafting, deprecated now-unneeded API

eco-api/src/main/java/com/willfp/eco/core/recipe/parts/GroupedTestableItems.java

@@ -57,6 +57,23 @@ public class GroupedTestableItems implements TestableItem {
         throw new IllegalStateException("Empty group of children!");
     }
 
+    /**
+     * Get matching child for an ItemStack.
+     *
+     * @param itemStack The ItemStack.
+     * @return The matching child, or null if the item matches nothing.
+     */
+    @Nullable
+    public TestableItem getMatchingChild(@NotNull final ItemStack itemStack) {
+        for (TestableItem child : children) {
+            if (child.matches(itemStack)) {
+                return child;
+            }
+        }
+
+        return null;
+    }
+
     /**
      * Get the children.
      *

eco-api/src/main/java/com/willfp/eco/core/recipe/parts/MaterialTestableItem.java

@@ -1,5 +1,6 @@
 package com.willfp.eco.core.recipe.parts;
 
+import com.willfp.eco.core.items.Items;
 import com.willfp.eco.core.items.TestableItem;
 import org.apache.commons.lang.Validate;
 import org.bukkit.Material;
@@ -35,7 +36,13 @@ public class MaterialTestableItem implements TestableItem {
      */
     @Override
     public boolean matches(@Nullable final ItemStack itemStack) {
-        return itemStack != null && itemStack.getType() == material;
+        boolean simpleMatches = itemStack != null && itemStack.getType() == material;
+
+        if (!simpleMatches) {
+            return false;
+        }
+
+        return !Items.isCustomItem(itemStack);
     }
 
     @Override

eco-api/src/main/java/com/willfp/eco/util/BlockUtils.java

@@ -1,6 +1,5 @@
 package com.willfp.eco.util;
 
-import org.apache.commons.lang.Validate;
 import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -9,28 +8,16 @@ import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Player;
 import org.bukkit.persistence.PersistentDataType;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.function.BiConsumer;
 
 /**
  * Utilities / API methods for blocks.
  */
 public final class BlockUtils {
-    /**
-     * If the meta set function has been set.
-     */
-    private static boolean initialized = false;
-
-    /**
-     * The block break function.
-     */
-    private static BiConsumer<Player, Block> blockBreakConsumer = null;
-
     private static Set<Block> getNearbyBlocks(@NotNull final Block start,
                                               @NotNull final List<Material> allowedMaterials,
                                               @NotNull final Set<Block> blocks,
@@ -75,12 +62,11 @@ public final class BlockUtils {
      *
      * @param player The player to break the block as.
      * @param block  The block to break.
+     * @deprecated Added into spigot API in 1.17.1
      */
+    @Deprecated(since = "6.26.2", forRemoval = true)
     public static void breakBlock(@NotNull final Player player,
                                   @NotNull final Block block) {
-        Validate.isTrue(initialized, "Must be initialized!");
-        Validate.notNull(blockBreakConsumer, "Must be initialized!");
-
         Location location = block.getLocation();
         World world = location.getWorld();
         assert world != null;
@@ -89,7 +75,7 @@ public final class BlockUtils {
             return;
         }
 
-        blockBreakConsumer.accept(player, block);
+        player.breakBlock(block);
     }
 
     /**
@@ -107,20 +93,6 @@ public final class BlockUtils {
         );
     }
 
-    /**
-     * Initialize the block break function.
-     *
-     * @param function The function.
-     */
-    @ApiStatus.Internal
-    public static void initialize(@NotNull final BiConsumer<Player, Block> function) {
-        Validate.isTrue(!initialized, "Already initialized!");
-
-        blockBreakConsumer = function;
-
-        initialized = true;
-    }
-
     private BlockUtils() {
         throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
     }