diff --git a/build.gradle.kts b/build.gradle.kts index c3d335bfce..0182b94ed1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -67,7 +67,7 @@ repositories { } dependencies { - paramMappings("net.fabricmc:yarn:1.21.1+build.3:mergedv2") + paramMappings("net.fabricmc:yarn:1.21.2+build.1:mergedv2") remapper("net.fabricmc:tiny-remapper:0.10.3:fat") decompiler("org.vineflower:vineflower:1.10.1") spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.13") diff --git a/patches/unapplied/Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/Add-command-line-option-to-load-extra-plugin-jars-no.patch similarity index 100% rename from patches/unapplied/Add-command-line-option-to-load-extra-plugin-jars-no.patch rename to patches/server/Add-command-line-option-to-load-extra-plugin-jars-no.patch diff --git a/patches/unapplied/Adventure.patch b/patches/server/Adventure.patch similarity index 99% rename from patches/unapplied/Adventure.patch rename to patches/server/Adventure.patch index 5f025f5046..6b2becf907 100644 --- a/patches/unapplied/Adventure.patch +++ b/patches/server/Adventure.patch @@ -2611,7 +2611,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -0,0 +0,0 @@ import org.bukkit.craftbukkit.SpigotTimings; // Spigot - public abstract class MinecraftServer extends ReentrantBlockableEventLoop implements ServerInfo, ChunkIOErrorReporter, CommandSource, AutoCloseable { + public abstract class MinecraftServer extends ReentrantBlockableEventLoop implements ServerInfo, ChunkIOErrorReporter, CommandSource { public static final Logger LOGGER = LogUtils.getLogger(); + public static final net.kyori.adventure.text.logger.slf4j.ComponentLogger COMPONENT_LOGGER = net.kyori.adventure.text.logger.slf4j.ComponentLogger.logger(LOGGER.getName()); // Paper @@ -2639,10 +2639,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 private ServerStatus.Players buildPlayerStatus() { @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop, Float> playSound0(final double x, final double y, final double z) { + return (packet, distance) -> this.world.getServer().getPlayerList().broadcast(null, x, y, z, distance, this.world.dimension(), packet); + } -+ // Paper end - - private static Map> gamerules; - public static synchronized Map> getGameRulesNMS() { ++ // Paper end - Adventure ++ + private Map> gamerules; + public synchronized Map> getGameRulesNMS() { + if (this.gamerules != null) { @@ -0,0 +0,0 @@ public class CraftWorld extends CraftRegionAccessor implements World { public void setSendViewDistance(final int viewDistance) { throw new UnsupportedOperationException("Not implemented yet"); @@ -3694,7 +3701,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftContainer.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftContainer.java @@ -0,0 +0,0 @@ public abstract class CraftContainer extends - this.getSnapshot().lockKey = (key == null) ? LockCode.NO_LOCK : new LockCode(key); + } } + // Paper start @@ -4201,7 +4208,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 if (player.getBukkitEntity().canSee(this)) { player.connection.send(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME, this.getHandle())); @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player { - } + this.getHandle().listOrder = order; } - private Component playerListHeader; @@ -4688,7 +4695,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + public static PlayerDeathEvent callPlayerDeathEvent(ServerPlayer victim, DamageSource damageSource, List drops, net.kyori.adventure.text.Component deathMessage, boolean keepInventory) { // Paper - Adventure CraftPlayer entity = victim.getBukkitEntity(); CraftDamageSource bukkitDamageSource = new CraftDamageSource(damageSource); - PlayerDeathEvent event = new PlayerDeathEvent(entity, bukkitDamageSource, drops, victim.getExpReward(damageSource.getEntity()), 0, deathMessage); + PlayerDeathEvent event = new PlayerDeathEvent(entity, bukkitDamageSource, drops, victim.getExpReward(victim.serverLevel(), damageSource.getEntity()), 0, deathMessage); @@ -0,0 +0,0 @@ public class CraftEventFactory { * Server methods */ @@ -4825,7 +4832,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java @@ -0,0 +0,0 @@ public final class CraftItemFactory implements ItemFactory { - Optional> optional = (allowTreasures) ? Optional.empty() : registry.registryOrThrow(Registries.ENCHANTMENT).getTag(EnchantmentTags.IN_ENCHANTING_TABLE); + Optional> optional = (allowTreasures) ? Optional.empty() : registry.lookupOrThrow(Registries.ENCHANTMENT).get(EnchantmentTags.IN_ENCHANTING_TABLE); return CraftItemStack.asCraftMirror(EnchantmentHelper.enchantItem(source, craft.handle, level, registry, optional)); } + @@ -5195,7 +5202,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { - return !(this.hasDisplayName() || this.hasItemName() || this.hasLocalizedName() || this.hasEnchants() || (this.lore != null) || this.hasCustomModelData() || this.hasBlockData() || this.hasRepairCost() || !this.unhandledTags.build().isEmpty() || !this.removedTags.isEmpty() || !this.persistentDataContainer.isEmpty() || this.hideFlag != 0 || this.isHideTooltip() || this.isUnbreakable() || this.hasEnchantmentGlintOverride() || this.isFireResistant() || this.hasMaxStackSize() || this.hasRarity() || this.hasFood() || this.hasTool() || this.hasJukeboxPlayable() || this.hasDamage() || this.hasMaxDamage() || this.hasAttributeModifiers() || this.customTag != null); + return !(this.hasDisplayName() || this.hasItemName() || this.hasLocalizedName() || this.hasEnchants() || (this.lore != null) || this.hasCustomModelData() || this.hasEnchantable() || this.hasBlockData() || this.hasRepairCost() || !this.unhandledTags.build().isEmpty() || !this.removedTags.isEmpty() || !this.persistentDataContainer.isEmpty() || this.hideFlag != 0 || this.isHideTooltip() || this.hasTooltipStyle() || this.hasItemModel() || this.isUnbreakable() || this.hasEnchantmentGlintOverride() || this.isGlider() || this.hasDamageResistant() || this.hasMaxStackSize() || this.hasRarity() || this.hasUseRemainder() || this.hasUseCooldown() || this.hasFood() || this.hasTool() || this.hasJukeboxPlayable() || this.hasEquippable() || this.hasDamage() || this.hasMaxDamage() || this.hasAttributeModifiers() || this.customTag != null); } + // Paper start diff --git a/patches/unapplied/Allow-nerfed-mobs-to-jump.patch b/patches/server/Allow-nerfed-mobs-to-jump.patch similarity index 97% rename from patches/unapplied/Allow-nerfed-mobs-to-jump.patch rename to patches/server/Allow-nerfed-mobs-to-jump.patch index 53a79a2043..140a3a49b9 100644 --- a/patches/unapplied/Allow-nerfed-mobs-to-jump.patch +++ b/patches/server/Allow-nerfed-mobs-to-jump.patch @@ -30,7 +30,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + return; + } + // Paper end - Allow nerfed mobs to jump and float - ProfilerFiller gameprofilerfiller = this.level().getProfiler(); + ProfilerFiller gameprofilerfiller = Profiler.get(); gameprofilerfiller.push("sensing"); diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/FloatGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/FloatGoal.java diff --git a/patches/unapplied/Build-system-changes.patch b/patches/server/Build-system-changes.patch similarity index 98% rename from patches/unapplied/Build-system-changes.patch rename to patches/server/Build-system-changes.patch index a70cb50817..bf365ad5e7 100644 --- a/patches/unapplied/Build-system-changes.patch +++ b/patches/server/Build-system-changes.patch @@ -22,7 +22,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") // Paper - remove exclusion implementation("org.ow2.asm:asm-commons:9.7.1") implementation("commons-lang:commons-lang:2.6") - runtimeOnly("org.xerial:sqlite-jdbc:3.46.0.0") + runtimeOnly("org.xerial:sqlite-jdbc:3.46.1.3") @@ -0,0 +0,0 @@ tasks.jar { val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim() val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\"" @@ -142,7 +142,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + Date buildDate = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z").parse(Main.class.getPackage().getImplementationVendor()); // Paper Calendar deadline = Calendar.getInstance(); - deadline.add(Calendar.DAY_OF_YEAR, -28); + deadline.add(Calendar.DAY_OF_YEAR, -3); diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java diff --git a/patches/unapplied/CB-fixes.patch b/patches/server/CB-fixes.patch similarity index 99% rename from patches/unapplied/CB-fixes.patch rename to patches/server/CB-fixes.patch index 29339a5348..3c66729fab 100644 --- a/patches/unapplied/CB-fixes.patch +++ b/patches/server/CB-fixes.patch @@ -22,7 +22,7 @@ diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/mai index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe long l = minecraftserver.getWorldData().worldGenOptions().seed(); diff --git a/patches/unapplied/ConcurrentUtil.patch b/patches/server/ConcurrentUtil.patch similarity index 100% rename from patches/unapplied/ConcurrentUtil.patch rename to patches/server/ConcurrentUtil.patch diff --git a/patches/unapplied/Configurable-baby-zombie-movement-speed.patch b/patches/server/Configurable-baby-zombie-movement-speed.patch similarity index 100% rename from patches/unapplied/Configurable-baby-zombie-movement-speed.patch rename to patches/server/Configurable-baby-zombie-movement-speed.patch diff --git a/patches/unapplied/Configurable-cactus-bamboo-and-reed-growth-height.patch b/patches/server/Configurable-cactus-bamboo-and-reed-growth-height.patch similarity index 100% rename from patches/unapplied/Configurable-cactus-bamboo-and-reed-growth-height.patch rename to patches/server/Configurable-cactus-bamboo-and-reed-growth-height.patch diff --git a/patches/unapplied/Configurable-fishing-time-ranges.patch b/patches/server/Configurable-fishing-time-ranges.patch similarity index 96% rename from patches/unapplied/Configurable-fishing-time-ranges.patch rename to patches/server/Configurable-fishing-time-ranges.patch index 0a2b1e6c0a..f4298001ba 100644 --- a/patches/unapplied/Configurable-fishing-time-ranges.patch +++ b/patches/server/Configurable-fishing-time-ranges.patch @@ -9,7 +9,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java +++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java @@ -0,0 +0,0 @@ public class FishingHook extends Projectile { - this.noCulling = true; + this.currentState = FishingHook.FishHookState.FLYING; this.luck = Math.max(0, luckBonus); this.lureSpeed = Math.max(0, waitTimeReductionTicks); + // Paper start - Configurable fishing time ranges diff --git a/patches/unapplied/Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch similarity index 100% rename from patches/unapplied/Deobfuscate-stacktraces-in-log-messages-crash-report.patch rename to patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch diff --git a/patches/unapplied/Further-improve-server-tick-loop.patch b/patches/server/Further-improve-server-tick-loop.patch similarity index 99% rename from patches/unapplied/Further-improve-server-tick-loop.patch rename to patches/server/Further-improve-server-tick-loop.patch index 39b8dea237..4bbb4e6736 100644 --- a/patches/unapplied/Further-improve-server-tick-loop.patch +++ b/patches/server/Further-improve-server-tick-loop.patch @@ -143,8 +143,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + //MinecraftServer.currentTick = (int) (System.currentTimeMillis() / 50); // CraftBukkit // Paper - don't overwrite current tick time + lastTick = currentTime; this.nextTickTimeNanos += i; - this.startMetricsRecordingTick(); - this.profiler.push("tick"); + + try { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/patches/unapplied/Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/server/Handle-plugin-prefixes-using-Log4J-configuration.patch similarity index 100% rename from patches/unapplied/Handle-plugin-prefixes-using-Log4J-configuration.patch rename to patches/server/Handle-plugin-prefixes-using-Log4J-configuration.patch diff --git a/patches/unapplied/Hook-into-CB-plugin-rewrites.patch b/patches/server/Hook-into-CB-plugin-rewrites.patch similarity index 100% rename from patches/unapplied/Hook-into-CB-plugin-rewrites.patch rename to patches/server/Hook-into-CB-plugin-rewrites.patch diff --git a/patches/unapplied/Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/server/Improve-Log4J-Configuration-Plugin-Loggers.patch similarity index 100% rename from patches/unapplied/Improve-Log4J-Configuration-Plugin-Loggers.patch rename to patches/server/Improve-Log4J-Configuration-Plugin-Loggers.patch diff --git a/patches/unapplied/MC-Dev-fixes.patch b/patches/server/MC-Dev-fixes.patch similarity index 94% rename from patches/unapplied/MC-Dev-fixes.patch rename to patches/server/MC-Dev-fixes.patch index 998a10d73f..7d1b572c75 100644 --- a/patches/unapplied/MC-Dev-fixes.patch +++ b/patches/server/MC-Dev-fixes.patch @@ -43,7 +43,7 @@ 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 { - Bootstrap.checkBootstrapCalled(() -> "registry " + key); + Bootstrap.checkBootstrapCalled(() -> "registry " + key.location()); ResourceLocation resourceLocation = key.location(); LOADERS.put(resourceLocation, () -> initializer.run(registry)); - WRITABLE_REGISTRY.register((ResourceKey>)key, registry, RegistrationInfo.BUILT_IN); @@ -82,7 +82,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + return stream.map(resourcepackrepository::getPack).filter(Objects::nonNull).map(Pack::open).collect(ImmutableList.toImmutableList()); // CraftBukkit - decompile error // Paper - decompile error // todo: is this needed anymore? }, this).thenCompose((immutablelist) -> { MultiPackResourceManager resourcemanager = new MultiPackResourceManager(PackType.SERVER_DATA, immutablelist); - + List> list = TagLoader.loadTagsForExistingRegistries(resourcemanager, this.registries.compositeAccess()); diff --git a/src/main/java/net/minecraft/util/SortedArraySet.java b/src/main/java/net/minecraft/util/SortedArraySet.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/util/SortedArraySet.java @@ -101,9 +101,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/net/minecraft/world/entity/monster/Pillager.java +++ b/src/main/java/net/minecraft/world/entity/monster/Pillager.java @@ -0,0 +0,0 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve - protected void registerGoals() { super.registerGoals(); this.goalSelector.addGoal(0, new FloatGoal(this)); + this.goalSelector.addGoal(1, new AvoidEntityGoal<>(this, Creaking.class, 8.0F, 1.0D, 1.2D)); - this.goalSelector.addGoal(2, new Raider.HoldGroundAttackGoal(this, this, 10.0F)); + this.goalSelector.addGoal(2, new Raider.HoldGroundAttackGoal(this, 10.0F)); // Paper - decomp fix this.goalSelector.addGoal(3, new RangedCrossbowAttackGoal<>(this, 1.0D, 8.0F)); @@ -114,8 +114,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/net/minecraft/world/level/chunk/status/ChunkStatusTasks.java +++ b/src/main/java/net/minecraft/world/level/chunk/status/ChunkStatusTasks.java @@ -0,0 +0,0 @@ public class ChunkStatusTasks { - if (protochunk instanceof ImposterProtoChunk) { - chunk1 = ((ImposterProtoChunk) protochunk).getWrapped(); + if (protochunk instanceof ImposterProtoChunk protochunkextension) { + chunk1 = protochunkextension.getWrapped(); } else { - chunk1 = new LevelChunk(worldserver, protochunk, (chunk1) -> { + chunk1 = new LevelChunk(worldserver, protochunk, ($) -> { // Paper - decompile fix diff --git a/patches/unapplied/MC-Utils.patch b/patches/server/MC-Utils.patch similarity index 98% rename from patches/unapplied/MC-Utils.patch rename to patches/server/MC-Utils.patch index 48e5d13fa9..bd936f4e2e 100644 --- a/patches/unapplied/MC-Utils.patch +++ b/patches/server/MC-Utils.patch @@ -4419,6 +4419,14 @@ diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/ index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java +@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 4) { + thread.setPriority(8); + } +- + S s0 = serverFactory.apply(thread); // CraftBukkit - decompile error + + atomicreference.set(s0); @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop objectiterator = ca.spottedleaf.moonrise.common.util.ChunkSystem.getVisibleChunkHolders(this.level).iterator(); // Paper - } + while (objectiterator.hasNext()) { + ChunkHolder playerchunk = (ChunkHolder) objectiterator.next(); @@ -0,0 +0,0 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider } public boolean hasWork() { -- return this.lightEngine.hasLightWork() || !this.pendingUnloads.isEmpty() || !this.updatingChunkMap.isEmpty() || this.poiManager.hasWork() || !this.toDrop.isEmpty() || !this.unloadQueue.isEmpty() || this.queueSorter.hasWork() || this.distanceManager.hasTickets(); -+ return this.lightEngine.hasLightWork() || !this.pendingUnloads.isEmpty() || ca.spottedleaf.moonrise.common.util.ChunkSystem.hasAnyChunkHolders(this.level) || this.poiManager.hasWork() || !this.toDrop.isEmpty() || !this.unloadQueue.isEmpty() || this.queueSorter.hasWork() || this.distanceManager.hasTickets(); // Paper +- return this.lightEngine.hasLightWork() || !this.pendingUnloads.isEmpty() || !this.updatingChunkMap.isEmpty() || this.poiManager.hasWork() || !this.toDrop.isEmpty() || !this.unloadQueue.isEmpty() || this.worldgenTaskDispatcher.hasWork() || this.lightTaskDispatcher.hasWork() || this.distanceManager.hasTickets(); ++ return this.lightEngine.hasLightWork() || !this.pendingUnloads.isEmpty() || ca.spottedleaf.moonrise.common.util.ChunkSystem.hasAnyChunkHolders(this.level) || this.poiManager.hasWork() || !this.toDrop.isEmpty() || !this.unloadQueue.isEmpty() || this.queueSorter.hasWork() || this.lightTaskDispatcher.hasWork() || this.distanceManager.hasTickets(); // Paper } private void processUnloads(BooleanSupplier shouldKeepTicking) { @@ -0,0 +0,0 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider - } - - int l = 0; -- ObjectIterator objectiterator = this.visibleChunkMap.values().iterator(); -+ Iterator objectiterator = ca.spottedleaf.moonrise.common.util.ChunkSystem.getVisibleChunkHolders(this.level).iterator(); // Paper - - while (l < 20 && shouldKeepTicking.getAsBoolean() && objectiterator.hasNext()) { - if (this.saveChunkIfNeeded((ChunkHolder) objectiterator.next())) { -@@ -0,0 +0,0 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider + this.scheduleUnload(pos, chunk); } else { - ChunkAccess ichunkaccess = holder.getLatestChunk(); - -- if (this.pendingUnloads.remove(pos, holder) && ichunkaccess != null) { + ChunkAccess ichunkaccess = chunk.getLatestChunk(); +- +- if (this.pendingUnloads.remove(pos, chunk) && ichunkaccess != null) { +- LevelChunk chunk1; + // Paper start + boolean removed; -+ if ((removed = this.pendingUnloads.remove(pos, holder)) && ichunkaccess != null) { -+ ca.spottedleaf.moonrise.common.util.ChunkSystem.onChunkHolderDelete(this.level, holder); ++ if ((removed = this.pendingUnloads.remove(pos, chunk)) && ichunkaccess != null) { ++ ca.spottedleaf.moonrise.common.util.ChunkSystem.onChunkHolderDelete(this.level, chunk); + // Paper end - LevelChunk chunk; ++ LevelChunk chunk; if (ichunkaccess instanceof LevelChunk) { + chunk1 = (LevelChunk) ichunkaccess; @@ -0,0 +0,0 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider this.lightEngine.tryScheduleUpdate(); this.progressListener.onStatusChange(ichunkaccess.getPos(), (ChunkStatus) null); - this.chunkSaveCooldowns.remove(ichunkaccess.getPos().toLong()); + this.nextChunkSaveTime.remove(ichunkaccess.getPos().toLong()); - } + } else if (removed) { // Paper start + ca.spottedleaf.moonrise.common.util.ChunkSystem.onChunkHolderDelete(this.level, holder); @@ -4735,14 +4729,6 @@ diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/sr index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -@@ -0,0 +0,0 @@ import net.minecraft.world.level.storage.LevelStorageSource; - - public class ServerChunkCache extends ChunkSource { - -+ public static final org.slf4j.Logger LOGGER = com.mojang.logging.LogUtils.getLogger(); // Paper - private static final List CHUNK_STATUSES = ChunkStatus.getStatusList(); - private final DistanceManager distanceManager; - final ServerLevel level; @@ -0,0 +0,0 @@ public class ServerChunkCache extends ChunkSource { @Nullable @VisibleForDebug @@ -4829,13 +4815,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + // Paper end + public boolean isPositionTicking(long pos) { - ChunkHolder playerchunk = this.getVisibleChunkIfPresent(pos); - + if (!this.level.shouldTickBlocksAt(pos)) { + return false; diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe return this.convertable.dimensionType; } @@ -4933,7 +4919,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + // Add env and gen to constructor, IWorldDataServer -> WorldDataServer public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List list, boolean flag1, @Nullable RandomSequences randomsequences, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) { - // IRegistryCustom.Dimension iregistrycustom_dimension = minecraftserver.registryAccess(); // CraftBukkit - decompile error + super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env, spigotConfig -> minecraftserver.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig, minecraftserver.registryAccess(), iworlddataserver.getGameRules()))); // Paper - create paper world configs diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -5018,7 +5004,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + // Paper end @Override - public void tell(R runnable) { + public void schedule(R runnable) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java @@ -5286,15 +5272,15 @@ diff --git a/src/main/java/net/minecraft/world/level/PathNavigationRegion.java b index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/world/level/PathNavigationRegion.java +++ b/src/main/java/net/minecraft/world/level/PathNavigationRegion.java -@@ -0,0 +0,0 @@ import net.minecraft.core.Holder; +@@ -0,0 +0,0 @@ import net.minecraft.core.BlockPos; + import net.minecraft.core.Holder; import net.minecraft.core.SectionPos; import net.minecraft.core.registries.Registries; - import net.minecraft.util.profiling.ProfilerFiller; +import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.Entity; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.Biomes; -@@ -0,0 +0,0 @@ public class PathNavigationRegion implements BlockGetter, CollisionGetter { +@@ -0,0 +0,0 @@ public class PathNavigationRegion implements CollisionGetter { private ChunkAccess getChunk(int chunkX, int chunkZ) { int i = chunkX - this.centerX; int j = chunkZ - this.centerZ; @@ -5303,7 +5289,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 ChunkAccess chunkAccess = this.chunks[i][j]; return (ChunkAccess)(chunkAccess != null ? chunkAccess : new EmptyLevelChunk(this.level, new ChunkPos(chunkX, chunkZ), this.plains.get())); } else { -@@ -0,0 +0,0 @@ public class PathNavigationRegion implements BlockGetter, CollisionGetter { +@@ -0,0 +0,0 @@ public class PathNavigationRegion implements CollisionGetter { } } @@ -5352,9 +5338,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + this.shapeExceedsCube = this.cache == null || this.cache.largeCollisionShape; // Paper - moved from actual method to here this.legacySolid = this.calculateSolid(); - } + this.occlusionShape = this.canOcclude ? ((Block) this.owner).getOcclusionShape(this.asState()) : Shapes.empty(); @@ -0,0 +0,0 @@ public abstract class BlockBehaviour implements FeatureElement { - return this.getBlock().getOcclusionShape(this.asState(), world, pos); + return this.occlusionShape; } - public boolean hasLargeCollisionShape() { @@ -5368,16 +5354,16 @@ diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java b/sr index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java -@@ -0,0 +0,0 @@ public abstract class ChunkAccess implements BlockGetter, BiomeManager.NoiseBiom +@@ -0,0 +0,0 @@ public abstract class ChunkAccess implements BiomeManager.NoiseBiomeSource, Ligh protected final ShortList[] postProcessing; - protected volatile boolean unsaved; + private volatile boolean unsaved; private volatile boolean isLightCorrect; - protected final ChunkPos chunkPos; + protected final ChunkPos chunkPos; public final long coordinateKey; public final int locX; public final int locZ; // Paper - cache coordinate key private long inhabitedTime; /** @deprecated */ @Nullable -@@ -0,0 +0,0 @@ public abstract class ChunkAccess implements BlockGetter, BiomeManager.NoiseBiom +@@ -0,0 +0,0 @@ public abstract class ChunkAccess implements BiomeManager.NoiseBiomeSource, Ligh // CraftBukkit end public ChunkAccess(ChunkPos pos, UpgradeData upgradeData, LevelHeightAccessor heightLimitView, Registry biomeRegistry, long inhabitedTime, @Nullable LevelChunkSection[] sectionArray, @Nullable BlendingData blendingData) { @@ -5505,7 +5491,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java @@ -0,0 +0,0 @@ public class ProtoChunk extends ChunkAccess { - return new ChunkAccess.TicksToSave(this.blockTicks, this.fluidTicks); + return new ChunkAccess.PackedTicks(this.blockTicks.pack(time), this.fluidTicks.pack(time)); } + // Paper start - If loaded util @@ -5717,8 +5703,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 public abstract class DelegatedGeneratorAccess implements WorldGenLevel { @@ -0,0 +0,0 @@ public abstract class DelegatedGeneratorAccess implements WorldGenLevel { - public int getMoonPhase() { - return this.handle.getMoonPhase(); + public boolean isFluidAtPosition(BlockPos pos, Predicate state) { + return this.handle.isFluidAtPosition(pos, state); } + + // Paper start @@ -5741,6 +5727,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } + // Paper end } ++ diff --git a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java diff --git a/patches/unapplied/Paper-Metrics.patch b/patches/server/Paper-Metrics.patch similarity index 100% rename from patches/unapplied/Paper-Metrics.patch rename to patches/server/Paper-Metrics.patch diff --git a/patches/unapplied/Paper-Plugins.patch b/patches/server/Paper-Plugins.patch similarity index 99% rename from patches/unapplied/Paper-Plugins.patch rename to patches/server/Paper-Plugins.patch index b4d013e11f..14ee4001b8 100644 --- a/patches/unapplied/Paper-Plugins.patch +++ b/patches/server/Paper-Plugins.patch @@ -7334,7 +7334,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -0,0 +0,0 @@ public final class CraftMagicNumbers implements UnsafeValues { net.minecraft.world.item.ItemStack nmsItemStack = CraftItemStack.asNMSCopy(itemStack); - return nmsItemStack.getItem().getDescriptionId(nmsItemStack); + return nmsItemStack.getItem().getDescriptionId(); } + // Paper start + @Override diff --git a/patches/unapplied/Paper-command.patch b/patches/server/Paper-command.patch similarity index 100% rename from patches/unapplied/Paper-command.patch rename to patches/server/Paper-command.patch diff --git a/patches/unapplied/Paper-config-files.patch b/patches/server/Paper-config-files.patch similarity index 99% rename from patches/unapplied/Paper-config-files.patch rename to patches/server/Paper-config-files.patch index f01a9e6a8c..0c54e1ba7c 100644 --- a/patches/unapplied/Paper-config-files.patch +++ b/patches/server/Paper-config-files.patch @@ -24,8 +24,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 implementation("org.ow2.asm:asm-commons:9.7.1") + implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files implementation("commons-lang:commons-lang:2.6") - runtimeOnly("org.xerial:sqlite-jdbc:3.46.0.0") - runtimeOnly("com.mysql:mysql-connector-j:8.4.0") + runtimeOnly("org.xerial:sqlite-jdbc:3.46.1.3") + runtimeOnly("com.mysql:mysql-connector-j:9.1.0") diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java new file mode 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 @@ -5188,12 +5188,12 @@ diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/mai index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel { - // Holder holder = worlddimension.type(); // CraftBukkit - decompile error +@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe - // Objects.requireNonNull(minecraftserver); // CraftBukkit - decompile error -- super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env); -+ super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env, spigotConfig -> minecraftserver.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig, minecraftserver.registryAccess(), iworlddataserver.getGameRules()))); // Paper - create paper world configs + // Add env and gen to constructor, IWorldDataServer -> WorldDataServer + public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List list, boolean flag1, @Nullable RandomSequences randomsequences, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) { +- super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env); ++ super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env, spigotConfig -> minecraftserver.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig, minecraftserver.registryAccess(), iworlddataserver.getGameRules()))); // Paper - create paper world configs this.pvpMode = minecraftserver.isPvpAllowed(); this.convertable = convertable_conversionsession; this.uuid = WorldUUID.getUUID(convertable_conversionsession.levelDirectory.path().toFile()); @@ -5218,8 +5218,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 public abstract ResourceKey getTypeKey(); -- protected Level(WritableLevelData worlddatamutable, ResourceKey resourcekey, RegistryAccess iregistrycustom, Holder holder, Supplier supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env) { -+ protected Level(WritableLevelData worlddatamutable, ResourceKey resourcekey, RegistryAccess iregistrycustom, Holder holder, Supplier supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function paperWorldConfigCreator) { // Paper - create paper world config +- protected Level(WritableLevelData worlddatamutable, ResourceKey resourcekey, RegistryAccess iregistrycustom, Holder holder, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env) { ++ protected Level(WritableLevelData worlddatamutable, ResourceKey resourcekey, RegistryAccess iregistrycustom, Holder holder, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function paperWorldConfigCreator) { // Paper - create paper world config this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot + this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config this.generator = gen; @@ -5236,7 +5236,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + this.console.paperConfigurations.reloadConfigs(this.console); for (ServerLevel world : this.console.getAllLevels()) { world.serverLevelData.setDifficulty(config.difficulty); - world.setSpawnSettings(config.spawnMonsters, config.spawnAnimals); + world.setSpawnSettings(config.spawnMonsters); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java diff --git a/patches/unapplied/Plugin-remapping.patch b/patches/server/Plugin-remapping.patch similarity index 99% rename from patches/unapplied/Plugin-remapping.patch rename to patches/server/Plugin-remapping.patch index c03bd394eb..0e5a110099 100644 --- a/patches/unapplied/Plugin-remapping.patch +++ b/patches/server/Plugin-remapping.patch @@ -1587,8 +1587,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + // Paper end + @Override - public boolean isSpawningAnimals() { - return this.getProperties().spawnAnimals && super.isSpawningAnimals(); + public boolean isSpawningMonsters() { + return this.settings.getProperties().spawnMonsters && super.isSpawningMonsters(); diff --git a/src/main/java/net/neoforged/art/internal/RenamerImpl.java b/src/main/java/net/neoforged/art/internal/RenamerImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 diff --git a/patches/unapplied/Remap-fixes.patch b/patches/server/Remap-fixes.patch similarity index 99% rename from patches/unapplied/Remap-fixes.patch rename to patches/server/Remap-fixes.patch index fe1d8ae127..452337873c 100644 --- a/patches/unapplied/Remap-fixes.patch +++ b/patches/server/Remap-fixes.patch @@ -70,7 +70,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - private final Builder functions = ImmutableList.builder(); + private final ImmutableList.Builder pools = ImmutableList.builder(); + private final ImmutableList.Builder functions = ImmutableList.builder(); - private LootContextParamSet paramSet; + private ContextKeySet paramSet; private Optional randomSequence; diff --git a/src/test/java/org/bukkit/DyeColorsTest.java b/src/test/java/org/bukkit/DyeColorsTest.java diff --git a/patches/unapplied/Remap-reflection-calls-in-plugins-using-internals.patch b/patches/server/Remap-reflection-calls-in-plugins-using-internals.patch similarity index 99% rename from patches/unapplied/Remap-reflection-calls-in-plugins-using-internals.patch rename to patches/server/Remap-reflection-calls-in-plugins-using-internals.patch index b8c3855e17..fb1700bad4 100644 --- a/patches/unapplied/Remap-reflection-calls-in-plugins-using-internals.patch +++ b/patches/server/Remap-reflection-calls-in-plugins-using-internals.patch @@ -616,7 +616,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @DefaultQualifier(NonNull.class) public final class MappingEnvironment { + public static final boolean DISABLE_PLUGIN_REMAPPING = Boolean.getBoolean("paper.disablePluginRemapping"); -+ public static final String LEGACY_CB_VERSION = "v1_21_R1"; ++ public static final String LEGACY_CB_VERSION = "v1_21_R2"; private static final @Nullable String MAPPINGS_HASH = readMappingsHash(); private static final boolean REOBF = checkReobf(); diff --git a/patches/unapplied/Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/unapplied/Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/Setup-Gradle-project.patch b/patches/server/Setup-Gradle-project.patch index 29a947e6a0..29af543bc7 100644 --- a/patches/server/Setup-Gradle-project.patch +++ b/patches/server/Setup-Gradle-project.patch @@ -47,8 +47,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } + implementation("org.ow2.asm:asm-commons:9.7.1") + implementation("commons-lang:commons-lang:2.6") -+ runtimeOnly("org.xerial:sqlite-jdbc:3.46.0.0") -+ runtimeOnly("com.mysql:mysql-connector-j:8.4.0") ++ runtimeOnly("org.xerial:sqlite-jdbc:3.46.1.3") ++ runtimeOnly("com.mysql:mysql-connector-j:9.1.0") + + runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6") + runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18") @@ -62,7 +62,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +} + +paperweight { -+ craftBukkitPackageVersion.set("v1_21_R1") // also needs to be updated in MappingEnvironment ++ craftBukkitPackageVersion.set("v1_21_R2") // also needs to be updated in MappingEnvironment +} + +tasks.jar { @@ -192,7 +192,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - UTF-8 - unknown - git -- 1_21_R1 +- 1_21_R2 - 21 - - @@ -235,7 +235,25 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - 9.7.1 - compile - -- +- +- +- com.fasterxml.jackson.core +- jackson-annotations +- 2.13.4 +- compile +- +- +- com.fasterxml.jackson.core +- jackson-core +- 2.13.4 +- compile +- +- +- com.fasterxml.jackson.core +- jackson-databind +- 2.13.4.2 +- compile +- - - com.github.oshi - oshi-core @@ -243,15 +261,27 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - compile - - +- com.github.stephenc.jcip +- jcip-annotations +- 1.0-1 +- compile +- +- +- com.microsoft.azure +- msal4j +- 1.15.0 +- compile +- +- - com.mojang - authlib -- 6.0.54 +- 6.0.55 - compile - - - com.mojang - brigadier -- 1.2.9 +- 1.3.10 - compile - - @@ -262,8 +292,38 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - - com.mojang +- jtracy +- 1.0.29 +- compile +- +- +- com.mojang - logging -- 1.2.7 +- 1.4.9 +- compile +- +- +- com.nimbusds +- content-type +- 2.3 +- compile +- +- +- com.nimbusds +- lang-tag +- 1.7 +- compile +- +- +- com.nimbusds +- nimbus-jose-jwt +- 9.37.3 +- compile +- +- +- com.nimbusds +- oauth2-oidc-sdk +- 11.9.1 - compile - - @@ -353,6 +413,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - compile - - +- net.minidev +- accessors-smart +- 2.5.0 +- compile +- +- +- net.minidev +- json-smart +- 2.5.0 +- compile +- +- - net.sf.jopt-simple - jopt-simple - 5.0.4 @@ -366,6 +438,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - - org.apache.logging.log4j +- log4j-api +- 2.22.1 +- compile +- +- +- org.apache.logging.log4j - log4j-core - 2.22.1 - compile @@ -377,17 +455,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - compile - - -- org.slf4j -- slf4j-api -- 2.0.9 -- compile -- -- - org.lz4 - lz4-java - 1.8.0 - compile - +- +- org.slf4j +- slf4j-api +- 2.0.9 +- compile +- +- - - - commons-lang @@ -411,13 +490,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.xerial - sqlite-jdbc -- 3.46.0.0 +- 3.46.1.3 - runtime - - - com.mysql - mysql-connector-j -- 8.4.0 +- 9.1.0 - runtime - - diff --git a/patches/unapplied/Support-components-in-ItemMeta.patch b/patches/server/Support-components-in-ItemMeta.patch similarity index 100% rename from patches/unapplied/Support-components-in-ItemMeta.patch rename to patches/server/Support-components-in-ItemMeta.patch diff --git a/patches/unapplied/Test-changes.patch b/patches/server/Test-changes.patch similarity index 91% rename from patches/unapplied/Test-changes.patch rename to patches/server/Test-changes.patch index a64a56f34f..9912854f6e 100644 --- a/patches/unapplied/Test-changes.patch +++ b/patches/server/Test-changes.patch @@ -395,7 +395,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 Preconditions.checkArgument(clazz == org.bukkit.Fluid.class, "Fluid namespace must have fluid type"); - TagKey fluidTagKey = TagKey.create(Registries.FLUID, key); + TagKey fluidTagKey = TagKey.create(Registries.FLUID, key); // Paper - address remapping issues - if (BuiltInRegistries.FLUID.getTag(fluidTagKey).isPresent()) { + if (BuiltInRegistries.FLUID.get(fluidTagKey).isPresent()) { return new CraftFluidTag(BuiltInRegistries.FLUID, fluidTagKey); } } @@ -403,7 +403,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 Preconditions.checkArgument(clazz == org.bukkit.entity.EntityType.class, "Entity type namespace must have entity type"); - TagKey> entityTagKey = TagKey.create(Registries.ENTITY_TYPE, key); + TagKey> entityTagKey = TagKey.create(Registries.ENTITY_TYPE, key); // Paper - address remapping issues - if (BuiltInRegistries.ENTITY_TYPE.getTag(entityTagKey).isPresent()) { + if (BuiltInRegistries.ENTITY_TYPE.get(entityTagKey).isPresent()) { return new CraftEntityTag(BuiltInRegistries.ENTITY_TYPE, entityTagKey); } } @@ -429,14 +429,26 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/test/java/org/bukkit/support/RegistryHelper.java +++ b/src/test/java/org/bukkit/support/RegistryHelper.java @@ -0,0 +0,0 @@ public final class RegistryHelper { - private static LayeredRegistryAccess createLayers(MultiPackResourceManager resourceManager) { - // add tags and loot tables for unit tests - LayeredRegistryAccess layers = RegistryLayer.createRegistryAccess(); + List> list1 = TagLoader.buildUpdatedLookups(iregistrycustom_dimension, list); + RegistryAccess.Frozen iregistrycustom_dimension1 = RegistryDataLoader.load((ResourceManager) ireloadableresourcemanager, list1, RegistryDataLoader.WORLDGEN_REGISTRIES); + LayeredRegistryAccess layers = layeredregistryaccess.replaceFrom(RegistryLayer.WORLDGEN, iregistrycustom_dimension1); + // Paper start - load registry here to ensure bukkit object registry are correctly delayed if needed + try { + Class.forName("org.bukkit.Registry"); + } catch (final ClassNotFoundException ignored) {} + // Paper end - load registry here to ensure bukkit object registry are correctly delayed if needed - layers = WorldLoader.loadAndReplaceLayer(resourceManager, layers, RegistryLayer.WORLDGEN, RegistryDataLoader.WORLDGEN_REGISTRIES); - return layers; + return layers.compositeAccess().freeze(); + } +@@ -0,0 +0,0 @@ public final class RegistryHelper { + List> list1 = TagLoader.buildUpdatedLookups(iregistrycustom_dimension, list); + RegistryAccess.Frozen iregistrycustom_dimension1 = RegistryDataLoader.load((ResourceManager) ireloadableresourcemanager, list1, RegistryDataLoader.WORLDGEN_REGISTRIES); + LayeredRegistryAccess layers = layeredregistryaccess.replaceFrom(RegistryLayer.WORLDGEN, iregistrycustom_dimension1); ++ // Paper start - load registry here to ensure bukkit object registry are correctly delayed if needed ++ try { ++ Class.forName("org.bukkit.Registry"); ++ } catch (final ClassNotFoundException ignored) {} ++ // Paper end - load registry here to ensure bukkit object registry are correctly delayed if needed + RegistryHelper.registry = layers.compositeAccess().freeze(); + // Register vanilla pack + RegistryHelper.dataPack = ReloadableServerResources.loadResources(ireloadableresourcemanager, layers, list, featureFlagSet, Commands.CommandSelection.DEDICATED, 0, MoreExecutors.directExecutor(), MoreExecutors.directExecutor()).join(); diff --git a/patches/unapplied/Timings-v2.patch b/patches/server/Timings-v2.patch similarity index 93% rename from patches/unapplied/Timings-v2.patch rename to patches/server/Timings-v2.patch index bbc594b29b..873a794690 100644 --- a/patches/unapplied/Timings-v2.patch +++ b/patches/server/Timings-v2.patch @@ -724,7 +724,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 -import org.bukkit.craftbukkit.SpigotTimings; // Spigot +import co.aikar.timings.MinecraftTimings; // Paper - public abstract class MinecraftServer extends ReentrantBlockableEventLoop implements ServerInfo, ChunkIOErrorReporter, CommandSource, AutoCloseable { + public abstract class MinecraftServer extends ReentrantBlockableEventLoop implements ServerInfo, ChunkIOErrorReporter, CommandSource { @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { -- return !this.haveTime(); -+ return !this.canSleepForTickNoOversleep(); // Paper - move oversleep into full server tick - }); - } ++ //this.runAllTasks(); // Paper - move this into the tick method for timings + this.waitingForNextTick = true; + try { + this.managedBlock(() -> { +- return !this.haveTime(); ++ return !this.canSleepForTickNoOversleep(); // Paper - move oversleep into full server tick + }); + } finally { + this.waitingForNextTick = false; @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { @@ -788,34 +797,39 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 this.tickRateManager.tick(); this.tickChildren(shouldKeepTicking); @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0 && this.ticksUntilAutosave <= 0) { - this.ticksUntilAutosave = this.autosavePeriod; - // CraftBukkit end -- SpigotTimings.worldSaveTimer.startTiming(); // Spigot - MinecraftServer.LOGGER.debug("Autosave started"); - this.profiler.push("save"); - this.saveEverything(true, false, false); - this.profiler.pop(); - MinecraftServer.LOGGER.debug("Autosave finished"); -- SpigotTimings.worldSaveTimer.stopTiming(); // Spigot - } + + ProfilerFiller gameprofilerfiller = Profiler.get(); + + // Paper start - move executeAll() into full server tick timing + try (co.aikar.timings.Timing ignored = MinecraftTimings.processTasksTimer.startTiming()) { + this.runAllTasks(); + } + // Paper end - this.profiler.push("tallying"); - long j = Util.getNanos() - i; - int k = this.tickCount % 100; + gameprofilerfiller.push("tallying"); + long k = Util.getNanos() - i; + int l = this.tickCount % 100; @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { @@ -823,17 +837,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 }); - SpigotTimings.schedulerTimer.startTiming(); // Spigot + MinecraftTimings.bukkitSchedulerTimer.startTiming(); // Spigot // Paper - this.server.getScheduler().mainThreadHeartbeat(this.tickCount); // CraftBukkit + this.server.getScheduler().mainThreadHeartbeat(); // CraftBukkit - SpigotTimings.schedulerTimer.stopTiming(); // Spigot + MinecraftTimings.bukkitSchedulerTimer.stopTiming(); // Spigot // Paper io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.CALLBACK_MANAGER.handleQueue(this.tickCount); // Paper - this.profiler.push("commandFunctions"); + gameprofilerfiller.push("commandFunctions"); - SpigotTimings.commandFunctionsTimer.startTiming(); // Spigot + MinecraftTimings.commandFunctionsTimer.startTiming(); // Spigot // Paper this.getFunctions().tick(); - SpigotTimings.commandFunctionsTimer.stopTiming(); // Spigot + MinecraftTimings.commandFunctionsTimer.stopTiming(); // Spigot // Paper - this.profiler.popPush("levels"); + gameprofilerfiller.popPush("levels"); Iterator iterator = this.getAllLevels().iterator(); // CraftBukkit start @@ -852,7 +866,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 if (this.tickCount % 20 == 0) { for (int i = 0; i < this.getPlayerList().players.size(); ++i) { @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop list = Lists.newArrayListWithCapacity(this.chunkMap.size()); - Iterator iterator = this.chunkMap.getChunks().iterator(); + gameprofilerfiller.pop(); + this.clearCache(); + } + if (this.level.getServer().tickRateManager().runsNormally()) this.level.timings.chunkTicks.startTiming(); // Paper - while (iterator.hasNext()) { - ChunkHolder playerchunk = (ChunkHolder) iterator.next(); + private void tickChunks() { + long i = this.level.getGameTime(); +@@ -0,0 +0,0 @@ public class ServerChunkCache extends ChunkSource { + LevelChunk chunk = playerchunk.getTickingChunk(); + + if (chunk != null) { ++ this.level.timings.broadcastChunkUpdates.startTiming(); // Paper - timing + playerchunk.broadcastChanges(chunk); ++ this.level.timings.broadcastChunkUpdates.stopTiming(); // Paper - timing + } + } + @@ -0,0 +0,0 @@ public class ServerChunkCache extends ChunkSource { - if (this.level.tickRateManager().runsNormally()) { - gameprofilerfiller.popPush("naturalSpawnCount"); -+ this.level.timings.countNaturalMobs.startTiming(); // Paper - timings - int k = this.distanceManager.getNaturalSpawnChunkCount(); - NaturalSpawner.SpawnState spawnercreature_d = NaturalSpawner.createState(k, this.level.getAllEntities(), this::getFullChunk, new LocalMobCapCalculator(this.chunkMap)); -+ this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings + private void tickChunks(ProfilerFiller profiler, long timeDelta, List chunks) { + profiler.popPush("naturalSpawnCount"); ++ this.level.timings.countNaturalMobs.startTiming(); // Paper - timings + int j = this.distanceManager.getNaturalSpawnChunkCount(); + NaturalSpawner.SpawnState spawnercreature_d = NaturalSpawner.createState(j, this.level.getAllEntities(), this::getFullChunk, new LocalMobCapCalculator(this.chunkMap)); ++ this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings - this.lastSpawnState = spawnercreature_d; - gameprofilerfiller.popPush("spawnAndTick"); + this.lastSpawnState = spawnercreature_d; + profiler.popPush("spawnAndTick"); @@ -0,0 +0,0 @@ public class ServerChunkCache extends ChunkSource { - } - - if (this.level.shouldTickBlocksAt(chunkcoordintpair.toLong())) { -- this.level.timings.doTickTiles.startTiming(); // Spigot - this.level.tickChunk(chunk1, l); -- this.level.timings.doTickTiles.stopTiming(); // Spigot - } - } - } -+ this.level.timings.chunkTicks.stopTiming(); // Paper - - gameprofilerfiller.popPush("customSpawners"); - if (flag) { -+ try (co.aikar.timings.Timing ignored = this.level.timings.miscMobSpawning.startTiming()) { // Paper - timings - this.level.tickCustomSpawners(this.spawnEnemies, this.spawnFriendlies); -+ } // Paper - timings - } } - gameprofilerfiller.popPush("broadcast"); - list.forEach((chunkproviderserver_a1) -> { -+ this.level.timings.broadcastChunkUpdates.startTiming(); // Paper - timing - chunkproviderserver_a1.holder.broadcastChanges(chunkproviderserver_a1.chunk); -+ this.level.timings.broadcastChunkUpdates.stopTiming(); // Paper - timing - }); - gameprofilerfiller.pop(); - gameprofilerfiller.pop(); + if (this.level.shouldTickBlocksAt(chunkcoordintpair.toLong())) { +- this.level.timings.doTickTiles.startTiming(); // Spigot + this.level.tickChunk(chunk, k); +- this.level.timings.doTickTiles.stopTiming(); // Spigot + } + } + ++ this.level.timings.chunkTicks.stopTiming(); // Paper ++ + profiler.popPush("customSpawners"); + if (flag) { ++ try (co.aikar.timings.Timing ignored = this.level.timings.miscMobSpawning.startTiming()) { // Paper - timings + this.level.tickCustomSpawners(this.spawnEnemies, this.spawnFriendlies); ++ } + } + + } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1130,16 +1146,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.craftbukkit.generator.CustomWorldChunkManager; import org.bukkit.craftbukkit.util.WorldUUID; -@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe } - gameprofilerfiller.popPush("tickPending"); + gameprofilerfiller.push("tickPending"); - this.timings.doTickPending.startTiming(); // Spigot + this.timings.scheduledBlocks.startTiming(); // Paper if (!this.isDebug() && flag) { j = this.getGameTime(); gameprofilerfiller.push("blockTicks"); -@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe this.fluidTicks.tick(j, 65536, this::tickFluid); gameprofilerfiller.pop(); } @@ -1160,7 +1176,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 gameprofilerfiller.popPush("blockEvents"); if (flag) { this.timings.doSounds.startTiming(); // Spigot -@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe } gameprofilerfiller.popPush("tickBlocks"); @@ -1168,7 +1184,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 if (randomTickSpeed > 0) { LevelChunkSection[] achunksection = chunk.getSections(); -@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe } } @@ -1176,7 +1192,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 gameprofilerfiller.pop(); } -@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe } public void tickNonPassenger(Entity entity) { @@ -1198,9 +1214,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + try { + // Paper end - timings entity.setOldPosAndRot(); - ProfilerFiller gameprofilerfiller = this.getProfiler(); + ProfilerFiller gameprofilerfiller = Profiler.get(); -@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe this.tickPassenger(entity, entity1); } @@ -1209,7 +1225,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } -@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe if (!savingDisabled) { org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(this.getWorld())); // CraftBukkit @@ -1217,7 +1233,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 if (progressListener != null) { progressListener.progressStartNoAbort(Component.translatable("menu.savingLevel")); } -@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe progressListener.progressStage(Component.translatable("menu.savingChunks")); } @@ -1322,19 +1338,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } - public void move(MoverType movementType, Vec3 movement) { + public void move(MoverType type, Vec3 movement) { - org.bukkit.craftbukkit.SpigotTimings.entityMoveTimer.startTiming(); // Spigot if (this.noPhysics) { this.setPos(this.getX() + movement.x, this.getY() + movement.y, this.getZ() + movement.z); } else { @@ -0,0 +0,0 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess - this.level().getProfiler().pop(); + gameprofilerfiller.pop(); } } - org.bukkit.craftbukkit.SpigotTimings.entityMoveTimer.stopTiming(); // Spigot } - private boolean isStateClimbable(BlockState state) { + private void applyMovementEmissionAndPlaySound(Entity.MovementEmission moveEffect, Vec3 movement, BlockPos landingPos, BlockState landingState) { diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/world/entity/EntityType.java @@ -1342,7 +1358,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public class EntityType implements FeatureElement, EntityTypeT } - public EntityType(EntityType.EntityFactory factory, MobCategory spawnGroup, boolean saveable, boolean summonable, boolean fireImmune, boolean spawnableFarFromPlayer, ImmutableSet canSpawnInside, EntityDimensions dimensions, float spawnBoxScale, int maxTrackDistance, int trackTickInterval, FeatureFlagSet requiredFeatures) { + public EntityType(EntityType.EntityFactory factory, MobCategory spawnGroup, boolean saveable, boolean summonable, boolean fireImmune, boolean spawnableFarFromPlayer, ImmutableSet canSpawnInside, EntityDimensions dimensions, float spawnBoxScale, int maxTrackDistance, int trackTickInterval, String translationKey, Optional> lootTable, FeatureFlagSet requiredFeatures) { + // Paper start + this(factory, spawnGroup, saveable, summonable, fireImmune, spawnableFarFromPlayer, canSpawnInside, dimensions, spawnBoxScale, maxTrackDistance, trackTickInterval, requiredFeatures, "custom"); + } @@ -1351,6 +1367,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + this.inactiveTickTimer = co.aikar.timings.MinecraftTimings.getEntityTimings(id, "inactiveTick"); + this.passengerTickTimer = co.aikar.timings.MinecraftTimings.getEntityTimings(id, "passengerTick"); + this.passengerInactiveTickTimer = co.aikar.timings.MinecraftTimings.getEntityTimings(id, "passengerInactiveTick"); ++ this.id = id; + // Paper end this.builtInRegistryHolder = BuiltInRegistries.ENTITY_TYPE.createIntrusiveHolder(this); this.factory = factory; @@ -1364,16 +1381,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + public final co.aikar.timings.Timing inactiveTickTimer; + public final co.aikar.timings.Timing passengerTickTimer; + public final co.aikar.timings.Timing passengerInactiveTickTimer; ++ private final String id; + // Paper end public boolean trackDeltas() { return this != EntityType.PLAYER && this != EntityType.LLAMA_SPIT && this != EntityType.WITHER && this != EntityType.BAT && this != EntityType.ITEM_FRAME && this != EntityType.GLOW_ITEM_FRAME && this != EntityType.LEASH_KNOT && this != EntityType.PAINTING && this != EntityType.END_CRYSTAL && this != EntityType.EVOKER_FANGS; } @@ -0,0 +0,0 @@ public class EntityType implements FeatureElement, EntityTypeT - Util.fetchChoiceType(References.ENTITY_TREE, id); + Util.fetchChoiceType(References.ENTITY_TREE, registryKey.location().toString()); } -- return new EntityType<>(this.factory, this.category, this.serialize, this.summon, this.fireImmune, this.canSpawnFarFromPlayer, this.immuneTo, this.dimensions.withAttachments(this.attachments), this.spawnDimensionsScale, this.clientTrackingRange, this.updateInterval, this.requiredFeatures); -+ return new EntityType<>(this.factory, this.category, this.serialize, this.summon, this.fireImmune, this.canSpawnFarFromPlayer, this.immuneTo, this.dimensions.withAttachments(this.attachments), this.spawnDimensionsScale, this.clientTrackingRange, this.updateInterval, this.requiredFeatures, id); // Paper - add id +- return new EntityType<>(this.factory, this.category, this.serialize, this.summon, this.fireImmune, this.canSpawnFarFromPlayer, this.immuneTo, this.dimensions.withAttachments(this.attachments), this.spawnDimensionsScale, this.clientTrackingRange, this.updateInterval, (String) this.descriptionId.get(registryKey), (Optional) this.lootTable.get(registryKey), this.requiredFeatures); ++ return new EntityType<>(this.factory, this.category, this.serialize, this.summon, this.fireImmune, this.canSpawnFarFromPlayer, this.immuneTo, this.dimensions.withAttachments(this.attachments), this.spawnDimensionsScale, this.clientTrackingRange, this.updateInterval, (String) this.descriptionId.get(registryKey), (Optional) this.lootTable.get(registryKey), this.requiredFeatures, this.id); // Paper - add id } } @@ -1409,35 +1427,35 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 double d0 = this.getX() - this.xo; @@ -0,0 +0,0 @@ public abstract class LivingEntity extends Entity implements Attackable { - this.refreshDimensions(); } + this.elytraAnimationState.tick(); - SpigotTimings.timerEntityTickRest.stopTiming(); // Spigot } public void detectEquipmentUpdatesPublic() { // CraftBukkit @@ -0,0 +0,0 @@ public abstract class LivingEntity extends Entity implements Attackable { + ProfilerFiller gameprofilerfiller = Profiler.get(); - this.setDeltaMovement(d0, d1, d2); - this.level().getProfiler().push("ai"); + gameprofilerfiller.push("ai"); - SpigotTimings.timerEntityAI.startTiming(); // Spigot if (this.isImmobile()) { this.jumping = false; this.xxa = 0.0F; @@ -0,0 +0,0 @@ public abstract class LivingEntity extends Entity implements Attackable { this.serverAiStep(); - this.level().getProfiler().pop(); + gameprofilerfiller.pop(); } - SpigotTimings.timerEntityAI.stopTiming(); // Spigot - this.level().getProfiler().pop(); - this.level().getProfiler().push("jump"); + gameprofilerfiller.pop(); + gameprofilerfiller.push("jump"); @@ -0,0 +0,0 @@ public abstract class LivingEntity extends Entity implements Attackable { this.resetFallDistance(); } - SpigotTimings.timerEntityAIMove.startTiming(); // Spigot - label104: + label112: { LivingEntity entityliving = this.getControllingPassenger(); @@ -0,0 +0,0 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -1446,8 +1464,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } - SpigotTimings.timerEntityAIMove.stopTiming(); // Spigot - this.level().getProfiler().pop(); - this.level().getProfiler().push("freezing"); + if (!this.level().isClientSide() || this.isControlledByLocalInstance()) { + this.applyEffectsFromBlocks(); @@ -0,0 +0,0 @@ public abstract class LivingEntity extends Entity implements Attackable { this.checkAutoSpinAttack(axisalignedbb, this.getBoundingBox()); } @@ -1455,9 +1473,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - SpigotTimings.timerEntityAICollision.startTiming(); // Spigot this.pushEntities(); - SpigotTimings.timerEntityAICollision.stopTiming(); // Spigot - this.level().getProfiler().pop(); - if (!this.level().isClientSide && this.isSensitiveToWater() && this.isInWaterRainOrBubble()) { - this.hurt(this.damageSources().drown(), 1.0F); + gameprofilerfiller.pop(); + world = this.level(); + if (world instanceof ServerLevel worldserver) { diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/world/level/Level.java @@ -1523,8 +1541,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } + // Paper end @Nullable - private String descriptionId; - @Nullable + private Item item; + private static final int CACHE_SIZE = 256; diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java @@ -1563,32 +1581,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } } } -diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java -+++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java -@@ -0,0 +0,0 @@ public class ChunkSerializer { - ListTag nbttaglist1 = ChunkSerializer.getListOfCompoundsOrNull(nbt, "block_entities"); - - return nbttaglist == null && nbttaglist1 == null ? null : (chunk) -> { -- world.timings.syncChunkLoadEntitiesTimer.startTiming(); // Spigot - if (nbttaglist != null) { - world.addLegacyChunkEntities(EntityType.loadEntitiesRecursive(nbttaglist, world)); - } -- world.timings.syncChunkLoadEntitiesTimer.stopTiming(); // Spigot - -- world.timings.syncChunkLoadTileEntitiesTimer.startTiming(); // Spigot - if (nbttaglist1 != null) { - for (int i = 0; i < nbttaglist1.size(); ++i) { - CompoundTag nbttagcompound1 = nbttaglist1.getCompound(i); -@@ -0,0 +0,0 @@ public class ChunkSerializer { - } - } - } -- world.timings.syncChunkLoadTileEntitiesTimer.stopTiming(); // Spigot - - }; - } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1869,7 +1861,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 this.pending.addAll(temp); temp.clear(); + MinecraftTimings.bukkitSchedulerFinishTimer.stopTiming(); // Paper - this.debugHead = this.debugHead.getNextHead(currentTick); + this.debugHead = this.debugHead.getNextHead(this.currentTick); } @@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler { diff --git a/patches/unapplied/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch similarity index 94% rename from patches/unapplied/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch rename to patches/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch index 5d4b973a8a..5c351919b1 100644 --- a/patches/unapplied/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch +++ b/patches/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch @@ -10,8 +10,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +++ b/build.gradle.kts @@ -0,0 +0,0 @@ dependencies { implementation("commons-lang:commons-lang:2.6") - runtimeOnly("org.xerial:sqlite-jdbc:3.46.0.0") - runtimeOnly("com.mysql:mysql-connector-j:8.4.0") + runtimeOnly("org.xerial:sqlite-jdbc:3.46.1.3") + runtimeOnly("com.mysql:mysql-connector-j:9.1.0") + runtimeOnly("com.lmax:disruptor:3.4.4") // Paper runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6") diff --git a/patches/unapplied/Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch similarity index 100% rename from patches/unapplied/Use-TerminalConsoleAppender-for-console-improvements.patch rename to patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch diff --git a/patches/unapplied/API-for-an-entity-s-scoreboard-name.patch b/patches/unapplied/server/API-for-an-entity-s-scoreboard-name.patch similarity index 100% rename from patches/unapplied/API-for-an-entity-s-scoreboard-name.patch rename to patches/unapplied/server/API-for-an-entity-s-scoreboard-name.patch diff --git a/patches/unapplied/API-for-checking-sent-chunks.patch b/patches/unapplied/server/API-for-checking-sent-chunks.patch similarity index 100% rename from patches/unapplied/API-for-checking-sent-chunks.patch rename to patches/unapplied/server/API-for-checking-sent-chunks.patch diff --git a/patches/unapplied/API-for-creating-command-sender-which-forwards-feedb.patch b/patches/unapplied/server/API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/unapplied/API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/unapplied/server/API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/unapplied/API-for-updating-recipes-on-clients.patch b/patches/unapplied/server/API-for-updating-recipes-on-clients.patch similarity index 100% rename from patches/unapplied/API-for-updating-recipes-on-clients.patch rename to patches/unapplied/server/API-for-updating-recipes-on-clients.patch diff --git a/patches/unapplied/API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/unapplied/server/API-to-get-Material-from-Boats-and-Minecarts.patch similarity index 100% rename from patches/unapplied/API-to-get-Material-from-Boats-and-Minecarts.patch rename to patches/unapplied/server/API-to-get-Material-from-Boats-and-Minecarts.patch diff --git a/patches/unapplied/API-to-get-a-BlockState-without-a-snapshot.patch b/patches/unapplied/server/API-to-get-a-BlockState-without-a-snapshot.patch similarity index 100% rename from patches/unapplied/API-to-get-a-BlockState-without-a-snapshot.patch rename to patches/unapplied/server/API-to-get-a-BlockState-without-a-snapshot.patch diff --git a/patches/unapplied/Ability-to-apply-mending-to-XP-API.patch b/patches/unapplied/server/Ability-to-apply-mending-to-XP-API.patch similarity index 100% rename from patches/unapplied/Ability-to-apply-mending-to-XP-API.patch rename to patches/unapplied/server/Ability-to-apply-mending-to-XP-API.patch diff --git a/patches/unapplied/Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/unapplied/server/Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/unapplied/Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/unapplied/server/Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/unapplied/Ability-to-get-block-entities-from-a-chunk-without-s.patch b/patches/unapplied/server/Ability-to-get-block-entities-from-a-chunk-without-s.patch similarity index 100% rename from patches/unapplied/Ability-to-get-block-entities-from-a-chunk-without-s.patch rename to patches/unapplied/server/Ability-to-get-block-entities-from-a-chunk-without-s.patch diff --git a/patches/unapplied/Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/unapplied/server/Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch similarity index 100% rename from patches/unapplied/Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch rename to patches/unapplied/server/Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch diff --git a/patches/unapplied/Add-API-for-item-entity-health.patch b/patches/unapplied/server/Add-API-for-item-entity-health.patch similarity index 100% rename from patches/unapplied/Add-API-for-item-entity-health.patch rename to patches/unapplied/server/Add-API-for-item-entity-health.patch diff --git a/patches/unapplied/Add-API-for-quit-reason.patch b/patches/unapplied/server/Add-API-for-quit-reason.patch similarity index 100% rename from patches/unapplied/Add-API-for-quit-reason.patch rename to patches/unapplied/server/Add-API-for-quit-reason.patch diff --git a/patches/unapplied/Add-API-for-resetting-a-single-score.patch b/patches/unapplied/server/Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/unapplied/Add-API-for-resetting-a-single-score.patch rename to patches/unapplied/server/Add-API-for-resetting-a-single-score.patch diff --git a/patches/unapplied/Add-API-methods-to-control-if-armor-stands-can-move.patch b/patches/unapplied/server/Add-API-methods-to-control-if-armor-stands-can-move.patch similarity index 100% rename from patches/unapplied/Add-API-methods-to-control-if-armor-stands-can-move.patch rename to patches/unapplied/server/Add-API-methods-to-control-if-armor-stands-can-move.patch diff --git a/patches/unapplied/Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/unapplied/server/Add-API-to-get-the-collision-shape-of-a-block-before.patch similarity index 100% rename from patches/unapplied/Add-API-to-get-the-collision-shape-of-a-block-before.patch rename to patches/unapplied/server/Add-API-to-get-the-collision-shape-of-a-block-before.patch diff --git a/patches/unapplied/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/unapplied/server/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/unapplied/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/unapplied/server/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/unapplied/Add-Alternate-Current-redstone-implementation.patch b/patches/unapplied/server/Add-Alternate-Current-redstone-implementation.patch similarity index 100% rename from patches/unapplied/Add-Alternate-Current-redstone-implementation.patch rename to patches/unapplied/server/Add-Alternate-Current-redstone-implementation.patch diff --git a/patches/unapplied/Add-AnvilView-bypassEnchantmentLevelRestriction.patch b/patches/unapplied/server/Add-AnvilView-bypassEnchantmentLevelRestriction.patch similarity index 100% rename from patches/unapplied/Add-AnvilView-bypassEnchantmentLevelRestriction.patch rename to patches/unapplied/server/Add-AnvilView-bypassEnchantmentLevelRestriction.patch diff --git a/patches/unapplied/Add-ArmorStand-Item-Meta.patch b/patches/unapplied/server/Add-ArmorStand-Item-Meta.patch similarity index 100% rename from patches/unapplied/Add-ArmorStand-Item-Meta.patch rename to patches/unapplied/server/Add-ArmorStand-Item-Meta.patch diff --git a/patches/unapplied/Add-BeaconEffectEvent.patch b/patches/unapplied/server/Add-BeaconEffectEvent.patch similarity index 100% rename from patches/unapplied/Add-BeaconEffectEvent.patch rename to patches/unapplied/server/Add-BeaconEffectEvent.patch diff --git a/patches/unapplied/Add-BellRevealRaiderEvent.patch b/patches/unapplied/server/Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/unapplied/Add-BellRevealRaiderEvent.patch rename to patches/unapplied/server/Add-BellRevealRaiderEvent.patch diff --git a/patches/unapplied/Add-BellRingEvent.patch b/patches/unapplied/server/Add-BellRingEvent.patch similarity index 100% rename from patches/unapplied/Add-BellRingEvent.patch rename to patches/unapplied/server/Add-BellRingEvent.patch diff --git a/patches/unapplied/Add-Block-isValidTool.patch b/patches/unapplied/server/Add-Block-isValidTool.patch similarity index 100% rename from patches/unapplied/Add-Block-isValidTool.patch rename to patches/unapplied/server/Add-Block-isValidTool.patch diff --git a/patches/unapplied/Add-BlockBreakBlockEvent.patch b/patches/unapplied/server/Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/unapplied/Add-BlockBreakBlockEvent.patch rename to patches/unapplied/server/Add-BlockBreakBlockEvent.patch diff --git a/patches/unapplied/Add-BlockBreakProgressUpdateEvent.patch b/patches/unapplied/server/Add-BlockBreakProgressUpdateEvent.patch similarity index 100% rename from patches/unapplied/Add-BlockBreakProgressUpdateEvent.patch rename to patches/unapplied/server/Add-BlockBreakProgressUpdateEvent.patch diff --git a/patches/unapplied/Add-BlockFace-to-BlockDamageEvent.patch b/patches/unapplied/server/Add-BlockFace-to-BlockDamageEvent.patch similarity index 100% rename from patches/unapplied/Add-BlockFace-to-BlockDamageEvent.patch rename to patches/unapplied/server/Add-BlockFace-to-BlockDamageEvent.patch diff --git a/patches/unapplied/Add-BlockFailedDispenseEvent.patch b/patches/unapplied/server/Add-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/unapplied/Add-BlockFailedDispenseEvent.patch rename to patches/unapplied/server/Add-BlockFailedDispenseEvent.patch diff --git a/patches/unapplied/Add-BlockLockCheckEvent.patch b/patches/unapplied/server/Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/unapplied/Add-BlockLockCheckEvent.patch rename to patches/unapplied/server/Add-BlockLockCheckEvent.patch diff --git a/patches/unapplied/Add-BlockPreDispenseEvent.patch b/patches/unapplied/server/Add-BlockPreDispenseEvent.patch similarity index 100% rename from patches/unapplied/Add-BlockPreDispenseEvent.patch rename to patches/unapplied/server/Add-BlockPreDispenseEvent.patch diff --git a/patches/unapplied/Add-BlockStateMeta-clearBlockState.patch b/patches/unapplied/server/Add-BlockStateMeta-clearBlockState.patch similarity index 100% rename from patches/unapplied/Add-BlockStateMeta-clearBlockState.patch rename to patches/unapplied/server/Add-BlockStateMeta-clearBlockState.patch diff --git a/patches/unapplied/Add-CartographyItemEvent.patch b/patches/unapplied/server/Add-CartographyItemEvent.patch similarity index 100% rename from patches/unapplied/Add-CartographyItemEvent.patch rename to patches/unapplied/server/Add-CartographyItemEvent.patch diff --git a/patches/unapplied/Add-Channel-initialization-listeners.patch b/patches/unapplied/server/Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/unapplied/Add-Channel-initialization-listeners.patch rename to patches/unapplied/server/Add-Channel-initialization-listeners.patch diff --git a/patches/unapplied/Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/unapplied/server/Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/unapplied/Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/unapplied/server/Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/unapplied/Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/unapplied/server/Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch similarity index 100% rename from patches/unapplied/Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch rename to patches/unapplied/server/Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch diff --git a/patches/unapplied/Add-Destroy-Speed-API.patch b/patches/unapplied/server/Add-Destroy-Speed-API.patch similarity index 100% rename from patches/unapplied/Add-Destroy-Speed-API.patch rename to patches/unapplied/server/Add-Destroy-Speed-API.patch diff --git a/patches/unapplied/Add-DragonEggFormEvent.patch b/patches/unapplied/server/Add-DragonEggFormEvent.patch similarity index 100% rename from patches/unapplied/Add-DragonEggFormEvent.patch rename to patches/unapplied/server/Add-DragonEggFormEvent.patch diff --git a/patches/unapplied/Add-Early-Warning-Feature-to-WatchDog.patch b/patches/unapplied/server/Add-Early-Warning-Feature-to-WatchDog.patch similarity index 100% rename from patches/unapplied/Add-Early-Warning-Feature-to-WatchDog.patch rename to patches/unapplied/server/Add-Early-Warning-Feature-to-WatchDog.patch diff --git a/patches/unapplied/Add-ElderGuardianAppearanceEvent.patch b/patches/unapplied/server/Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/unapplied/Add-ElderGuardianAppearanceEvent.patch rename to patches/unapplied/server/Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/unapplied/Add-Entity-Body-Yaw-API.patch b/patches/unapplied/server/Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/unapplied/Add-Entity-Body-Yaw-API.patch rename to patches/unapplied/server/Add-Entity-Body-Yaw-API.patch diff --git a/patches/unapplied/Add-EntityBlockStorage-clearEntities.patch b/patches/unapplied/server/Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/unapplied/Add-EntityBlockStorage-clearEntities.patch rename to patches/unapplied/server/Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/unapplied/Add-EntityDamageItemEvent.patch b/patches/unapplied/server/Add-EntityDamageItemEvent.patch similarity index 100% rename from patches/unapplied/Add-EntityDamageItemEvent.patch rename to patches/unapplied/server/Add-EntityDamageItemEvent.patch diff --git a/patches/unapplied/Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/unapplied/server/Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/unapplied/Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/unapplied/server/Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/unapplied/Add-EntityFertilizeEggEvent.patch b/patches/unapplied/server/Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/unapplied/Add-EntityFertilizeEggEvent.patch rename to patches/unapplied/server/Add-EntityFertilizeEggEvent.patch diff --git a/patches/unapplied/Add-EntityInsideBlockEvent.patch b/patches/unapplied/server/Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/unapplied/Add-EntityInsideBlockEvent.patch rename to patches/unapplied/server/Add-EntityInsideBlockEvent.patch diff --git a/patches/unapplied/Add-EntityLoadCrossbowEvent.patch b/patches/unapplied/server/Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/unapplied/Add-EntityLoadCrossbowEvent.patch rename to patches/unapplied/server/Add-EntityLoadCrossbowEvent.patch diff --git a/patches/unapplied/Add-EntityMoveEvent.patch b/patches/unapplied/server/Add-EntityMoveEvent.patch similarity index 100% rename from patches/unapplied/Add-EntityMoveEvent.patch rename to patches/unapplied/server/Add-EntityMoveEvent.patch diff --git a/patches/unapplied/Add-EntityPortalReadyEvent.patch b/patches/unapplied/server/Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/unapplied/Add-EntityPortalReadyEvent.patch rename to patches/unapplied/server/Add-EntityPortalReadyEvent.patch diff --git a/patches/unapplied/Add-EntityTeleportEndGatewayEvent.patch b/patches/unapplied/server/Add-EntityTeleportEndGatewayEvent.patch similarity index 100% rename from patches/unapplied/Add-EntityTeleportEndGatewayEvent.patch rename to patches/unapplied/server/Add-EntityTeleportEndGatewayEvent.patch diff --git a/patches/unapplied/Add-EntityToggleSitEvent.patch b/patches/unapplied/server/Add-EntityToggleSitEvent.patch similarity index 100% rename from patches/unapplied/Add-EntityToggleSitEvent.patch rename to patches/unapplied/server/Add-EntityToggleSitEvent.patch diff --git a/patches/unapplied/Add-EntityZapEvent.patch b/patches/unapplied/server/Add-EntityZapEvent.patch similarity index 100% rename from patches/unapplied/Add-EntityZapEvent.patch rename to patches/unapplied/server/Add-EntityZapEvent.patch diff --git a/patches/unapplied/Add-FeatureFlag-API.patch b/patches/unapplied/server/Add-FeatureFlag-API.patch similarity index 100% rename from patches/unapplied/Add-FeatureFlag-API.patch rename to patches/unapplied/server/Add-FeatureFlag-API.patch diff --git a/patches/unapplied/Add-FluidState-API.patch b/patches/unapplied/server/Add-FluidState-API.patch similarity index 100% rename from patches/unapplied/Add-FluidState-API.patch rename to patches/unapplied/server/Add-FluidState-API.patch diff --git a/patches/unapplied/Add-GameEvent-tags.patch b/patches/unapplied/server/Add-GameEvent-tags.patch similarity index 100% rename from patches/unapplied/Add-GameEvent-tags.patch rename to patches/unapplied/server/Add-GameEvent-tags.patch diff --git a/patches/unapplied/Add-HiddenPotionEffect-API.patch b/patches/unapplied/server/Add-HiddenPotionEffect-API.patch similarity index 100% rename from patches/unapplied/Add-HiddenPotionEffect-API.patch rename to patches/unapplied/server/Add-HiddenPotionEffect-API.patch diff --git a/patches/unapplied/Add-ItemFactory-getSpawnEgg-API.patch b/patches/unapplied/server/Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/unapplied/Add-ItemFactory-getSpawnEgg-API.patch rename to patches/unapplied/server/Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/unapplied/Add-ItemType-getItemRarity.patch b/patches/unapplied/server/Add-ItemType-getItemRarity.patch similarity index 100% rename from patches/unapplied/Add-ItemType-getItemRarity.patch rename to patches/unapplied/server/Add-ItemType-getItemRarity.patch diff --git a/patches/unapplied/Add-Lifecycle-Event-system.patch b/patches/unapplied/server/Add-Lifecycle-Event-system.patch similarity index 100% rename from patches/unapplied/Add-Lifecycle-Event-system.patch rename to patches/unapplied/server/Add-Lifecycle-Event-system.patch diff --git a/patches/unapplied/Add-Listing-API-for-Player.patch b/patches/unapplied/server/Add-Listing-API-for-Player.patch similarity index 100% rename from patches/unapplied/Add-Listing-API-for-Player.patch rename to patches/unapplied/server/Add-Listing-API-for-Player.patch diff --git a/patches/unapplied/Add-LivingEntity-clearActiveItem.patch b/patches/unapplied/server/Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/unapplied/Add-LivingEntity-clearActiveItem.patch rename to patches/unapplied/server/Add-LivingEntity-clearActiveItem.patch diff --git a/patches/unapplied/Add-LivingEntity-getTargetEntity.patch b/patches/unapplied/server/Add-LivingEntity-getTargetEntity.patch similarity index 100% rename from patches/unapplied/Add-LivingEntity-getTargetEntity.patch rename to patches/unapplied/server/Add-LivingEntity-getTargetEntity.patch diff --git a/patches/unapplied/Add-Mob-Experience-reward-API.patch b/patches/unapplied/server/Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/unapplied/Add-Mob-Experience-reward-API.patch rename to patches/unapplied/server/Add-Mob-Experience-reward-API.patch diff --git a/patches/unapplied/Add-Mob-lookAt-API.patch b/patches/unapplied/server/Add-Mob-lookAt-API.patch similarity index 100% rename from patches/unapplied/Add-Mob-lookAt-API.patch rename to patches/unapplied/server/Add-Mob-lookAt-API.patch diff --git a/patches/unapplied/Add-More-Creeper-API.patch b/patches/unapplied/server/Add-More-Creeper-API.patch similarity index 100% rename from patches/unapplied/Add-More-Creeper-API.patch rename to patches/unapplied/server/Add-More-Creeper-API.patch diff --git a/patches/unapplied/Add-Moving-Piston-API.patch b/patches/unapplied/server/Add-Moving-Piston-API.patch similarity index 100% rename from patches/unapplied/Add-Moving-Piston-API.patch rename to patches/unapplied/server/Add-Moving-Piston-API.patch diff --git a/patches/unapplied/Add-NamespacedKey-biome-methods.patch b/patches/unapplied/server/Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/unapplied/Add-NamespacedKey-biome-methods.patch rename to patches/unapplied/server/Add-NamespacedKey-biome-methods.patch diff --git a/patches/unapplied/Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/unapplied/server/Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/unapplied/Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/unapplied/server/Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/unapplied/Add-Offline-PDC-API.patch b/patches/unapplied/server/Add-Offline-PDC-API.patch similarity index 100% rename from patches/unapplied/Add-Offline-PDC-API.patch rename to patches/unapplied/server/Add-Offline-PDC-API.patch diff --git a/patches/unapplied/Add-PhantomPreSpawnEvent.patch b/patches/unapplied/server/Add-PhantomPreSpawnEvent.patch similarity index 100% rename from patches/unapplied/Add-PhantomPreSpawnEvent.patch rename to patches/unapplied/server/Add-PhantomPreSpawnEvent.patch diff --git a/patches/unapplied/Add-Player-Warden-Warning-API.patch b/patches/unapplied/server/Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/unapplied/Add-Player-Warden-Warning-API.patch rename to patches/unapplied/server/Add-Player-Warden-Warning-API.patch diff --git a/patches/unapplied/Add-Player-getFishHook.patch b/patches/unapplied/server/Add-Player-getFishHook.patch similarity index 100% rename from patches/unapplied/Add-Player-getFishHook.patch rename to patches/unapplied/server/Add-Player-getFishHook.patch diff --git a/patches/unapplied/Add-PlayerAdvancementCriterionGrantEvent.patch b/patches/unapplied/server/Add-PlayerAdvancementCriterionGrantEvent.patch similarity index 100% rename from patches/unapplied/Add-PlayerAdvancementCriterionGrantEvent.patch rename to patches/unapplied/server/Add-PlayerAdvancementCriterionGrantEvent.patch diff --git a/patches/unapplied/Add-PlayerArmSwingEvent.patch b/patches/unapplied/server/Add-PlayerArmSwingEvent.patch similarity index 100% rename from patches/unapplied/Add-PlayerArmSwingEvent.patch rename to patches/unapplied/server/Add-PlayerArmSwingEvent.patch diff --git a/patches/unapplied/Add-PlayerArmorChangeEvent.patch b/patches/unapplied/server/Add-PlayerArmorChangeEvent.patch similarity index 100% rename from patches/unapplied/Add-PlayerArmorChangeEvent.patch rename to patches/unapplied/server/Add-PlayerArmorChangeEvent.patch diff --git a/patches/unapplied/Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/unapplied/server/Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from patches/unapplied/Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/unapplied/server/Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/patches/unapplied/Add-PlayerBedFailEnterEvent.patch b/patches/unapplied/server/Add-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/unapplied/Add-PlayerBedFailEnterEvent.patch rename to patches/unapplied/server/Add-PlayerBedFailEnterEvent.patch diff --git a/patches/unapplied/Add-PlayerChangeBeaconEffectEvent.patch b/patches/unapplied/server/Add-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/unapplied/Add-PlayerChangeBeaconEffectEvent.patch rename to patches/unapplied/server/Add-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/unapplied/Add-PlayerConnectionCloseEvent.patch b/patches/unapplied/server/Add-PlayerConnectionCloseEvent.patch similarity index 100% rename from patches/unapplied/Add-PlayerConnectionCloseEvent.patch rename to patches/unapplied/server/Add-PlayerConnectionCloseEvent.patch diff --git a/patches/unapplied/Add-PlayerDeepSleepEvent.patch b/patches/unapplied/server/Add-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/unapplied/Add-PlayerDeepSleepEvent.patch rename to patches/unapplied/server/Add-PlayerDeepSleepEvent.patch diff --git a/patches/unapplied/Add-PlayerFlowerPotManipulateEvent.patch b/patches/unapplied/server/Add-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/unapplied/Add-PlayerFlowerPotManipulateEvent.patch rename to patches/unapplied/server/Add-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/unapplied/Add-PlayerInsertLecternBookEvent.patch b/patches/unapplied/server/Add-PlayerInsertLecternBookEvent.patch similarity index 100% rename from patches/unapplied/Add-PlayerInsertLecternBookEvent.patch rename to patches/unapplied/server/Add-PlayerInsertLecternBookEvent.patch diff --git a/patches/unapplied/Add-PlayerInventorySlotChangeEvent.patch b/patches/unapplied/server/Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/unapplied/Add-PlayerInventorySlotChangeEvent.patch rename to patches/unapplied/server/Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/unapplied/Add-PlayerItemCooldownEvent.patch b/patches/unapplied/server/Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/unapplied/Add-PlayerItemCooldownEvent.patch rename to patches/unapplied/server/Add-PlayerItemCooldownEvent.patch diff --git a/patches/unapplied/Add-PlayerItemFrameChangeEvent.patch b/patches/unapplied/server/Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/unapplied/Add-PlayerItemFrameChangeEvent.patch rename to patches/unapplied/server/Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/unapplied/Add-PlayerJumpEvent.patch b/patches/unapplied/server/Add-PlayerJumpEvent.patch similarity index 100% rename from patches/unapplied/Add-PlayerJumpEvent.patch rename to patches/unapplied/server/Add-PlayerJumpEvent.patch diff --git a/patches/unapplied/Add-PlayerKickEvent-causes.patch b/patches/unapplied/server/Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/unapplied/Add-PlayerKickEvent-causes.patch rename to patches/unapplied/server/Add-PlayerKickEvent-causes.patch diff --git a/patches/unapplied/Add-PlayerLecternPageChangeEvent.patch b/patches/unapplied/server/Add-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/unapplied/Add-PlayerLecternPageChangeEvent.patch rename to patches/unapplied/server/Add-PlayerLecternPageChangeEvent.patch diff --git a/patches/unapplied/Add-PlayerLoomPatternSelectEvent.patch b/patches/unapplied/server/Add-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/unapplied/Add-PlayerLoomPatternSelectEvent.patch rename to patches/unapplied/server/Add-PlayerLoomPatternSelectEvent.patch diff --git a/patches/unapplied/Add-PlayerNameEntityEvent.patch b/patches/unapplied/server/Add-PlayerNameEntityEvent.patch similarity index 100% rename from patches/unapplied/Add-PlayerNameEntityEvent.patch rename to patches/unapplied/server/Add-PlayerNameEntityEvent.patch diff --git a/patches/unapplied/Add-PlayerPickItemEvent.patch b/patches/unapplied/server/Add-PlayerPickItemEvent.patch similarity index 100% rename from patches/unapplied/Add-PlayerPickItemEvent.patch rename to patches/unapplied/server/Add-PlayerPickItemEvent.patch diff --git a/patches/unapplied/Add-PlayerPostRespawnEvent.patch b/patches/unapplied/server/Add-PlayerPostRespawnEvent.patch similarity index 100% rename from patches/unapplied/Add-PlayerPostRespawnEvent.patch rename to patches/unapplied/server/Add-PlayerPostRespawnEvent.patch diff --git a/patches/unapplied/Add-PlayerRecipeBookClickEvent.patch b/patches/unapplied/server/Add-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/unapplied/Add-PlayerRecipeBookClickEvent.patch rename to patches/unapplied/server/Add-PlayerRecipeBookClickEvent.patch diff --git a/patches/unapplied/Add-PlayerSetSpawnEvent.patch b/patches/unapplied/server/Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/unapplied/Add-PlayerSetSpawnEvent.patch rename to patches/unapplied/server/Add-PlayerSetSpawnEvent.patch diff --git a/patches/unapplied/Add-PlayerShearBlockEvent.patch b/patches/unapplied/server/Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/unapplied/Add-PlayerShearBlockEvent.patch rename to patches/unapplied/server/Add-PlayerShearBlockEvent.patch diff --git a/patches/unapplied/Add-PlayerShieldDisableEvent.patch b/patches/unapplied/server/Add-PlayerShieldDisableEvent.patch similarity index 100% rename from patches/unapplied/Add-PlayerShieldDisableEvent.patch rename to patches/unapplied/server/Add-PlayerShieldDisableEvent.patch diff --git a/patches/unapplied/Add-PlayerStonecutterRecipeSelectEvent.patch b/patches/unapplied/server/Add-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/unapplied/Add-PlayerStonecutterRecipeSelectEvent.patch rename to patches/unapplied/server/Add-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/unapplied/Add-PlayerStopUsingItemEvent.patch b/patches/unapplied/server/Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/unapplied/Add-PlayerStopUsingItemEvent.patch rename to patches/unapplied/server/Add-PlayerStopUsingItemEvent.patch diff --git a/patches/unapplied/Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/unapplied/server/Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/unapplied/Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/unapplied/server/Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/unapplied/Add-PlayerUseUnknownEntityEvent.patch b/patches/unapplied/server/Add-PlayerUseUnknownEntityEvent.patch similarity index 100% rename from patches/unapplied/Add-PlayerUseUnknownEntityEvent.patch rename to patches/unapplied/server/Add-PlayerUseUnknownEntityEvent.patch diff --git a/patches/unapplied/Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/unapplied/server/Add-Plugin-Tickets-to-API-Chunk-Methods.patch similarity index 100% rename from patches/unapplied/Add-Plugin-Tickets-to-API-Chunk-Methods.patch rename to patches/unapplied/server/Add-Plugin-Tickets-to-API-Chunk-Methods.patch diff --git a/patches/unapplied/Add-PrePlayerAttackEntityEvent.patch b/patches/unapplied/server/Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/unapplied/Add-PrePlayerAttackEntityEvent.patch rename to patches/unapplied/server/Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/unapplied/Add-PrepareResultEvent.patch b/patches/unapplied/server/Add-PrepareResultEvent.patch similarity index 100% rename from patches/unapplied/Add-PrepareResultEvent.patch rename to patches/unapplied/server/Add-PrepareResultEvent.patch diff --git a/patches/unapplied/Add-ProjectileCollideEvent.patch b/patches/unapplied/server/Add-ProjectileCollideEvent.patch similarity index 100% rename from patches/unapplied/Add-ProjectileCollideEvent.patch rename to patches/unapplied/server/Add-ProjectileCollideEvent.patch diff --git a/patches/unapplied/Add-PufferFishStateChangeEvent.patch b/patches/unapplied/server/Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/unapplied/Add-PufferFishStateChangeEvent.patch rename to patches/unapplied/server/Add-PufferFishStateChangeEvent.patch diff --git a/patches/unapplied/Add-Raw-Byte-Entity-Serialization.patch b/patches/unapplied/server/Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/unapplied/Add-Raw-Byte-Entity-Serialization.patch rename to patches/unapplied/server/Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/unapplied/Add-Raw-Byte-ItemStack-Serialization.patch b/patches/unapplied/server/Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/unapplied/Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/unapplied/server/Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/unapplied/Add-RegistryAccess-for-managing-Registries.patch b/patches/unapplied/server/Add-RegistryAccess-for-managing-Registries.patch similarity index 100% rename from patches/unapplied/Add-RegistryAccess-for-managing-Registries.patch rename to patches/unapplied/server/Add-RegistryAccess-for-managing-Registries.patch diff --git a/patches/unapplied/Add-ServerResourcesReloadedEvent.patch b/patches/unapplied/server/Add-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/unapplied/Add-ServerResourcesReloadedEvent.patch rename to patches/unapplied/server/Add-ServerResourcesReloadedEvent.patch diff --git a/patches/unapplied/Add-Shearable-API.patch b/patches/unapplied/server/Add-Shearable-API.patch similarity index 100% rename from patches/unapplied/Add-Shearable-API.patch rename to patches/unapplied/server/Add-Shearable-API.patch diff --git a/patches/unapplied/Add-ShulkerDuplicateEvent.patch b/patches/unapplied/server/Add-ShulkerDuplicateEvent.patch similarity index 100% rename from patches/unapplied/Add-ShulkerDuplicateEvent.patch rename to patches/unapplied/server/Add-ShulkerDuplicateEvent.patch diff --git a/patches/unapplied/Add-Sneaking-API-for-Entities.patch b/patches/unapplied/server/Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/unapplied/Add-Sneaking-API-for-Entities.patch rename to patches/unapplied/server/Add-Sneaking-API-for-Entities.patch diff --git a/patches/unapplied/Add-Structure-check-API.patch b/patches/unapplied/server/Add-Structure-check-API.patch similarity index 100% rename from patches/unapplied/Add-Structure-check-API.patch rename to patches/unapplied/server/Add-Structure-check-API.patch diff --git a/patches/unapplied/Add-StructuresLocateEvent.patch b/patches/unapplied/server/Add-StructuresLocateEvent.patch similarity index 100% rename from patches/unapplied/Add-StructuresLocateEvent.patch rename to patches/unapplied/server/Add-StructuresLocateEvent.patch diff --git a/patches/unapplied/Add-System.out-err-catcher.patch b/patches/unapplied/server/Add-System.out-err-catcher.patch similarity index 100% rename from patches/unapplied/Add-System.out-err-catcher.patch rename to patches/unapplied/server/Add-System.out-err-catcher.patch diff --git a/patches/unapplied/Add-TNTPrimeEvent.patch b/patches/unapplied/server/Add-TNTPrimeEvent.patch similarity index 100% rename from patches/unapplied/Add-TNTPrimeEvent.patch rename to patches/unapplied/server/Add-TNTPrimeEvent.patch diff --git a/patches/unapplied/Add-TameableDeathMessageEvent.patch b/patches/unapplied/server/Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/unapplied/Add-TameableDeathMessageEvent.patch rename to patches/unapplied/server/Add-TameableDeathMessageEvent.patch diff --git a/patches/unapplied/Add-TargetHitEvent.patch b/patches/unapplied/server/Add-TargetHitEvent.patch similarity index 100% rename from patches/unapplied/Add-TargetHitEvent.patch rename to patches/unapplied/server/Add-TargetHitEvent.patch diff --git a/patches/unapplied/Add-ThrownEggHatchEvent.patch b/patches/unapplied/server/Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/unapplied/Add-ThrownEggHatchEvent.patch rename to patches/unapplied/server/Add-ThrownEggHatchEvent.patch diff --git a/patches/unapplied/Add-UUID-attribute-modifier-API.patch b/patches/unapplied/server/Add-UUID-attribute-modifier-API.patch similarity index 100% rename from patches/unapplied/Add-UUID-attribute-modifier-API.patch rename to patches/unapplied/server/Add-UUID-attribute-modifier-API.patch diff --git a/patches/unapplied/Add-Unix-domain-socket-support.patch b/patches/unapplied/server/Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/unapplied/Add-Unix-domain-socket-support.patch rename to patches/unapplied/server/Add-Unix-domain-socket-support.patch diff --git a/patches/unapplied/Add-UnknownCommandEvent.patch b/patches/unapplied/server/Add-UnknownCommandEvent.patch similarity index 100% rename from patches/unapplied/Add-UnknownCommandEvent.patch rename to patches/unapplied/server/Add-UnknownCommandEvent.patch diff --git a/patches/unapplied/Add-Velocity-IP-Forwarding-Support.patch b/patches/unapplied/server/Add-Velocity-IP-Forwarding-Support.patch similarity index 100% rename from patches/unapplied/Add-Velocity-IP-Forwarding-Support.patch rename to patches/unapplied/server/Add-Velocity-IP-Forwarding-Support.patch diff --git a/patches/unapplied/Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/unapplied/server/Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from patches/unapplied/Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/unapplied/server/Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/unapplied/Add-WardenAngerChangeEvent.patch b/patches/unapplied/server/Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/unapplied/Add-WardenAngerChangeEvent.patch rename to patches/unapplied/server/Add-WardenAngerChangeEvent.patch diff --git a/patches/unapplied/Add-World-Util-Methods.patch b/patches/unapplied/server/Add-World-Util-Methods.patch similarity index 100% rename from patches/unapplied/Add-World-Util-Methods.patch rename to patches/unapplied/server/Add-World-Util-Methods.patch diff --git a/patches/unapplied/Add-WorldGameRuleChangeEvent.patch b/patches/unapplied/server/Add-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/unapplied/Add-WorldGameRuleChangeEvent.patch rename to patches/unapplied/server/Add-WorldGameRuleChangeEvent.patch diff --git a/patches/unapplied/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/unapplied/server/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/unapplied/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/unapplied/server/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/unapplied/Add-ability-to-configure-frosted_ice-properties.patch b/patches/unapplied/server/Add-ability-to-configure-frosted_ice-properties.patch similarity index 100% rename from patches/unapplied/Add-ability-to-configure-frosted_ice-properties.patch rename to patches/unapplied/server/Add-ability-to-configure-frosted_ice-properties.patch diff --git a/patches/unapplied/Add-additional-open-container-api-to-HumanEntity.patch b/patches/unapplied/server/Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/unapplied/Add-additional-open-container-api-to-HumanEntity.patch rename to patches/unapplied/server/Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/unapplied/Add-and-fix-missing-BlockFadeEvents.patch b/patches/unapplied/server/Add-and-fix-missing-BlockFadeEvents.patch similarity index 100% rename from patches/unapplied/Add-and-fix-missing-BlockFadeEvents.patch rename to patches/unapplied/server/Add-and-fix-missing-BlockFadeEvents.patch diff --git a/patches/unapplied/Add-api-for-spawn-egg-texture-colors.patch b/patches/unapplied/server/Add-api-for-spawn-egg-texture-colors.patch similarity index 100% rename from patches/unapplied/Add-api-for-spawn-egg-texture-colors.patch rename to patches/unapplied/server/Add-api-for-spawn-egg-texture-colors.patch diff --git a/patches/unapplied/Add-back-EntityPortalExitEvent.patch b/patches/unapplied/server/Add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/unapplied/Add-back-EntityPortalExitEvent.patch rename to patches/unapplied/server/Add-back-EntityPortalExitEvent.patch diff --git a/patches/unapplied/Add-basic-Datapack-API.patch b/patches/unapplied/server/Add-basic-Datapack-API.patch similarity index 100% rename from patches/unapplied/Add-basic-Datapack-API.patch rename to patches/unapplied/server/Add-basic-Datapack-API.patch diff --git a/patches/unapplied/Add-bypass-host-check.patch b/patches/unapplied/server/Add-bypass-host-check.patch similarity index 100% rename from patches/unapplied/Add-bypass-host-check.patch rename to patches/unapplied/server/Add-bypass-host-check.patch diff --git a/patches/unapplied/Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/unapplied/server/Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/unapplied/Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/unapplied/server/Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/unapplied/Add-config-for-mobs-immune-to-default-effects.patch b/patches/unapplied/server/Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/unapplied/Add-config-for-mobs-immune-to-default-effects.patch rename to patches/unapplied/server/Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/unapplied/Add-config-option-for-spider-worldborder-climbing.patch b/patches/unapplied/server/Add-config-option-for-spider-worldborder-climbing.patch similarity index 100% rename from patches/unapplied/Add-config-option-for-spider-worldborder-climbing.patch rename to patches/unapplied/server/Add-config-option-for-spider-worldborder-climbing.patch diff --git a/patches/unapplied/Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/unapplied/server/Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/unapplied/Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/unapplied/server/Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/unapplied/Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/unapplied/server/Add-config-to-disable-ender-dragon-legacy-check.patch similarity index 100% rename from patches/unapplied/Add-config-to-disable-ender-dragon-legacy-check.patch rename to patches/unapplied/server/Add-config-to-disable-ender-dragon-legacy-check.patch diff --git a/patches/unapplied/Add-configurable-entity-despawn-distances.patch b/patches/unapplied/server/Add-configurable-entity-despawn-distances.patch similarity index 100% rename from patches/unapplied/Add-configurable-entity-despawn-distances.patch rename to patches/unapplied/server/Add-configurable-entity-despawn-distances.patch diff --git a/patches/unapplied/Add-configurable-height-for-slime-spawn.patch b/patches/unapplied/server/Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/unapplied/Add-configurable-height-for-slime-spawn.patch rename to patches/unapplied/server/Add-configurable-height-for-slime-spawn.patch diff --git a/patches/unapplied/Add-configurable-portal-search-radius.patch b/patches/unapplied/server/Add-configurable-portal-search-radius.patch similarity index 100% rename from patches/unapplied/Add-configurable-portal-search-radius.patch rename to patches/unapplied/server/Add-configurable-portal-search-radius.patch diff --git a/patches/unapplied/Add-configuration-option-to-prevent-player-names-fro.patch b/patches/unapplied/server/Add-configuration-option-to-prevent-player-names-fro.patch similarity index 100% rename from patches/unapplied/Add-configuration-option-to-prevent-player-names-fro.patch rename to patches/unapplied/server/Add-configuration-option-to-prevent-player-names-fro.patch diff --git a/patches/unapplied/Add-critical-damage-API.patch b/patches/unapplied/server/Add-critical-damage-API.patch similarity index 100% rename from patches/unapplied/Add-critical-damage-API.patch rename to patches/unapplied/server/Add-critical-damage-API.patch diff --git a/patches/unapplied/Add-debug-for-sync-chunk-loads.patch b/patches/unapplied/server/Add-debug-for-sync-chunk-loads.patch similarity index 100% rename from patches/unapplied/Add-debug-for-sync-chunk-loads.patch rename to patches/unapplied/server/Add-debug-for-sync-chunk-loads.patch diff --git a/patches/unapplied/Add-drops-to-shear-events.patch b/patches/unapplied/server/Add-drops-to-shear-events.patch similarity index 100% rename from patches/unapplied/Add-drops-to-shear-events.patch rename to patches/unapplied/server/Add-drops-to-shear-events.patch diff --git a/patches/unapplied/Add-enchantWithLevels-with-enchantment-registry-set.patch b/patches/unapplied/server/Add-enchantWithLevels-with-enchantment-registry-set.patch similarity index 100% rename from patches/unapplied/Add-enchantWithLevels-with-enchantment-registry-set.patch rename to patches/unapplied/server/Add-enchantWithLevels-with-enchantment-registry-set.patch diff --git a/patches/unapplied/Add-enchantment-seed-update-API.patch b/patches/unapplied/server/Add-enchantment-seed-update-API.patch similarity index 100% rename from patches/unapplied/Add-enchantment-seed-update-API.patch rename to patches/unapplied/server/Add-enchantment-seed-update-API.patch diff --git a/patches/unapplied/Add-entity-knockback-API.patch b/patches/unapplied/server/Add-entity-knockback-API.patch similarity index 100% rename from patches/unapplied/Add-entity-knockback-API.patch rename to patches/unapplied/server/Add-entity-knockback-API.patch diff --git a/patches/unapplied/Add-entity-knockback-events.patch b/patches/unapplied/server/Add-entity-knockback-events.patch similarity index 100% rename from patches/unapplied/Add-entity-knockback-events.patch rename to patches/unapplied/server/Add-entity-knockback-events.patch diff --git a/patches/unapplied/Add-entity-liquid-API.patch b/patches/unapplied/server/Add-entity-liquid-API.patch similarity index 100% rename from patches/unapplied/Add-entity-liquid-API.patch rename to patches/unapplied/server/Add-entity-liquid-API.patch diff --git a/patches/unapplied/Add-environment-variable-to-disable-server-gui.patch b/patches/unapplied/server/Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/unapplied/Add-environment-variable-to-disable-server-gui.patch rename to patches/unapplied/server/Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/unapplied/Add-even-more-Enchantment-API.patch b/patches/unapplied/server/Add-even-more-Enchantment-API.patch similarity index 100% rename from patches/unapplied/Add-even-more-Enchantment-API.patch rename to patches/unapplied/server/Add-even-more-Enchantment-API.patch diff --git a/patches/unapplied/Add-event-for-player-editing-sign.patch b/patches/unapplied/server/Add-event-for-player-editing-sign.patch similarity index 100% rename from patches/unapplied/Add-event-for-player-editing-sign.patch rename to patches/unapplied/server/Add-event-for-player-editing-sign.patch diff --git a/patches/unapplied/Add-exception-reporting-event.patch b/patches/unapplied/server/Add-exception-reporting-event.patch similarity index 100% rename from patches/unapplied/Add-exception-reporting-event.patch rename to patches/unapplied/server/Add-exception-reporting-event.patch diff --git a/patches/unapplied/Add-experience-points-API.patch b/patches/unapplied/server/Add-experience-points-API.patch similarity index 100% rename from patches/unapplied/Add-experience-points-API.patch rename to patches/unapplied/server/Add-experience-points-API.patch diff --git a/patches/unapplied/Add-fast-alternative-constructor-for-Rotations.patch b/patches/unapplied/server/Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/unapplied/Add-fast-alternative-constructor-for-Rotations.patch rename to patches/unapplied/server/Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/unapplied/Add-fire-tick-delay-option.patch b/patches/unapplied/server/Add-fire-tick-delay-option.patch similarity index 100% rename from patches/unapplied/Add-fire-tick-delay-option.patch rename to patches/unapplied/server/Add-fire-tick-delay-option.patch diff --git a/patches/unapplied/Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/unapplied/server/Add-getChunkSnapshot-includeLightData-parameter.patch similarity index 100% rename from patches/unapplied/Add-getChunkSnapshot-includeLightData-parameter.patch rename to patches/unapplied/server/Add-getChunkSnapshot-includeLightData-parameter.patch diff --git a/patches/unapplied/Add-getDrops-to-BlockState.patch b/patches/unapplied/server/Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/unapplied/Add-getDrops-to-BlockState.patch rename to patches/unapplied/server/Add-getDrops-to-BlockState.patch diff --git a/patches/unapplied/Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/unapplied/server/Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/unapplied/Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/unapplied/server/Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/unapplied/Add-getOfflinePlayerIfCached-String.patch b/patches/unapplied/server/Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/unapplied/Add-getOfflinePlayerIfCached-String.patch rename to patches/unapplied/server/Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/unapplied/Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/unapplied/server/Add-hand-to-fish-event-for-all-player-interactions.patch similarity index 100% rename from patches/unapplied/Add-hand-to-fish-event-for-all-player-interactions.patch rename to patches/unapplied/server/Add-hand-to-fish-event-for-all-player-interactions.patch diff --git a/patches/unapplied/Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/unapplied/server/Add-handshake-event-to-allow-plugins-to-handle-clien.patch similarity index 100% rename from patches/unapplied/Add-handshake-event-to-allow-plugins-to-handle-clien.patch rename to patches/unapplied/server/Add-handshake-event-to-allow-plugins-to-handle-clien.patch diff --git a/patches/unapplied/Add-hasCollision-methods-to-various-places.patch b/patches/unapplied/server/Add-hasCollision-methods-to-various-places.patch similarity index 100% rename from patches/unapplied/Add-hasCollision-methods-to-various-places.patch rename to patches/unapplied/server/Add-hasCollision-methods-to-various-places.patch diff --git a/patches/unapplied/Add-ignore-discounts-API.patch b/patches/unapplied/server/Add-ignore-discounts-API.patch similarity index 100% rename from patches/unapplied/Add-ignore-discounts-API.patch rename to patches/unapplied/server/Add-ignore-discounts-API.patch diff --git a/patches/unapplied/Add-method-to-remove-all-active-potion-effects.patch b/patches/unapplied/server/Add-method-to-remove-all-active-potion-effects.patch similarity index 100% rename from patches/unapplied/Add-method-to-remove-all-active-potion-effects.patch rename to patches/unapplied/server/Add-method-to-remove-all-active-potion-effects.patch diff --git a/patches/unapplied/Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/unapplied/server/Add-methods-for-working-with-arrows-stuck-in-living-.patch similarity index 100% rename from patches/unapplied/Add-methods-for-working-with-arrows-stuck-in-living-.patch rename to patches/unapplied/server/Add-methods-for-working-with-arrows-stuck-in-living-.patch diff --git a/patches/unapplied/Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/unapplied/server/Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/unapplied/Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/unapplied/server/Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/unapplied/Add-methods-to-get-translation-keys.patch b/patches/unapplied/server/Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/unapplied/Add-methods-to-get-translation-keys.patch rename to patches/unapplied/server/Add-methods-to-get-translation-keys.patch diff --git a/patches/unapplied/Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/unapplied/server/Add-missing-IAE-check-for-PersistentDataContainer-ha.patch similarity index 100% rename from patches/unapplied/Add-missing-IAE-check-for-PersistentDataContainer-ha.patch rename to patches/unapplied/server/Add-missing-IAE-check-for-PersistentDataContainer-ha.patch diff --git a/patches/unapplied/Add-missing-InventoryHolders-to-inventories.patch b/patches/unapplied/server/Add-missing-InventoryHolders-to-inventories.patch similarity index 100% rename from patches/unapplied/Add-missing-InventoryHolders-to-inventories.patch rename to patches/unapplied/server/Add-missing-InventoryHolders-to-inventories.patch diff --git a/patches/unapplied/Add-missing-InventoryType.patch b/patches/unapplied/server/Add-missing-InventoryType.patch similarity index 100% rename from patches/unapplied/Add-missing-InventoryType.patch rename to patches/unapplied/server/Add-missing-InventoryType.patch diff --git a/patches/unapplied/Add-missing-SpigotConfig-logCommands-check.patch b/patches/unapplied/server/Add-missing-SpigotConfig-logCommands-check.patch similarity index 100% rename from patches/unapplied/Add-missing-SpigotConfig-logCommands-check.patch rename to patches/unapplied/server/Add-missing-SpigotConfig-logCommands-check.patch diff --git a/patches/unapplied/Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/unapplied/server/Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 100% rename from patches/unapplied/Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/unapplied/server/Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch diff --git a/patches/unapplied/Add-missing-block-data-API.patch b/patches/unapplied/server/Add-missing-block-data-API.patch similarity index 100% rename from patches/unapplied/Add-missing-block-data-API.patch rename to patches/unapplied/server/Add-missing-block-data-API.patch diff --git a/patches/unapplied/Add-missing-default-perms-for-commands.patch b/patches/unapplied/server/Add-missing-default-perms-for-commands.patch similarity index 100% rename from patches/unapplied/Add-missing-default-perms-for-commands.patch rename to patches/unapplied/server/Add-missing-default-perms-for-commands.patch diff --git a/patches/unapplied/Add-missing-fishing-event-state.patch b/patches/unapplied/server/Add-missing-fishing-event-state.patch similarity index 100% rename from patches/unapplied/Add-missing-fishing-event-state.patch rename to patches/unapplied/server/Add-missing-fishing-event-state.patch diff --git a/patches/unapplied/Add-missing-forceDrop-toggles.patch b/patches/unapplied/server/Add-missing-forceDrop-toggles.patch similarity index 100% rename from patches/unapplied/Add-missing-forceDrop-toggles.patch rename to patches/unapplied/server/Add-missing-forceDrop-toggles.patch diff --git a/patches/unapplied/Add-missing-important-BlockStateListPopulator-method.patch b/patches/unapplied/server/Add-missing-important-BlockStateListPopulator-method.patch similarity index 100% rename from patches/unapplied/Add-missing-important-BlockStateListPopulator-method.patch rename to patches/unapplied/server/Add-missing-important-BlockStateListPopulator-method.patch diff --git a/patches/unapplied/Add-missing-logs-for-log-ips-config-option.patch b/patches/unapplied/server/Add-missing-logs-for-log-ips-config-option.patch similarity index 100% rename from patches/unapplied/Add-missing-logs-for-log-ips-config-option.patch rename to patches/unapplied/server/Add-missing-logs-for-log-ips-config-option.patch diff --git a/patches/unapplied/Add-missing-structure-set-seed-configs.patch b/patches/unapplied/server/Add-missing-structure-set-seed-configs.patch similarity index 100% rename from patches/unapplied/Add-missing-structure-set-seed-configs.patch rename to patches/unapplied/server/Add-missing-structure-set-seed-configs.patch diff --git a/patches/unapplied/Add-missing-team-sidebar-display-slots.patch b/patches/unapplied/server/Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/unapplied/Add-missing-team-sidebar-display-slots.patch rename to patches/unapplied/server/Add-missing-team-sidebar-display-slots.patch diff --git a/patches/unapplied/Add-moon-phase-API.patch b/patches/unapplied/server/Add-moon-phase-API.patch similarity index 100% rename from patches/unapplied/Add-moon-phase-API.patch rename to patches/unapplied/server/Add-moon-phase-API.patch diff --git a/patches/unapplied/Add-more-Campfire-API.patch b/patches/unapplied/server/Add-more-Campfire-API.patch similarity index 100% rename from patches/unapplied/Add-more-Campfire-API.patch rename to patches/unapplied/server/Add-more-Campfire-API.patch diff --git a/patches/unapplied/Add-more-Evoker-API.patch b/patches/unapplied/server/Add-more-Evoker-API.patch similarity index 100% rename from patches/unapplied/Add-more-Evoker-API.patch rename to patches/unapplied/server/Add-more-Evoker-API.patch diff --git a/patches/unapplied/Add-more-LimitedRegion-API.patch b/patches/unapplied/server/Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/unapplied/Add-more-LimitedRegion-API.patch rename to patches/unapplied/server/Add-more-LimitedRegion-API.patch diff --git a/patches/unapplied/Add-more-WanderingTrader-API.patch b/patches/unapplied/server/Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/unapplied/Add-more-WanderingTrader-API.patch rename to patches/unapplied/server/Add-more-WanderingTrader-API.patch diff --git a/patches/unapplied/Add-more-Witch-API.patch b/patches/unapplied/server/Add-more-Witch-API.patch similarity index 100% rename from patches/unapplied/Add-more-Witch-API.patch rename to patches/unapplied/server/Add-more-Witch-API.patch diff --git a/patches/unapplied/Add-more-Zombie-API.patch b/patches/unapplied/server/Add-more-Zombie-API.patch similarity index 100% rename from patches/unapplied/Add-more-Zombie-API.patch rename to patches/unapplied/server/Add-more-Zombie-API.patch diff --git a/patches/unapplied/Add-more-advancement-API.patch b/patches/unapplied/server/Add-more-advancement-API.patch similarity index 100% rename from patches/unapplied/Add-more-advancement-API.patch rename to patches/unapplied/server/Add-more-advancement-API.patch diff --git a/patches/unapplied/Add-more-entities-to-activation-range-ignore-list.patch b/patches/unapplied/server/Add-more-entities-to-activation-range-ignore-list.patch similarity index 100% rename from patches/unapplied/Add-more-entities-to-activation-range-ignore-list.patch rename to patches/unapplied/server/Add-more-entities-to-activation-range-ignore-list.patch diff --git a/patches/unapplied/Add-more-fields-to-AsyncPreLoginEvent.patch b/patches/unapplied/server/Add-more-fields-to-AsyncPreLoginEvent.patch similarity index 100% rename from patches/unapplied/Add-more-fields-to-AsyncPreLoginEvent.patch rename to patches/unapplied/server/Add-more-fields-to-AsyncPreLoginEvent.patch diff --git a/patches/unapplied/Add-onboarding-message-for-initial-server-start.patch b/patches/unapplied/server/Add-onboarding-message-for-initial-server-start.patch similarity index 100% rename from patches/unapplied/Add-onboarding-message-for-initial-server-start.patch rename to patches/unapplied/server/Add-onboarding-message-for-initial-server-start.patch diff --git a/patches/unapplied/Add-openSign-method-to-HumanEntity.patch b/patches/unapplied/server/Add-openSign-method-to-HumanEntity.patch similarity index 100% rename from patches/unapplied/Add-openSign-method-to-HumanEntity.patch rename to patches/unapplied/server/Add-openSign-method-to-HumanEntity.patch diff --git a/patches/unapplied/Add-option-for-console-having-all-permissions.patch b/patches/unapplied/server/Add-option-for-console-having-all-permissions.patch similarity index 100% rename from patches/unapplied/Add-option-for-console-having-all-permissions.patch rename to patches/unapplied/server/Add-option-for-console-having-all-permissions.patch diff --git a/patches/unapplied/Add-option-for-strict-advancement-dimension-checks.patch b/patches/unapplied/server/Add-option-for-strict-advancement-dimension-checks.patch similarity index 100% rename from patches/unapplied/Add-option-for-strict-advancement-dimension-checks.patch rename to patches/unapplied/server/Add-option-for-strict-advancement-dimension-checks.patch diff --git a/patches/unapplied/Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/unapplied/server/Add-option-to-allow-iron-golems-to-spawn-in-air.patch similarity index 100% rename from patches/unapplied/Add-option-to-allow-iron-golems-to-spawn-in-air.patch rename to patches/unapplied/server/Add-option-to-allow-iron-golems-to-spawn-in-air.patch diff --git a/patches/unapplied/Add-option-to-disable-block-updates.patch b/patches/unapplied/server/Add-option-to-disable-block-updates.patch similarity index 100% rename from patches/unapplied/Add-option-to-disable-block-updates.patch rename to patches/unapplied/server/Add-option-to-disable-block-updates.patch diff --git a/patches/unapplied/Add-option-to-disable-pillager-patrols.patch b/patches/unapplied/server/Add-option-to-disable-pillager-patrols.patch similarity index 100% rename from patches/unapplied/Add-option-to-disable-pillager-patrols.patch rename to patches/unapplied/server/Add-option-to-disable-pillager-patrols.patch diff --git a/patches/unapplied/Add-option-to-fix-items-merging-through-walls.patch b/patches/unapplied/server/Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/unapplied/Add-option-to-fix-items-merging-through-walls.patch rename to patches/unapplied/server/Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/unapplied/Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/unapplied/server/Add-option-to-make-parrots-stay-on-shoulders-despite.patch similarity index 100% rename from patches/unapplied/Add-option-to-make-parrots-stay-on-shoulders-despite.patch rename to patches/unapplied/server/Add-option-to-make-parrots-stay-on-shoulders-despite.patch diff --git a/patches/unapplied/Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/unapplied/server/Add-option-to-nerf-pigmen-from-nether-portals.patch similarity index 100% rename from patches/unapplied/Add-option-to-nerf-pigmen-from-nether-portals.patch rename to patches/unapplied/server/Add-option-to-nerf-pigmen-from-nether-portals.patch diff --git a/patches/unapplied/Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/unapplied/server/Add-option-to-prevent-players-from-moving-into-unloa.patch similarity index 100% rename from patches/unapplied/Add-option-to-prevent-players-from-moving-into-unloa.patch rename to patches/unapplied/server/Add-option-to-prevent-players-from-moving-into-unloa.patch diff --git a/patches/unapplied/Add-packet-limiter-config.patch b/patches/unapplied/server/Add-packet-limiter-config.patch similarity index 100% rename from patches/unapplied/Add-packet-limiter-config.patch rename to patches/unapplied/server/Add-packet-limiter-config.patch diff --git a/patches/unapplied/Add-paper-dumplisteners-command.patch b/patches/unapplied/server/Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/unapplied/Add-paper-dumplisteners-command.patch rename to patches/unapplied/server/Add-paper-dumplisteners-command.patch diff --git a/patches/unapplied/Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/unapplied/server/Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 100% rename from patches/unapplied/Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/unapplied/server/Add-paper-mobcaps-and-paper-playermobcaps.patch diff --git a/patches/unapplied/Add-permission-for-command-blocks.patch b/patches/unapplied/server/Add-permission-for-command-blocks.patch similarity index 100% rename from patches/unapplied/Add-permission-for-command-blocks.patch rename to patches/unapplied/server/Add-permission-for-command-blocks.patch diff --git a/patches/unapplied/Add-phantom-creative-and-insomniac-controls.patch b/patches/unapplied/server/Add-phantom-creative-and-insomniac-controls.patch similarity index 100% rename from patches/unapplied/Add-phantom-creative-and-insomniac-controls.patch rename to patches/unapplied/server/Add-phantom-creative-and-insomniac-controls.patch diff --git a/patches/unapplied/Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/unapplied/server/Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/unapplied/Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/unapplied/server/Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/unapplied/Add-player-idle-duration-API.patch b/patches/unapplied/server/Add-player-idle-duration-API.patch similarity index 100% rename from patches/unapplied/Add-player-idle-duration-API.patch rename to patches/unapplied/server/Add-player-idle-duration-API.patch diff --git a/patches/unapplied/Add-plugin-info-at-startup.patch b/patches/unapplied/server/Add-plugin-info-at-startup.patch similarity index 100% rename from patches/unapplied/Add-plugin-info-at-startup.patch rename to patches/unapplied/server/Add-plugin-info-at-startup.patch diff --git a/patches/unapplied/Add-predicate-for-blocks-when-raytracing.patch b/patches/unapplied/server/Add-predicate-for-blocks-when-raytracing.patch similarity index 100% rename from patches/unapplied/Add-predicate-for-blocks-when-raytracing.patch rename to patches/unapplied/server/Add-predicate-for-blocks-when-raytracing.patch diff --git a/patches/unapplied/Add-proper-async-player-disconnections.patch b/patches/unapplied/server/Add-proper-async-player-disconnections.patch similarity index 100% rename from patches/unapplied/Add-proper-async-player-disconnections.patch rename to patches/unapplied/server/Add-proper-async-player-disconnections.patch diff --git a/patches/unapplied/Add-ray-tracing-methods-to-LivingEntity.patch b/patches/unapplied/server/Add-ray-tracing-methods-to-LivingEntity.patch similarity index 100% rename from patches/unapplied/Add-ray-tracing-methods-to-LivingEntity.patch rename to patches/unapplied/server/Add-ray-tracing-methods-to-LivingEntity.patch diff --git a/patches/unapplied/Add-recipe-to-cook-events.patch b/patches/unapplied/server/Add-recipe-to-cook-events.patch similarity index 100% rename from patches/unapplied/Add-recipe-to-cook-events.patch rename to patches/unapplied/server/Add-recipe-to-cook-events.patch diff --git a/patches/unapplied/Add-recipeBrewTime.patch b/patches/unapplied/server/Add-recipeBrewTime.patch similarity index 100% rename from patches/unapplied/Add-recipeBrewTime.patch rename to patches/unapplied/server/Add-recipeBrewTime.patch diff --git a/patches/unapplied/Add-registry-entry-and-builders.patch b/patches/unapplied/server/Add-registry-entry-and-builders.patch similarity index 100% rename from patches/unapplied/Add-registry-entry-and-builders.patch rename to patches/unapplied/server/Add-registry-entry-and-builders.patch diff --git a/patches/unapplied/Add-root-admin-user-detection.patch b/patches/unapplied/server/Add-root-admin-user-detection.patch similarity index 100% rename from patches/unapplied/Add-root-admin-user-detection.patch rename to patches/unapplied/server/Add-root-admin-user-detection.patch diff --git a/patches/unapplied/Add-sendOpLevel-API.patch b/patches/unapplied/server/Add-sendOpLevel-API.patch similarity index 100% rename from patches/unapplied/Add-sendOpLevel-API.patch rename to patches/unapplied/server/Add-sendOpLevel-API.patch diff --git a/patches/unapplied/Add-server-name-parameter.patch b/patches/unapplied/server/Add-server-name-parameter.patch similarity index 100% rename from patches/unapplied/Add-server-name-parameter.patch rename to patches/unapplied/server/Add-server-name-parameter.patch diff --git a/patches/unapplied/Add-setPlayerProfile-API-for-Skulls.patch b/patches/unapplied/server/Add-setPlayerProfile-API-for-Skulls.patch similarity index 100% rename from patches/unapplied/Add-setPlayerProfile-API-for-Skulls.patch rename to patches/unapplied/server/Add-setPlayerProfile-API-for-Skulls.patch diff --git a/patches/unapplied/Add-setting-for-proxy-online-mode-status.patch b/patches/unapplied/server/Add-setting-for-proxy-online-mode-status.patch similarity index 100% rename from patches/unapplied/Add-setting-for-proxy-online-mode-status.patch rename to patches/unapplied/server/Add-setting-for-proxy-online-mode-status.patch diff --git a/patches/unapplied/Add-skipping-world-symlink-scan.patch b/patches/unapplied/server/Add-skipping-world-symlink-scan.patch similarity index 100% rename from patches/unapplied/Add-skipping-world-symlink-scan.patch rename to patches/unapplied/server/Add-skipping-world-symlink-scan.patch diff --git a/patches/unapplied/Add-slot-sanity-checks-in-container-clicks.patch b/patches/unapplied/server/Add-slot-sanity-checks-in-container-clicks.patch similarity index 100% rename from patches/unapplied/Add-slot-sanity-checks-in-container-clicks.patch rename to patches/unapplied/server/Add-slot-sanity-checks-in-container-clicks.patch diff --git a/patches/unapplied/Add-source-to-PlayerExpChangeEvent.patch b/patches/unapplied/server/Add-source-to-PlayerExpChangeEvent.patch similarity index 100% rename from patches/unapplied/Add-source-to-PlayerExpChangeEvent.patch rename to patches/unapplied/server/Add-source-to-PlayerExpChangeEvent.patch diff --git a/patches/unapplied/Add-sun-related-API.patch b/patches/unapplied/server/Add-sun-related-API.patch similarity index 100% rename from patches/unapplied/Add-sun-related-API.patch rename to patches/unapplied/server/Add-sun-related-API.patch diff --git a/patches/unapplied/Add-support-for-Proxy-Protocol.patch b/patches/unapplied/server/Add-support-for-Proxy-Protocol.patch similarity index 100% rename from patches/unapplied/Add-support-for-Proxy-Protocol.patch rename to patches/unapplied/server/Add-support-for-Proxy-Protocol.patch diff --git a/patches/unapplied/Add-tick-times-API-and-mspt-command.patch b/patches/unapplied/server/Add-tick-times-API-and-mspt-command.patch similarity index 100% rename from patches/unapplied/Add-tick-times-API-and-mspt-command.patch rename to patches/unapplied/server/Add-tick-times-API-and-mspt-command.patch diff --git a/patches/unapplied/Add-titleOverride-to-InventoryOpenEvent.patch b/patches/unapplied/server/Add-titleOverride-to-InventoryOpenEvent.patch similarity index 100% rename from patches/unapplied/Add-titleOverride-to-InventoryOpenEvent.patch rename to patches/unapplied/server/Add-titleOverride-to-InventoryOpenEvent.patch diff --git a/patches/unapplied/Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/unapplied/server/Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/unapplied/Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/unapplied/server/Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/unapplied/Add-transient-modifier-API.patch b/patches/unapplied/server/Add-transient-modifier-API.patch similarity index 100% rename from patches/unapplied/Add-transient-modifier-API.patch rename to patches/unapplied/server/Add-transient-modifier-API.patch diff --git a/patches/unapplied/Add-various-missing-EntityDropItemEvent-calls.patch b/patches/unapplied/server/Add-various-missing-EntityDropItemEvent-calls.patch similarity index 100% rename from patches/unapplied/Add-various-missing-EntityDropItemEvent-calls.patch rename to patches/unapplied/server/Add-various-missing-EntityDropItemEvent-calls.patch diff --git a/patches/unapplied/Add-velocity-warnings.patch b/patches/unapplied/server/Add-velocity-warnings.patch similarity index 100% rename from patches/unapplied/Add-velocity-warnings.patch rename to patches/unapplied/server/Add-velocity-warnings.patch diff --git a/patches/unapplied/Add-villager-reputation-API.patch b/patches/unapplied/server/Add-villager-reputation-API.patch similarity index 100% rename from patches/unapplied/Add-villager-reputation-API.patch rename to patches/unapplied/server/Add-villager-reputation-API.patch diff --git a/patches/unapplied/Add-whitelist-events.patch b/patches/unapplied/server/Add-whitelist-events.patch similarity index 100% rename from patches/unapplied/Add-whitelist-events.patch rename to patches/unapplied/server/Add-whitelist-events.patch diff --git a/patches/unapplied/Add-world-settings-for-mobs-picking-up-loot.patch b/patches/unapplied/server/Add-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from patches/unapplied/Add-world-settings-for-mobs-picking-up-loot.patch rename to patches/unapplied/server/Add-world-settings-for-mobs-picking-up-loot.patch diff --git a/patches/unapplied/Add-worldborder-events.patch b/patches/unapplied/server/Add-worldborder-events.patch similarity index 100% rename from patches/unapplied/Add-worldborder-events.patch rename to patches/unapplied/server/Add-worldborder-events.patch diff --git a/patches/unapplied/Add-zombie-targets-turtle-egg-config.patch b/patches/unapplied/server/Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from patches/unapplied/Add-zombie-targets-turtle-egg-config.patch rename to patches/unapplied/server/Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/unapplied/Added-API-to-get-player-ha-proxy-address.patch b/patches/unapplied/server/Added-API-to-get-player-ha-proxy-address.patch similarity index 100% rename from patches/unapplied/Added-API-to-get-player-ha-proxy-address.patch rename to patches/unapplied/server/Added-API-to-get-player-ha-proxy-address.patch diff --git a/patches/unapplied/Added-byte-array-serialization-deserialization-for-P.patch b/patches/unapplied/server/Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/unapplied/Added-byte-array-serialization-deserialization-for-P.patch rename to patches/unapplied/server/Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/unapplied/Additional-Block-Material-API.patch b/patches/unapplied/server/Additional-Block-Material-API.patch similarity index 100% rename from patches/unapplied/Additional-Block-Material-API.patch rename to patches/unapplied/server/Additional-Block-Material-API.patch diff --git a/patches/unapplied/Adopt-MaterialRerouting.patch b/patches/unapplied/server/Adopt-MaterialRerouting.patch similarity index 100% rename from patches/unapplied/Adopt-MaterialRerouting.patch rename to patches/unapplied/server/Adopt-MaterialRerouting.patch diff --git a/patches/unapplied/All-chunks-are-slime-spawn-chunks-toggle.patch b/patches/unapplied/server/All-chunks-are-slime-spawn-chunks-toggle.patch similarity index 100% rename from patches/unapplied/All-chunks-are-slime-spawn-chunks-toggle.patch rename to patches/unapplied/server/All-chunks-are-slime-spawn-chunks-toggle.patch diff --git a/patches/unapplied/Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/unapplied/server/Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch similarity index 100% rename from patches/unapplied/Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch rename to patches/unapplied/server/Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch diff --git a/patches/unapplied/Allow-Reloading-of-Command-Aliases.patch b/patches/unapplied/server/Allow-Reloading-of-Command-Aliases.patch similarity index 100% rename from patches/unapplied/Allow-Reloading-of-Command-Aliases.patch rename to patches/unapplied/server/Allow-Reloading-of-Command-Aliases.patch diff --git a/patches/unapplied/Allow-Reloading-of-Custom-Permissions.patch b/patches/unapplied/server/Allow-Reloading-of-Custom-Permissions.patch similarity index 100% rename from patches/unapplied/Allow-Reloading-of-Custom-Permissions.patch rename to patches/unapplied/server/Allow-Reloading-of-Custom-Permissions.patch diff --git a/patches/unapplied/Allow-Saving-of-Oversized-Chunks.patch b/patches/unapplied/server/Allow-Saving-of-Oversized-Chunks.patch similarity index 100% rename from patches/unapplied/Allow-Saving-of-Oversized-Chunks.patch rename to patches/unapplied/server/Allow-Saving-of-Oversized-Chunks.patch diff --git a/patches/unapplied/Allow-adding-items-to-BlockDropItemEvent.patch b/patches/unapplied/server/Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/unapplied/Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/unapplied/server/Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/unapplied/Allow-changing-the-EnderDragon-podium.patch b/patches/unapplied/server/Allow-changing-the-EnderDragon-podium.patch similarity index 100% rename from patches/unapplied/Allow-changing-the-EnderDragon-podium.patch rename to patches/unapplied/server/Allow-changing-the-EnderDragon-podium.patch diff --git a/patches/unapplied/Allow-chests-to-be-placed-with-NBT-data.patch b/patches/unapplied/server/Allow-chests-to-be-placed-with-NBT-data.patch similarity index 100% rename from patches/unapplied/Allow-chests-to-be-placed-with-NBT-data.patch rename to patches/unapplied/server/Allow-chests-to-be-placed-with-NBT-data.patch diff --git a/patches/unapplied/Allow-disabling-armor-stand-ticking.patch b/patches/unapplied/server/Allow-disabling-armor-stand-ticking.patch similarity index 100% rename from patches/unapplied/Allow-disabling-armor-stand-ticking.patch rename to patches/unapplied/server/Allow-disabling-armor-stand-ticking.patch diff --git a/patches/unapplied/Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/unapplied/server/Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/unapplied/Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/unapplied/server/Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/unapplied/Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/unapplied/server/Allow-null-itemstack-for-Player-sendEquipmentChange.patch similarity index 100% rename from patches/unapplied/Allow-null-itemstack-for-Player-sendEquipmentChange.patch rename to patches/unapplied/server/Allow-null-itemstack-for-Player-sendEquipmentChange.patch diff --git a/patches/unapplied/Allow-proper-checking-of-empty-item-stacks.patch b/patches/unapplied/server/Allow-proper-checking-of-empty-item-stacks.patch similarity index 100% rename from patches/unapplied/Allow-proper-checking-of-empty-item-stacks.patch rename to patches/unapplied/server/Allow-proper-checking-of-empty-item-stacks.patch diff --git a/patches/unapplied/Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/unapplied/server/Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/unapplied/Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/unapplied/server/Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/unapplied/Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/unapplied/server/Allow-specifying-a-custom-authentication-servers-dow.patch similarity index 100% rename from patches/unapplied/Allow-specifying-a-custom-authentication-servers-dow.patch rename to patches/unapplied/server/Allow-specifying-a-custom-authentication-servers-dow.patch diff --git a/patches/unapplied/Allow-trident-custom-damage.patch b/patches/unapplied/server/Allow-trident-custom-damage.patch similarity index 100% rename from patches/unapplied/Allow-trident-custom-damage.patch rename to patches/unapplied/server/Allow-trident-custom-damage.patch diff --git a/patches/unapplied/Allow-using-signs-inside-spawn-protection.patch b/patches/unapplied/server/Allow-using-signs-inside-spawn-protection.patch similarity index 100% rename from patches/unapplied/Allow-using-signs-inside-spawn-protection.patch rename to patches/unapplied/server/Allow-using-signs-inside-spawn-protection.patch diff --git a/patches/unapplied/Alternative-item-despawn-rate.patch b/patches/unapplied/server/Alternative-item-despawn-rate.patch similarity index 100% rename from patches/unapplied/Alternative-item-despawn-rate.patch rename to patches/unapplied/server/Alternative-item-despawn-rate.patch diff --git a/patches/unapplied/Always-send-Banner-patterns-to-the-client.patch b/patches/unapplied/server/Always-send-Banner-patterns-to-the-client.patch similarity index 100% rename from patches/unapplied/Always-send-Banner-patterns-to-the-client.patch rename to patches/unapplied/server/Always-send-Banner-patterns-to-the-client.patch diff --git a/patches/unapplied/Anti-Xray.patch b/patches/unapplied/server/Anti-Xray.patch similarity index 100% rename from patches/unapplied/Anti-Xray.patch rename to patches/unapplied/server/Anti-Xray.patch diff --git a/patches/unapplied/AnvilDamageEvent.patch b/patches/unapplied/server/AnvilDamageEvent.patch similarity index 100% rename from patches/unapplied/AnvilDamageEvent.patch rename to patches/unapplied/server/AnvilDamageEvent.patch diff --git a/patches/unapplied/Async-GameProfileCache-saving.patch b/patches/unapplied/server/Async-GameProfileCache-saving.patch similarity index 100% rename from patches/unapplied/Async-GameProfileCache-saving.patch rename to patches/unapplied/server/Async-GameProfileCache-saving.patch diff --git a/patches/unapplied/Async-command-map-building.patch b/patches/unapplied/server/Async-command-map-building.patch similarity index 100% rename from patches/unapplied/Async-command-map-building.patch rename to patches/unapplied/server/Async-command-map-building.patch diff --git a/patches/unapplied/AsyncTabCompleteEvent.patch b/patches/unapplied/server/AsyncTabCompleteEvent.patch similarity index 100% rename from patches/unapplied/AsyncTabCompleteEvent.patch rename to patches/unapplied/server/AsyncTabCompleteEvent.patch diff --git a/patches/unapplied/Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/unapplied/server/Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/unapplied/Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/unapplied/server/Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/unapplied/Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/unapplied/server/Avoid-Lazy-Initialization-for-Enum-Fields.patch similarity index 100% rename from patches/unapplied/Avoid-Lazy-Initialization-for-Enum-Fields.patch rename to patches/unapplied/server/Avoid-Lazy-Initialization-for-Enum-Fields.patch diff --git a/patches/unapplied/Avoid-blocking-on-Network-Manager-creation.patch b/patches/unapplied/server/Avoid-blocking-on-Network-Manager-creation.patch similarity index 100% rename from patches/unapplied/Avoid-blocking-on-Network-Manager-creation.patch rename to patches/unapplied/server/Avoid-blocking-on-Network-Manager-creation.patch diff --git a/patches/unapplied/Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/unapplied/server/Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 100% rename from patches/unapplied/Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to patches/unapplied/server/Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/patches/unapplied/Bandaid-fix-for-Effect.patch b/patches/unapplied/server/Bandaid-fix-for-Effect.patch similarity index 100% rename from patches/unapplied/Bandaid-fix-for-Effect.patch rename to patches/unapplied/server/Bandaid-fix-for-Effect.patch diff --git a/patches/unapplied/Basic-PlayerProfile-API.patch b/patches/unapplied/server/Basic-PlayerProfile-API.patch similarity index 100% rename from patches/unapplied/Basic-PlayerProfile-API.patch rename to patches/unapplied/server/Basic-PlayerProfile-API.patch diff --git a/patches/unapplied/Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/unapplied/server/Be-a-bit-more-informative-in-maxHealth-exception.patch similarity index 100% rename from patches/unapplied/Be-a-bit-more-informative-in-maxHealth-exception.patch rename to patches/unapplied/server/Be-a-bit-more-informative-in-maxHealth-exception.patch diff --git a/patches/unapplied/Beacon-API-custom-effect-ranges.patch b/patches/unapplied/server/Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/unapplied/Beacon-API-custom-effect-ranges.patch rename to patches/unapplied/server/Beacon-API-custom-effect-ranges.patch diff --git a/patches/unapplied/Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/unapplied/server/Bees-get-gravity-in-void.-Fixes-MC-167279.patch similarity index 100% rename from patches/unapplied/Bees-get-gravity-in-void.-Fixes-MC-167279.patch rename to patches/unapplied/server/Bees-get-gravity-in-void.-Fixes-MC-167279.patch diff --git a/patches/unapplied/Block-Enderpearl-Travel-Exploit.patch b/patches/unapplied/server/Block-Enderpearl-Travel-Exploit.patch similarity index 100% rename from patches/unapplied/Block-Enderpearl-Travel-Exploit.patch rename to patches/unapplied/server/Block-Enderpearl-Travel-Exploit.patch diff --git a/patches/unapplied/Block-Ticking-API.patch b/patches/unapplied/server/Block-Ticking-API.patch similarity index 100% rename from patches/unapplied/Block-Ticking-API.patch rename to patches/unapplied/server/Block-Ticking-API.patch diff --git a/patches/unapplied/Block-player-logins-during-server-shutdown.patch b/patches/unapplied/server/Block-player-logins-during-server-shutdown.patch similarity index 100% rename from patches/unapplied/Block-player-logins-during-server-shutdown.patch rename to patches/unapplied/server/Block-player-logins-during-server-shutdown.patch diff --git a/patches/unapplied/BlockDestroyEvent.patch b/patches/unapplied/server/BlockDestroyEvent.patch similarity index 100% rename from patches/unapplied/BlockDestroyEvent.patch rename to patches/unapplied/server/BlockDestroyEvent.patch diff --git a/patches/unapplied/Book-size-limits.patch b/patches/unapplied/server/Book-size-limits.patch similarity index 100% rename from patches/unapplied/Book-size-limits.patch rename to patches/unapplied/server/Book-size-limits.patch diff --git a/patches/unapplied/Bound-Treasure-Maps-to-World-Border.patch b/patches/unapplied/server/Bound-Treasure-Maps-to-World-Border.patch similarity index 100% rename from patches/unapplied/Bound-Treasure-Maps-to-World-Border.patch rename to patches/unapplied/server/Bound-Treasure-Maps-to-World-Border.patch diff --git a/patches/unapplied/Brand-support.patch b/patches/unapplied/server/Brand-support.patch similarity index 100% rename from patches/unapplied/Brand-support.patch rename to patches/unapplied/server/Brand-support.patch diff --git a/patches/unapplied/Break-redstone-on-top-of-trap-doors-early.patch b/patches/unapplied/server/Break-redstone-on-top-of-trap-doors-early.patch similarity index 100% rename from patches/unapplied/Break-redstone-on-top-of-trap-doors-early.patch rename to patches/unapplied/server/Break-redstone-on-top-of-trap-doors-early.patch diff --git a/patches/unapplied/Break-up-and-make-tab-spam-limits-configurable.patch b/patches/unapplied/server/Break-up-and-make-tab-spam-limits-configurable.patch similarity index 100% rename from patches/unapplied/Break-up-and-make-tab-spam-limits-configurable.patch rename to patches/unapplied/server/Break-up-and-make-tab-spam-limits-configurable.patch diff --git a/patches/unapplied/Brigadier-Mojang-API.patch b/patches/unapplied/server/Brigadier-Mojang-API.patch similarity index 100% rename from patches/unapplied/Brigadier-Mojang-API.patch rename to patches/unapplied/server/Brigadier-Mojang-API.patch diff --git a/patches/unapplied/Brigadier-based-command-API.patch b/patches/unapplied/server/Brigadier-based-command-API.patch similarity index 100% rename from patches/unapplied/Brigadier-based-command-API.patch rename to patches/unapplied/server/Brigadier-based-command-API.patch diff --git a/patches/unapplied/Broadcast-take-item-packets-with-collector-as-source.patch b/patches/unapplied/server/Broadcast-take-item-packets-with-collector-as-source.patch similarity index 100% rename from patches/unapplied/Broadcast-take-item-packets-with-collector-as-source.patch rename to patches/unapplied/server/Broadcast-take-item-packets-with-collector-as-source.patch diff --git a/patches/unapplied/Bucketable-API.patch b/patches/unapplied/server/Bucketable-API.patch similarity index 100% rename from patches/unapplied/Bucketable-API.patch rename to patches/unapplied/server/Bucketable-API.patch diff --git a/patches/unapplied/Buffer-OOB-setBlock-calls.patch b/patches/unapplied/server/Buffer-OOB-setBlock-calls.patch similarity index 100% rename from patches/unapplied/Buffer-OOB-setBlock-calls.patch rename to patches/unapplied/server/Buffer-OOB-setBlock-calls.patch diff --git a/patches/unapplied/Buffer-joins-to-world.patch b/patches/unapplied/server/Buffer-joins-to-world.patch similarity index 100% rename from patches/unapplied/Buffer-joins-to-world.patch rename to patches/unapplied/server/Buffer-joins-to-world.patch diff --git a/patches/unapplied/Bundle-spark.patch b/patches/unapplied/server/Bundle-spark.patch similarity index 100% rename from patches/unapplied/Bundle-spark.patch rename to patches/unapplied/server/Bundle-spark.patch diff --git a/patches/unapplied/Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/unapplied/server/Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/unapplied/Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/unapplied/server/Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/unapplied/Cache-block-data-strings.patch b/patches/unapplied/server/Cache-block-data-strings.patch similarity index 100% rename from patches/unapplied/Cache-block-data-strings.patch rename to patches/unapplied/server/Cache-block-data-strings.patch diff --git a/patches/unapplied/Cache-map-ids-on-item-frames.patch b/patches/unapplied/server/Cache-map-ids-on-item-frames.patch similarity index 100% rename from patches/unapplied/Cache-map-ids-on-item-frames.patch rename to patches/unapplied/server/Cache-map-ids-on-item-frames.patch diff --git a/patches/unapplied/Cache-resource-keys-and-optimize-reference-Holder-ta.patch b/patches/unapplied/server/Cache-resource-keys-and-optimize-reference-Holder-ta.patch similarity index 100% rename from patches/unapplied/Cache-resource-keys-and-optimize-reference-Holder-ta.patch rename to patches/unapplied/server/Cache-resource-keys-and-optimize-reference-Holder-ta.patch diff --git a/patches/unapplied/Cache-user-authenticator-threads.patch b/patches/unapplied/server/Cache-user-authenticator-threads.patch similarity index 100% rename from patches/unapplied/Cache-user-authenticator-threads.patch rename to patches/unapplied/server/Cache-user-authenticator-threads.patch diff --git a/patches/unapplied/Call-BlockGrowEvent-for-missing-blocks.patch b/patches/unapplied/server/Call-BlockGrowEvent-for-missing-blocks.patch similarity index 100% rename from patches/unapplied/Call-BlockGrowEvent-for-missing-blocks.patch rename to patches/unapplied/server/Call-BlockGrowEvent-for-missing-blocks.patch diff --git a/patches/unapplied/Call-BlockPhysicsEvent-more-often.patch b/patches/unapplied/server/Call-BlockPhysicsEvent-more-often.patch similarity index 100% rename from patches/unapplied/Call-BlockPhysicsEvent-more-often.patch rename to patches/unapplied/server/Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/unapplied/Call-BlockRedstoneEvents-for-lecterns.patch b/patches/unapplied/server/Call-BlockRedstoneEvents-for-lecterns.patch similarity index 100% rename from patches/unapplied/Call-BlockRedstoneEvents-for-lecterns.patch rename to patches/unapplied/server/Call-BlockRedstoneEvents-for-lecterns.patch diff --git a/patches/unapplied/Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/unapplied/server/Call-PaperServerListPingEvent-for-legacy-pings.patch similarity index 100% rename from patches/unapplied/Call-PaperServerListPingEvent-for-legacy-pings.patch rename to patches/unapplied/server/Call-PaperServerListPingEvent-for-legacy-pings.patch diff --git a/patches/unapplied/Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/unapplied/server/Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch similarity index 100% rename from patches/unapplied/Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch rename to patches/unapplied/server/Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch diff --git a/patches/unapplied/Call-bucket-events-for-cauldrons.patch b/patches/unapplied/server/Call-bucket-events-for-cauldrons.patch similarity index 100% rename from patches/unapplied/Call-bucket-events-for-cauldrons.patch rename to patches/unapplied/server/Call-bucket-events-for-cauldrons.patch diff --git a/patches/unapplied/Call-missing-BlockDispenseEvent.patch b/patches/unapplied/server/Call-missing-BlockDispenseEvent.patch similarity index 100% rename from patches/unapplied/Call-missing-BlockDispenseEvent.patch rename to patches/unapplied/server/Call-missing-BlockDispenseEvent.patch diff --git a/patches/unapplied/Call-player-spectator-target-events-and-improve-impl.patch b/patches/unapplied/server/Call-player-spectator-target-events-and-improve-impl.patch similarity index 100% rename from patches/unapplied/Call-player-spectator-target-events-and-improve-impl.patch rename to patches/unapplied/server/Call-player-spectator-target-events-and-improve-impl.patch diff --git a/patches/unapplied/Cap-Entity-Collisions.patch b/patches/unapplied/server/Cap-Entity-Collisions.patch similarity index 100% rename from patches/unapplied/Cap-Entity-Collisions.patch rename to patches/unapplied/server/Cap-Entity-Collisions.patch diff --git a/patches/unapplied/Change-EnderEye-target-without-changing-other-things.patch b/patches/unapplied/server/Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/unapplied/Change-EnderEye-target-without-changing-other-things.patch rename to patches/unapplied/server/Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/unapplied/Check-Drowned-for-Villager-Aggression-Config.patch b/patches/unapplied/server/Check-Drowned-for-Villager-Aggression-Config.patch similarity index 100% rename from patches/unapplied/Check-Drowned-for-Villager-Aggression-Config.patch rename to patches/unapplied/server/Check-Drowned-for-Villager-Aggression-Config.patch diff --git a/patches/unapplied/Check-dead-flag-in-isAlive.patch b/patches/unapplied/server/Check-dead-flag-in-isAlive.patch similarity index 100% rename from patches/unapplied/Check-dead-flag-in-isAlive.patch rename to patches/unapplied/server/Check-dead-flag-in-isAlive.patch diff --git a/patches/unapplied/Check-distance-in-entity-interactions.patch b/patches/unapplied/server/Check-distance-in-entity-interactions.patch similarity index 100% rename from patches/unapplied/Check-distance-in-entity-interactions.patch rename to patches/unapplied/server/Check-distance-in-entity-interactions.patch diff --git a/patches/unapplied/Check-for-block-type-in-SculkSensorBlock-canActivate.patch b/patches/unapplied/server/Check-for-block-type-in-SculkSensorBlock-canActivate.patch similarity index 100% rename from patches/unapplied/Check-for-block-type-in-SculkSensorBlock-canActivate.patch rename to patches/unapplied/server/Check-for-block-type-in-SculkSensorBlock-canActivate.patch diff --git a/patches/unapplied/Check-online-mode-before-converting-and-renaming-pla.patch b/patches/unapplied/server/Check-online-mode-before-converting-and-renaming-pla.patch similarity index 100% rename from patches/unapplied/Check-online-mode-before-converting-and-renaming-pla.patch rename to patches/unapplied/server/Check-online-mode-before-converting-and-renaming-pla.patch diff --git a/patches/unapplied/Check-requirement-before-suggesting-root-nodes.patch b/patches/unapplied/server/Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/unapplied/Check-requirement-before-suggesting-root-nodes.patch rename to patches/unapplied/server/Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/unapplied/Chunk-Save-Reattempt.patch b/patches/unapplied/server/Chunk-Save-Reattempt.patch similarity index 100% rename from patches/unapplied/Chunk-Save-Reattempt.patch rename to patches/unapplied/server/Chunk-Save-Reattempt.patch diff --git a/patches/unapplied/Climbing-should-not-bypass-cramming-gamerule.patch b/patches/unapplied/server/Climbing-should-not-bypass-cramming-gamerule.patch similarity index 100% rename from patches/unapplied/Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/unapplied/server/Climbing-should-not-bypass-cramming-gamerule.patch diff --git a/patches/unapplied/Collision-API.patch b/patches/unapplied/server/Collision-API.patch similarity index 100% rename from patches/unapplied/Collision-API.patch rename to patches/unapplied/server/Collision-API.patch diff --git a/patches/unapplied/Collision-option-for-requiring-a-player-participant.patch b/patches/unapplied/server/Collision-option-for-requiring-a-player-participant.patch similarity index 100% rename from patches/unapplied/Collision-option-for-requiring-a-player-participant.patch rename to patches/unapplied/server/Collision-option-for-requiring-a-player-participant.patch diff --git a/patches/unapplied/Complete-resource-pack-API.patch b/patches/unapplied/server/Complete-resource-pack-API.patch similarity index 100% rename from patches/unapplied/Complete-resource-pack-API.patch rename to patches/unapplied/server/Complete-resource-pack-API.patch diff --git a/patches/unapplied/Config-option-for-Piglins-guarding-chests.patch b/patches/unapplied/server/Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/unapplied/Config-option-for-Piglins-guarding-chests.patch rename to patches/unapplied/server/Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/unapplied/Configurable-Cartographer-Treasure-Maps.patch b/patches/unapplied/server/Configurable-Cartographer-Treasure-Maps.patch similarity index 100% rename from patches/unapplied/Configurable-Cartographer-Treasure-Maps.patch rename to patches/unapplied/server/Configurable-Cartographer-Treasure-Maps.patch diff --git a/patches/unapplied/Configurable-Chunk-Inhabited-Time.patch b/patches/unapplied/server/Configurable-Chunk-Inhabited-Time.patch similarity index 100% rename from patches/unapplied/Configurable-Chunk-Inhabited-Time.patch rename to patches/unapplied/server/Configurable-Chunk-Inhabited-Time.patch diff --git a/patches/unapplied/Configurable-Disabling-Cat-Chest-Detection.patch b/patches/unapplied/server/Configurable-Disabling-Cat-Chest-Detection.patch similarity index 100% rename from patches/unapplied/Configurable-Disabling-Cat-Chest-Detection.patch rename to patches/unapplied/server/Configurable-Disabling-Cat-Chest-Detection.patch diff --git a/patches/unapplied/Configurable-LootPool-luck-formula.patch b/patches/unapplied/server/Configurable-LootPool-luck-formula.patch similarity index 100% rename from patches/unapplied/Configurable-LootPool-luck-formula.patch rename to patches/unapplied/server/Configurable-LootPool-luck-formula.patch diff --git a/patches/unapplied/Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/unapplied/server/Configurable-Non-Player-Arrow-Despawn-Rate.patch similarity index 100% rename from patches/unapplied/Configurable-Non-Player-Arrow-Despawn-Rate.patch rename to patches/unapplied/server/Configurable-Non-Player-Arrow-Despawn-Rate.patch diff --git a/patches/unapplied/Configurable-Player-Collision.patch b/patches/unapplied/server/Configurable-Player-Collision.patch similarity index 100% rename from patches/unapplied/Configurable-Player-Collision.patch rename to patches/unapplied/server/Configurable-Player-Collision.patch diff --git a/patches/unapplied/Configurable-RCON-IP-address.patch b/patches/unapplied/server/Configurable-RCON-IP-address.patch similarity index 100% rename from patches/unapplied/Configurable-RCON-IP-address.patch rename to patches/unapplied/server/Configurable-RCON-IP-address.patch diff --git a/patches/unapplied/Configurable-Region-Compression-Format.patch b/patches/unapplied/server/Configurable-Region-Compression-Format.patch similarity index 100% rename from patches/unapplied/Configurable-Region-Compression-Format.patch rename to patches/unapplied/server/Configurable-Region-Compression-Format.patch diff --git a/patches/unapplied/Configurable-Sand-Duping.patch b/patches/unapplied/server/Configurable-Sand-Duping.patch similarity index 100% rename from patches/unapplied/Configurable-Sand-Duping.patch rename to patches/unapplied/server/Configurable-Sand-Duping.patch diff --git a/patches/unapplied/Configurable-chance-of-villager-zombie-infection.patch b/patches/unapplied/server/Configurable-chance-of-villager-zombie-infection.patch similarity index 100% rename from patches/unapplied/Configurable-chance-of-villager-zombie-infection.patch rename to patches/unapplied/server/Configurable-chance-of-villager-zombie-infection.patch diff --git a/patches/unapplied/Configurable-chat-thread-limit.patch b/patches/unapplied/server/Configurable-chat-thread-limit.patch similarity index 100% rename from patches/unapplied/Configurable-chat-thread-limit.patch rename to patches/unapplied/server/Configurable-chat-thread-limit.patch diff --git a/patches/unapplied/Configurable-connection-throttle-kick-message.patch b/patches/unapplied/server/Configurable-connection-throttle-kick-message.patch similarity index 100% rename from patches/unapplied/Configurable-connection-throttle-kick-message.patch rename to patches/unapplied/server/Configurable-connection-throttle-kick-message.patch diff --git a/patches/unapplied/Configurable-container-update-tick-rate.patch b/patches/unapplied/server/Configurable-container-update-tick-rate.patch similarity index 100% rename from patches/unapplied/Configurable-container-update-tick-rate.patch rename to patches/unapplied/server/Configurable-container-update-tick-rate.patch diff --git a/patches/unapplied/Configurable-damage-tick-when-blocking-with-shield.patch b/patches/unapplied/server/Configurable-damage-tick-when-blocking-with-shield.patch similarity index 100% rename from patches/unapplied/Configurable-damage-tick-when-blocking-with-shield.patch rename to patches/unapplied/server/Configurable-damage-tick-when-blocking-with-shield.patch diff --git a/patches/unapplied/Configurable-door-breaking-difficulty.patch b/patches/unapplied/server/Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/unapplied/Configurable-door-breaking-difficulty.patch rename to patches/unapplied/server/Configurable-door-breaking-difficulty.patch diff --git a/patches/unapplied/Configurable-end-credits.patch b/patches/unapplied/server/Configurable-end-credits.patch similarity index 100% rename from patches/unapplied/Configurable-end-credits.patch rename to patches/unapplied/server/Configurable-end-credits.patch diff --git a/patches/unapplied/Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/unapplied/server/Configurable-entity-tracking-range-by-Y-coordinate.patch similarity index 100% rename from patches/unapplied/Configurable-entity-tracking-range-by-Y-coordinate.patch rename to patches/unapplied/server/Configurable-entity-tracking-range-by-Y-coordinate.patch diff --git a/patches/unapplied/Configurable-feature-seeds.patch b/patches/unapplied/server/Configurable-feature-seeds.patch similarity index 100% rename from patches/unapplied/Configurable-feature-seeds.patch rename to patches/unapplied/server/Configurable-feature-seeds.patch diff --git a/patches/unapplied/Configurable-flying-kick-messages.patch b/patches/unapplied/server/Configurable-flying-kick-messages.patch similarity index 100% rename from patches/unapplied/Configurable-flying-kick-messages.patch rename to patches/unapplied/server/Configurable-flying-kick-messages.patch diff --git a/patches/unapplied/Configurable-item-frame-map-cursor-update-interval.patch b/patches/unapplied/server/Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/unapplied/Configurable-item-frame-map-cursor-update-interval.patch rename to patches/unapplied/server/Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/unapplied/Configurable-max-block-fluid-ticks.patch b/patches/unapplied/server/Configurable-max-block-fluid-ticks.patch similarity index 100% rename from patches/unapplied/Configurable-max-block-fluid-ticks.patch rename to patches/unapplied/server/Configurable-max-block-fluid-ticks.patch diff --git a/patches/unapplied/Configurable-max-block-light-for-monster-spawning.patch b/patches/unapplied/server/Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/unapplied/Configurable-max-block-light-for-monster-spawning.patch rename to patches/unapplied/server/Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/unapplied/Configurable-max-leash-distance.patch b/patches/unapplied/server/Configurable-max-leash-distance.patch similarity index 100% rename from patches/unapplied/Configurable-max-leash-distance.patch rename to patches/unapplied/server/Configurable-max-leash-distance.patch diff --git a/patches/unapplied/Configurable-mob-spawner-tick-rate.patch b/patches/unapplied/server/Configurable-mob-spawner-tick-rate.patch similarity index 100% rename from patches/unapplied/Configurable-mob-spawner-tick-rate.patch rename to patches/unapplied/server/Configurable-mob-spawner-tick-rate.patch diff --git a/patches/unapplied/Configurable-packet-in-spam-threshold.patch b/patches/unapplied/server/Configurable-packet-in-spam-threshold.patch similarity index 100% rename from patches/unapplied/Configurable-packet-in-spam-threshold.patch rename to patches/unapplied/server/Configurable-packet-in-spam-threshold.patch diff --git a/patches/unapplied/Configurable-projectile-relative-velocity.patch b/patches/unapplied/server/Configurable-projectile-relative-velocity.patch similarity index 100% rename from patches/unapplied/Configurable-projectile-relative-velocity.patch rename to patches/unapplied/server/Configurable-projectile-relative-velocity.patch diff --git a/patches/unapplied/Configurable-random-tick-rates-for-blocks.patch b/patches/unapplied/server/Configurable-random-tick-rates-for-blocks.patch similarity index 100% rename from patches/unapplied/Configurable-random-tick-rates-for-blocks.patch rename to patches/unapplied/server/Configurable-random-tick-rates-for-blocks.patch diff --git a/patches/unapplied/Configurable-sculk-sensor-listener-range.patch b/patches/unapplied/server/Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/unapplied/Configurable-sculk-sensor-listener-range.patch rename to patches/unapplied/server/Configurable-sculk-sensor-listener-range.patch diff --git a/patches/unapplied/Configurable-spawn-chances-for-skeleton-horses.patch b/patches/unapplied/server/Configurable-spawn-chances-for-skeleton-horses.patch similarity index 100% rename from patches/unapplied/Configurable-spawn-chances-for-skeleton-horses.patch rename to patches/unapplied/server/Configurable-spawn-chances-for-skeleton-horses.patch diff --git a/patches/unapplied/Configurable-speed-for-water-flowing-over-lava.patch b/patches/unapplied/server/Configurable-speed-for-water-flowing-over-lava.patch similarity index 100% rename from patches/unapplied/Configurable-speed-for-water-flowing-over-lava.patch rename to patches/unapplied/server/Configurable-speed-for-water-flowing-over-lava.patch diff --git a/patches/unapplied/Configurable-sprint-interruption-on-attack.patch b/patches/unapplied/server/Configurable-sprint-interruption-on-attack.patch similarity index 100% rename from patches/unapplied/Configurable-sprint-interruption-on-attack.patch rename to patches/unapplied/server/Configurable-sprint-interruption-on-attack.patch diff --git a/patches/unapplied/Configurable-top-of-nether-void-damage.patch b/patches/unapplied/server/Configurable-top-of-nether-void-damage.patch similarity index 100% rename from patches/unapplied/Configurable-top-of-nether-void-damage.patch rename to patches/unapplied/server/Configurable-top-of-nether-void-damage.patch diff --git a/patches/unapplied/Configuration-for-horizontal-only-item-merging.patch b/patches/unapplied/server/Configuration-for-horizontal-only-item-merging.patch similarity index 100% rename from patches/unapplied/Configuration-for-horizontal-only-item-merging.patch rename to patches/unapplied/server/Configuration-for-horizontal-only-item-merging.patch diff --git a/patches/unapplied/Configure-sniffer-egg-hatch-time.patch b/patches/unapplied/server/Configure-sniffer-egg-hatch-time.patch similarity index 100% rename from patches/unapplied/Configure-sniffer-egg-hatch-time.patch rename to patches/unapplied/server/Configure-sniffer-egg-hatch-time.patch diff --git a/patches/unapplied/Convert-legacy-attributes-in-Item-Meta.patch b/patches/unapplied/server/Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from patches/unapplied/Convert-legacy-attributes-in-Item-Meta.patch rename to patches/unapplied/server/Convert-legacy-attributes-in-Item-Meta.patch diff --git a/patches/unapplied/Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/unapplied/server/Correctly-check-if-bucket-dispenses-will-succeed-for.patch similarity index 100% rename from patches/unapplied/Correctly-check-if-bucket-dispenses-will-succeed-for.patch rename to patches/unapplied/server/Correctly-check-if-bucket-dispenses-will-succeed-for.patch diff --git a/patches/unapplied/Correctly-handle-ArmorStand-invisibility.patch b/patches/unapplied/server/Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/unapplied/Correctly-handle-ArmorStand-invisibility.patch rename to patches/unapplied/server/Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/unapplied/Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/unapplied/server/Correctly-handle-interactions-with-items-on-cooldown.patch similarity index 100% rename from patches/unapplied/Correctly-handle-interactions-with-items-on-cooldown.patch rename to patches/unapplied/server/Correctly-handle-interactions-with-items-on-cooldown.patch diff --git a/patches/unapplied/Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/unapplied/server/Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 100% rename from patches/unapplied/Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/unapplied/server/Correctly-shrink-items-during-EntityResurrectEvent.patch diff --git a/patches/unapplied/Create-HoverEvent-from-ItemStack-Entity.patch b/patches/unapplied/server/Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/unapplied/Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/unapplied/server/Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/unapplied/Custom-Chat-Completion-Suggestions-API.patch b/patches/unapplied/server/Custom-Chat-Completion-Suggestions-API.patch similarity index 100% rename from patches/unapplied/Custom-Chat-Completion-Suggestions-API.patch rename to patches/unapplied/server/Custom-Chat-Completion-Suggestions-API.patch diff --git a/patches/unapplied/Custom-Potion-Mixes.patch b/patches/unapplied/server/Custom-Potion-Mixes.patch similarity index 100% rename from patches/unapplied/Custom-Potion-Mixes.patch rename to patches/unapplied/server/Custom-Potion-Mixes.patch diff --git a/patches/unapplied/Custom-replacement-for-eaten-items.patch b/patches/unapplied/server/Custom-replacement-for-eaten-items.patch similarity index 100% rename from patches/unapplied/Custom-replacement-for-eaten-items.patch rename to patches/unapplied/server/Custom-replacement-for-eaten-items.patch diff --git a/patches/unapplied/Custom-table-implementation-for-blockstate-state-loo.patch b/patches/unapplied/server/Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/unapplied/Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/unapplied/server/Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/unapplied/Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/unapplied/server/Dead-Player-s-shouldn-t-be-able-to-move.patch similarity index 100% rename from patches/unapplied/Dead-Player-s-shouldn-t-be-able-to-move.patch rename to patches/unapplied/server/Dead-Player-s-shouldn-t-be-able-to-move.patch diff --git a/patches/unapplied/Deep-clone-nbt-tags-in-PDC.patch b/patches/unapplied/server/Deep-clone-nbt-tags-in-PDC.patch similarity index 100% rename from patches/unapplied/Deep-clone-nbt-tags-in-PDC.patch rename to patches/unapplied/server/Deep-clone-nbt-tags-in-PDC.patch diff --git a/patches/unapplied/Default-loading-permissions.yml-before-plugins.patch b/patches/unapplied/server/Default-loading-permissions.yml-before-plugins.patch similarity index 100% rename from patches/unapplied/Default-loading-permissions.yml-before-plugins.patch rename to patches/unapplied/server/Default-loading-permissions.yml-before-plugins.patch diff --git a/patches/unapplied/Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/unapplied/server/Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch similarity index 100% rename from patches/unapplied/Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch rename to patches/unapplied/server/Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch diff --git a/patches/unapplied/Deprecate-ItemStack-setType.patch b/patches/unapplied/server/Deprecate-ItemStack-setType.patch similarity index 100% rename from patches/unapplied/Deprecate-ItemStack-setType.patch rename to patches/unapplied/server/Deprecate-ItemStack-setType.patch diff --git a/patches/unapplied/Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/unapplied/server/Deprecate-and-replace-methods-with-old-StructureType.patch similarity index 100% rename from patches/unapplied/Deprecate-and-replace-methods-with-old-StructureType.patch rename to patches/unapplied/server/Deprecate-and-replace-methods-with-old-StructureType.patch diff --git a/patches/unapplied/Detail-more-information-in-watchdog-dumps.patch b/patches/unapplied/server/Detail-more-information-in-watchdog-dumps.patch similarity index 100% rename from patches/unapplied/Detail-more-information-in-watchdog-dumps.patch rename to patches/unapplied/server/Detail-more-information-in-watchdog-dumps.patch diff --git a/patches/unapplied/Detect-headless-JREs.patch b/patches/unapplied/server/Detect-headless-JREs.patch similarity index 100% rename from patches/unapplied/Detect-headless-JREs.patch rename to patches/unapplied/server/Detect-headless-JREs.patch diff --git a/patches/unapplied/Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/unapplied/server/Determine-lava-and-water-fluid-explosion-resistance-.patch similarity index 100% rename from patches/unapplied/Determine-lava-and-water-fluid-explosion-resistance-.patch rename to patches/unapplied/server/Determine-lava-and-water-fluid-explosion-resistance-.patch diff --git a/patches/unapplied/Disable-Explicit-Network-Manager-Flushing.patch b/patches/unapplied/server/Disable-Explicit-Network-Manager-Flushing.patch similarity index 100% rename from patches/unapplied/Disable-Explicit-Network-Manager-Flushing.patch rename to patches/unapplied/server/Disable-Explicit-Network-Manager-Flushing.patch diff --git a/patches/unapplied/Disable-Scoreboards-for-non-players-by-default.patch b/patches/unapplied/server/Disable-Scoreboards-for-non-players-by-default.patch similarity index 100% rename from patches/unapplied/Disable-Scoreboards-for-non-players-by-default.patch rename to patches/unapplied/server/Disable-Scoreboards-for-non-players-by-default.patch diff --git a/patches/unapplied/Disable-component-selector-resolving-in-books-by-def.patch b/patches/unapplied/server/Disable-component-selector-resolving-in-books-by-def.patch similarity index 100% rename from patches/unapplied/Disable-component-selector-resolving-in-books-by-def.patch rename to patches/unapplied/server/Disable-component-selector-resolving-in-books-by-def.patch diff --git a/patches/unapplied/Disable-explosion-knockback.patch b/patches/unapplied/server/Disable-explosion-knockback.patch similarity index 100% rename from patches/unapplied/Disable-explosion-knockback.patch rename to patches/unapplied/server/Disable-explosion-knockback.patch diff --git a/patches/unapplied/Disable-ice-and-snow.patch b/patches/unapplied/server/Disable-ice-and-snow.patch similarity index 100% rename from patches/unapplied/Disable-ice-and-snow.patch rename to patches/unapplied/server/Disable-ice-and-snow.patch diff --git a/patches/unapplied/Disable-memory-reserve-allocating.patch b/patches/unapplied/server/Disable-memory-reserve-allocating.patch similarity index 100% rename from patches/unapplied/Disable-memory-reserve-allocating.patch rename to patches/unapplied/server/Disable-memory-reserve-allocating.patch diff --git a/patches/unapplied/Disable-pretty-printing-for-advancement-saving.patch b/patches/unapplied/server/Disable-pretty-printing-for-advancement-saving.patch similarity index 100% rename from patches/unapplied/Disable-pretty-printing-for-advancement-saving.patch rename to patches/unapplied/server/Disable-pretty-printing-for-advancement-saving.patch diff --git a/patches/unapplied/Disable-spigot-tick-limiters.patch b/patches/unapplied/server/Disable-spigot-tick-limiters.patch similarity index 100% rename from patches/unapplied/Disable-spigot-tick-limiters.patch rename to patches/unapplied/server/Disable-spigot-tick-limiters.patch diff --git a/patches/unapplied/Disable-thunder.patch b/patches/unapplied/server/Disable-thunder.patch similarity index 100% rename from patches/unapplied/Disable-thunder.patch rename to patches/unapplied/server/Disable-thunder.patch diff --git a/patches/unapplied/Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/unapplied/server/Do-crystal-portal-proximity-check-before-entity-look.patch similarity index 100% rename from patches/unapplied/Do-crystal-portal-proximity-check-before-entity-look.patch rename to patches/unapplied/server/Do-crystal-portal-proximity-check-before-entity-look.patch diff --git a/patches/unapplied/Do-not-accept-invalid-client-settings.patch b/patches/unapplied/server/Do-not-accept-invalid-client-settings.patch similarity index 100% rename from patches/unapplied/Do-not-accept-invalid-client-settings.patch rename to patches/unapplied/server/Do-not-accept-invalid-client-settings.patch diff --git a/patches/unapplied/Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/unapplied/server/Do-not-allow-bees-to-load-chunks-for-beehives.patch similarity index 100% rename from patches/unapplied/Do-not-allow-bees-to-load-chunks-for-beehives.patch rename to patches/unapplied/server/Do-not-allow-bees-to-load-chunks-for-beehives.patch diff --git a/patches/unapplied/Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/unapplied/server/Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/unapplied/Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/unapplied/server/Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/unapplied/Do-not-load-chunks-for-Pathfinding.patch b/patches/unapplied/server/Do-not-load-chunks-for-Pathfinding.patch similarity index 100% rename from patches/unapplied/Do-not-load-chunks-for-Pathfinding.patch rename to patches/unapplied/server/Do-not-load-chunks-for-Pathfinding.patch diff --git a/patches/unapplied/Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/unapplied/server/Do-not-read-tile-entities-in-chunks-that-are-positio.patch similarity index 100% rename from patches/unapplied/Do-not-read-tile-entities-in-chunks-that-are-positio.patch rename to patches/unapplied/server/Do-not-read-tile-entities-in-chunks-that-are-positio.patch diff --git a/patches/unapplied/Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/unapplied/server/Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 100% rename from patches/unapplied/Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/unapplied/server/Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch diff --git a/patches/unapplied/Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/unapplied/server/Do-not-submit-profile-lookups-to-worldgen-threads.patch similarity index 100% rename from patches/unapplied/Do-not-submit-profile-lookups-to-worldgen-threads.patch rename to patches/unapplied/server/Do-not-submit-profile-lookups-to-worldgen-threads.patch diff --git a/patches/unapplied/Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/unapplied/server/Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch similarity index 100% rename from patches/unapplied/Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch rename to patches/unapplied/server/Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch diff --git a/patches/unapplied/Don-t-allow-digging-into-unloaded-chunks.patch b/patches/unapplied/server/Don-t-allow-digging-into-unloaded-chunks.patch similarity index 100% rename from patches/unapplied/Don-t-allow-digging-into-unloaded-chunks.patch rename to patches/unapplied/server/Don-t-allow-digging-into-unloaded-chunks.patch diff --git a/patches/unapplied/Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/unapplied/server/Don-t-allow-vehicle-movement-from-players-while-tele.patch similarity index 100% rename from patches/unapplied/Don-t-allow-vehicle-movement-from-players-while-tele.patch rename to patches/unapplied/server/Don-t-allow-vehicle-movement-from-players-while-tele.patch diff --git a/patches/unapplied/Don-t-apply-cramming-damage-to-players.patch b/patches/unapplied/server/Don-t-apply-cramming-damage-to-players.patch similarity index 100% rename from patches/unapplied/Don-t-apply-cramming-damage-to-players.patch rename to patches/unapplied/server/Don-t-apply-cramming-damage-to-players.patch diff --git a/patches/unapplied/Don-t-broadcast-messages-to-command-blocks.patch b/patches/unapplied/server/Don-t-broadcast-messages-to-command-blocks.patch similarity index 100% rename from patches/unapplied/Don-t-broadcast-messages-to-command-blocks.patch rename to patches/unapplied/server/Don-t-broadcast-messages-to-command-blocks.patch diff --git a/patches/unapplied/Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/unapplied/server/Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 100% rename from patches/unapplied/Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/unapplied/server/Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch diff --git a/patches/unapplied/Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/unapplied/server/Don-t-check-if-we-can-see-non-visible-entities.patch similarity index 100% rename from patches/unapplied/Don-t-check-if-we-can-see-non-visible-entities.patch rename to patches/unapplied/server/Don-t-check-if-we-can-see-non-visible-entities.patch diff --git a/patches/unapplied/Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/unapplied/server/Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch similarity index 100% rename from patches/unapplied/Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch rename to patches/unapplied/server/Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch diff --git a/patches/unapplied/Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/unapplied/server/Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch similarity index 100% rename from patches/unapplied/Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch rename to patches/unapplied/server/Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch diff --git a/patches/unapplied/Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/unapplied/server/Don-t-fire-BlockFade-on-worldgen-threads.patch similarity index 100% rename from patches/unapplied/Don-t-fire-BlockFade-on-worldgen-threads.patch rename to patches/unapplied/server/Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/patches/unapplied/Don-t-fire-sync-events-during-worldgen.patch b/patches/unapplied/server/Don-t-fire-sync-events-during-worldgen.patch similarity index 100% rename from patches/unapplied/Don-t-fire-sync-events-during-worldgen.patch rename to patches/unapplied/server/Don-t-fire-sync-events-during-worldgen.patch diff --git a/patches/unapplied/Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/unapplied/server/Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 100% rename from patches/unapplied/Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/unapplied/server/Don-t-ignore-result-of-PlayerEditBookEvent.patch diff --git a/patches/unapplied/Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/unapplied/server/Don-t-load-Chunks-from-Hoppers-and-other-things.patch similarity index 100% rename from patches/unapplied/Don-t-load-Chunks-from-Hoppers-and-other-things.patch rename to patches/unapplied/server/Don-t-load-Chunks-from-Hoppers-and-other-things.patch diff --git a/patches/unapplied/Don-t-load-chunks-for-supporting-block-checks.patch b/patches/unapplied/server/Don-t-load-chunks-for-supporting-block-checks.patch similarity index 100% rename from patches/unapplied/Don-t-load-chunks-for-supporting-block-checks.patch rename to patches/unapplied/server/Don-t-load-chunks-for-supporting-block-checks.patch diff --git a/patches/unapplied/Don-t-log-debug-logging-being-disabled.patch b/patches/unapplied/server/Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/unapplied/Don-t-log-debug-logging-being-disabled.patch rename to patches/unapplied/server/Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/unapplied/Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch b/patches/unapplied/server/Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch similarity index 100% rename from patches/unapplied/Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch rename to patches/unapplied/server/Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch diff --git a/patches/unapplied/Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/unapplied/server/Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch similarity index 100% rename from patches/unapplied/Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch rename to patches/unapplied/server/Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch diff --git a/patches/unapplied/Don-t-move-existing-players-to-world-spawn.patch b/patches/unapplied/server/Don-t-move-existing-players-to-world-spawn.patch similarity index 100% rename from patches/unapplied/Don-t-move-existing-players-to-world-spawn.patch rename to patches/unapplied/server/Don-t-move-existing-players-to-world-spawn.patch diff --git a/patches/unapplied/Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/unapplied/server/Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/unapplied/Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/unapplied/server/Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/unapplied/Don-t-require-FACING-data.patch b/patches/unapplied/server/Don-t-require-FACING-data.patch similarity index 100% rename from patches/unapplied/Don-t-require-FACING-data.patch rename to patches/unapplied/server/Don-t-require-FACING-data.patch diff --git a/patches/unapplied/Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/unapplied/server/Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 100% rename from patches/unapplied/Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/unapplied/server/Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch diff --git a/patches/unapplied/Don-t-run-entity-collision-code-if-not-needed.patch b/patches/unapplied/server/Don-t-run-entity-collision-code-if-not-needed.patch similarity index 100% rename from patches/unapplied/Don-t-run-entity-collision-code-if-not-needed.patch rename to patches/unapplied/server/Don-t-run-entity-collision-code-if-not-needed.patch diff --git a/patches/unapplied/Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/unapplied/server/Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch similarity index 100% rename from patches/unapplied/Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch rename to patches/unapplied/server/Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch diff --git a/patches/unapplied/Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/unapplied/server/Don-t-sleep-after-profile-lookups-if-not-needed.patch similarity index 100% rename from patches/unapplied/Don-t-sleep-after-profile-lookups-if-not-needed.patch rename to patches/unapplied/server/Don-t-sleep-after-profile-lookups-if-not-needed.patch diff --git a/patches/unapplied/Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/unapplied/server/Don-t-tab-complete-namespaced-commands-if-send-names.patch similarity index 100% rename from patches/unapplied/Don-t-tab-complete-namespaced-commands-if-send-names.patch rename to patches/unapplied/server/Don-t-tab-complete-namespaced-commands-if-send-names.patch diff --git a/patches/unapplied/Don-t-tick-dead-players.patch b/patches/unapplied/server/Don-t-tick-dead-players.patch similarity index 100% rename from patches/unapplied/Don-t-tick-dead-players.patch rename to patches/unapplied/server/Don-t-tick-dead-players.patch diff --git a/patches/unapplied/Don-t-tick-markers.patch b/patches/unapplied/server/Don-t-tick-markers.patch similarity index 100% rename from patches/unapplied/Don-t-tick-markers.patch rename to patches/unapplied/server/Don-t-tick-markers.patch diff --git a/patches/unapplied/Don-t-use-level-random-in-entity-constructors.patch b/patches/unapplied/server/Don-t-use-level-random-in-entity-constructors.patch similarity index 100% rename from patches/unapplied/Don-t-use-level-random-in-entity-constructors.patch rename to patches/unapplied/server/Don-t-use-level-random-in-entity-constructors.patch diff --git a/patches/unapplied/Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch b/patches/unapplied/server/Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch similarity index 100% rename from patches/unapplied/Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch rename to patches/unapplied/server/Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch diff --git a/patches/unapplied/Dont-resend-blocks-on-interactions.patch b/patches/unapplied/server/Dont-resend-blocks-on-interactions.patch similarity index 100% rename from patches/unapplied/Dont-resend-blocks-on-interactions.patch rename to patches/unapplied/server/Dont-resend-blocks-on-interactions.patch diff --git a/patches/unapplied/Dont-resent-entity-on-art-update.patch b/patches/unapplied/server/Dont-resent-entity-on-art-update.patch similarity index 100% rename from patches/unapplied/Dont-resent-entity-on-art-update.patch rename to patches/unapplied/server/Dont-resent-entity-on-art-update.patch diff --git a/patches/unapplied/Dont-send-unnecessary-sign-update.patch b/patches/unapplied/server/Dont-send-unnecessary-sign-update.patch similarity index 100% rename from patches/unapplied/Dont-send-unnecessary-sign-update.patch rename to patches/unapplied/server/Dont-send-unnecessary-sign-update.patch diff --git a/patches/unapplied/Drop-carried-item-when-player-has-disconnected.patch b/patches/unapplied/server/Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/unapplied/Drop-carried-item-when-player-has-disconnected.patch rename to patches/unapplied/server/Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/unapplied/Drop-falling-block-and-tnt-entities-at-the-specified.patch b/patches/unapplied/server/Drop-falling-block-and-tnt-entities-at-the-specified.patch similarity index 100% rename from patches/unapplied/Drop-falling-block-and-tnt-entities-at-the-specified.patch rename to patches/unapplied/server/Drop-falling-block-and-tnt-entities-at-the-specified.patch diff --git a/patches/unapplied/Duplicate-UUID-Resolve-Option.patch b/patches/unapplied/server/Duplicate-UUID-Resolve-Option.patch similarity index 100% rename from patches/unapplied/Duplicate-UUID-Resolve-Option.patch rename to patches/unapplied/server/Duplicate-UUID-Resolve-Option.patch diff --git a/patches/unapplied/Eigencraft-redstone-implementation.patch b/patches/unapplied/server/Eigencraft-redstone-implementation.patch similarity index 100% rename from patches/unapplied/Eigencraft-redstone-implementation.patch rename to patches/unapplied/server/Eigencraft-redstone-implementation.patch diff --git a/patches/unapplied/Elder-Guardian-appearance-API.patch b/patches/unapplied/server/Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/unapplied/Elder-Guardian-appearance-API.patch rename to patches/unapplied/server/Elder-Guardian-appearance-API.patch diff --git a/patches/unapplied/Empty-commands-shall-not-be-dispatched.patch b/patches/unapplied/server/Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/unapplied/Empty-commands-shall-not-be-dispatched.patch rename to patches/unapplied/server/Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/unapplied/EnderDragon-Events.patch b/patches/unapplied/server/EnderDragon-Events.patch similarity index 100% rename from patches/unapplied/EnderDragon-Events.patch rename to patches/unapplied/server/EnderDragon-Events.patch diff --git a/patches/unapplied/Enderman.teleportRandomly.patch b/patches/unapplied/server/Enderman.teleportRandomly.patch similarity index 100% rename from patches/unapplied/Enderman.teleportRandomly.patch rename to patches/unapplied/server/Enderman.teleportRandomly.patch diff --git a/patches/unapplied/EndermanAttackPlayerEvent.patch b/patches/unapplied/server/EndermanAttackPlayerEvent.patch similarity index 100% rename from patches/unapplied/EndermanAttackPlayerEvent.patch rename to patches/unapplied/server/EndermanAttackPlayerEvent.patch diff --git a/patches/unapplied/EndermanEscapeEvent.patch b/patches/unapplied/server/EndermanEscapeEvent.patch similarity index 100% rename from patches/unapplied/EndermanEscapeEvent.patch rename to patches/unapplied/server/EndermanEscapeEvent.patch diff --git a/patches/unapplied/Enforce-Sync-Player-Saves.patch b/patches/unapplied/server/Enforce-Sync-Player-Saves.patch similarity index 100% rename from patches/unapplied/Enforce-Sync-Player-Saves.patch rename to patches/unapplied/server/Enforce-Sync-Player-Saves.patch diff --git a/patches/unapplied/Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/unapplied/server/Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/unapplied/Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/unapplied/server/Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/unapplied/Ensure-Entity-position-and-AABB-are-never-invalid.patch b/patches/unapplied/server/Ensure-Entity-position-and-AABB-are-never-invalid.patch similarity index 100% rename from patches/unapplied/Ensure-Entity-position-and-AABB-are-never-invalid.patch rename to patches/unapplied/server/Ensure-Entity-position-and-AABB-are-never-invalid.patch diff --git a/patches/unapplied/Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/unapplied/server/Ensure-EntityRaider-respects-game-and-entity-rules-f.patch similarity index 100% rename from patches/unapplied/Ensure-EntityRaider-respects-game-and-entity-rules-f.patch rename to patches/unapplied/server/Ensure-EntityRaider-respects-game-and-entity-rules-f.patch diff --git a/patches/unapplied/Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/unapplied/server/Ensure-entity-passenger-world-matches-ridden-entity.patch similarity index 100% rename from patches/unapplied/Ensure-entity-passenger-world-matches-ridden-entity.patch rename to patches/unapplied/server/Ensure-entity-passenger-world-matches-ridden-entity.patch diff --git a/patches/unapplied/Ensure-valid-vehicle-status.patch b/patches/unapplied/server/Ensure-valid-vehicle-status.patch similarity index 100% rename from patches/unapplied/Ensure-valid-vehicle-status.patch rename to patches/unapplied/server/Ensure-valid-vehicle-status.patch diff --git a/patches/unapplied/Entity-Activation-Range-2.0.patch b/patches/unapplied/server/Entity-Activation-Range-2.0.patch similarity index 100% rename from patches/unapplied/Entity-Activation-Range-2.0.patch rename to patches/unapplied/server/Entity-Activation-Range-2.0.patch diff --git a/patches/unapplied/Entity-AddTo-RemoveFrom-World-Events.patch b/patches/unapplied/server/Entity-AddTo-RemoveFrom-World-Events.patch similarity index 100% rename from patches/unapplied/Entity-AddTo-RemoveFrom-World-Events.patch rename to patches/unapplied/server/Entity-AddTo-RemoveFrom-World-Events.patch diff --git a/patches/unapplied/Entity-Jump-API.patch b/patches/unapplied/server/Entity-Jump-API.patch similarity index 100% rename from patches/unapplied/Entity-Jump-API.patch rename to patches/unapplied/server/Entity-Jump-API.patch diff --git a/patches/unapplied/Entity-Origin-API.patch b/patches/unapplied/server/Entity-Origin-API.patch similarity index 100% rename from patches/unapplied/Entity-Origin-API.patch rename to patches/unapplied/server/Entity-Origin-API.patch diff --git a/patches/unapplied/Entity-fromMobSpawner.patch b/patches/unapplied/server/Entity-fromMobSpawner.patch similarity index 100% rename from patches/unapplied/Entity-fromMobSpawner.patch rename to patches/unapplied/server/Entity-fromMobSpawner.patch diff --git a/patches/unapplied/Entity-isTicking.patch b/patches/unapplied/server/Entity-isTicking.patch similarity index 100% rename from patches/unapplied/Entity-isTicking.patch rename to patches/unapplied/server/Entity-isTicking.patch diff --git a/patches/unapplied/Entity-load-save-limit-per-chunk.patch b/patches/unapplied/server/Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/unapplied/Entity-load-save-limit-per-chunk.patch rename to patches/unapplied/server/Entity-load-save-limit-per-chunk.patch diff --git a/patches/unapplied/Entity-powdered-snow-API.patch b/patches/unapplied/server/Entity-powdered-snow-API.patch similarity index 100% rename from patches/unapplied/Entity-powdered-snow-API.patch rename to patches/unapplied/server/Entity-powdered-snow-API.patch diff --git a/patches/unapplied/EntityPathfindEvent.patch b/patches/unapplied/server/EntityPathfindEvent.patch similarity index 100% rename from patches/unapplied/EntityPathfindEvent.patch rename to patches/unapplied/server/EntityPathfindEvent.patch diff --git a/patches/unapplied/EntityPickupItemEvent-fixes.patch b/patches/unapplied/server/EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/unapplied/EntityPickupItemEvent-fixes.patch rename to patches/unapplied/server/EntityPickupItemEvent-fixes.patch diff --git a/patches/unapplied/EntityRegainHealthEvent-isFastRegen-API.patch b/patches/unapplied/server/EntityRegainHealthEvent-isFastRegen-API.patch similarity index 100% rename from patches/unapplied/EntityRegainHealthEvent-isFastRegen-API.patch rename to patches/unapplied/server/EntityRegainHealthEvent-isFastRegen-API.patch diff --git a/patches/unapplied/Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/unapplied/server/Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 100% rename from patches/unapplied/Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/unapplied/server/Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch diff --git a/patches/unapplied/Expand-ArmorStand-API.patch b/patches/unapplied/server/Expand-ArmorStand-API.patch similarity index 100% rename from patches/unapplied/Expand-ArmorStand-API.patch rename to patches/unapplied/server/Expand-ArmorStand-API.patch diff --git a/patches/unapplied/Expand-EntityUnleashEvent.patch b/patches/unapplied/server/Expand-EntityUnleashEvent.patch similarity index 100% rename from patches/unapplied/Expand-EntityUnleashEvent.patch rename to patches/unapplied/server/Expand-EntityUnleashEvent.patch diff --git a/patches/unapplied/Expand-Explosions-API.patch b/patches/unapplied/server/Expand-Explosions-API.patch similarity index 100% rename from patches/unapplied/Expand-Explosions-API.patch rename to patches/unapplied/server/Expand-Explosions-API.patch diff --git a/patches/unapplied/Expand-FallingBlock-API.patch b/patches/unapplied/server/Expand-FallingBlock-API.patch similarity index 100% rename from patches/unapplied/Expand-FallingBlock-API.patch rename to patches/unapplied/server/Expand-FallingBlock-API.patch diff --git a/patches/unapplied/Expand-LingeringPotion-API.patch b/patches/unapplied/server/Expand-LingeringPotion-API.patch similarity index 100% rename from patches/unapplied/Expand-LingeringPotion-API.patch rename to patches/unapplied/server/Expand-LingeringPotion-API.patch diff --git a/patches/unapplied/Expand-PlayerGameModeChangeEvent.patch b/patches/unapplied/server/Expand-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/unapplied/Expand-PlayerGameModeChangeEvent.patch rename to patches/unapplied/server/Expand-PlayerGameModeChangeEvent.patch diff --git a/patches/unapplied/Expand-PlayerItemDamageEvent.patch b/patches/unapplied/server/Expand-PlayerItemDamageEvent.patch similarity index 100% rename from patches/unapplied/Expand-PlayerItemDamageEvent.patch rename to patches/unapplied/server/Expand-PlayerItemDamageEvent.patch diff --git a/patches/unapplied/Expand-PlayerItemMendEvent.patch b/patches/unapplied/server/Expand-PlayerItemMendEvent.patch similarity index 100% rename from patches/unapplied/Expand-PlayerItemMendEvent.patch rename to patches/unapplied/server/Expand-PlayerItemMendEvent.patch diff --git a/patches/unapplied/Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch b/patches/unapplied/server/Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch similarity index 100% rename from patches/unapplied/Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch rename to patches/unapplied/server/Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch diff --git a/patches/unapplied/Expand-Pose-API.patch b/patches/unapplied/server/Expand-Pose-API.patch similarity index 100% rename from patches/unapplied/Expand-Pose-API.patch rename to patches/unapplied/server/Expand-Pose-API.patch diff --git a/patches/unapplied/Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/unapplied/server/Expand-World.spawnParticle-API-and-add-Builder.patch similarity index 100% rename from patches/unapplied/Expand-World.spawnParticle-API-and-add-Builder.patch rename to patches/unapplied/server/Expand-World.spawnParticle-API-and-add-Builder.patch diff --git a/patches/unapplied/Expand-world-key-API.patch b/patches/unapplied/server/Expand-world-key-API.patch similarity index 100% rename from patches/unapplied/Expand-world-key-API.patch rename to patches/unapplied/server/Expand-world-key-API.patch diff --git a/patches/unapplied/Expanded-Hopper-API.patch b/patches/unapplied/server/Expanded-Hopper-API.patch similarity index 100% rename from patches/unapplied/Expanded-Hopper-API.patch rename to patches/unapplied/server/Expanded-Hopper-API.patch diff --git a/patches/unapplied/ExperienceOrb-merging-stacking-API-and-fixes.patch b/patches/unapplied/server/ExperienceOrb-merging-stacking-API-and-fixes.patch similarity index 100% rename from patches/unapplied/ExperienceOrb-merging-stacking-API-and-fixes.patch rename to patches/unapplied/server/ExperienceOrb-merging-stacking-API-and-fixes.patch diff --git a/patches/unapplied/ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/unapplied/server/ExperienceOrb-should-call-EntitySpawnEvent.patch similarity index 100% rename from patches/unapplied/ExperienceOrb-should-call-EntitySpawnEvent.patch rename to patches/unapplied/server/ExperienceOrb-should-call-EntitySpawnEvent.patch diff --git a/patches/unapplied/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/unapplied/server/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch similarity index 100% rename from patches/unapplied/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch rename to patches/unapplied/server/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch diff --git a/patches/unapplied/Expose-LivingEntity-hurt-direction.patch b/patches/unapplied/server/Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/unapplied/Expose-LivingEntity-hurt-direction.patch rename to patches/unapplied/server/Expose-LivingEntity-hurt-direction.patch diff --git a/patches/unapplied/Expose-LootTable-of-DecoratedPot.patch b/patches/unapplied/server/Expose-LootTable-of-DecoratedPot.patch similarity index 100% rename from patches/unapplied/Expose-LootTable-of-DecoratedPot.patch rename to patches/unapplied/server/Expose-LootTable-of-DecoratedPot.patch diff --git a/patches/unapplied/Expose-MinecraftServer-isRunning.patch b/patches/unapplied/server/Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/unapplied/Expose-MinecraftServer-isRunning.patch rename to patches/unapplied/server/Expose-MinecraftServer-isRunning.patch diff --git a/patches/unapplied/Expose-Tracked-Players.patch b/patches/unapplied/server/Expose-Tracked-Players.patch similarity index 100% rename from patches/unapplied/Expose-Tracked-Players.patch rename to patches/unapplied/server/Expose-Tracked-Players.patch diff --git a/patches/unapplied/Expose-attack-cooldown-methods-for-Player.patch b/patches/unapplied/server/Expose-attack-cooldown-methods-for-Player.patch similarity index 100% rename from patches/unapplied/Expose-attack-cooldown-methods-for-Player.patch rename to patches/unapplied/server/Expose-attack-cooldown-methods-for-Player.patch diff --git a/patches/unapplied/Expose-client-protocol-version-and-virtual-host.patch b/patches/unapplied/server/Expose-client-protocol-version-and-virtual-host.patch similarity index 100% rename from patches/unapplied/Expose-client-protocol-version-and-virtual-host.patch rename to patches/unapplied/server/Expose-client-protocol-version-and-virtual-host.patch diff --git a/patches/unapplied/Expose-furnace-minecart-push-values.patch b/patches/unapplied/server/Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/unapplied/Expose-furnace-minecart-push-values.patch rename to patches/unapplied/server/Expose-furnace-minecart-push-values.patch diff --git a/patches/unapplied/Expose-hand-in-BlockCanBuildEvent.patch b/patches/unapplied/server/Expose-hand-in-BlockCanBuildEvent.patch similarity index 100% rename from patches/unapplied/Expose-hand-in-BlockCanBuildEvent.patch rename to patches/unapplied/server/Expose-hand-in-BlockCanBuildEvent.patch diff --git a/patches/unapplied/Expose-hasColor-to-leather-armor.patch b/patches/unapplied/server/Expose-hasColor-to-leather-armor.patch similarity index 100% rename from patches/unapplied/Expose-hasColor-to-leather-armor.patch rename to patches/unapplied/server/Expose-hasColor-to-leather-armor.patch diff --git a/patches/unapplied/Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/unapplied/server/Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/unapplied/Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/unapplied/server/Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/unapplied/Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/unapplied/server/Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/unapplied/Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/unapplied/server/Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/unapplied/Expose-protocol-version.patch b/patches/unapplied/server/Expose-protocol-version.patch similarity index 100% rename from patches/unapplied/Expose-protocol-version.patch rename to patches/unapplied/server/Expose-protocol-version.patch diff --git a/patches/unapplied/Expose-server-CommandMap.patch b/patches/unapplied/server/Expose-server-CommandMap.patch similarity index 100% rename from patches/unapplied/Expose-server-CommandMap.patch rename to patches/unapplied/server/Expose-server-CommandMap.patch diff --git a/patches/unapplied/Expose-server-build-information.patch b/patches/unapplied/server/Expose-server-build-information.patch similarity index 100% rename from patches/unapplied/Expose-server-build-information.patch rename to patches/unapplied/server/Expose-server-build-information.patch diff --git a/patches/unapplied/Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/unapplied/server/Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/unapplied/Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/unapplied/server/Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/unapplied/Expose-the-internal-current-tick.patch b/patches/unapplied/server/Expose-the-internal-current-tick.patch similarity index 100% rename from patches/unapplied/Expose-the-internal-current-tick.patch rename to patches/unapplied/server/Expose-the-internal-current-tick.patch diff --git a/patches/unapplied/Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/unapplied/server/Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/unapplied/Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/unapplied/server/Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/unapplied/Extend-Player-Interact-cancellation.patch b/patches/unapplied/server/Extend-Player-Interact-cancellation.patch similarity index 100% rename from patches/unapplied/Extend-Player-Interact-cancellation.patch rename to patches/unapplied/server/Extend-Player-Interact-cancellation.patch diff --git a/patches/unapplied/Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/unapplied/server/Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 100% rename from patches/unapplied/Extend-block-drop-capture-to-capture-all-items-added.patch rename to patches/unapplied/server/Extend-block-drop-capture-to-capture-all-items-added.patch diff --git a/patches/unapplied/Faster-redstone-torch-rapid-clock-removal.patch b/patches/unapplied/server/Faster-redstone-torch-rapid-clock-removal.patch similarity index 100% rename from patches/unapplied/Faster-redstone-torch-rapid-clock-removal.patch rename to patches/unapplied/server/Faster-redstone-torch-rapid-clock-removal.patch diff --git a/patches/unapplied/Fill-Profile-Property-Events.patch b/patches/unapplied/server/Fill-Profile-Property-Events.patch similarity index 100% rename from patches/unapplied/Fill-Profile-Property-Events.patch rename to patches/unapplied/server/Fill-Profile-Property-Events.patch diff --git a/patches/unapplied/Filter-bad-block-entity-nbt-data-from-falling-blocks.patch b/patches/unapplied/server/Filter-bad-block-entity-nbt-data-from-falling-blocks.patch similarity index 100% rename from patches/unapplied/Filter-bad-block-entity-nbt-data-from-falling-blocks.patch rename to patches/unapplied/server/Filter-bad-block-entity-nbt-data-from-falling-blocks.patch diff --git a/patches/unapplied/Fire-BlockExpEvent-on-grindstone-use.patch b/patches/unapplied/server/Fire-BlockExpEvent-on-grindstone-use.patch similarity index 100% rename from patches/unapplied/Fire-BlockExpEvent-on-grindstone-use.patch rename to patches/unapplied/server/Fire-BlockExpEvent-on-grindstone-use.patch diff --git a/patches/unapplied/Fire-CauldronLevelChange-on-initial-fill.patch b/patches/unapplied/server/Fire-CauldronLevelChange-on-initial-fill.patch similarity index 100% rename from patches/unapplied/Fire-CauldronLevelChange-on-initial-fill.patch rename to patches/unapplied/server/Fire-CauldronLevelChange-on-initial-fill.patch diff --git a/patches/unapplied/Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/unapplied/server/Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/unapplied/Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/unapplied/server/Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/unapplied/Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/unapplied/server/Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch similarity index 100% rename from patches/unapplied/Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch rename to patches/unapplied/server/Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch diff --git a/patches/unapplied/Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch b/patches/unapplied/server/Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch similarity index 100% rename from patches/unapplied/Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch rename to patches/unapplied/server/Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch diff --git a/patches/unapplied/Fire-entity-death-event-for-ender-dragon.patch b/patches/unapplied/server/Fire-entity-death-event-for-ender-dragon.patch similarity index 100% rename from patches/unapplied/Fire-entity-death-event-for-ender-dragon.patch rename to patches/unapplied/server/Fire-entity-death-event-for-ender-dragon.patch diff --git a/patches/unapplied/Fire-event-on-GS4-query.patch b/patches/unapplied/server/Fire-event-on-GS4-query.patch similarity index 100% rename from patches/unapplied/Fire-event-on-GS4-query.patch rename to patches/unapplied/server/Fire-event-on-GS4-query.patch diff --git a/patches/unapplied/Firework-API-s.patch b/patches/unapplied/server/Firework-API-s.patch similarity index 100% rename from patches/unapplied/Firework-API-s.patch rename to patches/unapplied/server/Firework-API-s.patch diff --git a/patches/unapplied/Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/unapplied/server/Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/unapplied/Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/unapplied/server/Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/unapplied/Fix-BanList-API.patch b/patches/unapplied/server/Fix-BanList-API.patch similarity index 100% rename from patches/unapplied/Fix-BanList-API.patch rename to patches/unapplied/server/Fix-BanList-API.patch diff --git a/patches/unapplied/Fix-Bee-flower-NPE.patch b/patches/unapplied/server/Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/unapplied/Fix-Bee-flower-NPE.patch rename to patches/unapplied/server/Fix-Bee-flower-NPE.patch diff --git a/patches/unapplied/Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/unapplied/server/Fix-CB-call-to-changed-postToMainThread-method.patch similarity index 100% rename from patches/unapplied/Fix-CB-call-to-changed-postToMainThread-method.patch rename to patches/unapplied/server/Fix-CB-call-to-changed-postToMainThread-method.patch diff --git a/patches/unapplied/Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/unapplied/server/Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch similarity index 100% rename from patches/unapplied/Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch rename to patches/unapplied/server/Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch diff --git a/patches/unapplied/Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/unapplied/server/Fix-CME-in-CraftPersistentDataTypeRegistry.patch similarity index 100% rename from patches/unapplied/Fix-CME-in-CraftPersistentDataTypeRegistry.patch rename to patches/unapplied/server/Fix-CME-in-CraftPersistentDataTypeRegistry.patch diff --git a/patches/unapplied/Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/unapplied/server/Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch similarity index 100% rename from patches/unapplied/Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch rename to patches/unapplied/server/Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch diff --git a/patches/unapplied/Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/unapplied/server/Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/unapplied/Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/unapplied/server/Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/unapplied/Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/unapplied/server/Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/unapplied/Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/unapplied/server/Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/unapplied/Fix-Concurrency-issue-in-ShufflingList.patch b/patches/unapplied/server/Fix-Concurrency-issue-in-ShufflingList.patch similarity index 100% rename from patches/unapplied/Fix-Concurrency-issue-in-ShufflingList.patch rename to patches/unapplied/server/Fix-Concurrency-issue-in-ShufflingList.patch diff --git a/patches/unapplied/Fix-CraftBukkit-drag-system.patch b/patches/unapplied/server/Fix-CraftBukkit-drag-system.patch similarity index 100% rename from patches/unapplied/Fix-CraftBukkit-drag-system.patch rename to patches/unapplied/server/Fix-CraftBukkit-drag-system.patch diff --git a/patches/unapplied/Fix-CraftCriteria-defaults-map.patch b/patches/unapplied/server/Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/unapplied/Fix-CraftCriteria-defaults-map.patch rename to patches/unapplied/server/Fix-CraftCriteria-defaults-map.patch diff --git a/patches/unapplied/Fix-CraftEntity-hashCode.patch b/patches/unapplied/server/Fix-CraftEntity-hashCode.patch similarity index 100% rename from patches/unapplied/Fix-CraftEntity-hashCode.patch rename to patches/unapplied/server/Fix-CraftEntity-hashCode.patch diff --git a/patches/unapplied/Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/unapplied/server/Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch similarity index 100% rename from patches/unapplied/Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch rename to patches/unapplied/server/Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch diff --git a/patches/unapplied/Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/unapplied/server/Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 100% rename from patches/unapplied/Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to patches/unapplied/server/Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch diff --git a/patches/unapplied/Fix-CraftSound-backwards-compatibility.patch b/patches/unapplied/server/Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/unapplied/Fix-CraftSound-backwards-compatibility.patch rename to patches/unapplied/server/Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/unapplied/Fix-CraftWorld-isChunkGenerated.patch b/patches/unapplied/server/Fix-CraftWorld-isChunkGenerated.patch similarity index 100% rename from patches/unapplied/Fix-CraftWorld-isChunkGenerated.patch rename to patches/unapplied/server/Fix-CraftWorld-isChunkGenerated.patch diff --git a/patches/unapplied/Fix-DamageSource-API.patch b/patches/unapplied/server/Fix-DamageSource-API.patch similarity index 100% rename from patches/unapplied/Fix-DamageSource-API.patch rename to patches/unapplied/server/Fix-DamageSource-API.patch diff --git a/patches/unapplied/Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/unapplied/server/Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 100% rename from patches/unapplied/Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to patches/unapplied/server/Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch diff --git a/patches/unapplied/Fix-EntityArgument-and-EntitySelectorParser-permissi.patch b/patches/unapplied/server/Fix-EntityArgument-and-EntitySelectorParser-permissi.patch similarity index 100% rename from patches/unapplied/Fix-EntityArgument-and-EntitySelectorParser-permissi.patch rename to patches/unapplied/server/Fix-EntityArgument-and-EntitySelectorParser-permissi.patch diff --git a/patches/unapplied/Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/unapplied/server/Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 100% rename from patches/unapplied/Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/unapplied/server/Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch diff --git a/patches/unapplied/Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/unapplied/server/Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch similarity index 100% rename from patches/unapplied/Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch rename to patches/unapplied/server/Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch diff --git a/patches/unapplied/Fix-GameProfileCache-concurrency.patch b/patches/unapplied/server/Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/unapplied/Fix-GameProfileCache-concurrency.patch rename to patches/unapplied/server/Fix-GameProfileCache-concurrency.patch diff --git a/patches/unapplied/Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/unapplied/server/Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 100% rename from patches/unapplied/Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/unapplied/server/Fix-HumanEntity-drop-not-updating-the-client-inv.patch diff --git a/patches/unapplied/Fix-InventoryOpenEvent-cancellation.patch b/patches/unapplied/server/Fix-InventoryOpenEvent-cancellation.patch similarity index 100% rename from patches/unapplied/Fix-InventoryOpenEvent-cancellation.patch rename to patches/unapplied/server/Fix-InventoryOpenEvent-cancellation.patch diff --git a/patches/unapplied/Fix-ItemFlags.patch b/patches/unapplied/server/Fix-ItemFlags.patch similarity index 100% rename from patches/unapplied/Fix-ItemFlags.patch rename to patches/unapplied/server/Fix-ItemFlags.patch diff --git a/patches/unapplied/Fix-MC-117075-Block-entity-unload-lag-spike.patch b/patches/unapplied/server/Fix-MC-117075-Block-entity-unload-lag-spike.patch similarity index 100% rename from patches/unapplied/Fix-MC-117075-Block-entity-unload-lag-spike.patch rename to patches/unapplied/server/Fix-MC-117075-Block-entity-unload-lag-spike.patch diff --git a/patches/unapplied/Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/unapplied/server/Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/unapplied/Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/unapplied/server/Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/unapplied/Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/unapplied/server/Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch similarity index 100% rename from patches/unapplied/Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch rename to patches/unapplied/server/Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch diff --git a/patches/unapplied/Fix-NBT-type-issues.patch b/patches/unapplied/server/Fix-NBT-type-issues.patch similarity index 100% rename from patches/unapplied/Fix-NBT-type-issues.patch rename to patches/unapplied/server/Fix-NBT-type-issues.patch diff --git a/patches/unapplied/Fix-NPE-for-Jukebox-setRecord.patch b/patches/unapplied/server/Fix-NPE-for-Jukebox-setRecord.patch similarity index 100% rename from patches/unapplied/Fix-NPE-for-Jukebox-setRecord.patch rename to patches/unapplied/server/Fix-NPE-for-Jukebox-setRecord.patch diff --git a/patches/unapplied/Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/unapplied/server/Fix-NPE-in-AdvancementProgress-getDateAwarded.patch similarity index 100% rename from patches/unapplied/Fix-NPE-in-AdvancementProgress-getDateAwarded.patch rename to patches/unapplied/server/Fix-NPE-in-AdvancementProgress-getDateAwarded.patch diff --git a/patches/unapplied/Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/unapplied/server/Fix-NPE-in-SculkBloomEvent-world-access.patch similarity index 100% rename from patches/unapplied/Fix-NPE-in-SculkBloomEvent-world-access.patch rename to patches/unapplied/server/Fix-NPE-in-SculkBloomEvent-world-access.patch diff --git a/patches/unapplied/Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/unapplied/server/Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/unapplied/Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/unapplied/server/Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/unapplied/Fix-NPE-on-Boat-getStatus.patch b/patches/unapplied/server/Fix-NPE-on-Boat-getStatus.patch similarity index 100% rename from patches/unapplied/Fix-NPE-on-Boat-getStatus.patch rename to patches/unapplied/server/Fix-NPE-on-Boat-getStatus.patch diff --git a/patches/unapplied/Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/unapplied/server/Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch similarity index 100% rename from patches/unapplied/Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch rename to patches/unapplied/server/Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch diff --git a/patches/unapplied/Fix-Not-a-string-Map-Conversion-spam.patch b/patches/unapplied/server/Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/unapplied/Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/unapplied/server/Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/unapplied/Fix-NotePlayEvent.patch b/patches/unapplied/server/Fix-NotePlayEvent.patch similarity index 100% rename from patches/unapplied/Fix-NotePlayEvent.patch rename to patches/unapplied/server/Fix-NotePlayEvent.patch diff --git a/patches/unapplied/Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/unapplied/server/Fix-OfflinePlayer-getBedSpawnLocation.patch similarity index 100% rename from patches/unapplied/Fix-OfflinePlayer-getBedSpawnLocation.patch rename to patches/unapplied/server/Fix-OfflinePlayer-getBedSpawnLocation.patch diff --git a/patches/unapplied/Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/unapplied/server/Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 100% rename from patches/unapplied/Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/unapplied/server/Fix-Per-World-Difficulty-Remembering-Difficulty.patch diff --git a/patches/unapplied/Fix-PickupStatus-getting-reset.patch b/patches/unapplied/server/Fix-PickupStatus-getting-reset.patch similarity index 100% rename from patches/unapplied/Fix-PickupStatus-getting-reset.patch rename to patches/unapplied/server/Fix-PickupStatus-getting-reset.patch diff --git a/patches/unapplied/Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/unapplied/server/Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/unapplied/Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/unapplied/server/Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/unapplied/Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/unapplied/server/Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/unapplied/Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/unapplied/server/Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/unapplied/Fix-PlayerCommandPreprocessEvent-on-signed-commands.patch b/patches/unapplied/server/Fix-PlayerCommandPreprocessEvent-on-signed-commands.patch similarity index 100% rename from patches/unapplied/Fix-PlayerCommandPreprocessEvent-on-signed-commands.patch rename to patches/unapplied/server/Fix-PlayerCommandPreprocessEvent-on-signed-commands.patch diff --git a/patches/unapplied/Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/unapplied/server/Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 100% rename from patches/unapplied/Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/unapplied/server/Fix-PlayerDropItemEvent-using-wrong-item.patch diff --git a/patches/unapplied/Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/unapplied/server/Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 100% rename from patches/unapplied/Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/unapplied/server/Fix-PlayerItemConsumeEvent-cancelling-properly.patch diff --git a/patches/unapplied/Fix-PotionEffect-ignores-icon-flag.patch b/patches/unapplied/server/Fix-PotionEffect-ignores-icon-flag.patch similarity index 100% rename from patches/unapplied/Fix-PotionEffect-ignores-icon-flag.patch rename to patches/unapplied/server/Fix-PotionEffect-ignores-icon-flag.patch diff --git a/patches/unapplied/Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/unapplied/server/Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/unapplied/Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/unapplied/server/Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/unapplied/Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/unapplied/server/Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/unapplied/Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/unapplied/server/Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/unapplied/Fix-SculkBloomEvent-firing-for-block-entity-loading.patch b/patches/unapplied/server/Fix-SculkBloomEvent-firing-for-block-entity-loading.patch similarity index 100% rename from patches/unapplied/Fix-SculkBloomEvent-firing-for-block-entity-loading.patch rename to patches/unapplied/server/Fix-SculkBloomEvent-firing-for-block-entity-loading.patch diff --git a/patches/unapplied/Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/unapplied/server/Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 100% rename from patches/unapplied/Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/unapplied/server/Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch diff --git a/patches/unapplied/Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/unapplied/server/Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/unapplied/Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/unapplied/server/Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/unapplied/Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/unapplied/server/Fix-Spigot-Config-not-using-commands.spam-exclusions.patch similarity index 100% rename from patches/unapplied/Fix-Spigot-Config-not-using-commands.spam-exclusions.patch rename to patches/unapplied/server/Fix-Spigot-Config-not-using-commands.spam-exclusions.patch diff --git a/patches/unapplied/Fix-Spigot-growth-modifiers.patch b/patches/unapplied/server/Fix-Spigot-growth-modifiers.patch similarity index 100% rename from patches/unapplied/Fix-Spigot-growth-modifiers.patch rename to patches/unapplied/server/Fix-Spigot-growth-modifiers.patch diff --git a/patches/unapplied/Fix-SpongeAbsortEvent-handling.patch b/patches/unapplied/server/Fix-SpongeAbsortEvent-handling.patch similarity index 100% rename from patches/unapplied/Fix-SpongeAbsortEvent-handling.patch rename to patches/unapplied/server/Fix-SpongeAbsortEvent-handling.patch diff --git a/patches/unapplied/Fix-UnsafeValues-loadAdvancement.patch b/patches/unapplied/server/Fix-UnsafeValues-loadAdvancement.patch similarity index 100% rename from patches/unapplied/Fix-UnsafeValues-loadAdvancement.patch rename to patches/unapplied/server/Fix-UnsafeValues-loadAdvancement.patch diff --git a/patches/unapplied/Fix-a-bunch-of-vanilla-bugs.patch b/patches/unapplied/server/Fix-a-bunch-of-vanilla-bugs.patch similarity index 100% rename from patches/unapplied/Fix-a-bunch-of-vanilla-bugs.patch rename to patches/unapplied/server/Fix-a-bunch-of-vanilla-bugs.patch diff --git a/patches/unapplied/Fix-a-couple-of-upstream-bed-issues.patch b/patches/unapplied/server/Fix-a-couple-of-upstream-bed-issues.patch similarity index 100% rename from patches/unapplied/Fix-a-couple-of-upstream-bed-issues.patch rename to patches/unapplied/server/Fix-a-couple-of-upstream-bed-issues.patch diff --git a/patches/unapplied/Fix-advancement-triggers-for-entity-damage.patch b/patches/unapplied/server/Fix-advancement-triggers-for-entity-damage.patch similarity index 100% rename from patches/unapplied/Fix-advancement-triggers-for-entity-damage.patch rename to patches/unapplied/server/Fix-advancement-triggers-for-entity-damage.patch diff --git a/patches/unapplied/Fix-arrows-never-despawning-MC-125757.patch b/patches/unapplied/server/Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/unapplied/Fix-arrows-never-despawning-MC-125757.patch rename to patches/unapplied/server/Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/unapplied/Fix-async-entity-add-due-to-fungus-trees.patch b/patches/unapplied/server/Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/unapplied/Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/unapplied/server/Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/unapplied/Fix-bees-aging-inside-hives.patch b/patches/unapplied/server/Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/unapplied/Fix-bees-aging-inside-hives.patch rename to patches/unapplied/server/Fix-bees-aging-inside-hives.patch diff --git a/patches/unapplied/Fix-bell-block-entity-memory-leak.patch b/patches/unapplied/server/Fix-bell-block-entity-memory-leak.patch similarity index 100% rename from patches/unapplied/Fix-bell-block-entity-memory-leak.patch rename to patches/unapplied/server/Fix-bell-block-entity-memory-leak.patch diff --git a/patches/unapplied/Fix-block-place-logic.patch b/patches/unapplied/server/Fix-block-place-logic.patch similarity index 100% rename from patches/unapplied/Fix-block-place-logic.patch rename to patches/unapplied/server/Fix-block-place-logic.patch diff --git a/patches/unapplied/Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/unapplied/server/Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 100% rename from patches/unapplied/Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/unapplied/server/Fix-cancelled-powdered-snow-bucket-placement.patch diff --git a/patches/unapplied/Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch b/patches/unapplied/server/Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch similarity index 100% rename from patches/unapplied/Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch rename to patches/unapplied/server/Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch diff --git a/patches/unapplied/Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/unapplied/server/Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch similarity index 100% rename from patches/unapplied/Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch rename to patches/unapplied/server/Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch diff --git a/patches/unapplied/Fix-client-lag-on-advancement-loading.patch b/patches/unapplied/server/Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from patches/unapplied/Fix-client-lag-on-advancement-loading.patch rename to patches/unapplied/server/Fix-client-lag-on-advancement-loading.patch diff --git a/patches/unapplied/Fix-cmd-permission-levels-for-command-blocks.patch b/patches/unapplied/server/Fix-cmd-permission-levels-for-command-blocks.patch similarity index 100% rename from patches/unapplied/Fix-cmd-permission-levels-for-command-blocks.patch rename to patches/unapplied/server/Fix-cmd-permission-levels-for-command-blocks.patch diff --git a/patches/unapplied/Fix-commands-from-signs-not-firing-command-events.patch b/patches/unapplied/server/Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/unapplied/Fix-commands-from-signs-not-firing-command-events.patch rename to patches/unapplied/server/Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/unapplied/Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch b/patches/unapplied/server/Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch similarity index 100% rename from patches/unapplied/Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch rename to patches/unapplied/server/Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch diff --git a/patches/unapplied/Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/unapplied/server/Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch similarity index 100% rename from patches/unapplied/Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch rename to patches/unapplied/server/Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch diff --git a/patches/unapplied/Fix-creation-of-invalid-block-entity-during-world-ge.patch b/patches/unapplied/server/Fix-creation-of-invalid-block-entity-during-world-ge.patch similarity index 100% rename from patches/unapplied/Fix-creation-of-invalid-block-entity-during-world-ge.patch rename to patches/unapplied/server/Fix-creation-of-invalid-block-entity-during-world-ge.patch diff --git a/patches/unapplied/Fix-custom-piglin-loved-items.patch b/patches/unapplied/server/Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/unapplied/Fix-custom-piglin-loved-items.patch rename to patches/unapplied/server/Fix-custom-piglin-loved-items.patch diff --git a/patches/unapplied/Fix-custom-statistic-criteria-creation.patch b/patches/unapplied/server/Fix-custom-statistic-criteria-creation.patch similarity index 100% rename from patches/unapplied/Fix-custom-statistic-criteria-creation.patch rename to patches/unapplied/server/Fix-custom-statistic-criteria-creation.patch diff --git a/patches/unapplied/Fix-demo-flag-not-enabling-demo-mode.patch b/patches/unapplied/server/Fix-demo-flag-not-enabling-demo-mode.patch similarity index 100% rename from patches/unapplied/Fix-demo-flag-not-enabling-demo-mode.patch rename to patches/unapplied/server/Fix-demo-flag-not-enabling-demo-mode.patch diff --git a/patches/unapplied/Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/unapplied/server/Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from patches/unapplied/Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to patches/unapplied/server/Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/patches/unapplied/Fix-entity-tracker-desync-when-new-players-are-added.patch b/patches/unapplied/server/Fix-entity-tracker-desync-when-new-players-are-added.patch similarity index 100% rename from patches/unapplied/Fix-entity-tracker-desync-when-new-players-are-added.patch rename to patches/unapplied/server/Fix-entity-tracker-desync-when-new-players-are-added.patch diff --git a/patches/unapplied/Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/unapplied/server/Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/unapplied/Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/unapplied/server/Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/unapplied/Fix-equipment-slot-and-group-API.patch b/patches/unapplied/server/Fix-equipment-slot-and-group-API.patch similarity index 100% rename from patches/unapplied/Fix-equipment-slot-and-group-API.patch rename to patches/unapplied/server/Fix-equipment-slot-and-group-API.patch diff --git a/patches/unapplied/Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/unapplied/server/Fix-exploit-that-allowed-colored-signs-to-be-created.patch similarity index 100% rename from patches/unapplied/Fix-exploit-that-allowed-colored-signs-to-be-created.patch rename to patches/unapplied/server/Fix-exploit-that-allowed-colored-signs-to-be-created.patch diff --git a/patches/unapplied/Fix-falling-block-spawn-methods.patch b/patches/unapplied/server/Fix-falling-block-spawn-methods.patch similarity index 100% rename from patches/unapplied/Fix-falling-block-spawn-methods.patch rename to patches/unapplied/server/Fix-falling-block-spawn-methods.patch diff --git a/patches/unapplied/Fix-for-large-move-vectors-crashing-server.patch b/patches/unapplied/server/Fix-for-large-move-vectors-crashing-server.patch similarity index 100% rename from patches/unapplied/Fix-for-large-move-vectors-crashing-server.patch rename to patches/unapplied/server/Fix-for-large-move-vectors-crashing-server.patch diff --git a/patches/unapplied/Fix-force-opening-enchantment-tables.patch b/patches/unapplied/server/Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/unapplied/Fix-force-opening-enchantment-tables.patch rename to patches/unapplied/server/Fix-force-opening-enchantment-tables.patch diff --git a/patches/unapplied/Fix-global-sound-handling.patch b/patches/unapplied/server/Fix-global-sound-handling.patch similarity index 100% rename from patches/unapplied/Fix-global-sound-handling.patch rename to patches/unapplied/server/Fix-global-sound-handling.patch diff --git a/patches/unapplied/Fix-harming-potion-dupe.patch b/patches/unapplied/server/Fix-harming-potion-dupe.patch similarity index 100% rename from patches/unapplied/Fix-harming-potion-dupe.patch rename to patches/unapplied/server/Fix-harming-potion-dupe.patch diff --git a/patches/unapplied/Fix-helmet-damage-reduction-inconsistencies.patch b/patches/unapplied/server/Fix-helmet-damage-reduction-inconsistencies.patch similarity index 100% rename from patches/unapplied/Fix-helmet-damage-reduction-inconsistencies.patch rename to patches/unapplied/server/Fix-helmet-damage-reduction-inconsistencies.patch diff --git a/patches/unapplied/Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/unapplied/server/Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/unapplied/Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/unapplied/server/Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/unapplied/Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/unapplied/server/Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/unapplied/Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/unapplied/server/Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/unapplied/Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/unapplied/server/Fix-incorrect-crafting-result-amount-for-fireworks.patch similarity index 100% rename from patches/unapplied/Fix-incorrect-crafting-result-amount-for-fireworks.patch rename to patches/unapplied/server/Fix-incorrect-crafting-result-amount-for-fireworks.patch diff --git a/patches/unapplied/Fix-interact-event-not-being-called-sometimes.patch b/patches/unapplied/server/Fix-interact-event-not-being-called-sometimes.patch similarity index 100% rename from patches/unapplied/Fix-interact-event-not-being-called-sometimes.patch rename to patches/unapplied/server/Fix-interact-event-not-being-called-sometimes.patch diff --git a/patches/unapplied/Fix-inventories-returning-null-Locations.patch b/patches/unapplied/server/Fix-inventories-returning-null-Locations.patch similarity index 100% rename from patches/unapplied/Fix-inventories-returning-null-Locations.patch rename to patches/unapplied/server/Fix-inventories-returning-null-Locations.patch diff --git a/patches/unapplied/Fix-invulnerable-end-crystals.patch b/patches/unapplied/server/Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/unapplied/Fix-invulnerable-end-crystals.patch rename to patches/unapplied/server/Fix-invulnerable-end-crystals.patch diff --git a/patches/unapplied/Fix-issues-with-Recipe-API.patch b/patches/unapplied/server/Fix-issues-with-Recipe-API.patch similarity index 100% rename from patches/unapplied/Fix-issues-with-Recipe-API.patch rename to patches/unapplied/server/Fix-issues-with-Recipe-API.patch diff --git a/patches/unapplied/Fix-issues-with-mob-conversion.patch b/patches/unapplied/server/Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/unapplied/Fix-issues-with-mob-conversion.patch rename to patches/unapplied/server/Fix-issues-with-mob-conversion.patch diff --git a/patches/unapplied/Fix-item-duplication-and-teleport-issues.patch b/patches/unapplied/server/Fix-item-duplication-and-teleport-issues.patch similarity index 100% rename from patches/unapplied/Fix-item-duplication-and-teleport-issues.patch rename to patches/unapplied/server/Fix-item-duplication-and-teleport-issues.patch diff --git a/patches/unapplied/Fix-item-locations-dropped-from-campfires.patch b/patches/unapplied/server/Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/unapplied/Fix-item-locations-dropped-from-campfires.patch rename to patches/unapplied/server/Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/unapplied/Fix-items-not-falling-correctly.patch b/patches/unapplied/server/Fix-items-not-falling-correctly.patch similarity index 100% rename from patches/unapplied/Fix-items-not-falling-correctly.patch rename to patches/unapplied/server/Fix-items-not-falling-correctly.patch diff --git a/patches/unapplied/Fix-kick-event-leave-message-not-being-sent.patch b/patches/unapplied/server/Fix-kick-event-leave-message-not-being-sent.patch similarity index 100% rename from patches/unapplied/Fix-kick-event-leave-message-not-being-sent.patch rename to patches/unapplied/server/Fix-kick-event-leave-message-not-being-sent.patch diff --git a/patches/unapplied/Fix-lag-from-explosions-processing-dead-entities.patch b/patches/unapplied/server/Fix-lag-from-explosions-processing-dead-entities.patch similarity index 100% rename from patches/unapplied/Fix-lag-from-explosions-processing-dead-entities.patch rename to patches/unapplied/server/Fix-lag-from-explosions-processing-dead-entities.patch diff --git a/patches/unapplied/Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/unapplied/server/Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 100% rename from patches/unapplied/Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/unapplied/server/Fix-merchant-inventory-not-closing-on-entity-removal.patch diff --git a/patches/unapplied/Fix-missing-chunks-due-to-integer-overflow.patch b/patches/unapplied/server/Fix-missing-chunks-due-to-integer-overflow.patch similarity index 100% rename from patches/unapplied/Fix-missing-chunks-due-to-integer-overflow.patch rename to patches/unapplied/server/Fix-missing-chunks-due-to-integer-overflow.patch diff --git a/patches/unapplied/Fix-missing-event-call-for-entity-teleport-API.patch b/patches/unapplied/server/Fix-missing-event-call-for-entity-teleport-API.patch similarity index 100% rename from patches/unapplied/Fix-missing-event-call-for-entity-teleport-API.patch rename to patches/unapplied/server/Fix-missing-event-call-for-entity-teleport-API.patch diff --git a/patches/unapplied/Fix-missing-map-initialize-event-call.patch b/patches/unapplied/server/Fix-missing-map-initialize-event-call.patch similarity index 100% rename from patches/unapplied/Fix-missing-map-initialize-event-call.patch rename to patches/unapplied/server/Fix-missing-map-initialize-event-call.patch diff --git a/patches/unapplied/Fix-nerfed-slime-when-splitting.patch b/patches/unapplied/server/Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/unapplied/Fix-nerfed-slime-when-splitting.patch rename to patches/unapplied/server/Fix-nerfed-slime-when-splitting.patch diff --git a/patches/unapplied/Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/unapplied/server/Fix-new-block-data-for-EntityChangeBlockEvent.patch similarity index 100% rename from patches/unapplied/Fix-new-block-data-for-EntityChangeBlockEvent.patch rename to patches/unapplied/server/Fix-new-block-data-for-EntityChangeBlockEvent.patch diff --git a/patches/unapplied/Fix-piston-physics-inconsistency-MC-188840.patch b/patches/unapplied/server/Fix-piston-physics-inconsistency-MC-188840.patch similarity index 100% rename from patches/unapplied/Fix-piston-physics-inconsistency-MC-188840.patch rename to patches/unapplied/server/Fix-piston-physics-inconsistency-MC-188840.patch diff --git a/patches/unapplied/Fix-plugin-loggers-on-server-shutdown.patch b/patches/unapplied/server/Fix-plugin-loggers-on-server-shutdown.patch similarity index 100% rename from patches/unapplied/Fix-plugin-loggers-on-server-shutdown.patch rename to patches/unapplied/server/Fix-plugin-loggers-on-server-shutdown.patch diff --git a/patches/unapplied/Fix-possible-NPE-on-painting-creation.patch b/patches/unapplied/server/Fix-possible-NPE-on-painting-creation.patch similarity index 100% rename from patches/unapplied/Fix-possible-NPE-on-painting-creation.patch rename to patches/unapplied/server/Fix-possible-NPE-on-painting-creation.patch diff --git a/patches/unapplied/Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/unapplied/server/Fix-possible-StackOverflowError-for-some-dispenses.patch similarity index 100% rename from patches/unapplied/Fix-possible-StackOverflowError-for-some-dispenses.patch rename to patches/unapplied/server/Fix-possible-StackOverflowError-for-some-dispenses.patch diff --git a/patches/unapplied/Fix-potions-splash-events.patch b/patches/unapplied/server/Fix-potions-splash-events.patch similarity index 100% rename from patches/unapplied/Fix-potions-splash-events.patch rename to patches/unapplied/server/Fix-potions-splash-events.patch diff --git a/patches/unapplied/Fix-premature-player-kicks-on-shutdown.patch b/patches/unapplied/server/Fix-premature-player-kicks-on-shutdown.patch similarity index 100% rename from patches/unapplied/Fix-premature-player-kicks-on-shutdown.patch rename to patches/unapplied/server/Fix-premature-player-kicks-on-shutdown.patch diff --git a/patches/unapplied/Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/unapplied/server/Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch similarity index 100% rename from patches/unapplied/Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch rename to patches/unapplied/server/Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch diff --git a/patches/unapplied/Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/unapplied/server/Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/unapplied/Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/unapplied/server/Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/unapplied/Fix-removing-recipes-from-RecipeIterator.patch b/patches/unapplied/server/Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/unapplied/Fix-removing-recipes-from-RecipeIterator.patch rename to patches/unapplied/server/Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/unapplied/Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/unapplied/server/Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/unapplied/Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/unapplied/server/Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/unapplied/Fix-rotation-when-spawning-display-entities.patch b/patches/unapplied/server/Fix-rotation-when-spawning-display-entities.patch similarity index 100% rename from patches/unapplied/Fix-rotation-when-spawning-display-entities.patch rename to patches/unapplied/server/Fix-rotation-when-spawning-display-entities.patch diff --git a/patches/unapplied/Fix-saving-in-unloadWorld.patch b/patches/unapplied/server/Fix-saving-in-unloadWorld.patch similarity index 100% rename from patches/unapplied/Fix-saving-in-unloadWorld.patch rename to patches/unapplied/server/Fix-saving-in-unloadWorld.patch diff --git a/patches/unapplied/Fix-sending-disconnect-packet-in-phases-where-it-doe.patch b/patches/unapplied/server/Fix-sending-disconnect-packet-in-phases-where-it-doe.patch similarity index 100% rename from patches/unapplied/Fix-sending-disconnect-packet-in-phases-where-it-doe.patch rename to patches/unapplied/server/Fix-sending-disconnect-packet-in-phases-where-it-doe.patch diff --git a/patches/unapplied/Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/unapplied/server/Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/unapplied/Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/unapplied/server/Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/unapplied/Fix-several-issues-with-EntityBreedEvent.patch b/patches/unapplied/server/Fix-several-issues-with-EntityBreedEvent.patch similarity index 100% rename from patches/unapplied/Fix-several-issues-with-EntityBreedEvent.patch rename to patches/unapplied/server/Fix-several-issues-with-EntityBreedEvent.patch diff --git a/patches/unapplied/Fix-shield-disable-inconsistency.patch b/patches/unapplied/server/Fix-shield-disable-inconsistency.patch similarity index 100% rename from patches/unapplied/Fix-shield-disable-inconsistency.patch rename to patches/unapplied/server/Fix-shield-disable-inconsistency.patch diff --git a/patches/unapplied/Fix-silent-equipment-change-for-mobs.patch b/patches/unapplied/server/Fix-silent-equipment-change-for-mobs.patch similarity index 100% rename from patches/unapplied/Fix-silent-equipment-change-for-mobs.patch rename to patches/unapplied/server/Fix-silent-equipment-change-for-mobs.patch diff --git a/patches/unapplied/Fix-slot-desync.patch b/patches/unapplied/server/Fix-slot-desync.patch similarity index 100% rename from patches/unapplied/Fix-slot-desync.patch rename to patches/unapplied/server/Fix-slot-desync.patch diff --git a/patches/unapplied/Fix-sniffer-removeExploredLocation.patch b/patches/unapplied/server/Fix-sniffer-removeExploredLocation.patch similarity index 100% rename from patches/unapplied/Fix-sniffer-removeExploredLocation.patch rename to patches/unapplied/server/Fix-sniffer-removeExploredLocation.patch diff --git a/patches/unapplied/Fix-some-rails-connecting-improperly.patch b/patches/unapplied/server/Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/unapplied/Fix-some-rails-connecting-improperly.patch rename to patches/unapplied/server/Fix-some-rails-connecting-improperly.patch diff --git a/patches/unapplied/Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/unapplied/server/Fix-sounds-when-item-frames-are-modified-MC-123450.patch similarity index 100% rename from patches/unapplied/Fix-sounds-when-item-frames-are-modified-MC-123450.patch rename to patches/unapplied/server/Fix-sounds-when-item-frames-are-modified-MC-123450.patch diff --git a/patches/unapplied/Fix-spawn-location-event-changing-location.patch b/patches/unapplied/server/Fix-spawn-location-event-changing-location.patch similarity index 100% rename from patches/unapplied/Fix-spawn-location-event-changing-location.patch rename to patches/unapplied/server/Fix-spawn-location-event-changing-location.patch diff --git a/patches/unapplied/Fix-spigot-s-Forced-Stats.patch b/patches/unapplied/server/Fix-spigot-s-Forced-Stats.patch similarity index 100% rename from patches/unapplied/Fix-spigot-s-Forced-Stats.patch rename to patches/unapplied/server/Fix-spigot-s-Forced-Stats.patch diff --git a/patches/unapplied/Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/unapplied/server/Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch similarity index 100% rename from patches/unapplied/Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch rename to patches/unapplied/server/Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch diff --git a/patches/unapplied/Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/unapplied/server/Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/unapplied/Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/unapplied/server/Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/unapplied/Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/unapplied/server/Fix-strikeLightningEffect-powers-lightning-rods-and-.patch similarity index 100% rename from patches/unapplied/Fix-strikeLightningEffect-powers-lightning-rods-and-.patch rename to patches/unapplied/server/Fix-strikeLightningEffect-powers-lightning-rods-and-.patch diff --git a/patches/unapplied/Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/unapplied/server/Fix-suggest-command-message-for-brigadier-syntax-exc.patch similarity index 100% rename from patches/unapplied/Fix-suggest-command-message-for-brigadier-syntax-exc.patch rename to patches/unapplied/server/Fix-suggest-command-message-for-brigadier-syntax-exc.patch diff --git a/patches/unapplied/Fix-swamp-hut-cat-generation-deadlock.patch b/patches/unapplied/server/Fix-swamp-hut-cat-generation-deadlock.patch similarity index 100% rename from patches/unapplied/Fix-swamp-hut-cat-generation-deadlock.patch rename to patches/unapplied/server/Fix-swamp-hut-cat-generation-deadlock.patch diff --git a/patches/unapplied/Fix-synchronise-sending-chat-to-client-with-updating.patch b/patches/unapplied/server/Fix-synchronise-sending-chat-to-client-with-updating.patch similarity index 100% rename from patches/unapplied/Fix-synchronise-sending-chat-to-client-with-updating.patch rename to patches/unapplied/server/Fix-synchronise-sending-chat-to-client-with-updating.patch diff --git a/patches/unapplied/Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/unapplied/server/Fix-team-sidebar-objectives-not-being-cleared.patch similarity index 100% rename from patches/unapplied/Fix-team-sidebar-objectives-not-being-cleared.patch rename to patches/unapplied/server/Fix-team-sidebar-objectives-not-being-cleared.patch diff --git a/patches/unapplied/Fix-text-display-error-on-spawn.patch b/patches/unapplied/server/Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/unapplied/Fix-text-display-error-on-spawn.patch rename to patches/unapplied/server/Fix-text-display-error-on-spawn.patch diff --git a/patches/unapplied/Fix-this-stupid-bullshit.patch b/patches/unapplied/server/Fix-this-stupid-bullshit.patch similarity index 100% rename from patches/unapplied/Fix-this-stupid-bullshit.patch rename to patches/unapplied/server/Fix-this-stupid-bullshit.patch diff --git a/patches/unapplied/Fix-tripwire-disarming-not-working-as-intended.patch b/patches/unapplied/server/Fix-tripwire-disarming-not-working-as-intended.patch similarity index 100% rename from patches/unapplied/Fix-tripwire-disarming-not-working-as-intended.patch rename to patches/unapplied/server/Fix-tripwire-disarming-not-working-as-intended.patch diff --git a/patches/unapplied/Fix-upstreams-block-state-factories.patch b/patches/unapplied/server/Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/unapplied/Fix-upstreams-block-state-factories.patch rename to patches/unapplied/server/Fix-upstreams-block-state-factories.patch diff --git a/patches/unapplied/Fix-villager-boat-exploit.patch b/patches/unapplied/server/Fix-villager-boat-exploit.patch similarity index 100% rename from patches/unapplied/Fix-villager-boat-exploit.patch rename to patches/unapplied/server/Fix-villager-boat-exploit.patch diff --git a/patches/unapplied/Fix-villager-trading-demand-MC-163962.patch b/patches/unapplied/server/Fix-villager-trading-demand-MC-163962.patch similarity index 100% rename from patches/unapplied/Fix-villager-trading-demand-MC-163962.patch rename to patches/unapplied/server/Fix-villager-trading-demand-MC-163962.patch diff --git a/patches/unapplied/Fix-xp-reward-for-baby-zombies.patch b/patches/unapplied/server/Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/unapplied/Fix-xp-reward-for-baby-zombies.patch rename to patches/unapplied/server/Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/unapplied/Fixes-and-additions-to-the-spawn-reason-API.patch b/patches/unapplied/server/Fixes-and-additions-to-the-spawn-reason-API.patch similarity index 100% rename from patches/unapplied/Fixes-and-additions-to-the-spawn-reason-API.patch rename to patches/unapplied/server/Fixes-and-additions-to-the-spawn-reason-API.patch diff --git a/patches/unapplied/Fixup-NamespacedKey-handling.patch b/patches/unapplied/server/Fixup-NamespacedKey-handling.patch similarity index 100% rename from patches/unapplied/Fixup-NamespacedKey-handling.patch rename to patches/unapplied/server/Fixup-NamespacedKey-handling.patch diff --git a/patches/unapplied/Flag-to-disable-the-channel-limit.patch b/patches/unapplied/server/Flag-to-disable-the-channel-limit.patch similarity index 100% rename from patches/unapplied/Flag-to-disable-the-channel-limit.patch rename to patches/unapplied/server/Flag-to-disable-the-channel-limit.patch diff --git a/patches/unapplied/Flat-bedrock-generator-settings.patch b/patches/unapplied/server/Flat-bedrock-generator-settings.patch similarity index 100% rename from patches/unapplied/Flat-bedrock-generator-settings.patch rename to patches/unapplied/server/Flat-bedrock-generator-settings.patch diff --git a/patches/unapplied/Flying-Fall-Damage.patch b/patches/unapplied/server/Flying-Fall-Damage.patch similarity index 100% rename from patches/unapplied/Flying-Fall-Damage.patch rename to patches/unapplied/server/Flying-Fall-Damage.patch diff --git a/patches/unapplied/Folia-scheduler-and-owned-region-API.patch b/patches/unapplied/server/Folia-scheduler-and-owned-region-API.patch similarity index 100% rename from patches/unapplied/Folia-scheduler-and-owned-region-API.patch rename to patches/unapplied/server/Folia-scheduler-and-owned-region-API.patch diff --git a/patches/unapplied/Force-close-world-loading-screen.patch b/patches/unapplied/server/Force-close-world-loading-screen.patch similarity index 100% rename from patches/unapplied/Force-close-world-loading-screen.patch rename to patches/unapplied/server/Force-close-world-loading-screen.patch diff --git a/patches/unapplied/Forward-CraftEntity-in-teleport-command.patch b/patches/unapplied/server/Forward-CraftEntity-in-teleport-command.patch similarity index 100% rename from patches/unapplied/Forward-CraftEntity-in-teleport-command.patch rename to patches/unapplied/server/Forward-CraftEntity-in-teleport-command.patch diff --git a/patches/unapplied/Freeze-Tick-Lock-API.patch b/patches/unapplied/server/Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/unapplied/Freeze-Tick-Lock-API.patch rename to patches/unapplied/server/Freeze-Tick-Lock-API.patch diff --git a/patches/unapplied/Friction-API.patch b/patches/unapplied/server/Friction-API.patch similarity index 100% rename from patches/unapplied/Friction-API.patch rename to patches/unapplied/server/Friction-API.patch diff --git a/patches/unapplied/Furnace-RecipesUsed-API.patch b/patches/unapplied/server/Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/unapplied/Furnace-RecipesUsed-API.patch rename to patches/unapplied/server/Furnace-RecipesUsed-API.patch diff --git a/patches/unapplied/General-ItemMeta-fixes.patch b/patches/unapplied/server/General-ItemMeta-fixes.patch similarity index 100% rename from patches/unapplied/General-ItemMeta-fixes.patch rename to patches/unapplied/server/General-ItemMeta-fixes.patch diff --git a/patches/unapplied/Get-entity-default-attributes.patch b/patches/unapplied/server/Get-entity-default-attributes.patch similarity index 100% rename from patches/unapplied/Get-entity-default-attributes.patch rename to patches/unapplied/server/Get-entity-default-attributes.patch diff --git a/patches/unapplied/Goat-ram-API.patch b/patches/unapplied/server/Goat-ram-API.patch similarity index 100% rename from patches/unapplied/Goat-ram-API.patch rename to patches/unapplied/server/Goat-ram-API.patch diff --git a/patches/unapplied/Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/unapplied/server/Guard-against-serializing-mismatching-chunk-coordina.patch similarity index 100% rename from patches/unapplied/Guard-against-serializing-mismatching-chunk-coordina.patch rename to patches/unapplied/server/Guard-against-serializing-mismatching-chunk-coordina.patch diff --git a/patches/unapplied/Handle-Item-Meta-Inconsistencies.patch b/patches/unapplied/server/Handle-Item-Meta-Inconsistencies.patch similarity index 100% rename from patches/unapplied/Handle-Item-Meta-Inconsistencies.patch rename to patches/unapplied/server/Handle-Item-Meta-Inconsistencies.patch diff --git a/patches/unapplied/Handle-Large-Packets-disconnecting-client.patch b/patches/unapplied/server/Handle-Large-Packets-disconnecting-client.patch similarity index 100% rename from patches/unapplied/Handle-Large-Packets-disconnecting-client.patch rename to patches/unapplied/server/Handle-Large-Packets-disconnecting-client.patch diff --git a/patches/unapplied/Handle-Oversized-block-entities-in-chunks.patch b/patches/unapplied/server/Handle-Oversized-block-entities-in-chunks.patch similarity index 100% rename from patches/unapplied/Handle-Oversized-block-entities-in-chunks.patch rename to patches/unapplied/server/Handle-Oversized-block-entities-in-chunks.patch diff --git a/patches/unapplied/Hide-sync-chunk-writes-behind-flag.patch b/patches/unapplied/server/Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from patches/unapplied/Hide-sync-chunk-writes-behind-flag.patch rename to patches/unapplied/server/Hide-sync-chunk-writes-behind-flag.patch diff --git a/patches/unapplied/Honor-EntityAgeable.ageLock.patch b/patches/unapplied/server/Honor-EntityAgeable.ageLock.patch similarity index 100% rename from patches/unapplied/Honor-EntityAgeable.ageLock.patch rename to patches/unapplied/server/Honor-EntityAgeable.ageLock.patch diff --git a/patches/unapplied/Ignore-impossible-spawn-tick.patch b/patches/unapplied/server/Ignore-impossible-spawn-tick.patch similarity index 100% rename from patches/unapplied/Ignore-impossible-spawn-tick.patch rename to patches/unapplied/server/Ignore-impossible-spawn-tick.patch diff --git a/patches/unapplied/Implement-CraftBlockSoundGroup.patch b/patches/unapplied/server/Implement-CraftBlockSoundGroup.patch similarity index 100% rename from patches/unapplied/Implement-CraftBlockSoundGroup.patch rename to patches/unapplied/server/Implement-CraftBlockSoundGroup.patch diff --git a/patches/unapplied/Implement-Mob-Goal-API.patch b/patches/unapplied/server/Implement-Mob-Goal-API.patch similarity index 100% rename from patches/unapplied/Implement-Mob-Goal-API.patch rename to patches/unapplied/server/Implement-Mob-Goal-API.patch diff --git a/patches/unapplied/Implement-OfflinePlayer-isConnected.patch b/patches/unapplied/server/Implement-OfflinePlayer-isConnected.patch similarity index 100% rename from patches/unapplied/Implement-OfflinePlayer-isConnected.patch rename to patches/unapplied/server/Implement-OfflinePlayer-isConnected.patch diff --git a/patches/unapplied/Implement-Player-Client-Options-API.patch b/patches/unapplied/server/Implement-Player-Client-Options-API.patch similarity index 100% rename from patches/unapplied/Implement-Player-Client-Options-API.patch rename to patches/unapplied/server/Implement-Player-Client-Options-API.patch diff --git a/patches/unapplied/Implement-PlayerFailMoveEvent.patch b/patches/unapplied/server/Implement-PlayerFailMoveEvent.patch similarity index 100% rename from patches/unapplied/Implement-PlayerFailMoveEvent.patch rename to patches/unapplied/server/Implement-PlayerFailMoveEvent.patch diff --git a/patches/unapplied/Implement-World.getEntity-UUID-API.patch b/patches/unapplied/server/Implement-World.getEntity-UUID-API.patch similarity index 100% rename from patches/unapplied/Implement-World.getEntity-UUID-API.patch rename to patches/unapplied/server/Implement-World.getEntity-UUID-API.patch diff --git a/patches/unapplied/Implement-enchantWithLevels-API.patch b/patches/unapplied/server/Implement-enchantWithLevels-API.patch similarity index 100% rename from patches/unapplied/Implement-enchantWithLevels-API.patch rename to patches/unapplied/server/Implement-enchantWithLevels-API.patch diff --git a/patches/unapplied/Implement-extended-PaperServerListPingEvent.patch b/patches/unapplied/server/Implement-extended-PaperServerListPingEvent.patch similarity index 100% rename from patches/unapplied/Implement-extended-PaperServerListPingEvent.patch rename to patches/unapplied/server/Implement-extended-PaperServerListPingEvent.patch diff --git a/patches/unapplied/Implement-furnace-cook-speed-multiplier-API.patch b/patches/unapplied/server/Implement-furnace-cook-speed-multiplier-API.patch similarity index 100% rename from patches/unapplied/Implement-furnace-cook-speed-multiplier-API.patch rename to patches/unapplied/server/Implement-furnace-cook-speed-multiplier-API.patch diff --git a/patches/unapplied/Implement-getComputedBiome-API.patch b/patches/unapplied/server/Implement-getComputedBiome-API.patch similarity index 100% rename from patches/unapplied/Implement-getComputedBiome-API.patch rename to patches/unapplied/server/Implement-getComputedBiome-API.patch diff --git a/patches/unapplied/Implement-getI18NDisplayName.patch b/patches/unapplied/server/Implement-getI18NDisplayName.patch similarity index 100% rename from patches/unapplied/Implement-getI18NDisplayName.patch rename to patches/unapplied/server/Implement-getI18NDisplayName.patch diff --git a/patches/unapplied/Implement-methods-to-convert-between-Component-and-B.patch b/patches/unapplied/server/Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/unapplied/Implement-methods-to-convert-between-Component-and-B.patch rename to patches/unapplied/server/Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/unapplied/Improve-Block-breakNaturally-API.patch b/patches/unapplied/server/Improve-Block-breakNaturally-API.patch similarity index 100% rename from patches/unapplied/Improve-Block-breakNaturally-API.patch rename to patches/unapplied/server/Improve-Block-breakNaturally-API.patch diff --git a/patches/unapplied/Improve-BlockPosition-inlining.patch b/patches/unapplied/server/Improve-BlockPosition-inlining.patch similarity index 100% rename from patches/unapplied/Improve-BlockPosition-inlining.patch rename to patches/unapplied/server/Improve-BlockPosition-inlining.patch diff --git a/patches/unapplied/Improve-EntityShootBowEvent.patch b/patches/unapplied/server/Improve-EntityShootBowEvent.patch similarity index 100% rename from patches/unapplied/Improve-EntityShootBowEvent.patch rename to patches/unapplied/server/Improve-EntityShootBowEvent.patch diff --git a/patches/unapplied/Improve-Legacy-Component-serialization-size.patch b/patches/unapplied/server/Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from patches/unapplied/Improve-Legacy-Component-serialization-size.patch rename to patches/unapplied/server/Improve-Legacy-Component-serialization-size.patch diff --git a/patches/unapplied/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/unapplied/server/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch similarity index 100% rename from patches/unapplied/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch rename to patches/unapplied/server/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch diff --git a/patches/unapplied/Improve-Player-chat-API-handling.patch b/patches/unapplied/server/Improve-Player-chat-API-handling.patch similarity index 100% rename from patches/unapplied/Improve-Player-chat-API-handling.patch rename to patches/unapplied/server/Improve-Player-chat-API-handling.patch diff --git a/patches/unapplied/Improve-PortalEvents.patch b/patches/unapplied/server/Improve-PortalEvents.patch similarity index 100% rename from patches/unapplied/Improve-PortalEvents.patch rename to patches/unapplied/server/Improve-PortalEvents.patch diff --git a/patches/unapplied/Improve-Registry.patch b/patches/unapplied/server/Improve-Registry.patch similarity index 100% rename from patches/unapplied/Improve-Registry.patch rename to patches/unapplied/server/Improve-Registry.patch diff --git a/patches/unapplied/Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/unapplied/server/Improve-Server-Thread-Pool-and-Thread-Priorities.patch similarity index 100% rename from patches/unapplied/Improve-Server-Thread-Pool-and-Thread-Priorities.patch rename to patches/unapplied/server/Improve-Server-Thread-Pool-and-Thread-Priorities.patch diff --git a/patches/unapplied/Improve-ServerGUI.patch b/patches/unapplied/server/Improve-ServerGUI.patch similarity index 100% rename from patches/unapplied/Improve-ServerGUI.patch rename to patches/unapplied/server/Improve-ServerGUI.patch diff --git a/patches/unapplied/Improve-and-expand-AsyncCatcher.patch b/patches/unapplied/server/Improve-and-expand-AsyncCatcher.patch similarity index 100% rename from patches/unapplied/Improve-and-expand-AsyncCatcher.patch rename to patches/unapplied/server/Improve-and-expand-AsyncCatcher.patch diff --git a/patches/unapplied/Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/unapplied/server/Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch similarity index 100% rename from patches/unapplied/Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch rename to patches/unapplied/server/Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch diff --git a/patches/unapplied/Improve-death-events.patch b/patches/unapplied/server/Improve-death-events.patch similarity index 100% rename from patches/unapplied/Improve-death-events.patch rename to patches/unapplied/server/Improve-death-events.patch diff --git a/patches/unapplied/Improve-entity-effect-API.patch b/patches/unapplied/server/Improve-entity-effect-API.patch similarity index 100% rename from patches/unapplied/Improve-entity-effect-API.patch rename to patches/unapplied/server/Improve-entity-effect-API.patch diff --git a/patches/unapplied/Improve-exact-choice-recipe-ingredients.patch b/patches/unapplied/server/Improve-exact-choice-recipe-ingredients.patch similarity index 100% rename from patches/unapplied/Improve-exact-choice-recipe-ingredients.patch rename to patches/unapplied/server/Improve-exact-choice-recipe-ingredients.patch diff --git a/patches/unapplied/Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/unapplied/server/Improve-fix-EntityTargetLivingEntityEvent.patch similarity index 100% rename from patches/unapplied/Improve-fix-EntityTargetLivingEntityEvent.patch rename to patches/unapplied/server/Improve-fix-EntityTargetLivingEntityEvent.patch diff --git a/patches/unapplied/Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/unapplied/server/Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/unapplied/Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/unapplied/server/Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/unapplied/Improve-item-default-attribute-API.patch b/patches/unapplied/server/Improve-item-default-attribute-API.patch similarity index 100% rename from patches/unapplied/Improve-item-default-attribute-API.patch rename to patches/unapplied/server/Improve-item-default-attribute-API.patch diff --git a/patches/unapplied/Improve-java-version-check.patch b/patches/unapplied/server/Improve-java-version-check.patch similarity index 100% rename from patches/unapplied/Improve-java-version-check.patch rename to patches/unapplied/server/Improve-java-version-check.patch diff --git a/patches/unapplied/Improve-logging-and-errors.patch b/patches/unapplied/server/Improve-logging-and-errors.patch similarity index 100% rename from patches/unapplied/Improve-logging-and-errors.patch rename to patches/unapplied/server/Improve-logging-and-errors.patch diff --git a/patches/unapplied/Improve-performance-of-mass-crafts.patch b/patches/unapplied/server/Improve-performance-of-mass-crafts.patch similarity index 100% rename from patches/unapplied/Improve-performance-of-mass-crafts.patch rename to patches/unapplied/server/Improve-performance-of-mass-crafts.patch diff --git a/patches/unapplied/Improve-scoreboard-entries.patch b/patches/unapplied/server/Improve-scoreboard-entries.patch similarity index 100% rename from patches/unapplied/Improve-scoreboard-entries.patch rename to patches/unapplied/server/Improve-scoreboard-entries.patch diff --git a/patches/unapplied/Improve-tag-parser-handling.patch b/patches/unapplied/server/Improve-tag-parser-handling.patch similarity index 100% rename from patches/unapplied/Improve-tag-parser-handling.patch rename to patches/unapplied/server/Improve-tag-parser-handling.patch diff --git a/patches/unapplied/Improve-the-Saddle-API-for-Horses.patch b/patches/unapplied/server/Improve-the-Saddle-API-for-Horses.patch similarity index 100% rename from patches/unapplied/Improve-the-Saddle-API-for-Horses.patch rename to patches/unapplied/server/Improve-the-Saddle-API-for-Horses.patch diff --git a/patches/unapplied/Improved-Async-Task-Scheduler.patch b/patches/unapplied/server/Improved-Async-Task-Scheduler.patch similarity index 100% rename from patches/unapplied/Improved-Async-Task-Scheduler.patch rename to patches/unapplied/server/Improved-Async-Task-Scheduler.patch diff --git a/patches/unapplied/Improved-Watchdog-Support.patch b/patches/unapplied/server/Improved-Watchdog-Support.patch similarity index 100% rename from patches/unapplied/Improved-Watchdog-Support.patch rename to patches/unapplied/server/Improved-Watchdog-Support.patch diff --git a/patches/unapplied/Incremental-chunk-and-player-saving.patch b/patches/unapplied/server/Incremental-chunk-and-player-saving.patch similarity index 100% rename from patches/unapplied/Incremental-chunk-and-player-saving.patch rename to patches/unapplied/server/Incremental-chunk-and-player-saving.patch diff --git a/patches/unapplied/Inline-shift-direction-fields.patch b/patches/unapplied/server/Inline-shift-direction-fields.patch similarity index 100% rename from patches/unapplied/Inline-shift-direction-fields.patch rename to patches/unapplied/server/Inline-shift-direction-fields.patch diff --git a/patches/unapplied/Introduce-beacon-activation-deactivation-events.patch b/patches/unapplied/server/Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/unapplied/Introduce-beacon-activation-deactivation-events.patch rename to patches/unapplied/server/Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/unapplied/Inventory-close.patch b/patches/unapplied/server/Inventory-close.patch similarity index 100% rename from patches/unapplied/Inventory-close.patch rename to patches/unapplied/server/Inventory-close.patch diff --git a/patches/unapplied/Inventory-getHolder-method-without-block-snapshot.patch b/patches/unapplied/server/Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/unapplied/Inventory-getHolder-method-without-block-snapshot.patch rename to patches/unapplied/server/Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/unapplied/Inventory-removeItemAnySlot.patch b/patches/unapplied/server/Inventory-removeItemAnySlot.patch similarity index 100% rename from patches/unapplied/Inventory-removeItemAnySlot.patch rename to patches/unapplied/server/Inventory-removeItemAnySlot.patch diff --git a/patches/unapplied/InventoryCloseEvent-Reason-API.patch b/patches/unapplied/server/InventoryCloseEvent-Reason-API.patch similarity index 100% rename from patches/unapplied/InventoryCloseEvent-Reason-API.patch rename to patches/unapplied/server/InventoryCloseEvent-Reason-API.patch diff --git a/patches/unapplied/Item-Mutation-Fixes.patch b/patches/unapplied/server/Item-Mutation-Fixes.patch similarity index 100% rename from patches/unapplied/Item-Mutation-Fixes.patch rename to patches/unapplied/server/Item-Mutation-Fixes.patch diff --git a/patches/unapplied/Item-canEntityPickup.patch b/patches/unapplied/server/Item-canEntityPickup.patch similarity index 100% rename from patches/unapplied/Item-canEntityPickup.patch rename to patches/unapplied/server/Item-canEntityPickup.patch diff --git a/patches/unapplied/Item-no-age-no-player-pickup.patch b/patches/unapplied/server/Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/unapplied/Item-no-age-no-player-pickup.patch rename to patches/unapplied/server/Item-no-age-no-player-pickup.patch diff --git a/patches/unapplied/Item-serialization-as-json.patch b/patches/unapplied/server/Item-serialization-as-json.patch similarity index 100% rename from patches/unapplied/Item-serialization-as-json.patch rename to patches/unapplied/server/Item-serialization-as-json.patch diff --git a/patches/unapplied/ItemStack-Tooltip-API.patch b/patches/unapplied/server/ItemStack-Tooltip-API.patch similarity index 100% rename from patches/unapplied/ItemStack-Tooltip-API.patch rename to patches/unapplied/server/ItemStack-Tooltip-API.patch diff --git a/patches/unapplied/ItemStack-damage-API.patch b/patches/unapplied/server/ItemStack-damage-API.patch similarity index 100% rename from patches/unapplied/ItemStack-damage-API.patch rename to patches/unapplied/server/ItemStack-damage-API.patch diff --git a/patches/unapplied/ItemStack-getMaxItemUseDuration.patch b/patches/unapplied/server/ItemStack-getMaxItemUseDuration.patch similarity index 100% rename from patches/unapplied/ItemStack-getMaxItemUseDuration.patch rename to patches/unapplied/server/ItemStack-getMaxItemUseDuration.patch diff --git a/patches/unapplied/ItemStack-repair-check-API.patch b/patches/unapplied/server/ItemStack-repair-check-API.patch similarity index 100% rename from patches/unapplied/ItemStack-repair-check-API.patch rename to patches/unapplied/server/ItemStack-repair-check-API.patch diff --git a/patches/unapplied/Lag-compensation-ticks.patch b/patches/unapplied/server/Lag-compensation-ticks.patch similarity index 100% rename from patches/unapplied/Lag-compensation-ticks.patch rename to patches/unapplied/server/Lag-compensation-ticks.patch diff --git a/patches/unapplied/Lazily-create-LootContext-for-criterions.patch b/patches/unapplied/server/Lazily-create-LootContext-for-criterions.patch similarity index 100% rename from patches/unapplied/Lazily-create-LootContext-for-criterions.patch rename to patches/unapplied/server/Lazily-create-LootContext-for-criterions.patch diff --git a/patches/unapplied/Lazily-track-plugin-scoreboards-by-default.patch b/patches/unapplied/server/Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/unapplied/Lazily-track-plugin-scoreboards-by-default.patch rename to patches/unapplied/server/Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/unapplied/Leashable-API.patch b/patches/unapplied/server/Leashable-API.patch similarity index 100% rename from patches/unapplied/Leashable-API.patch rename to patches/unapplied/server/Leashable-API.patch diff --git a/patches/unapplied/Left-handed-API.patch b/patches/unapplied/server/Left-handed-API.patch similarity index 100% rename from patches/unapplied/Left-handed-API.patch rename to patches/unapplied/server/Left-handed-API.patch diff --git a/patches/unapplied/Limit-Client-Sign-length-more.patch b/patches/unapplied/server/Limit-Client-Sign-length-more.patch similarity index 100% rename from patches/unapplied/Limit-Client-Sign-length-more.patch rename to patches/unapplied/server/Limit-Client-Sign-length-more.patch diff --git a/patches/unapplied/Limit-item-frame-cursors-on-maps.patch b/patches/unapplied/server/Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/unapplied/Limit-item-frame-cursors-on-maps.patch rename to patches/unapplied/server/Limit-item-frame-cursors-on-maps.patch diff --git a/patches/unapplied/Limit-pet-look-distance.patch b/patches/unapplied/server/Limit-pet-look-distance.patch similarity index 100% rename from patches/unapplied/Limit-pet-look-distance.patch rename to patches/unapplied/server/Limit-pet-look-distance.patch diff --git a/patches/unapplied/Limit-recipe-packets.patch b/patches/unapplied/server/Limit-recipe-packets.patch similarity index 100% rename from patches/unapplied/Limit-recipe-packets.patch rename to patches/unapplied/server/Limit-recipe-packets.patch diff --git a/patches/unapplied/Line-Of-Sight-Changes.patch b/patches/unapplied/server/Line-Of-Sight-Changes.patch similarity index 100% rename from patches/unapplied/Line-Of-Sight-Changes.patch rename to patches/unapplied/server/Line-Of-Sight-Changes.patch diff --git a/patches/unapplied/LivingEntity-Active-Item-API.patch b/patches/unapplied/server/LivingEntity-Active-Item-API.patch similarity index 100% rename from patches/unapplied/LivingEntity-Active-Item-API.patch rename to patches/unapplied/server/LivingEntity-Active-Item-API.patch diff --git a/patches/unapplied/LivingEntity-setKiller.patch b/patches/unapplied/server/LivingEntity-setKiller.patch similarity index 100% rename from patches/unapplied/LivingEntity-setKiller.patch rename to patches/unapplied/server/LivingEntity-setKiller.patch diff --git a/patches/unapplied/LootTable-API-and-replenishable-lootables.patch b/patches/unapplied/server/LootTable-API-and-replenishable-lootables.patch similarity index 100% rename from patches/unapplied/LootTable-API-and-replenishable-lootables.patch rename to patches/unapplied/server/LootTable-API-and-replenishable-lootables.patch diff --git a/patches/unapplied/MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/unapplied/server/MC-145656-Fix-Follow-Range-Initial-Target.patch similarity index 100% rename from patches/unapplied/MC-145656-Fix-Follow-Range-Initial-Target.patch rename to patches/unapplied/server/MC-145656-Fix-Follow-Range-Initial-Target.patch diff --git a/patches/unapplied/MC-4-Fix-item-position-desync.patch b/patches/unapplied/server/MC-4-Fix-item-position-desync.patch similarity index 100% rename from patches/unapplied/MC-4-Fix-item-position-desync.patch rename to patches/unapplied/server/MC-4-Fix-item-position-desync.patch diff --git a/patches/unapplied/Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/unapplied/server/Make-Amethyst-throw-both-Spread-and-Grow-Events.patch similarity index 100% rename from patches/unapplied/Make-Amethyst-throw-both-Spread-and-Grow-Events.patch rename to patches/unapplied/server/Make-Amethyst-throw-both-Spread-and-Grow-Events.patch diff --git a/patches/unapplied/Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/unapplied/server/Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch similarity index 100% rename from patches/unapplied/Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch rename to patches/unapplied/server/Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch diff --git a/patches/unapplied/Make-a-PDC-view-accessible-directly-from-ItemStack.patch b/patches/unapplied/server/Make-a-PDC-view-accessible-directly-from-ItemStack.patch similarity index 100% rename from patches/unapplied/Make-a-PDC-view-accessible-directly-from-ItemStack.patch rename to patches/unapplied/server/Make-a-PDC-view-accessible-directly-from-ItemStack.patch diff --git a/patches/unapplied/Make-hoppers-respect-inventory-max-stack-size.patch b/patches/unapplied/server/Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/unapplied/Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/unapplied/server/Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/unapplied/Make-interaction-leniency-distance-configurable.patch b/patches/unapplied/server/Make-interaction-leniency-distance-configurable.patch similarity index 100% rename from patches/unapplied/Make-interaction-leniency-distance-configurable.patch rename to patches/unapplied/server/Make-interaction-leniency-distance-configurable.patch diff --git a/patches/unapplied/Make-legacy-ping-handler-more-reliable.patch b/patches/unapplied/server/Make-legacy-ping-handler-more-reliable.patch similarity index 100% rename from patches/unapplied/Make-legacy-ping-handler-more-reliable.patch rename to patches/unapplied/server/Make-legacy-ping-handler-more-reliable.patch diff --git a/patches/unapplied/Make-schedule-command-per-world.patch b/patches/unapplied/server/Make-schedule-command-per-world.patch similarity index 100% rename from patches/unapplied/Make-schedule-command-per-world.patch rename to patches/unapplied/server/Make-schedule-command-per-world.patch diff --git a/patches/unapplied/Make-shield-blocking-delay-configurable.patch b/patches/unapplied/server/Make-shield-blocking-delay-configurable.patch similarity index 100% rename from patches/unapplied/Make-shield-blocking-delay-configurable.patch rename to patches/unapplied/server/Make-shield-blocking-delay-configurable.patch diff --git a/patches/unapplied/Make-some-itemstacks-nonnull.patch b/patches/unapplied/server/Make-some-itemstacks-nonnull.patch similarity index 100% rename from patches/unapplied/Make-some-itemstacks-nonnull.patch rename to patches/unapplied/server/Make-some-itemstacks-nonnull.patch diff --git a/patches/unapplied/Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/unapplied/server/Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/unapplied/Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/unapplied/server/Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/unapplied/Make-the-GUI-graph-fancier.patch b/patches/unapplied/server/Make-the-GUI-graph-fancier.patch similarity index 100% rename from patches/unapplied/Make-the-GUI-graph-fancier.patch rename to patches/unapplied/server/Make-the-GUI-graph-fancier.patch diff --git a/patches/unapplied/Make-the-default-permission-message-configurable.patch b/patches/unapplied/server/Make-the-default-permission-message-configurable.patch similarity index 100% rename from patches/unapplied/Make-the-default-permission-message-configurable.patch rename to patches/unapplied/server/Make-the-default-permission-message-configurable.patch diff --git a/patches/unapplied/Make-water-animal-spawn-height-configurable.patch b/patches/unapplied/server/Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/unapplied/Make-water-animal-spawn-height-configurable.patch rename to patches/unapplied/server/Make-water-animal-spawn-height-configurable.patch diff --git a/patches/unapplied/Manually-inline-methods-in-BlockPosition.patch b/patches/unapplied/server/Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/unapplied/Manually-inline-methods-in-BlockPosition.patch rename to patches/unapplied/server/Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/unapplied/Maps-shouldn-t-load-chunks.patch b/patches/unapplied/server/Maps-shouldn-t-load-chunks.patch similarity index 100% rename from patches/unapplied/Maps-shouldn-t-load-chunks.patch rename to patches/unapplied/server/Maps-shouldn-t-load-chunks.patch diff --git a/patches/unapplied/Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/unapplied/server/Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/unapplied/Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/unapplied/server/Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/unapplied/Missing-Entity-API.patch b/patches/unapplied/server/Missing-Entity-API.patch similarity index 100% rename from patches/unapplied/Missing-Entity-API.patch rename to patches/unapplied/server/Missing-Entity-API.patch diff --git a/patches/unapplied/Missing-eating-regain-reason.patch b/patches/unapplied/server/Missing-eating-regain-reason.patch similarity index 100% rename from patches/unapplied/Missing-eating-regain-reason.patch rename to patches/unapplied/server/Missing-eating-regain-reason.patch diff --git a/patches/unapplied/Missing-effect-cause.patch b/patches/unapplied/server/Missing-effect-cause.patch similarity index 100% rename from patches/unapplied/Missing-effect-cause.patch rename to patches/unapplied/server/Missing-effect-cause.patch diff --git a/patches/unapplied/Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/unapplied/server/Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/unapplied/Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/unapplied/server/Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/unapplied/Mob-Pathfinding-API.patch b/patches/unapplied/server/Mob-Pathfinding-API.patch similarity index 100% rename from patches/unapplied/Mob-Pathfinding-API.patch rename to patches/unapplied/server/Mob-Pathfinding-API.patch diff --git a/patches/unapplied/Mob-Spawner-API-Enhancements.patch b/patches/unapplied/server/Mob-Spawner-API-Enhancements.patch similarity index 100% rename from patches/unapplied/Mob-Spawner-API-Enhancements.patch rename to patches/unapplied/server/Mob-Spawner-API-Enhancements.patch diff --git a/patches/unapplied/Moonrise-optimisation-patches.patch b/patches/unapplied/server/Moonrise-optimisation-patches.patch similarity index 100% rename from patches/unapplied/Moonrise-optimisation-patches.patch rename to patches/unapplied/server/Moonrise-optimisation-patches.patch diff --git a/patches/unapplied/More-Chest-Block-API.patch b/patches/unapplied/server/More-Chest-Block-API.patch similarity index 100% rename from patches/unapplied/More-Chest-Block-API.patch rename to patches/unapplied/server/More-Chest-Block-API.patch diff --git a/patches/unapplied/More-CommandBlock-API.patch b/patches/unapplied/server/More-CommandBlock-API.patch similarity index 100% rename from patches/unapplied/More-CommandBlock-API.patch rename to patches/unapplied/server/More-CommandBlock-API.patch diff --git a/patches/unapplied/More-DragonBattle-API.patch b/patches/unapplied/server/More-DragonBattle-API.patch similarity index 100% rename from patches/unapplied/More-DragonBattle-API.patch rename to patches/unapplied/server/More-DragonBattle-API.patch diff --git a/patches/unapplied/More-Enchantment-API.patch b/patches/unapplied/server/More-Enchantment-API.patch similarity index 100% rename from patches/unapplied/More-Enchantment-API.patch rename to patches/unapplied/server/More-Enchantment-API.patch diff --git a/patches/unapplied/More-Lidded-Block-API.patch b/patches/unapplied/server/More-Lidded-Block-API.patch similarity index 100% rename from patches/unapplied/More-Lidded-Block-API.patch rename to patches/unapplied/server/More-Lidded-Block-API.patch diff --git a/patches/unapplied/More-PotionEffectType-API.patch b/patches/unapplied/server/More-PotionEffectType-API.patch similarity index 100% rename from patches/unapplied/More-PotionEffectType-API.patch rename to patches/unapplied/server/More-PotionEffectType-API.patch diff --git a/patches/unapplied/More-Projectile-API.patch b/patches/unapplied/server/More-Projectile-API.patch similarity index 100% rename from patches/unapplied/More-Projectile-API.patch rename to patches/unapplied/server/More-Projectile-API.patch diff --git a/patches/unapplied/More-Raid-API.patch b/patches/unapplied/server/More-Raid-API.patch similarity index 100% rename from patches/unapplied/More-Raid-API.patch rename to patches/unapplied/server/More-Raid-API.patch diff --git a/patches/unapplied/More-Sign-Block-API.patch b/patches/unapplied/server/More-Sign-Block-API.patch similarity index 100% rename from patches/unapplied/More-Sign-Block-API.patch rename to patches/unapplied/server/More-Sign-Block-API.patch diff --git a/patches/unapplied/More-Teleport-API.patch b/patches/unapplied/server/More-Teleport-API.patch similarity index 100% rename from patches/unapplied/More-Teleport-API.patch rename to patches/unapplied/server/More-Teleport-API.patch diff --git a/patches/unapplied/More-World-API.patch b/patches/unapplied/server/More-World-API.patch similarity index 100% rename from patches/unapplied/More-World-API.patch rename to patches/unapplied/server/More-World-API.patch diff --git a/patches/unapplied/More-accurate-isInOpenWater-impl.patch b/patches/unapplied/server/More-accurate-isInOpenWater-impl.patch similarity index 100% rename from patches/unapplied/More-accurate-isInOpenWater-impl.patch rename to patches/unapplied/server/More-accurate-isInOpenWater-impl.patch diff --git a/patches/unapplied/More-lightning-API.patch b/patches/unapplied/server/More-lightning-API.patch similarity index 100% rename from patches/unapplied/More-lightning-API.patch rename to patches/unapplied/server/More-lightning-API.patch diff --git a/patches/unapplied/More-vanilla-friendly-methods-to-update-trades.patch b/patches/unapplied/server/More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/unapplied/More-vanilla-friendly-methods-to-update-trades.patch rename to patches/unapplied/server/More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/unapplied/Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/unapplied/server/Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 100% rename from patches/unapplied/Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to patches/unapplied/server/Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch diff --git a/patches/unapplied/Move-range-check-for-block-placing-up.patch b/patches/unapplied/server/Move-range-check-for-block-placing-up.patch similarity index 100% rename from patches/unapplied/Move-range-check-for-block-placing-up.patch rename to patches/unapplied/server/Move-range-check-for-block-placing-up.patch diff --git a/patches/unapplied/Multi-Block-Change-API-Implementation.patch b/patches/unapplied/server/Multi-Block-Change-API-Implementation.patch similarity index 100% rename from patches/unapplied/Multi-Block-Change-API-Implementation.patch rename to patches/unapplied/server/Multi-Block-Change-API-Implementation.patch diff --git a/patches/unapplied/Multiple-Entries-with-Scoreboards.patch b/patches/unapplied/server/Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/unapplied/Multiple-Entries-with-Scoreboards.patch rename to patches/unapplied/server/Multiple-Entries-with-Scoreboards.patch diff --git a/patches/unapplied/Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/unapplied/server/Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/unapplied/Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/unapplied/server/Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/unapplied/Nameable-Banner-API.patch b/patches/unapplied/server/Nameable-Banner-API.patch similarity index 100% rename from patches/unapplied/Nameable-Banner-API.patch rename to patches/unapplied/server/Nameable-Banner-API.patch diff --git a/patches/unapplied/Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/unapplied/server/Ocelot-despawns-should-honor-nametags-and-leash.patch similarity index 100% rename from patches/unapplied/Ocelot-despawns-should-honor-nametags-and-leash.patch rename to patches/unapplied/server/Ocelot-despawns-should-honor-nametags-and-leash.patch diff --git a/patches/unapplied/Only-call-EntityDamageEvents-before-actuallyHurt.patch b/patches/unapplied/server/Only-call-EntityDamageEvents-before-actuallyHurt.patch similarity index 100% rename from patches/unapplied/Only-call-EntityDamageEvents-before-actuallyHurt.patch rename to patches/unapplied/server/Only-call-EntityDamageEvents-before-actuallyHurt.patch diff --git a/patches/unapplied/Only-capture-actual-tree-growth.patch b/patches/unapplied/server/Only-capture-actual-tree-growth.patch similarity index 100% rename from patches/unapplied/Only-capture-actual-tree-growth.patch rename to patches/unapplied/server/Only-capture-actual-tree-growth.patch diff --git a/patches/unapplied/Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/unapplied/server/Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch similarity index 100% rename from patches/unapplied/Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch rename to patches/unapplied/server/Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch diff --git a/patches/unapplied/Only-erase-allay-memory-on-non-item-targets.patch b/patches/unapplied/server/Only-erase-allay-memory-on-non-item-targets.patch similarity index 100% rename from patches/unapplied/Only-erase-allay-memory-on-non-item-targets.patch rename to patches/unapplied/server/Only-erase-allay-memory-on-non-item-targets.patch diff --git a/patches/unapplied/Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/unapplied/server/Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch similarity index 100% rename from patches/unapplied/Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch rename to patches/unapplied/server/Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch diff --git a/patches/unapplied/Only-refresh-abilities-if-needed.patch b/patches/unapplied/server/Only-refresh-abilities-if-needed.patch similarity index 100% rename from patches/unapplied/Only-refresh-abilities-if-needed.patch rename to patches/unapplied/server/Only-refresh-abilities-if-needed.patch diff --git a/patches/unapplied/Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/unapplied/server/Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/unapplied/Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/unapplied/server/Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/unapplied/Only-tick-item-frames-if-players-can-see-it.patch b/patches/unapplied/server/Only-tick-item-frames-if-players-can-see-it.patch similarity index 100% rename from patches/unapplied/Only-tick-item-frames-if-players-can-see-it.patch rename to patches/unapplied/server/Only-tick-item-frames-if-players-can-see-it.patch diff --git a/patches/unapplied/Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/unapplied/server/Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/unapplied/Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/unapplied/server/Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/unapplied/Oprimise-map-impl-for-tracked-players.patch b/patches/unapplied/server/Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/unapplied/Oprimise-map-impl-for-tracked-players.patch rename to patches/unapplied/server/Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/unapplied/Optimise-BlockSoil-nearby-water-lookup.patch b/patches/unapplied/server/Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/unapplied/Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/unapplied/server/Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/unapplied/Optimise-BlockState-s-hashCode-equals.patch b/patches/unapplied/server/Optimise-BlockState-s-hashCode-equals.patch similarity index 100% rename from patches/unapplied/Optimise-BlockState-s-hashCode-equals.patch rename to patches/unapplied/server/Optimise-BlockState-s-hashCode-equals.patch diff --git a/patches/unapplied/Optimise-Chunk-getFluid.patch b/patches/unapplied/server/Optimise-Chunk-getFluid.patch similarity index 100% rename from patches/unapplied/Optimise-Chunk-getFluid.patch rename to patches/unapplied/server/Optimise-Chunk-getFluid.patch diff --git a/patches/unapplied/Optimise-EntityGetter-getPlayerByUUID.patch b/patches/unapplied/server/Optimise-EntityGetter-getPlayerByUUID.patch similarity index 100% rename from patches/unapplied/Optimise-EntityGetter-getPlayerByUUID.patch rename to patches/unapplied/server/Optimise-EntityGetter-getPlayerByUUID.patch diff --git a/patches/unapplied/Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/unapplied/server/Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 100% rename from patches/unapplied/Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/unapplied/server/Optimise-collision-checking-in-player-move-packet-ha.patch diff --git a/patches/unapplied/Optimise-general-POI-access.patch b/patches/unapplied/server/Optimise-general-POI-access.patch similarity index 100% rename from patches/unapplied/Optimise-general-POI-access.patch rename to patches/unapplied/server/Optimise-general-POI-access.patch diff --git a/patches/unapplied/Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/unapplied/server/Optimise-getChunkAt-calls-for-loaded-chunks.patch similarity index 100% rename from patches/unapplied/Optimise-getChunkAt-calls-for-loaded-chunks.patch rename to patches/unapplied/server/Optimise-getChunkAt-calls-for-loaded-chunks.patch diff --git a/patches/unapplied/Optimise-getType-calls.patch b/patches/unapplied/server/Optimise-getType-calls.patch similarity index 100% rename from patches/unapplied/Optimise-getType-calls.patch rename to patches/unapplied/server/Optimise-getType-calls.patch diff --git a/patches/unapplied/Optimise-nearby-player-retrieval.patch b/patches/unapplied/server/Optimise-nearby-player-retrieval.patch similarity index 100% rename from patches/unapplied/Optimise-nearby-player-retrieval.patch rename to patches/unapplied/server/Optimise-nearby-player-retrieval.patch diff --git a/patches/unapplied/Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/unapplied/server/Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/unapplied/Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/unapplied/server/Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/unapplied/Optimize-Bit-Operations-by-inlining.patch b/patches/unapplied/server/Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/unapplied/Optimize-Bit-Operations-by-inlining.patch rename to patches/unapplied/server/Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/unapplied/Optimize-BlockPosition-helper-methods.patch b/patches/unapplied/server/Optimize-BlockPosition-helper-methods.patch similarity index 100% rename from patches/unapplied/Optimize-BlockPosition-helper-methods.patch rename to patches/unapplied/server/Optimize-BlockPosition-helper-methods.patch diff --git a/patches/unapplied/Optimize-Captured-BlockEntity-Lookup.patch b/patches/unapplied/server/Optimize-Captured-BlockEntity-Lookup.patch similarity index 100% rename from patches/unapplied/Optimize-Captured-BlockEntity-Lookup.patch rename to patches/unapplied/server/Optimize-Captured-BlockEntity-Lookup.patch diff --git a/patches/unapplied/Optimize-Collision-to-not-load-chunks.patch b/patches/unapplied/server/Optimize-Collision-to-not-load-chunks.patch similarity index 100% rename from patches/unapplied/Optimize-Collision-to-not-load-chunks.patch rename to patches/unapplied/server/Optimize-Collision-to-not-load-chunks.patch diff --git a/patches/unapplied/Optimize-CraftBlockData-Creation.patch b/patches/unapplied/server/Optimize-CraftBlockData-Creation.patch similarity index 100% rename from patches/unapplied/Optimize-CraftBlockData-Creation.patch rename to patches/unapplied/server/Optimize-CraftBlockData-Creation.patch diff --git a/patches/unapplied/Optimize-DataBits.patch b/patches/unapplied/server/Optimize-DataBits.patch similarity index 100% rename from patches/unapplied/Optimize-DataBits.patch rename to patches/unapplied/server/Optimize-DataBits.patch diff --git a/patches/unapplied/Optimize-Dynamic-get-Missing-Keys.patch b/patches/unapplied/server/Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/unapplied/Optimize-Dynamic-get-Missing-Keys.patch rename to patches/unapplied/server/Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/unapplied/Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/unapplied/server/Optimize-GoalSelector-Goal.Flag-Set-operations.patch similarity index 100% rename from patches/unapplied/Optimize-GoalSelector-Goal.Flag-Set-operations.patch rename to patches/unapplied/server/Optimize-GoalSelector-Goal.Flag-Set-operations.patch diff --git a/patches/unapplied/Optimize-HashMapPalette.patch b/patches/unapplied/server/Optimize-HashMapPalette.patch similarity index 100% rename from patches/unapplied/Optimize-HashMapPalette.patch rename to patches/unapplied/server/Optimize-HashMapPalette.patch diff --git a/patches/unapplied/Optimize-Hoppers.patch b/patches/unapplied/server/Optimize-Hoppers.patch similarity index 100% rename from patches/unapplied/Optimize-Hoppers.patch rename to patches/unapplied/server/Optimize-Hoppers.patch diff --git a/patches/unapplied/Optimize-Level.hasChunkAt-BlockPosition-Z.patch b/patches/unapplied/server/Optimize-Level.hasChunkAt-BlockPosition-Z.patch similarity index 100% rename from patches/unapplied/Optimize-Level.hasChunkAt-BlockPosition-Z.patch rename to patches/unapplied/server/Optimize-Level.hasChunkAt-BlockPosition-Z.patch diff --git a/patches/unapplied/Optimize-MappedRegistry.patch b/patches/unapplied/server/Optimize-MappedRegistry.patch similarity index 100% rename from patches/unapplied/Optimize-MappedRegistry.patch rename to patches/unapplied/server/Optimize-MappedRegistry.patch diff --git a/patches/unapplied/Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/unapplied/server/Optimize-Network-Manager-and-add-advanced-packet-sup.patch similarity index 100% rename from patches/unapplied/Optimize-Network-Manager-and-add-advanced-packet-sup.patch rename to patches/unapplied/server/Optimize-Network-Manager-and-add-advanced-packet-sup.patch diff --git a/patches/unapplied/Optimize-NetworkManager-Exception-Handling.patch b/patches/unapplied/server/Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/unapplied/Optimize-NetworkManager-Exception-Handling.patch rename to patches/unapplied/server/Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/unapplied/Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/unapplied/server/Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/unapplied/Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/unapplied/server/Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/unapplied/Optimize-Pathfinding.patch b/patches/unapplied/server/Optimize-Pathfinding.patch similarity index 100% rename from patches/unapplied/Optimize-Pathfinding.patch rename to patches/unapplied/server/Optimize-Pathfinding.patch diff --git a/patches/unapplied/Optimize-VarInts.patch b/patches/unapplied/server/Optimize-VarInts.patch similarity index 100% rename from patches/unapplied/Optimize-VarInts.patch rename to patches/unapplied/server/Optimize-VarInts.patch diff --git a/patches/unapplied/Optimize-Voxel-Shape-Merging.patch b/patches/unapplied/server/Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/unapplied/Optimize-Voxel-Shape-Merging.patch rename to patches/unapplied/server/Optimize-Voxel-Shape-Merging.patch diff --git a/patches/unapplied/Optimize-World-Time-Updates.patch b/patches/unapplied/server/Optimize-World-Time-Updates.patch similarity index 100% rename from patches/unapplied/Optimize-World-Time-Updates.patch rename to patches/unapplied/server/Optimize-World-Time-Updates.patch diff --git a/patches/unapplied/Optimize-call-to-getFluid-for-explosions.patch b/patches/unapplied/server/Optimize-call-to-getFluid-for-explosions.patch similarity index 100% rename from patches/unapplied/Optimize-call-to-getFluid-for-explosions.patch rename to patches/unapplied/server/Optimize-call-to-getFluid-for-explosions.patch diff --git a/patches/unapplied/Optimize-entity-tracker-passenger-checks.patch b/patches/unapplied/server/Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/unapplied/Optimize-entity-tracker-passenger-checks.patch rename to patches/unapplied/server/Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/unapplied/Optimize-explosions.patch b/patches/unapplied/server/Optimize-explosions.patch similarity index 100% rename from patches/unapplied/Optimize-explosions.patch rename to patches/unapplied/server/Optimize-explosions.patch diff --git a/patches/unapplied/Optimize-indirect-passenger-iteration.patch b/patches/unapplied/server/Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/unapplied/Optimize-indirect-passenger-iteration.patch rename to patches/unapplied/server/Optimize-indirect-passenger-iteration.patch diff --git a/patches/unapplied/Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/unapplied/server/Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch similarity index 100% rename from patches/unapplied/Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch rename to patches/unapplied/server/Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch diff --git a/patches/unapplied/Optimize-nearest-structure-border-iteration.patch b/patches/unapplied/server/Optimize-nearest-structure-border-iteration.patch similarity index 100% rename from patches/unapplied/Optimize-nearest-structure-border-iteration.patch rename to patches/unapplied/server/Optimize-nearest-structure-border-iteration.patch diff --git a/patches/unapplied/Optimize-player-lookups-for-beacons.patch b/patches/unapplied/server/Optimize-player-lookups-for-beacons.patch similarity index 100% rename from patches/unapplied/Optimize-player-lookups-for-beacons.patch rename to patches/unapplied/server/Optimize-player-lookups-for-beacons.patch diff --git a/patches/unapplied/Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/unapplied/server/Option-to-have-default-CustomSpawners-in-custom-worl.patch similarity index 100% rename from patches/unapplied/Option-to-have-default-CustomSpawners-in-custom-worl.patch rename to patches/unapplied/server/Option-to-have-default-CustomSpawners-in-custom-worl.patch diff --git a/patches/unapplied/Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/unapplied/server/Option-to-prevent-armor-stands-from-doing-entity-loo.patch similarity index 100% rename from patches/unapplied/Option-to-prevent-armor-stands-from-doing-entity-loo.patch rename to patches/unapplied/server/Option-to-prevent-armor-stands-from-doing-entity-loo.patch diff --git a/patches/unapplied/Option-to-prevent-data-components-copy-in-smithing-r.patch b/patches/unapplied/server/Option-to-prevent-data-components-copy-in-smithing-r.patch similarity index 100% rename from patches/unapplied/Option-to-prevent-data-components-copy-in-smithing-r.patch rename to patches/unapplied/server/Option-to-prevent-data-components-copy-in-smithing-r.patch diff --git a/patches/unapplied/Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/unapplied/server/Option-to-use-vanilla-per-world-scoreboard-coloring-.patch similarity index 100% rename from patches/unapplied/Option-to-use-vanilla-per-world-scoreboard-coloring-.patch rename to patches/unapplied/server/Option-to-use-vanilla-per-world-scoreboard-coloring-.patch diff --git a/patches/unapplied/Optional-TNT-doesn-t-move-in-water.patch b/patches/unapplied/server/Optional-TNT-doesn-t-move-in-water.patch similarity index 100% rename from patches/unapplied/Optional-TNT-doesn-t-move-in-water.patch rename to patches/unapplied/server/Optional-TNT-doesn-t-move-in-water.patch diff --git a/patches/unapplied/Optional-per-player-mob-spawns.patch b/patches/unapplied/server/Optional-per-player-mob-spawns.patch similarity index 100% rename from patches/unapplied/Optional-per-player-mob-spawns.patch rename to patches/unapplied/server/Optional-per-player-mob-spawns.patch diff --git a/patches/unapplied/Paper-dumpitem-command.patch b/patches/unapplied/server/Paper-dumpitem-command.patch similarity index 100% rename from patches/unapplied/Paper-dumpitem-command.patch rename to patches/unapplied/server/Paper-dumpitem-command.patch diff --git a/patches/unapplied/Per-world-ticks-per-spawn-settings.patch b/patches/unapplied/server/Per-world-ticks-per-spawn-settings.patch similarity index 100% rename from patches/unapplied/Per-world-ticks-per-spawn-settings.patch rename to patches/unapplied/server/Per-world-ticks-per-spawn-settings.patch diff --git a/patches/unapplied/Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/unapplied/server/Pillager-patrol-spawn-settings-and-per-player-option.patch similarity index 100% rename from patches/unapplied/Pillager-patrol-spawn-settings-and-per-player-option.patch rename to patches/unapplied/server/Pillager-patrol-spawn-settings-and-per-player-option.patch diff --git a/patches/unapplied/Player-Chunk-Load-Unload-Events.patch b/patches/unapplied/server/Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/unapplied/Player-Chunk-Load-Unload-Events.patch rename to patches/unapplied/server/Player-Chunk-Load-Unload-Events.patch diff --git a/patches/unapplied/Player-Entity-Tracking-Events.patch b/patches/unapplied/server/Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/unapplied/Player-Entity-Tracking-Events.patch rename to patches/unapplied/server/Player-Entity-Tracking-Events.patch diff --git a/patches/unapplied/Player-Tab-List-and-Title-APIs.patch b/patches/unapplied/server/Player-Tab-List-and-Title-APIs.patch similarity index 100% rename from patches/unapplied/Player-Tab-List-and-Title-APIs.patch rename to patches/unapplied/server/Player-Tab-List-and-Title-APIs.patch diff --git a/patches/unapplied/Player-affects-spawning-API.patch b/patches/unapplied/server/Player-affects-spawning-API.patch similarity index 100% rename from patches/unapplied/Player-affects-spawning-API.patch rename to patches/unapplied/server/Player-affects-spawning-API.patch diff --git a/patches/unapplied/Player.setPlayerProfile-API.patch b/patches/unapplied/server/Player.setPlayerProfile-API.patch similarity index 100% rename from patches/unapplied/Player.setPlayerProfile-API.patch rename to patches/unapplied/server/Player.setPlayerProfile-API.patch diff --git a/patches/unapplied/PlayerAttemptPickupItemEvent.patch b/patches/unapplied/server/PlayerAttemptPickupItemEvent.patch similarity index 100% rename from patches/unapplied/PlayerAttemptPickupItemEvent.patch rename to patches/unapplied/server/PlayerAttemptPickupItemEvent.patch diff --git a/patches/unapplied/PlayerDeathEvent-getItemsToKeep.patch b/patches/unapplied/server/PlayerDeathEvent-getItemsToKeep.patch similarity index 100% rename from patches/unapplied/PlayerDeathEvent-getItemsToKeep.patch rename to patches/unapplied/server/PlayerDeathEvent-getItemsToKeep.patch diff --git a/patches/unapplied/PlayerDeathEvent-shouldDropExperience.patch b/patches/unapplied/server/PlayerDeathEvent-shouldDropExperience.patch similarity index 100% rename from patches/unapplied/PlayerDeathEvent-shouldDropExperience.patch rename to patches/unapplied/server/PlayerDeathEvent-shouldDropExperience.patch diff --git a/patches/unapplied/PlayerElytraBoostEvent.patch b/patches/unapplied/server/PlayerElytraBoostEvent.patch similarity index 100% rename from patches/unapplied/PlayerElytraBoostEvent.patch rename to patches/unapplied/server/PlayerElytraBoostEvent.patch diff --git a/patches/unapplied/PlayerLaunchProjectileEvent.patch b/patches/unapplied/server/PlayerLaunchProjectileEvent.patch similarity index 100% rename from patches/unapplied/PlayerLaunchProjectileEvent.patch rename to patches/unapplied/server/PlayerLaunchProjectileEvent.patch diff --git a/patches/unapplied/PlayerNaturallySpawnCreaturesEvent.patch b/patches/unapplied/server/PlayerNaturallySpawnCreaturesEvent.patch similarity index 100% rename from patches/unapplied/PlayerNaturallySpawnCreaturesEvent.patch rename to patches/unapplied/server/PlayerNaturallySpawnCreaturesEvent.patch diff --git a/patches/unapplied/PlayerPickupExperienceEvent.patch b/patches/unapplied/server/PlayerPickupExperienceEvent.patch similarity index 100% rename from patches/unapplied/PlayerPickupExperienceEvent.patch rename to patches/unapplied/server/PlayerPickupExperienceEvent.patch diff --git a/patches/unapplied/PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/unapplied/server/PlayerPickupItemEvent-setFlyAtPlayer.patch similarity index 100% rename from patches/unapplied/PlayerPickupItemEvent-setFlyAtPlayer.patch rename to patches/unapplied/server/PlayerPickupItemEvent-setFlyAtPlayer.patch diff --git a/patches/unapplied/PlayerReadyArrowEvent.patch b/patches/unapplied/server/PlayerReadyArrowEvent.patch similarity index 100% rename from patches/unapplied/PlayerReadyArrowEvent.patch rename to patches/unapplied/server/PlayerReadyArrowEvent.patch diff --git a/patches/unapplied/PlayerTeleportEndGatewayEvent.patch b/patches/unapplied/server/PlayerTeleportEndGatewayEvent.patch similarity index 100% rename from patches/unapplied/PlayerTeleportEndGatewayEvent.patch rename to patches/unapplied/server/PlayerTeleportEndGatewayEvent.patch diff --git a/patches/unapplied/Potential-bed-API.patch b/patches/unapplied/server/Potential-bed-API.patch similarity index 100% rename from patches/unapplied/Potential-bed-API.patch rename to patches/unapplied/server/Potential-bed-API.patch diff --git a/patches/unapplied/PreCreatureSpawnEvent.patch b/patches/unapplied/server/PreCreatureSpawnEvent.patch similarity index 100% rename from patches/unapplied/PreCreatureSpawnEvent.patch rename to patches/unapplied/server/PreCreatureSpawnEvent.patch diff --git a/patches/unapplied/PreSpawnerSpawnEvent.patch b/patches/unapplied/server/PreSpawnerSpawnEvent.patch similarity index 100% rename from patches/unapplied/PreSpawnerSpawnEvent.patch rename to patches/unapplied/server/PreSpawnerSpawnEvent.patch diff --git a/patches/unapplied/Preserve-overstacked-loot.patch b/patches/unapplied/server/Preserve-overstacked-loot.patch similarity index 100% rename from patches/unapplied/Preserve-overstacked-loot.patch rename to patches/unapplied/server/Preserve-overstacked-loot.patch diff --git a/patches/unapplied/Prevent-AFK-kick-while-watching-end-credits.patch b/patches/unapplied/server/Prevent-AFK-kick-while-watching-end-credits.patch similarity index 100% rename from patches/unapplied/Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/unapplied/server/Prevent-AFK-kick-while-watching-end-credits.patch diff --git a/patches/unapplied/Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/unapplied/server/Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/unapplied/Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/unapplied/server/Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/unapplied/Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/unapplied/server/Prevent-Double-PlayerChunkMap-adds-crashing-server.patch similarity index 100% rename from patches/unapplied/Prevent-Double-PlayerChunkMap-adds-crashing-server.patch rename to patches/unapplied/server/Prevent-Double-PlayerChunkMap-adds-crashing-server.patch diff --git a/patches/unapplied/Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/unapplied/server/Prevent-GameEvents-being-fired-from-unloaded-chunks.patch similarity index 100% rename from patches/unapplied/Prevent-GameEvents-being-fired-from-unloaded-chunks.patch rename to patches/unapplied/server/Prevent-GameEvents-being-fired-from-unloaded-chunks.patch diff --git a/patches/unapplied/Prevent-NPE-if-hooked-entity-was-cleared.patch b/patches/unapplied/server/Prevent-NPE-if-hooked-entity-was-cleared.patch similarity index 100% rename from patches/unapplied/Prevent-NPE-if-hooked-entity-was-cleared.patch rename to patches/unapplied/server/Prevent-NPE-if-hooked-entity-was-cleared.patch diff --git a/patches/unapplied/Prevent-Pathfinding-out-of-World-Border.patch b/patches/unapplied/server/Prevent-Pathfinding-out-of-World-Border.patch similarity index 100% rename from patches/unapplied/Prevent-Pathfinding-out-of-World-Border.patch rename to patches/unapplied/server/Prevent-Pathfinding-out-of-World-Border.patch diff --git a/patches/unapplied/Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/unapplied/server/Prevent-bees-loading-chunks-checking-hive-position.patch similarity index 100% rename from patches/unapplied/Prevent-bees-loading-chunks-checking-hive-position.patch rename to patches/unapplied/server/Prevent-bees-loading-chunks-checking-hive-position.patch diff --git a/patches/unapplied/Prevent-block-entity-and-entity-crashes.patch b/patches/unapplied/server/Prevent-block-entity-and-entity-crashes.patch similarity index 100% rename from patches/unapplied/Prevent-block-entity-and-entity-crashes.patch rename to patches/unapplied/server/Prevent-block-entity-and-entity-crashes.patch diff --git a/patches/unapplied/Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/unapplied/server/Prevent-causing-expired-keys-from-impacting-new-join.patch similarity index 100% rename from patches/unapplied/Prevent-causing-expired-keys-from-impacting-new-join.patch rename to patches/unapplied/server/Prevent-causing-expired-keys-from-impacting-new-join.patch diff --git a/patches/unapplied/Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/unapplied/server/Prevent-chunk-loading-from-Fluid-Flowing.patch similarity index 100% rename from patches/unapplied/Prevent-chunk-loading-from-Fluid-Flowing.patch rename to patches/unapplied/server/Prevent-chunk-loading-from-Fluid-Flowing.patch diff --git a/patches/unapplied/Prevent-consuming-the-wrong-itemstack.patch b/patches/unapplied/server/Prevent-consuming-the-wrong-itemstack.patch similarity index 100% rename from patches/unapplied/Prevent-consuming-the-wrong-itemstack.patch rename to patches/unapplied/server/Prevent-consuming-the-wrong-itemstack.patch diff --git a/patches/unapplied/Prevent-empty-items-from-being-added-to-world.patch b/patches/unapplied/server/Prevent-empty-items-from-being-added-to-world.patch similarity index 100% rename from patches/unapplied/Prevent-empty-items-from-being-added-to-world.patch rename to patches/unapplied/server/Prevent-empty-items-from-being-added-to-world.patch diff --git a/patches/unapplied/Prevent-entity-loading-causing-async-lookups.patch b/patches/unapplied/server/Prevent-entity-loading-causing-async-lookups.patch similarity index 100% rename from patches/unapplied/Prevent-entity-loading-causing-async-lookups.patch rename to patches/unapplied/server/Prevent-entity-loading-causing-async-lookups.patch diff --git a/patches/unapplied/Prevent-excessive-velocity-through-repeated-crits.patch b/patches/unapplied/server/Prevent-excessive-velocity-through-repeated-crits.patch similarity index 100% rename from patches/unapplied/Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/unapplied/server/Prevent-excessive-velocity-through-repeated-crits.patch diff --git a/patches/unapplied/Prevent-headless-pistons-from-being-created.patch b/patches/unapplied/server/Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/unapplied/Prevent-headless-pistons-from-being-created.patch rename to patches/unapplied/server/Prevent-headless-pistons-from-being-created.patch diff --git a/patches/unapplied/Prevent-logins-from-being-processed-when-the-player-.patch b/patches/unapplied/server/Prevent-logins-from-being-processed-when-the-player-.patch similarity index 100% rename from patches/unapplied/Prevent-logins-from-being-processed-when-the-player-.patch rename to patches/unapplied/server/Prevent-logins-from-being-processed-when-the-player-.patch diff --git a/patches/unapplied/Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/unapplied/server/Prevent-mob-spawning-from-loading-generating-chunks.patch similarity index 100% rename from patches/unapplied/Prevent-mob-spawning-from-loading-generating-chunks.patch rename to patches/unapplied/server/Prevent-mob-spawning-from-loading-generating-chunks.patch diff --git a/patches/unapplied/Prevent-opening-inventories-when-frozen.patch b/patches/unapplied/server/Prevent-opening-inventories-when-frozen.patch similarity index 100% rename from patches/unapplied/Prevent-opening-inventories-when-frozen.patch rename to patches/unapplied/server/Prevent-opening-inventories-when-frozen.patch diff --git a/patches/unapplied/Prevent-position-desync-causing-tp-exploit.patch b/patches/unapplied/server/Prevent-position-desync-causing-tp-exploit.patch similarity index 100% rename from patches/unapplied/Prevent-position-desync-causing-tp-exploit.patch rename to patches/unapplied/server/Prevent-position-desync-causing-tp-exploit.patch diff --git a/patches/unapplied/Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/unapplied/server/Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 100% rename from patches/unapplied/Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/unapplied/server/Prevent-sending-oversized-item-data-in-equipment-and.patch diff --git a/patches/unapplied/Prevent-softlocked-end-exit-portal-generation.patch b/patches/unapplied/server/Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/unapplied/Prevent-softlocked-end-exit-portal-generation.patch rename to patches/unapplied/server/Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/unapplied/Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/unapplied/server/Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch similarity index 100% rename from patches/unapplied/Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch rename to patches/unapplied/server/Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch diff --git a/patches/unapplied/Prevent-teleporting-dead-entities.patch b/patches/unapplied/server/Prevent-teleporting-dead-entities.patch similarity index 100% rename from patches/unapplied/Prevent-teleporting-dead-entities.patch rename to patches/unapplied/server/Prevent-teleporting-dead-entities.patch diff --git a/patches/unapplied/Prevent-tile-entity-copies-loading-chunks.patch b/patches/unapplied/server/Prevent-tile-entity-copies-loading-chunks.patch similarity index 100% rename from patches/unapplied/Prevent-tile-entity-copies-loading-chunks.patch rename to patches/unapplied/server/Prevent-tile-entity-copies-loading-chunks.patch diff --git a/patches/unapplied/Prevent-various-interactions-from-causing-chunk-load.patch b/patches/unapplied/server/Prevent-various-interactions-from-causing-chunk-load.patch similarity index 100% rename from patches/unapplied/Prevent-various-interactions-from-causing-chunk-load.patch rename to patches/unapplied/server/Prevent-various-interactions-from-causing-chunk-load.patch diff --git a/patches/unapplied/Print-Error-details-when-failing-to-save-player-data.patch b/patches/unapplied/server/Print-Error-details-when-failing-to-save-player-data.patch similarity index 100% rename from patches/unapplied/Print-Error-details-when-failing-to-save-player-data.patch rename to patches/unapplied/server/Print-Error-details-when-failing-to-save-player-data.patch diff --git a/patches/unapplied/Print-data-component-type-on-encoding-error.patch b/patches/unapplied/server/Print-data-component-type-on-encoding-error.patch similarity index 100% rename from patches/unapplied/Print-data-component-type-on-encoding-error.patch rename to patches/unapplied/server/Print-data-component-type-on-encoding-error.patch diff --git a/patches/unapplied/Prioritize-Minecraft-commands-in-function-parsing-an.patch b/patches/unapplied/server/Prioritize-Minecraft-commands-in-function-parsing-an.patch similarity index 100% rename from patches/unapplied/Prioritize-Minecraft-commands-in-function-parsing-an.patch rename to patches/unapplied/server/Prioritize-Minecraft-commands-in-function-parsing-an.patch diff --git a/patches/unapplied/Profile-Lookup-Events.patch b/patches/unapplied/server/Profile-Lookup-Events.patch similarity index 100% rename from patches/unapplied/Profile-Lookup-Events.patch rename to patches/unapplied/server/Profile-Lookup-Events.patch diff --git a/patches/unapplied/ProfileWhitelistVerifyEvent.patch b/patches/unapplied/server/ProfileWhitelistVerifyEvent.patch similarity index 100% rename from patches/unapplied/ProfileWhitelistVerifyEvent.patch rename to patches/unapplied/server/ProfileWhitelistVerifyEvent.patch diff --git a/patches/unapplied/Properly-destroy-placed-blocks-on-the-end-platform.patch b/patches/unapplied/server/Properly-destroy-placed-blocks-on-the-end-platform.patch similarity index 100% rename from patches/unapplied/Properly-destroy-placed-blocks-on-the-end-platform.patch rename to patches/unapplied/server/Properly-destroy-placed-blocks-on-the-end-platform.patch diff --git a/patches/unapplied/Properly-fix-item-duplication-bug.patch b/patches/unapplied/server/Properly-fix-item-duplication-bug.patch similarity index 100% rename from patches/unapplied/Properly-fix-item-duplication-bug.patch rename to patches/unapplied/server/Properly-fix-item-duplication-bug.patch diff --git a/patches/unapplied/Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/unapplied/server/Properly-handle-BlockBreakEvent-isDropItems.patch similarity index 100% rename from patches/unapplied/Properly-handle-BlockBreakEvent-isDropItems.patch rename to patches/unapplied/server/Properly-handle-BlockBreakEvent-isDropItems.patch diff --git a/patches/unapplied/Properly-handle-async-calls-to-restart-the-server.patch b/patches/unapplied/server/Properly-handle-async-calls-to-restart-the-server.patch similarity index 100% rename from patches/unapplied/Properly-handle-async-calls-to-restart-the-server.patch rename to patches/unapplied/server/Properly-handle-async-calls-to-restart-the-server.patch diff --git a/patches/unapplied/Properly-handle-experience-dropping-on-block-break.patch b/patches/unapplied/server/Properly-handle-experience-dropping-on-block-break.patch similarity index 100% rename from patches/unapplied/Properly-handle-experience-dropping-on-block-break.patch rename to patches/unapplied/server/Properly-handle-experience-dropping-on-block-break.patch diff --git a/patches/unapplied/Properly-remove-the-experimental-smithing-inventory-.patch b/patches/unapplied/server/Properly-remove-the-experimental-smithing-inventory-.patch similarity index 100% rename from patches/unapplied/Properly-remove-the-experimental-smithing-inventory-.patch rename to patches/unapplied/server/Properly-remove-the-experimental-smithing-inventory-.patch diff --git a/patches/unapplied/Properly-resend-entities.patch b/patches/unapplied/server/Properly-resend-entities.patch similarity index 100% rename from patches/unapplied/Properly-resend-entities.patch rename to patches/unapplied/server/Properly-resend-entities.patch diff --git a/patches/unapplied/Properly-track-the-changed-item-from-dispense-events.patch b/patches/unapplied/server/Properly-track-the-changed-item-from-dispense-events.patch similarity index 100% rename from patches/unapplied/Properly-track-the-changed-item-from-dispense-events.patch rename to patches/unapplied/server/Properly-track-the-changed-item-from-dispense-events.patch diff --git a/patches/unapplied/Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/unapplied/server/Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 100% rename from patches/unapplied/Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to patches/unapplied/server/Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch diff --git a/patches/unapplied/Provide-E-TE-Chunk-count-stat-methods.patch b/patches/unapplied/server/Provide-E-TE-Chunk-count-stat-methods.patch similarity index 100% rename from patches/unapplied/Provide-E-TE-Chunk-count-stat-methods.patch rename to patches/unapplied/server/Provide-E-TE-Chunk-count-stat-methods.patch diff --git a/patches/unapplied/Proxy-ItemStack-to-CraftItemStack.patch b/patches/unapplied/server/Proxy-ItemStack-to-CraftItemStack.patch similarity index 100% rename from patches/unapplied/Proxy-ItemStack-to-CraftItemStack.patch rename to patches/unapplied/server/Proxy-ItemStack-to-CraftItemStack.patch diff --git a/patches/unapplied/Put-world-into-worldlist-before-initing-the-world.patch b/patches/unapplied/server/Put-world-into-worldlist-before-initing-the-world.patch similarity index 100% rename from patches/unapplied/Put-world-into-worldlist-before-initing-the-world.patch rename to patches/unapplied/server/Put-world-into-worldlist-before-initing-the-world.patch diff --git a/patches/unapplied/RangedEntity-API.patch b/patches/unapplied/server/RangedEntity-API.patch similarity index 100% rename from patches/unapplied/RangedEntity-API.patch rename to patches/unapplied/server/RangedEntity-API.patch diff --git a/patches/unapplied/Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/unapplied/server/Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/unapplied/Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/unapplied/server/Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/unapplied/Reduce-Either-Optional-allocation.patch b/patches/unapplied/server/Reduce-Either-Optional-allocation.patch similarity index 100% rename from patches/unapplied/Reduce-Either-Optional-allocation.patch rename to patches/unapplied/server/Reduce-Either-Optional-allocation.patch diff --git a/patches/unapplied/Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/unapplied/server/Reduce-allocation-of-Vec3D-by-entity-tracker.patch similarity index 100% rename from patches/unapplied/Reduce-allocation-of-Vec3D-by-entity-tracker.patch rename to patches/unapplied/server/Reduce-allocation-of-Vec3D-by-entity-tracker.patch diff --git a/patches/unapplied/Reduce-memory-footprint-of-CompoundTag.patch b/patches/unapplied/server/Reduce-memory-footprint-of-CompoundTag.patch similarity index 100% rename from patches/unapplied/Reduce-memory-footprint-of-CompoundTag.patch rename to patches/unapplied/server/Reduce-memory-footprint-of-CompoundTag.patch diff --git a/patches/unapplied/Refresh-ProjectileSource-for-projectiles.patch b/patches/unapplied/server/Refresh-ProjectileSource-for-projectiles.patch similarity index 100% rename from patches/unapplied/Refresh-ProjectileSource-for-projectiles.patch rename to patches/unapplied/server/Refresh-ProjectileSource-for-projectiles.patch diff --git a/patches/unapplied/Registry-Modification-API.patch b/patches/unapplied/server/Registry-Modification-API.patch similarity index 100% rename from patches/unapplied/Registry-Modification-API.patch rename to patches/unapplied/server/Registry-Modification-API.patch diff --git a/patches/unapplied/Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/unapplied/server/Remote-Connections-shouldn-t-hold-up-shutdown.patch similarity index 100% rename from patches/unapplied/Remote-Connections-shouldn-t-hold-up-shutdown.patch rename to patches/unapplied/server/Remote-Connections-shouldn-t-hold-up-shutdown.patch diff --git a/patches/unapplied/Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/unapplied/server/Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 100% rename from patches/unapplied/Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/unapplied/server/Remove-CraftItemStack-setAmount-null-assignment.patch diff --git a/patches/unapplied/Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/unapplied/server/Remove-CraftScheduler-Async-Task-Debugger.patch similarity index 100% rename from patches/unapplied/Remove-CraftScheduler-Async-Task-Debugger.patch rename to patches/unapplied/server/Remove-CraftScheduler-Async-Task-Debugger.patch diff --git a/patches/unapplied/Remove-Metadata-on-reload.patch b/patches/unapplied/server/Remove-Metadata-on-reload.patch similarity index 100% rename from patches/unapplied/Remove-Metadata-on-reload.patch rename to patches/unapplied/server/Remove-Metadata-on-reload.patch diff --git a/patches/unapplied/Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/unapplied/server/Remove-UpgradeData-neighbour-ticks-outside-of-range.patch similarity index 100% rename from patches/unapplied/Remove-UpgradeData-neighbour-ticks-outside-of-range.patch rename to patches/unapplied/server/Remove-UpgradeData-neighbour-ticks-outside-of-range.patch diff --git a/patches/unapplied/Remove-client-side-code-using-deprecated-for-removal.patch b/patches/unapplied/server/Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/unapplied/Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/unapplied/server/Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/unapplied/Remove-set-damage-lootable-item-function-from-compas.patch b/patches/unapplied/server/Remove-set-damage-lootable-item-function-from-compas.patch similarity index 100% rename from patches/unapplied/Remove-set-damage-lootable-item-function-from-compas.patch rename to patches/unapplied/server/Remove-set-damage-lootable-item-function-from-compas.patch diff --git a/patches/unapplied/Remove-stale-POIs.patch b/patches/unapplied/server/Remove-stale-POIs.patch similarity index 100% rename from patches/unapplied/Remove-stale-POIs.patch rename to patches/unapplied/server/Remove-stale-POIs.patch diff --git a/patches/unapplied/Remove-streams-from-hot-code.patch b/patches/unapplied/server/Remove-streams-from-hot-code.patch similarity index 100% rename from patches/unapplied/Remove-streams-from-hot-code.patch rename to patches/unapplied/server/Remove-streams-from-hot-code.patch diff --git a/patches/unapplied/Remove-unnecessary-itemmeta-handling.patch b/patches/unapplied/server/Remove-unnecessary-itemmeta-handling.patch similarity index 100% rename from patches/unapplied/Remove-unnecessary-itemmeta-handling.patch rename to patches/unapplied/server/Remove-unnecessary-itemmeta-handling.patch diff --git a/patches/unapplied/Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/unapplied/server/Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 100% rename from patches/unapplied/Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/unapplied/server/Remove-unnecessary-onTrackingStart-during-navigation.patch diff --git a/patches/unapplied/Remove-wall-time-unused-skip-tick-protection.patch b/patches/unapplied/server/Remove-wall-time-unused-skip-tick-protection.patch similarity index 100% rename from patches/unapplied/Remove-wall-time-unused-skip-tick-protection.patch rename to patches/unapplied/server/Remove-wall-time-unused-skip-tick-protection.patch diff --git a/patches/unapplied/Replace-OfflinePlayer-getLastPlayed.patch b/patches/unapplied/server/Replace-OfflinePlayer-getLastPlayed.patch similarity index 100% rename from patches/unapplied/Replace-OfflinePlayer-getLastPlayed.patch rename to patches/unapplied/server/Replace-OfflinePlayer-getLastPlayed.patch diff --git a/patches/unapplied/Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/unapplied/server/Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/unapplied/Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/unapplied/server/Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/unapplied/Reset-placed-block-on-exception.patch b/patches/unapplied/server/Reset-placed-block-on-exception.patch similarity index 100% rename from patches/unapplied/Reset-placed-block-on-exception.patch rename to patches/unapplied/server/Reset-placed-block-on-exception.patch diff --git a/patches/unapplied/Reset-players-airTicks-on-respawn.patch b/patches/unapplied/server/Reset-players-airTicks-on-respawn.patch similarity index 100% rename from patches/unapplied/Reset-players-airTicks-on-respawn.patch rename to patches/unapplied/server/Reset-players-airTicks-on-respawn.patch diff --git a/patches/unapplied/Reset-shield-blocking-on-dimension-change.patch b/patches/unapplied/server/Reset-shield-blocking-on-dimension-change.patch similarity index 100% rename from patches/unapplied/Reset-shield-blocking-on-dimension-change.patch rename to patches/unapplied/server/Reset-shield-blocking-on-dimension-change.patch diff --git a/patches/unapplied/Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/unapplied/server/Reset-spawner-timer-when-spawner-event-is-cancelled.patch similarity index 100% rename from patches/unapplied/Reset-spawner-timer-when-spawner-event-is-cancelled.patch rename to patches/unapplied/server/Reset-spawner-timer-when-spawner-event-is-cancelled.patch diff --git a/patches/unapplied/Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/unapplied/server/Respect-randomizeData-on-more-entities-when-spawning.patch similarity index 100% rename from patches/unapplied/Respect-randomizeData-on-more-entities-when-spawning.patch rename to patches/unapplied/server/Respect-randomizeData-on-more-entities-when-spawning.patch diff --git a/patches/unapplied/Restore-custom-InventoryHolder-support.patch b/patches/unapplied/server/Restore-custom-InventoryHolder-support.patch similarity index 100% rename from patches/unapplied/Restore-custom-InventoryHolder-support.patch rename to patches/unapplied/server/Restore-custom-InventoryHolder-support.patch diff --git a/patches/unapplied/Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/unapplied/server/Restore-vanilla-default-mob-spawn-range-and-water-an.patch similarity index 100% rename from patches/unapplied/Restore-vanilla-default-mob-spawn-range-and-water-an.patch rename to patches/unapplied/server/Restore-vanilla-default-mob-spawn-range-and-water-an.patch diff --git a/patches/unapplied/Restore-vanilla-entity-drops-behavior.patch b/patches/unapplied/server/Restore-vanilla-entity-drops-behavior.patch similarity index 100% rename from patches/unapplied/Restore-vanilla-entity-drops-behavior.patch rename to patches/unapplied/server/Restore-vanilla-entity-drops-behavior.patch diff --git a/patches/unapplied/Retain-block-place-order-when-capturing-blockstates.patch b/patches/unapplied/server/Retain-block-place-order-when-capturing-blockstates.patch similarity index 100% rename from patches/unapplied/Retain-block-place-order-when-capturing-blockstates.patch rename to patches/unapplied/server/Retain-block-place-order-when-capturing-blockstates.patch diff --git a/patches/unapplied/Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/unapplied/server/Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/unapplied/Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/unapplied/server/Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/unapplied/Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch b/patches/unapplied/server/Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch similarity index 100% rename from patches/unapplied/Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch rename to patches/unapplied/server/Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch diff --git a/patches/unapplied/Rewrite-dataconverter-system.patch b/patches/unapplied/server/Rewrite-dataconverter-system.patch similarity index 100% rename from patches/unapplied/Rewrite-dataconverter-system.patch rename to patches/unapplied/server/Rewrite-dataconverter-system.patch diff --git a/patches/unapplied/Sanitise-RegionFileCache-and-make-configurable.patch b/patches/unapplied/server/Sanitise-RegionFileCache-and-make-configurable.patch similarity index 100% rename from patches/unapplied/Sanitise-RegionFileCache-and-make-configurable.patch rename to patches/unapplied/server/Sanitise-RegionFileCache-and-make-configurable.patch diff --git a/patches/unapplied/Sanitize-ResourceLocation-error-logging.patch b/patches/unapplied/server/Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/unapplied/Sanitize-ResourceLocation-error-logging.patch rename to patches/unapplied/server/Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/unapplied/Sanitize-sent-BlockEntity-NBT.patch b/patches/unapplied/server/Sanitize-sent-BlockEntity-NBT.patch similarity index 100% rename from patches/unapplied/Sanitize-sent-BlockEntity-NBT.patch rename to patches/unapplied/server/Sanitize-sent-BlockEntity-NBT.patch diff --git a/patches/unapplied/SculkCatalyst-bloom-API.patch b/patches/unapplied/server/SculkCatalyst-bloom-API.patch similarity index 100% rename from patches/unapplied/SculkCatalyst-bloom-API.patch rename to patches/unapplied/server/SculkCatalyst-bloom-API.patch diff --git a/patches/unapplied/Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/unapplied/server/Send-attack-SoundEffects-only-to-players-who-can-see.patch similarity index 100% rename from patches/unapplied/Send-attack-SoundEffects-only-to-players-who-can-see.patch rename to patches/unapplied/server/Send-attack-SoundEffects-only-to-players-who-can-see.patch diff --git a/patches/unapplied/Send-block-entities-after-destroy-prediction.patch b/patches/unapplied/server/Send-block-entities-after-destroy-prediction.patch similarity index 100% rename from patches/unapplied/Send-block-entities-after-destroy-prediction.patch rename to patches/unapplied/server/Send-block-entities-after-destroy-prediction.patch diff --git a/patches/unapplied/Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/unapplied/server/Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/unapplied/Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/unapplied/server/Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/unapplied/Server-Tick-Events.patch b/patches/unapplied/server/Server-Tick-Events.patch similarity index 100% rename from patches/unapplied/Server-Tick-Events.patch rename to patches/unapplied/server/Server-Tick-Events.patch diff --git a/patches/unapplied/Set-area-affect-cloud-rotation.patch b/patches/unapplied/server/Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/unapplied/Set-area-affect-cloud-rotation.patch rename to patches/unapplied/server/Set-area-affect-cloud-rotation.patch diff --git a/patches/unapplied/Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/unapplied/server/Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 100% rename from patches/unapplied/Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to patches/unapplied/server/Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch diff --git a/patches/unapplied/Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/unapplied/server/Set-spigots-verbose-world-setting-to-false-by-def.patch similarity index 100% rename from patches/unapplied/Set-spigots-verbose-world-setting-to-false-by-def.patch rename to patches/unapplied/server/Set-spigots-verbose-world-setting-to-false-by-def.patch diff --git a/patches/unapplied/Shoulder-Entities-Release-API.patch b/patches/unapplied/server/Shoulder-Entities-Release-API.patch similarity index 100% rename from patches/unapplied/Shoulder-Entities-Release-API.patch rename to patches/unapplied/server/Shoulder-Entities-Release-API.patch diff --git a/patches/unapplied/Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/unapplied/server/Show-blockstate-location-if-we-failed-to-read-it.patch similarity index 100% rename from patches/unapplied/Show-blockstate-location-if-we-failed-to-read-it.patch rename to patches/unapplied/server/Show-blockstate-location-if-we-failed-to-read-it.patch diff --git a/patches/unapplied/Significantly-improve-performance-of-the-end-generat.patch b/patches/unapplied/server/Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/unapplied/Significantly-improve-performance-of-the-end-generat.patch rename to patches/unapplied/server/Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/unapplied/SkeletonHorse-Additions.patch b/patches/unapplied/server/SkeletonHorse-Additions.patch similarity index 100% rename from patches/unapplied/SkeletonHorse-Additions.patch rename to patches/unapplied/server/SkeletonHorse-Additions.patch diff --git a/patches/unapplied/Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/unapplied/server/Skip-POI-finding-if-stuck-in-vehicle.patch similarity index 100% rename from patches/unapplied/Skip-POI-finding-if-stuck-in-vehicle.patch rename to patches/unapplied/server/Skip-POI-finding-if-stuck-in-vehicle.patch diff --git a/patches/unapplied/Slime-Pathfinder-Events.patch b/patches/unapplied/server/Slime-Pathfinder-Events.patch similarity index 100% rename from patches/unapplied/Slime-Pathfinder-Events.patch rename to patches/unapplied/server/Slime-Pathfinder-Events.patch diff --git a/patches/unapplied/Stinger-API.patch b/patches/unapplied/server/Stinger-API.patch similarity index 100% rename from patches/unapplied/Stinger-API.patch rename to patches/unapplied/server/Stinger-API.patch diff --git a/patches/unapplied/Stop-large-look-changes-from-crashing-the-server.patch b/patches/unapplied/server/Stop-large-look-changes-from-crashing-the-server.patch similarity index 100% rename from patches/unapplied/Stop-large-look-changes-from-crashing-the-server.patch rename to patches/unapplied/server/Stop-large-look-changes-from-crashing-the-server.patch diff --git a/patches/unapplied/String-based-Action-Bar-API.patch b/patches/unapplied/server/String-based-Action-Bar-API.patch similarity index 100% rename from patches/unapplied/String-based-Action-Bar-API.patch rename to patches/unapplied/server/String-based-Action-Bar-API.patch diff --git a/patches/unapplied/Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/unapplied/server/Strip-raytracing-for-EntityLiving-hasLineOfSight.patch similarity index 100% rename from patches/unapplied/Strip-raytracing-for-EntityLiving-hasLineOfSight.patch rename to patches/unapplied/server/Strip-raytracing-for-EntityLiving-hasLineOfSight.patch diff --git a/patches/unapplied/Support-old-UUID-format-for-NBT.patch b/patches/unapplied/server/Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/unapplied/Support-old-UUID-format-for-NBT.patch rename to patches/unapplied/server/Support-old-UUID-format-for-NBT.patch diff --git a/patches/unapplied/Suspicious-Effect-Entry-API.patch b/patches/unapplied/server/Suspicious-Effect-Entry-API.patch similarity index 100% rename from patches/unapplied/Suspicious-Effect-Entry-API.patch rename to patches/unapplied/server/Suspicious-Effect-Entry-API.patch diff --git a/patches/unapplied/Sync-offhand-slot-in-menus.patch b/patches/unapplied/server/Sync-offhand-slot-in-menus.patch similarity index 100% rename from patches/unapplied/Sync-offhand-slot-in-menus.patch rename to patches/unapplied/server/Sync-offhand-slot-in-menus.patch diff --git a/patches/unapplied/Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/unapplied/server/Synchronize-PalettedContainer-instead-of-ThreadingDe.patch similarity index 100% rename from patches/unapplied/Synchronize-PalettedContainer-instead-of-ThreadingDe.patch rename to patches/unapplied/server/Synchronize-PalettedContainer-instead-of-ThreadingDe.patch diff --git a/patches/unapplied/System-property-for-disabling-watchdoge.patch b/patches/unapplied/server/System-property-for-disabling-watchdoge.patch similarity index 100% rename from patches/unapplied/System-property-for-disabling-watchdoge.patch rename to patches/unapplied/server/System-property-for-disabling-watchdoge.patch diff --git a/patches/unapplied/Tag-Lifecycle-Events.patch b/patches/unapplied/server/Tag-Lifecycle-Events.patch similarity index 100% rename from patches/unapplied/Tag-Lifecycle-Events.patch rename to patches/unapplied/server/Tag-Lifecycle-Events.patch diff --git a/patches/unapplied/Tameable-getOwnerUniqueId-API.patch b/patches/unapplied/server/Tameable-getOwnerUniqueId-API.patch similarity index 100% rename from patches/unapplied/Tameable-getOwnerUniqueId-API.patch rename to patches/unapplied/server/Tameable-getOwnerUniqueId-API.patch diff --git a/patches/unapplied/Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/unapplied/server/Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/unapplied/Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/unapplied/server/Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/unapplied/Throw-exception-on-world-create-while-being-ticked.patch b/patches/unapplied/server/Throw-exception-on-world-create-while-being-ticked.patch similarity index 100% rename from patches/unapplied/Throw-exception-on-world-create-while-being-ticked.patch rename to patches/unapplied/server/Throw-exception-on-world-create-while-being-ticked.patch diff --git a/patches/unapplied/Time-scoreboard-search.patch b/patches/unapplied/server/Time-scoreboard-search.patch similarity index 100% rename from patches/unapplied/Time-scoreboard-search.patch rename to patches/unapplied/server/Time-scoreboard-search.patch diff --git a/patches/unapplied/Toggle-for-removing-existing-dragon.patch b/patches/unapplied/server/Toggle-for-removing-existing-dragon.patch similarity index 100% rename from patches/unapplied/Toggle-for-removing-existing-dragon.patch rename to patches/unapplied/server/Toggle-for-removing-existing-dragon.patch diff --git a/patches/unapplied/Toggleable-player-crits.patch b/patches/unapplied/server/Toggleable-player-crits.patch similarity index 100% rename from patches/unapplied/Toggleable-player-crits.patch rename to patches/unapplied/server/Toggleable-player-crits.patch diff --git a/patches/unapplied/Tracking-Range-Improvements.patch b/patches/unapplied/server/Tracking-Range-Improvements.patch similarity index 100% rename from patches/unapplied/Tracking-Range-Improvements.patch rename to patches/unapplied/server/Tracking-Range-Improvements.patch diff --git a/patches/unapplied/Treat-sequence-violations-like-they-should-be.patch b/patches/unapplied/server/Treat-sequence-violations-like-they-should-be.patch similarity index 100% rename from patches/unapplied/Treat-sequence-violations-like-they-should-be.patch rename to patches/unapplied/server/Treat-sequence-violations-like-they-should-be.patch diff --git a/patches/unapplied/Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/unapplied/server/Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch similarity index 100% rename from patches/unapplied/Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch rename to patches/unapplied/server/Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch diff --git a/patches/unapplied/Turtle-API.patch b/patches/unapplied/server/Turtle-API.patch similarity index 100% rename from patches/unapplied/Turtle-API.patch rename to patches/unapplied/server/Turtle-API.patch diff --git a/patches/unapplied/Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/unapplied/server/Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch similarity index 100% rename from patches/unapplied/Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch rename to patches/unapplied/server/Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch diff --git a/patches/unapplied/Update-entity-data-when-attaching-firework-to-entity.patch b/patches/unapplied/server/Update-entity-data-when-attaching-firework-to-entity.patch similarity index 100% rename from patches/unapplied/Update-entity-data-when-attaching-firework-to-entity.patch rename to patches/unapplied/server/Update-entity-data-when-attaching-firework-to-entity.patch diff --git a/patches/unapplied/Update-head-rotation-in-missing-places.patch b/patches/unapplied/server/Update-head-rotation-in-missing-places.patch similarity index 100% rename from patches/unapplied/Update-head-rotation-in-missing-places.patch rename to patches/unapplied/server/Update-head-rotation-in-missing-places.patch diff --git a/patches/unapplied/Use-ConcurrentHashMap-in-JsonList.patch b/patches/unapplied/server/Use-ConcurrentHashMap-in-JsonList.patch similarity index 100% rename from patches/unapplied/Use-ConcurrentHashMap-in-JsonList.patch rename to patches/unapplied/server/Use-ConcurrentHashMap-in-JsonList.patch diff --git a/patches/unapplied/Use-UserCache-for-player-heads.patch b/patches/unapplied/server/Use-UserCache-for-player-heads.patch similarity index 100% rename from patches/unapplied/Use-UserCache-for-player-heads.patch rename to patches/unapplied/server/Use-UserCache-for-player-heads.patch diff --git a/patches/unapplied/Use-Velocity-compression-and-cipher-natives.patch b/patches/unapplied/server/Use-Velocity-compression-and-cipher-natives.patch similarity index 100% rename from patches/unapplied/Use-Velocity-compression-and-cipher-natives.patch rename to patches/unapplied/server/Use-Velocity-compression-and-cipher-natives.patch diff --git a/patches/unapplied/Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/unapplied/server/Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/unapplied/Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/unapplied/server/Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/unapplied/Use-a-Queue-for-Queueing-Commands.patch b/patches/unapplied/server/Use-a-Queue-for-Queueing-Commands.patch similarity index 100% rename from patches/unapplied/Use-a-Queue-for-Queueing-Commands.patch rename to patches/unapplied/server/Use-a-Queue-for-Queueing-Commands.patch diff --git a/patches/unapplied/Use-a-Shared-Random-for-Entities.patch b/patches/unapplied/server/Use-a-Shared-Random-for-Entities.patch similarity index 100% rename from patches/unapplied/Use-a-Shared-Random-for-Entities.patch rename to patches/unapplied/server/Use-a-Shared-Random-for-Entities.patch diff --git a/patches/unapplied/Use-array-for-gamerule-storage.patch b/patches/unapplied/server/Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/unapplied/Use-array-for-gamerule-storage.patch rename to patches/unapplied/server/Use-array-for-gamerule-storage.patch diff --git a/patches/unapplied/Use-correct-seed-on-api-world-load.patch b/patches/unapplied/server/Use-correct-seed-on-api-world-load.patch similarity index 100% rename from patches/unapplied/Use-correct-seed-on-api-world-load.patch rename to patches/unapplied/server/Use-correct-seed-on-api-world-load.patch diff --git a/patches/unapplied/Use-correct-source-for-mushroom-block-spread-event.patch b/patches/unapplied/server/Use-correct-source-for-mushroom-block-spread-event.patch similarity index 100% rename from patches/unapplied/Use-correct-source-for-mushroom-block-spread-event.patch rename to patches/unapplied/server/Use-correct-source-for-mushroom-block-spread-event.patch diff --git a/patches/unapplied/Use-getChunkIfLoadedImmediately-in-places.patch b/patches/unapplied/server/Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/unapplied/Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/unapplied/server/Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/unapplied/Use-null-Locale-by-default.patch b/patches/unapplied/server/Use-null-Locale-by-default.patch similarity index 100% rename from patches/unapplied/Use-null-Locale-by-default.patch rename to patches/unapplied/server/Use-null-Locale-by-default.patch diff --git a/patches/unapplied/Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/unapplied/server/Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch similarity index 100% rename from patches/unapplied/Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch rename to patches/unapplied/server/Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch diff --git a/patches/unapplied/Use-single-player-info-update-packet-on-join.patch b/patches/unapplied/server/Use-single-player-info-update-packet-on-join.patch similarity index 100% rename from patches/unapplied/Use-single-player-info-update-packet-on-join.patch rename to patches/unapplied/server/Use-single-player-info-update-packet-on-join.patch diff --git a/patches/unapplied/Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/unapplied/server/Use-username-instead-of-display-name-in-PlayerList-g.patch similarity index 100% rename from patches/unapplied/Use-username-instead-of-display-name-in-PlayerList-g.patch rename to patches/unapplied/server/Use-username-instead-of-display-name-in-PlayerList-g.patch diff --git a/patches/unapplied/Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/unapplied/server/Validate-PickItem-Packet-and-kick-for-invalid.patch similarity index 100% rename from patches/unapplied/Validate-PickItem-Packet-and-kick-for-invalid.patch rename to patches/unapplied/server/Validate-PickItem-Packet-and-kick-for-invalid.patch diff --git a/patches/unapplied/Validate-ResourceLocation-in-NBT-reading.patch b/patches/unapplied/server/Validate-ResourceLocation-in-NBT-reading.patch similarity index 100% rename from patches/unapplied/Validate-ResourceLocation-in-NBT-reading.patch rename to patches/unapplied/server/Validate-ResourceLocation-in-NBT-reading.patch diff --git a/patches/unapplied/Validate-slot-in-PlayerInventory-setSlot.patch b/patches/unapplied/server/Validate-slot-in-PlayerInventory-setSlot.patch similarity index 100% rename from patches/unapplied/Validate-slot-in-PlayerInventory-setSlot.patch rename to patches/unapplied/server/Validate-slot-in-PlayerInventory-setSlot.patch diff --git a/patches/unapplied/Validate-tripwire-hook-placement-before-update.patch b/patches/unapplied/server/Validate-tripwire-hook-placement-before-update.patch similarity index 100% rename from patches/unapplied/Validate-tripwire-hook-placement-before-update.patch rename to patches/unapplied/server/Validate-tripwire-hook-placement-before-update.patch diff --git a/patches/unapplied/Validate-usernames.patch b/patches/unapplied/server/Validate-usernames.patch similarity index 100% rename from patches/unapplied/Validate-usernames.patch rename to patches/unapplied/server/Validate-usernames.patch diff --git a/patches/unapplied/Vanilla-command-permission-fixes.patch b/patches/unapplied/server/Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/unapplied/Vanilla-command-permission-fixes.patch rename to patches/unapplied/server/Vanilla-command-permission-fixes.patch diff --git a/patches/unapplied/Vanished-players-don-t-have-rights.patch b/patches/unapplied/server/Vanished-players-don-t-have-rights.patch similarity index 100% rename from patches/unapplied/Vanished-players-don-t-have-rights.patch rename to patches/unapplied/server/Vanished-players-don-t-have-rights.patch diff --git a/patches/unapplied/Vex-get-setSummoner-API.patch b/patches/unapplied/server/Vex-get-setSummoner-API.patch similarity index 100% rename from patches/unapplied/Vex-get-setSummoner-API.patch rename to patches/unapplied/server/Vex-get-setSummoner-API.patch diff --git a/patches/unapplied/Villager-Restocks-API.patch b/patches/unapplied/server/Villager-Restocks-API.patch similarity index 100% rename from patches/unapplied/Villager-Restocks-API.patch rename to patches/unapplied/server/Villager-Restocks-API.patch diff --git a/patches/unapplied/Villager-resetOffers.patch b/patches/unapplied/server/Villager-resetOffers.patch similarity index 100% rename from patches/unapplied/Villager-resetOffers.patch rename to patches/unapplied/server/Villager-resetOffers.patch diff --git a/patches/unapplied/Void-damage-configuration-API.patch b/patches/unapplied/server/Void-damage-configuration-API.patch similarity index 100% rename from patches/unapplied/Void-damage-configuration-API.patch rename to patches/unapplied/server/Void-damage-configuration-API.patch diff --git a/patches/unapplied/Wait-for-Async-Tasks-during-shutdown.patch b/patches/unapplied/server/Wait-for-Async-Tasks-during-shutdown.patch similarity index 100% rename from patches/unapplied/Wait-for-Async-Tasks-during-shutdown.patch rename to patches/unapplied/server/Wait-for-Async-Tasks-during-shutdown.patch diff --git a/patches/unapplied/Warn-on-plugins-accessing-faraway-chunks.patch b/patches/unapplied/server/Warn-on-plugins-accessing-faraway-chunks.patch similarity index 100% rename from patches/unapplied/Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/unapplied/server/Warn-on-plugins-accessing-faraway-chunks.patch diff --git a/patches/unapplied/Win-Screen-API.patch b/patches/unapplied/server/Win-Screen-API.patch similarity index 100% rename from patches/unapplied/Win-Screen-API.patch rename to patches/unapplied/server/Win-Screen-API.patch diff --git a/patches/unapplied/WitchConsumePotionEvent.patch b/patches/unapplied/server/WitchConsumePotionEvent.patch similarity index 100% rename from patches/unapplied/WitchConsumePotionEvent.patch rename to patches/unapplied/server/WitchConsumePotionEvent.patch diff --git a/patches/unapplied/WitchReadyPotionEvent.patch b/patches/unapplied/server/WitchReadyPotionEvent.patch similarity index 100% rename from patches/unapplied/WitchReadyPotionEvent.patch rename to patches/unapplied/server/WitchReadyPotionEvent.patch diff --git a/patches/unapplied/WitchThrowPotionEvent.patch b/patches/unapplied/server/WitchThrowPotionEvent.patch similarity index 100% rename from patches/unapplied/WitchThrowPotionEvent.patch rename to patches/unapplied/server/WitchThrowPotionEvent.patch diff --git a/patches/unapplied/Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/unapplied/server/Workaround-for-vehicle-tracking-issue-on-disconnect.patch similarity index 100% rename from patches/unapplied/Workaround-for-vehicle-tracking-issue-on-disconnect.patch rename to patches/unapplied/server/Workaround-for-vehicle-tracking-issue-on-disconnect.patch diff --git a/patches/unapplied/WorldCreator-keepSpawnLoaded.patch b/patches/unapplied/server/WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/unapplied/WorldCreator-keepSpawnLoaded.patch rename to patches/unapplied/server/WorldCreator-keepSpawnLoaded.patch diff --git a/patches/unapplied/Write-SavedData-IO-async.patch b/patches/unapplied/server/Write-SavedData-IO-async.patch similarity index 100% rename from patches/unapplied/Write-SavedData-IO-async.patch rename to patches/unapplied/server/Write-SavedData-IO-async.patch diff --git a/patches/unapplied/Zombie-API-breaking-doors.patch b/patches/unapplied/server/Zombie-API-breaking-doors.patch similarity index 100% rename from patches/unapplied/Zombie-API-breaking-doors.patch rename to patches/unapplied/server/Zombie-API-breaking-doors.patch diff --git a/patches/unapplied/add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/unapplied/server/add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/unapplied/add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/unapplied/server/add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/unapplied/add-get-set-drop-chance-to-EntityEquipment.patch b/patches/unapplied/server/add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/unapplied/add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/unapplied/server/add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/unapplied/add-hand-to-BlockMultiPlaceEvent.patch b/patches/unapplied/server/add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/unapplied/add-hand-to-BlockMultiPlaceEvent.patch rename to patches/unapplied/server/add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/unapplied/add-isDeeplySleeping-to-HumanEntity.patch b/patches/unapplied/server/add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/unapplied/add-isDeeplySleeping-to-HumanEntity.patch rename to patches/unapplied/server/add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/unapplied/add-more-information-to-Entity.toString.patch b/patches/unapplied/server/add-more-information-to-Entity.toString.patch similarity index 100% rename from patches/unapplied/add-more-information-to-Entity.toString.patch rename to patches/unapplied/server/add-more-information-to-Entity.toString.patch diff --git a/patches/unapplied/add-more-scoreboard-API.patch b/patches/unapplied/server/add-more-scoreboard-API.patch similarity index 100% rename from patches/unapplied/add-more-scoreboard-API.patch rename to patches/unapplied/server/add-more-scoreboard-API.patch diff --git a/patches/unapplied/add-number-format-api.patch b/patches/unapplied/server/add-number-format-api.patch similarity index 100% rename from patches/unapplied/add-number-format-api.patch rename to patches/unapplied/server/add-number-format-api.patch diff --git a/patches/unapplied/add-per-world-spawn-limits.patch b/patches/unapplied/server/add-per-world-spawn-limits.patch similarity index 100% rename from patches/unapplied/add-per-world-spawn-limits.patch rename to patches/unapplied/server/add-per-world-spawn-limits.patch diff --git a/patches/unapplied/added-option-to-disable-pathfinding-updates-on-block.patch b/patches/unapplied/server/added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from patches/unapplied/added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/unapplied/server/added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/patches/unapplied/check-global-player-list-where-appropriate.patch b/patches/unapplied/server/check-global-player-list-where-appropriate.patch similarity index 100% rename from patches/unapplied/check-global-player-list-where-appropriate.patch rename to patches/unapplied/server/check-global-player-list-where-appropriate.patch diff --git a/patches/unapplied/check-if-itemstack-is-stackable-first.patch b/patches/unapplied/server/check-if-itemstack-is-stackable-first.patch similarity index 100% rename from patches/unapplied/check-if-itemstack-is-stackable-first.patch rename to patches/unapplied/server/check-if-itemstack-is-stackable-first.patch diff --git a/patches/unapplied/config-for-disabling-entity-tag-tags.patch b/patches/unapplied/server/config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/unapplied/config-for-disabling-entity-tag-tags.patch rename to patches/unapplied/server/config-for-disabling-entity-tag-tags.patch diff --git a/patches/unapplied/disable-forced-empty-world-ticks.patch b/patches/unapplied/server/disable-forced-empty-world-ticks.patch similarity index 100% rename from patches/unapplied/disable-forced-empty-world-ticks.patch rename to patches/unapplied/server/disable-forced-empty-world-ticks.patch diff --git a/patches/unapplied/don-t-attempt-to-teleport-dead-entities.patch b/patches/unapplied/server/don-t-attempt-to-teleport-dead-entities.patch similarity index 100% rename from patches/unapplied/don-t-attempt-to-teleport-dead-entities.patch rename to patches/unapplied/server/don-t-attempt-to-teleport-dead-entities.patch diff --git a/patches/unapplied/ensure-reset-EnderDragon-boss-event-name.patch b/patches/unapplied/server/ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/unapplied/ensure-reset-EnderDragon-boss-event-name.patch rename to patches/unapplied/server/ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/unapplied/ensureServerConversions-API.patch b/patches/unapplied/server/ensureServerConversions-API.patch similarity index 100% rename from patches/unapplied/ensureServerConversions-API.patch rename to patches/unapplied/server/ensureServerConversions-API.patch diff --git a/patches/unapplied/fix-Instruments.patch b/patches/unapplied/server/fix-Instruments.patch similarity index 100% rename from patches/unapplied/fix-Instruments.patch rename to patches/unapplied/server/fix-Instruments.patch diff --git a/patches/unapplied/fix-Jigsaw-block-kicking-user.patch b/patches/unapplied/server/fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/unapplied/fix-Jigsaw-block-kicking-user.patch rename to patches/unapplied/server/fix-Jigsaw-block-kicking-user.patch diff --git a/patches/unapplied/fix-MapLike-spam-for-missing-key-selector.patch b/patches/unapplied/server/fix-MapLike-spam-for-missing-key-selector.patch similarity index 100% rename from patches/unapplied/fix-MapLike-spam-for-missing-key-selector.patch rename to patches/unapplied/server/fix-MapLike-spam-for-missing-key-selector.patch diff --git a/patches/unapplied/fix-PigZombieAngerEvent-cancellation.patch b/patches/unapplied/server/fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/unapplied/fix-PigZombieAngerEvent-cancellation.patch rename to patches/unapplied/server/fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/unapplied/fix-PlayerItemHeldEvent-firing-twice.patch b/patches/unapplied/server/fix-PlayerItemHeldEvent-firing-twice.patch similarity index 100% rename from patches/unapplied/fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/unapplied/server/fix-PlayerItemHeldEvent-firing-twice.patch diff --git a/patches/unapplied/fix-converting-txt-to-json-file.patch b/patches/unapplied/server/fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/unapplied/fix-converting-txt-to-json-file.patch rename to patches/unapplied/server/fix-converting-txt-to-json-file.patch diff --git a/patches/unapplied/fix-dead-slime-setSize-invincibility.patch b/patches/unapplied/server/fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/unapplied/fix-dead-slime-setSize-invincibility.patch rename to patches/unapplied/server/fix-dead-slime-setSize-invincibility.patch diff --git a/patches/unapplied/fix-entity-vehicle-collision-event-not-called.patch b/patches/unapplied/server/fix-entity-vehicle-collision-event-not-called.patch similarity index 100% rename from patches/unapplied/fix-entity-vehicle-collision-event-not-called.patch rename to patches/unapplied/server/fix-entity-vehicle-collision-event-not-called.patch diff --git a/patches/unapplied/fix-horse-inventories.patch b/patches/unapplied/server/fix-horse-inventories.patch similarity index 100% rename from patches/unapplied/fix-horse-inventories.patch rename to patches/unapplied/server/fix-horse-inventories.patch diff --git a/patches/unapplied/fix-item-meta-for-tadpole-buckets.patch b/patches/unapplied/server/fix-item-meta-for-tadpole-buckets.patch similarity index 100% rename from patches/unapplied/fix-item-meta-for-tadpole-buckets.patch rename to patches/unapplied/server/fix-item-meta-for-tadpole-buckets.patch diff --git a/patches/unapplied/fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/unapplied/server/fix-player-loottables-running-when-mob-loot-gamerule.patch similarity index 100% rename from patches/unapplied/fix-player-loottables-running-when-mob-loot-gamerule.patch rename to patches/unapplied/server/fix-player-loottables-running-when-mob-loot-gamerule.patch diff --git a/patches/unapplied/fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/unapplied/server/fix-powder-snow-cauldrons-not-turning-to-water.patch similarity index 100% rename from patches/unapplied/fix-powder-snow-cauldrons-not-turning-to-water.patch rename to patches/unapplied/server/fix-powder-snow-cauldrons-not-turning-to-water.patch diff --git a/patches/unapplied/fix-various-menus-with-empty-level-accesses.patch b/patches/unapplied/server/fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/unapplied/fix-various-menus-with-empty-level-accesses.patch rename to patches/unapplied/server/fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/unapplied/force-entity-dismount-during-teleportation.patch b/patches/unapplied/server/force-entity-dismount-during-teleportation.patch similarity index 100% rename from patches/unapplied/force-entity-dismount-during-teleportation.patch rename to patches/unapplied/server/force-entity-dismount-during-teleportation.patch diff --git a/patches/unapplied/forced-whitelist-use-configurable-kick-message.patch b/patches/unapplied/server/forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/unapplied/forced-whitelist-use-configurable-kick-message.patch rename to patches/unapplied/server/forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/unapplied/getPlayerUniqueId-API.patch b/patches/unapplied/server/getPlayerUniqueId-API.patch similarity index 100% rename from patches/unapplied/getPlayerUniqueId-API.patch rename to patches/unapplied/server/getPlayerUniqueId-API.patch diff --git a/patches/unapplied/handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/unapplied/server/handle-NaN-health-absorb-values-and-repair-bad-data.patch similarity index 100% rename from patches/unapplied/handle-NaN-health-absorb-values-and-repair-bad-data.patch rename to patches/unapplied/server/handle-NaN-health-absorb-values-and-repair-bad-data.patch diff --git a/patches/unapplied/handle-ServerboundKeepAlivePacket-async.patch b/patches/unapplied/server/handle-ServerboundKeepAlivePacket-async.patch similarity index 100% rename from patches/unapplied/handle-ServerboundKeepAlivePacket-async.patch rename to patches/unapplied/server/handle-ServerboundKeepAlivePacket-async.patch diff --git a/patches/unapplied/improve-BanList-types.patch b/patches/unapplied/server/improve-BanList-types.patch similarity index 100% rename from patches/unapplied/improve-BanList-types.patch rename to patches/unapplied/server/improve-BanList-types.patch diff --git a/patches/unapplied/improve-checking-handled-tags-in-itemmeta.patch b/patches/unapplied/server/improve-checking-handled-tags-in-itemmeta.patch similarity index 100% rename from patches/unapplied/improve-checking-handled-tags-in-itemmeta.patch rename to patches/unapplied/server/improve-checking-handled-tags-in-itemmeta.patch diff --git a/patches/unapplied/living-entity-allow-attribute-registration.patch b/patches/unapplied/server/living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/unapplied/living-entity-allow-attribute-registration.patch rename to patches/unapplied/server/living-entity-allow-attribute-registration.patch diff --git a/patches/unapplied/misc-debugging-dumps.patch b/patches/unapplied/server/misc-debugging-dumps.patch similarity index 100% rename from patches/unapplied/misc-debugging-dumps.patch rename to patches/unapplied/server/misc-debugging-dumps.patch diff --git a/patches/unapplied/offset-item-frame-ticking.patch b/patches/unapplied/server/offset-item-frame-ticking.patch similarity index 100% rename from patches/unapplied/offset-item-frame-ticking.patch rename to patches/unapplied/server/offset-item-frame-ticking.patch diff --git a/patches/unapplied/optimize-dirt-and-snow-spreading.patch b/patches/unapplied/server/optimize-dirt-and-snow-spreading.patch similarity index 100% rename from patches/unapplied/optimize-dirt-and-snow-spreading.patch rename to patches/unapplied/server/optimize-dirt-and-snow-spreading.patch diff --git a/patches/unapplied/prevent-unintended-light-block-manipulation.patch b/patches/unapplied/server/prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/unapplied/prevent-unintended-light-block-manipulation.patch rename to patches/unapplied/server/prevent-unintended-light-block-manipulation.patch diff --git a/patches/unapplied/provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/unapplied/server/provide-a-configurable-option-to-disable-creeper-lin.patch similarity index 100% rename from patches/unapplied/provide-a-configurable-option-to-disable-creeper-lin.patch rename to patches/unapplied/server/provide-a-configurable-option-to-disable-creeper-lin.patch diff --git a/patches/unapplied/remove-null-possibility-for-getServer-singleton.patch b/patches/unapplied/server/remove-null-possibility-for-getServer-singleton.patch similarity index 100% rename from patches/unapplied/remove-null-possibility-for-getServer-singleton.patch rename to patches/unapplied/server/remove-null-possibility-for-getServer-singleton.patch diff --git a/patches/unapplied/revert-serverside-behavior-of-keepalives.patch b/patches/unapplied/server/revert-serverside-behavior-of-keepalives.patch similarity index 100% rename from patches/unapplied/revert-serverside-behavior-of-keepalives.patch rename to patches/unapplied/server/revert-serverside-behavior-of-keepalives.patch diff --git a/patches/unapplied/use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/unapplied/server/use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 100% rename from patches/unapplied/use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/unapplied/server/use-BlockFormEvent-for-mud-converting-into-clay.patch diff --git a/patches/unapplied/use-CB-BlockState-implementations-for-captured-block.patch b/patches/unapplied/server/use-CB-BlockState-implementations-for-captured-block.patch similarity index 100% rename from patches/unapplied/use-CB-BlockState-implementations-for-captured-block.patch rename to patches/unapplied/server/use-CB-BlockState-implementations-for-captured-block.patch diff --git a/todo.txt b/todo.txt new file mode 100644 index 0000000000..8cb87a4cf7 --- /dev/null +++ b/todo.txt @@ -0,0 +1 @@ +MCUTILS: look at chunkmap changes around line 555. I removed our changes because I wasn't sure what changed, needs to be looked at!