Prepare for 1.19 dev

2025-08-01 20:52:12 -07:00 · 2022-06-07 18:52:56 +02:00
parent f34f678b20
commit 1148687a8d
1302 changed files with 120 additions and 61 deletions
--- a/patches/api/Add-hand-to-bucket-events.patch
+++ b/patches/api/Add-hand-to-bucket-events.patch
@@ -1,130 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@GMail.com>
-Date: Thu, 2 Aug 2018 08:44:20 -0500
-Subject: [PATCH] Add hand to bucket events
-
-
-diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java
-+++ b/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java
-@@ -0,0 +0,0 @@ import org.bukkit.block.Block;
- import org.bukkit.block.BlockFace;
- import org.bukkit.entity.Player;
- import org.bukkit.event.HandlerList;
-+import org.bukkit.inventory.EquipmentSlot;
- import org.bukkit.inventory.ItemStack;
- import org.jetbrains.annotations.NotNull;
- 
-@@ -0,0 +0,0 @@ public class PlayerBucketEmptyEvent extends PlayerBucketEvent {
-     public PlayerBucketEmptyEvent(@NotNull final Player who, @NotNull final Block block, @NotNull final Block blockClicked, @NotNull final BlockFace blockFace, @NotNull final Material bucket, @NotNull final ItemStack itemInHand) {
-         super(who, block, blockClicked, blockFace, bucket, itemInHand);
-     }
-+    // Paper start - add EquipmentSlot
-+    @Deprecated
-+    public PlayerBucketEmptyEvent(@NotNull final Player who, @NotNull final Block blockClicked, @NotNull final BlockFace blockFace, @NotNull final Material bucket, @NotNull final ItemStack itemInHand, @org.jetbrains.annotations.Nullable final EquipmentSlot hand) {
-+        super(who, blockClicked, blockFace, bucket, itemInHand, hand);
-+    }
-+
-+    public PlayerBucketEmptyEvent(@NotNull final Player who, @NotNull final Block block, @NotNull final Block blockClicked, @NotNull final BlockFace blockFace, @NotNull final Material bucket, @NotNull final ItemStack itemInHand, @org.jetbrains.annotations.Nullable final EquipmentSlot hand) {
-+        super(who, block, blockClicked, blockFace, bucket, itemInHand, hand);
-+    }
-+    // Paper end
- 
-     @NotNull
-     @Override
-diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java
-+++ b/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java
-@@ -0,0 +0,0 @@ import org.bukkit.block.Block;
- import org.bukkit.block.BlockFace;
- import org.bukkit.entity.Player;
- import org.bukkit.event.Cancellable;
-+import org.bukkit.inventory.EquipmentSlot;
- import org.bukkit.inventory.ItemStack;
- import org.jetbrains.annotations.NotNull;
- import org.jetbrains.annotations.Nullable;
-@@ -0,0 +0,0 @@ public abstract class PlayerBucketEvent extends PlayerEvent implements Cancellab
-     private final Block blockClicked;
-     private final BlockFace blockFace;
-     private final Material bucket;
-+    private final EquipmentSlot hand; // Paper - add EquipmentSlot
- 
-     @Deprecated
-     public PlayerBucketEvent(@NotNull final Player who, @NotNull final Block blockClicked, @NotNull final BlockFace blockFace, @NotNull final Material bucket, @NotNull final ItemStack itemInHand) {
-@@ -0,0 +0,0 @@ public abstract class PlayerBucketEvent extends PlayerEvent implements Cancellab
-     }
- 
-     public PlayerBucketEvent(@NotNull final Player who, @NotNull final Block block, @NotNull final Block blockClicked, @NotNull final BlockFace blockFace, @NotNull final Material bucket, @NotNull final ItemStack itemInHand) {
-+        // Paper start - add EquipmentSlot
-+        this(who, block, blockClicked, blockFace, bucket, itemInHand, null);
-+    }
-+
-+    @Deprecated
-+    public PlayerBucketEvent(@NotNull final Player who,@NotNull final Block blockClicked, @NotNull final BlockFace blockFace, @NotNull final Material bucket, @NotNull final ItemStack itemInHand, @Nullable  final EquipmentSlot hand) {
-+        this(who, null, blockClicked, blockFace, bucket, itemInHand, hand);
-+    }
-+
-+    public PlayerBucketEvent(@NotNull final Player who, @NotNull final Block block, @NotNull final Block blockClicked, @NotNull final BlockFace blockFace, @NotNull final Material bucket, @NotNull final ItemStack itemInHand, @Nullable  final EquipmentSlot hand) {
-+        // Paper end
-         super(who);
-         this.block = block;
-         this.blockClicked = blockClicked;
-         this.blockFace = blockFace;
-         this.itemStack = itemInHand;
-         this.bucket = bucket;
-+        this.hand = hand == null ? player.getInventory().getItemInMainHand().equals(itemInHand) ? EquipmentSlot.HAND : EquipmentSlot.OFF_HAND : hand; // Paper - add EquipmentSlot
-     }
- 
-     /**
-@@ -0,0 +0,0 @@ public abstract class PlayerBucketEvent extends PlayerEvent implements Cancellab
-         return blockFace;
-     }
- 
-+    // Paper start
-+    /**
-+     * The hand used to perform this action.
-+     *
-+     * @return the hand used
-+     */
-+    @NotNull
-+    public EquipmentSlot getHand() {
-+        return hand;
-+    }
-+    // Paper end
-+
-     @Override
-     public boolean isCancelled() {
-         return cancelled;
-diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java
-+++ b/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java
-@@ -0,0 +0,0 @@ import org.bukkit.block.Block;
- import org.bukkit.block.BlockFace;
- import org.bukkit.entity.Player;
- import org.bukkit.event.HandlerList;
-+import org.bukkit.inventory.EquipmentSlot;
- import org.bukkit.inventory.ItemStack;
- import org.jetbrains.annotations.NotNull;
- 
-@@ -0,0 +0,0 @@ public class PlayerBucketFillEvent extends PlayerBucketEvent {
-         super(who, block, blockClicked, blockFace, bucket, itemInHand);
-     }
- 
-+    // Paper start - add EquipmentSlot
-+    @Deprecated
-+    public PlayerBucketFillEvent(@NotNull final Player who, @NotNull final Block blockClicked, @NotNull final BlockFace blockFace, @NotNull final Material bucket, @NotNull final ItemStack itemInHand, @org.jetbrains.annotations.Nullable final EquipmentSlot hand) {
-+        super(who, blockClicked, blockFace, bucket, itemInHand, hand);
-+    }
-+
-+    // Paper start - add EquipmentSlot
-+    public PlayerBucketFillEvent(@NotNull final Player who, @NotNull Block block, @NotNull final Block blockClicked, @NotNull final BlockFace blockFace, @NotNull final Material bucket, @NotNull final ItemStack itemInHand, @org.jetbrains.annotations.Nullable final EquipmentSlot hand) {
-+        super(who, block, blockClicked, blockFace, bucket, itemInHand, hand);
-+    }
-+    // Paper end
-+
-     @NotNull
-     @Override
-     public HandlerList getHandlers() {