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

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:
eb4b416d PR-822: Add experimental armor trim API
33498e1d PR-831: Add a standard of annotations for Minecraft experimental things and API

CraftBukkit Changes:
19de3550d SPIGOT-7315: Bed placement duplicates crops if cancelled
1eb88374e PR-1147: Add experimental armor trim API
c4c0bb0e9 Show clean error for invalidly configured server.properties options
3ae90697f Fix UUID not being updated when changing world of MapView
e43000601 PR-1164, MC-227255, MC-253819: Fix rotation of beehives and bells

Spigot Changes:
d2fdfe39 Rebuild patches

patches/api/fix-Instruments.patch

@@ -29,47 +29,52 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       */
      STICKS(0x3),
 @@ -0,0 +0,0 @@ public enum Instrument {
-     /**
-      * Zombie is normally played when a Zombie Head is on top of the note block.
       */
+     @MinecraftExperimental
+     @ApiStatus.Experimental
 -    ZOMBIE,
-+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20
 +    ZOMBIE(0x10), // Paper
      /**
       * Skeleton is normally played when a Skeleton Head is on top of the note block.
       */
+     @MinecraftExperimental
+     @ApiStatus.Experimental
 -    SKELETON,
-+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20
 +    SKELETON(0x11), // Paper
      /**
       * Creeper is normally played when a Creeper Head is on top of the note block.
       */
+     @MinecraftExperimental
+     @ApiStatus.Experimental
 -    CREEPER,
-+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20
 +    CREEPER(0x12), // Paper
      /**
       * Dragon is normally played when a Dragon Head is on top of the note block.
       */
+     @MinecraftExperimental
+     @ApiStatus.Experimental
 -    DRAGON,
-+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20
 +    DRAGON(0x13), // Paper
      /**
       * Wither Skeleton is normally played when a Wither Skeleton Head is on top of the note block.
       */
+     @MinecraftExperimental
+     @ApiStatus.Experimental
 -    WITHER_SKELETON,
-+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20
 +    WITHER_SKELETON(0x14), // Paper
      /**
       * Piglin is normally played when a Piglin Head is on top of the note block.
       */
+     @MinecraftExperimental
+     @ApiStatus.Experimental
 -    PIGLIN,
-+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20
 +    PIGLIN(0x15), // Paper
      /**
       * Custom Sound is normally played when a Player Head with the required data is on top of the note block.
       */
+     @MinecraftExperimental
+     @ApiStatus.Experimental
 -    CUSTOM_HEAD;
-+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20
 +    CUSTOM_HEAD(0x16); // Paper
  
      private final byte type;