From 3f70a3b9384f1be5ea12bd35a29ae789a7092f54 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Tue, 18 May 2021 01:57:33 -0700 Subject: [PATCH] Adds methods for checking item repairability (#5651) --- .../ItemStack-repair-check-API.patch | 59 ++++++++++++ .../ItemStack-repair-check-API.patch | 91 +++++++++++++++++++ 2 files changed, 150 insertions(+) create mode 100644 Spigot-API-Patches/ItemStack-repair-check-API.patch create mode 100644 Spigot-Server-Patches/ItemStack-repair-check-API.patch diff --git a/Spigot-API-Patches/ItemStack-repair-check-API.patch b/Spigot-API-Patches/ItemStack-repair-check-API.patch new file mode 100644 index 0000000000..3251a10bcb --- /dev/null +++ b/Spigot-API-Patches/ItemStack-repair-check-API.patch @@ -0,0 +1,59 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic +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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/org/bukkit/UnsafeValues.java ++++ b/src/main/java/org/bukkit/UnsafeValues.java +@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/org/bukkit/inventory/ItemStack.java ++++ b/src/main/java/org/bukkit/inventory/ItemStack.java +@@ -0,0 +0,0 @@ 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 + } diff --git a/Spigot-Server-Patches/ItemStack-repair-check-API.patch b/Spigot-Server-Patches/ItemStack-repair-check-API.patch new file mode 100644 index 0000000000..b397b6702f --- /dev/null +++ b/Spigot-Server-Patches/ItemStack-repair-check-API.patch @@ -0,0 +1,91 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic +Date: Sat, 15 May 2021 22:11:11 -0700 +Subject: [PATCH] ItemStack repair check API + + +diff --git a/src/main/java/net/minecraft/world/item/Item.java b/src/main/java/net/minecraft/world/item/Item.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/net/minecraft/world/item/Item.java ++++ b/src/main/java/net/minecraft/world/item/Item.java +@@ -0,0 +0,0 @@ public class Item implements IMaterial { + return this.i; + } + ++ public boolean canRepair(ItemStack toBeRepaired, ItemStack repairMaterial) { return a(toBeRepaired, repairMaterial); } // Paper - OBFHELPER + public boolean a(ItemStack itemstack, ItemStack itemstack1) { + return false; + } +diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java ++++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +@@ -0,0 +0,0 @@ public final class CraftMagicNumbers implements UnsafeValues { + return io.papermc.paper.inventory.ItemRarity.values()[getItem(itemStack.getType()).getItemStackRarity(CraftItemStack.asNMSCopy(itemStack)).ordinal()]; + } + ++ @Override ++ public boolean isValidRepairItemStack(org.bukkit.inventory.ItemStack itemToBeRepaired, org.bukkit.inventory.ItemStack repairMaterial) { ++ if (!itemToBeRepaired.getType().isItem() || !repairMaterial.getType().isItem()) { ++ return false; ++ } ++ return this.getItem(itemToBeRepaired.getType()).canRepair(CraftItemStack.asNMSCopy(itemToBeRepaired), CraftItemStack.asNMSCopy(repairMaterial)); ++ } ++ + @Override + public int getProtocolVersion() { + return net.minecraft.SharedConstants.getGameVersion().getProtocolVersion(); +diff --git a/src/test/java/io/papermc/paper/util/ItemStackRepairCheckTest.java b/src/test/java/io/papermc/paper/util/ItemStackRepairCheckTest.java +new file mode 100644 +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 +--- /dev/null ++++ b/src/test/java/io/papermc/paper/util/ItemStackRepairCheckTest.java +@@ -0,0 +0,0 @@ ++package io.papermc.paper.util; ++ ++import org.bukkit.Material; ++import org.bukkit.inventory.ItemStack; ++import org.bukkit.support.AbstractTestingBase; ++import org.junit.Test; ++ ++import static org.junit.Assert.assertFalse; ++import static org.junit.Assert.assertThrows; ++import static org.junit.Assert.assertTrue; ++ ++public class ItemStackRepairCheckTest extends AbstractTestingBase { ++ ++ @Test ++ public void testIsRepariableBy() { ++ ItemStack diamondPick = new ItemStack(Material.DIAMOND_PICKAXE); ++ ++ assertTrue("diamond pick isn't repairable by a diamond", diamondPick.isRepairableBy(new ItemStack(Material.DIAMOND))); ++ } ++ ++ @Test ++ public void testCanRepair() { ++ ItemStack diamond = new ItemStack(Material.DIAMOND); ++ ++ assertTrue("diamond can't repair a diamond axe", diamond.canRepair(new ItemStack(Material.DIAMOND_AXE))); ++ } ++ ++ @Test ++ public void testIsNotRepairableBy() { ++ ItemStack notDiamondPick = new ItemStack(Material.ACACIA_SAPLING); ++ ++ assertFalse("acacia sapling is repairable by a diamond", notDiamondPick.isRepairableBy(new ItemStack(Material.DIAMOND))); ++ } ++ ++ @Test ++ public void testCanNotRepair() { ++ ItemStack diamond = new ItemStack(Material.DIAMOND); ++ ++ assertFalse("diamond can repair oak button", diamond.canRepair(new ItemStack(Material.OAK_BUTTON))); ++ } ++ ++ @Test ++ public void testInvalidItem() { ++ ItemStack badItemStack = new ItemStack(Material.ACACIA_WALL_SIGN); ++ ++ assertFalse("acacia wall sign is repairable by diamond", badItemStack.isRepairableBy(new ItemStack(Material.DIAMOND))); ++ } ++}