2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Ineusia <ineusia@yahoo.com>
|
|
|
|
Date: Mon, 26 Oct 2020 11:37:48 -0500
|
|
|
|
Subject: [PATCH] Add Destroy Speed API
|
|
|
|
|
|
|
|
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
|
2024-06-13 17:45:43 +02:00
|
|
|
index 25db31b2e9a6d75f0c59f75237842f9ad7d1c350..75c2aadb0a2baebe8b2625ad11b16380285d65c5 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/block/Block.java
|
|
|
|
+++ b/src/main/java/org/bukkit/block/Block.java
|
2024-01-27 18:35:09 +01:00
|
|
|
@@ -690,4 +690,31 @@ public interface Block extends Metadatable, Translatable, net.kyori.adventure.tr
|
2023-02-15 23:10:14 +01:00
|
|
|
@Deprecated(forRemoval = true)
|
2021-06-11 14:02:28 +02:00
|
|
|
String getTranslationKey();
|
2023-08-25 19:57:11 +02:00
|
|
|
// Paper end
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
2023-08-25 19:57:11 +02:00
|
|
|
+ // Paper start - destroy speed API
|
2021-06-11 14:02:28 +02:00
|
|
|
+ /**
|
|
|
|
+ * Gets the speed at which this block will be destroyed by a given {@link ItemStack}
|
2023-08-25 19:57:11 +02:00
|
|
|
+ * <p>
|
|
|
|
+ * Default value is 1.0
|
2021-06-11 14:02:28 +02:00
|
|
|
+ *
|
2023-08-25 19:57:11 +02:00
|
|
|
+ * @param itemStack {@link ItemStack} used to mine this Block
|
|
|
|
+ * @return the speed that this Block will be mined by the given {@link ItemStack}
|
|
|
|
+ */
|
|
|
|
+ default float getDestroySpeed(final @NotNull ItemStack itemStack) {
|
|
|
|
+ return this.getBlockData().getDestroySpeed(itemStack);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Gets the speed at which this block will be destroyed by a given {@link ItemStack}
|
|
|
|
+ * <p>
|
|
|
|
+ * Default value is 1.0
|
2021-06-11 14:02:28 +02:00
|
|
|
+ *
|
|
|
|
+ * @param itemStack {@link ItemStack} used to mine this Block
|
2023-08-25 19:57:11 +02:00
|
|
|
+ * @param considerEnchants true to look at enchants on the itemstack
|
2021-06-11 14:02:28 +02:00
|
|
|
+ * @return the speed that this Block will be mined by the given {@link ItemStack}
|
|
|
|
+ */
|
2023-08-25 19:57:11 +02:00
|
|
|
+ default float getDestroySpeed(@NotNull ItemStack itemStack, boolean considerEnchants) {
|
|
|
|
+ return this.getBlockData().getDestroySpeed(itemStack, considerEnchants);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
2023-08-25 19:57:11 +02:00
|
|
|
+ // Paper end - destroy speed API
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/block/data/BlockData.java b/src/main/java/org/bukkit/block/data/BlockData.java
|
2024-06-16 00:19:10 +02:00
|
|
|
index cd3b3e05cc825cfedec07f9a2a1e0b7b2a8866d6..a2dc7376b2a3d386b671c894f73389139e0d97bf 100644
|
2023-08-25 19:57:11 +02:00
|
|
|
--- a/src/main/java/org/bukkit/block/data/BlockData.java
|
|
|
|
+++ b/src/main/java/org/bukkit/block/data/BlockData.java
|
2024-06-16 00:19:10 +02:00
|
|
|
@@ -266,4 +266,35 @@ public interface BlockData extends Cloneable {
|
2023-08-25 19:57:11 +02:00
|
|
|
@NotNull
|
|
|
|
@ApiStatus.Experimental
|
|
|
|
BlockState createBlockState();
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
2023-08-25 19:57:11 +02:00
|
|
|
+ // Paper start - destroy speed API
|
2021-06-11 14:02:28 +02:00
|
|
|
+ /**
|
2023-08-25 19:57:11 +02:00
|
|
|
+ * Gets the speed at which this block will be destroyed by a given {@link ItemStack}
|
2021-06-11 14:02:28 +02:00
|
|
|
+ * <p>
|
|
|
|
+ * Default value is 1.0
|
2023-08-25 19:57:11 +02:00
|
|
|
+ *
|
|
|
|
+ * @param itemStack {@link ItemStack} used to mine this Block
|
|
|
|
+ * @return the speed that this Block will be mined by the given {@link ItemStack}
|
2024-06-16 00:19:10 +02:00
|
|
|
+ * @deprecated the destroy speed of a block was never purely tied to an item stack. Since 1.21 enchantments
|
|
|
|
+ * also use complex effects that require a consuming player to compute their effects, including mining efficiency.
|
2023-08-25 19:57:11 +02:00
|
|
|
+ */
|
2024-06-16 00:19:10 +02:00
|
|
|
+ @Deprecated(forRemoval = true, since = "1.21")
|
2023-08-25 19:57:11 +02:00
|
|
|
+ default float getDestroySpeed(final @NotNull ItemStack itemStack) {
|
|
|
|
+ return this.getDestroySpeed(itemStack, false);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Gets the speed at which this block will be destroyed by a given {@link ItemStack}
|
|
|
|
+ * <p>
|
|
|
|
+ * Default value is 1.0
|
|
|
|
+ *
|
|
|
|
+ * @param itemStack {@link ItemStack} used to mine this Block
|
2021-06-11 14:02:28 +02:00
|
|
|
+ * @param considerEnchants true to look at enchants on the itemstack
|
2023-08-25 19:57:11 +02:00
|
|
|
+ * @return the speed that this Block will be mined by the given {@link ItemStack}
|
2024-06-16 00:19:10 +02:00
|
|
|
+ * @deprecated the destroy speed of a block was never purely tied to an item stack. Since 1.21 enchantments
|
|
|
|
+ * also use complex effects that require a consuming player to compute their effects, including mining efficiency.
|
2021-06-11 14:02:28 +02:00
|
|
|
+ */
|
2024-06-16 00:19:10 +02:00
|
|
|
+ @Deprecated(forRemoval = true, since = "1.21")
|
2021-06-11 14:02:28 +02:00
|
|
|
+ float getDestroySpeed(@NotNull ItemStack itemStack, boolean considerEnchants);
|
2023-08-25 19:57:11 +02:00
|
|
|
+ // Paper end - destroy speed API
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|