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
2024-10-31 23:44:34 +01:00
parent 5af7b3afbb
commit 29b207245f
25 changed files with 116 additions and 136 deletions
--- a/patches/api/Add-FeatureFlag-API.patch
+++ b/patches/api/Add-FeatureFlag-API.patch
@@ -251,7 +251,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
@@ -0,0 +0,0 @@ public interface UnsafeValues {
- 
+     @Deprecated(since = "1.21.3", forRemoval = true)
     String getTranslationKey(Attribute attribute);
 
 -    @Nullable
--- a/patches/api/Add-NamespacedKey-biome-methods.patch
+++ b/patches/api/Add-NamespacedKey-biome-methods.patch
@@ -22,9 +22,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @param x X-coordinate of the block
 +     * @param y Y-coordinate of the block
 +     * @param z Z-coordinate of the block
+     * @deprecated custom biomes are properly supported in API now
 +     * @return the biome's {@link NamespacedKey}
 +     */
 +    @org.jetbrains.annotations.NotNull
+    @Deprecated(since = "1.21.3", forRemoval = true)
 +    NamespacedKey getBiomeKey(RegionAccessor accessor, int x, int y, int z);
 +
 +    /**
@@ -38,8 +40,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @param y Y-coordinate of the block
 +     * @param z Z-coordinate of the block
 +     * @param biomeKey Biome key
+     * @deprecated custom biomes are properly supported in API now
 +     * @throws IllegalStateException if no biome by the given key is registered.
 +     */
+    @Deprecated(since = "1.21.3", forRemoval = true)
 +    void setBiomeKey(RegionAccessor accessor, int x, int y, int z, NamespacedKey biomeKey);
 +    // Paper end - namespaced key biome methods
 }
--- a/patches/api/Add-RegistryAccess-for-managing-registries.patch
+++ b/patches/api/Add-RegistryAccess-for-managing-registries.patch
@@ -211,6 +211,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/Registry.java
 +++ b/src/main/java/org/bukkit/Registry.java
