diff --git a/patches/unapplied/server/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 95%
rename from patches/unapplied/server/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index cfaab43cc6..4aba10c906 100644
--- a/patches/unapplied/server/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/server/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
@@ -22,10 +22,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                // Paper end
                  advancement.getRewards().grant(this.player);
 -                if (advancement.getDisplay() != null && advancement.getDisplay().shouldAnnounceChat() && this.player.level.getGameRules().getBoolean(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)) {
--                    this.playerList.broadcastSystemMessage(Component.translatable("chat.type.advancement." + advancement.getDisplay().getFrame().getName(), this.player.getDisplayName(), advancement.getChatComponent()), ChatType.SYSTEM);
+-                    this.playerList.broadcastSystemMessage(Component.translatable("chat.type.advancement." + advancement.getDisplay().getFrame().getName(), this.player.getDisplayName(), advancement.getChatComponent()), false);
 +                // Paper start - Add Adventure message to PlayerAdvancementDoneEvent
 +                if (message != null && this.player.level.getGameRules().getBoolean(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)) {
-+                    this.playerList.broadcastSystemMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), ChatType.SYSTEM);
++                    this.playerList.broadcastSystemMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), false);
 +                    // Paper end
                  }
              }
diff --git a/patches/unapplied/server/Add-Block-isValidTool.patch b/patches/server/Add-Block-isValidTool.patch
similarity index 100%
rename from patches/unapplied/server/Add-Block-isValidTool.patch
rename to patches/server/Add-Block-isValidTool.patch
diff --git a/patches/unapplied/server/Add-Channel-initialization-listeners.patch b/patches/server/Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/unapplied/server/Add-Channel-initialization-listeners.patch
rename to patches/server/Add-Channel-initialization-listeners.patch
diff --git a/patches/unapplied/server/Add-EntityBlockStorage-clearEntities.patch b/patches/server/Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/unapplied/server/Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/unapplied/server/Add-EntityLoadCrossbowEvent.patch b/patches/server/Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/unapplied/server/Add-EntityLoadCrossbowEvent.patch
rename to patches/server/Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/unapplied/server/Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/unapplied/server/Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/unapplied/server/Add-PaperRegistry.patch b/patches/server/Add-PaperRegistry.patch
similarity index 100%
rename from patches/unapplied/server/Add-PaperRegistry.patch
rename to patches/server/Add-PaperRegistry.patch
diff --git a/patches/unapplied/server/Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/unapplied/server/Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/server/Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/unapplied/server/Add-StructuresLocateEvent.patch b/patches/server/Add-StructuresLocateEvent.patch
similarity index 100%
rename from patches/unapplied/server/Add-StructuresLocateEvent.patch
rename to patches/server/Add-StructuresLocateEvent.patch
diff --git a/patches/unapplied/server/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/unapplied/server/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/unapplied/server/Add-basic-Datapack-API.patch b/patches/server/Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/unapplied/server/Add-basic-Datapack-API.patch
rename to patches/server/Add-basic-Datapack-API.patch
diff --git a/patches/unapplied/server/Add-bypass-host-check.patch b/patches/server/Add-bypass-host-check.patch
similarity index 100%
rename from patches/unapplied/server/Add-bypass-host-check.patch
rename to patches/server/Add-bypass-host-check.patch
diff --git a/patches/unapplied/server/Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/unapplied/server/Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/unapplied/server/Add-environment-variable-to-disable-server-gui.patch b/patches/server/Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/unapplied/server/Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/unapplied/server/Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/unapplied/server/Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/unapplied/server/Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/unapplied/server/Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/unapplied/server/Add-more-WanderingTrader-API.patch b/patches/server/Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/unapplied/server/Add-more-WanderingTrader-API.patch
rename to patches/server/Add-more-WanderingTrader-API.patch
diff --git a/patches/unapplied/server/Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 98%
rename from patches/unapplied/server/Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index 6cc2d44692..ea816a11b1 100644
--- a/patches/unapplied/server/Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
@@ -8,7 +8,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
                              // Paper end
                          String playerName = ServerLoginPacketListenerImpl.this.gameProfile.getName();
                          java.net.InetAddress address = ((java.net.InetSocketAddress) ServerLoginPacketListenerImpl.this.connection.getRemoteAddress()).getAddress();
