diff --git a/patches/unapplied/server/Add-API-for-quit-reason.patch b/patches/server/Add-API-for-quit-reason.patch
similarity index 98%
rename from patches/unapplied/server/Add-API-for-quit-reason.patch
rename to patches/server/Add-API-for-quit-reason.patch
index ddf8d7d333..24044b5270 100644
--- a/patches/unapplied/server/Add-API-for-quit-reason.patch
+++ b/patches/server/Add-API-for-quit-reason.patch
@@ -40,14 +40,14 @@ diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListener
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          final Component ichatbasecomponent = PaperAdventure.asVanilla(event.reason()); // Paper - Adventure
          // CraftBukkit end
  
 +        this.player.quitReason = org.bukkit.event.player.PlayerQuitEvent.QuitReason.KICKED; // Paper
-         this.connection.send(new ClientboundDisconnectPacket(ichatbasecomponent), (future) -> {
+         this.connection.send(new ClientboundDisconnectPacket(ichatbasecomponent), PacketSendListener.thenRun(() -> {
              this.connection.disconnect(ichatbasecomponent);
-         });
+         }));
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
diff --git a/patches/unapplied/server/Add-BellRingEvent.patch b/patches/server/Add-BellRingEvent.patch
similarity index 100%
rename from patches/unapplied/server/Add-BellRingEvent.patch
rename to patches/server/Add-BellRingEvent.patch
diff --git a/patches/unapplied/server/Add-Destroy-Speed-API.patch b/patches/server/Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/unapplied/server/Add-Destroy-Speed-API.patch
rename to patches/server/Add-Destroy-Speed-API.patch
diff --git a/patches/unapplied/server/Add-LivingEntity-clearActiveItem.patch b/patches/server/Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/unapplied/server/Add-LivingEntity-clearActiveItem.patch
rename to patches/server/Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/unapplied/server/Add-PlayerItemCooldownEvent.patch b/patches/server/Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/unapplied/server/Add-PlayerItemCooldownEvent.patch
rename to patches/server/Add-PlayerItemCooldownEvent.patch
diff --git a/patches/unapplied/server/Add-PlayerShearBlockEvent.patch b/patches/server/Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/unapplied/server/Add-PlayerShearBlockEvent.patch
rename to patches/server/Add-PlayerShearBlockEvent.patch
diff --git a/patches/unapplied/server/Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 100%
rename from patches/unapplied/server/Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/unapplied/server/Add-PrepareResultEvent.patch b/patches/server/Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/unapplied/server/Add-PrepareResultEvent.patch
rename to patches/server/Add-PrepareResultEvent.patch
diff --git a/patches/unapplied/server/Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/unapplied/server/Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/unapplied/server/Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/unapplied/server/Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/Add-and-implement-PlayerRecipeBookClickEvent.patch
new file mode 100644
index 0000000000..fff7bca5af
--- /dev/null
+++ b/patches/server/Add-and-implement-PlayerRecipeBookClickEvent.patch
@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Josh Roy <10731363+JRoy@users.noreply.github.com>
+Date: Fri, 5 Jun 2020 18:24:06 -0400
+Subject: [PATCH] Add and implement PlayerRecipeBookClickEvent
+
+
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+             if (!this.player.containerMenu.stillValid(this.player)) {
+                 ServerGamePacketListenerImpl.LOGGER.debug("Player {} interacted with invalid menu {}", this.player, this.player.containerMenu);
+             } else {
+-                this.server.getRecipeManager().byKey(packet.getRecipe()).ifPresent((irecipe) -> {
+-                    ((RecipeBookMenu) this.player.containerMenu).handlePlacement(packet.isShiftDown(), irecipe, this.player);
+-                });
++                // Paper start - fire event for clicking recipes in the recipe book
++                com.destroystokyo.paper.event.player.PlayerRecipeBookClickEvent event = new com.destroystokyo.paper.event.player.PlayerRecipeBookClickEvent(
++                    player.getBukkitEntity(), org.bukkit.craftbukkit.util.CraftNamespacedKey.fromMinecraft(packet.getRecipe()), packet.isShiftDown());
++                if (event.callEvent() && this.player.containerMenu instanceof RecipeBookMenu<?> recipeBookMenu) { // check if inventory changed during event handling
++                    this.server.getRecipeManager().byKey(org.bukkit.craftbukkit.util.CraftNamespacedKey.toMinecraft(event.getRecipe())).ifPresent((irecipe) -> {
++                        recipeBookMenu.handlePlacement(event.isMakeAll(), irecipe, this.player);
++                    });
++                }
++                // Paper end
+             }
+         }
+     }
diff --git a/patches/unapplied/server/Add-entity-liquid-API.patch b/patches/server/Add-entity-liquid-API.patch
similarity index 100%
rename from patches/unapplied/server/Add-entity-liquid-API.patch
rename to patches/server/Add-entity-liquid-API.patch
diff --git a/patches/unapplied/server/Add-getOfflinePlayerIfCached-String.patch b/patches/server/Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/unapplied/server/Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/unapplied/server/Add-ignore-discounts-API.patch b/patches/server/Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/unapplied/server/Add-ignore-discounts-API.patch
rename to patches/server/Add-ignore-discounts-API.patch
diff --git a/patches/unapplied/server/Add-methods-to-get-translation-keys.patch b/patches/server/Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/unapplied/server/Add-methods-to-get-translation-keys.patch
rename to patches/server/Add-methods-to-get-translation-keys.patch
diff --git a/patches/unapplied/server/Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/Add-missing-strikeLighting-call-to-World-spigot-stri.patch
similarity index 100%
rename from patches/unapplied/server/Add-missing-strikeLighting-call-to-World-spigot-stri.patch
rename to patches/server/Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/patches/unapplied/server/Add-moon-phase-API.patch b/patches/server/Add-moon-phase-API.patch
similarity index 100%
rename from patches/unapplied/server/Add-moon-phase-API.patch
rename to patches/server/Add-moon-phase-API.patch
diff --git a/patches/unapplied/server/Add-more-Evoker-API.patch b/patches/server/Add-more-Evoker-API.patch
similarity index 100%
rename from patches/unapplied/server/Add-more-Evoker-API.patch
rename to patches/server/Add-more-Evoker-API.patch
diff --git a/patches/unapplied/server/Add-permission-for-command-blocks.patch b/patches/server/Add-permission-for-command-blocks.patch
similarity index 99%
rename from patches/unapplied/server/Add-permission-for-command-blocks.patch
rename to patches/server/Add-permission-for-command-blocks.patch
index 8c88a0e629..46fffaa783 100644
--- a/patches/unapplied/server/Add-permission-for-command-blocks.patch
+++ b/patches/server/Add-permission-for-command-blocks.patch
@@ -21,7 +21,7 @@ diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListener
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
          if (!this.server.isCommandBlockEnabled()) {
              this.player.sendSystemMessage(Component.translatable("advMode.notEnabled"));
@@ -30,7 +30,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              this.player.sendSystemMessage(Component.translatable("advMode.notAllowed"));
          } else {
              BaseCommandBlock commandblocklistenerabstract = null;
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
          if (!this.server.isCommandBlockEnabled()) {
              this.player.sendSystemMessage(Component.translatable("advMode.notEnabled"));
diff --git a/patches/unapplied/server/Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/unapplied/server/Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/unapplied/server/Add-setMaxPlayers-API.patch b/patches/server/Add-setMaxPlayers-API.patch
similarity index 100%
rename from patches/unapplied/server/Add-setMaxPlayers-API.patch
rename to patches/server/Add-setMaxPlayers-API.patch
diff --git a/patches/unapplied/server/Add-zombie-targets-turtle-egg-config.patch b/patches/server/Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/unapplied/server/Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/unapplied/server/Added-missing-default-perms-for-commands.patch b/patches/server/Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/unapplied/server/Added-missing-default-perms-for-commands.patch
rename to patches/server/Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/Anti-Xray.patch b/patches/server/Anti-Xray.patch
index 9d5878a8f2..0bb41755cf 100644
--- a/patches/server/Anti-Xray.patch
+++ b/patches/server/Anti-Xray.patch
@@ -1263,16 +1263,24 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
 -    public static <T> Codec<PalettedContainer<T>> codecRW(IdMap<T> idList, Codec<T> entryCodec, PalettedContainer.Strategy paletteProvider, T defaultValue) {
+-        PalettedContainerRO.Unpacker<T, PalettedContainer<T>> unpacker = PalettedContainer::unpack;
 +    // Paper start - Anti-Xray - Add preset values
 +    @Deprecated @io.papermc.paper.annotation.DoNotUse public static <T> Codec<PalettedContainer<T>> codecRW(IdMap<T> idList, Codec<T> entryCodec, PalettedContainer.Strategy paletteProvider, T defaultValue) {return codecRW(idList, entryCodec, paletteProvider, defaultValue, null);}
 +    public static <T> Codec<PalettedContainer<T>> codecRW(IdMap<T> idList, Codec<T> entryCodec, PalettedContainer.Strategy paletteProvider, T defaultValue, T @org.jetbrains.annotations.Nullable [] presetValues) {
 +        PalettedContainerRO.Unpacker<T, PalettedContainer<T>> unpacker = (idMapx, strategyx, packedData) -> {
-+            return unpack(idMapx, strategyx, packedData, object, presetValues);
++            return unpack(idMapx, strategyx, packedData, defaultValue, presetValues);
 +        };
 +        // Paper end
-         PalettedContainerRO.Unpacker<T, PalettedContainer<T>> unpacker = PalettedContainer::unpack;
          return codec(idList, entryCodec, paletteProvider, defaultValue, unpacker);
      }
+ 
+     public static <T> Codec<PalettedContainerRO<T>> codecRO(IdMap<T> idList, Codec<T> entryCodec, PalettedContainer.Strategy paletteProvider, T defaultValue) {
+         PalettedContainerRO.Unpacker<T, PalettedContainerRO<T>> unpacker = (idListx, paletteProviderx, serialized) -> {
+-            return unpack(idListx, paletteProviderx, serialized).map((result) -> {
++            return unpack(idListx, paletteProviderx, serialized, defaultValue, null).map((result) -> { // Paper - Anti-Xray - Add preset values
+                 return result;
+             });
+         };
 @@ -0,0 +0,0 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
          });
      }
diff --git a/patches/unapplied/server/Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/unapplied/server/Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/unapplied/server/Beacon-API-custom-effect-ranges.patch b/patches/server/Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/unapplied/server/Beacon-API-custom-effect-ranges.patch
rename to patches/server/Beacon-API-custom-effect-ranges.patch
diff --git a/patches/unapplied/server/Brand-support.patch b/patches/server/Brand-support.patch
similarity index 94%
rename from patches/unapplied/server/Brand-support.patch
rename to patches/server/Brand-support.patch
index e004797b17..f047031047 100644
--- a/patches/unapplied/server/Brand-support.patch
+++ b/patches/server/Brand-support.patch
@@ -8,7 +8,7 @@ diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListener
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      private static final long KEEPALIVE_LIMIT = Long.getLong("paper.playerconnection.keepalive", 30) * 1000; // Paper - provide property to set keepalive limit
      private static final int MAX_SIGN_LINE_LENGTH = Integer.getInteger("Paper.maxSignLength", 80); // Paper
  
@@ -16,8 +16,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
      public ServerGamePacketListenerImpl(MinecraftServer server, Connection connection, ServerPlayer player) {
          this.lastChatTimeStamp = new AtomicReference(Instant.EPOCH);
-         this.server = server;
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+         this.lastSeenMessagesValidator = new LastSeenMessagesValidator();
+@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      private static final ResourceLocation CUSTOM_REGISTER = new ResourceLocation("register");
      private static final ResourceLocation CUSTOM_UNREGISTER = new ResourceLocation("unregister");
  
@@ -26,7 +26,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      @Override
      public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
              try {
                  byte[] data = new byte[packet.data.readableBytes()];
                  packet.data.readBytes(data);
@@ -42,7 +42,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  this.cserver.getMessenger().dispatchIncomingMessage(this.player.getBukkitEntity(), packet.identifier.toString(), data);
              } catch (Exception ex) {
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
      }
  
diff --git a/patches/unapplied/server/Buffer-joins-to-world.patch b/patches/server/Buffer-joins-to-world.patch
similarity index 78%
rename from patches/unapplied/server/Buffer-joins-to-world.patch
rename to patches/server/Buffer-joins-to-world.patch
index d11cf04663..1342669ea7 100644
--- a/patches/unapplied/server/Buffer-joins-to-world.patch
+++ b/patches/server/Buffer-joins-to-world.patch
@@ -26,11 +26,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            joinAttemptsThisTick = 0;
 +        }
 +        // Paper end
-         if (this.packetListener instanceof ServerLoginPacketListenerImpl) {
++        if (this.packetListener instanceof ServerLoginPacketListenerImpl) {
 +            if ( ((ServerLoginPacketListenerImpl) this.packetListener).state != ServerLoginPacketListenerImpl.State.READY_TO_ACCEPT // Paper
-+                     || (joinAttemptsThisTick++ < MAX_PER_TICK)) { // Paper - limit the number of joins which can be processed each tick
-             ((ServerLoginPacketListenerImpl) this.packetListener).tick();
++                || (joinAttemptsThisTick++ < MAX_PER_TICK)) { // Paper - limit the number of joins which can be processed each tick
++                ((ServerLoginPacketListenerImpl) this.packetListener).tick();
 +            } // Paper
-         }
++        }
+         PacketListener packetlistener = this.packetListener;
  
-         if (this.packetListener instanceof ServerGamePacketListenerImpl) {
+         if (packetlistener instanceof TickablePacketListener) {
diff --git a/patches/unapplied/server/Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/unapplied/server/Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/unapplied/server/Cache-block-data-strings.patch b/patches/server/Cache-block-data-strings.patch
similarity index 100%
rename from patches/unapplied/server/Cache-block-data-strings.patch
rename to patches/server/Cache-block-data-strings.patch
diff --git a/patches/unapplied/server/Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/Clean-up-duplicated-GameProfile-Properties.patch
similarity index 100%
rename from patches/unapplied/server/Clean-up-duplicated-GameProfile-Properties.patch
rename to patches/server/Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/unapplied/server/Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 100%
rename from patches/unapplied/server/Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/patches/unapplied/server/Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/unapplied/server/Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/unapplied/server/Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/unapplied/server/Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/unapplied/server/Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/unapplied/server/Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/unapplied/server/Don-t-allow-null-UUID-s-for-chat.patch b/patches/server/Don-t-allow-null-UUID-s-for-chat.patch
similarity index 66%
rename from patches/unapplied/server/Don-t-allow-null-UUID-s-for-chat.patch
rename to patches/server/Don-t-allow-null-UUID-s-for-chat.patch
index 61044667be..d90a6c3682 100644
--- a/patches/unapplied/server/Don-t-allow-null-UUID-s-for-chat.patch
+++ b/patches/server/Don-t-allow-null-UUID-s-for-chat.patch
@@ -8,15 +8,16 @@ diff --git a/src/main/java/net/minecraft/network/chat/ChatSender.java b/src/main
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/network/chat/ChatSender.java
 +++ b/src/main/java/net/minecraft/network/chat/ChatSender.java
-@@ -0,0 +0,0 @@ public record ChatSender(UUID uuid, Component name, @Nullable Component teamName
-     public ChatSender(FriendlyByteBuf buf) {
-         this(buf.readUUID(), buf.readComponent(), buf.readNullable(FriendlyByteBuf::readComponent));
-     }
+@@ -0,0 +0,0 @@ import net.minecraft.world.entity.player.ProfilePublicKey;
+ public record ChatSender(UUID profileId, @Nullable ProfilePublicKey profilePublicKey) {
+     public static final ChatSender SYSTEM = new ChatSender(Util.NIL_UUID, (ProfilePublicKey)null);
+ 
 +    // Paper start
 +    public ChatSender {
 +        com.google.common.base.Preconditions.checkNotNull(uuid, "uuid cannot be null");
 +    }
 +    // Paper end
- 
-     public static ChatSender system(Component name) {
-         return new ChatSender(Util.NIL_UUID, name);
++
+     public boolean isSystem() {
+         return SYSTEM.equals(this);
+     }
diff --git a/patches/unapplied/server/Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from patches/unapplied/server/Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/unapplied/server/Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
similarity index 100%
rename from patches/unapplied/server/Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
rename to patches/server/Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
diff --git a/patches/unapplied/server/Don-t-require-FACING-data.patch b/patches/server/Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/unapplied/server/Don-t-require-FACING-data.patch
rename to patches/server/Don-t-require-FACING-data.patch
diff --git a/patches/unapplied/server/Eigencraft-redstone-implementation.patch b/patches/server/Eigencraft-redstone-implementation.patch
similarity index 100%
rename from patches/unapplied/server/Eigencraft-redstone-implementation.patch
rename to patches/server/Eigencraft-redstone-implementation.patch
diff --git a/patches/unapplied/server/Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 100%
rename from patches/unapplied/server/Ensure-Entity-AABB-s-are-never-invalid.patch
rename to patches/server/Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/patches/unapplied/server/Entity-isTicking.patch b/patches/server/Entity-isTicking.patch
similarity index 100%
rename from patches/unapplied/server/Entity-isTicking.patch
rename to patches/server/Entity-isTicking.patch
diff --git a/patches/unapplied/server/Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from patches/unapplied/server/Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/unapplied/server/Expose-world-spawn-angle.patch b/patches/server/Expose-world-spawn-angle.patch
similarity index 100%
rename from patches/unapplied/server/Expose-world-spawn-angle.patch
rename to patches/server/Expose-world-spawn-angle.patch
diff --git a/patches/unapplied/server/Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 100%
rename from patches/unapplied/server/Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/unapplied/server/Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 86%
rename from patches/unapplied/server/Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
index 975fd2b1ce..ebb71f1fa8 100644
--- a/patches/unapplied/server/Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
+++ b/patches/server/Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
@@ -63,19 +63,11 @@ diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/ma
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
 +++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-@@ -0,0 +0,0 @@ import net.minecraft.advancements.Criterion;
- import net.minecraft.advancements.CriterionProgress;
- import net.minecraft.advancements.CriterionTrigger;
- import net.minecraft.advancements.CriterionTriggerInstance;
-+import net.minecraft.advancements.critereon.SimpleCriterionTrigger;
- import net.minecraft.network.chat.ChatType;
- import net.minecraft.network.chat.Component;
- import net.minecraft.network.protocol.game.ClientboundSelectAdvancementsTabPacket;
 @@ -0,0 +0,0 @@ public class PlayerAdvancements {
      private Advancement lastSelectedTab;
      private boolean isFirstPacket = true;
  
-+    public final Map<SimpleCriterionTrigger, Set<CriterionTrigger.Listener>> criterionData = Maps.newIdentityHashMap(); // Paper - fix advancement data player leakage
++    public final Map<net.minecraft.advancements.critereon.SimpleCriterionTrigger, Set<CriterionTrigger.Listener>> criterionData = Maps.newIdentityHashMap(); // Paper - fix advancement data player leakage
 +
      public PlayerAdvancements(DataFixer dataFixer, PlayerList playerManager, ServerAdvancementManager advancementLoader, File advancementFile, ServerPlayer owner) {
          this.dataFixer = dataFixer;
diff --git a/patches/unapplied/server/Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/Fix-Concurrency-issue-in-ShufflingList.patch
similarity index 100%
rename from patches/unapplied/server/Fix-Concurrency-issue-in-ShufflingList.patch
rename to patches/server/Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/unapplied/server/Fix-CraftTeam-null-check.patch b/patches/server/Fix-CraftTeam-null-check.patch
similarity index 100%
rename from patches/unapplied/server/Fix-CraftTeam-null-check.patch
rename to patches/server/Fix-CraftTeam-null-check.patch
diff --git a/patches/unapplied/server/Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 98%
rename from patches/unapplied/server/Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 29afdccde6..4cbf3d98f1 100644
--- a/patches/unapplied/server/Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -12,7 +12,7 @@ diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListener
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  return;
              }
  
@@ -21,7 +21,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              this.lastGoodX = this.awaitingPositionFromClient.x;
              this.lastGoodY = this.awaitingPositionFromClient.y;
              this.lastGoodZ = this.awaitingPositionFromClient.z;
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // CraftBukkit end
  
          this.awaitingTeleportTime = this.tickCount;
diff --git a/patches/unapplied/server/Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 99%
rename from patches/unapplied/server/Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 9e7011b9a0..500b0dabef 100644
--- a/patches/unapplied/server/Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -92,7 +92,7 @@ diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListener
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      public void handleChangeDifficulty(ServerboundChangeDifficultyPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
          if (this.player.hasPermissions(2) || this.isSingleplayerOwner()) {
diff --git a/patches/unapplied/server/Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from patches/unapplied/server/Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/unapplied/server/Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/unapplied/server/Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/unapplied/server/Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/unapplied/server/Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/unapplied/server/Fix-SPIGOT-5989.patch b/patches/server/Fix-SPIGOT-5989.patch
similarity index 100%
rename from patches/unapplied/server/Fix-SPIGOT-5989.patch
rename to patches/server/Fix-SPIGOT-5989.patch
diff --git a/patches/unapplied/server/Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 100%
rename from patches/unapplied/server/Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/unapplied/server/Fix-arrows-never-despawning-MC-125757.patch b/patches/server/Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/unapplied/server/Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/unapplied/server/Fix-client-lag-on-advancement-loading.patch b/patches/server/Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/unapplied/server/Fix-client-lag-on-advancement-loading.patch
rename to patches/server/Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/unapplied/server/Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from patches/unapplied/server/Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/unapplied/server/Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from patches/unapplied/server/Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/unapplied/server/Fix-for-large-move-vectors-crashing-server.patch b/patches/server/Fix-for-large-move-vectors-crashing-server.patch
similarity index 97%
rename from patches/unapplied/server/Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/Fix-for-large-move-vectors-crashing-server.patch
index 791559d779..4371c97c06 100644
--- a/patches/unapplied/server/Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/Fix-for-large-move-vectors-crashing-server.patch
@@ -9,7 +9,7 @@ diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListener
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
              if (entity != this.player && entity.getControllingPassenger() == this.player && entity == this.lastVehicle) {
                  ServerLevel worldserver = this.player.getLevel();
@@ -22,7 +22,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  double d3 = ServerGamePacketListenerImpl.clampHorizontal(packet.getX()); final double toX = d3; // Paper - OBFHELPER
                  double d4 = ServerGamePacketListenerImpl.clampVertical(packet.getY()); final double toY = d4; // Paper - OBFHELPER
                  double d5 = ServerGamePacketListenerImpl.clampHorizontal(packet.getZ()); final double toZ = d5; // Paper - OBFHELPER
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  double d7 = d4 - this.vehicleFirstGoodY;
                  double d8 = d5 - this.vehicleFirstGoodZ;
                  double d9 = entity.getDeltaMovement().lengthSqr();
@@ -44,7 +44,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
                  // CraftBukkit start - handle custom speeds and skipped ticks
                  this.allowedPlayerTicks += (System.currentTimeMillis() / 50) - this.lastTick;
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
                  boolean flag = worldserver.noCollision(entity, entity.getBoundingBox().deflate(0.0625D));
  
@@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  boolean flag1 = entity.verticalCollisionBelow;
  
                  entity.move(MoverType.PLAYER, new Vec3(d6, d7, d8));
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                          double d8 = d1 - this.firstGoodY;
                          double d9 = d2 - this.firstGoodZ;
                          double d10 = this.player.getDeltaMovement().lengthSqr();
@@ -77,7 +77,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
                          if (this.player.isSleeping()) {
                              if (d11 > 1.0D) {
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
                              AABB axisalignedbb = this.player.getBoundingBox();
  
diff --git a/patches/unapplied/server/Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 99%
rename from patches/unapplied/server/Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/Fix-hex-colors-not-working-in-some-kick-messages.patch
index 1229f796bc..c4d6d56cd0 100644
--- a/patches/unapplied/server/Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/server/Fix-hex-colors-not-working-in-some-kick-messages.patch
@@ -28,7 +28,7 @@ diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListene
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -0,0 +0,0 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
+@@ -0,0 +0,0 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
      // CraftBukkit start
      @Deprecated
      public void disconnect(String s) {
diff --git a/patches/unapplied/server/Fix-item-locations-dropped-from-campfires.patch b/patches/server/Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/unapplied/server/Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/unapplied/server/Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/unapplied/server/Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/unapplied/server/Fix-some-rails-connecting-improperly.patch b/patches/server/Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/unapplied/server/Fix-some-rails-connecting-improperly.patch
rename to patches/server/Fix-some-rails-connecting-improperly.patch
diff --git a/patches/unapplied/server/Fixed-TileEntityBell-memory-leak.patch b/patches/server/Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/unapplied/server/Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/unapplied/server/Hide-sync-chunk-writes-behind-flag.patch b/patches/server/Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/unapplied/server/Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/unapplied/server/Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/server/Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
similarity index 100%
rename from patches/unapplied/server/Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
rename to patches/server/Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
diff --git a/patches/unapplied/server/Improve-Chunk-Status-Transition-Speed.patch b/patches/server/Improve-Chunk-Status-Transition-Speed.patch
similarity index 100%
rename from patches/unapplied/server/Improve-Chunk-Status-Transition-Speed.patch
rename to patches/server/Improve-Chunk-Status-Transition-Speed.patch
diff --git a/patches/unapplied/server/Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
similarity index 100%
rename from patches/unapplied/server/Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
rename to patches/server/Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/patches/unapplied/server/Improve-Legacy-Component-serialization-size.patch b/patches/server/Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/unapplied/server/Improve-Legacy-Component-serialization-size.patch
rename to patches/server/Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/unapplied/server/Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/Improve-inlinig-for-some-hot-IBlockData-methods.patch
similarity index 100%
rename from patches/unapplied/server/Improve-inlinig-for-some-hot-IBlockData-methods.patch
rename to patches/server/Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/patches/unapplied/server/Item-no-age-no-player-pickup.patch b/patches/server/Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/unapplied/server/Item-no-age-no-player-pickup.patch
rename to patches/server/Item-no-age-no-player-pickup.patch
diff --git a/patches/unapplied/server/Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/unapplied/server/Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/unapplied/server/Limit-recipe-packets.patch b/patches/server/Limit-recipe-packets.patch
similarity index 96%
rename from patches/unapplied/server/Limit-recipe-packets.patch
rename to patches/server/Limit-recipe-packets.patch
index 7258760e82..0c112dffc7 100644
--- a/patches/unapplied/server/Limit-recipe-packets.patch
+++ b/patches/server/Limit-recipe-packets.patch
@@ -8,7 +8,7 @@ diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListener
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      // CraftBukkit start - multithreaded fields
      private final AtomicInteger chatSpamTickCount = new AtomicInteger();
      private final java.util.concurrent.atomic.AtomicInteger tabSpamLimiter = new java.util.concurrent.atomic.AtomicInteger(); // Paper - configurable tab spam limits
@@ -16,7 +16,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      // CraftBukkit end
      private int dropSpamTickCount;
      private double firstGoodX;
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // CraftBukkit start
          for (int spam; (spam = this.chatSpamTickCount.get()) > 0 && !this.chatSpamTickCount.compareAndSet(spam, spam - 1); ) ;
          if (tabSpamLimiter.get() > 0) tabSpamLimiter.getAndDecrement(); // Paper - split to seperate variable
@@ -24,7 +24,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          /* Use thread-safe field access instead
          if (this.chatSpamTickCount > 0) {
              --this.chatSpamTickCount;
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
      @Override
      public void handlePlaceRecipe(ServerboundPlaceRecipePacket packet) {
diff --git a/patches/unapplied/server/More-lightning-API.patch b/patches/server/More-lightning-API.patch
similarity index 100%
rename from patches/unapplied/server/More-lightning-API.patch
rename to patches/server/More-lightning-API.patch
diff --git a/patches/unapplied/server/Optimise-getType-calls.patch b/patches/server/Optimise-getType-calls.patch
similarity index 100%
rename from patches/unapplied/server/Optimise-getType-calls.patch
rename to patches/server/Optimise-getType-calls.patch
diff --git a/patches/unapplied/server/Optimize-Bit-Operations-by-inlining.patch b/patches/server/Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from patches/unapplied/server/Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/unapplied/server/Optimize-NetworkManager-Exception-Handling.patch b/patches/server/Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/unapplied/server/Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/unapplied/server/Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/unapplied/server/Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/unapplied/server/Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/Optimize-the-advancement-data-player-iteration-to-be.patch
similarity index 100%
rename from patches/unapplied/server/Optimize-the-advancement-data-player-iteration-to-be.patch
rename to patches/server/Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/patches/unapplied/server/Paper-dumpitem-command.patch b/patches/server/Paper-dumpitem-command.patch
similarity index 100%
rename from patches/unapplied/server/Paper-dumpitem-command.patch
rename to patches/server/Paper-dumpitem-command.patch
diff --git a/patches/unapplied/server/Player-elytra-boost-API.patch b/patches/server/Player-elytra-boost-API.patch
similarity index 100%
rename from patches/unapplied/server/Player-elytra-boost-API.patch
rename to patches/server/Player-elytra-boost-API.patch
diff --git a/patches/unapplied/server/PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from patches/unapplied/server/PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/unapplied/server/Prevent-headless-pistons-from-being-created.patch b/patches/server/Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/unapplied/server/Prevent-headless-pistons-from-being-created.patch
rename to patches/server/Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/unapplied/server/Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/unapplied/server/Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/unapplied/server/Remove-some-streams-from-structures.patch b/patches/server/Remove-some-streams-from-structures.patch
similarity index 72%
rename from patches/unapplied/server/Remove-some-streams-from-structures.patch
rename to patches/server/Remove-some-streams-from-structures.patch
index 0d8b990fff..e1c8cda77d 100644
--- a/patches/unapplied/server/Remove-some-streams-from-structures.patch
+++ b/patches/server/Remove-some-streams-from-structures.patch
@@ -10,18 +10,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/world/level/levelgen/Beardifier.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/Beardifier.java
 @@ -0,0 +0,0 @@ public class Beardifier implements DensityFunctions.BeardifierOrMarker {
-         int j = chunkPos.getMinBlockZ();
+         int j = pos.getMinBlockZ();
          ObjectList<Beardifier.Rigid> objectList = new ObjectArrayList<>(10);
          ObjectList<JigsawJunction> objectList2 = new ObjectArrayList<>(32);
--        structureManager.startsForStructure(chunkPos, (structure) -> {
+-        world.startsForStructure(pos, (structure) -> {
 +        // Paper start - replace for each
-+        for (net.minecraft.world.level.levelgen.structure.StructureStart structureStart : structureManager.startsForStructure(chunkPos, (structure) -> {
++        for (net.minecraft.world.level.levelgen.structure.StructureStart structureStart : structureManager.startsForStructure(pos, (structure) -> {
              return structure.terrainAdaptation() != TerrainAdjustment.NONE;
--        }).forEach((structureStart) -> {
-+        })) {
-             TerrainAdjustment terrainAdjustment = structureStart.getStructure().terrainAdaptation();
+-        }).forEach((start) -> {
+-            TerrainAdjustment terrainAdjustment = start.getStructure().terrainAdaptation();
++        })) { // Paper end
++            TerrainAdjustment terrainAdjustment = structureStart.getStructure().terrainAdaptation();
  
-             for(StructurePiece structurePiece : structureStart.getPieces()) {
+             for(StructurePiece structurePiece : start.getPieces()) {
+                 if (structurePiece.isCloseToChunk(pos, 12)) {
 @@ -0,0 +0,0 @@ public class Beardifier implements DensityFunctions.BeardifierOrMarker {
                  }
              }
diff --git a/patches/unapplied/server/Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from patches/unapplied/server/Remove-streams-from-classes-related-villager-gossip.patch
rename to patches/server/Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/unapplied/server/Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/unapplied/server/Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/unapplied/server/Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from patches/unapplied/server/Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/unapplied/server/Significantly-improve-performance-of-the-end-generat.patch b/patches/server/Significantly-improve-performance-of-the-end-generat.patch
similarity index 73%
rename from patches/unapplied/server/Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/Significantly-improve-performance-of-the-end-generat.patch
index 9e6c2bc98f..6c39ded870 100644
--- a/patches/unapplied/server/Significantly-improve-performance-of-the-end-generat.patch
+++ b/patches/server/Significantly-improve-performance-of-the-end-generat.patch
@@ -33,31 +33,31 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          public EndIslandDensityFunction(long seed) {
              RandomSource randomSource = new LegacyRandomSource(seed);
 @@ -0,0 +0,0 @@ public final class DensityFunctions {
-             float f = 100.0F - Mth.sqrt((long) i * (long) i + (long) j * (long) j) * 8.0F; // Paper - cast ints to long to avoid integer overflow
+             float f = 100.0F - Mth.sqrt((long) x * (long) x + (long) z * (long) z) * 8.0F; // Paper - cast ints to long to avoid integer overflow
              f = Mth.clamp(f, -100.0F, 80.0F);
  
-+            NoiseCache cache = noiseCache.get().computeIfAbsent(simplexNoise, noiseKey -> new NoiseCache()); // Paper
-             for(int o = -12; o <= 12; ++o) {
-                 for(int p = -12; p <= 12; ++p) {
-                     long q = (long)(k + o);
-                     long r = (long)(l + p);
--                    if (q * q + r * r > 4096L && simplexNoise.getValue((double)q, (double)r) < (double)-0.9F) {
--                        float g = (Mth.abs((float)q) * 3439.0F + Mth.abs((float)r) * 147.0F) % 13.0F + 9.0F;
++            NoiseCache cache = noiseCache.get().computeIfAbsent(sampler, noiseKey -> new NoiseCache()); // Paper
+             for(int m = -12; m <= 12; ++m) {
+                 for(int n = -12; n <= 12; ++n) {
+                     long o = (long)(i + m);
+                     long p = (long)(j + n);
+-                    if (o * o + p * p > 4096L && sampler.getValue((double)o, (double)p) < (double)-0.9F) {
+-                        float g = (Mth.abs((float)o) * 3439.0F + Mth.abs((float)p) * 147.0F) % 13.0F + 9.0F;
 +                    // Paper start - Significantly improve end generation performance by using a noise cache
-+                    long key = net.minecraft.world.level.ChunkPos.asLong((int) q, (int) r);
++                    long key = net.minecraft.world.level.ChunkPos.asLong((int) o, (int) p);
 +                    int index = (int) it.unimi.dsi.fastutil.HashCommon.mix(key) & 8191;
 +                    float g = Float.MIN_VALUE;
 +                    if (cache.keys[index] == key) {
 +                        g = cache.values[index];
 +                    } else {
-+                        if (q * q + r * r > 4096L && simplexNoise.getValue((double)q, (double)r) < (double)-0.9F) {
-+                            g = (Mth.abs((float) q) * 3439.0F + Mth.abs((float) r) * 147.0F) % 13.0F + 9.0F;
++                        if (o * o + p * p > 4096L && sampler.getValue((double)o, (double)p) < (double)-0.9F) {
++                            g = (Mth.abs((float) o) * 3439.0F + Mth.abs((float) p) * 147.0F) % 13.0F + 9.0F;
 +                        }
 +                        cache.keys[index] = key;
 +                        cache.values[index] = g;
 +                    }
 +                    if (g != Float.MIN_VALUE) {
 +                        // Paper end
-                         float h = (float)(m - o * 2);
-                         float s = (float)(n - p * 2);
-                         float t = 100.0F - Mth.sqrt(h * h + s * s) * g;
+                         float h = (float)(k - m * 2);
+                         float q = (float)(l - n * 2);
+                         float r = 100.0F - Mth.sqrt(h * h + q * q) * g;
diff --git a/patches/unapplied/server/Spawn-player-in-correct-world-on-login.patch b/patches/server/Spawn-player-in-correct-world-on-login.patch
similarity index 100%
rename from patches/unapplied/server/Spawn-player-in-correct-world-on-login.patch
rename to patches/server/Spawn-player-in-correct-world-on-login.patch
diff --git a/patches/unapplied/server/Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/Stop-copy-on-write-operations-for-updating-light-dat.patch
similarity index 100%
rename from patches/unapplied/server/Stop-copy-on-write-operations-for-updating-light-dat.patch
rename to patches/server/Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/patches/unapplied/server/Support-components-in-ItemMeta.patch b/patches/server/Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/unapplied/server/Support-components-in-ItemMeta.patch
rename to patches/server/Support-components-in-ItemMeta.patch
diff --git a/patches/unapplied/server/Support-old-UUID-format-for-NBT.patch b/patches/server/Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/unapplied/server/Support-old-UUID-format-for-NBT.patch
rename to patches/server/Support-old-UUID-format-for-NBT.patch
diff --git a/patches/unapplied/server/Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 98%
rename from patches/unapplied/server/Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/Thread-Safe-Vanilla-Command-permission-checking.patch
index 53aa8eaede..0f37478e4c 100644
--- a/patches/unapplied/server/Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/patches/server/Thread-Safe-Vanilla-Command-permission-checking.patch
@@ -30,9 +30,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
 +++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
 @@ -0,0 +0,0 @@ public class CommandSourceStack implements SharedSuggestionProvider, com.destroy
-     private final EntityAnchorArgument.Anchor anchor;
      private final Vec2 rotation;
      private final CommandSigningContext signingContext;
+     private final TaskChainer chatMessageChainer;
 -    public volatile CommandNode currentCommand; // CraftBukkit
 +    public java.util.Map<Thread, CommandNode> currentCommand = new java.util.concurrent.ConcurrentHashMap<>(); // CraftBukkit // Paper
  
diff --git a/patches/unapplied/server/Toggle-for-removing-existing-dragon.patch b/patches/server/Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/unapplied/server/Toggle-for-removing-existing-dragon.patch
rename to patches/server/Toggle-for-removing-existing-dragon.patch
diff --git a/patches/unapplied/server/Update-itemstack-legacy-name-and-lore.patch b/patches/server/Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from patches/unapplied/server/Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/unapplied/server/Villager-resetOffers.patch b/patches/server/Villager-resetOffers.patch
similarity index 100%
rename from patches/unapplied/server/Villager-resetOffers.patch
rename to patches/server/Villager-resetOffers.patch
diff --git a/patches/unapplied/server/incremental-chunk-and-player-saving.patch b/patches/server/incremental-chunk-and-player-saving.patch
similarity index 100%
rename from patches/unapplied/server/incremental-chunk-and-player-saving.patch
rename to patches/server/incremental-chunk-and-player-saving.patch
diff --git a/patches/unapplied/server/Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/unapplied/server/Add-and-implement-PlayerRecipeBookClickEvent.patch
deleted file mode 100644
index 5d623a45ea..0000000000
--- a/patches/unapplied/server/Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Josh Roy <10731363+JRoy@users.noreply.github.com>
-Date: Fri, 5 Jun 2020 18:24:06 -0400
-Subject: [PATCH] Add and implement PlayerRecipeBookClickEvent
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
-         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
-         this.player.resetLastActionTime();
-         if (!this.player.isSpectator() && this.player.containerMenu.containerId == packet.getContainerId() && this.player.containerMenu instanceof RecipeBookMenu) {
--            this.server.getRecipeManager().byKey(packet.getRecipe()).ifPresent((irecipe) -> {
--                ((RecipeBookMenu) this.player.containerMenu).handlePlacement(packet.isShiftDown(), irecipe, this.player);
--            });
-+            // Paper start - fire event for clicking recipes in the recipe book
-+            com.destroystokyo.paper.event.player.PlayerRecipeBookClickEvent event = new com.destroystokyo.paper.event.player.PlayerRecipeBookClickEvent(
-+                player.getBukkitEntity(), org.bukkit.craftbukkit.util.CraftNamespacedKey.fromMinecraft(packet.getRecipe()), packet.isShiftDown());
-+            if (event.callEvent() && this.player.containerMenu instanceof RecipeBookMenu<?> recipeBookMenu) { // check if inventory changed during event handling
-+                this.server.getRecipeManager().byKey(org.bukkit.craftbukkit.util.CraftNamespacedKey.toMinecraft(event.getRecipe())).ifPresent((irecipe) -> {
-+                    recipeBookMenu.handlePlacement(event.isMakeAll(), irecipe, this.player);
-+                });
-+            } // Paper end
-         }
-     }
-