mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Reorder some patches

Browse source
This commit is contained in:
Nassim Jahnke 2022-06-08 18:13:02 +02:00
parent a02874e014
commit 57dfcdf4eb
No known key found for this signature in database
GPG key ID: 6BE3B555EBC5982B
164 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

59
patches/api/0298-ItemStack-repair-check-API.patch Normal file
View 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 eadba6454530724619872034f6e680b4603b8a69..248453b259781aa45516133a0ed824f4e6f6a369 100644
--- a/src/main/java/org/bukkit/UnsafeValues.java
+++ b/src/main/java/org/bukkit/UnsafeValues.java
@@ -180,6 +180,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 75bd1f7a5a30d21ae61836072ec057a95b7c288b..0d0d7bda2d4fafffd3e80a359019626ab44031d0 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -893,5 +893,27 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor
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
}