PaperMC/patches/api/0413-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
Jake Potrebic 29b17a892d
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9088)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
5efeb7bd Also update compiler version
c13b867a Update some Maven plugin versions
deb28d9f PR-837: Add more bell API
e938d62a PR-819: Allow Player#sendBlockDamage() to specify a source entity
0e75532c PR-818: Add more Guardian API, particularly for its laser
a10155aa PR-839: Add BlockData#rotate and BlockData#mirror
77e690b4 PR-836: Add missing API for explosive minecarts
60722059 PR-832: Allow getting chunks without generating them and optimize chunk data request for ungenerated chunks
0a2c4b4b PR-834: Add Player#sendHurtAnimation()

CraftBukkit Changes:
be8682aa8 Also update compiler version
08e305f5b Update some Maven plugin versions
187bdd463 PR-1160: Add more bell API
2f8e5bc7c PR-1145: Allow Player#sendBlockDamage() to specify a source entity
bcbb61b36 PR-1144: Add more Guardian API, particularly for its laser
722ddff6d PR-1162: Add BlockData#rotate and BlockData#mirror
80998277c PR-1159: Add missing API for explosive minecarts
1fddefce1 PR-1155: Allow getting chunks without generating them and optimize chunk data request for ungenerated chunks
20e8a486f PR-1157: Add Player#sendHurtAnimation()

Spigot Changes:
b31949f2 Rebuild patches
2023-04-07 19:39:13 +01:00

126 lines
3.8 KiB
Diff

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
index 0000000000000000000000000000000000000000..150c6c1468a36bf51f53b6227c50ab517b10f5ce
--- /dev/null
+++ b/src/main/java/io/papermc/paper/event/block/CompostItemEvent.java
@@ -0,0 +1,65 @@
+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;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Called when an item is about to be composted by a hopper.
+ * To prevent hoppers from moving items into composters, cancel the {@link InventoryMoveItemEvent}.
+ */
+public class CompostItemEvent extends BlockEvent {
+
+ private static final HandlerList HANDLER_LIST = new HandlerList();
+
+ private final ItemStack item;
+ private boolean willRaiseLevel;
+
+ public CompostItemEvent(@NotNull Block composter, @NotNull ItemStack item, boolean willRaiseLevel) {
+ super(composter);
+ this.item = item;
+ this.willRaiseLevel = willRaiseLevel;
+ }
+
+ /**
+ * Gets the item that was used on the composter.
+ *
+ * @return the item
+ */
+ @NotNull
+ public ItemStack getItem() {
+ return this.item;
+ }
+
+ /**
+ * Gets whether the composter will rise a level.
+ *
+ * @return true if successful
+ */
+ public boolean willRaiseLevel() {
+ return this.willRaiseLevel;
+ }
+
+ /**
+ * Sets whether the composter will rise a level.
+ *
+ * @param willRaiseLevel true if the composter should rise a level
+ */
+ public void setWillRaiseLevel(boolean willRaiseLevel) {
+ this.willRaiseLevel = willRaiseLevel;
+ }
+
+ @Override
+ public @NotNull HandlerList getHandlers() {
+ return HANDLER_LIST;
+ }
+
+ @NotNull
+ 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
index 0000000000000000000000000000000000000000..fd94caaece9629df859cab85b98218ab3c8f22af
--- /dev/null
+++ b/src/main/java/io/papermc/paper/event/entity/EntityCompostItemEvent.java
@@ -0,0 +1,43 @@
+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.NotNull;
+
+/**
+ * Called when an item is about to be composted by an entity.
+ */
+public class EntityCompostItemEvent extends CompostItemEvent implements Cancellable {
+
+ private final Entity who;
+ private boolean cancelled;
+
+ public EntityCompostItemEvent(@NotNull Entity who, @NotNull Block composter, @NotNull ItemStack item, boolean willRaiseLevel) {
+ super(composter, item, willRaiseLevel);
+ this.who = who;
+ }
+
+ /**
+ * Gets the entity that interacted with the composter.
+ *
+ * @return the entity that composted an item.
+ */
+ @NotNull
+ public Entity getEntity() {
+ return this.who;
+ }
+
+ @Override
+ public boolean isCancelled() {
+ return this.cancelled;
+ }
+
+ @Override
+ public void setCancelled(boolean cancel) {
+ this.cancelled = cancel;
+ }
+
+}