From e371c168d8278656c062f6658f8c5f429e8cb646 Mon Sep 17 00:00:00 2001 From: Bjarne Koll <LynxPlay101@gmail.com> Date: Sun, 22 Sep 2024 20:09:41 +0200 Subject: [PATCH] Deprecate BlockType#isInteractable (#11427) While BlockType is still marked as internal, it mirrors the already paper-deprecated method #isInteractable. The commit marks said method as deprecated if/when BlockType becomes experimental/non-internal. --- .../api/Fix-Spigot-annotation-mistakes.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/patches/api/Fix-Spigot-annotation-mistakes.patch b/patches/api/Fix-Spigot-annotation-mistakes.patch index 29b2c61c70..68a3d170b4 100644 --- a/patches/api/Fix-Spigot-annotation-mistakes.patch +++ b/patches/api/Fix-Spigot-annotation-mistakes.patch @@ -713,6 +713,25 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + @Deprecated(forRemoval = true, since = "1.13") void setData(@NotNull MaterialData data); + /** +diff --git a/src/main/java/org/bukkit/block/BlockType.java b/src/main/java/org/bukkit/block/BlockType.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/org/bukkit/block/BlockType.java ++++ b/src/main/java/org/bukkit/block/BlockType.java +@@ -0,0 +0,0 @@ public interface BlockType extends Keyed, Translatable { + * state as well. This method will return true if there is at least one + * state in which additional interact handling is performed for the + * block type. ++ * ++ * @deprecated This method is not comprehensive and does not accurately reflect what block types are ++ * interactable. Many "interactions" are defined on the item not block, and many are conditional on some other world state ++ * checks being true. + * + * @return true if this block type can be interacted with. + */ ++ @Deprecated // Paper + boolean isInteractable(); + /** diff --git a/src/main/java/org/bukkit/block/BrushableBlock.java b/src/main/java/org/bukkit/block/BrushableBlock.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644