CompostItemEvent

Author: Lulu13022002

paper-api/src/main/java/io/papermc/paper/event/block/CompostItemEvent.java

@@ -1,66 +1,43 @@
 package io.papermc.paper.event.block;
 
-import org.bukkit.block.Block;
 import org.bukkit.event.HandlerList;
-import org.bukkit.event.block.BlockEvent;
+import org.bukkit.event.block.BlockEventNew;
 import org.bukkit.event.inventory.InventoryMoveItemEvent;
 import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
  * Called when an item is about to be composted by a hopper.
  * To prevent hoppers from moving items into composters, cancel the {@link InventoryMoveItemEvent}.
  */
 @NullMarked
-public class CompostItemEvent extends BlockEvent {
-
-    private static final HandlerList HANDLER_LIST = new HandlerList();
-
-    private final ItemStack item;
-    private boolean willRaiseLevel;
-
-    @ApiStatus.Internal
-    public CompostItemEvent(final Block composter, final ItemStack item, final boolean willRaiseLevel) {
-        super(composter);
-        this.item = item;
-        this.willRaiseLevel = willRaiseLevel;
-    }
+public interface CompostItemEvent extends BlockEventNew {
 
     /**
      * Gets the item that was used on the composter.
      *
      * @return the item
      */
-    public ItemStack getItem() {
-        return this.item;
-    }
+    ItemStack getItem();
 
     /**
      * Gets whether the composter will rise a level.
      *
      * @return {@code true} if successful
      */
-    public boolean willRaiseLevel() {
-        return this.willRaiseLevel;
-    }
+    boolean willRaiseLevel();
 
     /**
      * Sets whether the composter will rise a level.
      *
      * @param willRaiseLevel {@code true} if the composter should rise a level
      */
-    public void setWillRaiseLevel(final boolean willRaiseLevel) {
-        this.willRaiseLevel = willRaiseLevel;
-    }
+    void setWillRaiseLevel(boolean willRaiseLevel);
 
-    @Override
-    public HandlerList getHandlers() {
-        return HANDLER_LIST;
+    static HandlerList getHandlerList() {
+        final class Holder {
+            private static final HandlerList HANDLER_LIST = new HandlerList();
+        }
+        return Holder.HANDLER_LIST;
     }
-
-    public static HandlerList getHandlerList() {
-        return HANDLER_LIST;
-    }
-
 }

paper-api/src/main/java/io/papermc/paper/event/entity/EntityCompostItemEvent.java

@@ -1,45 +1,20 @@
 package io.papermc.paper.event.entity;
 
 import io.papermc.paper.event.block.CompostItemEvent;
-import org.bukkit.block.Block;
 import org.bukkit.entity.Entity;
 import org.bukkit.event.Cancellable;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
  * Called when an item is about to be composted by an entity.
  */
 @NullMarked
-public class EntityCompostItemEvent extends CompostItemEvent implements Cancellable {
-
-    private final Entity entity;
-    private boolean cancelled;
-
-    @ApiStatus.Internal
-    public EntityCompostItemEvent(final Entity entity, final Block composter, final ItemStack item, final boolean willRaiseLevel) {
-        super(composter, item, willRaiseLevel);
-        this.entity = entity;
-    }
+public interface EntityCompostItemEvent extends CompostItemEvent, Cancellable {
 
     /**
      * Gets the entity that interacted with the composter.
      *
      * @return the entity that composted an item.
      */
-    public Entity getEntity() {
-        return this.entity;
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return this.cancelled;
-    }
-
-    @Override
-    public void setCancelled(final boolean cancel) {
-        this.cancelled = cancel;
-    }
-
+    Entity getEntity();
 }

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

@@ -1273,6 +1273,22 @@ index 7b24213eb30f60d49c37fc7d1242b52db578e634..4824bc5185eed26407c3a43d3b083e64
                  if (!event.callEvent()) {
                      return InteractionResult.PASS;
                  }
+diff --git a/net/minecraft/world/level/block/ComposterBlock.java b/net/minecraft/world/level/block/ComposterBlock.java
+index 429e833ffe7c89d7b0ca7515dbd82ffc1ce8d60d..f565154a6705430bb4b33a56cedb30e7add57598 100644
+--- a/net/minecraft/world/level/block/ComposterBlock.java
++++ b/net/minecraft/world/level/block/ComposterBlock.java
+@@ -343,9 +343,9 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+         boolean willRaiseLevel = !((levelValue != 0 || _float <= 0.0F) && rand >= (double) _float);
+         final io.papermc.paper.event.block.CompostItemEvent event;
+         if (entity == null) {
+-            event = new io.papermc.paper.event.block.CompostItemEvent(org.bukkit.craftbukkit.block.CraftBlock.at(level, pos), stack.getBukkitStack(), willRaiseLevel);
++            event = new io.papermc.paper.event.block.PaperCompostItemEvent(org.bukkit.craftbukkit.block.CraftBlock.at(level, pos), stack.getBukkitStack(), willRaiseLevel);
+         } else {
+-            event = new io.papermc.paper.event.entity.EntityCompostItemEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(level, pos), stack.getBukkitStack(), willRaiseLevel);
++            event = new io.papermc.paper.event.block.PaperEntityCompostItemEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(level, pos), stack.getBukkitStack(), willRaiseLevel);
+         }
+         if (!event.callEvent()) { // check for cancellation of entity event (non entity event can't be cancelled cause of hoppers)
+             return null;
 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/event/block/PaperCompostItemEvent.java

@@ -0,0 +1,38 @@
+package io.papermc.paper.event.block;
+
+import org.bukkit.block.Block;
+import org.bukkit.craftbukkit.event.block.CraftBlockEvent;
+import org.bukkit.event.HandlerList;
+import org.bukkit.inventory.ItemStack;
+
+public class PaperCompostItemEvent extends CraftBlockEvent implements CompostItemEvent {
+
+    private final ItemStack item;
+    private boolean willRaiseLevel;
+
+    public PaperCompostItemEvent(final Block composter, final ItemStack item, final boolean willRaiseLevel) {
+        super(composter);
+        this.item = item;
+        this.willRaiseLevel = willRaiseLevel;
+    }
+
+    @Override
+    public ItemStack getItem() {
+        return this.item;
+    }
+
+    @Override
+    public boolean willRaiseLevel() {
+        return this.willRaiseLevel;
+    }
+
+    @Override
+    public void setWillRaiseLevel(final boolean willRaiseLevel) {
+        this.willRaiseLevel = willRaiseLevel;
+    }
+
+    @Override
+    public HandlerList getHandlers() {
+        return CompostItemEvent.getHandlerList();
+    }
+}

paper-server/src/main/java/io/papermc/paper/event/block/PaperEntityCompostItemEvent.java

@@ -0,0 +1,32 @@
+package io.papermc.paper.event.block;
+
+import io.papermc.paper.event.entity.EntityCompostItemEvent;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Entity;
+import org.bukkit.inventory.ItemStack;
+
+public class PaperEntityCompostItemEvent extends PaperCompostItemEvent implements EntityCompostItemEvent {
+
+    private final Entity entity;
+    private boolean cancelled;
+
+    public PaperEntityCompostItemEvent(final Entity entity, final Block composter, final ItemStack item, final boolean willRaiseLevel) {
+        super(composter, item, willRaiseLevel);
+        this.entity = entity;
+    }
+
+    @Override
+    public Entity getEntity() {
+        return this.entity;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return this.cancelled;
+    }
+
+    @Override
+    public void setCancelled(final boolean cancel) {
+        this.cancelled = cancel;
+    }
+}

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

@@ -8,6 +8,7 @@
 import io.papermc.asm.RewriteRuleVisitorFactory;
 import io.papermc.asm.rules.classes.ClassToInterfaceRule;
 import io.papermc.paper.event.block.*;
+import io.papermc.paper.event.entity.*;
 import io.papermc.paper.event.packet.*;
 import io.papermc.paper.event.player.*;
 import java.util.Set;
@@ -169,7 +170,9 @@ public final class EventToInterfaceMigration {
                 BlockFailedDispenseEvent.class,
                 BlockLockCheckEvent.class,
                 BlockPreDispenseEvent.class,
-                VaultChangeStateEvent.class
+                VaultChangeStateEvent.class,
+                CompostItemEvent.class,
+                EntityCompostItemEvent.class
                 //</editor-fold>
             );