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

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:
1fc1020a PR-1049: Add MenuType API
8ae2e3be PR-1055: Expand riptiding API
cac68bfb SPIGOT-7890: AttributeModifier#getUniqueId() doesn't match the UUID passed to its constructor
7004fcf2 SPIGOT-7886: Fix mistake in AttributeModifier UUID shim
1ac7f950 PR-1054: Add FireworkMeta#hasPower
4cfb565f SPIGOT-7873: Add powered state for skulls

CraftBukkit Changes:
bbb30e7a8 SPIGOT-7894: NPE when sending tile entity update
ba21e9472 SPIGOT-7895: PlayerItemBreakEvent not firing
0fb24bbe0 SPIGOT-7875: Fix PlayerItemConsumeEvent cancellation causing client-side desync
815066449 SPIGOT-7891: Can't remove second ingredient of MerchantRecipe
45c206f2c PR-1458: Add MenuType API
19c8ef9ae SPIGOT-7867: Merchant instanceof AbstractVillager always returns false
4e006d28f PR-1468: Expand riptiding API
bd8aded7d Ignore checks in CraftPlayerProfile for ResolvableProfile used in profile components
8679620b5 SPIGOT-7889: Fix tool component deserialisation without speed and/or correct-for-drops
8d5222691 SPIGOT-7882, PR-1467: Fix conversion of name in Profile Component to empty if it is missing
63f91669a SPIGOT-7887: Remove duplicate ProjectileHitEvent for fireballs
7070de8c8 SPIGOT-7878: Server#getLootTable does not return null on invalid loot table
060ee6cae SPIGOT-7876: Can't kick player or disconnect player in PlayerLoginEvent when checking for cookies
7ccb86cc0 PR-1465: Add FireworkMeta#hasPower
804ad6491 SPIGOT-7873: Add powered state for skulls
f9610cdcb Improve minecart movement

Spigot Changes:
a759b629 Rebuild patches

Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>

patches/api/Add-RegistryAccess-for-managing-registries.patch

@@ -267,6 +267,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       * Default server loot tables.
       *
 @@ -0,0 +0,0 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
+      * @see MenuType
+      */
+     @ApiStatus.Experimental
+-    Registry<MenuType> MENU = Objects.requireNonNull(Bukkit.getRegistry(MenuType.class), "No registry present for MenuType. This is a bug.");
++    Registry<MenuType> MENU = io.papermc.paper.registry.RegistryAccess.registryAccess().getRegistry(io.papermc.paper.registry.RegistryKey.MENU); // Paper
+     /**
+      * Server mob effects.
       *
       * @see PotionEffectType
       */

patches/api/Add-missing-InventoryType.patch

@@ -12,12 +12,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ public enum InventoryType {
       * Pseudo jukebox inventory with 1 slot of undefined type.
       */
-     JUKEBOX(1, "Jukebox", false),
+     JUKEBOX(1, "Jukebox", null, false),
 +    // Paper start - add missing type
 +    /**
 +     * Pseudo decorated pot with 1 slot of undefined type.
 +     */
-+    DECORATED_POT(1, "Decorated Pot", false),
++    DECORATED_POT(1, "Decorated Pot", null, false),
 +    // Paper end - add missing type
      /**
       * A crafter inventory, with 9 CRAFTING slots.

patches/api/Adventure.patch

@@ -3348,11 +3348,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
 @@ -0,0 +0,0 @@ public enum InventoryType {
      private final String title;
+     private final MenuType menuType;
      private final boolean isCreatable;
- 
 +    // Paper start
 +    private final net.kyori.adventure.text.Component defaultTitleComponent;
-+
+ 
 +    /**
 +     * Gets the inventory's default title.
 +     *
@@ -3362,12 +3362,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        return defaultTitleComponent;
 +    }
 +    // Paper end
-     private InventoryType(int defaultSize, /*@NotNull*/ String defaultTitle) {
-         this(defaultSize, defaultTitle, true);
+     private InventoryType(int defaultSize, /*@NotNull*/ String defaultTitle, @Nullable MenuType type) {
+         this(defaultSize, defaultTitle, type, true);
      }
 @@ -0,0 +0,0 @@ public enum InventoryType {
-         size = defaultSize;
          title = defaultTitle;
+         this.menuType = type;
          this.isCreatable = isCreatable;
 +        this.defaultTitleComponent = net.kyori.adventure.text.Component.text(defaultTitle); // Paper - Adventure
      }
@@ -4421,6 +4421,56 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +    // Paper end
  }
