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
|
2024-10-27 18:11:15 +01:00
|
|
|
index f33426207c403906c3c6fb99e848fd7ecbffd127..3ef6ffb506a7fdd05a08353f342e45de8066ca19 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
|
2024-10-27 18:11:15 +01:00
|
|
|
@@ -182,5 +182,15 @@ public interface UnsafeValues {
|
2024-04-27 01:43:59 +02:00
|
|
|
* @return the server's protocol version
|
2021-06-11 14:02:28 +02:00
|
|
|
*/
|
2024-04-27 01:43:59 +02:00
|
|
|
int getProtocolVersion();
|
|
|
|
+
|
2021-06-11 14:02:28 +02:00
|
|
|
+ /**
|
|
|
|
+ * 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);
|
2024-04-27 01:43:59 +02:00
|
|
|
// Paper end
|
|
|
|
}
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
|
2024-10-22 18:23:19 +02:00
|
|
|
index 45fc5fab3817a8d9e1c83bcfb0add9eba023abfe..ea50697a8dcdf87be046569b75fcc53ec870ca3e 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
|
2024-09-22 21:02:06 +02:00
|
|
|
@@ -1006,5 +1006,27 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
|
2021-06-11 14:02:28 +02:00
|
|
|
public io.papermc.paper.inventory.ItemRarity getRarity() {
|
2024-04-27 01:43:59 +02:00
|
|
|
return io.papermc.paper.inventory.ItemRarity.valueOf(this.getItemMeta().getRarity().name());
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 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
|
|
|
|
}
|