Fix ItemType#isEdible to also check for DataComponents#CONSUMABLE (#13348)

Author: aerulion

paper-api/src/main/java/org/bukkit/Material.java

@@ -3001,13 +3001,14 @@ public boolean isBlock() {
     }
 
     /**
-     * Checks if this Material is edible.
+     * Checks if this Material provides the {@link io.papermc.paper.datacomponent.DataComponentTypes#FOOD} and
+     * {@link io.papermc.paper.datacomponent.DataComponentTypes#CONSUMABLE} and, thereby, is edible by a player.
      *
      * @return true if this Material is edible.
      */
     public boolean isEdible() {
         ItemType type = asItemType();
-        return type == null ? false : type.isEdible();
+        return type != null && type.isEdible();
     }
 
     /**

paper-api/src/main/java/org/bukkit/inventory/ItemType.java

@@ -3189,7 +3189,8 @@ private static <M extends ItemType> M getItemType(@KeyPattern.Value final String
     short getMaxDurability();
 
     /**
-     * Checks if this item type is edible.
+     * Checks if this item type provides the {@link io.papermc.paper.datacomponent.DataComponentTypes#FOOD} and
+     * {@link io.papermc.paper.datacomponent.DataComponentTypes#CONSUMABLE} and, thereby, is edible by a player.
      *
      * @return true if this item type is edible.
      */

paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemType.java

@@ -143,7 +143,7 @@ public short getMaxDurability() {
 
     @Override
     public boolean isEdible() {
-        return this.getHandle().components().has(DataComponents.FOOD);
+        return this.getHandle().components().has(DataComponents.FOOD) && this.getHandle().components().has(DataComponents.CONSUMABLE);
     }
 
     @Override