Updated Upstream (Bukkit)

Upstream has released updates that appears 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:
af40a289 Deprecate ArmorStand equipment methods in favour of the standard and more complete EntityEquipment methods

Spigot-API-Patches/Expand-ArmorStand-API.patch

@@ -8,43 +8,35 @@ Add the following:
 - Enable/Disable slot interactions
 
 diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
-index 492df420..e7f71e65 100644
+index c8c08f1f..af70bac7 100644
 --- a/src/main/java/org/bukkit/entity/ArmorStand.java
 +++ b/src/main/java/org/bukkit/entity/ArmorStand.java
 @@ -0,0 +0,0 @@
  package org.bukkit.entity;
  
+ import org.bukkit.inventory.EntityEquipment;
 +import org.bukkit.inventory.EquipmentSlot;
  import org.bukkit.inventory.ItemStack;
  import org.bukkit.util.EulerAngle;
  import org.jetbrains.annotations.NotNull;
 @@ -0,0 +0,0 @@ public interface ArmorStand extends LivingEntity {
-      * currently holding
+      * Returns the item the armor stand is currently holding.
       *
       * @return the held item
-+     // Paper start - Deprecate in favor of setItemInMainHand
-+     * @deprecated use {@link ArmorStand#getItem(EquipmentSlot)} instead
-+     * @see ArmorStand#getItem(EquipmentSlot)
-+     // Paper end
+-     * @deprecated prefer {@link EntityEquipment#getItemInHand()}
++     * @deprecated prefer {@link ArmorStand#getItem(EquipmentSlot)} // Paper
+      * @see #getEquipment()
       */
      @NotNull
-+    @Deprecated // Paper
-     ItemStack getItemInHand();
- 
-     /**
 @@ -0,0 +0,0 @@ public interface ArmorStand extends LivingEntity {
-      * holding
       *
       * @param item the item to hold
-+     // Paper start - Deprecate in favor of setItemInMainHand
-+     * @deprecated use {@link ArmorStand#setItem(EquipmentSlot, ItemStack)} instead
-+     * @see ArmorStand#setItem(EquipmentSlot, ItemStack)
-+     // Paper end
+      * @deprecated prefer
+-     * {@link EntityEquipment#setItemInHand(org.bukkit.inventory.ItemStack)}
++     * {@link ArmorStand#setItem(EquipmentSlot, ItemStack)} // Paper
+      * @see #getEquipment()
       */
-+    @Deprecated // Paper
-     void setItemInHand(@Nullable ItemStack item);
- 
-     /**
+     @Deprecated
 @@ -0,0 +0,0 @@ public interface ArmorStand extends LivingEntity {
       * @param tick {@code true} if this armour stand can tick, {@code false} otherwise
       */