Updated Upstream (Bukkit/CraftBukkit) (#10691)

Updated Upstream (Bukkit/CraftBukkit)

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:
fa99e752 PR-1007: Add ItemMeta#getAsComponentString()
94a91782 Fix copy-pasted BlockType.Typed documentation
9b34ac8c Largely restore deprecated PotionData API
51a6449b PR-1008: Deprecate ITEMS_TOOLS, removed in 1.20.5
702d15fe Fix Javadoc reference
42f6cdf4 PR-919: Add internal ItemType and BlockType, delegate Material methods to them
237bb37b SPIGOT-1166, SPIGOT-7647: Expose Damager BlockState in EntityDamageByBlockEvent
035ea146 SPIGOT-6993: Allow #setVelocity to change the speed of a fireball and add a note to #setDirection about it
8c7880fb PR-1004: Improve field rename handling and centralize conversion between bukkit and string more
87c90e93 SPIGOT-7650: Add DamageSource for EntityDeathEvent and PlayerDeathEvent

CraftBukkit Changes:
4af0f22e8 SPIGOT-7664: Item meta should prevail over block states
c2ccc46ec SPIGOT-7666: Fix access to llama and horse special slot
124ac66d7 SPIGOT-7665: Fix ThrownPotion#getEffects() implementation only bringing custom effects
66f1f439a Restore null page behaviour of signed books even though not strictly allowed by API
6118e5398 Fix regression listening to minecraft:brand custom payloads
c1a26b366 Fix unnecessary and potential not thread-safe chat visibility check
12360a7ec Remove unused imports
147b098b4 PR-1397: Add ItemMeta#getAsComponentString()
428aefe0e Largely restore deprecated PotionData API
afe5b5ee9 PR-1275: Add internal ItemType and BlockType, delegate Material methods to them
8afeafa7d SPIGOT-1166, SPIGOT-7647: Expose Damager BlockState in EntityDamageByBlockEvent
4e7d749d4 SPIGOT-6993: Allow #setVelocity to change the speed of a fireball and add a note to #setDirection about it
441880757 Support both entity_data and bucket_entity_data on axolotl/fish buckets
0e22fdd1e Fix custom direct BlockState being not correctly set in DamageSource
f2182ed47 SPIGOT-7659: TropicalFishBucketMeta should use BUCKET_ENTITY_DATA
2a6207fe1 PR-1393: Improve field rename handling and centralize conversion between bukkit and string more
c024a5039 SPIGOT-7650: Add DamageSource for EntityDeathEvent and PlayerDeathEvent
741b84480 PR-1390: Improve internal handling of damage sources
0364df4e1 SPIGOT-7657: Error when loading angry entities

1 files changed, 189 insertions, 0 deletions

diff --git a/patches/api/0280-More-Enchantment-API.patch b/patches/api/0280-More-Enchantment-API.patch
new file mode 100644
index 0000000000..a58f9ad820
--- /dev/null
+++ b/patches/api/0280-More-Enchantment-API.patch
@@ -0,0 +1,189 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Thu, 6 May 2021 19:58:03 -0700
+Subject: [PATCH] More Enchantment API
+
+Co-authored-by: Luis <[email protected]>
+
+diff --git a/src/main/java/io/papermc/paper/enchantments/EnchantmentRarity.java b/src/main/java/io/papermc/paper/enchantments/EnchantmentRarity.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..50c49739cc25679c9d241466e3069c9c232a22c4
+--- /dev/null
++++ b/src/main/java/io/papermc/paper/enchantments/EnchantmentRarity.java
+@@ -0,0 +1,25 @@
++package io.papermc.paper.enchantments;
++
++@Deprecated(forRemoval = true, since = "As of 1.20.5 enchantments do not have a rarity.")
++public enum EnchantmentRarity {
++
++    COMMON(10),
++    UNCOMMON(5),
++    RARE(2),
++    VERY_RARE(1);
++
++    private final int weight;
++
++    EnchantmentRarity(int weight) {
++        this.weight = weight;
++    }
++
++    /**
++     * Gets the weight for the rarity.
++     *
++     * @return the weight
++     */
++    public int getWeight() {
++        return weight;
++    }
++}
+diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java
+index 4e41980dfbb256356231bc9565f6a90ea66aab76..de616cecaeb45018d96685c916532188e369bdd4 100644
+--- a/src/main/java/org/bukkit/enchantments/Enchantment.java
++++ b/src/main/java/org/bukkit/enchantments/Enchantment.java
+@@ -292,11 +292,7 @@ public abstract class Enchantment implements Keyed, Translatable, net.kyori.adve
+      * Cursed enchantments are found the same way treasure enchantments are
+      *
+      * @return true if the enchantment is cursed
+-     * @deprecated cursed enchantments are no longer special. Will return true
+-     * only for {@link Enchantment#BINDING_CURSE} and
+-     * {@link Enchantment#VANISHING_CURSE}.
+      */
+-    @Deprecated
+     public abstract boolean isCursed();
+ 
+     /**
+@@ -330,6 +326,87 @@ public abstract class Enchantment implements Keyed, Translatable, net.kyori.adve
+      * @return the name of the enchantment with {@code level} applied
+      */
+     public abstract net.kyori.adventure.text.@NotNull Component displayName(int level);
++
++    /**
++     * Checks if this enchantment can be found in villager trades.
++     *
++     * @return true if the enchantment can be found in trades
++     */
++    public abstract boolean isTradeable();
++
++    /**
++     * Checks if this enchantment can be found in an enchanting table
++     * or use to enchant items generated by loot tables.
++     *
++     * @return true if the enchantment can be found in a table or by loot tables
++     */
++    public abstract boolean isDiscoverable();
++
++    /**
++     * Gets the minimum modified cost of this enchantment at a specific level.
++     * <p>
++     * Note this is not the number of experience levels needed, and does not directly translate to the levels shown in an enchanting table.
++     * This value is used in combination with factors such as tool enchantability to determine a final cost.
++     * See <a href="https://minecraft.wiki/w/Enchanting/Levels">https://minecraft.wiki/w/Enchanting/Levels</a> for more information.
++     * </p>
++     * @param level The level of the enchantment
++     * @return The modified cost of this enchantment
++     */
++    public abstract int getMinModifiedCost(int level);
++
++    /**
++     * Gets the maximum modified cost of this enchantment at a specific level.
++     * <p>
++     * Note this is not the number of experience levels needed, and does not directly translate to the levels shown in an enchanting table.
++     * This value is used in combination with factors such as tool enchantability to determine a final cost.
++     * See <a href="https://minecraft.wiki/w/Enchanting/Levels">https://minecraft.wiki/w/Enchanting/Levels</a> for more information.
++     * </p>
++     * @param level The level of the enchantment
++     * @return The modified cost of this enchantment
++     */
++    public abstract int getMaxModifiedCost(int level);
++
++    /**
++     * Gets the rarity of this enchantment.
++     *
++     * @return the rarity
++     * @deprecated As of 1.20.5 enchantments do not have a rarity.
++     */
++    @NotNull
++    @Deprecated(forRemoval = true, since = "1.20.5")
++    @Contract("-> fail")
++    public abstract io.papermc.paper.enchantments.EnchantmentRarity getRarity();
++
++    /**
++     * Gets the damage increase as a result of the level and entity category specified
++     *
++     * @param level the level of enchantment
++     * @param entityCategory the category of entity
++     * @return the damage increase
++     * @deprecated Use {@link #getDamageIncrease(int, org.bukkit.entity.EntityType)} instead.
++     * Enchantment damage increase is no longer handled via {@link org.bukkit.entity.EntityCategory}s, but
++     * is instead controlled by tags, e.g. {@link org.bukkit.Tag#ENTITY_TYPES_SENSITIVE_TO_BANE_OF_ARTHROPODS}.
++     * As such, a category cannot properly represent all entities defined by the tags.
++     */
++    @Deprecated(forRemoval = true, since = "1.20.5")
++    public abstract float getDamageIncrease(int level, @NotNull org.bukkit.entity.EntityCategory entityCategory);
++
++    /**
++     * Gets the damage increase as a result of the level and entity type specified
++     *
++     * @param level the level of enchantment
++     * @param entityType the type of entity.
++     * @return the damage increase
++     */
++    public abstract float getDamageIncrease(int level, @NotNull org.bukkit.entity.EntityType entityType);
++
++    /**
++     * Gets the equipment slots where this enchantment is considered "active".
++     *
++     * @return the equipment slots
++     */
++    @NotNull
++    public abstract java.util.Set<org.bukkit.inventory.EquipmentSlot> getActiveSlots();
+     // Paper end
+ 
+     /**
+diff --git a/src/main/java/org/bukkit/enchantments/EnchantmentWrapper.java b/src/main/java/org/bukkit/enchantments/EnchantmentWrapper.java
+index ac0371285370594d4de1554871b19bbcd2311730..da5d153a3e55a38b767359564001ad8663f9730b 100644
+--- a/src/main/java/org/bukkit/enchantments/EnchantmentWrapper.java
++++ b/src/main/java/org/bukkit/enchantments/EnchantmentWrapper.java
+@@ -31,5 +31,42 @@ public abstract class EnchantmentWrapper extends Enchantment {
+     public @NotNull String translationKey() {
+         return getEnchantment().translationKey();
+     }
++
++    @Override
++    public boolean isTradeable() {
++        return getEnchantment().isTradeable();
++    }
++
++    @Override
++    public boolean isDiscoverable() {
++        return getEnchantment().isDiscoverable();
++    }
++
++    @Override
++    public int getMinModifiedCost(int level) {
++        return getEnchantment().getMinModifiedCost(level);
++    }
++
++    @Override
++    public int getMaxModifiedCost(int level) {
++        return getEnchantment().getMaxModifiedCost(level);
++    }
++
++    @NotNull
++    @Override
++    public io.papermc.paper.enchantments.EnchantmentRarity getRarity() {
++        return getEnchantment().getRarity();
++    }
++
++    @Override
++    public float getDamageIncrease(int level, @NotNull org.bukkit.entity.EntityCategory entityCategory) {
++        return getEnchantment().getDamageIncrease(level, entityCategory);
++    }
++
++    @NotNull
++    @Override
++    public java.util.Set<org.bukkit.inventory.EquipmentSlot> getActiveSlots() {
++        return getEnchantment().getActiveSlots();
++    }
+     // Paper end
+ }