diff --git a/patches/api/Adventure.patch b/patches/api/Adventure.patch index 23c90c1382..ced335af4d 100644 --- a/patches/api/Adventure.patch +++ b/patches/api/Adventure.patch @@ -969,6 +969,42 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + public net.kyori.adventure.key.@org.checkerframework.checker.nullness.qual.NonNull Key key() { + return this.key; + } ++ // Paper end + } +diff --git a/src/main/java/org/bukkit/SoundCategory.java b/src/main/java/org/bukkit/SoundCategory.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/org/bukkit/SoundCategory.java ++++ b/src/main/java/org/bukkit/SoundCategory.java +@@ -0,0 +0,0 @@ package org.bukkit; + /** + * An Enum of categories for sounds. + */ +-public enum SoundCategory { ++public enum SoundCategory implements net.kyori.adventure.sound.Sound.Source.Provider { // Paper - implement Sound.Source.Provider + + MASTER, + MUSIC, +@@ -0,0 +0,0 @@ public enum SoundCategory { + PLAYERS, + AMBIENT, + VOICE; ++ ++ // Paper start - implement Sound.Source.Provider ++ @Override ++ public net.kyori.adventure.sound.Sound.@org.jetbrains.annotations.NotNull Source soundSource() { ++ return switch (this) { ++ case MASTER -> net.kyori.adventure.sound.Sound.Source.MASTER; ++ case MUSIC -> net.kyori.adventure.sound.Sound.Source.MUSIC; ++ case RECORDS -> net.kyori.adventure.sound.Sound.Source.RECORD; ++ case WEATHER -> net.kyori.adventure.sound.Sound.Source.WEATHER; ++ case BLOCKS -> net.kyori.adventure.sound.Sound.Source.BLOCK; ++ case HOSTILE -> net.kyori.adventure.sound.Sound.Source.HOSTILE; ++ case NEUTRAL -> net.kyori.adventure.sound.Sound.Source.NEUTRAL; ++ case PLAYERS -> net.kyori.adventure.sound.Sound.Source.PLAYER; ++ case AMBIENT -> net.kyori.adventure.sound.Sound.Source.AMBIENT; ++ case VOICE -> net.kyori.adventure.sound.Sound.Source.VOICE; ++ }; ++ } + // Paper end } diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java