2023-03-05 18:59:48 +01:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Noah van der Aa <ndvdaa@gmail.com>
|
|
|
|
Date: Sat, 7 Aug 2021 15:11:27 +0200
|
|
|
|
Subject: [PATCH] Add CompostItemEvent and EntityCompostItemEvent
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/event/block/CompostItemEvent.java b/src/main/java/io/papermc/paper/event/block/CompostItemEvent.java
|
|
|
|
new file mode 100644
|
2024-09-29 21:52:13 +02:00
|
|
|
index 0000000000000000000000000000000000000000..03497ac2489b159716811f03ab68e345ff864fa6
|
2023-03-05 18:59:48 +01:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/io/papermc/paper/event/block/CompostItemEvent.java
|
2024-09-29 21:52:13 +02:00
|
|
|
@@ -0,0 +1,66 @@
|
2023-03-05 18:59:48 +01:00
|
|
|
+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.inventory.InventoryMoveItemEvent;
|
|
|
|
+import org.bukkit.inventory.ItemStack;
|
2024-02-01 10:15:57 +01:00
|
|
|
+import org.jetbrains.annotations.ApiStatus;
|
2024-09-29 21:52:13 +02:00
|
|
|
+import org.jspecify.annotations.NullMarked;
|
2023-03-05 18:59:48 +01:00
|
|
|
+
|
|
|
|
+/**
|
|
|
|
+ * Called when an item is about to be composted by a hopper.
|
|
|
|
+ * To prevent hoppers from moving items into composters, cancel the {@link InventoryMoveItemEvent}.
|
|
|
|
+ */
|
2024-09-29 21:52:13 +02:00
|
|
|
+@NullMarked
|
2023-03-05 18:59:48 +01:00
|
|
|
+public class CompostItemEvent extends BlockEvent {
|
|
|
|
+
|
|
|
|
+ private static final HandlerList HANDLER_LIST = new HandlerList();
|
|
|
|
+
|
|
|
|
+ private final ItemStack item;
|
|
|
|
+ private boolean willRaiseLevel;
|
|
|
|
+
|
2024-02-01 10:15:57 +01:00
|
|
|
+ @ApiStatus.Internal
|
2024-09-29 21:52:13 +02:00
|
|
|
+ public CompostItemEvent(final Block composter, final ItemStack item, final boolean willRaiseLevel) {
|
2023-03-05 18:59:48 +01:00
|
|
|
+ super(composter);
|
|
|
|
+ this.item = item;
|
|
|
|
+ this.willRaiseLevel = willRaiseLevel;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Gets the item that was used on the composter.
|
|
|
|
+ *
|
|
|
|
+ * @return the item
|
|
|
|
+ */
|
|
|
|
+ public ItemStack getItem() {
|
|
|
|
+ return this.item;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Gets whether the composter will rise a level.
|
|
|
|
+ *
|
2024-02-01 10:15:57 +01:00
|
|
|
+ * @return {@code true} if successful
|
2023-03-05 18:59:48 +01:00
|
|
|
+ */
|
|
|
|
+ public boolean willRaiseLevel() {
|
|
|
|
+ return this.willRaiseLevel;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Sets whether the composter will rise a level.
|
|
|
|
+ *
|
2024-02-01 10:15:57 +01:00
|
|
|
+ * @param willRaiseLevel {@code true} if the composter should rise a level
|
2023-03-05 18:59:48 +01:00
|
|
|
+ */
|
2024-09-29 21:52:13 +02:00
|
|
|
+ public void setWillRaiseLevel(final boolean willRaiseLevel) {
|
2023-03-05 18:59:48 +01:00
|
|
|
+ this.willRaiseLevel = willRaiseLevel;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
2024-09-29 21:52:13 +02:00
|
|
|
+ public HandlerList getHandlers() {
|
2023-03-05 18:59:48 +01:00
|
|
|
+ return HANDLER_LIST;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public static HandlerList getHandlerList() {
|
|
|
|
+ return HANDLER_LIST;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/event/entity/EntityCompostItemEvent.java b/src/main/java/io/papermc/paper/event/entity/EntityCompostItemEvent.java
|
|
|
|
new file mode 100644
|
2024-09-29 21:52:13 +02:00
|
|
|
index 0000000000000000000000000000000000000000..213d957fdc68aa32d77424c84c5cf3b244cd4314
|
2023-03-05 18:59:48 +01:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/io/papermc/paper/event/entity/EntityCompostItemEvent.java
|
2024-02-01 10:15:57 +01:00
|
|
|
@@ -0,0 +1,45 @@
|
2023-03-05 18:59:48 +01:00
|
|
|
+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;
|
2024-02-01 10:15:57 +01:00
|
|
|
+import org.jetbrains.annotations.ApiStatus;
|
2024-09-29 21:52:13 +02:00
|
|
|
+import org.jspecify.annotations.NullMarked;
|
2023-03-05 18:59:48 +01:00
|
|
|
+
|
|
|
|
+/**
|
|
|
|
+ * Called when an item is about to be composted by an entity.
|
|
|
|
+ */
|
2024-09-29 21:52:13 +02:00
|
|
|
+@NullMarked
|
2023-03-05 18:59:48 +01:00
|
|
|
+public class EntityCompostItemEvent extends CompostItemEvent implements Cancellable {
|
|
|
|
+
|
2024-02-01 10:15:57 +01:00
|
|
|
+ private final Entity entity;
|
2023-03-05 18:59:48 +01:00
|
|
|
+ private boolean cancelled;
|
|
|
|
+
|
2024-02-01 10:15:57 +01:00
|
|
|
+ @ApiStatus.Internal
|
2024-09-29 21:52:13 +02:00
|
|
|
+ public EntityCompostItemEvent(final Entity entity, final Block composter, final ItemStack item, final boolean willRaiseLevel) {
|
2023-03-05 18:59:48 +01:00
|
|
|
+ super(composter, item, willRaiseLevel);
|
2024-02-01 10:15:57 +01:00
|
|
|
+ this.entity = entity;
|
2023-03-05 18:59:48 +01:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Gets the entity that interacted with the composter.
|
|
|
|
+ *
|
|
|
|
+ * @return the entity that composted an item.
|
|
|
|
+ */
|
|
|
|
+ public Entity getEntity() {
|
2024-02-01 10:15:57 +01:00
|
|
|
+ return this.entity;
|
2023-03-05 18:59:48 +01:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean isCancelled() {
|
|
|
|
+ return this.cancelled;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
2024-09-29 21:52:13 +02:00
|
|
|
+ public void setCancelled(final boolean cancel) {
|
2023-03-05 18:59:48 +01:00
|
|
|
+ this.cancelled = cancel;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+}
|