diff --git a/patches/unapplied/server/Add-recipe-to-cook-events.patch b/patches/server/Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/unapplied/server/Add-recipe-to-cook-events.patch
rename to patches/server/Add-recipe-to-cook-events.patch
diff --git a/patches/unapplied/server/Add-sendOpLevel-API.patch b/patches/server/Add-sendOpLevel-API.patch
similarity index 100%
rename from patches/unapplied/server/Add-sendOpLevel-API.patch
rename to patches/server/Add-sendOpLevel-API.patch
diff --git a/patches/unapplied/server/Add-support-for-hex-color-codes-in-console.patch b/patches/server/Add-support-for-hex-color-codes-in-console.patch
similarity index 100%
rename from patches/unapplied/server/Add-support-for-hex-color-codes-in-console.patch
rename to patches/server/Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/unapplied/server/Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/unapplied/server/Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/unapplied/server/Add-worldborder-events.patch b/patches/server/Add-worldborder-events.patch
similarity index 100%
rename from patches/unapplied/server/Add-worldborder-events.patch
rename to patches/server/Add-worldborder-events.patch
diff --git a/patches/unapplied/server/Added-PlayerBedFailEnterEvent.patch b/patches/server/Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/unapplied/server/Added-PlayerBedFailEnterEvent.patch
rename to patches/server/Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/unapplied/server/Added-PlayerDeepSleepEvent.patch b/patches/server/Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/unapplied/server/Added-PlayerDeepSleepEvent.patch
rename to patches/server/Added-PlayerDeepSleepEvent.patch
diff --git a/patches/unapplied/server/Added-PlayerLecternPageChangeEvent.patch b/patches/server/Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/unapplied/server/Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/unapplied/server/Added-PlayerLoomPatternSelectEvent.patch b/patches/server/Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/unapplied/server/Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/unapplied/server/Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/unapplied/server/Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/unapplied/server/Added-ServerResourcesReloadedEvent.patch b/patches/server/Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/unapplied/server/Added-ServerResourcesReloadedEvent.patch
rename to patches/server/Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/unapplied/server/Added-WorldGameRuleChangeEvent.patch b/patches/server/Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/unapplied/server/Added-WorldGameRuleChangeEvent.patch
rename to patches/server/Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/unapplied/server/Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/unapplied/server/Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/unapplied/server/Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/unapplied/server/Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/unapplied/server/Additional-Block-Material-API-s.patch b/patches/server/Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/unapplied/server/Additional-Block-Material-API-s.patch
rename to patches/server/Additional-Block-Material-API-s.patch
diff --git a/patches/unapplied/server/Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/unapplied/server/Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/unapplied/server/Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/unapplied/server/Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/unapplied/server/Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
similarity index 99%
rename from patches/unapplied/server/Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
rename to patches/server/Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
index e2cba6d99f..3baebd766f 100644
--- a/patches/unapplied/server/Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
+++ b/patches/server/Allow-for-Component-suggestion-tooltips-in-AsyncTabC.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
  
          // Paper start - async tab completion
          com.destroystokyo.paper.event.server.AsyncTabCompleteEvent event;
