mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 12:41:50 +01:00
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
105 lines
3.7 KiB
Diff
105 lines
3.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: RodneyMKay <36546810+RodneyMKay@users.noreply.github.com>
|
|
Date: Wed, 8 Sep 2021 22:15:43 +0200
|
|
Subject: [PATCH] Add PlayerPickItemEvent
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/event/player/PlayerPickItemEvent.java b/src/main/java/io/papermc/paper/event/player/PlayerPickItemEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..d7e10652918e453838a3a983f089ef4727d0bfe2
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/player/PlayerPickItemEvent.java
|
|
@@ -0,0 +1,93 @@
|
|
+package io.papermc.paper.event.player;
|
|
+
|
|
+import com.google.common.base.Preconditions;
|
|
+import org.bukkit.entity.Player;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.player.PlayerEvent;
|
|
+import org.jetbrains.annotations.ApiStatus;
|
|
+import org.jetbrains.annotations.Range;
|
|
+import org.jspecify.annotations.NullMarked;
|
|
+
|
|
+/**
|
|
+ * Event that is fired when a player uses the pick item functionality (middle-clicking a block to get the appropriate
|
|
+ * item). However, note that this event will only trigger if an item has to be moved from the inventory to the hotbar.
|
|
+ * After the handling of this event, the contents of the source and the target slot will be swapped and the currently
|
|
+ * selected hotbar slot of the player will be set to the target slot.
|
|
+ * <p>
|
|
+ * Note: This event will not be fired for players in creative mode.
|
|
+ */
|
|
+@NullMarked
|
|
+public class PlayerPickItemEvent extends PlayerEvent implements Cancellable {
|
|
+
|
|
+ private static final HandlerList HANDLER_LIST = new HandlerList();
|
|
+
|
|
+ private int targetSlot;
|
|
+ private int sourceSlot;
|
|
+
|
|
+ private boolean cancelled;
|
|
+
|
|
+ @ApiStatus.Internal
|
|
+ public PlayerPickItemEvent(final Player player, final int targetSlot, final int sourceSlot) {
|
|
+ super(player);
|
|
+ this.targetSlot = targetSlot;
|
|
+ this.sourceSlot = sourceSlot;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Returns the slot the item that is being picked goes into.
|
|
+ *
|
|
+ * @return hotbar slot (0-8 inclusive)
|
|
+ */
|
|
+ public @Range(from = 0, to = 8) int getTargetSlot() {
|
|
+ return this.targetSlot;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Changes the slot the item that is being picked goes into.
|
|
+ *
|
|
+ * @param targetSlot hotbar slot (0-8 inclusive)
|
|
+ */
|
|
+ public void setTargetSlot(final @Range(from = 0, to = 8) int targetSlot) {
|
|
+ Preconditions.checkArgument(targetSlot >= 0 && targetSlot <= 8, "Target slot must be in range 0 - 8 (inclusive)");
|
|
+ this.targetSlot = targetSlot;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Returns the slot in which the item that will be put into the players hotbar is located.
|
|
+ *
|
|
+ * @return player inventory slot (0-35 inclusive)
|
|
+ */
|
|
+ public @Range(from = 0, to = 35) int getSourceSlot() {
|
|
+ return this.sourceSlot;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Change the source slot from which the item that will be put in the players hotbar will be taken.
|
|
+ *
|
|
+ * @param sourceSlot player inventory slot (0-35 inclusive)
|
|
+ */
|
|
+ public void setSourceSlot(final @Range(from = 0, to = 35) int sourceSlot) {
|
|
+ Preconditions.checkArgument(sourceSlot >= 0 && sourceSlot <= 35, "Source slot must be in range of the player's inventory slot");
|
|
+ this.sourceSlot = sourceSlot;
|
|
+ }
|
|
+
|
|
+ @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;
|
|
+ }
|
|
+}
|