diff --git a/README.md b/README.md index 14b8aa097e..f11287dc07 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ How To (Plugin Developers) io.papermc.paper paper-api - 1.20.4-R0.1-SNAPSHOT + 1.20.5-R0.1-SNAPSHOT provided ``` @@ -53,17 +53,17 @@ repositories { } dependencies { - compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT") + compileOnly("io.papermc.paper:paper-api:1.20.5-R0.1-SNAPSHOT") } java { - toolchain.languageVersion.set(JavaLanguageVersion.of(17)) + toolchain.languageVersion.set(JavaLanguageVersion.of(21)) } ``` How To (Compiling Jar From Source) ------ -To compile Paper, you need JDK 17 and an internet connection. +To compile Paper, you need JDK 21 and an internet connection. Clone this repo, run `./gradlew applyPatches`, then `./gradlew createReobfBundlerJar` from your terminal. You can find the compiled jar in the project root's `build/libs` directory. diff --git a/build.gradle.kts b/build.gradle.kts index 73ac5cedc6..803c1d07c8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,7 +20,7 @@ allprojects { java { toolchain { - languageVersion = JavaLanguageVersion.of(17) + languageVersion = JavaLanguageVersion.of(21) } } } @@ -30,7 +30,7 @@ val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/" subprojects { tasks.withType { options.encoding = Charsets.UTF_8.name() - options.release = 17 + options.release = 21 } tasks.withType { options.encoding = Charsets.UTF_8.name() @@ -67,10 +67,10 @@ repositories { } dependencies { - paramMappings("net.fabricmc:yarn:1.20.4+build.1:mergedv2") + paramMappings("net.fabricmc:yarn:1.20.5+build.1:mergedv2") remapper("net.fabricmc:tiny-remapper:0.10.1:fat") decompiler("org.vineflower:vineflower:1.10.1") - spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.6") + spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.12") paperclip("io.papermc:paperclip:3.0.3") } diff --git a/gradle.properties b/gradle.properties index 794f7c1540..06573bcbf9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ group=io.papermc.paper -version=1.20.4-R0.1-SNAPSHOT -mcVersion=1.20.4 +version=1.20.5-R0.1-SNAPSHOT +mcVersion=1.20.5 # Set to true while updating Minecraft version -updatingMinecraft=false +updatingMinecraft=true org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/api/Add-EquipmentSlot-convenience-methods.patch b/patches/api/Add-EquipmentSlot-convenience-methods.patch index e7df2449eb..8cffd7d3c9 100644 --- a/patches/api/Add-EquipmentSlot-convenience-methods.patch +++ b/patches/api/Add-EquipmentSlot-convenience-methods.patch @@ -9,11 +9,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/org/bukkit/inventory/EquipmentSlot.java +++ b/src/main/java/org/bukkit/inventory/EquipmentSlot.java @@ -0,0 +0,0 @@ public enum EquipmentSlot { - LEGS, - CHEST, - HEAD + public EquipmentSlotGroup getGroup() { + return group; + } + // Paper start -+ ; + /** + * Checks whether this equipment slot is a hand: + * either {@link #HAND} or {@link #OFF_HAND} @@ -28,12 +27,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + * Checks whether this equipment slot + * is one of the armor slots: + * {@link #HEAD}, {@link #CHEST}, -+ * {@link #LEGS}, or {@link #FEET} ++ * {@link #LEGS}, {@link #FEET}, or {@link #BODY} + * + * @return whether this is an armor slot + */ + public boolean isArmor() { -+ return this == HEAD || this == CHEST || this == LEGS || this == FEET; ++ return this == HEAD || this == CHEST || this == LEGS || this == FEET || this == BODY; + } + // Paper end } diff --git a/patches/api/Add-GameEvent-tags.patch b/patches/api/Add-GameEvent-tags.patch index 89c9c894f1..afe36d39a9 100644 --- a/patches/api/Add-GameEvent-tags.patch +++ b/patches/api/Add-GameEvent-tags.patch @@ -10,7 +10,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +++ b/src/main/java/org/bukkit/Tag.java @@ -0,0 +0,0 @@ public interface Tag extends Keyed { */ - Tag ENTITY_TYPES_CAN_TURN_IN_BOATS = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("can_turn_in_boats"), EntityType.class); + Tag ENTITY_TYPES_REDIRECTABLE_PROJECTILE = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("redirectable_projectile"), EntityType.class); + // Paper start + String REGISTRY_GAME_EVENTS = "game_events"; diff --git a/patches/api/Add-methods-to-get-translation-keys.patch b/patches/api/Add-methods-to-get-translation-keys.patch index 12386bc8c0..451778d9df 100644 --- a/patches/api/Add-methods-to-get-translation-keys.patch +++ b/patches/api/Add-methods-to-get-translation-keys.patch @@ -195,8 +195,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 -public abstract class MusicInstrument implements Keyed { +public abstract class MusicInstrument implements Keyed, net.kyori.adventure.translation.Translatable { // Paper - translation keys - public static final MusicInstrument PONDER = getInstrument("ponder_goat_horn"); - public static final MusicInstrument SING = getInstrument("sing_goat_horn"); + public static final MusicInstrument PONDER_GOAT_HORN = getInstrument("ponder_goat_horn"); + public static final MusicInstrument SING_GOAT_HORN = getInstrument("sing_goat_horn"); @@ -0,0 +0,0 @@ public abstract class MusicInstrument implements Keyed { return instrument; diff --git a/patches/api/Add-missing-effects.patch b/patches/api/Add-missing-effects.patch index ec3e826519..6b951b3683 100644 --- a/patches/api/Add-missing-effects.patch +++ b/patches/api/Add-missing-effects.patch @@ -20,11 +20,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + * Visual effect of a splash potion breaking. Needs color data value as * additional info. */ -- POTION_BREAK(2002, Type.VISUAL, Potion.class), -+ POTION_BREAK(2002, Type.VISUAL, Color.class, Potion.class), // Paper - color is correct - /** - * Visual effect of an instant splash potion breaking. Needs color data - * value as additional info. + POTION_BREAK(2002, Type.VISUAL, Color.class), @@ -0,0 +0,0 @@ public enum Effect { * block. */ diff --git a/patches/api/Add-more-fields-to-AsyncPreLoginEvent.patch b/patches/api/Add-more-fields-to-AsyncPreLoginEvent.patch index e7d053079f..b78e0c3fd8 100644 --- a/patches/api/Add-more-fields-to-AsyncPreLoginEvent.patch +++ b/patches/api/Add-more-fields-to-AsyncPreLoginEvent.patch @@ -10,15 +10,6 @@ diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java -@@ -0,0 +0,0 @@ package org.bukkit.event.player; - - import java.net.InetAddress; - import java.util.UUID; -+import com.destroystokyo.paper.profile.PlayerProfile; -+import org.bukkit.Bukkit; - import org.bukkit.event.Event; - import org.bukkit.event.HandlerList; - import org.jetbrains.annotations.NotNull; @@ -0,0 +0,0 @@ public class AsyncPlayerPreLoginEvent extends Event { private static final HandlerList handlers = new HandlerList(); private Result result; @@ -26,31 +17,33 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - private final String name; private final InetAddress ipAddress; - private final UUID uniqueId; -+ private PlayerProfile profile; // Paper ++ private com.destroystokyo.paper.profile.PlayerProfile profile; // Paper + private final InetAddress rawAddress; // Paper + private final String hostname; // Paper + private final boolean transferred; @Deprecated - public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress) { @@ -0,0 +0,0 @@ public class AsyncPlayerPreLoginEvent extends Event { } - public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId) { + public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId, boolean transferred) { + // Paper start -+ this(name, ipAddress, uniqueId, Bukkit.createProfile(uniqueId, name)); ++ this(name, ipAddress, uniqueId, transferred, org.bukkit.Bukkit.createProfile(uniqueId, name)); + } + + @Deprecated(forRemoval = true) -+ public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile) { -+ this(name, ipAddress, ipAddress, uniqueId, profile); ++ public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId, boolean transferred, @NotNull com.destroystokyo.paper.profile.PlayerProfile profile) { ++ this(name, ipAddress, ipAddress, uniqueId, transferred, profile); + } + + @Deprecated(forRemoval = true) -+ public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final InetAddress rawAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile) { -+ this(name, ipAddress, rawAddress, uniqueId, profile, ""); ++ public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final InetAddress rawAddress, @NotNull final UUID uniqueId, boolean transferred, @NotNull com.destroystokyo.paper.profile.PlayerProfile profile) { ++ this(name, ipAddress, rawAddress, uniqueId, transferred, profile, ""); + } + -+ public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final InetAddress rawAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile, @NotNull String hostname) { ++ @org.jetbrains.annotations.ApiStatus.Internal ++ public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final InetAddress rawAddress, @NotNull final UUID uniqueId, boolean transferred, @NotNull com.destroystokyo.paper.profile.PlayerProfile profile, @NotNull String hostname) { ++ // Paper end super(true); this.result = Result.ALLOWED; this.message = net.kyori.adventure.text.Component.empty(); // Paper @@ -58,12 +51,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + this.profile = profile; this.ipAddress = ipAddress; - this.uniqueId = uniqueId; -+ this.rawAddress = rawAddress; -+ this.hostname = hostname; -+ // Paper end ++ this.rawAddress = rawAddress; // Paper ++ this.hostname = hostname; // Paper + this.transferred = transferred; } - /** @@ -0,0 +0,0 @@ public class AsyncPlayerPreLoginEvent extends Event { */ @NotNull @@ -87,7 +79,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + * @return The Profile + */ + @NotNull -+ public PlayerProfile getPlayerProfile() { ++ public com.destroystokyo.paper.profile.PlayerProfile getPlayerProfile() { + return profile; + } + @@ -95,7 +87,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + * Changes the PlayerProfile the player will login as + * @param profile The profile to use + */ -+ public void setPlayerProfile(@NotNull PlayerProfile profile) { ++ public void setPlayerProfile(@NotNull com.destroystokyo.paper.profile.PlayerProfile profile) { + this.profile = profile; + } + @@ -120,6 +112,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } + // Paper end + - @NotNull - @Override - public HandlerList getHandlers() { + /** + * Gets if this connection has been transferred from another server. + * diff --git a/patches/api/Adventure.patch b/patches/api/Adventure.patch index fa47823c6a..6bf20e898e 100644 --- a/patches/api/Adventure.patch +++ b/patches/api/Adventure.patch @@ -1771,13 +1771,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 return false; @@ -0,0 +0,0 @@ public abstract class Command { - * command - * - * @return Permission check failed message -+ * @deprecated use {@link #permissionMessage()} - */ + @Deprecated @Nullable -+ @Deprecated // Paper public String getPermissionMessage() { - return permissionMessage; + return net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().serializeOrNull(permissionMessage); // Paper @@ -1785,13 +1780,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** @@ -0,0 +0,0 @@ public abstract class Command { - * @param permissionMessage new permission message, null to indicate - * default message, or an empty string to indicate no message - * @return this command object, for chaining -+ * @deprecated use {@link #permissionMessage(net.kyori.adventure.text.Component)} - */ + @Deprecated @NotNull -+ @Deprecated // Paper public Command setPermissionMessage(@Nullable String permissionMessage) { - this.permissionMessage = permissionMessage; + this.permissionMessage = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserializeOrNull(permissionMessage); // Paper @@ -1807,7 +1797,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + * Gets the permission message. + * + * @return the permission message ++ * @deprecated permission messages have not worked for player-executed ++ * commands since 1.13 as clients without permission to execute a command ++ * are unaware of its existence and therefore will not send an unknown ++ * command execution to the server. This message will only ever be shown to ++ * consoles or when this command is executed with ++ * {@link Bukkit#dispatchCommand(CommandSender, String)}. + */ ++ @Deprecated + public net.kyori.adventure.text.@Nullable Component permissionMessage() { + return this.permissionMessage; + } @@ -1816,7 +1813,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + * Sets the permission message. + * + * @param permissionMessage the permission message ++ * @deprecated permission messages have not worked for player-executed ++ * commands since 1.13 as clients without permission to execute a command ++ * are unaware of its existence and therefore will not send an unknown ++ * command execution to the server. This message will only ever be shown to ++ * consoles or when this command is executed with ++ * {@link Bukkit#dispatchCommand(CommandSender, String)}. + */ ++ @Deprecated + public void permissionMessage(net.kyori.adventure.text.@Nullable Component permissionMessage) { + this.permissionMessage = permissionMessage; + } @@ -3354,7 +3358,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 private final InetAddress ipAddress; private final UUID uniqueId; @@ -0,0 +0,0 @@ public class AsyncPlayerPreLoginEvent extends Event { - public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId) { + public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId, boolean transferred) { super(true); this.result = Result.ALLOWED; - this.message = ""; @@ -4357,187 +4361,7 @@ diff --git a/src/main/java/org/bukkit/inventory/meta/BookMeta.java b/src/main/ja index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/inventory/meta/BookMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/BookMeta.java -@@ -0,0 +0,0 @@ import org.jetbrains.annotations.Nullable; - * Represents a book ({@link Material#WRITABLE_BOOK} or {@link - * Material#WRITTEN_BOOK}) that can have a title, an author, and pages. - */ --public interface BookMeta extends ItemMeta { -+public interface BookMeta extends ItemMeta, net.kyori.adventure.inventory.Book { // Paper - - /** - * Represents the generation (or level of copying) of a written book -@@ -0,0 +0,0 @@ public interface BookMeta extends ItemMeta { - */ - boolean hasPages(); - -+ // Paper start -+ /** -+ * Gets the title of the book. -+ *

-+ * Plugins should check that hasTitle() returns true before calling this -+ * method. -+ * -+ * @return the title of the book -+ */ -+ @Override -+ net.kyori.adventure.text.@Nullable Component title(); -+ -+ /** -+ * Sets the title of the book. -+ *

-+ * Limited to 32 characters. Removes title when given null. -+ * -+ * @param title the title to set -+ * @return the same {@link BookMeta} instance -+ */ -+ @org.jetbrains.annotations.Contract(value = "_ -> this", pure = false) -+ @Override -+ @NotNull BookMeta title(net.kyori.adventure.text.@Nullable Component title); -+ -+ /** -+ * Gets the author of the book. -+ *

-+ * Plugins should check that hasAuthor() returns true before calling this -+ * method. -+ * -+ * @return the author of the book -+ */ -+ @Override -+ net.kyori.adventure.text.@Nullable Component author(); -+ -+ /** -+ * Sets the author of the book. Removes author when given null. -+ * -+ * @param author the author to set -+ * @return the same {@link BookMeta} instance -+ */ -+ @org.jetbrains.annotations.Contract(value = "_ -> this", pure = false) -+ @Override -+ @NotNull BookMeta author(net.kyori.adventure.text.@Nullable Component author); -+ -+ /** -+ * Gets the specified page in the book. The page must exist. -+ *

-+ * Pages are 1-indexed. -+ * -+ * @param page the page number to get, in range [1, getPageCount()] -+ * @return the page from the book -+ */ -+ net.kyori.adventure.text.@NotNull Component page(int page); -+ -+ /** -+ * Sets the specified page in the book. Pages of the book must be -+ * contiguous. -+ *

-+ * The data can be up to 1024 characters in length, additional characters -+ * are truncated. -+ *

-+ * Pages are 1-indexed. -+ * -+ * @param page the page number to set, in range [1, getPageCount()] -+ * @param data the data to set for that page -+ */ -+ void page(int page, net.kyori.adventure.text.@NotNull Component data); -+ -+ /** -+ * Adds new pages to the end of the book. Up to a maximum of 100 pages with -+ * 1024 characters per page. -+ * -+ * @param pages A list of strings, each being a page -+ */ -+ void addPages(net.kyori.adventure.text.@NotNull Component @NotNull ... pages); -+ -+ interface BookMetaBuilder extends Builder { -+ -+ @Override -+ @NotNull BookMetaBuilder title(net.kyori.adventure.text.@Nullable Component title); -+ -+ @Override -+ @NotNull BookMetaBuilder author(net.kyori.adventure.text.@Nullable Component author); -+ -+ @Override -+ @NotNull BookMetaBuilder addPage(net.kyori.adventure.text.@NotNull Component page); -+ -+ @Override -+ @NotNull BookMetaBuilder pages(net.kyori.adventure.text.@NotNull Component @NotNull ... pages); -+ -+ @Override -+ @NotNull BookMetaBuilder pages(java.util.@NotNull Collection pages); -+ -+ @Override -+ @NotNull BookMeta build(); -+ } -+ -+ @Override -+ @NotNull BookMetaBuilder toBuilder(); -+ -+ // Paper end -+ - /** - * Gets the specified page in the book. The given page must exist. - *

