52a05907c7
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: 97c59261 PR-1073: Make Biome an interface a38581aa Fix further javadoc errors 8271c490 Fix javadoc error 8a9ecf29 PR-1072: Fix bad naming for Vault State methods 6dd58108 PR-1071: Make Fluid an interface and add missing entry ed2cdfc3 PR-1070: Make Attribute an interface and align names with the new minecraft ones 63472efb PR-1069: Add missing winter drop experimental annotation to pale boats CraftBukkit Changes: 7235ad7b0 PR-1501: Make Biome an interface 602904003 PR-1500: Rename implementation for Vault State methods 75f26f79f PR-1499: Make Fluid an interface and add missing entry 4cfd87adc PR-1498: Make Attribute an interface and align names with the new minecraft ones 6bb0db5cb SPIGOT-7928: ExactChoice acts as MaterialChoice 3eaf3a13c SPIGOT-7929: Error when setting EquippableComponent abbf57bac SPIGOT-7930: Fix spawning entities with SummonEntityEffect 92d6ab6cf PR-1497: Move boat field rename entries to below key renaming, so that keys are also renamed abfe292aa PR-1496: Use correct Fluid class on Tags type check c7aab7fa7 SPIGOT-7923: Fix Dispenser logic to avoid firing empty projectiles
109 Zeilen
3.7 KiB
Diff
109 Zeilen
3.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Mariell Hoversholm <proximyst@proximyst.com>
|
|
Date: Sat, 29 Aug 2020 21:55:41 +0200
|
|
Subject: [PATCH] Add PlayerInsertLecternBookEvent
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/event/player/PlayerInsertLecternBookEvent.java b/src/main/java/io/papermc/paper/event/player/PlayerInsertLecternBookEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..6d31e0c30f0389eeaf44335bd842ca3e1d0212eb
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/player/PlayerInsertLecternBookEvent.java
|
|
@@ -0,0 +1,96 @@
|
|
+package io.papermc.paper.event.player;
|
|
+
|
|
+import com.google.common.base.Preconditions;
|
|
+import org.bukkit.block.Block;
|
|
+import org.bukkit.block.BlockState;
|
|
+import org.bukkit.block.Lectern;
|
|
+import org.bukkit.entity.Player;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.player.PlayerEvent;
|
|
+import org.bukkit.inventory.ItemStack;
|
|
+import org.jetbrains.annotations.ApiStatus;
|
|
+import org.jspecify.annotations.NullMarked;
|
|
+
|
|
+/**
|
|
+ * This event is called when a player clicks on a lectern to insert a book.
|
|
+ * If this event is cancelled the player will keep the book and the lectern will remain empty.
|
|
+ */
|
|
+@NullMarked
|
|
+public class PlayerInsertLecternBookEvent extends PlayerEvent implements Cancellable {
|
|
+
|
|
+ private static final HandlerList HANDLER_LIST = new HandlerList();
|
|
+ private boolean cancelled = false;
|
|
+ private final Block block;
|
|
+ private ItemStack book;
|
|
+
|
|
+ @ApiStatus.Internal
|
|
+ public PlayerInsertLecternBookEvent(final Player player, final Block block, final ItemStack book) {
|
|
+ super(player);
|
|
+ this.block = block;
|
|
+ this.book = book;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the block of the lectern involved in this event.
|
|
+ *
|
|
+ * @return the block of the lectern
|
|
+ */
|
|
+ public Block getBlock() {
|
|
+ return this.block;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Fetches the lectern block state that was part of this event.
|
|
+ * This method constructs a new snapshot {@link org.bukkit.block.BlockState}.
|
|
+ *
|
|
+ * @return a new lectern state snapshot of the involved lectern
|
|
+ * @throws IllegalStateException if the block at {@link #getBlock()} is no longer a lectern
|
|
+ */
|
|
+ public Lectern getLectern() {
|
|
+ final BlockState state = this.getBlock().getState();
|
|
+ Preconditions.checkState(state instanceof Lectern, "Block state of lectern block is no longer a lectern tile state!");
|
|
+ return (Lectern) state;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Returns the itemstack the player tried to insert. This is a copy of the item,
|
|
+ * changes made to this itemstack will not affect the book that is being placed in the lectern.
|
|
+ * If you want to mutate the item stack that ends up in the lectern, use {@link #setBook(ItemStack)}.
|
|
+ *
|
|
+ * @return the book that is being placed
|
|
+ */
|
|
+ public ItemStack getBook() {
|
|
+ return this.book.clone();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets the itemstack to insert into the lectern.
|
|
+ *
|
|
+ * @param book the book to insert (non book items will leave the lectern in a locked
|
|
+ * state as the menu cannot be opened, preventing item extraction)
|
|
+ */
|
|
+ public void setBook(final ItemStack book) {
|
|
+ Preconditions.checkArgument(book != null, "Cannot set book to null");
|
|
+ this.book = book.clone();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return this.cancelled;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(final boolean cancel) {
|
|
+ this.cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+}
|