+diff --git a/src/main/java/org/bukkit/inventory/MenuType.java b/src/main/java/org/bukkit/inventory/MenuType.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/inventory/MenuType.java
++++ b/src/main/java/org/bukkit/inventory/MenuType.java
+@@ -0,0 +0,0 @@ public interface MenuType extends Keyed {
+          * @param player the player the view belongs to
+          * @param title the title of the view
+          * @return the created {@link InventoryView}
++         * @deprecated Use {@link #create(HumanEntity, net.kyori.adventure.text.Component)} instead.
+          */
+         @NotNull
++        @Deprecated(since = "1.21") // Paper - adventure
+         V create(@NotNull HumanEntity player, @NotNull String title);
++
++        // Paper start - adventure
++        /**
++         * Creates a view of the specified menu type.
++         * <p>
++         * The player provided to create this view must be the player the view
++         * is opened for. See {@link HumanEntity#openInventory(InventoryView)}
++         * for more information.
++         *
++         * @param player the player the view belongs to
++         * @param title the title of the view
++         * @return the created {@link InventoryView}
++         */
++        @NotNull
++        V create(@NotNull HumanEntity player, @NotNull net.kyori.adventure.text.Component title);
++        // Paper end - adventure
+     }
+ 
++    // Paper start - adventure
++    /**
++     * Creates a view of the specified menu type.
++     * <p>
++     * The player provided to create this view must be the player the view
++     * is opened for. See {@link HumanEntity#openInventory(InventoryView)}
++     * for more information.
++     *
++     * @param player the player the view belongs to
++     * @param title the title of the view
++     * @return the created {@link InventoryView}
++     */
++    @NotNull
++    InventoryView create(@NotNull HumanEntity player, @NotNull net.kyori.adventure.text.Component title);
++    // Paper end - adventure
++
+     /**
+      * Yields this MenuType as a typed version of itself with a plain
+      * {@link InventoryView} representing it.
 diff --git a/src/main/java/org/bukkit/inventory/meta/BookMeta.java b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/inventory/meta/BookMeta.java

patches/api/Attribute-Modifier-API-improvements.patch

@@ -74,30 +74,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/attribute/AttributeModifier.java
 +++ b/src/main/java/org/bukkit/attribute/AttributeModifier.java
 @@ -0,0 +0,0 @@ public class AttributeModifier implements ConfigurationSerializable, Keyed {
-     private final Operation operation;
-     private final EquipmentSlotGroup slot;
- 
--    @Deprecated
-+    @Deprecated(forRemoval = true, since = "1.21")
-     public AttributeModifier(@NotNull String name, double amount, @NotNull Operation operation) {
-         this(UUID.randomUUID(), name, amount, operation);
-     }
- 
--    @Deprecated
-+    @Deprecated(forRemoval = true, since = "1.21")
-     public AttributeModifier(@NotNull UUID uuid, @NotNull String name, double amount, @NotNull Operation operation) {
-         this(uuid, name, amount, operation, (EquipmentSlot) null);
-     }
- 
--    @Deprecated
-+    @Deprecated(forRemoval = true, since = "1.21")
-     public AttributeModifier(@NotNull UUID uuid, @NotNull String name, double amount, @NotNull Operation operation, @Nullable EquipmentSlot slot) {
-         this(uuid, name, amount, operation, (slot) == null ? EquipmentSlotGroup.ANY : slot.getGroup());
-     }
- 
--    @Deprecated
-+    @Deprecated(forRemoval = true, since = "1.21")
-     public AttributeModifier(@NotNull UUID uuid, @NotNull String name, double amount, @NotNull Operation operation, @NotNull EquipmentSlotGroup slot) {
          this(NamespacedKey.fromString(uuid.toString()), amount, operation, slot);
      }
  
@@ -110,12 +86,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public AttributeModifier(@NotNull NamespacedKey key, double amount, @NotNull Operation operation, @NotNull EquipmentSlotGroup slot) {
          Preconditions.checkArgument(key != null, "Key cannot be null");
          Preconditions.checkArgument(operation != null, "Operation cannot be null");
-@@ -0,0 +0,0 @@ public class AttributeModifier implements ConfigurationSerializable, Keyed {
-      * @deprecated attributes are now identified by keys
-      */
-     @NotNull
--    @Deprecated
-+    @Deprecated(forRemoval = true, since = "1.21")
-     public UUID getUniqueId() {
-         return UUID.fromString(getKey().toString());
-     }

patches/api/Code-Generation.patch

@@ -114,6 +114,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import org.bukkit.generator.structure.Structure;
 +import org.bukkit.generator.structure.StructureType;
 +import org.bukkit.inventory.ItemType;
++import org.bukkit.inventory.MenuType;
 +import org.bukkit.inventory.meta.trim.TrimMaterial;
 +import org.bukkit.inventory.meta.trim.TrimPattern;
 +import org.bukkit.map.MapCursor;
@@ -235,6 +236,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    RegistryKey<Fluid> FLUID = create("fluid");
 +    RegistryKey<Frog.Variant> FROG_VARIANT = create("frog_variant");
 +    RegistryKey<MapCursor.Type> MAP_DECORATION_TYPE = create("map_decoration_type");
++    RegistryKey<MenuType> MENU = create("menu");
 +}
 diff --git a/src/main/java/io/papermc/paper/registry/RegistryKeyImpl.java b/src/main/java/io/papermc/paper/registry/RegistryKeyImpl.java
 new file mode 100644

