Updated Upstream (Bukkit/CraftBukkit) (#11543)

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:
97c59261 PR-1073: Make Biome an interface
a38581aa Fix further javadoc errors
8271c490 Fix javadoc error
8a9ecf29 PR-1072: Fix bad naming for Vault State methods
6dd58108 PR-1071: Make Fluid an interface and add missing entry
ed2cdfc3 PR-1070: Make Attribute an interface and align names with the new minecraft ones
63472efb PR-1069: Add missing winter drop experimental annotation to pale boats

CraftBukkit Changes:
7235ad7b0 PR-1501: Make Biome an interface
602904003 PR-1500: Rename implementation for Vault State methods
75f26f79f PR-1499: Make Fluid an interface and add missing entry
4cfd87adc PR-1498: Make Attribute an interface and align names with the new minecraft ones
6bb0db5cb SPIGOT-7928: ExactChoice acts as MaterialChoice
3eaf3a13c SPIGOT-7929: Error when setting EquippableComponent
abbf57bac SPIGOT-7930: Fix spawning entities with SummonEntityEffect
92d6ab6cf PR-1497: Move boat field rename entries to below key renaming, so that keys are also renamed
abfe292aa PR-1496: Use correct Fluid class on Tags type check
c7aab7fa7 SPIGOT-7923: Fix Dispenser logic to avoid firing empty projectiles

patches/api/Add-methods-to-get-translation-keys.patch

@@ -242,46 +242,33 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  /**
   * Types of attributes which may be present on an {@link Attributable}.
   */
--public enum Attribute implements Keyed, Translatable {
-+public enum Attribute implements Keyed, Translatable, net.kyori.adventure.translation.Translatable { // Paper - Adventure translations
+-public interface Attribute extends OldEnum<Attribute>, Keyed, Translatable {
++public interface Attribute extends OldEnum<Attribute>, Keyed, Translatable, net.kyori.adventure.translation.Translatable { // Paper - Adventure translations
  
      /**
       * Maximum health of an Entity.
-@@ -0,0 +0,0 @@ public enum Attribute implements Keyed, Translatable {
-     public String getTranslationKey() {
-         return Bukkit.getUnsafe().getTranslationKey(this);
-     }
-+
-+    // Paper start
-+    @SuppressWarnings("deprecation")
-+    @Override
-+    public @NotNull String translationKey() {
-+        return Bukkit.getUnsafe().getTranslationKey(this);
-+    }
-+    // Paper end
- }
 diff --git a/src/main/java/org/bukkit/block/Biome.java b/src/main/java/org/bukkit/block/Biome.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/block/Biome.java
 +++ b/src/main/java/org/bukkit/block/Biome.java
 @@ -0,0 +0,0 @@ import org.jetbrains.annotations.NotNull;
- /**
-  * Holds all accepted Biomes in the default server
+  * There may be additional biomes present in the server, for example from a {@link DataPack}
+  * which can be accessed via {@link Registry#BIOME}.
   */
--public enum Biome implements Keyed {
-+public enum Biome implements Keyed, net.kyori.adventure.translation.Translatable { // Paper
-     OCEAN,
-     PLAINS,
-     DESERT,
-@@ -0,0 +0,0 @@ public enum Biome implements Keyed {
-     public NamespacedKey getKey() {
-         return key;
+-public interface Biome extends OldEnum<Biome>, Keyed {
++public interface Biome extends OldEnum<Biome>, Keyed, net.kyori.adventure.translation.Translatable { // Paper - Adventure translations
+ 
+     Biome OCEAN = getBiome("ocean");
+     Biome PLAINS = getBiome("plains");
+@@ -0,0 +0,0 @@ public interface Biome extends OldEnum<Biome>, Keyed {
+     static Biome[] values() {
+         return Lists.newArrayList(Registry.BIOME).toArray(new Biome[0]);
      }
 +
 +    // Paper start
 +    @Override
-+    public @NotNull String translationKey() {
-+        return "biome.minecraft." + this.key.getKey();
++    default @NotNull String translationKey() {
++        return "biome.minecraft." + this.getKey().getKey();
 +    }
 +    // Paper end
  }