@@ -0,0 +0,0 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
+      * Attribute.
+      *
+      * @see Attribute
+     * @deprecated use {@link io.papermc.paper.registry.RegistryAccess#getRegistry(io.papermc.paper.registry.RegistryKey)} with {@link io.papermc.paper.registry.RegistryKey#ATTRIBUTE}
+      */
+-    Registry<Attribute> ATTRIBUTE = Objects.requireNonNull(Bukkit.getRegistry(Attribute.class), "No registry present for Attribute. This is a bug.");
+    @Deprecated(since = "1.21.3") // Paper
+    Registry<Attribute> ATTRIBUTE = Objects.requireNonNull(io.papermc.paper.registry.RegistryAccess.registryAccess().getRegistry(Attribute.class), "No registry present for Attribute. This is a bug.");
+     /**
      * Server banner patterns.
      *
      * @see PatternType
@@ -222,6 +231,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
     /**
      * Server biomes.
      *
+      * @see Biome
+     * @deprecated use {@link io.papermc.paper.registry.RegistryAccess#getRegistry(io.papermc.paper.registry.RegistryKey)} with {@link io.papermc.paper.registry.RegistryKey#BIOME}
+      */
+-    Registry<Biome> BIOME = Objects.requireNonNull(Bukkit.getRegistry(Biome.class), "No registry present for Biome. This is a bug.");
+    @Deprecated(since = "1.21.3") // Paper
+    Registry<Biome> BIOME = Objects.requireNonNull(io.papermc.paper.registry.RegistryAccess.registryAccess().getRegistry(Biome.class), "No registry present for Biome. This is a bug.");
+     /**
+      * Server block types.
+      *
@@ -0,0 +0,0 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
      * @apiNote BlockType is not ready for public usage yet
      */
@@ -358,6 +376,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      * Memory Keys.
      *
@@ -0,0 +0,0 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
+      * Server fluids.
+      *
+      * @see Fluid
+     * @deprecated use {@link io.papermc.paper.registry.RegistryAccess#getRegistry(io.papermc.paper.registry.RegistryKey)} with {@link io.papermc.paper.registry.RegistryKey#FLUID}
+      */
+-    Registry<Fluid> FLUID = Objects.requireNonNull(Bukkit.getRegistry(Fluid.class), "No registry present for Fluid. This is a bug.");
+    @Deprecated(since = "1.21.3")
+    Registry<Fluid> FLUID = Objects.requireNonNull(io.papermc.paper.registry.RegistryAccess.registryAccess().getRegistry(Fluid.class), "No registry present for Fluid. This is a bug.");
+     /**
+      * Frog variants.
      *
      * @see Frog.Variant
      */
--- a/patches/api/Add-methods-to-get-translation-keys.patch
+++ b/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
 }
--- a/patches/api/Add-missing-Fluid-type.patch
+++ b/patches/api/Add-missing-Fluid-type.patch
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sun, 4 Dec 2022 10:07:16 -0800
-Subject: [PATCH] Add missing Fluid type
-
-
-diff --git a/src/main/java/org/bukkit/Fluid.java b/src/main/java/org/bukkit/Fluid.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/Fluid.java
-+++ b/src/main/java/org/bukkit/Fluid.java
-@@ -0,0 +0,0 @@ import org.jetbrains.annotations.NotNull;
-  */
- public enum Fluid implements Keyed {
- 
-+    // Paper start
-+    /**
-+     * No fluid.
-+     */
-+    EMPTY,
-+    // Paper end
-     /**
-      * Stationary water.
-      */
--- a/patches/api/Fix-custom-statistic-criteria-creation.patch
+++ b/patches/api/Fix-custom-statistic-criteria-creation.patch
@@ -9,7 +9,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
@@ -0,0 +0,0 @@ public interface UnsafeValues {
-      */
+     @Deprecated(since = "1.21.3", forRemoval = true)
     void setBiomeKey(RegionAccessor accessor, int x, int y, int z, NamespacedKey biomeKey);
     // Paper end - namespaced key biome methods
 +
--- a/patches/api/Fix-upstream-javadocs.patch
+++ b/patches/api/Fix-upstream-javadocs.patch
@@ -600,9 +600,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * Setting the size of the slime (regardless of previous size)
 +     * will set the following attributes:
 +     * <ul>
-+     *     <li>{@link org.bukkit.attribute.Attribute#GENERIC_MAX_HEALTH}</li>
-+     *     <li>{@link org.bukkit.attribute.Attribute#GENERIC_MOVEMENT_SPEED}</li>
-+     *     <li>{@link org.bukkit.attribute.Attribute#GENERIC_ATTACK_DAMAGE}</li>
+     *     <li>{@link org.bukkit.attribute.Attribute#MAX_HEALTH}</li>
+     *     <li>{@link org.bukkit.attribute.Attribute#MOVEMENT_SPEED}</li>
+     *     <li>{@link org.bukkit.attribute.Attribute#ATTACK_DAMAGE}</li>
 +     * </ul>
 +     * to their per-size defaults and heal the
 +     * slime to its max health (assuming it's alive).
--- a/patches/api/Improve-death-events.patch
+++ b/patches/api/Improve-death-events.patch
@@ -79,7 +79,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @throws IllegalArgumentException Thrown if the health is {@literal <= 0 or >} max health
 +     */
 +    public void setReviveHealth(double reviveHealth) throws IllegalArgumentException {
-+        double maxHealth = ((LivingEntity) entity).getAttribute(org.bukkit.attribute.Attribute.GENERIC_MAX_HEALTH).getValue();
+        double maxHealth = ((LivingEntity) entity).getAttribute(org.bukkit.attribute.Attribute.MAX_HEALTH).getValue();
 +        if ((maxHealth != 0 && reviveHealth <= 0) || (reviveHealth > maxHealth)) {
 +            throw new IllegalArgumentException("Health must be between 0 (exclusive) and " + maxHealth + " (inclusive), but was " + reviveHealth);
 +        }
--- a/patches/api/Paper-Plugins.patch
+++ b/patches/api/Paper-Plugins.patch
@@ -1331,7 +1331,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
@@ -0,0 +0,0 @@ public interface UnsafeValues {
 
     @ApiStatus.Internal
-     <B extends Keyed> B get(Registry<B> registry, NamespacedKey key);
+     Biome getCustomBiome();
 +
 +    // Paper start
 +    @Deprecated(forRemoval = true)