diff --git a/README.md b/README.md index c656cf87d4..83caa19025 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ How To (Plugin Developers) io.papermc.paper paper-api - 1.18.2-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT provided ``` diff --git a/build.gradle.kts b/build.gradle.kts index 5307f62687..8ad25ffdcb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -61,10 +61,10 @@ repositories { } dependencies { - paramMappings("net.fabricmc:yarn:1.18.2+build.2:mergedv2") + paramMappings("net.fabricmc:yarn:1.19+build.1:mergedv2") remapper("net.fabricmc:tiny-remapper:0.8.2:fat") decompiler("net.minecraftforge:forgeflower:1.5.605.7") - spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.4") + spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.6") paperclip("io.papermc:paperclip:3.0.2") } diff --git a/gradle.properties b/gradle.properties index 398db6bb68..02859ad1a4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group=io.papermc.paper -version=1.18.2-R0.1-SNAPSHOT +version=1.19-R0.1-SNAPSHOT -mcVersion=1.18.2 +mcVersion=1.19 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/api/0001-Convert-project-to-Gradle.patch b/patches/api/0001-Convert-project-to-Gradle.patch index 0035f2a6e9..7a50bb9ba1 100644 --- a/patches/api/0001-Convert-project-to-Gradle.patch +++ b/patches/api/0001-Convert-project-to-Gradle.patch @@ -27,10 +27,10 @@ index e431e3435737e28394d81b56568a08b3c3148b9b..b23bde3b5e881f146539a307d0a59f21 +/.factorypath diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 -index 0000000000000000000000000000000000000000..d6b99d37c960a7d8de1852dbc74c3ce671101b14 +index 0000000000000000000000000000000000000000..7c41b546ae6f6e675072239b4c2d9076fa43ca87 --- /dev/null +++ b/build.gradle.kts -@@ -0,0 +1,80 @@ +@@ -0,0 +1,79 @@ +plugins { + `java-library` + `maven-publish` @@ -43,7 +43,6 @@ index 0000000000000000000000000000000000000000..d6b99d37c960a7d8de1852dbc74c3ce6 + +dependencies { + // api dependencies are listed transitively to API consumers -+ api("commons-lang:commons-lang:2.6") + api("com.google.guava:guava:31.0.1-jre") + api("com.google.code.gson:gson:2.8.9") + api("net.md-5:bungeecord-chat:1.16-R0.4") @@ -59,7 +58,7 @@ index 0000000000000000000000000000000000000000..d6b99d37c960a7d8de1852dbc74c3ce6 + + testImplementation("junit:junit:4.13.2") + testImplementation("org.hamcrest:hamcrest-library:1.3") -+ testImplementation("org.ow2.asm:asm-tree:9.2") ++ testImplementation("org.ow2.asm:asm-tree:9.3") +} + +configure { @@ -113,10 +112,10 @@ index 0000000000000000000000000000000000000000..d6b99d37c960a7d8de1852dbc74c3ce6 +} diff --git a/pom.xml b/pom.xml deleted file mode 100644 -index 7a34ef5514a30bcb61e657970bf087bdf9c2db90..0000000000000000000000000000000000000000 +index c9f858858011193d2a02ef1568a23164ac84d164..0000000000000000000000000000000000000000 --- a/pom.xml +++ /dev/null -@@ -1,263 +0,0 @@ +@@ -1,252 +0,0 @@ - - @@ -124,7 +123,7 @@ index 7a34ef5514a30bcb61e657970bf087bdf9c2db90..00000000000000000000000000000000 - - org.spigotmc - spigot-api -- 1.18.2-R0.1-SNAPSHOT +- 1.19-R0.1-SNAPSHOT - jar - - Spigot-API @@ -150,12 +149,6 @@ index 7a34ef5514a30bcb61e657970bf087bdf9c2db90..00000000000000000000000000000000 - - - -- -- commons-lang -- commons-lang -- 2.6 -- compile -- - - - com.google.guava @@ -187,19 +180,19 @@ index 7a34ef5514a30bcb61e657970bf087bdf9c2db90..00000000000000000000000000000000 - - org.apache.maven - maven-resolver-provider -- 3.8.4 +- 3.8.5 - provided - - - org.apache.maven.resolver - maven-resolver-connector-basic -- 1.7.2 +- 1.8.0 - provided - - - org.apache.maven.resolver - maven-resolver-transport-http -- 1.7.2 +- 1.8.0 - provided - - @@ -225,7 +218,7 @@ index 7a34ef5514a30bcb61e657970bf087bdf9c2db90..00000000000000000000000000000000 - - org.ow2.asm - asm-tree -- 9.2 +- 9.3 - test - - @@ -248,7 +241,7 @@ index 7a34ef5514a30bcb61e657970bf087bdf9c2db90..00000000000000000000000000000000 - - org.apache.maven.plugins - maven-compiler-plugin -- 3.8.1 +- 3.10.1 - - - eclipse @@ -257,19 +250,14 @@ index 7a34ef5514a30bcb61e657970bf087bdf9c2db90..00000000000000000000000000000000 - - org.codehaus.plexus - plexus-compiler-eclipse -- 2.8.8 -- -- -- org.eclipse.jdt -- ecj -- 3.28.0 +- 2.12.0 - - - - - org.apache.maven.plugins - maven-jar-plugin -- 3.2.0 +- 3.2.2 - - - @@ -309,7 +297,7 @@ index 7a34ef5514a30bcb61e657970bf087bdf9c2db90..00000000000000000000000000000000 - - org.apache.maven.plugins - maven-javadoc-plugin -- 3.3.1 +- 3.4.0 - - - https://guava.dev/releases/31.0.1-jre/api/docs/ @@ -358,7 +346,7 @@ index 7a34ef5514a30bcb61e657970bf087bdf9c2db90..00000000000000000000000000000000 - - org.codehaus.mojo - animal-sniffer-maven-plugin -- 1.20 +- 1.21 - - - process-classes diff --git a/patches/api/0002-Build-system-changes.patch b/patches/api/0002-Build-system-changes.patch index a428d131ec..7d5b7f711b 100644 --- a/patches/api/0002-Build-system-changes.patch +++ b/patches/api/0002-Build-system-changes.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Build system changes diff --git a/build.gradle.kts b/build.gradle.kts -index d6b99d37c960a7d8de1852dbc74c3ce671101b14..e49f4853e36f493754841231eeb5dd093b3788e0 100644 +index 7c41b546ae6f6e675072239b4c2d9076fa43ca87..8372fb4347113bc7dbd1bff738236b388a72e185 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -15,15 +15,27 @@ dependencies { +@@ -14,15 +14,27 @@ dependencies { api("com.google.code.gson:gson:2.8.9") api("net.md-5:bungeecord-chat:1.16-R0.4") api("org.yaml:snakeyaml:1.30") @@ -36,8 +36,8 @@ index d6b99d37c960a7d8de1852dbc74c3ce671101b14..e49f4853e36f493754841231eeb5dd09 + testImplementation("junit:junit:4.13.2") testImplementation("org.hamcrest:hamcrest-library:1.3") - testImplementation("org.ow2.asm:asm-tree:9.2") -@@ -63,7 +75,7 @@ tasks.withType { + testImplementation("org.ow2.asm:asm-tree:9.3") +@@ -62,7 +74,7 @@ tasks.withType { options.links( "https://guava.dev/releases/31.0.1-jre/api/docs/", "https://javadoc.io/doc/org.yaml/snakeyaml/1.30/", diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch index add974fb4c..31ae6fcd71 100644 --- a/patches/server/0001-Setup-Gradle-project.patch +++ b/patches/server/0001-Setup-Gradle-project.patch @@ -28,10 +28,10 @@ index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..bb338269c9e3bef4c274157c490d8b8f +/.factorypath diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 -index 0000000000000000000000000000000000000000..75c858870a55f7282a0e3500f803cb330b462f37 +index 0000000000000000000000000000000000000000..3451ca066dc093879d540b6c297f8814f40c15f2 --- /dev/null +++ b/build.gradle.kts -@@ -0,0 +1,137 @@ +@@ -0,0 +1,138 @@ +import io.papermc.paperweight.util.* + +plugins { @@ -46,9 +46,10 @@ index 0000000000000000000000000000000000000000..75c858870a55f7282a0e3500f803cb33 + implementation("org.apache.logging.log4j:log4j-iostreams:2.17.0") { + exclude(group = "org.apache.logging.log4j", module = "log4j-api") + } -+ implementation("org.ow2.asm:asm:9.2") ++ implementation("org.ow2.asm:asm:9.3") ++ implementation("commons-lang:commons-lang:2.6") + runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3") -+ runtimeOnly("mysql:mysql-connector-java:8.0.27") ++ runtimeOnly("mysql:mysql-connector-java:8.0.29") + + runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.4") + runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.2") @@ -171,17 +172,17 @@ index 0000000000000000000000000000000000000000..75c858870a55f7282a0e3500f803cb33 +} diff --git a/pom.xml b/pom.xml deleted file mode 100644 -index ac2dbe041d8a286ed7a34bf20c88464693f32a25..0000000000000000000000000000000000000000 +index 4d8c2f1741bd620a9b9098c0af463cd403284d49..0000000000000000000000000000000000000000 --- a/pom.xml +++ /dev/null -@@ -1,546 +0,0 @@ +@@ -1,616 +0,0 @@ - - 4.0.0 - org.spigotmc - spigot - jar -- 1.18.2-R0.1-SNAPSHOT +- 1.19-R0.1-SNAPSHOT - Spigot - https://www.spigotmc.org/ - @@ -197,9 +198,9 @@ index ac2dbe041d8a286ed7a34bf20c88464693f32a25..00000000000000000000000000000000 - UTF-8 - unknown - git -- 1_18_R2 -- 16 -- 16 +- 1_19_R1 +- 17 +- 17 - - - @@ -238,7 +239,7 @@ index ac2dbe041d8a286ed7a34bf20c88464693f32a25..00000000000000000000000000000000 - - org.ow2.asm - asm -- 9.2 +- 9.3 - compile - - @@ -251,7 +252,7 @@ index ac2dbe041d8a286ed7a34bf20c88464693f32a25..00000000000000000000000000000000 - - com.mojang - authlib -- 3.3.39 +- 3.5.41 - compile - - @@ -263,7 +264,7 @@ index ac2dbe041d8a286ed7a34bf20c88464693f32a25..00000000000000000000000000000000 - - com.mojang - datafixerupper -- 4.1.27 +- 5.0.28 - compile - - @@ -286,8 +287,64 @@ index ac2dbe041d8a286ed7a34bf20c88464693f32a25..00000000000000000000000000000000 - - - io.netty -- netty-all -- 4.1.68.Final +- netty-buffer +- 4.1.76.Final +- compile +- +- +- io.netty +- netty-codec +- 4.1.76.Final +- compile +- +- +- io.netty +- netty-common +- 4.1.76.Final +- compile +- +- +- io.netty +- netty-handler +- 4.1.76.Final +- compile +- +- +- io.netty +- netty-resolver +- 4.1.76.Final +- compile +- +- +- io.netty +- netty-transport +- 4.1.76.Final +- compile +- +- +- io.netty +- netty-transport-classes-epoll +- 4.1.76.Final +- compile +- +- +- io.netty +- netty-transport-native-epoll +- 4.1.76.Final +- linux-x86_64 +- compile +- +- +- io.netty +- netty-transport-native-epoll +- 4.1.76.Final +- linux-aarch_64 +- compile +- +- +- io.netty +- netty-transport-native-unix-common +- 4.1.76.Final - compile - - @@ -297,6 +354,18 @@ index ac2dbe041d8a286ed7a34bf20c88464693f32a25..00000000000000000000000000000000 - compile - - +- net.java.dev.jna +- jna +- 5.10.0 +- compile +- +- +- net.java.dev.jna +- jna-platform +- 5.10.0 +- compile +- +- - net.sf.jopt-simple - jopt-simple - 5.0.4 @@ -328,6 +397,13 @@ index ac2dbe041d8a286ed7a34bf20c88464693f32a25..00000000000000000000000000000000 - - - +- commons-lang +- commons-lang +- 2.6 +- compile +- +- +- - com.googlecode.json-simple - json-simple - 1.1.1 @@ -342,26 +418,26 @@ index ac2dbe041d8a286ed7a34bf20c88464693f32a25..00000000000000000000000000000000 - - mysql - mysql-connector-java -- 8.0.27 +- 8.0.29 - runtime - - - - org.apache.maven - maven-resolver-provider -- 3.8.4 +- 3.8.5 - runtime - - - org.apache.maven.resolver - maven-resolver-connector-basic -- 1.7.2 +- 1.8.0 - runtime - - - org.apache.maven.resolver - maven-resolver-transport-http -- 1.7.2 +- 1.8.0 - runtime - - @@ -416,7 +492,7 @@ index ac2dbe041d8a286ed7a34bf20c88464693f32a25..00000000000000000000000000000000 - - org.apache.maven.plugins - maven-clean-plugin -- 3.1.0 +- 3.2.0 - - - initialize @@ -429,7 +505,7 @@ index ac2dbe041d8a286ed7a34bf20c88464693f32a25..00000000000000000000000000000000 - - org.apache.maven.plugins - maven-jar-plugin -- 3.2.0 +- 3.2.2 - - - @@ -476,12 +552,12 @@ index ac2dbe041d8a286ed7a34bf20c88464693f32a25..00000000000000000000000000000000 - - org.ow2.asm - asm -- 9.2 +- 9.3 - - - org.ow2.asm - asm-commons -- 9.2 +- 9.3 - - - @@ -514,7 +590,7 @@ index ac2dbe041d8a286ed7a34bf20c88464693f32a25..00000000000000000000000000000000 - - net.md-5 - specialsource-maven-plugin -- 1.2.3 +- 1.2.4 - - - package @@ -586,7 +662,7 @@ index ac2dbe041d8a286ed7a34bf20c88464693f32a25..00000000000000000000000000000000 - - org.apache.maven.plugins - maven-compiler-plugin -- 3.8.1 +- 3.10.1 - - - eclipse @@ -595,12 +671,7 @@ index ac2dbe041d8a286ed7a34bf20c88464693f32a25..00000000000000000000000000000000 - - org.codehaus.plexus - plexus-compiler-eclipse -- 2.8.8 -- -- -- org.eclipse.jdt -- ecj -- 3.28.0 +- 2.12.0 - - - @@ -660,7 +731,7 @@ index ac2dbe041d8a286ed7a34bf20c88464693f32a25..00000000000000000000000000000000 - - org.codehaus.mojo - animal-sniffer-maven-plugin -- 1.20 +- 1.21 - - - process-classes diff --git a/patches/api/0003-Annotation-Test-changes.patch b/patches/unapplied/api/0003-Annotation-Test-changes.patch similarity index 100% rename from patches/api/0003-Annotation-Test-changes.patch rename to patches/unapplied/api/0003-Annotation-Test-changes.patch diff --git a/patches/api/0004-Add-FastUtil-to-Bukkit.patch b/patches/unapplied/api/0004-Add-FastUtil-to-Bukkit.patch similarity index 100% rename from patches/api/0004-Add-FastUtil-to-Bukkit.patch rename to patches/unapplied/api/0004-Add-FastUtil-to-Bukkit.patch diff --git a/patches/api/0005-Adventure.patch b/patches/unapplied/api/0005-Adventure.patch similarity index 100% rename from patches/api/0005-Adventure.patch rename to patches/unapplied/api/0005-Adventure.patch diff --git a/patches/api/0006-Paper-Utils.patch b/patches/unapplied/api/0006-Paper-Utils.patch similarity index 100% rename from patches/api/0006-Paper-Utils.patch rename to patches/unapplied/api/0006-Paper-Utils.patch diff --git a/patches/api/0007-Timings-v2.patch b/patches/unapplied/api/0007-Timings-v2.patch similarity index 100% rename from patches/api/0007-Timings-v2.patch rename to patches/unapplied/api/0007-Timings-v2.patch diff --git a/patches/api/0008-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/unapplied/api/0008-Add-command-line-option-to-load-extra-plugin-jars-no.patch similarity index 100% rename from patches/api/0008-Add-command-line-option-to-load-extra-plugin-jars-no.patch rename to patches/unapplied/api/0008-Add-command-line-option-to-load-extra-plugin-jars-no.patch diff --git a/patches/api/0009-Player-affects-spawning-API.patch b/patches/unapplied/api/0009-Player-affects-spawning-API.patch similarity index 100% rename from patches/api/0009-Player-affects-spawning-API.patch rename to patches/unapplied/api/0009-Player-affects-spawning-API.patch diff --git a/patches/api/0010-Add-getTPS-method.patch b/patches/unapplied/api/0010-Add-getTPS-method.patch similarity index 100% rename from patches/api/0010-Add-getTPS-method.patch rename to patches/unapplied/api/0010-Add-getTPS-method.patch diff --git a/patches/api/0011-Version-Command-2.0.patch b/patches/unapplied/api/0011-Version-Command-2.0.patch similarity index 100% rename from patches/api/0011-Version-Command-2.0.patch rename to patches/unapplied/api/0011-Version-Command-2.0.patch diff --git a/patches/api/0012-Entity-Origin-API.patch b/patches/unapplied/api/0012-Entity-Origin-API.patch similarity index 100% rename from patches/api/0012-Entity-Origin-API.patch rename to patches/unapplied/api/0012-Entity-Origin-API.patch diff --git a/patches/api/0013-Add-PlayerLocaleChangeEvent.patch b/patches/unapplied/api/0013-Add-PlayerLocaleChangeEvent.patch similarity index 100% rename from patches/api/0013-Add-PlayerLocaleChangeEvent.patch rename to patches/unapplied/api/0013-Add-PlayerLocaleChangeEvent.patch diff --git a/patches/api/0014-Add-view-distance-API.patch b/patches/unapplied/api/0014-Add-view-distance-API.patch similarity index 100% rename from patches/api/0014-Add-view-distance-API.patch rename to patches/unapplied/api/0014-Add-view-distance-API.patch diff --git a/patches/api/0015-Add-BeaconEffectEvent.patch b/patches/unapplied/api/0015-Add-BeaconEffectEvent.patch similarity index 100% rename from patches/api/0015-Add-BeaconEffectEvent.patch rename to patches/unapplied/api/0015-Add-BeaconEffectEvent.patch diff --git a/patches/api/0016-Add-PlayerInitialSpawnEvent.patch b/patches/unapplied/api/0016-Add-PlayerInitialSpawnEvent.patch similarity index 100% rename from patches/api/0016-Add-PlayerInitialSpawnEvent.patch rename to patches/unapplied/api/0016-Add-PlayerInitialSpawnEvent.patch diff --git a/patches/api/0017-Automatically-disable-plugins-that-fail-to-load.patch b/patches/unapplied/api/0017-Automatically-disable-plugins-that-fail-to-load.patch similarity index 100% rename from patches/api/0017-Automatically-disable-plugins-that-fail-to-load.patch rename to patches/unapplied/api/0017-Automatically-disable-plugins-that-fail-to-load.patch diff --git a/patches/api/0018-Expose-server-CommandMap.patch b/patches/unapplied/api/0018-Expose-server-CommandMap.patch similarity index 100% rename from patches/api/0018-Expose-server-CommandMap.patch rename to patches/unapplied/api/0018-Expose-server-CommandMap.patch diff --git a/patches/api/0019-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/patches/unapplied/api/0019-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch similarity index 100% rename from patches/api/0019-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch rename to patches/unapplied/api/0019-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch diff --git a/patches/api/0020-Add-exception-reporting-event.patch b/patches/unapplied/api/0020-Add-exception-reporting-event.patch similarity index 100% rename from patches/api/0020-Add-exception-reporting-event.patch rename to patches/unapplied/api/0020-Add-exception-reporting-event.patch diff --git a/patches/api/0021-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/patches/unapplied/api/0021-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch similarity index 100% rename from patches/api/0021-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch rename to patches/unapplied/api/0021-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch diff --git a/patches/api/0022-Fix-ServerListPingEvent-flagging-as-Async.patch b/patches/unapplied/api/0022-Fix-ServerListPingEvent-flagging-as-Async.patch similarity index 100% rename from patches/api/0022-Fix-ServerListPingEvent-flagging-as-Async.patch rename to patches/unapplied/api/0022-Fix-ServerListPingEvent-flagging-as-Async.patch diff --git a/patches/api/0023-Player-Tab-List-and-Title-APIs.patch b/patches/unapplied/api/0023-Player-Tab-List-and-Title-APIs.patch similarity index 100% rename from patches/api/0023-Player-Tab-List-and-Title-APIs.patch rename to patches/unapplied/api/0023-Player-Tab-List-and-Title-APIs.patch diff --git a/patches/api/0024-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/unapplied/api/0024-Add-methods-for-working-with-arrows-stuck-in-living-.patch similarity index 100% rename from patches/api/0024-Add-methods-for-working-with-arrows-stuck-in-living-.patch rename to patches/unapplied/api/0024-Add-methods-for-working-with-arrows-stuck-in-living-.patch diff --git a/patches/api/0025-Complete-resource-pack-API.patch b/patches/unapplied/api/0025-Complete-resource-pack-API.patch similarity index 100% rename from patches/api/0025-Complete-resource-pack-API.patch rename to patches/unapplied/api/0025-Complete-resource-pack-API.patch diff --git a/patches/api/0026-Use-ASM-for-event-executors.patch b/patches/unapplied/api/0026-Use-ASM-for-event-executors.patch similarity index 100% rename from patches/api/0026-Use-ASM-for-event-executors.patch rename to patches/unapplied/api/0026-Use-ASM-for-event-executors.patch diff --git a/patches/api/0027-Add-a-call-helper-to-Event.patch b/patches/unapplied/api/0027-Add-a-call-helper-to-Event.patch similarity index 100% rename from patches/api/0027-Add-a-call-helper-to-Event.patch rename to patches/unapplied/api/0027-Add-a-call-helper-to-Event.patch diff --git a/patches/api/0028-Add-sender-name-to-commands.yml-replacement.patch b/patches/unapplied/api/0028-Add-sender-name-to-commands.yml-replacement.patch similarity index 100% rename from patches/api/0028-Add-sender-name-to-commands.yml-replacement.patch rename to patches/unapplied/api/0028-Add-sender-name-to-commands.yml-replacement.patch diff --git a/patches/api/0029-Add-command-to-reload-permissions.yml-and-require-co.patch b/patches/unapplied/api/0029-Add-command-to-reload-permissions.yml-and-require-co.patch similarity index 100% rename from patches/api/0029-Add-command-to-reload-permissions.yml-and-require-co.patch rename to patches/unapplied/api/0029-Add-command-to-reload-permissions.yml-and-require-co.patch diff --git a/patches/api/0030-Custom-replacement-for-eaten-items.patch b/patches/unapplied/api/0030-Custom-replacement-for-eaten-items.patch similarity index 100% rename from patches/api/0030-Custom-replacement-for-eaten-items.patch rename to patches/unapplied/api/0030-Custom-replacement-for-eaten-items.patch diff --git a/patches/api/0031-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/unapplied/api/0031-Entity-AddTo-RemoveFrom-World-Events.patch similarity index 100% rename from patches/api/0031-Entity-AddTo-RemoveFrom-World-Events.patch rename to patches/unapplied/api/0031-Entity-AddTo-RemoveFrom-World-Events.patch diff --git a/patches/api/0032-EntityPathfindEvent.patch b/patches/unapplied/api/0032-EntityPathfindEvent.patch similarity index 100% rename from patches/api/0032-EntityPathfindEvent.patch rename to patches/unapplied/api/0032-EntityPathfindEvent.patch diff --git a/patches/api/0033-Reduce-thread-synchronization-in-MetadataStoreBase.patch b/patches/unapplied/api/0033-Reduce-thread-synchronization-in-MetadataStoreBase.patch similarity index 100% rename from patches/api/0033-Reduce-thread-synchronization-in-MetadataStoreBase.patch rename to patches/unapplied/api/0033-Reduce-thread-synchronization-in-MetadataStoreBase.patch diff --git a/patches/api/0034-Add-MetadataStoreBase.removeAll-Plugin.patch b/patches/unapplied/api/0034-Add-MetadataStoreBase.removeAll-Plugin.patch similarity index 100% rename from patches/api/0034-Add-MetadataStoreBase.removeAll-Plugin.patch rename to patches/unapplied/api/0034-Add-MetadataStoreBase.removeAll-Plugin.patch diff --git a/patches/api/0035-Add-PlayerUseUnknownEntityEvent.patch b/patches/unapplied/api/0035-Add-PlayerUseUnknownEntityEvent.patch similarity index 100% rename from patches/api/0035-Add-PlayerUseUnknownEntityEvent.patch rename to patches/unapplied/api/0035-Add-PlayerUseUnknownEntityEvent.patch diff --git a/patches/api/0036-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/unapplied/api/0036-Add-handshake-event-to-allow-plugins-to-handle-clien.patch similarity index 100% rename from patches/api/0036-Add-handshake-event-to-allow-plugins-to-handle-clien.patch rename to patches/unapplied/api/0036-Add-handshake-event-to-allow-plugins-to-handle-clien.patch diff --git a/patches/api/0037-Arrow-pickup-rule-API.patch b/patches/unapplied/api/0037-Arrow-pickup-rule-API.patch similarity index 100% rename from patches/api/0037-Arrow-pickup-rule-API.patch rename to patches/unapplied/api/0037-Arrow-pickup-rule-API.patch diff --git a/patches/api/0038-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/unapplied/api/0038-EntityRegainHealthEvent-isFastRegen-API.patch similarity index 100% rename from patches/api/0038-EntityRegainHealthEvent-isFastRegen-API.patch rename to patches/unapplied/api/0038-EntityRegainHealthEvent-isFastRegen-API.patch diff --git a/patches/api/0039-LootTable-API.patch b/patches/unapplied/api/0039-LootTable-API.patch similarity index 100% rename from patches/api/0039-LootTable-API.patch rename to patches/unapplied/api/0039-LootTable-API.patch diff --git a/patches/api/0040-Add-EntityZapEvent.patch b/patches/unapplied/api/0040-Add-EntityZapEvent.patch similarity index 100% rename from patches/api/0040-Add-EntityZapEvent.patch rename to patches/unapplied/api/0040-Add-EntityZapEvent.patch diff --git a/patches/api/0041-Misc-Utils.patch b/patches/unapplied/api/0041-Misc-Utils.patch similarity index 100% rename from patches/api/0041-Misc-Utils.patch rename to patches/unapplied/api/0041-Misc-Utils.patch diff --git a/patches/api/0042-Allow-Reloading-of-Command-Aliases.patch b/patches/unapplied/api/0042-Allow-Reloading-of-Command-Aliases.patch similarity index 100% rename from patches/api/0042-Allow-Reloading-of-Command-Aliases.patch rename to patches/unapplied/api/0042-Allow-Reloading-of-Command-Aliases.patch diff --git a/patches/api/0043-Add-source-to-PlayerExpChangeEvent.patch b/patches/unapplied/api/0043-Add-source-to-PlayerExpChangeEvent.patch similarity index 100% rename from patches/api/0043-Add-source-to-PlayerExpChangeEvent.patch rename to patches/unapplied/api/0043-Add-source-to-PlayerExpChangeEvent.patch diff --git a/patches/api/0044-Add-ProjectileCollideEvent.patch b/patches/unapplied/api/0044-Add-ProjectileCollideEvent.patch similarity index 100% rename from patches/api/0044-Add-ProjectileCollideEvent.patch rename to patches/unapplied/api/0044-Add-ProjectileCollideEvent.patch diff --git a/patches/api/0045-Add-String-based-Action-Bar-API.patch b/patches/unapplied/api/0045-Add-String-based-Action-Bar-API.patch similarity index 100% rename from patches/api/0045-Add-String-based-Action-Bar-API.patch rename to patches/unapplied/api/0045-Add-String-based-Action-Bar-API.patch diff --git a/patches/api/0046-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/unapplied/api/0046-Add-API-methods-to-control-if-armour-stands-can-move.patch similarity index 100% rename from patches/api/0046-Add-API-methods-to-control-if-armour-stands-can-move.patch rename to patches/unapplied/api/0046-Add-API-methods-to-control-if-armour-stands-can-move.patch diff --git a/patches/api/0047-IllegalPacketEvent.patch b/patches/unapplied/api/0047-IllegalPacketEvent.patch similarity index 100% rename from patches/api/0047-IllegalPacketEvent.patch rename to patches/unapplied/api/0047-IllegalPacketEvent.patch diff --git a/patches/api/0048-Fireworks-API-s.patch b/patches/unapplied/api/0048-Fireworks-API-s.patch similarity index 100% rename from patches/api/0048-Fireworks-API-s.patch rename to patches/unapplied/api/0048-Fireworks-API-s.patch diff --git a/patches/api/0049-PlayerTeleportEndGatewayEvent.patch b/patches/unapplied/api/0049-PlayerTeleportEndGatewayEvent.patch similarity index 100% rename from patches/api/0049-PlayerTeleportEndGatewayEvent.patch rename to patches/unapplied/api/0049-PlayerTeleportEndGatewayEvent.patch diff --git a/patches/api/0050-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/unapplied/api/0050-Provide-E-TE-Chunk-count-stat-methods.patch similarity index 100% rename from patches/api/0050-Provide-E-TE-Chunk-count-stat-methods.patch rename to patches/unapplied/api/0050-Provide-E-TE-Chunk-count-stat-methods.patch diff --git a/patches/api/0051-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/unapplied/api/0051-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch similarity index 100% rename from patches/api/0051-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch rename to patches/unapplied/api/0051-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch diff --git a/patches/api/0052-Expose-WorldBorder-isInBounds-Location-check.patch b/patches/unapplied/api/0052-Expose-WorldBorder-isInBounds-Location-check.patch similarity index 100% rename from patches/api/0052-Expose-WorldBorder-isInBounds-Location-check.patch rename to patches/unapplied/api/0052-Expose-WorldBorder-isInBounds-Location-check.patch diff --git a/patches/api/0053-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/unapplied/api/0053-Add-configuration-option-to-prevent-player-names-fro.patch similarity index 100% rename from patches/api/0053-Add-configuration-option-to-prevent-player-names-fro.patch rename to patches/unapplied/api/0053-Add-configuration-option-to-prevent-player-names-fro.patch diff --git a/patches/api/0054-Fix-upstream-javadocs.patch b/patches/unapplied/api/0054-Fix-upstream-javadocs.patch similarity index 100% rename from patches/api/0054-Fix-upstream-javadocs.patch rename to patches/unapplied/api/0054-Fix-upstream-javadocs.patch diff --git a/patches/api/0055-Item-canEntityPickup.patch b/patches/unapplied/api/0055-Item-canEntityPickup.patch similarity index 100% rename from patches/api/0055-Item-canEntityPickup.patch rename to patches/unapplied/api/0055-Item-canEntityPickup.patch diff --git a/patches/api/0056-PlayerAttemptPickupItemEvent.patch b/patches/unapplied/api/0056-PlayerAttemptPickupItemEvent.patch similarity index 100% rename from patches/api/0056-PlayerAttemptPickupItemEvent.patch rename to patches/unapplied/api/0056-PlayerAttemptPickupItemEvent.patch diff --git a/patches/api/0057-Add-UnknownCommandEvent.patch b/patches/unapplied/api/0057-Add-UnknownCommandEvent.patch similarity index 100% rename from patches/api/0057-Add-UnknownCommandEvent.patch rename to patches/unapplied/api/0057-Add-UnknownCommandEvent.patch diff --git a/patches/api/0058-Basic-PlayerProfile-API.patch b/patches/unapplied/api/0058-Basic-PlayerProfile-API.patch similarity index 100% rename from patches/api/0058-Basic-PlayerProfile-API.patch rename to patches/unapplied/api/0058-Basic-PlayerProfile-API.patch diff --git a/patches/api/0059-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/unapplied/api/0059-PlayerPickupItemEvent-setFlyAtPlayer.patch similarity index 100% rename from patches/api/0059-PlayerPickupItemEvent-setFlyAtPlayer.patch rename to patches/unapplied/api/0059-PlayerPickupItemEvent-setFlyAtPlayer.patch diff --git a/patches/api/0060-Shoulder-Entities-Release-API.patch b/patches/unapplied/api/0060-Shoulder-Entities-Release-API.patch similarity index 100% rename from patches/api/0060-Shoulder-Entities-Release-API.patch rename to patches/unapplied/api/0060-Shoulder-Entities-Release-API.patch diff --git a/patches/api/0061-Entity-fromMobSpawner.patch b/patches/unapplied/api/0061-Entity-fromMobSpawner.patch similarity index 100% rename from patches/api/0061-Entity-fromMobSpawner.patch rename to patches/unapplied/api/0061-Entity-fromMobSpawner.patch diff --git a/patches/api/0062-Profile-Lookup-Events.patch b/patches/unapplied/api/0062-Profile-Lookup-Events.patch similarity index 100% rename from patches/api/0062-Profile-Lookup-Events.patch rename to patches/unapplied/api/0062-Profile-Lookup-Events.patch diff --git a/patches/api/0063-Improve-the-Saddle-API-for-Horses.patch b/patches/unapplied/api/0063-Improve-the-Saddle-API-for-Horses.patch similarity index 100% rename from patches/api/0063-Improve-the-Saddle-API-for-Horses.patch rename to patches/unapplied/api/0063-Improve-the-Saddle-API-for-Horses.patch diff --git a/patches/api/0064-Add-getI18NDisplayName-API.patch b/patches/unapplied/api/0064-Add-getI18NDisplayName-API.patch similarity index 100% rename from patches/api/0064-Add-getI18NDisplayName-API.patch rename to patches/unapplied/api/0064-Add-getI18NDisplayName-API.patch diff --git a/patches/api/0065-ensureServerConversions-API.patch b/patches/unapplied/api/0065-ensureServerConversions-API.patch similarity index 100% rename from patches/api/0065-ensureServerConversions-API.patch rename to patches/unapplied/api/0065-ensureServerConversions-API.patch diff --git a/patches/api/0066-Make-plugins-list-alphabetical.patch b/patches/unapplied/api/0066-Make-plugins-list-alphabetical.patch similarity index 100% rename from patches/api/0066-Make-plugins-list-alphabetical.patch rename to patches/unapplied/api/0066-Make-plugins-list-alphabetical.patch diff --git a/patches/api/0067-LivingEntity-setKiller.patch b/patches/unapplied/api/0067-LivingEntity-setKiller.patch similarity index 100% rename from patches/api/0067-LivingEntity-setKiller.patch rename to patches/unapplied/api/0067-LivingEntity-setKiller.patch diff --git a/patches/api/0068-ProfileWhitelistVerifyEvent.patch b/patches/unapplied/api/0068-ProfileWhitelistVerifyEvent.patch similarity index 100% rename from patches/api/0068-ProfileWhitelistVerifyEvent.patch rename to patches/unapplied/api/0068-ProfileWhitelistVerifyEvent.patch diff --git a/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/unapplied/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch similarity index 100% rename from patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch rename to patches/unapplied/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch diff --git a/patches/api/0070-Handle-plugin-prefixes-in-implementation-logging-con.patch b/patches/unapplied/api/0070-Handle-plugin-prefixes-in-implementation-logging-con.patch similarity index 100% rename from patches/api/0070-Handle-plugin-prefixes-in-implementation-logging-con.patch rename to patches/unapplied/api/0070-Handle-plugin-prefixes-in-implementation-logging-con.patch diff --git a/patches/api/0071-Add-PlayerJumpEvent.patch b/patches/unapplied/api/0071-Add-PlayerJumpEvent.patch similarity index 100% rename from patches/api/0071-Add-PlayerJumpEvent.patch rename to patches/unapplied/api/0071-Add-PlayerJumpEvent.patch diff --git a/patches/api/0072-Add-workaround-for-plugins-modifying-the-parent-of-t.patch b/patches/unapplied/api/0072-Add-workaround-for-plugins-modifying-the-parent-of-t.patch similarity index 100% rename from patches/api/0072-Add-workaround-for-plugins-modifying-the-parent-of-t.patch rename to patches/unapplied/api/0072-Add-workaround-for-plugins-modifying-the-parent-of-t.patch diff --git a/patches/api/0073-Add-PlayerArmorChangeEvent.patch b/patches/unapplied/api/0073-Add-PlayerArmorChangeEvent.patch similarity index 100% rename from patches/api/0073-Add-PlayerArmorChangeEvent.patch rename to patches/unapplied/api/0073-Add-PlayerArmorChangeEvent.patch diff --git a/patches/api/0074-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/unapplied/api/0074-API-to-get-a-BlockState-without-a-snapshot.patch similarity index 100% rename from patches/api/0074-API-to-get-a-BlockState-without-a-snapshot.patch rename to patches/unapplied/api/0074-API-to-get-a-BlockState-without-a-snapshot.patch diff --git a/patches/api/0075-AsyncTabCompleteEvent.patch b/patches/unapplied/api/0075-AsyncTabCompleteEvent.patch similarity index 100% rename from patches/api/0075-AsyncTabCompleteEvent.patch rename to patches/unapplied/api/0075-AsyncTabCompleteEvent.patch diff --git a/patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch b/patches/unapplied/api/0076-Expose-client-protocol-version-and-virtual-host.patch similarity index 100% rename from patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch rename to patches/unapplied/api/0076-Expose-client-protocol-version-and-virtual-host.patch diff --git a/patches/api/0077-Display-warning-on-deprecated-recipe-API.patch b/patches/unapplied/api/0077-Display-warning-on-deprecated-recipe-API.patch similarity index 100% rename from patches/api/0077-Display-warning-on-deprecated-recipe-API.patch rename to patches/unapplied/api/0077-Display-warning-on-deprecated-recipe-API.patch diff --git a/patches/api/0078-PlayerPickupExperienceEvent.patch b/patches/unapplied/api/0078-PlayerPickupExperienceEvent.patch similarity index 100% rename from patches/api/0078-PlayerPickupExperienceEvent.patch rename to patches/unapplied/api/0078-PlayerPickupExperienceEvent.patch diff --git a/patches/api/0079-ExperienceOrbMergeEvent.patch b/patches/unapplied/api/0079-ExperienceOrbMergeEvent.patch similarity index 100% rename from patches/api/0079-ExperienceOrbMergeEvent.patch rename to patches/unapplied/api/0079-ExperienceOrbMergeEvent.patch diff --git a/patches/api/0080-Ability-to-apply-mending-to-XP-API.patch b/patches/unapplied/api/0080-Ability-to-apply-mending-to-XP-API.patch similarity index 100% rename from patches/api/0080-Ability-to-apply-mending-to-XP-API.patch rename to patches/unapplied/api/0080-Ability-to-apply-mending-to-XP-API.patch diff --git a/patches/api/0081-PreCreatureSpawnEvent.patch b/patches/unapplied/api/0081-PreCreatureSpawnEvent.patch similarity index 100% rename from patches/api/0081-PreCreatureSpawnEvent.patch rename to patches/unapplied/api/0081-PreCreatureSpawnEvent.patch diff --git a/patches/api/0082-PlayerNaturallySpawnCreaturesEvent.patch b/patches/unapplied/api/0082-PlayerNaturallySpawnCreaturesEvent.patch similarity index 100% rename from patches/api/0082-PlayerNaturallySpawnCreaturesEvent.patch rename to patches/unapplied/api/0082-PlayerNaturallySpawnCreaturesEvent.patch diff --git a/patches/api/0083-Add-setPlayerProfile-API-for-Skulls.patch b/patches/unapplied/api/0083-Add-setPlayerProfile-API-for-Skulls.patch similarity index 100% rename from patches/api/0083-Add-setPlayerProfile-API-for-Skulls.patch rename to patches/unapplied/api/0083-Add-setPlayerProfile-API-for-Skulls.patch diff --git a/patches/api/0084-Fill-Profile-Property-Events.patch b/patches/unapplied/api/0084-Fill-Profile-Property-Events.patch similarity index 100% rename from patches/api/0084-Fill-Profile-Property-Events.patch rename to patches/unapplied/api/0084-Fill-Profile-Property-Events.patch diff --git a/patches/api/0085-PlayerAdvancementCriterionGrantEvent.patch b/patches/unapplied/api/0085-PlayerAdvancementCriterionGrantEvent.patch similarity index 100% rename from patches/api/0085-PlayerAdvancementCriterionGrantEvent.patch rename to patches/unapplied/api/0085-PlayerAdvancementCriterionGrantEvent.patch diff --git a/patches/api/0086-Add-ArmorStand-Item-Meta.patch b/patches/unapplied/api/0086-Add-ArmorStand-Item-Meta.patch similarity index 100% rename from patches/api/0086-Add-ArmorStand-Item-Meta.patch rename to patches/unapplied/api/0086-Add-ArmorStand-Item-Meta.patch diff --git a/patches/api/0087-Optimize-Hoppers.patch b/patches/unapplied/api/0087-Optimize-Hoppers.patch similarity index 100% rename from patches/api/0087-Optimize-Hoppers.patch rename to patches/unapplied/api/0087-Optimize-Hoppers.patch diff --git a/patches/api/0088-Tameable-getOwnerUniqueId-API.patch b/patches/unapplied/api/0088-Tameable-getOwnerUniqueId-API.patch similarity index 100% rename from patches/api/0088-Tameable-getOwnerUniqueId-API.patch rename to patches/unapplied/api/0088-Tameable-getOwnerUniqueId-API.patch diff --git a/patches/api/0089-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/unapplied/api/0089-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch similarity index 100% rename from patches/api/0089-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch rename to patches/unapplied/api/0089-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch diff --git a/patches/api/0090-Add-extended-PaperServerListPingEvent.patch b/patches/unapplied/api/0090-Add-extended-PaperServerListPingEvent.patch similarity index 100% rename from patches/api/0090-Add-extended-PaperServerListPingEvent.patch rename to patches/unapplied/api/0090-Add-extended-PaperServerListPingEvent.patch diff --git a/patches/api/0091-Player.setPlayerProfile-API.patch b/patches/unapplied/api/0091-Player.setPlayerProfile-API.patch similarity index 100% rename from patches/api/0091-Player.setPlayerProfile-API.patch rename to patches/unapplied/api/0091-Player.setPlayerProfile-API.patch diff --git a/patches/api/0092-getPlayerUniqueId-API.patch b/patches/unapplied/api/0092-getPlayerUniqueId-API.patch similarity index 100% rename from patches/api/0092-getPlayerUniqueId-API.patch rename to patches/unapplied/api/0092-getPlayerUniqueId-API.patch diff --git a/patches/api/0093-Add-legacy-ping-support-to-PaperServerListPingEvent.patch b/patches/unapplied/api/0093-Add-legacy-ping-support-to-PaperServerListPingEvent.patch similarity index 100% rename from patches/api/0093-Add-legacy-ping-support-to-PaperServerListPingEvent.patch rename to patches/unapplied/api/0093-Add-legacy-ping-support-to-PaperServerListPingEvent.patch diff --git a/patches/api/0094-Add-openSign-method-to-HumanEntity.patch b/patches/unapplied/api/0094-Add-openSign-method-to-HumanEntity.patch similarity index 100% rename from patches/api/0094-Add-openSign-method-to-HumanEntity.patch rename to patches/unapplied/api/0094-Add-openSign-method-to-HumanEntity.patch diff --git a/patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch b/patches/unapplied/api/0095-Add-Ban-Methods-to-Player-Objects.patch similarity index 100% rename from patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch rename to patches/unapplied/api/0095-Add-Ban-Methods-to-Player-Objects.patch diff --git a/patches/api/0096-EndermanEscapeEvent.patch b/patches/unapplied/api/0096-EndermanEscapeEvent.patch similarity index 100% rename from patches/api/0096-EndermanEscapeEvent.patch rename to patches/unapplied/api/0096-EndermanEscapeEvent.patch diff --git a/patches/api/0097-Enderman.teleportRandomly.patch b/patches/unapplied/api/0097-Enderman.teleportRandomly.patch similarity index 100% rename from patches/api/0097-Enderman.teleportRandomly.patch rename to patches/unapplied/api/0097-Enderman.teleportRandomly.patch diff --git a/patches/api/0098-Additional-world.getNearbyEntities-API-s.patch b/patches/unapplied/api/0098-Additional-world.getNearbyEntities-API-s.patch similarity index 100% rename from patches/api/0098-Additional-world.getNearbyEntities-API-s.patch rename to patches/unapplied/api/0098-Additional-world.getNearbyEntities-API-s.patch diff --git a/patches/api/0099-Location.isChunkLoaded-API.patch b/patches/unapplied/api/0099-Location.isChunkLoaded-API.patch similarity index 100% rename from patches/api/0099-Location.isChunkLoaded-API.patch rename to patches/unapplied/api/0099-Location.isChunkLoaded-API.patch diff --git a/patches/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/unapplied/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch similarity index 100% rename from patches/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch rename to patches/unapplied/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch diff --git a/patches/api/0101-EndermanAttackPlayerEvent.patch b/patches/unapplied/api/0101-EndermanAttackPlayerEvent.patch similarity index 100% rename from patches/api/0101-EndermanAttackPlayerEvent.patch rename to patches/unapplied/api/0101-EndermanAttackPlayerEvent.patch diff --git a/patches/api/0102-Close-Plugin-Class-Loaders-on-Disable.patch b/patches/unapplied/api/0102-Close-Plugin-Class-Loaders-on-Disable.patch similarity index 100% rename from patches/api/0102-Close-Plugin-Class-Loaders-on-Disable.patch rename to patches/unapplied/api/0102-Close-Plugin-Class-Loaders-on-Disable.patch diff --git a/patches/api/0103-WitchConsumePotionEvent.patch b/patches/unapplied/api/0103-WitchConsumePotionEvent.patch similarity index 100% rename from patches/api/0103-WitchConsumePotionEvent.patch rename to patches/unapplied/api/0103-WitchConsumePotionEvent.patch diff --git a/patches/api/0104-WitchThrowPotionEvent.patch b/patches/unapplied/api/0104-WitchThrowPotionEvent.patch similarity index 100% rename from patches/api/0104-WitchThrowPotionEvent.patch rename to patches/unapplied/api/0104-WitchThrowPotionEvent.patch diff --git a/patches/api/0105-Location.toBlockLocation-toCenterLocation.patch b/patches/unapplied/api/0105-Location.toBlockLocation-toCenterLocation.patch similarity index 100% rename from patches/api/0105-Location.toBlockLocation-toCenterLocation.patch rename to patches/unapplied/api/0105-Location.toBlockLocation-toCenterLocation.patch diff --git a/patches/api/0106-PotionEffect-clone-methods.patch b/patches/unapplied/api/0106-PotionEffect-clone-methods.patch similarity index 100% rename from patches/api/0106-PotionEffect-clone-methods.patch rename to patches/unapplied/api/0106-PotionEffect-clone-methods.patch diff --git a/patches/api/0107-WitchReadyPotionEvent.patch b/patches/unapplied/api/0107-WitchReadyPotionEvent.patch similarity index 100% rename from patches/api/0107-WitchReadyPotionEvent.patch rename to patches/unapplied/api/0107-WitchReadyPotionEvent.patch diff --git a/patches/api/0108-ItemStack-getMaxItemUseDuration.patch b/patches/unapplied/api/0108-ItemStack-getMaxItemUseDuration.patch similarity index 100% rename from patches/api/0108-ItemStack-getMaxItemUseDuration.patch rename to patches/unapplied/api/0108-ItemStack-getMaxItemUseDuration.patch diff --git a/patches/api/0109-Add-EntityTeleportEndGatewayEvent.patch b/patches/unapplied/api/0109-Add-EntityTeleportEndGatewayEvent.patch similarity index 100% rename from patches/api/0109-Add-EntityTeleportEndGatewayEvent.patch rename to patches/unapplied/api/0109-Add-EntityTeleportEndGatewayEvent.patch diff --git a/patches/api/0110-Make-shield-blocking-delay-configurable.patch b/patches/unapplied/api/0110-Make-shield-blocking-delay-configurable.patch similarity index 100% rename from patches/api/0110-Make-shield-blocking-delay-configurable.patch rename to patches/unapplied/api/0110-Make-shield-blocking-delay-configurable.patch diff --git a/patches/api/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/patches/unapplied/api/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch similarity index 100% rename from patches/api/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch rename to patches/unapplied/api/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch diff --git a/patches/api/0112-Add-getNearbyXXX-methods-to-Location.patch b/patches/unapplied/api/0112-Add-getNearbyXXX-methods-to-Location.patch similarity index 100% rename from patches/api/0112-Add-getNearbyXXX-methods-to-Location.patch rename to patches/unapplied/api/0112-Add-getNearbyXXX-methods-to-Location.patch diff --git a/patches/api/0113-PlayerReadyArrowEvent.patch b/patches/unapplied/api/0113-PlayerReadyArrowEvent.patch similarity index 100% rename from patches/api/0113-PlayerReadyArrowEvent.patch rename to patches/unapplied/api/0113-PlayerReadyArrowEvent.patch diff --git a/patches/api/0114-Add-EntityKnockbackByEntityEvent.patch b/patches/unapplied/api/0114-Add-EntityKnockbackByEntityEvent.patch similarity index 100% rename from patches/api/0114-Add-EntityKnockbackByEntityEvent.patch rename to patches/unapplied/api/0114-Add-EntityKnockbackByEntityEvent.patch diff --git a/patches/api/0115-Expand-Explosions-API.patch b/patches/unapplied/api/0115-Expand-Explosions-API.patch similarity index 100% rename from patches/api/0115-Expand-Explosions-API.patch rename to patches/unapplied/api/0115-Expand-Explosions-API.patch diff --git a/patches/api/0116-ItemStack-API-additions-for-quantity-flags-lore.patch b/patches/unapplied/api/0116-ItemStack-API-additions-for-quantity-flags-lore.patch similarity index 100% rename from patches/api/0116-ItemStack-API-additions-for-quantity-flags-lore.patch rename to patches/unapplied/api/0116-ItemStack-API-additions-for-quantity-flags-lore.patch diff --git a/patches/api/0117-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/unapplied/api/0117-LivingEntity-Hand-Raised-Item-Use-API.patch similarity index 100% rename from patches/api/0117-LivingEntity-Hand-Raised-Item-Use-API.patch rename to patches/unapplied/api/0117-LivingEntity-Hand-Raised-Item-Use-API.patch diff --git a/patches/api/0118-RangedEntity-API.patch b/patches/unapplied/api/0118-RangedEntity-API.patch similarity index 100% rename from patches/api/0118-RangedEntity-API.patch rename to patches/unapplied/api/0118-RangedEntity-API.patch diff --git a/patches/api/0119-Add-World.getEntity-UUID-API.patch b/patches/unapplied/api/0119-Add-World.getEntity-UUID-API.patch similarity index 100% rename from patches/api/0119-Add-World.getEntity-UUID-API.patch rename to patches/unapplied/api/0119-Add-World.getEntity-UUID-API.patch diff --git a/patches/api/0120-InventoryCloseEvent-Reason-API.patch b/patches/unapplied/api/0120-InventoryCloseEvent-Reason-API.patch similarity index 100% rename from patches/api/0120-InventoryCloseEvent-Reason-API.patch rename to patches/unapplied/api/0120-InventoryCloseEvent-Reason-API.patch diff --git a/patches/api/0121-Allow-setting-the-vex-s-summoner.patch b/patches/unapplied/api/0121-Allow-setting-the-vex-s-summoner.patch similarity index 100% rename from patches/api/0121-Allow-setting-the-vex-s-summoner.patch rename to patches/unapplied/api/0121-Allow-setting-the-vex-s-summoner.patch diff --git a/patches/api/0122-Entity-getChunk-API.patch b/patches/unapplied/api/0122-Entity-getChunk-API.patch similarity index 100% rename from patches/api/0122-Entity-getChunk-API.patch rename to patches/unapplied/api/0122-Entity-getChunk-API.patch diff --git a/patches/api/0123-Add-an-asterisk-to-legacy-API-plugins.patch b/patches/unapplied/api/0123-Add-an-asterisk-to-legacy-API-plugins.patch similarity index 100% rename from patches/api/0123-Add-an-asterisk-to-legacy-API-plugins.patch rename to patches/unapplied/api/0123-Add-an-asterisk-to-legacy-API-plugins.patch diff --git a/patches/api/0124-EnderDragon-Events.patch b/patches/unapplied/api/0124-EnderDragon-Events.patch similarity index 100% rename from patches/api/0124-EnderDragon-Events.patch rename to patches/unapplied/api/0124-EnderDragon-Events.patch diff --git a/patches/api/0125-PlayerElytraBoostEvent.patch b/patches/unapplied/api/0125-PlayerElytraBoostEvent.patch similarity index 100% rename from patches/api/0125-PlayerElytraBoostEvent.patch rename to patches/unapplied/api/0125-PlayerElytraBoostEvent.patch diff --git a/patches/api/0126-PlayerLaunchProjectileEvent.patch b/patches/unapplied/api/0126-PlayerLaunchProjectileEvent.patch similarity index 100% rename from patches/api/0126-PlayerLaunchProjectileEvent.patch rename to patches/unapplied/api/0126-PlayerLaunchProjectileEvent.patch diff --git a/patches/api/0127-EntityTransformedEvent.patch b/patches/unapplied/api/0127-EntityTransformedEvent.patch similarity index 100% rename from patches/api/0127-EntityTransformedEvent.patch rename to patches/unapplied/api/0127-EntityTransformedEvent.patch diff --git a/patches/api/0128-Allow-disabling-armour-stand-ticking.patch b/patches/unapplied/api/0128-Allow-disabling-armour-stand-ticking.patch similarity index 100% rename from patches/api/0128-Allow-disabling-armour-stand-ticking.patch rename to patches/unapplied/api/0128-Allow-disabling-armour-stand-ticking.patch diff --git a/patches/api/0129-SkeletonHorse-Additions.patch b/patches/unapplied/api/0129-SkeletonHorse-Additions.patch similarity index 100% rename from patches/api/0129-SkeletonHorse-Additions.patch rename to patches/unapplied/api/0129-SkeletonHorse-Additions.patch diff --git a/patches/api/0130-Expand-Location-Manipulation-API.patch b/patches/unapplied/api/0130-Expand-Location-Manipulation-API.patch similarity index 100% rename from patches/api/0130-Expand-Location-Manipulation-API.patch rename to patches/unapplied/api/0130-Expand-Location-Manipulation-API.patch diff --git a/patches/api/0131-Expand-ArmorStand-API.patch b/patches/unapplied/api/0131-Expand-ArmorStand-API.patch similarity index 100% rename from patches/api/0131-Expand-ArmorStand-API.patch rename to patches/unapplied/api/0131-Expand-ArmorStand-API.patch diff --git a/patches/api/0132-AnvilDamageEvent.patch b/patches/unapplied/api/0132-AnvilDamageEvent.patch similarity index 100% rename from patches/api/0132-AnvilDamageEvent.patch rename to patches/unapplied/api/0132-AnvilDamageEvent.patch diff --git a/patches/api/0133-Remove-deadlock-risk-in-firing-async-events.patch b/patches/unapplied/api/0133-Remove-deadlock-risk-in-firing-async-events.patch similarity index 100% rename from patches/api/0133-Remove-deadlock-risk-in-firing-async-events.patch rename to patches/unapplied/api/0133-Remove-deadlock-risk-in-firing-async-events.patch diff --git a/patches/api/0134-Add-hand-to-bucket-events.patch b/patches/unapplied/api/0134-Add-hand-to-bucket-events.patch similarity index 100% rename from patches/api/0134-Add-hand-to-bucket-events.patch rename to patches/unapplied/api/0134-Add-hand-to-bucket-events.patch diff --git a/patches/api/0135-Add-TNTPrimeEvent.patch b/patches/unapplied/api/0135-Add-TNTPrimeEvent.patch similarity index 100% rename from patches/api/0135-Add-TNTPrimeEvent.patch rename to patches/unapplied/api/0135-Add-TNTPrimeEvent.patch diff --git a/patches/api/0136-Provide-Chunk-Coordinates-as-a-Long-API.patch b/patches/unapplied/api/0136-Provide-Chunk-Coordinates-as-a-Long-API.patch similarity index 100% rename from patches/api/0136-Provide-Chunk-Coordinates-as-a-Long-API.patch rename to patches/unapplied/api/0136-Provide-Chunk-Coordinates-as-a-Long-API.patch diff --git a/patches/api/0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/unapplied/api/0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch similarity index 100% rename from patches/api/0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch rename to patches/unapplied/api/0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch diff --git a/patches/api/0138-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch b/patches/unapplied/api/0138-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch similarity index 100% rename from patches/api/0138-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch rename to patches/unapplied/api/0138-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch diff --git a/patches/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/patches/unapplied/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch similarity index 100% rename from patches/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch rename to patches/unapplied/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch diff --git a/patches/api/0140-Slime-Pathfinder-Events.patch b/patches/unapplied/api/0140-Slime-Pathfinder-Events.patch similarity index 100% rename from patches/api/0140-Slime-Pathfinder-Events.patch rename to patches/unapplied/api/0140-Slime-Pathfinder-Events.patch diff --git a/patches/api/0141-Add-PhantomPreSpawnEvent.patch b/patches/unapplied/api/0141-Add-PhantomPreSpawnEvent.patch similarity index 100% rename from patches/api/0141-Add-PhantomPreSpawnEvent.patch rename to patches/unapplied/api/0141-Add-PhantomPreSpawnEvent.patch diff --git a/patches/api/0142-Add-More-Creeper-API.patch b/patches/unapplied/api/0142-Add-More-Creeper-API.patch similarity index 100% rename from patches/api/0142-Add-More-Creeper-API.patch rename to patches/unapplied/api/0142-Add-More-Creeper-API.patch diff --git a/patches/api/0143-Inventory-removeItemAnySlot.patch b/patches/unapplied/api/0143-Inventory-removeItemAnySlot.patch similarity index 100% rename from patches/api/0143-Inventory-removeItemAnySlot.patch rename to patches/unapplied/api/0143-Inventory-removeItemAnySlot.patch diff --git a/patches/api/0144-isChunkGenerated-API.patch b/patches/unapplied/api/0144-isChunkGenerated-API.patch similarity index 100% rename from patches/api/0144-isChunkGenerated-API.patch rename to patches/unapplied/api/0144-isChunkGenerated-API.patch diff --git a/patches/api/0145-Add-source-block-constructor-and-getChangedBlockData.patch b/patches/unapplied/api/0145-Add-source-block-constructor-and-getChangedBlockData.patch similarity index 100% rename from patches/api/0145-Add-source-block-constructor-and-getChangedBlockData.patch rename to patches/unapplied/api/0145-Add-source-block-constructor-and-getChangedBlockData.patch diff --git a/patches/api/0146-Async-Chunks-API.patch b/patches/unapplied/api/0146-Async-Chunks-API.patch similarity index 100% rename from patches/api/0146-Async-Chunks-API.patch rename to patches/unapplied/api/0146-Async-Chunks-API.patch diff --git a/patches/api/0147-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/unapplied/api/0147-Add-ray-tracing-methods-to-LivingEntity.patch similarity index 100% rename from patches/api/0147-Add-ray-tracing-methods-to-LivingEntity.patch rename to patches/unapplied/api/0147-Add-ray-tracing-methods-to-LivingEntity.patch diff --git a/patches/api/0148-Expose-attack-cooldown-methods-for-Player.patch b/patches/unapplied/api/0148-Expose-attack-cooldown-methods-for-Player.patch similarity index 100% rename from patches/api/0148-Expose-attack-cooldown-methods-for-Player.patch rename to patches/unapplied/api/0148-Expose-attack-cooldown-methods-for-Player.patch diff --git a/patches/api/0149-Improve-death-events.patch b/patches/unapplied/api/0149-Improve-death-events.patch similarity index 100% rename from patches/api/0149-Improve-death-events.patch rename to patches/unapplied/api/0149-Improve-death-events.patch diff --git a/patches/api/0150-Mob-Pathfinding-API.patch b/patches/unapplied/api/0150-Mob-Pathfinding-API.patch similarity index 100% rename from patches/api/0150-Mob-Pathfinding-API.patch rename to patches/unapplied/api/0150-Mob-Pathfinding-API.patch diff --git a/patches/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/unapplied/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch similarity index 100% rename from patches/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch rename to patches/unapplied/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch diff --git a/patches/api/0152-Performance-Concurrency-Improvements-to-Permissions.patch b/patches/unapplied/api/0152-Performance-Concurrency-Improvements-to-Permissions.patch similarity index 100% rename from patches/api/0152-Performance-Concurrency-Improvements-to-Permissions.patch rename to patches/unapplied/api/0152-Performance-Concurrency-Improvements-to-Permissions.patch diff --git a/patches/api/0153-Add-ItemStackRecipeChoice-Draft-API.patch b/patches/unapplied/api/0153-Add-ItemStackRecipeChoice-Draft-API.patch similarity index 100% rename from patches/api/0153-Add-ItemStackRecipeChoice-Draft-API.patch rename to patches/unapplied/api/0153-Add-ItemStackRecipeChoice-Draft-API.patch diff --git a/patches/api/0154-Implement-furnace-cook-speed-multiplier-API.patch b/patches/unapplied/api/0154-Implement-furnace-cook-speed-multiplier-API.patch similarity index 100% rename from patches/api/0154-Implement-furnace-cook-speed-multiplier-API.patch rename to patches/unapplied/api/0154-Implement-furnace-cook-speed-multiplier-API.patch diff --git a/patches/api/0155-Material-API-additions.patch b/patches/unapplied/api/0155-Material-API-additions.patch similarity index 100% rename from patches/api/0155-Material-API-additions.patch rename to patches/unapplied/api/0155-Material-API-additions.patch diff --git a/patches/api/0156-Add-Material-Tags.patch b/patches/unapplied/api/0156-Add-Material-Tags.patch similarity index 100% rename from patches/api/0156-Add-Material-Tags.patch rename to patches/unapplied/api/0156-Add-Material-Tags.patch diff --git a/patches/api/0157-PreSpawnerSpawnEvent.patch b/patches/unapplied/api/0157-PreSpawnerSpawnEvent.patch similarity index 100% rename from patches/api/0157-PreSpawnerSpawnEvent.patch rename to patches/unapplied/api/0157-PreSpawnerSpawnEvent.patch diff --git a/patches/api/0158-Add-LivingEntity-getTargetEntity.patch b/patches/unapplied/api/0158-Add-LivingEntity-getTargetEntity.patch similarity index 100% rename from patches/api/0158-Add-LivingEntity-getTargetEntity.patch rename to patches/unapplied/api/0158-Add-LivingEntity-getTargetEntity.patch diff --git a/patches/api/0159-Add-sun-related-API.patch b/patches/unapplied/api/0159-Add-sun-related-API.patch similarity index 100% rename from patches/api/0159-Add-sun-related-API.patch rename to patches/unapplied/api/0159-Add-sun-related-API.patch diff --git a/patches/api/0160-Turtle-API.patch b/patches/unapplied/api/0160-Turtle-API.patch similarity index 100% rename from patches/api/0160-Turtle-API.patch rename to patches/unapplied/api/0160-Turtle-API.patch diff --git a/patches/api/0161-Add-spectator-target-events.patch b/patches/unapplied/api/0161-Add-spectator-target-events.patch similarity index 100% rename from patches/api/0161-Add-spectator-target-events.patch rename to patches/unapplied/api/0161-Add-spectator-target-events.patch diff --git a/patches/api/0162-Add-more-Witch-API.patch b/patches/unapplied/api/0162-Add-more-Witch-API.patch similarity index 100% rename from patches/api/0162-Add-more-Witch-API.patch rename to patches/unapplied/api/0162-Add-more-Witch-API.patch diff --git a/patches/api/0163-Make-the-default-permission-message-configurable.patch b/patches/unapplied/api/0163-Make-the-default-permission-message-configurable.patch similarity index 100% rename from patches/api/0163-Make-the-default-permission-message-configurable.patch rename to patches/unapplied/api/0163-Make-the-default-permission-message-configurable.patch diff --git a/patches/api/0164-Support-cancellation-supression-of-EntityDismount-Ve.patch b/patches/unapplied/api/0164-Support-cancellation-supression-of-EntityDismount-Ve.patch similarity index 100% rename from patches/api/0164-Support-cancellation-supression-of-EntityDismount-Ve.patch rename to patches/unapplied/api/0164-Support-cancellation-supression-of-EntityDismount-Ve.patch diff --git a/patches/api/0165-Add-more-Zombie-API.patch b/patches/unapplied/api/0165-Add-more-Zombie-API.patch similarity index 100% rename from patches/api/0165-Add-more-Zombie-API.patch rename to patches/unapplied/api/0165-Add-more-Zombie-API.patch diff --git a/patches/api/0166-Change-the-reserved-channel-check-to-be-sensible.patch b/patches/unapplied/api/0166-Change-the-reserved-channel-check-to-be-sensible.patch similarity index 100% rename from patches/api/0166-Change-the-reserved-channel-check-to-be-sensible.patch rename to patches/unapplied/api/0166-Change-the-reserved-channel-check-to-be-sensible.patch diff --git a/patches/api/0167-Add-PlayerConnectionCloseEvent.patch b/patches/unapplied/api/0167-Add-PlayerConnectionCloseEvent.patch similarity index 100% rename from patches/api/0167-Add-PlayerConnectionCloseEvent.patch rename to patches/unapplied/api/0167-Add-PlayerConnectionCloseEvent.patch diff --git a/patches/api/0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/unapplied/api/0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 100% rename from patches/api/0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to patches/unapplied/api/0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch diff --git a/patches/api/0169-Add-ItemStack-Recipe-API-helper-methods.patch b/patches/unapplied/api/0169-Add-ItemStack-Recipe-API-helper-methods.patch similarity index 100% rename from patches/api/0169-Add-ItemStack-Recipe-API-helper-methods.patch rename to patches/unapplied/api/0169-Add-ItemStack-Recipe-API-helper-methods.patch diff --git a/patches/api/0170-BlockDestroyEvent.patch b/patches/unapplied/api/0170-BlockDestroyEvent.patch similarity index 100% rename from patches/api/0170-BlockDestroyEvent.patch rename to patches/unapplied/api/0170-BlockDestroyEvent.patch diff --git a/patches/api/0171-Add-WhitelistToggleEvent.patch b/patches/unapplied/api/0171-Add-WhitelistToggleEvent.patch similarity index 100% rename from patches/api/0171-Add-WhitelistToggleEvent.patch rename to patches/unapplied/api/0171-Add-WhitelistToggleEvent.patch diff --git a/patches/api/0172-Add-GS4-Query-event.patch b/patches/unapplied/api/0172-Add-GS4-Query-event.patch similarity index 100% rename from patches/api/0172-Add-GS4-Query-event.patch rename to patches/unapplied/api/0172-Add-GS4-Query-event.patch diff --git a/patches/api/0173-Add-PlayerPostRespawnEvent.patch b/patches/unapplied/api/0173-Add-PlayerPostRespawnEvent.patch similarity index 100% rename from patches/api/0173-Add-PlayerPostRespawnEvent.patch rename to patches/unapplied/api/0173-Add-PlayerPostRespawnEvent.patch diff --git a/patches/api/0174-Entity-getEntitySpawnReason.patch b/patches/unapplied/api/0174-Entity-getEntitySpawnReason.patch similarity index 100% rename from patches/api/0174-Entity-getEntitySpawnReason.patch rename to patches/unapplied/api/0174-Entity-getEntitySpawnReason.patch diff --git a/patches/api/0175-Fix-Spigot-annotation-mistakes.patch b/patches/unapplied/api/0175-Fix-Spigot-annotation-mistakes.patch similarity index 100% rename from patches/api/0175-Fix-Spigot-annotation-mistakes.patch rename to patches/unapplied/api/0175-Fix-Spigot-annotation-mistakes.patch diff --git a/patches/api/0176-Server-Tick-Events.patch b/patches/unapplied/api/0176-Server-Tick-Events.patch similarity index 100% rename from patches/api/0176-Server-Tick-Events.patch rename to patches/unapplied/api/0176-Server-Tick-Events.patch diff --git a/patches/api/0177-PlayerDeathEvent-getItemsToKeep.patch b/patches/unapplied/api/0177-PlayerDeathEvent-getItemsToKeep.patch similarity index 100% rename from patches/api/0177-PlayerDeathEvent-getItemsToKeep.patch rename to patches/unapplied/api/0177-PlayerDeathEvent-getItemsToKeep.patch diff --git a/patches/api/0178-Add-Heightmap-API.patch b/patches/unapplied/api/0178-Add-Heightmap-API.patch similarity index 100% rename from patches/api/0178-Add-Heightmap-API.patch rename to patches/unapplied/api/0178-Add-Heightmap-API.patch diff --git a/patches/api/0179-Mob-Spawner-API-Enhancements.patch b/patches/unapplied/api/0179-Mob-Spawner-API-Enhancements.patch similarity index 100% rename from patches/api/0179-Mob-Spawner-API-Enhancements.patch rename to patches/unapplied/api/0179-Mob-Spawner-API-Enhancements.patch diff --git a/patches/api/0180-Add-BlockSoundGroup-interface.patch b/patches/unapplied/api/0180-Add-BlockSoundGroup-interface.patch similarity index 100% rename from patches/api/0180-Add-BlockSoundGroup-interface.patch rename to patches/unapplied/api/0180-Add-BlockSoundGroup-interface.patch diff --git a/patches/api/0181-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch b/patches/unapplied/api/0181-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch similarity index 100% rename from patches/api/0181-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch rename to patches/unapplied/api/0181-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch diff --git a/patches/api/0182-Increase-custom-payload-channel-message-size.patch b/patches/unapplied/api/0182-Increase-custom-payload-channel-message-size.patch similarity index 100% rename from patches/api/0182-Increase-custom-payload-channel-message-size.patch rename to patches/unapplied/api/0182-Increase-custom-payload-channel-message-size.patch diff --git a/patches/api/0183-Expose-the-internal-current-tick.patch b/patches/unapplied/api/0183-Expose-the-internal-current-tick.patch similarity index 100% rename from patches/api/0183-Expose-the-internal-current-tick.patch rename to patches/unapplied/api/0183-Expose-the-internal-current-tick.patch diff --git a/patches/api/0184-PlayerDeathEvent-shouldDropExperience.patch b/patches/unapplied/api/0184-PlayerDeathEvent-shouldDropExperience.patch similarity index 100% rename from patches/api/0184-PlayerDeathEvent-shouldDropExperience.patch rename to patches/unapplied/api/0184-PlayerDeathEvent-shouldDropExperience.patch diff --git a/patches/api/0185-Add-effect-to-block-break-naturally.patch b/patches/unapplied/api/0185-Add-effect-to-block-break-naturally.patch similarity index 100% rename from patches/api/0185-Add-effect-to-block-break-naturally.patch rename to patches/unapplied/api/0185-Add-effect-to-block-break-naturally.patch diff --git a/patches/api/0186-Add-ThrownEggHatchEvent.patch b/patches/unapplied/api/0186-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/api/0186-Add-ThrownEggHatchEvent.patch rename to patches/unapplied/api/0186-Add-ThrownEggHatchEvent.patch diff --git a/patches/api/0187-Entity-Jump-API.patch b/patches/unapplied/api/0187-Entity-Jump-API.patch similarity index 100% rename from patches/api/0187-Entity-Jump-API.patch rename to patches/unapplied/api/0187-Entity-Jump-API.patch diff --git a/patches/api/0188-add-hand-to-BlockMultiPlaceEvent.patch b/patches/unapplied/api/0188-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/api/0188-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/unapplied/api/0188-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/api/0189-Add-tick-times-API.patch b/patches/unapplied/api/0189-Add-tick-times-API.patch similarity index 100% rename from patches/api/0189-Add-tick-times-API.patch rename to patches/unapplied/api/0189-Add-tick-times-API.patch diff --git a/patches/api/0190-Expose-MinecraftServer-isRunning.patch b/patches/unapplied/api/0190-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/api/0190-Expose-MinecraftServer-isRunning.patch rename to patches/unapplied/api/0190-Expose-MinecraftServer-isRunning.patch diff --git a/patches/api/0191-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/unapplied/api/0191-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/api/0191-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/unapplied/api/0191-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/api/0192-Disable-Sync-Events-firing-Async-errors-during-shutd.patch b/patches/unapplied/api/0192-Disable-Sync-Events-firing-Async-errors-during-shutd.patch similarity index 100% rename from patches/api/0192-Disable-Sync-Events-firing-Async-errors-during-shutd.patch rename to patches/unapplied/api/0192-Disable-Sync-Events-firing-Async-errors-during-shutd.patch diff --git a/patches/api/0193-Make-JavaPluginLoader-thread-safe.patch b/patches/unapplied/api/0193-Make-JavaPluginLoader-thread-safe.patch similarity index 100% rename from patches/api/0193-Make-JavaPluginLoader-thread-safe.patch rename to patches/unapplied/api/0193-Make-JavaPluginLoader-thread-safe.patch diff --git a/patches/api/0194-Add-Player-Client-Options-API.patch b/patches/unapplied/api/0194-Add-Player-Client-Options-API.patch similarity index 100% rename from patches/api/0194-Add-Player-Client-Options-API.patch rename to patches/unapplied/api/0194-Add-Player-Client-Options-API.patch diff --git a/patches/api/0195-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/unapplied/api/0195-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from patches/api/0195-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/unapplied/api/0195-Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/patches/api/0196-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch b/patches/unapplied/api/0196-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch similarity index 100% rename from patches/api/0196-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch rename to patches/unapplied/api/0196-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch diff --git a/patches/api/0197-Add-item-slot-convenience-methods.patch b/patches/unapplied/api/0197-Add-item-slot-convenience-methods.patch similarity index 100% rename from patches/api/0197-Add-item-slot-convenience-methods.patch rename to patches/unapplied/api/0197-Add-item-slot-convenience-methods.patch diff --git a/patches/api/0198-Villager-Restocks-API.patch b/patches/unapplied/api/0198-Villager-Restocks-API.patch similarity index 100% rename from patches/api/0198-Villager-Restocks-API.patch rename to patches/unapplied/api/0198-Villager-Restocks-API.patch diff --git a/patches/api/0199-Expose-game-version.patch b/patches/unapplied/api/0199-Expose-game-version.patch similarity index 100% rename from patches/api/0199-Expose-game-version.patch rename to patches/unapplied/api/0199-Expose-game-version.patch diff --git a/patches/api/0200-Add-Mob-Goal-API.patch b/patches/unapplied/api/0200-Add-Mob-Goal-API.patch similarity index 100% rename from patches/api/0200-Add-Mob-Goal-API.patch rename to patches/unapplied/api/0200-Add-Mob-Goal-API.patch diff --git a/patches/api/0201-Add-villager-reputation-API.patch b/patches/unapplied/api/0201-Add-villager-reputation-API.patch similarity index 100% rename from patches/api/0201-Add-villager-reputation-API.patch rename to patches/unapplied/api/0201-Add-villager-reputation-API.patch diff --git a/patches/api/0202-Spawn-Reason-API.patch b/patches/unapplied/api/0202-Spawn-Reason-API.patch similarity index 100% rename from patches/api/0202-Spawn-Reason-API.patch rename to patches/unapplied/api/0202-Spawn-Reason-API.patch diff --git a/patches/api/0203-Potential-bed-API.patch b/patches/unapplied/api/0203-Potential-bed-API.patch similarity index 100% rename from patches/api/0203-Potential-bed-API.patch rename to patches/unapplied/api/0203-Potential-bed-API.patch diff --git a/patches/api/0204-Prioritise-own-classes-where-possible.patch b/patches/unapplied/api/0204-Prioritise-own-classes-where-possible.patch similarity index 100% rename from patches/api/0204-Prioritise-own-classes-where-possible.patch rename to patches/unapplied/api/0204-Prioritise-own-classes-where-possible.patch diff --git a/patches/api/0205-Provide-a-useful-PluginClassLoader-toString.patch b/patches/unapplied/api/0205-Provide-a-useful-PluginClassLoader-toString.patch similarity index 100% rename from patches/api/0205-Provide-a-useful-PluginClassLoader-toString.patch rename to patches/unapplied/api/0205-Provide-a-useful-PluginClassLoader-toString.patch diff --git a/patches/api/0206-Inventory-getHolder-method-without-block-snapshot.patch b/patches/unapplied/api/0206-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/api/0206-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/unapplied/api/0206-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/api/0207-Improve-Arrow-API.patch b/patches/unapplied/api/0207-Improve-Arrow-API.patch similarity index 100% rename from patches/api/0207-Improve-Arrow-API.patch rename to patches/unapplied/api/0207-Improve-Arrow-API.patch diff --git a/patches/api/0208-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/unapplied/api/0208-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/api/0208-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/unapplied/api/0208-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/api/0209-Support-components-in-ItemMeta.patch b/patches/unapplied/api/0209-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/api/0209-Support-components-in-ItemMeta.patch rename to patches/unapplied/api/0209-Support-components-in-ItemMeta.patch diff --git a/patches/api/0210-added-2-new-TargetReasons-for-1.16-mob-behavior.patch b/patches/unapplied/api/0210-added-2-new-TargetReasons-for-1.16-mob-behavior.patch similarity index 100% rename from patches/api/0210-added-2-new-TargetReasons-for-1.16-mob-behavior.patch rename to patches/unapplied/api/0210-added-2-new-TargetReasons-for-1.16-mob-behavior.patch diff --git a/patches/api/0211-Add-entity-liquid-API.patch b/patches/unapplied/api/0211-Add-entity-liquid-API.patch similarity index 100% rename from patches/api/0211-Add-entity-liquid-API.patch rename to patches/unapplied/api/0211-Add-entity-liquid-API.patch diff --git a/patches/api/0212-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch b/patches/unapplied/api/0212-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch similarity index 100% rename from patches/api/0212-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch rename to patches/unapplied/api/0212-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch diff --git a/patches/api/0213-Support-hex-colors-in-getLastColors.patch b/patches/unapplied/api/0213-Support-hex-colors-in-getLastColors.patch similarity index 100% rename from patches/api/0213-Support-hex-colors-in-getLastColors.patch rename to patches/unapplied/api/0213-Support-hex-colors-in-getLastColors.patch diff --git a/patches/api/0214-Add-setMaxPlayers-API.patch b/patches/unapplied/api/0214-Add-setMaxPlayers-API.patch similarity index 100% rename from patches/api/0214-Add-setMaxPlayers-API.patch rename to patches/unapplied/api/0214-Add-setMaxPlayers-API.patch diff --git a/patches/api/0215-Add-moon-phase-API.patch b/patches/unapplied/api/0215-Add-moon-phase-API.patch similarity index 100% rename from patches/api/0215-Add-moon-phase-API.patch rename to patches/unapplied/api/0215-Add-moon-phase-API.patch diff --git a/patches/api/0216-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/unapplied/api/0216-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/api/0216-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/unapplied/api/0216-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/api/0217-Add-BellRingEvent.patch b/patches/unapplied/api/0217-Add-BellRingEvent.patch similarity index 100% rename from patches/api/0217-Add-BellRingEvent.patch rename to patches/unapplied/api/0217-Add-BellRingEvent.patch diff --git a/patches/api/0218-Brand-support.patch b/patches/unapplied/api/0218-Brand-support.patch similarity index 100% rename from patches/api/0218-Brand-support.patch rename to patches/unapplied/api/0218-Brand-support.patch diff --git a/patches/api/0219-Add-more-Evoker-API.patch b/patches/unapplied/api/0219-Add-more-Evoker-API.patch similarity index 100% rename from patches/api/0219-Add-more-Evoker-API.patch rename to patches/unapplied/api/0219-Add-more-Evoker-API.patch diff --git a/patches/api/0220-Add-methods-to-get-translation-keys.patch b/patches/unapplied/api/0220-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/api/0220-Add-methods-to-get-translation-keys.patch rename to patches/unapplied/api/0220-Add-methods-to-get-translation-keys.patch diff --git a/patches/api/0221-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/unapplied/api/0221-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/api/0221-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/unapplied/api/0221-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/api/0222-Add-additional-open-container-api-to-HumanEntity.patch b/patches/unapplied/api/0222-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/api/0222-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/unapplied/api/0222-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/api/0223-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/unapplied/api/0223-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/api/0223-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/unapplied/api/0223-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/api/0224-Entity-isTicking.patch b/patches/unapplied/api/0224-Entity-isTicking.patch similarity index 100% rename from patches/api/0224-Entity-isTicking.patch rename to patches/unapplied/api/0224-Entity-isTicking.patch diff --git a/patches/api/0225-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch b/patches/unapplied/api/0225-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch similarity index 100% rename from patches/api/0225-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch rename to patches/unapplied/api/0225-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch diff --git a/patches/api/0226-Villager-resetOffers.patch b/patches/unapplied/api/0226-Villager-resetOffers.patch similarity index 100% rename from patches/api/0226-Villager-resetOffers.patch rename to patches/unapplied/api/0226-Villager-resetOffers.patch diff --git a/patches/api/0227-Player-elytra-boost-API.patch b/patches/unapplied/api/0227-Player-elytra-boost-API.patch similarity index 100% rename from patches/api/0227-Player-elytra-boost-API.patch rename to patches/unapplied/api/0227-Player-elytra-boost-API.patch diff --git a/patches/api/0228-Add-getOfflinePlayerIfCached-String.patch b/patches/unapplied/api/0228-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/api/0228-Add-getOfflinePlayerIfCached-String.patch rename to patches/unapplied/api/0228-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/api/0229-Add-ignore-discounts-API.patch b/patches/unapplied/api/0229-Add-ignore-discounts-API.patch similarity index 100% rename from patches/api/0229-Add-ignore-discounts-API.patch rename to patches/unapplied/api/0229-Add-ignore-discounts-API.patch diff --git a/patches/api/0230-Item-no-age-no-player-pickup.patch b/patches/unapplied/api/0230-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/api/0230-Item-no-age-no-player-pickup.patch rename to patches/unapplied/api/0230-Item-no-age-no-player-pickup.patch diff --git a/patches/api/0231-Beacon-API-custom-effect-ranges.patch b/patches/unapplied/api/0231-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/api/0231-Beacon-API-custom-effect-ranges.patch rename to patches/unapplied/api/0231-Beacon-API-custom-effect-ranges.patch diff --git a/patches/api/0232-Add-API-for-quit-reason.patch b/patches/unapplied/api/0232-Add-API-for-quit-reason.patch similarity index 100% rename from patches/api/0232-Add-API-for-quit-reason.patch rename to patches/unapplied/api/0232-Add-API-for-quit-reason.patch diff --git a/patches/api/0233-Add-Destroy-Speed-API.patch b/patches/unapplied/api/0233-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/api/0233-Add-Destroy-Speed-API.patch rename to patches/unapplied/api/0233-Add-Destroy-Speed-API.patch diff --git a/patches/api/0234-Add-LivingEntity-clearActiveItem.patch b/patches/unapplied/api/0234-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/api/0234-Add-LivingEntity-clearActiveItem.patch rename to patches/unapplied/api/0234-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/api/0235-Add-PlayerItemCooldownEvent.patch b/patches/unapplied/api/0235-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/api/0235-Add-PlayerItemCooldownEvent.patch rename to patches/unapplied/api/0235-Add-PlayerItemCooldownEvent.patch diff --git a/patches/api/0236-More-lightning-API.patch b/patches/unapplied/api/0236-More-lightning-API.patch similarity index 100% rename from patches/api/0236-More-lightning-API.patch rename to patches/unapplied/api/0236-More-lightning-API.patch diff --git a/patches/api/0237-Add-PlayerShearBlockEvent.patch b/patches/unapplied/api/0237-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/api/0237-Add-PlayerShearBlockEvent.patch rename to patches/unapplied/api/0237-Add-PlayerShearBlockEvent.patch diff --git a/patches/api/0238-Enable-multi-release-plugin-jars.patch b/patches/unapplied/api/0238-Enable-multi-release-plugin-jars.patch similarity index 100% rename from patches/api/0238-Enable-multi-release-plugin-jars.patch rename to patches/unapplied/api/0238-Enable-multi-release-plugin-jars.patch diff --git a/patches/api/0239-Player-Chunk-Load-Unload-Events.patch b/patches/unapplied/api/0239-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/api/0239-Player-Chunk-Load-Unload-Events.patch rename to patches/unapplied/api/0239-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/api/0240-Expose-LivingEntity-hurt-direction.patch b/patches/unapplied/api/0240-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/api/0240-Expose-LivingEntity-hurt-direction.patch rename to patches/unapplied/api/0240-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/api/0241-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/unapplied/api/0241-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/api/0241-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/unapplied/api/0241-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/api/0242-Added-PlayerTradeEvent.patch b/patches/unapplied/api/0242-Added-PlayerTradeEvent.patch similarity index 100% rename from patches/api/0242-Added-PlayerTradeEvent.patch rename to patches/unapplied/api/0242-Added-PlayerTradeEvent.patch diff --git a/patches/api/0243-Add-TargetHitEvent-API.patch b/patches/unapplied/api/0243-Add-TargetHitEvent-API.patch similarity index 100% rename from patches/api/0243-Add-TargetHitEvent-API.patch rename to patches/unapplied/api/0243-Add-TargetHitEvent-API.patch diff --git a/patches/api/0244-Additional-Block-Material-API-s.patch b/patches/unapplied/api/0244-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/api/0244-Additional-Block-Material-API-s.patch rename to patches/unapplied/api/0244-Additional-Block-Material-API-s.patch diff --git a/patches/api/0245-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/unapplied/api/0245-Add-API-to-get-Material-from-Boats-and-Minecarts.patch similarity index 100% rename from patches/api/0245-Add-API-to-get-Material-from-Boats-and-Minecarts.patch rename to patches/unapplied/api/0245-Add-API-to-get-Material-from-Boats-and-Minecarts.patch diff --git a/patches/api/0246-Add-PlayerFlowerPotManipulateEvent.patch b/patches/unapplied/api/0246-Add-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/api/0246-Add-PlayerFlowerPotManipulateEvent.patch rename to patches/unapplied/api/0246-Add-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/api/0247-Zombie-API-breaking-doors.patch b/patches/unapplied/api/0247-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/api/0247-Zombie-API-breaking-doors.patch rename to patches/unapplied/api/0247-Zombie-API-breaking-doors.patch diff --git a/patches/api/0248-Add-EntityLoadCrossbowEvent.patch b/patches/unapplied/api/0248-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/api/0248-Add-EntityLoadCrossbowEvent.patch rename to patches/unapplied/api/0248-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/api/0249-Added-WorldGameRuleChangeEvent.patch b/patches/unapplied/api/0249-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/api/0249-Added-WorldGameRuleChangeEvent.patch rename to patches/unapplied/api/0249-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/api/0250-Added-ServerResourcesReloadedEvent.patch b/patches/unapplied/api/0250-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/api/0250-Added-ServerResourcesReloadedEvent.patch rename to patches/unapplied/api/0250-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/api/0251-Add-BlockFailedDispenseEvent.patch b/patches/unapplied/api/0251-Add-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/api/0251-Add-BlockFailedDispenseEvent.patch rename to patches/unapplied/api/0251-Add-BlockFailedDispenseEvent.patch diff --git a/patches/api/0252-Added-PlayerLecternPageChangeEvent.patch b/patches/unapplied/api/0252-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/api/0252-Added-PlayerLecternPageChangeEvent.patch rename to patches/unapplied/api/0252-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/api/0253-Added-PlayerLoomPatternSelectEvent.patch b/patches/unapplied/api/0253-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/api/0253-Added-PlayerLoomPatternSelectEvent.patch rename to patches/unapplied/api/0253-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/api/0254-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/unapplied/api/0254-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch similarity index 100% rename from patches/api/0254-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch rename to patches/unapplied/api/0254-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch diff --git a/patches/api/0255-Add-sendOpLevel-API.patch b/patches/unapplied/api/0255-Add-sendOpLevel-API.patch similarity index 100% rename from patches/api/0255-Add-sendOpLevel-API.patch rename to patches/unapplied/api/0255-Add-sendOpLevel-API.patch diff --git a/patches/api/0256-Add-PaperRegistry.patch b/patches/unapplied/api/0256-Add-PaperRegistry.patch similarity index 100% rename from patches/api/0256-Add-PaperRegistry.patch rename to patches/unapplied/api/0256-Add-PaperRegistry.patch diff --git a/patches/api/0257-Add-StructuresLocateEvent.patch b/patches/unapplied/api/0257-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/api/0257-Add-StructuresLocateEvent.patch rename to patches/unapplied/api/0257-Add-StructuresLocateEvent.patch diff --git a/patches/api/0258-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/unapplied/api/0258-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/api/0258-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/unapplied/api/0258-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/api/0259-Add-BlockPreDispenseEvent.patch b/patches/unapplied/api/0259-Add-BlockPreDispenseEvent.patch similarity index 100% rename from patches/api/0259-Add-BlockPreDispenseEvent.patch rename to patches/unapplied/api/0259-Add-BlockPreDispenseEvent.patch diff --git a/patches/api/0260-Added-Vanilla-Entity-Tags.patch b/patches/unapplied/api/0260-Added-Vanilla-Entity-Tags.patch similarity index 100% rename from patches/api/0260-Added-Vanilla-Entity-Tags.patch rename to patches/unapplied/api/0260-Added-Vanilla-Entity-Tags.patch diff --git a/patches/api/0261-Added-PlayerChangeBeaconEffectEvent.patch b/patches/unapplied/api/0261-Added-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/api/0261-Added-PlayerChangeBeaconEffectEvent.patch rename to patches/unapplied/api/0261-Added-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/api/0262-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/unapplied/api/0262-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/api/0262-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/unapplied/api/0262-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/api/0263-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/unapplied/api/0263-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/api/0263-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/unapplied/api/0263-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/api/0264-add-DragonEggFormEvent.patch b/patches/unapplied/api/0264-add-DragonEggFormEvent.patch similarity index 100% rename from patches/api/0264-add-DragonEggFormEvent.patch rename to patches/unapplied/api/0264-add-DragonEggFormEvent.patch diff --git a/patches/api/0265-EntityMoveEvent.patch b/patches/unapplied/api/0265-EntityMoveEvent.patch similarity index 100% rename from patches/api/0265-EntityMoveEvent.patch rename to patches/unapplied/api/0265-EntityMoveEvent.patch diff --git a/patches/api/0266-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/unapplied/api/0266-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/api/0266-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/unapplied/api/0266-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/api/0267-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/unapplied/api/0267-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/api/0267-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/unapplied/api/0267-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/api/0268-living-entity-allow-attribute-registration.patch b/patches/unapplied/api/0268-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/api/0268-living-entity-allow-attribute-registration.patch rename to patches/unapplied/api/0268-living-entity-allow-attribute-registration.patch diff --git a/patches/api/0269-Add-missing-effects.patch b/patches/unapplied/api/0269-Add-missing-effects.patch similarity index 100% rename from patches/api/0269-Add-missing-effects.patch rename to patches/unapplied/api/0269-Add-missing-effects.patch diff --git a/patches/api/0270-Expose-Tracked-Players.patch b/patches/unapplied/api/0270-Expose-Tracked-Players.patch similarity index 100% rename from patches/api/0270-Expose-Tracked-Players.patch rename to patches/unapplied/api/0270-Expose-Tracked-Players.patch diff --git a/patches/api/0271-Cache-the-result-of-Material-isBlock.patch b/patches/unapplied/api/0271-Cache-the-result-of-Material-isBlock.patch similarity index 100% rename from patches/api/0271-Cache-the-result-of-Material-isBlock.patch rename to patches/unapplied/api/0271-Cache-the-result-of-Material-isBlock.patch diff --git a/patches/api/0272-Add-worldborder-events.patch b/patches/unapplied/api/0272-Add-worldborder-events.patch similarity index 100% rename from patches/api/0272-Add-worldborder-events.patch rename to patches/unapplied/api/0272-Add-worldborder-events.patch diff --git a/patches/api/0273-added-PlayerNameEntityEvent.patch b/patches/unapplied/api/0273-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/api/0273-added-PlayerNameEntityEvent.patch rename to patches/unapplied/api/0273-added-PlayerNameEntityEvent.patch diff --git a/patches/api/0274-Add-recipe-to-cook-events.patch b/patches/unapplied/api/0274-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/api/0274-Add-recipe-to-cook-events.patch rename to patches/unapplied/api/0274-Add-recipe-to-cook-events.patch diff --git a/patches/api/0275-Add-Block-isValidTool.patch b/patches/unapplied/api/0275-Add-Block-isValidTool.patch similarity index 100% rename from patches/api/0275-Add-Block-isValidTool.patch rename to patches/unapplied/api/0275-Add-Block-isValidTool.patch diff --git a/patches/api/0276-Expand-world-key-API.patch b/patches/unapplied/api/0276-Expand-world-key-API.patch similarity index 100% rename from patches/api/0276-Expand-world-key-API.patch rename to patches/unapplied/api/0276-Expand-world-key-API.patch diff --git a/patches/api/0277-Item-Rarity-API.patch b/patches/unapplied/api/0277-Item-Rarity-API.patch similarity index 100% rename from patches/api/0277-Item-Rarity-API.patch rename to patches/unapplied/api/0277-Item-Rarity-API.patch diff --git a/patches/api/0278-Expose-protocol-version.patch b/patches/unapplied/api/0278-Expose-protocol-version.patch similarity index 100% rename from patches/api/0278-Expose-protocol-version.patch rename to patches/unapplied/api/0278-Expose-protocol-version.patch diff --git a/patches/api/0279-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/unapplied/api/0279-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch similarity index 100% rename from patches/api/0279-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch rename to patches/unapplied/api/0279-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch diff --git a/patches/api/0280-add-isDeeplySleeping-to-HumanEntity.patch b/patches/unapplied/api/0280-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/api/0280-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/unapplied/api/0280-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/api/0281-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/unapplied/api/0281-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/api/0281-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/unapplied/api/0281-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/api/0282-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/unapplied/api/0282-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/api/0282-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/unapplied/api/0282-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/api/0283-Added-PlayerDeepSleepEvent.patch b/patches/unapplied/api/0283-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/api/0283-Added-PlayerDeepSleepEvent.patch rename to patches/unapplied/api/0283-Added-PlayerDeepSleepEvent.patch diff --git a/patches/api/0284-More-World-API.patch b/patches/unapplied/api/0284-More-World-API.patch similarity index 100% rename from patches/api/0284-More-World-API.patch rename to patches/unapplied/api/0284-More-World-API.patch diff --git a/patches/api/0285-Added-PlayerBedFailEnterEvent.patch b/patches/unapplied/api/0285-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/api/0285-Added-PlayerBedFailEnterEvent.patch rename to patches/unapplied/api/0285-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/api/0286-Introduce-beacon-activation-deactivation-events.patch b/patches/unapplied/api/0286-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/api/0286-Introduce-beacon-activation-deactivation-events.patch rename to patches/unapplied/api/0286-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/api/0287-PlayerMoveEvent-Improvements.patch b/patches/unapplied/api/0287-PlayerMoveEvent-Improvements.patch similarity index 100% rename from patches/api/0287-PlayerMoveEvent-Improvements.patch rename to patches/unapplied/api/0287-PlayerMoveEvent-Improvements.patch diff --git a/patches/api/0288-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/unapplied/api/0288-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/api/0288-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/unapplied/api/0288-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/api/0289-Add-more-WanderingTrader-API.patch b/patches/unapplied/api/0289-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/api/0289-Add-more-WanderingTrader-API.patch rename to patches/unapplied/api/0289-Add-more-WanderingTrader-API.patch diff --git a/patches/api/0290-Add-EntityBlockStorage-clearEntities.patch b/patches/unapplied/api/0290-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/api/0290-Add-EntityBlockStorage-clearEntities.patch rename to patches/unapplied/api/0290-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/api/0291-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/unapplied/api/0291-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/api/0291-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/unapplied/api/0291-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/api/0292-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/api/0292-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/api/0292-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/unapplied/api/0292-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/api/0293-Inventory-close.patch b/patches/unapplied/api/0293-Inventory-close.patch similarity index 100% rename from patches/api/0293-Inventory-close.patch rename to patches/unapplied/api/0293-Inventory-close.patch diff --git a/patches/api/0294-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/unapplied/api/0294-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/api/0294-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/unapplied/api/0294-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/api/0295-Add-basic-Datapack-API.patch b/patches/unapplied/api/0295-Add-basic-Datapack-API.patch similarity index 100% rename from patches/api/0295-Add-basic-Datapack-API.patch rename to patches/unapplied/api/0295-Add-basic-Datapack-API.patch diff --git a/patches/api/0296-additions-to-PlayerGameModeChangeEvent.patch b/patches/unapplied/api/0296-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/api/0296-additions-to-PlayerGameModeChangeEvent.patch rename to patches/unapplied/api/0296-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/api/0297-ItemStack-repair-check-API.patch b/patches/unapplied/api/0297-ItemStack-repair-check-API.patch similarity index 100% rename from patches/api/0297-ItemStack-repair-check-API.patch rename to patches/unapplied/api/0297-ItemStack-repair-check-API.patch diff --git a/patches/api/0298-More-Enchantment-API.patch b/patches/unapplied/api/0298-More-Enchantment-API.patch similarity index 100% rename from patches/api/0298-More-Enchantment-API.patch rename to patches/unapplied/api/0298-More-Enchantment-API.patch diff --git a/patches/api/0299-List-all-missing-hard-depends-not-just-first.patch b/patches/unapplied/api/0299-List-all-missing-hard-depends-not-just-first.patch similarity index 100% rename from patches/api/0299-List-all-missing-hard-depends-not-just-first.patch rename to patches/unapplied/api/0299-List-all-missing-hard-depends-not-just-first.patch diff --git a/patches/api/0300-Add-Mob-lookAt-API.patch b/patches/unapplied/api/0300-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/api/0300-Add-Mob-lookAt-API.patch rename to patches/unapplied/api/0300-Add-Mob-lookAt-API.patch diff --git a/patches/api/0301-ItemStack-editMeta.patch b/patches/unapplied/api/0301-ItemStack-editMeta.patch similarity index 100% rename from patches/api/0301-ItemStack-editMeta.patch rename to patches/unapplied/api/0301-ItemStack-editMeta.patch diff --git a/patches/api/0302-Add-EntityInsideBlockEvent.patch b/patches/unapplied/api/0302-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/api/0302-Add-EntityInsideBlockEvent.patch rename to patches/unapplied/api/0302-Add-EntityInsideBlockEvent.patch diff --git a/patches/api/0303-Attributes-API-for-item-defaults.patch b/patches/unapplied/api/0303-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/api/0303-Attributes-API-for-item-defaults.patch rename to patches/unapplied/api/0303-Attributes-API-for-item-defaults.patch diff --git a/patches/api/0304-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/unapplied/api/0304-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/api/0304-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/unapplied/api/0304-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/api/0305-More-Lidded-Block-API.patch b/patches/unapplied/api/0305-More-Lidded-Block-API.patch similarity index 100% rename from patches/api/0305-More-Lidded-Block-API.patch rename to patches/unapplied/api/0305-More-Lidded-Block-API.patch diff --git a/patches/api/0306-Add-PlayerKickEvent-causes.patch b/patches/unapplied/api/0306-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/api/0306-Add-PlayerKickEvent-causes.patch rename to patches/unapplied/api/0306-Add-PlayerKickEvent-causes.patch diff --git a/patches/api/0307-Add-PufferFishStateChangeEvent.patch b/patches/unapplied/api/0307-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/api/0307-Add-PufferFishStateChangeEvent.patch rename to patches/unapplied/api/0307-Add-PufferFishStateChangeEvent.patch diff --git a/patches/api/0308-Add-BellRevealRaiderEvent.patch b/patches/unapplied/api/0308-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/api/0308-Add-BellRevealRaiderEvent.patch rename to patches/unapplied/api/0308-Add-BellRevealRaiderEvent.patch diff --git a/patches/api/0309-Add-ElderGuardianAppearanceEvent.patch b/patches/unapplied/api/0309-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/api/0309-Add-ElderGuardianAppearanceEvent.patch rename to patches/unapplied/api/0309-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/api/0310-Add-more-line-of-sight-methods.patch b/patches/unapplied/api/0310-Add-more-line-of-sight-methods.patch similarity index 100% rename from patches/api/0310-Add-more-line-of-sight-methods.patch rename to patches/unapplied/api/0310-Add-more-line-of-sight-methods.patch diff --git a/patches/api/0311-Add-more-LimitedRegion-API.patch b/patches/unapplied/api/0311-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/api/0311-Add-more-LimitedRegion-API.patch rename to patches/unapplied/api/0311-Add-more-LimitedRegion-API.patch diff --git a/patches/api/0312-Missing-Entity-Behavior-API.patch b/patches/unapplied/api/0312-Missing-Entity-Behavior-API.patch similarity index 100% rename from patches/api/0312-Missing-Entity-Behavior-API.patch rename to patches/unapplied/api/0312-Missing-Entity-Behavior-API.patch diff --git a/patches/api/0313-Add-Git-information-to-version-command-on-startup.patch b/patches/unapplied/api/0313-Add-Git-information-to-version-command-on-startup.patch similarity index 100% rename from patches/api/0313-Add-Git-information-to-version-command-on-startup.patch rename to patches/unapplied/api/0313-Add-Git-information-to-version-command-on-startup.patch diff --git a/patches/api/0314-Adds-PlayerArmSwingEvent.patch b/patches/unapplied/api/0314-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/api/0314-Adds-PlayerArmSwingEvent.patch rename to patches/unapplied/api/0314-Adds-PlayerArmSwingEvent.patch diff --git a/patches/api/0315-Add-PlayerSignCommandPreprocessEvent.patch b/patches/unapplied/api/0315-Add-PlayerSignCommandPreprocessEvent.patch similarity index 100% rename from patches/api/0315-Add-PlayerSignCommandPreprocessEvent.patch rename to patches/unapplied/api/0315-Add-PlayerSignCommandPreprocessEvent.patch diff --git a/patches/api/0316-fix-empty-array-elements-in-command-arguments.patch b/patches/unapplied/api/0316-fix-empty-array-elements-in-command-arguments.patch similarity index 100% rename from patches/api/0316-fix-empty-array-elements-in-command-arguments.patch rename to patches/unapplied/api/0316-fix-empty-array-elements-in-command-arguments.patch diff --git a/patches/api/0317-Stinger-API.patch b/patches/unapplied/api/0317-Stinger-API.patch similarity index 100% rename from patches/api/0317-Stinger-API.patch rename to patches/unapplied/api/0317-Stinger-API.patch diff --git a/patches/api/0318-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/unapplied/api/0318-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/api/0318-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/unapplied/api/0318-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/api/0319-Add-PlayerSetSpawnEvent.patch b/patches/unapplied/api/0319-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/api/0319-Add-PlayerSetSpawnEvent.patch rename to patches/unapplied/api/0319-Add-PlayerSetSpawnEvent.patch diff --git a/patches/api/0320-Added-EntityDamageItemEvent.patch b/patches/unapplied/api/0320-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/api/0320-Added-EntityDamageItemEvent.patch rename to patches/unapplied/api/0320-Added-EntityDamageItemEvent.patch diff --git a/patches/api/0321-Make-EntityUnleashEvent-cancellable.patch b/patches/unapplied/api/0321-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/api/0321-Make-EntityUnleashEvent-cancellable.patch rename to patches/unapplied/api/0321-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/api/0322-Change-EnderEye-target-without-changing-other-things.patch b/patches/unapplied/api/0322-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/api/0322-Change-EnderEye-target-without-changing-other-things.patch rename to patches/unapplied/api/0322-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/api/0323-Add-BlockBreakBlockEvent.patch b/patches/unapplied/api/0323-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/api/0323-Add-BlockBreakBlockEvent.patch rename to patches/unapplied/api/0323-Add-BlockBreakBlockEvent.patch diff --git a/patches/api/0324-Add-helpers-for-left-right-click-to-Action.patch b/patches/unapplied/api/0324-Add-helpers-for-left-right-click-to-Action.patch similarity index 100% rename from patches/api/0324-Add-helpers-for-left-right-click-to-Action.patch rename to patches/unapplied/api/0324-Add-helpers-for-left-right-click-to-Action.patch diff --git a/patches/api/0325-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/unapplied/api/0325-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/api/0325-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/unapplied/api/0325-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/api/0326-More-CommandBlock-API.patch b/patches/unapplied/api/0326-More-CommandBlock-API.patch similarity index 100% rename from patches/api/0326-More-CommandBlock-API.patch rename to patches/unapplied/api/0326-More-CommandBlock-API.patch diff --git a/patches/api/0327-Fix-plugin-provides-load-order.patch b/patches/unapplied/api/0327-Fix-plugin-provides-load-order.patch similarity index 100% rename from patches/api/0327-Fix-plugin-provides-load-order.patch rename to patches/unapplied/api/0327-Fix-plugin-provides-load-order.patch diff --git a/patches/api/0328-Add-missing-team-sidebar-display-slots.patch b/patches/unapplied/api/0328-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/api/0328-Add-missing-team-sidebar-display-slots.patch rename to patches/unapplied/api/0328-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/api/0329-add-back-EntityPortalExitEvent.patch b/patches/unapplied/api/0329-add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/api/0329-add-back-EntityPortalExitEvent.patch rename to patches/unapplied/api/0329-add-back-EntityPortalExitEvent.patch diff --git a/patches/api/0330-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/unapplied/api/0330-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/api/0330-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/unapplied/api/0330-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/api/0331-Get-entity-default-attributes.patch b/patches/unapplied/api/0331-Get-entity-default-attributes.patch similarity index 100% rename from patches/api/0331-Get-entity-default-attributes.patch rename to patches/unapplied/api/0331-Get-entity-default-attributes.patch diff --git a/patches/api/0332-Left-handed-API.patch b/patches/unapplied/api/0332-Left-handed-API.patch similarity index 100% rename from patches/api/0332-Left-handed-API.patch rename to patches/unapplied/api/0332-Left-handed-API.patch diff --git a/patches/api/0333-Add-advancement-display-API.patch b/patches/unapplied/api/0333-Add-advancement-display-API.patch similarity index 100% rename from patches/api/0333-Add-advancement-display-API.patch rename to patches/unapplied/api/0333-Add-advancement-display-API.patch diff --git a/patches/api/0334-Add-ItemFactory-getMonsterEgg-API.patch b/patches/unapplied/api/0334-Add-ItemFactory-getMonsterEgg-API.patch similarity index 100% rename from patches/api/0334-Add-ItemFactory-getMonsterEgg-API.patch rename to patches/unapplied/api/0334-Add-ItemFactory-getMonsterEgg-API.patch diff --git a/patches/api/0335-Add-critical-damage-API.patch b/patches/unapplied/api/0335-Add-critical-damage-API.patch similarity index 100% rename from patches/api/0335-Add-critical-damage-API.patch rename to patches/unapplied/api/0335-Add-critical-damage-API.patch diff --git a/patches/api/0336-Fix-issues-with-mob-conversion.patch b/patches/unapplied/api/0336-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/api/0336-Fix-issues-with-mob-conversion.patch rename to patches/unapplied/api/0336-Fix-issues-with-mob-conversion.patch diff --git a/patches/api/0337-Add-isCollidable-methods-to-various-places.patch b/patches/unapplied/api/0337-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/api/0337-Add-isCollidable-methods-to-various-places.patch rename to patches/unapplied/api/0337-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/api/0338-Goat-ram-API.patch b/patches/unapplied/api/0338-Goat-ram-API.patch similarity index 100% rename from patches/api/0338-Goat-ram-API.patch rename to patches/unapplied/api/0338-Goat-ram-API.patch diff --git a/patches/api/0339-Add-API-for-resetting-a-single-score.patch b/patches/unapplied/api/0339-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/api/0339-Add-API-for-resetting-a-single-score.patch rename to patches/unapplied/api/0339-Add-API-for-resetting-a-single-score.patch diff --git a/patches/api/0340-Add-Raw-Byte-Entity-Serialization.patch b/patches/unapplied/api/0340-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/api/0340-Add-Raw-Byte-Entity-Serialization.patch rename to patches/unapplied/api/0340-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/api/0341-Add-PlayerItemFrameChangeEvent.patch b/patches/unapplied/api/0341-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/api/0341-Add-PlayerItemFrameChangeEvent.patch rename to patches/unapplied/api/0341-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/api/0342-Add-player-health-update-API.patch b/patches/unapplied/api/0342-Add-player-health-update-API.patch similarity index 100% rename from patches/api/0342-Add-player-health-update-API.patch rename to patches/unapplied/api/0342-Add-player-health-update-API.patch diff --git a/patches/api/0343-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/unapplied/api/0343-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/api/0343-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/unapplied/api/0343-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/api/0344-Add-more-Campfire-API.patch b/patches/unapplied/api/0344-Add-more-Campfire-API.patch similarity index 100% rename from patches/api/0344-Add-more-Campfire-API.patch rename to patches/unapplied/api/0344-Add-more-Campfire-API.patch diff --git a/patches/api/0345-Move-VehicleCollisionEvent-HandlerList-up.patch b/patches/unapplied/api/0345-Move-VehicleCollisionEvent-HandlerList-up.patch similarity index 100% rename from patches/api/0345-Move-VehicleCollisionEvent-HandlerList-up.patch rename to patches/unapplied/api/0345-Move-VehicleCollisionEvent-HandlerList-up.patch diff --git a/patches/api/0346-Improve-scoreboard-entries.patch b/patches/unapplied/api/0346-Improve-scoreboard-entries.patch similarity index 100% rename from patches/api/0346-Improve-scoreboard-entries.patch rename to patches/unapplied/api/0346-Improve-scoreboard-entries.patch diff --git a/patches/api/0347-Entity-powdered-snow-API.patch b/patches/unapplied/api/0347-Entity-powdered-snow-API.patch similarity index 100% rename from patches/api/0347-Entity-powdered-snow-API.patch rename to patches/unapplied/api/0347-Entity-powdered-snow-API.patch diff --git a/patches/api/0348-Add-API-for-item-entity-health.patch b/patches/unapplied/api/0348-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/api/0348-Add-API-for-item-entity-health.patch rename to patches/unapplied/api/0348-Add-API-for-item-entity-health.patch diff --git a/patches/api/0349-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/unapplied/api/0349-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/api/0349-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/unapplied/api/0349-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/api/0350-Bucketable-API.patch b/patches/unapplied/api/0350-Bucketable-API.patch similarity index 100% rename from patches/api/0350-Bucketable-API.patch rename to patches/unapplied/api/0350-Bucketable-API.patch diff --git a/patches/api/0351-System-prop-for-default-config-comment-parsing.patch b/patches/unapplied/api/0351-System-prop-for-default-config-comment-parsing.patch similarity index 100% rename from patches/api/0351-System-prop-for-default-config-comment-parsing.patch rename to patches/unapplied/api/0351-System-prop-for-default-config-comment-parsing.patch diff --git a/patches/api/0352-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/unapplied/api/0352-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/api/0352-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/unapplied/api/0352-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/api/0353-Remove-upstream-snakeyaml-fix.patch b/patches/unapplied/api/0353-Remove-upstream-snakeyaml-fix.patch similarity index 100% rename from patches/api/0353-Remove-upstream-snakeyaml-fix.patch rename to patches/unapplied/api/0353-Remove-upstream-snakeyaml-fix.patch diff --git a/patches/api/0354-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/unapplied/api/0354-Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/api/0354-Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/unapplied/api/0354-Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/api/0355-Multiple-Entries-with-Scoreboards.patch b/patches/unapplied/api/0355-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/api/0355-Multiple-Entries-with-Scoreboards.patch rename to patches/unapplied/api/0355-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/api/0356-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/api/0356-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/api/0356-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/unapplied/api/0356-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/api/0357-Warn-on-strange-EventHandler-return-types.patch b/patches/unapplied/api/0357-Warn-on-strange-EventHandler-return-types.patch similarity index 100% rename from patches/api/0357-Warn-on-strange-EventHandler-return-types.patch rename to patches/unapplied/api/0357-Warn-on-strange-EventHandler-return-types.patch diff --git a/patches/api/0358-Multi-Block-Change-API.patch b/patches/unapplied/api/0358-Multi-Block-Change-API.patch similarity index 100% rename from patches/api/0358-Multi-Block-Change-API.patch rename to patches/unapplied/api/0358-Multi-Block-Change-API.patch diff --git a/patches/api/0359-Fix-NotePlayEvent.patch b/patches/unapplied/api/0359-Fix-NotePlayEvent.patch similarity index 100% rename from patches/api/0359-Fix-NotePlayEvent.patch rename to patches/unapplied/api/0359-Fix-NotePlayEvent.patch diff --git a/patches/api/0360-Freeze-Tick-Lock-API.patch b/patches/unapplied/api/0360-Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/api/0360-Freeze-Tick-Lock-API.patch rename to patches/unapplied/api/0360-Freeze-Tick-Lock-API.patch diff --git a/patches/api/0361-Dolphin-API.patch b/patches/unapplied/api/0361-Dolphin-API.patch similarity index 100% rename from patches/api/0361-Dolphin-API.patch rename to patches/unapplied/api/0361-Dolphin-API.patch diff --git a/patches/api/0362-More-PotionEffectType-API.patch b/patches/unapplied/api/0362-More-PotionEffectType-API.patch similarity index 100% rename from patches/api/0362-More-PotionEffectType-API.patch rename to patches/unapplied/api/0362-More-PotionEffectType-API.patch diff --git a/patches/api/0363-Expand-the-Registry-API.patch b/patches/unapplied/api/0363-Expand-the-Registry-API.patch similarity index 100% rename from patches/api/0363-Expand-the-Registry-API.patch rename to patches/unapplied/api/0363-Expand-the-Registry-API.patch diff --git a/patches/api/0364-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/unapplied/api/0364-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/api/0364-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/unapplied/api/0364-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/api/0365-Implement-regenerateChunk.patch b/patches/unapplied/api/0365-Implement-regenerateChunk.patch similarity index 100% rename from patches/api/0365-Implement-regenerateChunk.patch rename to patches/unapplied/api/0365-Implement-regenerateChunk.patch diff --git a/patches/api/0366-Don-t-load-plugins-prefixed-with-a-dot.patch b/patches/unapplied/api/0366-Don-t-load-plugins-prefixed-with-a-dot.patch similarity index 100% rename from patches/api/0366-Don-t-load-plugins-prefixed-with-a-dot.patch rename to patches/unapplied/api/0366-Don-t-load-plugins-prefixed-with-a-dot.patch diff --git a/patches/api/0367-Add-GameEvent-tags.patch b/patches/unapplied/api/0367-Add-GameEvent-tags.patch similarity index 100% rename from patches/api/0367-Add-GameEvent-tags.patch rename to patches/unapplied/api/0367-Add-GameEvent-tags.patch diff --git a/patches/api/0368-Furnace-RecipesUsed-API.patch b/patches/unapplied/api/0368-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/api/0368-Furnace-RecipesUsed-API.patch rename to patches/unapplied/api/0368-Furnace-RecipesUsed-API.patch diff --git a/patches/api/0369-Configurable-sculk-sensor-listener-range.patch b/patches/unapplied/api/0369-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/api/0369-Configurable-sculk-sensor-listener-range.patch rename to patches/unapplied/api/0369-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/api/0370-Add-missing-block-data-mins-and-maxes.patch b/patches/unapplied/api/0370-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/api/0370-Add-missing-block-data-mins-and-maxes.patch rename to patches/unapplied/api/0370-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/api/0371-Custom-Potion-Mixes.patch b/patches/unapplied/api/0371-Custom-Potion-Mixes.patch similarity index 100% rename from patches/api/0371-Custom-Potion-Mixes.patch rename to patches/unapplied/api/0371-Custom-Potion-Mixes.patch diff --git a/patches/api/0372-Expose-furnace-minecart-push-values.patch b/patches/unapplied/api/0372-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/api/0372-Expose-furnace-minecart-push-values.patch rename to patches/unapplied/api/0372-Expose-furnace-minecart-push-values.patch diff --git a/patches/api/0373-More-Projectile-API.patch b/patches/unapplied/api/0373-More-Projectile-API.patch similarity index 100% rename from patches/api/0373-More-Projectile-API.patch rename to patches/unapplied/api/0373-More-Projectile-API.patch diff --git a/patches/api/0374-Add-getComputedBiome-API.patch b/patches/unapplied/api/0374-Add-getComputedBiome-API.patch similarity index 100% rename from patches/api/0374-Add-getComputedBiome-API.patch rename to patches/unapplied/api/0374-Add-getComputedBiome-API.patch diff --git a/patches/api/0375-Add-enchantWithLevels-API.patch b/patches/unapplied/api/0375-Add-enchantWithLevels-API.patch similarity index 100% rename from patches/api/0375-Add-enchantWithLevels-API.patch rename to patches/unapplied/api/0375-Add-enchantWithLevels-API.patch diff --git a/patches/api/0376-Add-TameableDeathMessageEvent.patch b/patches/unapplied/api/0376-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/api/0376-Add-TameableDeathMessageEvent.patch rename to patches/unapplied/api/0376-Add-TameableDeathMessageEvent.patch diff --git a/patches/api/0377-Allow-to-change-the-podium-of-the-EnderDragon.patch b/patches/unapplied/api/0377-Allow-to-change-the-podium-of-the-EnderDragon.patch similarity index 100% rename from patches/api/0377-Allow-to-change-the-podium-of-the-EnderDragon.patch rename to patches/unapplied/api/0377-Allow-to-change-the-podium-of-the-EnderDragon.patch diff --git a/patches/api/0378-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/unapplied/api/0378-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/api/0378-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/unapplied/api/0378-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/api/0379-Update-Folder-Uses-Plugin-Name.patch b/patches/unapplied/api/0379-Update-Folder-Uses-Plugin-Name.patch similarity index 100% rename from patches/api/0379-Update-Folder-Uses-Plugin-Name.patch rename to patches/unapplied/api/0379-Update-Folder-Uses-Plugin-Name.patch diff --git a/patches/api/0380-WorldCreator-keepSpawnLoaded.patch b/patches/unapplied/api/0380-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/api/0380-WorldCreator-keepSpawnLoaded.patch rename to patches/unapplied/api/0380-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/api/0381-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/unapplied/api/0381-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/api/0381-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/unapplied/api/0381-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/api/0382-Add-PlayerStopUsingItemEvent.patch b/patches/unapplied/api/0382-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/api/0382-Add-PlayerStopUsingItemEvent.patch rename to patches/unapplied/api/0382-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/api/0383-FallingBlock-auto-expire-setting.patch b/patches/unapplied/api/0383-FallingBlock-auto-expire-setting.patch similarity index 100% rename from patches/api/0383-FallingBlock-auto-expire-setting.patch rename to patches/unapplied/api/0383-FallingBlock-auto-expire-setting.patch diff --git a/patches/server/0002-Remap-fixes.patch b/patches/unapplied/server/0002-Remap-fixes.patch similarity index 100% rename from patches/server/0002-Remap-fixes.patch rename to patches/unapplied/server/0002-Remap-fixes.patch diff --git a/patches/server/0003-Build-system-changes.patch b/patches/unapplied/server/0003-Build-system-changes.patch similarity index 100% rename from patches/server/0003-Build-system-changes.patch rename to patches/unapplied/server/0003-Build-system-changes.patch diff --git a/patches/server/0004-Paper-config-files.patch b/patches/unapplied/server/0004-Paper-config-files.patch similarity index 100% rename from patches/server/0004-Paper-config-files.patch rename to patches/unapplied/server/0004-Paper-config-files.patch diff --git a/patches/server/0005-MC-Dev-fixes.patch b/patches/unapplied/server/0005-MC-Dev-fixes.patch similarity index 100% rename from patches/server/0005-MC-Dev-fixes.patch rename to patches/unapplied/server/0005-MC-Dev-fixes.patch diff --git a/patches/server/0006-CB-fixes.patch b/patches/unapplied/server/0006-CB-fixes.patch similarity index 100% rename from patches/server/0006-CB-fixes.patch rename to patches/unapplied/server/0006-CB-fixes.patch diff --git a/patches/server/0007-MC-Utils.patch b/patches/unapplied/server/0007-MC-Utils.patch similarity index 100% rename from patches/server/0007-MC-Utils.patch rename to patches/unapplied/server/0007-MC-Utils.patch diff --git a/patches/server/0008-Adventure.patch b/patches/unapplied/server/0008-Adventure.patch similarity index 100% rename from patches/server/0008-Adventure.patch rename to patches/unapplied/server/0008-Adventure.patch diff --git a/patches/server/0009-Paper-command.patch b/patches/unapplied/server/0009-Paper-command.patch similarity index 100% rename from patches/server/0009-Paper-command.patch rename to patches/unapplied/server/0009-Paper-command.patch diff --git a/patches/server/0010-Not-implemeneted.patch b/patches/unapplied/server/0010-Not-implemeneted.patch similarity index 100% rename from patches/server/0010-Not-implemeneted.patch rename to patches/unapplied/server/0010-Not-implemeneted.patch diff --git a/patches/server/0011-Paper-Metrics.patch b/patches/unapplied/server/0011-Paper-Metrics.patch similarity index 100% rename from patches/server/0011-Paper-Metrics.patch rename to patches/unapplied/server/0011-Paper-Metrics.patch diff --git a/patches/server/0012-Timings-v2.patch b/patches/unapplied/server/0012-Timings-v2.patch similarity index 100% rename from patches/server/0012-Timings-v2.patch rename to patches/unapplied/server/0012-Timings-v2.patch diff --git a/patches/server/0013-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/unapplied/server/0013-Add-command-line-option-to-load-extra-plugin-jars-no.patch similarity index 100% rename from patches/server/0013-Add-command-line-option-to-load-extra-plugin-jars-no.patch rename to patches/unapplied/server/0013-Add-command-line-option-to-load-extra-plugin-jars-no.patch diff --git a/patches/server/0014-Configurable-cactus-bamboo-and-reed-growth-heights.patch b/patches/unapplied/server/0014-Configurable-cactus-bamboo-and-reed-growth-heights.patch similarity index 100% rename from patches/server/0014-Configurable-cactus-bamboo-and-reed-growth-heights.patch rename to patches/unapplied/server/0014-Configurable-cactus-bamboo-and-reed-growth-heights.patch diff --git a/patches/server/0015-Configurable-baby-zombie-movement-speed.patch b/patches/unapplied/server/0015-Configurable-baby-zombie-movement-speed.patch similarity index 100% rename from patches/server/0015-Configurable-baby-zombie-movement-speed.patch rename to patches/unapplied/server/0015-Configurable-baby-zombie-movement-speed.patch diff --git a/patches/server/0016-Configurable-fishing-time-ranges.patch b/patches/unapplied/server/0016-Configurable-fishing-time-ranges.patch similarity index 100% rename from patches/server/0016-Configurable-fishing-time-ranges.patch rename to patches/unapplied/server/0016-Configurable-fishing-time-ranges.patch diff --git a/patches/server/0017-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch b/patches/unapplied/server/0017-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch similarity index 100% rename from patches/server/0017-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch rename to patches/unapplied/server/0017-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch diff --git a/patches/server/0018-Add-configurable-despawn-distances-for-living-entiti.patch b/patches/unapplied/server/0018-Add-configurable-despawn-distances-for-living-entiti.patch similarity index 100% rename from patches/server/0018-Add-configurable-despawn-distances-for-living-entiti.patch rename to patches/unapplied/server/0018-Add-configurable-despawn-distances-for-living-entiti.patch diff --git a/patches/server/0019-Allow-for-toggling-of-spawn-chunks.patch b/patches/unapplied/server/0019-Allow-for-toggling-of-spawn-chunks.patch similarity index 100% rename from patches/server/0019-Allow-for-toggling-of-spawn-chunks.patch rename to patches/unapplied/server/0019-Allow-for-toggling-of-spawn-chunks.patch diff --git a/patches/server/0020-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/patches/unapplied/server/0020-Drop-falling-block-and-tnt-entities-at-the-specified.patch similarity index 100% rename from patches/server/0020-Drop-falling-block-and-tnt-entities-at-the-specified.patch rename to patches/unapplied/server/0020-Drop-falling-block-and-tnt-entities-at-the-specified.patch diff --git a/patches/server/0021-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/unapplied/server/0021-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch similarity index 100% rename from patches/server/0021-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch rename to patches/unapplied/server/0021-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch diff --git a/patches/server/0022-Implement-Paper-VersionChecker.patch b/patches/unapplied/server/0022-Implement-Paper-VersionChecker.patch similarity index 100% rename from patches/server/0022-Implement-Paper-VersionChecker.patch rename to patches/unapplied/server/0022-Implement-Paper-VersionChecker.patch diff --git a/patches/server/0023-Add-version-history-to-version-command.patch b/patches/unapplied/server/0023-Add-version-history-to-version-command.patch similarity index 100% rename from patches/server/0023-Add-version-history-to-version-command.patch rename to patches/unapplied/server/0023-Add-version-history-to-version-command.patch diff --git a/patches/server/0024-Player-affects-spawning-API.patch b/patches/unapplied/server/0024-Player-affects-spawning-API.patch similarity index 100% rename from patches/server/0024-Player-affects-spawning-API.patch rename to patches/unapplied/server/0024-Player-affects-spawning-API.patch diff --git a/patches/server/0025-Further-improve-server-tick-loop.patch b/patches/unapplied/server/0025-Further-improve-server-tick-loop.patch similarity index 100% rename from patches/server/0025-Further-improve-server-tick-loop.patch rename to patches/unapplied/server/0025-Further-improve-server-tick-loop.patch diff --git a/patches/server/0026-Only-refresh-abilities-if-needed.patch b/patches/unapplied/server/0026-Only-refresh-abilities-if-needed.patch similarity index 100% rename from patches/server/0026-Only-refresh-abilities-if-needed.patch rename to patches/unapplied/server/0026-Only-refresh-abilities-if-needed.patch diff --git a/patches/server/0027-Entity-Origin-API.patch b/patches/unapplied/server/0027-Entity-Origin-API.patch similarity index 100% rename from patches/server/0027-Entity-Origin-API.patch rename to patches/unapplied/server/0027-Entity-Origin-API.patch diff --git a/patches/server/0028-Prevent-tile-entity-and-entity-crashes.patch b/patches/unapplied/server/0028-Prevent-tile-entity-and-entity-crashes.patch similarity index 100% rename from patches/server/0028-Prevent-tile-entity-and-entity-crashes.patch rename to patches/unapplied/server/0028-Prevent-tile-entity-and-entity-crashes.patch diff --git a/patches/server/0029-Configurable-top-of-nether-void-damage.patch b/patches/unapplied/server/0029-Configurable-top-of-nether-void-damage.patch similarity index 100% rename from patches/server/0029-Configurable-top-of-nether-void-damage.patch rename to patches/unapplied/server/0029-Configurable-top-of-nether-void-damage.patch diff --git a/patches/server/0030-Check-online-mode-before-converting-and-renaming-pla.patch b/patches/unapplied/server/0030-Check-online-mode-before-converting-and-renaming-pla.patch similarity index 100% rename from patches/server/0030-Check-online-mode-before-converting-and-renaming-pla.patch rename to patches/unapplied/server/0030-Check-online-mode-before-converting-and-renaming-pla.patch diff --git a/patches/server/0031-Always-tick-falling-blocks.patch b/patches/unapplied/server/0031-Always-tick-falling-blocks.patch similarity index 100% rename from patches/server/0031-Always-tick-falling-blocks.patch rename to patches/unapplied/server/0031-Always-tick-falling-blocks.patch diff --git a/patches/server/0032-Configurable-end-credits.patch b/patches/unapplied/server/0032-Configurable-end-credits.patch similarity index 100% rename from patches/server/0032-Configurable-end-credits.patch rename to patches/unapplied/server/0032-Configurable-end-credits.patch diff --git a/patches/server/0033-Fix-lag-from-explosions-processing-dead-entities.patch b/patches/unapplied/server/0033-Fix-lag-from-explosions-processing-dead-entities.patch similarity index 100% rename from patches/server/0033-Fix-lag-from-explosions-processing-dead-entities.patch rename to patches/unapplied/server/0033-Fix-lag-from-explosions-processing-dead-entities.patch diff --git a/patches/server/0034-Optimize-explosions.patch b/patches/unapplied/server/0034-Optimize-explosions.patch similarity index 100% rename from patches/server/0034-Optimize-explosions.patch rename to patches/unapplied/server/0034-Optimize-explosions.patch diff --git a/patches/server/0035-Disable-explosion-knockback.patch b/patches/unapplied/server/0035-Disable-explosion-knockback.patch similarity index 100% rename from patches/server/0035-Disable-explosion-knockback.patch rename to patches/unapplied/server/0035-Disable-explosion-knockback.patch diff --git a/patches/server/0036-Disable-thunder.patch b/patches/unapplied/server/0036-Disable-thunder.patch similarity index 100% rename from patches/server/0036-Disable-thunder.patch rename to patches/unapplied/server/0036-Disable-thunder.patch diff --git a/patches/server/0037-Disable-ice-and-snow.patch b/patches/unapplied/server/0037-Disable-ice-and-snow.patch similarity index 100% rename from patches/server/0037-Disable-ice-and-snow.patch rename to patches/unapplied/server/0037-Disable-ice-and-snow.patch diff --git a/patches/server/0038-Configurable-mob-spawner-tick-rate.patch b/patches/unapplied/server/0038-Configurable-mob-spawner-tick-rate.patch similarity index 100% rename from patches/server/0038-Configurable-mob-spawner-tick-rate.patch rename to patches/unapplied/server/0038-Configurable-mob-spawner-tick-rate.patch diff --git a/patches/server/0039-Implement-PlayerLocaleChangeEvent.patch b/patches/unapplied/server/0039-Implement-PlayerLocaleChangeEvent.patch similarity index 100% rename from patches/server/0039-Implement-PlayerLocaleChangeEvent.patch rename to patches/unapplied/server/0039-Implement-PlayerLocaleChangeEvent.patch diff --git a/patches/server/0040-Per-Player-View-Distance-API-placeholders.patch b/patches/unapplied/server/0040-Per-Player-View-Distance-API-placeholders.patch similarity index 100% rename from patches/server/0040-Per-Player-View-Distance-API-placeholders.patch rename to patches/unapplied/server/0040-Per-Player-View-Distance-API-placeholders.patch diff --git a/patches/server/0041-Add-BeaconEffectEvent.patch b/patches/unapplied/server/0041-Add-BeaconEffectEvent.patch similarity index 100% rename from patches/server/0041-Add-BeaconEffectEvent.patch rename to patches/unapplied/server/0041-Add-BeaconEffectEvent.patch diff --git a/patches/server/0042-Configurable-container-update-tick-rate.patch b/patches/unapplied/server/0042-Configurable-container-update-tick-rate.patch similarity index 100% rename from patches/server/0042-Configurable-container-update-tick-rate.patch rename to patches/unapplied/server/0042-Configurable-container-update-tick-rate.patch diff --git a/patches/server/0043-Use-UserCache-for-player-heads.patch b/patches/unapplied/server/0043-Use-UserCache-for-player-heads.patch similarity index 100% rename from patches/server/0043-Use-UserCache-for-player-heads.patch rename to patches/unapplied/server/0043-Use-UserCache-for-player-heads.patch diff --git a/patches/server/0044-Disable-spigot-tick-limiters.patch b/patches/unapplied/server/0044-Disable-spigot-tick-limiters.patch similarity index 100% rename from patches/server/0044-Disable-spigot-tick-limiters.patch rename to patches/unapplied/server/0044-Disable-spigot-tick-limiters.patch diff --git a/patches/server/0045-Add-PlayerInitialSpawnEvent.patch b/patches/unapplied/server/0045-Add-PlayerInitialSpawnEvent.patch similarity index 100% rename from patches/server/0045-Add-PlayerInitialSpawnEvent.patch rename to patches/unapplied/server/0045-Add-PlayerInitialSpawnEvent.patch diff --git a/patches/server/0046-Configurable-Disabling-Cat-Chest-Detection.patch b/patches/unapplied/server/0046-Configurable-Disabling-Cat-Chest-Detection.patch similarity index 100% rename from patches/server/0046-Configurable-Disabling-Cat-Chest-Detection.patch rename to patches/unapplied/server/0046-Configurable-Disabling-Cat-Chest-Detection.patch diff --git a/patches/server/0047-Ensure-commands-are-not-ran-async.patch b/patches/unapplied/server/0047-Ensure-commands-are-not-ran-async.patch similarity index 100% rename from patches/server/0047-Ensure-commands-are-not-ran-async.patch rename to patches/unapplied/server/0047-Ensure-commands-are-not-ran-async.patch diff --git a/patches/server/0048-All-chunks-are-slime-spawn-chunks-toggle.patch b/patches/unapplied/server/0048-All-chunks-are-slime-spawn-chunks-toggle.patch similarity index 100% rename from patches/server/0048-All-chunks-are-slime-spawn-chunks-toggle.patch rename to patches/unapplied/server/0048-All-chunks-are-slime-spawn-chunks-toggle.patch diff --git a/patches/server/0049-Expose-server-CommandMap.patch b/patches/unapplied/server/0049-Expose-server-CommandMap.patch similarity index 100% rename from patches/server/0049-Expose-server-CommandMap.patch rename to patches/unapplied/server/0049-Expose-server-CommandMap.patch diff --git a/patches/server/0050-Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/unapplied/server/0050-Be-a-bit-more-informative-in-maxHealth-exception.patch similarity index 100% rename from patches/server/0050-Be-a-bit-more-informative-in-maxHealth-exception.patch rename to patches/unapplied/server/0050-Be-a-bit-more-informative-in-maxHealth-exception.patch diff --git a/patches/server/0051-Ensure-inv-drag-is-in-bounds.patch b/patches/unapplied/server/0051-Ensure-inv-drag-is-in-bounds.patch similarity index 100% rename from patches/server/0051-Ensure-inv-drag-is-in-bounds.patch rename to patches/unapplied/server/0051-Ensure-inv-drag-is-in-bounds.patch diff --git a/patches/server/0052-Player-Tab-List-and-Title-APIs.patch b/patches/unapplied/server/0052-Player-Tab-List-and-Title-APIs.patch similarity index 100% rename from patches/server/0052-Player-Tab-List-and-Title-APIs.patch rename to patches/unapplied/server/0052-Player-Tab-List-and-Title-APIs.patch diff --git a/patches/server/0053-Add-configurable-portal-search-radius.patch b/patches/unapplied/server/0053-Add-configurable-portal-search-radius.patch similarity index 100% rename from patches/server/0053-Add-configurable-portal-search-radius.patch rename to patches/unapplied/server/0053-Add-configurable-portal-search-radius.patch diff --git a/patches/server/0054-Add-velocity-warnings.patch b/patches/unapplied/server/0054-Add-velocity-warnings.patch similarity index 100% rename from patches/server/0054-Add-velocity-warnings.patch rename to patches/unapplied/server/0054-Add-velocity-warnings.patch diff --git a/patches/server/0055-Configurable-inter-world-teleportation-safety.patch b/patches/unapplied/server/0055-Configurable-inter-world-teleportation-safety.patch similarity index 100% rename from patches/server/0055-Configurable-inter-world-teleportation-safety.patch rename to patches/unapplied/server/0055-Configurable-inter-world-teleportation-safety.patch diff --git a/patches/server/0056-Add-exception-reporting-event.patch b/patches/unapplied/server/0056-Add-exception-reporting-event.patch similarity index 100% rename from patches/server/0056-Add-exception-reporting-event.patch rename to patches/unapplied/server/0056-Add-exception-reporting-event.patch diff --git a/patches/server/0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/patches/unapplied/server/0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch similarity index 100% rename from patches/server/0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch rename to patches/unapplied/server/0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch diff --git a/patches/server/0058-Disable-Scoreboards-for-non-players-by-default.patch b/patches/unapplied/server/0058-Disable-Scoreboards-for-non-players-by-default.patch similarity index 100% rename from patches/server/0058-Disable-Scoreboards-for-non-players-by-default.patch rename to patches/unapplied/server/0058-Disable-Scoreboards-for-non-players-by-default.patch diff --git a/patches/server/0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/unapplied/server/0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch similarity index 100% rename from patches/server/0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch rename to patches/unapplied/server/0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch diff --git a/patches/server/0060-Chunk-Save-Reattempt.patch b/patches/unapplied/server/0060-Chunk-Save-Reattempt.patch similarity index 100% rename from patches/server/0060-Chunk-Save-Reattempt.patch rename to patches/unapplied/server/0060-Chunk-Save-Reattempt.patch diff --git a/patches/server/0061-Complete-resource-pack-API.patch b/patches/unapplied/server/0061-Complete-resource-pack-API.patch similarity index 100% rename from patches/server/0061-Complete-resource-pack-API.patch rename to patches/unapplied/server/0061-Complete-resource-pack-API.patch diff --git a/patches/server/0062-Default-loading-permissions.yml-before-plugins.patch b/patches/unapplied/server/0062-Default-loading-permissions.yml-before-plugins.patch similarity index 100% rename from patches/server/0062-Default-loading-permissions.yml-before-plugins.patch rename to patches/unapplied/server/0062-Default-loading-permissions.yml-before-plugins.patch diff --git a/patches/server/0063-Allow-Reloading-of-Custom-Permissions.patch b/patches/unapplied/server/0063-Allow-Reloading-of-Custom-Permissions.patch similarity index 100% rename from patches/server/0063-Allow-Reloading-of-Custom-Permissions.patch rename to patches/unapplied/server/0063-Allow-Reloading-of-Custom-Permissions.patch diff --git a/patches/server/0064-Remove-Metadata-on-reload.patch b/patches/unapplied/server/0064-Remove-Metadata-on-reload.patch similarity index 100% rename from patches/server/0064-Remove-Metadata-on-reload.patch rename to patches/unapplied/server/0064-Remove-Metadata-on-reload.patch diff --git a/patches/server/0065-Handle-Item-Meta-Inconsistencies.patch b/patches/unapplied/server/0065-Handle-Item-Meta-Inconsistencies.patch similarity index 100% rename from patches/server/0065-Handle-Item-Meta-Inconsistencies.patch rename to patches/unapplied/server/0065-Handle-Item-Meta-Inconsistencies.patch diff --git a/patches/server/0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/unapplied/server/0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch similarity index 100% rename from patches/server/0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch rename to patches/unapplied/server/0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch diff --git a/patches/server/0067-Add-World-Util-Methods.patch b/patches/unapplied/server/0067-Add-World-Util-Methods.patch similarity index 100% rename from patches/server/0067-Add-World-Util-Methods.patch rename to patches/unapplied/server/0067-Add-World-Util-Methods.patch diff --git a/patches/server/0068-Custom-replacement-for-eaten-items.patch b/patches/unapplied/server/0068-Custom-replacement-for-eaten-items.patch similarity index 100% rename from patches/server/0068-Custom-replacement-for-eaten-items.patch rename to patches/unapplied/server/0068-Custom-replacement-for-eaten-items.patch diff --git a/patches/server/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/unapplied/server/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch similarity index 100% rename from patches/server/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch rename to patches/unapplied/server/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch diff --git a/patches/server/0070-Use-a-Shared-Random-for-Entities.patch b/patches/unapplied/server/0070-Use-a-Shared-Random-for-Entities.patch similarity index 100% rename from patches/server/0070-Use-a-Shared-Random-for-Entities.patch rename to patches/unapplied/server/0070-Use-a-Shared-Random-for-Entities.patch diff --git a/patches/server/0071-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/unapplied/server/0071-Configurable-spawn-chances-for-skeleton-horses.patch similarity index 100% rename from patches/server/0071-Configurable-spawn-chances-for-skeleton-horses.patch rename to patches/unapplied/server/0071-Configurable-spawn-chances-for-skeleton-horses.patch diff --git a/patches/server/0072-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/unapplied/server/0072-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch similarity index 100% rename from patches/server/0072-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch rename to patches/unapplied/server/0072-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch diff --git a/patches/server/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/unapplied/server/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch similarity index 100% rename from patches/server/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch rename to patches/unapplied/server/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch diff --git a/patches/server/0074-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/unapplied/server/0074-Entity-AddTo-RemoveFrom-World-Events.patch similarity index 100% rename from patches/server/0074-Entity-AddTo-RemoveFrom-World-Events.patch rename to patches/unapplied/server/0074-Entity-AddTo-RemoveFrom-World-Events.patch diff --git a/patches/server/0075-Configurable-Chunk-Inhabited-Time.patch b/patches/unapplied/server/0075-Configurable-Chunk-Inhabited-Time.patch similarity index 100% rename from patches/server/0075-Configurable-Chunk-Inhabited-Time.patch rename to patches/unapplied/server/0075-Configurable-Chunk-Inhabited-Time.patch diff --git a/patches/server/0076-EntityPathfindEvent.patch b/patches/unapplied/server/0076-EntityPathfindEvent.patch similarity index 100% rename from patches/server/0076-EntityPathfindEvent.patch rename to patches/unapplied/server/0076-EntityPathfindEvent.patch diff --git a/patches/server/0077-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/unapplied/server/0077-Sanitise-RegionFileCache-and-make-configurable.patch similarity index 100% rename from patches/server/0077-Sanitise-RegionFileCache-and-make-configurable.patch rename to patches/unapplied/server/0077-Sanitise-RegionFileCache-and-make-configurable.patch diff --git a/patches/server/0078-Do-not-load-chunks-for-Pathfinding.patch b/patches/unapplied/server/0078-Do-not-load-chunks-for-Pathfinding.patch similarity index 100% rename from patches/server/0078-Do-not-load-chunks-for-Pathfinding.patch rename to patches/unapplied/server/0078-Do-not-load-chunks-for-Pathfinding.patch diff --git a/patches/server/0079-Add-PlayerUseUnknownEntityEvent.patch b/patches/unapplied/server/0079-Add-PlayerUseUnknownEntityEvent.patch similarity index 100% rename from patches/server/0079-Add-PlayerUseUnknownEntityEvent.patch rename to patches/unapplied/server/0079-Add-PlayerUseUnknownEntityEvent.patch diff --git a/patches/server/0080-Configurable-Grass-Spread-Tick-Rate.patch b/patches/unapplied/server/0080-Configurable-Grass-Spread-Tick-Rate.patch similarity index 100% rename from patches/server/0080-Configurable-Grass-Spread-Tick-Rate.patch rename to patches/unapplied/server/0080-Configurable-Grass-Spread-Tick-Rate.patch diff --git a/patches/server/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/unapplied/server/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch similarity index 100% rename from patches/server/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch rename to patches/unapplied/server/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch diff --git a/patches/server/0082-Optimize-DataBits.patch b/patches/unapplied/server/0082-Optimize-DataBits.patch similarity index 100% rename from patches/server/0082-Optimize-DataBits.patch rename to patches/unapplied/server/0082-Optimize-DataBits.patch diff --git a/patches/server/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/unapplied/server/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch similarity index 100% rename from patches/server/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch rename to patches/unapplied/server/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch diff --git a/patches/server/0084-Configurable-Player-Collision.patch b/patches/unapplied/server/0084-Configurable-Player-Collision.patch similarity index 100% rename from patches/server/0084-Configurable-Player-Collision.patch rename to patches/unapplied/server/0084-Configurable-Player-Collision.patch diff --git a/patches/server/0085-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/unapplied/server/0085-Add-handshake-event-to-allow-plugins-to-handle-clien.patch similarity index 100% rename from patches/server/0085-Add-handshake-event-to-allow-plugins-to-handle-clien.patch rename to patches/unapplied/server/0085-Add-handshake-event-to-allow-plugins-to-handle-clien.patch diff --git a/patches/server/0086-Configurable-RCON-IP-address.patch b/patches/unapplied/server/0086-Configurable-RCON-IP-address.patch similarity index 100% rename from patches/server/0086-Configurable-RCON-IP-address.patch rename to patches/unapplied/server/0086-Configurable-RCON-IP-address.patch diff --git a/patches/server/0087-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/unapplied/server/0087-EntityRegainHealthEvent-isFastRegen-API.patch similarity index 100% rename from patches/server/0087-EntityRegainHealthEvent-isFastRegen-API.patch rename to patches/unapplied/server/0087-EntityRegainHealthEvent-isFastRegen-API.patch diff --git a/patches/server/0088-Add-ability-to-configure-frosted_ice-properties.patch b/patches/unapplied/server/0088-Add-ability-to-configure-frosted_ice-properties.patch similarity index 100% rename from patches/server/0088-Add-ability-to-configure-frosted_ice-properties.patch rename to patches/unapplied/server/0088-Add-ability-to-configure-frosted_ice-properties.patch diff --git a/patches/server/0089-remove-null-possibility-for-getServer-singleton.patch b/patches/unapplied/server/0089-remove-null-possibility-for-getServer-singleton.patch similarity index 100% rename from patches/server/0089-remove-null-possibility-for-getServer-singleton.patch rename to patches/unapplied/server/0089-remove-null-possibility-for-getServer-singleton.patch diff --git a/patches/server/0090-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/unapplied/server/0090-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch similarity index 100% rename from patches/server/0090-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch rename to patches/unapplied/server/0090-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch diff --git a/patches/server/0091-LootTable-API-Replenishable-Lootables-Feature.patch b/patches/unapplied/server/0091-LootTable-API-Replenishable-Lootables-Feature.patch similarity index 100% rename from patches/server/0091-LootTable-API-Replenishable-Lootables-Feature.patch rename to patches/unapplied/server/0091-LootTable-API-Replenishable-Lootables-Feature.patch diff --git a/patches/server/0092-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/unapplied/server/0092-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch similarity index 100% rename from patches/server/0092-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch rename to patches/unapplied/server/0092-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch diff --git a/patches/server/0093-System-property-for-disabling-watchdoge.patch b/patches/unapplied/server/0093-System-property-for-disabling-watchdoge.patch similarity index 100% rename from patches/server/0093-System-property-for-disabling-watchdoge.patch rename to patches/unapplied/server/0093-System-property-for-disabling-watchdoge.patch diff --git a/patches/server/0094-Async-GameProfileCache-saving.patch b/patches/unapplied/server/0094-Async-GameProfileCache-saving.patch similarity index 100% rename from patches/server/0094-Async-GameProfileCache-saving.patch rename to patches/unapplied/server/0094-Async-GameProfileCache-saving.patch diff --git a/patches/server/0095-Optional-TNT-doesn-t-move-in-water.patch b/patches/unapplied/server/0095-Optional-TNT-doesn-t-move-in-water.patch similarity index 100% rename from patches/server/0095-Optional-TNT-doesn-t-move-in-water.patch rename to patches/unapplied/server/0095-Optional-TNT-doesn-t-move-in-water.patch diff --git a/patches/server/0096-Faster-redstone-torch-rapid-clock-removal.patch b/patches/unapplied/server/0096-Faster-redstone-torch-rapid-clock-removal.patch similarity index 100% rename from patches/server/0096-Faster-redstone-torch-rapid-clock-removal.patch rename to patches/unapplied/server/0096-Faster-redstone-torch-rapid-clock-removal.patch diff --git a/patches/server/0097-Add-server-name-parameter.patch b/patches/unapplied/server/0097-Add-server-name-parameter.patch similarity index 100% rename from patches/server/0097-Add-server-name-parameter.patch rename to patches/unapplied/server/0097-Add-server-name-parameter.patch diff --git a/patches/server/0098-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/patches/unapplied/server/0098-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch similarity index 100% rename from patches/server/0098-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch rename to patches/unapplied/server/0098-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch diff --git a/patches/server/0099-Fix-Old-Sign-Conversion.patch b/patches/unapplied/server/0099-Fix-Old-Sign-Conversion.patch similarity index 100% rename from patches/server/0099-Fix-Old-Sign-Conversion.patch rename to patches/unapplied/server/0099-Fix-Old-Sign-Conversion.patch diff --git a/patches/server/0100-Avoid-blocking-on-Network-Manager-creation.patch b/patches/unapplied/server/0100-Avoid-blocking-on-Network-Manager-creation.patch similarity index 100% rename from patches/server/0100-Avoid-blocking-on-Network-Manager-creation.patch rename to patches/unapplied/server/0100-Avoid-blocking-on-Network-Manager-creation.patch diff --git a/patches/server/0101-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/unapplied/server/0101-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch similarity index 100% rename from patches/server/0101-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch rename to patches/unapplied/server/0101-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch diff --git a/patches/server/0102-Add-setting-for-proxy-online-mode-status.patch b/patches/unapplied/server/0102-Add-setting-for-proxy-online-mode-status.patch similarity index 100% rename from patches/server/0102-Add-setting-for-proxy-online-mode-status.patch rename to patches/unapplied/server/0102-Add-setting-for-proxy-online-mode-status.patch diff --git a/patches/server/0103-Optimise-BlockState-s-hashCode-equals.patch b/patches/unapplied/server/0103-Optimise-BlockState-s-hashCode-equals.patch similarity index 100% rename from patches/server/0103-Optimise-BlockState-s-hashCode-equals.patch rename to patches/unapplied/server/0103-Optimise-BlockState-s-hashCode-equals.patch diff --git a/patches/server/0104-Configurable-packet-in-spam-threshold.patch b/patches/unapplied/server/0104-Configurable-packet-in-spam-threshold.patch similarity index 100% rename from patches/server/0104-Configurable-packet-in-spam-threshold.patch rename to patches/unapplied/server/0104-Configurable-packet-in-spam-threshold.patch diff --git a/patches/server/0105-Configurable-flying-kick-messages.patch b/patches/unapplied/server/0105-Configurable-flying-kick-messages.patch similarity index 100% rename from patches/server/0105-Configurable-flying-kick-messages.patch rename to patches/unapplied/server/0105-Configurable-flying-kick-messages.patch diff --git a/patches/server/0106-Add-EntityZapEvent.patch b/patches/unapplied/server/0106-Add-EntityZapEvent.patch similarity index 100% rename from patches/server/0106-Add-EntityZapEvent.patch rename to patches/unapplied/server/0106-Add-EntityZapEvent.patch diff --git a/patches/server/0107-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/patches/unapplied/server/0107-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch similarity index 100% rename from patches/server/0107-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch rename to patches/unapplied/server/0107-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch diff --git a/patches/server/0108-Cache-user-authenticator-threads.patch b/patches/unapplied/server/0108-Cache-user-authenticator-threads.patch similarity index 100% rename from patches/server/0108-Cache-user-authenticator-threads.patch rename to patches/unapplied/server/0108-Cache-user-authenticator-threads.patch diff --git a/patches/server/0109-Allow-Reloading-of-Command-Aliases.patch b/patches/unapplied/server/0109-Allow-Reloading-of-Command-Aliases.patch similarity index 100% rename from patches/server/0109-Allow-Reloading-of-Command-Aliases.patch rename to patches/unapplied/server/0109-Allow-Reloading-of-Command-Aliases.patch diff --git a/patches/server/0110-Add-source-to-PlayerExpChangeEvent.patch b/patches/unapplied/server/0110-Add-source-to-PlayerExpChangeEvent.patch similarity index 100% rename from patches/server/0110-Add-source-to-PlayerExpChangeEvent.patch rename to patches/unapplied/server/0110-Add-source-to-PlayerExpChangeEvent.patch diff --git a/patches/server/0111-Add-ProjectileCollideEvent.patch b/patches/unapplied/server/0111-Add-ProjectileCollideEvent.patch similarity index 100% rename from patches/server/0111-Add-ProjectileCollideEvent.patch rename to patches/unapplied/server/0111-Add-ProjectileCollideEvent.patch diff --git a/patches/server/0112-Prevent-Pathfinding-out-of-World-Border.patch b/patches/unapplied/server/0112-Prevent-Pathfinding-out-of-World-Border.patch similarity index 100% rename from patches/server/0112-Prevent-Pathfinding-out-of-World-Border.patch rename to patches/unapplied/server/0112-Prevent-Pathfinding-out-of-World-Border.patch diff --git a/patches/server/0113-Optimize-World.isLoaded-BlockPosition-Z.patch b/patches/unapplied/server/0113-Optimize-World.isLoaded-BlockPosition-Z.patch similarity index 100% rename from patches/server/0113-Optimize-World.isLoaded-BlockPosition-Z.patch rename to patches/unapplied/server/0113-Optimize-World.isLoaded-BlockPosition-Z.patch diff --git a/patches/server/0114-Bound-Treasure-Maps-to-World-Border.patch b/patches/unapplied/server/0114-Bound-Treasure-Maps-to-World-Border.patch similarity index 100% rename from patches/server/0114-Bound-Treasure-Maps-to-World-Border.patch rename to patches/unapplied/server/0114-Bound-Treasure-Maps-to-World-Border.patch diff --git a/patches/server/0115-Configurable-Cartographer-Treasure-Maps.patch b/patches/unapplied/server/0115-Configurable-Cartographer-Treasure-Maps.patch similarity index 100% rename from patches/server/0115-Configurable-Cartographer-Treasure-Maps.patch rename to patches/unapplied/server/0115-Configurable-Cartographer-Treasure-Maps.patch diff --git a/patches/server/0116-Optimize-ItemStack.isEmpty.patch b/patches/unapplied/server/0116-Optimize-ItemStack.isEmpty.patch similarity index 100% rename from patches/server/0116-Optimize-ItemStack.isEmpty.patch rename to patches/unapplied/server/0116-Optimize-ItemStack.isEmpty.patch diff --git a/patches/server/0117-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/unapplied/server/0117-Add-API-methods-to-control-if-armour-stands-can-move.patch similarity index 100% rename from patches/server/0117-Add-API-methods-to-control-if-armour-stands-can-move.patch rename to patches/unapplied/server/0117-Add-API-methods-to-control-if-armour-stands-can-move.patch diff --git a/patches/server/0118-String-based-Action-Bar-API.patch b/patches/unapplied/server/0118-String-based-Action-Bar-API.patch similarity index 100% rename from patches/server/0118-String-based-Action-Bar-API.patch rename to patches/unapplied/server/0118-String-based-Action-Bar-API.patch diff --git a/patches/server/0119-Properly-fix-item-duplication-bug.patch b/patches/unapplied/server/0119-Properly-fix-item-duplication-bug.patch similarity index 100% rename from patches/server/0119-Properly-fix-item-duplication-bug.patch rename to patches/unapplied/server/0119-Properly-fix-item-duplication-bug.patch diff --git a/patches/server/0120-Firework-API-s.patch b/patches/unapplied/server/0120-Firework-API-s.patch similarity index 100% rename from patches/server/0120-Firework-API-s.patch rename to patches/unapplied/server/0120-Firework-API-s.patch diff --git a/patches/server/0121-PlayerTeleportEndGatewayEvent.patch b/patches/unapplied/server/0121-PlayerTeleportEndGatewayEvent.patch similarity index 100% rename from patches/server/0121-PlayerTeleportEndGatewayEvent.patch rename to patches/unapplied/server/0121-PlayerTeleportEndGatewayEvent.patch diff --git a/patches/server/0122-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/unapplied/server/0122-Provide-E-TE-Chunk-count-stat-methods.patch similarity index 100% rename from patches/server/0122-Provide-E-TE-Chunk-count-stat-methods.patch rename to patches/unapplied/server/0122-Provide-E-TE-Chunk-count-stat-methods.patch diff --git a/patches/server/0123-Enforce-Sync-Player-Saves.patch b/patches/unapplied/server/0123-Enforce-Sync-Player-Saves.patch similarity index 100% rename from patches/server/0123-Enforce-Sync-Player-Saves.patch rename to patches/unapplied/server/0123-Enforce-Sync-Player-Saves.patch diff --git a/patches/server/0124-Don-t-allow-entities-to-ride-themselves-572.patch b/patches/unapplied/server/0124-Don-t-allow-entities-to-ride-themselves-572.patch similarity index 100% rename from patches/server/0124-Don-t-allow-entities-to-ride-themselves-572.patch rename to patches/unapplied/server/0124-Don-t-allow-entities-to-ride-themselves-572.patch diff --git a/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/unapplied/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch similarity index 100% rename from patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch rename to patches/unapplied/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch diff --git a/patches/server/0126-Cap-Entity-Collisions.patch b/patches/unapplied/server/0126-Cap-Entity-Collisions.patch similarity index 100% rename from patches/server/0126-Cap-Entity-Collisions.patch rename to patches/unapplied/server/0126-Cap-Entity-Collisions.patch diff --git a/patches/server/0127-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/unapplied/server/0127-Remove-CraftScheduler-Async-Task-Debugger.patch similarity index 100% rename from patches/server/0127-Remove-CraftScheduler-Async-Task-Debugger.patch rename to patches/unapplied/server/0127-Remove-CraftScheduler-Async-Task-Debugger.patch diff --git a/patches/server/0128-Do-not-let-armorstands-drown.patch b/patches/unapplied/server/0128-Do-not-let-armorstands-drown.patch similarity index 100% rename from patches/server/0128-Do-not-let-armorstands-drown.patch rename to patches/unapplied/server/0128-Do-not-let-armorstands-drown.patch diff --git a/patches/server/0129-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/patches/unapplied/server/0129-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch similarity index 100% rename from patches/server/0129-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch rename to patches/unapplied/server/0129-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch diff --git a/patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch b/patches/unapplied/server/0130-Properly-handle-async-calls-to-restart-the-server.patch similarity index 100% rename from patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch rename to patches/unapplied/server/0130-Properly-handle-async-calls-to-restart-the-server.patch diff --git a/patches/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/unapplied/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch similarity index 100% rename from patches/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch rename to patches/unapplied/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch diff --git a/patches/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/unapplied/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch similarity index 100% rename from patches/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch rename to patches/unapplied/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch diff --git a/patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/unapplied/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch similarity index 100% rename from patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch rename to patches/unapplied/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch diff --git a/patches/server/0134-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/unapplied/server/0134-provide-a-configurable-option-to-disable-creeper-lin.patch similarity index 100% rename from patches/server/0134-provide-a-configurable-option-to-disable-creeper-lin.patch rename to patches/unapplied/server/0134-provide-a-configurable-option-to-disable-creeper-lin.patch diff --git a/patches/server/0135-Item-canEntityPickup.patch b/patches/unapplied/server/0135-Item-canEntityPickup.patch similarity index 100% rename from patches/server/0135-Item-canEntityPickup.patch rename to patches/unapplied/server/0135-Item-canEntityPickup.patch diff --git a/patches/server/0136-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/unapplied/server/0136-PlayerPickupItemEvent-setFlyAtPlayer.patch similarity index 100% rename from patches/server/0136-PlayerPickupItemEvent-setFlyAtPlayer.patch rename to patches/unapplied/server/0136-PlayerPickupItemEvent-setFlyAtPlayer.patch diff --git a/patches/server/0137-PlayerAttemptPickupItemEvent.patch b/patches/unapplied/server/0137-PlayerAttemptPickupItemEvent.patch similarity index 100% rename from patches/server/0137-PlayerAttemptPickupItemEvent.patch rename to patches/unapplied/server/0137-PlayerAttemptPickupItemEvent.patch diff --git a/patches/server/0138-Add-UnknownCommandEvent.patch b/patches/unapplied/server/0138-Add-UnknownCommandEvent.patch similarity index 100% rename from patches/server/0138-Add-UnknownCommandEvent.patch rename to patches/unapplied/server/0138-Add-UnknownCommandEvent.patch diff --git a/patches/server/0139-Basic-PlayerProfile-API.patch b/patches/unapplied/server/0139-Basic-PlayerProfile-API.patch similarity index 100% rename from patches/server/0139-Basic-PlayerProfile-API.patch rename to patches/unapplied/server/0139-Basic-PlayerProfile-API.patch diff --git a/patches/server/0140-Shoulder-Entities-Release-API.patch b/patches/unapplied/server/0140-Shoulder-Entities-Release-API.patch similarity index 100% rename from patches/server/0140-Shoulder-Entities-Release-API.patch rename to patches/unapplied/server/0140-Shoulder-Entities-Release-API.patch diff --git a/patches/server/0141-Profile-Lookup-Events.patch b/patches/unapplied/server/0141-Profile-Lookup-Events.patch similarity index 100% rename from patches/server/0141-Profile-Lookup-Events.patch rename to patches/unapplied/server/0141-Profile-Lookup-Events.patch diff --git a/patches/server/0142-Block-player-logins-during-server-shutdown.patch b/patches/unapplied/server/0142-Block-player-logins-during-server-shutdown.patch similarity index 100% rename from patches/server/0142-Block-player-logins-during-server-shutdown.patch rename to patches/unapplied/server/0142-Block-player-logins-during-server-shutdown.patch diff --git a/patches/server/0143-Entity-fromMobSpawner.patch b/patches/unapplied/server/0143-Entity-fromMobSpawner.patch similarity index 100% rename from patches/server/0143-Entity-fromMobSpawner.patch rename to patches/unapplied/server/0143-Entity-fromMobSpawner.patch diff --git a/patches/server/0144-Improve-the-Saddle-API-for-Horses.patch b/patches/unapplied/server/0144-Improve-the-Saddle-API-for-Horses.patch similarity index 100% rename from patches/server/0144-Improve-the-Saddle-API-for-Horses.patch rename to patches/unapplied/server/0144-Improve-the-Saddle-API-for-Horses.patch diff --git a/patches/server/0145-Implement-ensureServerConversions-API.patch b/patches/unapplied/server/0145-Implement-ensureServerConversions-API.patch similarity index 100% rename from patches/server/0145-Implement-ensureServerConversions-API.patch rename to patches/unapplied/server/0145-Implement-ensureServerConversions-API.patch diff --git a/patches/server/0146-Implement-getI18NDisplayName.patch b/patches/unapplied/server/0146-Implement-getI18NDisplayName.patch similarity index 100% rename from patches/server/0146-Implement-getI18NDisplayName.patch rename to patches/unapplied/server/0146-Implement-getI18NDisplayName.patch diff --git a/patches/server/0147-ProfileWhitelistVerifyEvent.patch b/patches/unapplied/server/0147-ProfileWhitelistVerifyEvent.patch similarity index 100% rename from patches/server/0147-ProfileWhitelistVerifyEvent.patch rename to patches/unapplied/server/0147-ProfileWhitelistVerifyEvent.patch diff --git a/patches/server/0148-Fix-this-stupid-bullshit.patch b/patches/unapplied/server/0148-Fix-this-stupid-bullshit.patch similarity index 100% rename from patches/server/0148-Fix-this-stupid-bullshit.patch rename to patches/unapplied/server/0148-Fix-this-stupid-bullshit.patch diff --git a/patches/server/0149-LivingEntity-setKiller.patch b/patches/unapplied/server/0149-LivingEntity-setKiller.patch similarity index 100% rename from patches/server/0149-LivingEntity-setKiller.patch rename to patches/unapplied/server/0149-LivingEntity-setKiller.patch diff --git a/patches/server/0150-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/unapplied/server/0150-Ocelot-despawns-should-honor-nametags-and-leash.patch similarity index 100% rename from patches/server/0150-Ocelot-despawns-should-honor-nametags-and-leash.patch rename to patches/unapplied/server/0150-Ocelot-despawns-should-honor-nametags-and-leash.patch diff --git a/patches/server/0151-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/unapplied/server/0151-Reset-spawner-timer-when-spawner-event-is-cancelled.patch similarity index 100% rename from patches/server/0151-Reset-spawner-timer-when-spawner-event-is-cancelled.patch rename to patches/unapplied/server/0151-Reset-spawner-timer-when-spawner-event-is-cancelled.patch diff --git a/patches/server/0152-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/unapplied/server/0152-Allow-specifying-a-custom-authentication-servers-dow.patch similarity index 100% rename from patches/server/0152-Allow-specifying-a-custom-authentication-servers-dow.patch rename to patches/unapplied/server/0152-Allow-specifying-a-custom-authentication-servers-dow.patch diff --git a/patches/server/0153-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/unapplied/server/0153-Handle-plugin-prefixes-using-Log4J-configuration.patch similarity index 100% rename from patches/server/0153-Handle-plugin-prefixes-using-Log4J-configuration.patch rename to patches/unapplied/server/0153-Handle-plugin-prefixes-using-Log4J-configuration.patch diff --git a/patches/server/0154-Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/unapplied/server/0154-Improve-Log4J-Configuration-Plugin-Loggers.patch similarity index 100% rename from patches/server/0154-Improve-Log4J-Configuration-Plugin-Loggers.patch rename to patches/unapplied/server/0154-Improve-Log4J-Configuration-Plugin-Loggers.patch diff --git a/patches/server/0155-Add-PlayerJumpEvent.patch b/patches/unapplied/server/0155-Add-PlayerJumpEvent.patch similarity index 100% rename from patches/server/0155-Add-PlayerJumpEvent.patch rename to patches/unapplied/server/0155-Add-PlayerJumpEvent.patch diff --git a/patches/server/0156-handle-PacketPlayInKeepAlive-async.patch b/patches/unapplied/server/0156-handle-PacketPlayInKeepAlive-async.patch similarity index 100% rename from patches/server/0156-handle-PacketPlayInKeepAlive-async.patch rename to patches/unapplied/server/0156-handle-PacketPlayInKeepAlive-async.patch diff --git a/patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch b/patches/unapplied/server/0157-Expose-client-protocol-version-and-virtual-host.patch similarity index 100% rename from patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch rename to patches/unapplied/server/0157-Expose-client-protocol-version-and-virtual-host.patch diff --git a/patches/server/0158-revert-serverside-behavior-of-keepalives.patch b/patches/unapplied/server/0158-revert-serverside-behavior-of-keepalives.patch similarity index 100% rename from patches/server/0158-revert-serverside-behavior-of-keepalives.patch rename to patches/unapplied/server/0158-revert-serverside-behavior-of-keepalives.patch diff --git a/patches/server/0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/unapplied/server/0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch similarity index 100% rename from patches/server/0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch rename to patches/unapplied/server/0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch diff --git a/patches/server/0160-Add-PlayerArmorChangeEvent.patch b/patches/unapplied/server/0160-Add-PlayerArmorChangeEvent.patch similarity index 100% rename from patches/server/0160-Add-PlayerArmorChangeEvent.patch rename to patches/unapplied/server/0160-Add-PlayerArmorChangeEvent.patch diff --git a/patches/server/0161-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/unapplied/server/0161-Prevent-logins-from-being-processed-when-the-player-.patch similarity index 100% rename from patches/server/0161-Prevent-logins-from-being-processed-when-the-player-.patch rename to patches/unapplied/server/0161-Prevent-logins-from-being-processed-when-the-player-.patch diff --git a/patches/server/0162-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/patches/unapplied/server/0162-Fix-MC-117075-TE-Unload-Lag-Spike.patch similarity index 100% rename from patches/server/0162-Fix-MC-117075-TE-Unload-Lag-Spike.patch rename to patches/unapplied/server/0162-Fix-MC-117075-TE-Unload-Lag-Spike.patch diff --git a/patches/server/0163-use-CB-BlockState-implementations-for-captured-block.patch b/patches/unapplied/server/0163-use-CB-BlockState-implementations-for-captured-block.patch similarity index 100% rename from patches/server/0163-use-CB-BlockState-implementations-for-captured-block.patch rename to patches/unapplied/server/0163-use-CB-BlockState-implementations-for-captured-block.patch diff --git a/patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/unapplied/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch similarity index 100% rename from patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch rename to patches/unapplied/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch diff --git a/patches/server/0165-AsyncTabCompleteEvent.patch b/patches/unapplied/server/0165-AsyncTabCompleteEvent.patch similarity index 100% rename from patches/server/0165-AsyncTabCompleteEvent.patch rename to patches/unapplied/server/0165-AsyncTabCompleteEvent.patch diff --git a/patches/server/0166-PlayerPickupExperienceEvent.patch b/patches/unapplied/server/0166-PlayerPickupExperienceEvent.patch similarity index 100% rename from patches/server/0166-PlayerPickupExperienceEvent.patch rename to patches/unapplied/server/0166-PlayerPickupExperienceEvent.patch diff --git a/patches/server/0167-Ability-to-apply-mending-to-XP-API.patch b/patches/unapplied/server/0167-Ability-to-apply-mending-to-XP-API.patch similarity index 100% rename from patches/server/0167-Ability-to-apply-mending-to-XP-API.patch rename to patches/unapplied/server/0167-Ability-to-apply-mending-to-XP-API.patch diff --git a/patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch b/patches/unapplied/server/0168-PlayerNaturallySpawnCreaturesEvent.patch similarity index 100% rename from patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch rename to patches/unapplied/server/0168-PlayerNaturallySpawnCreaturesEvent.patch diff --git a/patches/server/0169-PreCreatureSpawnEvent.patch b/patches/unapplied/server/0169-PreCreatureSpawnEvent.patch similarity index 100% rename from patches/server/0169-PreCreatureSpawnEvent.patch rename to patches/unapplied/server/0169-PreCreatureSpawnEvent.patch diff --git a/patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch b/patches/unapplied/server/0170-Add-setPlayerProfile-API-for-Skulls.patch similarity index 100% rename from patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch rename to patches/unapplied/server/0170-Add-setPlayerProfile-API-for-Skulls.patch diff --git a/patches/server/0171-Fill-Profile-Property-Events.patch b/patches/unapplied/server/0171-Fill-Profile-Property-Events.patch similarity index 100% rename from patches/server/0171-Fill-Profile-Property-Events.patch rename to patches/unapplied/server/0171-Fill-Profile-Property-Events.patch diff --git a/patches/server/0172-PlayerAdvancementCriterionGrantEvent.patch b/patches/unapplied/server/0172-PlayerAdvancementCriterionGrantEvent.patch similarity index 100% rename from patches/server/0172-PlayerAdvancementCriterionGrantEvent.patch rename to patches/unapplied/server/0172-PlayerAdvancementCriterionGrantEvent.patch diff --git a/patches/server/0173-Add-ArmorStand-Item-Meta.patch b/patches/unapplied/server/0173-Add-ArmorStand-Item-Meta.patch similarity index 100% rename from patches/server/0173-Add-ArmorStand-Item-Meta.patch rename to patches/unapplied/server/0173-Add-ArmorStand-Item-Meta.patch diff --git a/patches/server/0174-Extend-Player-Interact-cancellation.patch b/patches/unapplied/server/0174-Extend-Player-Interact-cancellation.patch similarity index 100% rename from patches/server/0174-Extend-Player-Interact-cancellation.patch rename to patches/unapplied/server/0174-Extend-Player-Interact-cancellation.patch diff --git a/patches/server/0175-Tameable-getOwnerUniqueId-API.patch b/patches/unapplied/server/0175-Tameable-getOwnerUniqueId-API.patch similarity index 100% rename from patches/server/0175-Tameable-getOwnerUniqueId-API.patch rename to patches/unapplied/server/0175-Tameable-getOwnerUniqueId-API.patch diff --git a/patches/server/0176-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/patches/unapplied/server/0176-Toggleable-player-crits-helps-mitigate-hacked-client.patch similarity index 100% rename from patches/server/0176-Toggleable-player-crits-helps-mitigate-hacked-client.patch rename to patches/unapplied/server/0176-Toggleable-player-crits-helps-mitigate-hacked-client.patch diff --git a/patches/server/0177-Disable-Explicit-Network-Manager-Flushing.patch b/patches/unapplied/server/0177-Disable-Explicit-Network-Manager-Flushing.patch similarity index 100% rename from patches/server/0177-Disable-Explicit-Network-Manager-Flushing.patch rename to patches/unapplied/server/0177-Disable-Explicit-Network-Manager-Flushing.patch diff --git a/patches/server/0178-Implement-extended-PaperServerListPingEvent.patch b/patches/unapplied/server/0178-Implement-extended-PaperServerListPingEvent.patch similarity index 100% rename from patches/server/0178-Implement-extended-PaperServerListPingEvent.patch rename to patches/unapplied/server/0178-Implement-extended-PaperServerListPingEvent.patch diff --git a/patches/server/0179-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/unapplied/server/0179-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch similarity index 100% rename from patches/server/0179-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch rename to patches/unapplied/server/0179-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch diff --git a/patches/server/0180-Player.setPlayerProfile-API.patch b/patches/unapplied/server/0180-Player.setPlayerProfile-API.patch similarity index 100% rename from patches/server/0180-Player.setPlayerProfile-API.patch rename to patches/unapplied/server/0180-Player.setPlayerProfile-API.patch diff --git a/patches/server/0181-getPlayerUniqueId-API.patch b/patches/unapplied/server/0181-getPlayerUniqueId-API.patch similarity index 100% rename from patches/server/0181-getPlayerUniqueId-API.patch rename to patches/unapplied/server/0181-getPlayerUniqueId-API.patch diff --git a/patches/server/0182-Improved-Async-Task-Scheduler.patch b/patches/unapplied/server/0182-Improved-Async-Task-Scheduler.patch similarity index 100% rename from patches/server/0182-Improved-Async-Task-Scheduler.patch rename to patches/unapplied/server/0182-Improved-Async-Task-Scheduler.patch diff --git a/patches/server/0183-Upstream-config-migrations.patch b/patches/unapplied/server/0183-Upstream-config-migrations.patch similarity index 100% rename from patches/server/0183-Upstream-config-migrations.patch rename to patches/unapplied/server/0183-Upstream-config-migrations.patch diff --git a/patches/server/0184-Make-legacy-ping-handler-more-reliable.patch b/patches/unapplied/server/0184-Make-legacy-ping-handler-more-reliable.patch similarity index 100% rename from patches/server/0184-Make-legacy-ping-handler-more-reliable.patch rename to patches/unapplied/server/0184-Make-legacy-ping-handler-more-reliable.patch diff --git a/patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/unapplied/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch similarity index 100% rename from patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch rename to patches/unapplied/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch diff --git a/patches/server/0186-Flag-to-disable-the-channel-limit.patch b/patches/unapplied/server/0186-Flag-to-disable-the-channel-limit.patch similarity index 100% rename from patches/server/0186-Flag-to-disable-the-channel-limit.patch rename to patches/unapplied/server/0186-Flag-to-disable-the-channel-limit.patch diff --git a/patches/server/0187-Add-openSign-method-to-HumanEntity.patch b/patches/unapplied/server/0187-Add-openSign-method-to-HumanEntity.patch similarity index 100% rename from patches/server/0187-Add-openSign-method-to-HumanEntity.patch rename to patches/unapplied/server/0187-Add-openSign-method-to-HumanEntity.patch diff --git a/patches/server/0188-Configurable-sprint-interruption-on-attack.patch b/patches/unapplied/server/0188-Configurable-sprint-interruption-on-attack.patch similarity index 100% rename from patches/server/0188-Configurable-sprint-interruption-on-attack.patch rename to patches/unapplied/server/0188-Configurable-sprint-interruption-on-attack.patch diff --git a/patches/server/0189-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/unapplied/server/0189-Fix-exploit-that-allowed-colored-signs-to-be-created.patch similarity index 100% rename from patches/server/0189-Fix-exploit-that-allowed-colored-signs-to-be-created.patch rename to patches/unapplied/server/0189-Fix-exploit-that-allowed-colored-signs-to-be-created.patch diff --git a/patches/server/0190-EndermanEscapeEvent.patch b/patches/unapplied/server/0190-EndermanEscapeEvent.patch similarity index 100% rename from patches/server/0190-EndermanEscapeEvent.patch rename to patches/unapplied/server/0190-EndermanEscapeEvent.patch diff --git a/patches/server/0191-Enderman.teleportRandomly.patch b/patches/unapplied/server/0191-Enderman.teleportRandomly.patch similarity index 100% rename from patches/server/0191-Enderman.teleportRandomly.patch rename to patches/unapplied/server/0191-Enderman.teleportRandomly.patch diff --git a/patches/server/0192-Block-Enderpearl-Travel-Exploit.patch b/patches/unapplied/server/0192-Block-Enderpearl-Travel-Exploit.patch similarity index 100% rename from patches/server/0192-Block-Enderpearl-Travel-Exploit.patch rename to patches/unapplied/server/0192-Block-Enderpearl-Travel-Exploit.patch diff --git a/patches/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/unapplied/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch similarity index 100% rename from patches/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch rename to patches/unapplied/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch diff --git a/patches/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/unapplied/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch similarity index 100% rename from patches/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch rename to patches/unapplied/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch diff --git a/patches/server/0195-EndermanAttackPlayerEvent.patch b/patches/unapplied/server/0195-EndermanAttackPlayerEvent.patch similarity index 100% rename from patches/server/0195-EndermanAttackPlayerEvent.patch rename to patches/unapplied/server/0195-EndermanAttackPlayerEvent.patch diff --git a/patches/server/0196-WitchConsumePotionEvent.patch b/patches/unapplied/server/0196-WitchConsumePotionEvent.patch similarity index 100% rename from patches/server/0196-WitchConsumePotionEvent.patch rename to patches/unapplied/server/0196-WitchConsumePotionEvent.patch diff --git a/patches/server/0197-WitchThrowPotionEvent.patch b/patches/unapplied/server/0197-WitchThrowPotionEvent.patch similarity index 100% rename from patches/server/0197-WitchThrowPotionEvent.patch rename to patches/unapplied/server/0197-WitchThrowPotionEvent.patch diff --git a/patches/server/0198-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/unapplied/server/0198-Allow-spawning-Item-entities-with-World.spawnEntity.patch similarity index 100% rename from patches/server/0198-Allow-spawning-Item-entities-with-World.spawnEntity.patch rename to patches/unapplied/server/0198-Allow-spawning-Item-entities-with-World.spawnEntity.patch diff --git a/patches/server/0199-WitchReadyPotionEvent.patch b/patches/unapplied/server/0199-WitchReadyPotionEvent.patch similarity index 100% rename from patches/server/0199-WitchReadyPotionEvent.patch rename to patches/unapplied/server/0199-WitchReadyPotionEvent.patch diff --git a/patches/server/0200-ItemStack-getMaxItemUseDuration.patch b/patches/unapplied/server/0200-ItemStack-getMaxItemUseDuration.patch similarity index 100% rename from patches/server/0200-ItemStack-getMaxItemUseDuration.patch rename to patches/unapplied/server/0200-ItemStack-getMaxItemUseDuration.patch diff --git a/patches/server/0201-Implement-EntityTeleportEndGatewayEvent.patch b/patches/unapplied/server/0201-Implement-EntityTeleportEndGatewayEvent.patch similarity index 100% rename from patches/server/0201-Implement-EntityTeleportEndGatewayEvent.patch rename to patches/unapplied/server/0201-Implement-EntityTeleportEndGatewayEvent.patch diff --git a/patches/server/0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/unapplied/server/0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch similarity index 100% rename from patches/server/0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch rename to patches/unapplied/server/0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch diff --git a/patches/server/0203-Fix-CraftEntity-hashCode.patch b/patches/unapplied/server/0203-Fix-CraftEntity-hashCode.patch similarity index 100% rename from patches/server/0203-Fix-CraftEntity-hashCode.patch rename to patches/unapplied/server/0203-Fix-CraftEntity-hashCode.patch diff --git a/patches/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/unapplied/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch similarity index 100% rename from patches/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch rename to patches/unapplied/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch diff --git a/patches/server/0205-Print-Error-details-when-failing-to-save-player-data.patch b/patches/unapplied/server/0205-Print-Error-details-when-failing-to-save-player-data.patch similarity index 100% rename from patches/server/0205-Print-Error-details-when-failing-to-save-player-data.patch rename to patches/unapplied/server/0205-Print-Error-details-when-failing-to-save-player-data.patch diff --git a/patches/server/0206-Make-shield-blocking-delay-configurable.patch b/patches/unapplied/server/0206-Make-shield-blocking-delay-configurable.patch similarity index 100% rename from patches/server/0206-Make-shield-blocking-delay-configurable.patch rename to patches/unapplied/server/0206-Make-shield-blocking-delay-configurable.patch diff --git a/patches/server/0207-Improve-EntityShootBowEvent.patch b/patches/unapplied/server/0207-Improve-EntityShootBowEvent.patch similarity index 100% rename from patches/server/0207-Improve-EntityShootBowEvent.patch rename to patches/unapplied/server/0207-Improve-EntityShootBowEvent.patch diff --git a/patches/server/0208-PlayerReadyArrowEvent.patch b/patches/unapplied/server/0208-PlayerReadyArrowEvent.patch similarity index 100% rename from patches/server/0208-PlayerReadyArrowEvent.patch rename to patches/unapplied/server/0208-PlayerReadyArrowEvent.patch diff --git a/patches/server/0209-Implement-EntityKnockbackByEntityEvent.patch b/patches/unapplied/server/0209-Implement-EntityKnockbackByEntityEvent.patch similarity index 100% rename from patches/server/0209-Implement-EntityKnockbackByEntityEvent.patch rename to patches/unapplied/server/0209-Implement-EntityKnockbackByEntityEvent.patch diff --git a/patches/server/0210-Expand-Explosions-API.patch b/patches/unapplied/server/0210-Expand-Explosions-API.patch similarity index 100% rename from patches/server/0210-Expand-Explosions-API.patch rename to patches/unapplied/server/0210-Expand-Explosions-API.patch diff --git a/patches/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/unapplied/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch similarity index 100% rename from patches/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch rename to patches/unapplied/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch diff --git a/patches/server/0212-RangedEntity-API.patch b/patches/unapplied/server/0212-RangedEntity-API.patch similarity index 100% rename from patches/server/0212-RangedEntity-API.patch rename to patches/unapplied/server/0212-RangedEntity-API.patch diff --git a/patches/server/0213-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/unapplied/server/0213-Add-config-to-disable-ender-dragon-legacy-check.patch similarity index 100% rename from patches/server/0213-Add-config-to-disable-ender-dragon-legacy-check.patch rename to patches/unapplied/server/0213-Add-config-to-disable-ender-dragon-legacy-check.patch diff --git a/patches/server/0214-Implement-World.getEntity-UUID-API.patch b/patches/unapplied/server/0214-Implement-World.getEntity-UUID-API.patch similarity index 100% rename from patches/server/0214-Implement-World.getEntity-UUID-API.patch rename to patches/unapplied/server/0214-Implement-World.getEntity-UUID-API.patch diff --git a/patches/server/0215-InventoryCloseEvent-Reason-API.patch b/patches/unapplied/server/0215-InventoryCloseEvent-Reason-API.patch similarity index 100% rename from patches/server/0215-InventoryCloseEvent-Reason-API.patch rename to patches/unapplied/server/0215-InventoryCloseEvent-Reason-API.patch diff --git a/patches/server/0216-Vex-get-setSummoner-API.patch b/patches/unapplied/server/0216-Vex-get-setSummoner-API.patch similarity index 100% rename from patches/server/0216-Vex-get-setSummoner-API.patch rename to patches/unapplied/server/0216-Vex-get-setSummoner-API.patch diff --git a/patches/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/unapplied/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch similarity index 100% rename from patches/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch rename to patches/unapplied/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch diff --git a/patches/server/0218-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/patches/unapplied/server/0218-Avoid-item-merge-if-stack-size-above-max-stack-size.patch similarity index 100% rename from patches/server/0218-Avoid-item-merge-if-stack-size-above-max-stack-size.patch rename to patches/unapplied/server/0218-Avoid-item-merge-if-stack-size-above-max-stack-size.patch diff --git a/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/unapplied/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch similarity index 100% rename from patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch rename to patches/unapplied/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch diff --git a/patches/server/0220-add-more-information-to-Entity.toString.patch b/patches/unapplied/server/0220-add-more-information-to-Entity.toString.patch similarity index 100% rename from patches/server/0220-add-more-information-to-Entity.toString.patch rename to patches/unapplied/server/0220-add-more-information-to-Entity.toString.patch diff --git a/patches/server/0221-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/patches/unapplied/server/0221-Add-CraftMagicNumbers.isSupportedApiVersion.patch similarity index 100% rename from patches/server/0221-Add-CraftMagicNumbers.isSupportedApiVersion.patch rename to patches/unapplied/server/0221-Add-CraftMagicNumbers.isSupportedApiVersion.patch diff --git a/patches/server/0222-EnderDragon-Events.patch b/patches/unapplied/server/0222-EnderDragon-Events.patch similarity index 100% rename from patches/server/0222-EnderDragon-Events.patch rename to patches/unapplied/server/0222-EnderDragon-Events.patch diff --git a/patches/server/0223-PlayerElytraBoostEvent.patch b/patches/unapplied/server/0223-PlayerElytraBoostEvent.patch similarity index 100% rename from patches/server/0223-PlayerElytraBoostEvent.patch rename to patches/unapplied/server/0223-PlayerElytraBoostEvent.patch diff --git a/patches/server/0224-PlayerLaunchProjectileEvent.patch b/patches/unapplied/server/0224-PlayerLaunchProjectileEvent.patch similarity index 100% rename from patches/server/0224-PlayerLaunchProjectileEvent.patch rename to patches/unapplied/server/0224-PlayerLaunchProjectileEvent.patch diff --git a/patches/server/0225-Improve-BlockPosition-inlining.patch b/patches/unapplied/server/0225-Improve-BlockPosition-inlining.patch similarity index 100% rename from patches/server/0225-Improve-BlockPosition-inlining.patch rename to patches/unapplied/server/0225-Improve-BlockPosition-inlining.patch diff --git a/patches/server/0226-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/unapplied/server/0226-Option-to-prevent-armor-stands-from-doing-entity-loo.patch similarity index 100% rename from patches/server/0226-Option-to-prevent-armor-stands-from-doing-entity-loo.patch rename to patches/unapplied/server/0226-Option-to-prevent-armor-stands-from-doing-entity-loo.patch diff --git a/patches/server/0227-Vanished-players-don-t-have-rights.patch b/patches/unapplied/server/0227-Vanished-players-don-t-have-rights.patch similarity index 100% rename from patches/server/0227-Vanished-players-don-t-have-rights.patch rename to patches/unapplied/server/0227-Vanished-players-don-t-have-rights.patch diff --git a/patches/server/0228-Allow-disabling-armour-stand-ticking.patch b/patches/unapplied/server/0228-Allow-disabling-armour-stand-ticking.patch similarity index 100% rename from patches/server/0228-Allow-disabling-armour-stand-ticking.patch rename to patches/unapplied/server/0228-Allow-disabling-armour-stand-ticking.patch diff --git a/patches/server/0229-SkeletonHorse-Additions.patch b/patches/unapplied/server/0229-SkeletonHorse-Additions.patch similarity index 100% rename from patches/server/0229-SkeletonHorse-Additions.patch rename to patches/unapplied/server/0229-SkeletonHorse-Additions.patch diff --git a/patches/server/0230-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/unapplied/server/0230-Don-t-call-getItemMeta-on-hasItemMeta.patch similarity index 100% rename from patches/server/0230-Don-t-call-getItemMeta-on-hasItemMeta.patch rename to patches/unapplied/server/0230-Don-t-call-getItemMeta-on-hasItemMeta.patch diff --git a/patches/server/0231-Implement-Expanded-ArmorStand-API.patch b/patches/unapplied/server/0231-Implement-Expanded-ArmorStand-API.patch similarity index 100% rename from patches/server/0231-Implement-Expanded-ArmorStand-API.patch rename to patches/unapplied/server/0231-Implement-Expanded-ArmorStand-API.patch diff --git a/patches/server/0232-AnvilDamageEvent.patch b/patches/unapplied/server/0232-AnvilDamageEvent.patch similarity index 100% rename from patches/server/0232-AnvilDamageEvent.patch rename to patches/unapplied/server/0232-AnvilDamageEvent.patch diff --git a/patches/server/0233-Add-hand-to-bucket-events.patch b/patches/unapplied/server/0233-Add-hand-to-bucket-events.patch similarity index 100% rename from patches/server/0233-Add-hand-to-bucket-events.patch rename to patches/unapplied/server/0233-Add-hand-to-bucket-events.patch diff --git a/patches/server/0234-Add-TNTPrimeEvent.patch b/patches/unapplied/server/0234-Add-TNTPrimeEvent.patch similarity index 100% rename from patches/server/0234-Add-TNTPrimeEvent.patch rename to patches/unapplied/server/0234-Add-TNTPrimeEvent.patch diff --git a/patches/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/unapplied/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch similarity index 100% rename from patches/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch rename to patches/unapplied/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch diff --git a/patches/server/0236-MC-135506-Experience-should-save-as-Integers.patch b/patches/unapplied/server/0236-MC-135506-Experience-should-save-as-Integers.patch similarity index 100% rename from patches/server/0236-MC-135506-Experience-should-save-as-Integers.patch rename to patches/unapplied/server/0236-MC-135506-Experience-should-save-as-Integers.patch diff --git a/patches/server/0237-Fix-client-rendering-skulls-from-same-user.patch b/patches/unapplied/server/0237-Fix-client-rendering-skulls-from-same-user.patch similarity index 100% rename from patches/server/0237-Fix-client-rendering-skulls-from-same-user.patch rename to patches/unapplied/server/0237-Fix-client-rendering-skulls-from-same-user.patch diff --git a/patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/unapplied/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch similarity index 100% rename from patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch rename to patches/unapplied/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch diff --git a/patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/unapplied/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch similarity index 100% rename from patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch rename to patches/unapplied/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch diff --git a/patches/server/0240-Use-ConcurrentHashMap-in-JsonList.patch b/patches/unapplied/server/0240-Use-ConcurrentHashMap-in-JsonList.patch similarity index 100% rename from patches/server/0240-Use-ConcurrentHashMap-in-JsonList.patch rename to patches/unapplied/server/0240-Use-ConcurrentHashMap-in-JsonList.patch diff --git a/patches/server/0241-Use-a-Queue-for-Queueing-Commands.patch b/patches/unapplied/server/0241-Use-a-Queue-for-Queueing-Commands.patch similarity index 100% rename from patches/server/0241-Use-a-Queue-for-Queueing-Commands.patch rename to patches/unapplied/server/0241-Use-a-Queue-for-Queueing-Commands.patch diff --git a/patches/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/unapplied/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch similarity index 100% rename from patches/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch rename to patches/unapplied/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch diff --git a/patches/server/0243-Optimize-BlockPosition-helper-methods.patch b/patches/unapplied/server/0243-Optimize-BlockPosition-helper-methods.patch similarity index 100% rename from patches/server/0243-Optimize-BlockPosition-helper-methods.patch rename to patches/unapplied/server/0243-Optimize-BlockPosition-helper-methods.patch diff --git a/patches/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/unapplied/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch similarity index 100% rename from patches/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch rename to patches/unapplied/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch diff --git a/patches/server/0245-Slime-Pathfinder-Events.patch b/patches/unapplied/server/0245-Slime-Pathfinder-Events.patch similarity index 100% rename from patches/server/0245-Slime-Pathfinder-Events.patch rename to patches/unapplied/server/0245-Slime-Pathfinder-Events.patch diff --git a/patches/server/0246-Configurable-speed-for-water-flowing-over-lava.patch b/patches/unapplied/server/0246-Configurable-speed-for-water-flowing-over-lava.patch similarity index 100% rename from patches/server/0246-Configurable-speed-for-water-flowing-over-lava.patch rename to patches/unapplied/server/0246-Configurable-speed-for-water-flowing-over-lava.patch diff --git a/patches/server/0247-Optimize-CraftBlockData-Creation.patch b/patches/unapplied/server/0247-Optimize-CraftBlockData-Creation.patch similarity index 100% rename from patches/server/0247-Optimize-CraftBlockData-Creation.patch rename to patches/unapplied/server/0247-Optimize-CraftBlockData-Creation.patch diff --git a/patches/server/0248-Optimize-MappedRegistry.patch b/patches/unapplied/server/0248-Optimize-MappedRegistry.patch similarity index 100% rename from patches/server/0248-Optimize-MappedRegistry.patch rename to patches/unapplied/server/0248-Optimize-MappedRegistry.patch diff --git a/patches/server/0249-Add-PhantomPreSpawnEvent.patch b/patches/unapplied/server/0249-Add-PhantomPreSpawnEvent.patch similarity index 100% rename from patches/server/0249-Add-PhantomPreSpawnEvent.patch rename to patches/unapplied/server/0249-Add-PhantomPreSpawnEvent.patch diff --git a/patches/server/0250-Add-More-Creeper-API.patch b/patches/unapplied/server/0250-Add-More-Creeper-API.patch similarity index 100% rename from patches/server/0250-Add-More-Creeper-API.patch rename to patches/unapplied/server/0250-Add-More-Creeper-API.patch diff --git a/patches/server/0251-Inventory-removeItemAnySlot.patch b/patches/unapplied/server/0251-Inventory-removeItemAnySlot.patch similarity index 100% rename from patches/server/0251-Inventory-removeItemAnySlot.patch rename to patches/unapplied/server/0251-Inventory-removeItemAnySlot.patch diff --git a/patches/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/unapplied/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch similarity index 100% rename from patches/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch rename to patches/unapplied/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch diff --git a/patches/server/0253-Asynchronous-chunk-IO-and-loading.patch b/patches/unapplied/server/0253-Asynchronous-chunk-IO-and-loading.patch similarity index 100% rename from patches/server/0253-Asynchronous-chunk-IO-and-loading.patch rename to patches/unapplied/server/0253-Asynchronous-chunk-IO-and-loading.patch diff --git a/patches/server/0254-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/unapplied/server/0254-Add-ray-tracing-methods-to-LivingEntity.patch similarity index 100% rename from patches/server/0254-Add-ray-tracing-methods-to-LivingEntity.patch rename to patches/unapplied/server/0254-Add-ray-tracing-methods-to-LivingEntity.patch diff --git a/patches/server/0255-Expose-attack-cooldown-methods-for-Player.patch b/patches/unapplied/server/0255-Expose-attack-cooldown-methods-for-Player.patch similarity index 100% rename from patches/server/0255-Expose-attack-cooldown-methods-for-Player.patch rename to patches/unapplied/server/0255-Expose-attack-cooldown-methods-for-Player.patch diff --git a/patches/server/0256-Improve-death-events.patch b/patches/unapplied/server/0256-Improve-death-events.patch similarity index 100% rename from patches/server/0256-Improve-death-events.patch rename to patches/unapplied/server/0256-Improve-death-events.patch diff --git a/patches/server/0257-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/unapplied/server/0257-Allow-chests-to-be-placed-with-NBT-data.patch similarity index 100% rename from patches/server/0257-Allow-chests-to-be-placed-with-NBT-data.patch rename to patches/unapplied/server/0257-Allow-chests-to-be-placed-with-NBT-data.patch diff --git a/patches/server/0258-Mob-Pathfinding-API.patch b/patches/unapplied/server/0258-Mob-Pathfinding-API.patch similarity index 100% rename from patches/server/0258-Mob-Pathfinding-API.patch rename to patches/unapplied/server/0258-Mob-Pathfinding-API.patch diff --git a/patches/server/0259-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/unapplied/server/0259-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch similarity index 100% rename from patches/server/0259-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch rename to patches/unapplied/server/0259-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch diff --git a/patches/server/0260-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/unapplied/server/0260-Prevent-chunk-loading-from-Fluid-Flowing.patch similarity index 100% rename from patches/server/0260-Prevent-chunk-loading-from-Fluid-Flowing.patch rename to patches/unapplied/server/0260-Prevent-chunk-loading-from-Fluid-Flowing.patch diff --git a/patches/server/0261-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/unapplied/server/0261-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch similarity index 100% rename from patches/server/0261-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch rename to patches/unapplied/server/0261-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch diff --git a/patches/server/0262-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/unapplied/server/0262-Prevent-mob-spawning-from-loading-generating-chunks.patch similarity index 100% rename from patches/server/0262-Prevent-mob-spawning-from-loading-generating-chunks.patch rename to patches/unapplied/server/0262-Prevent-mob-spawning-from-loading-generating-chunks.patch diff --git a/patches/server/0263-Implement-furnace-cook-speed-multiplier-API.patch b/patches/unapplied/server/0263-Implement-furnace-cook-speed-multiplier-API.patch similarity index 100% rename from patches/server/0263-Implement-furnace-cook-speed-multiplier-API.patch rename to patches/unapplied/server/0263-Implement-furnace-cook-speed-multiplier-API.patch diff --git a/patches/server/0264-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/unapplied/server/0264-Catch-JsonParseException-in-Entity-and-TE-names.patch similarity index 100% rename from patches/server/0264-Catch-JsonParseException-in-Entity-and-TE-names.patch rename to patches/unapplied/server/0264-Catch-JsonParseException-in-Entity-and-TE-names.patch diff --git a/patches/server/0265-Honor-EntityAgeable.ageLock.patch b/patches/unapplied/server/0265-Honor-EntityAgeable.ageLock.patch similarity index 100% rename from patches/server/0265-Honor-EntityAgeable.ageLock.patch rename to patches/unapplied/server/0265-Honor-EntityAgeable.ageLock.patch diff --git a/patches/server/0266-Configurable-connection-throttle-kick-message.patch b/patches/unapplied/server/0266-Configurable-connection-throttle-kick-message.patch similarity index 100% rename from patches/server/0266-Configurable-connection-throttle-kick-message.patch rename to patches/unapplied/server/0266-Configurable-connection-throttle-kick-message.patch diff --git a/patches/server/0267-Hook-into-CB-plugin-rewrites.patch b/patches/unapplied/server/0267-Hook-into-CB-plugin-rewrites.patch similarity index 100% rename from patches/server/0267-Hook-into-CB-plugin-rewrites.patch rename to patches/unapplied/server/0267-Hook-into-CB-plugin-rewrites.patch diff --git a/patches/server/0268-PreSpawnerSpawnEvent.patch b/patches/unapplied/server/0268-PreSpawnerSpawnEvent.patch similarity index 100% rename from patches/server/0268-PreSpawnerSpawnEvent.patch rename to patches/unapplied/server/0268-PreSpawnerSpawnEvent.patch diff --git a/patches/server/0269-Add-LivingEntity-getTargetEntity.patch b/patches/unapplied/server/0269-Add-LivingEntity-getTargetEntity.patch similarity index 100% rename from patches/server/0269-Add-LivingEntity-getTargetEntity.patch rename to patches/unapplied/server/0269-Add-LivingEntity-getTargetEntity.patch diff --git a/patches/server/0270-Add-sun-related-API.patch b/patches/unapplied/server/0270-Add-sun-related-API.patch similarity index 100% rename from patches/server/0270-Add-sun-related-API.patch rename to patches/unapplied/server/0270-Add-sun-related-API.patch diff --git a/patches/server/0271-Turtle-API.patch b/patches/unapplied/server/0271-Turtle-API.patch similarity index 100% rename from patches/server/0271-Turtle-API.patch rename to patches/unapplied/server/0271-Turtle-API.patch diff --git a/patches/server/0272-Call-player-spectator-target-events-and-improve-impl.patch b/patches/unapplied/server/0272-Call-player-spectator-target-events-and-improve-impl.patch similarity index 100% rename from patches/server/0272-Call-player-spectator-target-events-and-improve-impl.patch rename to patches/unapplied/server/0272-Call-player-spectator-target-events-and-improve-impl.patch diff --git a/patches/server/0273-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/unapplied/server/0273-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch similarity index 100% rename from patches/server/0273-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch rename to patches/unapplied/server/0273-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch diff --git a/patches/server/0274-Add-Velocity-IP-Forwarding-Support.patch b/patches/unapplied/server/0274-Add-Velocity-IP-Forwarding-Support.patch similarity index 100% rename from patches/server/0274-Add-Velocity-IP-Forwarding-Support.patch rename to patches/unapplied/server/0274-Add-Velocity-IP-Forwarding-Support.patch diff --git a/patches/server/0275-Add-more-Witch-API.patch b/patches/unapplied/server/0275-Add-more-Witch-API.patch similarity index 100% rename from patches/server/0275-Add-more-Witch-API.patch rename to patches/unapplied/server/0275-Add-more-Witch-API.patch diff --git a/patches/server/0276-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/unapplied/server/0276-Check-Drowned-for-Villager-Aggression-Config.patch similarity index 100% rename from patches/server/0276-Check-Drowned-for-Villager-Aggression-Config.patch rename to patches/unapplied/server/0276-Check-Drowned-for-Villager-Aggression-Config.patch diff --git a/patches/server/0277-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/unapplied/server/0277-Add-option-to-prevent-players-from-moving-into-unloa.patch similarity index 100% rename from patches/server/0277-Add-option-to-prevent-players-from-moving-into-unloa.patch rename to patches/unapplied/server/0277-Add-option-to-prevent-players-from-moving-into-unloa.patch diff --git a/patches/server/0278-Reset-players-airTicks-on-respawn.patch b/patches/unapplied/server/0278-Reset-players-airTicks-on-respawn.patch similarity index 100% rename from patches/server/0278-Reset-players-airTicks-on-respawn.patch rename to patches/unapplied/server/0278-Reset-players-airTicks-on-respawn.patch diff --git a/patches/server/0279-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/unapplied/server/0279-Don-t-sleep-after-profile-lookups-if-not-needed.patch similarity index 100% rename from patches/server/0279-Don-t-sleep-after-profile-lookups-if-not-needed.patch rename to patches/unapplied/server/0279-Don-t-sleep-after-profile-lookups-if-not-needed.patch diff --git a/patches/server/0280-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/unapplied/server/0280-Improve-Server-Thread-Pool-and-Thread-Priorities.patch similarity index 100% rename from patches/server/0280-Improve-Server-Thread-Pool-and-Thread-Priorities.patch rename to patches/unapplied/server/0280-Improve-Server-Thread-Pool-and-Thread-Priorities.patch diff --git a/patches/server/0281-Optimize-World-Time-Updates.patch b/patches/unapplied/server/0281-Optimize-World-Time-Updates.patch similarity index 100% rename from patches/server/0281-Optimize-World-Time-Updates.patch rename to patches/unapplied/server/0281-Optimize-World-Time-Updates.patch diff --git a/patches/server/0282-Restore-custom-InventoryHolder-support.patch b/patches/unapplied/server/0282-Restore-custom-InventoryHolder-support.patch similarity index 100% rename from patches/server/0282-Restore-custom-InventoryHolder-support.patch rename to patches/unapplied/server/0282-Restore-custom-InventoryHolder-support.patch diff --git a/patches/server/0283-Use-Vanilla-Minecart-Speeds.patch b/patches/unapplied/server/0283-Use-Vanilla-Minecart-Speeds.patch similarity index 100% rename from patches/server/0283-Use-Vanilla-Minecart-Speeds.patch rename to patches/unapplied/server/0283-Use-Vanilla-Minecart-Speeds.patch diff --git a/patches/server/0284-Fix-SpongeAbsortEvent-handling.patch b/patches/unapplied/server/0284-Fix-SpongeAbsortEvent-handling.patch similarity index 100% rename from patches/server/0284-Fix-SpongeAbsortEvent-handling.patch rename to patches/unapplied/server/0284-Fix-SpongeAbsortEvent-handling.patch diff --git a/patches/server/0285-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/unapplied/server/0285-Don-t-allow-digging-into-unloaded-chunks.patch similarity index 100% rename from patches/server/0285-Don-t-allow-digging-into-unloaded-chunks.patch rename to patches/unapplied/server/0285-Don-t-allow-digging-into-unloaded-chunks.patch diff --git a/patches/server/0286-Make-the-default-permission-message-configurable.patch b/patches/unapplied/server/0286-Make-the-default-permission-message-configurable.patch similarity index 100% rename from patches/server/0286-Make-the-default-permission-message-configurable.patch rename to patches/unapplied/server/0286-Make-the-default-permission-message-configurable.patch diff --git a/patches/server/0287-Prevent-rayTrace-from-loading-chunks.patch b/patches/unapplied/server/0287-Prevent-rayTrace-from-loading-chunks.patch similarity index 100% rename from patches/server/0287-Prevent-rayTrace-from-loading-chunks.patch rename to patches/unapplied/server/0287-Prevent-rayTrace-from-loading-chunks.patch diff --git a/patches/server/0288-Handle-Large-Packets-disconnecting-client.patch b/patches/unapplied/server/0288-Handle-Large-Packets-disconnecting-client.patch similarity index 100% rename from patches/server/0288-Handle-Large-Packets-disconnecting-client.patch rename to patches/unapplied/server/0288-Handle-Large-Packets-disconnecting-client.patch diff --git a/patches/server/0289-force-entity-dismount-during-teleportation.patch b/patches/unapplied/server/0289-force-entity-dismount-during-teleportation.patch similarity index 100% rename from patches/server/0289-force-entity-dismount-during-teleportation.patch rename to patches/unapplied/server/0289-force-entity-dismount-during-teleportation.patch diff --git a/patches/server/0290-Add-more-Zombie-API.patch b/patches/unapplied/server/0290-Add-more-Zombie-API.patch similarity index 100% rename from patches/server/0290-Add-more-Zombie-API.patch rename to patches/unapplied/server/0290-Add-more-Zombie-API.patch diff --git a/patches/server/0291-Book-Size-Limits.patch b/patches/unapplied/server/0291-Book-Size-Limits.patch similarity index 100% rename from patches/server/0291-Book-Size-Limits.patch rename to patches/unapplied/server/0291-Book-Size-Limits.patch diff --git a/patches/server/0292-Add-PlayerConnectionCloseEvent.patch b/patches/unapplied/server/0292-Add-PlayerConnectionCloseEvent.patch similarity index 100% rename from patches/server/0292-Add-PlayerConnectionCloseEvent.patch rename to patches/unapplied/server/0292-Add-PlayerConnectionCloseEvent.patch diff --git a/patches/server/0293-Prevent-Enderman-from-loading-chunks.patch b/patches/unapplied/server/0293-Prevent-Enderman-from-loading-chunks.patch similarity index 100% rename from patches/server/0293-Prevent-Enderman-from-loading-chunks.patch rename to patches/unapplied/server/0293-Prevent-Enderman-from-loading-chunks.patch diff --git a/patches/server/0294-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/unapplied/server/0294-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 100% rename from patches/server/0294-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to patches/unapplied/server/0294-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch diff --git a/patches/server/0295-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/unapplied/server/0295-Workaround-for-vehicle-tracking-issue-on-disconnect.patch similarity index 100% rename from patches/server/0295-Workaround-for-vehicle-tracking-issue-on-disconnect.patch rename to patches/unapplied/server/0295-Workaround-for-vehicle-tracking-issue-on-disconnect.patch diff --git a/patches/server/0296-Block-Entity-remove-from-being-called-on-Players.patch b/patches/unapplied/server/0296-Block-Entity-remove-from-being-called-on-Players.patch similarity index 100% rename from patches/server/0296-Block-Entity-remove-from-being-called-on-Players.patch rename to patches/unapplied/server/0296-Block-Entity-remove-from-being-called-on-Players.patch diff --git a/patches/server/0297-BlockDestroyEvent.patch b/patches/unapplied/server/0297-BlockDestroyEvent.patch similarity index 100% rename from patches/server/0297-BlockDestroyEvent.patch rename to patches/unapplied/server/0297-BlockDestroyEvent.patch diff --git a/patches/server/0298-Async-command-map-building.patch b/patches/unapplied/server/0298-Async-command-map-building.patch similarity index 100% rename from patches/server/0298-Async-command-map-building.patch rename to patches/unapplied/server/0298-Async-command-map-building.patch diff --git a/patches/server/0299-Implement-Brigadier-Mojang-API.patch b/patches/unapplied/server/0299-Implement-Brigadier-Mojang-API.patch similarity index 100% rename from patches/server/0299-Implement-Brigadier-Mojang-API.patch rename to patches/unapplied/server/0299-Implement-Brigadier-Mojang-API.patch diff --git a/patches/server/0300-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/patches/unapplied/server/0300-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch similarity index 100% rename from patches/server/0300-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch rename to patches/unapplied/server/0300-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch diff --git a/patches/server/0301-Limit-Client-Sign-length-more.patch b/patches/unapplied/server/0301-Limit-Client-Sign-length-more.patch similarity index 100% rename from patches/server/0301-Limit-Client-Sign-length-more.patch rename to patches/unapplied/server/0301-Limit-Client-Sign-length-more.patch diff --git a/patches/server/0302-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/unapplied/server/0302-Don-t-check-ConvertSigns-boolean-every-sign-save.patch similarity index 100% rename from patches/server/0302-Don-t-check-ConvertSigns-boolean-every-sign-save.patch rename to patches/unapplied/server/0302-Don-t-check-ConvertSigns-boolean-every-sign-save.patch diff --git a/patches/server/0303-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/unapplied/server/0303-Optimize-Network-Manager-and-add-advanced-packet-sup.patch similarity index 100% rename from patches/server/0303-Optimize-Network-Manager-and-add-advanced-packet-sup.patch rename to patches/unapplied/server/0303-Optimize-Network-Manager-and-add-advanced-packet-sup.patch diff --git a/patches/server/0304-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/unapplied/server/0304-Handle-Oversized-Tile-Entities-in-chunks.patch similarity index 100% rename from patches/server/0304-Handle-Oversized-Tile-Entities-in-chunks.patch rename to patches/unapplied/server/0304-Handle-Oversized-Tile-Entities-in-chunks.patch diff --git a/patches/server/0305-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/patches/unapplied/server/0305-Set-Zombie-last-tick-at-start-of-drowning-process.patch similarity index 100% rename from patches/server/0305-Set-Zombie-last-tick-at-start-of-drowning-process.patch rename to patches/unapplied/server/0305-Set-Zombie-last-tick-at-start-of-drowning-process.patch diff --git a/patches/server/0306-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/unapplied/server/0306-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch similarity index 100% rename from patches/server/0306-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch rename to patches/unapplied/server/0306-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch diff --git a/patches/server/0307-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/patches/unapplied/server/0307-Use-proper-max-length-when-serialising-BungeeCord-te.patch similarity index 100% rename from patches/server/0307-Use-proper-max-length-when-serialising-BungeeCord-te.patch rename to patches/unapplied/server/0307-Use-proper-max-length-when-serialising-BungeeCord-te.patch diff --git a/patches/server/0308-Entity-getEntitySpawnReason.patch b/patches/unapplied/server/0308-Entity-getEntitySpawnReason.patch similarity index 100% rename from patches/server/0308-Entity-getEntitySpawnReason.patch rename to patches/unapplied/server/0308-Entity-getEntitySpawnReason.patch diff --git a/patches/server/0309-Update-entity-Metadata-for-all-tracked-players.patch b/patches/unapplied/server/0309-Update-entity-Metadata-for-all-tracked-players.patch similarity index 100% rename from patches/server/0309-Update-entity-Metadata-for-all-tracked-players.patch rename to patches/unapplied/server/0309-Update-entity-Metadata-for-all-tracked-players.patch diff --git a/patches/server/0310-Fire-event-on-GS4-query.patch b/patches/unapplied/server/0310-Fire-event-on-GS4-query.patch similarity index 100% rename from patches/server/0310-Fire-event-on-GS4-query.patch rename to patches/unapplied/server/0310-Fire-event-on-GS4-query.patch diff --git a/patches/server/0311-Implement-PlayerPostRespawnEvent.patch b/patches/unapplied/server/0311-Implement-PlayerPostRespawnEvent.patch similarity index 100% rename from patches/server/0311-Implement-PlayerPostRespawnEvent.patch rename to patches/unapplied/server/0311-Implement-PlayerPostRespawnEvent.patch diff --git a/patches/server/0312-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/unapplied/server/0312-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch similarity index 100% rename from patches/server/0312-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch rename to patches/unapplied/server/0312-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch diff --git a/patches/server/0313-Server-Tick-Events.patch b/patches/unapplied/server/0313-Server-Tick-Events.patch similarity index 100% rename from patches/server/0313-Server-Tick-Events.patch rename to patches/unapplied/server/0313-Server-Tick-Events.patch diff --git a/patches/server/0314-PlayerDeathEvent-getItemsToKeep.patch b/patches/unapplied/server/0314-PlayerDeathEvent-getItemsToKeep.patch similarity index 100% rename from patches/server/0314-PlayerDeathEvent-getItemsToKeep.patch rename to patches/unapplied/server/0314-PlayerDeathEvent-getItemsToKeep.patch diff --git a/patches/server/0315-Optimize-Captured-TileEntity-Lookup.patch b/patches/unapplied/server/0315-Optimize-Captured-TileEntity-Lookup.patch similarity index 100% rename from patches/server/0315-Optimize-Captured-TileEntity-Lookup.patch rename to patches/unapplied/server/0315-Optimize-Captured-TileEntity-Lookup.patch diff --git a/patches/server/0316-Add-Heightmap-API.patch b/patches/unapplied/server/0316-Add-Heightmap-API.patch similarity index 100% rename from patches/server/0316-Add-Heightmap-API.patch rename to patches/unapplied/server/0316-Add-Heightmap-API.patch diff --git a/patches/server/0317-Mob-Spawner-API-Enhancements.patch b/patches/unapplied/server/0317-Mob-Spawner-API-Enhancements.patch similarity index 100% rename from patches/server/0317-Mob-Spawner-API-Enhancements.patch rename to patches/unapplied/server/0317-Mob-Spawner-API-Enhancements.patch diff --git a/patches/server/0318-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/unapplied/server/0318-Fix-CB-call-to-changed-postToMainThread-method.patch similarity index 100% rename from patches/server/0318-Fix-CB-call-to-changed-postToMainThread-method.patch rename to patches/unapplied/server/0318-Fix-CB-call-to-changed-postToMainThread-method.patch diff --git a/patches/server/0319-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/unapplied/server/0319-Fix-sounds-when-item-frames-are-modified-MC-123450.patch similarity index 100% rename from patches/server/0319-Fix-sounds-when-item-frames-are-modified-MC-123450.patch rename to patches/unapplied/server/0319-Fix-sounds-when-item-frames-are-modified-MC-123450.patch diff --git a/patches/server/0320-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/patches/unapplied/server/0320-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch similarity index 100% rename from patches/server/0320-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch rename to patches/unapplied/server/0320-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch diff --git a/patches/server/0321-improve-CraftWorld-isChunkLoaded.patch b/patches/unapplied/server/0321-improve-CraftWorld-isChunkLoaded.patch similarity index 100% rename from patches/server/0321-improve-CraftWorld-isChunkLoaded.patch rename to patches/unapplied/server/0321-improve-CraftWorld-isChunkLoaded.patch diff --git a/patches/server/0322-Implement-CraftBlockSoundGroup.patch b/patches/unapplied/server/0322-Implement-CraftBlockSoundGroup.patch similarity index 100% rename from patches/server/0322-Implement-CraftBlockSoundGroup.patch rename to patches/unapplied/server/0322-Implement-CraftBlockSoundGroup.patch diff --git a/patches/server/0323-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/unapplied/server/0323-Configurable-Keep-Spawn-Loaded-range-per-world.patch similarity index 100% rename from patches/server/0323-Configurable-Keep-Spawn-Loaded-range-per-world.patch rename to patches/unapplied/server/0323-Configurable-Keep-Spawn-Loaded-range-per-world.patch diff --git a/patches/server/0324-ChunkMapDistance-CME.patch b/patches/unapplied/server/0324-ChunkMapDistance-CME.patch similarity index 100% rename from patches/server/0324-ChunkMapDistance-CME.patch rename to patches/unapplied/server/0324-ChunkMapDistance-CME.patch diff --git a/patches/server/0325-Chunk-debug-command.patch b/patches/unapplied/server/0325-Chunk-debug-command.patch similarity index 100% rename from patches/server/0325-Chunk-debug-command.patch rename to patches/unapplied/server/0325-Chunk-debug-command.patch diff --git a/patches/server/0326-Allow-Saving-of-Oversized-Chunks.patch b/patches/unapplied/server/0326-Allow-Saving-of-Oversized-Chunks.patch similarity index 100% rename from patches/server/0326-Allow-Saving-of-Oversized-Chunks.patch rename to patches/unapplied/server/0326-Allow-Saving-of-Oversized-Chunks.patch diff --git a/patches/server/0327-Expose-the-internal-current-tick.patch b/patches/unapplied/server/0327-Expose-the-internal-current-tick.patch similarity index 100% rename from patches/server/0327-Expose-the-internal-current-tick.patch rename to patches/unapplied/server/0327-Expose-the-internal-current-tick.patch diff --git a/patches/server/0328-Fix-World-isChunkGenerated-calls.patch b/patches/unapplied/server/0328-Fix-World-isChunkGenerated-calls.patch similarity index 100% rename from patches/server/0328-Fix-World-isChunkGenerated-calls.patch rename to patches/unapplied/server/0328-Fix-World-isChunkGenerated-calls.patch diff --git a/patches/server/0329-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/unapplied/server/0329-Show-blockstate-location-if-we-failed-to-read-it.patch similarity index 100% rename from patches/server/0329-Show-blockstate-location-if-we-failed-to-read-it.patch rename to patches/unapplied/server/0329-Show-blockstate-location-if-we-failed-to-read-it.patch diff --git a/patches/server/0330-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/unapplied/server/0330-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch similarity index 100% rename from patches/server/0330-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch rename to patches/unapplied/server/0330-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch diff --git a/patches/server/0331-Configurable-projectile-relative-velocity.patch b/patches/unapplied/server/0331-Configurable-projectile-relative-velocity.patch similarity index 100% rename from patches/server/0331-Configurable-projectile-relative-velocity.patch rename to patches/unapplied/server/0331-Configurable-projectile-relative-velocity.patch diff --git a/patches/server/0332-offset-item-frame-ticking.patch b/patches/unapplied/server/0332-offset-item-frame-ticking.patch similarity index 100% rename from patches/server/0332-offset-item-frame-ticking.patch rename to patches/unapplied/server/0332-offset-item-frame-ticking.patch diff --git a/patches/server/0333-Fix-MC-158900.patch b/patches/unapplied/server/0333-Fix-MC-158900.patch similarity index 100% rename from patches/server/0333-Fix-MC-158900.patch rename to patches/unapplied/server/0333-Fix-MC-158900.patch diff --git a/patches/server/0334-Prevent-consuming-the-wrong-itemstack.patch b/patches/unapplied/server/0334-Prevent-consuming-the-wrong-itemstack.patch similarity index 100% rename from patches/server/0334-Prevent-consuming-the-wrong-itemstack.patch rename to patches/unapplied/server/0334-Prevent-consuming-the-wrong-itemstack.patch diff --git a/patches/server/0335-Dont-send-unnecessary-sign-update.patch b/patches/unapplied/server/0335-Dont-send-unnecessary-sign-update.patch similarity index 100% rename from patches/server/0335-Dont-send-unnecessary-sign-update.patch rename to patches/unapplied/server/0335-Dont-send-unnecessary-sign-update.patch diff --git a/patches/server/0336-Add-option-to-disable-pillager-patrols.patch b/patches/unapplied/server/0336-Add-option-to-disable-pillager-patrols.patch similarity index 100% rename from patches/server/0336-Add-option-to-disable-pillager-patrols.patch rename to patches/unapplied/server/0336-Add-option-to-disable-pillager-patrols.patch diff --git a/patches/server/0337-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/patches/unapplied/server/0337-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch similarity index 100% rename from patches/server/0337-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch rename to patches/unapplied/server/0337-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch diff --git a/patches/server/0338-Flat-bedrock-generator-settings.patch b/patches/unapplied/server/0338-Flat-bedrock-generator-settings.patch similarity index 100% rename from patches/server/0338-Flat-bedrock-generator-settings.patch rename to patches/unapplied/server/0338-Flat-bedrock-generator-settings.patch diff --git a/patches/server/0339-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/unapplied/server/0339-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch similarity index 100% rename from patches/server/0339-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch rename to patches/unapplied/server/0339-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch diff --git a/patches/server/0340-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/unapplied/server/0340-MC-145656-Fix-Follow-Range-Initial-Target.patch similarity index 100% rename from patches/server/0340-MC-145656-Fix-Follow-Range-Initial-Target.patch rename to patches/unapplied/server/0340-MC-145656-Fix-Follow-Range-Initial-Target.patch diff --git a/patches/server/0341-Duplicate-UUID-Resolve-Option.patch b/patches/unapplied/server/0341-Duplicate-UUID-Resolve-Option.patch similarity index 100% rename from patches/server/0341-Duplicate-UUID-Resolve-Option.patch rename to patches/unapplied/server/0341-Duplicate-UUID-Resolve-Option.patch diff --git a/patches/server/0342-Optimize-Hoppers.patch b/patches/unapplied/server/0342-Optimize-Hoppers.patch similarity index 100% rename from patches/server/0342-Optimize-Hoppers.patch rename to patches/unapplied/server/0342-Optimize-Hoppers.patch diff --git a/patches/server/0343-PlayerDeathEvent-shouldDropExperience.patch b/patches/unapplied/server/0343-PlayerDeathEvent-shouldDropExperience.patch similarity index 100% rename from patches/server/0343-PlayerDeathEvent-shouldDropExperience.patch rename to patches/unapplied/server/0343-PlayerDeathEvent-shouldDropExperience.patch diff --git a/patches/server/0344-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/unapplied/server/0344-Prevent-bees-loading-chunks-checking-hive-position.patch similarity index 100% rename from patches/server/0344-Prevent-bees-loading-chunks-checking-hive-position.patch rename to patches/unapplied/server/0344-Prevent-bees-loading-chunks-checking-hive-position.patch diff --git a/patches/server/0345-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/unapplied/server/0345-Don-t-load-Chunks-from-Hoppers-and-other-things.patch similarity index 100% rename from patches/server/0345-Don-t-load-Chunks-from-Hoppers-and-other-things.patch rename to patches/unapplied/server/0345-Don-t-load-Chunks-from-Hoppers-and-other-things.patch diff --git a/patches/server/0346-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/unapplied/server/0346-Guard-against-serializing-mismatching-chunk-coordina.patch similarity index 100% rename from patches/server/0346-Guard-against-serializing-mismatching-chunk-coordina.patch rename to patches/unapplied/server/0346-Guard-against-serializing-mismatching-chunk-coordina.patch diff --git a/patches/server/0347-Optimise-IEntityAccess-getPlayerByUUID.patch b/patches/unapplied/server/0347-Optimise-IEntityAccess-getPlayerByUUID.patch similarity index 100% rename from patches/server/0347-Optimise-IEntityAccess-getPlayerByUUID.patch rename to patches/unapplied/server/0347-Optimise-IEntityAccess-getPlayerByUUID.patch diff --git a/patches/server/0348-Fix-items-not-falling-correctly.patch b/patches/unapplied/server/0348-Fix-items-not-falling-correctly.patch similarity index 100% rename from patches/server/0348-Fix-items-not-falling-correctly.patch rename to patches/unapplied/server/0348-Fix-items-not-falling-correctly.patch diff --git a/patches/server/0349-Lag-compensate-eating.patch b/patches/unapplied/server/0349-Lag-compensate-eating.patch similarity index 100% rename from patches/server/0349-Lag-compensate-eating.patch rename to patches/unapplied/server/0349-Lag-compensate-eating.patch diff --git a/patches/server/0350-Optimize-call-to-getFluid-for-explosions.patch b/patches/unapplied/server/0350-Optimize-call-to-getFluid-for-explosions.patch similarity index 100% rename from patches/server/0350-Optimize-call-to-getFluid-for-explosions.patch rename to patches/unapplied/server/0350-Optimize-call-to-getFluid-for-explosions.patch diff --git a/patches/server/0351-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/unapplied/server/0351-Fix-last-firework-in-stack-not-having-effects-when-d.patch similarity index 100% rename from patches/server/0351-Fix-last-firework-in-stack-not-having-effects-when-d.patch rename to patches/unapplied/server/0351-Fix-last-firework-in-stack-not-having-effects-when-d.patch diff --git a/patches/server/0352-Add-effect-to-block-break-naturally.patch b/patches/unapplied/server/0352-Add-effect-to-block-break-naturally.patch similarity index 100% rename from patches/server/0352-Add-effect-to-block-break-naturally.patch rename to patches/unapplied/server/0352-Add-effect-to-block-break-naturally.patch diff --git a/patches/server/0353-Entity-Activation-Range-2.0.patch b/patches/unapplied/server/0353-Entity-Activation-Range-2.0.patch similarity index 100% rename from patches/server/0353-Entity-Activation-Range-2.0.patch rename to patches/unapplied/server/0353-Entity-Activation-Range-2.0.patch diff --git a/patches/server/0354-Increase-Light-Queue-Size.patch b/patches/unapplied/server/0354-Increase-Light-Queue-Size.patch similarity index 100% rename from patches/server/0354-Increase-Light-Queue-Size.patch rename to patches/unapplied/server/0354-Increase-Light-Queue-Size.patch diff --git a/patches/server/0355-Fix-Light-Command.patch b/patches/unapplied/server/0355-Fix-Light-Command.patch similarity index 100% rename from patches/server/0355-Fix-Light-Command.patch rename to patches/unapplied/server/0355-Fix-Light-Command.patch diff --git a/patches/server/0356-Anti-Xray.patch b/patches/unapplied/server/0356-Anti-Xray.patch similarity index 100% rename from patches/server/0356-Anti-Xray.patch rename to patches/unapplied/server/0356-Anti-Xray.patch diff --git a/patches/server/0357-Implement-alternative-item-despawn-rate.patch b/patches/unapplied/server/0357-Implement-alternative-item-despawn-rate.patch similarity index 100% rename from patches/server/0357-Implement-alternative-item-despawn-rate.patch rename to patches/unapplied/server/0357-Implement-alternative-item-despawn-rate.patch diff --git a/patches/server/0358-Tracking-Range-Improvements.patch b/patches/unapplied/server/0358-Tracking-Range-Improvements.patch similarity index 100% rename from patches/server/0358-Tracking-Range-Improvements.patch rename to patches/unapplied/server/0358-Tracking-Range-Improvements.patch diff --git a/patches/server/0359-Fix-items-vanishing-through-end-portal.patch b/patches/unapplied/server/0359-Fix-items-vanishing-through-end-portal.patch similarity index 100% rename from patches/server/0359-Fix-items-vanishing-through-end-portal.patch rename to patches/unapplied/server/0359-Fix-items-vanishing-through-end-portal.patch diff --git a/patches/server/0360-implement-optional-per-player-mob-spawns.patch b/patches/unapplied/server/0360-implement-optional-per-player-mob-spawns.patch similarity index 100% rename from patches/server/0360-implement-optional-per-player-mob-spawns.patch rename to patches/unapplied/server/0360-implement-optional-per-player-mob-spawns.patch diff --git a/patches/server/0361-Avoid-hopper-searches-if-there-are-no-items.patch b/patches/unapplied/server/0361-Avoid-hopper-searches-if-there-are-no-items.patch similarity index 100% rename from patches/server/0361-Avoid-hopper-searches-if-there-are-no-items.patch rename to patches/unapplied/server/0361-Avoid-hopper-searches-if-there-are-no-items.patch diff --git a/patches/server/0362-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/unapplied/server/0362-Bees-get-gravity-in-void.-Fixes-MC-167279.patch similarity index 100% rename from patches/server/0362-Bees-get-gravity-in-void.-Fixes-MC-167279.patch rename to patches/unapplied/server/0362-Bees-get-gravity-in-void.-Fixes-MC-167279.patch diff --git a/patches/server/0363-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/unapplied/server/0363-Optimise-getChunkAt-calls-for-loaded-chunks.patch similarity index 100% rename from patches/server/0363-Optimise-getChunkAt-calls-for-loaded-chunks.patch rename to patches/unapplied/server/0363-Optimise-getChunkAt-calls-for-loaded-chunks.patch diff --git a/patches/server/0364-Add-debug-for-sync-chunk-loads.patch b/patches/unapplied/server/0364-Add-debug-for-sync-chunk-loads.patch similarity index 100% rename from patches/server/0364-Add-debug-for-sync-chunk-loads.patch rename to patches/unapplied/server/0364-Add-debug-for-sync-chunk-loads.patch diff --git a/patches/server/0365-Remove-garbage-Java-version-check.patch b/patches/unapplied/server/0365-Remove-garbage-Java-version-check.patch similarity index 100% rename from patches/server/0365-Remove-garbage-Java-version-check.patch rename to patches/unapplied/server/0365-Remove-garbage-Java-version-check.patch diff --git a/patches/server/0366-Add-ThrownEggHatchEvent.patch b/patches/unapplied/server/0366-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/server/0366-Add-ThrownEggHatchEvent.patch rename to patches/unapplied/server/0366-Add-ThrownEggHatchEvent.patch diff --git a/patches/server/0367-Entity-Jump-API.patch b/patches/unapplied/server/0367-Entity-Jump-API.patch similarity index 100% rename from patches/server/0367-Entity-Jump-API.patch rename to patches/unapplied/server/0367-Entity-Jump-API.patch diff --git a/patches/server/0368-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/unapplied/server/0368-Add-option-to-nerf-pigmen-from-nether-portals.patch similarity index 100% rename from patches/server/0368-Add-option-to-nerf-pigmen-from-nether-portals.patch rename to patches/unapplied/server/0368-Add-option-to-nerf-pigmen-from-nether-portals.patch diff --git a/patches/server/0369-Make-the-GUI-graph-fancier.patch b/patches/unapplied/server/0369-Make-the-GUI-graph-fancier.patch similarity index 100% rename from patches/server/0369-Make-the-GUI-graph-fancier.patch rename to patches/unapplied/server/0369-Make-the-GUI-graph-fancier.patch diff --git a/patches/server/0370-add-hand-to-BlockMultiPlaceEvent.patch b/patches/unapplied/server/0370-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/server/0370-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/unapplied/server/0370-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/server/0371-Validate-tripwire-hook-placement-before-update.patch b/patches/unapplied/server/0371-Validate-tripwire-hook-placement-before-update.patch similarity index 100% rename from patches/server/0371-Validate-tripwire-hook-placement-before-update.patch rename to patches/unapplied/server/0371-Validate-tripwire-hook-placement-before-update.patch diff --git a/patches/server/0372-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/unapplied/server/0372-Add-option-to-allow-iron-golems-to-spawn-in-air.patch similarity index 100% rename from patches/server/0372-Add-option-to-allow-iron-golems-to-spawn-in-air.patch rename to patches/unapplied/server/0372-Add-option-to-allow-iron-golems-to-spawn-in-air.patch diff --git a/patches/server/0373-Configurable-chance-of-villager-zombie-infection.patch b/patches/unapplied/server/0373-Configurable-chance-of-villager-zombie-infection.patch similarity index 100% rename from patches/server/0373-Configurable-chance-of-villager-zombie-infection.patch rename to patches/unapplied/server/0373-Configurable-chance-of-villager-zombie-infection.patch diff --git a/patches/server/0374-Optimise-Chunk-getFluid.patch b/patches/unapplied/server/0374-Optimise-Chunk-getFluid.patch similarity index 100% rename from patches/server/0374-Optimise-Chunk-getFluid.patch rename to patches/unapplied/server/0374-Optimise-Chunk-getFluid.patch diff --git a/patches/server/0375-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/unapplied/server/0375-Set-spigots-verbose-world-setting-to-false-by-def.patch similarity index 100% rename from patches/server/0375-Set-spigots-verbose-world-setting-to-false-by-def.patch rename to patches/unapplied/server/0375-Set-spigots-verbose-world-setting-to-false-by-def.patch diff --git a/patches/server/0376-Add-tick-times-API-and-mspt-command.patch b/patches/unapplied/server/0376-Add-tick-times-API-and-mspt-command.patch similarity index 100% rename from patches/server/0376-Add-tick-times-API-and-mspt-command.patch rename to patches/unapplied/server/0376-Add-tick-times-API-and-mspt-command.patch diff --git a/patches/server/0377-Expose-MinecraftServer-isRunning.patch b/patches/unapplied/server/0377-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/server/0377-Expose-MinecraftServer-isRunning.patch rename to patches/unapplied/server/0377-Expose-MinecraftServer-isRunning.patch diff --git a/patches/server/0378-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/unapplied/server/0378-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/server/0378-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/unapplied/server/0378-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/server/0379-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/unapplied/server/0379-Pillager-patrol-spawn-settings-and-per-player-option.patch similarity index 100% rename from patches/server/0379-Pillager-patrol-spawn-settings-and-per-player-option.patch rename to patches/unapplied/server/0379-Pillager-patrol-spawn-settings-and-per-player-option.patch diff --git a/patches/server/0380-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/unapplied/server/0380-Remote-Connections-shouldn-t-hold-up-shutdown.patch similarity index 100% rename from patches/server/0380-Remote-Connections-shouldn-t-hold-up-shutdown.patch rename to patches/unapplied/server/0380-Remote-Connections-shouldn-t-hold-up-shutdown.patch diff --git a/patches/server/0381-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/unapplied/server/0381-Do-not-allow-bees-to-load-chunks-for-beehives.patch similarity index 100% rename from patches/server/0381-Do-not-allow-bees-to-load-chunks-for-beehives.patch rename to patches/unapplied/server/0381-Do-not-allow-bees-to-load-chunks-for-beehives.patch diff --git a/patches/server/0382-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/unapplied/server/0382-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch similarity index 100% rename from patches/server/0382-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch rename to patches/unapplied/server/0382-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch diff --git a/patches/server/0383-Don-t-tick-dead-players.patch b/patches/unapplied/server/0383-Don-t-tick-dead-players.patch similarity index 100% rename from patches/server/0383-Don-t-tick-dead-players.patch rename to patches/unapplied/server/0383-Don-t-tick-dead-players.patch diff --git a/patches/server/0384-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/unapplied/server/0384-Dead-Player-s-shouldn-t-be-able-to-move.patch similarity index 100% rename from patches/server/0384-Dead-Player-s-shouldn-t-be-able-to-move.patch rename to patches/unapplied/server/0384-Dead-Player-s-shouldn-t-be-able-to-move.patch diff --git a/patches/server/0385-Optimize-Collision-to-not-load-chunks.patch b/patches/unapplied/server/0385-Optimize-Collision-to-not-load-chunks.patch similarity index 100% rename from patches/server/0385-Optimize-Collision-to-not-load-chunks.patch rename to patches/unapplied/server/0385-Optimize-Collision-to-not-load-chunks.patch diff --git a/patches/server/0386-Don-t-move-existing-players-to-world-spawn.patch b/patches/unapplied/server/0386-Don-t-move-existing-players-to-world-spawn.patch similarity index 100% rename from patches/server/0386-Don-t-move-existing-players-to-world-spawn.patch rename to patches/unapplied/server/0386-Don-t-move-existing-players-to-world-spawn.patch diff --git a/patches/server/0387-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/unapplied/server/0387-Optimize-GoalSelector-Goal.Flag-Set-operations.patch similarity index 100% rename from patches/server/0387-Optimize-GoalSelector-Goal.Flag-Set-operations.patch rename to patches/unapplied/server/0387-Optimize-GoalSelector-Goal.Flag-Set-operations.patch diff --git a/patches/server/0388-Improved-Watchdog-Support.patch b/patches/unapplied/server/0388-Improved-Watchdog-Support.patch similarity index 100% rename from patches/server/0388-Improved-Watchdog-Support.patch rename to patches/unapplied/server/0388-Improved-Watchdog-Support.patch diff --git a/patches/server/0389-Optimize-Pathfinding.patch b/patches/unapplied/server/0389-Optimize-Pathfinding.patch similarity index 100% rename from patches/server/0389-Optimize-Pathfinding.patch rename to patches/unapplied/server/0389-Optimize-Pathfinding.patch diff --git a/patches/server/0390-Reduce-Either-Optional-allocation.patch b/patches/unapplied/server/0390-Reduce-Either-Optional-allocation.patch similarity index 100% rename from patches/server/0390-Reduce-Either-Optional-allocation.patch rename to patches/unapplied/server/0390-Reduce-Either-Optional-allocation.patch diff --git a/patches/server/0391-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/unapplied/server/0391-Reduce-memory-footprint-of-NBTTagCompound.patch similarity index 100% rename from patches/server/0391-Reduce-memory-footprint-of-NBTTagCompound.patch rename to patches/unapplied/server/0391-Reduce-memory-footprint-of-NBTTagCompound.patch diff --git a/patches/server/0392-Prevent-opening-inventories-when-frozen.patch b/patches/unapplied/server/0392-Prevent-opening-inventories-when-frozen.patch similarity index 100% rename from patches/server/0392-Prevent-opening-inventories-when-frozen.patch rename to patches/unapplied/server/0392-Prevent-opening-inventories-when-frozen.patch diff --git a/patches/server/0393-Optimise-ArraySetSorted-removeIf.patch b/patches/unapplied/server/0393-Optimise-ArraySetSorted-removeIf.patch similarity index 100% rename from patches/server/0393-Optimise-ArraySetSorted-removeIf.patch rename to patches/unapplied/server/0393-Optimise-ArraySetSorted-removeIf.patch diff --git a/patches/server/0394-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/unapplied/server/0394-Don-t-run-entity-collision-code-if-not-needed.patch similarity index 100% rename from patches/server/0394-Don-t-run-entity-collision-code-if-not-needed.patch rename to patches/unapplied/server/0394-Don-t-run-entity-collision-code-if-not-needed.patch diff --git a/patches/server/0395-Implement-Player-Client-Options-API.patch b/patches/unapplied/server/0395-Implement-Player-Client-Options-API.patch similarity index 100% rename from patches/server/0395-Implement-Player-Client-Options-API.patch rename to patches/unapplied/server/0395-Implement-Player-Client-Options-API.patch diff --git a/patches/server/0396-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/unapplied/server/0396-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch similarity index 100% rename from patches/server/0396-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch rename to patches/unapplied/server/0396-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch diff --git a/patches/server/0397-Broadcast-join-message-to-console.patch b/patches/unapplied/server/0397-Broadcast-join-message-to-console.patch similarity index 100% rename from patches/server/0397-Broadcast-join-message-to-console.patch rename to patches/unapplied/server/0397-Broadcast-join-message-to-console.patch diff --git a/patches/server/0398-Fix-Chunk-Post-Processing-deadlock-risk.patch b/patches/unapplied/server/0398-Fix-Chunk-Post-Processing-deadlock-risk.patch similarity index 100% rename from patches/server/0398-Fix-Chunk-Post-Processing-deadlock-risk.patch rename to patches/unapplied/server/0398-Fix-Chunk-Post-Processing-deadlock-risk.patch diff --git a/patches/server/0399-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/unapplied/server/0399-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch similarity index 100% rename from patches/server/0399-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch rename to patches/unapplied/server/0399-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch diff --git a/patches/server/0400-Load-Chunks-for-Login-Asynchronously.patch b/patches/unapplied/server/0400-Load-Chunks-for-Login-Asynchronously.patch similarity index 100% rename from patches/server/0400-Load-Chunks-for-Login-Asynchronously.patch rename to patches/unapplied/server/0400-Load-Chunks-for-Login-Asynchronously.patch diff --git a/patches/server/0401-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/unapplied/server/0401-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 100% rename from patches/server/0401-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to patches/unapplied/server/0401-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch diff --git a/patches/server/0402-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/unapplied/server/0402-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from patches/server/0402-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/unapplied/server/0402-Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/patches/server/0403-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/unapplied/server/0403-Don-t-fire-BlockFade-on-worldgen-threads.patch similarity index 100% rename from patches/server/0403-Don-t-fire-BlockFade-on-worldgen-threads.patch rename to patches/unapplied/server/0403-Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/patches/server/0404-Add-phantom-creative-and-insomniac-controls.patch b/patches/unapplied/server/0404-Add-phantom-creative-and-insomniac-controls.patch similarity index 100% rename from patches/server/0404-Add-phantom-creative-and-insomniac-controls.patch rename to patches/unapplied/server/0404-Add-phantom-creative-and-insomniac-controls.patch diff --git a/patches/server/0405-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/unapplied/server/0405-Fix-numerous-item-duplication-issues-and-teleport-is.patch similarity index 100% rename from patches/server/0405-Fix-numerous-item-duplication-issues-and-teleport-is.patch rename to patches/unapplied/server/0405-Fix-numerous-item-duplication-issues-and-teleport-is.patch diff --git a/patches/server/0406-Villager-Restocks-API.patch b/patches/unapplied/server/0406-Villager-Restocks-API.patch similarity index 100% rename from patches/server/0406-Villager-Restocks-API.patch rename to patches/unapplied/server/0406-Villager-Restocks-API.patch diff --git a/patches/server/0407-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/unapplied/server/0407-Validate-PickItem-Packet-and-kick-for-invalid.patch similarity index 100% rename from patches/server/0407-Validate-PickItem-Packet-and-kick-for-invalid.patch rename to patches/unapplied/server/0407-Validate-PickItem-Packet-and-kick-for-invalid.patch diff --git a/patches/server/0408-Expose-game-version.patch b/patches/unapplied/server/0408-Expose-game-version.patch similarity index 100% rename from patches/server/0408-Expose-game-version.patch rename to patches/unapplied/server/0408-Expose-game-version.patch diff --git a/patches/server/0409-Optimize-Voxel-Shape-Merging.patch b/patches/unapplied/server/0409-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/0409-Optimize-Voxel-Shape-Merging.patch rename to patches/unapplied/server/0409-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/0410-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/unapplied/server/0410-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 100% rename from patches/server/0410-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to patches/unapplied/server/0410-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch diff --git a/patches/server/0411-misc-debugging-dumps.patch b/patches/unapplied/server/0411-misc-debugging-dumps.patch similarity index 100% rename from patches/server/0411-misc-debugging-dumps.patch rename to patches/unapplied/server/0411-misc-debugging-dumps.patch diff --git a/patches/server/0412-Prevent-teleporting-dead-entities.patch b/patches/unapplied/server/0412-Prevent-teleporting-dead-entities.patch similarity index 100% rename from patches/server/0412-Prevent-teleporting-dead-entities.patch rename to patches/unapplied/server/0412-Prevent-teleporting-dead-entities.patch diff --git a/patches/server/0413-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/unapplied/server/0413-Deobfuscate-stacktraces-in-log-messages-crash-report.patch similarity index 100% rename from patches/server/0413-Deobfuscate-stacktraces-in-log-messages-crash-report.patch rename to patches/unapplied/server/0413-Deobfuscate-stacktraces-in-log-messages-crash-report.patch diff --git a/patches/server/0414-Implement-Mob-Goal-API.patch b/patches/unapplied/server/0414-Implement-Mob-Goal-API.patch similarity index 100% rename from patches/server/0414-Implement-Mob-Goal-API.patch rename to patches/unapplied/server/0414-Implement-Mob-Goal-API.patch diff --git a/patches/server/0415-Add-villager-reputation-API.patch b/patches/unapplied/server/0415-Add-villager-reputation-API.patch similarity index 100% rename from patches/server/0415-Add-villager-reputation-API.patch rename to patches/unapplied/server/0415-Add-villager-reputation-API.patch diff --git a/patches/server/0416-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/unapplied/server/0416-Option-for-maximum-exp-value-when-merging-orbs.patch similarity index 100% rename from patches/server/0416-Option-for-maximum-exp-value-when-merging-orbs.patch rename to patches/unapplied/server/0416-Option-for-maximum-exp-value-when-merging-orbs.patch diff --git a/patches/server/0417-ExperienceOrbMergeEvent.patch b/patches/unapplied/server/0417-ExperienceOrbMergeEvent.patch similarity index 100% rename from patches/server/0417-ExperienceOrbMergeEvent.patch rename to patches/unapplied/server/0417-ExperienceOrbMergeEvent.patch diff --git a/patches/server/0418-Fix-PotionEffect-ignores-icon-flag.patch b/patches/unapplied/server/0418-Fix-PotionEffect-ignores-icon-flag.patch similarity index 100% rename from patches/server/0418-Fix-PotionEffect-ignores-icon-flag.patch rename to patches/unapplied/server/0418-Fix-PotionEffect-ignores-icon-flag.patch diff --git a/patches/server/0419-Optimize-brigadier-child-sorting-performance.patch b/patches/unapplied/server/0419-Optimize-brigadier-child-sorting-performance.patch similarity index 100% rename from patches/server/0419-Optimize-brigadier-child-sorting-performance.patch rename to patches/unapplied/server/0419-Optimize-brigadier-child-sorting-performance.patch diff --git a/patches/server/0420-Potential-bed-API.patch b/patches/unapplied/server/0420-Potential-bed-API.patch similarity index 100% rename from patches/server/0420-Potential-bed-API.patch rename to patches/unapplied/server/0420-Potential-bed-API.patch diff --git a/patches/server/0421-Wait-for-Async-Tasks-during-shutdown.patch b/patches/unapplied/server/0421-Wait-for-Async-Tasks-during-shutdown.patch similarity index 100% rename from patches/server/0421-Wait-for-Async-Tasks-during-shutdown.patch rename to patches/unapplied/server/0421-Wait-for-Async-Tasks-during-shutdown.patch diff --git a/patches/server/0422-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/unapplied/server/0422-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch similarity index 100% rename from patches/server/0422-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch rename to patches/unapplied/server/0422-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch diff --git a/patches/server/0423-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/unapplied/server/0423-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 100% rename from patches/server/0423-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to patches/unapplied/server/0423-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch diff --git a/patches/server/0424-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/unapplied/server/0424-Reduce-MutableInt-allocations-from-light-engine.patch similarity index 100% rename from patches/server/0424-Reduce-MutableInt-allocations-from-light-engine.patch rename to patches/unapplied/server/0424-Reduce-MutableInt-allocations-from-light-engine.patch diff --git a/patches/server/0425-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/unapplied/server/0425-Reduce-allocation-of-Vec3D-by-entity-tracker.patch similarity index 100% rename from patches/server/0425-Reduce-allocation-of-Vec3D-by-entity-tracker.patch rename to patches/unapplied/server/0425-Reduce-allocation-of-Vec3D-by-entity-tracker.patch diff --git a/patches/server/0426-Ensure-safe-gateway-teleport.patch b/patches/unapplied/server/0426-Ensure-safe-gateway-teleport.patch similarity index 100% rename from patches/server/0426-Ensure-safe-gateway-teleport.patch rename to patches/unapplied/server/0426-Ensure-safe-gateway-teleport.patch diff --git a/patches/server/0427-Add-option-for-console-having-all-permissions.patch b/patches/unapplied/server/0427-Add-option-for-console-having-all-permissions.patch similarity index 100% rename from patches/server/0427-Add-option-for-console-having-all-permissions.patch rename to patches/unapplied/server/0427-Add-option-for-console-having-all-permissions.patch diff --git a/patches/server/0428-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/unapplied/server/0428-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch similarity index 100% rename from patches/server/0428-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch rename to patches/unapplied/server/0428-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch diff --git a/patches/server/0429-Use-distance-map-to-optimise-entity-tracker.patch b/patches/unapplied/server/0429-Use-distance-map-to-optimise-entity-tracker.patch similarity index 100% rename from patches/server/0429-Use-distance-map-to-optimise-entity-tracker.patch rename to patches/unapplied/server/0429-Use-distance-map-to-optimise-entity-tracker.patch diff --git a/patches/server/0430-Optimize-ServerLevels-chunk-level-checking-methods.patch b/patches/unapplied/server/0430-Optimize-ServerLevels-chunk-level-checking-methods.patch similarity index 100% rename from patches/server/0430-Optimize-ServerLevels-chunk-level-checking-methods.patch rename to patches/unapplied/server/0430-Optimize-ServerLevels-chunk-level-checking-methods.patch diff --git a/patches/server/0431-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/patches/unapplied/server/0431-Delay-Chunk-Unloads-based-on-Player-Movement.patch similarity index 100% rename from patches/server/0431-Delay-Chunk-Unloads-based-on-Player-Movement.patch rename to patches/unapplied/server/0431-Delay-Chunk-Unloads-based-on-Player-Movement.patch diff --git a/patches/server/0432-Fix-villager-trading-demand-MC-163962.patch b/patches/unapplied/server/0432-Fix-villager-trading-demand-MC-163962.patch similarity index 100% rename from patches/server/0432-Fix-villager-trading-demand-MC-163962.patch rename to patches/unapplied/server/0432-Fix-villager-trading-demand-MC-163962.patch diff --git a/patches/server/0433-Maps-shouldn-t-load-chunks.patch b/patches/unapplied/server/0433-Maps-shouldn-t-load-chunks.patch similarity index 100% rename from patches/server/0433-Maps-shouldn-t-load-chunks.patch rename to patches/unapplied/server/0433-Maps-shouldn-t-load-chunks.patch diff --git a/patches/server/0434-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/unapplied/server/0434-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch similarity index 100% rename from patches/server/0434-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch rename to patches/unapplied/server/0434-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch diff --git a/patches/server/0435-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/unapplied/server/0435-Fix-missing-chunks-due-to-integer-overflow.patch similarity index 100% rename from patches/server/0435-Fix-missing-chunks-due-to-integer-overflow.patch rename to patches/unapplied/server/0435-Fix-missing-chunks-due-to-integer-overflow.patch diff --git a/patches/server/0436-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/unapplied/server/0436-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 100% rename from patches/server/0436-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to patches/unapplied/server/0436-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch diff --git a/patches/server/0437-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/unapplied/server/0437-Fix-piston-physics-inconsistency-MC-188840.patch similarity index 100% rename from patches/server/0437-Fix-piston-physics-inconsistency-MC-188840.patch rename to patches/unapplied/server/0437-Fix-piston-physics-inconsistency-MC-188840.patch diff --git a/patches/server/0438-Fix-sand-duping.patch b/patches/unapplied/server/0438-Fix-sand-duping.patch similarity index 100% rename from patches/server/0438-Fix-sand-duping.patch rename to patches/unapplied/server/0438-Fix-sand-duping.patch diff --git a/patches/server/0439-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/unapplied/server/0439-Prevent-position-desync-in-playerconnection-causing-.patch similarity index 100% rename from patches/server/0439-Prevent-position-desync-in-playerconnection-causing-.patch rename to patches/unapplied/server/0439-Prevent-position-desync-in-playerconnection-causing-.patch diff --git a/patches/server/0440-Inventory-getHolder-method-without-block-snapshot.patch b/patches/unapplied/server/0440-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/server/0440-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/unapplied/server/0440-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/server/0441-Improve-Arrow-API.patch b/patches/unapplied/server/0441-Improve-Arrow-API.patch similarity index 100% rename from patches/server/0441-Improve-Arrow-API.patch rename to patches/unapplied/server/0441-Improve-Arrow-API.patch diff --git a/patches/server/0442-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/unapplied/server/0442-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/server/0442-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/unapplied/server/0442-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/server/0443-Hide-sync-chunk-writes-behind-flag.patch b/patches/unapplied/server/0443-Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from patches/server/0443-Hide-sync-chunk-writes-behind-flag.patch rename to patches/unapplied/server/0443-Hide-sync-chunk-writes-behind-flag.patch diff --git a/patches/server/0444-Add-permission-for-command-blocks.patch b/patches/unapplied/server/0444-Add-permission-for-command-blocks.patch similarity index 100% rename from patches/server/0444-Add-permission-for-command-blocks.patch rename to patches/unapplied/server/0444-Add-permission-for-command-blocks.patch diff --git a/patches/server/0445-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/unapplied/server/0445-Ensure-Entity-AABB-s-are-never-invalid.patch similarity index 100% rename from patches/server/0445-Ensure-Entity-AABB-s-are-never-invalid.patch rename to patches/unapplied/server/0445-Ensure-Entity-AABB-s-are-never-invalid.patch diff --git a/patches/server/0446-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/unapplied/server/0446-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 100% rename from patches/server/0446-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/unapplied/server/0446-Fix-Per-World-Difficulty-Remembering-Difficulty.patch diff --git a/patches/server/0447-Paper-dumpitem-command.patch b/patches/unapplied/server/0447-Paper-dumpitem-command.patch similarity index 100% rename from patches/server/0447-Paper-dumpitem-command.patch rename to patches/unapplied/server/0447-Paper-dumpitem-command.patch diff --git a/patches/server/0448-Don-t-allow-null-UUID-s-for-chat.patch b/patches/unapplied/server/0448-Don-t-allow-null-UUID-s-for-chat.patch similarity index 100% rename from patches/server/0448-Don-t-allow-null-UUID-s-for-chat.patch rename to patches/unapplied/server/0448-Don-t-allow-null-UUID-s-for-chat.patch diff --git a/patches/server/0449-Improve-Legacy-Component-serialization-size.patch b/patches/unapplied/server/0449-Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from patches/server/0449-Improve-Legacy-Component-serialization-size.patch rename to patches/unapplied/server/0449-Improve-Legacy-Component-serialization-size.patch diff --git a/patches/server/0450-Optimize-Bit-Operations-by-inlining.patch b/patches/unapplied/server/0450-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/0450-Optimize-Bit-Operations-by-inlining.patch rename to patches/unapplied/server/0450-Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/0451-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/unapplied/server/0451-Add-Plugin-Tickets-to-API-Chunk-Methods.patch similarity index 100% rename from patches/server/0451-Add-Plugin-Tickets-to-API-Chunk-Methods.patch rename to patches/unapplied/server/0451-Add-Plugin-Tickets-to-API-Chunk-Methods.patch diff --git a/patches/server/0452-incremental-chunk-and-player-saving.patch b/patches/unapplied/server/0452-incremental-chunk-and-player-saving.patch similarity index 100% rename from patches/server/0452-incremental-chunk-and-player-saving.patch rename to patches/unapplied/server/0452-incremental-chunk-and-player-saving.patch diff --git a/patches/server/0453-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/unapplied/server/0453-Stop-copy-on-write-operations-for-updating-light-dat.patch similarity index 100% rename from patches/server/0453-Stop-copy-on-write-operations-for-updating-light-dat.patch rename to patches/unapplied/server/0453-Stop-copy-on-write-operations-for-updating-light-dat.patch diff --git a/patches/server/0454-Support-old-UUID-format-for-NBT.patch b/patches/unapplied/server/0454-Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/server/0454-Support-old-UUID-format-for-NBT.patch rename to patches/unapplied/server/0454-Support-old-UUID-format-for-NBT.patch diff --git a/patches/server/0455-Clean-up-duplicated-GameProfile-Properties.patch b/patches/unapplied/server/0455-Clean-up-duplicated-GameProfile-Properties.patch similarity index 100% rename from patches/server/0455-Clean-up-duplicated-GameProfile-Properties.patch rename to patches/unapplied/server/0455-Clean-up-duplicated-GameProfile-Properties.patch diff --git a/patches/server/0456-Convert-legacy-attributes-in-Item-Meta.patch b/patches/unapplied/server/0456-Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from patches/server/0456-Convert-legacy-attributes-in-Item-Meta.patch rename to patches/unapplied/server/0456-Convert-legacy-attributes-in-Item-Meta.patch diff --git a/patches/server/0457-Remove-some-streams-from-structures.patch b/patches/unapplied/server/0457-Remove-some-streams-from-structures.patch similarity index 100% rename from patches/server/0457-Remove-some-streams-from-structures.patch rename to patches/unapplied/server/0457-Remove-some-streams-from-structures.patch diff --git a/patches/server/0458-Remove-streams-from-classes-related-villager-gossip.patch b/patches/unapplied/server/0458-Remove-streams-from-classes-related-villager-gossip.patch similarity index 100% rename from patches/server/0458-Remove-streams-from-classes-related-villager-gossip.patch rename to patches/unapplied/server/0458-Remove-streams-from-classes-related-villager-gossip.patch diff --git a/patches/server/0459-Support-components-in-ItemMeta.patch b/patches/unapplied/server/0459-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/server/0459-Support-components-in-ItemMeta.patch rename to patches/unapplied/server/0459-Support-components-in-ItemMeta.patch diff --git a/patches/server/0460-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/unapplied/server/0460-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch similarity index 100% rename from patches/server/0460-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch rename to patches/unapplied/server/0460-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch diff --git a/patches/server/0461-Add-entity-liquid-API.patch b/patches/unapplied/server/0461-Add-entity-liquid-API.patch similarity index 100% rename from patches/server/0461-Add-entity-liquid-API.patch rename to patches/unapplied/server/0461-Add-entity-liquid-API.patch diff --git a/patches/server/0462-Update-itemstack-legacy-name-and-lore.patch b/patches/unapplied/server/0462-Update-itemstack-legacy-name-and-lore.patch similarity index 100% rename from patches/server/0462-Update-itemstack-legacy-name-and-lore.patch rename to patches/unapplied/server/0462-Update-itemstack-legacy-name-and-lore.patch diff --git a/patches/server/0463-Spawn-player-in-correct-world-on-login.patch b/patches/unapplied/server/0463-Spawn-player-in-correct-world-on-login.patch similarity index 100% rename from patches/server/0463-Spawn-player-in-correct-world-on-login.patch rename to patches/unapplied/server/0463-Spawn-player-in-correct-world-on-login.patch diff --git a/patches/server/0464-Add-PrepareResultEvent.patch b/patches/unapplied/server/0464-Add-PrepareResultEvent.patch similarity index 100% rename from patches/server/0464-Add-PrepareResultEvent.patch rename to patches/unapplied/server/0464-Add-PrepareResultEvent.patch diff --git a/patches/server/0465-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/unapplied/server/0465-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 100% rename from patches/server/0465-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/unapplied/server/0465-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch diff --git a/patches/server/0466-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/unapplied/server/0466-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch similarity index 100% rename from patches/server/0466-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch rename to patches/unapplied/server/0466-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch diff --git a/patches/server/0467-Optimize-NetworkManager-Exception-Handling.patch b/patches/unapplied/server/0467-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0467-Optimize-NetworkManager-Exception-Handling.patch rename to patches/unapplied/server/0467-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0468-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/unapplied/server/0468-Optimize-the-advancement-data-player-iteration-to-be.patch similarity index 100% rename from patches/server/0468-Optimize-the-advancement-data-player-iteration-to-be.patch rename to patches/unapplied/server/0468-Optimize-the-advancement-data-player-iteration-to-be.patch diff --git a/patches/server/0469-Fix-arrows-never-despawning-MC-125757.patch b/patches/unapplied/server/0469-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/server/0469-Fix-arrows-never-despawning-MC-125757.patch rename to patches/unapplied/server/0469-Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/0470-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/unapplied/server/0470-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/0470-Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/unapplied/server/0470-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/0471-Move-range-check-for-block-placing-up.patch b/patches/unapplied/server/0471-Move-range-check-for-block-placing-up.patch similarity index 100% rename from patches/server/0471-Move-range-check-for-block-placing-up.patch rename to patches/unapplied/server/0471-Move-range-check-for-block-placing-up.patch diff --git a/patches/server/0472-Fix-SPIGOT-5989.patch b/patches/unapplied/server/0472-Fix-SPIGOT-5989.patch similarity index 100% rename from patches/server/0472-Fix-SPIGOT-5989.patch rename to patches/unapplied/server/0472-Fix-SPIGOT-5989.patch diff --git a/patches/server/0473-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/unapplied/server/0473-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/0473-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/unapplied/server/0473-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/0474-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/unapplied/server/0474-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/server/0474-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/unapplied/server/0474-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/0475-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/unapplied/server/0475-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/0475-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/unapplied/server/0475-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0476-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/unapplied/server/0476-Add-missing-strikeLighting-call-to-World-spigot-stri.patch similarity index 100% rename from patches/server/0476-Add-missing-strikeLighting-call-to-World-spigot-stri.patch rename to patches/unapplied/server/0476-Add-missing-strikeLighting-call-to-World-spigot-stri.patch diff --git a/patches/server/0477-Fix-some-rails-connecting-improperly.patch b/patches/unapplied/server/0477-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/0477-Fix-some-rails-connecting-improperly.patch rename to patches/unapplied/server/0477-Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/0478-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/unapplied/server/0478-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0478-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/unapplied/server/0478-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0479-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/unapplied/server/0479-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/server/0479-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/unapplied/server/0479-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/server/0480-Brand-support.patch b/patches/unapplied/server/0480-Brand-support.patch similarity index 100% rename from patches/server/0480-Brand-support.patch rename to patches/unapplied/server/0480-Brand-support.patch diff --git a/patches/server/0481-Add-setMaxPlayers-API.patch b/patches/unapplied/server/0481-Add-setMaxPlayers-API.patch similarity index 100% rename from patches/server/0481-Add-setMaxPlayers-API.patch rename to patches/unapplied/server/0481-Add-setMaxPlayers-API.patch diff --git a/patches/server/0482-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/unapplied/server/0482-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0482-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/unapplied/server/0482-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0483-Don-t-require-FACING-data.patch b/patches/unapplied/server/0483-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0483-Don-t-require-FACING-data.patch rename to patches/unapplied/server/0483-Don-t-require-FACING-data.patch diff --git a/patches/server/0484-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/unapplied/server/0484-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 100% rename from patches/server/0484-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/unapplied/server/0484-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch diff --git a/patches/server/0485-Add-moon-phase-API.patch b/patches/unapplied/server/0485-Add-moon-phase-API.patch similarity index 100% rename from patches/server/0485-Add-moon-phase-API.patch rename to patches/unapplied/server/0485-Add-moon-phase-API.patch diff --git a/patches/server/0486-Improve-Chunk-Status-Transition-Speed.patch b/patches/unapplied/server/0486-Improve-Chunk-Status-Transition-Speed.patch similarity index 100% rename from patches/server/0486-Improve-Chunk-Status-Transition-Speed.patch rename to patches/unapplied/server/0486-Improve-Chunk-Status-Transition-Speed.patch diff --git a/patches/server/0487-Prevent-headless-pistons-from-being-created.patch b/patches/unapplied/server/0487-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/0487-Prevent-headless-pistons-from-being-created.patch rename to patches/unapplied/server/0487-Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/0488-Add-BellRingEvent.patch b/patches/unapplied/server/0488-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0488-Add-BellRingEvent.patch rename to patches/unapplied/server/0488-Add-BellRingEvent.patch diff --git a/patches/server/0489-Add-zombie-targets-turtle-egg-config.patch b/patches/unapplied/server/0489-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from patches/server/0489-Add-zombie-targets-turtle-egg-config.patch rename to patches/unapplied/server/0489-Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/server/0490-Buffer-joins-to-world.patch b/patches/unapplied/server/0490-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0490-Buffer-joins-to-world.patch rename to patches/unapplied/server/0490-Buffer-joins-to-world.patch diff --git a/patches/server/0491-Eigencraft-redstone-implementation.patch b/patches/unapplied/server/0491-Eigencraft-redstone-implementation.patch similarity index 100% rename from patches/server/0491-Eigencraft-redstone-implementation.patch rename to patches/unapplied/server/0491-Eigencraft-redstone-implementation.patch diff --git a/patches/server/0492-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/unapplied/server/0492-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0492-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/unapplied/server/0492-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0493-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/unapplied/server/0493-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from patches/server/0493-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/unapplied/server/0493-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/patches/server/0494-Fix-CraftTeam-null-check.patch b/patches/unapplied/server/0494-Fix-CraftTeam-null-check.patch similarity index 100% rename from patches/server/0494-Fix-CraftTeam-null-check.patch rename to patches/unapplied/server/0494-Fix-CraftTeam-null-check.patch diff --git a/patches/server/0495-Add-more-Evoker-API.patch b/patches/unapplied/server/0495-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0495-Add-more-Evoker-API.patch rename to patches/unapplied/server/0495-Add-more-Evoker-API.patch diff --git a/patches/server/0496-Add-methods-to-get-translation-keys.patch b/patches/unapplied/server/0496-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/server/0496-Add-methods-to-get-translation-keys.patch rename to patches/unapplied/server/0496-Add-methods-to-get-translation-keys.patch diff --git a/patches/server/0497-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/unapplied/server/0497-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0497-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/unapplied/server/0497-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0498-Cache-block-data-strings.patch b/patches/unapplied/server/0498-Cache-block-data-strings.patch similarity index 100% rename from patches/server/0498-Cache-block-data-strings.patch rename to patches/unapplied/server/0498-Cache-block-data-strings.patch diff --git a/patches/server/0499-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/unapplied/server/0499-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 100% rename from patches/server/0499-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to patches/unapplied/server/0499-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch diff --git a/patches/server/0500-Add-additional-open-container-api-to-HumanEntity.patch b/patches/unapplied/server/0500-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/server/0500-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/unapplied/server/0500-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/server/0501-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/unapplied/server/0501-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/server/0501-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/unapplied/server/0501-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/server/0502-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/unapplied/server/0502-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 100% rename from patches/server/0502-Extend-block-drop-capture-to-capture-all-items-added.patch rename to patches/unapplied/server/0502-Extend-block-drop-capture-to-capture-all-items-added.patch diff --git a/patches/server/0503-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/unapplied/server/0503-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch similarity index 100% rename from patches/server/0503-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch rename to patches/unapplied/server/0503-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch diff --git a/patches/server/0504-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/unapplied/server/0504-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/server/0504-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/unapplied/server/0504-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/server/0505-Lazily-track-plugin-scoreboards-by-default.patch b/patches/unapplied/server/0505-Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/server/0505-Lazily-track-plugin-scoreboards-by-default.patch rename to patches/unapplied/server/0505-Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/server/0506-Entity-isTicking.patch b/patches/unapplied/server/0506-Entity-isTicking.patch similarity index 100% rename from patches/server/0506-Entity-isTicking.patch rename to patches/unapplied/server/0506-Entity-isTicking.patch diff --git a/patches/server/0507-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/unapplied/server/0507-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from patches/server/0507-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to patches/unapplied/server/0507-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/patches/server/0508-Fix-Concurrency-issue-in-WeightedList.patch b/patches/unapplied/server/0508-Fix-Concurrency-issue-in-WeightedList.patch similarity index 100% rename from patches/server/0508-Fix-Concurrency-issue-in-WeightedList.patch rename to patches/unapplied/server/0508-Fix-Concurrency-issue-in-WeightedList.patch diff --git a/patches/server/0509-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/unapplied/server/0509-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/0509-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/unapplied/server/0509-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/0510-Fix-for-large-move-vectors-crashing-server.patch b/patches/unapplied/server/0510-Fix-for-large-move-vectors-crashing-server.patch similarity index 100% rename from patches/server/0510-Fix-for-large-move-vectors-crashing-server.patch rename to patches/unapplied/server/0510-Fix-for-large-move-vectors-crashing-server.patch diff --git a/patches/server/0511-Optimise-getType-calls.patch b/patches/unapplied/server/0511-Optimise-getType-calls.patch similarity index 100% rename from patches/server/0511-Optimise-getType-calls.patch rename to patches/unapplied/server/0511-Optimise-getType-calls.patch diff --git a/patches/server/0512-Villager-resetOffers.patch b/patches/unapplied/server/0512-Villager-resetOffers.patch similarity index 100% rename from patches/server/0512-Villager-resetOffers.patch rename to patches/unapplied/server/0512-Villager-resetOffers.patch diff --git a/patches/server/0513-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/unapplied/server/0513-Improve-inlinig-for-some-hot-IBlockData-methods.patch similarity index 100% rename from patches/server/0513-Improve-inlinig-for-some-hot-IBlockData-methods.patch rename to patches/unapplied/server/0513-Improve-inlinig-for-some-hot-IBlockData-methods.patch diff --git a/patches/server/0514-Retain-block-place-order-when-capturing-blockstates.patch b/patches/unapplied/server/0514-Retain-block-place-order-when-capturing-blockstates.patch similarity index 100% rename from patches/server/0514-Retain-block-place-order-when-capturing-blockstates.patch rename to patches/unapplied/server/0514-Retain-block-place-order-when-capturing-blockstates.patch diff --git a/patches/server/0515-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/unapplied/server/0515-Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from patches/server/0515-Reduce-blockpos-allocation-from-pathfinding.patch rename to patches/unapplied/server/0515-Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/patches/server/0516-Fix-item-locations-dropped-from-campfires.patch b/patches/unapplied/server/0516-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/0516-Fix-item-locations-dropped-from-campfires.patch rename to patches/unapplied/server/0516-Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/0517-Player-elytra-boost-API.patch b/patches/unapplied/server/0517-Player-elytra-boost-API.patch similarity index 100% rename from patches/server/0517-Player-elytra-boost-API.patch rename to patches/unapplied/server/0517-Player-elytra-boost-API.patch diff --git a/patches/server/0518-Fixed-TileEntityBell-memory-leak.patch b/patches/unapplied/server/0518-Fixed-TileEntityBell-memory-leak.patch similarity index 100% rename from patches/server/0518-Fixed-TileEntityBell-memory-leak.patch rename to patches/unapplied/server/0518-Fixed-TileEntityBell-memory-leak.patch diff --git a/patches/server/0519-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/unapplied/server/0519-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 100% rename from patches/server/0519-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to patches/unapplied/server/0519-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/patches/server/0520-Add-getOfflinePlayerIfCached-String.patch b/patches/unapplied/server/0520-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/server/0520-Add-getOfflinePlayerIfCached-String.patch rename to patches/unapplied/server/0520-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/server/0521-Add-ignore-discounts-API.patch b/patches/unapplied/server/0521-Add-ignore-discounts-API.patch similarity index 100% rename from patches/server/0521-Add-ignore-discounts-API.patch rename to patches/unapplied/server/0521-Add-ignore-discounts-API.patch diff --git a/patches/server/0522-Toggle-for-removing-existing-dragon.patch b/patches/unapplied/server/0522-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from patches/server/0522-Toggle-for-removing-existing-dragon.patch rename to patches/unapplied/server/0522-Toggle-for-removing-existing-dragon.patch diff --git a/patches/server/0523-Fix-client-lag-on-advancement-loading.patch b/patches/unapplied/server/0523-Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from patches/server/0523-Fix-client-lag-on-advancement-loading.patch rename to patches/unapplied/server/0523-Fix-client-lag-on-advancement-loading.patch diff --git a/patches/server/0524-Item-no-age-no-player-pickup.patch b/patches/unapplied/server/0524-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/server/0524-Item-no-age-no-player-pickup.patch rename to patches/unapplied/server/0524-Item-no-age-no-player-pickup.patch diff --git a/patches/server/0525-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/unapplied/server/0525-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/0525-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/unapplied/server/0525-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/0526-Beacon-API-custom-effect-ranges.patch b/patches/unapplied/server/0526-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/server/0526-Beacon-API-custom-effect-ranges.patch rename to patches/unapplied/server/0526-Beacon-API-custom-effect-ranges.patch diff --git a/patches/server/0527-Add-API-for-quit-reason.patch b/patches/unapplied/server/0527-Add-API-for-quit-reason.patch similarity index 100% rename from patches/server/0527-Add-API-for-quit-reason.patch rename to patches/unapplied/server/0527-Add-API-for-quit-reason.patch diff --git a/patches/server/0528-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/unapplied/server/0528-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from patches/server/0528-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/unapplied/server/0528-Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/server/0529-Significantly-improve-performance-of-the-end-generat.patch b/patches/unapplied/server/0529-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0529-Significantly-improve-performance-of-the-end-generat.patch rename to patches/unapplied/server/0529-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0530-Expose-world-spawn-angle.patch b/patches/unapplied/server/0530-Expose-world-spawn-angle.patch similarity index 100% rename from patches/server/0530-Expose-world-spawn-angle.patch rename to patches/unapplied/server/0530-Expose-world-spawn-angle.patch diff --git a/patches/server/0531-Add-Destroy-Speed-API.patch b/patches/unapplied/server/0531-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0531-Add-Destroy-Speed-API.patch rename to patches/unapplied/server/0531-Add-Destroy-Speed-API.patch diff --git a/patches/server/0532-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/unapplied/server/0532-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/server/0532-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/unapplied/server/0532-Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/server/0533-Add-LivingEntity-clearActiveItem.patch b/patches/unapplied/server/0533-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0533-Add-LivingEntity-clearActiveItem.patch rename to patches/unapplied/server/0533-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0534-Add-PlayerItemCooldownEvent.patch b/patches/unapplied/server/0534-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0534-Add-PlayerItemCooldownEvent.patch rename to patches/unapplied/server/0534-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0535-More-lightning-API.patch b/patches/unapplied/server/0535-More-lightning-API.patch similarity index 100% rename from patches/server/0535-More-lightning-API.patch rename to patches/unapplied/server/0535-More-lightning-API.patch diff --git a/patches/server/0536-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/unapplied/server/0536-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 100% rename from patches/server/0536-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/unapplied/server/0536-Climbing-should-not-bypass-cramming-gamerule.patch diff --git a/patches/server/0537-Added-missing-default-perms-for-commands.patch b/patches/unapplied/server/0537-Added-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0537-Added-missing-default-perms-for-commands.patch rename to patches/unapplied/server/0537-Added-missing-default-perms-for-commands.patch diff --git a/patches/server/0538-Add-PlayerShearBlockEvent.patch b/patches/unapplied/server/0538-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0538-Add-PlayerShearBlockEvent.patch rename to patches/unapplied/server/0538-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0539-Fix-curing-zombie-villager-discount-exploit.patch b/patches/unapplied/server/0539-Fix-curing-zombie-villager-discount-exploit.patch similarity index 100% rename from patches/server/0539-Fix-curing-zombie-villager-discount-exploit.patch rename to patches/unapplied/server/0539-Fix-curing-zombie-villager-discount-exploit.patch diff --git a/patches/server/0540-Limit-recipe-packets.patch b/patches/unapplied/server/0540-Limit-recipe-packets.patch similarity index 100% rename from patches/server/0540-Limit-recipe-packets.patch rename to patches/unapplied/server/0540-Limit-recipe-packets.patch diff --git a/patches/server/0541-Fix-CraftSound-backwards-compatibility.patch b/patches/unapplied/server/0541-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0541-Fix-CraftSound-backwards-compatibility.patch rename to patches/unapplied/server/0541-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0542-MC-4-Fix-item-position-desync.patch b/patches/unapplied/server/0542-MC-4-Fix-item-position-desync.patch similarity index 100% rename from patches/server/0542-MC-4-Fix-item-position-desync.patch rename to patches/unapplied/server/0542-MC-4-Fix-item-position-desync.patch diff --git a/patches/server/0543-Player-Chunk-Load-Unload-Events.patch b/patches/unapplied/server/0543-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/server/0543-Player-Chunk-Load-Unload-Events.patch rename to patches/unapplied/server/0543-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/server/0544-Optimize-Dynamic-get-Missing-Keys.patch b/patches/unapplied/server/0544-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0544-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/unapplied/server/0544-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0545-Expose-LivingEntity-hurt-direction.patch b/patches/unapplied/server/0545-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0545-Expose-LivingEntity-hurt-direction.patch rename to patches/unapplied/server/0545-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0546-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/unapplied/server/0546-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/0546-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/unapplied/server/0546-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/0547-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/unapplied/server/0547-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/server/0547-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/unapplied/server/0547-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/server/0548-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/unapplied/server/0548-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0548-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/unapplied/server/0548-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/0549-Implement-TargetHitEvent.patch b/patches/unapplied/server/0549-Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/0549-Implement-TargetHitEvent.patch rename to patches/unapplied/server/0549-Implement-TargetHitEvent.patch diff --git a/patches/server/0550-Additional-Block-Material-API-s.patch b/patches/unapplied/server/0550-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/server/0550-Additional-Block-Material-API-s.patch rename to patches/unapplied/server/0550-Additional-Block-Material-API-s.patch diff --git a/patches/server/0551-Fix-harming-potion-dupe.patch b/patches/unapplied/server/0551-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0551-Fix-harming-potion-dupe.patch rename to patches/unapplied/server/0551-Fix-harming-potion-dupe.patch diff --git a/patches/server/0552-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/unapplied/server/0552-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0552-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/unapplied/server/0552-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0553-Cache-burn-durations.patch b/patches/unapplied/server/0553-Cache-burn-durations.patch similarity index 100% rename from patches/server/0553-Cache-burn-durations.patch rename to patches/unapplied/server/0553-Cache-burn-durations.patch diff --git a/patches/server/0554-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/unapplied/server/0554-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/0554-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/unapplied/server/0554-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/0555-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/unapplied/server/0555-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0555-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/unapplied/server/0555-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0556-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/unapplied/server/0556-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0556-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/unapplied/server/0556-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0557-Fix-interact-event-not-being-called-in-adventure.patch b/patches/unapplied/server/0557-Fix-interact-event-not-being-called-in-adventure.patch similarity index 100% rename from patches/server/0557-Fix-interact-event-not-being-called-in-adventure.patch rename to patches/unapplied/server/0557-Fix-interact-event-not-being-called-in-adventure.patch diff --git a/patches/server/0558-Zombie-API-breaking-doors.patch b/patches/unapplied/server/0558-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0558-Zombie-API-breaking-doors.patch rename to patches/unapplied/server/0558-Zombie-API-breaking-doors.patch diff --git a/patches/server/0559-Fix-nerfed-slime-when-splitting.patch b/patches/unapplied/server/0559-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0559-Fix-nerfed-slime-when-splitting.patch rename to patches/unapplied/server/0559-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0560-Add-EntityLoadCrossbowEvent.patch b/patches/unapplied/server/0560-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0560-Add-EntityLoadCrossbowEvent.patch rename to patches/unapplied/server/0560-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0561-Guardian-beam-workaround.patch b/patches/unapplied/server/0561-Guardian-beam-workaround.patch similarity index 100% rename from patches/server/0561-Guardian-beam-workaround.patch rename to patches/unapplied/server/0561-Guardian-beam-workaround.patch diff --git a/patches/server/0562-Added-WorldGameRuleChangeEvent.patch b/patches/unapplied/server/0562-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/0562-Added-WorldGameRuleChangeEvent.patch rename to patches/unapplied/server/0562-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/server/0563-Added-ServerResourcesReloadedEvent.patch b/patches/unapplied/server/0563-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/0563-Added-ServerResourcesReloadedEvent.patch rename to patches/unapplied/server/0563-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/server/0564-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/unapplied/server/0564-Added-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from patches/server/0564-Added-world-settings-for-mobs-picking-up-loot.patch rename to patches/unapplied/server/0564-Added-world-settings-for-mobs-picking-up-loot.patch diff --git a/patches/server/0565-Implemented-BlockFailedDispenseEvent.patch b/patches/unapplied/server/0565-Implemented-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/server/0565-Implemented-BlockFailedDispenseEvent.patch rename to patches/unapplied/server/0565-Implemented-BlockFailedDispenseEvent.patch diff --git a/patches/server/0566-Added-PlayerLecternPageChangeEvent.patch b/patches/unapplied/server/0566-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/0566-Added-PlayerLecternPageChangeEvent.patch rename to patches/unapplied/server/0566-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/0567-Added-PlayerLoomPatternSelectEvent.patch b/patches/unapplied/server/0567-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/0567-Added-PlayerLoomPatternSelectEvent.patch rename to patches/unapplied/server/0567-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/0568-Configurable-door-breaking-difficulty.patch b/patches/unapplied/server/0568-Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/0568-Configurable-door-breaking-difficulty.patch rename to patches/unapplied/server/0568-Configurable-door-breaking-difficulty.patch diff --git a/patches/server/0569-Empty-commands-shall-not-be-dispatched.patch b/patches/unapplied/server/0569-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/0569-Empty-commands-shall-not-be-dispatched.patch rename to patches/unapplied/server/0569-Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/0570-Implement-API-to-expose-exact-interaction-point.patch b/patches/unapplied/server/0570-Implement-API-to-expose-exact-interaction-point.patch similarity index 100% rename from patches/server/0570-Implement-API-to-expose-exact-interaction-point.patch rename to patches/unapplied/server/0570-Implement-API-to-expose-exact-interaction-point.patch diff --git a/patches/server/0571-Remove-stale-POIs.patch b/patches/unapplied/server/0571-Remove-stale-POIs.patch similarity index 100% rename from patches/server/0571-Remove-stale-POIs.patch rename to patches/unapplied/server/0571-Remove-stale-POIs.patch diff --git a/patches/server/0572-Fix-villager-boat-exploit.patch b/patches/unapplied/server/0572-Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/0572-Fix-villager-boat-exploit.patch rename to patches/unapplied/server/0572-Fix-villager-boat-exploit.patch diff --git a/patches/server/0573-Add-sendOpLevel-API.patch b/patches/unapplied/server/0573-Add-sendOpLevel-API.patch similarity index 100% rename from patches/server/0573-Add-sendOpLevel-API.patch rename to patches/unapplied/server/0573-Add-sendOpLevel-API.patch diff --git a/patches/server/0574-Add-PaperRegistry.patch b/patches/unapplied/server/0574-Add-PaperRegistry.patch similarity index 100% rename from patches/server/0574-Add-PaperRegistry.patch rename to patches/unapplied/server/0574-Add-PaperRegistry.patch diff --git a/patches/server/0575-Add-StructuresLocateEvent.patch b/patches/unapplied/server/0575-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/server/0575-Add-StructuresLocateEvent.patch rename to patches/unapplied/server/0575-Add-StructuresLocateEvent.patch diff --git a/patches/server/0576-Collision-option-for-requiring-a-player-participant.patch b/patches/unapplied/server/0576-Collision-option-for-requiring-a-player-participant.patch similarity index 100% rename from patches/server/0576-Collision-option-for-requiring-a-player-participant.patch rename to patches/unapplied/server/0576-Collision-option-for-requiring-a-player-participant.patch diff --git a/patches/server/0577-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/unapplied/server/0577-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0577-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/unapplied/server/0577-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0578-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/unapplied/server/0578-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0578-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/unapplied/server/0578-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0579-Make-schedule-command-per-world.patch b/patches/unapplied/server/0579-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0579-Make-schedule-command-per-world.patch rename to patches/unapplied/server/0579-Make-schedule-command-per-world.patch diff --git a/patches/server/0580-Configurable-max-leash-distance.patch b/patches/unapplied/server/0580-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0580-Configurable-max-leash-distance.patch rename to patches/unapplied/server/0580-Configurable-max-leash-distance.patch diff --git a/patches/server/0581-Implement-BlockPreDispenseEvent.patch b/patches/unapplied/server/0581-Implement-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0581-Implement-BlockPreDispenseEvent.patch rename to patches/unapplied/server/0581-Implement-BlockPreDispenseEvent.patch diff --git a/patches/server/0582-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/unapplied/server/0582-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0582-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/unapplied/server/0582-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0583-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/unapplied/server/0583-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0583-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/unapplied/server/0583-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0584-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/unapplied/server/0584-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0584-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/unapplied/server/0584-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0585-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/unapplied/server/0585-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0585-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/unapplied/server/0585-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/server/0586-Reset-shield-blocking-on-dimension-change.patch b/patches/unapplied/server/0586-Reset-shield-blocking-on-dimension-change.patch similarity index 100% rename from patches/server/0586-Reset-shield-blocking-on-dimension-change.patch rename to patches/unapplied/server/0586-Reset-shield-blocking-on-dimension-change.patch diff --git a/patches/server/0587-add-DragonEggFormEvent.patch b/patches/unapplied/server/0587-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0587-add-DragonEggFormEvent.patch rename to patches/unapplied/server/0587-add-DragonEggFormEvent.patch diff --git a/patches/server/0588-EntityMoveEvent.patch b/patches/unapplied/server/0588-EntityMoveEvent.patch similarity index 100% rename from patches/server/0588-EntityMoveEvent.patch rename to patches/unapplied/server/0588-EntityMoveEvent.patch diff --git a/patches/server/0589-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/unapplied/server/0589-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from patches/server/0589-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/unapplied/server/0589-added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/patches/server/0590-Inline-shift-direction-fields.patch b/patches/unapplied/server/0590-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0590-Inline-shift-direction-fields.patch rename to patches/unapplied/server/0590-Inline-shift-direction-fields.patch diff --git a/patches/server/0591-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/unapplied/server/0591-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0591-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/unapplied/server/0591-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0592-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/unapplied/server/0592-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0592-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/unapplied/server/0592-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0593-living-entity-allow-attribute-registration.patch b/patches/unapplied/server/0593-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0593-living-entity-allow-attribute-registration.patch rename to patches/unapplied/server/0593-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0594-fix-dead-slime-setSize-invincibility.patch b/patches/unapplied/server/0594-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0594-fix-dead-slime-setSize-invincibility.patch rename to patches/unapplied/server/0594-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0595-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/unapplied/server/0595-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0595-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/unapplied/server/0595-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0596-Add-support-for-hex-color-codes-in-console.patch b/patches/unapplied/server/0596-Add-support-for-hex-color-codes-in-console.patch similarity index 100% rename from patches/server/0596-Add-support-for-hex-color-codes-in-console.patch rename to patches/unapplied/server/0596-Add-support-for-hex-color-codes-in-console.patch diff --git a/patches/server/0597-Expose-Tracked-Players.patch b/patches/unapplied/server/0597-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0597-Expose-Tracked-Players.patch rename to patches/unapplied/server/0597-Expose-Tracked-Players.patch diff --git a/patches/server/0598-Remove-streams-from-SensorNearest.patch b/patches/unapplied/server/0598-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0598-Remove-streams-from-SensorNearest.patch rename to patches/unapplied/server/0598-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0599-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/unapplied/server/0599-Throw-proper-exception-on-empty-JsonList-file.patch similarity index 100% rename from patches/server/0599-Throw-proper-exception-on-empty-JsonList-file.patch rename to patches/unapplied/server/0599-Throw-proper-exception-on-empty-JsonList-file.patch diff --git a/patches/server/0600-Improve-ServerGUI.patch b/patches/unapplied/server/0600-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0600-Improve-ServerGUI.patch rename to patches/unapplied/server/0600-Improve-ServerGUI.patch diff --git a/patches/server/0601-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/unapplied/server/0601-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch similarity index 100% rename from patches/server/0601-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch rename to patches/unapplied/server/0601-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch diff --git a/patches/server/0602-fix-converting-txt-to-json-file.patch b/patches/unapplied/server/0602-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0602-fix-converting-txt-to-json-file.patch rename to patches/unapplied/server/0602-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0603-Add-worldborder-events.patch b/patches/unapplied/server/0603-Add-worldborder-events.patch similarity index 100% rename from patches/server/0603-Add-worldborder-events.patch rename to patches/unapplied/server/0603-Add-worldborder-events.patch diff --git a/patches/server/0604-added-PlayerNameEntityEvent.patch b/patches/unapplied/server/0604-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0604-added-PlayerNameEntityEvent.patch rename to patches/unapplied/server/0604-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0605-Prevent-grindstones-from-overstacking-items.patch b/patches/unapplied/server/0605-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0605-Prevent-grindstones-from-overstacking-items.patch rename to patches/unapplied/server/0605-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0606-Add-recipe-to-cook-events.patch b/patches/unapplied/server/0606-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0606-Add-recipe-to-cook-events.patch rename to patches/unapplied/server/0606-Add-recipe-to-cook-events.patch diff --git a/patches/server/0607-Add-Block-isValidTool.patch b/patches/unapplied/server/0607-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0607-Add-Block-isValidTool.patch rename to patches/unapplied/server/0607-Add-Block-isValidTool.patch diff --git a/patches/server/0608-Allow-using-signs-inside-spawn-protection.patch b/patches/unapplied/server/0608-Allow-using-signs-inside-spawn-protection.patch similarity index 100% rename from patches/server/0608-Allow-using-signs-inside-spawn-protection.patch rename to patches/unapplied/server/0608-Allow-using-signs-inside-spawn-protection.patch diff --git a/patches/server/0609-Expand-world-key-API.patch b/patches/unapplied/server/0609-Expand-world-key-API.patch similarity index 100% rename from patches/server/0609-Expand-world-key-API.patch rename to patches/unapplied/server/0609-Expand-world-key-API.patch diff --git a/patches/server/0610-Add-fast-alternative-constructor-for-Rotations.patch b/patches/unapplied/server/0610-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0610-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/unapplied/server/0610-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0611-Item-Rarity-API.patch b/patches/unapplied/server/0611-Item-Rarity-API.patch similarity index 100% rename from patches/server/0611-Item-Rarity-API.patch rename to patches/unapplied/server/0611-Item-Rarity-API.patch diff --git a/patches/server/0612-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/unapplied/server/0612-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/server/0612-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/unapplied/server/0612-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/server/0613-copy-TESign-isEditable-from-snapshots.patch b/patches/unapplied/server/0613-copy-TESign-isEditable-from-snapshots.patch similarity index 100% rename from patches/server/0613-copy-TESign-isEditable-from-snapshots.patch rename to patches/unapplied/server/0613-copy-TESign-isEditable-from-snapshots.patch diff --git a/patches/server/0614-Drop-carried-item-when-player-has-disconnected.patch b/patches/unapplied/server/0614-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0614-Drop-carried-item-when-player-has-disconnected.patch rename to patches/unapplied/server/0614-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0615-forced-whitelist-use-configurable-kick-message.patch b/patches/unapplied/server/0615-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0615-forced-whitelist-use-configurable-kick-message.patch rename to patches/unapplied/server/0615-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0616-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/unapplied/server/0616-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 100% rename from patches/server/0616-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/unapplied/server/0616-Don-t-ignore-result-of-PlayerEditBookEvent.patch diff --git a/patches/server/0617-Entity-load-save-limit-per-chunk.patch b/patches/unapplied/server/0617-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/0617-Entity-load-save-limit-per-chunk.patch rename to patches/unapplied/server/0617-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/0618-Expose-protocol-version.patch b/patches/unapplied/server/0618-Expose-protocol-version.patch similarity index 100% rename from patches/server/0618-Expose-protocol-version.patch rename to patches/unapplied/server/0618-Expose-protocol-version.patch diff --git a/patches/server/0619-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/unapplied/server/0619-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch similarity index 100% rename from patches/server/0619-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch rename to patches/unapplied/server/0619-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch diff --git a/patches/server/0620-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/unapplied/server/0620-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0620-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/unapplied/server/0620-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0621-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/unapplied/server/0621-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 100% rename from patches/server/0621-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/unapplied/server/0621-Fix-PlayerItemConsumeEvent-cancelling-properly.patch diff --git a/patches/server/0622-Add-bypass-host-check.patch b/patches/unapplied/server/0622-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0622-Add-bypass-host-check.patch rename to patches/unapplied/server/0622-Add-bypass-host-check.patch diff --git a/patches/server/0623-Set-area-affect-cloud-rotation.patch b/patches/unapplied/server/0623-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0623-Set-area-affect-cloud-rotation.patch rename to patches/unapplied/server/0623-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0624-add-isDeeplySleeping-to-HumanEntity.patch b/patches/unapplied/server/0624-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0624-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/unapplied/server/0624-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0625-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/unapplied/server/0625-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0625-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/unapplied/server/0625-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0626-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/unapplied/server/0626-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0626-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/unapplied/server/0626-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0627-fix-PigZombieAngerEvent-cancellation.patch b/patches/unapplied/server/0627-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0627-fix-PigZombieAngerEvent-cancellation.patch rename to patches/unapplied/server/0627-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0628-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/unapplied/server/0628-Fix-checkReach-check-for-Shulker-boxes.patch similarity index 100% rename from patches/server/0628-Fix-checkReach-check-for-Shulker-boxes.patch rename to patches/unapplied/server/0628-Fix-checkReach-check-for-Shulker-boxes.patch diff --git a/patches/server/0629-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/unapplied/server/0629-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 100% rename from patches/server/0629-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/unapplied/server/0629-fix-PlayerItemHeldEvent-firing-twice.patch diff --git a/patches/server/0630-Added-PlayerDeepSleepEvent.patch b/patches/unapplied/server/0630-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0630-Added-PlayerDeepSleepEvent.patch rename to patches/unapplied/server/0630-Added-PlayerDeepSleepEvent.patch diff --git a/patches/server/0631-More-World-API.patch b/patches/unapplied/server/0631-More-World-API.patch similarity index 100% rename from patches/server/0631-More-World-API.patch rename to patches/unapplied/server/0631-More-World-API.patch diff --git a/patches/server/0632-Added-PlayerBedFailEnterEvent.patch b/patches/unapplied/server/0632-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0632-Added-PlayerBedFailEnterEvent.patch rename to patches/unapplied/server/0632-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0633-Implement-methods-to-convert-between-Component-and-B.patch b/patches/unapplied/server/0633-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0633-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/unapplied/server/0633-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0634-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/unapplied/server/0634-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 100% rename from patches/server/0634-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/unapplied/server/0634-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch diff --git a/patches/server/0635-Introduce-beacon-activation-deactivation-events.patch b/patches/unapplied/server/0635-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0635-Introduce-beacon-activation-deactivation-events.patch rename to patches/unapplied/server/0635-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0636-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/unapplied/server/0636-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/server/0636-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/unapplied/server/0636-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/server/0637-Add-Channel-initialization-listeners.patch b/patches/unapplied/server/0637-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0637-Add-Channel-initialization-listeners.patch rename to patches/unapplied/server/0637-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0638-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/unapplied/server/0638-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0638-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/unapplied/server/0638-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0639-Add-more-WanderingTrader-API.patch b/patches/unapplied/server/0639-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0639-Add-more-WanderingTrader-API.patch rename to patches/unapplied/server/0639-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0640-Add-EntityBlockStorage-clearEntities.patch b/patches/unapplied/server/0640-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0640-Add-EntityBlockStorage-clearEntities.patch rename to patches/unapplied/server/0640-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0641-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/unapplied/server/0641-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0641-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/unapplied/server/0641-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0642-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/server/0642-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0642-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/unapplied/server/0642-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0643-Inventory-close.patch b/patches/unapplied/server/0643-Inventory-close.patch similarity index 100% rename from patches/server/0643-Inventory-close.patch rename to patches/unapplied/server/0643-Inventory-close.patch diff --git a/patches/server/0644-call-PortalCreateEvent-players-and-end-platform.patch b/patches/unapplied/server/0644-call-PortalCreateEvent-players-and-end-platform.patch similarity index 100% rename from patches/server/0644-call-PortalCreateEvent-players-and-end-platform.patch rename to patches/unapplied/server/0644-call-PortalCreateEvent-players-and-end-platform.patch diff --git a/patches/server/0645-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/unapplied/server/0645-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0645-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/unapplied/server/0645-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0646-Fix-CraftPotionBrewer-cache.patch b/patches/unapplied/server/0646-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/0646-Fix-CraftPotionBrewer-cache.patch rename to patches/unapplied/server/0646-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/0647-Add-basic-Datapack-API.patch b/patches/unapplied/server/0647-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0647-Add-basic-Datapack-API.patch rename to patches/unapplied/server/0647-Add-basic-Datapack-API.patch diff --git a/patches/server/0648-Add-environment-variable-to-disable-server-gui.patch b/patches/unapplied/server/0648-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0648-Add-environment-variable-to-disable-server-gui.patch rename to patches/unapplied/server/0648-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0649-additions-to-PlayerGameModeChangeEvent.patch b/patches/unapplied/server/0649-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/server/0649-additions-to-PlayerGameModeChangeEvent.patch rename to patches/unapplied/server/0649-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/server/0650-ItemStack-repair-check-API.patch b/patches/unapplied/server/0650-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0650-ItemStack-repair-check-API.patch rename to patches/unapplied/server/0650-ItemStack-repair-check-API.patch diff --git a/patches/server/0651-More-Enchantment-API.patch b/patches/unapplied/server/0651-More-Enchantment-API.patch similarity index 100% rename from patches/server/0651-More-Enchantment-API.patch rename to patches/unapplied/server/0651-More-Enchantment-API.patch diff --git a/patches/server/0652-Fix-and-optimise-world-force-upgrading.patch b/patches/unapplied/server/0652-Fix-and-optimise-world-force-upgrading.patch similarity index 100% rename from patches/server/0652-Fix-and-optimise-world-force-upgrading.patch rename to patches/unapplied/server/0652-Fix-and-optimise-world-force-upgrading.patch diff --git a/patches/server/0653-Add-Mob-lookAt-API.patch b/patches/unapplied/server/0653-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0653-Add-Mob-lookAt-API.patch rename to patches/unapplied/server/0653-Add-Mob-lookAt-API.patch diff --git a/patches/server/0654-Add-Unix-domain-socket-support.patch b/patches/unapplied/server/0654-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0654-Add-Unix-domain-socket-support.patch rename to patches/unapplied/server/0654-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0655-Add-EntityInsideBlockEvent.patch b/patches/unapplied/server/0655-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0655-Add-EntityInsideBlockEvent.patch rename to patches/unapplied/server/0655-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0656-Attributes-API-for-item-defaults.patch b/patches/unapplied/server/0656-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0656-Attributes-API-for-item-defaults.patch rename to patches/unapplied/server/0656-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0657-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/unapplied/server/0657-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/server/0657-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/unapplied/server/0657-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/server/0658-More-Lidded-Block-API.patch b/patches/unapplied/server/0658-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0658-More-Lidded-Block-API.patch rename to patches/unapplied/server/0658-More-Lidded-Block-API.patch diff --git a/patches/server/0659-Limit-item-frame-cursors-on-maps.patch b/patches/unapplied/server/0659-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0659-Limit-item-frame-cursors-on-maps.patch rename to patches/unapplied/server/0659-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0660-Add-PlayerKickEvent-causes.patch b/patches/unapplied/server/0660-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/server/0660-Add-PlayerKickEvent-causes.patch rename to patches/unapplied/server/0660-Add-PlayerKickEvent-causes.patch diff --git a/patches/server/0661-Add-PufferFishStateChangeEvent.patch b/patches/unapplied/server/0661-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0661-Add-PufferFishStateChangeEvent.patch rename to patches/unapplied/server/0661-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0662-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/unapplied/server/0662-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0662-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/unapplied/server/0662-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0663-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/unapplied/server/0663-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch similarity index 100% rename from patches/server/0663-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch rename to patches/unapplied/server/0663-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch diff --git a/patches/server/0664-Add-option-to-fix-items-merging-through-walls.patch b/patches/unapplied/server/0664-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0664-Add-option-to-fix-items-merging-through-walls.patch rename to patches/unapplied/server/0664-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0665-Add-BellRevealRaiderEvent.patch b/patches/unapplied/server/0665-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0665-Add-BellRevealRaiderEvent.patch rename to patches/unapplied/server/0665-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0666-Fix-invulnerable-end-crystals.patch b/patches/unapplied/server/0666-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0666-Fix-invulnerable-end-crystals.patch rename to patches/unapplied/server/0666-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0667-Add-ElderGuardianAppearanceEvent.patch b/patches/unapplied/server/0667-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0667-Add-ElderGuardianAppearanceEvent.patch rename to patches/unapplied/server/0667-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0668-Fix-dangerous-end-portal-logic.patch b/patches/unapplied/server/0668-Fix-dangerous-end-portal-logic.patch similarity index 100% rename from patches/server/0668-Fix-dangerous-end-portal-logic.patch rename to patches/unapplied/server/0668-Fix-dangerous-end-portal-logic.patch diff --git a/patches/server/0669-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/unapplied/server/0669-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0669-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/unapplied/server/0669-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0670-Make-item-validations-configurable.patch b/patches/unapplied/server/0670-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0670-Make-item-validations-configurable.patch rename to patches/unapplied/server/0670-Make-item-validations-configurable.patch diff --git a/patches/server/0671-Line-Of-Sight-Changes.patch b/patches/unapplied/server/0671-Line-Of-Sight-Changes.patch similarity index 100% rename from patches/server/0671-Line-Of-Sight-Changes.patch rename to patches/unapplied/server/0671-Line-Of-Sight-Changes.patch diff --git a/patches/server/0672-add-per-world-spawn-limits.patch b/patches/unapplied/server/0672-add-per-world-spawn-limits.patch similarity index 100% rename from patches/server/0672-add-per-world-spawn-limits.patch rename to patches/unapplied/server/0672-add-per-world-spawn-limits.patch diff --git a/patches/server/0673-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/unapplied/server/0673-Fix-PotionSplashEvent-for-water-splash-potions.patch similarity index 100% rename from patches/server/0673-Fix-PotionSplashEvent-for-water-splash-potions.patch rename to patches/unapplied/server/0673-Fix-PotionSplashEvent-for-water-splash-potions.patch diff --git a/patches/server/0674-Add-more-LimitedRegion-API.patch b/patches/unapplied/server/0674-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0674-Add-more-LimitedRegion-API.patch rename to patches/unapplied/server/0674-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0675-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/unapplied/server/0675-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 100% rename from patches/server/0675-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/unapplied/server/0675-Fix-PlayerDropItemEvent-using-wrong-item.patch diff --git a/patches/server/0676-Missing-Entity-Behavior-API.patch b/patches/unapplied/server/0676-Missing-Entity-Behavior-API.patch similarity index 100% rename from patches/server/0676-Missing-Entity-Behavior-API.patch rename to patches/unapplied/server/0676-Missing-Entity-Behavior-API.patch diff --git a/patches/server/0677-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/unapplied/server/0677-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 100% rename from patches/server/0677-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/unapplied/server/0677-Ensure-disconnect-for-book-edit-is-called-on-main.patch diff --git a/patches/server/0678-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/unapplied/server/0678-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0678-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/unapplied/server/0678-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0679-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/unapplied/server/0679-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/server/0679-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/unapplied/server/0679-Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/server/0680-Fix-commands-from-signs-not-firing-command-events.patch b/patches/unapplied/server/0680-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0680-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/unapplied/server/0680-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0681-Adds-PlayerArmSwingEvent.patch b/patches/unapplied/server/0681-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/server/0681-Adds-PlayerArmSwingEvent.patch rename to patches/unapplied/server/0681-Adds-PlayerArmSwingEvent.patch diff --git a/patches/server/0682-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/unapplied/server/0682-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 100% rename from patches/server/0682-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/unapplied/server/0682-Fixes-kick-event-leave-message-not-being-sent.patch diff --git a/patches/server/0683-Add-config-for-mobs-immune-to-default-effects.patch b/patches/unapplied/server/0683-Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/server/0683-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/unapplied/server/0683-Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/server/0684-Fix-incorrect-message-for-outdated-client.patch b/patches/unapplied/server/0684-Fix-incorrect-message-for-outdated-client.patch similarity index 100% rename from patches/server/0684-Fix-incorrect-message-for-outdated-client.patch rename to patches/unapplied/server/0684-Fix-incorrect-message-for-outdated-client.patch diff --git a/patches/server/0685-Don-t-apply-cramming-damage-to-players.patch b/patches/unapplied/server/0685-Don-t-apply-cramming-damage-to-players.patch similarity index 100% rename from patches/server/0685-Don-t-apply-cramming-damage-to-players.patch rename to patches/unapplied/server/0685-Don-t-apply-cramming-damage-to-players.patch diff --git a/patches/server/0686-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/unapplied/server/0686-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0686-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/unapplied/server/0686-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0687-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/unapplied/server/0687-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0687-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/unapplied/server/0687-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0688-Stinger-API.patch b/patches/unapplied/server/0688-Stinger-API.patch similarity index 100% rename from patches/server/0688-Stinger-API.patch rename to patches/unapplied/server/0688-Stinger-API.patch diff --git a/patches/server/0689-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/unapplied/server/0689-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0689-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/unapplied/server/0689-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0690-Add-System.out-err-catcher.patch b/patches/unapplied/server/0690-Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/0690-Add-System.out-err-catcher.patch rename to patches/unapplied/server/0690-Add-System.out-err-catcher.patch diff --git a/patches/server/0691-Fix-test-not-bootstrapping.patch b/patches/unapplied/server/0691-Fix-test-not-bootstrapping.patch similarity index 100% rename from patches/server/0691-Fix-test-not-bootstrapping.patch rename to patches/unapplied/server/0691-Fix-test-not-bootstrapping.patch diff --git a/patches/server/0692-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/unapplied/server/0692-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0692-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/unapplied/server/0692-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0693-Improve-boat-collision-performance.patch b/patches/unapplied/server/0693-Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/0693-Improve-boat-collision-performance.patch rename to patches/unapplied/server/0693-Improve-boat-collision-performance.patch diff --git a/patches/server/0694-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/unapplied/server/0694-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 100% rename from patches/server/0694-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/unapplied/server/0694-Prevent-AFK-kick-while-watching-end-credits.patch diff --git a/patches/server/0695-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/unapplied/server/0695-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0695-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/unapplied/server/0695-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0696-Add-PlayerSetSpawnEvent.patch b/patches/unapplied/server/0696-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/server/0696-Add-PlayerSetSpawnEvent.patch rename to patches/unapplied/server/0696-Add-PlayerSetSpawnEvent.patch diff --git a/patches/server/0697-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/unapplied/server/0697-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0697-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/unapplied/server/0697-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0698-Optimize-entity-tracker-passenger-checks.patch b/patches/unapplied/server/0698-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0698-Optimize-entity-tracker-passenger-checks.patch rename to patches/unapplied/server/0698-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0699-Config-option-for-Piglins-guarding-chests.patch b/patches/unapplied/server/0699-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0699-Config-option-for-Piglins-guarding-chests.patch rename to patches/unapplied/server/0699-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0700-Added-EntityDamageItemEvent.patch b/patches/unapplied/server/0700-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0700-Added-EntityDamageItemEvent.patch rename to patches/unapplied/server/0700-Added-EntityDamageItemEvent.patch diff --git a/patches/server/0701-Optimize-indirect-passenger-iteration.patch b/patches/unapplied/server/0701-Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/server/0701-Optimize-indirect-passenger-iteration.patch rename to patches/unapplied/server/0701-Optimize-indirect-passenger-iteration.patch diff --git a/patches/server/0702-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/unapplied/server/0702-Fix-block-drops-position-losing-precision-millions-o.patch similarity index 100% rename from patches/server/0702-Fix-block-drops-position-losing-precision-millions-o.patch rename to patches/unapplied/server/0702-Fix-block-drops-position-losing-precision-millions-o.patch diff --git a/patches/server/0703-Configurable-item-frame-map-cursor-update-interval.patch b/patches/unapplied/server/0703-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0703-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/unapplied/server/0703-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0704-Make-EntityUnleashEvent-cancellable.patch b/patches/unapplied/server/0704-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0704-Make-EntityUnleashEvent-cancellable.patch rename to patches/unapplied/server/0704-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0705-Clear-bucket-NBT-after-dispense.patch b/patches/unapplied/server/0705-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0705-Clear-bucket-NBT-after-dispense.patch rename to patches/unapplied/server/0705-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0706-Change-EnderEye-target-without-changing-other-things.patch b/patches/unapplied/server/0706-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0706-Change-EnderEye-target-without-changing-other-things.patch rename to patches/unapplied/server/0706-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0707-Add-BlockBreakBlockEvent.patch b/patches/unapplied/server/0707-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0707-Add-BlockBreakBlockEvent.patch rename to patches/unapplied/server/0707-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0708-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/unapplied/server/0708-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0708-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/unapplied/server/0708-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0709-More-CommandBlock-API.patch b/patches/unapplied/server/0709-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0709-More-CommandBlock-API.patch rename to patches/unapplied/server/0709-More-CommandBlock-API.patch diff --git a/patches/server/0710-Add-missing-team-sidebar-display-slots.patch b/patches/unapplied/server/0710-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0710-Add-missing-team-sidebar-display-slots.patch rename to patches/unapplied/server/0710-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0711-Add-back-EntityPortalExitEvent.patch b/patches/unapplied/server/0711-Add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/server/0711-Add-back-EntityPortalExitEvent.patch rename to patches/unapplied/server/0711-Add-back-EntityPortalExitEvent.patch diff --git a/patches/server/0712-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/unapplied/server/0712-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/server/0712-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/unapplied/server/0712-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/server/0713-Get-entity-default-attributes.patch b/patches/unapplied/server/0713-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0713-Get-entity-default-attributes.patch rename to patches/unapplied/server/0713-Get-entity-default-attributes.patch diff --git a/patches/server/0714-Left-handed-API.patch b/patches/unapplied/server/0714-Left-handed-API.patch similarity index 100% rename from patches/server/0714-Left-handed-API.patch rename to patches/unapplied/server/0714-Left-handed-API.patch diff --git a/patches/server/0715-Add-advancement-display-API.patch b/patches/unapplied/server/0715-Add-advancement-display-API.patch similarity index 100% rename from patches/server/0715-Add-advancement-display-API.patch rename to patches/unapplied/server/0715-Add-advancement-display-API.patch diff --git a/patches/server/0716-Add-ItemFactory-getMonsterEgg-API.patch b/patches/unapplied/server/0716-Add-ItemFactory-getMonsterEgg-API.patch similarity index 100% rename from patches/server/0716-Add-ItemFactory-getMonsterEgg-API.patch rename to patches/unapplied/server/0716-Add-ItemFactory-getMonsterEgg-API.patch diff --git a/patches/server/0717-Add-critical-damage-API.patch b/patches/unapplied/server/0717-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0717-Add-critical-damage-API.patch rename to patches/unapplied/server/0717-Add-critical-damage-API.patch diff --git a/patches/server/0718-Fix-issues-with-mob-conversion.patch b/patches/unapplied/server/0718-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0718-Fix-issues-with-mob-conversion.patch rename to patches/unapplied/server/0718-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0719-Add-isCollidable-methods-to-various-places.patch b/patches/unapplied/server/0719-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/0719-Add-isCollidable-methods-to-various-places.patch rename to patches/unapplied/server/0719-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/0720-Goat-ram-API.patch b/patches/unapplied/server/0720-Goat-ram-API.patch similarity index 100% rename from patches/server/0720-Goat-ram-API.patch rename to patches/unapplied/server/0720-Goat-ram-API.patch diff --git a/patches/server/0721-Add-API-for-resetting-a-single-score.patch b/patches/unapplied/server/0721-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0721-Add-API-for-resetting-a-single-score.patch rename to patches/unapplied/server/0721-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0722-Add-Raw-Byte-Entity-Serialization.patch b/patches/unapplied/server/0722-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/server/0722-Add-Raw-Byte-Entity-Serialization.patch rename to patches/unapplied/server/0722-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/server/0723-Vanilla-command-permission-fixes.patch b/patches/unapplied/server/0723-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0723-Vanilla-command-permission-fixes.patch rename to patches/unapplied/server/0723-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0724-Make-CallbackExecutor-strict-again.patch b/patches/unapplied/server/0724-Make-CallbackExecutor-strict-again.patch similarity index 100% rename from patches/server/0724-Make-CallbackExecutor-strict-again.patch rename to patches/unapplied/server/0724-Make-CallbackExecutor-strict-again.patch diff --git a/patches/server/0725-Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/unapplied/server/0725-Do-not-allow-the-server-to-unload-chunks-at-request-.patch similarity index 100% rename from patches/server/0725-Do-not-allow-the-server-to-unload-chunks-at-request-.patch rename to patches/unapplied/server/0725-Do-not-allow-the-server-to-unload-chunks-at-request-.patch diff --git a/patches/server/0726-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/unapplied/server/0726-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 100% rename from patches/server/0726-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/unapplied/server/0726-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch diff --git a/patches/server/0727-Correctly-handle-recursion-for-chunkholder-updates.patch b/patches/unapplied/server/0727-Correctly-handle-recursion-for-chunkholder-updates.patch similarity index 100% rename from patches/server/0727-Correctly-handle-recursion-for-chunkholder-updates.patch rename to patches/unapplied/server/0727-Correctly-handle-recursion-for-chunkholder-updates.patch diff --git a/patches/server/0728-Fix-GameProfileCache-concurrency.patch b/patches/unapplied/server/0728-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0728-Fix-GameProfileCache-concurrency.patch rename to patches/unapplied/server/0728-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0729-Fix-chunks-refusing-to-unload-at-low-TPS.patch b/patches/unapplied/server/0729-Fix-chunks-refusing-to-unload-at-low-TPS.patch similarity index 100% rename from patches/server/0729-Fix-chunks-refusing-to-unload-at-low-TPS.patch rename to patches/unapplied/server/0729-Fix-chunks-refusing-to-unload-at-low-TPS.patch diff --git a/patches/server/0730-Do-not-allow-ticket-level-changes-while-unloading-pl.patch b/patches/unapplied/server/0730-Do-not-allow-ticket-level-changes-while-unloading-pl.patch similarity index 100% rename from patches/server/0730-Do-not-allow-ticket-level-changes-while-unloading-pl.patch rename to patches/unapplied/server/0730-Do-not-allow-ticket-level-changes-while-unloading-pl.patch diff --git a/patches/server/0731-Do-not-allow-ticket-level-changes-when-updating-chun.patch b/patches/unapplied/server/0731-Do-not-allow-ticket-level-changes-when-updating-chun.patch similarity index 100% rename from patches/server/0731-Do-not-allow-ticket-level-changes-when-updating-chun.patch rename to patches/unapplied/server/0731-Do-not-allow-ticket-level-changes-when-updating-chun.patch diff --git a/patches/server/0732-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/unapplied/server/0732-Do-not-submit-profile-lookups-to-worldgen-threads.patch similarity index 100% rename from patches/server/0732-Do-not-submit-profile-lookups-to-worldgen-threads.patch rename to patches/unapplied/server/0732-Do-not-submit-profile-lookups-to-worldgen-threads.patch diff --git a/patches/server/0733-Log-when-the-async-catcher-is-tripped.patch b/patches/unapplied/server/0733-Log-when-the-async-catcher-is-tripped.patch similarity index 100% rename from patches/server/0733-Log-when-the-async-catcher-is-tripped.patch rename to patches/unapplied/server/0733-Log-when-the-async-catcher-is-tripped.patch diff --git a/patches/server/0734-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/unapplied/server/0734-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 100% rename from patches/server/0734-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/unapplied/server/0734-Add-paper-mobcaps-and-paper-playermobcaps.patch diff --git a/patches/server/0735-Prevent-unload-calls-removing-tickets-for-sync-loads.patch b/patches/unapplied/server/0735-Prevent-unload-calls-removing-tickets-for-sync-loads.patch similarity index 100% rename from patches/server/0735-Prevent-unload-calls-removing-tickets-for-sync-loads.patch rename to patches/unapplied/server/0735-Prevent-unload-calls-removing-tickets-for-sync-loads.patch diff --git a/patches/server/0736-Sanitize-ResourceLocation-error-logging.patch b/patches/unapplied/server/0736-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0736-Sanitize-ResourceLocation-error-logging.patch rename to patches/unapplied/server/0736-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0737-Optimise-general-POI-access.patch b/patches/unapplied/server/0737-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/0737-Optimise-general-POI-access.patch rename to patches/unapplied/server/0737-Optimise-general-POI-access.patch diff --git a/patches/server/0738-Allow-controlled-flushing-for-network-manager.patch b/patches/unapplied/server/0738-Allow-controlled-flushing-for-network-manager.patch similarity index 100% rename from patches/server/0738-Allow-controlled-flushing-for-network-manager.patch rename to patches/unapplied/server/0738-Allow-controlled-flushing-for-network-manager.patch diff --git a/patches/server/0739-Add-more-async-catchers.patch b/patches/unapplied/server/0739-Add-more-async-catchers.patch similarity index 100% rename from patches/server/0739-Add-more-async-catchers.patch rename to patches/unapplied/server/0739-Add-more-async-catchers.patch diff --git a/patches/server/0740-Rewrite-entity-bounding-box-lookup-calls.patch b/patches/unapplied/server/0740-Rewrite-entity-bounding-box-lookup-calls.patch similarity index 100% rename from patches/server/0740-Rewrite-entity-bounding-box-lookup-calls.patch rename to patches/unapplied/server/0740-Rewrite-entity-bounding-box-lookup-calls.patch diff --git a/patches/server/0741-Optimise-chunk-tick-iteration.patch b/patches/unapplied/server/0741-Optimise-chunk-tick-iteration.patch similarity index 100% rename from patches/server/0741-Optimise-chunk-tick-iteration.patch rename to patches/unapplied/server/0741-Optimise-chunk-tick-iteration.patch diff --git a/patches/server/0742-Execute-chunk-tasks-mid-tick.patch b/patches/unapplied/server/0742-Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/server/0742-Execute-chunk-tasks-mid-tick.patch rename to patches/unapplied/server/0742-Execute-chunk-tasks-mid-tick.patch diff --git a/patches/server/0743-Do-not-copy-visible-chunks.patch b/patches/unapplied/server/0743-Do-not-copy-visible-chunks.patch similarity index 100% rename from patches/server/0743-Do-not-copy-visible-chunks.patch rename to patches/unapplied/server/0743-Do-not-copy-visible-chunks.patch diff --git a/patches/server/0744-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/unapplied/server/0744-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/0744-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/unapplied/server/0744-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/0745-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/unapplied/server/0745-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/0745-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/unapplied/server/0745-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/0746-Detail-more-information-in-watchdog-dumps.patch b/patches/unapplied/server/0746-Detail-more-information-in-watchdog-dumps.patch similarity index 100% rename from patches/server/0746-Detail-more-information-in-watchdog-dumps.patch rename to patches/unapplied/server/0746-Detail-more-information-in-watchdog-dumps.patch diff --git a/patches/server/0747-Manually-inline-methods-in-BlockPosition.patch b/patches/unapplied/server/0747-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0747-Manually-inline-methods-in-BlockPosition.patch rename to patches/unapplied/server/0747-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0748-Distance-manager-tick-timings.patch b/patches/unapplied/server/0748-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/0748-Distance-manager-tick-timings.patch rename to patches/unapplied/server/0748-Distance-manager-tick-timings.patch diff --git a/patches/server/0749-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/unapplied/server/0749-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0749-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/unapplied/server/0749-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0750-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/unapplied/server/0750-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/0750-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/unapplied/server/0750-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/0751-Add-packet-limiter-config.patch b/patches/unapplied/server/0751-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0751-Add-packet-limiter-config.patch rename to patches/unapplied/server/0751-Add-packet-limiter-config.patch diff --git a/patches/server/0752-Lag-compensate-block-breaking.patch b/patches/unapplied/server/0752-Lag-compensate-block-breaking.patch similarity index 100% rename from patches/server/0752-Lag-compensate-block-breaking.patch rename to patches/unapplied/server/0752-Lag-compensate-block-breaking.patch diff --git a/patches/server/0753-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/unapplied/server/0753-Use-correct-LevelStem-registry-when-loading-default-.patch similarity index 100% rename from patches/server/0753-Use-correct-LevelStem-registry-when-loading-default-.patch rename to patches/unapplied/server/0753-Use-correct-LevelStem-registry-when-loading-default-.patch diff --git a/patches/server/0754-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/unapplied/server/0754-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/0754-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/unapplied/server/0754-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/0755-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/unapplied/server/0755-Consolidate-flush-calls-for-entity-tracker-packets.patch similarity index 100% rename from patches/server/0755-Consolidate-flush-calls-for-entity-tracker-packets.patch rename to patches/unapplied/server/0755-Consolidate-flush-calls-for-entity-tracker-packets.patch diff --git a/patches/server/0756-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/unapplied/server/0756-Don-t-lookup-fluid-state-when-raytracing.patch similarity index 100% rename from patches/server/0756-Don-t-lookup-fluid-state-when-raytracing.patch rename to patches/unapplied/server/0756-Don-t-lookup-fluid-state-when-raytracing.patch diff --git a/patches/server/0757-Time-scoreboard-search.patch b/patches/unapplied/server/0757-Time-scoreboard-search.patch similarity index 100% rename from patches/server/0757-Time-scoreboard-search.patch rename to patches/unapplied/server/0757-Time-scoreboard-search.patch diff --git a/patches/server/0758-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/unapplied/server/0758-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/0758-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/unapplied/server/0758-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/0759-Do-not-run-raytrace-logic-for-AIR.patch b/patches/unapplied/server/0759-Do-not-run-raytrace-logic-for-AIR.patch similarity index 100% rename from patches/server/0759-Do-not-run-raytrace-logic-for-AIR.patch rename to patches/unapplied/server/0759-Do-not-run-raytrace-logic-for-AIR.patch diff --git a/patches/server/0760-Oprimise-map-impl-for-tracked-players.patch b/patches/unapplied/server/0760-Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/server/0760-Oprimise-map-impl-for-tracked-players.patch rename to patches/unapplied/server/0760-Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/server/0761-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/unapplied/server/0761-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0761-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/unapplied/server/0761-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0762-Allow-removal-addition-of-entities-to-entity-ticklis.patch b/patches/unapplied/server/0762-Allow-removal-addition-of-entities-to-entity-ticklis.patch similarity index 100% rename from patches/server/0762-Allow-removal-addition-of-entities-to-entity-ticklis.patch rename to patches/unapplied/server/0762-Allow-removal-addition-of-entities-to-entity-ticklis.patch diff --git a/patches/server/0763-Optimise-random-block-ticking.patch b/patches/unapplied/server/0763-Optimise-random-block-ticking.patch similarity index 100% rename from patches/server/0763-Optimise-random-block-ticking.patch rename to patches/unapplied/server/0763-Optimise-random-block-ticking.patch diff --git a/patches/server/0764-Optimise-non-flush-packet-sending.patch b/patches/unapplied/server/0764-Optimise-non-flush-packet-sending.patch similarity index 100% rename from patches/server/0764-Optimise-non-flush-packet-sending.patch rename to patches/unapplied/server/0764-Optimise-non-flush-packet-sending.patch diff --git a/patches/server/0765-Optimise-nearby-player-lookups.patch b/patches/unapplied/server/0765-Optimise-nearby-player-lookups.patch similarity index 100% rename from patches/server/0765-Optimise-nearby-player-lookups.patch rename to patches/unapplied/server/0765-Optimise-nearby-player-lookups.patch diff --git a/patches/server/0766-Optimise-WorldServer-notify.patch b/patches/unapplied/server/0766-Optimise-WorldServer-notify.patch similarity index 100% rename from patches/server/0766-Optimise-WorldServer-notify.patch rename to patches/unapplied/server/0766-Optimise-WorldServer-notify.patch diff --git a/patches/server/0767-Remove-streams-for-villager-AI.patch b/patches/unapplied/server/0767-Remove-streams-for-villager-AI.patch similarity index 100% rename from patches/server/0767-Remove-streams-for-villager-AI.patch rename to patches/unapplied/server/0767-Remove-streams-for-villager-AI.patch diff --git a/patches/server/0768-Rewrite-dataconverter-system.patch b/patches/unapplied/server/0768-Rewrite-dataconverter-system.patch similarity index 100% rename from patches/server/0768-Rewrite-dataconverter-system.patch rename to patches/unapplied/server/0768-Rewrite-dataconverter-system.patch diff --git a/patches/server/0769-Use-Velocity-compression-and-cipher-natives.patch b/patches/unapplied/server/0769-Use-Velocity-compression-and-cipher-natives.patch similarity index 100% rename from patches/server/0769-Use-Velocity-compression-and-cipher-natives.patch rename to patches/unapplied/server/0769-Use-Velocity-compression-and-cipher-natives.patch diff --git a/patches/server/0770-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/unapplied/server/0770-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch similarity index 100% rename from patches/server/0770-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch rename to patches/unapplied/server/0770-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch diff --git a/patches/server/0771-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch b/patches/unapplied/server/0771-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch similarity index 100% rename from patches/server/0771-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch rename to patches/unapplied/server/0771-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch diff --git a/patches/server/0772-Async-catch-modifications-to-critical-entity-state.patch b/patches/unapplied/server/0772-Async-catch-modifications-to-critical-entity-state.patch similarity index 100% rename from patches/server/0772-Async-catch-modifications-to-critical-entity-state.patch rename to patches/unapplied/server/0772-Async-catch-modifications-to-critical-entity-state.patch diff --git a/patches/server/0773-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/unapplied/server/0773-Fix-Bukkit-NamespacedKey-shenanigans.patch similarity index 100% rename from patches/server/0773-Fix-Bukkit-NamespacedKey-shenanigans.patch rename to patches/unapplied/server/0773-Fix-Bukkit-NamespacedKey-shenanigans.patch diff --git a/patches/server/0774-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/unapplied/server/0774-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 100% rename from patches/server/0774-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/unapplied/server/0774-Fix-merchant-inventory-not-closing-on-entity-removal.patch diff --git a/patches/server/0775-Check-requirement-before-suggesting-root-nodes.patch b/patches/unapplied/server/0775-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0775-Check-requirement-before-suggesting-root-nodes.patch rename to patches/unapplied/server/0775-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0776-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/unapplied/server/0776-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 100% rename from patches/server/0776-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/unapplied/server/0776-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch diff --git a/patches/server/0777-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/unapplied/server/0777-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0777-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/unapplied/server/0777-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/0778-Ensure-valid-vehicle-status.patch b/patches/unapplied/server/0778-Ensure-valid-vehicle-status.patch similarity index 100% rename from patches/server/0778-Ensure-valid-vehicle-status.patch rename to patches/unapplied/server/0778-Ensure-valid-vehicle-status.patch diff --git a/patches/server/0779-Prevent-softlocked-end-exit-portal-generation.patch b/patches/unapplied/server/0779-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0779-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/unapplied/server/0779-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0780-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/unapplied/server/0780-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0780-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/unapplied/server/0780-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0781-Don-t-log-debug-logging-being-disabled.patch b/patches/unapplied/server/0781-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0781-Don-t-log-debug-logging-being-disabled.patch rename to patches/unapplied/server/0781-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0782-fix-various-menus-with-empty-level-accesses.patch b/patches/unapplied/server/0782-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0782-fix-various-menus-with-empty-level-accesses.patch rename to patches/unapplied/server/0782-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0783-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch b/patches/unapplied/server/0783-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch similarity index 100% rename from patches/server/0783-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch rename to patches/unapplied/server/0783-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch diff --git a/patches/server/0784-Preserve-overstacked-loot.patch b/patches/unapplied/server/0784-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0784-Preserve-overstacked-loot.patch rename to patches/unapplied/server/0784-Preserve-overstacked-loot.patch diff --git a/patches/server/0785-Update-head-rotation-in-missing-places.patch b/patches/unapplied/server/0785-Update-head-rotation-in-missing-places.patch similarity index 100% rename from patches/server/0785-Update-head-rotation-in-missing-places.patch rename to patches/unapplied/server/0785-Update-head-rotation-in-missing-places.patch diff --git a/patches/server/0786-prevent-unintended-light-block-manipulation.patch b/patches/unapplied/server/0786-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0786-prevent-unintended-light-block-manipulation.patch rename to patches/unapplied/server/0786-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0787-Fix-CraftCriteria-defaults-map.patch b/patches/unapplied/server/0787-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0787-Fix-CraftCriteria-defaults-map.patch rename to patches/unapplied/server/0787-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0788-Fix-upstreams-block-state-factories.patch b/patches/unapplied/server/0788-Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/server/0788-Fix-upstreams-block-state-factories.patch rename to patches/unapplied/server/0788-Fix-upstreams-block-state-factories.patch diff --git a/patches/server/0789-Add-config-option-for-logging-player-ip-addresses.patch b/patches/unapplied/server/0789-Add-config-option-for-logging-player-ip-addresses.patch similarity index 100% rename from patches/server/0789-Add-config-option-for-logging-player-ip-addresses.patch rename to patches/unapplied/server/0789-Add-config-option-for-logging-player-ip-addresses.patch diff --git a/patches/server/0790-Configurable-feature-seeds.patch b/patches/unapplied/server/0790-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0790-Configurable-feature-seeds.patch rename to patches/unapplied/server/0790-Configurable-feature-seeds.patch diff --git a/patches/server/0791-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/unapplied/server/0791-VanillaCommandWrapper-didnt-account-for-entity-sende.patch similarity index 100% rename from patches/server/0791-VanillaCommandWrapper-didnt-account-for-entity-sende.patch rename to patches/unapplied/server/0791-VanillaCommandWrapper-didnt-account-for-entity-sende.patch diff --git a/patches/server/0792-Add-root-admin-user-detection.patch b/patches/unapplied/server/0792-Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/0792-Add-root-admin-user-detection.patch rename to patches/unapplied/server/0792-Add-root-admin-user-detection.patch diff --git a/patches/server/0793-Always-allow-item-changing-in-Fireball.patch b/patches/unapplied/server/0793-Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/0793-Always-allow-item-changing-in-Fireball.patch rename to patches/unapplied/server/0793-Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/0794-don-t-attempt-to-teleport-dead-entities.patch b/patches/unapplied/server/0794-don-t-attempt-to-teleport-dead-entities.patch similarity index 100% rename from patches/server/0794-don-t-attempt-to-teleport-dead-entities.patch rename to patches/unapplied/server/0794-don-t-attempt-to-teleport-dead-entities.patch diff --git a/patches/server/0795-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/unapplied/server/0795-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 100% rename from patches/server/0795-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/unapplied/server/0795-Prevent-excessive-velocity-through-repeated-crits.patch diff --git a/patches/server/0796-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/unapplied/server/0796-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0796-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/unapplied/server/0796-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0797-Rewrite-the-light-engine.patch b/patches/unapplied/server/0797-Rewrite-the-light-engine.patch similarity index 100% rename from patches/server/0797-Rewrite-the-light-engine.patch rename to patches/unapplied/server/0797-Rewrite-the-light-engine.patch diff --git a/patches/server/0798-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/unapplied/server/0798-Always-parse-protochunk-light-sources-unless-it-is-m.patch similarity index 100% rename from patches/server/0798-Always-parse-protochunk-light-sources-unless-it-is-m.patch rename to patches/unapplied/server/0798-Always-parse-protochunk-light-sources-unless-it-is-m.patch diff --git a/patches/server/0799-Fix-removing-recipes-from-RecipeIterator.patch b/patches/unapplied/server/0799-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0799-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/unapplied/server/0799-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0800-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/unapplied/server/0800-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 100% rename from patches/server/0800-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/unapplied/server/0800-Prevent-sending-oversized-item-data-in-equipment-and.patch diff --git a/patches/server/0801-Hide-unnecessary-itemmeta-from-clients.patch b/patches/unapplied/server/0801-Hide-unnecessary-itemmeta-from-clients.patch similarity index 100% rename from patches/server/0801-Hide-unnecessary-itemmeta-from-clients.patch rename to patches/unapplied/server/0801-Hide-unnecessary-itemmeta-from-clients.patch diff --git a/patches/server/0802-Fix-kelp-modifier-changing-growth-for-other-crops.patch b/patches/unapplied/server/0802-Fix-kelp-modifier-changing-growth-for-other-crops.patch similarity index 100% rename from patches/server/0802-Fix-kelp-modifier-changing-growth-for-other-crops.patch rename to patches/unapplied/server/0802-Fix-kelp-modifier-changing-growth-for-other-crops.patch diff --git a/patches/server/0803-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/unapplied/server/0803-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0803-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/unapplied/server/0803-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0804-Add-PlayerItemFrameChangeEvent.patch b/patches/unapplied/server/0804-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0804-Add-PlayerItemFrameChangeEvent.patch rename to patches/unapplied/server/0804-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0805-Add-player-health-update-API.patch b/patches/unapplied/server/0805-Add-player-health-update-API.patch similarity index 100% rename from patches/server/0805-Add-player-health-update-API.patch rename to patches/unapplied/server/0805-Add-player-health-update-API.patch diff --git a/patches/server/0806-Optimize-HashMapPalette.patch b/patches/unapplied/server/0806-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0806-Optimize-HashMapPalette.patch rename to patches/unapplied/server/0806-Optimize-HashMapPalette.patch diff --git a/patches/server/0807-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/unapplied/server/0807-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/server/0807-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/unapplied/server/0807-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/server/0808-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/unapplied/server/0808-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch similarity index 100% rename from patches/server/0808-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch rename to patches/unapplied/server/0808-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch diff --git a/patches/server/0809-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/unapplied/server/0809-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 100% rename from patches/server/0809-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/unapplied/server/0809-Optimise-collision-checking-in-player-move-packet-ha.patch diff --git a/patches/server/0810-Actually-unload-POI-data.patch b/patches/unapplied/server/0810-Actually-unload-POI-data.patch similarity index 100% rename from patches/server/0810-Actually-unload-POI-data.patch rename to patches/unapplied/server/0810-Actually-unload-POI-data.patch diff --git a/patches/server/0811-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/unapplied/server/0811-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0811-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/unapplied/server/0811-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0812-Update-Log4j.patch b/patches/unapplied/server/0812-Update-Log4j.patch similarity index 100% rename from patches/server/0812-Update-Log4j.patch rename to patches/unapplied/server/0812-Update-Log4j.patch diff --git a/patches/server/0813-Add-more-Campfire-API.patch b/patches/unapplied/server/0813-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0813-Add-more-Campfire-API.patch rename to patches/unapplied/server/0813-Add-more-Campfire-API.patch diff --git a/patches/server/0814-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/unapplied/server/0814-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/0814-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/unapplied/server/0814-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/0815-Fix-tripwire-state-inconsistency.patch b/patches/unapplied/server/0815-Fix-tripwire-state-inconsistency.patch similarity index 100% rename from patches/server/0815-Fix-tripwire-state-inconsistency.patch rename to patches/unapplied/server/0815-Fix-tripwire-state-inconsistency.patch diff --git a/patches/server/0816-Fix-fluid-logging-on-Block-breakNaturally.patch b/patches/unapplied/server/0816-Fix-fluid-logging-on-Block-breakNaturally.patch similarity index 100% rename from patches/server/0816-Fix-fluid-logging-on-Block-breakNaturally.patch rename to patches/unapplied/server/0816-Fix-fluid-logging-on-Block-breakNaturally.patch diff --git a/patches/server/0817-Forward-CraftEntity-in-teleport-command.patch b/patches/unapplied/server/0817-Forward-CraftEntity-in-teleport-command.patch similarity index 100% rename from patches/server/0817-Forward-CraftEntity-in-teleport-command.patch rename to patches/unapplied/server/0817-Forward-CraftEntity-in-teleport-command.patch diff --git a/patches/server/0818-Improve-scoreboard-entries.patch b/patches/unapplied/server/0818-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0818-Improve-scoreboard-entries.patch rename to patches/unapplied/server/0818-Improve-scoreboard-entries.patch diff --git a/patches/server/0819-Entity-powdered-snow-API.patch b/patches/unapplied/server/0819-Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/0819-Entity-powdered-snow-API.patch rename to patches/unapplied/server/0819-Entity-powdered-snow-API.patch diff --git a/patches/server/0820-Add-API-for-item-entity-health.patch b/patches/unapplied/server/0820-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0820-Add-API-for-item-entity-health.patch rename to patches/unapplied/server/0820-Add-API-for-item-entity-health.patch diff --git a/patches/server/0821-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/unapplied/server/0821-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/0821-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/unapplied/server/0821-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/0822-Configurable-max-block-light-for-monster-spawning.patch b/patches/unapplied/server/0822-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0822-Configurable-max-block-light-for-monster-spawning.patch rename to patches/unapplied/server/0822-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0823-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/unapplied/server/0823-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0823-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/unapplied/server/0823-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0824-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/unapplied/server/0824-Load-effect-amplifiers-greater-than-127-correctly.patch similarity index 100% rename from patches/server/0824-Load-effect-amplifiers-greater-than-127-correctly.patch rename to patches/unapplied/server/0824-Load-effect-amplifiers-greater-than-127-correctly.patch diff --git a/patches/server/0825-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/unapplied/server/0825-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0825-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/unapplied/server/0825-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0826-Fix-bees-aging-inside-hives.patch b/patches/unapplied/server/0826-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0826-Fix-bees-aging-inside-hives.patch rename to patches/unapplied/server/0826-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0827-Bucketable-API.patch b/patches/unapplied/server/0827-Bucketable-API.patch similarity index 100% rename from patches/server/0827-Bucketable-API.patch rename to patches/unapplied/server/0827-Bucketable-API.patch diff --git a/patches/server/0828-Check-player-world-in-endPortalSoundRadius.patch b/patches/unapplied/server/0828-Check-player-world-in-endPortalSoundRadius.patch similarity index 100% rename from patches/server/0828-Check-player-world-in-endPortalSoundRadius.patch rename to patches/unapplied/server/0828-Check-player-world-in-endPortalSoundRadius.patch diff --git a/patches/server/0829-Validate-usernames.patch b/patches/unapplied/server/0829-Validate-usernames.patch similarity index 100% rename from patches/server/0829-Validate-usernames.patch rename to patches/unapplied/server/0829-Validate-usernames.patch diff --git a/patches/server/0830-Fix-saving-configs-with-more-long-comments.patch b/patches/unapplied/server/0830-Fix-saving-configs-with-more-long-comments.patch similarity index 100% rename from patches/server/0830-Fix-saving-configs-with-more-long-comments.patch rename to patches/unapplied/server/0830-Fix-saving-configs-with-more-long-comments.patch diff --git a/patches/server/0831-Make-water-animal-spawn-height-configurable.patch b/patches/unapplied/server/0831-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0831-Make-water-animal-spawn-height-configurable.patch rename to patches/unapplied/server/0831-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0832-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/unapplied/server/0832-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/server/0832-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/unapplied/server/0832-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/server/0833-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/unapplied/server/0833-Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/server/0833-Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/unapplied/server/0833-Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/server/0834-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/unapplied/server/0834-Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/server/0834-Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/unapplied/server/0834-Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/server/0835-Multiple-Entries-with-Scoreboards.patch b/patches/unapplied/server/0835-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/0835-Multiple-Entries-with-Scoreboards.patch rename to patches/unapplied/server/0835-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/0836-Reset-placed-block-on-exception.patch b/patches/unapplied/server/0836-Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/0836-Reset-placed-block-on-exception.patch rename to patches/unapplied/server/0836-Reset-placed-block-on-exception.patch diff --git a/patches/server/0837-Add-configurable-height-for-slime-spawn.patch b/patches/unapplied/server/0837-Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/server/0837-Add-configurable-height-for-slime-spawn.patch rename to patches/unapplied/server/0837-Add-configurable-height-for-slime-spawn.patch diff --git a/patches/server/0838-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/server/0838-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0838-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/unapplied/server/0838-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0839-Fix-xp-reward-for-baby-zombies.patch b/patches/unapplied/server/0839-Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/server/0839-Fix-xp-reward-for-baby-zombies.patch rename to patches/unapplied/server/0839-Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/server/0840-Kick-on-main-for-illegal-chars.patch b/patches/unapplied/server/0840-Kick-on-main-for-illegal-chars.patch similarity index 100% rename from patches/server/0840-Kick-on-main-for-illegal-chars.patch rename to patches/unapplied/server/0840-Kick-on-main-for-illegal-chars.patch diff --git a/patches/server/0841-Multi-Block-Change-API-Implementation.patch b/patches/unapplied/server/0841-Multi-Block-Change-API-Implementation.patch similarity index 100% rename from patches/server/0841-Multi-Block-Change-API-Implementation.patch rename to patches/unapplied/server/0841-Multi-Block-Change-API-Implementation.patch diff --git a/patches/server/0842-Fix-NotePlayEvent.patch b/patches/unapplied/server/0842-Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/0842-Fix-NotePlayEvent.patch rename to patches/unapplied/server/0842-Fix-NotePlayEvent.patch diff --git a/patches/server/0843-Freeze-Tick-Lock-API.patch b/patches/unapplied/server/0843-Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/server/0843-Freeze-Tick-Lock-API.patch rename to patches/unapplied/server/0843-Freeze-Tick-Lock-API.patch diff --git a/patches/server/0844-Dolphin-API.patch b/patches/unapplied/server/0844-Dolphin-API.patch similarity index 100% rename from patches/server/0844-Dolphin-API.patch rename to patches/unapplied/server/0844-Dolphin-API.patch diff --git a/patches/server/0845-More-PotionEffectType-API.patch b/patches/unapplied/server/0845-More-PotionEffectType-API.patch similarity index 100% rename from patches/server/0845-More-PotionEffectType-API.patch rename to patches/unapplied/server/0845-More-PotionEffectType-API.patch diff --git a/patches/server/0846-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/unapplied/server/0846-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/0846-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/unapplied/server/0846-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/0847-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/unapplied/server/0847-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/server/0847-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/unapplied/server/0847-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/server/0848-Add-config-for-stronghold-seed.patch b/patches/unapplied/server/0848-Add-config-for-stronghold-seed.patch similarity index 100% rename from patches/server/0848-Add-config-for-stronghold-seed.patch rename to patches/unapplied/server/0848-Add-config-for-stronghold-seed.patch diff --git a/patches/server/0849-Implement-regenerateChunk.patch b/patches/unapplied/server/0849-Implement-regenerateChunk.patch similarity index 100% rename from patches/server/0849-Implement-regenerateChunk.patch rename to patches/unapplied/server/0849-Implement-regenerateChunk.patch diff --git a/patches/server/0850-Log-exceptions-thrown-during-chat-processing.patch b/patches/unapplied/server/0850-Log-exceptions-thrown-during-chat-processing.patch similarity index 100% rename from patches/server/0850-Log-exceptions-thrown-during-chat-processing.patch rename to patches/unapplied/server/0850-Log-exceptions-thrown-during-chat-processing.patch diff --git a/patches/server/0851-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/unapplied/server/0851-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 100% rename from patches/server/0851-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/unapplied/server/0851-Fix-cancelled-powdered-snow-bucket-placement.patch diff --git a/patches/server/0852-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/unapplied/server/0852-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 100% rename from patches/server/0852-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/unapplied/server/0852-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch diff --git a/patches/server/0853-Add-GameEvent-tags.patch b/patches/unapplied/server/0853-Add-GameEvent-tags.patch similarity index 100% rename from patches/server/0853-Add-GameEvent-tags.patch rename to patches/unapplied/server/0853-Add-GameEvent-tags.patch diff --git a/patches/server/0854-Replace-player-chunk-loader-system.patch b/patches/unapplied/server/0854-Replace-player-chunk-loader-system.patch similarity index 100% rename from patches/server/0854-Replace-player-chunk-loader-system.patch rename to patches/unapplied/server/0854-Replace-player-chunk-loader-system.patch diff --git a/patches/server/0855-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/unapplied/server/0855-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 100% rename from patches/server/0855-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/unapplied/server/0855-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch diff --git a/patches/server/0856-Replace-ticket-level-propagator.patch b/patches/unapplied/server/0856-Replace-ticket-level-propagator.patch similarity index 100% rename from patches/server/0856-Replace-ticket-level-propagator.patch rename to patches/unapplied/server/0856-Replace-ticket-level-propagator.patch diff --git a/patches/server/0857-Furnace-RecipesUsed-API.patch b/patches/unapplied/server/0857-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/server/0857-Furnace-RecipesUsed-API.patch rename to patches/unapplied/server/0857-Furnace-RecipesUsed-API.patch diff --git a/patches/server/0858-Configurable-sculk-sensor-listener-range.patch b/patches/unapplied/server/0858-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/server/0858-Configurable-sculk-sensor-listener-range.patch rename to patches/unapplied/server/0858-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/server/0859-Add-missing-block-data-mins-and-maxes.patch b/patches/unapplied/server/0859-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/server/0859-Add-missing-block-data-mins-and-maxes.patch rename to patches/unapplied/server/0859-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/server/0860-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/unapplied/server/0860-Option-to-have-default-CustomSpawners-in-custom-worl.patch similarity index 100% rename from patches/server/0860-Option-to-have-default-CustomSpawners-in-custom-worl.patch rename to patches/unapplied/server/0860-Option-to-have-default-CustomSpawners-in-custom-worl.patch diff --git a/patches/server/0861-Put-world-into-worldlist-before-initing-the-world.patch b/patches/unapplied/server/0861-Put-world-into-worldlist-before-initing-the-world.patch similarity index 100% rename from patches/server/0861-Put-world-into-worldlist-before-initing-the-world.patch rename to patches/unapplied/server/0861-Put-world-into-worldlist-before-initing-the-world.patch diff --git a/patches/server/0862-Fix-Entity-Position-Desync.patch b/patches/unapplied/server/0862-Fix-Entity-Position-Desync.patch similarity index 100% rename from patches/server/0862-Fix-Entity-Position-Desync.patch rename to patches/unapplied/server/0862-Fix-Entity-Position-Desync.patch diff --git a/patches/server/0863-Custom-Potion-Mixes.patch b/patches/unapplied/server/0863-Custom-Potion-Mixes.patch similarity index 100% rename from patches/server/0863-Custom-Potion-Mixes.patch rename to patches/unapplied/server/0863-Custom-Potion-Mixes.patch diff --git a/patches/server/0864-Fix-Fluid-tags-isTagged-method.patch b/patches/unapplied/server/0864-Fix-Fluid-tags-isTagged-method.patch similarity index 100% rename from patches/server/0864-Fix-Fluid-tags-isTagged-method.patch rename to patches/unapplied/server/0864-Fix-Fluid-tags-isTagged-method.patch diff --git a/patches/server/0865-Fix-World-locateNearestStructure.patch b/patches/unapplied/server/0865-Fix-World-locateNearestStructure.patch similarity index 100% rename from patches/server/0865-Fix-World-locateNearestStructure.patch rename to patches/unapplied/server/0865-Fix-World-locateNearestStructure.patch diff --git a/patches/server/0866-Force-close-world-loading-screen.patch b/patches/unapplied/server/0866-Force-close-world-loading-screen.patch similarity index 100% rename from patches/server/0866-Force-close-world-loading-screen.patch rename to patches/unapplied/server/0866-Force-close-world-loading-screen.patch diff --git a/patches/server/0867-Fix-falling-block-spawn-methods.patch b/patches/unapplied/server/0867-Fix-falling-block-spawn-methods.patch similarity index 100% rename from patches/server/0867-Fix-falling-block-spawn-methods.patch rename to patches/unapplied/server/0867-Fix-falling-block-spawn-methods.patch diff --git a/patches/server/0868-Expose-furnace-minecart-push-values.patch b/patches/unapplied/server/0868-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/server/0868-Expose-furnace-minecart-push-values.patch rename to patches/unapplied/server/0868-Expose-furnace-minecart-push-values.patch diff --git a/patches/server/0869-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/unapplied/server/0869-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch similarity index 100% rename from patches/server/0869-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch rename to patches/unapplied/server/0869-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch diff --git a/patches/server/0870-Fix-save-problems-on-shutdown.patch b/patches/unapplied/server/0870-Fix-save-problems-on-shutdown.patch similarity index 100% rename from patches/server/0870-Fix-save-problems-on-shutdown.patch rename to patches/unapplied/server/0870-Fix-save-problems-on-shutdown.patch diff --git a/patches/server/0871-More-Projectile-API.patch b/patches/unapplied/server/0871-More-Projectile-API.patch similarity index 100% rename from patches/server/0871-More-Projectile-API.patch rename to patches/unapplied/server/0871-More-Projectile-API.patch diff --git a/patches/server/0872-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/unapplied/server/0872-Fix-swamp-hut-cat-generation-deadlock.patch similarity index 100% rename from patches/server/0872-Fix-swamp-hut-cat-generation-deadlock.patch rename to patches/unapplied/server/0872-Fix-swamp-hut-cat-generation-deadlock.patch diff --git a/patches/server/0873-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/unapplied/server/0873-Don-t-allow-vehicle-movement-from-players-while-tele.patch similarity index 100% rename from patches/server/0873-Don-t-allow-vehicle-movement-from-players-while-tele.patch rename to patches/unapplied/server/0873-Don-t-allow-vehicle-movement-from-players-while-tele.patch diff --git a/patches/server/0874-Implement-getComputedBiome-API.patch b/patches/unapplied/server/0874-Implement-getComputedBiome-API.patch similarity index 100% rename from patches/server/0874-Implement-getComputedBiome-API.patch rename to patches/unapplied/server/0874-Implement-getComputedBiome-API.patch diff --git a/patches/server/0875-Make-some-itemstacks-nonnull.patch b/patches/unapplied/server/0875-Make-some-itemstacks-nonnull.patch similarity index 100% rename from patches/server/0875-Make-some-itemstacks-nonnull.patch rename to patches/unapplied/server/0875-Make-some-itemstacks-nonnull.patch diff --git a/patches/server/0876-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch b/patches/unapplied/server/0876-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch similarity index 100% rename from patches/server/0876-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch rename to patches/unapplied/server/0876-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch diff --git a/patches/server/0877-Implement-enchantWithLevels-API.patch b/patches/unapplied/server/0877-Implement-enchantWithLevels-API.patch similarity index 100% rename from patches/server/0877-Implement-enchantWithLevels-API.patch rename to patches/unapplied/server/0877-Implement-enchantWithLevels-API.patch diff --git a/patches/server/0878-Fix-saving-in-unloadWorld.patch b/patches/unapplied/server/0878-Fix-saving-in-unloadWorld.patch similarity index 100% rename from patches/server/0878-Fix-saving-in-unloadWorld.patch rename to patches/unapplied/server/0878-Fix-saving-in-unloadWorld.patch diff --git a/patches/server/0879-Buffer-OOB-setBlock-calls.patch b/patches/unapplied/server/0879-Buffer-OOB-setBlock-calls.patch similarity index 100% rename from patches/server/0879-Buffer-OOB-setBlock-calls.patch rename to patches/unapplied/server/0879-Buffer-OOB-setBlock-calls.patch diff --git a/patches/server/0880-Add-TameableDeathMessageEvent.patch b/patches/unapplied/server/0880-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/server/0880-Add-TameableDeathMessageEvent.patch rename to patches/unapplied/server/0880-Add-TameableDeathMessageEvent.patch diff --git a/patches/server/0881-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch b/patches/unapplied/server/0881-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch similarity index 100% rename from patches/server/0881-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch rename to patches/unapplied/server/0881-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch diff --git a/patches/server/0882-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/unapplied/server/0882-fix-player-loottables-running-when-mob-loot-gamerule.patch similarity index 100% rename from patches/server/0882-fix-player-loottables-running-when-mob-loot-gamerule.patch rename to patches/unapplied/server/0882-fix-player-loottables-running-when-mob-loot-gamerule.patch diff --git a/patches/server/0883-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/unapplied/server/0883-Ensure-entity-passenger-world-matches-ridden-entity.patch similarity index 100% rename from patches/server/0883-Ensure-entity-passenger-world-matches-ridden-entity.patch rename to patches/unapplied/server/0883-Ensure-entity-passenger-world-matches-ridden-entity.patch diff --git a/patches/server/0884-Guard-against-invalid-entity-positions.patch b/patches/unapplied/server/0884-Guard-against-invalid-entity-positions.patch similarity index 100% rename from patches/server/0884-Guard-against-invalid-entity-positions.patch rename to patches/unapplied/server/0884-Guard-against-invalid-entity-positions.patch diff --git a/patches/server/0885-cache-resource-keys.patch b/patches/unapplied/server/0885-cache-resource-keys.patch similarity index 100% rename from patches/server/0885-cache-resource-keys.patch rename to patches/unapplied/server/0885-cache-resource-keys.patch diff --git a/patches/server/0886-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/unapplied/server/0886-Allow-to-change-the-podium-for-the-EnderDragon.patch similarity index 100% rename from patches/server/0886-Allow-to-change-the-podium-for-the-EnderDragon.patch rename to patches/unapplied/server/0886-Allow-to-change-the-podium-for-the-EnderDragon.patch diff --git a/patches/server/0887-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/unapplied/server/0887-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch similarity index 100% rename from patches/server/0887-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch rename to patches/unapplied/server/0887-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch diff --git a/patches/server/0888-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/unapplied/server/0888-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch similarity index 100% rename from patches/server/0888-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch rename to patches/unapplied/server/0888-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch diff --git a/patches/server/0889-Prevent-tile-entity-copies-loading-chunks.patch b/patches/unapplied/server/0889-Prevent-tile-entity-copies-loading-chunks.patch similarity index 100% rename from patches/server/0889-Prevent-tile-entity-copies-loading-chunks.patch rename to patches/unapplied/server/0889-Prevent-tile-entity-copies-loading-chunks.patch diff --git a/patches/server/0890-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/unapplied/server/0890-Use-username-instead-of-display-name-in-PlayerList-g.patch similarity index 100% rename from patches/server/0890-Use-username-instead-of-display-name-in-PlayerList-g.patch rename to patches/unapplied/server/0890-Use-username-instead-of-display-name-in-PlayerList-g.patch diff --git a/patches/server/0891-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/unapplied/server/0891-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch similarity index 100% rename from patches/server/0891-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch rename to patches/unapplied/server/0891-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch diff --git a/patches/server/0892-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/unapplied/server/0892-Pass-ServerLevel-for-gamerule-callbacks.patch similarity index 100% rename from patches/server/0892-Pass-ServerLevel-for-gamerule-callbacks.patch rename to patches/unapplied/server/0892-Pass-ServerLevel-for-gamerule-callbacks.patch diff --git a/patches/server/0893-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/unapplied/server/0893-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/server/0893-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/unapplied/server/0893-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/server/0894-WorldCreator-keepSpawnLoaded.patch b/patches/unapplied/server/0894-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/server/0894-WorldCreator-keepSpawnLoaded.patch rename to patches/unapplied/server/0894-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/server/0895-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/unapplied/server/0895-Fix-NPE-for-BlockDataMeta-getBlockData.patch similarity index 100% rename from patches/server/0895-Fix-NPE-for-BlockDataMeta-getBlockData.patch rename to patches/unapplied/server/0895-Fix-NPE-for-BlockDataMeta-getBlockData.patch diff --git a/patches/server/0896-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/unapplied/server/0896-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch similarity index 100% rename from patches/server/0896-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch rename to patches/unapplied/server/0896-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch diff --git a/patches/server/0897-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/unapplied/server/0897-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/server/0897-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/unapplied/server/0897-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/server/0898-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/unapplied/server/0898-Fire-CauldronLevelChange-on-initial-fill.patch similarity index 100% rename from patches/server/0898-Fire-CauldronLevelChange-on-initial-fill.patch rename to patches/unapplied/server/0898-Fire-CauldronLevelChange-on-initial-fill.patch diff --git a/patches/server/0899-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/unapplied/server/0899-fix-powder-snow-cauldrons-not-turning-to-water.patch similarity index 100% rename from patches/server/0899-fix-powder-snow-cauldrons-not-turning-to-water.patch rename to patches/unapplied/server/0899-fix-powder-snow-cauldrons-not-turning-to-water.patch diff --git a/patches/server/0900-Sign-cleanup-filtering.patch b/patches/unapplied/server/0900-Sign-cleanup-filtering.patch similarity index 100% rename from patches/server/0900-Sign-cleanup-filtering.patch rename to patches/unapplied/server/0900-Sign-cleanup-filtering.patch diff --git a/patches/server/0901-Add-PlayerStopUsingItemEvent.patch b/patches/unapplied/server/0901-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/server/0901-Add-PlayerStopUsingItemEvent.patch rename to patches/unapplied/server/0901-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/server/0902-FallingBlock-auto-expire-setting.patch b/patches/unapplied/server/0902-FallingBlock-auto-expire-setting.patch similarity index 100% rename from patches/server/0902-FallingBlock-auto-expire-setting.patch rename to patches/unapplied/server/0902-FallingBlock-auto-expire-setting.patch diff --git a/patches/server/0903-Don-t-tick-markers.patch b/patches/unapplied/server/0903-Don-t-tick-markers.patch similarity index 100% rename from patches/server/0903-Don-t-tick-markers.patch rename to patches/unapplied/server/0903-Don-t-tick-markers.patch diff --git a/patches/server/0904-Add-Alternate-Current-redstone-implementation.patch b/patches/unapplied/server/0904-Add-Alternate-Current-redstone-implementation.patch similarity index 100% rename from patches/server/0904-Add-Alternate-Current-redstone-implementation.patch rename to patches/unapplied/server/0904-Add-Alternate-Current-redstone-implementation.patch diff --git a/patches/server/0905-Do-not-accept-invalid-client-settings.patch b/patches/unapplied/server/0905-Do-not-accept-invalid-client-settings.patch similarity index 100% rename from patches/server/0905-Do-not-accept-invalid-client-settings.patch rename to patches/unapplied/server/0905-Do-not-accept-invalid-client-settings.patch diff --git a/patches/server/0906-Add-support-for-Proxy-Protocol.patch b/patches/unapplied/server/0906-Add-support-for-Proxy-Protocol.patch similarity index 100% rename from patches/server/0906-Add-support-for-Proxy-Protocol.patch rename to patches/unapplied/server/0906-Add-support-for-Proxy-Protocol.patch diff --git a/patches/server/0907-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/unapplied/server/0907-Fix-OfflinePlayer-getBedSpawnLocation.patch similarity index 100% rename from patches/server/0907-Fix-OfflinePlayer-getBedSpawnLocation.patch rename to patches/unapplied/server/0907-Fix-OfflinePlayer-getBedSpawnLocation.patch diff --git a/patches/server/0908-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/unapplied/server/0908-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch similarity index 100% rename from patches/server/0908-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch rename to patches/unapplied/server/0908-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch diff --git a/patches/server/0909-Sanitize-Sent-BlockEntity-NBT.patch b/patches/unapplied/server/0909-Sanitize-Sent-BlockEntity-NBT.patch similarity index 100% rename from patches/server/0909-Sanitize-Sent-BlockEntity-NBT.patch rename to patches/unapplied/server/0909-Sanitize-Sent-BlockEntity-NBT.patch diff --git a/patches/server/0910-Prevent-entity-loading-causing-async-lookups.patch b/patches/unapplied/server/0910-Prevent-entity-loading-causing-async-lookups.patch similarity index 100% rename from patches/server/0910-Prevent-entity-loading-causing-async-lookups.patch rename to patches/unapplied/server/0910-Prevent-entity-loading-causing-async-lookups.patch diff --git a/patches/server/0911-Disable-component-selector-resolving-in-books-by-def.patch b/patches/unapplied/server/0911-Disable-component-selector-resolving-in-books-by-def.patch similarity index 100% rename from patches/server/0911-Disable-component-selector-resolving-in-books-by-def.patch rename to patches/unapplied/server/0911-Disable-component-selector-resolving-in-books-by-def.patch diff --git a/patches/server/0912-Throw-exception-on-world-create-while-being-ticked.patch b/patches/unapplied/server/0912-Throw-exception-on-world-create-while-being-ticked.patch similarity index 100% rename from patches/server/0912-Throw-exception-on-world-create-while-being-ticked.patch rename to patches/unapplied/server/0912-Throw-exception-on-world-create-while-being-ticked.patch diff --git a/work/BuildData b/work/BuildData index 641cb0c939..e6ebde42e3 160000 --- a/work/BuildData +++ b/work/BuildData @@ -1 +1 @@ -Subproject commit 641cb0c939c7c2a3c4b42f2fd7bca7c8b34254ae +Subproject commit e6ebde42e39100b18ca0265596b04f557b2b27cc diff --git a/work/Bukkit b/work/Bukkit index 6a039faf74..b93194d14a 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 6a039faf7488beba29527a112404cbab84d0cbd3 +Subproject commit b93194d14a2bec34b8106d79094c35b10cc18466 diff --git a/work/CraftBukkit b/work/CraftBukkit index a59dc59e88..64c15270e7 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit a59dc59e88299b03b52335d95f83a880f131e3a4 +Subproject commit 64c15270e76475e68b2167d4bfba162a4a827fe0 diff --git a/work/Spigot b/work/Spigot index b081915002..87c4d13aee 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit b0819150028ec7233960ec622a4b1ba57f102047 +Subproject commit 87c4d13aee2e4a6ec924342c8b4642c87602aacc