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

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:
96340858 PR-938: Various Sound API improvements
cbfe0ff0 PR-937: Minor improvements to World#rayTrace documentation
e979ee95 PR-935: Change Consumer and Predicates to super
27ae46dc SPIGOT-3641, SPIGOT-7479, PR-931: Add missing values to EntityEffect
0616ec8b Add eclipse .factorypath file to .gitignore

CraftBukkit Changes:
8e162d008 PR-1301: Various Sound API improvements
eeb7dfc2d SPIGOT-7520: Attribute LootTableSeed missing for generated containers with attached LootTable
d433f086d PR-1297: Change Consumer and Predicates to super
864f616da SPIGOT-7518: Fix NullPointerException when calling Block#applyBoneMeal()
5a2d905af Add eclipse .factorypath file to .gitignore
7c6bf15d4 Fix SkullMeta configuration serialization / deserialization with note block sound

Spigot Changes:
7de1049b Rebuild patches

patches/api/fix-Instruments.patch

@@ -17,63 +17,64 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -     * Piano is the standard instrument for a note block.
 +     * Piano (Harp) is the standard instrument for a note block.
       */
-     PIANO(0x0),
+     PIANO(0x0, Sound.BLOCK_NOTE_BLOCK_HARP),
      /**
 @@ -0,0 +0,0 @@ public enum Instrument {
       */
-     SNARE_DRUM(0x2),
+     SNARE_DRUM(0x2, Sound.BLOCK_NOTE_BLOCK_SNARE),
      /**
 -     * Sticks are normally played when a note block is on top of a glass
 +     * Sticks (Hat) are normally played when a note block is on top of a glass
       * block.
       */
-     STICKS(0x3),
+     STICKS(0x3, Sound.BLOCK_NOTE_BLOCK_HAT),
 @@ -0,0 +0,0 @@ public enum Instrument {
      /**
       * Zombie is normally played when a Zombie Head is on top of the note block.
       */
--    ZOMBIE,
-+    ZOMBIE(0x10), // Paper
+-    ZOMBIE(Sound.BLOCK_NOTE_BLOCK_IMITATE_ZOMBIE),
++    ZOMBIE(0x10, Sound.BLOCK_NOTE_BLOCK_IMITATE_ZOMBIE), // Paper
      /**
       * Skeleton is normally played when a Skeleton Head is on top of the note block.
       */
--    SKELETON,
-+    SKELETON(0x11), // Paper
+-    SKELETON(Sound.BLOCK_NOTE_BLOCK_IMITATE_SKELETON),
++    SKELETON(0x11, Sound.BLOCK_NOTE_BLOCK_IMITATE_SKELETON), // Paper
      /**
       * Creeper is normally played when a Creeper Head is on top of the note block.
       */
--    CREEPER,
-+    CREEPER(0x12), // Paper
+-    CREEPER(Sound.BLOCK_NOTE_BLOCK_IMITATE_CREEPER),
++    CREEPER(0x12, Sound.BLOCK_NOTE_BLOCK_IMITATE_CREEPER), // Paper
      /**
       * Dragon is normally played when a Dragon Head is on top of the note block.
       */
--    DRAGON,
-+    DRAGON(0x13), // Paper
+-    DRAGON(Sound.BLOCK_NOTE_BLOCK_IMITATE_ENDER_DRAGON),
++    DRAGON(0x13, Sound.BLOCK_NOTE_BLOCK_IMITATE_ENDER_DRAGON), // Paper
      /**
       * Wither Skeleton is normally played when a Wither Skeleton Head is on top of the note block.
       */
--    WITHER_SKELETON,
-+    WITHER_SKELETON(0x14), // Paper
+-    WITHER_SKELETON(Sound.BLOCK_NOTE_BLOCK_IMITATE_WITHER_SKELETON),
++    WITHER_SKELETON(0x14, Sound.BLOCK_NOTE_BLOCK_IMITATE_WITHER_SKELETON), // Paper
      /**
       * Piglin is normally played when a Piglin Head is on top of the note block.
       */
--    PIGLIN,
-+    PIGLIN(0x15), // Paper
+-    PIGLIN(Sound.BLOCK_NOTE_BLOCK_IMITATE_PIGLIN),
++    PIGLIN(0x15, Sound.BLOCK_NOTE_BLOCK_IMITATE_PIGLIN), // Paper
      /**
       * Custom Sound is normally played when a Player Head with the required data is on top of the note block.
       */
--    CUSTOM_HEAD;
-+    CUSTOM_HEAD(0x16); // Paper
+-    CUSTOM_HEAD(null);
++    CUSTOM_HEAD(0x16, null); // Paper
  
      private final byte type;
+     private final Sound sound;
      private static final Map<Byte, Instrument> BY_DATA = Maps.newHashMap();
  
--    private Instrument() {
--        this(-1);
+-    private Instrument(final Sound sound) {
+-        this(-1, sound);
 -    }
 +    // Paper - remove ctor (the server still uses the byte magic value)
  
-     private Instrument(final int type) {
+     private Instrument(final int type, final Sound sound) {
          this.type = (byte) type;
 @@ -0,0 +0,0 @@ public enum Instrument {
  
@@ -97,21 +98,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      @Nullable
      public static Instrument getByType(final byte type) {
          return BY_DATA.get(type);
-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
-     public void playNote(@NotNull Location loc, byte instrument, byte note);
- 
-     /**
--     * Play a note for a player at a location. This requires a note block
--     * at the particular location (as far as the client is concerned). This
--     * will not work without a note block. This will not work with cake.
-+     * Play a note for a player at a location.
-      *
-      * @param loc The location of a note block
-      * @param instrument The instrument
 diff --git a/src/test/java/org/bukkit/InstrumentTest.java b/src/test/java/org/bukkit/InstrumentTest.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/test/java/org/bukkit/InstrumentTest.java