Updated Upstream (Bukkit/CraftBukkit) (#8714)

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:
aef9b6d2 PR-800: Add support for NoteBlock sounds in Skulls

CraftBukkit Changes:
ae8f5fc02 PR-1125: Add support for NoteBlock sounds in Skulls
0a1c89e4b SPIGOT-7212: Allow negative firework power
909a246af SPIGOT-7211: generateTree() with Consumer or Predicate is broken
c810c3ed8 Increase outdated build delay

patches/server/Add-missing-important-BlockStateListPopulator-method.patch

@@ -10,15 +10,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
 @@ -0,0 +0,0 @@ public class BlockStateListPopulator extends DummyGeneratorAccess {
-     public DimensionType dimensionType() {
-         return this.world.dimensionType();
+ 
+     @Override
+     public boolean isFluidAtPosition(BlockPos pos, Predicate<FluidState> state) {
+-        return this.world.isFluidAtPosition(pos, state);
++        return state.test(this.getFluidState(pos)); // Paper - fix
+     }
+ 
+     @Override
+@@ -0,0 +0,0 @@ public class BlockStateListPopulator extends DummyGeneratorAccess {
+     public RegistryAccess registryAccess() {
+         return this.world.registryAccess();
      }
-+    // Paper start
-+    @Override
-+    public boolean isFluidAtPosition(BlockPos pos, Predicate<FluidState> state) {
-+        return state.test(this.getFluidState(pos));
-+    }
 +
++    // Paper start
 +    @Override
 +    public <T extends BlockEntity> java.util.Optional<T> getBlockEntity(BlockPos pos, net.minecraft.world.level.block.entity.BlockEntityType<T> type) {
 +        BlockEntity tileentity = this.getBlockEntity(pos);