Begin update to 1.20.5
This commit is contained in:
parent
f4c7d373e4
commit
abc49bf069
1409 changed files with 1134 additions and 1281 deletions
59
patches/api/0281-ItemStack-repair-check-API.patch
Normal file
59
patches/api/0281-ItemStack-repair-check-API.patch
Normal file
|
@ -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 42e4983051062f2fd3b595487cf8093440b41bba..057f4db9cb6b686ab941ec5d3e6ca23dcfbd845f 100644
|
||||
--- a/src/main/java/org/bukkit/UnsafeValues.java
|
||||
+++ b/src/main/java/org/bukkit/UnsafeValues.java
|
||||
@@ -187,6 +187,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 569f67ee3f89d6af4fe1420cecc74811550b6507..78ea59c8f63b5a71ba092cf1783183bb5d0a3b79 100644
|
||||
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
@@ -898,5 +898,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
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue