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/Book-Size-Limits.patch

@@ -25,8 +25,8 @@ diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -0,0 +0,0 @@ import java.util.Optional;
- import java.util.Set;
+@@ -0,0 +0,0 @@ import java.util.function.Consumer;
+ import java.util.stream.Collectors;
  import java.util.stream.Stream;
  import javax.annotation.Nullable;
 +import org.apache.commons.lang3.StringEscapeUtils;
@@ -38,7 +38,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      @Override
      public void a(PacketPlayInBEdit packetplayinbedit) {
 +        // Paper start
-+        ItemStack testStack = packetplayinbedit.b();
++        ItemStack testStack = packetplayinbedit.b(); // TODO(Proximyst): Add obfhelper here
 +        if (!server.isPrimaryThread() && !testStack.isEmpty() && testStack.getTag() != null) {
 +            NBTTagList pageList = testStack.getTag().getList("pages", 8);
 +            long byteTotal = 0;
@@ -73,6 +73,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            }
 +        }
 +        // Paper end
-         PlayerConnectionUtils.ensureMainThread(packetplayinbedit, this, this.player.getWorldServer());
          // CraftBukkit start
          if (this.lastBookTick + 20 > MinecraftServer.currentTick) {
+             this.disconnect("Book edited too quickly!");