Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9018)

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:
2c64d8c4 SPIGOT-7309: Add API for jukebox inventories
a6d7e4ca PR-826: Add Sniffer API

CraftBukkit Changes:
93813509b SPIGOT-7309: Add API for jukebox inventories
2d5209e8d PR-1153: Handle teleport reason in spreadplayers command
f5b61387e SPIGOT-7308: Fix NullPointerException when calling Jukebox#setRecord()
388d458a6 SPIGOT-7306: Fix reset of coords in default teleportTo in EntityPlayer
40b87e1af PR-1150: Add Sniffer API and handle EntityItemDropEvent

Spigot Changes:
6ad4b93c SPIGOT-7298: Fix debug stick always permission left click toggle

patches/api/0005-Adventure.patch

@@ -2775,10 +2775,10 @@ index 3c2ea8fec3a748cab7f5ad9100d12bd8213ec6c9..a803bfea5400b3578bb4cf3261874e87
       * Gets how much EXP the Player should have at respawn.
       * <p>
 diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-index 4fb754cd7fd9b668029e2311cfaad774bb47cf80..99a45a698882acd47c725183a1f199eb1643f6e8 100644
+index 629c1bf79ca3577c51d17ef8c9d36f84b1a2c360..2186507089384cb9805057c7cc1795fba7de1df3 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
 +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-@@ -151,6 +151,18 @@ public enum InventoryType {
+@@ -155,6 +155,18 @@ public enum InventoryType {
      private final String title;
      private final boolean isCreatable;
  
@@ -2797,7 +2797,7 @@ index 4fb754cd7fd9b668029e2311cfaad774bb47cf80..99a45a698882acd47c725183a1f199eb
      private InventoryType(int defaultSize, /*@NotNull*/ String defaultTitle) {
          this(defaultSize, defaultTitle, true);
      }
-@@ -159,6 +171,7 @@ public enum InventoryType {
+@@ -163,6 +175,7 @@ public enum InventoryType {
          size = defaultSize;
          title = defaultTitle;
          this.isCreatable = isCreatable;
@@ -2805,7 +2805,7 @@ index 4fb754cd7fd9b668029e2311cfaad774bb47cf80..99a45a698882acd47c725183a1f199eb
      }
  
      public int getDefaultSize() {
-@@ -166,6 +179,7 @@ public enum InventoryType {
+@@ -170,6 +183,7 @@ public enum InventoryType {
      }
  
      @NotNull

patches/api/0402-Mark-experimental-api-as-such.patch

@@ -562,7 +562,7 @@ index 93244e6d940891f1297d4a26a80ba155af306071..caa34db68bdbbc8dceefb4385f4585ac
      /**
       * Uses {@link BlockData} as DataType
 diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java
-index fad12a883046010274c8b44426096bfe4703bcc3..5537a0a86b8d360ad540e1dff3b872098fe2ad6b 100644
+index 5035c525ab40ebdde3da7fe85f5bdf6a26f6cfc0..aeaa8406fd97154a7afe66a4d08a3f598dfb83a4 100644
 --- a/src/main/java/org/bukkit/Sound.java
 +++ b/src/main/java/org/bukkit/Sound.java
 @@ -76,25 +76,45 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
@@ -1166,17 +1166,18 @@ index 9f935266f51f4ea5d1193031f52e5327350cc06f..ee3a3bda9a5b9cf3bcabf80ee3c653a2
      TEXT_DISPLAY("text_display", TextDisplay.class, -1),
      /**
 diff --git a/src/main/java/org/bukkit/entity/Sniffer.java b/src/main/java/org/bukkit/entity/Sniffer.java
-index dc640c44660acef8f2d17283426052fe7e9e8ae2..50c953619dc8139f064ba139e75a397325ae8cd4 100644
+index 6509d1ca35ff1cb7a2b31871c642d730b2816f6f..67982a8b2258c476eac76e7dc64bc7f143f63df9 100644
 --- a/src/main/java/org/bukkit/entity/Sniffer.java
 +++ b/src/main/java/org/bukkit/entity/Sniffer.java
-@@ -3,6 +3,7 @@ package org.bukkit.entity;
- /**
-  * Represents a Sniffer.
+@@ -12,7 +12,7 @@ import org.jetbrains.annotations.Nullable;
+  * <b>Note: This entity is part of an experimental feature of Minecraft and
+  * hence subject to change.</b>
   */
-+@org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20
+-@ApiStatus.Experimental
++@ApiStatus.Experimental // Paper - 1.20
  public interface Sniffer extends Animals {
  
- }
+     /**
 diff --git a/src/main/java/org/bukkit/entity/memory/MemoryKey.java b/src/main/java/org/bukkit/entity/memory/MemoryKey.java
 index 8f601e85df580ef8106eaff8b9eafb5691a4874b..99ca502a14e3f321c323d7675bc47e7ee77d7464 100644
 --- a/src/main/java/org/bukkit/entity/memory/MemoryKey.java
@@ -1190,17 +1191,18 @@ index 8f601e85df580ef8106eaff8b9eafb5691a4874b..99ca502a14e3f321c323d7675bc47e7e
  
      /**
 diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-index 65a1cd5837d944db1ade9dbed1caa083f73da53e..90a846e23d2b41e3f658fbf48cd43bd5e72b709f 100644
+index 2186507089384cb9805057c7cc1795fba7de1df3..94f127fd6ba69ca48d03acbc9886ee499e9be4f3 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
 +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-@@ -137,13 +137,14 @@ public enum InventoryType {
+@@ -137,6 +137,7 @@ public enum InventoryType {
      /**
       * Pseudo chiseled bookshelf inventory, with 6 slots of undefined type.
       */
 +    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20
      CHISELED_BOOKSHELF(6, "Chiseled Bookshelf", false),
      /**
-      * The new smithing inventory, with 3 CRAFTING slots and 1 RESULT slot.
+      * Pseudo jukebox inventory with 1 slot of undefined type.
+@@ -147,7 +148,7 @@ public enum InventoryType {
       *
       * @deprecated draft, experimental 1.20 API
       */

patches/api/0416-Fix-Jukeboxes.patch

@@ -1,58 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Tue, 14 Mar 2023 18:55:47 -0700
-Subject: [PATCH] Fix Jukeboxes
-
-
-diff --git a/src/main/java/org/bukkit/block/Jukebox.java b/src/main/java/org/bukkit/block/Jukebox.java
-index 321e5e034a906129142341cec952fac3c1e7e360..37967acb9ee85f1d1c9b3b2d3472b460f41f7080 100644
---- a/src/main/java/org/bukkit/block/Jukebox.java
-+++ b/src/main/java/org/bukkit/block/Jukebox.java
-@@ -8,7 +8,7 @@ import org.jetbrains.annotations.Nullable;
- /**
-  * Represents a captured state of a jukebox.
-  */
--public interface Jukebox extends TileState {
-+public interface Jukebox extends TileState, org.bukkit.inventory.BlockInventoryHolder { // Paper
- 
-     /**
-      * Gets the record inserted into the jukebox.
-@@ -62,4 +62,20 @@ public interface Jukebox extends TileState {
-      * @throws IllegalStateException if this block state is not placed
-      */
-     public boolean eject();
-+    // Paper start
-+    /**
-+     * @return inventory
-+     * @see Container#getInventory()
-+     */
-+    @NotNull
-+    @Override
-+    org.bukkit.inventory.Inventory getInventory();
-+
-+    /**
-+     * @return snapshot inventory
-+     * @see Container#getSnapshotInventory()
-+     */
-+    @NotNull
-+    org.bukkit.inventory.Inventory getSnapshotInventory();
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-index 90a846e23d2b41e3f658fbf48cd43bd5e72b709f..35aac79a7c58d00e6b3c6c042b291093c9c7af71 100644
---- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
-+++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-@@ -146,6 +146,13 @@ public enum InventoryType {
-      */
-     @Deprecated @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20
-     SMITHING_NEW(4, "Upgrade Gear"),
-+    // Paper start
-+    /**
-+     * Pseudo jukebox inventory
-+     */
-+    @org.jetbrains.annotations.ApiStatus.Experimental
-+    JUKEBOX(1, "Jukebox", false);
-+    // Paper end
-     ;
- 
-     private final int size;