Updated Upstream (Bukkit/CraftBukkit) (#7875)

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:
6a039faf PR-745: Expose more information about advancements
52148c47 PR-749: Various javadoc improvements
23c2d841 PR-748: Remove permissible recalculation from Permission constructor

CraftBukkit Changes:
a59dc59e SPIGOT-7025: Use existing item in hand for ranged Drowned attack
e4cca0ca PR-1050: Expose more information about advancements

patches/api/0333-Add-advancement-display-API.patch

@@ -167,20 +167,22 @@ index 0000000000000000000000000000000000000000..67341bb70762a2326030abd2548372b9
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/advancement/Advancement.java b/src/main/java/org/bukkit/advancement/Advancement.java
-index 7c5009974ac8d64d0e738e60cec45acb0d4ca89a..3bbc7dffc36fa31099a8794ceeec77aeae0c49cb 100644
+index 17527c2f7bd5b8a5528388a53f2472bc1869c7f3..792d5ab90e9252b4f660434f72f004fade14a84c 100644
 --- a/src/main/java/org/bukkit/advancement/Advancement.java
 +++ b/src/main/java/org/bukkit/advancement/Advancement.java
-@@ -17,4 +17,41 @@ public interface Advancement extends Keyed {
-      */
+@@ -19,13 +19,41 @@ public interface Advancement extends Keyed {
      @NotNull
      Collection<String> getCriteria();
+ 
 +    // Paper start
-+    /**
+     /**
+-     * Returns the display information for this advancement.
 +     * Get the display info of this advancement.
 +     * <p>
 +     * Will be {@code null} when totally hidden, for example with crafting
 +     * recipes.
-+     *
+      *
+-     * This includes it's name, description and other visible tags.
 +     * @return the display info
 +     */
 +    @org.jetbrains.annotations.Nullable
@@ -196,9 +198,12 @@ index 7c5009974ac8d64d0e738e60cec45acb0d4ca89a..3bbc7dffc36fa31099a8794ceeec77ae
 +
 +    /**
 +     * Gets all the direct children advancements.
-+     *
+      *
+-     * @return a AdvancementDisplay object, or null if not set.
 +     * @return the children advancements
-+     */
+      */
+-    @Nullable
+-    AdvancementDisplay getDisplay();
 +    @NotNull
 +    @org.jetbrains.annotations.Unmodifiable
 +    Collection<Advancement> getChildren();
@@ -212,3 +217,18 @@ index 7c5009974ac8d64d0e738e60cec45acb0d4ca89a..3bbc7dffc36fa31099a8794ceeec77ae
 +    Advancement getRoot();
 +    // Paper end
  }
+diff --git a/src/main/java/org/bukkit/advancement/AdvancementDisplay.java b/src/main/java/org/bukkit/advancement/AdvancementDisplay.java
+index 0ff86a39025a94ca128364a45bf171728cb81027..aec6be7e121da3eb8a464b6934da29ab6b473885 100644
+--- a/src/main/java/org/bukkit/advancement/AdvancementDisplay.java
++++ b/src/main/java/org/bukkit/advancement/AdvancementDisplay.java
+@@ -5,7 +5,10 @@ import org.jetbrains.annotations.NotNull;
+ 
+ /**
+  * Holds information about how the advancement is displayed by the game.
++ *
++ * @deprecated use {@link io.papermc.paper.advancement.AdvancementDisplay}
+  */
++@Deprecated(forRemoval = true) // Paper
+ public interface AdvancementDisplay {
+ 
+     /**