diff --git a/README.md b/README.md index 72bb670b0..95d0d6625 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ How To (Plugin Developers) io.papermc.paper paper-api - 1.19.4-R0.1-SNAPSHOT + 1.20-R0.1-SNAPSHOT provided ``` @@ -54,7 +54,7 @@ repositories { } dependencies { - compileOnly("io.papermc.paper:paper-api:1.19.4-R0.1-SNAPSHOT") + compileOnly("io.papermc.paper:paper-api:1.20-R0.1-SNAPSHOT") } java { diff --git a/build.gradle.kts b/build.gradle.kts index e0911816b..d5566aac1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -61,7 +61,7 @@ repositories { } dependencies { - paramMappings("net.fabricmc:yarn:1.19.4+build.1:mergedv2") + paramMappings("net.fabricmc:yarn:1.20+build.1:mergedv2") remapper("net.fabricmc:tiny-remapper:0.8.6:fat") decompiler("net.minecraftforge:forgeflower:2.0.627.2") spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.6") @@ -133,7 +133,7 @@ allprojects { tasks.collectAtsFromPatches { // Uncomment while updating for a new Minecraft version - // extraPatchDir.set(layout.projectDirectory.dir("patches/unapplied/server")) + extraPatchDir.set(layout.projectDirectory.dir("patches/unapplied/server")) } tasks.register("printMinecraftVersion") { diff --git a/gradle.properties b/gradle.properties index 080537633..5fb6c5286 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ group=io.papermc.paper -version=1.19.4-R0.1-SNAPSHOT -mcVersion=1.19.4 +version=1.20-R0.1-SNAPSHOT +mcVersion=1.20 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/api/Actually-mark-mc-experimental-API-as-such.patch b/patches/api/Actually-mark-mc-experimental-API-as-such.patch index 0cf486ad2..30594d378 100644 --- a/patches/api/Actually-mark-mc-experimental-API-as-such.patch +++ b/patches/api/Actually-mark-mc-experimental-API-as-such.patch @@ -135,11 +135,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + @MinecraftExperimental // Paper + @ApiStatus.Experimental // Paper BLOCK_BAMBOO_WOOD_FENCE_GATE_OPEN("block.bamboo_wood_fence_gate.open"), - @MinecraftExperimental - @ApiStatus.Experimental -@@ -0,0 +0,0 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa - @MinecraftExperimental - @ApiStatus.Experimental + BLOCK_BAMBOO_WOOD_HANGING_SIGN_BREAK("block.bamboo_wood_hanging_sign.break"), + BLOCK_BAMBOO_WOOD_HANGING_SIGN_FALL("block.bamboo_wood_hanging_sign.fall"), + BLOCK_BAMBOO_WOOD_HANGING_SIGN_HIT("block.bamboo_wood_hanging_sign.hit"), + BLOCK_BAMBOO_WOOD_HANGING_SIGN_PLACE("block.bamboo_wood_hanging_sign.place"), BLOCK_BAMBOO_WOOD_HANGING_SIGN_STEP("block.bamboo_wood_hanging_sign.step"), + @MinecraftExperimental // Paper + @ApiStatus.Experimental // Paper @@ -209,44 +208,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 BLOCK_NOTE_BLOCK_IMITATE_ZOMBIE("block.note_block.imitate.zombie"), BLOCK_NOTE_BLOCK_IRON_XYLOPHONE("block.note_block.iron_xylophone"), BLOCK_NOTE_BLOCK_PLING("block.note_block.pling"), -@@ -0,0 +0,0 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa - ENTITY_BOAT_PADDLE_LAND("entity.boat.paddle_land"), - ENTITY_BOAT_PADDLE_WATER("entity.boat.paddle_water"), - @MinecraftExperimental -+ @ApiStatus.Experimental // Paper - ENTITY_CAMEL_AMBIENT("entity.camel.ambient"), - @MinecraftExperimental -+ @ApiStatus.Experimental // Paper - ENTITY_CAMEL_DASH("entity.camel.dash"), - @MinecraftExperimental -+ @ApiStatus.Experimental // Paper - ENTITY_CAMEL_DASH_READY("entity.camel.dash_ready"), - @MinecraftExperimental -+ @ApiStatus.Experimental // Paper - ENTITY_CAMEL_DEATH("entity.camel.death"), - @MinecraftExperimental -+ @ApiStatus.Experimental // Paper - ENTITY_CAMEL_EAT("entity.camel.eat"), - @MinecraftExperimental -+ @ApiStatus.Experimental // Paper - ENTITY_CAMEL_HURT("entity.camel.hurt"), - @MinecraftExperimental -+ @ApiStatus.Experimental // Paper - ENTITY_CAMEL_SADDLE("entity.camel.saddle"), - @MinecraftExperimental -+ @ApiStatus.Experimental // Paper - ENTITY_CAMEL_SIT("entity.camel.sit"), - @MinecraftExperimental -+ @ApiStatus.Experimental // Paper - ENTITY_CAMEL_STAND("entity.camel.stand"), - @MinecraftExperimental -+ @ApiStatus.Experimental // Paper - ENTITY_CAMEL_STEP("entity.camel.step"), - @MinecraftExperimental -+ @ApiStatus.Experimental // Paper - ENTITY_CAMEL_STEP_SAND("entity.camel.step_sand"), - ENTITY_CAT_AMBIENT("entity.cat.ambient"), - ENTITY_CAT_BEG_FOR_FOOD("entity.cat.beg_for_food"), diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/Tag.java diff --git a/patches/api/Add-FastUtil-to-Bukkit.patch b/patches/api/Add-FastUtil-to-Bukkit.patch index 58114b0f3..dd3cbde27 100644 --- a/patches/api/Add-FastUtil-to-Bukkit.patch +++ b/patches/api/Add-FastUtil-to-Bukkit.patch @@ -16,4 +16,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + api("it.unimi.dsi:fastutil:8.5.6") // Paper end - compileOnly("org.apache.maven:maven-resolver-provider:3.8.5") + compileOnly("org.apache.maven:maven-resolver-provider:3.9.2") diff --git a/patches/api/Adventure.patch b/patches/api/Adventure.patch index 33dc74375..14c979390 100644 --- a/patches/api/Adventure.patch +++ b/patches/api/Adventure.patch @@ -27,6 +27,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + extendsFrom(apiAndDocs) +} + + val annotationsVersion = "24.0.1" + dependencies { // api dependencies are listed transitively to API consumers api("com.google.guava:guava:31.1-jre") @@ -49,11 +51,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + apiAndDocs("net.kyori:adventure-text-logger-slf4j") // Paper end - compileOnly("org.apache.maven:maven-resolver-provider:3.8.5") + compileOnly("org.apache.maven:maven-resolver-provider:3.9.2") @@ -0,0 +0,0 @@ tasks.withType { "https://guava.dev/releases/31.1-jre/api/docs/", "https://javadoc.io/doc/org.yaml/snakeyaml/1.33/", - "https://javadoc.io/doc/org.jetbrains/annotations/23.0.0/", // Paper - we don't want Java 5 annotations + "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations - "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", + // Paper start + //"https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", // don't link to bungee chat @@ -1542,7 +1544,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + * Gets all the lines of text currently on the {@link Side#FRONT} of this sign. + * + * @return List of components containing each line of text -+ * @see #getSide(Side) ++ * @deprecated A sign may have multiple writable sides now. Use {@link Sign#getSide(Side)} and {@link SignSide#lines()}. + */ + @NotNull + public java.util.List lines(); @@ -1555,9 +1557,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + * @param index Line number to get the text from, starting at 0 + * @throws IndexOutOfBoundsException Thrown when the line does not exist + * @return Text on the given line -+ * @see #getSide(Side) ++ * @deprecated A sign may have multiple writable sides now. Use {@link #getSide(Side)} and {@link SignSide#line(int)}. + */ + @NotNull ++ @Deprecated + public net.kyori.adventure.text.Component line(int index) throws IndexOutOfBoundsException; + + /** @@ -1569,49 +1572,46 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + * @param index Line number to set the text at, starting from 0 + * @param line New text to set at the specified index + * @throws IndexOutOfBoundsException If the index is out of the range 0..3 -+ * @see #getSide(Side) ++ * @deprecated A sign may have multiple writable sides now. Use {@link #getSide(Side)} and {@link SignSide#line(int, net.kyori.adventure.text.Component)}. + */ ++ @Deprecated + public void line(int index, net.kyori.adventure.text.@NotNull Component line) throws IndexOutOfBoundsException; + // Paper end /** * Gets all the lines of text currently on the {@link Side#FRONT} of this sign. -@@ -0,0 +0,0 @@ public interface Sign extends TileState, Colorable { - * @see #getSide(Side) + * + * @return Array of Strings containing each line of text +- * @deprecated A sign may have multiple writable sides now. Use {@link Sign#getSide(Side)} and {@link SignSide#getLines()}. ++ * @deprecated A sign may have multiple writable sides now. Use {@link Sign#getSide(Side)} and {@link SignSide#lines()}. */ + @Deprecated @NotNull -+ @Deprecated // Paper - public String[] getLines(); - - /** @@ -0,0 +0,0 @@ public interface Sign extends TileState, Colorable { + * @param index Line number to get the text from, starting at 0 * @return Text on the given line * @throws IndexOutOfBoundsException Thrown when the line does not exist - * @see #getSide(Side) -+ * @deprecated in favour of {@link #line(int)} +- * @deprecated A sign may have multiple writable sides now. Use {@link #getSide(Side)} and {@link SignSide#getLine(int)}. ++ * @deprecated A sign may have multiple writable sides now. Use {@link #getSide(Side)} and {@link SignSide#line(int)}. */ + @Deprecated @NotNull -+ @Deprecated // Paper - public String getLine(int index) throws IndexOutOfBoundsException; - - /** @@ -0,0 +0,0 @@ public interface Sign extends TileState, Colorable { + * @param index Line number to set the text at, starting from 0 * @param line New text to set at the specified index * @throws IndexOutOfBoundsException If the index is out of the range 0..3 - * @see #getSide(Side) -+ * @deprecated in favour of {@link #line(int, net.kyori.adventure.text.Component)} +- * @deprecated A sign may have multiple writable sides now. Use {@link #getSide(Side)} and {@link SignSide#setLine(int, String)}. ++ * @deprecated A sign may have multiple writable sides now. Use {@link #getSide(Side)} and {@link SignSide#line(int, net.kyori.adventure.text.Component)}. */ -+ @Deprecated // Paper + @Deprecated public void setLine(int index, @NotNull String line) throws IndexOutOfBoundsException; - - /** diff --git a/src/main/java/org/bukkit/block/sign/SignSide.java b/src/main/java/org/bukkit/block/sign/SignSide.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/block/sign/SignSide.java +++ b/src/main/java/org/bukkit/block/sign/SignSide.java @@ -0,0 +0,0 @@ import org.jetbrains.annotations.NotNull; + * Represents a side of a sign. */ - @Experimental public interface SignSide extends Colorable { + // Paper start + /** diff --git a/patches/api/Build-system-changes.patch b/patches/api/Build-system-changes.patch index fa4e7c046..4b13d4251 100644 --- a/patches/api/Build-system-changes.patch +++ b/patches/api/Build-system-changes.patch @@ -18,13 +18,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } + // Paper end - compileOnly("org.apache.maven:maven-resolver-provider:3.8.5") - compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") - compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3") + compileOnly("org.apache.maven:maven-resolver-provider:3.9.2") + compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10") + compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10") + compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper -- val annotations = "org.jetbrains:annotations-java5:23.0.0" -+ val annotations = "org.jetbrains:annotations:23.0.0" // Paper - we don't want Java 5 annotations... +- val annotations = "org.jetbrains:annotations-java5:$annotationsVersion" ++ val annotations = "org.jetbrains:annotations:$annotationsVersion" // Paper - we don't want Java 5 annotations... compileOnly(annotations) testCompileOnly(annotations) @@ -41,8 +41,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 options.links( "https://guava.dev/releases/31.1-jre/api/docs/", "https://javadoc.io/doc/org.yaml/snakeyaml/1.33/", -- "https://javadoc.io/doc/org.jetbrains/annotations-java5/23.0.0/", -+ "https://javadoc.io/doc/org.jetbrains/annotations/23.0.0/", // Paper - we don't want Java 5 annotations +- "https://javadoc.io/doc/org.jetbrains/annotations-java5/$annotationsVersion/", ++ "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", ) options.tags("apiNote:a:API Note:") diff --git a/patches/api/Convert-project-to-Gradle.patch b/patches/api/Convert-project-to-Gradle.patch index aeebbac82..44017ae3e 100644 --- a/patches/api/Convert-project-to-Gradle.patch +++ b/patches/api/Convert-project-to-Gradle.patch @@ -41,6 +41,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + withJavadocJar() +} + ++val annotationsVersion = "24.0.1" ++ +dependencies { + // api dependencies are listed transitively to API consumers + api("com.google.guava:guava:31.1-jre") @@ -49,11 +51,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + api("org.yaml:snakeyaml:1.33") + api("org.joml:joml:1.10.5") + -+ compileOnly("org.apache.maven:maven-resolver-provider:3.8.5") -+ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") -+ compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3") ++ compileOnly("org.apache.maven:maven-resolver-provider:3.9.2") ++ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10") ++ compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10") + -+ val annotations = "org.jetbrains:annotations-java5:23.0.0" ++ val annotations = "org.jetbrains:annotations-java5:$annotationsVersion" + compileOnly(annotations) + testCompileOnly(annotations) + @@ -98,7 +100,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + options.links( + "https://guava.dev/releases/31.1-jre/api/docs/", + "https://javadoc.io/doc/org.yaml/snakeyaml/1.33/", -+ "https://javadoc.io/doc/org.jetbrains/annotations-java5/23.0.0/", ++ "https://javadoc.io/doc/org.jetbrains/annotations-java5/$annotationsVersion/", + "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", + ) + options.tags("apiNote:a:API Note:") @@ -127,7 +129,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.spigotmc - spigot-api -- 1.19.4-R0.1-SNAPSHOT +- 1.20-R0.1-SNAPSHOT - jar - - Spigot-API @@ -184,33 +186,33 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.yaml - snakeyaml -- 1.33 +- 2.0 - compile - - - - org.apache.maven - maven-resolver-provider -- 3.8.5 +- 3.9.2 - provided - - - org.apache.maven.resolver - maven-resolver-connector-basic -- 1.7.3 +- 1.9.10 - provided - - - org.apache.maven.resolver - maven-resolver-transport-http -- 1.7.3 +- 1.9.10 - provided - - - - org.jetbrains - annotations-java5 -- 23.0.0 +- 24.0.1 - provided - - @@ -229,7 +231,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.ow2.asm - asm-tree -- 9.4 +- 9.5 - test - - @@ -317,7 +319,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - https://guava.dev/releases/31.1-jre/api/docs/ - https://javadoc.io/doc/org.yaml/snakeyaml/1.33/ -- https://javadoc.io/doc/org.jetbrains/annotations-java5/23.0.0/ +- https://javadoc.io/doc/org.jetbrains/annotations-java5/24.0.1/ - https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/ - - @@ -343,7 +345,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.apache.maven.plugins - maven-checkstyle-plugin -- 3.2.1 +- 3.3.0 - - - process-classes diff --git a/patches/api/Fix-upstream-javadocs.patch b/patches/api/Fix-upstream-javadocs.patch index c4cbe86b5..da1829ffa 100644 --- a/patches/api/Fix-upstream-javadocs.patch +++ b/patches/api/Fix-upstream-javadocs.patch @@ -988,8 +988,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - * Setting to show/hide armor trim from leather armor. + * Setting to show/hide armor trim from armor. */ - @MinecraftExperimental - @ApiStatus.Experimental + HIDE_ARMOR_TRIM; + } diff --git a/src/main/java/org/bukkit/inventory/PlayerInventory.java b/src/main/java/org/bukkit/inventory/PlayerInventory.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/inventory/PlayerInventory.java diff --git a/patches/api/Paper-Plugins.patch b/patches/api/Paper-Plugins.patch index 6357f5e98..14ff666d9 100644 --- a/patches/api/Paper-Plugins.patch +++ b/patches/api/Paper-Plugins.patch @@ -12,10 +12,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 implementation("org.ow2.asm:asm-commons:9.4") // Paper end -- compileOnly("org.apache.maven:maven-resolver-provider:3.8.5") -+ api("org.apache.maven:maven-resolver-provider:3.8.5") // Paper, expose - compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") - compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3") +- compileOnly("org.apache.maven:maven-resolver-provider:3.9.2") ++ api("org.apache.maven:maven-resolver-provider:3.9.2") + compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10") + compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10") compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper diff --git a/src/main/java/io/papermc/paper/plugin/PermissionManager.java b/src/main/java/io/papermc/paper/plugin/PermissionManager.java new file mode 100644 diff --git a/patches/api/Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/Replace-ItemFlag.HIDE_POTION_EFFECTS.patch index bb1e3e813..808f650fb 100644 --- a/patches/api/Replace-ItemFlag.HIDE_POTION_EFFECTS.patch +++ b/patches/api/Replace-ItemFlag.HIDE_POTION_EFFECTS.patch @@ -19,8 +19,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * Setting to show/hide dyes from colored leather armor. @@ -0,0 +0,0 @@ public enum ItemFlag { - @MinecraftExperimental - @ApiStatus.Experimental + * Setting to show/hide armor trim from armor. + */ HIDE_ARMOR_TRIM; + // Paper start + /** diff --git a/patches/api/Use-ASM-for-event-executors.patch b/patches/api/Use-ASM-for-event-executors.patch index 888ff399f..31022d18d 100644 --- a/patches/api/Use-ASM-for-event-executors.patch +++ b/patches/api/Use-ASM-for-event-executors.patch @@ -18,7 +18,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + implementation("org.ow2.asm:asm-commons:9.4") // Paper end - compileOnly("org.apache.maven:maven-resolver-provider:3.8.5") + compileOnly("org.apache.maven:maven-resolver-provider:3.9.2") diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java new file mode 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 diff --git a/patches/api/fix-Instruments.patch b/patches/api/fix-Instruments.patch index 2799bb320..64f4461ea 100644 --- a/patches/api/fix-Instruments.patch +++ b/patches/api/fix-Instruments.patch @@ -29,51 +29,39 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 */ STICKS(0x3), @@ -0,0 +0,0 @@ public enum Instrument { + /** + * Zombie is normally played when a Zombie Head is on top of the note block. */ - @MinecraftExperimental - @ApiStatus.Experimental - ZOMBIE, + ZOMBIE(0x10), // Paper /** * Skeleton is normally played when a Skeleton Head is on top of the note block. */ - @MinecraftExperimental - @ApiStatus.Experimental - SKELETON, + SKELETON(0x11), // Paper /** * Creeper is normally played when a Creeper Head is on top of the note block. */ - @MinecraftExperimental - @ApiStatus.Experimental - CREEPER, + CREEPER(0x12), // Paper /** * Dragon is normally played when a Dragon Head is on top of the note block. */ - @MinecraftExperimental - @ApiStatus.Experimental - DRAGON, + DRAGON(0x13), // Paper /** * Wither Skeleton is normally played when a Wither Skeleton Head is on top of the note block. */ - @MinecraftExperimental - @ApiStatus.Experimental - WITHER_SKELETON, + WITHER_SKELETON(0x14), // Paper /** * Piglin is normally played when a Piglin Head is on top of the note block. */ - @MinecraftExperimental - @ApiStatus.Experimental - PIGLIN, + PIGLIN(0x15), // Paper /** * Custom Sound is normally played when a Player Head with the required data is on top of the note block. */ - @MinecraftExperimental - @ApiStatus.Experimental - CUSTOM_HEAD; + CUSTOM_HEAD(0x16); // Paper diff --git a/patches/server/Build-system-changes.patch b/patches/server/Build-system-changes.patch index 8a9fbd0ad..4a93c811c 100644 --- a/patches/server/Build-system-changes.patch +++ b/patches/server/Build-system-changes.patch @@ -19,8 +19,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 implementation("org.ow2.asm:asm:9.4") + implementation("org.ow2.asm:asm-commons:9.4") // Paper - ASM event executor generation implementation("commons-lang:commons-lang:2.6") - runtimeOnly("org.xerial:sqlite-jdbc:3.41.2.2") - runtimeOnly("com.mysql:mysql-connector-j:8.0.32") + runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0") + runtimeOnly("com.mysql:mysql-connector-j:8.0.33") @@ -0,0 +0,0 @@ dependencies { testImplementation("junit:junit:4.13.2") @@ -78,7 +78,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + Date buildDate = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z").parse(Main.class.getPackage().getImplementationVendor()); // Paper Calendar deadline = Calendar.getInstance(); - deadline.add(Calendar.DAY_OF_YEAR, -21); + deadline.add(Calendar.DAY_OF_YEAR, -3); diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java diff --git a/patches/server/CB-fixes.patch b/patches/server/CB-fixes.patch index 128a77f0d..51a8cb2ea 100644 --- a/patches/server/CB-fixes.patch +++ b/patches/server/CB-fixes.patch @@ -54,7 +54,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @Override - protected void actuallyHurt(DamageSource source, float amount) { + protected boolean damageEntity0(DamageSource source, float amount) { // Paper - fix CB method rename issue - this.standUpPanic(); + this.standUpInstantly(); - super.actuallyHurt(source, amount); + return super.damageEntity0(source, amount); // Paper - fix CB method rename issue } @@ -89,14 +89,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public final class CraftServer implements Server { Validate.notNull(key, "NamespacedKey cannot be null"); - LootTables registry = this.getServer().getLootTables(); -- return new CraftLootTable(key, registry.get(CraftNamespacedKey.toMinecraft(key))); + LootDataManager registry = this.getServer().getLootData(); +- return new CraftLootTable(key, registry.getLootTable(CraftNamespacedKey.toMinecraft(key))); + // Paper start - honor method contract + final ResourceLocation lootTableKey = CraftNamespacedKey.toMinecraft(key); -+ if (!registry.getIds().contains(lootTableKey)) { ++ if (registry.getLootTable(lootTableKey) == net.minecraft.world.level.storage.loot.LootTable.EMPTY) { + return null; + } -+ return new CraftLootTable(key, registry.get(lootTableKey)); ++ return new CraftLootTable(key, registry.getLootTable(lootTableKey)); + // Paper end } diff --git a/patches/server/MC-Dev-fixes.patch b/patches/server/MC-Dev-fixes.patch index 0ae0fb531..fb9065d6d 100644 --- a/patches/server/MC-Dev-fixes.patch +++ b/patches/server/MC-Dev-fixes.patch @@ -139,12 +139,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Rider @Override protected void customServerAiStep() { - this.level.getProfiler().push("camelBrain"); + this.level().getProfiler().push("camelBrain"); - Brain brain = this.getBrain(); + Brain brain = (Brain) this.getBrain(); // Paper - decompile fix - brain.tick((ServerLevel)this.level, this); - this.level.getProfiler().pop(); - this.level.getProfiler().push("camelActivityUpdate"); + brain.tick((ServerLevel)this.level(), this); + this.level().getProfiler().pop(); + this.level().getProfiler().push("camelActivityUpdate"); diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java diff --git a/patches/server/MC-Utils.patch b/patches/server/MC-Utils.patch index e13c463ab..2c18cf1da 100644 --- a/patches/server/MC-Utils.patch +++ b/patches/server/MC-Utils.patch @@ -5559,7 +5559,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java @@ -0,0 +0,0 @@ public class ChunkHolder { - private static final int BLOCKS_BEFORE_RESEND_FUDGE = 64; + private static final List CHUNK_STATUSES = ChunkStatus.getStatusList(); private final AtomicReferenceArray>> futures; private final LevelHeightAccessor levelHeightAccessor; - private volatile CompletableFuture> fullChunkFuture; @@ -5572,7 +5572,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @Nullable private final DebugBuffer chunkToSaveHistory; @@ -0,0 +0,0 @@ public class ChunkHolder { - private boolean resendLight; + private boolean wasAccessibleSinceLastSave; private CompletableFuture pendingFullStateConfirmation; + private final ChunkMap chunkMap; // Paper @@ -5615,7 +5615,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 public LevelChunk getFullChunkNow() { // Note: We use the oldTicketLevel for isLoaded checks. @@ -0,0 +0,0 @@ public class ChunkHolder { - return ChunkHolder.getStatus(this.ticketLevel).isOrAfter(leastStatus) ? this.getFutureIfPresentUnchecked(leastStatus) : ChunkHolder.UNLOADED_CHUNK_FUTURE; + return ChunkLevel.generationStatus(this.ticketLevel).isOrAfter(leastStatus) ? this.getFutureIfPresentUnchecked(leastStatus) : ChunkHolder.UNLOADED_CHUNK_FUTURE; } - public CompletableFuture> getTickingChunkFuture() { @@ -5680,7 +5680,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } @@ -0,0 +0,0 @@ public class ChunkHolder { - return ChunkHolder.getFullChunkStatus(this.ticketLevel); + return ChunkLevel.fullStatus(this.ticketLevel); } - public ChunkPos getPos() { @@ -5699,7 +5699,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 if (!flag2 && flag3) { + int expectCreateCount = ++this.fullChunkCreateCount; // Paper this.fullChunkFuture = chunkStorage.prepareAccessibleChunk(this); - this.scheduleFullChunkPromotion(chunkStorage, this.fullChunkFuture, executor, ChunkHolder.FullChunkStatus.BORDER); + this.scheduleFullChunkPromotion(chunkStorage, this.fullChunkFuture, executor, FullChunkStatus.FULL); + // Paper start - cache ticking ready status + this.fullChunkFuture.thenAccept(either -> { + final Optional left = either.left(); @@ -5724,11 +5724,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + this.isFullChunkReady = false; // Paper - cache ticking ready status } - boolean flag4 = playerchunk_state.isOrAfter(ChunkHolder.FullChunkStatus.TICKING); + boolean flag4 = fullchunkstatus.isOrAfter(FullChunkStatus.BLOCK_TICKING); @@ -0,0 +0,0 @@ public class ChunkHolder { if (!flag4 && flag5) { this.tickingChunkFuture = chunkStorage.prepareTickingChunk(this); - this.scheduleFullChunkPromotion(chunkStorage, this.tickingChunkFuture, executor, ChunkHolder.FullChunkStatus.TICKING); + this.scheduleFullChunkPromotion(chunkStorage, this.tickingChunkFuture, executor, FullChunkStatus.BLOCK_TICKING); + // Paper start - cache ticking ready status + this.tickingChunkFuture.thenAccept(either -> { + either.ifLeft(chunk -> { @@ -5754,8 +5754,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public class ChunkHolder { - this.entityTickingChunkFuture = chunkStorage.prepareEntityTickingChunk(this.pos); - this.scheduleFullChunkPromotion(chunkStorage, this.entityTickingChunkFuture, executor, ChunkHolder.FullChunkStatus.ENTITY_TICKING); + this.entityTickingChunkFuture = chunkStorage.prepareEntityTickingChunk(this); + this.scheduleFullChunkPromotion(chunkStorage, this.entityTickingChunkFuture, executor, FullChunkStatus.ENTITY_TICKING); + // Paper start - cache ticking ready status + this.entityTickingChunkFuture.thenAccept(either -> { + either.ifLeft(chunk -> { @@ -5885,13 +5885,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + public final int getEffectiveViewDistance() { + // TODO this needs to be checked on update + // Mojang currently sets it to +1 of the configured view distance. So subtract one to get the one we really want. -+ return this.viewDistance - 1; ++ //TODO check if +0 is correct now ++ return this.viewDistance; + } + // Paper end + - private CompletableFuture, ChunkHolder.ChunkLoadingFailure>> getChunkRangeFuture(ChunkPos centerChunk, int margin, IntFunction distanceToStatus) { - List>> list = new ArrayList(); - List list1 = new ArrayList(); + private CompletableFuture, ChunkHolder.ChunkLoadingFailure>> getChunkRangeFuture(ChunkHolder centerChunk, int margin, IntFunction distanceToStatus) { + if (margin == 0) { + ChunkStatus chunkstatus = (ChunkStatus) distanceToStatus.apply(0); @@ -0,0 +0,0 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider }; @@ -5990,7 +5991,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider this.viewDistance = j; - this.distanceManager.updatePlayerTickets(this.viewDistance + 1); + this.distanceManager.updatePlayerTickets(this.viewDistance); - ObjectIterator objectiterator = this.updatingChunkMap.values().iterator(); + Iterator objectiterator = io.papermc.paper.chunk.system.ChunkSystem.getUpdatingChunkHolders(this.level).iterator(); // Paper @@ -6525,7 +6526,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + // Paper end + // Add env and gen to constructor, IWorldDataServer -> WorldDataServer - public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List list, boolean flag1, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) { + public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List list, boolean flag1, @Nullable RandomSequences randomsequences, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) { // IRegistryCustom.Dimension iregistrycustom_dimension = minecraftserver.registryAccess(); // CraftBukkit - decompile error diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 @@ -6603,7 +6604,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + player.isRealPlayer = true; // Paper GameProfile gameprofile = player.getGameProfile(); GameProfileCache usercache = this.server.getProfileCache(); - Optional optional = usercache.get(gameprofile.getId()); + String s; diff --git a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java b/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java @@ -6673,7 +6674,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + public org.bukkit.craftbukkit.entity.CraftCreature getBukkitCreature() { return (org.bukkit.craftbukkit.entity.CraftCreature) super.getBukkitEntity(); } // Paper + public float getWalkTargetValue(BlockPos pos) { - return this.getWalkTargetValue(pos, this.level); + return this.getWalkTargetValue(pos, this.level()); } diff --git a/src/main/java/net/minecraft/world/entity/monster/Monster.java b/src/main/java/net/minecraft/world/entity/monster/Monster.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 @@ -6921,14 +6922,15 @@ diff --git a/src/main/java/net/minecraft/world/level/LevelReader.java b/src/main index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/world/level/LevelReader.java +++ b/src/main/java/net/minecraft/world/level/LevelReader.java -@@ -0,0 +0,0 @@ import net.minecraft.world.level.levelgen.Heightmap; - import net.minecraft.world.phys.AABB; - - public interface LevelReader extends BlockAndTintGetter, CollisionGetter, BiomeManager.NoiseBiomeSource { -+ @Nullable ChunkAccess getChunkIfLoadedImmediately(int x, int z); // Paper - ifLoaded api (we need this since current impl blocks if the chunk is loading) +@@ -0,0 +0,0 @@ public interface LevelReader extends BlockAndTintGetter, CollisionGetter, Signal @Nullable ChunkAccess getChunk(int chunkX, int chunkZ, ChunkStatus leastStatus, boolean create); ++ @Nullable ChunkAccess getChunkIfLoadedImmediately(int x, int z); // Paper - ifLoaded api (we need this since current impl blocks if the chunk is loading) ++ + /** @deprecated */ + @Deprecated + boolean hasChunk(int chunkX, int chunkZ); diff --git a/src/main/java/net/minecraft/world/level/PathNavigationRegion.java b/src/main/java/net/minecraft/world/level/PathNavigationRegion.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/world/level/PathNavigationRegion.java @@ -6994,8 +6996,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + private final int lightEmission; public final int getEmittedLight() { return this.lightEmission; } // Paper - OBFHELPER + private final boolean useShapeForLightOcclusion; public final boolean isTransparentOnSomeFaces() { return this.useShapeForLightOcclusion; } // Paper - OBFHELPER private final boolean isAir; - private final Material material; - private final MaterialColor materialColor; + private final boolean ignitedByLava; + /** @deprecated */ +@@ -0,0 +0,0 @@ public abstract class BlockBehaviour implements FeatureElement { + private final MapColor mapColor; public final float destroySpeed; private final boolean requiresCorrectToolForDrops; - private final boolean canOcclude; @@ -7004,7 +7008,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 private final BlockBehaviour.StatePredicate isSuffocating; private final BlockBehaviour.StatePredicate isViewBlocking; @@ -0,0 +0,0 @@ public abstract class BlockBehaviour implements FeatureElement { - this.spawnParticlesOnBreak = blockbase_info.spawnParticlesOnBreak; + } } + // Paper start @@ -7022,8 +7026,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } + this.shapeExceedsCube = this.cache == null || this.cache.largeCollisionShape; // Paper - moved from actual method to here + this.legacySolid = this.calculateSolid(); } - @@ -0,0 +0,0 @@ public abstract class BlockBehaviour implements FeatureElement { return this.getBlock().getOcclusionShape(this.asState(), world, pos); } @@ -7051,7 +7055,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public abstract class ChunkAccess implements BlockGetter, BiomeManager.NoiseBiom // CraftBukkit end - public ChunkAccess(ChunkPos pos, UpgradeData upgradeData, LevelHeightAccessor heightLimitView, Registry biome, long inhabitedTime, @Nullable LevelChunkSection[] sectionArrayInitializer, @Nullable BlendingData blendingData) { + public ChunkAccess(ChunkPos pos, UpgradeData upgradeData, LevelHeightAccessor heightLimitView, Registry biomeRegistry, long inhabitedTime, @Nullable LevelChunkSection[] sectionArray, @Nullable BlendingData blendingData) { - this.chunkPos = pos; + this.locX = pos.x; this.locZ = pos.z; // Paper - reduce need for field lookups + this.chunkPos = pos; this.coordinateKey = ChunkPos.asLong(locX, locZ); // Paper - cache long key @@ -7062,14 +7066,6 @@ diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java -@@ -0,0 +0,0 @@ import net.minecraft.nbt.CompoundTag; - import net.minecraft.network.FriendlyByteBuf; - import net.minecraft.network.protocol.game.ClientboundLevelChunkPacketData; - import net.minecraft.server.level.ChunkHolder; -+import net.minecraft.server.level.ServerChunkCache; - import net.minecraft.server.level.ServerLevel; - import net.minecraft.util.profiling.ProfilerFiller; - import net.minecraft.world.entity.Entity; @@ -0,0 +0,0 @@ public class LevelChunk extends ChunkAccess { public boolean needsDecoration; // CraftBukkit end @@ -7214,7 +7210,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + // Paper start - neighbour cache + int chunkX = this.chunkPos.x; + int chunkZ = this.chunkPos.z; -+ ServerChunkCache chunkProvider = this.level.getChunkSource(); ++ net.minecraft.server.level.ServerChunkCache chunkProvider = this.level.getChunkSource(); + for (int dx = -NEIGHBOUR_CACHE_RADIUS; dx <= NEIGHBOUR_CACHE_RADIUS; ++dx) { + for (int dz = -NEIGHBOUR_CACHE_RADIUS; dz <= NEIGHBOUR_CACHE_RADIUS; ++dz) { + LevelChunk neighbour = chunkProvider.getChunkAtIfLoadedMainThreadNoCache(chunkX + dx, chunkZ + dz); @@ -7241,7 +7237,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + // Paper start - neighbour cache + int chunkX = this.chunkPos.x; + int chunkZ = this.chunkPos.z; -+ ServerChunkCache chunkProvider = this.level.getChunkSource(); ++ net.minecraft.server.level.ServerChunkCache chunkProvider = this.level.getChunkSource(); + for (int dx = -NEIGHBOUR_CACHE_RADIUS; dx <= NEIGHBOUR_CACHE_RADIUS; ++dx) { + for (int dz = -NEIGHBOUR_CACHE_RADIUS; dz <= NEIGHBOUR_CACHE_RADIUS; ++dz) { + LevelChunk neighbour = chunkProvider.getChunkAtIfLoadedMainThreadNoCache(chunkX + dx, chunkZ + dz); diff --git a/patches/server/Paper-config-files.patch b/patches/server/Paper-config-files.patch index 791215c43..7657bb6be 100644 --- a/patches/server/Paper-config-files.patch +++ b/patches/server/Paper-config-files.patch @@ -23,8 +23,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 testImplementation("org.mockito:mockito-core:4.9.0") // Paper - switch to mockito + implementation("org.spongepowered:configurate-yaml:4.1.2") // Paper - config files implementation("commons-lang:commons-lang:2.6") - runtimeOnly("org.xerial:sqlite-jdbc:3.41.2.2") - runtimeOnly("com.mysql:mysql-connector-j:8.0.32") + runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0") + runtimeOnly("com.mysql:mysql-connector-j:8.0.33") diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java new file mode 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 @@ -4468,16 +4468,16 @@ diff --git a/src/main/java/net/minecraft/server/Services.java b/src/main/java/ne index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/Services.java +++ b/src/main/java/net/minecraft/server/Services.java -@@ -0,0 +0,0 @@ import java.io.File; +@@ -0,0 +0,0 @@ import javax.annotation.Nullable; import net.minecraft.server.players.GameProfileCache; import net.minecraft.util.SignatureValidator; --public record Services(MinecraftSessionService sessionService, SignatureValidator serviceSignatureValidator, GameProfileRepository profileRepository, GameProfileCache profileCache) { +-public record Services(MinecraftSessionService sessionService, ServicesKeySet servicesKeySet, GameProfileRepository profileRepository, GameProfileCache profileCache) { +// Paper start -+public record Services(MinecraftSessionService sessionService, SignatureValidator serviceSignatureValidator, GameProfileRepository profileRepository, GameProfileCache profileCache, @javax.annotation.Nullable io.papermc.paper.configuration.PaperConfigurations paperConfigurations) { ++public record Services(MinecraftSessionService sessionService, ServicesKeySet servicesKeySet, GameProfileRepository profileRepository, GameProfileCache profileCache, @javax.annotation.Nullable io.papermc.paper.configuration.PaperConfigurations paperConfigurations) { + -+ public Services(MinecraftSessionService sessionService, SignatureValidator signatureValidator, GameProfileRepository profileRepository, GameProfileCache profileCache) { -+ this(sessionService, signatureValidator, profileRepository, profileCache, null); ++ public Services(MinecraftSessionService sessionService, ServicesKeySet servicesKeySet, GameProfileRepository profileRepository, GameProfileCache profileCache) { ++ this(sessionService, servicesKeySet, profileRepository, profileCache, null); + } + + @Override @@ -4492,16 +4492,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 MinecraftSessionService minecraftSessionService = authenticationService.createMinecraftSessionService(); GameProfileRepository gameProfileRepository = authenticationService.createProfileRepository(); GameProfileCache gameProfileCache = new GameProfileCache(gameProfileRepository, new File(rootDirectory, "usercache.json")); - SignatureValidator signatureValidator = SignatureValidator.from(authenticationService.getServicesKey()); -- return new Services(minecraftSessionService, signatureValidator, gameProfileRepository, gameProfileCache); +- return new Services(minecraftSessionService, authenticationService.getServicesKeySet(), gameProfileRepository, gameProfileCache); + // Paper start + final java.nio.file.Path legacyConfigPath = ((File) optionSet.valueOf("paper-settings")).toPath(); + final java.nio.file.Path configDirPath = ((File) optionSet.valueOf("paper-settings-directory")).toPath(); + io.papermc.paper.configuration.PaperConfigurations paperConfigurations = io.papermc.paper.configuration.PaperConfigurations.setup(legacyConfigPath, configDirPath, rootDirectory.toPath(), (File) optionSet.valueOf("spigot-settings")); -+ return new Services(minecraftSessionService, signatureValidator, gameProfileRepository, gameProfileCache, paperConfigurations); ++ return new Services(minecraftSessionService, authenticationService.getServicesKeySet(), gameProfileRepository, gameProfileCache, paperConfigurations); + // Paper end } - } + + @Nullable diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java diff --git a/patches/server/Remap-fixes.patch b/patches/server/Remap-fixes.patch index d1d3e16cd..7878987ec 100644 --- a/patches/server/Remap-fixes.patch +++ b/patches/server/Remap-fixes.patch @@ -48,7 +48,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public class BehaviorUtils { return optional.map((uuid) -> { - return ((ServerLevel) entity.level).getEntity(uuid); + return ((ServerLevel) entity.level()).getEntity(uuid); - }).map((entity) -> { + }).map((entity1) -> { // Paper - remap fix LivingEntity entityliving1; diff --git a/patches/server/Setup-Gradle-project.patch b/patches/server/Setup-Gradle-project.patch index f468c0740..fc33d0f8d 100644 --- a/patches/server/Setup-Gradle-project.patch +++ b/patches/server/Setup-Gradle-project.patch @@ -48,12 +48,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } + implementation("org.ow2.asm:asm:9.4") + implementation("commons-lang:commons-lang:2.6") -+ runtimeOnly("org.xerial:sqlite-jdbc:3.41.2.2") -+ runtimeOnly("com.mysql:mysql-connector-j:8.0.32") ++ runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0") ++ runtimeOnly("com.mysql:mysql-connector-j:8.0.33") + -+ runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5") -+ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") -+ runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3") ++ runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.2") ++ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10") ++ runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10") + + testImplementation("junit:junit:4.13.2") + testImplementation("org.hamcrest:hamcrest-library:1.3") @@ -181,7 +181,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - org.spigotmc - spigot - jar -- 1.19.4-R0.1-SNAPSHOT +- 1.20-R0.1-SNAPSHOT - Spigot - https://www.spigotmc.org/ - @@ -197,7 +197,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - UTF-8 - unknown - git -- 1_19_R3 +- 1_20_R1 - 17 - 17 - @@ -251,19 +251,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - com.mojang - authlib -- 3.17.30 +- 4.0.43 - compile - - - com.mojang - brigadier -- 1.0.18 +- 1.1.8 - compile - - - com.mojang - datafixerupper -- 6.0.6 +- 6.0.8 - compile - - @@ -405,39 +405,39 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.xerial - sqlite-jdbc -- 3.41.2.2 +- 3.42.0.0 - runtime - - - com.mysql - mysql-connector-j -- 8.0.32 +- 8.0.33 - runtime - - - - org.apache.maven - maven-resolver-provider -- 3.8.5 +- 3.9.2 - runtime - - - org.apache.maven.resolver - maven-resolver-connector-basic -- 1.7.3 +- 1.9.10 - runtime - - - org.apache.maven.resolver - maven-resolver-transport-http -- 1.7.3 +- 1.9.10 - runtime - - - - org.jetbrains - annotations-java5 -- 23.0.0 +- 24.0.1 - provided - - @@ -578,7 +578,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - net.md-5 - specialsource-maven-plugin -- 1.2.4 +- 1.2.5 - - - package @@ -623,7 +623,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.apache.maven.plugins - maven-assembly-plugin -- 3.5.0 +- 3.6.0 - - - package @@ -668,7 +668,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.apache.maven.plugins - maven-surefire-plugin -- 3.0.0 +- 3.1.0 - - ${basedir}/target/test-server - @@ -697,7 +697,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.apache.maven.plugins - maven-checkstyle-plugin -- 3.2.1 +- 3.3.0 - - - test-compile diff --git a/patches/server/Test-changes.patch b/patches/server/Test-changes.patch index 89e14093c..271362b6d 100644 --- a/patches/server/Test-changes.patch +++ b/patches/server/Test-changes.patch @@ -14,8 +14,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 implementation("org.ow2.asm:asm-commons:9.4") // Paper - ASM event executor generation + testImplementation("org.mockito:mockito-core:4.9.0") // Paper - switch to mockito implementation("commons-lang:commons-lang:2.6") - runtimeOnly("org.xerial:sqlite-jdbc:3.41.2.2") - runtimeOnly("com.mysql:mysql-connector-j:8.0.32") + runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0") + runtimeOnly("com.mysql:mysql-connector-j:8.0.33") diff --git a/src/test/java/io/papermc/paper/testing/DummyServer.java b/src/test/java/io/papermc/paper/testing/DummyServer.java new file mode 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 @@ -74,7 +74,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + + when(dummyServer.getLootTable(any(NamespacedKey.class))).thenAnswer(invocation -> { + final NamespacedKey key = invocation.getArgument(0, NamespacedKey.class); -+ return new org.bukkit.craftbukkit.CraftLootTable(key, AbstractTestingBase.DATA_PACK.getLootTables().get(CraftNamespacedKey.toMinecraft(key))); ++ return new org.bukkit.craftbukkit.CraftLootTable(key, AbstractTestingBase.DATA_PACK.getLootData().getLootTable(CraftNamespacedKey.toMinecraft(key))); + }); + + when(dummyServer.getRegistry(any())).thenAnswer(invocation -> { @@ -240,7 +240,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - @Override - public Object handle(DummyServer server, Object[] args) { - NamespacedKey key = (NamespacedKey) args[0]; -- return new CraftLootTable(key, AbstractTestingBase.DATA_PACK.getLootTables().get(CraftNamespacedKey.toMinecraft(key))); +- return new CraftLootTable(key, AbstractTestingBase.DATA_PACK.getLootData().getLootTable(CraftNamespacedKey.toMinecraft(key))); - } - } - ); diff --git a/patches/server/API-for-creating-command-sender-which-forwards-feedb.patch b/patches/unapplied/server/API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/server/API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/unapplied/server/API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/server/API-to-get-a-BlockState-without-a-snapshot.patch b/patches/unapplied/server/API-to-get-a-BlockState-without-a-snapshot.patch similarity index 100% rename from patches/server/API-to-get-a-BlockState-without-a-snapshot.patch rename to patches/unapplied/server/API-to-get-a-BlockState-without-a-snapshot.patch diff --git a/patches/server/Ability-to-apply-mending-to-XP-API.patch b/patches/unapplied/server/Ability-to-apply-mending-to-XP-API.patch similarity index 100% rename from patches/server/Ability-to-apply-mending-to-XP-API.patch rename to patches/unapplied/server/Ability-to-apply-mending-to-XP-API.patch diff --git a/patches/server/Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/unapplied/server/Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch similarity index 100% rename from patches/server/Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch rename to patches/unapplied/server/Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch diff --git a/patches/server/Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/unapplied/server/Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/unapplied/server/Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/unapplied/server/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch similarity index 100% rename from patches/server/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch rename to patches/unapplied/server/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch diff --git a/patches/server/Add-API-for-item-entity-health.patch b/patches/unapplied/server/Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/Add-API-for-item-entity-health.patch rename to patches/unapplied/server/Add-API-for-item-entity-health.patch diff --git a/patches/server/Add-API-for-quit-reason.patch b/patches/unapplied/server/Add-API-for-quit-reason.patch similarity index 100% rename from patches/server/Add-API-for-quit-reason.patch rename to patches/unapplied/server/Add-API-for-quit-reason.patch diff --git a/patches/server/Add-API-for-resetting-a-single-score.patch b/patches/unapplied/server/Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/Add-API-for-resetting-a-single-score.patch rename to patches/unapplied/server/Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/unapplied/server/Add-API-methods-to-control-if-armour-stands-can-move.patch similarity index 100% rename from patches/server/Add-API-methods-to-control-if-armour-stands-can-move.patch rename to patches/unapplied/server/Add-API-methods-to-control-if-armour-stands-can-move.patch diff --git a/patches/server/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/unapplied/server/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 100% rename from patches/server/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to patches/unapplied/server/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch diff --git a/patches/server/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/unapplied/server/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/unapplied/server/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/Add-Alternate-Current-redstone-implementation.patch b/patches/unapplied/server/Add-Alternate-Current-redstone-implementation.patch similarity index 100% rename from patches/server/Add-Alternate-Current-redstone-implementation.patch rename to patches/unapplied/server/Add-Alternate-Current-redstone-implementation.patch diff --git a/patches/server/Add-ArmorStand-Item-Meta.patch b/patches/unapplied/server/Add-ArmorStand-Item-Meta.patch similarity index 100% rename from patches/server/Add-ArmorStand-Item-Meta.patch rename to patches/unapplied/server/Add-ArmorStand-Item-Meta.patch diff --git a/patches/server/Add-BeaconEffectEvent.patch b/patches/unapplied/server/Add-BeaconEffectEvent.patch similarity index 100% rename from patches/server/Add-BeaconEffectEvent.patch rename to patches/unapplied/server/Add-BeaconEffectEvent.patch diff --git a/patches/server/Add-BellRevealRaiderEvent.patch b/patches/unapplied/server/Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/Add-BellRevealRaiderEvent.patch rename to patches/unapplied/server/Add-BellRevealRaiderEvent.patch diff --git a/patches/server/Add-BellRingEvent.patch b/patches/unapplied/server/Add-BellRingEvent.patch similarity index 100% rename from patches/server/Add-BellRingEvent.patch rename to patches/unapplied/server/Add-BellRingEvent.patch diff --git a/patches/server/Add-Block-isValidTool.patch b/patches/unapplied/server/Add-Block-isValidTool.patch similarity index 100% rename from patches/server/Add-Block-isValidTool.patch rename to patches/unapplied/server/Add-Block-isValidTool.patch diff --git a/patches/server/Add-BlockBreakBlockEvent.patch b/patches/unapplied/server/Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/Add-BlockBreakBlockEvent.patch rename to patches/unapplied/server/Add-BlockBreakBlockEvent.patch diff --git a/patches/server/Add-BlockLockCheckEvent.patch b/patches/unapplied/server/Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/server/Add-BlockLockCheckEvent.patch rename to patches/unapplied/server/Add-BlockLockCheckEvent.patch diff --git a/patches/server/Add-Channel-initialization-listeners.patch b/patches/unapplied/server/Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/Add-Channel-initialization-listeners.patch rename to patches/unapplied/server/Add-Channel-initialization-listeners.patch diff --git a/patches/server/Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/unapplied/server/Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/unapplied/server/Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/unapplied/server/Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch similarity index 100% rename from patches/server/Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch rename to patches/unapplied/server/Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch diff --git a/patches/server/Add-Destroy-Speed-API.patch b/patches/unapplied/server/Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/Add-Destroy-Speed-API.patch rename to patches/unapplied/server/Add-Destroy-Speed-API.patch diff --git a/patches/server/Add-Early-Warning-Feature-to-WatchDog.patch b/patches/unapplied/server/Add-Early-Warning-Feature-to-WatchDog.patch similarity index 100% rename from patches/server/Add-Early-Warning-Feature-to-WatchDog.patch rename to patches/unapplied/server/Add-Early-Warning-Feature-to-WatchDog.patch diff --git a/patches/server/Add-ElderGuardianAppearanceEvent.patch b/patches/unapplied/server/Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/Add-ElderGuardianAppearanceEvent.patch rename to patches/unapplied/server/Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/Add-Entity-Body-Yaw-API.patch b/patches/unapplied/server/Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/server/Add-Entity-Body-Yaw-API.patch rename to patches/unapplied/server/Add-Entity-Body-Yaw-API.patch diff --git a/patches/server/Add-EntityBlockStorage-clearEntities.patch b/patches/unapplied/server/Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/Add-EntityBlockStorage-clearEntities.patch rename to patches/unapplied/server/Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/unapplied/server/Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/server/Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/unapplied/server/Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/server/Add-EntityFertilizeEggEvent.patch b/patches/unapplied/server/Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/server/Add-EntityFertilizeEggEvent.patch rename to patches/unapplied/server/Add-EntityFertilizeEggEvent.patch diff --git a/patches/server/Add-EntityInsideBlockEvent.patch b/patches/unapplied/server/Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/Add-EntityInsideBlockEvent.patch rename to patches/unapplied/server/Add-EntityInsideBlockEvent.patch diff --git a/patches/server/Add-EntityLoadCrossbowEvent.patch b/patches/unapplied/server/Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/Add-EntityLoadCrossbowEvent.patch rename to patches/unapplied/server/Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/Add-EntityPortalReadyEvent.patch b/patches/unapplied/server/Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/server/Add-EntityPortalReadyEvent.patch rename to patches/unapplied/server/Add-EntityPortalReadyEvent.patch diff --git a/patches/server/Add-EntityZapEvent.patch b/patches/unapplied/server/Add-EntityZapEvent.patch similarity index 100% rename from patches/server/Add-EntityZapEvent.patch rename to patches/unapplied/server/Add-EntityZapEvent.patch diff --git a/patches/server/Add-GameEvent-tags.patch b/patches/unapplied/server/Add-GameEvent-tags.patch similarity index 100% rename from patches/server/Add-GameEvent-tags.patch rename to patches/unapplied/server/Add-GameEvent-tags.patch diff --git a/patches/server/Add-Heightmap-API.patch b/patches/unapplied/server/Add-Heightmap-API.patch similarity index 100% rename from patches/server/Add-Heightmap-API.patch rename to patches/unapplied/server/Add-Heightmap-API.patch diff --git a/patches/server/Add-ItemFactory-getSpawnEgg-API.patch b/patches/unapplied/server/Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/server/Add-ItemFactory-getSpawnEgg-API.patch rename to patches/unapplied/server/Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/server/Add-LivingEntity-clearActiveItem.patch b/patches/unapplied/server/Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/Add-LivingEntity-clearActiveItem.patch rename to patches/unapplied/server/Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/Add-LivingEntity-getTargetEntity.patch b/patches/unapplied/server/Add-LivingEntity-getTargetEntity.patch similarity index 100% rename from patches/server/Add-LivingEntity-getTargetEntity.patch rename to patches/unapplied/server/Add-LivingEntity-getTargetEntity.patch diff --git a/patches/server/Add-Mob-Experience-reward-API.patch b/patches/unapplied/server/Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/server/Add-Mob-Experience-reward-API.patch rename to patches/unapplied/server/Add-Mob-Experience-reward-API.patch diff --git a/patches/server/Add-Mob-lookAt-API.patch b/patches/unapplied/server/Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/Add-Mob-lookAt-API.patch rename to patches/unapplied/server/Add-Mob-lookAt-API.patch diff --git a/patches/server/Add-More-Creeper-API.patch b/patches/unapplied/server/Add-More-Creeper-API.patch similarity index 100% rename from patches/server/Add-More-Creeper-API.patch rename to patches/unapplied/server/Add-More-Creeper-API.patch diff --git a/patches/server/Add-Moving-Piston-API.patch b/patches/unapplied/server/Add-Moving-Piston-API.patch similarity index 100% rename from patches/server/Add-Moving-Piston-API.patch rename to patches/unapplied/server/Add-Moving-Piston-API.patch diff --git a/patches/server/Add-NamespacedKey-biome-methods.patch b/patches/unapplied/server/Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/server/Add-NamespacedKey-biome-methods.patch rename to patches/unapplied/server/Add-NamespacedKey-biome-methods.patch diff --git a/patches/server/Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/unapplied/server/Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/unapplied/server/Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/Add-PhantomPreSpawnEvent.patch b/patches/unapplied/server/Add-PhantomPreSpawnEvent.patch similarity index 100% rename from patches/server/Add-PhantomPreSpawnEvent.patch rename to patches/unapplied/server/Add-PhantomPreSpawnEvent.patch diff --git a/patches/server/Add-Player-Warden-Warning-API.patch b/patches/unapplied/server/Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/server/Add-Player-Warden-Warning-API.patch rename to patches/unapplied/server/Add-Player-Warden-Warning-API.patch diff --git a/patches/server/Add-Player-getFishHook.patch b/patches/unapplied/server/Add-Player-getFishHook.patch similarity index 100% rename from patches/server/Add-Player-getFishHook.patch rename to patches/unapplied/server/Add-Player-getFishHook.patch diff --git a/patches/server/Add-PlayerArmorChangeEvent.patch b/patches/unapplied/server/Add-PlayerArmorChangeEvent.patch similarity index 100% rename from patches/server/Add-PlayerArmorChangeEvent.patch rename to patches/unapplied/server/Add-PlayerArmorChangeEvent.patch diff --git a/patches/server/Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/unapplied/server/Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from patches/server/Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/unapplied/server/Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/patches/server/Add-PlayerConnectionCloseEvent.patch b/patches/unapplied/server/Add-PlayerConnectionCloseEvent.patch similarity index 100% rename from patches/server/Add-PlayerConnectionCloseEvent.patch rename to patches/unapplied/server/Add-PlayerConnectionCloseEvent.patch diff --git a/patches/server/Add-PlayerInitialSpawnEvent.patch b/patches/unapplied/server/Add-PlayerInitialSpawnEvent.patch similarity index 100% rename from patches/server/Add-PlayerInitialSpawnEvent.patch rename to patches/unapplied/server/Add-PlayerInitialSpawnEvent.patch diff --git a/patches/server/Add-PlayerInventorySlotChangeEvent.patch b/patches/unapplied/server/Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/server/Add-PlayerInventorySlotChangeEvent.patch rename to patches/unapplied/server/Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/server/Add-PlayerItemCooldownEvent.patch b/patches/unapplied/server/Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/Add-PlayerItemCooldownEvent.patch rename to patches/unapplied/server/Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/Add-PlayerItemFrameChangeEvent.patch b/patches/unapplied/server/Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/Add-PlayerItemFrameChangeEvent.patch rename to patches/unapplied/server/Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/Add-PlayerJumpEvent.patch b/patches/unapplied/server/Add-PlayerJumpEvent.patch similarity index 100% rename from patches/server/Add-PlayerJumpEvent.patch rename to patches/unapplied/server/Add-PlayerJumpEvent.patch diff --git a/patches/server/Add-PlayerKickEvent-causes.patch b/patches/unapplied/server/Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/server/Add-PlayerKickEvent-causes.patch rename to patches/unapplied/server/Add-PlayerKickEvent-causes.patch diff --git a/patches/server/Add-PlayerSetSpawnEvent.patch b/patches/unapplied/server/Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/server/Add-PlayerSetSpawnEvent.patch rename to patches/unapplied/server/Add-PlayerSetSpawnEvent.patch diff --git a/patches/server/Add-PlayerShearBlockEvent.patch b/patches/unapplied/server/Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/Add-PlayerShearBlockEvent.patch rename to patches/unapplied/server/Add-PlayerShearBlockEvent.patch diff --git a/patches/server/Add-PlayerStopUsingItemEvent.patch b/patches/unapplied/server/Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/server/Add-PlayerStopUsingItemEvent.patch rename to patches/unapplied/server/Add-PlayerStopUsingItemEvent.patch diff --git a/patches/server/Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/unapplied/server/Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/unapplied/server/Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/Add-PlayerUseUnknownEntityEvent.patch b/patches/unapplied/server/Add-PlayerUseUnknownEntityEvent.patch similarity index 100% rename from patches/server/Add-PlayerUseUnknownEntityEvent.patch rename to patches/unapplied/server/Add-PlayerUseUnknownEntityEvent.patch diff --git a/patches/server/Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/unapplied/server/Add-Plugin-Tickets-to-API-Chunk-Methods.patch similarity index 100% rename from patches/server/Add-Plugin-Tickets-to-API-Chunk-Methods.patch rename to patches/unapplied/server/Add-Plugin-Tickets-to-API-Chunk-Methods.patch diff --git a/patches/server/Add-PrePlayerAttackEntityEvent.patch b/patches/unapplied/server/Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/server/Add-PrePlayerAttackEntityEvent.patch rename to patches/unapplied/server/Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/server/Add-PrepareResultEvent.patch b/patches/unapplied/server/Add-PrepareResultEvent.patch similarity index 100% rename from patches/server/Add-PrepareResultEvent.patch rename to patches/unapplied/server/Add-PrepareResultEvent.patch diff --git a/patches/server/Add-ProjectileCollideEvent.patch b/patches/unapplied/server/Add-ProjectileCollideEvent.patch similarity index 100% rename from patches/server/Add-ProjectileCollideEvent.patch rename to patches/unapplied/server/Add-ProjectileCollideEvent.patch diff --git a/patches/server/Add-PufferFishStateChangeEvent.patch b/patches/unapplied/server/Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/Add-PufferFishStateChangeEvent.patch rename to patches/unapplied/server/Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/Add-Raw-Byte-Entity-Serialization.patch b/patches/unapplied/server/Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/server/Add-Raw-Byte-Entity-Serialization.patch rename to patches/unapplied/server/Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/server/Add-Raw-Byte-ItemStack-Serialization.patch b/patches/unapplied/server/Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/server/Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/unapplied/server/Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/server/Add-Shearable-API.patch b/patches/unapplied/server/Add-Shearable-API.patch similarity index 100% rename from patches/server/Add-Shearable-API.patch rename to patches/unapplied/server/Add-Shearable-API.patch diff --git a/patches/server/Add-Sneaking-API-for-Entities.patch b/patches/unapplied/server/Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/server/Add-Sneaking-API-for-Entities.patch rename to patches/unapplied/server/Add-Sneaking-API-for-Entities.patch diff --git a/patches/server/Add-StructuresLocateEvent.patch b/patches/unapplied/server/Add-StructuresLocateEvent.patch similarity index 100% rename from patches/server/Add-StructuresLocateEvent.patch rename to patches/unapplied/server/Add-StructuresLocateEvent.patch diff --git a/patches/server/Add-System.out-err-catcher.patch b/patches/unapplied/server/Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/Add-System.out-err-catcher.patch rename to patches/unapplied/server/Add-System.out-err-catcher.patch diff --git a/patches/server/Add-TNTPrimeEvent.patch b/patches/unapplied/server/Add-TNTPrimeEvent.patch similarity index 100% rename from patches/server/Add-TNTPrimeEvent.patch rename to patches/unapplied/server/Add-TNTPrimeEvent.patch diff --git a/patches/server/Add-TameableDeathMessageEvent.patch b/patches/unapplied/server/Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/server/Add-TameableDeathMessageEvent.patch rename to patches/unapplied/server/Add-TameableDeathMessageEvent.patch diff --git a/patches/server/Add-ThrownEggHatchEvent.patch b/patches/unapplied/server/Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/server/Add-ThrownEggHatchEvent.patch rename to patches/unapplied/server/Add-ThrownEggHatchEvent.patch diff --git a/patches/server/Add-TickThread.patch b/patches/unapplied/server/Add-TickThread.patch similarity index 100% rename from patches/server/Add-TickThread.patch rename to patches/unapplied/server/Add-TickThread.patch diff --git a/patches/server/Add-Unix-domain-socket-support.patch b/patches/unapplied/server/Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/Add-Unix-domain-socket-support.patch rename to patches/unapplied/server/Add-Unix-domain-socket-support.patch diff --git a/patches/server/Add-UnknownCommandEvent.patch b/patches/unapplied/server/Add-UnknownCommandEvent.patch similarity index 100% rename from patches/server/Add-UnknownCommandEvent.patch rename to patches/unapplied/server/Add-UnknownCommandEvent.patch diff --git a/patches/server/Add-Velocity-IP-Forwarding-Support.patch b/patches/unapplied/server/Add-Velocity-IP-Forwarding-Support.patch similarity index 100% rename from patches/server/Add-Velocity-IP-Forwarding-Support.patch rename to patches/unapplied/server/Add-Velocity-IP-Forwarding-Support.patch diff --git a/patches/server/Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/unapplied/server/Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from patches/server/Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/unapplied/server/Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/server/Add-WardenAngerChangeEvent.patch b/patches/unapplied/server/Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/server/Add-WardenAngerChangeEvent.patch rename to patches/unapplied/server/Add-WardenAngerChangeEvent.patch diff --git a/patches/server/Add-World-Util-Methods.patch b/patches/unapplied/server/Add-World-Util-Methods.patch similarity index 100% rename from patches/server/Add-World-Util-Methods.patch rename to patches/unapplied/server/Add-World-Util-Methods.patch diff --git a/patches/server/Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/unapplied/server/Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/unapplied/server/Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/unapplied/server/Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/server/Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/unapplied/server/Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/server/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/unapplied/server/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/unapplied/server/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/Add-ability-to-configure-frosted_ice-properties.patch b/patches/unapplied/server/Add-ability-to-configure-frosted_ice-properties.patch similarity index 100% rename from patches/server/Add-ability-to-configure-frosted_ice-properties.patch rename to patches/unapplied/server/Add-ability-to-configure-frosted_ice-properties.patch diff --git a/patches/server/Add-additional-open-container-api-to-HumanEntity.patch b/patches/unapplied/server/Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/server/Add-additional-open-container-api-to-HumanEntity.patch rename to patches/unapplied/server/Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/server/Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/unapplied/server/Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/server/Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/unapplied/server/Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/server/Add-back-EntityPortalExitEvent.patch b/patches/unapplied/server/Add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/server/Add-back-EntityPortalExitEvent.patch rename to patches/unapplied/server/Add-back-EntityPortalExitEvent.patch diff --git a/patches/server/Add-basic-Datapack-API.patch b/patches/unapplied/server/Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/Add-basic-Datapack-API.patch rename to patches/unapplied/server/Add-basic-Datapack-API.patch diff --git a/patches/server/Add-bypass-host-check.patch b/patches/unapplied/server/Add-bypass-host-check.patch similarity index 100% rename from patches/server/Add-bypass-host-check.patch rename to patches/unapplied/server/Add-bypass-host-check.patch diff --git a/patches/server/Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/unapplied/server/Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/server/Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/unapplied/server/Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/server/Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/unapplied/server/Add-command-line-option-to-load-extra-plugin-jars-no.patch similarity index 100% rename from patches/server/Add-command-line-option-to-load-extra-plugin-jars-no.patch rename to patches/unapplied/server/Add-command-line-option-to-load-extra-plugin-jars-no.patch diff --git a/patches/server/Add-config-for-mobs-immune-to-default-effects.patch b/patches/unapplied/server/Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/server/Add-config-for-mobs-immune-to-default-effects.patch rename to patches/unapplied/server/Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/server/Add-config-option-for-logging-player-ip-addresses.patch b/patches/unapplied/server/Add-config-option-for-logging-player-ip-addresses.patch similarity index 100% rename from patches/server/Add-config-option-for-logging-player-ip-addresses.patch rename to patches/unapplied/server/Add-config-option-for-logging-player-ip-addresses.patch diff --git a/patches/server/Add-config-option-for-spider-worldborder-climbing.patch b/patches/unapplied/server/Add-config-option-for-spider-worldborder-climbing.patch similarity index 100% rename from patches/server/Add-config-option-for-spider-worldborder-climbing.patch rename to patches/unapplied/server/Add-config-option-for-spider-worldborder-climbing.patch diff --git a/patches/server/Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/unapplied/server/Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/server/Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/unapplied/server/Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/server/Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/unapplied/server/Add-config-to-disable-ender-dragon-legacy-check.patch similarity index 100% rename from patches/server/Add-config-to-disable-ender-dragon-legacy-check.patch rename to patches/unapplied/server/Add-config-to-disable-ender-dragon-legacy-check.patch diff --git a/patches/server/Add-configurable-despawn-distances-for-living-entiti.patch b/patches/unapplied/server/Add-configurable-despawn-distances-for-living-entiti.patch similarity index 100% rename from patches/server/Add-configurable-despawn-distances-for-living-entiti.patch rename to patches/unapplied/server/Add-configurable-despawn-distances-for-living-entiti.patch diff --git a/patches/server/Add-configurable-height-for-slime-spawn.patch b/patches/unapplied/server/Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/server/Add-configurable-height-for-slime-spawn.patch rename to patches/unapplied/server/Add-configurable-height-for-slime-spawn.patch diff --git a/patches/server/Add-configurable-portal-search-radius.patch b/patches/unapplied/server/Add-configurable-portal-search-radius.patch similarity index 100% rename from patches/server/Add-configurable-portal-search-radius.patch rename to patches/unapplied/server/Add-configurable-portal-search-radius.patch diff --git a/patches/server/Add-configuration-option-to-prevent-player-names-fro.patch b/patches/unapplied/server/Add-configuration-option-to-prevent-player-names-fro.patch similarity index 100% rename from patches/server/Add-configuration-option-to-prevent-player-names-fro.patch rename to patches/unapplied/server/Add-configuration-option-to-prevent-player-names-fro.patch diff --git a/patches/server/Add-critical-damage-API.patch b/patches/unapplied/server/Add-critical-damage-API.patch similarity index 100% rename from patches/server/Add-critical-damage-API.patch rename to patches/unapplied/server/Add-critical-damage-API.patch diff --git a/patches/server/Add-debug-for-sync-chunk-loads.patch b/patches/unapplied/server/Add-debug-for-sync-chunk-loads.patch similarity index 100% rename from patches/server/Add-debug-for-sync-chunk-loads.patch rename to patches/unapplied/server/Add-debug-for-sync-chunk-loads.patch diff --git a/patches/server/Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/unapplied/server/Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/server/Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/unapplied/server/Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/server/Add-entity-knockback-API.patch b/patches/unapplied/server/Add-entity-knockback-API.patch similarity index 100% rename from patches/server/Add-entity-knockback-API.patch rename to patches/unapplied/server/Add-entity-knockback-API.patch diff --git a/patches/server/Add-entity-liquid-API.patch b/patches/unapplied/server/Add-entity-liquid-API.patch similarity index 100% rename from patches/server/Add-entity-liquid-API.patch rename to patches/unapplied/server/Add-entity-liquid-API.patch diff --git a/patches/server/Add-environment-variable-to-disable-server-gui.patch b/patches/unapplied/server/Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/Add-environment-variable-to-disable-server-gui.patch rename to patches/unapplied/server/Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/Add-exception-reporting-event.patch b/patches/unapplied/server/Add-exception-reporting-event.patch similarity index 100% rename from patches/server/Add-exception-reporting-event.patch rename to patches/unapplied/server/Add-exception-reporting-event.patch diff --git a/patches/server/Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/unapplied/server/Add-exploded-block-state-to-BlockExplodeEvent.patch similarity index 100% rename from patches/server/Add-exploded-block-state-to-BlockExplodeEvent.patch rename to patches/unapplied/server/Add-exploded-block-state-to-BlockExplodeEvent.patch diff --git a/patches/server/Add-fast-alternative-constructor-for-Rotations.patch b/patches/unapplied/server/Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/Add-fast-alternative-constructor-for-Rotations.patch rename to patches/unapplied/server/Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/Add-fire-tick-delay-option.patch b/patches/unapplied/server/Add-fire-tick-delay-option.patch similarity index 100% rename from patches/server/Add-fire-tick-delay-option.patch rename to patches/unapplied/server/Add-fire-tick-delay-option.patch diff --git a/patches/server/Add-getDrops-to-BlockState.patch b/patches/unapplied/server/Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/server/Add-getDrops-to-BlockState.patch rename to patches/unapplied/server/Add-getDrops-to-BlockState.patch diff --git a/patches/server/Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/unapplied/server/Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/unapplied/server/Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/Add-getOfflinePlayerIfCached-String.patch b/patches/unapplied/server/Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/server/Add-getOfflinePlayerIfCached-String.patch rename to patches/unapplied/server/Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/server/Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/unapplied/server/Add-handshake-event-to-allow-plugins-to-handle-clien.patch similarity index 100% rename from patches/server/Add-handshake-event-to-allow-plugins-to-handle-clien.patch rename to patches/unapplied/server/Add-handshake-event-to-allow-plugins-to-handle-clien.patch diff --git a/patches/server/Add-ignore-discounts-API.patch b/patches/unapplied/server/Add-ignore-discounts-API.patch similarity index 100% rename from patches/server/Add-ignore-discounts-API.patch rename to patches/unapplied/server/Add-ignore-discounts-API.patch diff --git a/patches/server/Add-isCollidable-methods-to-various-places.patch b/patches/unapplied/server/Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/Add-isCollidable-methods-to-various-places.patch rename to patches/unapplied/server/Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/unapplied/server/Add-methods-for-working-with-arrows-stuck-in-living-.patch similarity index 100% rename from patches/server/Add-methods-for-working-with-arrows-stuck-in-living-.patch rename to patches/unapplied/server/Add-methods-for-working-with-arrows-stuck-in-living-.patch diff --git a/patches/server/Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/unapplied/server/Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/server/Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/unapplied/server/Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/server/Add-methods-to-get-translation-keys.patch b/patches/unapplied/server/Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/server/Add-methods-to-get-translation-keys.patch rename to patches/unapplied/server/Add-methods-to-get-translation-keys.patch diff --git a/patches/server/Add-missing-BlockFadeEvents.patch b/patches/unapplied/server/Add-missing-BlockFadeEvents.patch similarity index 100% rename from patches/server/Add-missing-BlockFadeEvents.patch rename to patches/unapplied/server/Add-missing-BlockFadeEvents.patch diff --git a/patches/server/Add-missing-SpigotConfig-logCommands-check.patch b/patches/unapplied/server/Add-missing-SpigotConfig-logCommands-check.patch similarity index 100% rename from patches/server/Add-missing-SpigotConfig-logCommands-check.patch rename to patches/unapplied/server/Add-missing-SpigotConfig-logCommands-check.patch diff --git a/patches/server/Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/unapplied/server/Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 100% rename from patches/server/Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/unapplied/server/Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch diff --git a/patches/server/Add-missing-block-data-mins-and-maxes.patch b/patches/unapplied/server/Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/server/Add-missing-block-data-mins-and-maxes.patch rename to patches/unapplied/server/Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/server/Add-missing-important-BlockStateListPopulator-method.patch b/patches/unapplied/server/Add-missing-important-BlockStateListPopulator-method.patch similarity index 100% rename from patches/server/Add-missing-important-BlockStateListPopulator-method.patch rename to patches/unapplied/server/Add-missing-important-BlockStateListPopulator-method.patch diff --git a/patches/server/Add-missing-structure-set-seed-configs.patch b/patches/unapplied/server/Add-missing-structure-set-seed-configs.patch similarity index 100% rename from patches/server/Add-missing-structure-set-seed-configs.patch rename to patches/unapplied/server/Add-missing-structure-set-seed-configs.patch diff --git a/patches/server/Add-missing-team-sidebar-display-slots.patch b/patches/unapplied/server/Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/Add-missing-team-sidebar-display-slots.patch rename to patches/unapplied/server/Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/Add-moon-phase-API.patch b/patches/unapplied/server/Add-moon-phase-API.patch similarity index 100% rename from patches/server/Add-moon-phase-API.patch rename to patches/unapplied/server/Add-moon-phase-API.patch diff --git a/patches/server/Add-more-Campfire-API.patch b/patches/unapplied/server/Add-more-Campfire-API.patch similarity index 100% rename from patches/server/Add-more-Campfire-API.patch rename to patches/unapplied/server/Add-more-Campfire-API.patch diff --git a/patches/server/Add-more-Evoker-API.patch b/patches/unapplied/server/Add-more-Evoker-API.patch similarity index 100% rename from patches/server/Add-more-Evoker-API.patch rename to patches/unapplied/server/Add-more-Evoker-API.patch diff --git a/patches/server/Add-more-LimitedRegion-API.patch b/patches/unapplied/server/Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/Add-more-LimitedRegion-API.patch rename to patches/unapplied/server/Add-more-LimitedRegion-API.patch diff --git a/patches/server/Add-more-WanderingTrader-API.patch b/patches/unapplied/server/Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/Add-more-WanderingTrader-API.patch rename to patches/unapplied/server/Add-more-WanderingTrader-API.patch diff --git a/patches/server/Add-more-Witch-API.patch b/patches/unapplied/server/Add-more-Witch-API.patch similarity index 100% rename from patches/server/Add-more-Witch-API.patch rename to patches/unapplied/server/Add-more-Witch-API.patch diff --git a/patches/server/Add-more-Zombie-API.patch b/patches/unapplied/server/Add-more-Zombie-API.patch similarity index 100% rename from patches/server/Add-more-Zombie-API.patch rename to patches/unapplied/server/Add-more-Zombie-API.patch diff --git a/patches/server/Add-more-advancement-API.patch b/patches/unapplied/server/Add-more-advancement-API.patch similarity index 100% rename from patches/server/Add-more-advancement-API.patch rename to patches/unapplied/server/Add-more-advancement-API.patch diff --git a/patches/server/Add-new-overload-to-PersistentDataContainer-has.patch b/patches/unapplied/server/Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/server/Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/unapplied/server/Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/server/Add-openSign-method-to-HumanEntity.patch b/patches/unapplied/server/Add-openSign-method-to-HumanEntity.patch similarity index 100% rename from patches/server/Add-openSign-method-to-HumanEntity.patch rename to patches/unapplied/server/Add-openSign-method-to-HumanEntity.patch diff --git a/patches/server/Add-option-for-console-having-all-permissions.patch b/patches/unapplied/server/Add-option-for-console-having-all-permissions.patch similarity index 100% rename from patches/server/Add-option-for-console-having-all-permissions.patch rename to patches/unapplied/server/Add-option-for-console-having-all-permissions.patch diff --git a/patches/server/Add-option-for-strict-advancement-dimension-checks.patch b/patches/unapplied/server/Add-option-for-strict-advancement-dimension-checks.patch similarity index 100% rename from patches/server/Add-option-for-strict-advancement-dimension-checks.patch rename to patches/unapplied/server/Add-option-for-strict-advancement-dimension-checks.patch diff --git a/patches/server/Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/unapplied/server/Add-option-to-allow-iron-golems-to-spawn-in-air.patch similarity index 100% rename from patches/server/Add-option-to-allow-iron-golems-to-spawn-in-air.patch rename to patches/unapplied/server/Add-option-to-allow-iron-golems-to-spawn-in-air.patch diff --git a/patches/server/Add-option-to-disable-pillager-patrols.patch b/patches/unapplied/server/Add-option-to-disable-pillager-patrols.patch similarity index 100% rename from patches/server/Add-option-to-disable-pillager-patrols.patch rename to patches/unapplied/server/Add-option-to-disable-pillager-patrols.patch diff --git a/patches/server/Add-option-to-fix-items-merging-through-walls.patch b/patches/unapplied/server/Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/Add-option-to-fix-items-merging-through-walls.patch rename to patches/unapplied/server/Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/unapplied/server/Add-option-to-make-parrots-stay-on-shoulders-despite.patch similarity index 100% rename from patches/server/Add-option-to-make-parrots-stay-on-shoulders-despite.patch rename to patches/unapplied/server/Add-option-to-make-parrots-stay-on-shoulders-despite.patch diff --git a/patches/server/Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/unapplied/server/Add-option-to-nerf-pigmen-from-nether-portals.patch similarity index 100% rename from patches/server/Add-option-to-nerf-pigmen-from-nether-portals.patch rename to patches/unapplied/server/Add-option-to-nerf-pigmen-from-nether-portals.patch diff --git a/patches/server/Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/unapplied/server/Add-option-to-prevent-players-from-moving-into-unloa.patch similarity index 100% rename from patches/server/Add-option-to-prevent-players-from-moving-into-unloa.patch rename to patches/unapplied/server/Add-option-to-prevent-players-from-moving-into-unloa.patch diff --git a/patches/server/Add-packet-limiter-config.patch b/patches/unapplied/server/Add-packet-limiter-config.patch similarity index 100% rename from patches/server/Add-packet-limiter-config.patch rename to patches/unapplied/server/Add-packet-limiter-config.patch diff --git a/patches/server/Add-paper-dumplisteners-command.patch b/patches/unapplied/server/Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/Add-paper-dumplisteners-command.patch rename to patches/unapplied/server/Add-paper-dumplisteners-command.patch diff --git a/patches/server/Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/unapplied/server/Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 100% rename from patches/server/Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/unapplied/server/Add-paper-mobcaps-and-paper-playermobcaps.patch diff --git a/patches/server/Add-permission-for-command-blocks.patch b/patches/unapplied/server/Add-permission-for-command-blocks.patch similarity index 100% rename from patches/server/Add-permission-for-command-blocks.patch rename to patches/unapplied/server/Add-permission-for-command-blocks.patch diff --git a/patches/server/Add-phantom-creative-and-insomniac-controls.patch b/patches/unapplied/server/Add-phantom-creative-and-insomniac-controls.patch similarity index 100% rename from patches/server/Add-phantom-creative-and-insomniac-controls.patch rename to patches/unapplied/server/Add-phantom-creative-and-insomniac-controls.patch diff --git a/patches/server/Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/unapplied/server/Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/unapplied/server/Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/Add-player-health-update-API.patch b/patches/unapplied/server/Add-player-health-update-API.patch similarity index 100% rename from patches/server/Add-player-health-update-API.patch rename to patches/unapplied/server/Add-player-health-update-API.patch diff --git a/patches/server/Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/unapplied/server/Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/server/Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/unapplied/server/Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/server/Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/server/Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/unapplied/server/Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/Add-ray-tracing-methods-to-LivingEntity.patch b/patches/unapplied/server/Add-ray-tracing-methods-to-LivingEntity.patch similarity index 100% rename from patches/server/Add-ray-tracing-methods-to-LivingEntity.patch rename to patches/unapplied/server/Add-ray-tracing-methods-to-LivingEntity.patch diff --git a/patches/server/Add-recipe-to-cook-events.patch b/patches/unapplied/server/Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/Add-recipe-to-cook-events.patch rename to patches/unapplied/server/Add-recipe-to-cook-events.patch diff --git a/patches/server/Add-root-admin-user-detection.patch b/patches/unapplied/server/Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/Add-root-admin-user-detection.patch rename to patches/unapplied/server/Add-root-admin-user-detection.patch diff --git a/patches/server/Add-sendOpLevel-API.patch b/patches/unapplied/server/Add-sendOpLevel-API.patch similarity index 100% rename from patches/server/Add-sendOpLevel-API.patch rename to patches/unapplied/server/Add-sendOpLevel-API.patch diff --git a/patches/server/Add-server-name-parameter.patch b/patches/unapplied/server/Add-server-name-parameter.patch similarity index 100% rename from patches/server/Add-server-name-parameter.patch rename to patches/unapplied/server/Add-server-name-parameter.patch diff --git a/patches/server/Add-setMaxPlayers-API.patch b/patches/unapplied/server/Add-setMaxPlayers-API.patch similarity index 100% rename from patches/server/Add-setMaxPlayers-API.patch rename to patches/unapplied/server/Add-setMaxPlayers-API.patch diff --git a/patches/server/Add-setPlayerProfile-API-for-Skulls.patch b/patches/unapplied/server/Add-setPlayerProfile-API-for-Skulls.patch similarity index 100% rename from patches/server/Add-setPlayerProfile-API-for-Skulls.patch rename to patches/unapplied/server/Add-setPlayerProfile-API-for-Skulls.patch diff --git a/patches/server/Add-setting-for-proxy-online-mode-status.patch b/patches/unapplied/server/Add-setting-for-proxy-online-mode-status.patch similarity index 100% rename from patches/server/Add-setting-for-proxy-online-mode-status.patch rename to patches/unapplied/server/Add-setting-for-proxy-online-mode-status.patch diff --git a/patches/server/Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/unapplied/server/Add-some-minimal-debug-information-to-chat-packet-er.patch similarity index 100% rename from patches/server/Add-some-minimal-debug-information-to-chat-packet-er.patch rename to patches/unapplied/server/Add-some-minimal-debug-information-to-chat-packet-er.patch diff --git a/patches/server/Add-source-to-PlayerExpChangeEvent.patch b/patches/unapplied/server/Add-source-to-PlayerExpChangeEvent.patch similarity index 100% rename from patches/server/Add-source-to-PlayerExpChangeEvent.patch rename to patches/unapplied/server/Add-source-to-PlayerExpChangeEvent.patch diff --git a/patches/server/Add-sun-related-API.patch b/patches/unapplied/server/Add-sun-related-API.patch similarity index 100% rename from patches/server/Add-sun-related-API.patch rename to patches/unapplied/server/Add-sun-related-API.patch diff --git a/patches/server/Add-support-for-Proxy-Protocol.patch b/patches/unapplied/server/Add-support-for-Proxy-Protocol.patch similarity index 100% rename from patches/server/Add-support-for-Proxy-Protocol.patch rename to patches/unapplied/server/Add-support-for-Proxy-Protocol.patch diff --git a/patches/server/Add-support-for-hex-color-codes-in-console.patch b/patches/unapplied/server/Add-support-for-hex-color-codes-in-console.patch similarity index 100% rename from patches/server/Add-support-for-hex-color-codes-in-console.patch rename to patches/unapplied/server/Add-support-for-hex-color-codes-in-console.patch diff --git a/patches/server/Add-tick-times-API-and-mspt-command.patch b/patches/unapplied/server/Add-tick-times-API-and-mspt-command.patch similarity index 100% rename from patches/server/Add-tick-times-API-and-mspt-command.patch rename to patches/unapplied/server/Add-tick-times-API-and-mspt-command.patch diff --git a/patches/server/Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/unapplied/server/Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/unapplied/server/Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/Add-transient-modifier-API.patch b/patches/unapplied/server/Add-transient-modifier-API.patch similarity index 100% rename from patches/server/Add-transient-modifier-API.patch rename to patches/unapplied/server/Add-transient-modifier-API.patch diff --git a/patches/server/Add-various-missing-EntityDropItemEvent-calls.patch b/patches/unapplied/server/Add-various-missing-EntityDropItemEvent-calls.patch similarity index 100% rename from patches/server/Add-various-missing-EntityDropItemEvent-calls.patch rename to patches/unapplied/server/Add-various-missing-EntityDropItemEvent-calls.patch diff --git a/patches/server/Add-velocity-warnings.patch b/patches/unapplied/server/Add-velocity-warnings.patch similarity index 100% rename from patches/server/Add-velocity-warnings.patch rename to patches/unapplied/server/Add-velocity-warnings.patch diff --git a/patches/server/Add-version-history-to-version-command.patch b/patches/unapplied/server/Add-version-history-to-version-command.patch similarity index 100% rename from patches/server/Add-version-history-to-version-command.patch rename to patches/unapplied/server/Add-version-history-to-version-command.patch diff --git a/patches/server/Add-villager-reputation-API.patch b/patches/unapplied/server/Add-villager-reputation-API.patch similarity index 100% rename from patches/server/Add-villager-reputation-API.patch rename to patches/unapplied/server/Add-villager-reputation-API.patch diff --git a/patches/server/Add-worldborder-events.patch b/patches/unapplied/server/Add-worldborder-events.patch similarity index 100% rename from patches/server/Add-worldborder-events.patch rename to patches/unapplied/server/Add-worldborder-events.patch diff --git a/patches/server/Add-zombie-targets-turtle-egg-config.patch b/patches/unapplied/server/Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from patches/server/Add-zombie-targets-turtle-egg-config.patch rename to patches/unapplied/server/Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/server/Added-EntityDamageItemEvent.patch b/patches/unapplied/server/Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/Added-EntityDamageItemEvent.patch rename to patches/unapplied/server/Added-EntityDamageItemEvent.patch diff --git a/patches/server/Added-EntityToggleSitEvent.patch b/patches/unapplied/server/Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/server/Added-EntityToggleSitEvent.patch rename to patches/unapplied/server/Added-EntityToggleSitEvent.patch diff --git a/patches/server/Added-PlayerBedFailEnterEvent.patch b/patches/unapplied/server/Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/Added-PlayerBedFailEnterEvent.patch rename to patches/unapplied/server/Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/Added-PlayerDeepSleepEvent.patch b/patches/unapplied/server/Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/Added-PlayerDeepSleepEvent.patch rename to patches/unapplied/server/Added-PlayerDeepSleepEvent.patch diff --git a/patches/server/Added-PlayerLecternPageChangeEvent.patch b/patches/unapplied/server/Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/Added-PlayerLecternPageChangeEvent.patch rename to patches/unapplied/server/Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/Added-PlayerLoomPatternSelectEvent.patch b/patches/unapplied/server/Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/Added-PlayerLoomPatternSelectEvent.patch rename to patches/unapplied/server/Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/unapplied/server/Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/unapplied/server/Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/Added-ServerResourcesReloadedEvent.patch b/patches/unapplied/server/Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/Added-ServerResourcesReloadedEvent.patch rename to patches/unapplied/server/Added-ServerResourcesReloadedEvent.patch diff --git a/patches/server/Added-WorldGameRuleChangeEvent.patch b/patches/unapplied/server/Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/Added-WorldGameRuleChangeEvent.patch rename to patches/unapplied/server/Added-WorldGameRuleChangeEvent.patch diff --git a/patches/server/Added-byte-array-serialization-deserialization-for-P.patch b/patches/unapplied/server/Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/server/Added-byte-array-serialization-deserialization-for-P.patch rename to patches/unapplied/server/Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/server/Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/unapplied/server/Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/unapplied/server/Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/server/Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/unapplied/server/Added-getHostname-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/Added-missing-default-perms-for-commands.patch b/patches/unapplied/server/Added-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/Added-missing-default-perms-for-commands.patch rename to patches/unapplied/server/Added-missing-default-perms-for-commands.patch diff --git a/patches/server/Added-world-settings-for-mobs-picking-up-loot.patch b/patches/unapplied/server/Added-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from patches/server/Added-world-settings-for-mobs-picking-up-loot.patch rename to patches/unapplied/server/Added-world-settings-for-mobs-picking-up-loot.patch diff --git a/patches/server/Additional-Block-Material-API-s.patch b/patches/unapplied/server/Additional-Block-Material-API-s.patch similarity index 100% rename from patches/server/Additional-Block-Material-API-s.patch rename to patches/unapplied/server/Additional-Block-Material-API-s.patch diff --git a/patches/server/Adds-PlayerArmSwingEvent.patch b/patches/unapplied/server/Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/server/Adds-PlayerArmSwingEvent.patch rename to patches/unapplied/server/Adds-PlayerArmSwingEvent.patch diff --git a/patches/server/Adventure.patch b/patches/unapplied/server/Adventure.patch similarity index 100% rename from patches/server/Adventure.patch rename to patches/unapplied/server/Adventure.patch diff --git a/patches/server/All-chunks-are-slime-spawn-chunks-toggle.patch b/patches/unapplied/server/All-chunks-are-slime-spawn-chunks-toggle.patch similarity index 100% rename from patches/server/All-chunks-are-slime-spawn-chunks-toggle.patch rename to patches/unapplied/server/All-chunks-are-slime-spawn-chunks-toggle.patch diff --git a/patches/server/Allow-Reloading-of-Command-Aliases.patch b/patches/unapplied/server/Allow-Reloading-of-Command-Aliases.patch similarity index 100% rename from patches/server/Allow-Reloading-of-Command-Aliases.patch rename to patches/unapplied/server/Allow-Reloading-of-Command-Aliases.patch diff --git a/patches/server/Allow-Reloading-of-Custom-Permissions.patch b/patches/unapplied/server/Allow-Reloading-of-Custom-Permissions.patch similarity index 100% rename from patches/server/Allow-Reloading-of-Custom-Permissions.patch rename to patches/unapplied/server/Allow-Reloading-of-Custom-Permissions.patch diff --git a/patches/server/Allow-Saving-of-Oversized-Chunks.patch b/patches/unapplied/server/Allow-Saving-of-Oversized-Chunks.patch similarity index 100% rename from patches/server/Allow-Saving-of-Oversized-Chunks.patch rename to patches/unapplied/server/Allow-Saving-of-Oversized-Chunks.patch diff --git a/patches/server/Allow-adding-items-to-BlockDropItemEvent.patch b/patches/unapplied/server/Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/unapplied/server/Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/Allow-changing-bed-s-occupied-property.patch b/patches/unapplied/server/Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/server/Allow-changing-bed-s-occupied-property.patch rename to patches/unapplied/server/Allow-changing-bed-s-occupied-property.patch diff --git a/patches/server/Allow-chests-to-be-placed-with-NBT-data.patch b/patches/unapplied/server/Allow-chests-to-be-placed-with-NBT-data.patch similarity index 100% rename from patches/server/Allow-chests-to-be-placed-with-NBT-data.patch rename to patches/unapplied/server/Allow-chests-to-be-placed-with-NBT-data.patch diff --git a/patches/server/Allow-controlled-flushing-for-network-manager.patch b/patches/unapplied/server/Allow-controlled-flushing-for-network-manager.patch similarity index 100% rename from patches/server/Allow-controlled-flushing-for-network-manager.patch rename to patches/unapplied/server/Allow-controlled-flushing-for-network-manager.patch diff --git a/patches/server/Allow-delegation-to-vanilla-chunk-gen.patch b/patches/unapplied/server/Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/server/Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/unapplied/server/Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/server/Allow-disabling-armour-stand-ticking.patch b/patches/unapplied/server/Allow-disabling-armour-stand-ticking.patch similarity index 100% rename from patches/server/Allow-disabling-armour-stand-ticking.patch rename to patches/unapplied/server/Allow-disabling-armour-stand-ticking.patch diff --git a/patches/server/Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/unapplied/server/Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/unapplied/server/Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/Allow-for-toggling-of-spawn-chunks.patch b/patches/unapplied/server/Allow-for-toggling-of-spawn-chunks.patch similarity index 100% rename from patches/server/Allow-for-toggling-of-spawn-chunks.patch rename to patches/unapplied/server/Allow-for-toggling-of-spawn-chunks.patch diff --git a/patches/server/Allow-nerfed-mobs-to-jump-and-take-water-damage.patch b/patches/unapplied/server/Allow-nerfed-mobs-to-jump-and-take-water-damage.patch similarity index 100% rename from patches/server/Allow-nerfed-mobs-to-jump-and-take-water-damage.patch rename to patches/unapplied/server/Allow-nerfed-mobs-to-jump-and-take-water-damage.patch diff --git a/patches/server/Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/unapplied/server/Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/unapplied/server/Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/unapplied/server/Allow-spawning-Item-entities-with-World.spawnEntity.patch similarity index 100% rename from patches/server/Allow-spawning-Item-entities-with-World.spawnEntity.patch rename to patches/unapplied/server/Allow-spawning-Item-entities-with-World.spawnEntity.patch diff --git a/patches/server/Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/unapplied/server/Allow-specifying-a-custom-authentication-servers-dow.patch similarity index 100% rename from patches/server/Allow-specifying-a-custom-authentication-servers-dow.patch rename to patches/unapplied/server/Allow-specifying-a-custom-authentication-servers-dow.patch diff --git a/patches/server/Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/unapplied/server/Allow-to-change-the-podium-for-the-EnderDragon.patch similarity index 100% rename from patches/server/Allow-to-change-the-podium-for-the-EnderDragon.patch rename to patches/unapplied/server/Allow-to-change-the-podium-for-the-EnderDragon.patch diff --git a/patches/server/Allow-using-signs-inside-spawn-protection.patch b/patches/unapplied/server/Allow-using-signs-inside-spawn-protection.patch similarity index 100% rename from patches/server/Allow-using-signs-inside-spawn-protection.patch rename to patches/unapplied/server/Allow-using-signs-inside-spawn-protection.patch diff --git a/patches/server/Always-allow-item-changing-in-Fireball.patch b/patches/unapplied/server/Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/Always-allow-item-changing-in-Fireball.patch rename to patches/unapplied/server/Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/unapplied/server/Always-parse-protochunk-light-sources-unless-it-is-m.patch similarity index 100% rename from patches/server/Always-parse-protochunk-light-sources-unless-it-is-m.patch rename to patches/unapplied/server/Always-parse-protochunk-light-sources-unless-it-is-m.patch diff --git a/patches/server/Always-tick-falling-blocks.patch b/patches/unapplied/server/Always-tick-falling-blocks.patch similarity index 100% rename from patches/server/Always-tick-falling-blocks.patch rename to patches/unapplied/server/Always-tick-falling-blocks.patch diff --git a/patches/server/Anti-Xray.patch b/patches/unapplied/server/Anti-Xray.patch similarity index 100% rename from patches/server/Anti-Xray.patch rename to patches/unapplied/server/Anti-Xray.patch diff --git a/patches/server/AnvilDamageEvent.patch b/patches/unapplied/server/AnvilDamageEvent.patch similarity index 100% rename from patches/server/AnvilDamageEvent.patch rename to patches/unapplied/server/AnvilDamageEvent.patch diff --git a/patches/server/Async-GameProfileCache-saving.patch b/patches/unapplied/server/Async-GameProfileCache-saving.patch similarity index 100% rename from patches/server/Async-GameProfileCache-saving.patch rename to patches/unapplied/server/Async-GameProfileCache-saving.patch diff --git a/patches/server/Async-command-map-building.patch b/patches/unapplied/server/Async-command-map-building.patch similarity index 100% rename from patches/server/Async-command-map-building.patch rename to patches/unapplied/server/Async-command-map-building.patch diff --git a/patches/server/AsyncTabCompleteEvent.patch b/patches/unapplied/server/AsyncTabCompleteEvent.patch similarity index 100% rename from patches/server/AsyncTabCompleteEvent.patch rename to patches/unapplied/server/AsyncTabCompleteEvent.patch diff --git a/patches/server/Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/unapplied/server/Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/unapplied/server/Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/Attributes-API-for-item-defaults.patch b/patches/unapplied/server/Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/Attributes-API-for-item-defaults.patch rename to patches/unapplied/server/Attributes-API-for-item-defaults.patch diff --git a/patches/server/Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/unapplied/server/Avoid-Lazy-Initialization-for-Enum-Fields.patch similarity index 100% rename from patches/server/Avoid-Lazy-Initialization-for-Enum-Fields.patch rename to patches/unapplied/server/Avoid-Lazy-Initialization-for-Enum-Fields.patch diff --git a/patches/server/Avoid-blocking-on-Network-Manager-creation.patch b/patches/unapplied/server/Avoid-blocking-on-Network-Manager-creation.patch similarity index 100% rename from patches/server/Avoid-blocking-on-Network-Manager-creation.patch rename to patches/unapplied/server/Avoid-blocking-on-Network-Manager-creation.patch diff --git a/patches/server/Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/unapplied/server/Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 100% rename from patches/server/Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to patches/unapplied/server/Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/patches/server/Basic-PlayerProfile-API.patch b/patches/unapplied/server/Basic-PlayerProfile-API.patch similarity index 100% rename from patches/server/Basic-PlayerProfile-API.patch rename to patches/unapplied/server/Basic-PlayerProfile-API.patch diff --git a/patches/server/Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/unapplied/server/Be-a-bit-more-informative-in-maxHealth-exception.patch similarity index 100% rename from patches/server/Be-a-bit-more-informative-in-maxHealth-exception.patch rename to patches/unapplied/server/Be-a-bit-more-informative-in-maxHealth-exception.patch diff --git a/patches/server/Beacon-API-custom-effect-ranges.patch b/patches/unapplied/server/Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/server/Beacon-API-custom-effect-ranges.patch rename to patches/unapplied/server/Beacon-API-custom-effect-ranges.patch diff --git a/patches/server/Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/unapplied/server/Bees-get-gravity-in-void.-Fixes-MC-167279.patch similarity index 100% rename from patches/server/Bees-get-gravity-in-void.-Fixes-MC-167279.patch rename to patches/unapplied/server/Bees-get-gravity-in-void.-Fixes-MC-167279.patch diff --git a/patches/server/Block-Enderpearl-Travel-Exploit.patch b/patches/unapplied/server/Block-Enderpearl-Travel-Exploit.patch similarity index 100% rename from patches/server/Block-Enderpearl-Travel-Exploit.patch rename to patches/unapplied/server/Block-Enderpearl-Travel-Exploit.patch diff --git a/patches/server/Block-Entity-remove-from-being-called-on-Players.patch b/patches/unapplied/server/Block-Entity-remove-from-being-called-on-Players.patch similarity index 100% rename from patches/server/Block-Entity-remove-from-being-called-on-Players.patch rename to patches/unapplied/server/Block-Entity-remove-from-being-called-on-Players.patch diff --git a/patches/server/Block-Ticking-API.patch b/patches/unapplied/server/Block-Ticking-API.patch similarity index 100% rename from patches/server/Block-Ticking-API.patch rename to patches/unapplied/server/Block-Ticking-API.patch diff --git a/patches/server/Block-player-logins-during-server-shutdown.patch b/patches/unapplied/server/Block-player-logins-during-server-shutdown.patch similarity index 100% rename from patches/server/Block-player-logins-during-server-shutdown.patch rename to patches/unapplied/server/Block-player-logins-during-server-shutdown.patch diff --git a/patches/server/BlockDestroyEvent.patch b/patches/unapplied/server/BlockDestroyEvent.patch similarity index 100% rename from patches/server/BlockDestroyEvent.patch rename to patches/unapplied/server/BlockDestroyEvent.patch diff --git a/patches/server/Book-Size-Limits.patch b/patches/unapplied/server/Book-Size-Limits.patch similarity index 100% rename from patches/server/Book-Size-Limits.patch rename to patches/unapplied/server/Book-Size-Limits.patch diff --git a/patches/server/Bound-Treasure-Maps-to-World-Border.patch b/patches/unapplied/server/Bound-Treasure-Maps-to-World-Border.patch similarity index 100% rename from patches/server/Bound-Treasure-Maps-to-World-Border.patch rename to patches/unapplied/server/Bound-Treasure-Maps-to-World-Border.patch diff --git a/patches/server/Brand-support.patch b/patches/unapplied/server/Brand-support.patch similarity index 100% rename from patches/server/Brand-support.patch rename to patches/unapplied/server/Brand-support.patch diff --git a/patches/server/Break-redstone-on-top-of-trap-doors-early.patch b/patches/unapplied/server/Break-redstone-on-top-of-trap-doors-early.patch similarity index 100% rename from patches/server/Break-redstone-on-top-of-trap-doors-early.patch rename to patches/unapplied/server/Break-redstone-on-top-of-trap-doors-early.patch diff --git a/patches/server/Break-up-and-make-tab-spam-limits-configurable.patch b/patches/unapplied/server/Break-up-and-make-tab-spam-limits-configurable.patch similarity index 100% rename from patches/server/Break-up-and-make-tab-spam-limits-configurable.patch rename to patches/unapplied/server/Break-up-and-make-tab-spam-limits-configurable.patch diff --git a/patches/server/Bucketable-API.patch b/patches/unapplied/server/Bucketable-API.patch similarity index 100% rename from patches/server/Bucketable-API.patch rename to patches/unapplied/server/Bucketable-API.patch diff --git a/patches/server/Buffer-OOB-setBlock-calls.patch b/patches/unapplied/server/Buffer-OOB-setBlock-calls.patch similarity index 100% rename from patches/server/Buffer-OOB-setBlock-calls.patch rename to patches/unapplied/server/Buffer-OOB-setBlock-calls.patch diff --git a/patches/server/Buffer-joins-to-world.patch b/patches/unapplied/server/Buffer-joins-to-world.patch similarity index 100% rename from patches/server/Buffer-joins-to-world.patch rename to patches/unapplied/server/Buffer-joins-to-world.patch diff --git a/patches/server/Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/unapplied/server/Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/server/Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/unapplied/server/Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/server/Cache-block-data-strings.patch b/patches/unapplied/server/Cache-block-data-strings.patch similarity index 100% rename from patches/server/Cache-block-data-strings.patch rename to patches/unapplied/server/Cache-block-data-strings.patch diff --git a/patches/server/Cache-burn-durations.patch b/patches/unapplied/server/Cache-burn-durations.patch similarity index 100% rename from patches/server/Cache-burn-durations.patch rename to patches/unapplied/server/Cache-burn-durations.patch diff --git a/patches/server/Cache-user-authenticator-threads.patch b/patches/unapplied/server/Cache-user-authenticator-threads.patch similarity index 100% rename from patches/server/Cache-user-authenticator-threads.patch rename to patches/unapplied/server/Cache-user-authenticator-threads.patch diff --git a/patches/server/Call-BlockPhysicsEvent-more-often.patch b/patches/unapplied/server/Call-BlockPhysicsEvent-more-often.patch similarity index 100% rename from patches/server/Call-BlockPhysicsEvent-more-often.patch rename to patches/unapplied/server/Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/server/Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/unapplied/server/Call-PaperServerListPingEvent-for-legacy-pings.patch similarity index 100% rename from patches/server/Call-PaperServerListPingEvent-for-legacy-pings.patch rename to patches/unapplied/server/Call-PaperServerListPingEvent-for-legacy-pings.patch diff --git a/patches/server/Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/unapplied/server/Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch similarity index 100% rename from patches/server/Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch rename to patches/unapplied/server/Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch diff --git a/patches/server/Call-player-spectator-target-events-and-improve-impl.patch b/patches/unapplied/server/Call-player-spectator-target-events-and-improve-impl.patch similarity index 100% rename from patches/server/Call-player-spectator-target-events-and-improve-impl.patch rename to patches/unapplied/server/Call-player-spectator-target-events-and-improve-impl.patch diff --git a/patches/server/Cap-Entity-Collisions.patch b/patches/unapplied/server/Cap-Entity-Collisions.patch similarity index 100% rename from patches/server/Cap-Entity-Collisions.patch rename to patches/unapplied/server/Cap-Entity-Collisions.patch diff --git a/patches/server/Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/unapplied/server/Catch-JsonParseException-in-Entity-and-TE-names.patch similarity index 100% rename from patches/server/Catch-JsonParseException-in-Entity-and-TE-names.patch rename to patches/unapplied/server/Catch-JsonParseException-in-Entity-and-TE-names.patch diff --git a/patches/server/Change-EnderEye-target-without-changing-other-things.patch b/patches/unapplied/server/Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/Change-EnderEye-target-without-changing-other-things.patch rename to patches/unapplied/server/Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/Check-Drowned-for-Villager-Aggression-Config.patch b/patches/unapplied/server/Check-Drowned-for-Villager-Aggression-Config.patch similarity index 100% rename from patches/server/Check-Drowned-for-Villager-Aggression-Config.patch rename to patches/unapplied/server/Check-Drowned-for-Villager-Aggression-Config.patch diff --git a/patches/server/Check-online-mode-before-converting-and-renaming-pla.patch b/patches/unapplied/server/Check-online-mode-before-converting-and-renaming-pla.patch similarity index 100% rename from patches/server/Check-online-mode-before-converting-and-renaming-pla.patch rename to patches/unapplied/server/Check-online-mode-before-converting-and-renaming-pla.patch diff --git a/patches/server/Check-requirement-before-suggesting-root-nodes.patch b/patches/unapplied/server/Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/Check-requirement-before-suggesting-root-nodes.patch rename to patches/unapplied/server/Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/Chunk-Save-Reattempt.patch b/patches/unapplied/server/Chunk-Save-Reattempt.patch similarity index 100% rename from patches/server/Chunk-Save-Reattempt.patch rename to patches/unapplied/server/Chunk-Save-Reattempt.patch diff --git a/patches/server/Clean-up-duplicated-GameProfile-Properties.patch b/patches/unapplied/server/Clean-up-duplicated-GameProfile-Properties.patch similarity index 100% rename from patches/server/Clean-up-duplicated-GameProfile-Properties.patch rename to patches/unapplied/server/Clean-up-duplicated-GameProfile-Properties.patch diff --git a/patches/server/Clear-bucket-NBT-after-dispense.patch b/patches/unapplied/server/Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/Clear-bucket-NBT-after-dispense.patch rename to patches/unapplied/server/Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/Climbing-should-not-bypass-cramming-gamerule.patch b/patches/unapplied/server/Climbing-should-not-bypass-cramming-gamerule.patch similarity index 100% rename from patches/server/Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/unapplied/server/Climbing-should-not-bypass-cramming-gamerule.patch diff --git a/patches/server/Collision-API.patch b/patches/unapplied/server/Collision-API.patch similarity index 100% rename from patches/server/Collision-API.patch rename to patches/unapplied/server/Collision-API.patch diff --git a/patches/server/Collision-option-for-requiring-a-player-participant.patch b/patches/unapplied/server/Collision-option-for-requiring-a-player-participant.patch similarity index 100% rename from patches/server/Collision-option-for-requiring-a-player-participant.patch rename to patches/unapplied/server/Collision-option-for-requiring-a-player-participant.patch diff --git a/patches/server/Complete-resource-pack-API.patch b/patches/unapplied/server/Complete-resource-pack-API.patch similarity index 100% rename from patches/server/Complete-resource-pack-API.patch rename to patches/unapplied/server/Complete-resource-pack-API.patch diff --git a/patches/server/Config-option-for-Piglins-guarding-chests.patch b/patches/unapplied/server/Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/Config-option-for-Piglins-guarding-chests.patch rename to patches/unapplied/server/Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/unapplied/server/Configurable-Alternative-LootPool-Luck-Formula.patch similarity index 100% rename from patches/server/Configurable-Alternative-LootPool-Luck-Formula.patch rename to patches/unapplied/server/Configurable-Alternative-LootPool-Luck-Formula.patch diff --git a/patches/server/Configurable-Cartographer-Treasure-Maps.patch b/patches/unapplied/server/Configurable-Cartographer-Treasure-Maps.patch similarity index 100% rename from patches/server/Configurable-Cartographer-Treasure-Maps.patch rename to patches/unapplied/server/Configurable-Cartographer-Treasure-Maps.patch diff --git a/patches/server/Configurable-Chunk-Inhabited-Time.patch b/patches/unapplied/server/Configurable-Chunk-Inhabited-Time.patch similarity index 100% rename from patches/server/Configurable-Chunk-Inhabited-Time.patch rename to patches/unapplied/server/Configurable-Chunk-Inhabited-Time.patch diff --git a/patches/server/Configurable-Disabling-Cat-Chest-Detection.patch b/patches/unapplied/server/Configurable-Disabling-Cat-Chest-Detection.patch similarity index 100% rename from patches/server/Configurable-Disabling-Cat-Chest-Detection.patch rename to patches/unapplied/server/Configurable-Disabling-Cat-Chest-Detection.patch diff --git a/patches/server/Configurable-Grass-Spread-Tick-Rate.patch b/patches/unapplied/server/Configurable-Grass-Spread-Tick-Rate.patch similarity index 100% rename from patches/server/Configurable-Grass-Spread-Tick-Rate.patch rename to patches/unapplied/server/Configurable-Grass-Spread-Tick-Rate.patch diff --git a/patches/server/Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/unapplied/server/Configurable-Keep-Spawn-Loaded-range-per-world.patch similarity index 100% rename from patches/server/Configurable-Keep-Spawn-Loaded-range-per-world.patch rename to patches/unapplied/server/Configurable-Keep-Spawn-Loaded-range-per-world.patch diff --git a/patches/server/Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/unapplied/server/Configurable-Non-Player-Arrow-Despawn-Rate.patch similarity index 100% rename from patches/server/Configurable-Non-Player-Arrow-Despawn-Rate.patch rename to patches/unapplied/server/Configurable-Non-Player-Arrow-Despawn-Rate.patch diff --git a/patches/server/Configurable-Player-Collision.patch b/patches/unapplied/server/Configurable-Player-Collision.patch similarity index 100% rename from patches/server/Configurable-Player-Collision.patch rename to patches/unapplied/server/Configurable-Player-Collision.patch diff --git a/patches/server/Configurable-RCON-IP-address.patch b/patches/unapplied/server/Configurable-RCON-IP-address.patch similarity index 100% rename from patches/server/Configurable-RCON-IP-address.patch rename to patches/unapplied/server/Configurable-RCON-IP-address.patch diff --git a/patches/server/Configurable-baby-zombie-movement-speed.patch b/patches/unapplied/server/Configurable-baby-zombie-movement-speed.patch similarity index 100% rename from patches/server/Configurable-baby-zombie-movement-speed.patch rename to patches/unapplied/server/Configurable-baby-zombie-movement-speed.patch diff --git a/patches/server/Configurable-cactus-bamboo-and-reed-growth-heights.patch b/patches/unapplied/server/Configurable-cactus-bamboo-and-reed-growth-heights.patch similarity index 100% rename from patches/server/Configurable-cactus-bamboo-and-reed-growth-heights.patch rename to patches/unapplied/server/Configurable-cactus-bamboo-and-reed-growth-heights.patch diff --git a/patches/server/Configurable-chance-of-villager-zombie-infection.patch b/patches/unapplied/server/Configurable-chance-of-villager-zombie-infection.patch similarity index 100% rename from patches/server/Configurable-chance-of-villager-zombie-infection.patch rename to patches/unapplied/server/Configurable-chance-of-villager-zombie-infection.patch diff --git a/patches/server/Configurable-chat-thread-limit.patch b/patches/unapplied/server/Configurable-chat-thread-limit.patch similarity index 100% rename from patches/server/Configurable-chat-thread-limit.patch rename to patches/unapplied/server/Configurable-chat-thread-limit.patch diff --git a/patches/server/Configurable-connection-throttle-kick-message.patch b/patches/unapplied/server/Configurable-connection-throttle-kick-message.patch similarity index 100% rename from patches/server/Configurable-connection-throttle-kick-message.patch rename to patches/unapplied/server/Configurable-connection-throttle-kick-message.patch diff --git a/patches/server/Configurable-container-update-tick-rate.patch b/patches/unapplied/server/Configurable-container-update-tick-rate.patch similarity index 100% rename from patches/server/Configurable-container-update-tick-rate.patch rename to patches/unapplied/server/Configurable-container-update-tick-rate.patch diff --git a/patches/server/Configurable-door-breaking-difficulty.patch b/patches/unapplied/server/Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/Configurable-door-breaking-difficulty.patch rename to patches/unapplied/server/Configurable-door-breaking-difficulty.patch diff --git a/patches/server/Configurable-end-credits.patch b/patches/unapplied/server/Configurable-end-credits.patch similarity index 100% rename from patches/server/Configurable-end-credits.patch rename to patches/unapplied/server/Configurable-end-credits.patch diff --git a/patches/server/Configurable-feature-seeds.patch b/patches/unapplied/server/Configurable-feature-seeds.patch similarity index 100% rename from patches/server/Configurable-feature-seeds.patch rename to patches/unapplied/server/Configurable-feature-seeds.patch diff --git a/patches/server/Configurable-fishing-time-ranges.patch b/patches/unapplied/server/Configurable-fishing-time-ranges.patch similarity index 100% rename from patches/server/Configurable-fishing-time-ranges.patch rename to patches/unapplied/server/Configurable-fishing-time-ranges.patch diff --git a/patches/server/Configurable-flying-kick-messages.patch b/patches/unapplied/server/Configurable-flying-kick-messages.patch similarity index 100% rename from patches/server/Configurable-flying-kick-messages.patch rename to patches/unapplied/server/Configurable-flying-kick-messages.patch diff --git a/patches/server/Configurable-inter-world-teleportation-safety.patch b/patches/unapplied/server/Configurable-inter-world-teleportation-safety.patch similarity index 100% rename from patches/server/Configurable-inter-world-teleportation-safety.patch rename to patches/unapplied/server/Configurable-inter-world-teleportation-safety.patch diff --git a/patches/server/Configurable-item-frame-map-cursor-update-interval.patch b/patches/unapplied/server/Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/Configurable-item-frame-map-cursor-update-interval.patch rename to patches/unapplied/server/Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/Configurable-max-block-light-for-monster-spawning.patch b/patches/unapplied/server/Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/Configurable-max-block-light-for-monster-spawning.patch rename to patches/unapplied/server/Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/Configurable-max-leash-distance.patch b/patches/unapplied/server/Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/Configurable-max-leash-distance.patch rename to patches/unapplied/server/Configurable-max-leash-distance.patch diff --git a/patches/server/Configurable-mob-spawner-tick-rate.patch b/patches/unapplied/server/Configurable-mob-spawner-tick-rate.patch similarity index 100% rename from patches/server/Configurable-mob-spawner-tick-rate.patch rename to patches/unapplied/server/Configurable-mob-spawner-tick-rate.patch diff --git a/patches/server/Configurable-packet-in-spam-threshold.patch b/patches/unapplied/server/Configurable-packet-in-spam-threshold.patch similarity index 100% rename from patches/server/Configurable-packet-in-spam-threshold.patch rename to patches/unapplied/server/Configurable-packet-in-spam-threshold.patch diff --git a/patches/server/Configurable-projectile-relative-velocity.patch b/patches/unapplied/server/Configurable-projectile-relative-velocity.patch similarity index 100% rename from patches/server/Configurable-projectile-relative-velocity.patch rename to patches/unapplied/server/Configurable-projectile-relative-velocity.patch diff --git a/patches/server/Configurable-sculk-sensor-listener-range.patch b/patches/unapplied/server/Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/server/Configurable-sculk-sensor-listener-range.patch rename to patches/unapplied/server/Configurable-sculk-sensor-listener-range.patch diff --git a/patches/server/Configurable-spawn-chances-for-skeleton-horses.patch b/patches/unapplied/server/Configurable-spawn-chances-for-skeleton-horses.patch similarity index 100% rename from patches/server/Configurable-spawn-chances-for-skeleton-horses.patch rename to patches/unapplied/server/Configurable-spawn-chances-for-skeleton-horses.patch diff --git a/patches/server/Configurable-speed-for-water-flowing-over-lava.patch b/patches/unapplied/server/Configurable-speed-for-water-flowing-over-lava.patch similarity index 100% rename from patches/server/Configurable-speed-for-water-flowing-over-lava.patch rename to patches/unapplied/server/Configurable-speed-for-water-flowing-over-lava.patch diff --git a/patches/server/Configurable-sprint-interruption-on-attack.patch b/patches/unapplied/server/Configurable-sprint-interruption-on-attack.patch similarity index 100% rename from patches/server/Configurable-sprint-interruption-on-attack.patch rename to patches/unapplied/server/Configurable-sprint-interruption-on-attack.patch diff --git a/patches/server/Configurable-top-of-nether-void-damage.patch b/patches/unapplied/server/Configurable-top-of-nether-void-damage.patch similarity index 100% rename from patches/server/Configurable-top-of-nether-void-damage.patch rename to patches/unapplied/server/Configurable-top-of-nether-void-damage.patch diff --git a/patches/server/Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/unapplied/server/Consolidate-flush-calls-for-entity-tracker-packets.patch similarity index 100% rename from patches/server/Consolidate-flush-calls-for-entity-tracker-packets.patch rename to patches/unapplied/server/Consolidate-flush-calls-for-entity-tracker-packets.patch diff --git a/patches/server/Convert-legacy-attributes-in-Item-Meta.patch b/patches/unapplied/server/Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from patches/server/Convert-legacy-attributes-in-Item-Meta.patch rename to patches/unapplied/server/Convert-legacy-attributes-in-Item-Meta.patch diff --git a/patches/server/Correctly-handle-ArmorStand-invisibility.patch b/patches/unapplied/server/Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/server/Correctly-handle-ArmorStand-invisibility.patch rename to patches/unapplied/server/Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/server/Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/unapplied/server/Correctly-handle-interactions-with-items-on-cooldown.patch similarity index 100% rename from patches/server/Correctly-handle-interactions-with-items-on-cooldown.patch rename to patches/unapplied/server/Correctly-handle-interactions-with-items-on-cooldown.patch diff --git a/patches/server/Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/unapplied/server/Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 100% rename from patches/server/Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/unapplied/server/Correctly-shrink-items-during-EntityResurrectEvent.patch diff --git a/patches/server/Create-HoverEvent-from-ItemStack-Entity.patch b/patches/unapplied/server/Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/unapplied/server/Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/Custom-Chat-Completion-Suggestions-API.patch b/patches/unapplied/server/Custom-Chat-Completion-Suggestions-API.patch similarity index 100% rename from patches/server/Custom-Chat-Completion-Suggestions-API.patch rename to patches/unapplied/server/Custom-Chat-Completion-Suggestions-API.patch diff --git a/patches/server/Custom-Potion-Mixes.patch b/patches/unapplied/server/Custom-Potion-Mixes.patch similarity index 100% rename from patches/server/Custom-Potion-Mixes.patch rename to patches/unapplied/server/Custom-Potion-Mixes.patch diff --git a/patches/server/Custom-replacement-for-eaten-items.patch b/patches/unapplied/server/Custom-replacement-for-eaten-items.patch similarity index 100% rename from patches/server/Custom-replacement-for-eaten-items.patch rename to patches/unapplied/server/Custom-replacement-for-eaten-items.patch diff --git a/patches/server/Custom-table-implementation-for-blockstate-state-loo.patch b/patches/unapplied/server/Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/unapplied/server/Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/unapplied/server/Dead-Player-s-shouldn-t-be-able-to-move.patch similarity index 100% rename from patches/server/Dead-Player-s-shouldn-t-be-able-to-move.patch rename to patches/unapplied/server/Dead-Player-s-shouldn-t-be-able-to-move.patch diff --git a/patches/server/Default-loading-permissions.yml-before-plugins.patch b/patches/unapplied/server/Default-loading-permissions.yml-before-plugins.patch similarity index 100% rename from patches/server/Default-loading-permissions.yml-before-plugins.patch rename to patches/unapplied/server/Default-loading-permissions.yml-before-plugins.patch diff --git a/patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/unapplied/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch similarity index 100% rename from patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch rename to patches/unapplied/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch diff --git a/patches/server/Detail-more-information-in-watchdog-dumps.patch b/patches/unapplied/server/Detail-more-information-in-watchdog-dumps.patch similarity index 100% rename from patches/server/Detail-more-information-in-watchdog-dumps.patch rename to patches/unapplied/server/Detail-more-information-in-watchdog-dumps.patch diff --git a/patches/server/Detect-headless-JREs.patch b/patches/unapplied/server/Detect-headless-JREs.patch similarity index 100% rename from patches/server/Detect-headless-JREs.patch rename to patches/unapplied/server/Detect-headless-JREs.patch diff --git a/patches/server/Disable-Explicit-Network-Manager-Flushing.patch b/patches/unapplied/server/Disable-Explicit-Network-Manager-Flushing.patch similarity index 100% rename from patches/server/Disable-Explicit-Network-Manager-Flushing.patch rename to patches/unapplied/server/Disable-Explicit-Network-Manager-Flushing.patch diff --git a/patches/server/Disable-Scoreboards-for-non-players-by-default.patch b/patches/unapplied/server/Disable-Scoreboards-for-non-players-by-default.patch similarity index 100% rename from patches/server/Disable-Scoreboards-for-non-players-by-default.patch rename to patches/unapplied/server/Disable-Scoreboards-for-non-players-by-default.patch diff --git a/patches/server/Disable-allowListing-before-received-from-client.patch b/patches/unapplied/server/Disable-allowListing-before-received-from-client.patch similarity index 100% rename from patches/server/Disable-allowListing-before-received-from-client.patch rename to patches/unapplied/server/Disable-allowListing-before-received-from-client.patch diff --git a/patches/server/Disable-component-selector-resolving-in-books-by-def.patch b/patches/unapplied/server/Disable-component-selector-resolving-in-books-by-def.patch similarity index 100% rename from patches/server/Disable-component-selector-resolving-in-books-by-def.patch rename to patches/unapplied/server/Disable-component-selector-resolving-in-books-by-def.patch diff --git a/patches/server/Disable-explosion-knockback.patch b/patches/unapplied/server/Disable-explosion-knockback.patch similarity index 100% rename from patches/server/Disable-explosion-knockback.patch rename to patches/unapplied/server/Disable-explosion-knockback.patch diff --git a/patches/server/Disable-ice-and-snow.patch b/patches/unapplied/server/Disable-ice-and-snow.patch similarity index 100% rename from patches/server/Disable-ice-and-snow.patch rename to patches/unapplied/server/Disable-ice-and-snow.patch diff --git a/patches/server/Disable-spigot-tick-limiters.patch b/patches/unapplied/server/Disable-spigot-tick-limiters.patch similarity index 100% rename from patches/server/Disable-spigot-tick-limiters.patch rename to patches/unapplied/server/Disable-spigot-tick-limiters.patch diff --git a/patches/server/Disable-thunder.patch b/patches/unapplied/server/Disable-thunder.patch similarity index 100% rename from patches/server/Disable-thunder.patch rename to patches/unapplied/server/Disable-thunder.patch diff --git a/patches/server/Distance-manager-tick-timings.patch b/patches/unapplied/server/Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/Distance-manager-tick-timings.patch rename to patches/unapplied/server/Distance-manager-tick-timings.patch diff --git a/patches/server/Do-not-accept-invalid-client-settings.patch b/patches/unapplied/server/Do-not-accept-invalid-client-settings.patch similarity index 100% rename from patches/server/Do-not-accept-invalid-client-settings.patch rename to patches/unapplied/server/Do-not-accept-invalid-client-settings.patch diff --git a/patches/server/Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/unapplied/server/Do-not-allow-bees-to-load-chunks-for-beehives.patch similarity index 100% rename from patches/server/Do-not-allow-bees-to-load-chunks-for-beehives.patch rename to patches/unapplied/server/Do-not-allow-bees-to-load-chunks-for-beehives.patch diff --git a/patches/server/Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/unapplied/server/Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/server/Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/unapplied/server/Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/server/Do-not-let-armorstands-drown.patch b/patches/unapplied/server/Do-not-let-armorstands-drown.patch similarity index 100% rename from patches/server/Do-not-let-armorstands-drown.patch rename to patches/unapplied/server/Do-not-let-armorstands-drown.patch diff --git a/patches/server/Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/unapplied/server/Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/server/Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/unapplied/server/Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/server/Do-not-load-chunks-for-Pathfinding.patch b/patches/unapplied/server/Do-not-load-chunks-for-Pathfinding.patch similarity index 100% rename from patches/server/Do-not-load-chunks-for-Pathfinding.patch rename to patches/unapplied/server/Do-not-load-chunks-for-Pathfinding.patch diff --git a/patches/server/Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/unapplied/server/Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 100% rename from patches/server/Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/unapplied/server/Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch diff --git a/patches/server/Do-not-run-raytrace-logic-for-AIR.patch b/patches/unapplied/server/Do-not-run-raytrace-logic-for-AIR.patch similarity index 100% rename from patches/server/Do-not-run-raytrace-logic-for-AIR.patch rename to patches/unapplied/server/Do-not-run-raytrace-logic-for-AIR.patch diff --git a/patches/server/Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/unapplied/server/Do-not-submit-profile-lookups-to-worldgen-threads.patch similarity index 100% rename from patches/server/Do-not-submit-profile-lookups-to-worldgen-threads.patch rename to patches/unapplied/server/Do-not-submit-profile-lookups-to-worldgen-threads.patch diff --git a/patches/server/Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/unapplied/server/Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch similarity index 100% rename from patches/server/Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch rename to patches/unapplied/server/Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch diff --git a/patches/server/Dolphin-API.patch b/patches/unapplied/server/Dolphin-API.patch similarity index 100% rename from patches/server/Dolphin-API.patch rename to patches/unapplied/server/Dolphin-API.patch diff --git a/patches/server/Don-t-allow-digging-into-unloaded-chunks.patch b/patches/unapplied/server/Don-t-allow-digging-into-unloaded-chunks.patch similarity index 100% rename from patches/server/Don-t-allow-digging-into-unloaded-chunks.patch rename to patches/unapplied/server/Don-t-allow-digging-into-unloaded-chunks.patch diff --git a/patches/server/Don-t-allow-entities-to-ride-themselves-572.patch b/patches/unapplied/server/Don-t-allow-entities-to-ride-themselves-572.patch similarity index 100% rename from patches/server/Don-t-allow-entities-to-ride-themselves-572.patch rename to patches/unapplied/server/Don-t-allow-entities-to-ride-themselves-572.patch diff --git a/patches/server/Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/unapplied/server/Don-t-allow-vehicle-movement-from-players-while-tele.patch similarity index 100% rename from patches/server/Don-t-allow-vehicle-movement-from-players-while-tele.patch rename to patches/unapplied/server/Don-t-allow-vehicle-movement-from-players-while-tele.patch diff --git a/patches/server/Don-t-apply-cramming-damage-to-players.patch b/patches/unapplied/server/Don-t-apply-cramming-damage-to-players.patch similarity index 100% rename from patches/server/Don-t-apply-cramming-damage-to-players.patch rename to patches/unapplied/server/Don-t-apply-cramming-damage-to-players.patch diff --git a/patches/server/Don-t-broadcast-messages-to-command-blocks.patch b/patches/unapplied/server/Don-t-broadcast-messages-to-command-blocks.patch similarity index 100% rename from patches/server/Don-t-broadcast-messages-to-command-blocks.patch rename to patches/unapplied/server/Don-t-broadcast-messages-to-command-blocks.patch diff --git a/patches/server/Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/unapplied/server/Don-t-call-getItemMeta-on-hasItemMeta.patch similarity index 100% rename from patches/server/Don-t-call-getItemMeta-on-hasItemMeta.patch rename to patches/unapplied/server/Don-t-call-getItemMeta-on-hasItemMeta.patch diff --git a/patches/server/Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/unapplied/server/Don-t-check-ConvertSigns-boolean-every-sign-save.patch similarity index 100% rename from patches/server/Don-t-check-ConvertSigns-boolean-every-sign-save.patch rename to patches/unapplied/server/Don-t-check-ConvertSigns-boolean-every-sign-save.patch diff --git a/patches/server/Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/unapplied/server/Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 100% rename from patches/server/Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/unapplied/server/Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch diff --git a/patches/server/Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/unapplied/server/Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch similarity index 100% rename from patches/server/Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch rename to patches/unapplied/server/Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch diff --git a/patches/server/Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/unapplied/server/Don-t-fire-BlockFade-on-worldgen-threads.patch similarity index 100% rename from patches/server/Don-t-fire-BlockFade-on-worldgen-threads.patch rename to patches/unapplied/server/Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/patches/server/Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/unapplied/server/Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 100% rename from patches/server/Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/unapplied/server/Don-t-ignore-result-of-PlayerEditBookEvent.patch diff --git a/patches/server/Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/unapplied/server/Don-t-load-Chunks-from-Hoppers-and-other-things.patch similarity index 100% rename from patches/server/Don-t-load-Chunks-from-Hoppers-and-other-things.patch rename to patches/unapplied/server/Don-t-load-Chunks-from-Hoppers-and-other-things.patch diff --git a/patches/server/Don-t-log-debug-logging-being-disabled.patch b/patches/unapplied/server/Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/Don-t-log-debug-logging-being-disabled.patch rename to patches/unapplied/server/Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/Don-t-lookup-fluid-state-when-raytracing.patch b/patches/unapplied/server/Don-t-lookup-fluid-state-when-raytracing.patch similarity index 100% rename from patches/server/Don-t-lookup-fluid-state-when-raytracing.patch rename to patches/unapplied/server/Don-t-lookup-fluid-state-when-raytracing.patch diff --git a/patches/server/Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/unapplied/server/Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch similarity index 100% rename from patches/server/Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch rename to patches/unapplied/server/Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch diff --git a/patches/server/Don-t-move-existing-players-to-world-spawn.patch b/patches/unapplied/server/Don-t-move-existing-players-to-world-spawn.patch similarity index 100% rename from patches/server/Don-t-move-existing-players-to-world-spawn.patch rename to patches/unapplied/server/Don-t-move-existing-players-to-world-spawn.patch diff --git a/patches/server/Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/patches/unapplied/server/Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch similarity index 100% rename from patches/server/Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch rename to patches/unapplied/server/Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch diff --git a/patches/server/Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/unapplied/server/Don-t-print-component-in-resource-pack-rejection-mes.patch similarity index 100% rename from patches/server/Don-t-print-component-in-resource-pack-rejection-mes.patch rename to patches/unapplied/server/Don-t-print-component-in-resource-pack-rejection-mes.patch diff --git a/patches/server/Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/unapplied/server/Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/unapplied/server/Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/Don-t-require-FACING-data.patch b/patches/unapplied/server/Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/Don-t-require-FACING-data.patch rename to patches/unapplied/server/Don-t-require-FACING-data.patch diff --git a/patches/server/Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/unapplied/server/Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 100% rename from patches/server/Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/unapplied/server/Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch diff --git a/patches/server/Don-t-run-entity-collision-code-if-not-needed.patch b/patches/unapplied/server/Don-t-run-entity-collision-code-if-not-needed.patch similarity index 100% rename from patches/server/Don-t-run-entity-collision-code-if-not-needed.patch rename to patches/unapplied/server/Don-t-run-entity-collision-code-if-not-needed.patch diff --git a/patches/server/Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/unapplied/server/Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch similarity index 100% rename from patches/server/Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch rename to patches/unapplied/server/Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch diff --git a/patches/server/Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/unapplied/server/Don-t-sleep-after-profile-lookups-if-not-needed.patch similarity index 100% rename from patches/server/Don-t-sleep-after-profile-lookups-if-not-needed.patch rename to patches/unapplied/server/Don-t-sleep-after-profile-lookups-if-not-needed.patch diff --git a/patches/server/Don-t-tick-dead-players.patch b/patches/unapplied/server/Don-t-tick-dead-players.patch similarity index 100% rename from patches/server/Don-t-tick-dead-players.patch rename to patches/unapplied/server/Don-t-tick-dead-players.patch diff --git a/patches/server/Don-t-tick-markers.patch b/patches/unapplied/server/Don-t-tick-markers.patch similarity index 100% rename from patches/server/Don-t-tick-markers.patch rename to patches/unapplied/server/Don-t-tick-markers.patch diff --git a/patches/server/Don-t-use-level-random-in-entity-constructors.patch b/patches/unapplied/server/Don-t-use-level-random-in-entity-constructors.patch similarity index 100% rename from patches/server/Don-t-use-level-random-in-entity-constructors.patch rename to patches/unapplied/server/Don-t-use-level-random-in-entity-constructors.patch diff --git a/patches/server/Dont-resent-entity-on-art-update.patch b/patches/unapplied/server/Dont-resent-entity-on-art-update.patch similarity index 100% rename from patches/server/Dont-resent-entity-on-art-update.patch rename to patches/unapplied/server/Dont-resent-entity-on-art-update.patch diff --git a/patches/server/Dont-send-unnecessary-sign-update.patch b/patches/unapplied/server/Dont-send-unnecessary-sign-update.patch similarity index 100% rename from patches/server/Dont-send-unnecessary-sign-update.patch rename to patches/unapplied/server/Dont-send-unnecessary-sign-update.patch diff --git a/patches/server/Drop-carried-item-when-player-has-disconnected.patch b/patches/unapplied/server/Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/Drop-carried-item-when-player-has-disconnected.patch rename to patches/unapplied/server/Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/Drop-falling-block-and-tnt-entities-at-the-specified.patch b/patches/unapplied/server/Drop-falling-block-and-tnt-entities-at-the-specified.patch similarity index 100% rename from patches/server/Drop-falling-block-and-tnt-entities-at-the-specified.patch rename to patches/unapplied/server/Drop-falling-block-and-tnt-entities-at-the-specified.patch diff --git a/patches/server/Duplicate-UUID-Resolve-Option.patch b/patches/unapplied/server/Duplicate-UUID-Resolve-Option.patch similarity index 100% rename from patches/server/Duplicate-UUID-Resolve-Option.patch rename to patches/unapplied/server/Duplicate-UUID-Resolve-Option.patch diff --git a/patches/server/Eigencraft-redstone-implementation.patch b/patches/unapplied/server/Eigencraft-redstone-implementation.patch similarity index 100% rename from patches/server/Eigencraft-redstone-implementation.patch rename to patches/unapplied/server/Eigencraft-redstone-implementation.patch diff --git a/patches/server/Elder-Guardian-appearance-API.patch b/patches/unapplied/server/Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/server/Elder-Guardian-appearance-API.patch rename to patches/unapplied/server/Elder-Guardian-appearance-API.patch diff --git a/patches/server/Empty-commands-shall-not-be-dispatched.patch b/patches/unapplied/server/Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/Empty-commands-shall-not-be-dispatched.patch rename to patches/unapplied/server/Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/EnderDragon-Events.patch b/patches/unapplied/server/EnderDragon-Events.patch similarity index 100% rename from patches/server/EnderDragon-Events.patch rename to patches/unapplied/server/EnderDragon-Events.patch diff --git a/patches/server/Enderman.teleportRandomly.patch b/patches/unapplied/server/Enderman.teleportRandomly.patch similarity index 100% rename from patches/server/Enderman.teleportRandomly.patch rename to patches/unapplied/server/Enderman.teleportRandomly.patch diff --git a/patches/server/EndermanAttackPlayerEvent.patch b/patches/unapplied/server/EndermanAttackPlayerEvent.patch similarity index 100% rename from patches/server/EndermanAttackPlayerEvent.patch rename to patches/unapplied/server/EndermanAttackPlayerEvent.patch diff --git a/patches/server/EndermanEscapeEvent.patch b/patches/unapplied/server/EndermanEscapeEvent.patch similarity index 100% rename from patches/server/EndermanEscapeEvent.patch rename to patches/unapplied/server/EndermanEscapeEvent.patch diff --git a/patches/server/Enforce-Sync-Player-Saves.patch b/patches/unapplied/server/Enforce-Sync-Player-Saves.patch similarity index 100% rename from patches/server/Enforce-Sync-Player-Saves.patch rename to patches/unapplied/server/Enforce-Sync-Player-Saves.patch diff --git a/patches/server/Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/unapplied/server/Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/unapplied/server/Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/unapplied/server/Ensure-Entity-AABB-s-are-never-invalid.patch similarity index 100% rename from patches/server/Ensure-Entity-AABB-s-are-never-invalid.patch rename to patches/unapplied/server/Ensure-Entity-AABB-s-are-never-invalid.patch diff --git a/patches/server/Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/unapplied/server/Ensure-EntityRaider-respects-game-and-entity-rules-f.patch similarity index 100% rename from patches/server/Ensure-EntityRaider-respects-game-and-entity-rules-f.patch rename to patches/unapplied/server/Ensure-EntityRaider-respects-game-and-entity-rules-f.patch diff --git a/patches/server/Ensure-commands-are-not-ran-async.patch b/patches/unapplied/server/Ensure-commands-are-not-ran-async.patch similarity index 100% rename from patches/server/Ensure-commands-are-not-ran-async.patch rename to patches/unapplied/server/Ensure-commands-are-not-ran-async.patch diff --git a/patches/server/Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/unapplied/server/Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 100% rename from patches/server/Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/unapplied/server/Ensure-disconnect-for-book-edit-is-called-on-main.patch diff --git a/patches/server/Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/unapplied/server/Ensure-entity-passenger-world-matches-ridden-entity.patch similarity index 100% rename from patches/server/Ensure-entity-passenger-world-matches-ridden-entity.patch rename to patches/unapplied/server/Ensure-entity-passenger-world-matches-ridden-entity.patch diff --git a/patches/server/Ensure-safe-gateway-teleport.patch b/patches/unapplied/server/Ensure-safe-gateway-teleport.patch similarity index 100% rename from patches/server/Ensure-safe-gateway-teleport.patch rename to patches/unapplied/server/Ensure-safe-gateway-teleport.patch diff --git a/patches/server/Ensure-valid-vehicle-status.patch b/patches/unapplied/server/Ensure-valid-vehicle-status.patch similarity index 100% rename from patches/server/Ensure-valid-vehicle-status.patch rename to patches/unapplied/server/Ensure-valid-vehicle-status.patch diff --git a/patches/server/Entity-Activation-Range-2.0.patch b/patches/unapplied/server/Entity-Activation-Range-2.0.patch similarity index 100% rename from patches/server/Entity-Activation-Range-2.0.patch rename to patches/unapplied/server/Entity-Activation-Range-2.0.patch diff --git a/patches/server/Entity-AddTo-RemoveFrom-World-Events.patch b/patches/unapplied/server/Entity-AddTo-RemoveFrom-World-Events.patch similarity index 100% rename from patches/server/Entity-AddTo-RemoveFrom-World-Events.patch rename to patches/unapplied/server/Entity-AddTo-RemoveFrom-World-Events.patch diff --git a/patches/server/Entity-Jump-API.patch b/patches/unapplied/server/Entity-Jump-API.patch similarity index 100% rename from patches/server/Entity-Jump-API.patch rename to patches/unapplied/server/Entity-Jump-API.patch diff --git a/patches/server/Entity-Origin-API.patch b/patches/unapplied/server/Entity-Origin-API.patch similarity index 100% rename from patches/server/Entity-Origin-API.patch rename to patches/unapplied/server/Entity-Origin-API.patch diff --git a/patches/server/Entity-fromMobSpawner.patch b/patches/unapplied/server/Entity-fromMobSpawner.patch similarity index 100% rename from patches/server/Entity-fromMobSpawner.patch rename to patches/unapplied/server/Entity-fromMobSpawner.patch diff --git a/patches/server/Entity-getEntitySpawnReason.patch b/patches/unapplied/server/Entity-getEntitySpawnReason.patch similarity index 100% rename from patches/server/Entity-getEntitySpawnReason.patch rename to patches/unapplied/server/Entity-getEntitySpawnReason.patch diff --git a/patches/server/Entity-isTicking.patch b/patches/unapplied/server/Entity-isTicking.patch similarity index 100% rename from patches/server/Entity-isTicking.patch rename to patches/unapplied/server/Entity-isTicking.patch diff --git a/patches/server/Entity-load-save-limit-per-chunk.patch b/patches/unapplied/server/Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/Entity-load-save-limit-per-chunk.patch rename to patches/unapplied/server/Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/Entity-powdered-snow-API.patch b/patches/unapplied/server/Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/Entity-powdered-snow-API.patch rename to patches/unapplied/server/Entity-powdered-snow-API.patch diff --git a/patches/server/EntityMoveEvent.patch b/patches/unapplied/server/EntityMoveEvent.patch similarity index 100% rename from patches/server/EntityMoveEvent.patch rename to patches/unapplied/server/EntityMoveEvent.patch diff --git a/patches/server/EntityPathfindEvent.patch b/patches/unapplied/server/EntityPathfindEvent.patch similarity index 100% rename from patches/server/EntityPathfindEvent.patch rename to patches/unapplied/server/EntityPathfindEvent.patch diff --git a/patches/server/EntityPickupItemEvent-fixes.patch b/patches/unapplied/server/EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/server/EntityPickupItemEvent-fixes.patch rename to patches/unapplied/server/EntityPickupItemEvent-fixes.patch diff --git a/patches/server/EntityRegainHealthEvent-isFastRegen-API.patch b/patches/unapplied/server/EntityRegainHealthEvent-isFastRegen-API.patch similarity index 100% rename from patches/server/EntityRegainHealthEvent-isFastRegen-API.patch rename to patches/unapplied/server/EntityRegainHealthEvent-isFastRegen-API.patch diff --git a/patches/server/Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/unapplied/server/Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 100% rename from patches/server/Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/unapplied/server/Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch diff --git a/patches/server/Execute-chunk-tasks-mid-tick.patch b/patches/unapplied/server/Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/server/Execute-chunk-tasks-mid-tick.patch rename to patches/unapplied/server/Execute-chunk-tasks-mid-tick.patch diff --git a/patches/server/Expand-Explosions-API.patch b/patches/unapplied/server/Expand-Explosions-API.patch similarity index 100% rename from patches/server/Expand-Explosions-API.patch rename to patches/unapplied/server/Expand-Explosions-API.patch diff --git a/patches/server/Expand-PlayerItemMendEvent.patch b/patches/unapplied/server/Expand-PlayerItemMendEvent.patch similarity index 100% rename from patches/server/Expand-PlayerItemMendEvent.patch rename to patches/unapplied/server/Expand-PlayerItemMendEvent.patch diff --git a/patches/server/Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/unapplied/server/Expand-World.spawnParticle-API-and-add-Builder.patch similarity index 100% rename from patches/server/Expand-World.spawnParticle-API-and-add-Builder.patch rename to patches/unapplied/server/Expand-World.spawnParticle-API-and-add-Builder.patch diff --git a/patches/server/Expand-world-key-API.patch b/patches/unapplied/server/Expand-world-key-API.patch similarity index 100% rename from patches/server/Expand-world-key-API.patch rename to patches/unapplied/server/Expand-world-key-API.patch diff --git a/patches/server/ExperienceOrbMergeEvent.patch b/patches/unapplied/server/ExperienceOrbMergeEvent.patch similarity index 100% rename from patches/server/ExperienceOrbMergeEvent.patch rename to patches/unapplied/server/ExperienceOrbMergeEvent.patch diff --git a/patches/server/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/unapplied/server/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch similarity index 100% rename from patches/server/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch rename to patches/unapplied/server/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch diff --git a/patches/server/Expose-LivingEntity-hurt-direction.patch b/patches/unapplied/server/Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/Expose-LivingEntity-hurt-direction.patch rename to patches/unapplied/server/Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/Expose-MinecraftServer-isRunning.patch b/patches/unapplied/server/Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/server/Expose-MinecraftServer-isRunning.patch rename to patches/unapplied/server/Expose-MinecraftServer-isRunning.patch diff --git a/patches/server/Expose-Tracked-Players.patch b/patches/unapplied/server/Expose-Tracked-Players.patch similarity index 100% rename from patches/server/Expose-Tracked-Players.patch rename to patches/unapplied/server/Expose-Tracked-Players.patch diff --git a/patches/server/Expose-attack-cooldown-methods-for-Player.patch b/patches/unapplied/server/Expose-attack-cooldown-methods-for-Player.patch similarity index 100% rename from patches/server/Expose-attack-cooldown-methods-for-Player.patch rename to patches/unapplied/server/Expose-attack-cooldown-methods-for-Player.patch diff --git a/patches/server/Expose-client-protocol-version-and-virtual-host.patch b/patches/unapplied/server/Expose-client-protocol-version-and-virtual-host.patch similarity index 100% rename from patches/server/Expose-client-protocol-version-and-virtual-host.patch rename to patches/unapplied/server/Expose-client-protocol-version-and-virtual-host.patch diff --git a/patches/server/Expose-furnace-minecart-push-values.patch b/patches/unapplied/server/Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/server/Expose-furnace-minecart-push-values.patch rename to patches/unapplied/server/Expose-furnace-minecart-push-values.patch diff --git a/patches/server/Expose-game-version.patch b/patches/unapplied/server/Expose-game-version.patch similarity index 100% rename from patches/server/Expose-game-version.patch rename to patches/unapplied/server/Expose-game-version.patch diff --git a/patches/server/Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/unapplied/server/Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/unapplied/server/Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/unapplied/server/Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/server/Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/unapplied/server/Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/server/Expose-protocol-version.patch b/patches/unapplied/server/Expose-protocol-version.patch similarity index 100% rename from patches/server/Expose-protocol-version.patch rename to patches/unapplied/server/Expose-protocol-version.patch diff --git a/patches/server/Expose-server-CommandMap.patch b/patches/unapplied/server/Expose-server-CommandMap.patch similarity index 100% rename from patches/server/Expose-server-CommandMap.patch rename to patches/unapplied/server/Expose-server-CommandMap.patch diff --git a/patches/server/Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/unapplied/server/Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/server/Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/unapplied/server/Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/server/Expose-the-internal-current-tick.patch b/patches/unapplied/server/Expose-the-internal-current-tick.patch similarity index 100% rename from patches/server/Expose-the-internal-current-tick.patch rename to patches/unapplied/server/Expose-the-internal-current-tick.patch diff --git a/patches/server/Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/unapplied/server/Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/server/Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/unapplied/server/Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/server/Expose-world-spawn-angle.patch b/patches/unapplied/server/Expose-world-spawn-angle.patch similarity index 100% rename from patches/server/Expose-world-spawn-angle.patch rename to patches/unapplied/server/Expose-world-spawn-angle.patch diff --git a/patches/server/Extend-Player-Interact-cancellation.patch b/patches/unapplied/server/Extend-Player-Interact-cancellation.patch similarity index 100% rename from patches/server/Extend-Player-Interact-cancellation.patch rename to patches/unapplied/server/Extend-Player-Interact-cancellation.patch diff --git a/patches/server/Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/unapplied/server/Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 100% rename from patches/server/Extend-block-drop-capture-to-capture-all-items-added.patch rename to patches/unapplied/server/Extend-block-drop-capture-to-capture-all-items-added.patch diff --git a/patches/server/FallingBlock-auto-expire-setting.patch b/patches/unapplied/server/FallingBlock-auto-expire-setting.patch similarity index 100% rename from patches/server/FallingBlock-auto-expire-setting.patch rename to patches/unapplied/server/FallingBlock-auto-expire-setting.patch diff --git a/patches/server/Faster-redstone-torch-rapid-clock-removal.patch b/patches/unapplied/server/Faster-redstone-torch-rapid-clock-removal.patch similarity index 100% rename from patches/server/Faster-redstone-torch-rapid-clock-removal.patch rename to patches/unapplied/server/Faster-redstone-torch-rapid-clock-removal.patch diff --git a/patches/server/Fill-Profile-Property-Events.patch b/patches/unapplied/server/Fill-Profile-Property-Events.patch similarity index 100% rename from patches/server/Fill-Profile-Property-Events.patch rename to patches/unapplied/server/Fill-Profile-Property-Events.patch diff --git a/patches/server/Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch b/patches/unapplied/server/Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch similarity index 100% rename from patches/server/Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch rename to patches/unapplied/server/Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch diff --git a/patches/server/Fire-CauldronLevelChange-on-initial-fill.patch b/patches/unapplied/server/Fire-CauldronLevelChange-on-initial-fill.patch similarity index 100% rename from patches/server/Fire-CauldronLevelChange-on-initial-fill.patch rename to patches/unapplied/server/Fire-CauldronLevelChange-on-initial-fill.patch diff --git a/patches/server/Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/unapplied/server/Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/server/Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/unapplied/server/Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/server/Fire-event-on-GS4-query.patch b/patches/unapplied/server/Fire-event-on-GS4-query.patch similarity index 100% rename from patches/server/Fire-event-on-GS4-query.patch rename to patches/unapplied/server/Fire-event-on-GS4-query.patch diff --git a/patches/server/Firework-API-s.patch b/patches/unapplied/server/Firework-API-s.patch similarity index 100% rename from patches/server/Firework-API-s.patch rename to patches/unapplied/server/Firework-API-s.patch diff --git a/patches/server/Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/unapplied/server/Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/unapplied/server/Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/Fix-Bee-flower-NPE.patch b/patches/unapplied/server/Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/server/Fix-Bee-flower-NPE.patch rename to patches/unapplied/server/Fix-Bee-flower-NPE.patch diff --git a/patches/server/Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/unapplied/server/Fix-Bukkit-NamespacedKey-shenanigans.patch similarity index 100% rename from patches/server/Fix-Bukkit-NamespacedKey-shenanigans.patch rename to patches/unapplied/server/Fix-Bukkit-NamespacedKey-shenanigans.patch diff --git a/patches/server/Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/unapplied/server/Fix-CB-call-to-changed-postToMainThread-method.patch similarity index 100% rename from patches/server/Fix-CB-call-to-changed-postToMainThread-method.patch rename to patches/unapplied/server/Fix-CB-call-to-changed-postToMainThread-method.patch diff --git a/patches/server/Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/unapplied/server/Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch similarity index 100% rename from patches/server/Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch rename to patches/unapplied/server/Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch diff --git a/patches/server/Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/unapplied/server/Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch similarity index 100% rename from patches/server/Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch rename to patches/unapplied/server/Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch diff --git a/patches/server/Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/unapplied/server/Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/unapplied/server/Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/unapplied/server/Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/unapplied/server/Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/Fix-Concurrency-issue-in-ShufflingList.patch b/patches/unapplied/server/Fix-Concurrency-issue-in-ShufflingList.patch similarity index 100% rename from patches/server/Fix-Concurrency-issue-in-ShufflingList.patch rename to patches/unapplied/server/Fix-Concurrency-issue-in-ShufflingList.patch diff --git a/patches/server/Fix-CraftCriteria-defaults-map.patch b/patches/unapplied/server/Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/Fix-CraftCriteria-defaults-map.patch rename to patches/unapplied/server/Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/Fix-CraftEntity-hashCode.patch b/patches/unapplied/server/Fix-CraftEntity-hashCode.patch similarity index 100% rename from patches/server/Fix-CraftEntity-hashCode.patch rename to patches/unapplied/server/Fix-CraftEntity-hashCode.patch diff --git a/patches/server/Fix-CraftPotionBrewer-cache.patch b/patches/unapplied/server/Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/Fix-CraftPotionBrewer-cache.patch rename to patches/unapplied/server/Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/unapplied/server/Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 100% rename from patches/server/Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to patches/unapplied/server/Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch diff --git a/patches/server/Fix-CraftSound-backwards-compatibility.patch b/patches/unapplied/server/Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/Fix-CraftSound-backwards-compatibility.patch rename to patches/unapplied/server/Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/Fix-CraftTeam-null-check.patch b/patches/unapplied/server/Fix-CraftTeam-null-check.patch similarity index 100% rename from patches/server/Fix-CraftTeam-null-check.patch rename to patches/unapplied/server/Fix-CraftTeam-null-check.patch diff --git a/patches/server/Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/patches/unapplied/server/Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch similarity index 100% rename from patches/server/Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch rename to patches/unapplied/server/Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch diff --git a/patches/server/Fix-DamageCause-for-Falling-Blocks.patch b/patches/unapplied/server/Fix-DamageCause-for-Falling-Blocks.patch similarity index 100% rename from patches/server/Fix-DamageCause-for-Falling-Blocks.patch rename to patches/unapplied/server/Fix-DamageCause-for-Falling-Blocks.patch diff --git a/patches/server/Fix-EndDragonFight-killed-statuses-should-be-false-f.patch b/patches/unapplied/server/Fix-EndDragonFight-killed-statuses-should-be-false-f.patch similarity index 100% rename from patches/server/Fix-EndDragonFight-killed-statuses-should-be-false-f.patch rename to patches/unapplied/server/Fix-EndDragonFight-killed-statuses-should-be-false-f.patch diff --git a/patches/server/Fix-Entity-Position-Desync.patch b/patches/unapplied/server/Fix-Entity-Position-Desync.patch similarity index 100% rename from patches/server/Fix-Entity-Position-Desync.patch rename to patches/unapplied/server/Fix-Entity-Position-Desync.patch diff --git a/patches/server/Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/unapplied/server/Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 100% rename from patches/server/Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to patches/unapplied/server/Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch diff --git a/patches/server/Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/unapplied/server/Fix-EntityArgument-suggestion-permissions-to-align-w.patch similarity index 100% rename from patches/server/Fix-EntityArgument-suggestion-permissions-to-align-w.patch rename to patches/unapplied/server/Fix-EntityArgument-suggestion-permissions-to-align-w.patch diff --git a/patches/server/Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/unapplied/server/Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 100% rename from patches/server/Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/unapplied/server/Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch diff --git a/patches/server/Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/unapplied/server/Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch similarity index 100% rename from patches/server/Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch rename to patches/unapplied/server/Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch diff --git a/patches/server/Fix-GameProfileCache-concurrency.patch b/patches/unapplied/server/Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/Fix-GameProfileCache-concurrency.patch rename to patches/unapplied/server/Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/unapplied/server/Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 100% rename from patches/server/Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/unapplied/server/Fix-HumanEntity-drop-not-updating-the-client-inv.patch diff --git a/patches/server/Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/unapplied/server/Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch similarity index 100% rename from patches/server/Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch rename to patches/unapplied/server/Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch diff --git a/patches/server/Fix-MC-117075-TE-Unload-Lag-Spike.patch b/patches/unapplied/server/Fix-MC-117075-TE-Unload-Lag-Spike.patch similarity index 100% rename from patches/server/Fix-MC-117075-TE-Unload-Lag-Spike.patch rename to patches/unapplied/server/Fix-MC-117075-TE-Unload-Lag-Spike.patch diff --git a/patches/server/Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/unapplied/server/Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/server/Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/unapplied/server/Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/server/Fix-MC-158900.patch b/patches/unapplied/server/Fix-MC-158900.patch similarity index 100% rename from patches/server/Fix-MC-158900.patch rename to patches/unapplied/server/Fix-MC-158900.patch diff --git a/patches/server/Fix-MapLike-Codec-missing-key-selector.patch b/patches/unapplied/server/Fix-MapLike-Codec-missing-key-selector.patch similarity index 100% rename from patches/server/Fix-MapLike-Codec-missing-key-selector.patch rename to patches/unapplied/server/Fix-MapLike-Codec-missing-key-selector.patch diff --git a/patches/server/Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/unapplied/server/Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch similarity index 100% rename from patches/server/Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch rename to patches/unapplied/server/Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch diff --git a/patches/server/Fix-NBT-type-issues.patch b/patches/unapplied/server/Fix-NBT-type-issues.patch similarity index 100% rename from patches/server/Fix-NBT-type-issues.patch rename to patches/unapplied/server/Fix-NBT-type-issues.patch diff --git a/patches/server/Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/unapplied/server/Fix-NPE-for-BlockDataMeta-getBlockData.patch similarity index 100% rename from patches/server/Fix-NPE-for-BlockDataMeta-getBlockData.patch rename to patches/unapplied/server/Fix-NPE-for-BlockDataMeta-getBlockData.patch diff --git a/patches/server/Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/unapplied/server/Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/server/Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/unapplied/server/Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/server/Fix-Not-a-string-Map-Conversion-spam.patch b/patches/unapplied/server/Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/unapplied/server/Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/Fix-NotePlayEvent.patch b/patches/unapplied/server/Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/Fix-NotePlayEvent.patch rename to patches/unapplied/server/Fix-NotePlayEvent.patch diff --git a/patches/server/Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/unapplied/server/Fix-OfflinePlayer-getBedSpawnLocation.patch similarity index 100% rename from patches/server/Fix-OfflinePlayer-getBedSpawnLocation.patch rename to patches/unapplied/server/Fix-OfflinePlayer-getBedSpawnLocation.patch diff --git a/patches/server/Fix-Old-Sign-Conversion.patch b/patches/unapplied/server/Fix-Old-Sign-Conversion.patch similarity index 100% rename from patches/server/Fix-Old-Sign-Conversion.patch rename to patches/unapplied/server/Fix-Old-Sign-Conversion.patch diff --git a/patches/server/Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/unapplied/server/Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 100% rename from patches/server/Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/unapplied/server/Fix-Per-World-Difficulty-Remembering-Difficulty.patch diff --git a/patches/server/Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/unapplied/server/Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/server/Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/unapplied/server/Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/server/Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/unapplied/server/Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/unapplied/server/Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/unapplied/server/Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 100% rename from patches/server/Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/unapplied/server/Fix-PlayerDropItemEvent-using-wrong-item.patch diff --git a/patches/server/Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/unapplied/server/Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 100% rename from patches/server/Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/unapplied/server/Fix-PlayerItemConsumeEvent-cancelling-properly.patch diff --git a/patches/server/Fix-PotionEffect-ignores-icon-flag.patch b/patches/unapplied/server/Fix-PotionEffect-ignores-icon-flag.patch similarity index 100% rename from patches/server/Fix-PotionEffect-ignores-icon-flag.patch rename to patches/unapplied/server/Fix-PotionEffect-ignores-icon-flag.patch diff --git a/patches/server/Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/unapplied/server/Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/unapplied/server/Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/unapplied/server/Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/server/Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/unapplied/server/Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/Fix-SPIGOT-5989.patch b/patches/unapplied/server/Fix-SPIGOT-5989.patch similarity index 100% rename from patches/server/Fix-SPIGOT-5989.patch rename to patches/unapplied/server/Fix-SPIGOT-5989.patch diff --git a/patches/server/Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/unapplied/server/Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 100% rename from patches/server/Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/unapplied/server/Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch diff --git a/patches/server/Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/unapplied/server/Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/server/Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/unapplied/server/Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/server/Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/unapplied/server/Fix-Spigot-Config-not-using-commands.spam-exclusions.patch similarity index 100% rename from patches/server/Fix-Spigot-Config-not-using-commands.spam-exclusions.patch rename to patches/unapplied/server/Fix-Spigot-Config-not-using-commands.spam-exclusions.patch diff --git a/patches/server/Fix-Spigot-growth-modifiers.patch b/patches/unapplied/server/Fix-Spigot-growth-modifiers.patch similarity index 100% rename from patches/server/Fix-Spigot-growth-modifiers.patch rename to patches/unapplied/server/Fix-Spigot-growth-modifiers.patch diff --git a/patches/server/Fix-SpongeAbsortEvent-handling.patch b/patches/unapplied/server/Fix-SpongeAbsortEvent-handling.patch similarity index 100% rename from patches/server/Fix-SpongeAbsortEvent-handling.patch rename to patches/unapplied/server/Fix-SpongeAbsortEvent-handling.patch diff --git a/patches/server/Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/unapplied/server/Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch similarity index 100% rename from patches/server/Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch rename to patches/unapplied/server/Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch diff --git a/patches/server/Fix-World-isChunkGenerated-calls.patch b/patches/unapplied/server/Fix-World-isChunkGenerated-calls.patch similarity index 100% rename from patches/server/Fix-World-isChunkGenerated-calls.patch rename to patches/unapplied/server/Fix-World-isChunkGenerated-calls.patch diff --git a/patches/server/Fix-a-bunch-of-vanilla-bugs.patch b/patches/unapplied/server/Fix-a-bunch-of-vanilla-bugs.patch similarity index 100% rename from patches/server/Fix-a-bunch-of-vanilla-bugs.patch rename to patches/unapplied/server/Fix-a-bunch-of-vanilla-bugs.patch diff --git a/patches/server/Fix-a-couple-of-upstream-bed-issues.patch b/patches/unapplied/server/Fix-a-couple-of-upstream-bed-issues.patch similarity index 100% rename from patches/server/Fix-a-couple-of-upstream-bed-issues.patch rename to patches/unapplied/server/Fix-a-couple-of-upstream-bed-issues.patch diff --git a/patches/server/Fix-advancement-triggers-for-entity-damage.patch b/patches/unapplied/server/Fix-advancement-triggers-for-entity-damage.patch similarity index 100% rename from patches/server/Fix-advancement-triggers-for-entity-damage.patch rename to patches/unapplied/server/Fix-advancement-triggers-for-entity-damage.patch diff --git a/patches/server/Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/unapplied/server/Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 100% rename from patches/server/Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/unapplied/server/Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch diff --git a/patches/server/Fix-and-optimise-world-force-upgrading.patch b/patches/unapplied/server/Fix-and-optimise-world-force-upgrading.patch similarity index 100% rename from patches/server/Fix-and-optimise-world-force-upgrading.patch rename to patches/unapplied/server/Fix-and-optimise-world-force-upgrading.patch diff --git a/patches/server/Fix-api-checking-banned-ips.patch b/patches/unapplied/server/Fix-api-checking-banned-ips.patch similarity index 100% rename from patches/server/Fix-api-checking-banned-ips.patch rename to patches/unapplied/server/Fix-api-checking-banned-ips.patch diff --git a/patches/server/Fix-arrows-never-despawning-MC-125757.patch b/patches/unapplied/server/Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/server/Fix-arrows-never-despawning-MC-125757.patch rename to patches/unapplied/server/Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/Fix-async-entity-add-due-to-fungus-trees.patch b/patches/unapplied/server/Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/server/Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/unapplied/server/Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/server/Fix-beehives-generating-from-using-bonemeal.patch b/patches/unapplied/server/Fix-beehives-generating-from-using-bonemeal.patch similarity index 100% rename from patches/server/Fix-beehives-generating-from-using-bonemeal.patch rename to patches/unapplied/server/Fix-beehives-generating-from-using-bonemeal.patch diff --git a/patches/server/Fix-bees-aging-inside-hives.patch b/patches/unapplied/server/Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/Fix-bees-aging-inside-hives.patch rename to patches/unapplied/server/Fix-bees-aging-inside-hives.patch diff --git a/patches/server/Fix-block-place-logic.patch b/patches/unapplied/server/Fix-block-place-logic.patch similarity index 100% rename from patches/server/Fix-block-place-logic.patch rename to patches/unapplied/server/Fix-block-place-logic.patch diff --git a/patches/server/Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/unapplied/server/Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 100% rename from patches/server/Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/unapplied/server/Fix-cancelled-powdered-snow-bucket-placement.patch diff --git a/patches/server/Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/unapplied/server/Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch similarity index 100% rename from patches/server/Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch rename to patches/unapplied/server/Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch diff --git a/patches/server/Fix-certain-inventories-returning-null-Locations.patch b/patches/unapplied/server/Fix-certain-inventories-returning-null-Locations.patch similarity index 100% rename from patches/server/Fix-certain-inventories-returning-null-Locations.patch rename to patches/unapplied/server/Fix-certain-inventories-returning-null-Locations.patch diff --git a/patches/server/Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/unapplied/server/Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch similarity index 100% rename from patches/server/Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch rename to patches/unapplied/server/Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch diff --git a/patches/server/Fix-client-lag-on-advancement-loading.patch b/patches/unapplied/server/Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from patches/server/Fix-client-lag-on-advancement-loading.patch rename to patches/unapplied/server/Fix-client-lag-on-advancement-loading.patch diff --git a/patches/server/Fix-commands-from-signs-not-firing-command-events.patch b/patches/unapplied/server/Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/Fix-commands-from-signs-not-firing-command-events.patch rename to patches/unapplied/server/Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/unapplied/server/Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch similarity index 100% rename from patches/server/Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch rename to patches/unapplied/server/Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch diff --git a/patches/server/Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/unapplied/server/Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch similarity index 100% rename from patches/server/Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch rename to patches/unapplied/server/Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch diff --git a/patches/server/Fix-curing-zombie-villager-discount-exploit.patch b/patches/unapplied/server/Fix-curing-zombie-villager-discount-exploit.patch similarity index 100% rename from patches/server/Fix-curing-zombie-villager-discount-exploit.patch rename to patches/unapplied/server/Fix-curing-zombie-villager-discount-exploit.patch diff --git a/patches/server/Fix-custom-piglin-loved-items.patch b/patches/unapplied/server/Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/server/Fix-custom-piglin-loved-items.patch rename to patches/unapplied/server/Fix-custom-piglin-loved-items.patch diff --git a/patches/server/Fix-dangerous-end-portal-logic.patch b/patches/unapplied/server/Fix-dangerous-end-portal-logic.patch similarity index 100% rename from patches/server/Fix-dangerous-end-portal-logic.patch rename to patches/unapplied/server/Fix-dangerous-end-portal-logic.patch diff --git a/patches/server/Fix-demo-flag-not-enabling-demo-mode.patch b/patches/unapplied/server/Fix-demo-flag-not-enabling-demo-mode.patch similarity index 100% rename from patches/server/Fix-demo-flag-not-enabling-demo-mode.patch rename to patches/unapplied/server/Fix-demo-flag-not-enabling-demo-mode.patch diff --git a/patches/server/Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/unapplied/server/Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from patches/server/Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to patches/unapplied/server/Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/patches/server/Fix-destroying-beehive-without-any-players-nearby-th.patch b/patches/unapplied/server/Fix-destroying-beehive-without-any-players-nearby-th.patch similarity index 100% rename from patches/server/Fix-destroying-beehive-without-any-players-nearby-th.patch rename to patches/unapplied/server/Fix-destroying-beehive-without-any-players-nearby-th.patch diff --git a/patches/server/Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/unapplied/server/Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/unapplied/server/Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/unapplied/server/Fix-exploit-that-allowed-colored-signs-to-be-created.patch similarity index 100% rename from patches/server/Fix-exploit-that-allowed-colored-signs-to-be-created.patch rename to patches/unapplied/server/Fix-exploit-that-allowed-colored-signs-to-be-created.patch diff --git a/patches/server/Fix-falling-block-spawn-methods.patch b/patches/unapplied/server/Fix-falling-block-spawn-methods.patch similarity index 100% rename from patches/server/Fix-falling-block-spawn-methods.patch rename to patches/unapplied/server/Fix-falling-block-spawn-methods.patch diff --git a/patches/server/Fix-for-large-move-vectors-crashing-server.patch b/patches/unapplied/server/Fix-for-large-move-vectors-crashing-server.patch similarity index 100% rename from patches/server/Fix-for-large-move-vectors-crashing-server.patch rename to patches/unapplied/server/Fix-for-large-move-vectors-crashing-server.patch diff --git a/patches/server/Fix-force-opening-enchantment-tables.patch b/patches/unapplied/server/Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/server/Fix-force-opening-enchantment-tables.patch rename to patches/unapplied/server/Fix-force-opening-enchantment-tables.patch diff --git a/patches/server/Fix-harming-potion-dupe.patch b/patches/unapplied/server/Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/Fix-harming-potion-dupe.patch rename to patches/unapplied/server/Fix-harming-potion-dupe.patch diff --git a/patches/server/Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/unapplied/server/Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/unapplied/server/Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/unapplied/server/Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/server/Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/unapplied/server/Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/server/Fix-incorrect-message-for-outdated-client.patch b/patches/unapplied/server/Fix-incorrect-message-for-outdated-client.patch similarity index 100% rename from patches/server/Fix-incorrect-message-for-outdated-client.patch rename to patches/unapplied/server/Fix-incorrect-message-for-outdated-client.patch diff --git a/patches/server/Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/unapplied/server/Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/unapplied/server/Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/Fix-interact-event-not-being-called-in-adventure.patch b/patches/unapplied/server/Fix-interact-event-not-being-called-in-adventure.patch similarity index 100% rename from patches/server/Fix-interact-event-not-being-called-in-adventure.patch rename to patches/unapplied/server/Fix-interact-event-not-being-called-in-adventure.patch diff --git a/patches/server/Fix-invulnerable-end-crystals.patch b/patches/unapplied/server/Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/Fix-invulnerable-end-crystals.patch rename to patches/unapplied/server/Fix-invulnerable-end-crystals.patch diff --git a/patches/server/Fix-issues-with-mob-conversion.patch b/patches/unapplied/server/Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/Fix-issues-with-mob-conversion.patch rename to patches/unapplied/server/Fix-issues-with-mob-conversion.patch diff --git a/patches/server/Fix-item-locations-dropped-from-campfires.patch b/patches/unapplied/server/Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/Fix-item-locations-dropped-from-campfires.patch rename to patches/unapplied/server/Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/Fix-items-not-falling-correctly.patch b/patches/unapplied/server/Fix-items-not-falling-correctly.patch similarity index 100% rename from patches/server/Fix-items-not-falling-correctly.patch rename to patches/unapplied/server/Fix-items-not-falling-correctly.patch diff --git a/patches/server/Fix-items-vanishing-through-end-portal.patch b/patches/unapplied/server/Fix-items-vanishing-through-end-portal.patch similarity index 100% rename from patches/server/Fix-items-vanishing-through-end-portal.patch rename to patches/unapplied/server/Fix-items-vanishing-through-end-portal.patch diff --git a/patches/server/Fix-lag-from-explosions-processing-dead-entities.patch b/patches/unapplied/server/Fix-lag-from-explosions-processing-dead-entities.patch similarity index 100% rename from patches/server/Fix-lag-from-explosions-processing-dead-entities.patch rename to patches/unapplied/server/Fix-lag-from-explosions-processing-dead-entities.patch diff --git a/patches/server/Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/unapplied/server/Fix-last-firework-in-stack-not-having-effects-when-d.patch similarity index 100% rename from patches/server/Fix-last-firework-in-stack-not-having-effects-when-d.patch rename to patches/unapplied/server/Fix-last-firework-in-stack-not-having-effects-when-d.patch diff --git a/patches/server/Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/unapplied/server/Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 100% rename from patches/server/Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/unapplied/server/Fix-merchant-inventory-not-closing-on-entity-removal.patch diff --git a/patches/server/Fix-missing-chunks-due-to-integer-overflow.patch b/patches/unapplied/server/Fix-missing-chunks-due-to-integer-overflow.patch similarity index 100% rename from patches/server/Fix-missing-chunks-due-to-integer-overflow.patch rename to patches/unapplied/server/Fix-missing-chunks-due-to-integer-overflow.patch diff --git a/patches/server/Fix-nerfed-slime-when-splitting.patch b/patches/unapplied/server/Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/Fix-nerfed-slime-when-splitting.patch rename to patches/unapplied/server/Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/unapplied/server/Fix-new-block-data-for-EntityChangeBlockEvent.patch similarity index 100% rename from patches/server/Fix-new-block-data-for-EntityChangeBlockEvent.patch rename to patches/unapplied/server/Fix-new-block-data-for-EntityChangeBlockEvent.patch diff --git a/patches/server/Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/unapplied/server/Fix-numerous-item-duplication-issues-and-teleport-is.patch similarity index 100% rename from patches/server/Fix-numerous-item-duplication-issues-and-teleport-is.patch rename to patches/unapplied/server/Fix-numerous-item-duplication-issues-and-teleport-is.patch diff --git a/patches/server/Fix-piston-physics-inconsistency-MC-188840.patch b/patches/unapplied/server/Fix-piston-physics-inconsistency-MC-188840.patch similarity index 100% rename from patches/server/Fix-piston-physics-inconsistency-MC-188840.patch rename to patches/unapplied/server/Fix-piston-physics-inconsistency-MC-188840.patch diff --git a/patches/server/Fix-player-kick-on-shutdown.patch b/patches/unapplied/server/Fix-player-kick-on-shutdown.patch similarity index 100% rename from patches/server/Fix-player-kick-on-shutdown.patch rename to patches/unapplied/server/Fix-player-kick-on-shutdown.patch diff --git a/patches/server/Fix-plugin-loggers-on-server-shutdown.patch b/patches/unapplied/server/Fix-plugin-loggers-on-server-shutdown.patch similarity index 100% rename from patches/server/Fix-plugin-loggers-on-server-shutdown.patch rename to patches/unapplied/server/Fix-plugin-loggers-on-server-shutdown.patch diff --git a/patches/server/Fix-potions-splash-events.patch b/patches/unapplied/server/Fix-potions-splash-events.patch similarity index 100% rename from patches/server/Fix-potions-splash-events.patch rename to patches/unapplied/server/Fix-potions-splash-events.patch diff --git a/patches/server/Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/unapplied/server/Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/unapplied/server/Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/Fix-removing-recipes-from-RecipeIterator.patch b/patches/unapplied/server/Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/Fix-removing-recipes-from-RecipeIterator.patch rename to patches/unapplied/server/Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/unapplied/server/Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/unapplied/server/Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/Fix-sand-duping.patch b/patches/unapplied/server/Fix-sand-duping.patch similarity index 100% rename from patches/server/Fix-sand-duping.patch rename to patches/unapplied/server/Fix-sand-duping.patch diff --git a/patches/server/Fix-saving-in-unloadWorld.patch b/patches/unapplied/server/Fix-saving-in-unloadWorld.patch similarity index 100% rename from patches/server/Fix-saving-in-unloadWorld.patch rename to patches/unapplied/server/Fix-saving-in-unloadWorld.patch diff --git a/patches/server/Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/unapplied/server/Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/unapplied/server/Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/unapplied/server/Fix-slime-spawners-not-spawning-outside-slime-chunks.patch similarity index 100% rename from patches/server/Fix-slime-spawners-not-spawning-outside-slime-chunks.patch rename to patches/unapplied/server/Fix-slime-spawners-not-spawning-outside-slime-chunks.patch diff --git a/patches/server/Fix-some-rails-connecting-improperly.patch b/patches/unapplied/server/Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/Fix-some-rails-connecting-improperly.patch rename to patches/unapplied/server/Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/unapplied/server/Fix-sounds-when-item-frames-are-modified-MC-123450.patch similarity index 100% rename from patches/server/Fix-sounds-when-item-frames-are-modified-MC-123450.patch rename to patches/unapplied/server/Fix-sounds-when-item-frames-are-modified-MC-123450.patch diff --git a/patches/server/Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/unapplied/server/Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/unapplied/server/Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/unapplied/server/Fix-suggest-command-message-for-brigadier-syntax-exc.patch similarity index 100% rename from patches/server/Fix-suggest-command-message-for-brigadier-syntax-exc.patch rename to patches/unapplied/server/Fix-suggest-command-message-for-brigadier-syntax-exc.patch diff --git a/patches/server/Fix-swamp-hut-cat-generation-deadlock.patch b/patches/unapplied/server/Fix-swamp-hut-cat-generation-deadlock.patch similarity index 100% rename from patches/server/Fix-swamp-hut-cat-generation-deadlock.patch rename to patches/unapplied/server/Fix-swamp-hut-cat-generation-deadlock.patch diff --git a/patches/server/Fix-test-not-bootstrapping.patch b/patches/unapplied/server/Fix-test-not-bootstrapping.patch similarity index 100% rename from patches/server/Fix-test-not-bootstrapping.patch rename to patches/unapplied/server/Fix-test-not-bootstrapping.patch diff --git a/patches/server/Fix-text-display-error-on-spawn.patch b/patches/unapplied/server/Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/server/Fix-text-display-error-on-spawn.patch rename to patches/unapplied/server/Fix-text-display-error-on-spawn.patch diff --git a/patches/server/Fix-this-stupid-bullshit.patch b/patches/unapplied/server/Fix-this-stupid-bullshit.patch similarity index 100% rename from patches/server/Fix-this-stupid-bullshit.patch rename to patches/unapplied/server/Fix-this-stupid-bullshit.patch diff --git a/patches/server/Fix-tripwire-state-inconsistency.patch b/patches/unapplied/server/Fix-tripwire-state-inconsistency.patch similarity index 100% rename from patches/server/Fix-tripwire-state-inconsistency.patch rename to patches/unapplied/server/Fix-tripwire-state-inconsistency.patch diff --git a/patches/server/Fix-upstreams-block-state-factories.patch b/patches/unapplied/server/Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/server/Fix-upstreams-block-state-factories.patch rename to patches/unapplied/server/Fix-upstreams-block-state-factories.patch diff --git a/patches/server/Fix-villager-boat-exploit.patch b/patches/unapplied/server/Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/Fix-villager-boat-exploit.patch rename to patches/unapplied/server/Fix-villager-boat-exploit.patch diff --git a/patches/server/Fix-villager-trading-demand-MC-163962.patch b/patches/unapplied/server/Fix-villager-trading-demand-MC-163962.patch similarity index 100% rename from patches/server/Fix-villager-trading-demand-MC-163962.patch rename to patches/unapplied/server/Fix-villager-trading-demand-MC-163962.patch diff --git a/patches/server/Fix-xp-reward-for-baby-zombies.patch b/patches/unapplied/server/Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/server/Fix-xp-reward-for-baby-zombies.patch rename to patches/unapplied/server/Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/server/Fixed-TileEntityBell-memory-leak.patch b/patches/unapplied/server/Fixed-TileEntityBell-memory-leak.patch similarity index 100% rename from patches/server/Fixed-TileEntityBell-memory-leak.patch rename to patches/unapplied/server/Fixed-TileEntityBell-memory-leak.patch diff --git a/patches/server/Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/unapplied/server/Fixes-and-additions-to-the-SpawnReason-API.patch similarity index 100% rename from patches/server/Fixes-and-additions-to-the-SpawnReason-API.patch rename to patches/unapplied/server/Fixes-and-additions-to-the-SpawnReason-API.patch diff --git a/patches/server/Fixes-kick-event-leave-message-not-being-sent.patch b/patches/unapplied/server/Fixes-kick-event-leave-message-not-being-sent.patch similarity index 100% rename from patches/server/Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/unapplied/server/Fixes-kick-event-leave-message-not-being-sent.patch diff --git a/patches/server/Flag-to-disable-the-channel-limit.patch b/patches/unapplied/server/Flag-to-disable-the-channel-limit.patch similarity index 100% rename from patches/server/Flag-to-disable-the-channel-limit.patch rename to patches/unapplied/server/Flag-to-disable-the-channel-limit.patch diff --git a/patches/server/Flat-bedrock-generator-settings.patch b/patches/unapplied/server/Flat-bedrock-generator-settings.patch similarity index 100% rename from patches/server/Flat-bedrock-generator-settings.patch rename to patches/unapplied/server/Flat-bedrock-generator-settings.patch diff --git a/patches/server/Flying-Fall-Damage.patch b/patches/unapplied/server/Flying-Fall-Damage.patch similarity index 100% rename from patches/server/Flying-Fall-Damage.patch rename to patches/unapplied/server/Flying-Fall-Damage.patch diff --git a/patches/server/Force-close-world-loading-screen.patch b/patches/unapplied/server/Force-close-world-loading-screen.patch similarity index 100% rename from patches/server/Force-close-world-loading-screen.patch rename to patches/unapplied/server/Force-close-world-loading-screen.patch diff --git a/patches/server/Forward-CraftEntity-in-teleport-command.patch b/patches/unapplied/server/Forward-CraftEntity-in-teleport-command.patch similarity index 100% rename from patches/server/Forward-CraftEntity-in-teleport-command.patch rename to patches/unapplied/server/Forward-CraftEntity-in-teleport-command.patch diff --git a/patches/server/Freeze-Tick-Lock-API.patch b/patches/unapplied/server/Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/server/Freeze-Tick-Lock-API.patch rename to patches/unapplied/server/Freeze-Tick-Lock-API.patch diff --git a/patches/server/Friction-API.patch b/patches/unapplied/server/Friction-API.patch similarity index 100% rename from patches/server/Friction-API.patch rename to patches/unapplied/server/Friction-API.patch diff --git a/patches/server/Furnace-RecipesUsed-API.patch b/patches/unapplied/server/Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/server/Furnace-RecipesUsed-API.patch rename to patches/unapplied/server/Furnace-RecipesUsed-API.patch diff --git a/patches/server/Further-improve-server-tick-loop.patch b/patches/unapplied/server/Further-improve-server-tick-loop.patch similarity index 100% rename from patches/server/Further-improve-server-tick-loop.patch rename to patches/unapplied/server/Further-improve-server-tick-loop.patch diff --git a/patches/server/Get-entity-default-attributes.patch b/patches/unapplied/server/Get-entity-default-attributes.patch similarity index 100% rename from patches/server/Get-entity-default-attributes.patch rename to patches/unapplied/server/Get-entity-default-attributes.patch diff --git a/patches/server/Goat-ram-API.patch b/patches/unapplied/server/Goat-ram-API.patch similarity index 100% rename from patches/server/Goat-ram-API.patch rename to patches/unapplied/server/Goat-ram-API.patch diff --git a/patches/server/Guard-against-invalid-entity-positions.patch b/patches/unapplied/server/Guard-against-invalid-entity-positions.patch similarity index 100% rename from patches/server/Guard-against-invalid-entity-positions.patch rename to patches/unapplied/server/Guard-against-invalid-entity-positions.patch diff --git a/patches/server/Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/unapplied/server/Guard-against-serializing-mismatching-chunk-coordina.patch similarity index 100% rename from patches/server/Guard-against-serializing-mismatching-chunk-coordina.patch rename to patches/unapplied/server/Guard-against-serializing-mismatching-chunk-coordina.patch diff --git a/patches/server/Handle-Item-Meta-Inconsistencies.patch b/patches/unapplied/server/Handle-Item-Meta-Inconsistencies.patch similarity index 100% rename from patches/server/Handle-Item-Meta-Inconsistencies.patch rename to patches/unapplied/server/Handle-Item-Meta-Inconsistencies.patch diff --git a/patches/server/Handle-Large-Packets-disconnecting-client.patch b/patches/unapplied/server/Handle-Large-Packets-disconnecting-client.patch similarity index 100% rename from patches/server/Handle-Large-Packets-disconnecting-client.patch rename to patches/unapplied/server/Handle-Large-Packets-disconnecting-client.patch diff --git a/patches/server/Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/unapplied/server/Handle-Oversized-Tile-Entities-in-chunks.patch similarity index 100% rename from patches/server/Handle-Oversized-Tile-Entities-in-chunks.patch rename to patches/unapplied/server/Handle-Oversized-Tile-Entities-in-chunks.patch diff --git a/patches/server/Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/unapplied/server/Handle-plugin-prefixes-using-Log4J-configuration.patch similarity index 100% rename from patches/server/Handle-plugin-prefixes-using-Log4J-configuration.patch rename to patches/unapplied/server/Handle-plugin-prefixes-using-Log4J-configuration.patch diff --git a/patches/server/Hide-sync-chunk-writes-behind-flag.patch b/patches/unapplied/server/Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from patches/server/Hide-sync-chunk-writes-behind-flag.patch rename to patches/unapplied/server/Hide-sync-chunk-writes-behind-flag.patch diff --git a/patches/server/Hide-unnecessary-itemmeta-from-clients.patch b/patches/unapplied/server/Hide-unnecessary-itemmeta-from-clients.patch similarity index 100% rename from patches/server/Hide-unnecessary-itemmeta-from-clients.patch rename to patches/unapplied/server/Hide-unnecessary-itemmeta-from-clients.patch diff --git a/patches/server/Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/unapplied/server/Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch similarity index 100% rename from patches/server/Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch rename to patches/unapplied/server/Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch diff --git a/patches/server/Honor-EntityAgeable.ageLock.patch b/patches/unapplied/server/Honor-EntityAgeable.ageLock.patch similarity index 100% rename from patches/server/Honor-EntityAgeable.ageLock.patch rename to patches/unapplied/server/Honor-EntityAgeable.ageLock.patch diff --git a/patches/server/Hook-into-CB-plugin-rewrites.patch b/patches/unapplied/server/Hook-into-CB-plugin-rewrites.patch similarity index 100% rename from patches/server/Hook-into-CB-plugin-rewrites.patch rename to patches/unapplied/server/Hook-into-CB-plugin-rewrites.patch diff --git a/patches/server/Ignore-impossible-spawn-tick.patch b/patches/unapplied/server/Ignore-impossible-spawn-tick.patch similarity index 100% rename from patches/server/Ignore-impossible-spawn-tick.patch rename to patches/unapplied/server/Ignore-impossible-spawn-tick.patch diff --git a/patches/server/Implement-API-to-expose-exact-interaction-point.patch b/patches/unapplied/server/Implement-API-to-expose-exact-interaction-point.patch similarity index 100% rename from patches/server/Implement-API-to-expose-exact-interaction-point.patch rename to patches/unapplied/server/Implement-API-to-expose-exact-interaction-point.patch diff --git a/patches/server/Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/unapplied/server/Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/unapplied/server/Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/Implement-BlockPreDispenseEvent.patch b/patches/unapplied/server/Implement-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/Implement-BlockPreDispenseEvent.patch rename to patches/unapplied/server/Implement-BlockPreDispenseEvent.patch diff --git a/patches/server/Implement-Brigadier-Mojang-API.patch b/patches/unapplied/server/Implement-Brigadier-Mojang-API.patch similarity index 100% rename from patches/server/Implement-Brigadier-Mojang-API.patch rename to patches/unapplied/server/Implement-Brigadier-Mojang-API.patch diff --git a/patches/server/Implement-CraftBlockSoundGroup.patch b/patches/unapplied/server/Implement-CraftBlockSoundGroup.patch similarity index 100% rename from patches/server/Implement-CraftBlockSoundGroup.patch rename to patches/unapplied/server/Implement-CraftBlockSoundGroup.patch diff --git a/patches/server/Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch b/patches/unapplied/server/Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch similarity index 100% rename from patches/server/Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch rename to patches/unapplied/server/Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch diff --git a/patches/server/Implement-EntityTeleportEndGatewayEvent.patch b/patches/unapplied/server/Implement-EntityTeleportEndGatewayEvent.patch similarity index 100% rename from patches/server/Implement-EntityTeleportEndGatewayEvent.patch rename to patches/unapplied/server/Implement-EntityTeleportEndGatewayEvent.patch diff --git a/patches/server/Implement-Expanded-ArmorStand-API.patch b/patches/unapplied/server/Implement-Expanded-ArmorStand-API.patch similarity index 100% rename from patches/server/Implement-Expanded-ArmorStand-API.patch rename to patches/unapplied/server/Implement-Expanded-ArmorStand-API.patch diff --git a/patches/server/Implement-Mob-Goal-API.patch b/patches/unapplied/server/Implement-Mob-Goal-API.patch similarity index 100% rename from patches/server/Implement-Mob-Goal-API.patch rename to patches/unapplied/server/Implement-Mob-Goal-API.patch diff --git a/patches/server/Implement-Paper-VersionChecker.patch b/patches/unapplied/server/Implement-Paper-VersionChecker.patch similarity index 100% rename from patches/server/Implement-Paper-VersionChecker.patch rename to patches/unapplied/server/Implement-Paper-VersionChecker.patch diff --git a/patches/server/Implement-Player-Client-Options-API.patch b/patches/unapplied/server/Implement-Player-Client-Options-API.patch similarity index 100% rename from patches/server/Implement-Player-Client-Options-API.patch rename to patches/unapplied/server/Implement-Player-Client-Options-API.patch diff --git a/patches/server/Implement-PlayerFlowerPotManipulateEvent.patch b/patches/unapplied/server/Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/unapplied/server/Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/Implement-PlayerLocaleChangeEvent.patch b/patches/unapplied/server/Implement-PlayerLocaleChangeEvent.patch similarity index 100% rename from patches/server/Implement-PlayerLocaleChangeEvent.patch rename to patches/unapplied/server/Implement-PlayerLocaleChangeEvent.patch diff --git a/patches/server/Implement-PlayerPostRespawnEvent.patch b/patches/unapplied/server/Implement-PlayerPostRespawnEvent.patch similarity index 100% rename from patches/server/Implement-PlayerPostRespawnEvent.patch rename to patches/unapplied/server/Implement-PlayerPostRespawnEvent.patch diff --git a/patches/server/Implement-TargetHitEvent.patch b/patches/unapplied/server/Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/Implement-TargetHitEvent.patch rename to patches/unapplied/server/Implement-TargetHitEvent.patch diff --git a/patches/server/Implement-World.getEntity-UUID-API.patch b/patches/unapplied/server/Implement-World.getEntity-UUID-API.patch similarity index 100% rename from patches/server/Implement-World.getEntity-UUID-API.patch rename to patches/unapplied/server/Implement-World.getEntity-UUID-API.patch diff --git a/patches/server/Implement-alternative-item-despawn-rate.patch b/patches/unapplied/server/Implement-alternative-item-despawn-rate.patch similarity index 100% rename from patches/server/Implement-alternative-item-despawn-rate.patch rename to patches/unapplied/server/Implement-alternative-item-despawn-rate.patch diff --git a/patches/server/Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/unapplied/server/Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch similarity index 100% rename from patches/server/Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch rename to patches/unapplied/server/Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch diff --git a/patches/server/Implement-enchantWithLevels-API.patch b/patches/unapplied/server/Implement-enchantWithLevels-API.patch similarity index 100% rename from patches/server/Implement-enchantWithLevels-API.patch rename to patches/unapplied/server/Implement-enchantWithLevels-API.patch diff --git a/patches/server/Implement-ensureServerConversions-API.patch b/patches/unapplied/server/Implement-ensureServerConversions-API.patch similarity index 100% rename from patches/server/Implement-ensureServerConversions-API.patch rename to patches/unapplied/server/Implement-ensureServerConversions-API.patch diff --git a/patches/server/Implement-extended-PaperServerListPingEvent.patch b/patches/unapplied/server/Implement-extended-PaperServerListPingEvent.patch similarity index 100% rename from patches/server/Implement-extended-PaperServerListPingEvent.patch rename to patches/unapplied/server/Implement-extended-PaperServerListPingEvent.patch diff --git a/patches/server/Implement-furnace-cook-speed-multiplier-API.patch b/patches/unapplied/server/Implement-furnace-cook-speed-multiplier-API.patch similarity index 100% rename from patches/server/Implement-furnace-cook-speed-multiplier-API.patch rename to patches/unapplied/server/Implement-furnace-cook-speed-multiplier-API.patch diff --git a/patches/server/Implement-getComputedBiome-API.patch b/patches/unapplied/server/Implement-getComputedBiome-API.patch similarity index 100% rename from patches/server/Implement-getComputedBiome-API.patch rename to patches/unapplied/server/Implement-getComputedBiome-API.patch diff --git a/patches/server/Implement-getI18NDisplayName.patch b/patches/unapplied/server/Implement-getI18NDisplayName.patch similarity index 100% rename from patches/server/Implement-getI18NDisplayName.patch rename to patches/unapplied/server/Implement-getI18NDisplayName.patch diff --git a/patches/server/Implement-methods-to-convert-between-Component-and-B.patch b/patches/unapplied/server/Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/Implement-methods-to-convert-between-Component-and-B.patch rename to patches/unapplied/server/Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/Implement-regenerateChunk.patch b/patches/unapplied/server/Implement-regenerateChunk.patch similarity index 100% rename from patches/server/Implement-regenerateChunk.patch rename to patches/unapplied/server/Implement-regenerateChunk.patch diff --git a/patches/server/Implemented-BlockFailedDispenseEvent.patch b/patches/unapplied/server/Implemented-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/server/Implemented-BlockFailedDispenseEvent.patch rename to patches/unapplied/server/Implemented-BlockFailedDispenseEvent.patch diff --git a/patches/server/Improve-Arrow-API.patch b/patches/unapplied/server/Improve-Arrow-API.patch similarity index 100% rename from patches/server/Improve-Arrow-API.patch rename to patches/unapplied/server/Improve-Arrow-API.patch diff --git a/patches/server/Improve-Block-breakNaturally-API.patch b/patches/unapplied/server/Improve-Block-breakNaturally-API.patch similarity index 100% rename from patches/server/Improve-Block-breakNaturally-API.patch rename to patches/unapplied/server/Improve-Block-breakNaturally-API.patch diff --git a/patches/server/Improve-BlockPosition-inlining.patch b/patches/unapplied/server/Improve-BlockPosition-inlining.patch similarity index 100% rename from patches/server/Improve-BlockPosition-inlining.patch rename to patches/unapplied/server/Improve-BlockPosition-inlining.patch diff --git a/patches/server/Improve-EntityShootBowEvent.patch b/patches/unapplied/server/Improve-EntityShootBowEvent.patch similarity index 100% rename from patches/server/Improve-EntityShootBowEvent.patch rename to patches/unapplied/server/Improve-EntityShootBowEvent.patch diff --git a/patches/server/Improve-Legacy-Component-serialization-size.patch b/patches/unapplied/server/Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from patches/server/Improve-Legacy-Component-serialization-size.patch rename to patches/unapplied/server/Improve-Legacy-Component-serialization-size.patch diff --git a/patches/server/Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/unapplied/server/Improve-Log4J-Configuration-Plugin-Loggers.patch similarity index 100% rename from patches/server/Improve-Log4J-Configuration-Plugin-Loggers.patch rename to patches/unapplied/server/Improve-Log4J-Configuration-Plugin-Loggers.patch diff --git a/patches/server/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/unapplied/server/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch similarity index 100% rename from patches/server/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch rename to patches/unapplied/server/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch diff --git a/patches/server/Improve-PortalEvents.patch b/patches/unapplied/server/Improve-PortalEvents.patch similarity index 100% rename from patches/server/Improve-PortalEvents.patch rename to patches/unapplied/server/Improve-PortalEvents.patch diff --git a/patches/server/Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/unapplied/server/Improve-Server-Thread-Pool-and-Thread-Priorities.patch similarity index 100% rename from patches/server/Improve-Server-Thread-Pool-and-Thread-Priorities.patch rename to patches/unapplied/server/Improve-Server-Thread-Pool-and-Thread-Priorities.patch diff --git a/patches/server/Improve-ServerGUI.patch b/patches/unapplied/server/Improve-ServerGUI.patch similarity index 100% rename from patches/server/Improve-ServerGUI.patch rename to patches/unapplied/server/Improve-ServerGUI.patch diff --git a/patches/server/Improve-and-expand-AsyncCatcher.patch b/patches/unapplied/server/Improve-and-expand-AsyncCatcher.patch similarity index 100% rename from patches/server/Improve-and-expand-AsyncCatcher.patch rename to patches/unapplied/server/Improve-and-expand-AsyncCatcher.patch diff --git a/patches/server/Improve-boat-collision-performance.patch b/patches/unapplied/server/Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/Improve-boat-collision-performance.patch rename to patches/unapplied/server/Improve-boat-collision-performance.patch diff --git a/patches/server/Improve-death-events.patch b/patches/unapplied/server/Improve-death-events.patch similarity index 100% rename from patches/server/Improve-death-events.patch rename to patches/unapplied/server/Improve-death-events.patch diff --git a/patches/server/Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/unapplied/server/Improve-fix-EntityTargetLivingEntityEvent.patch similarity index 100% rename from patches/server/Improve-fix-EntityTargetLivingEntityEvent.patch rename to patches/unapplied/server/Improve-fix-EntityTargetLivingEntityEvent.patch diff --git a/patches/server/Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/unapplied/server/Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/server/Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/unapplied/server/Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/server/Improve-logging-and-errors.patch b/patches/unapplied/server/Improve-logging-and-errors.patch similarity index 100% rename from patches/server/Improve-logging-and-errors.patch rename to patches/unapplied/server/Improve-logging-and-errors.patch diff --git a/patches/server/Improve-scoreboard-entries.patch b/patches/unapplied/server/Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/Improve-scoreboard-entries.patch rename to patches/unapplied/server/Improve-scoreboard-entries.patch diff --git a/patches/server/Improve-the-Saddle-API-for-Horses.patch b/patches/unapplied/server/Improve-the-Saddle-API-for-Horses.patch similarity index 100% rename from patches/server/Improve-the-Saddle-API-for-Horses.patch rename to patches/unapplied/server/Improve-the-Saddle-API-for-Horses.patch diff --git a/patches/server/Improved-Async-Task-Scheduler.patch b/patches/unapplied/server/Improved-Async-Task-Scheduler.patch similarity index 100% rename from patches/server/Improved-Async-Task-Scheduler.patch rename to patches/unapplied/server/Improved-Async-Task-Scheduler.patch diff --git a/patches/server/Improved-Watchdog-Support.patch b/patches/unapplied/server/Improved-Watchdog-Support.patch similarity index 100% rename from patches/server/Improved-Watchdog-Support.patch rename to patches/unapplied/server/Improved-Watchdog-Support.patch diff --git a/patches/server/Increase-Light-Queue-Size.patch b/patches/unapplied/server/Increase-Light-Queue-Size.patch similarity index 100% rename from patches/server/Increase-Light-Queue-Size.patch rename to patches/unapplied/server/Increase-Light-Queue-Size.patch diff --git a/patches/server/Inline-shift-direction-fields.patch b/patches/unapplied/server/Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/Inline-shift-direction-fields.patch rename to patches/unapplied/server/Inline-shift-direction-fields.patch diff --git a/patches/server/Introduce-beacon-activation-deactivation-events.patch b/patches/unapplied/server/Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/Introduce-beacon-activation-deactivation-events.patch rename to patches/unapplied/server/Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/Inventory-close.patch b/patches/unapplied/server/Inventory-close.patch similarity index 100% rename from patches/server/Inventory-close.patch rename to patches/unapplied/server/Inventory-close.patch diff --git a/patches/server/Inventory-getHolder-method-without-block-snapshot.patch b/patches/unapplied/server/Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/server/Inventory-getHolder-method-without-block-snapshot.patch rename to patches/unapplied/server/Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/server/Inventory-removeItemAnySlot.patch b/patches/unapplied/server/Inventory-removeItemAnySlot.patch similarity index 100% rename from patches/server/Inventory-removeItemAnySlot.patch rename to patches/unapplied/server/Inventory-removeItemAnySlot.patch diff --git a/patches/server/InventoryCloseEvent-Reason-API.patch b/patches/unapplied/server/InventoryCloseEvent-Reason-API.patch similarity index 100% rename from patches/server/InventoryCloseEvent-Reason-API.patch rename to patches/unapplied/server/InventoryCloseEvent-Reason-API.patch diff --git a/patches/server/Item-Rarity-API.patch b/patches/unapplied/server/Item-Rarity-API.patch similarity index 100% rename from patches/server/Item-Rarity-API.patch rename to patches/unapplied/server/Item-Rarity-API.patch diff --git a/patches/server/Item-canEntityPickup.patch b/patches/unapplied/server/Item-canEntityPickup.patch similarity index 100% rename from patches/server/Item-canEntityPickup.patch rename to patches/unapplied/server/Item-canEntityPickup.patch diff --git a/patches/server/Item-no-age-no-player-pickup.patch b/patches/unapplied/server/Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/server/Item-no-age-no-player-pickup.patch rename to patches/unapplied/server/Item-no-age-no-player-pickup.patch diff --git a/patches/server/ItemStack-damage-API.patch b/patches/unapplied/server/ItemStack-damage-API.patch similarity index 100% rename from patches/server/ItemStack-damage-API.patch rename to patches/unapplied/server/ItemStack-damage-API.patch diff --git a/patches/server/ItemStack-getMaxItemUseDuration.patch b/patches/unapplied/server/ItemStack-getMaxItemUseDuration.patch similarity index 100% rename from patches/server/ItemStack-getMaxItemUseDuration.patch rename to patches/unapplied/server/ItemStack-getMaxItemUseDuration.patch diff --git a/patches/server/ItemStack-repair-check-API.patch b/patches/unapplied/server/ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/ItemStack-repair-check-API.patch rename to patches/unapplied/server/ItemStack-repair-check-API.patch diff --git a/patches/server/Kick-on-main-for-illegal-chat.patch b/patches/unapplied/server/Kick-on-main-for-illegal-chat.patch similarity index 100% rename from patches/server/Kick-on-main-for-illegal-chat.patch rename to patches/unapplied/server/Kick-on-main-for-illegal-chat.patch diff --git a/patches/server/Lag-compensate-eating.patch b/patches/unapplied/server/Lag-compensate-eating.patch similarity index 100% rename from patches/server/Lag-compensate-eating.patch rename to patches/unapplied/server/Lag-compensate-eating.patch diff --git a/patches/server/Lazily-track-plugin-scoreboards-by-default.patch b/patches/unapplied/server/Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/server/Lazily-track-plugin-scoreboards-by-default.patch rename to patches/unapplied/server/Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/server/Left-handed-API.patch b/patches/unapplied/server/Left-handed-API.patch similarity index 100% rename from patches/server/Left-handed-API.patch rename to patches/unapplied/server/Left-handed-API.patch diff --git a/patches/server/Limit-Client-Sign-length-more.patch b/patches/unapplied/server/Limit-Client-Sign-length-more.patch similarity index 100% rename from patches/server/Limit-Client-Sign-length-more.patch rename to patches/unapplied/server/Limit-Client-Sign-length-more.patch diff --git a/patches/server/Limit-item-frame-cursors-on-maps.patch b/patches/unapplied/server/Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/Limit-item-frame-cursors-on-maps.patch rename to patches/unapplied/server/Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/Limit-pet-look-distance.patch b/patches/unapplied/server/Limit-pet-look-distance.patch similarity index 100% rename from patches/server/Limit-pet-look-distance.patch rename to patches/unapplied/server/Limit-pet-look-distance.patch diff --git a/patches/server/Limit-recipe-packets.patch b/patches/unapplied/server/Limit-recipe-packets.patch similarity index 100% rename from patches/server/Limit-recipe-packets.patch rename to patches/unapplied/server/Limit-recipe-packets.patch diff --git a/patches/server/Line-Of-Sight-Changes.patch b/patches/unapplied/server/Line-Of-Sight-Changes.patch similarity index 100% rename from patches/server/Line-Of-Sight-Changes.patch rename to patches/unapplied/server/Line-Of-Sight-Changes.patch diff --git a/patches/server/LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/unapplied/server/LivingEntity-Hand-Raised-Item-Use-API.patch similarity index 100% rename from patches/server/LivingEntity-Hand-Raised-Item-Use-API.patch rename to patches/unapplied/server/LivingEntity-Hand-Raised-Item-Use-API.patch diff --git a/patches/server/LivingEntity-setKiller.patch b/patches/unapplied/server/LivingEntity-setKiller.patch similarity index 100% rename from patches/server/LivingEntity-setKiller.patch rename to patches/unapplied/server/LivingEntity-setKiller.patch diff --git a/patches/server/Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/unapplied/server/Load-effect-amplifiers-greater-than-127-correctly.patch similarity index 100% rename from patches/server/Load-effect-amplifiers-greater-than-127-correctly.patch rename to patches/unapplied/server/Load-effect-amplifiers-greater-than-127-correctly.patch diff --git a/patches/server/LootTable-API-Replenishable-Lootables-Feature.patch b/patches/unapplied/server/LootTable-API-Replenishable-Lootables-Feature.patch similarity index 100% rename from patches/server/LootTable-API-Replenishable-Lootables-Feature.patch rename to patches/unapplied/server/LootTable-API-Replenishable-Lootables-Feature.patch diff --git a/patches/server/MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/unapplied/server/MC-145656-Fix-Follow-Range-Initial-Target.patch similarity index 100% rename from patches/server/MC-145656-Fix-Follow-Range-Initial-Target.patch rename to patches/unapplied/server/MC-145656-Fix-Follow-Range-Initial-Target.patch diff --git a/patches/server/MC-4-Fix-item-position-desync.patch b/patches/unapplied/server/MC-4-Fix-item-position-desync.patch similarity index 100% rename from patches/server/MC-4-Fix-item-position-desync.patch rename to patches/unapplied/server/MC-4-Fix-item-position-desync.patch diff --git a/patches/server/MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/unapplied/server/MC-50319-Check-other-worlds-for-shooter-of-projectil.patch similarity index 100% rename from patches/server/MC-50319-Check-other-worlds-for-shooter-of-projectil.patch rename to patches/unapplied/server/MC-50319-Check-other-worlds-for-shooter-of-projectil.patch diff --git a/patches/server/Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/unapplied/server/Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch similarity index 100% rename from patches/server/Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch rename to patches/unapplied/server/Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch diff --git a/patches/server/Make-EntityUnleashEvent-cancellable.patch b/patches/unapplied/server/Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/Make-EntityUnleashEvent-cancellable.patch rename to patches/unapplied/server/Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/Make-hoppers-respect-inventory-max-stack-size.patch b/patches/unapplied/server/Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/unapplied/server/Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/Make-item-validations-configurable.patch b/patches/unapplied/server/Make-item-validations-configurable.patch similarity index 100% rename from patches/server/Make-item-validations-configurable.patch rename to patches/unapplied/server/Make-item-validations-configurable.patch diff --git a/patches/server/Make-legacy-ping-handler-more-reliable.patch b/patches/unapplied/server/Make-legacy-ping-handler-more-reliable.patch similarity index 100% rename from patches/server/Make-legacy-ping-handler-more-reliable.patch rename to patches/unapplied/server/Make-legacy-ping-handler-more-reliable.patch diff --git a/patches/server/Make-schedule-command-per-world.patch b/patches/unapplied/server/Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/Make-schedule-command-per-world.patch rename to patches/unapplied/server/Make-schedule-command-per-world.patch diff --git a/patches/server/Make-shield-blocking-delay-configurable.patch b/patches/unapplied/server/Make-shield-blocking-delay-configurable.patch similarity index 100% rename from patches/server/Make-shield-blocking-delay-configurable.patch rename to patches/unapplied/server/Make-shield-blocking-delay-configurable.patch diff --git a/patches/server/Make-some-itemstacks-nonnull.patch b/patches/unapplied/server/Make-some-itemstacks-nonnull.patch similarity index 100% rename from patches/server/Make-some-itemstacks-nonnull.patch rename to patches/unapplied/server/Make-some-itemstacks-nonnull.patch diff --git a/patches/server/Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/unapplied/server/Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/unapplied/server/Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/Make-the-GUI-graph-fancier.patch b/patches/unapplied/server/Make-the-GUI-graph-fancier.patch similarity index 100% rename from patches/server/Make-the-GUI-graph-fancier.patch rename to patches/unapplied/server/Make-the-GUI-graph-fancier.patch diff --git a/patches/server/Make-the-default-permission-message-configurable.patch b/patches/unapplied/server/Make-the-default-permission-message-configurable.patch similarity index 100% rename from patches/server/Make-the-default-permission-message-configurable.patch rename to patches/unapplied/server/Make-the-default-permission-message-configurable.patch diff --git a/patches/server/Make-water-animal-spawn-height-configurable.patch b/patches/unapplied/server/Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/Make-water-animal-spawn-height-configurable.patch rename to patches/unapplied/server/Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/Manually-inline-methods-in-BlockPosition.patch b/patches/unapplied/server/Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/Manually-inline-methods-in-BlockPosition.patch rename to patches/unapplied/server/Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/Maps-shouldn-t-load-chunks.patch b/patches/unapplied/server/Maps-shouldn-t-load-chunks.patch similarity index 100% rename from patches/server/Maps-shouldn-t-load-chunks.patch rename to patches/unapplied/server/Maps-shouldn-t-load-chunks.patch diff --git a/patches/server/Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/unapplied/server/Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/unapplied/server/Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/Missing-Entity-Behavior-API.patch b/patches/unapplied/server/Missing-Entity-Behavior-API.patch similarity index 100% rename from patches/server/Missing-Entity-Behavior-API.patch rename to patches/unapplied/server/Missing-Entity-Behavior-API.patch diff --git a/patches/server/Missing-eating-regain-reason.patch b/patches/unapplied/server/Missing-eating-regain-reason.patch similarity index 100% rename from patches/server/Missing-eating-regain-reason.patch rename to patches/unapplied/server/Missing-eating-regain-reason.patch diff --git a/patches/server/Missing-effect-cause.patch b/patches/unapplied/server/Missing-effect-cause.patch similarity index 100% rename from patches/server/Missing-effect-cause.patch rename to patches/unapplied/server/Missing-effect-cause.patch diff --git a/patches/server/Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/unapplied/server/Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/server/Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/unapplied/server/Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/server/Mob-Pathfinding-API.patch b/patches/unapplied/server/Mob-Pathfinding-API.patch similarity index 100% rename from patches/server/Mob-Pathfinding-API.patch rename to patches/unapplied/server/Mob-Pathfinding-API.patch diff --git a/patches/server/Mob-Spawner-API-Enhancements.patch b/patches/unapplied/server/Mob-Spawner-API-Enhancements.patch similarity index 100% rename from patches/server/Mob-Spawner-API-Enhancements.patch rename to patches/unapplied/server/Mob-Spawner-API-Enhancements.patch diff --git a/patches/server/More-CommandBlock-API.patch b/patches/unapplied/server/More-CommandBlock-API.patch similarity index 100% rename from patches/server/More-CommandBlock-API.patch rename to patches/unapplied/server/More-CommandBlock-API.patch diff --git a/patches/server/More-Enchantment-API.patch b/patches/unapplied/server/More-Enchantment-API.patch similarity index 100% rename from patches/server/More-Enchantment-API.patch rename to patches/unapplied/server/More-Enchantment-API.patch diff --git a/patches/server/More-Lidded-Block-API.patch b/patches/unapplied/server/More-Lidded-Block-API.patch similarity index 100% rename from patches/server/More-Lidded-Block-API.patch rename to patches/unapplied/server/More-Lidded-Block-API.patch diff --git a/patches/server/More-PotionEffectType-API.patch b/patches/unapplied/server/More-PotionEffectType-API.patch similarity index 100% rename from patches/server/More-PotionEffectType-API.patch rename to patches/unapplied/server/More-PotionEffectType-API.patch diff --git a/patches/server/More-Projectile-API.patch b/patches/unapplied/server/More-Projectile-API.patch similarity index 100% rename from patches/server/More-Projectile-API.patch rename to patches/unapplied/server/More-Projectile-API.patch diff --git a/patches/server/More-Teleport-API.patch b/patches/unapplied/server/More-Teleport-API.patch similarity index 100% rename from patches/server/More-Teleport-API.patch rename to patches/unapplied/server/More-Teleport-API.patch diff --git a/patches/server/More-World-API.patch b/patches/unapplied/server/More-World-API.patch similarity index 100% rename from patches/server/More-World-API.patch rename to patches/unapplied/server/More-World-API.patch diff --git a/patches/server/More-accurate-isInOpenWater-impl.patch b/patches/unapplied/server/More-accurate-isInOpenWater-impl.patch similarity index 100% rename from patches/server/More-accurate-isInOpenWater-impl.patch rename to patches/unapplied/server/More-accurate-isInOpenWater-impl.patch diff --git a/patches/server/More-lightning-API.patch b/patches/unapplied/server/More-lightning-API.patch similarity index 100% rename from patches/server/More-lightning-API.patch rename to patches/unapplied/server/More-lightning-API.patch diff --git a/patches/server/More-vanilla-friendly-methods-to-update-trades.patch b/patches/unapplied/server/More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/server/More-vanilla-friendly-methods-to-update-trades.patch rename to patches/unapplied/server/More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/server/Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/unapplied/server/Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 100% rename from patches/server/Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to patches/unapplied/server/Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch diff --git a/patches/server/Move-range-check-for-block-placing-up.patch b/patches/unapplied/server/Move-range-check-for-block-placing-up.patch similarity index 100% rename from patches/server/Move-range-check-for-block-placing-up.patch rename to patches/unapplied/server/Move-range-check-for-block-placing-up.patch diff --git a/patches/server/Multi-Block-Change-API-Implementation.patch b/patches/unapplied/server/Multi-Block-Change-API-Implementation.patch similarity index 100% rename from patches/server/Multi-Block-Change-API-Implementation.patch rename to patches/unapplied/server/Multi-Block-Change-API-Implementation.patch diff --git a/patches/server/Multiple-Entries-with-Scoreboards.patch b/patches/unapplied/server/Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/Multiple-Entries-with-Scoreboards.patch rename to patches/unapplied/server/Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/unapplied/server/Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/unapplied/server/Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/Nameable-Banner-API.patch b/patches/unapplied/server/Nameable-Banner-API.patch similarity index 100% rename from patches/server/Nameable-Banner-API.patch rename to patches/unapplied/server/Nameable-Banner-API.patch diff --git a/patches/server/Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/unapplied/server/Ocelot-despawns-should-honor-nametags-and-leash.patch similarity index 100% rename from patches/server/Ocelot-despawns-should-honor-nametags-and-leash.patch rename to patches/unapplied/server/Ocelot-despawns-should-honor-nametags-and-leash.patch diff --git a/patches/server/Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/unapplied/server/Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch similarity index 100% rename from patches/server/Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch rename to patches/unapplied/server/Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch diff --git a/patches/server/Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/unapplied/server/Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch similarity index 100% rename from patches/server/Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch rename to patches/unapplied/server/Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch diff --git a/patches/server/Only-refresh-abilities-if-needed.patch b/patches/unapplied/server/Only-refresh-abilities-if-needed.patch similarity index 100% rename from patches/server/Only-refresh-abilities-if-needed.patch rename to patches/unapplied/server/Only-refresh-abilities-if-needed.patch diff --git a/patches/server/Only-send-global-sounds-to-same-world-if-limiting-ra.patch b/patches/unapplied/server/Only-send-global-sounds-to-same-world-if-limiting-ra.patch similarity index 100% rename from patches/server/Only-send-global-sounds-to-same-world-if-limiting-ra.patch rename to patches/unapplied/server/Only-send-global-sounds-to-same-world-if-limiting-ra.patch diff --git a/patches/server/Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/unapplied/server/Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/unapplied/server/Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/Oprimise-map-impl-for-tracked-players.patch b/patches/unapplied/server/Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/server/Oprimise-map-impl-for-tracked-players.patch rename to patches/unapplied/server/Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/server/Optimise-BlockSoil-nearby-water-lookup.patch b/patches/unapplied/server/Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/unapplied/server/Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/Optimise-BlockState-s-hashCode-equals.patch b/patches/unapplied/server/Optimise-BlockState-s-hashCode-equals.patch similarity index 100% rename from patches/server/Optimise-BlockState-s-hashCode-equals.patch rename to patches/unapplied/server/Optimise-BlockState-s-hashCode-equals.patch diff --git a/patches/server/Optimise-Chunk-getFluid.patch b/patches/unapplied/server/Optimise-Chunk-getFluid.patch similarity index 100% rename from patches/server/Optimise-Chunk-getFluid.patch rename to patches/unapplied/server/Optimise-Chunk-getFluid.patch diff --git a/patches/server/Optimise-EntityGetter-getPlayerByUUID.patch b/patches/unapplied/server/Optimise-EntityGetter-getPlayerByUUID.patch similarity index 100% rename from patches/server/Optimise-EntityGetter-getPlayerByUUID.patch rename to patches/unapplied/server/Optimise-EntityGetter-getPlayerByUUID.patch diff --git a/patches/server/Optimise-chunk-tick-iteration.patch b/patches/unapplied/server/Optimise-chunk-tick-iteration.patch similarity index 100% rename from patches/server/Optimise-chunk-tick-iteration.patch rename to patches/unapplied/server/Optimise-chunk-tick-iteration.patch diff --git a/patches/server/Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/unapplied/server/Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 100% rename from patches/server/Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/unapplied/server/Optimise-collision-checking-in-player-move-packet-ha.patch diff --git a/patches/server/Optimise-general-POI-access.patch b/patches/unapplied/server/Optimise-general-POI-access.patch similarity index 100% rename from patches/server/Optimise-general-POI-access.patch rename to patches/unapplied/server/Optimise-general-POI-access.patch diff --git a/patches/server/Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/unapplied/server/Optimise-getChunkAt-calls-for-loaded-chunks.patch similarity index 100% rename from patches/server/Optimise-getChunkAt-calls-for-loaded-chunks.patch rename to patches/unapplied/server/Optimise-getChunkAt-calls-for-loaded-chunks.patch diff --git a/patches/server/Optimise-getType-calls.patch b/patches/unapplied/server/Optimise-getType-calls.patch similarity index 100% rename from patches/server/Optimise-getType-calls.patch rename to patches/unapplied/server/Optimise-getType-calls.patch diff --git a/patches/server/Optimise-nearby-player-lookups.patch b/patches/unapplied/server/Optimise-nearby-player-lookups.patch similarity index 100% rename from patches/server/Optimise-nearby-player-lookups.patch rename to patches/unapplied/server/Optimise-nearby-player-lookups.patch diff --git a/patches/server/Optimise-non-flush-packet-sending.patch b/patches/unapplied/server/Optimise-non-flush-packet-sending.patch similarity index 100% rename from patches/server/Optimise-non-flush-packet-sending.patch rename to patches/unapplied/server/Optimise-non-flush-packet-sending.patch diff --git a/patches/server/Optimise-random-block-ticking.patch b/patches/unapplied/server/Optimise-random-block-ticking.patch similarity index 100% rename from patches/server/Optimise-random-block-ticking.patch rename to patches/unapplied/server/Optimise-random-block-ticking.patch diff --git a/patches/server/Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/unapplied/server/Optimise-recalcBlockCounts-for-empty-sections.patch similarity index 100% rename from patches/server/Optimise-recalcBlockCounts-for-empty-sections.patch rename to patches/unapplied/server/Optimise-recalcBlockCounts-for-empty-sections.patch diff --git a/patches/server/Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/unapplied/server/Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/unapplied/server/Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/Optimize-Bit-Operations-by-inlining.patch b/patches/unapplied/server/Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/Optimize-Bit-Operations-by-inlining.patch rename to patches/unapplied/server/Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/Optimize-BlockPosition-helper-methods.patch b/patches/unapplied/server/Optimize-BlockPosition-helper-methods.patch similarity index 100% rename from patches/server/Optimize-BlockPosition-helper-methods.patch rename to patches/unapplied/server/Optimize-BlockPosition-helper-methods.patch diff --git a/patches/server/Optimize-Captured-TileEntity-Lookup.patch b/patches/unapplied/server/Optimize-Captured-TileEntity-Lookup.patch similarity index 100% rename from patches/server/Optimize-Captured-TileEntity-Lookup.patch rename to patches/unapplied/server/Optimize-Captured-TileEntity-Lookup.patch diff --git a/patches/server/Optimize-Collision-to-not-load-chunks.patch b/patches/unapplied/server/Optimize-Collision-to-not-load-chunks.patch similarity index 100% rename from patches/server/Optimize-Collision-to-not-load-chunks.patch rename to patches/unapplied/server/Optimize-Collision-to-not-load-chunks.patch diff --git a/patches/server/Optimize-CraftBlockData-Creation.patch b/patches/unapplied/server/Optimize-CraftBlockData-Creation.patch similarity index 100% rename from patches/server/Optimize-CraftBlockData-Creation.patch rename to patches/unapplied/server/Optimize-CraftBlockData-Creation.patch diff --git a/patches/server/Optimize-DataBits.patch b/patches/unapplied/server/Optimize-DataBits.patch similarity index 100% rename from patches/server/Optimize-DataBits.patch rename to patches/unapplied/server/Optimize-DataBits.patch diff --git a/patches/server/Optimize-Dynamic-get-Missing-Keys.patch b/patches/unapplied/server/Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/Optimize-Dynamic-get-Missing-Keys.patch rename to patches/unapplied/server/Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/unapplied/server/Optimize-GoalSelector-Goal.Flag-Set-operations.patch similarity index 100% rename from patches/server/Optimize-GoalSelector-Goal.Flag-Set-operations.patch rename to patches/unapplied/server/Optimize-GoalSelector-Goal.Flag-Set-operations.patch diff --git a/patches/server/Optimize-HashMapPalette.patch b/patches/unapplied/server/Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/Optimize-HashMapPalette.patch rename to patches/unapplied/server/Optimize-HashMapPalette.patch diff --git a/patches/server/Optimize-Hoppers.patch b/patches/unapplied/server/Optimize-Hoppers.patch similarity index 100% rename from patches/server/Optimize-Hoppers.patch rename to patches/unapplied/server/Optimize-Hoppers.patch diff --git a/patches/server/Optimize-ItemStack.isEmpty.patch b/patches/unapplied/server/Optimize-ItemStack.isEmpty.patch similarity index 100% rename from patches/server/Optimize-ItemStack.isEmpty.patch rename to patches/unapplied/server/Optimize-ItemStack.isEmpty.patch diff --git a/patches/server/Optimize-MappedRegistry.patch b/patches/unapplied/server/Optimize-MappedRegistry.patch similarity index 100% rename from patches/server/Optimize-MappedRegistry.patch rename to patches/unapplied/server/Optimize-MappedRegistry.patch diff --git a/patches/server/Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/unapplied/server/Optimize-Network-Manager-and-add-advanced-packet-sup.patch similarity index 100% rename from patches/server/Optimize-Network-Manager-and-add-advanced-packet-sup.patch rename to patches/unapplied/server/Optimize-Network-Manager-and-add-advanced-packet-sup.patch diff --git a/patches/server/Optimize-NetworkManager-Exception-Handling.patch b/patches/unapplied/server/Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/Optimize-NetworkManager-Exception-Handling.patch rename to patches/unapplied/server/Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/unapplied/server/Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/unapplied/server/Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/Optimize-Pathfinding.patch b/patches/unapplied/server/Optimize-Pathfinding.patch similarity index 100% rename from patches/server/Optimize-Pathfinding.patch rename to patches/unapplied/server/Optimize-Pathfinding.patch diff --git a/patches/server/Optimize-Voxel-Shape-Merging.patch b/patches/unapplied/server/Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/Optimize-Voxel-Shape-Merging.patch rename to patches/unapplied/server/Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/Optimize-World-Time-Updates.patch b/patches/unapplied/server/Optimize-World-Time-Updates.patch similarity index 100% rename from patches/server/Optimize-World-Time-Updates.patch rename to patches/unapplied/server/Optimize-World-Time-Updates.patch diff --git a/patches/server/Optimize-World.isLoaded-BlockPosition-Z.patch b/patches/unapplied/server/Optimize-World.isLoaded-BlockPosition-Z.patch similarity index 100% rename from patches/server/Optimize-World.isLoaded-BlockPosition-Z.patch rename to patches/unapplied/server/Optimize-World.isLoaded-BlockPosition-Z.patch diff --git a/patches/server/Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/unapplied/server/Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch similarity index 100% rename from patches/server/Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch rename to patches/unapplied/server/Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch diff --git a/patches/server/Optimize-brigadier-child-sorting-performance.patch b/patches/unapplied/server/Optimize-brigadier-child-sorting-performance.patch similarity index 100% rename from patches/server/Optimize-brigadier-child-sorting-performance.patch rename to patches/unapplied/server/Optimize-brigadier-child-sorting-performance.patch diff --git a/patches/server/Optimize-call-to-getFluid-for-explosions.patch b/patches/unapplied/server/Optimize-call-to-getFluid-for-explosions.patch similarity index 100% rename from patches/server/Optimize-call-to-getFluid-for-explosions.patch rename to patches/unapplied/server/Optimize-call-to-getFluid-for-explosions.patch diff --git a/patches/server/Optimize-entity-tracker-passenger-checks.patch b/patches/unapplied/server/Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/Optimize-entity-tracker-passenger-checks.patch rename to patches/unapplied/server/Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/Optimize-explosions.patch b/patches/unapplied/server/Optimize-explosions.patch similarity index 100% rename from patches/server/Optimize-explosions.patch rename to patches/unapplied/server/Optimize-explosions.patch diff --git a/patches/server/Optimize-indirect-passenger-iteration.patch b/patches/unapplied/server/Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/server/Optimize-indirect-passenger-iteration.patch rename to patches/unapplied/server/Optimize-indirect-passenger-iteration.patch diff --git a/patches/server/Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/unapplied/server/Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch similarity index 100% rename from patches/server/Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch rename to patches/unapplied/server/Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch diff --git a/patches/server/Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/unapplied/server/Option-for-maximum-exp-value-when-merging-orbs.patch similarity index 100% rename from patches/server/Option-for-maximum-exp-value-when-merging-orbs.patch rename to patches/unapplied/server/Option-for-maximum-exp-value-when-merging-orbs.patch diff --git a/patches/server/Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/unapplied/server/Option-to-have-default-CustomSpawners-in-custom-worl.patch similarity index 100% rename from patches/server/Option-to-have-default-CustomSpawners-in-custom-worl.patch rename to patches/unapplied/server/Option-to-have-default-CustomSpawners-in-custom-worl.patch diff --git a/patches/server/Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/unapplied/server/Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/unapplied/server/Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/unapplied/server/Option-to-prevent-armor-stands-from-doing-entity-loo.patch similarity index 100% rename from patches/server/Option-to-prevent-armor-stands-from-doing-entity-loo.patch rename to patches/unapplied/server/Option-to-prevent-armor-stands-from-doing-entity-loo.patch diff --git a/patches/server/Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/unapplied/server/Option-to-use-vanilla-per-world-scoreboard-coloring-.patch similarity index 100% rename from patches/server/Option-to-use-vanilla-per-world-scoreboard-coloring-.patch rename to patches/unapplied/server/Option-to-use-vanilla-per-world-scoreboard-coloring-.patch diff --git a/patches/server/Optional-TNT-doesn-t-move-in-water.patch b/patches/unapplied/server/Optional-TNT-doesn-t-move-in-water.patch similarity index 100% rename from patches/server/Optional-TNT-doesn-t-move-in-water.patch rename to patches/unapplied/server/Optional-TNT-doesn-t-move-in-water.patch diff --git a/patches/server/Paper-Metrics.patch b/patches/unapplied/server/Paper-Metrics.patch similarity index 100% rename from patches/server/Paper-Metrics.patch rename to patches/unapplied/server/Paper-Metrics.patch diff --git a/patches/server/Paper-Plugins.patch b/patches/unapplied/server/Paper-Plugins.patch similarity index 100% rename from patches/server/Paper-Plugins.patch rename to patches/unapplied/server/Paper-Plugins.patch diff --git a/patches/server/Paper-command.patch b/patches/unapplied/server/Paper-command.patch similarity index 100% rename from patches/server/Paper-command.patch rename to patches/unapplied/server/Paper-command.patch diff --git a/patches/server/Paper-dumpitem-command.patch b/patches/unapplied/server/Paper-dumpitem-command.patch similarity index 100% rename from patches/server/Paper-dumpitem-command.patch rename to patches/unapplied/server/Paper-dumpitem-command.patch diff --git a/patches/server/Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/unapplied/server/Pass-ServerLevel-for-gamerule-callbacks.patch similarity index 100% rename from patches/server/Pass-ServerLevel-for-gamerule-callbacks.patch rename to patches/unapplied/server/Pass-ServerLevel-for-gamerule-callbacks.patch diff --git a/patches/server/Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/unapplied/server/Pillager-patrol-spawn-settings-and-per-player-option.patch similarity index 100% rename from patches/server/Pillager-patrol-spawn-settings-and-per-player-option.patch rename to patches/unapplied/server/Pillager-patrol-spawn-settings-and-per-player-option.patch diff --git a/patches/server/Player-Chunk-Load-Unload-Events.patch b/patches/unapplied/server/Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/server/Player-Chunk-Load-Unload-Events.patch rename to patches/unapplied/server/Player-Chunk-Load-Unload-Events.patch diff --git a/patches/server/Player-Entity-Tracking-Events.patch b/patches/unapplied/server/Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/server/Player-Entity-Tracking-Events.patch rename to patches/unapplied/server/Player-Entity-Tracking-Events.patch diff --git a/patches/server/Player-Tab-List-and-Title-APIs.patch b/patches/unapplied/server/Player-Tab-List-and-Title-APIs.patch similarity index 100% rename from patches/server/Player-Tab-List-and-Title-APIs.patch rename to patches/unapplied/server/Player-Tab-List-and-Title-APIs.patch diff --git a/patches/server/Player-affects-spawning-API.patch b/patches/unapplied/server/Player-affects-spawning-API.patch similarity index 100% rename from patches/server/Player-affects-spawning-API.patch rename to patches/unapplied/server/Player-affects-spawning-API.patch diff --git a/patches/server/Player-elytra-boost-API.patch b/patches/unapplied/server/Player-elytra-boost-API.patch similarity index 100% rename from patches/server/Player-elytra-boost-API.patch rename to patches/unapplied/server/Player-elytra-boost-API.patch diff --git a/patches/server/Player.setPlayerProfile-API.patch b/patches/unapplied/server/Player.setPlayerProfile-API.patch similarity index 100% rename from patches/server/Player.setPlayerProfile-API.patch rename to patches/unapplied/server/Player.setPlayerProfile-API.patch diff --git a/patches/server/PlayerAdvancementCriterionGrantEvent.patch b/patches/unapplied/server/PlayerAdvancementCriterionGrantEvent.patch similarity index 100% rename from patches/server/PlayerAdvancementCriterionGrantEvent.patch rename to patches/unapplied/server/PlayerAdvancementCriterionGrantEvent.patch diff --git a/patches/server/PlayerAttemptPickupItemEvent.patch b/patches/unapplied/server/PlayerAttemptPickupItemEvent.patch similarity index 100% rename from patches/server/PlayerAttemptPickupItemEvent.patch rename to patches/unapplied/server/PlayerAttemptPickupItemEvent.patch diff --git a/patches/server/PlayerDeathEvent-getItemsToKeep.patch b/patches/unapplied/server/PlayerDeathEvent-getItemsToKeep.patch similarity index 100% rename from patches/server/PlayerDeathEvent-getItemsToKeep.patch rename to patches/unapplied/server/PlayerDeathEvent-getItemsToKeep.patch diff --git a/patches/server/PlayerDeathEvent-shouldDropExperience.patch b/patches/unapplied/server/PlayerDeathEvent-shouldDropExperience.patch similarity index 100% rename from patches/server/PlayerDeathEvent-shouldDropExperience.patch rename to patches/unapplied/server/PlayerDeathEvent-shouldDropExperience.patch diff --git a/patches/server/PlayerElytraBoostEvent.patch b/patches/unapplied/server/PlayerElytraBoostEvent.patch similarity index 100% rename from patches/server/PlayerElytraBoostEvent.patch rename to patches/unapplied/server/PlayerElytraBoostEvent.patch diff --git a/patches/server/PlayerLaunchProjectileEvent.patch b/patches/unapplied/server/PlayerLaunchProjectileEvent.patch similarity index 100% rename from patches/server/PlayerLaunchProjectileEvent.patch rename to patches/unapplied/server/PlayerLaunchProjectileEvent.patch diff --git a/patches/server/PlayerNaturallySpawnCreaturesEvent.patch b/patches/unapplied/server/PlayerNaturallySpawnCreaturesEvent.patch similarity index 100% rename from patches/server/PlayerNaturallySpawnCreaturesEvent.patch rename to patches/unapplied/server/PlayerNaturallySpawnCreaturesEvent.patch diff --git a/patches/server/PlayerPickupExperienceEvent.patch b/patches/unapplied/server/PlayerPickupExperienceEvent.patch similarity index 100% rename from patches/server/PlayerPickupExperienceEvent.patch rename to patches/unapplied/server/PlayerPickupExperienceEvent.patch diff --git a/patches/server/PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/unapplied/server/PlayerPickupItemEvent-setFlyAtPlayer.patch similarity index 100% rename from patches/server/PlayerPickupItemEvent-setFlyAtPlayer.patch rename to patches/unapplied/server/PlayerPickupItemEvent-setFlyAtPlayer.patch diff --git a/patches/server/PlayerReadyArrowEvent.patch b/patches/unapplied/server/PlayerReadyArrowEvent.patch similarity index 100% rename from patches/server/PlayerReadyArrowEvent.patch rename to patches/unapplied/server/PlayerReadyArrowEvent.patch diff --git a/patches/server/PlayerTeleportEndGatewayEvent.patch b/patches/unapplied/server/PlayerTeleportEndGatewayEvent.patch similarity index 100% rename from patches/server/PlayerTeleportEndGatewayEvent.patch rename to patches/unapplied/server/PlayerTeleportEndGatewayEvent.patch diff --git a/patches/server/PortalCreateEvent-needs-to-know-its-entity.patch b/patches/unapplied/server/PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from patches/server/PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/unapplied/server/PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/patches/server/Potential-bed-API.patch b/patches/unapplied/server/Potential-bed-API.patch similarity index 100% rename from patches/server/Potential-bed-API.patch rename to patches/unapplied/server/Potential-bed-API.patch diff --git a/patches/server/PreCreatureSpawnEvent.patch b/patches/unapplied/server/PreCreatureSpawnEvent.patch similarity index 100% rename from patches/server/PreCreatureSpawnEvent.patch rename to patches/unapplied/server/PreCreatureSpawnEvent.patch diff --git a/patches/server/PreSpawnerSpawnEvent.patch b/patches/unapplied/server/PreSpawnerSpawnEvent.patch similarity index 100% rename from patches/server/PreSpawnerSpawnEvent.patch rename to patches/unapplied/server/PreSpawnerSpawnEvent.patch diff --git a/patches/server/Preserve-overstacked-loot.patch b/patches/unapplied/server/Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/Preserve-overstacked-loot.patch rename to patches/unapplied/server/Preserve-overstacked-loot.patch diff --git a/patches/server/Prevent-AFK-kick-while-watching-end-credits.patch b/patches/unapplied/server/Prevent-AFK-kick-while-watching-end-credits.patch similarity index 100% rename from patches/server/Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/unapplied/server/Prevent-AFK-kick-while-watching-end-credits.patch diff --git a/patches/server/Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/unapplied/server/Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/unapplied/server/Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/unapplied/server/Prevent-Double-PlayerChunkMap-adds-crashing-server.patch similarity index 100% rename from patches/server/Prevent-Double-PlayerChunkMap-adds-crashing-server.patch rename to patches/unapplied/server/Prevent-Double-PlayerChunkMap-adds-crashing-server.patch diff --git a/patches/server/Prevent-Enderman-from-loading-chunks.patch b/patches/unapplied/server/Prevent-Enderman-from-loading-chunks.patch similarity index 100% rename from patches/server/Prevent-Enderman-from-loading-chunks.patch rename to patches/unapplied/server/Prevent-Enderman-from-loading-chunks.patch diff --git a/patches/server/Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/unapplied/server/Prevent-Frosted-Ice-from-loading-holding-chunks.patch similarity index 100% rename from patches/server/Prevent-Frosted-Ice-from-loading-holding-chunks.patch rename to patches/unapplied/server/Prevent-Frosted-Ice-from-loading-holding-chunks.patch diff --git a/patches/server/Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/unapplied/server/Prevent-GameEvents-being-fired-from-unloaded-chunks.patch similarity index 100% rename from patches/server/Prevent-GameEvents-being-fired-from-unloaded-chunks.patch rename to patches/unapplied/server/Prevent-GameEvents-being-fired-from-unloaded-chunks.patch diff --git a/patches/server/Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/unapplied/server/Prevent-Mob-AI-Rules-from-Loading-Chunks.patch similarity index 100% rename from patches/server/Prevent-Mob-AI-Rules-from-Loading-Chunks.patch rename to patches/unapplied/server/Prevent-Mob-AI-Rules-from-Loading-Chunks.patch diff --git a/patches/server/Prevent-Pathfinding-out-of-World-Border.patch b/patches/unapplied/server/Prevent-Pathfinding-out-of-World-Border.patch similarity index 100% rename from patches/server/Prevent-Pathfinding-out-of-World-Border.patch rename to patches/unapplied/server/Prevent-Pathfinding-out-of-World-Border.patch diff --git a/patches/server/Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/unapplied/server/Prevent-bees-loading-chunks-checking-hive-position.patch similarity index 100% rename from patches/server/Prevent-bees-loading-chunks-checking-hive-position.patch rename to patches/unapplied/server/Prevent-bees-loading-chunks-checking-hive-position.patch diff --git a/patches/server/Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/unapplied/server/Prevent-causing-expired-keys-from-impacting-new-join.patch similarity index 100% rename from patches/server/Prevent-causing-expired-keys-from-impacting-new-join.patch rename to patches/unapplied/server/Prevent-causing-expired-keys-from-impacting-new-join.patch diff --git a/patches/server/Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/unapplied/server/Prevent-chunk-loading-from-Fluid-Flowing.patch similarity index 100% rename from patches/server/Prevent-chunk-loading-from-Fluid-Flowing.patch rename to patches/unapplied/server/Prevent-chunk-loading-from-Fluid-Flowing.patch diff --git a/patches/server/Prevent-compass-from-loading-chunks.patch b/patches/unapplied/server/Prevent-compass-from-loading-chunks.patch similarity index 100% rename from patches/server/Prevent-compass-from-loading-chunks.patch rename to patches/unapplied/server/Prevent-compass-from-loading-chunks.patch diff --git a/patches/server/Prevent-consuming-the-wrong-itemstack.patch b/patches/unapplied/server/Prevent-consuming-the-wrong-itemstack.patch similarity index 100% rename from patches/server/Prevent-consuming-the-wrong-itemstack.patch rename to patches/unapplied/server/Prevent-consuming-the-wrong-itemstack.patch diff --git a/patches/server/Prevent-empty-items-from-being-added-to-world.patch b/patches/unapplied/server/Prevent-empty-items-from-being-added-to-world.patch similarity index 100% rename from patches/server/Prevent-empty-items-from-being-added-to-world.patch rename to patches/unapplied/server/Prevent-empty-items-from-being-added-to-world.patch diff --git a/patches/server/Prevent-entity-loading-causing-async-lookups.patch b/patches/unapplied/server/Prevent-entity-loading-causing-async-lookups.patch similarity index 100% rename from patches/server/Prevent-entity-loading-causing-async-lookups.patch rename to patches/unapplied/server/Prevent-entity-loading-causing-async-lookups.patch diff --git a/patches/server/Prevent-excessive-velocity-through-repeated-crits.patch b/patches/unapplied/server/Prevent-excessive-velocity-through-repeated-crits.patch similarity index 100% rename from patches/server/Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/unapplied/server/Prevent-excessive-velocity-through-repeated-crits.patch diff --git a/patches/server/Prevent-grindstones-from-overstacking-items.patch b/patches/unapplied/server/Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/Prevent-grindstones-from-overstacking-items.patch rename to patches/unapplied/server/Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/Prevent-headless-pistons-from-being-created.patch b/patches/unapplied/server/Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/Prevent-headless-pistons-from-being-created.patch rename to patches/unapplied/server/Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/Prevent-logins-from-being-processed-when-the-player-.patch b/patches/unapplied/server/Prevent-logins-from-being-processed-when-the-player-.patch similarity index 100% rename from patches/server/Prevent-logins-from-being-processed-when-the-player-.patch rename to patches/unapplied/server/Prevent-logins-from-being-processed-when-the-player-.patch diff --git a/patches/server/Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/unapplied/server/Prevent-mob-spawning-from-loading-generating-chunks.patch similarity index 100% rename from patches/server/Prevent-mob-spawning-from-loading-generating-chunks.patch rename to patches/unapplied/server/Prevent-mob-spawning-from-loading-generating-chunks.patch diff --git a/patches/server/Prevent-opening-inventories-when-frozen.patch b/patches/unapplied/server/Prevent-opening-inventories-when-frozen.patch similarity index 100% rename from patches/server/Prevent-opening-inventories-when-frozen.patch rename to patches/unapplied/server/Prevent-opening-inventories-when-frozen.patch diff --git a/patches/server/Prevent-position-desync-in-playerconnection-causing-.patch b/patches/unapplied/server/Prevent-position-desync-in-playerconnection-causing-.patch similarity index 100% rename from patches/server/Prevent-position-desync-in-playerconnection-causing-.patch rename to patches/unapplied/server/Prevent-position-desync-in-playerconnection-causing-.patch diff --git a/patches/server/Prevent-rayTrace-from-loading-chunks.patch b/patches/unapplied/server/Prevent-rayTrace-from-loading-chunks.patch similarity index 100% rename from patches/server/Prevent-rayTrace-from-loading-chunks.patch rename to patches/unapplied/server/Prevent-rayTrace-from-loading-chunks.patch diff --git a/patches/server/Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/unapplied/server/Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 100% rename from patches/server/Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/unapplied/server/Prevent-sending-oversized-item-data-in-equipment-and.patch diff --git a/patches/server/Prevent-softlocked-end-exit-portal-generation.patch b/patches/unapplied/server/Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/Prevent-softlocked-end-exit-portal-generation.patch rename to patches/unapplied/server/Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/unapplied/server/Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch similarity index 100% rename from patches/server/Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch rename to patches/unapplied/server/Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch diff --git a/patches/server/Prevent-teleporting-dead-entities.patch b/patches/unapplied/server/Prevent-teleporting-dead-entities.patch similarity index 100% rename from patches/server/Prevent-teleporting-dead-entities.patch rename to patches/unapplied/server/Prevent-teleporting-dead-entities.patch diff --git a/patches/server/Prevent-tile-entity-and-entity-crashes.patch b/patches/unapplied/server/Prevent-tile-entity-and-entity-crashes.patch similarity index 100% rename from patches/server/Prevent-tile-entity-and-entity-crashes.patch rename to patches/unapplied/server/Prevent-tile-entity-and-entity-crashes.patch diff --git a/patches/server/Prevent-tile-entity-copies-loading-chunks.patch b/patches/unapplied/server/Prevent-tile-entity-copies-loading-chunks.patch similarity index 100% rename from patches/server/Prevent-tile-entity-copies-loading-chunks.patch rename to patches/unapplied/server/Prevent-tile-entity-copies-loading-chunks.patch diff --git a/patches/server/Print-Error-details-when-failing-to-save-player-data.patch b/patches/unapplied/server/Print-Error-details-when-failing-to-save-player-data.patch similarity index 100% rename from patches/server/Print-Error-details-when-failing-to-save-player-data.patch rename to patches/unapplied/server/Print-Error-details-when-failing-to-save-player-data.patch diff --git a/patches/server/Profile-Lookup-Events.patch b/patches/unapplied/server/Profile-Lookup-Events.patch similarity index 100% rename from patches/server/Profile-Lookup-Events.patch rename to patches/unapplied/server/Profile-Lookup-Events.patch diff --git a/patches/server/ProfileWhitelistVerifyEvent.patch b/patches/unapplied/server/ProfileWhitelistVerifyEvent.patch similarity index 100% rename from patches/server/ProfileWhitelistVerifyEvent.patch rename to patches/unapplied/server/ProfileWhitelistVerifyEvent.patch diff --git a/patches/server/Properly-fix-item-duplication-bug.patch b/patches/unapplied/server/Properly-fix-item-duplication-bug.patch similarity index 100% rename from patches/server/Properly-fix-item-duplication-bug.patch rename to patches/unapplied/server/Properly-fix-item-duplication-bug.patch diff --git a/patches/server/Properly-handle-async-calls-to-restart-the-server.patch b/patches/unapplied/server/Properly-handle-async-calls-to-restart-the-server.patch similarity index 100% rename from patches/server/Properly-handle-async-calls-to-restart-the-server.patch rename to patches/unapplied/server/Properly-handle-async-calls-to-restart-the-server.patch diff --git a/patches/server/Properly-resend-entities.patch b/patches/unapplied/server/Properly-resend-entities.patch similarity index 100% rename from patches/server/Properly-resend-entities.patch rename to patches/unapplied/server/Properly-resend-entities.patch diff --git a/patches/server/Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/unapplied/server/Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 100% rename from patches/server/Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to patches/unapplied/server/Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch diff --git a/patches/server/Provide-E-TE-Chunk-count-stat-methods.patch b/patches/unapplied/server/Provide-E-TE-Chunk-count-stat-methods.patch similarity index 100% rename from patches/server/Provide-E-TE-Chunk-count-stat-methods.patch rename to patches/unapplied/server/Provide-E-TE-Chunk-count-stat-methods.patch diff --git a/patches/server/Put-world-into-worldlist-before-initing-the-world.patch b/patches/unapplied/server/Put-world-into-worldlist-before-initing-the-world.patch similarity index 100% rename from patches/server/Put-world-into-worldlist-before-initing-the-world.patch rename to patches/unapplied/server/Put-world-into-worldlist-before-initing-the-world.patch diff --git a/patches/server/RangedEntity-API.patch b/patches/unapplied/server/RangedEntity-API.patch similarity index 100% rename from patches/server/RangedEntity-API.patch rename to patches/unapplied/server/RangedEntity-API.patch diff --git a/patches/server/Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/unapplied/server/Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/unapplied/server/Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/Reduce-Either-Optional-allocation.patch b/patches/unapplied/server/Reduce-Either-Optional-allocation.patch similarity index 100% rename from patches/server/Reduce-Either-Optional-allocation.patch rename to patches/unapplied/server/Reduce-Either-Optional-allocation.patch diff --git a/patches/server/Reduce-MutableInt-allocations-from-light-engine.patch b/patches/unapplied/server/Reduce-MutableInt-allocations-from-light-engine.patch similarity index 100% rename from patches/server/Reduce-MutableInt-allocations-from-light-engine.patch rename to patches/unapplied/server/Reduce-MutableInt-allocations-from-light-engine.patch diff --git a/patches/server/Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/unapplied/server/Reduce-allocation-of-Vec3D-by-entity-tracker.patch similarity index 100% rename from patches/server/Reduce-allocation-of-Vec3D-by-entity-tracker.patch rename to patches/unapplied/server/Reduce-allocation-of-Vec3D-by-entity-tracker.patch diff --git a/patches/server/Reduce-blockpos-allocation-from-pathfinding.patch b/patches/unapplied/server/Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from patches/server/Reduce-blockpos-allocation-from-pathfinding.patch rename to patches/unapplied/server/Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/patches/server/Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/unapplied/server/Reduce-memory-footprint-of-NBTTagCompound.patch similarity index 100% rename from patches/server/Reduce-memory-footprint-of-NBTTagCompound.patch rename to patches/unapplied/server/Reduce-memory-footprint-of-NBTTagCompound.patch diff --git a/patches/server/Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/unapplied/server/Reduce-worldgen-thread-worker-count-for-low-core-cou.patch similarity index 100% rename from patches/server/Reduce-worldgen-thread-worker-count-for-low-core-cou.patch rename to patches/unapplied/server/Reduce-worldgen-thread-worker-count-for-low-core-cou.patch diff --git a/patches/server/Refresh-ProjectileSource-for-projectiles.patch b/patches/unapplied/server/Refresh-ProjectileSource-for-projectiles.patch similarity index 100% rename from patches/server/Refresh-ProjectileSource-for-projectiles.patch rename to patches/unapplied/server/Refresh-ProjectileSource-for-projectiles.patch diff --git a/patches/server/Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/unapplied/server/Refresh-player-inventory-when-cancelling-PlayerInter.patch similarity index 100% rename from patches/server/Refresh-player-inventory-when-cancelling-PlayerInter.patch rename to patches/unapplied/server/Refresh-player-inventory-when-cancelling-PlayerInter.patch diff --git a/patches/server/Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/unapplied/server/Remote-Connections-shouldn-t-hold-up-shutdown.patch similarity index 100% rename from patches/server/Remote-Connections-shouldn-t-hold-up-shutdown.patch rename to patches/unapplied/server/Remote-Connections-shouldn-t-hold-up-shutdown.patch diff --git a/patches/server/Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/unapplied/server/Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 100% rename from patches/server/Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/unapplied/server/Remove-CraftItemStack-setAmount-null-assignment.patch diff --git a/patches/server/Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/unapplied/server/Remove-CraftScheduler-Async-Task-Debugger.patch similarity index 100% rename from patches/server/Remove-CraftScheduler-Async-Task-Debugger.patch rename to patches/unapplied/server/Remove-CraftScheduler-Async-Task-Debugger.patch diff --git a/patches/server/Remove-Metadata-on-reload.patch b/patches/unapplied/server/Remove-Metadata-on-reload.patch similarity index 100% rename from patches/server/Remove-Metadata-on-reload.patch rename to patches/unapplied/server/Remove-Metadata-on-reload.patch diff --git a/patches/server/Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/unapplied/server/Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/unapplied/server/Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/Remove-client-side-code-using-deprecated-for-removal.patch b/patches/unapplied/server/Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/unapplied/server/Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/Remove-garbage-Java-version-check.patch b/patches/unapplied/server/Remove-garbage-Java-version-check.patch similarity index 100% rename from patches/server/Remove-garbage-Java-version-check.patch rename to patches/unapplied/server/Remove-garbage-Java-version-check.patch diff --git a/patches/server/Remove-invalid-signature-login-stacktrace.patch b/patches/unapplied/server/Remove-invalid-signature-login-stacktrace.patch similarity index 100% rename from patches/server/Remove-invalid-signature-login-stacktrace.patch rename to patches/unapplied/server/Remove-invalid-signature-login-stacktrace.patch diff --git a/patches/server/Remove-some-streams-from-structures.patch b/patches/unapplied/server/Remove-some-streams-from-structures.patch similarity index 100% rename from patches/server/Remove-some-streams-from-structures.patch rename to patches/unapplied/server/Remove-some-streams-from-structures.patch diff --git a/patches/server/Remove-stale-POIs.patch b/patches/unapplied/server/Remove-stale-POIs.patch similarity index 100% rename from patches/server/Remove-stale-POIs.patch rename to patches/unapplied/server/Remove-stale-POIs.patch diff --git a/patches/server/Remove-streams-for-villager-AI.patch b/patches/unapplied/server/Remove-streams-for-villager-AI.patch similarity index 100% rename from patches/server/Remove-streams-for-villager-AI.patch rename to patches/unapplied/server/Remove-streams-for-villager-AI.patch diff --git a/patches/server/Remove-streams-from-SensorNearest.patch b/patches/unapplied/server/Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/Remove-streams-from-SensorNearest.patch rename to patches/unapplied/server/Remove-streams-from-SensorNearest.patch diff --git a/patches/server/Remove-streams-from-classes-related-villager-gossip.patch b/patches/unapplied/server/Remove-streams-from-classes-related-villager-gossip.patch similarity index 100% rename from patches/server/Remove-streams-from-classes-related-villager-gossip.patch rename to patches/unapplied/server/Remove-streams-from-classes-related-villager-gossip.patch diff --git a/patches/server/Remove-unnecessary-itemmeta-handling.patch b/patches/unapplied/server/Remove-unnecessary-itemmeta-handling.patch similarity index 100% rename from patches/server/Remove-unnecessary-itemmeta-handling.patch rename to patches/unapplied/server/Remove-unnecessary-itemmeta-handling.patch diff --git a/patches/server/Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/unapplied/server/Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 100% rename from patches/server/Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/unapplied/server/Remove-unnecessary-onTrackingStart-during-navigation.patch diff --git a/patches/server/Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/unapplied/server/Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/unapplied/server/Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/Reset-placed-block-on-exception.patch b/patches/unapplied/server/Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/Reset-placed-block-on-exception.patch rename to patches/unapplied/server/Reset-placed-block-on-exception.patch diff --git a/patches/server/Reset-players-airTicks-on-respawn.patch b/patches/unapplied/server/Reset-players-airTicks-on-respawn.patch similarity index 100% rename from patches/server/Reset-players-airTicks-on-respawn.patch rename to patches/unapplied/server/Reset-players-airTicks-on-respawn.patch diff --git a/patches/server/Reset-shield-blocking-on-dimension-change.patch b/patches/unapplied/server/Reset-shield-blocking-on-dimension-change.patch similarity index 100% rename from patches/server/Reset-shield-blocking-on-dimension-change.patch rename to patches/unapplied/server/Reset-shield-blocking-on-dimension-change.patch diff --git a/patches/server/Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/unapplied/server/Reset-spawner-timer-when-spawner-event-is-cancelled.patch similarity index 100% rename from patches/server/Reset-spawner-timer-when-spawner-event-is-cancelled.patch rename to patches/unapplied/server/Reset-spawner-timer-when-spawner-event-is-cancelled.patch diff --git a/patches/server/Restore-custom-InventoryHolder-support.patch b/patches/unapplied/server/Restore-custom-InventoryHolder-support.patch similarity index 100% rename from patches/server/Restore-custom-InventoryHolder-support.patch rename to patches/unapplied/server/Restore-custom-InventoryHolder-support.patch diff --git a/patches/server/Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/unapplied/server/Restore-vanilla-default-mob-spawn-range-and-water-an.patch similarity index 100% rename from patches/server/Restore-vanilla-default-mob-spawn-range-and-water-an.patch rename to patches/unapplied/server/Restore-vanilla-default-mob-spawn-range-and-water-an.patch diff --git a/patches/server/Retain-block-place-order-when-capturing-blockstates.patch b/patches/unapplied/server/Retain-block-place-order-when-capturing-blockstates.patch similarity index 100% rename from patches/server/Retain-block-place-order-when-capturing-blockstates.patch rename to patches/unapplied/server/Retain-block-place-order-when-capturing-blockstates.patch diff --git a/patches/server/Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/unapplied/server/Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/unapplied/server/Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/unapplied/server/Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/unapplied/server/Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/Rewrite-chunk-system.patch b/patches/unapplied/server/Rewrite-chunk-system.patch similarity index 100% rename from patches/server/Rewrite-chunk-system.patch rename to patches/unapplied/server/Rewrite-chunk-system.patch diff --git a/patches/server/Rewrite-dataconverter-system.patch b/patches/unapplied/server/Rewrite-dataconverter-system.patch similarity index 100% rename from patches/server/Rewrite-dataconverter-system.patch rename to patches/unapplied/server/Rewrite-dataconverter-system.patch diff --git a/patches/server/Sanitise-RegionFileCache-and-make-configurable.patch b/patches/unapplied/server/Sanitise-RegionFileCache-and-make-configurable.patch similarity index 100% rename from patches/server/Sanitise-RegionFileCache-and-make-configurable.patch rename to patches/unapplied/server/Sanitise-RegionFileCache-and-make-configurable.patch diff --git a/patches/server/Sanitize-ResourceLocation-error-logging.patch b/patches/unapplied/server/Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/Sanitize-ResourceLocation-error-logging.patch rename to patches/unapplied/server/Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/Sanitize-Sent-BlockEntity-NBT.patch b/patches/unapplied/server/Sanitize-Sent-BlockEntity-NBT.patch similarity index 100% rename from patches/server/Sanitize-Sent-BlockEntity-NBT.patch rename to patches/unapplied/server/Sanitize-Sent-BlockEntity-NBT.patch diff --git a/patches/server/Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/unapplied/server/Send-attack-SoundEffects-only-to-players-who-can-see.patch similarity index 100% rename from patches/server/Send-attack-SoundEffects-only-to-players-who-can-see.patch rename to patches/unapplied/server/Send-attack-SoundEffects-only-to-players-who-can-see.patch diff --git a/patches/server/Send-block-entities-after-destroy-prediction.patch b/patches/unapplied/server/Send-block-entities-after-destroy-prediction.patch similarity index 100% rename from patches/server/Send-block-entities-after-destroy-prediction.patch rename to patches/unapplied/server/Send-block-entities-after-destroy-prediction.patch diff --git a/patches/server/Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/unapplied/server/Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/unapplied/server/Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/unapplied/server/Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/unapplied/server/Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/Server-Tick-Events.patch b/patches/unapplied/server/Server-Tick-Events.patch similarity index 100% rename from patches/server/Server-Tick-Events.patch rename to patches/unapplied/server/Server-Tick-Events.patch diff --git a/patches/server/Set-area-affect-cloud-rotation.patch b/patches/unapplied/server/Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/Set-area-affect-cloud-rotation.patch rename to patches/unapplied/server/Set-area-affect-cloud-rotation.patch diff --git a/patches/server/Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/unapplied/server/Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 100% rename from patches/server/Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to patches/unapplied/server/Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch diff --git a/patches/server/Set-position-before-player-sending-on-dimension-chan.patch b/patches/unapplied/server/Set-position-before-player-sending-on-dimension-chan.patch similarity index 100% rename from patches/server/Set-position-before-player-sending-on-dimension-chan.patch rename to patches/unapplied/server/Set-position-before-player-sending-on-dimension-chan.patch diff --git a/patches/server/Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/unapplied/server/Set-spigots-verbose-world-setting-to-false-by-def.patch similarity index 100% rename from patches/server/Set-spigots-verbose-world-setting-to-false-by-def.patch rename to patches/unapplied/server/Set-spigots-verbose-world-setting-to-false-by-def.patch diff --git a/patches/server/Shoulder-Entities-Release-API.patch b/patches/unapplied/server/Shoulder-Entities-Release-API.patch similarity index 100% rename from patches/server/Shoulder-Entities-Release-API.patch rename to patches/unapplied/server/Shoulder-Entities-Release-API.patch diff --git a/patches/server/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/unapplied/server/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch similarity index 100% rename from patches/server/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch rename to patches/unapplied/server/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch diff --git a/patches/server/Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/unapplied/server/Show-blockstate-location-if-we-failed-to-read-it.patch similarity index 100% rename from patches/server/Show-blockstate-location-if-we-failed-to-read-it.patch rename to patches/unapplied/server/Show-blockstate-location-if-we-failed-to-read-it.patch diff --git a/patches/server/Significantly-improve-performance-of-the-end-generat.patch b/patches/unapplied/server/Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/Significantly-improve-performance-of-the-end-generat.patch rename to patches/unapplied/server/Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/SkeletonHorse-Additions.patch b/patches/unapplied/server/SkeletonHorse-Additions.patch similarity index 100% rename from patches/server/SkeletonHorse-Additions.patch rename to patches/unapplied/server/SkeletonHorse-Additions.patch diff --git a/patches/server/Slime-Pathfinder-Events.patch b/patches/unapplied/server/Slime-Pathfinder-Events.patch similarity index 100% rename from patches/server/Slime-Pathfinder-Events.patch rename to patches/unapplied/server/Slime-Pathfinder-Events.patch diff --git a/patches/server/Spawn-player-in-correct-world-on-login.patch b/patches/unapplied/server/Spawn-player-in-correct-world-on-login.patch similarity index 100% rename from patches/server/Spawn-player-in-correct-world-on-login.patch rename to patches/unapplied/server/Spawn-player-in-correct-world-on-login.patch diff --git a/patches/server/Starlight.patch b/patches/unapplied/server/Starlight.patch similarity index 100% rename from patches/server/Starlight.patch rename to patches/unapplied/server/Starlight.patch diff --git a/patches/server/Stinger-API.patch b/patches/unapplied/server/Stinger-API.patch similarity index 100% rename from patches/server/Stinger-API.patch rename to patches/unapplied/server/Stinger-API.patch diff --git a/patches/server/Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/unapplied/server/Stop-copy-on-write-operations-for-updating-light-dat.patch similarity index 100% rename from patches/server/Stop-copy-on-write-operations-for-updating-light-dat.patch rename to patches/unapplied/server/Stop-copy-on-write-operations-for-updating-light-dat.patch diff --git a/patches/server/Stop-large-look-changes-from-crashing-the-server.patch b/patches/unapplied/server/Stop-large-look-changes-from-crashing-the-server.patch similarity index 100% rename from patches/server/Stop-large-look-changes-from-crashing-the-server.patch rename to patches/unapplied/server/Stop-large-look-changes-from-crashing-the-server.patch diff --git a/patches/server/String-based-Action-Bar-API.patch b/patches/unapplied/server/String-based-Action-Bar-API.patch similarity index 100% rename from patches/server/String-based-Action-Bar-API.patch rename to patches/unapplied/server/String-based-Action-Bar-API.patch diff --git a/patches/server/Support-components-in-ItemMeta.patch b/patches/unapplied/server/Support-components-in-ItemMeta.patch similarity index 100% rename from patches/server/Support-components-in-ItemMeta.patch rename to patches/unapplied/server/Support-components-in-ItemMeta.patch diff --git a/patches/server/Support-old-UUID-format-for-NBT.patch b/patches/unapplied/server/Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/server/Support-old-UUID-format-for-NBT.patch rename to patches/unapplied/server/Support-old-UUID-format-for-NBT.patch diff --git a/patches/server/Sync-offhand-slot-in-menus.patch b/patches/unapplied/server/Sync-offhand-slot-in-menus.patch similarity index 100% rename from patches/server/Sync-offhand-slot-in-menus.patch rename to patches/unapplied/server/Sync-offhand-slot-in-menus.patch diff --git a/patches/server/Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/unapplied/server/Synchronize-PalettedContainer-instead-of-ThreadingDe.patch similarity index 100% rename from patches/server/Synchronize-PalettedContainer-instead-of-ThreadingDe.patch rename to patches/unapplied/server/Synchronize-PalettedContainer-instead-of-ThreadingDe.patch diff --git a/patches/server/System-property-for-disabling-watchdoge.patch b/patches/unapplied/server/System-property-for-disabling-watchdoge.patch similarity index 100% rename from patches/server/System-property-for-disabling-watchdoge.patch rename to patches/unapplied/server/System-property-for-disabling-watchdoge.patch diff --git a/patches/server/TODO-Registry-Modification-API.patch b/patches/unapplied/server/TODO-Registry-Modification-API.patch similarity index 100% rename from patches/server/TODO-Registry-Modification-API.patch rename to patches/unapplied/server/TODO-Registry-Modification-API.patch diff --git a/patches/server/Tameable-getOwnerUniqueId-API.patch b/patches/unapplied/server/Tameable-getOwnerUniqueId-API.patch similarity index 100% rename from patches/server/Tameable-getOwnerUniqueId-API.patch rename to patches/unapplied/server/Tameable-getOwnerUniqueId-API.patch diff --git a/patches/server/Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/unapplied/server/Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/unapplied/server/Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/Throw-exception-on-world-create-while-being-ticked.patch b/patches/unapplied/server/Throw-exception-on-world-create-while-being-ticked.patch similarity index 100% rename from patches/server/Throw-exception-on-world-create-while-being-ticked.patch rename to patches/unapplied/server/Throw-exception-on-world-create-while-being-ticked.patch diff --git a/patches/server/Throw-proper-exception-on-empty-JsonList-file.patch b/patches/unapplied/server/Throw-proper-exception-on-empty-JsonList-file.patch similarity index 100% rename from patches/server/Throw-proper-exception-on-empty-JsonList-file.patch rename to patches/unapplied/server/Throw-proper-exception-on-empty-JsonList-file.patch diff --git a/patches/server/Time-scoreboard-search.patch b/patches/unapplied/server/Time-scoreboard-search.patch similarity index 100% rename from patches/server/Time-scoreboard-search.patch rename to patches/unapplied/server/Time-scoreboard-search.patch diff --git a/patches/server/Timings-v2.patch b/patches/unapplied/server/Timings-v2.patch similarity index 100% rename from patches/server/Timings-v2.patch rename to patches/unapplied/server/Timings-v2.patch diff --git a/patches/server/Toggle-for-removing-existing-dragon.patch b/patches/unapplied/server/Toggle-for-removing-existing-dragon.patch similarity index 100% rename from patches/server/Toggle-for-removing-existing-dragon.patch rename to patches/unapplied/server/Toggle-for-removing-existing-dragon.patch diff --git a/patches/server/Toggleable-player-crits-helps-mitigate-hacked-client.patch b/patches/unapplied/server/Toggleable-player-crits-helps-mitigate-hacked-client.patch similarity index 100% rename from patches/server/Toggleable-player-crits-helps-mitigate-hacked-client.patch rename to patches/unapplied/server/Toggleable-player-crits-helps-mitigate-hacked-client.patch diff --git a/patches/server/Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/unapplied/server/Track-projectile-source-for-fireworks-from-dispenser.patch similarity index 100% rename from patches/server/Track-projectile-source-for-fireworks-from-dispenser.patch rename to patches/unapplied/server/Track-projectile-source-for-fireworks-from-dispenser.patch diff --git a/patches/server/Tracking-Range-Improvements.patch b/patches/unapplied/server/Tracking-Range-Improvements.patch similarity index 100% rename from patches/server/Tracking-Range-Improvements.patch rename to patches/unapplied/server/Tracking-Range-Improvements.patch diff --git a/patches/server/Treat-sequence-violations-like-they-should-be.patch b/patches/unapplied/server/Treat-sequence-violations-like-they-should-be.patch similarity index 100% rename from patches/server/Treat-sequence-violations-like-they-should-be.patch rename to patches/unapplied/server/Treat-sequence-violations-like-they-should-be.patch diff --git a/patches/server/Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/unapplied/server/Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch similarity index 100% rename from patches/server/Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch rename to patches/unapplied/server/Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch diff --git a/patches/server/Turtle-API.patch b/patches/unapplied/server/Turtle-API.patch similarity index 100% rename from patches/server/Turtle-API.patch rename to patches/unapplied/server/Turtle-API.patch diff --git a/patches/server/Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/unapplied/server/Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch similarity index 100% rename from patches/server/Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch rename to patches/unapplied/server/Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch diff --git a/patches/server/Update-head-rotation-in-missing-places.patch b/patches/unapplied/server/Update-head-rotation-in-missing-places.patch similarity index 100% rename from patches/server/Update-head-rotation-in-missing-places.patch rename to patches/unapplied/server/Update-head-rotation-in-missing-places.patch diff --git a/patches/server/Update-itemstack-legacy-name-and-lore.patch b/patches/unapplied/server/Update-itemstack-legacy-name-and-lore.patch similarity index 100% rename from patches/server/Update-itemstack-legacy-name-and-lore.patch rename to patches/unapplied/server/Update-itemstack-legacy-name-and-lore.patch diff --git a/patches/server/Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/unapplied/server/Update-the-flag-when-a-captured-block-state-is-outda.patch similarity index 100% rename from patches/server/Update-the-flag-when-a-captured-block-state-is-outda.patch rename to patches/unapplied/server/Update-the-flag-when-a-captured-block-state-is-outda.patch diff --git a/patches/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/unapplied/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch similarity index 100% rename from patches/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch rename to patches/unapplied/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch diff --git a/patches/server/Use-ConcurrentHashMap-in-JsonList.patch b/patches/unapplied/server/Use-ConcurrentHashMap-in-JsonList.patch similarity index 100% rename from patches/server/Use-ConcurrentHashMap-in-JsonList.patch rename to patches/unapplied/server/Use-ConcurrentHashMap-in-JsonList.patch diff --git a/patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/unapplied/server/Use-TerminalConsoleAppender-for-console-improvements.patch similarity index 100% rename from patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch rename to patches/unapplied/server/Use-TerminalConsoleAppender-for-console-improvements.patch diff --git a/patches/server/Use-UserCache-for-player-heads.patch b/patches/unapplied/server/Use-UserCache-for-player-heads.patch similarity index 100% rename from patches/server/Use-UserCache-for-player-heads.patch rename to patches/unapplied/server/Use-UserCache-for-player-heads.patch diff --git a/patches/server/Use-Vanilla-Minecart-Speeds.patch b/patches/unapplied/server/Use-Vanilla-Minecart-Speeds.patch similarity index 100% rename from patches/server/Use-Vanilla-Minecart-Speeds.patch rename to patches/unapplied/server/Use-Vanilla-Minecart-Speeds.patch diff --git a/patches/server/Use-Velocity-compression-and-cipher-natives.patch b/patches/unapplied/server/Use-Velocity-compression-and-cipher-natives.patch similarity index 100% rename from patches/server/Use-Velocity-compression-and-cipher-natives.patch rename to patches/unapplied/server/Use-Velocity-compression-and-cipher-natives.patch diff --git a/patches/server/Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/unapplied/server/Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/unapplied/server/Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/Use-a-Queue-for-Queueing-Commands.patch b/patches/unapplied/server/Use-a-Queue-for-Queueing-Commands.patch similarity index 100% rename from patches/server/Use-a-Queue-for-Queueing-Commands.patch rename to patches/unapplied/server/Use-a-Queue-for-Queueing-Commands.patch diff --git a/patches/server/Use-a-Shared-Random-for-Entities.patch b/patches/unapplied/server/Use-a-Shared-Random-for-Entities.patch similarity index 100% rename from patches/server/Use-a-Shared-Random-for-Entities.patch rename to patches/unapplied/server/Use-a-Shared-Random-for-Entities.patch diff --git a/patches/server/Use-array-for-gamerule-storage.patch b/patches/unapplied/server/Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/Use-array-for-gamerule-storage.patch rename to patches/unapplied/server/Use-array-for-gamerule-storage.patch diff --git a/patches/server/Use-distance-map-to-optimise-entity-tracker.patch b/patches/unapplied/server/Use-distance-map-to-optimise-entity-tracker.patch similarity index 100% rename from patches/server/Use-distance-map-to-optimise-entity-tracker.patch rename to patches/unapplied/server/Use-distance-map-to-optimise-entity-tracker.patch diff --git a/patches/server/Use-getChunkIfLoadedImmediately-in-places.patch b/patches/unapplied/server/Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/server/Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/unapplied/server/Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/server/Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/unapplied/server/Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch similarity index 100% rename from patches/server/Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch rename to patches/unapplied/server/Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch diff --git a/patches/server/Use-single-player-info-update-packet-on-join.patch b/patches/unapplied/server/Use-single-player-info-update-packet-on-join.patch similarity index 100% rename from patches/server/Use-single-player-info-update-packet-on-join.patch rename to patches/unapplied/server/Use-single-player-info-update-packet-on-join.patch diff --git a/patches/server/Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/unapplied/server/Use-thread-safe-random-in-ServerLoginPacketListenerI.patch similarity index 100% rename from patches/server/Use-thread-safe-random-in-ServerLoginPacketListenerI.patch rename to patches/unapplied/server/Use-thread-safe-random-in-ServerLoginPacketListenerI.patch diff --git a/patches/server/Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/unapplied/server/Use-username-instead-of-display-name-in-PlayerList-g.patch similarity index 100% rename from patches/server/Use-username-instead-of-display-name-in-PlayerList-g.patch rename to patches/unapplied/server/Use-username-instead-of-display-name-in-PlayerList-g.patch diff --git a/patches/server/Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/unapplied/server/Validate-PickItem-Packet-and-kick-for-invalid.patch similarity index 100% rename from patches/server/Validate-PickItem-Packet-and-kick-for-invalid.patch rename to patches/unapplied/server/Validate-PickItem-Packet-and-kick-for-invalid.patch diff --git a/patches/server/Validate-tripwire-hook-placement-before-update.patch b/patches/unapplied/server/Validate-tripwire-hook-placement-before-update.patch similarity index 100% rename from patches/server/Validate-tripwire-hook-placement-before-update.patch rename to patches/unapplied/server/Validate-tripwire-hook-placement-before-update.patch diff --git a/patches/server/Validate-usernames.patch b/patches/unapplied/server/Validate-usernames.patch similarity index 100% rename from patches/server/Validate-usernames.patch rename to patches/unapplied/server/Validate-usernames.patch diff --git a/patches/server/Vanilla-command-permission-fixes.patch b/patches/unapplied/server/Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/Vanilla-command-permission-fixes.patch rename to patches/unapplied/server/Vanilla-command-permission-fixes.patch diff --git a/patches/server/VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/unapplied/server/VanillaCommandWrapper-didnt-account-for-entity-sende.patch similarity index 100% rename from patches/server/VanillaCommandWrapper-didnt-account-for-entity-sende.patch rename to patches/unapplied/server/VanillaCommandWrapper-didnt-account-for-entity-sende.patch diff --git a/patches/server/Vanished-players-don-t-have-rights.patch b/patches/unapplied/server/Vanished-players-don-t-have-rights.patch similarity index 100% rename from patches/server/Vanished-players-don-t-have-rights.patch rename to patches/unapplied/server/Vanished-players-don-t-have-rights.patch diff --git a/patches/server/Vex-get-setSummoner-API.patch b/patches/unapplied/server/Vex-get-setSummoner-API.patch similarity index 100% rename from patches/server/Vex-get-setSummoner-API.patch rename to patches/unapplied/server/Vex-get-setSummoner-API.patch diff --git a/patches/server/Villager-Restocks-API.patch b/patches/unapplied/server/Villager-Restocks-API.patch similarity index 100% rename from patches/server/Villager-Restocks-API.patch rename to patches/unapplied/server/Villager-Restocks-API.patch diff --git a/patches/server/Villager-resetOffers.patch b/patches/unapplied/server/Villager-resetOffers.patch similarity index 100% rename from patches/server/Villager-resetOffers.patch rename to patches/unapplied/server/Villager-resetOffers.patch diff --git a/patches/server/Wait-for-Async-Tasks-during-shutdown.patch b/patches/unapplied/server/Wait-for-Async-Tasks-during-shutdown.patch similarity index 100% rename from patches/server/Wait-for-Async-Tasks-during-shutdown.patch rename to patches/unapplied/server/Wait-for-Async-Tasks-during-shutdown.patch diff --git a/patches/server/Warn-on-plugins-accessing-faraway-chunks.patch b/patches/unapplied/server/Warn-on-plugins-accessing-faraway-chunks.patch similarity index 100% rename from patches/server/Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/unapplied/server/Warn-on-plugins-accessing-faraway-chunks.patch diff --git a/patches/server/Win-Screen-API.patch b/patches/unapplied/server/Win-Screen-API.patch similarity index 100% rename from patches/server/Win-Screen-API.patch rename to patches/unapplied/server/Win-Screen-API.patch diff --git a/patches/server/WitchConsumePotionEvent.patch b/patches/unapplied/server/WitchConsumePotionEvent.patch similarity index 100% rename from patches/server/WitchConsumePotionEvent.patch rename to patches/unapplied/server/WitchConsumePotionEvent.patch diff --git a/patches/server/WitchReadyPotionEvent.patch b/patches/unapplied/server/WitchReadyPotionEvent.patch similarity index 100% rename from patches/server/WitchReadyPotionEvent.patch rename to patches/unapplied/server/WitchReadyPotionEvent.patch diff --git a/patches/server/WitchThrowPotionEvent.patch b/patches/unapplied/server/WitchThrowPotionEvent.patch similarity index 100% rename from patches/server/WitchThrowPotionEvent.patch rename to patches/unapplied/server/WitchThrowPotionEvent.patch diff --git a/patches/server/Workaround-for-client-lag-spikes-MC-162253.patch b/patches/unapplied/server/Workaround-for-client-lag-spikes-MC-162253.patch similarity index 100% rename from patches/server/Workaround-for-client-lag-spikes-MC-162253.patch rename to patches/unapplied/server/Workaround-for-client-lag-spikes-MC-162253.patch diff --git a/patches/server/Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/unapplied/server/Workaround-for-vehicle-tracking-issue-on-disconnect.patch similarity index 100% rename from patches/server/Workaround-for-vehicle-tracking-issue-on-disconnect.patch rename to patches/unapplied/server/Workaround-for-vehicle-tracking-issue-on-disconnect.patch diff --git a/patches/server/WorldCreator-keepSpawnLoaded.patch b/patches/unapplied/server/WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/server/WorldCreator-keepSpawnLoaded.patch rename to patches/unapplied/server/WorldCreator-keepSpawnLoaded.patch diff --git a/patches/server/Zombie-API-breaking-doors.patch b/patches/unapplied/server/Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/Zombie-API-breaking-doors.patch rename to patches/unapplied/server/Zombie-API-breaking-doors.patch diff --git a/patches/server/add-DragonEggFormEvent.patch b/patches/unapplied/server/add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/add-DragonEggFormEvent.patch rename to patches/unapplied/server/add-DragonEggFormEvent.patch diff --git a/patches/server/add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/unapplied/server/add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/server/add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/unapplied/server/add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/server/add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/unapplied/server/add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/unapplied/server/add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/add-get-set-drop-chance-to-EntityEquipment.patch b/patches/unapplied/server/add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/unapplied/server/add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/add-hand-to-BlockMultiPlaceEvent.patch b/patches/unapplied/server/add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/server/add-hand-to-BlockMultiPlaceEvent.patch rename to patches/unapplied/server/add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/server/add-isDeeplySleeping-to-HumanEntity.patch b/patches/unapplied/server/add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/add-isDeeplySleeping-to-HumanEntity.patch rename to patches/unapplied/server/add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/add-more-information-to-Entity.toString.patch b/patches/unapplied/server/add-more-information-to-Entity.toString.patch similarity index 100% rename from patches/server/add-more-information-to-Entity.toString.patch rename to patches/unapplied/server/add-more-information-to-Entity.toString.patch diff --git a/patches/server/add-per-world-spawn-limits.patch b/patches/unapplied/server/add-per-world-spawn-limits.patch similarity index 100% rename from patches/server/add-per-world-spawn-limits.patch rename to patches/unapplied/server/add-per-world-spawn-limits.patch diff --git a/patches/server/added-PlayerNameEntityEvent.patch b/patches/unapplied/server/added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/added-PlayerNameEntityEvent.patch rename to patches/unapplied/server/added-PlayerNameEntityEvent.patch diff --git a/patches/server/added-option-to-disable-pathfinding-updates-on-block.patch b/patches/unapplied/server/added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from patches/server/added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/unapplied/server/added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/patches/server/additions-to-PlayerGameModeChangeEvent.patch b/patches/unapplied/server/additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/server/additions-to-PlayerGameModeChangeEvent.patch rename to patches/unapplied/server/additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/server/cache-resource-keys.patch b/patches/unapplied/server/cache-resource-keys.patch similarity index 100% rename from patches/server/cache-resource-keys.patch rename to patches/unapplied/server/cache-resource-keys.patch diff --git a/patches/server/check-global-player-list-where-appropriate.patch b/patches/unapplied/server/check-global-player-list-where-appropriate.patch similarity index 100% rename from patches/server/check-global-player-list-where-appropriate.patch rename to patches/unapplied/server/check-global-player-list-where-appropriate.patch diff --git a/patches/server/config-for-disabling-entity-tag-tags.patch b/patches/unapplied/server/config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/config-for-disabling-entity-tag-tags.patch rename to patches/unapplied/server/config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/copy-TESign-isEditable-from-snapshots.patch b/patches/unapplied/server/copy-TESign-isEditable-from-snapshots.patch similarity index 100% rename from patches/server/copy-TESign-isEditable-from-snapshots.patch rename to patches/unapplied/server/copy-TESign-isEditable-from-snapshots.patch diff --git a/patches/server/don-t-attempt-to-teleport-dead-entities.patch b/patches/unapplied/server/don-t-attempt-to-teleport-dead-entities.patch similarity index 100% rename from patches/server/don-t-attempt-to-teleport-dead-entities.patch rename to patches/unapplied/server/don-t-attempt-to-teleport-dead-entities.patch diff --git a/patches/server/don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/unapplied/server/don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch similarity index 100% rename from patches/server/don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch rename to patches/unapplied/server/don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch diff --git a/patches/server/ensure-reset-EnderDragon-boss-event-name.patch b/patches/unapplied/server/ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/ensure-reset-EnderDragon-boss-event-name.patch rename to patches/unapplied/server/ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/fix-Instruments.patch b/patches/unapplied/server/fix-Instruments.patch similarity index 100% rename from patches/server/fix-Instruments.patch rename to patches/unapplied/server/fix-Instruments.patch diff --git a/patches/server/fix-Jigsaw-block-kicking-user.patch b/patches/unapplied/server/fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/server/fix-Jigsaw-block-kicking-user.patch rename to patches/unapplied/server/fix-Jigsaw-block-kicking-user.patch diff --git a/patches/server/fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/unapplied/server/fix-MC-252817-green-map-markers-do-not-disappear.patch similarity index 100% rename from patches/server/fix-MC-252817-green-map-markers-do-not-disappear.patch rename to patches/unapplied/server/fix-MC-252817-green-map-markers-do-not-disappear.patch diff --git a/patches/server/fix-PigZombieAngerEvent-cancellation.patch b/patches/unapplied/server/fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/fix-PigZombieAngerEvent-cancellation.patch rename to patches/unapplied/server/fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/fix-PlayerItemHeldEvent-firing-twice.patch b/patches/unapplied/server/fix-PlayerItemHeldEvent-firing-twice.patch similarity index 100% rename from patches/server/fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/unapplied/server/fix-PlayerItemHeldEvent-firing-twice.patch diff --git a/patches/server/fix-converting-txt-to-json-file.patch b/patches/unapplied/server/fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/fix-converting-txt-to-json-file.patch rename to patches/unapplied/server/fix-converting-txt-to-json-file.patch diff --git a/patches/server/fix-dead-slime-setSize-invincibility.patch b/patches/unapplied/server/fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/fix-dead-slime-setSize-invincibility.patch rename to patches/unapplied/server/fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/unapplied/server/fix-player-loottables-running-when-mob-loot-gamerule.patch similarity index 100% rename from patches/server/fix-player-loottables-running-when-mob-loot-gamerule.patch rename to patches/unapplied/server/fix-player-loottables-running-when-mob-loot-gamerule.patch diff --git a/patches/server/fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/unapplied/server/fix-powder-snow-cauldrons-not-turning-to-water.patch similarity index 100% rename from patches/server/fix-powder-snow-cauldrons-not-turning-to-water.patch rename to patches/unapplied/server/fix-powder-snow-cauldrons-not-turning-to-water.patch diff --git a/patches/server/fix-various-menus-with-empty-level-accesses.patch b/patches/unapplied/server/fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/fix-various-menus-with-empty-level-accesses.patch rename to patches/unapplied/server/fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/fixed-entity-vehicle-collision-event-not-called.patch b/patches/unapplied/server/fixed-entity-vehicle-collision-event-not-called.patch similarity index 100% rename from patches/server/fixed-entity-vehicle-collision-event-not-called.patch rename to patches/unapplied/server/fixed-entity-vehicle-collision-event-not-called.patch diff --git a/patches/server/force-entity-dismount-during-teleportation.patch b/patches/unapplied/server/force-entity-dismount-during-teleportation.patch similarity index 100% rename from patches/server/force-entity-dismount-during-teleportation.patch rename to patches/unapplied/server/force-entity-dismount-during-teleportation.patch diff --git a/patches/server/forced-whitelist-use-configurable-kick-message.patch b/patches/unapplied/server/forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/forced-whitelist-use-configurable-kick-message.patch rename to patches/unapplied/server/forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/getPlayerUniqueId-API.patch b/patches/unapplied/server/getPlayerUniqueId-API.patch similarity index 100% rename from patches/server/getPlayerUniqueId-API.patch rename to patches/unapplied/server/getPlayerUniqueId-API.patch diff --git a/patches/server/handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/unapplied/server/handle-NaN-health-absorb-values-and-repair-bad-data.patch similarity index 100% rename from patches/server/handle-NaN-health-absorb-values-and-repair-bad-data.patch rename to patches/unapplied/server/handle-NaN-health-absorb-values-and-repair-bad-data.patch diff --git a/patches/server/handle-ServerboundKeepAlivePacket-async.patch b/patches/unapplied/server/handle-ServerboundKeepAlivePacket-async.patch similarity index 100% rename from patches/server/handle-ServerboundKeepAlivePacket-async.patch rename to patches/unapplied/server/handle-ServerboundKeepAlivePacket-async.patch diff --git a/patches/server/implement-optional-per-player-mob-spawns.patch b/patches/unapplied/server/implement-optional-per-player-mob-spawns.patch similarity index 100% rename from patches/server/implement-optional-per-player-mob-spawns.patch rename to patches/unapplied/server/implement-optional-per-player-mob-spawns.patch diff --git a/patches/server/incremental-chunk-and-player-saving.patch b/patches/unapplied/server/incremental-chunk-and-player-saving.patch similarity index 100% rename from patches/server/incremental-chunk-and-player-saving.patch rename to patches/unapplied/server/incremental-chunk-and-player-saving.patch diff --git a/patches/server/living-entity-allow-attribute-registration.patch b/patches/unapplied/server/living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/living-entity-allow-attribute-registration.patch rename to patches/unapplied/server/living-entity-allow-attribute-registration.patch diff --git a/patches/server/misc-debugging-dumps.patch b/patches/unapplied/server/misc-debugging-dumps.patch similarity index 100% rename from patches/server/misc-debugging-dumps.patch rename to patches/unapplied/server/misc-debugging-dumps.patch diff --git a/patches/server/offset-item-frame-ticking.patch b/patches/unapplied/server/offset-item-frame-ticking.patch similarity index 100% rename from patches/server/offset-item-frame-ticking.patch rename to patches/unapplied/server/offset-item-frame-ticking.patch diff --git a/patches/server/optimized-dirt-and-snow-spreading.patch b/patches/unapplied/server/optimized-dirt-and-snow-spreading.patch similarity index 100% rename from patches/server/optimized-dirt-and-snow-spreading.patch rename to patches/unapplied/server/optimized-dirt-and-snow-spreading.patch diff --git a/patches/server/prevent-unintended-light-block-manipulation.patch b/patches/unapplied/server/prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/prevent-unintended-light-block-manipulation.patch rename to patches/unapplied/server/prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/unapplied/server/provide-a-configurable-option-to-disable-creeper-lin.patch similarity index 100% rename from patches/server/provide-a-configurable-option-to-disable-creeper-lin.patch rename to patches/unapplied/server/provide-a-configurable-option-to-disable-creeper-lin.patch diff --git a/patches/server/remove-duplicate-animate-packet-for-records.patch b/patches/unapplied/server/remove-duplicate-animate-packet-for-records.patch similarity index 100% rename from patches/server/remove-duplicate-animate-packet-for-records.patch rename to patches/unapplied/server/remove-duplicate-animate-packet-for-records.patch diff --git a/patches/server/remove-null-possibility-for-getServer-singleton.patch b/patches/unapplied/server/remove-null-possibility-for-getServer-singleton.patch similarity index 100% rename from patches/server/remove-null-possibility-for-getServer-singleton.patch rename to patches/unapplied/server/remove-null-possibility-for-getServer-singleton.patch diff --git a/patches/server/revert-serverside-behavior-of-keepalives.patch b/patches/unapplied/server/revert-serverside-behavior-of-keepalives.patch similarity index 100% rename from patches/server/revert-serverside-behavior-of-keepalives.patch rename to patches/unapplied/server/revert-serverside-behavior-of-keepalives.patch diff --git a/patches/server/stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/unapplied/server/stop-firing-pressure-plate-EntityInteractEvent-for-i.patch similarity index 100% rename from patches/server/stop-firing-pressure-plate-EntityInteractEvent-for-i.patch rename to patches/unapplied/server/stop-firing-pressure-plate-EntityInteractEvent-for-i.patch diff --git a/patches/server/use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/unapplied/server/use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 100% rename from patches/server/use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/unapplied/server/use-BlockFormEvent-for-mud-converting-into-clay.patch diff --git a/patches/server/use-CB-BlockState-implementations-for-captured-block.patch b/patches/unapplied/server/use-CB-BlockState-implementations-for-captured-block.patch similarity index 100% rename from patches/server/use-CB-BlockState-implementations-for-captured-block.patch rename to patches/unapplied/server/use-CB-BlockState-implementations-for-captured-block.patch diff --git a/work/BuildData b/work/BuildData index 4d9436f7b..2881c6b6d 160000 --- a/work/BuildData +++ b/work/BuildData @@ -1 +1 @@ -Subproject commit 4d9436f7b66190ad21fe4e3975b73a36b7ad2a7e +Subproject commit 2881c6b6dd146126596342d4025d37a9a84a0b03 diff --git a/work/Bukkit b/work/Bukkit index 5dbedae1c..3635fe1a7 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 5dbedae1cbbc70791dcfc374c4c8da35db309a44 +Subproject commit 3635fe1a771a768acc67a9ab8b3ea184fc724bae diff --git a/work/CraftBukkit b/work/CraftBukkit index 2270366cd..e1188ed3a 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 2270366cdd98ff02eaa62212b7881084feadd764 +Subproject commit e1188ed3a2f295cba417e59645ca22c97b4587a4 diff --git a/work/Spigot b/work/Spigot index 7d7b241e3..81b9def3c 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 7d7b241e353e86ee90ad025dab0262b050a6fe4a +Subproject commit 81b9def3c89c26289118ed0e43ec4df167edd56c