-@@ -0,0 +0,0 @@ public interface BookMeta extends ItemMeta { - * - * @param page the page number to get, in range [1, getPageCount()] - * @return the page from the book -+ * @deprecated in favour of {@link #page(int)} - */ - @NotNull -+ @Deprecated // Paper - String getPage(int page); - - /** -@@ -0,0 +0,0 @@ public interface BookMeta extends ItemMeta { - * - * @param page the page number to set, in range [1, getPageCount()] - * @param data the data to set for that page -+ * @deprecated in favour of {@link #page(int, net.kyori.adventure.text.Component)} - */ -+ @Deprecated // Paper - void setPage(int page, @NotNull String data); - - /** - * Gets all the pages in the book. - * - * @return list of all the pages in the book -+ * @deprecated in favour of {@link #pages()} - */ - @NotNull -+ @Deprecated // Paper - List getPages(); - - /** -@@ -0,0 +0,0 @@ public interface BookMeta extends ItemMeta { - * pages. Maximum 100 pages with 1024 characters per page. - * - * @param pages A list of pages to set the book to use -+ * @deprecated in favour of {@link #pages(List)} - */ -+ @Deprecated // Paper - void setPages(@NotNull List pages); - - /** -@@ -0,0 +0,0 @@ public interface BookMeta extends ItemMeta { - * pages. Maximum 100 pages with 1024 characters per page. - * - * @param pages A list of strings, each being a page -+ * @deprecated in favour of {@link #pages(net.kyori.adventure.text.Component...)} - */ -+ @Deprecated // Paper - void setPages(@NotNull String... pages); - - /** -@@ -0,0 +0,0 @@ public interface BookMeta extends ItemMeta { - * 1024 characters per page. - * - * @param pages A list of strings, each being a page -+ * @deprecated in favour of {@link #addPages(net.kyori.adventure.text.Component...)} - */ -+ @Deprecated // Paper - void addPage(@NotNull String... pages); - - /** -@@ -0,0 +0,0 @@ public interface BookMeta extends ItemMeta { +@@ -0,0 +0,0 @@ public interface BookMeta extends WritableBookMeta { * * @param page the page number to get * @return the page from the book @@ -4548,7 +4372,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 public BaseComponent[] getPage(int page) { throw new UnsupportedOperationException("Not supported yet."); } -@@ -0,0 +0,0 @@ public interface BookMeta extends ItemMeta { +@@ -0,0 +0,0 @@ public interface BookMeta extends WritableBookMeta { * * @param page the page number to set * @param data the data to set for that page @@ -4558,7 +4382,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 public void setPage(int page, @Nullable BaseComponent... data) { throw new UnsupportedOperationException("Not supported yet."); } -@@ -0,0 +0,0 @@ public interface BookMeta extends ItemMeta { +@@ -0,0 +0,0 @@ public interface BookMeta extends WritableBookMeta { * Gets all the pages in the book. * * @return list of all the pages in the book @@ -4569,7 +4393,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 public List getPages() { throw new UnsupportedOperationException("Not supported yet."); } -@@ -0,0 +0,0 @@ public interface BookMeta extends ItemMeta { +@@ -0,0 +0,0 @@ public interface BookMeta extends WritableBookMeta { * pages. Maximum 50 pages with 256 characters per page. * * @param pages A list of pages to set the book to use @@ -4579,7 +4403,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 public void setPages(@NotNull List pages) { throw new UnsupportedOperationException("Not supported yet."); } -@@ -0,0 +0,0 @@ public interface BookMeta extends ItemMeta { +@@ -0,0 +0,0 @@ public interface BookMeta extends WritableBookMeta { * pages. Maximum 50 pages with 256 characters per page. * * @param pages A list of component arrays, each being a page @@ -4589,7 +4413,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 public void setPages(@NotNull BaseComponent[]... pages) { throw new UnsupportedOperationException("Not supported yet."); } -@@ -0,0 +0,0 @@ public interface BookMeta extends ItemMeta { +@@ -0,0 +0,0 @@ public interface BookMeta extends WritableBookMeta { * with 256 characters per page. * * @param pages A list of component arrays, each being a page @@ -4692,6 +4516,189 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + @Deprecated // Paper void setLore(@Nullable List lore); + /** +diff --git a/src/main/java/org/bukkit/inventory/meta/WritableBookMeta.java b/src/main/java/org/bukkit/inventory/meta/WritableBookMeta.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/org/bukkit/inventory/meta/WritableBookMeta.java ++++ b/src/main/java/org/bukkit/inventory/meta/WritableBookMeta.java +@@ -0,0 +0,0 @@ import org.jetbrains.annotations.NotNull; + * Represents a book ({@link Material#WRITABLE_BOOK} or {@link + * Material#WRITTEN_BOOK}) that can have pages. + */ +-public interface WritableBookMeta extends ItemMeta { ++public interface WritableBookMeta extends ItemMeta, net.kyori.adventure.inventory.Book { // Paper + + /** + * Checks for the existence of pages in the book. +@@ -0,0 +0,0 @@ public interface WritableBookMeta extends ItemMeta { + */ + boolean hasPages(); + ++ // Paper start ++ /** ++ * Gets the title of the book. ++ *

++ * Plugins should check that hasTitle() returns true before calling this ++ * method. ++ * ++ * @return the title of the book ++ */ ++ @Override ++ net.kyori.adventure.text.@org.jetbrains.annotations.Nullable Component title(); ++ ++ /** ++ * Sets the title of the book. ++ *

++ * Limited to 32 characters. Removes title when given null. ++ * ++ * @param title the title to set ++ * @return the same {@link BookMeta} instance ++ */ ++ @org.jetbrains.annotations.Contract(value = "_ -> this", pure = false) ++ @Override ++ @NotNull BookMeta title(net.kyori.adventure.text.@org.jetbrains.annotations.Nullable Component title); ++ ++ /** ++ * Gets the author of the book. ++ *

++ * Plugins should check that hasAuthor() returns true before calling this ++ * method. ++ * ++ * @return the author of the book ++ */ ++ @Override ++ net.kyori.adventure.text.@org.jetbrains.annotations.Nullable Component author(); ++ ++ /** ++ * Sets the author of the book. Removes author when given null. ++ * ++ * @param author the author to set ++ * @return the same {@link BookMeta} instance ++ */ ++ @org.jetbrains.annotations.Contract(value = "_ -> this", pure = false) ++ @Override ++ @NotNull BookMeta author(net.kyori.adventure.text.@org.jetbrains.annotations.Nullable Component author); ++ ++ /** ++ * Gets the specified page in the book. The page must exist. ++ *

++ * Pages are 1-indexed. ++ * ++ * @param page the page number to get, in range [1, getPageCount()] ++ * @return the page from the book ++ */ ++ net.kyori.adventure.text.@NotNull Component page(int page); ++ ++ /** ++ * Sets the specified page in the book. Pages of the book must be ++ * contiguous. ++ *

++ * The data can be up to 1024 characters in length, additional characters ++ * are truncated. ++ *

++ * Pages are 1-indexed. ++ * ++ * @param page the page number to set, in range [1, getPageCount()] ++ * @param data the data to set for that page ++ */ ++ void page(int page, net.kyori.adventure.text.@NotNull Component data); ++ ++ /** ++ * Adds new pages to the end of the book. Up to a maximum of 100 pages with ++ * 1024 characters per page. ++ * ++ * @param pages A list of strings, each being a page ++ */ ++ void addPages(net.kyori.adventure.text.@NotNull Component @NotNull ... pages); ++ ++ interface BookMetaBuilder extends net.kyori.adventure.inventory.Book.Builder { ++ ++ @Override ++ @NotNull BookMetaBuilder title(net.kyori.adventure.text.@org.jetbrains.annotations.Nullable Component title); ++ ++ @Override ++ @NotNull BookMetaBuilder author(net.kyori.adventure.text.@org.jetbrains.annotations.Nullable Component author); ++ ++ @Override ++ @NotNull BookMetaBuilder addPage(net.kyori.adventure.text.@NotNull Component page); ++ ++ @Override ++ @NotNull BookMetaBuilder pages(net.kyori.adventure.text.@NotNull Component @NotNull ... pages); ++ ++ @Override ++ @NotNull BookMetaBuilder pages(java.util.@NotNull Collection pages); ++ ++ @Override ++ @NotNull BookMeta build(); ++ } ++ ++ @Override ++ @NotNull BookMetaBuilder toBuilder(); ++ // Paper end ++ + /** + * Gets the specified page in the book. The given page must exist. + *

+@@ -0,0 +0,0 @@ public interface WritableBookMeta extends ItemMeta { + * + * @param page the page number to get, in range [1, getPageCount()] + * @return the page from the book ++ * @deprecated in favour of {@link #page(int)} + */ + @NotNull ++ @Deprecated // Paper + String getPage(int page); + + /** +@@ -0,0 +0,0 @@ public interface WritableBookMeta extends ItemMeta { + * + * @param page the page number to set, in range [1, getPageCount()] + * @param data the data to set for that page ++ * @deprecated in favour of {@link #page(int, net.kyori.adventure.text.Component)} + */ ++ @Deprecated // Paper + void setPage(int page, @NotNull String data); + + /** + * Gets all the pages in the book. + * + * @return list of all the pages in the book ++ * @deprecated in favour of {@link #pages()} + */ + @NotNull ++ @Deprecated // Paper + List getPages(); + + /** +@@ -0,0 +0,0 @@ public interface WritableBookMeta extends ItemMeta { + * pages. Maximum 100 pages with 1024 characters per page. + * + * @param pages A list of pages to set the book to use ++ * @deprecated in favour of {@link #pages(List)} + */ ++ @Deprecated // Paper + void setPages(@NotNull List pages); + + /** +@@ -0,0 +0,0 @@ public interface WritableBookMeta extends ItemMeta { + * pages. Maximum 100 pages with 1024 characters per page. + * + * @param pages A list of strings, each being a page ++ * @deprecated in favour of {@link #pages(net.kyori.adventure.text.Component...)} + */ ++ @Deprecated // Paper + void setPages(@NotNull String... pages); + + /** +@@ -0,0 +0,0 @@ public interface WritableBookMeta extends ItemMeta { + * 1024 characters per page. + * + * @param pages A list of strings, each being a page ++ * @deprecated in favour of {@link #addPages(net.kyori.adventure.text.Component...)} + */ ++ @Deprecated // Paper + void addPage(@NotNull String... pages); + /** diff --git a/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java b/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 @@ -4724,9 +4731,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java +++ b/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java @@ -0,0 +0,0 @@ public interface TrimPattern extends Keyed, Translatable { - * {@link Material#HOST_ARMOR_TRIM_SMITHING_TEMPLATE}. + * {@link Material#BOLT_ARMOR_TRIM_SMITHING_TEMPLATE}. */ - public static final TrimPattern HOST = Registry.TRIM_PATTERN.get(NamespacedKey.minecraft("host")); + public static final TrimPattern BOLT = Registry.TRIM_PATTERN.get(NamespacedKey.minecraft("bolt")); + + // Paper start - adventure + /** diff --git a/patches/api/Conduit-API.patch b/patches/api/Conduit-API.patch deleted file mode 100644 index 6f73ebdb0b..0000000000 --- a/patches/api/Conduit-API.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Tamion <70228790+notTamion@users.noreply.github.com> -Date: Sat, 27 Jan 2024 20:46:29 +0100 -Subject: [PATCH] Conduit API - - -diff --git a/src/main/java/org/bukkit/block/Conduit.java b/src/main/java/org/bukkit/block/Conduit.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/org/bukkit/block/Conduit.java -+++ b/src/main/java/org/bukkit/block/Conduit.java -@@ -0,0 +0,0 @@ package org.bukkit.block; - /** - * Represents a captured state of a conduit. - */ --public interface Conduit extends TileState { } -+public interface Conduit extends TileState { -+ -+ // Paper start - Conduit API -+ -+ /** -+ * Gets if the conduit is currently active. -+ *

-+ * Requires the conduit to be placed in the world. -+ * -+ * @return if the conduit is active -+ */ -+ boolean isActive(); -+ -+ /** -+ * Gets the range in which the Conduit Power effect gets added to players. -+ *

-+ * Requires the conduit to be placed in the world. -+ * -+ * @return the range -+ */ -+ int getRange(); -+ -+ /** -+ * Gets the current target of the conduit. -+ * -+ * @return the current target -+ */ -+ @org.jetbrains.annotations.Nullable -+ org.bukkit.entity.LivingEntity getTarget(); -+ // Paper end - Conduit API -+} diff --git a/patches/api/Convert-project-to-Gradle.patch b/patches/api/Convert-project-to-Gradle.patch index ffd585cece..ad0b25c885 100644 --- a/patches/api/Convert-project-to-Gradle.patch +++ b/patches/api/Convert-project-to-Gradle.patch @@ -135,7 +135,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.spigotmc - spigot-api -- 1.20.4-R0.1-SNAPSHOT +- 1.20.5-R0.1-SNAPSHOT - jar - - Spigot-API @@ -144,8 +144,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - - true -- 17 -- 17 +- 17 - UTF-8 - - @@ -266,7 +265,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.apache.maven.plugins - maven-compiler-plugin -- 3.11.0 +- 3.13.0 - - - eclipse @@ -277,7 +276,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.codehaus.plexus - plexus-compiler-eclipse -- 2.13.0 +- 2.15.0 - - - diff --git a/patches/api/Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch b/patches/api/Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch deleted file mode 100644 index 3f5d65d932..0000000000 --- a/patches/api/Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Wesley Smith -Date: Fri, 24 Apr 2020 18:30:26 -0400 -Subject: [PATCH] Fix Potion#toItemStack swapping the extended and upgraded - constructor values. - -While the Potion class is deprecated, it is still used in some plugins for cross-version potion handling. This issue has existed for a long time, and has caused many heaches along the way. - -diff --git a/src/main/java/org/bukkit/potion/Potion.java b/src/main/java/org/bukkit/potion/Potion.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/org/bukkit/potion/Potion.java -+++ b/src/main/java/org/bukkit/potion/Potion.java -@@ -0,0 +0,0 @@ public class Potion { - } - ItemStack itemStack = new ItemStack(material, amount); - PotionMeta meta = (PotionMeta) itemStack.getItemMeta(); -- meta.setBasePotionData(new PotionData(type, level == 2, extended)); -+ meta.setBasePotionData(new PotionData(type, extended, level == 2)); // Paper - fix swapped values - itemStack.setItemMeta(meta); - return itemStack; - } diff --git a/patches/api/Fix-Spigot-annotation-mistakes.patch b/patches/api/Fix-Spigot-annotation-mistakes.patch index dd625d8162..c8eb708c6d 100644 --- a/patches/api/Fix-Spigot-annotation-mistakes.patch +++ b/patches/api/Fix-Spigot-annotation-mistakes.patch @@ -452,42 +452,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 public byte getId() { return note; } -diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/org/bukkit/Particle.java -+++ b/src/main/java/org/bukkit/Particle.java -@@ -0,0 +0,0 @@ public enum Particle implements Keyed { - BLOCK_CRACK("block", BlockData.class), - /** - * Uses {@link BlockData} as DataType -+ * @deprecated use {@link #BLOCK_CRACK} - */ -+ @Deprecated // Paper - BLOCK_DUST("block", BlockData.class, false), - WATER_DROP("rain"), - MOB_APPEARANCE("elder_guardian"), -@@ -0,0 +0,0 @@ public enum Particle implements Keyed { - // ----- Legacy Separator ----- - /** - * Uses {@link MaterialData} as DataType -+ * @deprecated {@link MaterialData} is deprecated API - */ -+ @Deprecated // Paper - LEGACY_BLOCK_CRACK(null, MaterialData.class, false), - /** - * Uses {@link MaterialData} as DataType -+ * @deprecated {@link MaterialData} is deprecated API - */ -+ @Deprecated // Paper - LEGACY_BLOCK_DUST(null, MaterialData.class, false), - /** - * Uses {@link MaterialData} as DataType -+ * @deprecated {@link MaterialData} is deprecated API - */ -+ @Deprecated // Paper - LEGACY_FALLING_DUST(null, MaterialData.class, false); - - private final NamespacedKey key; diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/Registry.java @@ -939,32 +903,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 -@Deprecated +@Deprecated(forRemoval = true) // Paper public interface SplashPotion extends ThrownPotion { } -diff --git a/src/main/java/org/bukkit/entity/TextDisplay.java b/src/main/java/org/bukkit/entity/TextDisplay.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/org/bukkit/entity/TextDisplay.java -+++ b/src/main/java/org/bukkit/entity/TextDisplay.java -@@ -0,0 +0,0 @@ public interface TextDisplay extends Display { - * Gets the text background color. - * - * @return the background color -- * @deprecated API subject to change - */ - @Nullable -- @Deprecated -+ // @Deprecated // Paper - is stable API - Color getBackgroundColor(); - - /** - * Sets the text background color. - * - * @param color new background color -- * @deprecated API subject to change - */ -- @Deprecated -+ // @Deprecated // Paper - is stable API - void setBackgroundColor(@Nullable Color color); - - /** diff --git a/src/main/java/org/bukkit/entity/memory/MemoryKey.java b/src/main/java/org/bukkit/entity/memory/MemoryKey.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/entity/memory/MemoryKey.java @@ -1651,32 +1589,28 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 * + * @deprecated Use {@link ItemMeta#displayName()} and check if it is instanceof a {@link net.kyori.adventure.text.TranslatableComponent}. * @return true if this has a localized name + * @deprecated meta no longer exists */ -+ @Deprecated // Paper - Deprecate old localized API - boolean hasLocalizedName(); - - /** @@ -0,0 +0,0 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste * Plugins should check that hasLocalizedName() returns true * before calling this method. * + * @deprecated Use {@link ItemMeta#displayName()} and cast it to a {@link net.kyori.adventure.text.TranslatableComponent}. No longer used by the client. * @return the localized name that is set + * @deprecated meta no longer exists */ + @Deprecated // Paper - Deprecate old localized API @NotNull + @Deprecated(forRemoval = true) String getLocalizedName(); - +@@ -0,0 +0,0 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste /** * Sets the localized name. * + * @deprecated Use {@link ItemMeta#displayName(Component)} with a {@link net.kyori.adventure.text.TranslatableComponent}. No longer used by the client. * @param name the name to set + * @deprecated meta no longer exists */ -+ @Deprecated // Paper - Deprecate old localized API - void setLocalizedName(@Nullable String name); - - /** diff --git a/src/main/java/org/bukkit/inventory/meta/MapMeta.java b/src/main/java/org/bukkit/inventory/meta/MapMeta.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/inventory/meta/MapMeta.java diff --git a/patches/api/More-PotionEffectType-API.patch b/patches/api/More-PotionEffectType-API.patch index c9c48cadb3..464fc89fe7 100644 --- a/patches/api/More-PotionEffectType-API.patch +++ b/patches/api/More-PotionEffectType-API.patch @@ -54,9 +54,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** @@ -0,0 +0,0 @@ public abstract class PotionEffectType implements Keyed, Translatable { - - return from; + public static PotionEffectType[] values() { + return Lists.newArrayList(Registry.EFFECT).toArray(new PotionEffectType[0]); } ++ + // Paper start + /** + * Gets the effect attributes in an immutable map. diff --git a/patches/api/Support-cancellation-supression-of-EntityDismount-Ve.patch b/patches/api/Support-cancellation-supression-of-EntityDismount-Ve.patch index 963b45765d..e9eed5abed 100644 --- a/patches/api/Support-cancellation-supression-of-EntityDismount-Ve.patch +++ b/patches/api/Support-cancellation-supression-of-EntityDismount-Ve.patch @@ -105,47 +105,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @NotNull @Override public HandlerList getHandlers() { -diff --git a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java -+++ b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java -@@ -0,0 +0,0 @@ public class EntityDismountEvent extends EntityEvent implements Cancellable { - private static final HandlerList handlers = new HandlerList(); - private boolean cancelled; - private final Entity dismounted; -+ private final boolean isCancellable; // Paper - - public EntityDismountEvent(@NotNull Entity what, @NotNull Entity dismounted) { -- super(what); -+ // Paper start -+ this(what, dismounted, true); -+ } -+ -+ -+ public EntityDismountEvent(@NotNull Entity what, @NotNull Entity dismounted, boolean isCancellable) { -+ // Paper end -+ super( what ); - this.dismounted = dismounted; -+ this.isCancellable = isCancellable; // Paper - } - - @NotNull -@@ -0,0 +0,0 @@ public class EntityDismountEvent extends EntityEvent implements Cancellable { - - @Override - public void setCancelled(boolean cancel) { -+ // Paper start -+ if (cancel && !isCancellable) { -+ return; -+ } - this.cancelled = cancel; - } - -+ public boolean isCancellable() { -+ return isCancellable; -+ // Paper end -+ } -+ - @NotNull - @Override - public HandlerList getHandlers() { diff --git a/patches/api/Support-components-in-ItemMeta.patch b/patches/api/Support-components-in-ItemMeta.patch index f9fac522fb..8f09547f66 100644 --- a/patches/api/Support-components-in-ItemMeta.patch +++ b/patches/api/Support-components-in-ItemMeta.patch @@ -52,8 +52,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + void setDisplayNameComponent(@Nullable net.md_5.bungee.api.chat.BaseComponent[] component); + // Paper end /** - * Checks for existence of a localized name. - * + * Checks for existence of an item name. + *
@@ -0,0 +0,0 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste @Nullable List getLore(); diff --git a/patches/api/add-missing-Experimental-annotations.patch b/patches/api/add-missing-Experimental-annotations.patch index 2b56a74d02..f91e9213c7 100644 --- a/patches/api/add-missing-Experimental-annotations.patch +++ b/patches/api/add-missing-Experimental-annotations.patch @@ -254,6 +254,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 BEE_SPAWN_EGG(22924), BLAZE_SPAWN_EGG(4759), @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + BOGGED_SPAWN_EGG(12042), + @MinecraftExperimental + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BREEZE_SPAWN_EGG(7580), CAT_SPAWN_EGG(29583), @@ -363,8 +366,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @MinecraftExperimental + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_KEY(12725), - /** - * BlockData: {@link Levelled} + @MinecraftExperimental + OMINOUS_TRIAL_KEY(4986), diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/Particle.java @@ -377,15 +380,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 GUST("gust"), @MinecraftExperimental + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - GUST_EMITTER("gust_emitter"), + SMALL_GUST("small_gust"), @MinecraftExperimental + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - GUST_DUST("gust_dust"), + GUST_EMITTER_LARGE("gust_emitter_large"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + GUST_EMITTER_SMALL("gust_emitter_small"), @MinecraftExperimental + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_SPAWNER_DETECTION("trial_spawner_detection"), - /** - * Uses {@link BlockData} as DataType + @MinecraftExperimental + TRIAL_SPAWNER_DETECTION_OMINOUS("trial_spawner_detection_ominous"), diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/Sound.java @@ -468,15 +474,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 BLOCK_PORTAL_AMBIENT("block.portal.ambient"), BLOCK_PORTAL_TRAVEL("block.portal.travel"), @@ -0,0 +0,0 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa - BLOCK_SWEET_BERRY_BUSH_PICK_BERRIES("block.sweet_berry_bush.pick_berries"), - BLOCK_SWEET_BERRY_BUSH_PLACE("block.sweet_berry_bush.place"), + @MinecraftExperimental + BLOCK_TRIAL_SPAWNER_ABOUT_TO_SPAWN_ITEM("block.trial_spawner.about_to_spawn_item"), @MinecraftExperimental + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_TRIAL_SPAWNER_AMBIENT("block.trial_spawner.ambient"), @MinecraftExperimental + BLOCK_TRIAL_SPAWNER_AMBIENT_CHARGED("block.trial_spawner.ambient_charged"), + @MinecraftExperimental + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_TRIAL_SPAWNER_BREAK("block.trial_spawner.break"), @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + BLOCK_TRIAL_SPAWNER_CHARGE_ACTIVATE("block.trial_spawner.charge_activate"), + @MinecraftExperimental + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_TRIAL_SPAWNER_CLOSE_SHUTTER("block.trial_spawner.close_shutter"), @MinecraftExperimental @@ -498,6 +509,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_TRIAL_SPAWNER_PLACE("block.trial_spawner.place"), @MinecraftExperimental + BLOCK_TRIAL_SPAWNER_SPAWN_ITEM("block.trial_spawner.spawn_item"), + @MinecraftExperimental + BLOCK_TRIAL_SPAWNER_SPAWN_ITEM_BEGIN("block.trial_spawner.spawn_item_begin"), + @MinecraftExperimental + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_TRIAL_SPAWNER_SPAWN_MOB("block.trial_spawner.spawn_mob"), @MinecraftExperimental @@ -529,9 +544,29 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 ENTITY_BOAT_PADDLE_LAND("entity.boat.paddle_land"), ENTITY_BOAT_PADDLE_WATER("entity.boat.paddle_water"), @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + ENTITY_BOGGED_AMBIENT("entity.bogged.ambient"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + ENTITY_BOGGED_DEATH("entity.bogged.death"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + ENTITY_BOGGED_HURT("entity.bogged.hurt"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + ENTITY_BOGGED_SHEAR("entity.bogged.shear"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + ENTITY_BOGGED_STEP("entity.bogged.step"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + ENTITY_BREEZE_CHARGE("entity.breeze.charge"), + @MinecraftExperimental + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_BREEZE_DEATH("entity.breeze.death"), @MinecraftExperimental + ENTITY_BREEZE_DEFLECT("entity.breeze.deflect"), + @MinecraftExperimental + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_BREEZE_HURT("entity.breeze.hurt"), @MinecraftExperimental @@ -555,19 +590,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @MinecraftExperimental + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_BREEZE_SLIDE("entity.breeze.slide"), - ENTITY_CAMEL_AMBIENT("entity.camel.ambient"), - ENTITY_CAMEL_DASH("entity.camel.dash"), -@@ -0,0 +0,0 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa - ENTITY_GENERIC_SPLASH("entity.generic.splash"), - ENTITY_GENERIC_SWIM("entity.generic.swim"), @MinecraftExperimental -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ENTITY_GENERIC_WIND_BURST("entity.generic.wind_burst"), - ENTITY_GHAST_AMBIENT("entity.ghast.ambient"), - ENTITY_GHAST_DEATH("entity.ghast.death"), + ENTITY_BREEZE_WHIRL("entity.breeze.whirl"), @@ -0,0 +0,0 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa - ENTITY_PARROT_HURT("entity.parrot.hurt"), - ENTITY_PARROT_IMITATE_BLAZE("entity.parrot.imitate.blaze"), + @MinecraftExperimental + ENTITY_PARROT_IMITATE_BOGGED("entity.parrot.imitate.bogged"), @MinecraftExperimental + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_PARROT_IMITATE_BREEZE("entity.parrot.imitate.breeze"), @@ -593,22 +620,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +++ b/src/main/java/org/bukkit/Tag.java @@ -0,0 +0,0 @@ public interface Tag extends Keyed { /** - * Vanilla tag representing entities which deflect arrows. + * Vanilla tag representing entities which deflect projectiles. */ + @org.jetbrains.annotations.ApiStatus.Experimental @MinecraftExperimental // Paper - add missing annotation - Tag ENTITY_TYPES_DEFLECTS_ARROWS = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("deflects_arrows"), EntityType.class); + Tag ENTITY_TYPES_DEFLECTS_PROJECTILES = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("deflects_projectiles"), EntityType.class); /** - * Vanilla tag representing entities which deflect tridents. - */ -+ @org.jetbrains.annotations.ApiStatus.Experimental @MinecraftExperimental // Paper - add missing annotation - Tag ENTITY_TYPES_DEFLECTS_TRIDENTS = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("deflects_tridents"), EntityType.class); + * Vanilla tag representing entities which deflect arrows. +@@ -0,0 +0,0 @@ public interface Tag extends Keyed { /** * Vanilla tag representing entities which can turn in boats. */ + @org.jetbrains.annotations.ApiStatus.Experimental @MinecraftExperimental // Paper - add missing annotation Tag ENTITY_TYPES_CAN_TURN_IN_BOATS = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("can_turn_in_boats"), EntityType.class); - - // Paper start + /** + * Vanilla tag representing all entities sensitive to illager enchantments. diff --git a/src/main/java/org/bukkit/generator/structure/Structure.java b/src/main/java/org/bukkit/generator/structure/Structure.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/generator/structure/Structure.java @@ -632,6 +657,27 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_CHAMBERS_REWARD("chests/trial_chambers/reward"), @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + TRIAL_CHAMBERS_REWARD_COMMON("chests/trial_chambers/reward_common"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + TRIAL_CHAMBERS_REWARD_RARE("chests/trial_chambers/reward_rare"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + TRIAL_CHAMBERS_REWARD_UNIQUE("chests/trial_chambers/reward_unique"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + TRIAL_CHAMBERS_REWARD_OMINOUS("chests/trial_chambers/reward_ominous"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + TRIAL_CHAMBERS_REWARD_OMINOUS_COMMON("chests/trial_chambers/reward_ominous_common"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + TRIAL_CHAMBERS_REWARD_OMINOUS_RARE("chests/trial_chambers/reward_ominous_rare"), + @MinecraftExperimental ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + TRIAL_CHAMBERS_REWARD_OMINOUS_UNIQUE("chests/trial_chambers/reward_ominous_unique"), + @MinecraftExperimental + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_CHAMBERS_SUPPLY("chests/trial_chambers/supply"), @MinecraftExperimental @@ -658,8 +704,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @MinecraftExperimental + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_CHAMBERS_CORRIDOR_POT("pots/trial_chambers/corridor"), - SHIPWRECK_MAP("chests/shipwreck_map"), - SHIPWRECK_SUPPLY("chests/shipwreck_supply"), + @MinecraftExperimental + EQUIPMENT_TRIAL_CHAMBER("equipment/trial_chamber"), @@ -0,0 +0,0 @@ public enum LootTables implements Keyed { PIGLIN_BARTERING("gameplay/piglin_bartering"), // Spawners @@ -669,5 +715,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @MinecraftExperimental + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_CHAMBER_CONSUMABLES("spawners/trial_chamber/consumables"), - // Archaeology - DESERT_WELL_ARCHAEOLOGY("archaeology/desert_well"), + @MinecraftExperimental + OMINOUS_TRIAL_CHAMBER_KEY("spawners/ominous/trial_chamber/key"), diff --git a/patches/server/Build-system-changes.patch b/patches/server/Build-system-changes.patch index 1eb6639266..c38869edb0 100644 --- a/patches/server/Build-system-changes.patch +++ b/patches/server/Build-system-changes.patch @@ -16,13 +16,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 dependencies { implementation(project(":paper-api")) implementation("jline:jline:2.12.1") -- implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") { +- implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") { - exclude(group = "org.apache.logging.log4j", module = "log4j-api") - } -+ implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion ++ implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") // Paper - remove exclusion implementation("org.ow2.asm:asm-commons:9.7") implementation("commons-lang:commons-lang:2.6") - runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1") + runtimeOnly("org.xerial:sqlite-jdbc:3.45.3.0") @@ -0,0 +0,0 @@ tasks.jar { val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim() val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\"" @@ -109,7 +109,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + .exposeNamespace("minecraft", ResourceLocation.PAPER_NAMESPACE) // Paper .applyDevelopmentConfig() .pushJarResources() - .build(); + .build(VANILLA_PACK_INFO); 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 @@ -122,7 +122,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/server/Remap-fixes.patch b/patches/server/Remap-fixes.patch index aac51edd1a..aac272411d 100644 --- a/patches/server/Remap-fixes.patch +++ b/patches/server/Remap-fixes.patch @@ -53,26 +53,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + }).map((entity1) -> { // Paper - remap fix LivingEntity entityliving1; -- if (entity instanceof LivingEntity) { -- LivingEntity entityliving2 = (LivingEntity) entity; -+ if (entity1 instanceof LivingEntity) { // Paper - remap fix -+ LivingEntity entityliving2 = (LivingEntity) entity1; // Paper - remap fix - +- if (entity instanceof LivingEntity entityliving2) { ++ if (entity1 instanceof LivingEntity entityliving2) { // Paper - remap fix entityliving1 = entityliving2; } else { -diff --git a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java -+++ b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java -@@ -0,0 +0,0 @@ public class RecipeManager extends SimpleJsonResourceReloadListener { - Builder> builder = ImmutableMap.builder(); - - recipes.forEach((recipeholder) -> { -- Map> map1 = (Map) map.computeIfAbsent(recipeholder.value().getType(), (recipes) -> { -+ Map> map1 = (Map) map.computeIfAbsent(recipeholder.value().getType(), (recipes_) -> { // Paper - remap fix - return new Object2ObjectLinkedOpenHashMap<>(); // CraftBukkit - }); - ResourceLocation minecraftkey = recipeholder.id(); + entityliving1 = null; diff --git a/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java b/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java @@ -126,8 +111,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 Check in CraftParticle if the conversion is still correct. """, bukkit.getKey())); -- DataResult encoded = assertDoesNotThrow(() -> minecraft.codec().encodeStart(DynamicOpsNBT.INSTANCE, particleParam), -+ DataResult encoded = assertDoesNotThrow(() -> minecraft.codec().encodeStart(NbtOps.INSTANCE, particleParam), // Paper - remap fix +- DataResult encoded = assertDoesNotThrow(() -> minecraft.codec().codec().encodeStart(DynamicOpsNBT.INSTANCE, particleParam), ++ DataResult encoded = assertDoesNotThrow(() -> minecraft.codec().codec().encodeStart(NbtOps.INSTANCE, particleParam), // Paper - remap fix String.format(""" Could not encoded particle param for particle %s. This can indicated, that the wrong particle param is created in CraftParticle. diff --git a/patches/server/Setup-Gradle-project.patch b/patches/server/Setup-Gradle-project.patch index 0ab12ed9f4..41cf6e4239 100644 --- a/patches/server/Setup-Gradle-project.patch +++ b/patches/server/Setup-Gradle-project.patch @@ -43,13 +43,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +dependencies { + implementation(project(":paper-api")) + implementation("jline:jline:2.12.1") -+ implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") { ++ implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") { + exclude(group = "org.apache.logging.log4j", module = "log4j-api") + } + implementation("org.ow2.asm:asm-commons:9.7") + implementation("commons-lang:commons-lang:2.6") -+ runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1") -+ runtimeOnly("com.mysql:mysql-connector-j:8.2.0") ++ runtimeOnly("org.xerial:sqlite-jdbc:3.45.3.0") ++ runtimeOnly("com.mysql:mysql-connector-j:8.3.0") + + runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6") + runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18") @@ -61,7 +61,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + testImplementation("org.ow2.asm:asm-tree:9.7") +} + -+val craftbukkitPackageVersion = "1_20_R3" // Paper ++val craftbukkitPackageVersion = "1_20_R4" // Paper +tasks.jar { + archiveClassifier.set("dev") + @@ -185,7 +185,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - org.spigotmc - spigot - jar -- 1.20.4-R0.1-SNAPSHOT +- 1.20.5-R0.1-SNAPSHOT - Spigot - https://www.spigotmc.org/ - @@ -201,9 +201,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - UTF-8 - unknown - git -- 1_20_R3 -- 17 -- 17 +- 1_20_R4 +- 21 - - - @@ -236,7 +235,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.apache.logging.log4j - log4j-iostreams -- 2.19.0 +- 2.22.1 - compile - - @@ -249,13 +248,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - com.github.oshi - oshi-core -- 6.4.5 +- 6.4.10 - compile - - - com.mojang - authlib -- 5.0.51 +- 6.0.54 - compile - - @@ -267,19 +266,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - com.mojang - datafixerupper -- 6.0.8 +- 7.0.14 - compile - - - com.mojang - logging -- 1.1.1 +- 1.2.7 - compile - - - commons-io - commons-io -- 2.13.0 +- 2.15.1 - compile - - @@ -353,13 +352,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - net.java.dev.jna - jna -- 5.13.0 +- 5.14.0 - compile - - - net.java.dev.jna - jna-platform -- 5.13.0 +- 5.14.0 - compile - - @@ -371,25 +370,31 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.apache.commons - commons-lang3 -- 3.13.0 +- 3.14.0 - compile - - - org.apache.logging.log4j - log4j-core -- 2.19.0 +- 2.22.1 - compile - - - org.apache.logging.log4j - log4j-slf4j2-impl -- 2.19.0 +- 2.22.1 - compile - - - org.slf4j - slf4j-api -- 2.0.7 +- 2.0.9 +- compile +- +- +- org.lz4 +- lz4-java +- 1.8.0 - compile - - @@ -415,13 +420,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.xerial - sqlite-jdbc -- 3.42.0.1 +- 3.45.3.0 - runtime - - - com.mysql - mysql-connector-j -- 8.2.0 +- 8.3.0 - runtime - - @@ -673,7 +678,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.apache.maven.plugins - maven-compiler-plugin -- 3.11.0 +- 3.13.0 - - - eclipse @@ -684,7 +689,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.codehaus.plexus - plexus-compiler-eclipse -- 2.13.0 +- 2.15.0 - - - diff --git a/patches/server/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/server/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/server/API-for-checking-sent-chunks.patch b/patches/unapplied/server/API-for-checking-sent-chunks.patch similarity index 100% rename from patches/server/API-for-checking-sent-chunks.patch rename to patches/unapplied/server/API-for-checking-sent-chunks.patch diff --git a/patches/server/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/server/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/server/API-for-updating-recipes-on-clients.patch b/patches/unapplied/server/API-for-updating-recipes-on-clients.patch similarity index 100% rename from patches/server/API-for-updating-recipes-on-clients.patch rename to patches/unapplied/server/API-for-updating-recipes-on-clients.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/Actually-optimise-explosions.patch b/patches/unapplied/server/Actually-optimise-explosions.patch similarity index 100% rename from patches/server/Actually-optimise-explosions.patch rename to patches/unapplied/server/Actually-optimise-explosions.patch diff --git a/patches/server/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/server/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/server/Add-API-for-item-entity-health.patch b/patches/unapplied/server/Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/Add-API-for-item-entity-health.patch rename to patches/unapplied/server/Add-API-for-item-entity-health.patch diff --git a/patches/server/Add-API-for-quit-reason.patch b/patches/unapplied/server/Add-API-for-quit-reason.patch similarity index 100% rename from patches/server/Add-API-for-quit-reason.patch rename to patches/unapplied/server/Add-API-for-quit-reason.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/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/server/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/server/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/unapplied/server/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/unapplied/server/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/Add-Alternate-Current-redstone-implementation.patch b/patches/unapplied/server/Add-Alternate-Current-redstone-implementation.patch similarity index 100% rename from patches/server/Add-Alternate-Current-redstone-implementation.patch rename to patches/unapplied/server/Add-Alternate-Current-redstone-implementation.patch diff --git a/patches/server/Add-ArmorStand-Item-Meta.patch b/patches/unapplied/server/Add-ArmorStand-Item-Meta.patch similarity index 100% rename from patches/server/Add-ArmorStand-Item-Meta.patch rename to patches/unapplied/server/Add-ArmorStand-Item-Meta.patch diff --git a/patches/server/Add-BeaconEffectEvent.patch b/patches/unapplied/server/Add-BeaconEffectEvent.patch similarity index 100% rename from patches/server/Add-BeaconEffectEvent.patch rename to patches/unapplied/server/Add-BeaconEffectEvent.patch diff --git a/patches/server/Add-BellRevealRaiderEvent.patch b/patches/unapplied/server/Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/Add-BellRevealRaiderEvent.patch rename to patches/unapplied/server/Add-BellRevealRaiderEvent.patch diff --git a/patches/server/Add-BellRingEvent.patch b/patches/unapplied/server/Add-BellRingEvent.patch similarity index 100% rename from patches/server/Add-BellRingEvent.patch rename to patches/unapplied/server/Add-BellRingEvent.patch diff --git a/patches/server/Add-Block-isValidTool.patch b/patches/unapplied/server/Add-Block-isValidTool.patch similarity index 100% rename from patches/server/Add-Block-isValidTool.patch rename to patches/unapplied/server/Add-Block-isValidTool.patch diff --git a/patches/server/Add-BlockBreakBlockEvent.patch b/patches/unapplied/server/Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/Add-BlockBreakBlockEvent.patch rename to patches/unapplied/server/Add-BlockBreakBlockEvent.patch diff --git a/patches/server/Add-BlockBreakProgressUpdateEvent.patch b/patches/unapplied/server/Add-BlockBreakProgressUpdateEvent.patch similarity index 100% rename from patches/server/Add-BlockBreakProgressUpdateEvent.patch rename to patches/unapplied/server/Add-BlockBreakProgressUpdateEvent.patch diff --git a/patches/server/Add-BlockFace-to-BlockDamageEvent.patch b/patches/unapplied/server/Add-BlockFace-to-BlockDamageEvent.patch similarity index 100% rename from patches/server/Add-BlockFace-to-BlockDamageEvent.patch rename to patches/unapplied/server/Add-BlockFace-to-BlockDamageEvent.patch diff --git a/patches/server/Add-BlockFailedDispenseEvent.patch b/patches/unapplied/server/Add-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/server/Add-BlockFailedDispenseEvent.patch rename to patches/unapplied/server/Add-BlockFailedDispenseEvent.patch diff --git a/patches/server/Add-BlockLockCheckEvent.patch b/patches/unapplied/server/Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/server/Add-BlockLockCheckEvent.patch rename to patches/unapplied/server/Add-BlockLockCheckEvent.patch diff --git a/patches/server/Add-BlockPreDispenseEvent.patch b/patches/unapplied/server/Add-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/Add-BlockPreDispenseEvent.patch rename to patches/unapplied/server/Add-BlockPreDispenseEvent.patch diff --git a/patches/server/Add-BlockStateMeta-clearBlockState.patch b/patches/unapplied/server/Add-BlockStateMeta-clearBlockState.patch similarity index 100% rename from patches/server/Add-BlockStateMeta-clearBlockState.patch rename to patches/unapplied/server/Add-BlockStateMeta-clearBlockState.patch diff --git a/patches/server/Add-CartographyItemEvent.patch b/patches/unapplied/server/Add-CartographyItemEvent.patch similarity index 100% rename from patches/server/Add-CartographyItemEvent.patch rename to patches/unapplied/server/Add-CartographyItemEvent.patch diff --git a/patches/server/Add-Channel-initialization-listeners.patch b/patches/unapplied/server/Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/Add-Channel-initialization-listeners.patch rename to patches/unapplied/server/Add-Channel-initialization-listeners.patch diff --git a/patches/server/Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/unapplied/server/Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/unapplied/server/Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/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/server/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/server/Add-Destroy-Speed-API.patch b/patches/unapplied/server/Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/Add-Destroy-Speed-API.patch rename to patches/unapplied/server/Add-Destroy-Speed-API.patch diff --git a/patches/server/Add-DragonEggFormEvent.patch b/patches/unapplied/server/Add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/Add-DragonEggFormEvent.patch rename to patches/unapplied/server/Add-DragonEggFormEvent.patch diff --git a/patches/server/Add-Early-Warning-Feature-to-WatchDog.patch b/patches/unapplied/server/Add-Early-Warning-Feature-to-WatchDog.patch similarity index 100% rename from patches/server/Add-Early-Warning-Feature-to-WatchDog.patch rename to patches/unapplied/server/Add-Early-Warning-Feature-to-WatchDog.patch diff --git a/patches/server/Add-ElderGuardianAppearanceEvent.patch b/patches/unapplied/server/Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/Add-ElderGuardianAppearanceEvent.patch rename to patches/unapplied/server/Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/Add-Entity-Body-Yaw-API.patch b/patches/unapplied/server/Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/server/Add-Entity-Body-Yaw-API.patch rename to patches/unapplied/server/Add-Entity-Body-Yaw-API.patch diff --git a/patches/server/Add-EntityBlockStorage-clearEntities.patch b/patches/unapplied/server/Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/Add-EntityBlockStorage-clearEntities.patch rename to patches/unapplied/server/Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/Add-EntityDamageItemEvent.patch b/patches/unapplied/server/Add-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/Add-EntityDamageItemEvent.patch rename to patches/unapplied/server/Add-EntityDamageItemEvent.patch diff --git a/patches/server/Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/unapplied/server/Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/server/Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/unapplied/server/Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/server/Add-EntityFertilizeEggEvent.patch b/patches/unapplied/server/Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/server/Add-EntityFertilizeEggEvent.patch rename to patches/unapplied/server/Add-EntityFertilizeEggEvent.patch diff --git a/patches/server/Add-EntityInsideBlockEvent.patch b/patches/unapplied/server/Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/Add-EntityInsideBlockEvent.patch rename to patches/unapplied/server/Add-EntityInsideBlockEvent.patch diff --git a/patches/server/Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch b/patches/unapplied/server/Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch similarity index 100% rename from patches/server/Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch rename to patches/unapplied/server/Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch diff --git a/patches/server/Add-EntityLoadCrossbowEvent.patch b/patches/unapplied/server/Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/Add-EntityLoadCrossbowEvent.patch rename to patches/unapplied/server/Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/Add-EntityMoveEvent.patch b/patches/unapplied/server/Add-EntityMoveEvent.patch similarity index 100% rename from patches/server/Add-EntityMoveEvent.patch rename to patches/unapplied/server/Add-EntityMoveEvent.patch diff --git a/patches/server/Add-EntityPortalReadyEvent.patch b/patches/unapplied/server/Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/server/Add-EntityPortalReadyEvent.patch rename to patches/unapplied/server/Add-EntityPortalReadyEvent.patch diff --git a/patches/server/Add-EntityTeleportEndGatewayEvent.patch b/patches/unapplied/server/Add-EntityTeleportEndGatewayEvent.patch similarity index 100% rename from patches/server/Add-EntityTeleportEndGatewayEvent.patch rename to patches/unapplied/server/Add-EntityTeleportEndGatewayEvent.patch diff --git a/patches/server/Add-EntityToggleSitEvent.patch b/patches/unapplied/server/Add-EntityToggleSitEvent.patch similarity index 100% rename from patches/server/Add-EntityToggleSitEvent.patch rename to patches/unapplied/server/Add-EntityToggleSitEvent.patch diff --git a/patches/server/Add-EntityZapEvent.patch b/patches/unapplied/server/Add-EntityZapEvent.patch similarity index 100% rename from patches/server/Add-EntityZapEvent.patch rename to patches/unapplied/server/Add-EntityZapEvent.patch diff --git a/patches/server/Add-FluidState-API.patch b/patches/unapplied/server/Add-FluidState-API.patch similarity index 100% rename from patches/server/Add-FluidState-API.patch rename to patches/unapplied/server/Add-FluidState-API.patch diff --git a/patches/server/Add-GameEvent-tags.patch b/patches/unapplied/server/Add-GameEvent-tags.patch similarity index 100% rename from patches/server/Add-GameEvent-tags.patch rename to patches/unapplied/server/Add-GameEvent-tags.patch diff --git a/patches/server/Add-Heightmap-API.patch b/patches/unapplied/server/Add-Heightmap-API.patch similarity index 100% rename from patches/server/Add-Heightmap-API.patch rename to patches/unapplied/server/Add-Heightmap-API.patch diff --git a/patches/server/Add-HiddenPotionEffect-API.patch b/patches/unapplied/server/Add-HiddenPotionEffect-API.patch similarity index 100% rename from patches/server/Add-HiddenPotionEffect-API.patch rename to patches/unapplied/server/Add-HiddenPotionEffect-API.patch diff --git a/patches/server/Add-ItemFactory-getSpawnEgg-API.patch b/patches/unapplied/server/Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/server/Add-ItemFactory-getSpawnEgg-API.patch rename to patches/unapplied/server/Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/server/Add-Lifecycle-Event-system.patch b/patches/unapplied/server/Add-Lifecycle-Event-system.patch similarity index 100% rename from patches/server/Add-Lifecycle-Event-system.patch rename to patches/unapplied/server/Add-Lifecycle-Event-system.patch diff --git a/patches/server/Add-Listing-API-for-Player.patch b/patches/unapplied/server/Add-Listing-API-for-Player.patch similarity index 100% rename from patches/server/Add-Listing-API-for-Player.patch rename to patches/unapplied/server/Add-Listing-API-for-Player.patch diff --git a/patches/server/Add-LivingEntity-clearActiveItem.patch b/patches/unapplied/server/Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/Add-LivingEntity-clearActiveItem.patch rename to patches/unapplied/server/Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/Add-LivingEntity-getTargetEntity.patch b/patches/unapplied/server/Add-LivingEntity-getTargetEntity.patch similarity index 100% rename from patches/server/Add-LivingEntity-getTargetEntity.patch rename to patches/unapplied/server/Add-LivingEntity-getTargetEntity.patch diff --git a/patches/server/Add-MaterialTagsTest.patch b/patches/unapplied/server/Add-MaterialTagsTest.patch similarity index 100% rename from patches/server/Add-MaterialTagsTest.patch rename to patches/unapplied/server/Add-MaterialTagsTest.patch diff --git a/patches/server/Add-Mob-Experience-reward-API.patch b/patches/unapplied/server/Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/server/Add-Mob-Experience-reward-API.patch rename to patches/unapplied/server/Add-Mob-Experience-reward-API.patch diff --git a/patches/server/Add-Mob-lookAt-API.patch b/patches/unapplied/server/Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/Add-Mob-lookAt-API.patch rename to patches/unapplied/server/Add-Mob-lookAt-API.patch diff --git a/patches/server/Add-More-Creeper-API.patch b/patches/unapplied/server/Add-More-Creeper-API.patch similarity index 100% rename from patches/server/Add-More-Creeper-API.patch rename to patches/unapplied/server/Add-More-Creeper-API.patch diff --git a/patches/server/Add-Moving-Piston-API.patch b/patches/unapplied/server/Add-Moving-Piston-API.patch similarity index 100% rename from patches/server/Add-Moving-Piston-API.patch rename to patches/unapplied/server/Add-Moving-Piston-API.patch diff --git a/patches/server/Add-NamespacedKey-biome-methods.patch b/patches/unapplied/server/Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/server/Add-NamespacedKey-biome-methods.patch rename to patches/unapplied/server/Add-NamespacedKey-biome-methods.patch diff --git a/patches/server/Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/unapplied/server/Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/unapplied/server/Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/Add-PhantomPreSpawnEvent.patch b/patches/unapplied/server/Add-PhantomPreSpawnEvent.patch similarity index 100% rename from patches/server/Add-PhantomPreSpawnEvent.patch rename to patches/unapplied/server/Add-PhantomPreSpawnEvent.patch diff --git a/patches/server/Add-Player-Warden-Warning-API.patch b/patches/unapplied/server/Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/server/Add-Player-Warden-Warning-API.patch rename to patches/unapplied/server/Add-Player-Warden-Warning-API.patch diff --git a/patches/server/Add-Player-getFishHook.patch b/patches/unapplied/server/Add-Player-getFishHook.patch similarity index 100% rename from patches/server/Add-Player-getFishHook.patch rename to patches/unapplied/server/Add-Player-getFishHook.patch diff --git a/patches/server/Add-PlayerAdvancementCriterionGrantEvent.patch b/patches/unapplied/server/Add-PlayerAdvancementCriterionGrantEvent.patch similarity index 100% rename from patches/server/Add-PlayerAdvancementCriterionGrantEvent.patch rename to patches/unapplied/server/Add-PlayerAdvancementCriterionGrantEvent.patch diff --git a/patches/server/Add-PlayerArmSwingEvent.patch b/patches/unapplied/server/Add-PlayerArmSwingEvent.patch similarity index 100% rename from patches/server/Add-PlayerArmSwingEvent.patch rename to patches/unapplied/server/Add-PlayerArmSwingEvent.patch diff --git a/patches/server/Add-PlayerArmorChangeEvent.patch b/patches/unapplied/server/Add-PlayerArmorChangeEvent.patch similarity index 100% rename from patches/server/Add-PlayerArmorChangeEvent.patch rename to patches/unapplied/server/Add-PlayerArmorChangeEvent.patch diff --git a/patches/server/Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/unapplied/server/Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from patches/server/Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/unapplied/server/Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/patches/server/Add-PlayerBedFailEnterEvent.patch b/patches/unapplied/server/Add-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/Add-PlayerBedFailEnterEvent.patch rename to patches/unapplied/server/Add-PlayerBedFailEnterEvent.patch diff --git a/patches/server/Add-PlayerChangeBeaconEffectEvent.patch b/patches/unapplied/server/Add-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/Add-PlayerChangeBeaconEffectEvent.patch rename to patches/unapplied/server/Add-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/Add-PlayerConnectionCloseEvent.patch b/patches/unapplied/server/Add-PlayerConnectionCloseEvent.patch similarity index 100% rename from patches/server/Add-PlayerConnectionCloseEvent.patch rename to patches/unapplied/server/Add-PlayerConnectionCloseEvent.patch diff --git a/patches/server/Add-PlayerDeepSleepEvent.patch b/patches/unapplied/server/Add-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/Add-PlayerDeepSleepEvent.patch rename to patches/unapplied/server/Add-PlayerDeepSleepEvent.patch diff --git a/patches/server/Add-PlayerFlowerPotManipulateEvent.patch b/patches/unapplied/server/Add-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/Add-PlayerFlowerPotManipulateEvent.patch rename to patches/unapplied/server/Add-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/Add-PlayerInitialSpawnEvent.patch b/patches/unapplied/server/Add-PlayerInitialSpawnEvent.patch similarity index 100% rename from patches/server/Add-PlayerInitialSpawnEvent.patch rename to patches/unapplied/server/Add-PlayerInitialSpawnEvent.patch diff --git a/patches/server/Add-PlayerInventorySlotChangeEvent.patch b/patches/unapplied/server/Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/server/Add-PlayerInventorySlotChangeEvent.patch rename to patches/unapplied/server/Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/server/Add-PlayerItemCooldownEvent.patch b/patches/unapplied/server/Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/Add-PlayerItemCooldownEvent.patch rename to patches/unapplied/server/Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/Add-PlayerItemFrameChangeEvent.patch b/patches/unapplied/server/Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/Add-PlayerItemFrameChangeEvent.patch rename to patches/unapplied/server/Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/Add-PlayerJumpEvent.patch b/patches/unapplied/server/Add-PlayerJumpEvent.patch similarity index 100% rename from patches/server/Add-PlayerJumpEvent.patch rename to patches/unapplied/server/Add-PlayerJumpEvent.patch diff --git a/patches/server/Add-PlayerKickEvent-causes.patch b/patches/unapplied/server/Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/server/Add-PlayerKickEvent-causes.patch rename to patches/unapplied/server/Add-PlayerKickEvent-causes.patch diff --git a/patches/server/Add-PlayerLecternPageChangeEvent.patch b/patches/unapplied/server/Add-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/Add-PlayerLecternPageChangeEvent.patch rename to patches/unapplied/server/Add-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/Add-PlayerLoomPatternSelectEvent.patch b/patches/unapplied/server/Add-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/Add-PlayerLoomPatternSelectEvent.patch rename to patches/unapplied/server/Add-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/Add-PlayerNameEntityEvent.patch b/patches/unapplied/server/Add-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/Add-PlayerNameEntityEvent.patch rename to patches/unapplied/server/Add-PlayerNameEntityEvent.patch diff --git a/patches/server/Add-PlayerPickItemEvent.patch b/patches/unapplied/server/Add-PlayerPickItemEvent.patch similarity index 100% rename from patches/server/Add-PlayerPickItemEvent.patch rename to patches/unapplied/server/Add-PlayerPickItemEvent.patch diff --git a/patches/server/Add-PlayerPostRespawnEvent.patch b/patches/unapplied/server/Add-PlayerPostRespawnEvent.patch similarity index 100% rename from patches/server/Add-PlayerPostRespawnEvent.patch rename to patches/unapplied/server/Add-PlayerPostRespawnEvent.patch diff --git a/patches/server/Add-PlayerRecipeBookClickEvent.patch b/patches/unapplied/server/Add-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/server/Add-PlayerRecipeBookClickEvent.patch rename to patches/unapplied/server/Add-PlayerRecipeBookClickEvent.patch diff --git a/patches/server/Add-PlayerSetSpawnEvent.patch b/patches/unapplied/server/Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/server/Add-PlayerSetSpawnEvent.patch rename to patches/unapplied/server/Add-PlayerSetSpawnEvent.patch diff --git a/patches/server/Add-PlayerShearBlockEvent.patch b/patches/unapplied/server/Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/Add-PlayerShearBlockEvent.patch rename to patches/unapplied/server/Add-PlayerShearBlockEvent.patch diff --git a/patches/server/Add-PlayerShieldDisableEvent.patch b/patches/unapplied/server/Add-PlayerShieldDisableEvent.patch similarity index 100% rename from patches/server/Add-PlayerShieldDisableEvent.patch rename to patches/unapplied/server/Add-PlayerShieldDisableEvent.patch diff --git a/patches/server/Add-PlayerStonecutterRecipeSelectEvent.patch b/patches/unapplied/server/Add-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/Add-PlayerStonecutterRecipeSelectEvent.patch rename to patches/unapplied/server/Add-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/Add-PlayerStopUsingItemEvent.patch b/patches/unapplied/server/Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/server/Add-PlayerStopUsingItemEvent.patch rename to patches/unapplied/server/Add-PlayerStopUsingItemEvent.patch diff --git a/patches/server/Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/unapplied/server/Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/unapplied/server/Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/Add-PlayerUseUnknownEntityEvent.patch b/patches/unapplied/server/Add-PlayerUseUnknownEntityEvent.patch similarity index 100% rename from patches/server/Add-PlayerUseUnknownEntityEvent.patch rename to patches/unapplied/server/Add-PlayerUseUnknownEntityEvent.patch diff --git a/patches/server/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/server/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/server/Add-PrePlayerAttackEntityEvent.patch b/patches/unapplied/server/Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/server/Add-PrePlayerAttackEntityEvent.patch rename to patches/unapplied/server/Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/server/Add-PrepareResultEvent.patch b/patches/unapplied/server/Add-PrepareResultEvent.patch similarity index 100% rename from patches/server/Add-PrepareResultEvent.patch rename to patches/unapplied/server/Add-PrepareResultEvent.patch diff --git a/patches/server/Add-ProjectileCollideEvent.patch b/patches/unapplied/server/Add-ProjectileCollideEvent.patch similarity index 100% rename from patches/server/Add-ProjectileCollideEvent.patch rename to patches/unapplied/server/Add-ProjectileCollideEvent.patch diff --git a/patches/server/Add-PufferFishStateChangeEvent.patch b/patches/unapplied/server/Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/Add-PufferFishStateChangeEvent.patch rename to patches/unapplied/server/Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/Add-Raw-Byte-Entity-Serialization.patch b/patches/unapplied/server/Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/server/Add-Raw-Byte-Entity-Serialization.patch rename to patches/unapplied/server/Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/server/Add-Raw-Byte-ItemStack-Serialization.patch b/patches/unapplied/server/Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/server/Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/unapplied/server/Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/server/Add-ServerResourcesReloadedEvent.patch b/patches/unapplied/server/Add-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/Add-ServerResourcesReloadedEvent.patch rename to patches/unapplied/server/Add-ServerResourcesReloadedEvent.patch diff --git a/patches/server/Add-Shearable-API.patch b/patches/unapplied/server/Add-Shearable-API.patch similarity index 100% rename from patches/server/Add-Shearable-API.patch rename to patches/unapplied/server/Add-Shearable-API.patch diff --git a/patches/server/Add-ShulkerDuplicateEvent.patch b/patches/unapplied/server/Add-ShulkerDuplicateEvent.patch similarity index 100% rename from patches/server/Add-ShulkerDuplicateEvent.patch rename to patches/unapplied/server/Add-ShulkerDuplicateEvent.patch diff --git a/patches/server/Add-Sign-getInteractableSideFor.patch b/patches/unapplied/server/Add-Sign-getInteractableSideFor.patch similarity index 100% rename from patches/server/Add-Sign-getInteractableSideFor.patch rename to patches/unapplied/server/Add-Sign-getInteractableSideFor.patch diff --git a/patches/server/Add-Sneaking-API-for-Entities.patch b/patches/unapplied/server/Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/server/Add-Sneaking-API-for-Entities.patch rename to patches/unapplied/server/Add-Sneaking-API-for-Entities.patch diff --git a/patches/server/Add-Structure-check-API.patch b/patches/unapplied/server/Add-Structure-check-API.patch similarity index 100% rename from patches/server/Add-Structure-check-API.patch rename to patches/unapplied/server/Add-Structure-check-API.patch diff --git a/patches/server/Add-StructuresLocateEvent.patch b/patches/unapplied/server/Add-StructuresLocateEvent.patch similarity index 100% rename from patches/server/Add-StructuresLocateEvent.patch rename to patches/unapplied/server/Add-StructuresLocateEvent.patch diff --git a/patches/server/Add-System.out-err-catcher.patch b/patches/unapplied/server/Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/Add-System.out-err-catcher.patch rename to patches/unapplied/server/Add-System.out-err-catcher.patch diff --git a/patches/server/Add-TNTPrimeEvent.patch b/patches/unapplied/server/Add-TNTPrimeEvent.patch similarity index 100% rename from patches/server/Add-TNTPrimeEvent.patch rename to patches/unapplied/server/Add-TNTPrimeEvent.patch diff --git a/patches/server/Add-TameableDeathMessageEvent.patch b/patches/unapplied/server/Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/server/Add-TameableDeathMessageEvent.patch rename to patches/unapplied/server/Add-TameableDeathMessageEvent.patch diff --git a/patches/server/Add-TargetHitEvent.patch b/patches/unapplied/server/Add-TargetHitEvent.patch similarity index 100% rename from patches/server/Add-TargetHitEvent.patch rename to patches/unapplied/server/Add-TargetHitEvent.patch diff --git a/patches/server/Add-ThrownEggHatchEvent.patch b/patches/unapplied/server/Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/server/Add-ThrownEggHatchEvent.patch rename to patches/unapplied/server/Add-ThrownEggHatchEvent.patch diff --git a/patches/server/Add-TickThread.patch b/patches/unapplied/server/Add-TickThread.patch similarity index 100% rename from patches/server/Add-TickThread.patch rename to patches/unapplied/server/Add-TickThread.patch diff --git a/patches/server/Add-UUID-attribute-modifier-API.patch b/patches/unapplied/server/Add-UUID-attribute-modifier-API.patch similarity index 100% rename from patches/server/Add-UUID-attribute-modifier-API.patch rename to patches/unapplied/server/Add-UUID-attribute-modifier-API.patch diff --git a/patches/server/Add-Unix-domain-socket-support.patch b/patches/unapplied/server/Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/Add-Unix-domain-socket-support.patch rename to patches/unapplied/server/Add-Unix-domain-socket-support.patch diff --git a/patches/server/Add-UnknownCommandEvent.patch b/patches/unapplied/server/Add-UnknownCommandEvent.patch similarity index 100% rename from patches/server/Add-UnknownCommandEvent.patch rename to patches/unapplied/server/Add-UnknownCommandEvent.patch diff --git a/patches/server/Add-Velocity-IP-Forwarding-Support.patch b/patches/unapplied/server/Add-Velocity-IP-Forwarding-Support.patch similarity index 100% rename from patches/server/Add-Velocity-IP-Forwarding-Support.patch rename to patches/unapplied/server/Add-Velocity-IP-Forwarding-Support.patch diff --git a/patches/server/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/server/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/server/Add-WardenAngerChangeEvent.patch b/patches/unapplied/server/Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/server/Add-WardenAngerChangeEvent.patch rename to patches/unapplied/server/Add-WardenAngerChangeEvent.patch diff --git a/patches/server/Add-World-Util-Methods.patch b/patches/unapplied/server/Add-World-Util-Methods.patch similarity index 100% rename from patches/server/Add-World-Util-Methods.patch rename to patches/unapplied/server/Add-World-Util-Methods.patch diff --git a/patches/server/Add-WorldGameRuleChangeEvent.patch b/patches/unapplied/server/Add-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/Add-WorldGameRuleChangeEvent.patch rename to patches/unapplied/server/Add-WorldGameRuleChangeEvent.patch diff --git a/patches/server/Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/unapplied/server/Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/server/Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/unapplied/server/Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/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/server/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/server/Add-and-fix-missing-BlockFadeEvents.patch b/patches/unapplied/server/Add-and-fix-missing-BlockFadeEvents.patch similarity index 100% rename from patches/server/Add-and-fix-missing-BlockFadeEvents.patch rename to patches/unapplied/server/Add-and-fix-missing-BlockFadeEvents.patch diff --git a/patches/server/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/server/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/server/Add-back-EntityPortalExitEvent.patch b/patches/unapplied/server/Add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/server/Add-back-EntityPortalExitEvent.patch rename to patches/unapplied/server/Add-back-EntityPortalExitEvent.patch diff --git a/patches/server/Add-basic-Datapack-API.patch b/patches/unapplied/server/Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/Add-basic-Datapack-API.patch rename to patches/unapplied/server/Add-basic-Datapack-API.patch diff --git a/patches/server/Add-bypass-host-check.patch b/patches/unapplied/server/Add-bypass-host-check.patch similarity index 100% rename from patches/server/Add-bypass-host-check.patch rename to patches/unapplied/server/Add-bypass-host-check.patch diff --git a/patches/server/Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/unapplied/server/Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/server/Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/unapplied/server/Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/server/Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/unapplied/server/Add-command-line-option-to-load-extra-plugin-jars-no.patch similarity index 100% rename from patches/server/Add-command-line-option-to-load-extra-plugin-jars-no.patch rename to patches/unapplied/server/Add-command-line-option-to-load-extra-plugin-jars-no.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/Add-configurable-entity-despawn-distances.patch b/patches/unapplied/server/Add-configurable-entity-despawn-distances.patch similarity index 100% rename from patches/server/Add-configurable-entity-despawn-distances.patch rename to patches/unapplied/server/Add-configurable-entity-despawn-distances.patch diff --git a/patches/server/Add-configurable-height-for-slime-spawn.patch b/patches/unapplied/server/Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/server/Add-configurable-height-for-slime-spawn.patch rename to patches/unapplied/server/Add-configurable-height-for-slime-spawn.patch diff --git a/patches/server/Add-configurable-portal-search-radius.patch b/patches/unapplied/server/Add-configurable-portal-search-radius.patch similarity index 100% rename from patches/server/Add-configurable-portal-search-radius.patch rename to patches/unapplied/server/Add-configurable-portal-search-radius.patch diff --git a/patches/server/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/server/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/server/Add-critical-damage-API.patch b/patches/unapplied/server/Add-critical-damage-API.patch similarity index 100% rename from patches/server/Add-critical-damage-API.patch rename to patches/unapplied/server/Add-critical-damage-API.patch diff --git a/patches/server/Add-debug-for-sync-chunk-loads.patch b/patches/unapplied/server/Add-debug-for-sync-chunk-loads.patch similarity index 100% rename from patches/server/Add-debug-for-sync-chunk-loads.patch rename to patches/unapplied/server/Add-debug-for-sync-chunk-loads.patch diff --git a/patches/server/Add-drops-to-shear-events.patch b/patches/unapplied/server/Add-drops-to-shear-events.patch similarity index 100% rename from patches/server/Add-drops-to-shear-events.patch rename to patches/unapplied/server/Add-drops-to-shear-events.patch diff --git a/patches/server/Add-entity-knockback-API.patch b/patches/unapplied/server/Add-entity-knockback-API.patch similarity index 100% rename from patches/server/Add-entity-knockback-API.patch rename to patches/unapplied/server/Add-entity-knockback-API.patch diff --git a/patches/server/Add-entity-liquid-API.patch b/patches/unapplied/server/Add-entity-liquid-API.patch similarity index 100% rename from patches/server/Add-entity-liquid-API.patch rename to patches/unapplied/server/Add-entity-liquid-API.patch diff --git a/patches/server/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/server/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/server/Add-event-for-player-editing-sign.patch b/patches/unapplied/server/Add-event-for-player-editing-sign.patch similarity index 100% rename from patches/server/Add-event-for-player-editing-sign.patch rename to patches/unapplied/server/Add-event-for-player-editing-sign.patch diff --git a/patches/server/Add-exception-reporting-event.patch b/patches/unapplied/server/Add-exception-reporting-event.patch similarity index 100% rename from patches/server/Add-exception-reporting-event.patch rename to patches/unapplied/server/Add-exception-reporting-event.patch diff --git a/patches/server/Add-experience-points-API.patch b/patches/unapplied/server/Add-experience-points-API.patch similarity index 100% rename from patches/server/Add-experience-points-API.patch rename to patches/unapplied/server/Add-experience-points-API.patch diff --git a/patches/server/Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/unapplied/server/Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch similarity index 100% rename from patches/server/Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch rename to patches/unapplied/server/Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch diff --git a/patches/server/Add-fast-alternative-constructor-for-Rotations.patch b/patches/unapplied/server/Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/Add-fast-alternative-constructor-for-Rotations.patch rename to patches/unapplied/server/Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/Add-fire-tick-delay-option.patch b/patches/unapplied/server/Add-fire-tick-delay-option.patch similarity index 100% rename from patches/server/Add-fire-tick-delay-option.patch rename to patches/unapplied/server/Add-fire-tick-delay-option.patch diff --git a/patches/server/Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/unapplied/server/Add-getChunkSnapshot-includeLightData-parameter.patch similarity index 100% rename from patches/server/Add-getChunkSnapshot-includeLightData-parameter.patch rename to patches/unapplied/server/Add-getChunkSnapshot-includeLightData-parameter.patch diff --git a/patches/server/Add-getDrops-to-BlockState.patch b/patches/unapplied/server/Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/server/Add-getDrops-to-BlockState.patch rename to patches/unapplied/server/Add-getDrops-to-BlockState.patch diff --git a/patches/server/Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/unapplied/server/Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/unapplied/server/Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/Add-getOfflinePlayerIfCached-String.patch b/patches/unapplied/server/Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/server/Add-getOfflinePlayerIfCached-String.patch rename to patches/unapplied/server/Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/Add-ignore-discounts-API.patch b/patches/unapplied/server/Add-ignore-discounts-API.patch similarity index 100% rename from patches/server/Add-ignore-discounts-API.patch rename to patches/unapplied/server/Add-ignore-discounts-API.patch diff --git a/patches/server/Add-isCollidable-methods-to-various-places.patch b/patches/unapplied/server/Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/Add-isCollidable-methods-to-various-places.patch rename to patches/unapplied/server/Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/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/server/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/server/Add-methods-to-get-translation-keys.patch b/patches/unapplied/server/Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/server/Add-methods-to-get-translation-keys.patch rename to patches/unapplied/server/Add-methods-to-get-translation-keys.patch diff --git a/patches/server/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/server/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/server/Add-missing-InventoryHolders-to-inventories.patch b/patches/unapplied/server/Add-missing-InventoryHolders-to-inventories.patch similarity index 100% rename from patches/server/Add-missing-InventoryHolders-to-inventories.patch rename to patches/unapplied/server/Add-missing-InventoryHolders-to-inventories.patch diff --git a/patches/server/Add-missing-InventoryType.patch b/patches/unapplied/server/Add-missing-InventoryType.patch similarity index 100% rename from patches/server/Add-missing-InventoryType.patch rename to patches/unapplied/server/Add-missing-InventoryType.patch diff --git a/patches/server/Add-missing-SpigotConfig-logCommands-check.patch b/patches/unapplied/server/Add-missing-SpigotConfig-logCommands-check.patch similarity index 100% rename from patches/server/Add-missing-SpigotConfig-logCommands-check.patch rename to patches/unapplied/server/Add-missing-SpigotConfig-logCommands-check.patch diff --git a/patches/server/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/server/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/server/Add-missing-block-data-mins-and-maxes.patch b/patches/unapplied/server/Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/server/Add-missing-block-data-mins-and-maxes.patch rename to patches/unapplied/server/Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/server/Add-missing-default-perms-for-commands.patch b/patches/unapplied/server/Add-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/Add-missing-default-perms-for-commands.patch rename to patches/unapplied/server/Add-missing-default-perms-for-commands.patch diff --git a/patches/server/Add-missing-forceDrop-toggles.patch b/patches/unapplied/server/Add-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/Add-missing-forceDrop-toggles.patch rename to patches/unapplied/server/Add-missing-forceDrop-toggles.patch diff --git a/patches/server/Add-missing-important-BlockStateListPopulator-method.patch b/patches/unapplied/server/Add-missing-important-BlockStateListPopulator-method.patch similarity index 100% rename from patches/server/Add-missing-important-BlockStateListPopulator-method.patch rename to patches/unapplied/server/Add-missing-important-BlockStateListPopulator-method.patch diff --git a/patches/server/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/server/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/server/Add-missing-structure-set-seed-configs.patch b/patches/unapplied/server/Add-missing-structure-set-seed-configs.patch similarity index 100% rename from patches/server/Add-missing-structure-set-seed-configs.patch rename to patches/unapplied/server/Add-missing-structure-set-seed-configs.patch diff --git a/patches/server/Add-missing-team-sidebar-display-slots.patch b/patches/unapplied/server/Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/Add-missing-team-sidebar-display-slots.patch rename to patches/unapplied/server/Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/Add-moon-phase-API.patch b/patches/unapplied/server/Add-moon-phase-API.patch similarity index 100% rename from patches/server/Add-moon-phase-API.patch rename to patches/unapplied/server/Add-moon-phase-API.patch diff --git a/patches/server/Add-more-Campfire-API.patch b/patches/unapplied/server/Add-more-Campfire-API.patch similarity index 100% rename from patches/server/Add-more-Campfire-API.patch rename to patches/unapplied/server/Add-more-Campfire-API.patch diff --git a/patches/server/Add-more-Evoker-API.patch b/patches/unapplied/server/Add-more-Evoker-API.patch similarity index 100% rename from patches/server/Add-more-Evoker-API.patch rename to patches/unapplied/server/Add-more-Evoker-API.patch diff --git a/patches/server/Add-more-LimitedRegion-API.patch b/patches/unapplied/server/Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/Add-more-LimitedRegion-API.patch rename to patches/unapplied/server/Add-more-LimitedRegion-API.patch diff --git a/patches/server/Add-more-WanderingTrader-API.patch b/patches/unapplied/server/Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/Add-more-WanderingTrader-API.patch rename to patches/unapplied/server/Add-more-WanderingTrader-API.patch diff --git a/patches/server/Add-more-Witch-API.patch b/patches/unapplied/server/Add-more-Witch-API.patch similarity index 100% rename from patches/server/Add-more-Witch-API.patch rename to patches/unapplied/server/Add-more-Witch-API.patch diff --git a/patches/server/Add-more-Zombie-API.patch b/patches/unapplied/server/Add-more-Zombie-API.patch similarity index 100% rename from patches/server/Add-more-Zombie-API.patch rename to patches/unapplied/server/Add-more-Zombie-API.patch diff --git a/patches/server/Add-more-advancement-API.patch b/patches/unapplied/server/Add-more-advancement-API.patch similarity index 100% rename from patches/server/Add-more-advancement-API.patch rename to patches/unapplied/server/Add-more-advancement-API.patch diff --git a/patches/server/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/server/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/server/Add-more-fields-to-AsyncPreLoginEvent.patch b/patches/unapplied/server/Add-more-fields-to-AsyncPreLoginEvent.patch similarity index 100% rename from patches/server/Add-more-fields-to-AsyncPreLoginEvent.patch rename to patches/unapplied/server/Add-more-fields-to-AsyncPreLoginEvent.patch diff --git a/patches/server/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/server/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/server/Add-openSign-method-to-HumanEntity.patch b/patches/unapplied/server/Add-openSign-method-to-HumanEntity.patch similarity index 100% rename from patches/server/Add-openSign-method-to-HumanEntity.patch rename to patches/unapplied/server/Add-openSign-method-to-HumanEntity.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/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/server/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/server/Add-option-to-disable-block-updates.patch b/patches/unapplied/server/Add-option-to-disable-block-updates.patch similarity index 100% rename from patches/server/Add-option-to-disable-block-updates.patch rename to patches/unapplied/server/Add-option-to-disable-block-updates.patch diff --git a/patches/server/Add-option-to-disable-pillager-patrols.patch b/patches/unapplied/server/Add-option-to-disable-pillager-patrols.patch similarity index 100% rename from patches/server/Add-option-to-disable-pillager-patrols.patch rename to patches/unapplied/server/Add-option-to-disable-pillager-patrols.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/Add-packet-limiter-config.patch b/patches/unapplied/server/Add-packet-limiter-config.patch similarity index 100% rename from patches/server/Add-packet-limiter-config.patch rename to patches/unapplied/server/Add-packet-limiter-config.patch diff --git a/patches/server/Add-paper-dumplisteners-command.patch b/patches/unapplied/server/Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/Add-paper-dumplisteners-command.patch rename to patches/unapplied/server/Add-paper-dumplisteners-command.patch diff --git a/patches/server/Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/unapplied/server/Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 100% rename from patches/server/Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/unapplied/server/Add-paper-mobcaps-and-paper-playermobcaps.patch diff --git a/patches/server/Add-permission-for-command-blocks.patch b/patches/unapplied/server/Add-permission-for-command-blocks.patch similarity index 100% rename from patches/server/Add-permission-for-command-blocks.patch rename to patches/unapplied/server/Add-permission-for-command-blocks.patch diff --git a/patches/server/Add-phantom-creative-and-insomniac-controls.patch b/patches/unapplied/server/Add-phantom-creative-and-insomniac-controls.patch similarity index 100% rename from patches/server/Add-phantom-creative-and-insomniac-controls.patch rename to patches/unapplied/server/Add-phantom-creative-and-insomniac-controls.patch diff --git a/patches/server/Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/unapplied/server/Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/unapplied/server/Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/Add-player-idle-duration-API.patch b/patches/unapplied/server/Add-player-idle-duration-API.patch similarity index 100% rename from patches/server/Add-player-idle-duration-API.patch rename to patches/unapplied/server/Add-player-idle-duration-API.patch diff --git a/patches/server/Add-predicate-for-blocks-when-raytracing.patch b/patches/unapplied/server/Add-predicate-for-blocks-when-raytracing.patch similarity index 100% rename from patches/server/Add-predicate-for-blocks-when-raytracing.patch rename to patches/unapplied/server/Add-predicate-for-blocks-when-raytracing.patch diff --git a/patches/server/Add-ray-tracing-methods-to-LivingEntity.patch b/patches/unapplied/server/Add-ray-tracing-methods-to-LivingEntity.patch similarity index 100% rename from patches/server/Add-ray-tracing-methods-to-LivingEntity.patch rename to patches/unapplied/server/Add-ray-tracing-methods-to-LivingEntity.patch diff --git a/patches/server/Add-recipe-to-cook-events.patch b/patches/unapplied/server/Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/Add-recipe-to-cook-events.patch rename to patches/unapplied/server/Add-recipe-to-cook-events.patch diff --git a/patches/server/Add-root-admin-user-detection.patch b/patches/unapplied/server/Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/Add-root-admin-user-detection.patch rename to patches/unapplied/server/Add-root-admin-user-detection.patch diff --git a/patches/server/Add-sendOpLevel-API.patch b/patches/unapplied/server/Add-sendOpLevel-API.patch similarity index 100% rename from patches/server/Add-sendOpLevel-API.patch rename to patches/unapplied/server/Add-sendOpLevel-API.patch diff --git a/patches/server/Add-server-name-parameter.patch b/patches/unapplied/server/Add-server-name-parameter.patch similarity index 100% rename from patches/server/Add-server-name-parameter.patch rename to patches/unapplied/server/Add-server-name-parameter.patch diff --git a/patches/server/Add-setPlayerProfile-API-for-Skulls.patch b/patches/unapplied/server/Add-setPlayerProfile-API-for-Skulls.patch similarity index 100% rename from patches/server/Add-setPlayerProfile-API-for-Skulls.patch rename to patches/unapplied/server/Add-setPlayerProfile-API-for-Skulls.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/Add-source-to-PlayerExpChangeEvent.patch b/patches/unapplied/server/Add-source-to-PlayerExpChangeEvent.patch similarity index 100% rename from patches/server/Add-source-to-PlayerExpChangeEvent.patch rename to patches/unapplied/server/Add-source-to-PlayerExpChangeEvent.patch diff --git a/patches/server/Add-sun-related-API.patch b/patches/unapplied/server/Add-sun-related-API.patch similarity index 100% rename from patches/server/Add-sun-related-API.patch rename to patches/unapplied/server/Add-sun-related-API.patch diff --git a/patches/server/Add-support-for-Proxy-Protocol.patch b/patches/unapplied/server/Add-support-for-Proxy-Protocol.patch similarity index 100% rename from patches/server/Add-support-for-Proxy-Protocol.patch rename to patches/unapplied/server/Add-support-for-Proxy-Protocol.patch diff --git a/patches/server/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/server/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/server/Add-titleOverride-to-InventoryOpenEvent.patch b/patches/unapplied/server/Add-titleOverride-to-InventoryOpenEvent.patch similarity index 100% rename from patches/server/Add-titleOverride-to-InventoryOpenEvent.patch rename to patches/unapplied/server/Add-titleOverride-to-InventoryOpenEvent.patch diff --git a/patches/server/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/server/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/server/Add-transient-modifier-API.patch b/patches/unapplied/server/Add-transient-modifier-API.patch similarity index 100% rename from patches/server/Add-transient-modifier-API.patch rename to patches/unapplied/server/Add-transient-modifier-API.patch diff --git a/patches/server/Add-various-missing-EntityDropItemEvent-calls.patch b/patches/unapplied/server/Add-various-missing-EntityDropItemEvent-calls.patch similarity index 100% rename from patches/server/Add-various-missing-EntityDropItemEvent-calls.patch rename to patches/unapplied/server/Add-various-missing-EntityDropItemEvent-calls.patch diff --git a/patches/server/Add-velocity-warnings.patch b/patches/unapplied/server/Add-velocity-warnings.patch similarity index 100% rename from patches/server/Add-velocity-warnings.patch rename to patches/unapplied/server/Add-velocity-warnings.patch diff --git a/patches/server/Add-version-history-to-version-command.patch b/patches/unapplied/server/Add-version-history-to-version-command.patch similarity index 100% rename from patches/server/Add-version-history-to-version-command.patch rename to patches/unapplied/server/Add-version-history-to-version-command.patch diff --git a/patches/server/Add-villager-reputation-API.patch b/patches/unapplied/server/Add-villager-reputation-API.patch similarity index 100% rename from patches/server/Add-villager-reputation-API.patch rename to patches/unapplied/server/Add-villager-reputation-API.patch diff --git a/patches/server/Add-whitelist-events.patch b/patches/unapplied/server/Add-whitelist-events.patch similarity index 100% rename from patches/server/Add-whitelist-events.patch rename to patches/unapplied/server/Add-whitelist-events.patch diff --git a/patches/server/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/server/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/server/Add-worldborder-events.patch b/patches/unapplied/server/Add-worldborder-events.patch similarity index 100% rename from patches/server/Add-worldborder-events.patch rename to patches/unapplied/server/Add-worldborder-events.patch diff --git a/patches/server/Add-zombie-targets-turtle-egg-config.patch b/patches/unapplied/server/Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from patches/server/Add-zombie-targets-turtle-egg-config.patch rename to patches/unapplied/server/Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/server/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/server/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/server/Additional-Block-Material-API.patch b/patches/unapplied/server/Additional-Block-Material-API.patch similarity index 100% rename from patches/server/Additional-Block-Material-API.patch rename to patches/unapplied/server/Additional-Block-Material-API.patch diff --git a/patches/server/Adventure.patch b/patches/unapplied/server/Adventure.patch similarity index 100% rename from patches/server/Adventure.patch rename to patches/unapplied/server/Adventure.patch diff --git a/patches/server/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/server/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/server/Allow-Reloading-of-Command-Aliases.patch b/patches/unapplied/server/Allow-Reloading-of-Command-Aliases.patch similarity index 100% rename from patches/server/Allow-Reloading-of-Command-Aliases.patch rename to patches/unapplied/server/Allow-Reloading-of-Command-Aliases.patch diff --git a/patches/server/Allow-Reloading-of-Custom-Permissions.patch b/patches/unapplied/server/Allow-Reloading-of-Custom-Permissions.patch similarity index 100% rename from patches/server/Allow-Reloading-of-Custom-Permissions.patch rename to patches/unapplied/server/Allow-Reloading-of-Custom-Permissions.patch diff --git a/patches/server/Allow-Saving-of-Oversized-Chunks.patch b/patches/unapplied/server/Allow-Saving-of-Oversized-Chunks.patch similarity index 100% rename from patches/server/Allow-Saving-of-Oversized-Chunks.patch rename to patches/unapplied/server/Allow-Saving-of-Oversized-Chunks.patch diff --git a/patches/server/Allow-adding-items-to-BlockDropItemEvent.patch b/patches/unapplied/server/Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/unapplied/server/Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/Allow-changing-bed-s-occupied-property.patch b/patches/unapplied/server/Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/server/Allow-changing-bed-s-occupied-property.patch rename to patches/unapplied/server/Allow-changing-bed-s-occupied-property.patch diff --git a/patches/server/Allow-changing-the-EnderDragon-podium.patch b/patches/unapplied/server/Allow-changing-the-EnderDragon-podium.patch similarity index 100% rename from patches/server/Allow-changing-the-EnderDragon-podium.patch rename to patches/unapplied/server/Allow-changing-the-EnderDragon-podium.patch diff --git a/patches/server/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/server/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/server/Allow-delegation-to-vanilla-chunk-gen.patch b/patches/unapplied/server/Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/server/Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/unapplied/server/Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/server/Allow-disabling-armor-stand-ticking.patch b/patches/unapplied/server/Allow-disabling-armor-stand-ticking.patch similarity index 100% rename from patches/server/Allow-disabling-armor-stand-ticking.patch rename to patches/unapplied/server/Allow-disabling-armor-stand-ticking.patch diff --git a/patches/server/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/server/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/server/Allow-for-toggling-of-spawn-chunks.patch b/patches/unapplied/server/Allow-for-toggling-of-spawn-chunks.patch similarity index 100% rename from patches/server/Allow-for-toggling-of-spawn-chunks.patch rename to patches/unapplied/server/Allow-for-toggling-of-spawn-chunks.patch diff --git a/patches/server/Allow-nerfed-mobs-to-jump.patch b/patches/unapplied/server/Allow-nerfed-mobs-to-jump.patch similarity index 100% rename from patches/server/Allow-nerfed-mobs-to-jump.patch rename to patches/unapplied/server/Allow-nerfed-mobs-to-jump.patch diff --git a/patches/server/Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/unapplied/server/Allow-null-itemstack-for-Player-sendEquipmentChange.patch similarity index 100% rename from patches/server/Allow-null-itemstack-for-Player-sendEquipmentChange.patch rename to patches/unapplied/server/Allow-null-itemstack-for-Player-sendEquipmentChange.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/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/server/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/server/Allow-trident-custom-damage.patch b/patches/unapplied/server/Allow-trident-custom-damage.patch similarity index 100% rename from patches/server/Allow-trident-custom-damage.patch rename to patches/unapplied/server/Allow-trident-custom-damage.patch diff --git a/patches/server/Allow-using-signs-inside-spawn-protection.patch b/patches/unapplied/server/Allow-using-signs-inside-spawn-protection.patch similarity index 100% rename from patches/server/Allow-using-signs-inside-spawn-protection.patch rename to patches/unapplied/server/Allow-using-signs-inside-spawn-protection.patch diff --git a/patches/server/Alternative-item-despawn-rate.patch b/patches/unapplied/server/Alternative-item-despawn-rate.patch similarity index 100% rename from patches/server/Alternative-item-despawn-rate.patch rename to patches/unapplied/server/Alternative-item-despawn-rate.patch diff --git a/patches/server/Always-allow-item-changing-in-Fireball.patch b/patches/unapplied/server/Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/Always-allow-item-changing-in-Fireball.patch rename to patches/unapplied/server/Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/Anti-Xray.patch b/patches/unapplied/server/Anti-Xray.patch similarity index 100% rename from patches/server/Anti-Xray.patch rename to patches/unapplied/server/Anti-Xray.patch diff --git a/patches/server/AnvilDamageEvent.patch b/patches/unapplied/server/AnvilDamageEvent.patch similarity index 100% rename from patches/server/AnvilDamageEvent.patch rename to patches/unapplied/server/AnvilDamageEvent.patch diff --git a/patches/server/Array-backed-synched-entity-data.patch b/patches/unapplied/server/Array-backed-synched-entity-data.patch similarity index 100% rename from patches/server/Array-backed-synched-entity-data.patch rename to patches/unapplied/server/Array-backed-synched-entity-data.patch diff --git a/patches/server/Async-GameProfileCache-saving.patch b/patches/unapplied/server/Async-GameProfileCache-saving.patch similarity index 100% rename from patches/server/Async-GameProfileCache-saving.patch rename to patches/unapplied/server/Async-GameProfileCache-saving.patch diff --git a/patches/server/Async-command-map-building.patch b/patches/unapplied/server/Async-command-map-building.patch similarity index 100% rename from patches/server/Async-command-map-building.patch rename to patches/unapplied/server/Async-command-map-building.patch diff --git a/patches/server/AsyncTabCompleteEvent.patch b/patches/unapplied/server/AsyncTabCompleteEvent.patch similarity index 100% rename from patches/server/AsyncTabCompleteEvent.patch rename to patches/unapplied/server/AsyncTabCompleteEvent.patch diff --git a/patches/server/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/server/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/server/Attributes-API-for-item-defaults.patch b/patches/unapplied/server/Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/Attributes-API-for-item-defaults.patch rename to patches/unapplied/server/Attributes-API-for-item-defaults.patch diff --git a/patches/server/Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/unapplied/server/Avoid-Lazy-Initialization-for-Enum-Fields.patch similarity index 100% rename from patches/server/Avoid-Lazy-Initialization-for-Enum-Fields.patch rename to patches/unapplied/server/Avoid-Lazy-Initialization-for-Enum-Fields.patch diff --git a/patches/server/Avoid-blocking-on-Network-Manager-creation.patch b/patches/unapplied/server/Avoid-blocking-on-Network-Manager-creation.patch similarity index 100% rename from patches/server/Avoid-blocking-on-Network-Manager-creation.patch rename to patches/unapplied/server/Avoid-blocking-on-Network-Manager-creation.patch diff --git a/patches/server/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/server/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/server/Bandaid-fix-for-Effect.patch b/patches/unapplied/server/Bandaid-fix-for-Effect.patch similarity index 100% rename from patches/server/Bandaid-fix-for-Effect.patch rename to patches/unapplied/server/Bandaid-fix-for-Effect.patch diff --git a/patches/server/Basic-PlayerProfile-API.patch b/patches/unapplied/server/Basic-PlayerProfile-API.patch similarity index 100% rename from patches/server/Basic-PlayerProfile-API.patch rename to patches/unapplied/server/Basic-PlayerProfile-API.patch diff --git a/patches/server/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/server/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/server/Beacon-API-custom-effect-ranges.patch b/patches/unapplied/server/Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/server/Beacon-API-custom-effect-ranges.patch rename to patches/unapplied/server/Beacon-API-custom-effect-ranges.patch diff --git a/patches/server/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/server/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/server/Block-Enderpearl-Travel-Exploit.patch b/patches/unapplied/server/Block-Enderpearl-Travel-Exploit.patch similarity index 100% rename from patches/server/Block-Enderpearl-Travel-Exploit.patch rename to patches/unapplied/server/Block-Enderpearl-Travel-Exploit.patch diff --git a/patches/server/Block-Ticking-API.patch b/patches/unapplied/server/Block-Ticking-API.patch similarity index 100% rename from patches/server/Block-Ticking-API.patch rename to patches/unapplied/server/Block-Ticking-API.patch diff --git a/patches/server/Block-player-logins-during-server-shutdown.patch b/patches/unapplied/server/Block-player-logins-during-server-shutdown.patch similarity index 100% rename from patches/server/Block-player-logins-during-server-shutdown.patch rename to patches/unapplied/server/Block-player-logins-during-server-shutdown.patch diff --git a/patches/server/BlockDestroyEvent.patch b/patches/unapplied/server/BlockDestroyEvent.patch similarity index 100% rename from patches/server/BlockDestroyEvent.patch rename to patches/unapplied/server/BlockDestroyEvent.patch diff --git a/patches/server/Book-Size-Limits.patch b/patches/unapplied/server/Book-Size-Limits.patch similarity index 100% rename from patches/server/Book-Size-Limits.patch rename to patches/unapplied/server/Book-Size-Limits.patch diff --git a/patches/server/Bound-Treasure-Maps-to-World-Border.patch b/patches/unapplied/server/Bound-Treasure-Maps-to-World-Border.patch similarity index 100% rename from patches/server/Bound-Treasure-Maps-to-World-Border.patch rename to patches/unapplied/server/Bound-Treasure-Maps-to-World-Border.patch diff --git a/patches/server/Brand-support.patch b/patches/unapplied/server/Brand-support.patch similarity index 100% rename from patches/server/Brand-support.patch rename to patches/unapplied/server/Brand-support.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/Brigadier-Mojang-API.patch b/patches/unapplied/server/Brigadier-Mojang-API.patch similarity index 100% rename from patches/server/Brigadier-Mojang-API.patch rename to patches/unapplied/server/Brigadier-Mojang-API.patch diff --git a/patches/server/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/server/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/server/Bucketable-API.patch b/patches/unapplied/server/Bucketable-API.patch similarity index 100% rename from patches/server/Bucketable-API.patch rename to patches/unapplied/server/Bucketable-API.patch diff --git a/patches/server/Buffer-OOB-setBlock-calls.patch b/patches/unapplied/server/Buffer-OOB-setBlock-calls.patch similarity index 100% rename from patches/server/Buffer-OOB-setBlock-calls.patch rename to patches/unapplied/server/Buffer-OOB-setBlock-calls.patch diff --git a/patches/server/Buffer-joins-to-world.patch b/patches/unapplied/server/Buffer-joins-to-world.patch similarity index 100% rename from patches/server/Buffer-joins-to-world.patch rename to patches/unapplied/server/Buffer-joins-to-world.patch diff --git a/patches/server/CB-fixes.patch b/patches/unapplied/server/CB-fixes.patch similarity index 100% rename from patches/server/CB-fixes.patch rename to patches/unapplied/server/CB-fixes.patch diff --git a/patches/server/Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/unapplied/server/Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/server/Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/unapplied/server/Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/server/Cache-block-data-strings.patch b/patches/unapplied/server/Cache-block-data-strings.patch similarity index 100% rename from patches/server/Cache-block-data-strings.patch rename to patches/unapplied/server/Cache-block-data-strings.patch diff --git a/patches/server/Cache-burn-durations.patch b/patches/unapplied/server/Cache-burn-durations.patch similarity index 100% rename from patches/server/Cache-burn-durations.patch rename to patches/unapplied/server/Cache-burn-durations.patch diff --git a/patches/server/Cache-map-ids-on-item-frames.patch b/patches/unapplied/server/Cache-map-ids-on-item-frames.patch similarity index 100% rename from patches/server/Cache-map-ids-on-item-frames.patch rename to patches/unapplied/server/Cache-map-ids-on-item-frames.patch diff --git a/patches/server/Cache-user-authenticator-threads.patch b/patches/unapplied/server/Cache-user-authenticator-threads.patch similarity index 100% rename from patches/server/Cache-user-authenticator-threads.patch rename to patches/unapplied/server/Cache-user-authenticator-threads.patch diff --git a/patches/server/Call-BlockGrowEvent-for-missing-blocks.patch b/patches/unapplied/server/Call-BlockGrowEvent-for-missing-blocks.patch similarity index 100% rename from patches/server/Call-BlockGrowEvent-for-missing-blocks.patch rename to patches/unapplied/server/Call-BlockGrowEvent-for-missing-blocks.patch diff --git a/patches/server/Call-BlockPhysicsEvent-more-often.patch b/patches/unapplied/server/Call-BlockPhysicsEvent-more-often.patch similarity index 100% rename from patches/server/Call-BlockPhysicsEvent-more-often.patch rename to patches/unapplied/server/Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/server/Call-BlockRedstoneEvents-for-lecterns.patch b/patches/unapplied/server/Call-BlockRedstoneEvents-for-lecterns.patch similarity index 100% rename from patches/server/Call-BlockRedstoneEvents-for-lecterns.patch rename to patches/unapplied/server/Call-BlockRedstoneEvents-for-lecterns.patch diff --git a/patches/server/Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/unapplied/server/Call-PaperServerListPingEvent-for-legacy-pings.patch similarity index 100% rename from patches/server/Call-PaperServerListPingEvent-for-legacy-pings.patch rename to patches/unapplied/server/Call-PaperServerListPingEvent-for-legacy-pings.patch diff --git a/patches/server/Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/unapplied/server/Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch similarity index 100% rename from patches/server/Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch rename to patches/unapplied/server/Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch diff --git a/patches/server/Call-missing-BlockDispenseEvent.patch b/patches/unapplied/server/Call-missing-BlockDispenseEvent.patch similarity index 100% rename from patches/server/Call-missing-BlockDispenseEvent.patch rename to patches/unapplied/server/Call-missing-BlockDispenseEvent.patch diff --git a/patches/server/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/server/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/server/Cap-Entity-Collisions.patch b/patches/unapplied/server/Cap-Entity-Collisions.patch similarity index 100% rename from patches/server/Cap-Entity-Collisions.patch rename to patches/unapplied/server/Cap-Entity-Collisions.patch diff --git a/patches/server/Catch-JsonParseException-in-entity-and-block-entity-.patch b/patches/unapplied/server/Catch-JsonParseException-in-entity-and-block-entity-.patch similarity index 100% rename from patches/server/Catch-JsonParseException-in-entity-and-block-entity-.patch rename to patches/unapplied/server/Catch-JsonParseException-in-entity-and-block-entity-.patch diff --git a/patches/server/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/server/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/server/Check-Drowned-for-Villager-Aggression-Config.patch b/patches/unapplied/server/Check-Drowned-for-Villager-Aggression-Config.patch similarity index 100% rename from patches/server/Check-Drowned-for-Villager-Aggression-Config.patch rename to patches/unapplied/server/Check-Drowned-for-Villager-Aggression-Config.patch diff --git a/patches/server/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/server/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/server/Check-requirement-before-suggesting-root-nodes.patch b/patches/unapplied/server/Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/Check-requirement-before-suggesting-root-nodes.patch rename to patches/unapplied/server/Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/Chunk-Save-Reattempt.patch b/patches/unapplied/server/Chunk-Save-Reattempt.patch similarity index 100% rename from patches/server/Chunk-Save-Reattempt.patch rename to patches/unapplied/server/Chunk-Save-Reattempt.patch diff --git a/patches/server/Clear-bucket-NBT-after-dispense.patch b/patches/unapplied/server/Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/Clear-bucket-NBT-after-dispense.patch rename to patches/unapplied/server/Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/Climbing-should-not-bypass-cramming-gamerule.patch b/patches/unapplied/server/Climbing-should-not-bypass-cramming-gamerule.patch similarity index 100% rename from patches/server/Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/unapplied/server/Climbing-should-not-bypass-cramming-gamerule.patch diff --git a/patches/server/Collision-API.patch b/patches/unapplied/server/Collision-API.patch similarity index 100% rename from patches/server/Collision-API.patch rename to patches/unapplied/server/Collision-API.patch diff --git a/patches/server/Collision-optimisations.patch b/patches/unapplied/server/Collision-optimisations.patch similarity index 100% rename from patches/server/Collision-optimisations.patch rename to patches/unapplied/server/Collision-optimisations.patch diff --git a/patches/server/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/server/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/server/Complete-resource-pack-API.patch b/patches/unapplied/server/Complete-resource-pack-API.patch similarity index 100% rename from patches/server/Complete-resource-pack-API.patch rename to patches/unapplied/server/Complete-resource-pack-API.patch diff --git a/patches/server/ConcurrentUtil.patch b/patches/unapplied/server/ConcurrentUtil.patch similarity index 100% rename from patches/server/ConcurrentUtil.patch rename to patches/unapplied/server/ConcurrentUtil.patch diff --git a/patches/server/Conduit-API.patch b/patches/unapplied/server/Conduit-API.patch similarity index 100% rename from patches/server/Conduit-API.patch rename to patches/unapplied/server/Conduit-API.patch diff --git a/patches/server/Config-option-for-Piglins-guarding-chests.patch b/patches/unapplied/server/Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/Config-option-for-Piglins-guarding-chests.patch rename to patches/unapplied/server/Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/Configurable-Cartographer-Treasure-Maps.patch b/patches/unapplied/server/Configurable-Cartographer-Treasure-Maps.patch similarity index 100% rename from patches/server/Configurable-Cartographer-Treasure-Maps.patch rename to patches/unapplied/server/Configurable-Cartographer-Treasure-Maps.patch diff --git a/patches/server/Configurable-Chunk-Inhabited-Time.patch b/patches/unapplied/server/Configurable-Chunk-Inhabited-Time.patch similarity index 100% rename from patches/server/Configurable-Chunk-Inhabited-Time.patch rename to patches/unapplied/server/Configurable-Chunk-Inhabited-Time.patch diff --git a/patches/server/Configurable-Disabling-Cat-Chest-Detection.patch b/patches/unapplied/server/Configurable-Disabling-Cat-Chest-Detection.patch similarity index 100% rename from patches/server/Configurable-Disabling-Cat-Chest-Detection.patch rename to patches/unapplied/server/Configurable-Disabling-Cat-Chest-Detection.patch diff --git a/patches/server/Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/unapplied/server/Configurable-Keep-Spawn-Loaded-range-per-world.patch similarity index 100% rename from patches/server/Configurable-Keep-Spawn-Loaded-range-per-world.patch rename to patches/unapplied/server/Configurable-Keep-Spawn-Loaded-range-per-world.patch diff --git a/patches/server/Configurable-LootPool-luck-formula.patch b/patches/unapplied/server/Configurable-LootPool-luck-formula.patch similarity index 100% rename from patches/server/Configurable-LootPool-luck-formula.patch rename to patches/unapplied/server/Configurable-LootPool-luck-formula.patch diff --git a/patches/server/Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/unapplied/server/Configurable-Non-Player-Arrow-Despawn-Rate.patch similarity index 100% rename from patches/server/Configurable-Non-Player-Arrow-Despawn-Rate.patch rename to patches/unapplied/server/Configurable-Non-Player-Arrow-Despawn-Rate.patch diff --git a/patches/server/Configurable-Player-Collision.patch b/patches/unapplied/server/Configurable-Player-Collision.patch similarity index 100% rename from patches/server/Configurable-Player-Collision.patch rename to patches/unapplied/server/Configurable-Player-Collision.patch diff --git a/patches/server/Configurable-RCON-IP-address.patch b/patches/unapplied/server/Configurable-RCON-IP-address.patch similarity index 100% rename from patches/server/Configurable-RCON-IP-address.patch rename to patches/unapplied/server/Configurable-RCON-IP-address.patch diff --git a/patches/server/Configurable-Region-Compression-Format.patch b/patches/unapplied/server/Configurable-Region-Compression-Format.patch similarity index 100% rename from patches/server/Configurable-Region-Compression-Format.patch rename to patches/unapplied/server/Configurable-Region-Compression-Format.patch diff --git a/patches/server/Configurable-baby-zombie-movement-speed.patch b/patches/unapplied/server/Configurable-baby-zombie-movement-speed.patch similarity index 100% rename from patches/server/Configurable-baby-zombie-movement-speed.patch rename to patches/unapplied/server/Configurable-baby-zombie-movement-speed.patch diff --git a/patches/server/Configurable-cactus-bamboo-and-reed-growth-height.patch b/patches/unapplied/server/Configurable-cactus-bamboo-and-reed-growth-height.patch similarity index 100% rename from patches/server/Configurable-cactus-bamboo-and-reed-growth-height.patch rename to patches/unapplied/server/Configurable-cactus-bamboo-and-reed-growth-height.patch diff --git a/patches/server/Configurable-chance-of-villager-zombie-infection.patch b/patches/unapplied/server/Configurable-chance-of-villager-zombie-infection.patch similarity index 100% rename from patches/server/Configurable-chance-of-villager-zombie-infection.patch rename to patches/unapplied/server/Configurable-chance-of-villager-zombie-infection.patch diff --git a/patches/server/Configurable-chat-thread-limit.patch b/patches/unapplied/server/Configurable-chat-thread-limit.patch similarity index 100% rename from patches/server/Configurable-chat-thread-limit.patch rename to patches/unapplied/server/Configurable-chat-thread-limit.patch diff --git a/patches/server/Configurable-connection-throttle-kick-message.patch b/patches/unapplied/server/Configurable-connection-throttle-kick-message.patch similarity index 100% rename from patches/server/Configurable-connection-throttle-kick-message.patch rename to patches/unapplied/server/Configurable-connection-throttle-kick-message.patch diff --git a/patches/server/Configurable-container-update-tick-rate.patch b/patches/unapplied/server/Configurable-container-update-tick-rate.patch similarity index 100% rename from patches/server/Configurable-container-update-tick-rate.patch rename to patches/unapplied/server/Configurable-container-update-tick-rate.patch diff --git a/patches/server/Configurable-door-breaking-difficulty.patch b/patches/unapplied/server/Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/Configurable-door-breaking-difficulty.patch rename to patches/unapplied/server/Configurable-door-breaking-difficulty.patch diff --git a/patches/server/Configurable-end-credits.patch b/patches/unapplied/server/Configurable-end-credits.patch similarity index 100% rename from patches/server/Configurable-end-credits.patch rename to patches/unapplied/server/Configurable-end-credits.patch diff --git a/patches/server/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/server/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/server/Configurable-feature-seeds.patch b/patches/unapplied/server/Configurable-feature-seeds.patch similarity index 100% rename from patches/server/Configurable-feature-seeds.patch rename to patches/unapplied/server/Configurable-feature-seeds.patch diff --git a/patches/server/Configurable-fishing-time-ranges.patch b/patches/unapplied/server/Configurable-fishing-time-ranges.patch similarity index 100% rename from patches/server/Configurable-fishing-time-ranges.patch rename to patches/unapplied/server/Configurable-fishing-time-ranges.patch diff --git a/patches/server/Configurable-flying-kick-messages.patch b/patches/unapplied/server/Configurable-flying-kick-messages.patch similarity index 100% rename from patches/server/Configurable-flying-kick-messages.patch rename to patches/unapplied/server/Configurable-flying-kick-messages.patch diff --git a/patches/server/Configurable-inter-world-teleportation-safety.patch b/patches/unapplied/server/Configurable-inter-world-teleportation-safety.patch similarity index 100% rename from patches/server/Configurable-inter-world-teleportation-safety.patch rename to patches/unapplied/server/Configurable-inter-world-teleportation-safety.patch diff --git a/patches/server/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/server/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/server/Configurable-max-block-fluid-ticks.patch b/patches/unapplied/server/Configurable-max-block-fluid-ticks.patch similarity index 100% rename from patches/server/Configurable-max-block-fluid-ticks.patch rename to patches/unapplied/server/Configurable-max-block-fluid-ticks.patch diff --git a/patches/server/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/server/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/server/Configurable-max-leash-distance.patch b/patches/unapplied/server/Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/Configurable-max-leash-distance.patch rename to patches/unapplied/server/Configurable-max-leash-distance.patch diff --git a/patches/server/Configurable-mob-spawner-tick-rate.patch b/patches/unapplied/server/Configurable-mob-spawner-tick-rate.patch similarity index 100% rename from patches/server/Configurable-mob-spawner-tick-rate.patch rename to patches/unapplied/server/Configurable-mob-spawner-tick-rate.patch diff --git a/patches/server/Configurable-packet-in-spam-threshold.patch b/patches/unapplied/server/Configurable-packet-in-spam-threshold.patch similarity index 100% rename from patches/server/Configurable-packet-in-spam-threshold.patch rename to patches/unapplied/server/Configurable-packet-in-spam-threshold.patch diff --git a/patches/server/Configurable-projectile-relative-velocity.patch b/patches/unapplied/server/Configurable-projectile-relative-velocity.patch similarity index 100% rename from patches/server/Configurable-projectile-relative-velocity.patch rename to patches/unapplied/server/Configurable-projectile-relative-velocity.patch diff --git a/patches/server/Configurable-random-tick-rates-for-blocks.patch b/patches/unapplied/server/Configurable-random-tick-rates-for-blocks.patch similarity index 100% rename from patches/server/Configurable-random-tick-rates-for-blocks.patch rename to patches/unapplied/server/Configurable-random-tick-rates-for-blocks.patch diff --git a/patches/server/Configurable-sculk-sensor-listener-range.patch b/patches/unapplied/server/Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/server/Configurable-sculk-sensor-listener-range.patch rename to patches/unapplied/server/Configurable-sculk-sensor-listener-range.patch diff --git a/patches/server/Configurable-spawn-chances-for-skeleton-horses.patch b/patches/unapplied/server/Configurable-spawn-chances-for-skeleton-horses.patch similarity index 100% rename from patches/server/Configurable-spawn-chances-for-skeleton-horses.patch rename to patches/unapplied/server/Configurable-spawn-chances-for-skeleton-horses.patch diff --git a/patches/server/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/server/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/server/Configurable-sprint-interruption-on-attack.patch b/patches/unapplied/server/Configurable-sprint-interruption-on-attack.patch similarity index 100% rename from patches/server/Configurable-sprint-interruption-on-attack.patch rename to patches/unapplied/server/Configurable-sprint-interruption-on-attack.patch diff --git a/patches/server/Configurable-top-of-nether-void-damage.patch b/patches/unapplied/server/Configurable-top-of-nether-void-damage.patch similarity index 100% rename from patches/server/Configurable-top-of-nether-void-damage.patch rename to patches/unapplied/server/Configurable-top-of-nether-void-damage.patch diff --git a/patches/server/Configure-sniffer-egg-hatch-time.patch b/patches/unapplied/server/Configure-sniffer-egg-hatch-time.patch similarity index 100% rename from patches/server/Configure-sniffer-egg-hatch-time.patch rename to patches/unapplied/server/Configure-sniffer-egg-hatch-time.patch diff --git a/patches/server/Convert-legacy-attributes-in-Item-Meta.patch b/patches/unapplied/server/Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from patches/server/Convert-legacy-attributes-in-Item-Meta.patch rename to patches/unapplied/server/Convert-legacy-attributes-in-Item-Meta.patch diff --git a/patches/server/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/server/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/server/Correctly-handle-ArmorStand-invisibility.patch b/patches/unapplied/server/Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/server/Correctly-handle-ArmorStand-invisibility.patch rename to patches/unapplied/server/Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/server/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/server/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/server/Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/unapplied/server/Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 100% rename from patches/server/Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/unapplied/server/Correctly-shrink-items-during-EntityResurrectEvent.patch diff --git a/patches/server/Create-HoverEvent-from-ItemStack-Entity.patch b/patches/unapplied/server/Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/unapplied/server/Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/Custom-Chat-Completion-Suggestions-API.patch b/patches/unapplied/server/Custom-Chat-Completion-Suggestions-API.patch similarity index 100% rename from patches/server/Custom-Chat-Completion-Suggestions-API.patch rename to patches/unapplied/server/Custom-Chat-Completion-Suggestions-API.patch diff --git a/patches/server/Custom-Potion-Mixes.patch b/patches/unapplied/server/Custom-Potion-Mixes.patch similarity index 100% rename from patches/server/Custom-Potion-Mixes.patch rename to patches/unapplied/server/Custom-Potion-Mixes.patch diff --git a/patches/server/Custom-replacement-for-eaten-items.patch b/patches/unapplied/server/Custom-replacement-for-eaten-items.patch similarity index 100% rename from patches/server/Custom-replacement-for-eaten-items.patch rename to patches/unapplied/server/Custom-replacement-for-eaten-items.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/Deep-clone-unhandled-nbt-tags.patch b/patches/unapplied/server/Deep-clone-unhandled-nbt-tags.patch similarity index 100% rename from patches/server/Deep-clone-unhandled-nbt-tags.patch rename to patches/unapplied/server/Deep-clone-unhandled-nbt-tags.patch diff --git a/patches/server/Default-loading-permissions.yml-before-plugins.patch b/patches/unapplied/server/Default-loading-permissions.yml-before-plugins.patch similarity index 100% rename from patches/server/Default-loading-permissions.yml-before-plugins.patch rename to patches/unapplied/server/Default-loading-permissions.yml-before-plugins.patch diff --git a/patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/unapplied/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch similarity index 100% rename from patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch rename to patches/unapplied/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch diff --git a/patches/server/Deprecate-ItemStack-setType.patch b/patches/unapplied/server/Deprecate-ItemStack-setType.patch similarity index 100% rename from patches/server/Deprecate-ItemStack-setType.patch rename to patches/unapplied/server/Deprecate-ItemStack-setType.patch diff --git a/patches/server/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/server/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/server/Detail-more-information-in-watchdog-dumps.patch b/patches/unapplied/server/Detail-more-information-in-watchdog-dumps.patch similarity index 100% rename from patches/server/Detail-more-information-in-watchdog-dumps.patch rename to patches/unapplied/server/Detail-more-information-in-watchdog-dumps.patch diff --git a/patches/server/Detect-headless-JREs.patch b/patches/unapplied/server/Detect-headless-JREs.patch similarity index 100% rename from patches/server/Detect-headless-JREs.patch rename to patches/unapplied/server/Detect-headless-JREs.patch diff --git a/patches/server/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/server/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/server/Disable-Explicit-Network-Manager-Flushing.patch b/patches/unapplied/server/Disable-Explicit-Network-Manager-Flushing.patch similarity index 100% rename from patches/server/Disable-Explicit-Network-Manager-Flushing.patch rename to patches/unapplied/server/Disable-Explicit-Network-Manager-Flushing.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/Disable-explosion-knockback.patch b/patches/unapplied/server/Disable-explosion-knockback.patch similarity index 100% rename from patches/server/Disable-explosion-knockback.patch rename to patches/unapplied/server/Disable-explosion-knockback.patch diff --git a/patches/server/Disable-ice-and-snow.patch b/patches/unapplied/server/Disable-ice-and-snow.patch similarity index 100% rename from patches/server/Disable-ice-and-snow.patch rename to patches/unapplied/server/Disable-ice-and-snow.patch diff --git a/patches/server/Disable-memory-reserve-allocating.patch b/patches/unapplied/server/Disable-memory-reserve-allocating.patch similarity index 100% rename from patches/server/Disable-memory-reserve-allocating.patch rename to patches/unapplied/server/Disable-memory-reserve-allocating.patch diff --git a/patches/server/Disable-spigot-tick-limiters.patch b/patches/unapplied/server/Disable-spigot-tick-limiters.patch similarity index 100% rename from patches/server/Disable-spigot-tick-limiters.patch rename to patches/unapplied/server/Disable-spigot-tick-limiters.patch diff --git a/patches/server/Disable-thunder.patch b/patches/unapplied/server/Disable-thunder.patch similarity index 100% rename from patches/server/Disable-thunder.patch rename to patches/unapplied/server/Disable-thunder.patch diff --git a/patches/server/Distance-manager-tick-timings.patch b/patches/unapplied/server/Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/Distance-manager-tick-timings.patch rename to patches/unapplied/server/Distance-manager-tick-timings.patch diff --git a/patches/server/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/server/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/server/Do-not-accept-invalid-client-settings.patch b/patches/unapplied/server/Do-not-accept-invalid-client-settings.patch similarity index 100% rename from patches/server/Do-not-accept-invalid-client-settings.patch rename to patches/unapplied/server/Do-not-accept-invalid-client-settings.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/Do-not-load-chunks-for-Pathfinding.patch b/patches/unapplied/server/Do-not-load-chunks-for-Pathfinding.patch similarity index 100% rename from patches/server/Do-not-load-chunks-for-Pathfinding.patch rename to patches/unapplied/server/Do-not-load-chunks-for-Pathfinding.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/unapplied/server/Don-t-call-getItemMeta-on-hasItemMeta.patch similarity index 100% rename from patches/server/Don-t-call-getItemMeta-on-hasItemMeta.patch rename to patches/unapplied/server/Don-t-call-getItemMeta-on-hasItemMeta.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/unapplied/server/Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 100% rename from patches/server/Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/unapplied/server/Don-t-ignore-result-of-PlayerEditBookEvent.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/Don-t-require-FACING-data.patch b/patches/unapplied/server/Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/Don-t-require-FACING-data.patch rename to patches/unapplied/server/Don-t-require-FACING-data.patch diff --git a/patches/server/Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/unapplied/server/Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 100% rename from patches/server/Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/unapplied/server/Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/Don-t-tick-dead-players.patch b/patches/unapplied/server/Don-t-tick-dead-players.patch similarity index 100% rename from patches/server/Don-t-tick-dead-players.patch rename to patches/unapplied/server/Don-t-tick-dead-players.patch diff --git a/patches/server/Don-t-tick-markers.patch b/patches/unapplied/server/Don-t-tick-markers.patch similarity index 100% rename from patches/server/Don-t-tick-markers.patch rename to patches/unapplied/server/Don-t-tick-markers.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/Dont-resend-blocks-on-interactions.patch b/patches/unapplied/server/Dont-resend-blocks-on-interactions.patch similarity index 100% rename from patches/server/Dont-resend-blocks-on-interactions.patch rename to patches/unapplied/server/Dont-resend-blocks-on-interactions.patch diff --git a/patches/server/Dont-resent-entity-on-art-update.patch b/patches/unapplied/server/Dont-resent-entity-on-art-update.patch similarity index 100% rename from patches/server/Dont-resent-entity-on-art-update.patch rename to patches/unapplied/server/Dont-resent-entity-on-art-update.patch diff --git a/patches/server/Dont-send-unnecessary-sign-update.patch b/patches/unapplied/server/Dont-send-unnecessary-sign-update.patch similarity index 100% rename from patches/server/Dont-send-unnecessary-sign-update.patch rename to patches/unapplied/server/Dont-send-unnecessary-sign-update.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/Duplicate-UUID-Resolve-Option.patch b/patches/unapplied/server/Duplicate-UUID-Resolve-Option.patch similarity index 100% rename from patches/server/Duplicate-UUID-Resolve-Option.patch rename to patches/unapplied/server/Duplicate-UUID-Resolve-Option.patch diff --git a/patches/server/Eigencraft-redstone-implementation.patch b/patches/unapplied/server/Eigencraft-redstone-implementation.patch similarity index 100% rename from patches/server/Eigencraft-redstone-implementation.patch rename to patches/unapplied/server/Eigencraft-redstone-implementation.patch diff --git a/patches/server/Elder-Guardian-appearance-API.patch b/patches/unapplied/server/Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/server/Elder-Guardian-appearance-API.patch rename to patches/unapplied/server/Elder-Guardian-appearance-API.patch diff --git a/patches/server/Empty-commands-shall-not-be-dispatched.patch b/patches/unapplied/server/Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/Empty-commands-shall-not-be-dispatched.patch rename to patches/unapplied/server/Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/EnderDragon-Events.patch b/patches/unapplied/server/EnderDragon-Events.patch similarity index 100% rename from patches/server/EnderDragon-Events.patch rename to patches/unapplied/server/EnderDragon-Events.patch diff --git a/patches/server/Enderman.teleportRandomly.patch b/patches/unapplied/server/Enderman.teleportRandomly.patch similarity index 100% rename from patches/server/Enderman.teleportRandomly.patch rename to patches/unapplied/server/Enderman.teleportRandomly.patch diff --git a/patches/server/EndermanAttackPlayerEvent.patch b/patches/unapplied/server/EndermanAttackPlayerEvent.patch similarity index 100% rename from patches/server/EndermanAttackPlayerEvent.patch rename to patches/unapplied/server/EndermanAttackPlayerEvent.patch diff --git a/patches/server/EndermanEscapeEvent.patch b/patches/unapplied/server/EndermanEscapeEvent.patch similarity index 100% rename from patches/server/EndermanEscapeEvent.patch rename to patches/unapplied/server/EndermanEscapeEvent.patch diff --git a/patches/server/Enforce-Sync-Player-Saves.patch b/patches/unapplied/server/Enforce-Sync-Player-Saves.patch similarity index 100% rename from patches/server/Enforce-Sync-Player-Saves.patch rename to patches/unapplied/server/Enforce-Sync-Player-Saves.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/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/server/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/server/Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/unapplied/server/Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 100% rename from patches/server/Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/unapplied/server/Ensure-disconnect-for-book-edit-is-called-on-main.patch diff --git a/patches/server/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/server/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/server/Ensure-safe-gateway-teleport.patch b/patches/unapplied/server/Ensure-safe-gateway-teleport.patch similarity index 100% rename from patches/server/Ensure-safe-gateway-teleport.patch rename to patches/unapplied/server/Ensure-safe-gateway-teleport.patch diff --git a/patches/server/Ensure-valid-vehicle-status.patch b/patches/unapplied/server/Ensure-valid-vehicle-status.patch similarity index 100% rename from patches/server/Ensure-valid-vehicle-status.patch rename to patches/unapplied/server/Ensure-valid-vehicle-status.patch diff --git a/patches/server/Entity-Activation-Range-2.0.patch b/patches/unapplied/server/Entity-Activation-Range-2.0.patch similarity index 100% rename from patches/server/Entity-Activation-Range-2.0.patch rename to patches/unapplied/server/Entity-Activation-Range-2.0.patch diff --git a/patches/server/Entity-AddTo-RemoveFrom-World-Events.patch b/patches/unapplied/server/Entity-AddTo-RemoveFrom-World-Events.patch similarity index 100% rename from patches/server/Entity-AddTo-RemoveFrom-World-Events.patch rename to patches/unapplied/server/Entity-AddTo-RemoveFrom-World-Events.patch diff --git a/patches/server/Entity-Jump-API.patch b/patches/unapplied/server/Entity-Jump-API.patch similarity index 100% rename from patches/server/Entity-Jump-API.patch rename to patches/unapplied/server/Entity-Jump-API.patch diff --git a/patches/server/Entity-Origin-API.patch b/patches/unapplied/server/Entity-Origin-API.patch similarity index 100% rename from patches/server/Entity-Origin-API.patch rename to patches/unapplied/server/Entity-Origin-API.patch diff --git a/patches/server/Entity-fromMobSpawner.patch b/patches/unapplied/server/Entity-fromMobSpawner.patch similarity index 100% rename from patches/server/Entity-fromMobSpawner.patch rename to patches/unapplied/server/Entity-fromMobSpawner.patch diff --git a/patches/server/Entity-getEntitySpawnReason.patch b/patches/unapplied/server/Entity-getEntitySpawnReason.patch similarity index 100% rename from patches/server/Entity-getEntitySpawnReason.patch rename to patches/unapplied/server/Entity-getEntitySpawnReason.patch diff --git a/patches/server/Entity-isTicking.patch b/patches/unapplied/server/Entity-isTicking.patch similarity index 100% rename from patches/server/Entity-isTicking.patch rename to patches/unapplied/server/Entity-isTicking.patch diff --git a/patches/server/Entity-load-save-limit-per-chunk.patch b/patches/unapplied/server/Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/Entity-load-save-limit-per-chunk.patch rename to patches/unapplied/server/Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/Entity-powdered-snow-API.patch b/patches/unapplied/server/Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/Entity-powdered-snow-API.patch rename to patches/unapplied/server/Entity-powdered-snow-API.patch diff --git a/patches/server/EntityPathfindEvent.patch b/patches/unapplied/server/EntityPathfindEvent.patch similarity index 100% rename from patches/server/EntityPathfindEvent.patch rename to patches/unapplied/server/EntityPathfindEvent.patch diff --git a/patches/server/EntityPickupItemEvent-fixes.patch b/patches/unapplied/server/EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/server/EntityPickupItemEvent-fixes.patch rename to patches/unapplied/server/EntityPickupItemEvent-fixes.patch diff --git a/patches/server/EntityRegainHealthEvent-isFastRegen-API.patch b/patches/unapplied/server/EntityRegainHealthEvent-isFastRegen-API.patch similarity index 100% rename from patches/server/EntityRegainHealthEvent-isFastRegen-API.patch rename to patches/unapplied/server/EntityRegainHealthEvent-isFastRegen-API.patch diff --git a/patches/server/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/server/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/server/Execute-chunk-tasks-mid-tick.patch b/patches/unapplied/server/Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/server/Execute-chunk-tasks-mid-tick.patch rename to patches/unapplied/server/Execute-chunk-tasks-mid-tick.patch diff --git a/patches/server/Expand-ArmorStand-API.patch b/patches/unapplied/server/Expand-ArmorStand-API.patch similarity index 100% rename from patches/server/Expand-ArmorStand-API.patch rename to patches/unapplied/server/Expand-ArmorStand-API.patch diff --git a/patches/server/Expand-EntityUnleashEvent.patch b/patches/unapplied/server/Expand-EntityUnleashEvent.patch similarity index 100% rename from patches/server/Expand-EntityUnleashEvent.patch rename to patches/unapplied/server/Expand-EntityUnleashEvent.patch diff --git a/patches/server/Expand-Explosions-API.patch b/patches/unapplied/server/Expand-Explosions-API.patch similarity index 100% rename from patches/server/Expand-Explosions-API.patch rename to patches/unapplied/server/Expand-Explosions-API.patch diff --git a/patches/server/Expand-FallingBlock-API.patch b/patches/unapplied/server/Expand-FallingBlock-API.patch similarity index 100% rename from patches/server/Expand-FallingBlock-API.patch rename to patches/unapplied/server/Expand-FallingBlock-API.patch diff --git a/patches/server/Expand-LingeringPotion-API.patch b/patches/unapplied/server/Expand-LingeringPotion-API.patch similarity index 100% rename from patches/server/Expand-LingeringPotion-API.patch rename to patches/unapplied/server/Expand-LingeringPotion-API.patch diff --git a/patches/server/Expand-PlayerGameModeChangeEvent.patch b/patches/unapplied/server/Expand-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/server/Expand-PlayerGameModeChangeEvent.patch rename to patches/unapplied/server/Expand-PlayerGameModeChangeEvent.patch diff --git a/patches/server/Expand-PlayerItemDamageEvent.patch b/patches/unapplied/server/Expand-PlayerItemDamageEvent.patch similarity index 100% rename from patches/server/Expand-PlayerItemDamageEvent.patch rename to patches/unapplied/server/Expand-PlayerItemDamageEvent.patch diff --git a/patches/server/Expand-PlayerItemMendEvent.patch b/patches/unapplied/server/Expand-PlayerItemMendEvent.patch similarity index 100% rename from patches/server/Expand-PlayerItemMendEvent.patch rename to patches/unapplied/server/Expand-PlayerItemMendEvent.patch diff --git a/patches/server/Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch b/patches/unapplied/server/Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch similarity index 100% rename from patches/server/Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch rename to patches/unapplied/server/Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch diff --git a/patches/server/Expand-Pose-API.patch b/patches/unapplied/server/Expand-Pose-API.patch similarity index 100% rename from patches/server/Expand-Pose-API.patch rename to patches/unapplied/server/Expand-Pose-API.patch diff --git a/patches/server/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/server/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/server/Expand-world-key-API.patch b/patches/unapplied/server/Expand-world-key-API.patch similarity index 100% rename from patches/server/Expand-world-key-API.patch rename to patches/unapplied/server/Expand-world-key-API.patch diff --git a/patches/server/Expanded-Hopper-API.patch b/patches/unapplied/server/Expanded-Hopper-API.patch similarity index 100% rename from patches/server/Expanded-Hopper-API.patch rename to patches/unapplied/server/Expanded-Hopper-API.patch diff --git a/patches/server/ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/unapplied/server/ExperienceOrb-should-call-EntitySpawnEvent.patch similarity index 100% rename from patches/server/ExperienceOrb-should-call-EntitySpawnEvent.patch rename to patches/unapplied/server/ExperienceOrb-should-call-EntitySpawnEvent.patch diff --git a/patches/server/ExperienceOrbMergeEvent.patch b/patches/unapplied/server/ExperienceOrbMergeEvent.patch similarity index 100% rename from patches/server/ExperienceOrbMergeEvent.patch rename to patches/unapplied/server/ExperienceOrbMergeEvent.patch diff --git a/patches/server/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/server/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/server/Expose-LivingEntity-hurt-direction.patch b/patches/unapplied/server/Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/Expose-LivingEntity-hurt-direction.patch rename to patches/unapplied/server/Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/Expose-LootTable-of-DecoratedPot.patch b/patches/unapplied/server/Expose-LootTable-of-DecoratedPot.patch similarity index 100% rename from patches/server/Expose-LootTable-of-DecoratedPot.patch rename to patches/unapplied/server/Expose-LootTable-of-DecoratedPot.patch diff --git a/patches/server/Expose-MinecraftServer-isRunning.patch b/patches/unapplied/server/Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/server/Expose-MinecraftServer-isRunning.patch rename to patches/unapplied/server/Expose-MinecraftServer-isRunning.patch diff --git a/patches/server/Expose-Tracked-Players.patch b/patches/unapplied/server/Expose-Tracked-Players.patch similarity index 100% rename from patches/server/Expose-Tracked-Players.patch rename to patches/unapplied/server/Expose-Tracked-Players.patch diff --git a/patches/server/Expose-attack-cooldown-methods-for-Player.patch b/patches/unapplied/server/Expose-attack-cooldown-methods-for-Player.patch similarity index 100% rename from patches/server/Expose-attack-cooldown-methods-for-Player.patch rename to patches/unapplied/server/Expose-attack-cooldown-methods-for-Player.patch diff --git a/patches/server/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/server/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/server/Expose-furnace-minecart-push-values.patch b/patches/unapplied/server/Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/server/Expose-furnace-minecart-push-values.patch rename to patches/unapplied/server/Expose-furnace-minecart-push-values.patch diff --git a/patches/server/Expose-game-version.patch b/patches/unapplied/server/Expose-game-version.patch similarity index 100% rename from patches/server/Expose-game-version.patch rename to patches/unapplied/server/Expose-game-version.patch diff --git a/patches/server/Expose-hand-in-BlockCanBuildEvent.patch b/patches/unapplied/server/Expose-hand-in-BlockCanBuildEvent.patch similarity index 100% rename from patches/server/Expose-hand-in-BlockCanBuildEvent.patch rename to patches/unapplied/server/Expose-hand-in-BlockCanBuildEvent.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/Expose-protocol-version.patch b/patches/unapplied/server/Expose-protocol-version.patch similarity index 100% rename from patches/server/Expose-protocol-version.patch rename to patches/unapplied/server/Expose-protocol-version.patch diff --git a/patches/server/Expose-server-CommandMap.patch b/patches/unapplied/server/Expose-server-CommandMap.patch similarity index 100% rename from patches/server/Expose-server-CommandMap.patch rename to patches/unapplied/server/Expose-server-CommandMap.patch diff --git a/patches/server/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/server/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/server/Expose-the-internal-current-tick.patch b/patches/unapplied/server/Expose-the-internal-current-tick.patch similarity index 100% rename from patches/server/Expose-the-internal-current-tick.patch rename to patches/unapplied/server/Expose-the-internal-current-tick.patch diff --git a/patches/server/Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/unapplied/server/Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/server/Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/unapplied/server/Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/server/Expose-world-spawn-angle.patch b/patches/unapplied/server/Expose-world-spawn-angle.patch similarity index 100% rename from patches/server/Expose-world-spawn-angle.patch rename to patches/unapplied/server/Expose-world-spawn-angle.patch diff --git a/patches/server/Extend-Player-Interact-cancellation.patch b/patches/unapplied/server/Extend-Player-Interact-cancellation.patch similarity index 100% rename from patches/server/Extend-Player-Interact-cancellation.patch rename to patches/unapplied/server/Extend-Player-Interact-cancellation.patch diff --git a/patches/server/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/server/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/server/Faster-redstone-torch-rapid-clock-removal.patch b/patches/unapplied/server/Faster-redstone-torch-rapid-clock-removal.patch similarity index 100% rename from patches/server/Faster-redstone-torch-rapid-clock-removal.patch rename to patches/unapplied/server/Faster-redstone-torch-rapid-clock-removal.patch diff --git a/patches/server/Fill-Profile-Property-Events.patch b/patches/unapplied/server/Fill-Profile-Property-Events.patch similarity index 100% rename from patches/server/Fill-Profile-Property-Events.patch rename to patches/unapplied/server/Fill-Profile-Property-Events.patch diff --git a/patches/server/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/server/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/server/Fire-CauldronLevelChange-on-initial-fill.patch b/patches/unapplied/server/Fire-CauldronLevelChange-on-initial-fill.patch similarity index 100% rename from patches/server/Fire-CauldronLevelChange-on-initial-fill.patch rename to patches/unapplied/server/Fire-CauldronLevelChange-on-initial-fill.patch diff --git a/patches/server/Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/unapplied/server/Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/server/Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/unapplied/server/Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/server/Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/unapplied/server/Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch similarity index 100% rename from patches/server/Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch rename to patches/unapplied/server/Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/Fire-event-on-GS4-query.patch b/patches/unapplied/server/Fire-event-on-GS4-query.patch similarity index 100% rename from patches/server/Fire-event-on-GS4-query.patch rename to patches/unapplied/server/Fire-event-on-GS4-query.patch diff --git a/patches/server/Firework-API-s.patch b/patches/unapplied/server/Firework-API-s.patch similarity index 100% rename from patches/server/Firework-API-s.patch rename to patches/unapplied/server/Firework-API-s.patch diff --git a/patches/server/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/server/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/server/Fix-BanList-API.patch b/patches/unapplied/server/Fix-BanList-API.patch similarity index 100% rename from patches/server/Fix-BanList-API.patch rename to patches/unapplied/server/Fix-BanList-API.patch diff --git a/patches/server/Fix-Bee-flower-NPE.patch b/patches/unapplied/server/Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/server/Fix-Bee-flower-NPE.patch rename to patches/unapplied/server/Fix-Bee-flower-NPE.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/unapplied/server/Fix-CME-in-CraftPersistentDataTypeRegistry.patch similarity index 100% rename from patches/server/Fix-CME-in-CraftPersistentDataTypeRegistry.patch rename to patches/unapplied/server/Fix-CME-in-CraftPersistentDataTypeRegistry.patch diff --git a/patches/server/Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/unapplied/server/Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch similarity index 100% rename from patches/server/Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch rename to patches/unapplied/server/Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/Fix-Concurrency-issue-in-ShufflingList.patch b/patches/unapplied/server/Fix-Concurrency-issue-in-ShufflingList.patch similarity index 100% rename from patches/server/Fix-Concurrency-issue-in-ShufflingList.patch rename to patches/unapplied/server/Fix-Concurrency-issue-in-ShufflingList.patch diff --git a/patches/server/Fix-CraftCriteria-defaults-map.patch b/patches/unapplied/server/Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/Fix-CraftCriteria-defaults-map.patch rename to patches/unapplied/server/Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/Fix-CraftEntity-hashCode.patch b/patches/unapplied/server/Fix-CraftEntity-hashCode.patch similarity index 100% rename from patches/server/Fix-CraftEntity-hashCode.patch rename to patches/unapplied/server/Fix-CraftEntity-hashCode.patch diff --git a/patches/server/Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/unapplied/server/Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch similarity index 100% rename from patches/server/Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch rename to patches/unapplied/server/Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch diff --git a/patches/server/Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/unapplied/server/Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 100% rename from patches/server/Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to patches/unapplied/server/Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch diff --git a/patches/server/Fix-CraftSound-backwards-compatibility.patch b/patches/unapplied/server/Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/Fix-CraftSound-backwards-compatibility.patch rename to patches/unapplied/server/Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/Fix-DamageSource-API.patch b/patches/unapplied/server/Fix-DamageSource-API.patch similarity index 100% rename from patches/server/Fix-DamageSource-API.patch rename to patches/unapplied/server/Fix-DamageSource-API.patch diff --git a/patches/server/Fix-Entity-Position-Desync.patch b/patches/unapplied/server/Fix-Entity-Position-Desync.patch similarity index 100% rename from patches/server/Fix-Entity-Position-Desync.patch rename to patches/unapplied/server/Fix-Entity-Position-Desync.patch diff --git a/patches/server/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/server/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/server/Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/unapplied/server/Fix-EntityArgument-suggestion-permissions-to-align-w.patch similarity index 100% rename from patches/server/Fix-EntityArgument-suggestion-permissions-to-align-w.patch rename to patches/unapplied/server/Fix-EntityArgument-suggestion-permissions-to-align-w.patch diff --git a/patches/server/Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/unapplied/server/Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 100% rename from patches/server/Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/unapplied/server/Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch diff --git a/patches/server/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/server/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/server/Fix-GameProfileCache-concurrency.patch b/patches/unapplied/server/Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/Fix-GameProfileCache-concurrency.patch rename to patches/unapplied/server/Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/Fix-NBT-type-issues.patch b/patches/unapplied/server/Fix-NBT-type-issues.patch similarity index 100% rename from patches/server/Fix-NBT-type-issues.patch rename to patches/unapplied/server/Fix-NBT-type-issues.patch diff --git a/patches/server/Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/unapplied/server/Fix-NPE-in-AdvancementProgress-getDateAwarded.patch similarity index 100% rename from patches/server/Fix-NPE-in-AdvancementProgress-getDateAwarded.patch rename to patches/unapplied/server/Fix-NPE-in-AdvancementProgress-getDateAwarded.patch diff --git a/patches/server/Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/unapplied/server/Fix-NPE-in-SculkBloomEvent-world-access.patch similarity index 100% rename from patches/server/Fix-NPE-in-SculkBloomEvent-world-access.patch rename to patches/unapplied/server/Fix-NPE-in-SculkBloomEvent-world-access.patch diff --git a/patches/server/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/server/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/server/Fix-NPE-on-Boat-getStatus.patch b/patches/unapplied/server/Fix-NPE-on-Boat-getStatus.patch similarity index 100% rename from patches/server/Fix-NPE-on-Boat-getStatus.patch rename to patches/unapplied/server/Fix-NPE-on-Boat-getStatus.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/Fix-NotePlayEvent.patch b/patches/unapplied/server/Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/Fix-NotePlayEvent.patch rename to patches/unapplied/server/Fix-NotePlayEvent.patch diff --git a/patches/server/Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/unapplied/server/Fix-OfflinePlayer-getBedSpawnLocation.patch similarity index 100% rename from patches/server/Fix-OfflinePlayer-getBedSpawnLocation.patch rename to patches/unapplied/server/Fix-OfflinePlayer-getBedSpawnLocation.patch diff --git a/patches/server/Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/unapplied/server/Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 100% rename from patches/server/Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/unapplied/server/Fix-Per-World-Difficulty-Remembering-Difficulty.patch diff --git a/patches/server/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/server/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/server/Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/unapplied/server/Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/unapplied/server/Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/unapplied/server/Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 100% rename from patches/server/Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/unapplied/server/Fix-PlayerDropItemEvent-using-wrong-item.patch diff --git a/patches/server/Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/unapplied/server/Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 100% rename from patches/server/Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/unapplied/server/Fix-PlayerItemConsumeEvent-cancelling-properly.patch diff --git a/patches/server/Fix-PotionEffect-ignores-icon-flag.patch b/patches/unapplied/server/Fix-PotionEffect-ignores-icon-flag.patch similarity index 100% rename from patches/server/Fix-PotionEffect-ignores-icon-flag.patch rename to patches/unapplied/server/Fix-PotionEffect-ignores-icon-flag.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/Fix-SPIGOT-5989.patch b/patches/unapplied/server/Fix-SPIGOT-5989.patch similarity index 100% rename from patches/server/Fix-SPIGOT-5989.patch rename to patches/unapplied/server/Fix-SPIGOT-5989.patch diff --git a/patches/server/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/server/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/server/Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/unapplied/server/Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/server/Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/unapplied/server/Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/server/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/server/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/server/Fix-Spigot-growth-modifiers.patch b/patches/unapplied/server/Fix-Spigot-growth-modifiers.patch similarity index 100% rename from patches/server/Fix-Spigot-growth-modifiers.patch rename to patches/unapplied/server/Fix-Spigot-growth-modifiers.patch diff --git a/patches/server/Fix-SpongeAbsortEvent-handling.patch b/patches/unapplied/server/Fix-SpongeAbsortEvent-handling.patch similarity index 100% rename from patches/server/Fix-SpongeAbsortEvent-handling.patch rename to patches/unapplied/server/Fix-SpongeAbsortEvent-handling.patch diff --git a/patches/server/Fix-UnsafeValues-loadAdvancement.patch b/patches/unapplied/server/Fix-UnsafeValues-loadAdvancement.patch similarity index 100% rename from patches/server/Fix-UnsafeValues-loadAdvancement.patch rename to patches/unapplied/server/Fix-UnsafeValues-loadAdvancement.patch diff --git a/patches/server/Fix-World-isChunkGenerated-calls.patch b/patches/unapplied/server/Fix-World-isChunkGenerated-calls.patch similarity index 100% rename from patches/server/Fix-World-isChunkGenerated-calls.patch rename to patches/unapplied/server/Fix-World-isChunkGenerated-calls.patch diff --git a/patches/server/Fix-a-bunch-of-vanilla-bugs.patch b/patches/unapplied/server/Fix-a-bunch-of-vanilla-bugs.patch similarity index 100% rename from patches/server/Fix-a-bunch-of-vanilla-bugs.patch rename to patches/unapplied/server/Fix-a-bunch-of-vanilla-bugs.patch diff --git a/patches/server/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/server/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/server/Fix-advancement-triggers-for-entity-damage.patch b/patches/unapplied/server/Fix-advancement-triggers-for-entity-damage.patch similarity index 100% rename from patches/server/Fix-advancement-triggers-for-entity-damage.patch rename to patches/unapplied/server/Fix-advancement-triggers-for-entity-damage.patch diff --git a/patches/server/Fix-and-optimise-world-force-upgrading.patch b/patches/unapplied/server/Fix-and-optimise-world-force-upgrading.patch similarity index 100% rename from patches/server/Fix-and-optimise-world-force-upgrading.patch rename to patches/unapplied/server/Fix-and-optimise-world-force-upgrading.patch diff --git a/patches/server/Fix-arrows-never-despawning-MC-125757.patch b/patches/unapplied/server/Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/server/Fix-arrows-never-despawning-MC-125757.patch rename to patches/unapplied/server/Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/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/server/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/server/Fix-bees-aging-inside-hives.patch b/patches/unapplied/server/Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/Fix-bees-aging-inside-hives.patch rename to patches/unapplied/server/Fix-bees-aging-inside-hives.patch diff --git a/patches/server/Fix-bell-block-entity-memory-leak.patch b/patches/unapplied/server/Fix-bell-block-entity-memory-leak.patch similarity index 100% rename from patches/server/Fix-bell-block-entity-memory-leak.patch rename to patches/unapplied/server/Fix-bell-block-entity-memory-leak.patch diff --git a/patches/server/Fix-block-place-logic.patch b/patches/unapplied/server/Fix-block-place-logic.patch similarity index 100% rename from patches/server/Fix-block-place-logic.patch rename to patches/unapplied/server/Fix-block-place-logic.patch diff --git a/patches/server/Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/unapplied/server/Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 100% rename from patches/server/Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/unapplied/server/Fix-cancelled-powdered-snow-bucket-placement.patch diff --git a/patches/server/Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/unapplied/server/Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch similarity index 100% rename from patches/server/Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch rename to patches/unapplied/server/Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch diff --git a/patches/server/Fix-client-lag-on-advancement-loading.patch b/patches/unapplied/server/Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from patches/server/Fix-client-lag-on-advancement-loading.patch rename to patches/unapplied/server/Fix-client-lag-on-advancement-loading.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/unapplied/server/Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch similarity index 100% rename from patches/server/Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch rename to patches/unapplied/server/Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/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/server/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/server/Fix-custom-piglin-loved-items.patch b/patches/unapplied/server/Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/server/Fix-custom-piglin-loved-items.patch rename to patches/unapplied/server/Fix-custom-piglin-loved-items.patch diff --git a/patches/server/Fix-custom-statistic-criteria-creation.patch b/patches/unapplied/server/Fix-custom-statistic-criteria-creation.patch similarity index 100% rename from patches/server/Fix-custom-statistic-criteria-creation.patch rename to patches/unapplied/server/Fix-custom-statistic-criteria-creation.patch diff --git a/patches/server/Fix-dangerous-end-portal-logic.patch b/patches/unapplied/server/Fix-dangerous-end-portal-logic.patch similarity index 100% rename from patches/server/Fix-dangerous-end-portal-logic.patch rename to patches/unapplied/server/Fix-dangerous-end-portal-logic.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/Fix-falling-block-spawn-methods.patch b/patches/unapplied/server/Fix-falling-block-spawn-methods.patch similarity index 100% rename from patches/server/Fix-falling-block-spawn-methods.patch rename to patches/unapplied/server/Fix-falling-block-spawn-methods.patch diff --git a/patches/server/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/server/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/server/Fix-force-opening-enchantment-tables.patch b/patches/unapplied/server/Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/server/Fix-force-opening-enchantment-tables.patch rename to patches/unapplied/server/Fix-force-opening-enchantment-tables.patch diff --git a/patches/server/Fix-global-sound-handling.patch b/patches/unapplied/server/Fix-global-sound-handling.patch similarity index 100% rename from patches/server/Fix-global-sound-handling.patch rename to patches/unapplied/server/Fix-global-sound-handling.patch diff --git a/patches/server/Fix-harming-potion-dupe.patch b/patches/unapplied/server/Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/Fix-harming-potion-dupe.patch rename to patches/unapplied/server/Fix-harming-potion-dupe.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/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/server/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/server/Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/unapplied/server/Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/unapplied/server/Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/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/server/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/server/Fix-inventories-returning-null-Locations.patch b/patches/unapplied/server/Fix-inventories-returning-null-Locations.patch similarity index 100% rename from patches/server/Fix-inventories-returning-null-Locations.patch rename to patches/unapplied/server/Fix-inventories-returning-null-Locations.patch diff --git a/patches/server/Fix-inventory-desync.patch b/patches/unapplied/server/Fix-inventory-desync.patch similarity index 100% rename from patches/server/Fix-inventory-desync.patch rename to patches/unapplied/server/Fix-inventory-desync.patch diff --git a/patches/server/Fix-invulnerable-end-crystals.patch b/patches/unapplied/server/Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/Fix-invulnerable-end-crystals.patch rename to patches/unapplied/server/Fix-invulnerable-end-crystals.patch diff --git a/patches/server/Fix-issues-with-mob-conversion.patch b/patches/unapplied/server/Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/Fix-issues-with-mob-conversion.patch rename to patches/unapplied/server/Fix-issues-with-mob-conversion.patch diff --git a/patches/server/Fix-item-duplication-and-teleport-issues.patch b/patches/unapplied/server/Fix-item-duplication-and-teleport-issues.patch similarity index 100% rename from patches/server/Fix-item-duplication-and-teleport-issues.patch rename to patches/unapplied/server/Fix-item-duplication-and-teleport-issues.patch diff --git a/patches/server/Fix-item-locations-dropped-from-campfires.patch b/patches/unapplied/server/Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/Fix-item-locations-dropped-from-campfires.patch rename to patches/unapplied/server/Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/Fix-items-not-falling-correctly.patch b/patches/unapplied/server/Fix-items-not-falling-correctly.patch similarity index 100% rename from patches/server/Fix-items-not-falling-correctly.patch rename to patches/unapplied/server/Fix-items-not-falling-correctly.patch diff --git a/patches/server/Fix-items-vanishing-through-end-portal.patch b/patches/unapplied/server/Fix-items-vanishing-through-end-portal.patch similarity index 100% rename from patches/server/Fix-items-vanishing-through-end-portal.patch rename to patches/unapplied/server/Fix-items-vanishing-through-end-portal.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/unapplied/server/Fix-last-firework-in-stack-not-having-effects-when-d.patch similarity index 100% rename from patches/server/Fix-last-firework-in-stack-not-having-effects-when-d.patch rename to patches/unapplied/server/Fix-last-firework-in-stack-not-having-effects-when-d.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/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/server/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/server/Fix-missing-map-initialize-event-call.patch b/patches/unapplied/server/Fix-missing-map-initialize-event-call.patch similarity index 100% rename from patches/server/Fix-missing-map-initialize-event-call.patch rename to patches/unapplied/server/Fix-missing-map-initialize-event-call.patch diff --git a/patches/server/Fix-nerfed-slime-when-splitting.patch b/patches/unapplied/server/Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/Fix-nerfed-slime-when-splitting.patch rename to patches/unapplied/server/Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/unapplied/server/Fix-new-block-data-for-EntityChangeBlockEvent.patch similarity index 100% rename from patches/server/Fix-new-block-data-for-EntityChangeBlockEvent.patch rename to patches/unapplied/server/Fix-new-block-data-for-EntityChangeBlockEvent.patch diff --git a/patches/server/Fix-piston-physics-inconsistency-MC-188840.patch b/patches/unapplied/server/Fix-piston-physics-inconsistency-MC-188840.patch similarity index 100% rename from patches/server/Fix-piston-physics-inconsistency-MC-188840.patch rename to patches/unapplied/server/Fix-piston-physics-inconsistency-MC-188840.patch diff --git a/patches/server/Fix-plugin-loggers-on-server-shutdown.patch b/patches/unapplied/server/Fix-plugin-loggers-on-server-shutdown.patch similarity index 100% rename from patches/server/Fix-plugin-loggers-on-server-shutdown.patch rename to patches/unapplied/server/Fix-plugin-loggers-on-server-shutdown.patch diff --git a/patches/server/Fix-possible-NPE-on-painting-creation.patch b/patches/unapplied/server/Fix-possible-NPE-on-painting-creation.patch similarity index 100% rename from patches/server/Fix-possible-NPE-on-painting-creation.patch rename to patches/unapplied/server/Fix-possible-NPE-on-painting-creation.patch diff --git a/patches/server/Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/unapplied/server/Fix-possible-StackOverflowError-for-some-dispenses.patch similarity index 100% rename from patches/server/Fix-possible-StackOverflowError-for-some-dispenses.patch rename to patches/unapplied/server/Fix-possible-StackOverflowError-for-some-dispenses.patch diff --git a/patches/server/Fix-potions-splash-events.patch b/patches/unapplied/server/Fix-potions-splash-events.patch similarity index 100% rename from patches/server/Fix-potions-splash-events.patch rename to patches/unapplied/server/Fix-potions-splash-events.patch diff --git a/patches/server/Fix-premature-player-kicks-on-shutdown.patch b/patches/unapplied/server/Fix-premature-player-kicks-on-shutdown.patch similarity index 100% rename from patches/server/Fix-premature-player-kicks-on-shutdown.patch rename to patches/unapplied/server/Fix-premature-player-kicks-on-shutdown.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/Fix-removing-recipes-from-RecipeIterator.patch b/patches/unapplied/server/Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/Fix-removing-recipes-from-RecipeIterator.patch rename to patches/unapplied/server/Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/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/server/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/server/Fix-rotation-when-spawning-display-entities.patch b/patches/unapplied/server/Fix-rotation-when-spawning-display-entities.patch similarity index 100% rename from patches/server/Fix-rotation-when-spawning-display-entities.patch rename to patches/unapplied/server/Fix-rotation-when-spawning-display-entities.patch diff --git a/patches/server/Fix-saving-in-unloadWorld.patch b/patches/unapplied/server/Fix-saving-in-unloadWorld.patch similarity index 100% rename from patches/server/Fix-saving-in-unloadWorld.patch rename to patches/unapplied/server/Fix-saving-in-unloadWorld.patch diff --git a/patches/server/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/server/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/server/Fix-several-issues-with-EntityBreedEvent.patch b/patches/unapplied/server/Fix-several-issues-with-EntityBreedEvent.patch similarity index 100% rename from patches/server/Fix-several-issues-with-EntityBreedEvent.patch rename to patches/unapplied/server/Fix-several-issues-with-EntityBreedEvent.patch diff --git a/patches/server/Fix-silent-equipment-change-for-mobs.patch b/patches/unapplied/server/Fix-silent-equipment-change-for-mobs.patch similarity index 100% rename from patches/server/Fix-silent-equipment-change-for-mobs.patch rename to patches/unapplied/server/Fix-silent-equipment-change-for-mobs.patch diff --git a/patches/server/Fix-sniffer-removeExploredLocation.patch b/patches/unapplied/server/Fix-sniffer-removeExploredLocation.patch similarity index 100% rename from patches/server/Fix-sniffer-removeExploredLocation.patch rename to patches/unapplied/server/Fix-sniffer-removeExploredLocation.patch diff --git a/patches/server/Fix-some-rails-connecting-improperly.patch b/patches/unapplied/server/Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/Fix-some-rails-connecting-improperly.patch rename to patches/unapplied/server/Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/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/server/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/server/Fix-spigot-s-Forced-Stats.patch b/patches/unapplied/server/Fix-spigot-s-Forced-Stats.patch similarity index 100% rename from patches/server/Fix-spigot-s-Forced-Stats.patch rename to patches/unapplied/server/Fix-spigot-s-Forced-Stats.patch diff --git a/patches/server/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/server/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/server/Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/unapplied/server/Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/unapplied/server/Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/unapplied/server/Fix-strikeLightningEffect-powers-lightning-rods-and-.patch similarity index 100% rename from patches/server/Fix-strikeLightningEffect-powers-lightning-rods-and-.patch rename to patches/unapplied/server/Fix-strikeLightningEffect-powers-lightning-rods-and-.patch diff --git a/patches/server/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/server/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/server/Fix-swamp-hut-cat-generation-deadlock.patch b/patches/unapplied/server/Fix-swamp-hut-cat-generation-deadlock.patch similarity index 100% rename from patches/server/Fix-swamp-hut-cat-generation-deadlock.patch rename to patches/unapplied/server/Fix-swamp-hut-cat-generation-deadlock.patch diff --git a/patches/server/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/server/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/server/Fix-text-display-error-on-spawn.patch b/patches/unapplied/server/Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/server/Fix-text-display-error-on-spawn.patch rename to patches/unapplied/server/Fix-text-display-error-on-spawn.patch diff --git a/patches/server/Fix-this-stupid-bullshit.patch b/patches/unapplied/server/Fix-this-stupid-bullshit.patch similarity index 100% rename from patches/server/Fix-this-stupid-bullshit.patch rename to patches/unapplied/server/Fix-this-stupid-bullshit.patch diff --git a/patches/server/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/server/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/server/Fix-upstreams-block-state-factories.patch b/patches/unapplied/server/Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/server/Fix-upstreams-block-state-factories.patch rename to patches/unapplied/server/Fix-upstreams-block-state-factories.patch diff --git a/patches/server/Fix-villager-boat-exploit.patch b/patches/unapplied/server/Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/Fix-villager-boat-exploit.patch rename to patches/unapplied/server/Fix-villager-boat-exploit.patch diff --git a/patches/server/Fix-villager-trading-demand-MC-163962.patch b/patches/unapplied/server/Fix-villager-trading-demand-MC-163962.patch similarity index 100% rename from patches/server/Fix-villager-trading-demand-MC-163962.patch rename to patches/unapplied/server/Fix-villager-trading-demand-MC-163962.patch diff --git a/patches/server/Fix-xp-reward-for-baby-zombies.patch b/patches/unapplied/server/Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/server/Fix-xp-reward-for-baby-zombies.patch rename to patches/unapplied/server/Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/server/Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/unapplied/server/Fixes-and-additions-to-the-SpawnReason-API.patch similarity index 100% rename from patches/server/Fixes-and-additions-to-the-SpawnReason-API.patch rename to patches/unapplied/server/Fixes-and-additions-to-the-SpawnReason-API.patch diff --git a/patches/server/Fixup-NamespacedKey-handling.patch b/patches/unapplied/server/Fixup-NamespacedKey-handling.patch similarity index 100% rename from patches/server/Fixup-NamespacedKey-handling.patch rename to patches/unapplied/server/Fixup-NamespacedKey-handling.patch diff --git a/patches/server/Flag-to-disable-the-channel-limit.patch b/patches/unapplied/server/Flag-to-disable-the-channel-limit.patch similarity index 100% rename from patches/server/Flag-to-disable-the-channel-limit.patch rename to patches/unapplied/server/Flag-to-disable-the-channel-limit.patch diff --git a/patches/server/Flat-bedrock-generator-settings.patch b/patches/unapplied/server/Flat-bedrock-generator-settings.patch similarity index 100% rename from patches/server/Flat-bedrock-generator-settings.patch rename to patches/unapplied/server/Flat-bedrock-generator-settings.patch diff --git a/patches/server/Flying-Fall-Damage.patch b/patches/unapplied/server/Flying-Fall-Damage.patch similarity index 100% rename from patches/server/Flying-Fall-Damage.patch rename to patches/unapplied/server/Flying-Fall-Damage.patch diff --git a/patches/server/Folia-scheduler-and-owned-region-API.patch b/patches/unapplied/server/Folia-scheduler-and-owned-region-API.patch similarity index 100% rename from patches/server/Folia-scheduler-and-owned-region-API.patch rename to patches/unapplied/server/Folia-scheduler-and-owned-region-API.patch diff --git a/patches/server/Force-close-world-loading-screen.patch b/patches/unapplied/server/Force-close-world-loading-screen.patch similarity index 100% rename from patches/server/Force-close-world-loading-screen.patch rename to patches/unapplied/server/Force-close-world-loading-screen.patch diff --git a/patches/server/Forward-CraftEntity-in-teleport-command.patch b/patches/unapplied/server/Forward-CraftEntity-in-teleport-command.patch similarity index 100% rename from patches/server/Forward-CraftEntity-in-teleport-command.patch rename to patches/unapplied/server/Forward-CraftEntity-in-teleport-command.patch diff --git a/patches/server/Freeze-Tick-Lock-API.patch b/patches/unapplied/server/Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/server/Freeze-Tick-Lock-API.patch rename to patches/unapplied/server/Freeze-Tick-Lock-API.patch diff --git a/patches/server/Friction-API.patch b/patches/unapplied/server/Friction-API.patch similarity index 100% rename from patches/server/Friction-API.patch rename to patches/unapplied/server/Friction-API.patch diff --git a/patches/server/Furnace-RecipesUsed-API.patch b/patches/unapplied/server/Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/server/Furnace-RecipesUsed-API.patch rename to patches/unapplied/server/Furnace-RecipesUsed-API.patch diff --git a/patches/server/Further-improve-server-tick-loop.patch b/patches/unapplied/server/Further-improve-server-tick-loop.patch similarity index 100% rename from patches/server/Further-improve-server-tick-loop.patch rename to patches/unapplied/server/Further-improve-server-tick-loop.patch diff --git a/patches/server/Get-entity-default-attributes.patch b/patches/unapplied/server/Get-entity-default-attributes.patch similarity index 100% rename from patches/server/Get-entity-default-attributes.patch rename to patches/unapplied/server/Get-entity-default-attributes.patch diff --git a/patches/server/Goat-ram-API.patch b/patches/unapplied/server/Goat-ram-API.patch similarity index 100% rename from patches/server/Goat-ram-API.patch rename to patches/unapplied/server/Goat-ram-API.patch diff --git a/patches/server/Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/unapplied/server/Guard-against-serializing-mismatching-chunk-coordina.patch similarity index 100% rename from patches/server/Guard-against-serializing-mismatching-chunk-coordina.patch rename to patches/unapplied/server/Guard-against-serializing-mismatching-chunk-coordina.patch diff --git a/patches/server/Handle-Item-Meta-Inconsistencies.patch b/patches/unapplied/server/Handle-Item-Meta-Inconsistencies.patch similarity index 100% rename from patches/server/Handle-Item-Meta-Inconsistencies.patch rename to patches/unapplied/server/Handle-Item-Meta-Inconsistencies.patch diff --git a/patches/server/Handle-Large-Packets-disconnecting-client.patch b/patches/unapplied/server/Handle-Large-Packets-disconnecting-client.patch similarity index 100% rename from patches/server/Handle-Large-Packets-disconnecting-client.patch rename to patches/unapplied/server/Handle-Large-Packets-disconnecting-client.patch diff --git a/patches/server/Handle-Oversized-block-entities-in-chunks.patch b/patches/unapplied/server/Handle-Oversized-block-entities-in-chunks.patch similarity index 100% rename from patches/server/Handle-Oversized-block-entities-in-chunks.patch rename to patches/unapplied/server/Handle-Oversized-block-entities-in-chunks.patch diff --git a/patches/server/Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/unapplied/server/Handle-plugin-prefixes-using-Log4J-configuration.patch similarity index 100% rename from patches/server/Handle-plugin-prefixes-using-Log4J-configuration.patch rename to patches/unapplied/server/Handle-plugin-prefixes-using-Log4J-configuration.patch diff --git a/patches/server/Hide-sync-chunk-writes-behind-flag.patch b/patches/unapplied/server/Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from patches/server/Hide-sync-chunk-writes-behind-flag.patch rename to patches/unapplied/server/Hide-sync-chunk-writes-behind-flag.patch diff --git a/patches/server/Hide-unnecessary-itemmeta-from-clients.patch b/patches/unapplied/server/Hide-unnecessary-itemmeta-from-clients.patch similarity index 100% rename from patches/server/Hide-unnecessary-itemmeta-from-clients.patch rename to patches/unapplied/server/Hide-unnecessary-itemmeta-from-clients.patch diff --git a/patches/server/Honor-EntityAgeable.ageLock.patch b/patches/unapplied/server/Honor-EntityAgeable.ageLock.patch similarity index 100% rename from patches/server/Honor-EntityAgeable.ageLock.patch rename to patches/unapplied/server/Honor-EntityAgeable.ageLock.patch diff --git a/patches/server/Hook-into-CB-plugin-rewrites.patch b/patches/unapplied/server/Hook-into-CB-plugin-rewrites.patch similarity index 100% rename from patches/server/Hook-into-CB-plugin-rewrites.patch rename to patches/unapplied/server/Hook-into-CB-plugin-rewrites.patch diff --git a/patches/server/Ignore-impossible-spawn-tick.patch b/patches/unapplied/server/Ignore-impossible-spawn-tick.patch similarity index 100% rename from patches/server/Ignore-impossible-spawn-tick.patch rename to patches/unapplied/server/Ignore-impossible-spawn-tick.patch diff --git a/patches/server/Implement-CraftBlockSoundGroup.patch b/patches/unapplied/server/Implement-CraftBlockSoundGroup.patch similarity index 100% rename from patches/server/Implement-CraftBlockSoundGroup.patch rename to patches/unapplied/server/Implement-CraftBlockSoundGroup.patch diff --git a/patches/server/Implement-Mob-Goal-API.patch b/patches/unapplied/server/Implement-Mob-Goal-API.patch similarity index 100% rename from patches/server/Implement-Mob-Goal-API.patch rename to patches/unapplied/server/Implement-Mob-Goal-API.patch diff --git a/patches/server/Implement-OfflinePlayer-isConnected.patch b/patches/unapplied/server/Implement-OfflinePlayer-isConnected.patch similarity index 100% rename from patches/server/Implement-OfflinePlayer-isConnected.patch rename to patches/unapplied/server/Implement-OfflinePlayer-isConnected.patch diff --git a/patches/server/Implement-Paper-VersionChecker.patch b/patches/unapplied/server/Implement-Paper-VersionChecker.patch similarity index 100% rename from patches/server/Implement-Paper-VersionChecker.patch rename to patches/unapplied/server/Implement-Paper-VersionChecker.patch diff --git a/patches/server/Implement-Player-Client-Options-API.patch b/patches/unapplied/server/Implement-Player-Client-Options-API.patch similarity index 100% rename from patches/server/Implement-Player-Client-Options-API.patch rename to patches/unapplied/server/Implement-Player-Client-Options-API.patch diff --git a/patches/server/Implement-PlayerFailMoveEvent.patch b/patches/unapplied/server/Implement-PlayerFailMoveEvent.patch similarity index 100% rename from patches/server/Implement-PlayerFailMoveEvent.patch rename to patches/unapplied/server/Implement-PlayerFailMoveEvent.patch diff --git a/patches/server/Implement-PlayerLocaleChangeEvent.patch b/patches/unapplied/server/Implement-PlayerLocaleChangeEvent.patch similarity index 100% rename from patches/server/Implement-PlayerLocaleChangeEvent.patch rename to patches/unapplied/server/Implement-PlayerLocaleChangeEvent.patch diff --git a/patches/server/Implement-World.getEntity-UUID-API.patch b/patches/unapplied/server/Implement-World.getEntity-UUID-API.patch similarity index 100% rename from patches/server/Implement-World.getEntity-UUID-API.patch rename to patches/unapplied/server/Implement-World.getEntity-UUID-API.patch diff --git a/patches/server/Implement-enchantWithLevels-API.patch b/patches/unapplied/server/Implement-enchantWithLevels-API.patch similarity index 100% rename from patches/server/Implement-enchantWithLevels-API.patch rename to patches/unapplied/server/Implement-enchantWithLevels-API.patch diff --git a/patches/server/Implement-extended-PaperServerListPingEvent.patch b/patches/unapplied/server/Implement-extended-PaperServerListPingEvent.patch similarity index 100% rename from patches/server/Implement-extended-PaperServerListPingEvent.patch rename to patches/unapplied/server/Implement-extended-PaperServerListPingEvent.patch diff --git a/patches/server/Implement-furnace-cook-speed-multiplier-API.patch b/patches/unapplied/server/Implement-furnace-cook-speed-multiplier-API.patch similarity index 100% rename from patches/server/Implement-furnace-cook-speed-multiplier-API.patch rename to patches/unapplied/server/Implement-furnace-cook-speed-multiplier-API.patch diff --git a/patches/server/Implement-getComputedBiome-API.patch b/patches/unapplied/server/Implement-getComputedBiome-API.patch similarity index 100% rename from patches/server/Implement-getComputedBiome-API.patch rename to patches/unapplied/server/Implement-getComputedBiome-API.patch diff --git a/patches/server/Implement-getI18NDisplayName.patch b/patches/unapplied/server/Implement-getI18NDisplayName.patch similarity index 100% rename from patches/server/Implement-getI18NDisplayName.patch rename to patches/unapplied/server/Implement-getI18NDisplayName.patch diff --git a/patches/server/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/server/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/server/Implement-regenerateChunk.patch b/patches/unapplied/server/Implement-regenerateChunk.patch similarity index 100% rename from patches/server/Implement-regenerateChunk.patch rename to patches/unapplied/server/Implement-regenerateChunk.patch diff --git a/patches/server/Improve-Block-breakNaturally-API.patch b/patches/unapplied/server/Improve-Block-breakNaturally-API.patch similarity index 100% rename from patches/server/Improve-Block-breakNaturally-API.patch rename to patches/unapplied/server/Improve-Block-breakNaturally-API.patch diff --git a/patches/server/Improve-BlockPosition-inlining.patch b/patches/unapplied/server/Improve-BlockPosition-inlining.patch similarity index 100% rename from patches/server/Improve-BlockPosition-inlining.patch rename to patches/unapplied/server/Improve-BlockPosition-inlining.patch diff --git a/patches/server/Improve-EntityShootBowEvent.patch b/patches/unapplied/server/Improve-EntityShootBowEvent.patch similarity index 100% rename from patches/server/Improve-EntityShootBowEvent.patch rename to patches/unapplied/server/Improve-EntityShootBowEvent.patch diff --git a/patches/server/Improve-Legacy-Component-serialization-size.patch b/patches/unapplied/server/Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from patches/server/Improve-Legacy-Component-serialization-size.patch rename to patches/unapplied/server/Improve-Legacy-Component-serialization-size.patch diff --git a/patches/server/Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/unapplied/server/Improve-Log4J-Configuration-Plugin-Loggers.patch similarity index 100% rename from patches/server/Improve-Log4J-Configuration-Plugin-Loggers.patch rename to patches/unapplied/server/Improve-Log4J-Configuration-Plugin-Loggers.patch diff --git a/patches/server/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/server/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/server/Improve-Player-chat-API-handling.patch b/patches/unapplied/server/Improve-Player-chat-API-handling.patch similarity index 100% rename from patches/server/Improve-Player-chat-API-handling.patch rename to patches/unapplied/server/Improve-Player-chat-API-handling.patch diff --git a/patches/server/Improve-PortalEvents.patch b/patches/unapplied/server/Improve-PortalEvents.patch similarity index 100% rename from patches/server/Improve-PortalEvents.patch rename to patches/unapplied/server/Improve-PortalEvents.patch diff --git a/patches/server/Improve-Registry.patch b/patches/unapplied/server/Improve-Registry.patch similarity index 100% rename from patches/server/Improve-Registry.patch rename to patches/unapplied/server/Improve-Registry.patch diff --git a/patches/server/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/server/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/server/Improve-ServerGUI.patch b/patches/unapplied/server/Improve-ServerGUI.patch similarity index 100% rename from patches/server/Improve-ServerGUI.patch rename to patches/unapplied/server/Improve-ServerGUI.patch diff --git a/patches/server/Improve-and-expand-AsyncCatcher.patch b/patches/unapplied/server/Improve-and-expand-AsyncCatcher.patch similarity index 100% rename from patches/server/Improve-and-expand-AsyncCatcher.patch rename to patches/unapplied/server/Improve-and-expand-AsyncCatcher.patch diff --git a/patches/server/Improve-boat-collision-performance.patch b/patches/unapplied/server/Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/Improve-boat-collision-performance.patch rename to patches/unapplied/server/Improve-boat-collision-performance.patch diff --git a/patches/server/Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/unapplied/server/Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch similarity index 100% rename from patches/server/Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch rename to patches/unapplied/server/Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch diff --git a/patches/server/Improve-death-events.patch b/patches/unapplied/server/Improve-death-events.patch similarity index 100% rename from patches/server/Improve-death-events.patch rename to patches/unapplied/server/Improve-death-events.patch diff --git a/patches/server/Improve-exact-choice-recipe-ingredients.patch b/patches/unapplied/server/Improve-exact-choice-recipe-ingredients.patch similarity index 100% rename from patches/server/Improve-exact-choice-recipe-ingredients.patch rename to patches/unapplied/server/Improve-exact-choice-recipe-ingredients.patch diff --git a/patches/server/Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/unapplied/server/Improve-fix-EntityTargetLivingEntityEvent.patch similarity index 100% rename from patches/server/Improve-fix-EntityTargetLivingEntityEvent.patch rename to patches/unapplied/server/Improve-fix-EntityTargetLivingEntityEvent.patch diff --git a/patches/server/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/server/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/server/Improve-java-version-check.patch b/patches/unapplied/server/Improve-java-version-check.patch similarity index 100% rename from patches/server/Improve-java-version-check.patch rename to patches/unapplied/server/Improve-java-version-check.patch diff --git a/patches/server/Improve-logging-and-errors.patch b/patches/unapplied/server/Improve-logging-and-errors.patch similarity index 100% rename from patches/server/Improve-logging-and-errors.patch rename to patches/unapplied/server/Improve-logging-and-errors.patch diff --git a/patches/server/Improve-performance-of-mass-crafts.patch b/patches/unapplied/server/Improve-performance-of-mass-crafts.patch similarity index 100% rename from patches/server/Improve-performance-of-mass-crafts.patch rename to patches/unapplied/server/Improve-performance-of-mass-crafts.patch diff --git a/patches/server/Improve-scoreboard-entries.patch b/patches/unapplied/server/Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/Improve-scoreboard-entries.patch rename to patches/unapplied/server/Improve-scoreboard-entries.patch diff --git a/patches/server/Improve-tag-parser-handling.patch b/patches/unapplied/server/Improve-tag-parser-handling.patch similarity index 100% rename from patches/server/Improve-tag-parser-handling.patch rename to patches/unapplied/server/Improve-tag-parser-handling.patch diff --git a/patches/server/Improve-the-Saddle-API-for-Horses.patch b/patches/unapplied/server/Improve-the-Saddle-API-for-Horses.patch similarity index 100% rename from patches/server/Improve-the-Saddle-API-for-Horses.patch rename to patches/unapplied/server/Improve-the-Saddle-API-for-Horses.patch diff --git a/patches/server/Improved-Async-Task-Scheduler.patch b/patches/unapplied/server/Improved-Async-Task-Scheduler.patch similarity index 100% rename from patches/server/Improved-Async-Task-Scheduler.patch rename to patches/unapplied/server/Improved-Async-Task-Scheduler.patch diff --git a/patches/server/Improved-Watchdog-Support.patch b/patches/unapplied/server/Improved-Watchdog-Support.patch similarity index 100% rename from patches/server/Improved-Watchdog-Support.patch rename to patches/unapplied/server/Improved-Watchdog-Support.patch diff --git a/patches/server/Inline-shift-direction-fields.patch b/patches/unapplied/server/Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/Inline-shift-direction-fields.patch rename to patches/unapplied/server/Inline-shift-direction-fields.patch diff --git a/patches/server/Introduce-beacon-activation-deactivation-events.patch b/patches/unapplied/server/Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/Introduce-beacon-activation-deactivation-events.patch rename to patches/unapplied/server/Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/Inventory-close.patch b/patches/unapplied/server/Inventory-close.patch similarity index 100% rename from patches/server/Inventory-close.patch rename to patches/unapplied/server/Inventory-close.patch diff --git a/patches/server/Inventory-getHolder-method-without-block-snapshot.patch b/patches/unapplied/server/Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/server/Inventory-getHolder-method-without-block-snapshot.patch rename to patches/unapplied/server/Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/server/Inventory-removeItemAnySlot.patch b/patches/unapplied/server/Inventory-removeItemAnySlot.patch similarity index 100% rename from patches/server/Inventory-removeItemAnySlot.patch rename to patches/unapplied/server/Inventory-removeItemAnySlot.patch diff --git a/patches/server/InventoryCloseEvent-Reason-API.patch b/patches/unapplied/server/InventoryCloseEvent-Reason-API.patch similarity index 100% rename from patches/server/InventoryCloseEvent-Reason-API.patch rename to patches/unapplied/server/InventoryCloseEvent-Reason-API.patch diff --git a/patches/server/Item-Mutation-Fixes.patch b/patches/unapplied/server/Item-Mutation-Fixes.patch similarity index 100% rename from patches/server/Item-Mutation-Fixes.patch rename to patches/unapplied/server/Item-Mutation-Fixes.patch diff --git a/patches/server/Item-Rarity-API.patch b/patches/unapplied/server/Item-Rarity-API.patch similarity index 100% rename from patches/server/Item-Rarity-API.patch rename to patches/unapplied/server/Item-Rarity-API.patch diff --git a/patches/server/Item-canEntityPickup.patch b/patches/unapplied/server/Item-canEntityPickup.patch similarity index 100% rename from patches/server/Item-canEntityPickup.patch rename to patches/unapplied/server/Item-canEntityPickup.patch diff --git a/patches/server/Item-no-age-no-player-pickup.patch b/patches/unapplied/server/Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/server/Item-no-age-no-player-pickup.patch rename to patches/unapplied/server/Item-no-age-no-player-pickup.patch diff --git a/patches/server/ItemStack-Tooltip-API.patch b/patches/unapplied/server/ItemStack-Tooltip-API.patch similarity index 100% rename from patches/server/ItemStack-Tooltip-API.patch rename to patches/unapplied/server/ItemStack-Tooltip-API.patch diff --git a/patches/server/ItemStack-damage-API.patch b/patches/unapplied/server/ItemStack-damage-API.patch similarity index 100% rename from patches/server/ItemStack-damage-API.patch rename to patches/unapplied/server/ItemStack-damage-API.patch diff --git a/patches/server/ItemStack-getMaxItemUseDuration.patch b/patches/unapplied/server/ItemStack-getMaxItemUseDuration.patch similarity index 100% rename from patches/server/ItemStack-getMaxItemUseDuration.patch rename to patches/unapplied/server/ItemStack-getMaxItemUseDuration.patch diff --git a/patches/server/ItemStack-repair-check-API.patch b/patches/unapplied/server/ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/ItemStack-repair-check-API.patch rename to patches/unapplied/server/ItemStack-repair-check-API.patch diff --git a/patches/server/Lag-compensation-ticks.patch b/patches/unapplied/server/Lag-compensation-ticks.patch similarity index 100% rename from patches/server/Lag-compensation-ticks.patch rename to patches/unapplied/server/Lag-compensation-ticks.patch diff --git a/patches/server/Lazily-create-LootContext-for-criterions.patch b/patches/unapplied/server/Lazily-create-LootContext-for-criterions.patch similarity index 100% rename from patches/server/Lazily-create-LootContext-for-criterions.patch rename to patches/unapplied/server/Lazily-create-LootContext-for-criterions.patch diff --git a/patches/server/Lazily-track-plugin-scoreboards-by-default.patch b/patches/unapplied/server/Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/server/Lazily-track-plugin-scoreboards-by-default.patch rename to patches/unapplied/server/Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/server/Left-handed-API.patch b/patches/unapplied/server/Left-handed-API.patch similarity index 100% rename from patches/server/Left-handed-API.patch rename to patches/unapplied/server/Left-handed-API.patch diff --git a/patches/server/Limit-Client-Sign-length-more.patch b/patches/unapplied/server/Limit-Client-Sign-length-more.patch similarity index 100% rename from patches/server/Limit-Client-Sign-length-more.patch rename to patches/unapplied/server/Limit-Client-Sign-length-more.patch diff --git a/patches/server/Limit-item-frame-cursors-on-maps.patch b/patches/unapplied/server/Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/Limit-item-frame-cursors-on-maps.patch rename to patches/unapplied/server/Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/Limit-pet-look-distance.patch b/patches/unapplied/server/Limit-pet-look-distance.patch similarity index 100% rename from patches/server/Limit-pet-look-distance.patch rename to patches/unapplied/server/Limit-pet-look-distance.patch diff --git a/patches/server/Limit-recipe-packets.patch b/patches/unapplied/server/Limit-recipe-packets.patch similarity index 100% rename from patches/server/Limit-recipe-packets.patch rename to patches/unapplied/server/Limit-recipe-packets.patch diff --git a/patches/server/Line-Of-Sight-Changes.patch b/patches/unapplied/server/Line-Of-Sight-Changes.patch similarity index 100% rename from patches/server/Line-Of-Sight-Changes.patch rename to patches/unapplied/server/Line-Of-Sight-Changes.patch diff --git a/patches/server/LivingEntity-Active-Item-API.patch b/patches/unapplied/server/LivingEntity-Active-Item-API.patch similarity index 100% rename from patches/server/LivingEntity-Active-Item-API.patch rename to patches/unapplied/server/LivingEntity-Active-Item-API.patch diff --git a/patches/server/LivingEntity-setKiller.patch b/patches/unapplied/server/LivingEntity-setKiller.patch similarity index 100% rename from patches/server/LivingEntity-setKiller.patch rename to patches/unapplied/server/LivingEntity-setKiller.patch diff --git a/patches/server/Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/unapplied/server/Load-effect-amplifiers-greater-than-127-correctly.patch similarity index 100% rename from patches/server/Load-effect-amplifiers-greater-than-127-correctly.patch rename to patches/unapplied/server/Load-effect-amplifiers-greater-than-127-correctly.patch diff --git a/patches/server/LootTable-API-and-replenishable-lootables.patch b/patches/unapplied/server/LootTable-API-and-replenishable-lootables.patch similarity index 100% rename from patches/server/LootTable-API-and-replenishable-lootables.patch rename to patches/unapplied/server/LootTable-API-and-replenishable-lootables.patch diff --git a/patches/server/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/server/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/server/MC-4-Fix-item-position-desync.patch b/patches/unapplied/server/MC-4-Fix-item-position-desync.patch similarity index 100% rename from patches/server/MC-4-Fix-item-position-desync.patch rename to patches/unapplied/server/MC-4-Fix-item-position-desync.patch diff --git a/patches/server/MC-Dev-fixes.patch b/patches/unapplied/server/MC-Dev-fixes.patch similarity index 100% rename from patches/server/MC-Dev-fixes.patch rename to patches/unapplied/server/MC-Dev-fixes.patch diff --git a/patches/server/MC-Utils.patch b/patches/unapplied/server/MC-Utils.patch similarity index 100% rename from patches/server/MC-Utils.patch rename to patches/unapplied/server/MC-Utils.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/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/server/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/server/Make-item-validations-configurable.patch b/patches/unapplied/server/Make-item-validations-configurable.patch similarity index 100% rename from patches/server/Make-item-validations-configurable.patch rename to patches/unapplied/server/Make-item-validations-configurable.patch diff --git a/patches/server/Make-legacy-ping-handler-more-reliable.patch b/patches/unapplied/server/Make-legacy-ping-handler-more-reliable.patch similarity index 100% rename from patches/server/Make-legacy-ping-handler-more-reliable.patch rename to patches/unapplied/server/Make-legacy-ping-handler-more-reliable.patch diff --git a/patches/server/Make-schedule-command-per-world.patch b/patches/unapplied/server/Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/Make-schedule-command-per-world.patch rename to patches/unapplied/server/Make-schedule-command-per-world.patch diff --git a/patches/server/Make-shield-blocking-delay-configurable.patch b/patches/unapplied/server/Make-shield-blocking-delay-configurable.patch similarity index 100% rename from patches/server/Make-shield-blocking-delay-configurable.patch rename to patches/unapplied/server/Make-shield-blocking-delay-configurable.patch diff --git a/patches/server/Make-some-itemstacks-nonnull.patch b/patches/unapplied/server/Make-some-itemstacks-nonnull.patch similarity index 100% rename from patches/server/Make-some-itemstacks-nonnull.patch rename to patches/unapplied/server/Make-some-itemstacks-nonnull.patch diff --git a/patches/server/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/server/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/server/Make-the-GUI-graph-fancier.patch b/patches/unapplied/server/Make-the-GUI-graph-fancier.patch similarity index 100% rename from patches/server/Make-the-GUI-graph-fancier.patch rename to patches/unapplied/server/Make-the-GUI-graph-fancier.patch diff --git a/patches/server/Make-the-default-permission-message-configurable.patch b/patches/unapplied/server/Make-the-default-permission-message-configurable.patch similarity index 100% rename from patches/server/Make-the-default-permission-message-configurable.patch rename to patches/unapplied/server/Make-the-default-permission-message-configurable.patch diff --git a/patches/server/Make-water-animal-spawn-height-configurable.patch b/patches/unapplied/server/Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/Make-water-animal-spawn-height-configurable.patch rename to patches/unapplied/server/Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/Manually-inline-methods-in-BlockPosition.patch b/patches/unapplied/server/Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/Manually-inline-methods-in-BlockPosition.patch rename to patches/unapplied/server/Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/Maps-shouldn-t-load-chunks.patch b/patches/unapplied/server/Maps-shouldn-t-load-chunks.patch similarity index 100% rename from patches/server/Maps-shouldn-t-load-chunks.patch rename to patches/unapplied/server/Maps-shouldn-t-load-chunks.patch diff --git a/patches/server/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/server/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/server/Missing-Entity-API.patch b/patches/unapplied/server/Missing-Entity-API.patch similarity index 100% rename from patches/server/Missing-Entity-API.patch rename to patches/unapplied/server/Missing-Entity-API.patch diff --git a/patches/server/Missing-eating-regain-reason.patch b/patches/unapplied/server/Missing-eating-regain-reason.patch similarity index 100% rename from patches/server/Missing-eating-regain-reason.patch rename to patches/unapplied/server/Missing-eating-regain-reason.patch diff --git a/patches/server/Missing-effect-cause.patch b/patches/unapplied/server/Missing-effect-cause.patch similarity index 100% rename from patches/server/Missing-effect-cause.patch rename to patches/unapplied/server/Missing-effect-cause.patch diff --git a/patches/server/Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/unapplied/server/Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/server/Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/unapplied/server/Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/server/Mob-Pathfinding-API.patch b/patches/unapplied/server/Mob-Pathfinding-API.patch similarity index 100% rename from patches/server/Mob-Pathfinding-API.patch rename to patches/unapplied/server/Mob-Pathfinding-API.patch diff --git a/patches/server/Mob-Spawner-API-Enhancements.patch b/patches/unapplied/server/Mob-Spawner-API-Enhancements.patch similarity index 100% rename from patches/server/Mob-Spawner-API-Enhancements.patch rename to patches/unapplied/server/Mob-Spawner-API-Enhancements.patch diff --git a/patches/server/More-CommandBlock-API.patch b/patches/unapplied/server/More-CommandBlock-API.patch similarity index 100% rename from patches/server/More-CommandBlock-API.patch rename to patches/unapplied/server/More-CommandBlock-API.patch diff --git a/patches/server/More-DragonBattle-API.patch b/patches/unapplied/server/More-DragonBattle-API.patch similarity index 100% rename from patches/server/More-DragonBattle-API.patch rename to patches/unapplied/server/More-DragonBattle-API.patch diff --git a/patches/server/More-Enchantment-API.patch b/patches/unapplied/server/More-Enchantment-API.patch similarity index 100% rename from patches/server/More-Enchantment-API.patch rename to patches/unapplied/server/More-Enchantment-API.patch diff --git a/patches/server/More-Lidded-Block-API.patch b/patches/unapplied/server/More-Lidded-Block-API.patch similarity index 100% rename from patches/server/More-Lidded-Block-API.patch rename to patches/unapplied/server/More-Lidded-Block-API.patch diff --git a/patches/server/More-PotionEffectType-API.patch b/patches/unapplied/server/More-PotionEffectType-API.patch similarity index 100% rename from patches/server/More-PotionEffectType-API.patch rename to patches/unapplied/server/More-PotionEffectType-API.patch diff --git a/patches/server/More-Projectile-API.patch b/patches/unapplied/server/More-Projectile-API.patch similarity index 100% rename from patches/server/More-Projectile-API.patch rename to patches/unapplied/server/More-Projectile-API.patch diff --git a/patches/server/More-Raid-API.patch b/patches/unapplied/server/More-Raid-API.patch similarity index 100% rename from patches/server/More-Raid-API.patch rename to patches/unapplied/server/More-Raid-API.patch diff --git a/patches/server/More-Teleport-API.patch b/patches/unapplied/server/More-Teleport-API.patch similarity index 100% rename from patches/server/More-Teleport-API.patch rename to patches/unapplied/server/More-Teleport-API.patch diff --git a/patches/server/More-World-API.patch b/patches/unapplied/server/More-World-API.patch similarity index 100% rename from patches/server/More-World-API.patch rename to patches/unapplied/server/More-World-API.patch diff --git a/patches/server/More-accurate-isInOpenWater-impl.patch b/patches/unapplied/server/More-accurate-isInOpenWater-impl.patch similarity index 100% rename from patches/server/More-accurate-isInOpenWater-impl.patch rename to patches/unapplied/server/More-accurate-isInOpenWater-impl.patch diff --git a/patches/server/More-lightning-API.patch b/patches/unapplied/server/More-lightning-API.patch similarity index 100% rename from patches/server/More-lightning-API.patch rename to patches/unapplied/server/More-lightning-API.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/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/server/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/server/Multi-Block-Change-API-Implementation.patch b/patches/unapplied/server/Multi-Block-Change-API-Implementation.patch similarity index 100% rename from patches/server/Multi-Block-Change-API-Implementation.patch rename to patches/unapplied/server/Multi-Block-Change-API-Implementation.patch diff --git a/patches/server/Multiple-Entries-with-Scoreboards.patch b/patches/unapplied/server/Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/Multiple-Entries-with-Scoreboards.patch rename to patches/unapplied/server/Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/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/server/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/server/Nameable-Banner-API.patch b/patches/unapplied/server/Nameable-Banner-API.patch similarity index 100% rename from patches/server/Nameable-Banner-API.patch rename to patches/unapplied/server/Nameable-Banner-API.patch diff --git a/patches/server/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/server/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/server/Only-capture-actual-tree-growth.patch b/patches/unapplied/server/Only-capture-actual-tree-growth.patch similarity index 100% rename from patches/server/Only-capture-actual-tree-growth.patch rename to patches/unapplied/server/Only-capture-actual-tree-growth.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/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/server/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/server/Only-refresh-abilities-if-needed.patch b/patches/unapplied/server/Only-refresh-abilities-if-needed.patch similarity index 100% rename from patches/server/Only-refresh-abilities-if-needed.patch rename to patches/unapplied/server/Only-refresh-abilities-if-needed.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/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/server/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/server/Oprimise-map-impl-for-tracked-players.patch b/patches/unapplied/server/Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/server/Oprimise-map-impl-for-tracked-players.patch rename to patches/unapplied/server/Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/server/Optimise-BlockSoil-nearby-water-lookup.patch b/patches/unapplied/server/Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/unapplied/server/Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/Optimise-BlockState-s-hashCode-equals.patch b/patches/unapplied/server/Optimise-BlockState-s-hashCode-equals.patch similarity index 100% rename from patches/server/Optimise-BlockState-s-hashCode-equals.patch rename to patches/unapplied/server/Optimise-BlockState-s-hashCode-equals.patch diff --git a/patches/server/Optimise-Chunk-getFluid.patch b/patches/unapplied/server/Optimise-Chunk-getFluid.patch similarity index 100% rename from patches/server/Optimise-Chunk-getFluid.patch rename to patches/unapplied/server/Optimise-Chunk-getFluid.patch diff --git a/patches/server/Optimise-EntityGetter-getPlayerByUUID.patch b/patches/unapplied/server/Optimise-EntityGetter-getPlayerByUUID.patch similarity index 100% rename from patches/server/Optimise-EntityGetter-getPlayerByUUID.patch rename to patches/unapplied/server/Optimise-EntityGetter-getPlayerByUUID.patch diff --git a/patches/server/Optimise-chunk-tick-iteration.patch b/patches/unapplied/server/Optimise-chunk-tick-iteration.patch similarity index 100% rename from patches/server/Optimise-chunk-tick-iteration.patch rename to patches/unapplied/server/Optimise-chunk-tick-iteration.patch diff --git a/patches/server/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/server/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/server/Optimise-general-POI-access.patch b/patches/unapplied/server/Optimise-general-POI-access.patch similarity index 100% rename from patches/server/Optimise-general-POI-access.patch rename to patches/unapplied/server/Optimise-general-POI-access.patch diff --git a/patches/server/Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/unapplied/server/Optimise-getChunkAt-calls-for-loaded-chunks.patch similarity index 100% rename from patches/server/Optimise-getChunkAt-calls-for-loaded-chunks.patch rename to patches/unapplied/server/Optimise-getChunkAt-calls-for-loaded-chunks.patch diff --git a/patches/server/Optimise-getType-calls.patch b/patches/unapplied/server/Optimise-getType-calls.patch similarity index 100% rename from patches/server/Optimise-getType-calls.patch rename to patches/unapplied/server/Optimise-getType-calls.patch diff --git a/patches/server/Optimise-nearby-player-retrieval.patch b/patches/unapplied/server/Optimise-nearby-player-retrieval.patch similarity index 100% rename from patches/server/Optimise-nearby-player-retrieval.patch rename to patches/unapplied/server/Optimise-nearby-player-retrieval.patch diff --git a/patches/server/Optimise-random-block-ticking.patch b/patches/unapplied/server/Optimise-random-block-ticking.patch similarity index 100% rename from patches/server/Optimise-random-block-ticking.patch rename to patches/unapplied/server/Optimise-random-block-ticking.patch diff --git a/patches/server/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/server/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/server/Optimize-Bit-Operations-by-inlining.patch b/patches/unapplied/server/Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/Optimize-Bit-Operations-by-inlining.patch rename to patches/unapplied/server/Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/Optimize-BlockPosition-helper-methods.patch b/patches/unapplied/server/Optimize-BlockPosition-helper-methods.patch similarity index 100% rename from patches/server/Optimize-BlockPosition-helper-methods.patch rename to patches/unapplied/server/Optimize-BlockPosition-helper-methods.patch diff --git a/patches/server/Optimize-Captured-BlockEntity-Lookup.patch b/patches/unapplied/server/Optimize-Captured-BlockEntity-Lookup.patch similarity index 100% rename from patches/server/Optimize-Captured-BlockEntity-Lookup.patch rename to patches/unapplied/server/Optimize-Captured-BlockEntity-Lookup.patch diff --git a/patches/server/Optimize-Collision-to-not-load-chunks.patch b/patches/unapplied/server/Optimize-Collision-to-not-load-chunks.patch similarity index 100% rename from patches/server/Optimize-Collision-to-not-load-chunks.patch rename to patches/unapplied/server/Optimize-Collision-to-not-load-chunks.patch diff --git a/patches/server/Optimize-CraftBlockData-Creation.patch b/patches/unapplied/server/Optimize-CraftBlockData-Creation.patch similarity index 100% rename from patches/server/Optimize-CraftBlockData-Creation.patch rename to patches/unapplied/server/Optimize-CraftBlockData-Creation.patch diff --git a/patches/server/Optimize-DataBits.patch b/patches/unapplied/server/Optimize-DataBits.patch similarity index 100% rename from patches/server/Optimize-DataBits.patch rename to patches/unapplied/server/Optimize-DataBits.patch diff --git a/patches/server/Optimize-Dynamic-get-Missing-Keys.patch b/patches/unapplied/server/Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/Optimize-Dynamic-get-Missing-Keys.patch rename to patches/unapplied/server/Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/unapplied/server/Optimize-GoalSelector-Goal.Flag-Set-operations.patch similarity index 100% rename from patches/server/Optimize-GoalSelector-Goal.Flag-Set-operations.patch rename to patches/unapplied/server/Optimize-GoalSelector-Goal.Flag-Set-operations.patch diff --git a/patches/server/Optimize-HashMapPalette.patch b/patches/unapplied/server/Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/Optimize-HashMapPalette.patch rename to patches/unapplied/server/Optimize-HashMapPalette.patch diff --git a/patches/server/Optimize-Hoppers.patch b/patches/unapplied/server/Optimize-Hoppers.patch similarity index 100% rename from patches/server/Optimize-Hoppers.patch rename to patches/unapplied/server/Optimize-Hoppers.patch diff --git a/patches/server/Optimize-Level.hasChunkAt-BlockPosition-Z.patch b/patches/unapplied/server/Optimize-Level.hasChunkAt-BlockPosition-Z.patch similarity index 100% rename from patches/server/Optimize-Level.hasChunkAt-BlockPosition-Z.patch rename to patches/unapplied/server/Optimize-Level.hasChunkAt-BlockPosition-Z.patch diff --git a/patches/server/Optimize-MappedRegistry.patch b/patches/unapplied/server/Optimize-MappedRegistry.patch similarity index 100% rename from patches/server/Optimize-MappedRegistry.patch rename to patches/unapplied/server/Optimize-MappedRegistry.patch diff --git a/patches/server/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/server/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/server/Optimize-NetworkManager-Exception-Handling.patch b/patches/unapplied/server/Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/Optimize-NetworkManager-Exception-Handling.patch rename to patches/unapplied/server/Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/unapplied/server/Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/unapplied/server/Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/Optimize-Pathfinding.patch b/patches/unapplied/server/Optimize-Pathfinding.patch similarity index 100% rename from patches/server/Optimize-Pathfinding.patch rename to patches/unapplied/server/Optimize-Pathfinding.patch diff --git a/patches/server/Optimize-VarInts.patch b/patches/unapplied/server/Optimize-VarInts.patch similarity index 100% rename from patches/server/Optimize-VarInts.patch rename to patches/unapplied/server/Optimize-VarInts.patch diff --git a/patches/server/Optimize-Voxel-Shape-Merging.patch b/patches/unapplied/server/Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/Optimize-Voxel-Shape-Merging.patch rename to patches/unapplied/server/Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/Optimize-World-Time-Updates.patch b/patches/unapplied/server/Optimize-World-Time-Updates.patch similarity index 100% rename from patches/server/Optimize-World-Time-Updates.patch rename to patches/unapplied/server/Optimize-World-Time-Updates.patch diff --git a/patches/server/Optimize-call-to-getFluid-for-explosions.patch b/patches/unapplied/server/Optimize-call-to-getFluid-for-explosions.patch similarity index 100% rename from patches/server/Optimize-call-to-getFluid-for-explosions.patch rename to patches/unapplied/server/Optimize-call-to-getFluid-for-explosions.patch diff --git a/patches/server/Optimize-entity-tracker-passenger-checks.patch b/patches/unapplied/server/Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/Optimize-entity-tracker-passenger-checks.patch rename to patches/unapplied/server/Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/Optimize-explosions.patch b/patches/unapplied/server/Optimize-explosions.patch similarity index 100% rename from patches/server/Optimize-explosions.patch rename to patches/unapplied/server/Optimize-explosions.patch diff --git a/patches/server/Optimize-indirect-passenger-iteration.patch b/patches/unapplied/server/Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/server/Optimize-indirect-passenger-iteration.patch rename to patches/unapplied/server/Optimize-indirect-passenger-iteration.patch diff --git a/patches/server/Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/unapplied/server/Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch similarity index 100% rename from patches/server/Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch rename to patches/unapplied/server/Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch diff --git a/patches/server/Optimize-nearest-structure-border-iteration.patch b/patches/unapplied/server/Optimize-nearest-structure-border-iteration.patch similarity index 100% rename from patches/server/Optimize-nearest-structure-border-iteration.patch rename to patches/unapplied/server/Optimize-nearest-structure-border-iteration.patch diff --git a/patches/server/Optimize-player-lookups-for-beacons.patch b/patches/unapplied/server/Optimize-player-lookups-for-beacons.patch similarity index 100% rename from patches/server/Optimize-player-lookups-for-beacons.patch rename to patches/unapplied/server/Optimize-player-lookups-for-beacons.patch diff --git a/patches/server/Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/unapplied/server/Option-for-maximum-exp-value-when-merging-orbs.patch similarity index 100% rename from patches/server/Option-for-maximum-exp-value-when-merging-orbs.patch rename to patches/unapplied/server/Option-for-maximum-exp-value-when-merging-orbs.patch diff --git a/patches/server/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/server/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/server/Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/unapplied/server/Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/unapplied/server/Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/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/server/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/server/Optional-per-player-mob-spawns.patch b/patches/unapplied/server/Optional-per-player-mob-spawns.patch similarity index 100% rename from patches/server/Optional-per-player-mob-spawns.patch rename to patches/unapplied/server/Optional-per-player-mob-spawns.patch diff --git a/patches/server/Paper-Metrics.patch b/patches/unapplied/server/Paper-Metrics.patch similarity index 100% rename from patches/server/Paper-Metrics.patch rename to patches/unapplied/server/Paper-Metrics.patch diff --git a/patches/server/Paper-Plugins.patch b/patches/unapplied/server/Paper-Plugins.patch similarity index 100% rename from patches/server/Paper-Plugins.patch rename to patches/unapplied/server/Paper-Plugins.patch diff --git a/patches/server/Paper-command.patch b/patches/unapplied/server/Paper-command.patch similarity index 100% rename from patches/server/Paper-command.patch rename to patches/unapplied/server/Paper-command.patch diff --git a/patches/server/Paper-config-files.patch b/patches/unapplied/server/Paper-config-files.patch similarity index 100% rename from patches/server/Paper-config-files.patch rename to patches/unapplied/server/Paper-config-files.patch diff --git a/patches/server/Paper-dumpitem-command.patch b/patches/unapplied/server/Paper-dumpitem-command.patch similarity index 100% rename from patches/server/Paper-dumpitem-command.patch rename to patches/unapplied/server/Paper-dumpitem-command.patch diff --git a/patches/server/Per-world-ticks-per-spawn-settings.patch b/patches/unapplied/server/Per-world-ticks-per-spawn-settings.patch similarity index 100% rename from patches/server/Per-world-ticks-per-spawn-settings.patch rename to patches/unapplied/server/Per-world-ticks-per-spawn-settings.patch diff --git a/patches/server/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/server/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/server/Player-Chunk-Load-Unload-Events.patch b/patches/unapplied/server/Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/server/Player-Chunk-Load-Unload-Events.patch rename to patches/unapplied/server/Player-Chunk-Load-Unload-Events.patch diff --git a/patches/server/Player-Entity-Tracking-Events.patch b/patches/unapplied/server/Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/server/Player-Entity-Tracking-Events.patch rename to patches/unapplied/server/Player-Entity-Tracking-Events.patch diff --git a/patches/server/Player-Tab-List-and-Title-APIs.patch b/patches/unapplied/server/Player-Tab-List-and-Title-APIs.patch similarity index 100% rename from patches/server/Player-Tab-List-and-Title-APIs.patch rename to patches/unapplied/server/Player-Tab-List-and-Title-APIs.patch diff --git a/patches/server/Player-affects-spawning-API.patch b/patches/unapplied/server/Player-affects-spawning-API.patch similarity index 100% rename from patches/server/Player-affects-spawning-API.patch rename to patches/unapplied/server/Player-affects-spawning-API.patch diff --git a/patches/server/Player.setPlayerProfile-API.patch b/patches/unapplied/server/Player.setPlayerProfile-API.patch similarity index 100% rename from patches/server/Player.setPlayerProfile-API.patch rename to patches/unapplied/server/Player.setPlayerProfile-API.patch diff --git a/patches/server/PlayerAttemptPickupItemEvent.patch b/patches/unapplied/server/PlayerAttemptPickupItemEvent.patch similarity index 100% rename from patches/server/PlayerAttemptPickupItemEvent.patch rename to patches/unapplied/server/PlayerAttemptPickupItemEvent.patch diff --git a/patches/server/PlayerDeathEvent-getItemsToKeep.patch b/patches/unapplied/server/PlayerDeathEvent-getItemsToKeep.patch similarity index 100% rename from patches/server/PlayerDeathEvent-getItemsToKeep.patch rename to patches/unapplied/server/PlayerDeathEvent-getItemsToKeep.patch diff --git a/patches/server/PlayerDeathEvent-shouldDropExperience.patch b/patches/unapplied/server/PlayerDeathEvent-shouldDropExperience.patch similarity index 100% rename from patches/server/PlayerDeathEvent-shouldDropExperience.patch rename to patches/unapplied/server/PlayerDeathEvent-shouldDropExperience.patch diff --git a/patches/server/PlayerElytraBoostEvent.patch b/patches/unapplied/server/PlayerElytraBoostEvent.patch similarity index 100% rename from patches/server/PlayerElytraBoostEvent.patch rename to patches/unapplied/server/PlayerElytraBoostEvent.patch diff --git a/patches/server/PlayerLaunchProjectileEvent.patch b/patches/unapplied/server/PlayerLaunchProjectileEvent.patch similarity index 100% rename from patches/server/PlayerLaunchProjectileEvent.patch rename to patches/unapplied/server/PlayerLaunchProjectileEvent.patch diff --git a/patches/server/PlayerNaturallySpawnCreaturesEvent.patch b/patches/unapplied/server/PlayerNaturallySpawnCreaturesEvent.patch similarity index 100% rename from patches/server/PlayerNaturallySpawnCreaturesEvent.patch rename to patches/unapplied/server/PlayerNaturallySpawnCreaturesEvent.patch diff --git a/patches/server/PlayerPickupExperienceEvent.patch b/patches/unapplied/server/PlayerPickupExperienceEvent.patch similarity index 100% rename from patches/server/PlayerPickupExperienceEvent.patch rename to patches/unapplied/server/PlayerPickupExperienceEvent.patch diff --git a/patches/server/PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/unapplied/server/PlayerPickupItemEvent-setFlyAtPlayer.patch similarity index 100% rename from patches/server/PlayerPickupItemEvent-setFlyAtPlayer.patch rename to patches/unapplied/server/PlayerPickupItemEvent-setFlyAtPlayer.patch diff --git a/patches/server/PlayerReadyArrowEvent.patch b/patches/unapplied/server/PlayerReadyArrowEvent.patch similarity index 100% rename from patches/server/PlayerReadyArrowEvent.patch rename to patches/unapplied/server/PlayerReadyArrowEvent.patch diff --git a/patches/server/PlayerTeleportEndGatewayEvent.patch b/patches/unapplied/server/PlayerTeleportEndGatewayEvent.patch similarity index 100% rename from patches/server/PlayerTeleportEndGatewayEvent.patch rename to patches/unapplied/server/PlayerTeleportEndGatewayEvent.patch diff --git a/patches/server/PortalCreateEvent-needs-to-know-its-entity.patch b/patches/unapplied/server/PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from patches/server/PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/unapplied/server/PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/patches/server/Potential-bed-API.patch b/patches/unapplied/server/Potential-bed-API.patch similarity index 100% rename from patches/server/Potential-bed-API.patch rename to patches/unapplied/server/Potential-bed-API.patch diff --git a/patches/server/PreCreatureSpawnEvent.patch b/patches/unapplied/server/PreCreatureSpawnEvent.patch similarity index 100% rename from patches/server/PreCreatureSpawnEvent.patch rename to patches/unapplied/server/PreCreatureSpawnEvent.patch diff --git a/patches/server/PreSpawnerSpawnEvent.patch b/patches/unapplied/server/PreSpawnerSpawnEvent.patch similarity index 100% rename from patches/server/PreSpawnerSpawnEvent.patch rename to patches/unapplied/server/PreSpawnerSpawnEvent.patch diff --git a/patches/server/Preserve-overstacked-loot.patch b/patches/unapplied/server/Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/Preserve-overstacked-loot.patch rename to patches/unapplied/server/Preserve-overstacked-loot.patch diff --git a/patches/server/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/server/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/server/Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/unapplied/server/Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/unapplied/server/Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/unapplied/server/Prevent-Double-PlayerChunkMap-adds-crashing-server.patch similarity index 100% rename from patches/server/Prevent-Double-PlayerChunkMap-adds-crashing-server.patch rename to patches/unapplied/server/Prevent-Double-PlayerChunkMap-adds-crashing-server.patch diff --git a/patches/server/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/server/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/server/Prevent-Pathfinding-out-of-World-Border.patch b/patches/unapplied/server/Prevent-Pathfinding-out-of-World-Border.patch similarity index 100% rename from patches/server/Prevent-Pathfinding-out-of-World-Border.patch rename to patches/unapplied/server/Prevent-Pathfinding-out-of-World-Border.patch diff --git a/patches/server/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/server/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/server/Prevent-block-entity-and-entity-crashes.patch b/patches/unapplied/server/Prevent-block-entity-and-entity-crashes.patch similarity index 100% rename from patches/server/Prevent-block-entity-and-entity-crashes.patch rename to patches/unapplied/server/Prevent-block-entity-and-entity-crashes.patch diff --git a/patches/server/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/server/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/server/Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/unapplied/server/Prevent-chunk-loading-from-Fluid-Flowing.patch similarity index 100% rename from patches/server/Prevent-chunk-loading-from-Fluid-Flowing.patch rename to patches/unapplied/server/Prevent-chunk-loading-from-Fluid-Flowing.patch diff --git a/patches/server/Prevent-consuming-the-wrong-itemstack.patch b/patches/unapplied/server/Prevent-consuming-the-wrong-itemstack.patch similarity index 100% rename from patches/server/Prevent-consuming-the-wrong-itemstack.patch rename to patches/unapplied/server/Prevent-consuming-the-wrong-itemstack.patch diff --git a/patches/server/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/server/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/server/Prevent-entity-loading-causing-async-lookups.patch b/patches/unapplied/server/Prevent-entity-loading-causing-async-lookups.patch similarity index 100% rename from patches/server/Prevent-entity-loading-causing-async-lookups.patch rename to patches/unapplied/server/Prevent-entity-loading-causing-async-lookups.patch diff --git a/patches/server/Prevent-excessive-velocity-through-repeated-crits.patch b/patches/unapplied/server/Prevent-excessive-velocity-through-repeated-crits.patch similarity index 100% rename from patches/server/Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/unapplied/server/Prevent-excessive-velocity-through-repeated-crits.patch diff --git a/patches/server/Prevent-grindstones-from-overstacking-items.patch b/patches/unapplied/server/Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/Prevent-grindstones-from-overstacking-items.patch rename to patches/unapplied/server/Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/Prevent-headless-pistons-from-being-created.patch b/patches/unapplied/server/Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/Prevent-headless-pistons-from-being-created.patch rename to patches/unapplied/server/Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/Prevent-opening-inventories-when-frozen.patch b/patches/unapplied/server/Prevent-opening-inventories-when-frozen.patch similarity index 100% rename from patches/server/Prevent-opening-inventories-when-frozen.patch rename to patches/unapplied/server/Prevent-opening-inventories-when-frozen.patch diff --git a/patches/server/Prevent-position-desync-causing-tp-exploit.patch b/patches/unapplied/server/Prevent-position-desync-causing-tp-exploit.patch similarity index 100% rename from patches/server/Prevent-position-desync-causing-tp-exploit.patch rename to patches/unapplied/server/Prevent-position-desync-causing-tp-exploit.patch diff --git a/patches/server/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/server/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/server/Prevent-softlocked-end-exit-portal-generation.patch b/patches/unapplied/server/Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/Prevent-softlocked-end-exit-portal-generation.patch rename to patches/unapplied/server/Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/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/server/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/server/Prevent-teleporting-dead-entities.patch b/patches/unapplied/server/Prevent-teleporting-dead-entities.patch similarity index 100% rename from patches/server/Prevent-teleporting-dead-entities.patch rename to patches/unapplied/server/Prevent-teleporting-dead-entities.patch diff --git a/patches/server/Prevent-tile-entity-copies-loading-chunks.patch b/patches/unapplied/server/Prevent-tile-entity-copies-loading-chunks.patch similarity index 100% rename from patches/server/Prevent-tile-entity-copies-loading-chunks.patch rename to patches/unapplied/server/Prevent-tile-entity-copies-loading-chunks.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/Profile-Lookup-Events.patch b/patches/unapplied/server/Profile-Lookup-Events.patch similarity index 100% rename from patches/server/Profile-Lookup-Events.patch rename to patches/unapplied/server/Profile-Lookup-Events.patch diff --git a/patches/server/ProfileWhitelistVerifyEvent.patch b/patches/unapplied/server/ProfileWhitelistVerifyEvent.patch similarity index 100% rename from patches/server/ProfileWhitelistVerifyEvent.patch rename to patches/unapplied/server/ProfileWhitelistVerifyEvent.patch diff --git a/patches/server/Properly-fix-item-duplication-bug.patch b/patches/unapplied/server/Properly-fix-item-duplication-bug.patch similarity index 100% rename from patches/server/Properly-fix-item-duplication-bug.patch rename to patches/unapplied/server/Properly-fix-item-duplication-bug.patch diff --git a/patches/server/Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/unapplied/server/Properly-handle-BlockBreakEvent-isDropItems.patch similarity index 100% rename from patches/server/Properly-handle-BlockBreakEvent-isDropItems.patch rename to patches/unapplied/server/Properly-handle-BlockBreakEvent-isDropItems.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/Properly-resend-entities.patch b/patches/unapplied/server/Properly-resend-entities.patch similarity index 100% rename from patches/server/Properly-resend-entities.patch rename to patches/unapplied/server/Properly-resend-entities.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/RangedEntity-API.patch b/patches/unapplied/server/RangedEntity-API.patch similarity index 100% rename from patches/server/RangedEntity-API.patch rename to patches/unapplied/server/RangedEntity-API.patch diff --git a/patches/server/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/server/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/server/Reduce-Either-Optional-allocation.patch b/patches/unapplied/server/Reduce-Either-Optional-allocation.patch similarity index 100% rename from patches/server/Reduce-Either-Optional-allocation.patch rename to patches/unapplied/server/Reduce-Either-Optional-allocation.patch diff --git a/patches/server/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/server/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/server/Reduce-blockpos-allocation-from-pathfinding.patch b/patches/unapplied/server/Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from patches/server/Reduce-blockpos-allocation-from-pathfinding.patch rename to patches/unapplied/server/Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/patches/server/Reduce-memory-footprint-of-CompoundTag.patch b/patches/unapplied/server/Reduce-memory-footprint-of-CompoundTag.patch similarity index 100% rename from patches/server/Reduce-memory-footprint-of-CompoundTag.patch rename to patches/unapplied/server/Reduce-memory-footprint-of-CompoundTag.patch diff --git a/patches/server/Refresh-ProjectileSource-for-projectiles.patch b/patches/unapplied/server/Refresh-ProjectileSource-for-projectiles.patch similarity index 100% rename from patches/server/Refresh-ProjectileSource-for-projectiles.patch rename to patches/unapplied/server/Refresh-ProjectileSource-for-projectiles.patch diff --git a/patches/server/Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/unapplied/server/Refresh-player-inventory-when-cancelling-PlayerInter.patch similarity index 100% rename from patches/server/Refresh-player-inventory-when-cancelling-PlayerInter.patch rename to patches/unapplied/server/Refresh-player-inventory-when-cancelling-PlayerInter.patch diff --git a/patches/server/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/server/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/server/Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/unapplied/server/Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 100% rename from patches/server/Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/unapplied/server/Remove-CraftItemStack-setAmount-null-assignment.patch diff --git a/patches/server/Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/unapplied/server/Remove-CraftScheduler-Async-Task-Debugger.patch similarity index 100% rename from patches/server/Remove-CraftScheduler-Async-Task-Debugger.patch rename to patches/unapplied/server/Remove-CraftScheduler-Async-Task-Debugger.patch diff --git a/patches/server/Remove-Metadata-on-reload.patch b/patches/unapplied/server/Remove-Metadata-on-reload.patch similarity index 100% rename from patches/server/Remove-Metadata-on-reload.patch rename to patches/unapplied/server/Remove-Metadata-on-reload.patch diff --git a/patches/server/Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/unapplied/server/Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/unapplied/server/Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/Remove-stale-POIs.patch b/patches/unapplied/server/Remove-stale-POIs.patch similarity index 100% rename from patches/server/Remove-stale-POIs.patch rename to patches/unapplied/server/Remove-stale-POIs.patch diff --git a/patches/server/Remove-streams-from-hot-code.patch b/patches/unapplied/server/Remove-streams-from-hot-code.patch similarity index 100% rename from patches/server/Remove-streams-from-hot-code.patch rename to patches/unapplied/server/Remove-streams-from-hot-code.patch diff --git a/patches/server/Remove-unnecessary-itemmeta-handling.patch b/patches/unapplied/server/Remove-unnecessary-itemmeta-handling.patch similarity index 100% rename from patches/server/Remove-unnecessary-itemmeta-handling.patch rename to patches/unapplied/server/Remove-unnecessary-itemmeta-handling.patch diff --git a/patches/server/Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/unapplied/server/Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 100% rename from patches/server/Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/unapplied/server/Remove-unnecessary-onTrackingStart-during-navigation.patch diff --git a/patches/server/Replace-OfflinePlayer-getLastPlayed.patch b/patches/unapplied/server/Replace-OfflinePlayer-getLastPlayed.patch similarity index 100% rename from patches/server/Replace-OfflinePlayer-getLastPlayed.patch rename to patches/unapplied/server/Replace-OfflinePlayer-getLastPlayed.patch diff --git a/patches/server/Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/unapplied/server/Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/unapplied/server/Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/Reset-placed-block-on-exception.patch b/patches/unapplied/server/Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/Reset-placed-block-on-exception.patch rename to patches/unapplied/server/Reset-placed-block-on-exception.patch diff --git a/patches/server/Reset-players-airTicks-on-respawn.patch b/patches/unapplied/server/Reset-players-airTicks-on-respawn.patch similarity index 100% rename from patches/server/Reset-players-airTicks-on-respawn.patch rename to patches/unapplied/server/Reset-players-airTicks-on-respawn.patch diff --git a/patches/server/Reset-shield-blocking-on-dimension-change.patch b/patches/unapplied/server/Reset-shield-blocking-on-dimension-change.patch similarity index 100% rename from patches/server/Reset-shield-blocking-on-dimension-change.patch rename to patches/unapplied/server/Reset-shield-blocking-on-dimension-change.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/Restore-custom-InventoryHolder-support.patch b/patches/unapplied/server/Restore-custom-InventoryHolder-support.patch similarity index 100% rename from patches/server/Restore-custom-InventoryHolder-support.patch rename to patches/unapplied/server/Restore-custom-InventoryHolder-support.patch diff --git a/patches/server/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/server/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/server/Restore-vanilla-entity-drops-behavior.patch b/patches/unapplied/server/Restore-vanilla-entity-drops-behavior.patch similarity index 100% rename from patches/server/Restore-vanilla-entity-drops-behavior.patch rename to patches/unapplied/server/Restore-vanilla-entity-drops-behavior.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/unapplied/server/Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/unapplied/server/Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/Rewrite-chunk-system.patch b/patches/unapplied/server/Rewrite-chunk-system.patch similarity index 100% rename from patches/server/Rewrite-chunk-system.patch rename to patches/unapplied/server/Rewrite-chunk-system.patch diff --git a/patches/server/Rewrite-dataconverter-system.patch b/patches/unapplied/server/Rewrite-dataconverter-system.patch similarity index 100% rename from patches/server/Rewrite-dataconverter-system.patch rename to patches/unapplied/server/Rewrite-dataconverter-system.patch diff --git a/patches/server/Sanitise-RegionFileCache-and-make-configurable.patch b/patches/unapplied/server/Sanitise-RegionFileCache-and-make-configurable.patch similarity index 100% rename from patches/server/Sanitise-RegionFileCache-and-make-configurable.patch rename to patches/unapplied/server/Sanitise-RegionFileCache-and-make-configurable.patch diff --git a/patches/server/Sanitize-ResourceLocation-error-logging.patch b/patches/unapplied/server/Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/Sanitize-ResourceLocation-error-logging.patch rename to patches/unapplied/server/Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/Sanitize-sent-BlockEntity-NBT.patch b/patches/unapplied/server/Sanitize-sent-BlockEntity-NBT.patch similarity index 100% rename from patches/server/Sanitize-sent-BlockEntity-NBT.patch rename to patches/unapplied/server/Sanitize-sent-BlockEntity-NBT.patch diff --git a/patches/server/SculkCatalyst-bloom-API.patch b/patches/unapplied/server/SculkCatalyst-bloom-API.patch similarity index 100% rename from patches/server/SculkCatalyst-bloom-API.patch rename to patches/unapplied/server/SculkCatalyst-bloom-API.patch diff --git a/patches/server/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/server/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/server/Send-block-entities-after-destroy-prediction.patch b/patches/unapplied/server/Send-block-entities-after-destroy-prediction.patch similarity index 100% rename from patches/server/Send-block-entities-after-destroy-prediction.patch rename to patches/unapplied/server/Send-block-entities-after-destroy-prediction.patch diff --git a/patches/server/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/server/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/server/Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/unapplied/server/Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/unapplied/server/Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/Server-Tick-Events.patch b/patches/unapplied/server/Server-Tick-Events.patch similarity index 100% rename from patches/server/Server-Tick-Events.patch rename to patches/unapplied/server/Server-Tick-Events.patch diff --git a/patches/server/Set-area-affect-cloud-rotation.patch b/patches/unapplied/server/Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/Set-area-affect-cloud-rotation.patch rename to patches/unapplied/server/Set-area-affect-cloud-rotation.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/Shoulder-Entities-Release-API.patch b/patches/unapplied/server/Shoulder-Entities-Release-API.patch similarity index 100% rename from patches/server/Shoulder-Entities-Release-API.patch rename to patches/unapplied/server/Shoulder-Entities-Release-API.patch diff --git a/patches/server/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/unapplied/server/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch similarity index 100% rename from patches/server/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch rename to patches/unapplied/server/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/SkeletonHorse-Additions.patch b/patches/unapplied/server/SkeletonHorse-Additions.patch similarity index 100% rename from patches/server/SkeletonHorse-Additions.patch rename to patches/unapplied/server/SkeletonHorse-Additions.patch diff --git a/patches/server/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/server/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/server/Slime-Pathfinder-Events.patch b/patches/unapplied/server/Slime-Pathfinder-Events.patch similarity index 100% rename from patches/server/Slime-Pathfinder-Events.patch rename to patches/unapplied/server/Slime-Pathfinder-Events.patch diff --git a/patches/server/Starlight.patch b/patches/unapplied/server/Starlight.patch similarity index 100% rename from patches/server/Starlight.patch rename to patches/unapplied/server/Starlight.patch diff --git a/patches/server/Stinger-API.patch b/patches/unapplied/server/Stinger-API.patch similarity index 100% rename from patches/server/Stinger-API.patch rename to patches/unapplied/server/Stinger-API.patch diff --git a/patches/server/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/server/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/server/String-based-Action-Bar-API.patch b/patches/unapplied/server/String-based-Action-Bar-API.patch similarity index 100% rename from patches/server/String-based-Action-Bar-API.patch rename to patches/unapplied/server/String-based-Action-Bar-API.patch diff --git a/patches/server/Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/unapplied/server/Strip-raytracing-for-EntityLiving-hasLineOfSight.patch similarity index 100% rename from patches/server/Strip-raytracing-for-EntityLiving-hasLineOfSight.patch rename to patches/unapplied/server/Strip-raytracing-for-EntityLiving-hasLineOfSight.patch diff --git a/patches/server/Support-components-in-ItemMeta.patch b/patches/unapplied/server/Support-components-in-ItemMeta.patch similarity index 100% rename from patches/server/Support-components-in-ItemMeta.patch rename to patches/unapplied/server/Support-components-in-ItemMeta.patch diff --git a/patches/server/Support-old-UUID-format-for-NBT.patch b/patches/unapplied/server/Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/server/Support-old-UUID-format-for-NBT.patch rename to patches/unapplied/server/Support-old-UUID-format-for-NBT.patch diff --git a/patches/server/Suspicious-Effect-Entry-API.patch b/patches/unapplied/server/Suspicious-Effect-Entry-API.patch similarity index 100% rename from patches/server/Suspicious-Effect-Entry-API.patch rename to patches/unapplied/server/Suspicious-Effect-Entry-API.patch diff --git a/patches/server/Sync-offhand-slot-in-menus.patch b/patches/unapplied/server/Sync-offhand-slot-in-menus.patch similarity index 100% rename from patches/server/Sync-offhand-slot-in-menus.patch rename to patches/unapplied/server/Sync-offhand-slot-in-menus.patch diff --git a/patches/server/Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/unapplied/server/Synchronize-PalettedContainer-instead-of-ThreadingDe.patch similarity index 100% rename from patches/server/Synchronize-PalettedContainer-instead-of-ThreadingDe.patch rename to patches/unapplied/server/Synchronize-PalettedContainer-instead-of-ThreadingDe.patch diff --git a/patches/server/System-property-for-disabling-watchdoge.patch b/patches/unapplied/server/System-property-for-disabling-watchdoge.patch similarity index 100% rename from patches/server/System-property-for-disabling-watchdoge.patch rename to patches/unapplied/server/System-property-for-disabling-watchdoge.patch diff --git a/patches/server/TODO-Registry-Modification-API.patch b/patches/unapplied/server/TODO-Registry-Modification-API.patch similarity index 100% rename from patches/server/TODO-Registry-Modification-API.patch rename to patches/unapplied/server/TODO-Registry-Modification-API.patch diff --git a/patches/server/Tameable-getOwnerUniqueId-API.patch b/patches/unapplied/server/Tameable-getOwnerUniqueId-API.patch similarity index 100% rename from patches/server/Tameable-getOwnerUniqueId-API.patch rename to patches/unapplied/server/Tameable-getOwnerUniqueId-API.patch diff --git a/patches/server/Test-changes.patch b/patches/unapplied/server/Test-changes.patch similarity index 100% rename from patches/server/Test-changes.patch rename to patches/unapplied/server/Test-changes.patch diff --git a/patches/server/Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/unapplied/server/Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/unapplied/server/Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/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/server/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/server/Time-scoreboard-search.patch b/patches/unapplied/server/Time-scoreboard-search.patch similarity index 100% rename from patches/server/Time-scoreboard-search.patch rename to patches/unapplied/server/Time-scoreboard-search.patch diff --git a/patches/server/Timings-v2.patch b/patches/unapplied/server/Timings-v2.patch similarity index 100% rename from patches/server/Timings-v2.patch rename to patches/unapplied/server/Timings-v2.patch diff --git a/patches/server/Toggle-for-removing-existing-dragon.patch b/patches/unapplied/server/Toggle-for-removing-existing-dragon.patch similarity index 100% rename from patches/server/Toggle-for-removing-existing-dragon.patch rename to patches/unapplied/server/Toggle-for-removing-existing-dragon.patch diff --git a/patches/server/Toggleable-player-crits.patch b/patches/unapplied/server/Toggleable-player-crits.patch similarity index 100% rename from patches/server/Toggleable-player-crits.patch rename to patches/unapplied/server/Toggleable-player-crits.patch diff --git a/patches/server/Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/unapplied/server/Track-projectile-source-for-fireworks-from-dispenser.patch similarity index 100% rename from patches/server/Track-projectile-source-for-fireworks-from-dispenser.patch rename to patches/unapplied/server/Track-projectile-source-for-fireworks-from-dispenser.patch diff --git a/patches/server/Tracking-Range-Improvements.patch b/patches/unapplied/server/Tracking-Range-Improvements.patch similarity index 100% rename from patches/server/Tracking-Range-Improvements.patch rename to patches/unapplied/server/Tracking-Range-Improvements.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/Turtle-API.patch b/patches/unapplied/server/Turtle-API.patch similarity index 100% rename from patches/server/Turtle-API.patch rename to patches/unapplied/server/Turtle-API.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/Update-head-rotation-in-missing-places.patch b/patches/unapplied/server/Update-head-rotation-in-missing-places.patch similarity index 100% rename from patches/server/Update-head-rotation-in-missing-places.patch rename to patches/unapplied/server/Update-head-rotation-in-missing-places.patch diff --git a/patches/server/Update-itemstack-legacy-name-and-lore.patch b/patches/unapplied/server/Update-itemstack-legacy-name-and-lore.patch similarity index 100% rename from patches/server/Update-itemstack-legacy-name-and-lore.patch rename to patches/unapplied/server/Update-itemstack-legacy-name-and-lore.patch diff --git a/patches/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/unapplied/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch similarity index 100% rename from patches/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch rename to patches/unapplied/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch diff --git a/patches/server/Use-ConcurrentHashMap-in-JsonList.patch b/patches/unapplied/server/Use-ConcurrentHashMap-in-JsonList.patch similarity index 100% rename from patches/server/Use-ConcurrentHashMap-in-JsonList.patch rename to patches/unapplied/server/Use-ConcurrentHashMap-in-JsonList.patch diff --git a/patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/unapplied/server/Use-TerminalConsoleAppender-for-console-improvements.patch similarity index 100% rename from patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch rename to patches/unapplied/server/Use-TerminalConsoleAppender-for-console-improvements.patch diff --git a/patches/server/Use-UserCache-for-player-heads.patch b/patches/unapplied/server/Use-UserCache-for-player-heads.patch similarity index 100% rename from patches/server/Use-UserCache-for-player-heads.patch rename to patches/unapplied/server/Use-UserCache-for-player-heads.patch diff --git a/patches/server/Use-Velocity-compression-and-cipher-natives.patch b/patches/unapplied/server/Use-Velocity-compression-and-cipher-natives.patch similarity index 100% rename from patches/server/Use-Velocity-compression-and-cipher-natives.patch rename to patches/unapplied/server/Use-Velocity-compression-and-cipher-natives.patch diff --git a/patches/server/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/server/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/server/Use-a-Queue-for-Queueing-Commands.patch b/patches/unapplied/server/Use-a-Queue-for-Queueing-Commands.patch similarity index 100% rename from patches/server/Use-a-Queue-for-Queueing-Commands.patch rename to patches/unapplied/server/Use-a-Queue-for-Queueing-Commands.patch diff --git a/patches/server/Use-a-Shared-Random-for-Entities.patch b/patches/unapplied/server/Use-a-Shared-Random-for-Entities.patch similarity index 100% rename from patches/server/Use-a-Shared-Random-for-Entities.patch rename to patches/unapplied/server/Use-a-Shared-Random-for-Entities.patch diff --git a/patches/server/Use-array-for-gamerule-storage.patch b/patches/unapplied/server/Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/Use-array-for-gamerule-storage.patch rename to patches/unapplied/server/Use-array-for-gamerule-storage.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/Use-correct-variable-for-initializing-CraftLootTable.patch b/patches/unapplied/server/Use-correct-variable-for-initializing-CraftLootTable.patch similarity index 100% rename from patches/server/Use-correct-variable-for-initializing-CraftLootTable.patch rename to patches/unapplied/server/Use-correct-variable-for-initializing-CraftLootTable.patch diff --git a/patches/server/Use-distance-map-to-optimise-entity-tracker.patch b/patches/unapplied/server/Use-distance-map-to-optimise-entity-tracker.patch similarity index 100% rename from patches/server/Use-distance-map-to-optimise-entity-tracker.patch rename to patches/unapplied/server/Use-distance-map-to-optimise-entity-tracker.patch diff --git a/patches/server/Use-getChunkIfLoadedImmediately-in-places.patch b/patches/unapplied/server/Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/server/Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/unapplied/server/Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/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/server/Validate-ResourceLocation-in-NBT-reading.patch b/patches/unapplied/server/Validate-ResourceLocation-in-NBT-reading.patch similarity index 100% rename from patches/server/Validate-ResourceLocation-in-NBT-reading.patch rename to patches/unapplied/server/Validate-ResourceLocation-in-NBT-reading.patch diff --git a/patches/server/Validate-tripwire-hook-placement-before-update.patch b/patches/unapplied/server/Validate-tripwire-hook-placement-before-update.patch similarity index 100% rename from patches/server/Validate-tripwire-hook-placement-before-update.patch rename to patches/unapplied/server/Validate-tripwire-hook-placement-before-update.patch diff --git a/patches/server/Validate-usernames.patch b/patches/unapplied/server/Validate-usernames.patch similarity index 100% rename from patches/server/Validate-usernames.patch rename to patches/unapplied/server/Validate-usernames.patch diff --git a/patches/server/Vanilla-command-permission-fixes.patch b/patches/unapplied/server/Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/Vanilla-command-permission-fixes.patch rename to patches/unapplied/server/Vanilla-command-permission-fixes.patch diff --git a/patches/server/Vanished-players-don-t-have-rights.patch b/patches/unapplied/server/Vanished-players-don-t-have-rights.patch similarity index 100% rename from patches/server/Vanished-players-don-t-have-rights.patch rename to patches/unapplied/server/Vanished-players-don-t-have-rights.patch diff --git a/patches/server/Vex-get-setSummoner-API.patch b/patches/unapplied/server/Vex-get-setSummoner-API.patch similarity index 100% rename from patches/server/Vex-get-setSummoner-API.patch rename to patches/unapplied/server/Vex-get-setSummoner-API.patch diff --git a/patches/server/Villager-Restocks-API.patch b/patches/unapplied/server/Villager-Restocks-API.patch similarity index 100% rename from patches/server/Villager-Restocks-API.patch rename to patches/unapplied/server/Villager-Restocks-API.patch diff --git a/patches/server/Villager-resetOffers.patch b/patches/unapplied/server/Villager-resetOffers.patch similarity index 100% rename from patches/server/Villager-resetOffers.patch rename to patches/unapplied/server/Villager-resetOffers.patch diff --git a/patches/server/Wait-for-Async-Tasks-during-shutdown.patch b/patches/unapplied/server/Wait-for-Async-Tasks-during-shutdown.patch similarity index 100% rename from patches/server/Wait-for-Async-Tasks-during-shutdown.patch rename to patches/unapplied/server/Wait-for-Async-Tasks-during-shutdown.patch diff --git a/patches/server/Warn-on-plugins-accessing-faraway-chunks.patch b/patches/unapplied/server/Warn-on-plugins-accessing-faraway-chunks.patch similarity index 100% rename from patches/server/Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/unapplied/server/Warn-on-plugins-accessing-faraway-chunks.patch diff --git a/patches/server/Win-Screen-API.patch b/patches/unapplied/server/Win-Screen-API.patch similarity index 100% rename from patches/server/Win-Screen-API.patch rename to patches/unapplied/server/Win-Screen-API.patch diff --git a/patches/server/WitchConsumePotionEvent.patch b/patches/unapplied/server/WitchConsumePotionEvent.patch similarity index 100% rename from patches/server/WitchConsumePotionEvent.patch rename to patches/unapplied/server/WitchConsumePotionEvent.patch diff --git a/patches/server/WitchReadyPotionEvent.patch b/patches/unapplied/server/WitchReadyPotionEvent.patch similarity index 100% rename from patches/server/WitchReadyPotionEvent.patch rename to patches/unapplied/server/WitchReadyPotionEvent.patch diff --git a/patches/server/WitchThrowPotionEvent.patch b/patches/unapplied/server/WitchThrowPotionEvent.patch similarity index 100% rename from patches/server/WitchThrowPotionEvent.patch rename to patches/unapplied/server/WitchThrowPotionEvent.patch diff --git a/patches/server/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/server/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/server/WorldCreator-keepSpawnLoaded.patch b/patches/unapplied/server/WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/server/WorldCreator-keepSpawnLoaded.patch rename to patches/unapplied/server/WorldCreator-keepSpawnLoaded.patch diff --git a/patches/server/Write-SavedData-IO-async.patch b/patches/unapplied/server/Write-SavedData-IO-async.patch similarity index 100% rename from patches/server/Write-SavedData-IO-async.patch rename to patches/unapplied/server/Write-SavedData-IO-async.patch diff --git a/patches/server/Zombie-API-breaking-doors.patch b/patches/unapplied/server/Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/Zombie-API-breaking-doors.patch rename to patches/unapplied/server/Zombie-API-breaking-doors.patch diff --git a/patches/server/add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/unapplied/server/add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/unapplied/server/add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/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/server/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/server/add-hand-to-BlockMultiPlaceEvent.patch b/patches/unapplied/server/add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/server/add-hand-to-BlockMultiPlaceEvent.patch rename to patches/unapplied/server/add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/server/add-isDeeplySleeping-to-HumanEntity.patch b/patches/unapplied/server/add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/add-isDeeplySleeping-to-HumanEntity.patch rename to patches/unapplied/server/add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/add-more-information-to-Entity.toString.patch b/patches/unapplied/server/add-more-information-to-Entity.toString.patch similarity index 100% rename from patches/server/add-more-information-to-Entity.toString.patch rename to patches/unapplied/server/add-more-information-to-Entity.toString.patch diff --git a/patches/server/add-more-scoreboard-API.patch b/patches/unapplied/server/add-more-scoreboard-API.patch similarity index 100% rename from patches/server/add-more-scoreboard-API.patch rename to patches/unapplied/server/add-more-scoreboard-API.patch diff --git a/patches/server/add-number-format-api.patch b/patches/unapplied/server/add-number-format-api.patch similarity index 100% rename from patches/server/add-number-format-api.patch rename to patches/unapplied/server/add-number-format-api.patch diff --git a/patches/server/add-per-world-spawn-limits.patch b/patches/unapplied/server/add-per-world-spawn-limits.patch similarity index 100% rename from patches/server/add-per-world-spawn-limits.patch rename to patches/unapplied/server/add-per-world-spawn-limits.patch diff --git a/patches/server/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/server/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/server/cache-resource-keys.patch b/patches/unapplied/server/cache-resource-keys.patch similarity index 100% rename from patches/server/cache-resource-keys.patch rename to patches/unapplied/server/cache-resource-keys.patch diff --git a/patches/server/check-global-player-list-where-appropriate.patch b/patches/unapplied/server/check-global-player-list-where-appropriate.patch similarity index 100% rename from patches/server/check-global-player-list-where-appropriate.patch rename to patches/unapplied/server/check-global-player-list-where-appropriate.patch diff --git a/patches/server/check-if-itemstack-is-stackable-first.patch b/patches/unapplied/server/check-if-itemstack-is-stackable-first.patch similarity index 100% rename from patches/server/check-if-itemstack-is-stackable-first.patch rename to patches/unapplied/server/check-if-itemstack-is-stackable-first.patch diff --git a/patches/server/config-for-disabling-entity-tag-tags.patch b/patches/unapplied/server/config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/config-for-disabling-entity-tag-tags.patch rename to patches/unapplied/server/config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/disable-forced-empty-world-ticks.patch b/patches/unapplied/server/disable-forced-empty-world-ticks.patch similarity index 100% rename from patches/server/disable-forced-empty-world-ticks.patch rename to patches/unapplied/server/disable-forced-empty-world-ticks.patch diff --git a/patches/server/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/server/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/server/don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/unapplied/server/don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch similarity index 100% rename from patches/server/don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch rename to patches/unapplied/server/don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch diff --git a/patches/server/ensure-reset-EnderDragon-boss-event-name.patch b/patches/unapplied/server/ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/ensure-reset-EnderDragon-boss-event-name.patch rename to patches/unapplied/server/ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/ensureServerConversions-API.patch b/patches/unapplied/server/ensureServerConversions-API.patch similarity index 100% rename from patches/server/ensureServerConversions-API.patch rename to patches/unapplied/server/ensureServerConversions-API.patch diff --git a/patches/server/fix-Instruments.patch b/patches/unapplied/server/fix-Instruments.patch similarity index 100% rename from patches/server/fix-Instruments.patch rename to patches/unapplied/server/fix-Instruments.patch diff --git a/patches/server/fix-ItemMeta-removing-CustomModelData.patch b/patches/unapplied/server/fix-ItemMeta-removing-CustomModelData.patch similarity index 100% rename from patches/server/fix-ItemMeta-removing-CustomModelData.patch rename to patches/unapplied/server/fix-ItemMeta-removing-CustomModelData.patch diff --git a/patches/server/fix-Jigsaw-block-kicking-user.patch b/patches/unapplied/server/fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/server/fix-Jigsaw-block-kicking-user.patch rename to patches/unapplied/server/fix-Jigsaw-block-kicking-user.patch diff --git a/patches/server/fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/unapplied/server/fix-MC-252817-green-map-markers-do-not-disappear.patch similarity index 100% rename from patches/server/fix-MC-252817-green-map-markers-do-not-disappear.patch rename to patches/unapplied/server/fix-MC-252817-green-map-markers-do-not-disappear.patch diff --git a/patches/server/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/server/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/server/fix-PigZombieAngerEvent-cancellation.patch b/patches/unapplied/server/fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/fix-PigZombieAngerEvent-cancellation.patch rename to patches/unapplied/server/fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/fix-PlayerItemHeldEvent-firing-twice.patch b/patches/unapplied/server/fix-PlayerItemHeldEvent-firing-twice.patch similarity index 100% rename from patches/server/fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/unapplied/server/fix-PlayerItemHeldEvent-firing-twice.patch diff --git a/patches/server/fix-converting-txt-to-json-file.patch b/patches/unapplied/server/fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/fix-converting-txt-to-json-file.patch rename to patches/unapplied/server/fix-converting-txt-to-json-file.patch diff --git a/patches/server/fix-dead-slime-setSize-invincibility.patch b/patches/unapplied/server/fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/fix-dead-slime-setSize-invincibility.patch rename to patches/unapplied/server/fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/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/server/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/server/fix-item-meta-for-tadpole-buckets.patch b/patches/unapplied/server/fix-item-meta-for-tadpole-buckets.patch similarity index 100% rename from patches/server/fix-item-meta-for-tadpole-buckets.patch rename to patches/unapplied/server/fix-item-meta-for-tadpole-buckets.patch diff --git a/patches/server/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/server/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/server/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/server/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/server/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/server/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/server/force-entity-dismount-during-teleportation.patch b/patches/unapplied/server/force-entity-dismount-during-teleportation.patch similarity index 100% rename from patches/server/force-entity-dismount-during-teleportation.patch rename to patches/unapplied/server/force-entity-dismount-during-teleportation.patch diff --git a/patches/server/forced-whitelist-use-configurable-kick-message.patch b/patches/unapplied/server/forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/forced-whitelist-use-configurable-kick-message.patch rename to patches/unapplied/server/forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/getPlayerUniqueId-API.patch b/patches/unapplied/server/getPlayerUniqueId-API.patch similarity index 100% rename from patches/server/getPlayerUniqueId-API.patch rename to patches/unapplied/server/getPlayerUniqueId-API.patch diff --git a/patches/server/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/server/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/server/handle-ServerboundKeepAlivePacket-async.patch b/patches/unapplied/server/handle-ServerboundKeepAlivePacket-async.patch similarity index 100% rename from patches/server/handle-ServerboundKeepAlivePacket-async.patch rename to patches/unapplied/server/handle-ServerboundKeepAlivePacket-async.patch diff --git a/patches/server/improve-BanList-types.patch b/patches/unapplied/server/improve-BanList-types.patch similarity index 100% rename from patches/server/improve-BanList-types.patch rename to patches/unapplied/server/improve-BanList-types.patch diff --git a/patches/server/incremental-chunk-and-player-saving.patch b/patches/unapplied/server/incremental-chunk-and-player-saving.patch similarity index 100% rename from patches/server/incremental-chunk-and-player-saving.patch rename to patches/unapplied/server/incremental-chunk-and-player-saving.patch diff --git a/patches/server/living-entity-allow-attribute-registration.patch b/patches/unapplied/server/living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/living-entity-allow-attribute-registration.patch rename to patches/unapplied/server/living-entity-allow-attribute-registration.patch diff --git a/patches/server/misc-debugging-dumps.patch b/patches/unapplied/server/misc-debugging-dumps.patch similarity index 100% rename from patches/server/misc-debugging-dumps.patch rename to patches/unapplied/server/misc-debugging-dumps.patch diff --git a/patches/server/offset-item-frame-ticking.patch b/patches/unapplied/server/offset-item-frame-ticking.patch similarity index 100% rename from patches/server/offset-item-frame-ticking.patch rename to patches/unapplied/server/offset-item-frame-ticking.patch diff --git a/patches/server/optimize-dirt-and-snow-spreading.patch b/patches/unapplied/server/optimize-dirt-and-snow-spreading.patch similarity index 100% rename from patches/server/optimize-dirt-and-snow-spreading.patch rename to patches/unapplied/server/optimize-dirt-and-snow-spreading.patch diff --git a/patches/server/prevent-unintended-light-block-manipulation.patch b/patches/unapplied/server/prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/prevent-unintended-light-block-manipulation.patch rename to patches/unapplied/server/prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/properly-read-and-store-sus-effect-duration.patch b/patches/unapplied/server/properly-read-and-store-sus-effect-duration.patch similarity index 100% rename from patches/server/properly-read-and-store-sus-effect-duration.patch rename to patches/unapplied/server/properly-read-and-store-sus-effect-duration.patch diff --git a/patches/server/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/server/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/server/remove-duplicate-animate-packet-for-records.patch b/patches/unapplied/server/remove-duplicate-animate-packet-for-records.patch similarity index 100% rename from patches/server/remove-duplicate-animate-packet-for-records.patch rename to patches/unapplied/server/remove-duplicate-animate-packet-for-records.patch diff --git a/patches/server/remove-null-possibility-for-getServer-singleton.patch b/patches/unapplied/server/remove-null-possibility-for-getServer-singleton.patch similarity index 100% rename from patches/server/remove-null-possibility-for-getServer-singleton.patch rename to patches/unapplied/server/remove-null-possibility-for-getServer-singleton.patch diff --git a/patches/server/revert-serverside-behavior-of-keepalives.patch b/patches/unapplied/server/revert-serverside-behavior-of-keepalives.patch similarity index 100% rename from patches/server/revert-serverside-behavior-of-keepalives.patch rename to patches/unapplied/server/revert-serverside-behavior-of-keepalives.patch diff --git a/patches/server/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/server/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/server/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/server/use-CB-BlockState-implementations-for-captured-block.patch rename to patches/unapplied/server/use-CB-BlockState-implementations-for-captured-block.patch diff --git a/work/BuildData b/work/BuildData index 58819a3c2a..2e2c7cd23d 160000 --- a/work/BuildData +++ b/work/BuildData @@ -1 +1 @@ -Subproject commit 58819a3c2a15e6e47ad89d32fb60d44c253491f3 +Subproject commit 2e2c7cd23daeeddf71226b4e604f8603d71cfca0 diff --git a/work/Bukkit b/work/Bukkit index f02baa3869..664548f4ec 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit f02baa38696abb62cc2588af8aaed4c9e0e1b30f +Subproject commit 664548f4eca483e1b9722c5252e322205ba6e201 diff --git a/work/CraftBukkit b/work/CraftBukkit index dfaa89bbe3..8d3e67d865 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit dfaa89bbe33da3db95b8cc61f9897845076ba757 +Subproject commit 8d3e67d8653ffb29b0fd00adaffd3f166aa10e7d diff --git a/work/Spigot b/work/Spigot index e9ec54852f..b698b49caf 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit e9ec54852f825ba470576cd1b5a33b0d76091fbe +Subproject commit b698b49caf14f97a717afd67e13fd7ac59f51089