Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-16 19:40:07 +01:00
ef0e5a642d
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 9ae3f10f SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API 48c0c547 PR-786: Add methods to get sounds from entities CraftBukkit Changes: 5cc9c022a SPIGOT-7152: Handle hand item changing during air interact event 4ffa1acf6 SPIGOT-7154: Players get kicked when interacting with a conversation 4daa21123 SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API e5d6a9bbf PR-1100: Add methods to get sounds from entities b7e9f1c8b SPIGOT-7146: Reduce use of Material switch in ItemMeta Spigot Changes: 4c157bb4 Rebuild patches
80 Zeilen
3.4 KiB
Diff
80 Zeilen
3.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Sat, 15 May 2021 22:11:11 -0700
|
|
Subject: [PATCH] ItemStack repair check API
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
|
index 7f747fbaa1da49ab930d2a9ff60200a445ca477c..0ebcadd6daf244cd9b6c943ca0a2baaafb3eba50 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
|
@@ -537,6 +537,14 @@ public final class CraftMagicNumbers implements UnsafeValues {
|
|
return io.papermc.paper.inventory.ItemRarity.values()[getItem(itemStack.getType()).getRarity(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 CraftMagicNumbers.getItem(itemToBeRepaired.getType()).isValidRepairItem(CraftItemStack.asNMSCopy(itemToBeRepaired), CraftItemStack.asNMSCopy(repairMaterial));
|
|
+ }
|
|
+
|
|
@Override
|
|
public int getProtocolVersion() {
|
|
return net.minecraft.SharedConstants.getCurrentVersion().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..8d9c9b3bd53d407391d4fcb7fc773153d1a7b402
|
|
--- /dev/null
|
|
+++ b/src/test/java/io/papermc/paper/util/ItemStackRepairCheckTest.java
|
|
@@ -0,0 +1,48 @@
|
|
+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)));
|
|
+ }
|
|
+}
|