patches/api/Experimental-annotations-change.patch

@@ -170,7 +170,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       * A crafter inventory, with 9 CRAFTING slots.
       */
 -    @ApiStatus.Experimental
-     CRAFTER(9, "Crafter"),
+     CRAFTER(9, "Crafter", MenuType.CRAFTER_3X3),
      /**
       * The new smithing inventory, with 3 CRAFTING slots and 1 RESULT slot.
 diff --git a/src/main/java/org/bukkit/inventory/CrafterInventory.java b/src/main/java/org/bukkit/inventory/CrafterInventory.java

patches/api/Fix-Spigot-annotation-mistakes.patch

@@ -1276,7 +1276,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       */
 -    @Deprecated
 +    @Deprecated(forRemoval = true) // Paper
-     SMITHING_NEW(4, "Upgrade Gear"),
+     SMITHING_NEW(4, "Upgrade Gear", MenuType.SMITHING),
      ;
  
 diff --git a/src/main/java/org/bukkit/event/player/PlayerBedLeaveEvent.java b/src/main/java/org/bukkit/event/player/PlayerBedLeaveEvent.java

patches/api/General-ItemMeta-fixes.patch

@@ -132,31 +132,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      /**
       * Checks to see if this item has a maximum amount of damage.
       *
-diff --git a/src/main/java/org/bukkit/inventory/meta/FireworkMeta.java b/src/main/java/org/bukkit/inventory/meta/FireworkMeta.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/inventory/meta/FireworkMeta.java
-+++ b/src/main/java/org/bukkit/inventory/meta/FireworkMeta.java
-@@ -0,0 +0,0 @@ public interface FireworkMeta extends ItemMeta {
-      */
-     boolean hasEffects();
- 
-+    // Paper start - add hasPower
-+    /**
-+     * Checks if power is defined on this meta.
-+     *
-+     * @return true if there is a power specified
-+     */
-+    boolean hasPower();
-+    // Paper end - add hasPower
-+
-     /**
-      * Gets the approximate height the firework will fly.
-      *
-      * @return approximate flight height of the firework.
-+     * @see #hasPower()
-      */
-     int getPower();
- 
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java