geforkt von Mirrors/Paper
647cf31e61
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: fdef9473 Correct Material#isFuel for new experimental materials 42811598 SPIGOT-7293: Add Biome#CHERRY_GROVE CraftBukkit Changes: 968d28df0 Fix availability of experimental datapack features in unit tests
127 Zeilen
3.8 KiB
Diff
127 Zeilen
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;
|
|
+ }
|
|
+
|
|
+}
|