Updated Upstream (Bukkit/CraftBukkit/Spigot) (#4728)

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:
30885166 Update to Minecraft 1.16.4

CraftBukkit Changes:
3af81c71 Update to Minecraft 1.16.4

Spigot Changes:
f011ca24 Update to Minecraft 1.16.4

Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com>

Spigot-Server-Patches/LivingEntity-Hand-Raised-Item-Use-API.patch

@@ -22,14 +22,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          return this.activeItem;
      }
  
-+    public int getItemUseRemainingTime() { return this.dY(); } // Paper - OBFHELPER
-     public int dY() {
++    public int getItemUseRemainingTime() { return this.dZ(); } // Paper - OBFHELPER
+     public int dZ() {
          return this.bd;
      }
  
-+    public int getHandRaisedTime() { return this.dZ(); } // Paper - OBFHELPER
-     public int dZ() {
-         return this.isHandRaised() ? this.activeItem.k() - this.dY() : 0;
++    public int getHandRaisedTime() { return this.ea(); } // Paper - OBFHELPER
+     public int ea() {
+         return this.isHandRaised() ? this.activeItem.k() - this.dZ() : 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644