From 6d1409316e7723f0d99f1192d4c5f24d48ab5eed Mon Sep 17 00:00:00 2001 From: Melncat Date: Sat, 1 Oct 2022 03:30:00 -0700 Subject: [PATCH] Add getDrops to BlockState and isPreferredTool to BlockData (#8284) --- ...BlockState-and-isPreferredTool-to-Bl.patch | 66 +++++++++++++++++++ ...BlockState-and-isPreferredTool-to-Bl.patch | 61 +++++++++++++++++ 2 files changed, 127 insertions(+) create mode 100644 patches/api/0399-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch create mode 100644 patches/server/0919-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch diff --git a/patches/api/0399-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch b/patches/api/0399-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch new file mode 100644 index 000000000..ff9178837 --- /dev/null +++ b/patches/api/0399-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch @@ -0,0 +1,66 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MelnCat +Date: Fri, 12 Aug 2022 23:24:53 -0700 +Subject: [PATCH] Add getDrops to BlockState and isPreferredTool to BlockData + + +diff --git a/src/main/java/org/bukkit/block/BlockState.java b/src/main/java/org/bukkit/block/BlockState.java +index 10cbe71917bc32cca61748bcb0aa3395c554dbf8..5be829058c41283a5d3d14776617c98c4cdaaf8e 100644 +--- a/src/main/java/org/bukkit/block/BlockState.java ++++ b/src/main/java/org/bukkit/block/BlockState.java +@@ -233,5 +233,34 @@ public interface BlockState extends Metadatable { + * @return true if collidable + */ + boolean isCollidable(); ++ ++ /** ++ * Returns an immutable list of items which would drop by destroying this block state. ++ * ++ * @return an immutable list of dropped items for the block state ++ */ ++ @NotNull ++ java.util.Collection getDrops(); ++ ++ /** ++ * Returns an immutable list of items which would drop by destroying this block state ++ * with a specific tool ++ * ++ * @param tool The tool or item in hand used for digging ++ * @return an immutable list of dropped items for the block state ++ */ ++ @NotNull ++ java.util.Collection getDrops(@Nullable org.bukkit.inventory.ItemStack tool); ++ ++ /** ++ * Returns an immutable list of items which would drop by the entity destroying this ++ * block state with a specific tool ++ * ++ * @param tool The tool or item in hand used for digging ++ * @param entity the entity destroying the block ++ * @return an immutable list of dropped items for the block state ++ */ ++ @NotNull ++ java.util.Collection getDrops(@NotNull org.bukkit.inventory.ItemStack tool, @Nullable org.bukkit.entity.Entity entity); + // Paper end + } +diff --git a/src/main/java/org/bukkit/block/data/BlockData.java b/src/main/java/org/bukkit/block/data/BlockData.java +index bd987bd0a29618dfe07de50b194fd6fa694628ec..b166d053b3c44f06cb1f5b643e7f7e117eb21d17 100644 +--- a/src/main/java/org/bukkit/block/data/BlockData.java ++++ b/src/main/java/org/bukkit/block/data/BlockData.java +@@ -160,5 +160,16 @@ public interface BlockData extends Cloneable { + * @return is ticked randomly + */ + boolean isRandomlyTicked(); ++ ++ /** ++ * Returns if the given item is a preferred choice to break this block. ++ * ++ * In some cases this determines if a block will drop anything or extra ++ * loot. ++ * ++ * @param tool The tool or item used for breaking this block ++ * @return true if the tool is preferred for breaking this block ++ */ ++ boolean isPreferredTool(@NotNull org.bukkit.inventory.ItemStack tool); + // Paper end + } diff --git a/patches/server/0919-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch b/patches/server/0919-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch new file mode 100644 index 000000000..517828b9b --- /dev/null +++ b/patches/server/0919-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch @@ -0,0 +1,61 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MelnCat +Date: Fri, 12 Aug 2022 23:24:37 -0700 +Subject: [PATCH] Add getDrops to BlockState and isPreferredTool to BlockData + + +diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java +index 966ac60daebb7bb211ab8096fc0c5f33db67320a..a8ab1d3ee81664193be39d2735d6495136e0e310 100644 +--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java ++++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java +@@ -330,5 +330,33 @@ public class CraftBlockState implements BlockState { + public boolean isCollidable() { + return this.data.getBlock().hasCollision; + } ++ ++ @Override ++ public java.util.Collection getDrops() { ++ return this.getDrops(null); ++ } ++ ++ @Override ++ public java.util.Collection getDrops(org.bukkit.inventory.ItemStack item) { ++ return this.getDrops(item, null); ++ } ++ ++ @Override ++ public java.util.Collection getDrops(org.bukkit.inventory.ItemStack item, org.bukkit.entity.Entity entity) { ++ net.minecraft.world.item.ItemStack nms = org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(item); ++ ++ // Modelled off EntityHuman#hasBlock ++ if (item == null || !data.requiresCorrectToolForDrops() || nms.isCorrectToolForDrops(data)) { ++ return net.minecraft.world.level.block.Block.getDrops( ++ data, ++ world.getHandle(), ++ position, ++ world.getHandle().getBlockEntity(position), entity == null ? null : ++ ((org.bukkit.craftbukkit.entity.CraftEntity) entity).getHandle(), nms ++ ).stream().map(org.bukkit.craftbukkit.inventory.CraftItemStack::asBukkitCopy).toList(); ++ } else { ++ return java.util.Collections.emptyList(); ++ } ++ } + // Paper end + } +diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java +index e4c15fcbd21f70836c26133ef10f3d0da9b6c238..edce55a0cebe245cd944fcc1df735df66c736e43 100644 +--- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java ++++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java +@@ -620,4 +620,12 @@ public class CraftBlockData implements BlockData { + return this.state.isRandomlyTicking(); + } + // Paper end ++ ++ // Paper start - Preferred tool API ++ @Override ++ public boolean isPreferredTool(org.bukkit.inventory.ItemStack item) { ++ net.minecraft.world.item.ItemStack nms = org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(item); ++ return !state.requiresCorrectToolForDrops() || nms.isCorrectToolForDrops(state); ++ } ++ // Paper end + }