@@ -24,7 +24,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          // If the event isn't handled, we can assume that we have no completions, and so we'll ask the server
          if (!event.isHandled()) {
              if (!event.isCancelled()) {
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  });
              }
          } else if (!completions.isEmpty()) {
diff --git a/patches/unapplied/server/Allow-using-signs-inside-spawn-protection.patch b/patches/server/Allow-using-signs-inside-spawn-protection.patch
similarity index 98%
rename from patches/unapplied/server/Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/Allow-using-signs-inside-spawn-protection.patch
index 6aa816b431..2798e8fa00 100644
--- a/patches/unapplied/server/Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/Allow-using-signs-inside-spawn-protection.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
                  int i = this.player.level.getMaxBuildHeight();
  
                  if (blockposition.getY() < i) {
diff --git a/patches/unapplied/server/Cache-burn-durations.patch b/patches/server/Cache-burn-durations.patch
similarity index 100%
rename from patches/unapplied/server/Cache-burn-durations.patch
rename to patches/server/Cache-burn-durations.patch
diff --git a/patches/unapplied/server/Collision-option-for-requiring-a-player-participant.patch b/patches/server/Collision-option-for-requiring-a-player-participant.patch
similarity index 100%
rename from patches/unapplied/server/Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/unapplied/server/Configurable-door-breaking-difficulty.patch b/patches/server/Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/unapplied/server/Configurable-door-breaking-difficulty.patch
rename to patches/server/Configurable-door-breaking-difficulty.patch
diff --git a/patches/unapplied/server/Configurable-max-leash-distance.patch b/patches/server/Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/unapplied/server/Configurable-max-leash-distance.patch
rename to patches/server/Configurable-max-leash-distance.patch
diff --git a/patches/unapplied/server/Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/unapplied/server/Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/unapplied/server/Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 97%
rename from patches/unapplied/server/Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/Don-t-ignore-result-of-PlayerEditBookEvent.patch
index b10b585d92..05690d2308 100644
--- a/patches/unapplied/server/Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/Don-t-ignore-result-of-PlayerEditBookEvent.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
          }
  
          itemstack.addTagElement("pages", nbttaglist);
diff --git a/patches/unapplied/server/Drop-carried-item-when-player-has-disconnected.patch b/patches/server/Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/unapplied/server/Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/unapplied/server/Empty-commands-shall-not-be-dispatched.patch b/patches/server/Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/unapplied/server/Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/unapplied/server/Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/unapplied/server/Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/unapplied/server/Entity-load-save-limit-per-chunk.patch b/patches/server/Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/unapplied/server/Entity-load-save-limit-per-chunk.patch
rename to patches/server/Entity-load-save-limit-per-chunk.patch
diff --git a/patches/unapplied/server/EntityMoveEvent.patch b/patches/server/EntityMoveEvent.patch
similarity index 100%
rename from patches/unapplied/server/EntityMoveEvent.patch
rename to patches/server/EntityMoveEvent.patch
diff --git a/patches/unapplied/server/Expand-world-key-API.patch b/patches/server/Expand-world-key-API.patch
similarity index 100%
rename from patches/unapplied/server/Expand-world-key-API.patch
rename to patches/server/Expand-world-key-API.patch
diff --git a/patches/unapplied/server/Expose-LivingEntity-hurt-direction.patch b/patches/server/Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/unapplied/server/Expose-LivingEntity-hurt-direction.patch
rename to patches/server/Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/unapplied/server/Expose-Tracked-Players.patch b/patches/server/Expose-Tracked-Players.patch
similarity index 100%
rename from patches/unapplied/server/Expose-Tracked-Players.patch
rename to patches/server/Expose-Tracked-Players.patch
diff --git a/patches/unapplied/server/Expose-protocol-version.patch b/patches/server/Expose-protocol-version.patch
similarity index 100%
rename from patches/unapplied/server/Expose-protocol-version.patch
rename to patches/server/Expose-protocol-version.patch
diff --git a/patches/unapplied/server/Fix-CraftPotionBrewer-cache.patch b/patches/server/Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/unapplied/server/Fix-CraftPotionBrewer-cache.patch
rename to patches/server/Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/unapplied/server/Fix-CraftSound-backwards-compatibility.patch b/patches/server/Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/unapplied/server/Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/unapplied/server/Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/unapplied/server/Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/unapplied/server/Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/unapplied/server/Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/unapplied/server/Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 100%
rename from patches/unapplied/server/Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/unapplied/server/Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/Fix-checkReach-check-for-Shulker-boxes.patch
similarity index 100%
rename from patches/unapplied/server/Fix-checkReach-check-for-Shulker-boxes.patch
rename to patches/server/Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/unapplied/server/Fix-harming-potion-dupe.patch b/patches/server/Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/unapplied/server/Fix-harming-potion-dupe.patch
rename to patches/server/Fix-harming-potion-dupe.patch
diff --git a/patches/unapplied/server/Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/Fix-interact-event-not-being-called-in-adventure.patch
similarity index 95%
rename from patches/unapplied/server/Fix-interact-event-not-being-called-in-adventure.patch
rename to patches/server/Fix-interact-event-not-being-called-in-adventure.patch
index 1108fae680..9dd715cf64 100644
--- a/patches/unapplied/server/Fix-interact-event-not-being-called-in-adventure.patch
+++ b/patches/server/Fix-interact-event-not-being-called-in-adventure.patch
@@ -9,16 +9,16 @@ 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
                              MutableComponent ichatmutablecomponent = Component.translatable("build.tooHigh", i - 1).withStyle(ChatFormatting.RED);
  
-                             this.player.sendSystemMessage(ichatmutablecomponent, ChatType.GAME_INFO);
+                             this.player.sendSystemMessage(ichatmutablecomponent, true);
 -                        } else if (enuminteractionresult.shouldSwing()) {
 +                        } else if (enuminteractionresult.shouldSwing() && !this.player.gameMode.interactResult) { // Paper
                              this.player.swing(enumhand, true);
                          }
                      }
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          Vec3 vec3d1 = vec3d.add((double) f7 * d3, (double) f6 * d3, (double) f8 * d3);
          HitResult movingobjectposition = this.player.level.clip(new ClipContext(vec3d, vec3d1, ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, this.player));
  
