diff --git a/patches/unapplied/server/Add-registry-entry-and-builders.patch b/patches/server/Add-registry-entry-and-builders.patch
similarity index 100%
rename from patches/unapplied/server/Add-registry-entry-and-builders.patch
rename to patches/server/Add-registry-entry-and-builders.patch
diff --git a/patches/unapplied/server/Check-distance-in-entity-interactions.patch b/patches/server/Check-distance-in-entity-interactions.patch
similarity index 91%
rename from patches/unapplied/server/Check-distance-in-entity-interactions.patch
rename to patches/server/Check-distance-in-entity-interactions.patch
index 7245588440..d478e65bcc 100644
--- a/patches/unapplied/server/Check-distance-in-entity-interactions.patch
+++ b/patches/server/Check-distance-in-entity-interactions.patch
@@ -53,16 +53,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                      this.blockUsingShield((LivingEntity) entity);
                  }
              }
-diff --git a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
+diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractBoat.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractBoat.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
-@@ -0,0 +0,0 @@ public class Boat extends VehicleEntity implements Leashable, VariantHolder<Boat
+--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractBoat.java
++++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractBoat.java
+@@ -0,0 +0,0 @@ public abstract class AbstractBoat extends VehicleEntity implements Leashable {
              double d2 = (double) (this.getWaterLevelAbove() - this.getBbHeight()) + 0.101D;
  
              if (this.level().noCollision(this, this.getBoundingBox().move(0.0D, d2 - this.getY(), 0.0D))) {
 -                this.setPos(this.getX(), d2, this.getZ());
-+                this.move(MoverType.SELF, new Vec3(0.0D, d2 - this.getY(), 0.0D)); // Paper - Check distance in entity interactions // TODO Still needed?
++                this.move(MoverType.SELF, new Vec3(0.0D, d2 - this.getY(), 0.0D)); // Paper - Check distance in entity interactions // TODO Still needed??
                  this.setDeltaMovement(this.getDeltaMovement().multiply(1.0D, 0.0D, 1.0D));
                  this.lastYd = 0.0D;
              }
diff --git a/patches/unapplied/server/Configurable-Sand-Duping.patch b/patches/server/Configurable-Sand-Duping.patch
similarity index 94%
rename from patches/unapplied/server/Configurable-Sand-Duping.patch
rename to patches/server/Configurable-Sand-Duping.patch
index 7c7a1a2536..c42a7effa4 100644
--- a/patches/unapplied/server/Configurable-Sand-Duping.patch
+++ b/patches/server/Configurable-Sand-Duping.patch
@@ -10,7 +10,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 @@ -0,0 +0,0 @@ public class FallingBlockEntity extends Entity {
          boolean flag = (resourcekey1 == Level.END || resourcekey == Level.END) && resourcekey1 != resourcekey;
-         Entity entity = super.changeDimension(teleportTarget);
+         Entity entity = super.teleport(teleportTarget);
  
 -        this.forceTickAfterTeleportToDuplicate = entity != null && flag;
 +        this.forceTickAfterTeleportToDuplicate = entity != null && flag && io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.allowUnsafeEndPortalTeleportation; // Paper
diff --git a/patches/unapplied/server/Fix-NPE-for-Jukebox-setRecord.patch b/patches/server/Fix-NPE-for-Jukebox-setRecord.patch
similarity index 97%
rename from patches/unapplied/server/Fix-NPE-for-Jukebox-setRecord.patch
rename to patches/server/Fix-NPE-for-Jukebox-setRecord.patch
index 5e4f062270..26c54f6e52 100644
--- a/patches/unapplied/server/Fix-NPE-for-Jukebox-setRecord.patch
+++ b/patches/server/Fix-NPE-for-Jukebox-setRecord.patch
@@ -9,7 +9,7 @@ diff --git a/src/main/java/net/minecraft/world/level/block/entity/JukeboxBlockEn
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java
-@@ -0,0 +0,0 @@ public class JukeboxBlockEntity extends BlockEntity implements Clearable, Contai
+@@ -0,0 +0,0 @@ public class JukeboxBlockEntity extends BlockEntity implements ContainerSingleIt
      public void setSongItemWithoutPlaying(ItemStack itemstack, long ticksSinceSongStarted) { // CraftBukkit - add argument
          this.item = itemstack;
          this.jukeboxSongPlayer.song = null; // CraftBukkit - reset
diff --git a/patches/unapplied/server/Handle-Oversized-block-entities-in-chunks.patch b/patches/server/Handle-Oversized-block-entities-in-chunks.patch
similarity index 100%
rename from patches/unapplied/server/Handle-Oversized-block-entities-in-chunks.patch
rename to patches/server/Handle-Oversized-block-entities-in-chunks.patch
diff --git a/patches/unapplied/server/Make-a-PDC-view-accessible-directly-from-ItemStack.patch b/patches/server/Make-a-PDC-view-accessible-directly-from-ItemStack.patch
similarity index 100%
rename from patches/unapplied/server/Make-a-PDC-view-accessible-directly-from-ItemStack.patch
rename to patches/server/Make-a-PDC-view-accessible-directly-from-ItemStack.patch
diff --git a/patches/unapplied/server/Prioritize-Minecraft-commands-in-function-parsing-an.patch b/patches/server/Prioritize-Minecraft-commands-in-function-parsing-an.patch
similarity index 100%
rename from patches/unapplied/server/Prioritize-Minecraft-commands-in-function-parsing-an.patch
rename to patches/server/Prioritize-Minecraft-commands-in-function-parsing-an.patch
diff --git a/patches/unapplied/server/Properly-resend-entities.patch b/patches/server/Properly-resend-entities.patch
similarity index 96%
rename from patches/unapplied/server/Properly-resend-entities.patch
rename to patches/server/Properly-resend-entities.patch
index d88b1ccffd..635496ad4d 100644
--- a/patches/unapplied/server/Properly-resend-entities.patch
+++ b/patches/server/Properly-resend-entities.patch
@@ -215,27 +215,26 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  return Optional.of(InteractionResult.FAIL);
              }
              entity.playSound(((Bucketable) entity).getPickupSound(), 1.0F, 1.0F);
-diff --git a/src/main/java/net/minecraft/world/item/SuspiciousStewItem.java b/src/main/java/net/minecraft/world/item/SuspiciousStewItem.java
+diff --git a/src/main/java/net/minecraft/world/item/component/SuspiciousStewEffects.java b/src/main/java/net/minecraft/world/item/component/SuspiciousStewEffects.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/item/SuspiciousStewItem.java
-+++ b/src/main/java/net/minecraft/world/item/SuspiciousStewItem.java
-@@ -0,0 +0,0 @@ public class SuspiciousStewItem extends Item {
+--- a/src/main/java/net/minecraft/world/item/component/SuspiciousStewEffects.java
++++ b/src/main/java/net/minecraft/world/item/component/SuspiciousStewEffects.java
+@@ -0,0 +0,0 @@ public record SuspiciousStewEffects(List<SuspiciousStewEffects.Entry> effects) i
+     // CraftBukkit start
+     @Override
      public void cancelUsingItem(net.minecraft.server.level.ServerPlayer entityplayer, ItemStack itemstack) {
-         SuspiciousStewEffects suspicioussteweffects = (SuspiciousStewEffects) itemstack.getOrDefault(DataComponents.SUSPICIOUS_STEW_EFFECTS, SuspiciousStewEffects.EMPTY);
- 
 +        final List<net.minecraft.network.protocol.Packet<? super net.minecraft.network.protocol.game.ClientGamePacketListener>> packets = new java.util.ArrayList<>(); // Paper - bundlize packets
-         for (SuspiciousStewEffects.Entry suspicioussteweffects_a : suspicioussteweffects.effects()) {
+         for (SuspiciousStewEffects.Entry suspicioussteweffects_a : this.effects) {
 -            entityplayer.connection.send(new net.minecraft.network.protocol.game.ClientboundRemoveMobEffectPacket(entityplayer.getId(), suspicioussteweffects_a.effect()));
 +            packets.add(new net.minecraft.network.protocol.game.ClientboundRemoveMobEffectPacket(entityplayer.getId(), suspicioussteweffects_a.effect())); // Paper - bundlize packets
          }
--        entityplayer.server.getPlayerList().sendActivePlayerEffects(entityplayer);
 +        // Paper start - bundlize packets
 +        entityplayer.server.getPlayerList().sendActiveEffects(entityplayer, packets::add);
 +        entityplayer.connection.send(new net.minecraft.network.protocol.game.ClientboundBundlePacket(packets));
 +        // Paper end - bundlize packets
      }
      // CraftBukkit end
- }
+ 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
diff --git a/patches/unapplied/server/Proxy-ItemStack-to-CraftItemStack.patch b/patches/server/Proxy-ItemStack-to-CraftItemStack.patch
similarity index 100%
rename from patches/unapplied/server/Proxy-ItemStack-to-CraftItemStack.patch
rename to patches/server/Proxy-ItemStack-to-CraftItemStack.patch
diff --git a/patches/unapplied/server/Registry-Modification-API.patch b/patches/server/Registry-Modification-API.patch
similarity index 96%
rename from patches/unapplied/server/Registry-Modification-API.patch
rename to patches/server/Registry-Modification-API.patch
index b9425d5f14..6b914289b0 100644
--- a/patches/unapplied/server/Registry-Modification-API.patch
+++ b/patches/server/Registry-Modification-API.patch
@@ -1121,8 +1121,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/core/MappedRegistry.java
 +++ b/src/main/java/net/minecraft/core/MappedRegistry.java
 @@ -0,0 +0,0 @@ public class MappedRegistry<T> implements WritableRegistry<T> {
-     public HolderLookup.RegistryLookup<T> asLookup() {
-         return this.lookup;
+ 
+         Stream<HolderSet.Named<T>> getTags();
      }
 +    // Paper start
 +    // used to clear intrusive holders from GameEvent, Item, Block, EntityType, and Fluid from unused instances of those types
@@ -1138,8 +1138,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java
 +++ b/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java
 @@ -0,0 +0,0 @@ public class BuiltInRegistries {
-         Registries.ENCHANTMENT_PROVIDER_TYPE, EnchantmentProviderTypes::bootstrap
-     );
+     public static final Registry<SlotDisplay.Type<?>> SLOT_DISPLAY = registerSimple(Registries.SLOT_DISPLAY, SlotDisplays::bootstrap);
+     public static final Registry<RecipeBookCategory> RECIPE_BOOK_CATEGORY = registerSimple(Registries.RECIPE_BOOK_CATEGORY, RecipeBookCategories::bootstrap);
      public static final Registry<? extends Registry<?>> REGISTRY = WRITABLE_REGISTRY;
 +    // Paper start - add built-in registry conversions
 +    public static final io.papermc.paper.registry.data.util.Conversions BUILT_IN_CONVERSIONS = new io.papermc.paper.registry.data.util.Conversions(new net.minecraft.resources.RegistryOps.RegistryInfoLookup() {
@@ -1164,9 +1164,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          runnable.run(); // Paper
          freeze();
 @@ -0,0 +0,0 @@ public class BuiltInRegistries {
-         REGISTRY.freeze();
  
          for (Registry<?> registry : REGISTRY) {
+             bindBootstrappedTagsToEmpty(registry);
 +            io.papermc.paper.registry.PaperRegistryListenerManager.INSTANCE.runFreezeListeners(registry.key(), BUILT_IN_CONVERSIONS); // Paper
              registry.freeze();
          }
@@ -1176,27 +1176,27 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/resources/RegistryDataLoader.java
 +++ b/src/main/java/net/minecraft/resources/RegistryDataLoader.java
 @@ -0,0 +0,0 @@ public class RegistryDataLoader {
-     );
- 
-     public static RegistryAccess.Frozen load(ResourceManager resourceManager, RegistryAccess registryManager, List<RegistryDataLoader.RegistryData<?>> entries) {
--        return load((loader, infoGetter) -> loader.loadFromResources(resourceManager, infoGetter), registryManager, entries);
-+        return load((loader, infoGetter, conversions) -> loader.loadFromResources(resourceManager, infoGetter, conversions), registryManager, entries); // Paper - pass conversions
+     public static RegistryAccess.Frozen load(
+         ResourceManager resourceManager, List<HolderLookup.RegistryLookup<?>> registries, List<RegistryDataLoader.RegistryData<?>> entries
+     ) {
+-        return load((loader, infoGetter) -> loader.loadFromResources(resourceManager, infoGetter), registries, entries);
++        return load((loader, infoGetter, conversions) -> loader.loadFromResources(resourceManager, infoGetter, conversions), registries, entries); // Paper - pass conversions
      }
  
      public static RegistryAccess.Frozen load(
 @@ -0,0 +0,0 @@ public class RegistryDataLoader {
-         RegistryAccess registryManager,
+         List<HolderLookup.RegistryLookup<?>> registries,
          List<RegistryDataLoader.RegistryData<?>> entries
      ) {
--        return load((loader, infoGetter) -> loader.loadFromNetwork(data, factory, infoGetter), registryManager, entries);
-+        return load((loader, infoGetter, conversions) -> loader.loadFromNetwork(data, factory, infoGetter, conversions), registryManager, entries); // Paper - pass conversions
+-        return load((loader, infoGetter) -> loader.loadFromNetwork(data, factory, infoGetter), registries, entries);
++        return load((loader, infoGetter, conversions) -> loader.loadFromNetwork(data, factory, infoGetter, conversions), registries, entries); // Paper - pass conversions
      }
  
      private static RegistryAccess.Frozen load(
 @@ -0,0 +0,0 @@ public class RegistryDataLoader {
          Map<ResourceKey<?>, Exception> map = new HashMap<>();
          List<RegistryDataLoader.Loader<?>> list = entries.stream().map(entry -> entry.create(Lifecycle.stable(), map)).collect(Collectors.toUnmodifiableList());
-         RegistryOps.RegistryInfoLookup registryInfoLookup = createContext(baseRegistryManager, list);
+         RegistryOps.RegistryInfoLookup registryInfoLookup = createContext(registries, list);
 -        list.forEach(loader -> loadable.apply((RegistryDataLoader.Loader<?>)loader, registryInfoLookup));
 +        final io.papermc.paper.registry.data.util.Conversions conversions = new io.papermc.paper.registry.data.util.Conversions(registryInfoLookup); // Paper - create conversions
 +        list.forEach(loader -> loadable.apply((RegistryDataLoader.Loader<?>)loader, registryInfoLookup, conversions));
@@ -1249,8 +1249,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        Map<ResourceKey<?>, Exception> loadingErrors,
 +        io.papermc.paper.registry.data.util.Conversions conversions // Paper - pass conversions
      ) {
-         List<RegistrySynchronization.PackedRegistryEntry> list = data.get(registry.key());
-         if (list != null) {
+         RegistryDataLoader.NetworkedRegistryData networkedRegistryData = data.get(registry.key());
+         if (networkedRegistryData != null) {
 @@ -0,0 +0,0 @@ public class RegistryDataLoader {
  
                      try {
@@ -1271,7 +1271,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          }
  
          public void loadFromNetwork(
-             Map<ResourceKey<? extends Registry<?>>, List<RegistrySynchronization.PackedRegistryEntry>> data,
+             Map<ResourceKey<? extends Registry<?>>, RegistryDataLoader.NetworkedRegistryData> data,
              ResourceProvider factory,
 -            RegistryOps.RegistryInfoLookup infoGetter
 +            RegistryOps.RegistryInfoLookup infoGetter,
@@ -1288,39 +1288,40 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        void apply(RegistryDataLoader.Loader<?> loader, RegistryOps.RegistryInfoLookup infoGetter, io.papermc.paper.registry.data.util.Conversions conversions); // Paper - pass conversions
      }
  
-     public static record RegistryData<T>(ResourceKey<? extends Registry<T>> key, Codec<T> elementCodec, boolean requiredNonEmpty) {
+     public static record NetworkedRegistryData(List<RegistrySynchronization.PackedRegistryEntry> elements, TagNetworkSerialization.NetworkPayload tags) {
 diff --git a/src/main/java/net/minecraft/server/ReloadableServerRegistries.java b/src/main/java/net/minecraft/server/ReloadableServerRegistries.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/ReloadableServerRegistries.java
 +++ b/src/main/java/net/minecraft/server/ReloadableServerRegistries.java
 @@ -0,0 +0,0 @@ public class ReloadableServerRegistries {
-     ) {
-         RegistryAccess.Frozen frozen = dynamicRegistries.getAccessForLoading(RegistryLayer.RELOADABLE);
-         RegistryOps<JsonElement> registryOps = new ReloadableServerRegistries.EmptyTagLookupWrapper(frozen).createSerializationContext(JsonOps.INSTANCE);
+         );
+         HolderLookup.Provider provider = HolderLookup.Provider.create(list.stream());
+         RegistryOps<JsonElement> registryOps = provider.createSerializationContext(JsonOps.INSTANCE);
 +        final io.papermc.paper.registry.data.util.Conversions conversions = new io.papermc.paper.registry.data.util.Conversions(registryOps.lookupProvider); // Paper
-         List<CompletableFuture<WritableRegistry<?>>> list = LootDataType.values()
--            .map(type -> scheduleElementParse((LootDataType<?>)type, registryOps, resourceManager, prepareExecutor))
-+            .map(type -> scheduleElementParse((LootDataType<?>)type, registryOps, resourceManager, prepareExecutor, conversions)) // Paper
+         List<CompletableFuture<WritableRegistry<?>>> list2 = LootDataType.values()
+-            .map(type -> scheduleRegistryLoad((LootDataType<?>)type, registryOps, resourceManager, prepareExecutor))
++            .map(type -> scheduleRegistryLoad((LootDataType<?>)type, registryOps, resourceManager, prepareExecutor, conversions)) // Paper
              .toList();
-         CompletableFuture<List<WritableRegistry<?>>> completableFuture = Util.sequence(list);
-         return completableFuture.thenApplyAsync(registries -> apply(dynamicRegistries, (List<WritableRegistry<?>>)registries), prepareExecutor);
+         CompletableFuture<List<WritableRegistry<?>>> completableFuture = Util.sequence(list2);
+         return completableFuture.thenApplyAsync(
+@@ -0,0 +0,0 @@ public class ReloadableServerRegistries {
      }
  
-     private static <T> CompletableFuture<WritableRegistry<?>> scheduleElementParse(
+     private static <T> CompletableFuture<WritableRegistry<?>> scheduleRegistryLoad(
 -        LootDataType<T> type, RegistryOps<JsonElement> ops, ResourceManager resourceManager, Executor prepareExecutor
 +        LootDataType<T> type, RegistryOps<JsonElement> ops, ResourceManager resourceManager, Executor prepareExecutor, io.papermc.paper.registry.data.util.Conversions conversions // Paper
      ) {
-         return CompletableFuture.supplyAsync(
-             () -> {
+         return CompletableFuture.supplyAsync(() -> {
+             WritableRegistry<T> writableRegistry = new MappedRegistry<>(type.registryKey(), Lifecycle.experimental());
 @@ -0,0 +0,0 @@ public class ReloadableServerRegistries {
-                 SimpleJsonResourceReloadListener.scanDirectory(resourceManager, string, GSON, map);
-                 map.forEach(
-                     (id, json) -> type.deserialize(id, ops, json)
--                            .ifPresent(value -> writableRegistry.register(ResourceKey.create(type.registryKey(), id), (T)value, DEFAULT_REGISTRATION_INFO))
-+                            .ifPresent(value -> io.papermc.paper.registry.PaperRegistryListenerManager.INSTANCE.registerWithListeners(writableRegistry, ResourceKey.create(type.registryKey(), id), value, DEFAULT_REGISTRATION_INFO, conversions)) // Paper - register with listeners
-                 );
-                 return writableRegistry;
-             },
+             Map<ResourceLocation, T> map = new HashMap<>();
+             String string = Registries.elementsDirPath(type.registryKey());
+             SimpleJsonResourceReloadListener.scanDirectory(resourceManager, string, ops, type.codec(), map);
+-            map.forEach((id, value) -> writableRegistry.register(ResourceKey.create(type.registryKey(), id), (T)value, DEFAULT_REGISTRATION_INFO));
++            map.forEach((id, value) -> io.papermc.paper.registry.PaperRegistryListenerManager.INSTANCE.registerWithListeners(writableRegistry, ResourceKey.create(type.registryKey(), id), value, DEFAULT_REGISTRATION_INFO, conversions)); // Paper - register with listeners
+             TagLoader.loadTagsForRegistry(resourceManager, writableRegistry);
+             return writableRegistry;
+         }, prepareExecutor);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java b/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java
diff --git a/patches/unapplied/server/optimize-dirt-and-snow-spreading.patch b/patches/server/optimize-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/unapplied/server/optimize-dirt-and-snow-spreading.patch
rename to patches/server/optimize-dirt-and-snow-spreading.patch