Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9301)

patches/api/0284-ItemStack-repair-check-API.patch

@@ -0,0 +1,59 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <jake.m.potrebic@gmail.com>
+Date: Sat, 15 May 2021 22:10:50 -0700
+Subject: [PATCH] ItemStack repair check API
+
+
+diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
+index a27e14e00d759d6c15530ef038bcf4b5cbd9f120..00e61ab3103c86c9aabcdfa2fd4c565adcc091da 100644
+--- a/src/main/java/org/bukkit/UnsafeValues.java
++++ b/src/main/java/org/bukkit/UnsafeValues.java
+@@ -160,6 +160,16 @@ public interface UnsafeValues {
+      */
+     public io.papermc.paper.inventory.ItemRarity getItemStackRarity(ItemStack itemStack);
+ 
++    /**
++     * Checks if an itemstack can be repaired with another itemstack.
++     * Returns false if either argument's type is not an item ({@link Material#isItem()}).
++     *
++     * @param itemToBeRepaired the itemstack to be repaired
++     * @param repairMaterial the repair material
++     * @return true if valid repair, false if not
++     */
++    public boolean isValidRepairItemStack(@org.jetbrains.annotations.NotNull ItemStack itemToBeRepaired, @org.jetbrains.annotations.NotNull ItemStack repairMaterial);
++
+     /**
+      * Returns the server's protocol version.
+      *
+diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
+index 4f867ba2bc9b1a7c277e4a5f0ea8b452315f3272..2d945516ec65ffe103479aea218b3002cc572dc1 100644
+--- a/src/main/java/org/bukkit/inventory/ItemStack.java
++++ b/src/main/java/org/bukkit/inventory/ItemStack.java
+@@ -887,5 +887,27 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+     public io.papermc.paper.inventory.ItemRarity getRarity() {
+         return Bukkit.getUnsafe().getItemStackRarity(this);
+     }
++
++    /**
++     * Checks if an itemstack can repair this itemstack.
++     * Returns false if {@code this} or {@code repairMaterial}'s type is not an item ({@link Material#isItem()}).
++     *
++     * @param repairMaterial the repair material
++     * @return true if it is repairable by, false if not
++     */
++    public boolean isRepairableBy(@NotNull ItemStack repairMaterial) {
++        return Bukkit.getUnsafe().isValidRepairItemStack(this, repairMaterial);
++    }
++
++    /**
++     * Checks if this itemstack can repair another.
++     * Returns false if {@code this} or {@code toBeRepaired}'s type is not an item ({@link Material#isItem()}).
++     *
++     * @param toBeRepaired the itemstack to be repaired
++     * @return true if it can repair, false if not
++     */
++    public boolean canRepair(@NotNull ItemStack toBeRepaired) {
++        return Bukkit.getUnsafe().isValidRepairItemStack(toBeRepaired, this);
++    }
+     // Paper end
+ }