2021-06-11 14:02:28 +02:00
|
|
|
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
|
2022-01-01 04:05:42 +01:00
|
|
|
index 8f85c41be166ea720a0bf5b6b58bc51a6d2c71cc..c1bda4dba319999261613d4aa45a280ed1af0d8c 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/UnsafeValues.java
|
|
|
|
+++ b/src/main/java/org/bukkit/UnsafeValues.java
|
2022-01-01 04:05:42 +01:00
|
|
|
@@ -162,6 +162,16 @@ public interface UnsafeValues {
|
2021-06-11 14:02:28 +02:00
|
|
|
*/
|
|
|
|
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
|
2022-01-17 01:53:26 +01:00
|
|
|
index 45e656643f07e25ee4432786dea750b83abc95ae..a1d332a5eafb88c2f5d95bea6dc7e528ea2047be 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
|
|
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
2022-01-17 01:53:26 +01:00
|
|
|
@@ -890,5 +890,27 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor
|
2021-06-11 14:02:28 +02:00
|
|
|
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
|
|
|
|
}
|