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-Spigot-annotation-mistakes.patch

@@ -203,14 +203,14 @@ diff --git a/src/main/java/org/bukkit/UndefinedNullability.java b/src/main/java/
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/UndefinedNullability.java
 +++ b/src/main/java/org/bukkit/UndefinedNullability.java
-@@ -0,0 +0,0 @@ import java.lang.annotation.RetentionPolicy;
+@@ -0,0 +0,0 @@ import org.jetbrains.annotations.ApiStatus;
   * suggests a bad API design.
   */
  @Retention(RetentionPolicy.CLASS)
 +@java.lang.annotation.Documented // Paper
+ @ApiStatus.Internal
  @Deprecated
  public @interface UndefinedNullability {
- 
 diff --git a/src/main/java/org/bukkit/Vibration.java b/src/main/java/org/bukkit/Vibration.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/Vibration.java
@@ -369,43 +369,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    @Deprecated // Paper
      public MaterialData getDisplayBlock();
  
-     /**
-diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/entity/Player.java
-+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      *
-      * @param plugin Plugin that wants to hide the entity
-      * @param entity Entity to hide
--     * @deprecated draft API
-      */
--    @Deprecated
-+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper
-     public void hideEntity(@NotNull Plugin plugin, @NotNull Entity entity);
- 
-     /**
-@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      *
-      * @param plugin Plugin that wants to show the entity
-      * @param entity Entity to show
--     * @deprecated draft API
-      */
--    @Deprecated
-+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper
-     public void showEntity(@NotNull Plugin plugin, @NotNull Entity entity);
- 
-     /**
-@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      * @param entity Entity to check
-      * @return True if the provided entity is not being hidden from this
-      *     player
--     * @deprecated draft API
-      */
--    @Deprecated
-+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper
-     public boolean canSee(@NotNull Entity entity);
- 
      /**
 diff --git a/src/main/java/org/bukkit/entity/Projectile.java b/src/main/java/org/bukkit/entity/Projectile.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
@@ -495,21 +458,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      @Override
      public void setCancelled(boolean cancel) {
          this.cancel = cancel;
-diff --git a/src/main/java/org/bukkit/event/player/PlayerHideEntityEvent.java b/src/main/java/org/bukkit/event/player/PlayerHideEntityEvent.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/event/player/PlayerHideEntityEvent.java
-+++ b/src/main/java/org/bukkit/event/player/PlayerHideEntityEvent.java
-@@ -0,0 +0,0 @@ import org.jetbrains.annotations.NotNull;
-  * This event is called regardless of if the entity was within tracking range.
-  *
-  * @see Player#hideEntity(org.bukkit.plugin.Plugin, org.bukkit.entity.Entity)
-- * @deprecated draft API
-  */
--@Deprecated
-+@org.jetbrains.annotations.ApiStatus.Experimental // Paper
- @Warning(false)
- public class PlayerHideEntityEvent extends PlayerEvent {
- 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
@@ -523,21 +471,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public Location getTo() {
          return to;
      }
-diff --git a/src/main/java/org/bukkit/event/player/PlayerShowEntityEvent.java b/src/main/java/org/bukkit/event/player/PlayerShowEntityEvent.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/event/player/PlayerShowEntityEvent.java
-+++ b/src/main/java/org/bukkit/event/player/PlayerShowEntityEvent.java
-@@ -0,0 +0,0 @@ import org.jetbrains.annotations.NotNull;
-  * range.
-  *
-  * @see Player#showEntity(org.bukkit.plugin.Plugin, org.bukkit.entity.Entity)
-- * @deprecated draft API
-  */
--@Deprecated
-+@org.jetbrains.annotations.ApiStatus.Experimental // Paper
- @Warning(false)
- public class PlayerShowEntityEvent extends PlayerEvent {
- 
 diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java