BlockCanBuildEvent

Author: Lulu13022002

paper-api/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java

@@ -1,13 +1,11 @@
 package org.bukkit.event.block;
 
 import org.bukkit.Material;
-import org.bukkit.block.Block;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.bukkit.inventory.EquipmentSlot;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Called when we try to place a block, to see if we can build it here or not.
@@ -20,35 +18,7 @@
  *     #getMaterial()} instead.
  * </ul>
  */
-public class BlockCanBuildEvent extends BlockEvent {
-
-    private static final HandlerList HANDLER_LIST = new HandlerList();
-
-    private final Player player;
-    private final org.bukkit.inventory.EquipmentSlot hand;
-    protected BlockData blockData;
-    protected boolean buildable;
-
-    @Deprecated(since = "1.13.2", forRemoval = true)
-    @ApiStatus.Internal
-    public BlockCanBuildEvent(@NotNull final Block block, @NotNull final BlockData type, final boolean canBuild) {
-        this(block, null, type, canBuild, org.bukkit.inventory.EquipmentSlot.HAND); // Paper - expose hand
-    }
-
-    @Deprecated(forRemoval = true)
-    @ApiStatus.Internal
-    public BlockCanBuildEvent(@NotNull final Block block, @Nullable final Player player, @NotNull final BlockData type, final boolean canBuild) {
-        this(block, player, type, canBuild, org.bukkit.inventory.EquipmentSlot.HAND); // Paper start - expose hand
-    }
-
-    @ApiStatus.Internal
-    public BlockCanBuildEvent(@NotNull final Block block, @Nullable final Player player, @NotNull final BlockData type, final boolean canBuild, @NotNull final org.bukkit.inventory.EquipmentSlot hand) { // Paper end - expose hand
-        super(block);
-        this.player = player;
-        this.buildable = canBuild;
-        this.blockData = type;
-        this.hand = hand;
-    }
+public interface BlockCanBuildEvent extends BlockEventNew {
 
     /**
      * Gets the player who placed the block involved in this event.
@@ -57,40 +27,28 @@ public BlockCanBuildEvent(@NotNull final Block block, @Nullable final Player pla
      *
      * @return The Player who placed the block involved in this event
      */
-    @Nullable
-    public Player getPlayer() {
-        return this.player;
-    }
+    @Nullable Player getPlayer();
 
     /**
      * Gets the Material that we are trying to place.
      *
      * @return The Material that we are trying to place
      */
-    @NotNull
-    public Material getMaterial() {
-        return this.blockData.getMaterial();
-    }
+    Material getMaterial();
 
     /**
      * Gets the BlockData that we are trying to place.
      *
      * @return The BlockData that we are trying to place
      */
-    @NotNull
-    public BlockData getBlockData() {
-        return this.blockData.clone();
-    }
+    BlockData getBlockData();
 
     /**
      * Gets the hand the player will use to place the block
      *
-     * @return the EquipmentSlot representing the players hand.
+     * @return the {@link EquipmentSlot} representing the players hand.
      */
-    @NotNull
-    public org.bukkit.inventory.EquipmentSlot getHand() {
-        return this.hand;
-    }
+    EquipmentSlot getHand();
 
     /**
      * Gets whether the block can be built here.
@@ -100,28 +58,20 @@ public org.bukkit.inventory.EquipmentSlot getHand() {
      *
      * @return boolean whether the block can be built
      */
-    public boolean isBuildable() {
-        return this.buildable;
-    }
+    boolean isBuildable();
 
     /**
      * Sets whether the block can be built here or not.
      *
-     * @param cancel {@code true} if you want to allow the block to be built here
+     * @param buildable {@code true} if you want to allow the block to be built here
      *     despite Minecraft's default behaviour
      */
-    public void setBuildable(boolean cancel) {
-        this.buildable = cancel;
-    }
-
-    @NotNull
-    @Override
-    public HandlerList getHandlers() {
-        return HANDLER_LIST;
-    }
+    void setBuildable(boolean buildable);
 
-    @NotNull
-    public static HandlerList getHandlerList() {
-        return HANDLER_LIST;
+    static HandlerList getHandlerList() {
+        final class Holder {
+            private static final HandlerList HANDLER_LIST = new HandlerList();
+        }
+        return Holder.HANDLER_LIST;
     }
 }

paper-server/patches/features/0032-Events-to-interfaces.patch

@@ -1057,6 +1057,19 @@ index e21d06007b6d207397e878768e243deded9486aa..880be975b8d5cb0436c090b2b794d401
                      if (!event.callEvent()) {
                          player.containerMenu.sendAllDataToRemote();
                          return false;
+diff --git a/net/minecraft/world/item/BlockItem.java b/net/minecraft/world/item/BlockItem.java
+index 73ce7c82c0bd28c2e43ca40ba35c4603b21375ad..d0fb3e30eda4bb2187011a2ca9d7588cf20ffb67 100644
+--- a/net/minecraft/world/item/BlockItem.java
++++ b/net/minecraft/world/item/BlockItem.java
+@@ -172,7 +172,7 @@ public class BlockItem extends Item {
+         boolean canBuild = (!this.mustSurvive() || state.canSurvive(world, context.getClickedPos())) && world.checkEntityCollision(state, player, CollisionContext.placementContext(player), context.getClickedPos(), true); // Paper - Cancel hit for vanished players
+         org.bukkit.entity.Player bukkitPlayer = (context.getPlayer() instanceof ServerPlayer) ? (org.bukkit.entity.Player) context.getPlayer().getBukkitEntity() : null;
+ 
+-        org.bukkit.event.block.BlockCanBuildEvent event = new org.bukkit.event.block.BlockCanBuildEvent(
++        org.bukkit.event.block.BlockCanBuildEvent event = new org.bukkit.craftbukkit.event.block.CraftBlockCanBuildEvent(
+             org.bukkit.craftbukkit.block.CraftBlock.at(world, context.getClickedPos()), bukkitPlayer,
+             org.bukkit.craftbukkit.block.data.CraftBlockData.fromData(state), canBuild, org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(context.getHand())
+         );
 diff --git a/net/minecraft/world/item/BucketItem.java b/net/minecraft/world/item/BucketItem.java
 index 9d6485148393292006ed4453e0ed228b6197b239..c2339ab0794afcbfa23e44063d680ee0717a5819 100644
 --- a/net/minecraft/world/item/BucketItem.java
@@ -1230,6 +1243,19 @@ index a5bfd497a07f2e2311db8eca5b8ba8af9f4d1080..6b3905581ea35562baa8e8bd3e70227b
              if (event.callEvent() && snowball.attemptSpawn()) {
                  player.awardStat(Stats.ITEM_USED.get(this));
                  if (event.shouldConsume()) {
+diff --git a/net/minecraft/world/item/StandingAndWallBlockItem.java b/net/minecraft/world/item/StandingAndWallBlockItem.java
+index d75c95d728efc0b4064f562ca80b68b23883feaf..88c54281c4263033948ec4caf84bf0b36a891bd6 100644
+--- a/net/minecraft/world/item/StandingAndWallBlockItem.java
++++ b/net/minecraft/world/item/StandingAndWallBlockItem.java
+@@ -47,7 +47,7 @@ public class StandingAndWallBlockItem extends BlockItem {
+             boolean defaultReturn = level.isUnobstructed(blockState, clickedPos, CollisionContext.empty());
+             org.bukkit.entity.Player player = (context.getPlayer() instanceof net.minecraft.server.level.ServerPlayer serverPlayer) ? serverPlayer.getBukkitEntity() : null;
+ 
+-            org.bukkit.event.block.BlockCanBuildEvent event = new org.bukkit.event.block.BlockCanBuildEvent(org.bukkit.craftbukkit.block.CraftBlock.at(context.getLevel(), clickedPos), player, org.bukkit.craftbukkit.block.data.CraftBlockData.fromData(blockState), defaultReturn, org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(context.getHand())); // Paper - Expose hand in BlockCanBuildEvent
++            org.bukkit.event.block.BlockCanBuildEvent event = new org.bukkit.craftbukkit.event.block.CraftBlockCanBuildEvent(org.bukkit.craftbukkit.block.CraftBlock.at(context.getLevel(), clickedPos), player, org.bukkit.craftbukkit.block.data.CraftBlockData.fromData(blockState), defaultReturn, org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(context.getHand())); // Paper - Expose hand in BlockCanBuildEvent
+             context.getLevel().getCraftServer().getPluginManager().callEvent(event);
+ 
+             return (event.isBuildable()) ? blockState : null;
 diff --git a/net/minecraft/world/item/ThrowablePotionItem.java b/net/minecraft/world/item/ThrowablePotionItem.java
 index 2707c2e3c6e32bb7c497808dceb34690e27a567a..e538185e1897f7ba1c0c291cf6a0f6d8cabcbc3b 100644
 --- a/net/minecraft/world/item/ThrowablePotionItem.java
@@ -1359,6 +1385,19 @@ index 0284c631e8e2b303f4f95927d99513423dad4b0c..727066a79520bda4a08f5c7ce301559d
              world1.getCraftServer().getPluginManager().callEvent(event);
 
              if (!event.isCancelled()) {
+diff --git a/net/minecraft/world/level/block/FireBlock.java b/net/minecraft/world/level/block/FireBlock.java
+index 14a4189166b862b66a8383046f2abfe02ccbccd8..acdfcd25c7949609b96eb48f67ca7635a423b895 100644
+--- a/net/minecraft/world/level/block/FireBlock.java
++++ b/net/minecraft/world/level/block/FireBlock.java
+@@ -270,7 +270,7 @@ public class FireBlock extends BaseFireBlock {
+             org.bukkit.block.Block burnBlock = org.bukkit.craftbukkit.block.CraftBlock.at(level, pos);
+             org.bukkit.block.Block sourceBlock = org.bukkit.craftbukkit.block.CraftBlock.at(level, sourcePos);
+ 
+-            org.bukkit.event.block.BlockBurnEvent event = new org.bukkit.event.block.BlockBurnEvent(burnBlock, sourceBlock);
++            org.bukkit.event.block.BlockBurnEvent event = new org.bukkit.craftbukkit.event.block.CraftBlockBurnEvent(burnBlock, sourceBlock);
+             if (!event.callEvent()) {
+                 return;
+             }
 diff --git a/net/minecraft/world/level/block/FlowerPotBlock.java b/net/minecraft/world/level/block/FlowerPotBlock.java
 index b9cd84b1305cae67762eebde52aeab15ac6f0435..965c72dd4d7ee0afdd1c634cec3d0b0599258d17 100644
 --- a/net/minecraft/world/level/block/FlowerPotBlock.java

paper-server/src/main/java/io/papermc/paper/plugin/bytecode/EventToInterfaceMigration.java

@@ -187,7 +187,8 @@ public final class EventToInterfaceMigration {
                 EntityBlockFormEvent.class,
                 BlockSpreadEvent.class,
                 BellResonateEvent.class,
-                BlockBurnEvent.class
+                BlockBurnEvent.class,
+                BlockCanBuildEvent.class
                 //</editor-fold>
             );
 

paper-server/src/main/java/org/bukkit/craftbukkit/event/block/CraftBlockCanBuildEvent.java

@@ -0,0 +1,61 @@
+package org.bukkit.craftbukkit.event.block;
+
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.entity.Player;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.block.BlockCanBuildEvent;
+import org.bukkit.inventory.EquipmentSlot;
+import org.jspecify.annotations.Nullable;
+
+public class CraftBlockCanBuildEvent extends CraftBlockEvent implements BlockCanBuildEvent {
+
+    private final Player player;
+    private final EquipmentSlot hand;
+    protected BlockData blockData;
+    protected boolean buildable;
+
+    public CraftBlockCanBuildEvent(final Block block, final @Nullable Player player, final BlockData blockData, final boolean canBuild, final EquipmentSlot hand) {
+        super(block);
+        this.player = player;
+        this.buildable = canBuild;
+        this.blockData = blockData;
+        this.hand = hand;
+    }
+
+    @Override
+    public @Nullable Player getPlayer() {
+        return this.player;
+    }
+
+    @Override
+    public Material getMaterial() {
+        return this.blockData.getMaterial();
+    }
+
+    @Override
+    public BlockData getBlockData() {
+        return this.blockData.clone();
+    }
+
+    @Override
+    public EquipmentSlot getHand() {
+        return this.hand;
+    }
+
+    @Override
+    public boolean isBuildable() {
+        return this.buildable;
+    }
+
+    @Override
+    public void setBuildable(final boolean buildable) {
+        this.buildable = buildable;
+    }
+
+    @Override
+    public HandlerList getHandlers() {
+        return BlockCanBuildEvent.getHandlerList();
+    }
+}