From 2e423c895439e908181198c85587cff7b17245a5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jun 2018 23:01:16 -0400 Subject: [PATCH] ItemStack#getMaxItemUseDuration Allows you to determine how long it takes to use a usable/consumable item --- ...0110-ItemStack-getMaxItemUseDuration.patch | 29 ++++++++++++++ ...0302-ItemStack-getMaxItemUseDuration.patch | 40 +++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 Spigot-API-Patches/0110-ItemStack-getMaxItemUseDuration.patch create mode 100644 Spigot-Server-Patches/0302-ItemStack-getMaxItemUseDuration.patch diff --git a/Spigot-API-Patches/0110-ItemStack-getMaxItemUseDuration.patch b/Spigot-API-Patches/0110-ItemStack-getMaxItemUseDuration.patch new file mode 100644 index 0000000000..b2d984c957 --- /dev/null +++ b/Spigot-API-Patches/0110-ItemStack-getMaxItemUseDuration.patch @@ -0,0 +1,29 @@ +From dca114a3fa37ef6bb99e05cce391850e6cdb0937 Mon Sep 17 00:00:00 2001 +From: Aikar +Date: Tue, 5 Jun 2018 22:59:50 -0400 +Subject: [PATCH] ItemStack#getMaxItemUseDuration + +Allows you to determine how long it takes to use a usable/consumable item + +diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java +index 567706ac..82240129 100644 +--- a/src/main/java/org/bukkit/inventory/ItemStack.java ++++ b/src/main/java/org/bukkit/inventory/ItemStack.java +@@ -632,5 +632,14 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { + public String getI18NDisplayName() { + return Bukkit.getServer().getItemFactory().getI18NDisplayName(this); + } ++ ++ public int getMaxItemUseDuration() { ++ Material material = Material.getMaterial(type); ++ if (material == null || !material.isItem()) { ++ return 0; ++ } ++ // Requires access to NMS ++ return ensureServerConversions().getMaxItemUseDuration(); ++ } + // Paper end + } +-- +2.17.1 + diff --git a/Spigot-Server-Patches/0302-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0302-ItemStack-getMaxItemUseDuration.patch new file mode 100644 index 0000000000..f59ff2de20 --- /dev/null +++ b/Spigot-Server-Patches/0302-ItemStack-getMaxItemUseDuration.patch @@ -0,0 +1,40 @@ +From 3b7b48e9015f695e3e59130a51a7a06dae7cbc11 Mon Sep 17 00:00:00 2001 +From: Aikar +Date: Tue, 5 Jun 2018 23:00:29 -0400 +Subject: [PATCH] ItemStack#getMaxItemUseDuration + +Allows you to determine how long it takes to use a usable/consumable item + +diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java +index 985237d86..908fb280a 100644 +--- a/src/main/java/net/minecraft/server/ItemStack.java ++++ b/src/main/java/net/minecraft/server/ItemStack.java +@@ -560,6 +560,7 @@ public final class ItemStack { + this.getItem().b(this, world, entityhuman); + } + ++ public int getItemUseMaxDuration() { return m(); } // Paper - OBFHELPER + public int m() { + return this.getItem().e(this); + } +diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +index aa99254ff..be6589dbf 100644 +--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java ++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +@@ -180,6 +180,13 @@ public final class CraftItemStack extends ItemStack { + return (handle == null) ? Material.AIR.getMaxStackSize() : handle.getItem().getMaxStackSize(); + } + ++ // Paper start ++ @Override ++ public int getMaxItemUseDuration() { ++ return handle == null ? 0 : handle.getItemUseMaxDuration(); ++ } ++ // Paper end ++ + @Override + public void addUnsafeEnchantment(Enchantment ench, int level) { + Validate.notNull(ench, "Cannot add null enchantment"); +-- +2.17.1 +