diff --git a/patches/unapplied/server/Fix-nerfed-slime-when-splitting.patch b/patches/server/Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/unapplied/server/Fix-nerfed-slime-when-splitting.patch
rename to patches/server/Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/unapplied/server/Fix-villager-boat-exploit.patch b/patches/server/Fix-villager-boat-exploit.patch
similarity index 100%
rename from patches/unapplied/server/Fix-villager-boat-exploit.patch
rename to patches/server/Fix-villager-boat-exploit.patch
diff --git a/patches/unapplied/server/Guardian-beam-workaround.patch b/patches/server/Guardian-beam-workaround.patch
similarity index 100%
rename from patches/unapplied/server/Guardian-beam-workaround.patch
rename to patches/server/Guardian-beam-workaround.patch
diff --git a/patches/unapplied/server/Implement-API-to-expose-exact-interaction-point.patch b/patches/server/Implement-API-to-expose-exact-interaction-point.patch
similarity index 100%
rename from patches/unapplied/server/Implement-API-to-expose-exact-interaction-point.patch
rename to patches/server/Implement-API-to-expose-exact-interaction-point.patch
diff --git a/patches/unapplied/server/Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/unapplied/server/Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/unapplied/server/Implement-BlockPreDispenseEvent.patch b/patches/server/Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/unapplied/server/Implement-BlockPreDispenseEvent.patch
rename to patches/server/Implement-BlockPreDispenseEvent.patch
diff --git a/patches/unapplied/server/Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/unapplied/server/Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/unapplied/server/Implement-TargetHitEvent.patch b/patches/server/Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/unapplied/server/Implement-TargetHitEvent.patch
rename to patches/server/Implement-TargetHitEvent.patch
diff --git a/patches/unapplied/server/Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/unapplied/server/Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/unapplied/server/Implemented-BlockFailedDispenseEvent.patch b/patches/server/Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/unapplied/server/Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/unapplied/server/Improve-ServerGUI.patch b/patches/server/Improve-ServerGUI.patch
similarity index 100%
rename from patches/unapplied/server/Improve-ServerGUI.patch
rename to patches/server/Improve-ServerGUI.patch
diff --git a/patches/unapplied/server/Inline-shift-direction-fields.patch b/patches/server/Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/unapplied/server/Inline-shift-direction-fields.patch
rename to patches/server/Inline-shift-direction-fields.patch
diff --git a/patches/unapplied/server/Introduce-beacon-activation-deactivation-events.patch b/patches/server/Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/unapplied/server/Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/unapplied/server/Inventory-close.patch b/patches/server/Inventory-close.patch
similarity index 100%
rename from patches/unapplied/server/Inventory-close.patch
rename to patches/server/Inventory-close.patch
diff --git a/patches/unapplied/server/Item-Rarity-API.patch b/patches/server/Item-Rarity-API.patch
similarity index 100%
rename from patches/unapplied/server/Item-Rarity-API.patch
rename to patches/server/Item-Rarity-API.patch
diff --git a/patches/unapplied/server/ItemStack-repair-check-API.patch b/patches/server/ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/unapplied/server/ItemStack-repair-check-API.patch
rename to patches/server/ItemStack-repair-check-API.patch
diff --git a/patches/unapplied/server/MC-4-Fix-item-position-desync.patch b/patches/server/MC-4-Fix-item-position-desync.patch
similarity index 100%
rename from patches/unapplied/server/MC-4-Fix-item-position-desync.patch
rename to patches/server/MC-4-Fix-item-position-desync.patch
diff --git a/patches/unapplied/server/Make-schedule-command-per-world.patch b/patches/server/Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/unapplied/server/Make-schedule-command-per-world.patch
rename to patches/server/Make-schedule-command-per-world.patch
diff --git a/patches/unapplied/server/Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/unapplied/server/Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/unapplied/server/More-Enchantment-API.patch b/patches/server/More-Enchantment-API.patch
similarity index 100%
rename from patches/unapplied/server/More-Enchantment-API.patch
rename to patches/server/More-Enchantment-API.patch
diff --git a/patches/unapplied/server/More-World-API.patch b/patches/server/More-World-API.patch
similarity index 100%
rename from patches/unapplied/server/More-World-API.patch
rename to patches/server/More-World-API.patch
diff --git a/patches/unapplied/server/Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/unapplied/server/Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/unapplied/server/Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/unapplied/server/Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/unapplied/server/Player-Chunk-Load-Unload-Events.patch b/patches/server/Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/unapplied/server/Player-Chunk-Load-Unload-Events.patch
rename to patches/server/Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/unapplied/server/Prevent-grindstones-from-overstacking-items.patch b/patches/server/Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/unapplied/server/Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/unapplied/server/Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/unapplied/server/Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/unapplied/server/Remove-stale-POIs.patch b/patches/server/Remove-stale-POIs.patch
similarity index 100%
rename from patches/unapplied/server/Remove-stale-POIs.patch
rename to patches/server/Remove-stale-POIs.patch
diff --git a/patches/unapplied/server/Remove-streams-from-SensorNearest.patch b/patches/server/Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/unapplied/server/Remove-streams-from-SensorNearest.patch
rename to patches/server/Remove-streams-from-SensorNearest.patch
diff --git a/patches/unapplied/server/Reset-shield-blocking-on-dimension-change.patch b/patches/server/Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from patches/unapplied/server/Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/unapplied/server/Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/unapplied/server/Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/unapplied/server/Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/unapplied/server/Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/unapplied/server/Set-area-affect-cloud-rotation.patch b/patches/server/Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/unapplied/server/Set-area-affect-cloud-rotation.patch
rename to patches/server/Set-area-affect-cloud-rotation.patch
diff --git a/patches/unapplied/server/Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from patches/unapplied/server/Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/server/Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/unapplied/server/Zombie-API-breaking-doors.patch b/patches/server/Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/unapplied/server/Zombie-API-breaking-doors.patch
rename to patches/server/Zombie-API-breaking-doors.patch
diff --git a/patches/unapplied/server/add-DragonEggFormEvent.patch b/patches/server/add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/unapplied/server/add-DragonEggFormEvent.patch
rename to patches/server/add-DragonEggFormEvent.patch
diff --git a/patches/unapplied/server/add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 99%
rename from patches/unapplied/server/add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/add-RespawnFlags-to-PlayerRespawnEvent.patch
index 84cd8ae4e1..3e8d6157f8 100644
--- a/patches/unapplied/server/add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/add-RespawnFlags-to-PlayerRespawnEvent.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
              case PERFORM_RESPAWN:
                  if (this.player.wonGame) {
                      this.player.wonGame = false;
diff --git a/patches/unapplied/server/add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/unapplied/server/add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/unapplied/server/add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/unapplied/server/add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/unapplied/server/add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/unapplied/server/add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/unapplied/server/added-PlayerNameEntityEvent.patch b/patches/server/added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/unapplied/server/added-PlayerNameEntityEvent.patch
rename to patches/server/added-PlayerNameEntityEvent.patch
diff --git a/patches/unapplied/server/added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 100%
rename from patches/unapplied/server/added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/unapplied/server/additions-to-PlayerGameModeChangeEvent.patch b/patches/server/additions-to-PlayerGameModeChangeEvent.patch
similarity index 99%
rename from patches/unapplied/server/additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/additions-to-PlayerGameModeChangeEvent.patch
index c6056477db..366cfd7409 100644
--- a/patches/unapplied/server/additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/additions-to-PlayerGameModeChangeEvent.patch
@@ -129,7 +129,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
  
                      this.player = this.server.getPlayerList().respawn(this.player, false);
                      if (this.server.isHardcore()) {
diff --git a/patches/unapplied/server/call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/call-PortalCreateEvent-players-and-end-platform.patch
similarity index 100%
rename from patches/unapplied/server/call-PortalCreateEvent-players-and-end-platform.patch
rename to patches/server/call-PortalCreateEvent-players-and-end-platform.patch
diff --git a/patches/unapplied/server/copy-TESign-isEditable-from-snapshots.patch b/patches/server/copy-TESign-isEditable-from-snapshots.patch
similarity index 100%
rename from patches/unapplied/server/copy-TESign-isEditable-from-snapshots.patch
rename to patches/server/copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/unapplied/server/fix-PigZombieAngerEvent-cancellation.patch b/patches/server/fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/unapplied/server/fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/unapplied/server/fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 97%
rename from patches/unapplied/server/fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/fix-PlayerItemHeldEvent-firing-twice.patch
index 3b2c2d38b4..ad96ea3866 100644
--- a/patches/unapplied/server/fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/fix-PlayerItemHeldEvent-firing-twice.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
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
          if (this.player.isImmobile()) return; // CraftBukkit
          if (packet.getSlot() >= 0 && packet.getSlot() < Inventory.getSelectionSize()) {
diff --git a/patches/unapplied/server/fix-converting-txt-to-json-file.patch b/patches/server/fix-converting-txt-to-json-file.patch
similarity index 100%
rename from patches/unapplied/server/fix-converting-txt-to-json-file.patch
rename to patches/server/fix-converting-txt-to-json-file.patch
diff --git a/patches/unapplied/server/fix-dead-slime-setSize-invincibility.patch b/patches/server/fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/unapplied/server/fix-dead-slime-setSize-invincibility.patch
rename to patches/server/fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/unapplied/server/forced-whitelist-use-configurable-kick-message.patch b/patches/server/forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/unapplied/server/forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/unapplied/server/living-entity-allow-attribute-registration.patch b/patches/server/living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/unapplied/server/living-entity-allow-attribute-registration.patch
rename to patches/server/living-entity-allow-attribute-registration.patch
diff --git a/patches/unapplied/server/stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
similarity index 100%
rename from patches/unapplied/server/stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
rename to patches/server/stop-firing-pressure-plate-EntityInteractEvent-for-i.patch