diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch index dce8977936..b5c120a1df 100644 --- a/patches/server/0001-Setup-Gradle-project.patch +++ b/patches/server/0001-Setup-Gradle-project.patch @@ -28,16 +28,15 @@ index 37dab9e868dbfb019c271a547d975a48ad1cb571..3811c0d849a3eb028ed1a6b7a2d4747f +/.factorypath diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 -index 0000000000000000000000000000000000000000..e69d74d671b1b73f32eac47d620ec364f419bd6c +index 0000000000000000000000000000000000000000..b3055953028759e4754d507c31f387b6bf7c0108 --- /dev/null +++ b/build.gradle.kts -@@ -0,0 +1,124 @@ +@@ -0,0 +1,119 @@ +import io.papermc.paperweight.util.* + +plugins { + java + `maven-publish` -+ id("com.github.johnrengelman.shadow") +} + +dependencies { @@ -90,10 +89,6 @@ index 0000000000000000000000000000000000000000..e69d74d671b1b73f32eac47d620ec364 + } +} + -+tasks.shadowJar { -+ configurations = listOf(project.configurations.vanillaServer.get()) -+} -+ +tasks.test { + exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class") + useJUnitPlatform() diff --git a/patches/server/0003-Build-system-changes.patch b/patches/server/0003-Build-system-changes.patch index 3870873603..52428906e4 100644 --- a/patches/server/0003-Build-system-changes.patch +++ b/patches/server/0003-Build-system-changes.patch @@ -9,10 +9,10 @@ public net.minecraft.server.packs.VanillaPackResourcesBuilder safeGetPath(Ljava/ Co-authored-by: Jake Potrebic diff --git a/build.gradle.kts b/build.gradle.kts -index e69d74d671b1b73f32eac47d620ec364f419bd6c..9d425351f32739eb6c18ebc5c36545c1be21d436 100644 +index b3055953028759e4754d507c31f387b6bf7c0108..39e4021d3fa7e79bd28463a01e3e6d07181f6765 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -9,9 +9,7 @@ plugins { +@@ -8,9 +8,7 @@ plugins { dependencies { implementation(project(":paper-api")) implementation("jline:jline:2.12.1") @@ -23,7 +23,7 @@ index e69d74d671b1b73f32eac47d620ec364f419bd6c..9d425351f32739eb6c18ebc5c36545c1 implementation("org.ow2.asm:asm-commons:9.7") implementation("commons-lang:commons-lang:2.6") runtimeOnly("org.xerial:sqlite-jdbc:3.45.3.0") -@@ -36,6 +34,7 @@ tasks.jar { +@@ -35,6 +33,7 @@ tasks.jar { val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim() val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\"" val date = git("show", "-s", "--format=%ci", gitHash).getText().trim() // Paper @@ -31,7 +31,7 @@ index e69d74d671b1b73f32eac47d620ec364f419bd6c..9d425351f32739eb6c18ebc5c36545c1 attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", -@@ -44,6 +43,9 @@ tasks.jar { +@@ -43,6 +42,9 @@ tasks.jar { "Specification-Title" to "Bukkit", "Specification-Version" to project.version, "Specification-Vendor" to "Bukkit Team", @@ -41,14 +41,14 @@ index e69d74d671b1b73f32eac47d620ec364f419bd6c..9d425351f32739eb6c18ebc5c36545c1 ) for (tld in setOf("net", "com", "org")) { attributes("$tld/bukkit", "Sealed" to true) -@@ -60,6 +62,17 @@ tasks.shadowJar { - configurations = listOf(project.configurations.vanillaServer.get()) +@@ -55,6 +57,17 @@ publishing { + } } +// Paper start +val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.ScanJarForBadCalls::class) { + badAnnotations.add("Lio/papermc/paper/annotation/DoNotUse;") -+ jarToScan.set(tasks.shadowJar.flatMap { it.archiveFile }) ++ jarToScan.set(tasks.serverJar.flatMap { it.archiveFile }) + classpath.from(configurations.compileClasspath) +} +tasks.check { @@ -59,7 +59,7 @@ index e69d74d671b1b73f32eac47d620ec364f419bd6c..9d425351f32739eb6c18ebc5c36545c1 tasks.test { exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class") useJUnitPlatform() -@@ -121,4 +134,5 @@ tasks.registerRunTask("runReobf") { +@@ -116,4 +129,5 @@ tasks.registerRunTask("runReobf") { tasks.registerRunTask("runDev") { description = "Spin up a non-relocated Mojang-mapped test server" classpath(sourceSets.main.map { it.runtimeClasspath }) diff --git a/patches/server/0004-Test-changes.patch b/patches/server/0004-Test-changes.patch index 448797c72a..da0eca4b4b 100644 --- a/patches/server/0004-Test-changes.patch +++ b/patches/server/0004-Test-changes.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Test changes diff --git a/build.gradle.kts b/build.gradle.kts -index 9d425351f32739eb6c18ebc5c36545c1be21d436..db90a1c1409cc7a58f35d2e9ae768f2edd3f36ae 100644 +index 39e4021d3fa7e79bd28463a01e3e6d07181f6765..83598b48724e3a4f40a153be3e681564105b90b4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -23,6 +23,7 @@ dependencies { +@@ -22,6 +22,7 @@ dependencies { testImplementation("org.hamcrest:hamcrest:2.2") testImplementation("org.mockito:mockito-core:5.11.0") testImplementation("org.ow2.asm:asm-tree:9.7") @@ -16,7 +16,7 @@ index 9d425351f32739eb6c18ebc5c36545c1be21d436..db90a1c1409cc7a58f35d2e9ae768f2e } val craftbukkitPackageVersion = "1_20_R4" // Paper -@@ -53,6 +54,12 @@ tasks.jar { +@@ -52,6 +53,12 @@ tasks.jar { } } diff --git a/patches/server/0005-Paper-config-files.patch b/patches/server/0005-Paper-config-files.patch index b04a8966ef..3e158b1a0c 100644 --- a/patches/server/0005-Paper-config-files.patch +++ b/patches/server/0005-Paper-config-files.patch @@ -15,10 +15,10 @@ public net.minecraft.server.dedicated.DedicatedServerProperties reload(Lnet/mine public net.minecraft.world.level.NaturalSpawner SPAWNING_CATEGORIES diff --git a/build.gradle.kts b/build.gradle.kts -index db90a1c1409cc7a58f35d2e9ae768f2edd3f36ae..c0a078302223202db37d2ed9ecf20716ed7706a5 100644 +index 83598b48724e3a4f40a153be3e681564105b90b4..94fcbfae0678391d38ee8e6e54576d9fb294585e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -11,6 +11,7 @@ dependencies { +@@ -10,6 +10,7 @@ dependencies { implementation("jline:jline:2.12.1") implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") // Paper - remove exclusion implementation("org.ow2.asm:asm-commons:9.7") diff --git a/patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch index 3f94b48878..ae13000aef 100644 --- a/patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch @@ -25,11 +25,11 @@ Other changes: Co-Authored-By: Emilia Kond diff --git a/build.gradle.kts b/build.gradle.kts -index c0a078302223202db37d2ed9ecf20716ed7706a5..7fb99f67edf961bb31e3f77049d2d3eb7bb148bc 100644 +index 94fcbfae0678391d38ee8e6e54576d9fb294585e..3dc1e82536e1e84287499825ab191c4e92bc37d7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -6,9 +6,30 @@ plugins { - id("com.github.johnrengelman.shadow") +@@ -5,9 +5,30 @@ plugins { + `maven-publish` } +val log4jPlugins = sourceSets.create("log4jPlugins") @@ -60,15 +60,26 @@ index c0a078302223202db37d2ed9ecf20716ed7706a5..7fb99f67edf961bb31e3f77049d2d3eb implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") // Paper - remove exclusion implementation("org.ow2.asm:asm-commons:9.7") implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files -@@ -67,7 +88,7 @@ publishing { +@@ -75,6 +96,19 @@ tasks.check { + dependsOn(scanJar) } + // Paper end ++// Paper start - use TCA for console improvements ++tasks.serverJar { ++ from(alsoShade.elements.map { ++ it.map { f -> ++ if (f.asFile.isFile) { ++ zipTree(f.asFile) ++ } else { ++ f.asFile ++ } ++ } ++ }) ++} ++// Paper end - use TCA for console improvements - tasks.shadowJar { -- configurations = listOf(project.configurations.vanillaServer.get()) -+ configurations = listOf(project.configurations.vanillaServer.get(), alsoShade) // Paper - } - - // Paper start + tasks.test { + exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class") diff --git a/src/log4jPlugins/java/io/papermc/paper/console/StripANSIConverter.java b/src/log4jPlugins/java/io/papermc/paper/console/StripANSIConverter.java new file mode 100644 index 0000000000000000000000000000000000000000..91547f6e6fe90006713beb2818da634304bdd236 diff --git a/patches/server/0012-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/server/0012-Handle-plugin-prefixes-using-Log4J-configuration.patch index a6bf632ac1..7b3f3156dd 100644 --- a/patches/server/0012-Handle-plugin-prefixes-using-Log4J-configuration.patch +++ b/patches/server/0012-Handle-plugin-prefixes-using-Log4J-configuration.patch @@ -15,10 +15,10 @@ This may cause additional prefixes to be disabled for plugins bypassing the plugin logger. diff --git a/build.gradle.kts b/build.gradle.kts -index 7fb99f67edf961bb31e3f77049d2d3eb7bb148bc..012dbc51b70e24d01e03df5471196249cd534bb8 100644 +index 3dc1e82536e1e84287499825ab191c4e92bc37d7..5b5bcb37cf3a318fa80e6b594b0b900f50a471cc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -25,7 +25,7 @@ dependencies { +@@ -24,7 +24,7 @@ dependencies { all its classes to check if they are plugins. Scanning takes about 1-2 seconds so adding this speeds up the server start. */ diff --git a/patches/server/0014-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/0014-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch index a54bf91ced..1635092537 100644 --- a/patches/server/0014-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch +++ b/patches/server/0014-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread diff --git a/build.gradle.kts b/build.gradle.kts -index 012dbc51b70e24d01e03df5471196249cd534bb8..c0cde2b74865070c6901cbc5809e8f79d14969b2 100644 +index 5b5bcb37cf3a318fa80e6b594b0b900f50a471cc..37bf660248173c25ec379639faece55c9e1207ce 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -34,8 +34,7 @@ dependencies { +@@ -33,8 +33,7 @@ dependencies { implementation("org.ow2.asm:asm-commons:9.7") implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files implementation("commons-lang:commons-lang:2.6") diff --git a/patches/server/0015-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0015-Deobfuscate-stacktraces-in-log-messages-crash-report.patch index 97ea5c6955..9f28b08353 100644 --- a/patches/server/0015-Deobfuscate-stacktraces-in-log-messages-crash-report.patch +++ b/patches/server/0015-Deobfuscate-stacktraces-in-log-messages-crash-report.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and diff --git a/build.gradle.kts b/build.gradle.kts -index c0cde2b74865070c6901cbc5809e8f79d14969b2..cc8f024fec9c1f928e0d218d19794eb1478f5d07 100644 +index 37bf660248173c25ec379639faece55c9e1207ce..71da2755ac2253b73b128cf8f1afe9cf5e537912 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -34,6 +34,7 @@ dependencies { +@@ -33,6 +33,7 @@ dependencies { implementation("org.ow2.asm:asm-commons:9.7") implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files implementation("commons-lang:commons-lang:2.6") diff --git a/patches/server/0020-Plugin-remapping.patch b/patches/server/0020-Plugin-remapping.patch index ad8314314c..6fbd1d7f78 100644 --- a/patches/server/0020-Plugin-remapping.patch +++ b/patches/server/0020-Plugin-remapping.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Plugin remapping Co-authored-by: Nassim Jahnke diff --git a/build.gradle.kts b/build.gradle.kts -index cc8f024fec9c1f928e0d218d19794eb1478f5d07..5f94206910467c3302da5a995da5f74961a3365a 100644 +index 71da2755ac2253b73b128cf8f1afe9cf5e537912..8e2a118be60e100a057d863457eee57ee34147bd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -46,9 +46,14 @@ dependencies { +@@ -45,9 +45,14 @@ dependencies { testImplementation("org.mockito:mockito-core:5.11.0") testImplementation("org.ow2.asm:asm-tree:9.7") testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest @@ -25,7 +25,7 @@ index cc8f024fec9c1f928e0d218d19794eb1478f5d07..5f94206910467c3302da5a995da5f749 tasks.jar { archiveClassifier.set("dev") -@@ -68,7 +73,7 @@ tasks.jar { +@@ -67,7 +72,7 @@ tasks.jar { "Specification-Vendor" to "Bukkit Team", "Git-Branch" to gitBranch, // Paper "Git-Commit" to gitHash, // Paper @@ -34,7 +34,7 @@ index cc8f024fec9c1f928e0d218d19794eb1478f5d07..5f94206910467c3302da5a995da5f749 ) for (tld in setOf("net", "com", "org")) { attributes("$tld/bukkit", "Sealed" to true) -@@ -148,20 +153,41 @@ val runtimeClasspathWithoutVanillaServer = configurations.runtimeClasspath.flatM +@@ -156,20 +161,41 @@ val runtimeClasspathWithoutVanillaServer = configurations.runtimeClasspath.flatM runtime.filterNot { it.asFile.absolutePath == vanilla } } diff --git a/patches/server/0022-Remap-reflection-calls-in-plugins-using-internals.patch b/patches/server/0022-Remap-reflection-calls-in-plugins-using-internals.patch index bdeb7e663a..840e4b1c15 100644 --- a/patches/server/0022-Remap-reflection-calls-in-plugins-using-internals.patch +++ b/patches/server/0022-Remap-reflection-calls-in-plugins-using-internals.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Remap reflection calls in plugins using internals Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com> diff --git a/build.gradle.kts b/build.gradle.kts -index 5f94206910467c3302da5a995da5f74961a3365a..b995ea46b0fabdab6d398aa1980f9d801460b772 100644 +index 8e2a118be60e100a057d863457eee57ee34147bd..5e0200abc509989d79a5f3dd2ee456b7a3fca33f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -34,7 +34,6 @@ dependencies { +@@ -33,7 +33,6 @@ dependencies { implementation("org.ow2.asm:asm-commons:9.7") implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files implementation("commons-lang:commons-lang:2.6") @@ -17,7 +17,7 @@ index 5f94206910467c3302da5a995da5f74961a3365a..b995ea46b0fabdab6d398aa1980f9d80 runtimeOnly("com.lmax:disruptor:3.4.4") // Paper runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6") -@@ -48,6 +47,12 @@ dependencies { +@@ -47,6 +46,12 @@ dependencies { testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest implementation("net.neoforged:AutoRenamingTool:2.0.3") // Paper - remap plugins implementation("net.neoforged:srgutils:1.0.9") // Paper - remap plugins - bump transitive of ART diff --git a/patches/server/0023-Add-WorldEdit-plugin-flag-test-task.patch b/patches/server/0023-Add-WorldEdit-plugin-flag-test-task.patch deleted file mode 100644 index caaa9d04f8..0000000000 --- a/patches/server/0023-Add-WorldEdit-plugin-flag-test-task.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> -Date: Mon, 12 Feb 2024 22:19:03 -0700 -Subject: [PATCH] Add WorldEdit plugin flag test task - - -diff --git a/build.gradle.kts b/build.gradle.kts -index b995ea46b0fabdab6d398aa1980f9d801460b772..2902bbff8d4aff8d09eaa6b7e4f6c604c42dac29 100644 ---- a/build.gradle.kts -+++ b/build.gradle.kts -@@ -1,9 +1,11 @@ - import io.papermc.paperweight.util.* -+import xyz.jpenilla.runpaper.task.RunServer - - plugins { - java - `maven-publish` - id("com.github.johnrengelman.shadow") -+ id("xyz.jpenilla.run-paper") version "2.2.3" apply false - } - - val log4jPlugins = sourceSets.create("log4jPlugins") -@@ -176,6 +178,25 @@ tasks.registerRunTask("runDevServer") { - jvmArgs("-DPaper.pushPaperAssetsRoot=true") - } - -+tasks.register("runWithPlugins") { -+ version.set(providers.gradleProperty("mcVersion")) -+ runJar(rootProject.tasks.named("createMojmapBundlerJar").flatMap { it.outputZip }) -+ downloadPlugins { -+ url("https://ci.enginehub.org/repository/download/bt10/23382:id/worldedit-bukkit-7.2.19-dist.jar?branch=version/7.2.x&guest=1") -+ url("https://www.patreon.com/file?h=89830486&i=15920178") -+ url("https://dev.bukkit.org/projects/grief-prevention/files/4433061/download") -+ github("EssentialsX", "Essentials", "2.20.1", "EssentialsX-2.20.1.jar") -+ hangar("squaremap", "1.2.3") -+ hangar("FancyHolograms", "2.0.5") -+ hangar("Chunky", "1.3.92") -+ hangar("Multiverse-Core", "4.3.12") -+ // Once they fix package parsing -+ // hangar("Denizen", "1.3.0-Build-1803") -+ // hangar("GrimAnticheat", "2.3.58") -+ // hangar("ProtocolLib", "5.1.0") -+ } -+ runDirectory.set(rootProject.layout.projectDirectory.dir("run")) -+} - tasks.registerRunTask("runBundler") { - description = "Spin up a test server from the Mojang mapped bundler jar" - classpath(rootProject.tasks.named("createMojmapBundlerJar").flatMap { it.outputZip }) diff --git a/patches/server/0025-Timings-v2.patch b/patches/server/0023-Timings-v2.patch similarity index 100% rename from patches/server/0025-Timings-v2.patch rename to patches/server/0023-Timings-v2.patch diff --git a/patches/server/0026-Add-TickThread.patch b/patches/server/0024-Add-TickThread.patch similarity index 100% rename from patches/server/0026-Add-TickThread.patch rename to patches/server/0024-Add-TickThread.patch diff --git a/patches/server/0024-build-replace-use-of-shadow-plugin.patch b/patches/server/0024-build-replace-use-of-shadow-plugin.patch deleted file mode 100644 index 78d0d23bdc..0000000000 --- a/patches/server/0024-build-replace-use-of-shadow-plugin.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> -Date: Thu, 18 Apr 2024 13:39:18 -0700 -Subject: [PATCH] build: replace use of shadow plugin - - -diff --git a/build.gradle.kts b/build.gradle.kts -index 2902bbff8d4aff8d09eaa6b7e4f6c604c42dac29..fec06ac47cf190bf4d5d743c34e4a90b99a0af18 100644 ---- a/build.gradle.kts -+++ b/build.gradle.kts -@@ -4,7 +4,6 @@ import xyz.jpenilla.runpaper.task.RunServer - plugins { - java - `maven-publish` -- id("com.github.johnrengelman.shadow") - id("xyz.jpenilla.run-paper") version "2.2.3" apply false - } - -@@ -99,14 +98,22 @@ publishing { - } - } - --tasks.shadowJar { -- configurations = listOf(project.configurations.vanillaServer.get(), alsoShade) // Paper -+tasks.serverJar { -+ from(alsoShade.elements.map { -+ it.map { f -> -+ if (f.asFile.isFile) { -+ zipTree(f.asFile) -+ } else { -+ f.asFile -+ } -+ } -+ }) - } - - // Paper start - val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.ScanJarForBadCalls::class) { - badAnnotations.add("Lio/papermc/paper/annotation/DoNotUse;") -- jarToScan.set(tasks.shadowJar.flatMap { it.archiveFile }) -+ jarToScan.set(tasks.serverJar.flatMap { it.archiveFile }) - classpath.from(configurations.compileClasspath) - } - tasks.check { diff --git a/patches/server/0027-Further-improve-server-tick-loop.patch b/patches/server/0025-Further-improve-server-tick-loop.patch similarity index 100% rename from patches/server/0027-Further-improve-server-tick-loop.patch rename to patches/server/0025-Further-improve-server-tick-loop.patch diff --git a/patches/server/0028-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0026-Add-command-line-option-to-load-extra-plugin-jars-no.patch similarity index 100% rename from patches/server/0028-Add-command-line-option-to-load-extra-plugin-jars-no.patch rename to patches/server/0026-Add-command-line-option-to-load-extra-plugin-jars-no.patch diff --git a/patches/server/0029-Support-components-in-ItemMeta.patch b/patches/server/0027-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/server/0029-Support-components-in-ItemMeta.patch rename to patches/server/0027-Support-components-in-ItemMeta.patch diff --git a/patches/server/0030-Configurable-cactus-bamboo-and-reed-growth-height.patch b/patches/server/0028-Configurable-cactus-bamboo-and-reed-growth-height.patch similarity index 100% rename from patches/server/0030-Configurable-cactus-bamboo-and-reed-growth-height.patch rename to patches/server/0028-Configurable-cactus-bamboo-and-reed-growth-height.patch diff --git a/patches/server/0031-Configurable-baby-zombie-movement-speed.patch b/patches/server/0029-Configurable-baby-zombie-movement-speed.patch similarity index 100% rename from patches/server/0031-Configurable-baby-zombie-movement-speed.patch rename to patches/server/0029-Configurable-baby-zombie-movement-speed.patch diff --git a/patches/server/0032-Configurable-fishing-time-ranges.patch b/patches/server/0030-Configurable-fishing-time-ranges.patch similarity index 100% rename from patches/server/0032-Configurable-fishing-time-ranges.patch rename to patches/server/0030-Configurable-fishing-time-ranges.patch diff --git a/patches/server/0033-Allow-nerfed-mobs-to-jump.patch b/patches/server/0031-Allow-nerfed-mobs-to-jump.patch similarity index 100% rename from patches/server/0033-Allow-nerfed-mobs-to-jump.patch rename to patches/server/0031-Allow-nerfed-mobs-to-jump.patch diff --git a/patches/server/0034-Add-configurable-entity-despawn-distances.patch b/patches/server/0032-Add-configurable-entity-despawn-distances.patch similarity index 100% rename from patches/server/0034-Add-configurable-entity-despawn-distances.patch rename to patches/server/0032-Add-configurable-entity-despawn-distances.patch diff --git a/patches/server/0035-Allow-for-toggling-of-spawn-chunks.patch b/patches/server/0033-Allow-for-toggling-of-spawn-chunks.patch similarity index 100% rename from patches/server/0035-Allow-for-toggling-of-spawn-chunks.patch rename to patches/server/0033-Allow-for-toggling-of-spawn-chunks.patch diff --git a/patches/server/0036-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/patches/server/0034-Drop-falling-block-and-tnt-entities-at-the-specified.patch similarity index 100% rename from patches/server/0036-Drop-falling-block-and-tnt-entities-at-the-specified.patch rename to patches/server/0034-Drop-falling-block-and-tnt-entities-at-the-specified.patch diff --git a/patches/server/0037-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/server/0035-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch similarity index 100% rename from patches/server/0037-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch rename to patches/server/0035-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch diff --git a/patches/server/0038-Implement-Paper-VersionChecker.patch b/patches/server/0036-Implement-Paper-VersionChecker.patch similarity index 100% rename from patches/server/0038-Implement-Paper-VersionChecker.patch rename to patches/server/0036-Implement-Paper-VersionChecker.patch diff --git a/patches/server/0039-Add-version-history-to-version-command.patch b/patches/server/0037-Add-version-history-to-version-command.patch similarity index 100% rename from patches/server/0039-Add-version-history-to-version-command.patch rename to patches/server/0037-Add-version-history-to-version-command.patch diff --git a/patches/server/0040-Player-affects-spawning-API.patch b/patches/server/0038-Player-affects-spawning-API.patch similarity index 100% rename from patches/server/0040-Player-affects-spawning-API.patch rename to patches/server/0038-Player-affects-spawning-API.patch diff --git a/patches/server/0041-Only-refresh-abilities-if-needed.patch b/patches/server/0039-Only-refresh-abilities-if-needed.patch similarity index 100% rename from patches/server/0041-Only-refresh-abilities-if-needed.patch rename to patches/server/0039-Only-refresh-abilities-if-needed.patch diff --git a/patches/server/0042-Entity-Origin-API.patch b/patches/server/0040-Entity-Origin-API.patch similarity index 100% rename from patches/server/0042-Entity-Origin-API.patch rename to patches/server/0040-Entity-Origin-API.patch diff --git a/patches/server/0043-Prevent-block-entity-and-entity-crashes.patch b/patches/server/0041-Prevent-block-entity-and-entity-crashes.patch similarity index 100% rename from patches/server/0043-Prevent-block-entity-and-entity-crashes.patch rename to patches/server/0041-Prevent-block-entity-and-entity-crashes.patch diff --git a/patches/server/0044-Configurable-top-of-nether-void-damage.patch b/patches/server/0042-Configurable-top-of-nether-void-damage.patch similarity index 100% rename from patches/server/0044-Configurable-top-of-nether-void-damage.patch rename to patches/server/0042-Configurable-top-of-nether-void-damage.patch diff --git a/patches/server/0045-Check-online-mode-before-converting-and-renaming-pla.patch b/patches/server/0043-Check-online-mode-before-converting-and-renaming-pla.patch similarity index 100% rename from patches/server/0045-Check-online-mode-before-converting-and-renaming-pla.patch rename to patches/server/0043-Check-online-mode-before-converting-and-renaming-pla.patch diff --git a/patches/server/0046-Add-more-entities-to-activation-range-ignore-list.patch b/patches/server/0044-Add-more-entities-to-activation-range-ignore-list.patch similarity index 100% rename from patches/server/0046-Add-more-entities-to-activation-range-ignore-list.patch rename to patches/server/0044-Add-more-entities-to-activation-range-ignore-list.patch diff --git a/patches/server/0047-Configurable-end-credits.patch b/patches/server/0045-Configurable-end-credits.patch similarity index 100% rename from patches/server/0047-Configurable-end-credits.patch rename to patches/server/0045-Configurable-end-credits.patch diff --git a/patches/server/0048-Fix-lag-from-explosions-processing-dead-entities.patch b/patches/server/0046-Fix-lag-from-explosions-processing-dead-entities.patch similarity index 100% rename from patches/server/0048-Fix-lag-from-explosions-processing-dead-entities.patch rename to patches/server/0046-Fix-lag-from-explosions-processing-dead-entities.patch diff --git a/patches/server/0049-Optimize-explosions.patch b/patches/server/0047-Optimize-explosions.patch similarity index 100% rename from patches/server/0049-Optimize-explosions.patch rename to patches/server/0047-Optimize-explosions.patch diff --git a/patches/server/0050-Disable-explosion-knockback.patch b/patches/server/0048-Disable-explosion-knockback.patch similarity index 100% rename from patches/server/0050-Disable-explosion-knockback.patch rename to patches/server/0048-Disable-explosion-knockback.patch diff --git a/patches/server/0051-Disable-thunder.patch b/patches/server/0049-Disable-thunder.patch similarity index 100% rename from patches/server/0051-Disable-thunder.patch rename to patches/server/0049-Disable-thunder.patch diff --git a/patches/server/0052-Disable-ice-and-snow.patch b/patches/server/0050-Disable-ice-and-snow.patch similarity index 100% rename from patches/server/0052-Disable-ice-and-snow.patch rename to patches/server/0050-Disable-ice-and-snow.patch diff --git a/patches/server/0053-Configurable-mob-spawner-tick-rate.patch b/patches/server/0051-Configurable-mob-spawner-tick-rate.patch similarity index 100% rename from patches/server/0053-Configurable-mob-spawner-tick-rate.patch rename to patches/server/0051-Configurable-mob-spawner-tick-rate.patch diff --git a/patches/server/0054-Implement-PlayerLocaleChangeEvent.patch b/patches/server/0052-Implement-PlayerLocaleChangeEvent.patch similarity index 100% rename from patches/server/0054-Implement-PlayerLocaleChangeEvent.patch rename to patches/server/0052-Implement-PlayerLocaleChangeEvent.patch diff --git a/patches/server/0055-Add-BeaconEffectEvent.patch b/patches/server/0053-Add-BeaconEffectEvent.patch similarity index 100% rename from patches/server/0055-Add-BeaconEffectEvent.patch rename to patches/server/0053-Add-BeaconEffectEvent.patch diff --git a/patches/server/0056-Configurable-container-update-tick-rate.patch b/patches/server/0054-Configurable-container-update-tick-rate.patch similarity index 100% rename from patches/server/0056-Configurable-container-update-tick-rate.patch rename to patches/server/0054-Configurable-container-update-tick-rate.patch diff --git a/patches/server/0057-Use-UserCache-for-player-heads.patch b/patches/server/0055-Use-UserCache-for-player-heads.patch similarity index 100% rename from patches/server/0057-Use-UserCache-for-player-heads.patch rename to patches/server/0055-Use-UserCache-for-player-heads.patch diff --git a/patches/server/0058-Disable-spigot-tick-limiters.patch b/patches/server/0056-Disable-spigot-tick-limiters.patch similarity index 100% rename from patches/server/0058-Disable-spigot-tick-limiters.patch rename to patches/server/0056-Disable-spigot-tick-limiters.patch diff --git a/patches/server/0059-Add-PlayerInitialSpawnEvent.patch b/patches/server/0057-Add-PlayerInitialSpawnEvent.patch similarity index 100% rename from patches/server/0059-Add-PlayerInitialSpawnEvent.patch rename to patches/server/0057-Add-PlayerInitialSpawnEvent.patch diff --git a/patches/server/0060-Configurable-Disabling-Cat-Chest-Detection.patch b/patches/server/0058-Configurable-Disabling-Cat-Chest-Detection.patch similarity index 100% rename from patches/server/0060-Configurable-Disabling-Cat-Chest-Detection.patch rename to patches/server/0058-Configurable-Disabling-Cat-Chest-Detection.patch diff --git a/patches/server/0061-Improve-Player-chat-API-handling.patch b/patches/server/0059-Improve-Player-chat-API-handling.patch similarity index 100% rename from patches/server/0061-Improve-Player-chat-API-handling.patch rename to patches/server/0059-Improve-Player-chat-API-handling.patch diff --git a/patches/server/0062-All-chunks-are-slime-spawn-chunks-toggle.patch b/patches/server/0060-All-chunks-are-slime-spawn-chunks-toggle.patch similarity index 100% rename from patches/server/0062-All-chunks-are-slime-spawn-chunks-toggle.patch rename to patches/server/0060-All-chunks-are-slime-spawn-chunks-toggle.patch diff --git a/patches/server/0063-Expose-server-CommandMap.patch b/patches/server/0061-Expose-server-CommandMap.patch similarity index 100% rename from patches/server/0063-Expose-server-CommandMap.patch rename to patches/server/0061-Expose-server-CommandMap.patch diff --git a/patches/server/0064-Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/server/0062-Be-a-bit-more-informative-in-maxHealth-exception.patch similarity index 100% rename from patches/server/0064-Be-a-bit-more-informative-in-maxHealth-exception.patch rename to patches/server/0062-Be-a-bit-more-informative-in-maxHealth-exception.patch diff --git a/patches/server/0065-Player-Tab-List-and-Title-APIs.patch b/patches/server/0063-Player-Tab-List-and-Title-APIs.patch similarity index 100% rename from patches/server/0065-Player-Tab-List-and-Title-APIs.patch rename to patches/server/0063-Player-Tab-List-and-Title-APIs.patch diff --git a/patches/server/0066-Add-configurable-portal-search-radius.patch b/patches/server/0064-Add-configurable-portal-search-radius.patch similarity index 100% rename from patches/server/0066-Add-configurable-portal-search-radius.patch rename to patches/server/0064-Add-configurable-portal-search-radius.patch diff --git a/patches/server/0067-Add-velocity-warnings.patch b/patches/server/0065-Add-velocity-warnings.patch similarity index 100% rename from patches/server/0067-Add-velocity-warnings.patch rename to patches/server/0065-Add-velocity-warnings.patch diff --git a/patches/server/0068-Configurable-inter-world-teleportation-safety.patch b/patches/server/0066-Configurable-inter-world-teleportation-safety.patch similarity index 100% rename from patches/server/0068-Configurable-inter-world-teleportation-safety.patch rename to patches/server/0066-Configurable-inter-world-teleportation-safety.patch diff --git a/patches/server/0069-Add-exception-reporting-event.patch b/patches/server/0067-Add-exception-reporting-event.patch similarity index 100% rename from patches/server/0069-Add-exception-reporting-event.patch rename to patches/server/0067-Add-exception-reporting-event.patch diff --git a/patches/server/0070-Disable-Scoreboards-for-non-players-by-default.patch b/patches/server/0068-Disable-Scoreboards-for-non-players-by-default.patch similarity index 100% rename from patches/server/0070-Disable-Scoreboards-for-non-players-by-default.patch rename to patches/server/0068-Disable-Scoreboards-for-non-players-by-default.patch diff --git a/patches/server/0071-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/server/0069-Add-methods-for-working-with-arrows-stuck-in-living-.patch similarity index 100% rename from patches/server/0071-Add-methods-for-working-with-arrows-stuck-in-living-.patch rename to patches/server/0069-Add-methods-for-working-with-arrows-stuck-in-living-.patch diff --git a/patches/server/0072-Chunk-Save-Reattempt.patch b/patches/server/0070-Chunk-Save-Reattempt.patch similarity index 100% rename from patches/server/0072-Chunk-Save-Reattempt.patch rename to patches/server/0070-Chunk-Save-Reattempt.patch diff --git a/patches/server/0073-Complete-resource-pack-API.patch b/patches/server/0071-Complete-resource-pack-API.patch similarity index 100% rename from patches/server/0073-Complete-resource-pack-API.patch rename to patches/server/0071-Complete-resource-pack-API.patch diff --git a/patches/server/0074-Default-loading-permissions.yml-before-plugins.patch b/patches/server/0072-Default-loading-permissions.yml-before-plugins.patch similarity index 100% rename from patches/server/0074-Default-loading-permissions.yml-before-plugins.patch rename to patches/server/0072-Default-loading-permissions.yml-before-plugins.patch diff --git a/patches/server/0075-Allow-Reloading-of-Custom-Permissions.patch b/patches/server/0073-Allow-Reloading-of-Custom-Permissions.patch similarity index 100% rename from patches/server/0075-Allow-Reloading-of-Custom-Permissions.patch rename to patches/server/0073-Allow-Reloading-of-Custom-Permissions.patch diff --git a/patches/server/0076-Remove-Metadata-on-reload.patch b/patches/server/0074-Remove-Metadata-on-reload.patch similarity index 100% rename from patches/server/0076-Remove-Metadata-on-reload.patch rename to patches/server/0074-Remove-Metadata-on-reload.patch diff --git a/patches/server/0077-Handle-Item-Meta-Inconsistencies.patch b/patches/server/0075-Handle-Item-Meta-Inconsistencies.patch similarity index 100% rename from patches/server/0077-Handle-Item-Meta-Inconsistencies.patch rename to patches/server/0075-Handle-Item-Meta-Inconsistencies.patch diff --git a/patches/server/0078-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/server/0076-Configurable-Non-Player-Arrow-Despawn-Rate.patch similarity index 100% rename from patches/server/0078-Configurable-Non-Player-Arrow-Despawn-Rate.patch rename to patches/server/0076-Configurable-Non-Player-Arrow-Despawn-Rate.patch diff --git a/patches/server/0079-Add-World-Util-Methods.patch b/patches/server/0077-Add-World-Util-Methods.patch similarity index 100% rename from patches/server/0079-Add-World-Util-Methods.patch rename to patches/server/0077-Add-World-Util-Methods.patch diff --git a/patches/server/0080-Custom-replacement-for-eaten-items.patch b/patches/server/0078-Custom-replacement-for-eaten-items.patch similarity index 100% rename from patches/server/0080-Custom-replacement-for-eaten-items.patch rename to patches/server/0078-Custom-replacement-for-eaten-items.patch diff --git a/patches/server/0081-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0079-handle-NaN-health-absorb-values-and-repair-bad-data.patch similarity index 100% rename from patches/server/0081-handle-NaN-health-absorb-values-and-repair-bad-data.patch rename to patches/server/0079-handle-NaN-health-absorb-values-and-repair-bad-data.patch diff --git a/patches/server/0082-Use-a-Shared-Random-for-Entities.patch b/patches/server/0080-Use-a-Shared-Random-for-Entities.patch similarity index 100% rename from patches/server/0082-Use-a-Shared-Random-for-Entities.patch rename to patches/server/0080-Use-a-Shared-Random-for-Entities.patch diff --git a/patches/server/0083-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/server/0081-Configurable-spawn-chances-for-skeleton-horses.patch similarity index 100% rename from patches/server/0083-Configurable-spawn-chances-for-skeleton-horses.patch rename to patches/server/0081-Configurable-spawn-chances-for-skeleton-horses.patch diff --git a/patches/server/0084-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/server/0082-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch similarity index 100% rename from patches/server/0084-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch rename to patches/server/0082-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch diff --git a/patches/server/0085-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/server/0083-Entity-AddTo-RemoveFrom-World-Events.patch similarity index 100% rename from patches/server/0085-Entity-AddTo-RemoveFrom-World-Events.patch rename to patches/server/0083-Entity-AddTo-RemoveFrom-World-Events.patch diff --git a/patches/server/0086-Configurable-Chunk-Inhabited-Time.patch b/patches/server/0084-Configurable-Chunk-Inhabited-Time.patch similarity index 100% rename from patches/server/0086-Configurable-Chunk-Inhabited-Time.patch rename to patches/server/0084-Configurable-Chunk-Inhabited-Time.patch diff --git a/patches/server/0087-EntityPathfindEvent.patch b/patches/server/0085-EntityPathfindEvent.patch similarity index 100% rename from patches/server/0087-EntityPathfindEvent.patch rename to patches/server/0085-EntityPathfindEvent.patch diff --git a/patches/server/0088-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/server/0086-Sanitise-RegionFileCache-and-make-configurable.patch similarity index 100% rename from patches/server/0088-Sanitise-RegionFileCache-and-make-configurable.patch rename to patches/server/0086-Sanitise-RegionFileCache-and-make-configurable.patch diff --git a/patches/server/0089-Do-not-load-chunks-for-Pathfinding.patch b/patches/server/0087-Do-not-load-chunks-for-Pathfinding.patch similarity index 100% rename from patches/server/0089-Do-not-load-chunks-for-Pathfinding.patch rename to patches/server/0087-Do-not-load-chunks-for-Pathfinding.patch diff --git a/patches/server/0090-Add-PlayerUseUnknownEntityEvent.patch b/patches/server/0088-Add-PlayerUseUnknownEntityEvent.patch similarity index 100% rename from patches/server/0090-Add-PlayerUseUnknownEntityEvent.patch rename to patches/server/0088-Add-PlayerUseUnknownEntityEvent.patch diff --git a/patches/server/0091-Configurable-random-tick-rates-for-blocks.patch b/patches/server/0089-Configurable-random-tick-rates-for-blocks.patch similarity index 100% rename from patches/server/0091-Configurable-random-tick-rates-for-blocks.patch rename to patches/server/0089-Configurable-random-tick-rates-for-blocks.patch diff --git a/patches/server/0092-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/server/0090-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch similarity index 100% rename from patches/server/0092-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch rename to patches/server/0090-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch diff --git a/patches/server/0093-Optimize-DataBits.patch b/patches/server/0091-Optimize-DataBits.patch similarity index 100% rename from patches/server/0093-Optimize-DataBits.patch rename to patches/server/0091-Optimize-DataBits.patch diff --git a/patches/server/0094-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/server/0092-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch similarity index 100% rename from patches/server/0094-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch rename to patches/server/0092-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch diff --git a/patches/server/0095-Configurable-Player-Collision.patch b/patches/server/0093-Configurable-Player-Collision.patch similarity index 100% rename from patches/server/0095-Configurable-Player-Collision.patch rename to patches/server/0093-Configurable-Player-Collision.patch diff --git a/patches/server/0096-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/server/0094-Add-handshake-event-to-allow-plugins-to-handle-clien.patch similarity index 100% rename from patches/server/0096-Add-handshake-event-to-allow-plugins-to-handle-clien.patch rename to patches/server/0094-Add-handshake-event-to-allow-plugins-to-handle-clien.patch diff --git a/patches/server/0097-Configurable-RCON-IP-address.patch b/patches/server/0095-Configurable-RCON-IP-address.patch similarity index 100% rename from patches/server/0097-Configurable-RCON-IP-address.patch rename to patches/server/0095-Configurable-RCON-IP-address.patch diff --git a/patches/server/0098-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/server/0096-EntityRegainHealthEvent-isFastRegen-API.patch similarity index 100% rename from patches/server/0098-EntityRegainHealthEvent-isFastRegen-API.patch rename to patches/server/0096-EntityRegainHealthEvent-isFastRegen-API.patch diff --git a/patches/server/0099-Add-ability-to-configure-frosted_ice-properties.patch b/patches/server/0097-Add-ability-to-configure-frosted_ice-properties.patch similarity index 100% rename from patches/server/0099-Add-ability-to-configure-frosted_ice-properties.patch rename to patches/server/0097-Add-ability-to-configure-frosted_ice-properties.patch diff --git a/patches/server/0100-remove-null-possibility-for-getServer-singleton.patch b/patches/server/0098-remove-null-possibility-for-getServer-singleton.patch similarity index 100% rename from patches/server/0100-remove-null-possibility-for-getServer-singleton.patch rename to patches/server/0098-remove-null-possibility-for-getServer-singleton.patch diff --git a/patches/server/0101-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/server/0099-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch similarity index 100% rename from patches/server/0101-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch rename to patches/server/0099-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch diff --git a/patches/server/0102-LootTable-API-and-replenishable-lootables.patch b/patches/server/0100-LootTable-API-and-replenishable-lootables.patch similarity index 100% rename from patches/server/0102-LootTable-API-and-replenishable-lootables.patch rename to patches/server/0100-LootTable-API-and-replenishable-lootables.patch diff --git a/patches/server/0103-System-property-for-disabling-watchdoge.patch b/patches/server/0101-System-property-for-disabling-watchdoge.patch similarity index 100% rename from patches/server/0103-System-property-for-disabling-watchdoge.patch rename to patches/server/0101-System-property-for-disabling-watchdoge.patch diff --git a/patches/server/0104-Async-GameProfileCache-saving.patch b/patches/server/0102-Async-GameProfileCache-saving.patch similarity index 100% rename from patches/server/0104-Async-GameProfileCache-saving.patch rename to patches/server/0102-Async-GameProfileCache-saving.patch diff --git a/patches/server/0105-Optional-TNT-doesn-t-move-in-water.patch b/patches/server/0103-Optional-TNT-doesn-t-move-in-water.patch similarity index 100% rename from patches/server/0105-Optional-TNT-doesn-t-move-in-water.patch rename to patches/server/0103-Optional-TNT-doesn-t-move-in-water.patch diff --git a/patches/server/0106-Faster-redstone-torch-rapid-clock-removal.patch b/patches/server/0104-Faster-redstone-torch-rapid-clock-removal.patch similarity index 100% rename from patches/server/0106-Faster-redstone-torch-rapid-clock-removal.patch rename to patches/server/0104-Faster-redstone-torch-rapid-clock-removal.patch diff --git a/patches/server/0107-Add-server-name-parameter.patch b/patches/server/0105-Add-server-name-parameter.patch similarity index 100% rename from patches/server/0107-Add-server-name-parameter.patch rename to patches/server/0105-Add-server-name-parameter.patch diff --git a/patches/server/0108-Fix-global-sound-handling.patch b/patches/server/0106-Fix-global-sound-handling.patch similarity index 100% rename from patches/server/0108-Fix-global-sound-handling.patch rename to patches/server/0106-Fix-global-sound-handling.patch diff --git a/patches/server/0109-Avoid-blocking-on-Network-Manager-creation.patch b/patches/server/0107-Avoid-blocking-on-Network-Manager-creation.patch similarity index 100% rename from patches/server/0109-Avoid-blocking-on-Network-Manager-creation.patch rename to patches/server/0107-Avoid-blocking-on-Network-Manager-creation.patch diff --git a/patches/server/0110-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/server/0108-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch similarity index 100% rename from patches/server/0110-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch rename to patches/server/0108-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch diff --git a/patches/server/0111-Add-setting-for-proxy-online-mode-status.patch b/patches/server/0109-Add-setting-for-proxy-online-mode-status.patch similarity index 100% rename from patches/server/0111-Add-setting-for-proxy-online-mode-status.patch rename to patches/server/0109-Add-setting-for-proxy-online-mode-status.patch diff --git a/patches/server/0112-Optimise-BlockState-s-hashCode-equals.patch b/patches/server/0110-Optimise-BlockState-s-hashCode-equals.patch similarity index 100% rename from patches/server/0112-Optimise-BlockState-s-hashCode-equals.patch rename to patches/server/0110-Optimise-BlockState-s-hashCode-equals.patch diff --git a/patches/server/0113-Configurable-packet-in-spam-threshold.patch b/patches/server/0111-Configurable-packet-in-spam-threshold.patch similarity index 100% rename from patches/server/0113-Configurable-packet-in-spam-threshold.patch rename to patches/server/0111-Configurable-packet-in-spam-threshold.patch diff --git a/patches/server/0114-Configurable-flying-kick-messages.patch b/patches/server/0112-Configurable-flying-kick-messages.patch similarity index 100% rename from patches/server/0114-Configurable-flying-kick-messages.patch rename to patches/server/0112-Configurable-flying-kick-messages.patch diff --git a/patches/server/0115-Add-EntityZapEvent.patch b/patches/server/0113-Add-EntityZapEvent.patch similarity index 100% rename from patches/server/0115-Add-EntityZapEvent.patch rename to patches/server/0113-Add-EntityZapEvent.patch diff --git a/patches/server/0116-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch b/patches/server/0114-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch similarity index 100% rename from patches/server/0116-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch rename to patches/server/0114-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch diff --git a/patches/server/0117-Cache-user-authenticator-threads.patch b/patches/server/0115-Cache-user-authenticator-threads.patch similarity index 100% rename from patches/server/0117-Cache-user-authenticator-threads.patch rename to patches/server/0115-Cache-user-authenticator-threads.patch diff --git a/patches/server/0118-Allow-Reloading-of-Command-Aliases.patch b/patches/server/0116-Allow-Reloading-of-Command-Aliases.patch similarity index 100% rename from patches/server/0118-Allow-Reloading-of-Command-Aliases.patch rename to patches/server/0116-Allow-Reloading-of-Command-Aliases.patch diff --git a/patches/server/0119-Add-source-to-PlayerExpChangeEvent.patch b/patches/server/0117-Add-source-to-PlayerExpChangeEvent.patch similarity index 100% rename from patches/server/0119-Add-source-to-PlayerExpChangeEvent.patch rename to patches/server/0117-Add-source-to-PlayerExpChangeEvent.patch diff --git a/patches/server/0120-Add-ProjectileCollideEvent.patch b/patches/server/0118-Add-ProjectileCollideEvent.patch similarity index 100% rename from patches/server/0120-Add-ProjectileCollideEvent.patch rename to patches/server/0118-Add-ProjectileCollideEvent.patch diff --git a/patches/server/0121-Prevent-Pathfinding-out-of-World-Border.patch b/patches/server/0119-Prevent-Pathfinding-out-of-World-Border.patch similarity index 100% rename from patches/server/0121-Prevent-Pathfinding-out-of-World-Border.patch rename to patches/server/0119-Prevent-Pathfinding-out-of-World-Border.patch diff --git a/patches/server/0122-Optimize-Level.hasChunkAt-BlockPosition-Z.patch b/patches/server/0120-Optimize-Level.hasChunkAt-BlockPosition-Z.patch similarity index 100% rename from patches/server/0122-Optimize-Level.hasChunkAt-BlockPosition-Z.patch rename to patches/server/0120-Optimize-Level.hasChunkAt-BlockPosition-Z.patch diff --git a/patches/server/0123-Bound-Treasure-Maps-to-World-Border.patch b/patches/server/0121-Bound-Treasure-Maps-to-World-Border.patch similarity index 100% rename from patches/server/0123-Bound-Treasure-Maps-to-World-Border.patch rename to patches/server/0121-Bound-Treasure-Maps-to-World-Border.patch diff --git a/patches/server/0124-Configurable-Cartographer-Treasure-Maps.patch b/patches/server/0122-Configurable-Cartographer-Treasure-Maps.patch similarity index 100% rename from patches/server/0124-Configurable-Cartographer-Treasure-Maps.patch rename to patches/server/0122-Configurable-Cartographer-Treasure-Maps.patch diff --git a/patches/server/0125-Add-API-methods-to-control-if-armor-stands-can-move.patch b/patches/server/0123-Add-API-methods-to-control-if-armor-stands-can-move.patch similarity index 100% rename from patches/server/0125-Add-API-methods-to-control-if-armor-stands-can-move.patch rename to patches/server/0123-Add-API-methods-to-control-if-armor-stands-can-move.patch diff --git a/patches/server/0126-String-based-Action-Bar-API.patch b/patches/server/0124-String-based-Action-Bar-API.patch similarity index 100% rename from patches/server/0126-String-based-Action-Bar-API.patch rename to patches/server/0124-String-based-Action-Bar-API.patch diff --git a/patches/server/0127-Properly-fix-item-duplication-bug.patch b/patches/server/0125-Properly-fix-item-duplication-bug.patch similarity index 100% rename from patches/server/0127-Properly-fix-item-duplication-bug.patch rename to patches/server/0125-Properly-fix-item-duplication-bug.patch diff --git a/patches/server/0128-Firework-API-s.patch b/patches/server/0126-Firework-API-s.patch similarity index 100% rename from patches/server/0128-Firework-API-s.patch rename to patches/server/0126-Firework-API-s.patch diff --git a/patches/server/0129-PlayerTeleportEndGatewayEvent.patch b/patches/server/0127-PlayerTeleportEndGatewayEvent.patch similarity index 100% rename from patches/server/0129-PlayerTeleportEndGatewayEvent.patch rename to patches/server/0127-PlayerTeleportEndGatewayEvent.patch diff --git a/patches/server/0130-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/server/0128-Provide-E-TE-Chunk-count-stat-methods.patch similarity index 100% rename from patches/server/0130-Provide-E-TE-Chunk-count-stat-methods.patch rename to patches/server/0128-Provide-E-TE-Chunk-count-stat-methods.patch diff --git a/patches/server/0131-Enforce-Sync-Player-Saves.patch b/patches/server/0129-Enforce-Sync-Player-Saves.patch similarity index 100% rename from patches/server/0131-Enforce-Sync-Player-Saves.patch rename to patches/server/0129-Enforce-Sync-Player-Saves.patch diff --git a/patches/server/0132-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0130-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch similarity index 100% rename from patches/server/0132-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch rename to patches/server/0130-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch diff --git a/patches/server/0133-Cap-Entity-Collisions.patch b/patches/server/0131-Cap-Entity-Collisions.patch similarity index 100% rename from patches/server/0133-Cap-Entity-Collisions.patch rename to patches/server/0131-Cap-Entity-Collisions.patch diff --git a/patches/server/0134-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/server/0132-Remove-CraftScheduler-Async-Task-Debugger.patch similarity index 100% rename from patches/server/0134-Remove-CraftScheduler-Async-Task-Debugger.patch rename to patches/server/0132-Remove-CraftScheduler-Async-Task-Debugger.patch diff --git a/patches/server/0135-Properly-handle-async-calls-to-restart-the-server.patch b/patches/server/0133-Properly-handle-async-calls-to-restart-the-server.patch similarity index 100% rename from patches/server/0135-Properly-handle-async-calls-to-restart-the-server.patch rename to patches/server/0133-Properly-handle-async-calls-to-restart-the-server.patch diff --git a/patches/server/0136-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/server/0134-Add-option-to-make-parrots-stay-on-shoulders-despite.patch similarity index 100% rename from patches/server/0136-Add-option-to-make-parrots-stay-on-shoulders-despite.patch rename to patches/server/0134-Add-option-to-make-parrots-stay-on-shoulders-despite.patch diff --git a/patches/server/0137-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/server/0135-Add-configuration-option-to-prevent-player-names-fro.patch similarity index 100% rename from patches/server/0137-Add-configuration-option-to-prevent-player-names-fro.patch rename to patches/server/0135-Add-configuration-option-to-prevent-player-names-fro.patch diff --git a/patches/server/0138-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/server/0136-provide-a-configurable-option-to-disable-creeper-lin.patch similarity index 100% rename from patches/server/0138-provide-a-configurable-option-to-disable-creeper-lin.patch rename to patches/server/0136-provide-a-configurable-option-to-disable-creeper-lin.patch diff --git a/patches/server/0139-Item-canEntityPickup.patch b/patches/server/0137-Item-canEntityPickup.patch similarity index 100% rename from patches/server/0139-Item-canEntityPickup.patch rename to patches/server/0137-Item-canEntityPickup.patch diff --git a/patches/server/0140-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/server/0138-PlayerPickupItemEvent-setFlyAtPlayer.patch similarity index 100% rename from patches/server/0140-PlayerPickupItemEvent-setFlyAtPlayer.patch rename to patches/server/0138-PlayerPickupItemEvent-setFlyAtPlayer.patch diff --git a/patches/server/0141-PlayerAttemptPickupItemEvent.patch b/patches/server/0139-PlayerAttemptPickupItemEvent.patch similarity index 100% rename from patches/server/0141-PlayerAttemptPickupItemEvent.patch rename to patches/server/0139-PlayerAttemptPickupItemEvent.patch diff --git a/patches/server/0142-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0140-Do-not-submit-profile-lookups-to-worldgen-threads.patch similarity index 100% rename from patches/server/0142-Do-not-submit-profile-lookups-to-worldgen-threads.patch rename to patches/server/0140-Do-not-submit-profile-lookups-to-worldgen-threads.patch diff --git a/patches/server/0143-Basic-PlayerProfile-API.patch b/patches/server/0141-Basic-PlayerProfile-API.patch similarity index 100% rename from patches/server/0143-Basic-PlayerProfile-API.patch rename to patches/server/0141-Basic-PlayerProfile-API.patch diff --git a/patches/server/0144-Add-UnknownCommandEvent.patch b/patches/server/0142-Add-UnknownCommandEvent.patch similarity index 100% rename from patches/server/0144-Add-UnknownCommandEvent.patch rename to patches/server/0142-Add-UnknownCommandEvent.patch diff --git a/patches/server/0145-Shoulder-Entities-Release-API.patch b/patches/server/0143-Shoulder-Entities-Release-API.patch similarity index 100% rename from patches/server/0145-Shoulder-Entities-Release-API.patch rename to patches/server/0143-Shoulder-Entities-Release-API.patch diff --git a/patches/server/0146-Profile-Lookup-Events.patch b/patches/server/0144-Profile-Lookup-Events.patch similarity index 100% rename from patches/server/0146-Profile-Lookup-Events.patch rename to patches/server/0144-Profile-Lookup-Events.patch diff --git a/patches/server/0147-Block-player-logins-during-server-shutdown.patch b/patches/server/0145-Block-player-logins-during-server-shutdown.patch similarity index 100% rename from patches/server/0147-Block-player-logins-during-server-shutdown.patch rename to patches/server/0145-Block-player-logins-during-server-shutdown.patch diff --git a/patches/server/0148-Entity-fromMobSpawner.patch b/patches/server/0146-Entity-fromMobSpawner.patch similarity index 100% rename from patches/server/0148-Entity-fromMobSpawner.patch rename to patches/server/0146-Entity-fromMobSpawner.patch diff --git a/patches/server/0149-Improve-the-Saddle-API-for-Horses.patch b/patches/server/0147-Improve-the-Saddle-API-for-Horses.patch similarity index 100% rename from patches/server/0149-Improve-the-Saddle-API-for-Horses.patch rename to patches/server/0147-Improve-the-Saddle-API-for-Horses.patch diff --git a/patches/server/0150-ensureServerConversions-API.patch b/patches/server/0148-ensureServerConversions-API.patch similarity index 100% rename from patches/server/0150-ensureServerConversions-API.patch rename to patches/server/0148-ensureServerConversions-API.patch diff --git a/patches/server/0151-Implement-getI18NDisplayName.patch b/patches/server/0149-Implement-getI18NDisplayName.patch similarity index 100% rename from patches/server/0151-Implement-getI18NDisplayName.patch rename to patches/server/0149-Implement-getI18NDisplayName.patch diff --git a/patches/server/0152-ProfileWhitelistVerifyEvent.patch b/patches/server/0150-ProfileWhitelistVerifyEvent.patch similarity index 100% rename from patches/server/0152-ProfileWhitelistVerifyEvent.patch rename to patches/server/0150-ProfileWhitelistVerifyEvent.patch diff --git a/patches/server/0153-Fix-this-stupid-bullshit.patch b/patches/server/0151-Fix-this-stupid-bullshit.patch similarity index 100% rename from patches/server/0153-Fix-this-stupid-bullshit.patch rename to patches/server/0151-Fix-this-stupid-bullshit.patch diff --git a/patches/server/0154-LivingEntity-setKiller.patch b/patches/server/0152-LivingEntity-setKiller.patch similarity index 100% rename from patches/server/0154-LivingEntity-setKiller.patch rename to patches/server/0152-LivingEntity-setKiller.patch diff --git a/patches/server/0155-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/server/0153-Ocelot-despawns-should-honor-nametags-and-leash.patch similarity index 100% rename from patches/server/0155-Ocelot-despawns-should-honor-nametags-and-leash.patch rename to patches/server/0153-Ocelot-despawns-should-honor-nametags-and-leash.patch diff --git a/patches/server/0156-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/server/0154-Reset-spawner-timer-when-spawner-event-is-cancelled.patch similarity index 100% rename from patches/server/0156-Reset-spawner-timer-when-spawner-event-is-cancelled.patch rename to patches/server/0154-Reset-spawner-timer-when-spawner-event-is-cancelled.patch diff --git a/patches/server/0157-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/server/0155-Allow-specifying-a-custom-authentication-servers-dow.patch similarity index 100% rename from patches/server/0157-Allow-specifying-a-custom-authentication-servers-dow.patch rename to patches/server/0155-Allow-specifying-a-custom-authentication-servers-dow.patch diff --git a/patches/server/0158-Add-PlayerJumpEvent.patch b/patches/server/0156-Add-PlayerJumpEvent.patch similarity index 100% rename from patches/server/0158-Add-PlayerJumpEvent.patch rename to patches/server/0156-Add-PlayerJumpEvent.patch diff --git a/patches/server/0159-handle-ServerboundKeepAlivePacket-async.patch b/patches/server/0157-handle-ServerboundKeepAlivePacket-async.patch similarity index 100% rename from patches/server/0159-handle-ServerboundKeepAlivePacket-async.patch rename to patches/server/0157-handle-ServerboundKeepAlivePacket-async.patch diff --git a/patches/server/0160-Expose-client-protocol-version-and-virtual-host.patch b/patches/server/0158-Expose-client-protocol-version-and-virtual-host.patch similarity index 100% rename from patches/server/0160-Expose-client-protocol-version-and-virtual-host.patch rename to patches/server/0158-Expose-client-protocol-version-and-virtual-host.patch diff --git a/patches/server/0161-revert-serverside-behavior-of-keepalives.patch b/patches/server/0159-revert-serverside-behavior-of-keepalives.patch similarity index 100% rename from patches/server/0161-revert-serverside-behavior-of-keepalives.patch rename to patches/server/0159-revert-serverside-behavior-of-keepalives.patch diff --git a/patches/server/0162-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/server/0160-Send-attack-SoundEffects-only-to-players-who-can-see.patch similarity index 100% rename from patches/server/0162-Send-attack-SoundEffects-only-to-players-who-can-see.patch rename to patches/server/0160-Send-attack-SoundEffects-only-to-players-who-can-see.patch diff --git a/patches/server/0163-Add-PlayerArmorChangeEvent.patch b/patches/server/0161-Add-PlayerArmorChangeEvent.patch similarity index 100% rename from patches/server/0163-Add-PlayerArmorChangeEvent.patch rename to patches/server/0161-Add-PlayerArmorChangeEvent.patch diff --git a/patches/server/0164-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/server/0162-Prevent-logins-from-being-processed-when-the-player-.patch similarity index 100% rename from patches/server/0164-Prevent-logins-from-being-processed-when-the-player-.patch rename to patches/server/0162-Prevent-logins-from-being-processed-when-the-player-.patch diff --git a/patches/server/0165-Fix-MC-117075-Block-entity-unload-lag-spike.patch b/patches/server/0163-Fix-MC-117075-Block-entity-unload-lag-spike.patch similarity index 100% rename from patches/server/0165-Fix-MC-117075-Block-entity-unload-lag-spike.patch rename to patches/server/0163-Fix-MC-117075-Block-entity-unload-lag-spike.patch diff --git a/patches/server/0166-use-CB-BlockState-implementations-for-captured-block.patch b/patches/server/0164-use-CB-BlockState-implementations-for-captured-block.patch similarity index 100% rename from patches/server/0166-use-CB-BlockState-implementations-for-captured-block.patch rename to patches/server/0164-use-CB-BlockState-implementations-for-captured-block.patch diff --git a/patches/server/0167-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/server/0165-API-to-get-a-BlockState-without-a-snapshot.patch similarity index 100% rename from patches/server/0167-API-to-get-a-BlockState-without-a-snapshot.patch rename to patches/server/0165-API-to-get-a-BlockState-without-a-snapshot.patch diff --git a/patches/server/0168-AsyncTabCompleteEvent.patch b/patches/server/0166-AsyncTabCompleteEvent.patch similarity index 100% rename from patches/server/0168-AsyncTabCompleteEvent.patch rename to patches/server/0166-AsyncTabCompleteEvent.patch diff --git a/patches/server/0169-PlayerPickupExperienceEvent.patch b/patches/server/0167-PlayerPickupExperienceEvent.patch similarity index 100% rename from patches/server/0169-PlayerPickupExperienceEvent.patch rename to patches/server/0167-PlayerPickupExperienceEvent.patch diff --git a/patches/server/0170-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0168-Ability-to-apply-mending-to-XP-API.patch similarity index 100% rename from patches/server/0170-Ability-to-apply-mending-to-XP-API.patch rename to patches/server/0168-Ability-to-apply-mending-to-XP-API.patch diff --git a/patches/server/0171-PlayerNaturallySpawnCreaturesEvent.patch b/patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch similarity index 100% rename from patches/server/0171-PlayerNaturallySpawnCreaturesEvent.patch rename to patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch diff --git a/patches/server/0172-Add-setPlayerProfile-API-for-Skulls.patch b/patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch similarity index 100% rename from patches/server/0172-Add-setPlayerProfile-API-for-Skulls.patch rename to patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch diff --git a/patches/server/0173-PreCreatureSpawnEvent.patch b/patches/server/0171-PreCreatureSpawnEvent.patch similarity index 100% rename from patches/server/0173-PreCreatureSpawnEvent.patch rename to patches/server/0171-PreCreatureSpawnEvent.patch diff --git a/patches/server/0174-Fill-Profile-Property-Events.patch b/patches/server/0172-Fill-Profile-Property-Events.patch similarity index 100% rename from patches/server/0174-Fill-Profile-Property-Events.patch rename to patches/server/0172-Fill-Profile-Property-Events.patch diff --git a/patches/server/0175-Add-PlayerAdvancementCriterionGrantEvent.patch b/patches/server/0173-Add-PlayerAdvancementCriterionGrantEvent.patch similarity index 100% rename from patches/server/0175-Add-PlayerAdvancementCriterionGrantEvent.patch rename to patches/server/0173-Add-PlayerAdvancementCriterionGrantEvent.patch diff --git a/patches/server/0176-Add-ArmorStand-Item-Meta.patch b/patches/server/0174-Add-ArmorStand-Item-Meta.patch similarity index 100% rename from patches/server/0176-Add-ArmorStand-Item-Meta.patch rename to patches/server/0174-Add-ArmorStand-Item-Meta.patch diff --git a/patches/server/0177-Extend-Player-Interact-cancellation.patch b/patches/server/0175-Extend-Player-Interact-cancellation.patch similarity index 100% rename from patches/server/0177-Extend-Player-Interact-cancellation.patch rename to patches/server/0175-Extend-Player-Interact-cancellation.patch diff --git a/patches/server/0178-Tameable-getOwnerUniqueId-API.patch b/patches/server/0176-Tameable-getOwnerUniqueId-API.patch similarity index 100% rename from patches/server/0178-Tameable-getOwnerUniqueId-API.patch rename to patches/server/0176-Tameable-getOwnerUniqueId-API.patch diff --git a/patches/server/0179-Toggleable-player-crits.patch b/patches/server/0177-Toggleable-player-crits.patch similarity index 100% rename from patches/server/0179-Toggleable-player-crits.patch rename to patches/server/0177-Toggleable-player-crits.patch diff --git a/patches/server/0180-Disable-Explicit-Network-Manager-Flushing.patch b/patches/server/0178-Disable-Explicit-Network-Manager-Flushing.patch similarity index 100% rename from patches/server/0180-Disable-Explicit-Network-Manager-Flushing.patch rename to patches/server/0178-Disable-Explicit-Network-Manager-Flushing.patch diff --git a/patches/server/0181-Implement-extended-PaperServerListPingEvent.patch b/patches/server/0179-Implement-extended-PaperServerListPingEvent.patch similarity index 100% rename from patches/server/0181-Implement-extended-PaperServerListPingEvent.patch rename to patches/server/0179-Implement-extended-PaperServerListPingEvent.patch diff --git a/patches/server/0182-Add-more-fields-to-AsyncPreLoginEvent.patch b/patches/server/0180-Add-more-fields-to-AsyncPreLoginEvent.patch similarity index 100% rename from patches/server/0182-Add-more-fields-to-AsyncPreLoginEvent.patch rename to patches/server/0180-Add-more-fields-to-AsyncPreLoginEvent.patch diff --git a/patches/server/0183-Player.setPlayerProfile-API.patch b/patches/server/0181-Player.setPlayerProfile-API.patch similarity index 100% rename from patches/server/0183-Player.setPlayerProfile-API.patch rename to patches/server/0181-Player.setPlayerProfile-API.patch diff --git a/patches/server/0184-getPlayerUniqueId-API.patch b/patches/server/0182-getPlayerUniqueId-API.patch similarity index 100% rename from patches/server/0184-getPlayerUniqueId-API.patch rename to patches/server/0182-getPlayerUniqueId-API.patch diff --git a/patches/server/0185-Improved-Async-Task-Scheduler.patch b/patches/server/0183-Improved-Async-Task-Scheduler.patch similarity index 100% rename from patches/server/0185-Improved-Async-Task-Scheduler.patch rename to patches/server/0183-Improved-Async-Task-Scheduler.patch diff --git a/patches/server/0186-Make-legacy-ping-handler-more-reliable.patch b/patches/server/0184-Make-legacy-ping-handler-more-reliable.patch similarity index 100% rename from patches/server/0186-Make-legacy-ping-handler-more-reliable.patch rename to patches/server/0184-Make-legacy-ping-handler-more-reliable.patch diff --git a/patches/server/0187-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch similarity index 100% rename from patches/server/0187-Call-PaperServerListPingEvent-for-legacy-pings.patch rename to patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch diff --git a/patches/server/0188-Flag-to-disable-the-channel-limit.patch b/patches/server/0186-Flag-to-disable-the-channel-limit.patch similarity index 100% rename from patches/server/0188-Flag-to-disable-the-channel-limit.patch rename to patches/server/0186-Flag-to-disable-the-channel-limit.patch diff --git a/patches/server/0189-Add-openSign-method-to-HumanEntity.patch b/patches/server/0187-Add-openSign-method-to-HumanEntity.patch similarity index 100% rename from patches/server/0189-Add-openSign-method-to-HumanEntity.patch rename to patches/server/0187-Add-openSign-method-to-HumanEntity.patch diff --git a/patches/server/0190-Configurable-sprint-interruption-on-attack.patch b/patches/server/0188-Configurable-sprint-interruption-on-attack.patch similarity index 100% rename from patches/server/0190-Configurable-sprint-interruption-on-attack.patch rename to patches/server/0188-Configurable-sprint-interruption-on-attack.patch diff --git a/patches/server/0191-EndermanEscapeEvent.patch b/patches/server/0189-EndermanEscapeEvent.patch similarity index 100% rename from patches/server/0191-EndermanEscapeEvent.patch rename to patches/server/0189-EndermanEscapeEvent.patch diff --git a/patches/server/0192-Enderman.teleportRandomly.patch b/patches/server/0190-Enderman.teleportRandomly.patch similarity index 100% rename from patches/server/0192-Enderman.teleportRandomly.patch rename to patches/server/0190-Enderman.teleportRandomly.patch diff --git a/patches/server/0193-Block-Enderpearl-Travel-Exploit.patch b/patches/server/0191-Block-Enderpearl-Travel-Exploit.patch similarity index 100% rename from patches/server/0193-Block-Enderpearl-Travel-Exploit.patch rename to patches/server/0191-Block-Enderpearl-Travel-Exploit.patch diff --git a/patches/server/0194-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch similarity index 100% rename from patches/server/0194-Expand-World.spawnParticle-API-and-add-Builder.patch rename to patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch diff --git a/patches/server/0195-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch similarity index 100% rename from patches/server/0195-Fix-exploit-that-allowed-colored-signs-to-be-created.patch rename to patches/server/0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch diff --git a/patches/server/0196-EndermanAttackPlayerEvent.patch b/patches/server/0194-EndermanAttackPlayerEvent.patch similarity index 100% rename from patches/server/0196-EndermanAttackPlayerEvent.patch rename to patches/server/0194-EndermanAttackPlayerEvent.patch diff --git a/patches/server/0197-WitchConsumePotionEvent.patch b/patches/server/0195-WitchConsumePotionEvent.patch similarity index 100% rename from patches/server/0197-WitchConsumePotionEvent.patch rename to patches/server/0195-WitchConsumePotionEvent.patch diff --git a/patches/server/0198-WitchThrowPotionEvent.patch b/patches/server/0196-WitchThrowPotionEvent.patch similarity index 100% rename from patches/server/0198-WitchThrowPotionEvent.patch rename to patches/server/0196-WitchThrowPotionEvent.patch diff --git a/patches/server/0199-WitchReadyPotionEvent.patch b/patches/server/0197-WitchReadyPotionEvent.patch similarity index 100% rename from patches/server/0199-WitchReadyPotionEvent.patch rename to patches/server/0197-WitchReadyPotionEvent.patch diff --git a/patches/server/0200-ItemStack-getMaxItemUseDuration.patch b/patches/server/0198-ItemStack-getMaxItemUseDuration.patch similarity index 100% rename from patches/server/0200-ItemStack-getMaxItemUseDuration.patch rename to patches/server/0198-ItemStack-getMaxItemUseDuration.patch diff --git a/patches/server/0201-Add-EntityTeleportEndGatewayEvent.patch b/patches/server/0199-Add-EntityTeleportEndGatewayEvent.patch similarity index 100% rename from patches/server/0201-Add-EntityTeleportEndGatewayEvent.patch rename to patches/server/0199-Add-EntityTeleportEndGatewayEvent.patch diff --git a/patches/server/0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/server/0200-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch similarity index 100% rename from patches/server/0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch rename to patches/server/0200-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch diff --git a/patches/server/0203-Fix-CraftEntity-hashCode.patch b/patches/server/0201-Fix-CraftEntity-hashCode.patch similarity index 100% rename from patches/server/0203-Fix-CraftEntity-hashCode.patch rename to patches/server/0201-Fix-CraftEntity-hashCode.patch diff --git a/patches/server/0204-Configurable-LootPool-luck-formula.patch b/patches/server/0202-Configurable-LootPool-luck-formula.patch similarity index 100% rename from patches/server/0204-Configurable-LootPool-luck-formula.patch rename to patches/server/0202-Configurable-LootPool-luck-formula.patch diff --git a/patches/server/0205-Print-Error-details-when-failing-to-save-player-data.patch b/patches/server/0203-Print-Error-details-when-failing-to-save-player-data.patch similarity index 100% rename from patches/server/0205-Print-Error-details-when-failing-to-save-player-data.patch rename to patches/server/0203-Print-Error-details-when-failing-to-save-player-data.patch diff --git a/patches/server/0206-Make-shield-blocking-delay-configurable.patch b/patches/server/0204-Make-shield-blocking-delay-configurable.patch similarity index 100% rename from patches/server/0206-Make-shield-blocking-delay-configurable.patch rename to patches/server/0204-Make-shield-blocking-delay-configurable.patch diff --git a/patches/server/0207-Improve-EntityShootBowEvent.patch b/patches/server/0205-Improve-EntityShootBowEvent.patch similarity index 100% rename from patches/server/0207-Improve-EntityShootBowEvent.patch rename to patches/server/0205-Improve-EntityShootBowEvent.patch diff --git a/patches/server/0208-PlayerReadyArrowEvent.patch b/patches/server/0206-PlayerReadyArrowEvent.patch similarity index 100% rename from patches/server/0208-PlayerReadyArrowEvent.patch rename to patches/server/0206-PlayerReadyArrowEvent.patch diff --git a/patches/server/0209-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch b/patches/server/0207-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch similarity index 100% rename from patches/server/0209-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch rename to patches/server/0207-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch diff --git a/patches/server/0210-Expand-Explosions-API.patch b/patches/server/0208-Expand-Explosions-API.patch similarity index 100% rename from patches/server/0210-Expand-Explosions-API.patch rename to patches/server/0208-Expand-Explosions-API.patch diff --git a/patches/server/0211-LivingEntity-Active-Item-API.patch b/patches/server/0209-LivingEntity-Active-Item-API.patch similarity index 100% rename from patches/server/0211-LivingEntity-Active-Item-API.patch rename to patches/server/0209-LivingEntity-Active-Item-API.patch diff --git a/patches/server/0212-RangedEntity-API.patch b/patches/server/0210-RangedEntity-API.patch similarity index 100% rename from patches/server/0212-RangedEntity-API.patch rename to patches/server/0210-RangedEntity-API.patch diff --git a/patches/server/0213-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/server/0211-Add-config-to-disable-ender-dragon-legacy-check.patch similarity index 100% rename from patches/server/0213-Add-config-to-disable-ender-dragon-legacy-check.patch rename to patches/server/0211-Add-config-to-disable-ender-dragon-legacy-check.patch diff --git a/patches/server/0214-Implement-World.getEntity-UUID-API.patch b/patches/server/0212-Implement-World.getEntity-UUID-API.patch similarity index 100% rename from patches/server/0214-Implement-World.getEntity-UUID-API.patch rename to patches/server/0212-Implement-World.getEntity-UUID-API.patch diff --git a/patches/server/0215-InventoryCloseEvent-Reason-API.patch b/patches/server/0213-InventoryCloseEvent-Reason-API.patch similarity index 100% rename from patches/server/0215-InventoryCloseEvent-Reason-API.patch rename to patches/server/0213-InventoryCloseEvent-Reason-API.patch diff --git a/patches/server/0216-Vex-get-setSummoner-API.patch b/patches/server/0214-Vex-get-setSummoner-API.patch similarity index 100% rename from patches/server/0216-Vex-get-setSummoner-API.patch rename to patches/server/0214-Vex-get-setSummoner-API.patch diff --git a/patches/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0215-Refresh-player-inventory-when-cancelling-PlayerInter.patch similarity index 100% rename from patches/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch rename to patches/server/0215-Refresh-player-inventory-when-cancelling-PlayerInter.patch diff --git a/patches/server/0218-add-more-information-to-Entity.toString.patch b/patches/server/0216-add-more-information-to-Entity.toString.patch similarity index 100% rename from patches/server/0218-add-more-information-to-Entity.toString.patch rename to patches/server/0216-add-more-information-to-Entity.toString.patch diff --git a/patches/server/0219-EnderDragon-Events.patch b/patches/server/0217-EnderDragon-Events.patch similarity index 100% rename from patches/server/0219-EnderDragon-Events.patch rename to patches/server/0217-EnderDragon-Events.patch diff --git a/patches/server/0220-PlayerElytraBoostEvent.patch b/patches/server/0218-PlayerElytraBoostEvent.patch similarity index 100% rename from patches/server/0220-PlayerElytraBoostEvent.patch rename to patches/server/0218-PlayerElytraBoostEvent.patch diff --git a/patches/server/0221-PlayerLaunchProjectileEvent.patch b/patches/server/0219-PlayerLaunchProjectileEvent.patch similarity index 100% rename from patches/server/0221-PlayerLaunchProjectileEvent.patch rename to patches/server/0219-PlayerLaunchProjectileEvent.patch diff --git a/patches/server/0222-Improve-BlockPosition-inlining.patch b/patches/server/0220-Improve-BlockPosition-inlining.patch similarity index 100% rename from patches/server/0222-Improve-BlockPosition-inlining.patch rename to patches/server/0220-Improve-BlockPosition-inlining.patch diff --git a/patches/server/0223-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0221-Option-to-prevent-armor-stands-from-doing-entity-loo.patch similarity index 100% rename from patches/server/0223-Option-to-prevent-armor-stands-from-doing-entity-loo.patch rename to patches/server/0221-Option-to-prevent-armor-stands-from-doing-entity-loo.patch diff --git a/patches/server/0224-Vanished-players-don-t-have-rights.patch b/patches/server/0222-Vanished-players-don-t-have-rights.patch similarity index 100% rename from patches/server/0224-Vanished-players-don-t-have-rights.patch rename to patches/server/0222-Vanished-players-don-t-have-rights.patch diff --git a/patches/server/0225-Allow-disabling-armor-stand-ticking.patch b/patches/server/0223-Allow-disabling-armor-stand-ticking.patch similarity index 100% rename from patches/server/0225-Allow-disabling-armor-stand-ticking.patch rename to patches/server/0223-Allow-disabling-armor-stand-ticking.patch diff --git a/patches/server/0226-SkeletonHorse-Additions.patch b/patches/server/0224-SkeletonHorse-Additions.patch similarity index 100% rename from patches/server/0226-SkeletonHorse-Additions.patch rename to patches/server/0224-SkeletonHorse-Additions.patch diff --git a/patches/server/0227-Expand-ArmorStand-API.patch b/patches/server/0225-Expand-ArmorStand-API.patch similarity index 100% rename from patches/server/0227-Expand-ArmorStand-API.patch rename to patches/server/0225-Expand-ArmorStand-API.patch diff --git a/patches/server/0228-AnvilDamageEvent.patch b/patches/server/0226-AnvilDamageEvent.patch similarity index 100% rename from patches/server/0228-AnvilDamageEvent.patch rename to patches/server/0226-AnvilDamageEvent.patch diff --git a/patches/server/0229-Add-TNTPrimeEvent.patch b/patches/server/0227-Add-TNTPrimeEvent.patch similarity index 100% rename from patches/server/0229-Add-TNTPrimeEvent.patch rename to patches/server/0227-Add-TNTPrimeEvent.patch diff --git a/patches/server/0230-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0228-Break-up-and-make-tab-spam-limits-configurable.patch similarity index 100% rename from patches/server/0230-Break-up-and-make-tab-spam-limits-configurable.patch rename to patches/server/0228-Break-up-and-make-tab-spam-limits-configurable.patch diff --git a/patches/server/0231-Fix-NBT-type-issues.patch b/patches/server/0229-Fix-NBT-type-issues.patch similarity index 100% rename from patches/server/0231-Fix-NBT-type-issues.patch rename to patches/server/0229-Fix-NBT-type-issues.patch diff --git a/patches/server/0232-Remove-unnecessary-itemmeta-handling.patch b/patches/server/0230-Remove-unnecessary-itemmeta-handling.patch similarity index 100% rename from patches/server/0232-Remove-unnecessary-itemmeta-handling.patch rename to patches/server/0230-Remove-unnecessary-itemmeta-handling.patch diff --git a/patches/server/0233-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0231-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch similarity index 100% rename from patches/server/0233-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch rename to patches/server/0231-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch diff --git a/patches/server/0234-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0232-Add-Early-Warning-Feature-to-WatchDog.patch similarity index 100% rename from patches/server/0234-Add-Early-Warning-Feature-to-WatchDog.patch rename to patches/server/0232-Add-Early-Warning-Feature-to-WatchDog.patch diff --git a/patches/server/0235-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0233-Use-ConcurrentHashMap-in-JsonList.patch similarity index 100% rename from patches/server/0235-Use-ConcurrentHashMap-in-JsonList.patch rename to patches/server/0233-Use-ConcurrentHashMap-in-JsonList.patch diff --git a/patches/server/0236-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0234-Use-a-Queue-for-Queueing-Commands.patch similarity index 100% rename from patches/server/0236-Use-a-Queue-for-Queueing-Commands.patch rename to patches/server/0234-Use-a-Queue-for-Queueing-Commands.patch diff --git a/patches/server/0237-Ability-to-get-block-entities-from-a-chunk-without-s.patch b/patches/server/0235-Ability-to-get-block-entities-from-a-chunk-without-s.patch similarity index 100% rename from patches/server/0237-Ability-to-get-block-entities-from-a-chunk-without-s.patch rename to patches/server/0235-Ability-to-get-block-entities-from-a-chunk-without-s.patch diff --git a/patches/server/0238-Optimize-BlockPosition-helper-methods.patch b/patches/server/0236-Optimize-BlockPosition-helper-methods.patch similarity index 100% rename from patches/server/0238-Optimize-BlockPosition-helper-methods.patch rename to patches/server/0236-Optimize-BlockPosition-helper-methods.patch diff --git a/patches/server/0239-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/server/0237-Restore-vanilla-default-mob-spawn-range-and-water-an.patch similarity index 100% rename from patches/server/0239-Restore-vanilla-default-mob-spawn-range-and-water-an.patch rename to patches/server/0237-Restore-vanilla-default-mob-spawn-range-and-water-an.patch diff --git a/patches/server/0240-Slime-Pathfinder-Events.patch b/patches/server/0238-Slime-Pathfinder-Events.patch similarity index 100% rename from patches/server/0240-Slime-Pathfinder-Events.patch rename to patches/server/0238-Slime-Pathfinder-Events.patch diff --git a/patches/server/0241-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0239-Configurable-speed-for-water-flowing-over-lava.patch similarity index 100% rename from patches/server/0241-Configurable-speed-for-water-flowing-over-lava.patch rename to patches/server/0239-Configurable-speed-for-water-flowing-over-lava.patch diff --git a/patches/server/0242-Optimize-CraftBlockData-Creation.patch b/patches/server/0240-Optimize-CraftBlockData-Creation.patch similarity index 100% rename from patches/server/0242-Optimize-CraftBlockData-Creation.patch rename to patches/server/0240-Optimize-CraftBlockData-Creation.patch diff --git a/patches/server/0243-Optimize-MappedRegistry.patch b/patches/server/0241-Optimize-MappedRegistry.patch similarity index 100% rename from patches/server/0243-Optimize-MappedRegistry.patch rename to patches/server/0241-Optimize-MappedRegistry.patch diff --git a/patches/server/0244-Add-PhantomPreSpawnEvent.patch b/patches/server/0242-Add-PhantomPreSpawnEvent.patch similarity index 100% rename from patches/server/0244-Add-PhantomPreSpawnEvent.patch rename to patches/server/0242-Add-PhantomPreSpawnEvent.patch diff --git a/patches/server/0245-Add-More-Creeper-API.patch b/patches/server/0243-Add-More-Creeper-API.patch similarity index 100% rename from patches/server/0245-Add-More-Creeper-API.patch rename to patches/server/0243-Add-More-Creeper-API.patch diff --git a/patches/server/0246-Inventory-removeItemAnySlot.patch b/patches/server/0244-Inventory-removeItemAnySlot.patch similarity index 100% rename from patches/server/0246-Inventory-removeItemAnySlot.patch rename to patches/server/0244-Inventory-removeItemAnySlot.patch diff --git a/patches/server/0247-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0245-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch similarity index 100% rename from patches/server/0247-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch rename to patches/server/0245-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch diff --git a/patches/server/0248-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0246-Add-ray-tracing-methods-to-LivingEntity.patch similarity index 100% rename from patches/server/0248-Add-ray-tracing-methods-to-LivingEntity.patch rename to patches/server/0246-Add-ray-tracing-methods-to-LivingEntity.patch diff --git a/patches/server/0249-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0247-Expose-attack-cooldown-methods-for-Player.patch similarity index 100% rename from patches/server/0249-Expose-attack-cooldown-methods-for-Player.patch rename to patches/server/0247-Expose-attack-cooldown-methods-for-Player.patch diff --git a/patches/server/0250-Improve-death-events.patch b/patches/server/0248-Improve-death-events.patch similarity index 100% rename from patches/server/0250-Improve-death-events.patch rename to patches/server/0248-Improve-death-events.patch diff --git a/patches/server/0251-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0249-Allow-chests-to-be-placed-with-NBT-data.patch similarity index 100% rename from patches/server/0251-Allow-chests-to-be-placed-with-NBT-data.patch rename to patches/server/0249-Allow-chests-to-be-placed-with-NBT-data.patch diff --git a/patches/server/0252-Mob-Pathfinding-API.patch b/patches/server/0250-Mob-Pathfinding-API.patch similarity index 100% rename from patches/server/0252-Mob-Pathfinding-API.patch rename to patches/server/0250-Mob-Pathfinding-API.patch diff --git a/patches/server/0253-Prevent-various-interactions-from-causing-chunk-load.patch b/patches/server/0251-Prevent-various-interactions-from-causing-chunk-load.patch similarity index 100% rename from patches/server/0253-Prevent-various-interactions-from-causing-chunk-load.patch rename to patches/server/0251-Prevent-various-interactions-from-causing-chunk-load.patch diff --git a/patches/server/0254-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0252-Prevent-mob-spawning-from-loading-generating-chunks.patch similarity index 100% rename from patches/server/0254-Prevent-mob-spawning-from-loading-generating-chunks.patch rename to patches/server/0252-Prevent-mob-spawning-from-loading-generating-chunks.patch diff --git a/patches/server/0255-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0253-Implement-furnace-cook-speed-multiplier-API.patch similarity index 100% rename from patches/server/0255-Implement-furnace-cook-speed-multiplier-API.patch rename to patches/server/0253-Implement-furnace-cook-speed-multiplier-API.patch diff --git a/patches/server/0256-Honor-EntityAgeable.ageLock.patch b/patches/server/0254-Honor-EntityAgeable.ageLock.patch similarity index 100% rename from patches/server/0256-Honor-EntityAgeable.ageLock.patch rename to patches/server/0254-Honor-EntityAgeable.ageLock.patch diff --git a/patches/server/0257-Configurable-connection-throttle-kick-message.patch b/patches/server/0255-Configurable-connection-throttle-kick-message.patch similarity index 100% rename from patches/server/0257-Configurable-connection-throttle-kick-message.patch rename to patches/server/0255-Configurable-connection-throttle-kick-message.patch diff --git a/patches/server/0258-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0256-Prevent-chunk-loading-from-Fluid-Flowing.patch similarity index 100% rename from patches/server/0258-Prevent-chunk-loading-from-Fluid-Flowing.patch rename to patches/server/0256-Prevent-chunk-loading-from-Fluid-Flowing.patch diff --git a/patches/server/0259-PreSpawnerSpawnEvent.patch b/patches/server/0257-PreSpawnerSpawnEvent.patch similarity index 100% rename from patches/server/0259-PreSpawnerSpawnEvent.patch rename to patches/server/0257-PreSpawnerSpawnEvent.patch diff --git a/patches/server/0260-Add-LivingEntity-getTargetEntity.patch b/patches/server/0258-Add-LivingEntity-getTargetEntity.patch similarity index 100% rename from patches/server/0260-Add-LivingEntity-getTargetEntity.patch rename to patches/server/0258-Add-LivingEntity-getTargetEntity.patch diff --git a/patches/server/0261-Add-sun-related-API.patch b/patches/server/0259-Add-sun-related-API.patch similarity index 100% rename from patches/server/0261-Add-sun-related-API.patch rename to patches/server/0259-Add-sun-related-API.patch diff --git a/patches/server/0262-Catch-JsonParseException-in-entity-and-block-entity-.patch b/patches/server/0260-Catch-JsonParseException-in-entity-and-block-entity-.patch similarity index 100% rename from patches/server/0262-Catch-JsonParseException-in-entity-and-block-entity-.patch rename to patches/server/0260-Catch-JsonParseException-in-entity-and-block-entity-.patch diff --git a/patches/server/0263-Turtle-API.patch b/patches/server/0261-Turtle-API.patch similarity index 100% rename from patches/server/0263-Turtle-API.patch rename to patches/server/0261-Turtle-API.patch diff --git a/patches/server/0264-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0262-Call-player-spectator-target-events-and-improve-impl.patch similarity index 100% rename from patches/server/0264-Call-player-spectator-target-events-and-improve-impl.patch rename to patches/server/0262-Call-player-spectator-target-events-and-improve-impl.patch diff --git a/patches/server/0265-Add-more-Witch-API.patch b/patches/server/0263-Add-more-Witch-API.patch similarity index 100% rename from patches/server/0265-Add-more-Witch-API.patch rename to patches/server/0263-Add-more-Witch-API.patch diff --git a/patches/server/0266-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0264-Check-Drowned-for-Villager-Aggression-Config.patch similarity index 100% rename from patches/server/0266-Check-Drowned-for-Villager-Aggression-Config.patch rename to patches/server/0264-Check-Drowned-for-Villager-Aggression-Config.patch diff --git a/patches/server/0267-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0265-Add-option-to-prevent-players-from-moving-into-unloa.patch similarity index 100% rename from patches/server/0267-Add-option-to-prevent-players-from-moving-into-unloa.patch rename to patches/server/0265-Add-option-to-prevent-players-from-moving-into-unloa.patch diff --git a/patches/server/0268-Reset-players-airTicks-on-respawn.patch b/patches/server/0266-Reset-players-airTicks-on-respawn.patch similarity index 100% rename from patches/server/0268-Reset-players-airTicks-on-respawn.patch rename to patches/server/0266-Reset-players-airTicks-on-respawn.patch diff --git a/patches/server/0269-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0267-Don-t-sleep-after-profile-lookups-if-not-needed.patch similarity index 100% rename from patches/server/0269-Don-t-sleep-after-profile-lookups-if-not-needed.patch rename to patches/server/0267-Don-t-sleep-after-profile-lookups-if-not-needed.patch diff --git a/patches/server/0270-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0268-Improve-Server-Thread-Pool-and-Thread-Priorities.patch similarity index 100% rename from patches/server/0270-Improve-Server-Thread-Pool-and-Thread-Priorities.patch rename to patches/server/0268-Improve-Server-Thread-Pool-and-Thread-Priorities.patch diff --git a/patches/server/0271-Optimize-World-Time-Updates.patch b/patches/server/0269-Optimize-World-Time-Updates.patch similarity index 100% rename from patches/server/0271-Optimize-World-Time-Updates.patch rename to patches/server/0269-Optimize-World-Time-Updates.patch diff --git a/patches/server/0272-Restore-custom-InventoryHolder-support.patch b/patches/server/0270-Restore-custom-InventoryHolder-support.patch similarity index 100% rename from patches/server/0272-Restore-custom-InventoryHolder-support.patch rename to patches/server/0270-Restore-custom-InventoryHolder-support.patch diff --git a/patches/server/0273-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0271-Fix-SpongeAbsortEvent-handling.patch similarity index 100% rename from patches/server/0273-Fix-SpongeAbsortEvent-handling.patch rename to patches/server/0271-Fix-SpongeAbsortEvent-handling.patch diff --git a/patches/server/0274-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0272-Don-t-allow-digging-into-unloaded-chunks.patch similarity index 100% rename from patches/server/0274-Don-t-allow-digging-into-unloaded-chunks.patch rename to patches/server/0272-Don-t-allow-digging-into-unloaded-chunks.patch diff --git a/patches/server/0275-Make-the-default-permission-message-configurable.patch b/patches/server/0273-Make-the-default-permission-message-configurable.patch similarity index 100% rename from patches/server/0275-Make-the-default-permission-message-configurable.patch rename to patches/server/0273-Make-the-default-permission-message-configurable.patch diff --git a/patches/server/0276-force-entity-dismount-during-teleportation.patch b/patches/server/0274-force-entity-dismount-during-teleportation.patch similarity index 100% rename from patches/server/0276-force-entity-dismount-during-teleportation.patch rename to patches/server/0274-force-entity-dismount-during-teleportation.patch diff --git a/patches/server/0277-Add-more-Zombie-API.patch b/patches/server/0275-Add-more-Zombie-API.patch similarity index 100% rename from patches/server/0277-Add-more-Zombie-API.patch rename to patches/server/0275-Add-more-Zombie-API.patch diff --git a/patches/server/0278-Book-Size-Limits.patch b/patches/server/0276-Book-Size-Limits.patch similarity index 100% rename from patches/server/0278-Book-Size-Limits.patch rename to patches/server/0276-Book-Size-Limits.patch diff --git a/patches/server/0279-Add-PlayerConnectionCloseEvent.patch b/patches/server/0277-Add-PlayerConnectionCloseEvent.patch similarity index 100% rename from patches/server/0279-Add-PlayerConnectionCloseEvent.patch rename to patches/server/0277-Add-PlayerConnectionCloseEvent.patch diff --git a/patches/server/0280-Replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0278-Replace-OfflinePlayer-getLastPlayed.patch similarity index 100% rename from patches/server/0280-Replace-OfflinePlayer-getLastPlayed.patch rename to patches/server/0278-Replace-OfflinePlayer-getLastPlayed.patch diff --git a/patches/server/0281-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0279-Workaround-for-vehicle-tracking-issue-on-disconnect.patch similarity index 100% rename from patches/server/0281-Workaround-for-vehicle-tracking-issue-on-disconnect.patch rename to patches/server/0279-Workaround-for-vehicle-tracking-issue-on-disconnect.patch diff --git a/patches/server/0282-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch b/patches/server/0280-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch similarity index 100% rename from patches/server/0282-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch rename to patches/server/0280-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch diff --git a/patches/server/0283-BlockDestroyEvent.patch b/patches/server/0281-BlockDestroyEvent.patch similarity index 100% rename from patches/server/0283-BlockDestroyEvent.patch rename to patches/server/0281-BlockDestroyEvent.patch diff --git a/patches/server/0284-Async-command-map-building.patch b/patches/server/0282-Async-command-map-building.patch similarity index 100% rename from patches/server/0284-Async-command-map-building.patch rename to patches/server/0282-Async-command-map-building.patch diff --git a/patches/server/0285-Brigadier-Mojang-API.patch b/patches/server/0283-Brigadier-Mojang-API.patch similarity index 98% rename from patches/server/0285-Brigadier-Mojang-API.patch rename to patches/server/0283-Brigadier-Mojang-API.patch index d958c5942a..4b9d8b66e1 100644 --- a/patches/server/0285-Brigadier-Mojang-API.patch +++ b/patches/server/0283-Brigadier-Mojang-API.patch @@ -10,10 +10,10 @@ Adds CommandRegisteredEvent - Allows manipulating the CommandNode to add more children/metadata for the client diff --git a/build.gradle.kts b/build.gradle.kts -index fec06ac47cf190bf4d5d743c34e4a90b99a0af18..22f27a1ee5bf09247d9bcd50141add4116035735 100644 +index 5e0200abc509989d79a5f3dd2ee456b7a3fca33f..39961c6751d9e09ee150125944384661f7a2ab69 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -15,6 +15,7 @@ val alsoShade: Configuration by configurations.creating +@@ -13,6 +13,7 @@ val alsoShade: Configuration by configurations.creating dependencies { implementation(project(":paper-api")) diff --git a/patches/server/0286-Improve-exact-choice-recipe-ingredients.patch b/patches/server/0284-Improve-exact-choice-recipe-ingredients.patch similarity index 100% rename from patches/server/0286-Improve-exact-choice-recipe-ingredients.patch rename to patches/server/0284-Improve-exact-choice-recipe-ingredients.patch diff --git a/patches/server/0287-Limit-Client-Sign-length-more.patch b/patches/server/0285-Limit-Client-Sign-length-more.patch similarity index 100% rename from patches/server/0287-Limit-Client-Sign-length-more.patch rename to patches/server/0285-Limit-Client-Sign-length-more.patch diff --git a/patches/server/0288-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0286-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch similarity index 100% rename from patches/server/0288-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch rename to patches/server/0286-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch diff --git a/patches/server/0289-Entity-getEntitySpawnReason.patch b/patches/server/0287-Entity-getEntitySpawnReason.patch similarity index 100% rename from patches/server/0289-Entity-getEntitySpawnReason.patch rename to patches/server/0287-Entity-getEntitySpawnReason.patch diff --git a/patches/server/0290-Fire-event-on-GS4-query.patch b/patches/server/0288-Fire-event-on-GS4-query.patch similarity index 100% rename from patches/server/0290-Fire-event-on-GS4-query.patch rename to patches/server/0288-Fire-event-on-GS4-query.patch diff --git a/patches/server/0291-Add-PlayerPostRespawnEvent.patch b/patches/server/0289-Add-PlayerPostRespawnEvent.patch similarity index 100% rename from patches/server/0291-Add-PlayerPostRespawnEvent.patch rename to patches/server/0289-Add-PlayerPostRespawnEvent.patch diff --git a/patches/server/0292-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0290-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch similarity index 100% rename from patches/server/0292-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch rename to patches/server/0290-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch diff --git a/patches/server/0293-Server-Tick-Events.patch b/patches/server/0291-Server-Tick-Events.patch similarity index 100% rename from patches/server/0293-Server-Tick-Events.patch rename to patches/server/0291-Server-Tick-Events.patch diff --git a/patches/server/0294-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0292-PlayerDeathEvent-getItemsToKeep.patch similarity index 100% rename from patches/server/0294-PlayerDeathEvent-getItemsToKeep.patch rename to patches/server/0292-PlayerDeathEvent-getItemsToKeep.patch diff --git a/patches/server/0295-Optimize-Captured-BlockEntity-Lookup.patch b/patches/server/0293-Optimize-Captured-BlockEntity-Lookup.patch similarity index 100% rename from patches/server/0295-Optimize-Captured-BlockEntity-Lookup.patch rename to patches/server/0293-Optimize-Captured-BlockEntity-Lookup.patch diff --git a/patches/server/0296-Add-Heightmap-API.patch b/patches/server/0294-Add-Heightmap-API.patch similarity index 100% rename from patches/server/0296-Add-Heightmap-API.patch rename to patches/server/0294-Add-Heightmap-API.patch diff --git a/patches/server/0297-Mob-Spawner-API-Enhancements.patch b/patches/server/0295-Mob-Spawner-API-Enhancements.patch similarity index 100% rename from patches/server/0297-Mob-Spawner-API-Enhancements.patch rename to patches/server/0295-Mob-Spawner-API-Enhancements.patch diff --git a/patches/server/0298-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0296-Fix-CB-call-to-changed-postToMainThread-method.patch similarity index 100% rename from patches/server/0298-Fix-CB-call-to-changed-postToMainThread-method.patch rename to patches/server/0296-Fix-CB-call-to-changed-postToMainThread-method.patch diff --git a/patches/server/0299-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0297-Fix-sounds-when-item-frames-are-modified-MC-123450.patch similarity index 100% rename from patches/server/0299-Fix-sounds-when-item-frames-are-modified-MC-123450.patch rename to patches/server/0297-Fix-sounds-when-item-frames-are-modified-MC-123450.patch diff --git a/patches/server/0300-Implement-CraftBlockSoundGroup.patch b/patches/server/0298-Implement-CraftBlockSoundGroup.patch similarity index 100% rename from patches/server/0300-Implement-CraftBlockSoundGroup.patch rename to patches/server/0298-Implement-CraftBlockSoundGroup.patch diff --git a/patches/server/0301-Expose-the-internal-current-tick.patch b/patches/server/0299-Expose-the-internal-current-tick.patch similarity index 100% rename from patches/server/0301-Expose-the-internal-current-tick.patch rename to patches/server/0299-Expose-the-internal-current-tick.patch diff --git a/patches/server/0302-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0300-Show-blockstate-location-if-we-failed-to-read-it.patch similarity index 100% rename from patches/server/0302-Show-blockstate-location-if-we-failed-to-read-it.patch rename to patches/server/0300-Show-blockstate-location-if-we-failed-to-read-it.patch diff --git a/patches/server/0303-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0301-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch similarity index 100% rename from patches/server/0303-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch rename to patches/server/0301-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch diff --git a/patches/server/0304-Configurable-projectile-relative-velocity.patch b/patches/server/0302-Configurable-projectile-relative-velocity.patch similarity index 100% rename from patches/server/0304-Configurable-projectile-relative-velocity.patch rename to patches/server/0302-Configurable-projectile-relative-velocity.patch diff --git a/patches/server/0305-offset-item-frame-ticking.patch b/patches/server/0303-offset-item-frame-ticking.patch similarity index 100% rename from patches/server/0305-offset-item-frame-ticking.patch rename to patches/server/0303-offset-item-frame-ticking.patch diff --git a/patches/server/0306-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0304-Prevent-consuming-the-wrong-itemstack.patch similarity index 100% rename from patches/server/0306-Prevent-consuming-the-wrong-itemstack.patch rename to patches/server/0304-Prevent-consuming-the-wrong-itemstack.patch diff --git a/patches/server/0307-Dont-send-unnecessary-sign-update.patch b/patches/server/0305-Dont-send-unnecessary-sign-update.patch similarity index 100% rename from patches/server/0307-Dont-send-unnecessary-sign-update.patch rename to patches/server/0305-Dont-send-unnecessary-sign-update.patch diff --git a/patches/server/0308-Add-option-to-disable-pillager-patrols.patch b/patches/server/0306-Add-option-to-disable-pillager-patrols.patch similarity index 100% rename from patches/server/0308-Add-option-to-disable-pillager-patrols.patch rename to patches/server/0306-Add-option-to-disable-pillager-patrols.patch diff --git a/patches/server/0309-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0307-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch similarity index 100% rename from patches/server/0309-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch rename to patches/server/0307-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch diff --git a/patches/server/0310-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0308-MC-145656-Fix-Follow-Range-Initial-Target.patch similarity index 100% rename from patches/server/0310-MC-145656-Fix-Follow-Range-Initial-Target.patch rename to patches/server/0308-MC-145656-Fix-Follow-Range-Initial-Target.patch diff --git a/patches/server/0311-Duplicate-UUID-Resolve-Option.patch b/patches/server/0309-Duplicate-UUID-Resolve-Option.patch similarity index 100% rename from patches/server/0311-Duplicate-UUID-Resolve-Option.patch rename to patches/server/0309-Duplicate-UUID-Resolve-Option.patch diff --git a/patches/server/0312-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0310-PlayerDeathEvent-shouldDropExperience.patch similarity index 100% rename from patches/server/0312-PlayerDeathEvent-shouldDropExperience.patch rename to patches/server/0310-PlayerDeathEvent-shouldDropExperience.patch diff --git a/patches/server/0313-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0311-Prevent-bees-loading-chunks-checking-hive-position.patch similarity index 100% rename from patches/server/0313-Prevent-bees-loading-chunks-checking-hive-position.patch rename to patches/server/0311-Prevent-bees-loading-chunks-checking-hive-position.patch diff --git a/patches/server/0314-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0312-Don-t-load-Chunks-from-Hoppers-and-other-things.patch similarity index 100% rename from patches/server/0314-Don-t-load-Chunks-from-Hoppers-and-other-things.patch rename to patches/server/0312-Don-t-load-Chunks-from-Hoppers-and-other-things.patch diff --git a/patches/server/0315-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/server/0313-Optimise-EntityGetter-getPlayerByUUID.patch similarity index 100% rename from patches/server/0315-Optimise-EntityGetter-getPlayerByUUID.patch rename to patches/server/0313-Optimise-EntityGetter-getPlayerByUUID.patch diff --git a/patches/server/0316-Fix-items-not-falling-correctly.patch b/patches/server/0314-Fix-items-not-falling-correctly.patch similarity index 100% rename from patches/server/0316-Fix-items-not-falling-correctly.patch rename to patches/server/0314-Fix-items-not-falling-correctly.patch diff --git a/patches/server/0317-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0315-Optimize-call-to-getFluid-for-explosions.patch similarity index 100% rename from patches/server/0317-Optimize-call-to-getFluid-for-explosions.patch rename to patches/server/0315-Optimize-call-to-getFluid-for-explosions.patch diff --git a/patches/server/0318-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0316-Guard-against-serializing-mismatching-chunk-coordina.patch similarity index 100% rename from patches/server/0318-Guard-against-serializing-mismatching-chunk-coordina.patch rename to patches/server/0316-Guard-against-serializing-mismatching-chunk-coordina.patch diff --git a/patches/server/0319-Alternative-item-despawn-rate.patch b/patches/server/0317-Alternative-item-despawn-rate.patch similarity index 100% rename from patches/server/0319-Alternative-item-despawn-rate.patch rename to patches/server/0317-Alternative-item-despawn-rate.patch diff --git a/patches/server/0320-Tracking-Range-Improvements.patch b/patches/server/0318-Tracking-Range-Improvements.patch similarity index 100% rename from patches/server/0320-Tracking-Range-Improvements.patch rename to patches/server/0318-Tracking-Range-Improvements.patch diff --git a/patches/server/0321-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0319-Bees-get-gravity-in-void.-Fixes-MC-167279.patch similarity index 100% rename from patches/server/0321-Bees-get-gravity-in-void.-Fixes-MC-167279.patch rename to patches/server/0319-Bees-get-gravity-in-void.-Fixes-MC-167279.patch diff --git a/patches/server/0322-Improve-Block-breakNaturally-API.patch b/patches/server/0320-Improve-Block-breakNaturally-API.patch similarity index 100% rename from patches/server/0322-Improve-Block-breakNaturally-API.patch rename to patches/server/0320-Improve-Block-breakNaturally-API.patch diff --git a/patches/server/0323-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0321-Optimise-getChunkAt-calls-for-loaded-chunks.patch similarity index 100% rename from patches/server/0323-Optimise-getChunkAt-calls-for-loaded-chunks.patch rename to patches/server/0321-Optimise-getChunkAt-calls-for-loaded-chunks.patch diff --git a/patches/server/0324-Add-debug-for-sync-chunk-loads.patch b/patches/server/0322-Add-debug-for-sync-chunk-loads.patch similarity index 100% rename from patches/server/0324-Add-debug-for-sync-chunk-loads.patch rename to patches/server/0322-Add-debug-for-sync-chunk-loads.patch diff --git a/patches/server/0325-Improve-java-version-check.patch b/patches/server/0323-Improve-java-version-check.patch similarity index 100% rename from patches/server/0325-Improve-java-version-check.patch rename to patches/server/0323-Improve-java-version-check.patch diff --git a/patches/server/0326-Add-ThrownEggHatchEvent.patch b/patches/server/0324-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/server/0326-Add-ThrownEggHatchEvent.patch rename to patches/server/0324-Add-ThrownEggHatchEvent.patch diff --git a/patches/server/0327-Entity-Jump-API.patch b/patches/server/0325-Entity-Jump-API.patch similarity index 100% rename from patches/server/0327-Entity-Jump-API.patch rename to patches/server/0325-Entity-Jump-API.patch diff --git a/patches/server/0328-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0326-Add-option-to-nerf-pigmen-from-nether-portals.patch similarity index 100% rename from patches/server/0328-Add-option-to-nerf-pigmen-from-nether-portals.patch rename to patches/server/0326-Add-option-to-nerf-pigmen-from-nether-portals.patch diff --git a/patches/server/0329-Make-the-GUI-graph-fancier.patch b/patches/server/0327-Make-the-GUI-graph-fancier.patch similarity index 100% rename from patches/server/0329-Make-the-GUI-graph-fancier.patch rename to patches/server/0327-Make-the-GUI-graph-fancier.patch diff --git a/patches/server/0330-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0328-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/server/0330-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/server/0328-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/server/0331-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0329-Validate-tripwire-hook-placement-before-update.patch similarity index 100% rename from patches/server/0331-Validate-tripwire-hook-placement-before-update.patch rename to patches/server/0329-Validate-tripwire-hook-placement-before-update.patch diff --git a/patches/server/0332-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0330-Add-option-to-allow-iron-golems-to-spawn-in-air.patch similarity index 100% rename from patches/server/0332-Add-option-to-allow-iron-golems-to-spawn-in-air.patch rename to patches/server/0330-Add-option-to-allow-iron-golems-to-spawn-in-air.patch diff --git a/patches/server/0333-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0331-Configurable-chance-of-villager-zombie-infection.patch similarity index 100% rename from patches/server/0333-Configurable-chance-of-villager-zombie-infection.patch rename to patches/server/0331-Configurable-chance-of-villager-zombie-infection.patch diff --git a/patches/server/0334-Optimise-Chunk-getFluid.patch b/patches/server/0332-Optimise-Chunk-getFluid.patch similarity index 100% rename from patches/server/0334-Optimise-Chunk-getFluid.patch rename to patches/server/0332-Optimise-Chunk-getFluid.patch diff --git a/patches/server/0335-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0333-Set-spigots-verbose-world-setting-to-false-by-def.patch similarity index 100% rename from patches/server/0335-Set-spigots-verbose-world-setting-to-false-by-def.patch rename to patches/server/0333-Set-spigots-verbose-world-setting-to-false-by-def.patch diff --git a/patches/server/0336-Add-tick-times-API-and-mspt-command.patch b/patches/server/0334-Add-tick-times-API-and-mspt-command.patch similarity index 100% rename from patches/server/0336-Add-tick-times-API-and-mspt-command.patch rename to patches/server/0334-Add-tick-times-API-and-mspt-command.patch diff --git a/patches/server/0337-Expose-MinecraftServer-isRunning.patch b/patches/server/0335-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/server/0337-Expose-MinecraftServer-isRunning.patch rename to patches/server/0335-Expose-MinecraftServer-isRunning.patch diff --git a/patches/server/0338-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0336-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/server/0338-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/server/0336-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/server/0339-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0337-Pillager-patrol-spawn-settings-and-per-player-option.patch similarity index 100% rename from patches/server/0339-Pillager-patrol-spawn-settings-and-per-player-option.patch rename to patches/server/0337-Pillager-patrol-spawn-settings-and-per-player-option.patch diff --git a/patches/server/0340-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0338-Remote-Connections-shouldn-t-hold-up-shutdown.patch similarity index 100% rename from patches/server/0340-Remote-Connections-shouldn-t-hold-up-shutdown.patch rename to patches/server/0338-Remote-Connections-shouldn-t-hold-up-shutdown.patch diff --git a/patches/server/0341-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0339-Do-not-allow-bees-to-load-chunks-for-beehives.patch similarity index 100% rename from patches/server/0341-Do-not-allow-bees-to-load-chunks-for-beehives.patch rename to patches/server/0339-Do-not-allow-bees-to-load-chunks-for-beehives.patch diff --git a/patches/server/0342-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0340-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch similarity index 100% rename from patches/server/0342-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch rename to patches/server/0340-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch diff --git a/patches/server/0343-Don-t-tick-dead-players.patch b/patches/server/0341-Don-t-tick-dead-players.patch similarity index 100% rename from patches/server/0343-Don-t-tick-dead-players.patch rename to patches/server/0341-Don-t-tick-dead-players.patch diff --git a/patches/server/0344-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0342-Dead-Player-s-shouldn-t-be-able-to-move.patch similarity index 100% rename from patches/server/0344-Dead-Player-s-shouldn-t-be-able-to-move.patch rename to patches/server/0342-Dead-Player-s-shouldn-t-be-able-to-move.patch diff --git a/patches/server/0345-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0343-Don-t-move-existing-players-to-world-spawn.patch similarity index 100% rename from patches/server/0345-Don-t-move-existing-players-to-world-spawn.patch rename to patches/server/0343-Don-t-move-existing-players-to-world-spawn.patch diff --git a/patches/server/0346-Optimize-Pathfinding.patch b/patches/server/0344-Optimize-Pathfinding.patch similarity index 100% rename from patches/server/0346-Optimize-Pathfinding.patch rename to patches/server/0344-Optimize-Pathfinding.patch diff --git a/patches/server/0347-Reduce-Either-Optional-allocation.patch b/patches/server/0345-Reduce-Either-Optional-allocation.patch similarity index 100% rename from patches/server/0347-Reduce-Either-Optional-allocation.patch rename to patches/server/0345-Reduce-Either-Optional-allocation.patch diff --git a/patches/server/0348-Reduce-memory-footprint-of-CompoundTag.patch b/patches/server/0346-Reduce-memory-footprint-of-CompoundTag.patch similarity index 100% rename from patches/server/0348-Reduce-memory-footprint-of-CompoundTag.patch rename to patches/server/0346-Reduce-memory-footprint-of-CompoundTag.patch diff --git a/patches/server/0349-Prevent-opening-inventories-when-frozen.patch b/patches/server/0347-Prevent-opening-inventories-when-frozen.patch similarity index 100% rename from patches/server/0349-Prevent-opening-inventories-when-frozen.patch rename to patches/server/0347-Prevent-opening-inventories-when-frozen.patch diff --git a/patches/server/0350-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0348-Don-t-run-entity-collision-code-if-not-needed.patch similarity index 100% rename from patches/server/0350-Don-t-run-entity-collision-code-if-not-needed.patch rename to patches/server/0348-Don-t-run-entity-collision-code-if-not-needed.patch diff --git a/patches/server/0351-Implement-Player-Client-Options-API.patch b/patches/server/0349-Implement-Player-Client-Options-API.patch similarity index 100% rename from patches/server/0351-Implement-Player-Client-Options-API.patch rename to patches/server/0349-Implement-Player-Client-Options-API.patch diff --git a/patches/server/0352-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0350-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch similarity index 100% rename from patches/server/0352-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch rename to patches/server/0350-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch diff --git a/patches/server/0353-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch b/patches/server/0351-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch similarity index 100% rename from patches/server/0353-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch rename to patches/server/0351-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch diff --git a/patches/server/0354-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0352-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 100% rename from patches/server/0354-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to patches/server/0352-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch diff --git a/patches/server/0355-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0353-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from patches/server/0355-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/server/0353-Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/patches/server/0356-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0354-Don-t-fire-BlockFade-on-worldgen-threads.patch similarity index 100% rename from patches/server/0356-Don-t-fire-BlockFade-on-worldgen-threads.patch rename to patches/server/0354-Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/patches/server/0357-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0355-Add-phantom-creative-and-insomniac-controls.patch similarity index 100% rename from patches/server/0357-Add-phantom-creative-and-insomniac-controls.patch rename to patches/server/0355-Add-phantom-creative-and-insomniac-controls.patch diff --git a/patches/server/0358-Fix-item-duplication-and-teleport-issues.patch b/patches/server/0356-Fix-item-duplication-and-teleport-issues.patch similarity index 100% rename from patches/server/0358-Fix-item-duplication-and-teleport-issues.patch rename to patches/server/0356-Fix-item-duplication-and-teleport-issues.patch diff --git a/patches/server/0359-Villager-Restocks-API.patch b/patches/server/0357-Villager-Restocks-API.patch similarity index 100% rename from patches/server/0359-Villager-Restocks-API.patch rename to patches/server/0357-Villager-Restocks-API.patch diff --git a/patches/server/0360-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0358-Validate-PickItem-Packet-and-kick-for-invalid.patch similarity index 100% rename from patches/server/0360-Validate-PickItem-Packet-and-kick-for-invalid.patch rename to patches/server/0358-Validate-PickItem-Packet-and-kick-for-invalid.patch diff --git a/patches/server/0361-Expose-game-version.patch b/patches/server/0359-Expose-game-version.patch similarity index 100% rename from patches/server/0361-Expose-game-version.patch rename to patches/server/0359-Expose-game-version.patch diff --git a/patches/server/0362-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0360-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 100% rename from patches/server/0362-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to patches/server/0360-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch diff --git a/patches/server/0363-misc-debugging-dumps.patch b/patches/server/0361-misc-debugging-dumps.patch similarity index 100% rename from patches/server/0363-misc-debugging-dumps.patch rename to patches/server/0361-misc-debugging-dumps.patch diff --git a/patches/server/0364-Prevent-teleporting-dead-entities.patch b/patches/server/0362-Prevent-teleporting-dead-entities.patch similarity index 100% rename from patches/server/0364-Prevent-teleporting-dead-entities.patch rename to patches/server/0362-Prevent-teleporting-dead-entities.patch diff --git a/patches/server/0365-Implement-Mob-Goal-API.patch b/patches/server/0363-Implement-Mob-Goal-API.patch similarity index 99% rename from patches/server/0365-Implement-Mob-Goal-API.patch rename to patches/server/0363-Implement-Mob-Goal-API.patch index 05113ab5d0..24864a4666 100644 --- a/patches/server/0365-Implement-Mob-Goal-API.patch +++ b/patches/server/0363-Implement-Mob-Goal-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Implement Mob Goal API diff --git a/build.gradle.kts b/build.gradle.kts -index 22f27a1ee5bf09247d9bcd50141add4116035735..fb7e956fd7beb741984780a9492230916a330504 100644 +index 39961c6751d9e09ee150125944384661f7a2ab69..ecd857d58be4a7aa9944934af2ad6a83b2d1b647 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -42,6 +42,7 @@ dependencies { +@@ -40,6 +40,7 @@ dependencies { runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18") runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18") diff --git a/patches/server/0366-Add-villager-reputation-API.patch b/patches/server/0364-Add-villager-reputation-API.patch similarity index 100% rename from patches/server/0366-Add-villager-reputation-API.patch rename to patches/server/0364-Add-villager-reputation-API.patch diff --git a/patches/server/0367-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0365-Option-for-maximum-exp-value-when-merging-orbs.patch similarity index 100% rename from patches/server/0367-Option-for-maximum-exp-value-when-merging-orbs.patch rename to patches/server/0365-Option-for-maximum-exp-value-when-merging-orbs.patch diff --git a/patches/server/0368-ExperienceOrbMergeEvent.patch b/patches/server/0366-ExperienceOrbMergeEvent.patch similarity index 100% rename from patches/server/0368-ExperienceOrbMergeEvent.patch rename to patches/server/0366-ExperienceOrbMergeEvent.patch diff --git a/patches/server/0369-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0367-Fix-PotionEffect-ignores-icon-flag.patch similarity index 100% rename from patches/server/0369-Fix-PotionEffect-ignores-icon-flag.patch rename to patches/server/0367-Fix-PotionEffect-ignores-icon-flag.patch diff --git a/patches/server/0370-Potential-bed-API.patch b/patches/server/0368-Potential-bed-API.patch similarity index 100% rename from patches/server/0370-Potential-bed-API.patch rename to patches/server/0368-Potential-bed-API.patch diff --git a/patches/server/0371-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0369-Wait-for-Async-Tasks-during-shutdown.patch similarity index 100% rename from patches/server/0371-Wait-for-Async-Tasks-during-shutdown.patch rename to patches/server/0369-Wait-for-Async-Tasks-during-shutdown.patch diff --git a/patches/server/0372-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0370-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch similarity index 100% rename from patches/server/0372-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch rename to patches/server/0370-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch diff --git a/patches/server/0373-Ensure-safe-gateway-teleport.patch b/patches/server/0371-Ensure-safe-gateway-teleport.patch similarity index 100% rename from patches/server/0373-Ensure-safe-gateway-teleport.patch rename to patches/server/0371-Ensure-safe-gateway-teleport.patch diff --git a/patches/server/0374-Add-option-for-console-having-all-permissions.patch b/patches/server/0372-Add-option-for-console-having-all-permissions.patch similarity index 100% rename from patches/server/0374-Add-option-for-console-having-all-permissions.patch rename to patches/server/0372-Add-option-for-console-having-all-permissions.patch diff --git a/patches/server/0375-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0373-Fix-villager-trading-demand-MC-163962.patch similarity index 100% rename from patches/server/0375-Fix-villager-trading-demand-MC-163962.patch rename to patches/server/0373-Fix-villager-trading-demand-MC-163962.patch diff --git a/patches/server/0376-Maps-shouldn-t-load-chunks.patch b/patches/server/0374-Maps-shouldn-t-load-chunks.patch similarity index 100% rename from patches/server/0376-Maps-shouldn-t-load-chunks.patch rename to patches/server/0374-Maps-shouldn-t-load-chunks.patch diff --git a/patches/server/0377-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0375-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch similarity index 100% rename from patches/server/0377-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch rename to patches/server/0375-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch diff --git a/patches/server/0378-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0376-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 100% rename from patches/server/0378-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to patches/server/0376-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch diff --git a/patches/server/0379-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0377-Fix-piston-physics-inconsistency-MC-188840.patch similarity index 100% rename from patches/server/0379-Fix-piston-physics-inconsistency-MC-188840.patch rename to patches/server/0377-Fix-piston-physics-inconsistency-MC-188840.patch diff --git a/patches/server/0380-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0378-Fix-missing-chunks-due-to-integer-overflow.patch similarity index 100% rename from patches/server/0380-Fix-missing-chunks-due-to-integer-overflow.patch rename to patches/server/0378-Fix-missing-chunks-due-to-integer-overflow.patch diff --git a/patches/server/0381-Prevent-position-desync-causing-tp-exploit.patch b/patches/server/0379-Prevent-position-desync-causing-tp-exploit.patch similarity index 100% rename from patches/server/0381-Prevent-position-desync-causing-tp-exploit.patch rename to patches/server/0379-Prevent-position-desync-causing-tp-exploit.patch diff --git a/patches/server/0382-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0380-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/server/0382-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/server/0380-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/server/0383-Add-PlayerRecipeBookClickEvent.patch b/patches/server/0381-Add-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/server/0383-Add-PlayerRecipeBookClickEvent.patch rename to patches/server/0381-Add-PlayerRecipeBookClickEvent.patch diff --git a/patches/server/0384-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0382-Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from patches/server/0384-Hide-sync-chunk-writes-behind-flag.patch rename to patches/server/0382-Hide-sync-chunk-writes-behind-flag.patch diff --git a/patches/server/0385-Add-permission-for-command-blocks.patch b/patches/server/0383-Add-permission-for-command-blocks.patch similarity index 100% rename from patches/server/0385-Add-permission-for-command-blocks.patch rename to patches/server/0383-Add-permission-for-command-blocks.patch diff --git a/patches/server/0386-Ensure-Entity-position-and-AABB-are-never-invalid.patch b/patches/server/0384-Ensure-Entity-position-and-AABB-are-never-invalid.patch similarity index 100% rename from patches/server/0386-Ensure-Entity-position-and-AABB-are-never-invalid.patch rename to patches/server/0384-Ensure-Entity-position-and-AABB-are-never-invalid.patch diff --git a/patches/server/0387-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0385-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 100% rename from patches/server/0387-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/server/0385-Fix-Per-World-Difficulty-Remembering-Difficulty.patch diff --git a/patches/server/0388-Paper-dumpitem-command.patch b/patches/server/0386-Paper-dumpitem-command.patch similarity index 100% rename from patches/server/0388-Paper-dumpitem-command.patch rename to patches/server/0386-Paper-dumpitem-command.patch diff --git a/patches/server/0389-Improve-Legacy-Component-serialization-size.patch b/patches/server/0387-Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from patches/server/0389-Improve-Legacy-Component-serialization-size.patch rename to patches/server/0387-Improve-Legacy-Component-serialization-size.patch diff --git a/patches/server/0390-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0388-Add-Plugin-Tickets-to-API-Chunk-Methods.patch similarity index 100% rename from patches/server/0390-Add-Plugin-Tickets-to-API-Chunk-Methods.patch rename to patches/server/0388-Add-Plugin-Tickets-to-API-Chunk-Methods.patch diff --git a/patches/server/0391-Add-BlockStateMeta-clearBlockState.patch b/patches/server/0389-Add-BlockStateMeta-clearBlockState.patch similarity index 100% rename from patches/server/0391-Add-BlockStateMeta-clearBlockState.patch rename to patches/server/0389-Add-BlockStateMeta-clearBlockState.patch diff --git a/patches/server/0392-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0390-Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from patches/server/0392-Convert-legacy-attributes-in-Item-Meta.patch rename to patches/server/0390-Convert-legacy-attributes-in-Item-Meta.patch diff --git a/patches/server/0393-Do-not-accept-invalid-client-settings.patch b/patches/server/0391-Do-not-accept-invalid-client-settings.patch similarity index 100% rename from patches/server/0393-Do-not-accept-invalid-client-settings.patch rename to patches/server/0391-Do-not-accept-invalid-client-settings.patch diff --git a/patches/server/0394-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0392-Improve-fix-EntityTargetLivingEntityEvent.patch similarity index 100% rename from patches/server/0394-Improve-fix-EntityTargetLivingEntityEvent.patch rename to patches/server/0392-Improve-fix-EntityTargetLivingEntityEvent.patch diff --git a/patches/server/0395-Add-entity-liquid-API.patch b/patches/server/0393-Add-entity-liquid-API.patch similarity index 100% rename from patches/server/0395-Add-entity-liquid-API.patch rename to patches/server/0393-Add-entity-liquid-API.patch diff --git a/patches/server/0396-Add-PrepareResultEvent.patch b/patches/server/0394-Add-PrepareResultEvent.patch similarity index 100% rename from patches/server/0396-Add-PrepareResultEvent.patch rename to patches/server/0394-Add-PrepareResultEvent.patch diff --git a/patches/server/0397-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0395-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 100% rename from patches/server/0397-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/server/0395-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch diff --git a/patches/server/0398-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0396-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/server/0398-Fix-arrows-never-despawning-MC-125757.patch rename to patches/server/0396-Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/0399-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0397-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/0399-Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/server/0397-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/0400-Fix-SPIGOT-5989.patch b/patches/server/0398-Fix-SPIGOT-5989.patch similarity index 100% rename from patches/server/0400-Fix-SPIGOT-5989.patch rename to patches/server/0398-Fix-SPIGOT-5989.patch diff --git a/patches/server/0401-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0399-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/0401-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/server/0399-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/0402-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0400-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/server/0402-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/server/0400-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/0403-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0401-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/0403-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/server/0401-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0404-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0402-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0404-Optimize-NetworkManager-Exception-Handling.patch rename to patches/server/0402-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0405-Fix-some-rails-connecting-improperly.patch b/patches/server/0403-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/0405-Fix-some-rails-connecting-improperly.patch rename to patches/server/0403-Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/0406-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0404-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0406-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/server/0404-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0407-Brand-support.patch b/patches/server/0405-Brand-support.patch similarity index 100% rename from patches/server/0407-Brand-support.patch rename to patches/server/0405-Brand-support.patch diff --git a/patches/server/0408-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0406-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0408-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/server/0406-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0409-Don-t-require-FACING-data.patch b/patches/server/0407-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0409-Don-t-require-FACING-data.patch rename to patches/server/0407-Don-t-require-FACING-data.patch diff --git a/patches/server/0410-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0408-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 100% rename from patches/server/0410-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/server/0408-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch diff --git a/patches/server/0411-Add-moon-phase-API.patch b/patches/server/0409-Add-moon-phase-API.patch similarity index 100% rename from patches/server/0411-Add-moon-phase-API.patch rename to patches/server/0409-Add-moon-phase-API.patch diff --git a/patches/server/0412-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0410-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/server/0412-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/server/0410-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/server/0413-Prevent-headless-pistons-from-being-created.patch b/patches/server/0411-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/0413-Prevent-headless-pistons-from-being-created.patch rename to patches/server/0411-Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/0414-Add-BellRingEvent.patch b/patches/server/0412-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0414-Add-BellRingEvent.patch rename to patches/server/0412-Add-BellRingEvent.patch diff --git a/patches/server/0415-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0413-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from patches/server/0415-Add-zombie-targets-turtle-egg-config.patch rename to patches/server/0413-Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/server/0416-Buffer-joins-to-world.patch b/patches/server/0414-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0416-Buffer-joins-to-world.patch rename to patches/server/0414-Buffer-joins-to-world.patch diff --git a/patches/server/0417-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0415-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0417-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/server/0415-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0418-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0416-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from patches/server/0418-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/server/0416-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/patches/server/0419-Add-more-Evoker-API.patch b/patches/server/0417-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0419-Add-more-Evoker-API.patch rename to patches/server/0417-Add-more-Evoker-API.patch diff --git a/patches/server/0420-Add-methods-to-get-translation-keys.patch b/patches/server/0418-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/server/0420-Add-methods-to-get-translation-keys.patch rename to patches/server/0418-Add-methods-to-get-translation-keys.patch diff --git a/patches/server/0421-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0419-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0421-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/server/0419-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0422-Cache-block-data-strings.patch b/patches/server/0420-Cache-block-data-strings.patch similarity index 100% rename from patches/server/0422-Cache-block-data-strings.patch rename to patches/server/0420-Cache-block-data-strings.patch diff --git a/patches/server/0423-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0421-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 100% rename from patches/server/0423-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to patches/server/0421-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch diff --git a/patches/server/0424-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0422-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/server/0424-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/server/0422-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/server/0425-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0423-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/server/0425-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/server/0423-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/server/0426-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0424-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 100% rename from patches/server/0426-Extend-block-drop-capture-to-capture-all-items-added.patch rename to patches/server/0424-Extend-block-drop-capture-to-capture-all-items-added.patch diff --git a/patches/server/0427-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0425-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/server/0427-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/server/0425-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/server/0428-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0426-Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/server/0428-Lazily-track-plugin-scoreboards-by-default.patch rename to patches/server/0426-Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/server/0429-Entity-isTicking.patch b/patches/server/0427-Entity-isTicking.patch similarity index 100% rename from patches/server/0429-Entity-isTicking.patch rename to patches/server/0427-Entity-isTicking.patch diff --git a/patches/server/0430-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0428-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from patches/server/0430-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to patches/server/0428-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/patches/server/0431-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0429-Fix-Concurrency-issue-in-ShufflingList.patch similarity index 100% rename from patches/server/0431-Fix-Concurrency-issue-in-ShufflingList.patch rename to patches/server/0429-Fix-Concurrency-issue-in-ShufflingList.patch diff --git a/patches/server/0432-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0430-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/0432-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/server/0430-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/0433-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0431-Fix-for-large-move-vectors-crashing-server.patch similarity index 100% rename from patches/server/0433-Fix-for-large-move-vectors-crashing-server.patch rename to patches/server/0431-Fix-for-large-move-vectors-crashing-server.patch diff --git a/patches/server/0434-Optimise-getType-calls.patch b/patches/server/0432-Optimise-getType-calls.patch similarity index 100% rename from patches/server/0434-Optimise-getType-calls.patch rename to patches/server/0432-Optimise-getType-calls.patch diff --git a/patches/server/0435-Villager-resetOffers.patch b/patches/server/0433-Villager-resetOffers.patch similarity index 100% rename from patches/server/0435-Villager-resetOffers.patch rename to patches/server/0433-Villager-resetOffers.patch diff --git a/patches/server/0436-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0434-Retain-block-place-order-when-capturing-blockstates.patch similarity index 100% rename from patches/server/0436-Retain-block-place-order-when-capturing-blockstates.patch rename to patches/server/0434-Retain-block-place-order-when-capturing-blockstates.patch diff --git a/patches/server/0437-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0435-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/0437-Fix-item-locations-dropped-from-campfires.patch rename to patches/server/0435-Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/0438-Fix-bell-block-entity-memory-leak.patch b/patches/server/0436-Fix-bell-block-entity-memory-leak.patch similarity index 100% rename from patches/server/0438-Fix-bell-block-entity-memory-leak.patch rename to patches/server/0436-Fix-bell-block-entity-memory-leak.patch diff --git a/patches/server/0439-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0437-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 100% rename from patches/server/0439-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to patches/server/0437-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/patches/server/0440-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0438-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/server/0440-Add-getOfflinePlayerIfCached-String.patch rename to patches/server/0438-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/server/0441-Add-ignore-discounts-API.patch b/patches/server/0439-Add-ignore-discounts-API.patch similarity index 100% rename from patches/server/0441-Add-ignore-discounts-API.patch rename to patches/server/0439-Add-ignore-discounts-API.patch diff --git a/patches/server/0442-Toggle-for-removing-existing-dragon.patch b/patches/server/0440-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from patches/server/0442-Toggle-for-removing-existing-dragon.patch rename to patches/server/0440-Toggle-for-removing-existing-dragon.patch diff --git a/patches/server/0443-Fix-client-lag-on-advancement-loading.patch b/patches/server/0441-Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from patches/server/0443-Fix-client-lag-on-advancement-loading.patch rename to patches/server/0441-Fix-client-lag-on-advancement-loading.patch diff --git a/patches/server/0444-Item-no-age-no-player-pickup.patch b/patches/server/0442-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/server/0444-Item-no-age-no-player-pickup.patch rename to patches/server/0442-Item-no-age-no-player-pickup.patch diff --git a/patches/server/0445-Beacon-API-custom-effect-ranges.patch b/patches/server/0443-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/server/0445-Beacon-API-custom-effect-ranges.patch rename to patches/server/0443-Beacon-API-custom-effect-ranges.patch diff --git a/patches/server/0446-Add-API-for-quit-reason.patch b/patches/server/0444-Add-API-for-quit-reason.patch similarity index 100% rename from patches/server/0446-Add-API-for-quit-reason.patch rename to patches/server/0444-Add-API-for-quit-reason.patch diff --git a/patches/server/0447-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0445-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from patches/server/0447-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/server/0445-Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/server/0448-Expose-world-spawn-angle.patch b/patches/server/0446-Expose-world-spawn-angle.patch similarity index 100% rename from patches/server/0448-Expose-world-spawn-angle.patch rename to patches/server/0446-Expose-world-spawn-angle.patch diff --git a/patches/server/0449-Add-Destroy-Speed-API.patch b/patches/server/0447-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0449-Add-Destroy-Speed-API.patch rename to patches/server/0447-Add-Destroy-Speed-API.patch diff --git a/patches/server/0450-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0448-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/server/0450-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/server/0448-Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/server/0451-Add-LivingEntity-clearActiveItem.patch b/patches/server/0449-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0451-Add-LivingEntity-clearActiveItem.patch rename to patches/server/0449-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0452-Add-PlayerItemCooldownEvent.patch b/patches/server/0450-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0452-Add-PlayerItemCooldownEvent.patch rename to patches/server/0450-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0453-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0451-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0453-Significantly-improve-performance-of-the-end-generat.patch rename to patches/server/0451-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0454-More-lightning-API.patch b/patches/server/0452-More-lightning-API.patch similarity index 100% rename from patches/server/0454-More-lightning-API.patch rename to patches/server/0452-More-lightning-API.patch diff --git a/patches/server/0455-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0453-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 100% rename from patches/server/0455-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0453-Climbing-should-not-bypass-cramming-gamerule.patch diff --git a/patches/server/0456-Add-missing-default-perms-for-commands.patch b/patches/server/0454-Add-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0456-Add-missing-default-perms-for-commands.patch rename to patches/server/0454-Add-missing-default-perms-for-commands.patch diff --git a/patches/server/0457-Add-PlayerShearBlockEvent.patch b/patches/server/0455-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0457-Add-PlayerShearBlockEvent.patch rename to patches/server/0455-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0458-Limit-recipe-packets.patch b/patches/server/0456-Limit-recipe-packets.patch similarity index 100% rename from patches/server/0458-Limit-recipe-packets.patch rename to patches/server/0456-Limit-recipe-packets.patch diff --git a/patches/server/0459-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0457-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0459-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0457-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0460-Player-Chunk-Load-Unload-Events.patch b/patches/server/0458-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/server/0460-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0458-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/server/0461-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0459-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0461-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0459-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0462-Expose-LivingEntity-hurt-direction.patch b/patches/server/0460-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0462-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0460-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0463-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0461-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/0463-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0461-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/0464-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch b/patches/server/0462-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch similarity index 100% rename from patches/server/0464-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch rename to patches/server/0462-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch diff --git a/patches/server/0465-Add-TargetHitEvent.patch b/patches/server/0463-Add-TargetHitEvent.patch similarity index 100% rename from patches/server/0465-Add-TargetHitEvent.patch rename to patches/server/0463-Add-TargetHitEvent.patch diff --git a/patches/server/0466-MC-4-Fix-item-position-desync.patch b/patches/server/0464-MC-4-Fix-item-position-desync.patch similarity index 100% rename from patches/server/0466-MC-4-Fix-item-position-desync.patch rename to patches/server/0464-MC-4-Fix-item-position-desync.patch diff --git a/patches/server/0467-Additional-Block-Material-API.patch b/patches/server/0465-Additional-Block-Material-API.patch similarity index 100% rename from patches/server/0467-Additional-Block-Material-API.patch rename to patches/server/0465-Additional-Block-Material-API.patch diff --git a/patches/server/0468-Fix-harming-potion-dupe.patch b/patches/server/0466-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0468-Fix-harming-potion-dupe.patch rename to patches/server/0466-Fix-harming-potion-dupe.patch diff --git a/patches/server/0469-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/server/0467-API-to-get-Material-from-Boats-and-Minecarts.patch similarity index 100% rename from patches/server/0469-API-to-get-Material-from-Boats-and-Minecarts.patch rename to patches/server/0467-API-to-get-Material-from-Boats-and-Minecarts.patch diff --git a/patches/server/0470-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0468-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/0470-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0468-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/0471-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0469-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0471-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0469-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0472-Add-PlayerFlowerPotManipulateEvent.patch b/patches/server/0470-Add-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0472-Add-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0470-Add-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0473-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0471-Fix-interact-event-not-being-called-sometimes.patch similarity index 100% rename from patches/server/0473-Fix-interact-event-not-being-called-sometimes.patch rename to patches/server/0471-Fix-interact-event-not-being-called-sometimes.patch diff --git a/patches/server/0474-Zombie-API-breaking-doors.patch b/patches/server/0472-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0474-Zombie-API-breaking-doors.patch rename to patches/server/0472-Zombie-API-breaking-doors.patch diff --git a/patches/server/0475-Fix-nerfed-slime-when-splitting.patch b/patches/server/0473-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0475-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0473-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0476-Add-EntityLoadCrossbowEvent.patch b/patches/server/0474-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0476-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0474-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0477-Add-WorldGameRuleChangeEvent.patch b/patches/server/0475-Add-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/0477-Add-WorldGameRuleChangeEvent.patch rename to patches/server/0475-Add-WorldGameRuleChangeEvent.patch diff --git a/patches/server/0478-Add-ServerResourcesReloadedEvent.patch b/patches/server/0476-Add-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/0478-Add-ServerResourcesReloadedEvent.patch rename to patches/server/0476-Add-ServerResourcesReloadedEvent.patch diff --git a/patches/server/0479-Add-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0477-Add-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from patches/server/0479-Add-world-settings-for-mobs-picking-up-loot.patch rename to patches/server/0477-Add-world-settings-for-mobs-picking-up-loot.patch diff --git a/patches/server/0480-Add-BlockFailedDispenseEvent.patch b/patches/server/0478-Add-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/server/0480-Add-BlockFailedDispenseEvent.patch rename to patches/server/0478-Add-BlockFailedDispenseEvent.patch diff --git a/patches/server/0481-Add-PlayerLecternPageChangeEvent.patch b/patches/server/0479-Add-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/0481-Add-PlayerLecternPageChangeEvent.patch rename to patches/server/0479-Add-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/0482-Add-PlayerLoomPatternSelectEvent.patch b/patches/server/0480-Add-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/0482-Add-PlayerLoomPatternSelectEvent.patch rename to patches/server/0480-Add-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/0483-Configurable-door-breaking-difficulty.patch b/patches/server/0481-Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/0483-Configurable-door-breaking-difficulty.patch rename to patches/server/0481-Configurable-door-breaking-difficulty.patch diff --git a/patches/server/0484-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0482-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/0484-Empty-commands-shall-not-be-dispatched.patch rename to patches/server/0482-Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/0485-Remove-stale-POIs.patch b/patches/server/0483-Remove-stale-POIs.patch similarity index 100% rename from patches/server/0485-Remove-stale-POIs.patch rename to patches/server/0483-Remove-stale-POIs.patch diff --git a/patches/server/0486-Fix-villager-boat-exploit.patch b/patches/server/0484-Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/0486-Fix-villager-boat-exploit.patch rename to patches/server/0484-Fix-villager-boat-exploit.patch diff --git a/patches/server/0487-Add-sendOpLevel-API.patch b/patches/server/0485-Add-sendOpLevel-API.patch similarity index 100% rename from patches/server/0487-Add-sendOpLevel-API.patch rename to patches/server/0485-Add-sendOpLevel-API.patch diff --git a/patches/server/0488-TODO-Registry-Modification-API.patch b/patches/server/0486-TODO-Registry-Modification-API.patch similarity index 100% rename from patches/server/0488-TODO-Registry-Modification-API.patch rename to patches/server/0486-TODO-Registry-Modification-API.patch diff --git a/patches/server/0489-Add-StructuresLocateEvent.patch b/patches/server/0487-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/server/0489-Add-StructuresLocateEvent.patch rename to patches/server/0487-Add-StructuresLocateEvent.patch diff --git a/patches/server/0490-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0488-Collision-option-for-requiring-a-player-participant.patch similarity index 100% rename from patches/server/0490-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0488-Collision-option-for-requiring-a-player-participant.patch diff --git a/patches/server/0491-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0489-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0491-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/server/0489-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0492-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0490-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0492-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0490-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0493-Make-schedule-command-per-world.patch b/patches/server/0491-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0493-Make-schedule-command-per-world.patch rename to patches/server/0491-Make-schedule-command-per-world.patch diff --git a/patches/server/0494-Configurable-max-leash-distance.patch b/patches/server/0492-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0494-Configurable-max-leash-distance.patch rename to patches/server/0492-Configurable-max-leash-distance.patch diff --git a/patches/server/0495-Add-BlockPreDispenseEvent.patch b/patches/server/0493-Add-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0495-Add-BlockPreDispenseEvent.patch rename to patches/server/0493-Add-BlockPreDispenseEvent.patch diff --git a/patches/server/0496-Add-PlayerChangeBeaconEffectEvent.patch b/patches/server/0494-Add-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0496-Add-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0494-Add-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0497-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0495-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0497-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0495-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0498-Add-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0496-Add-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0498-Add-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0496-Add-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0499-Expand-EntityUnleashEvent.patch b/patches/server/0497-Expand-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0499-Expand-EntityUnleashEvent.patch rename to patches/server/0497-Expand-EntityUnleashEvent.patch diff --git a/patches/server/0500-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0498-Reset-shield-blocking-on-dimension-change.patch similarity index 100% rename from patches/server/0500-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0498-Reset-shield-blocking-on-dimension-change.patch diff --git a/patches/server/0501-Add-DragonEggFormEvent.patch b/patches/server/0499-Add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0501-Add-DragonEggFormEvent.patch rename to patches/server/0499-Add-DragonEggFormEvent.patch diff --git a/patches/server/0502-Add-EntityMoveEvent.patch b/patches/server/0500-Add-EntityMoveEvent.patch similarity index 100% rename from patches/server/0502-Add-EntityMoveEvent.patch rename to patches/server/0500-Add-EntityMoveEvent.patch diff --git a/patches/server/0503-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0501-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from patches/server/0503-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0501-added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/patches/server/0504-Inline-shift-direction-fields.patch b/patches/server/0502-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0504-Inline-shift-direction-fields.patch rename to patches/server/0502-Inline-shift-direction-fields.patch diff --git a/patches/server/0505-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0503-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0505-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0503-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0506-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0504-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0506-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0504-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0507-living-entity-allow-attribute-registration.patch b/patches/server/0505-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0507-living-entity-allow-attribute-registration.patch rename to patches/server/0505-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0508-fix-dead-slime-setSize-invincibility.patch b/patches/server/0506-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0508-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0506-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0509-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0507-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0509-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0507-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0510-Expose-Tracked-Players.patch b/patches/server/0508-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0510-Expose-Tracked-Players.patch rename to patches/server/0508-Expose-Tracked-Players.patch diff --git a/patches/server/0511-Improve-ServerGUI.patch b/patches/server/0509-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0511-Improve-ServerGUI.patch rename to patches/server/0509-Improve-ServerGUI.patch diff --git a/patches/server/0512-fix-converting-txt-to-json-file.patch b/patches/server/0510-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0512-fix-converting-txt-to-json-file.patch rename to patches/server/0510-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0513-Add-worldborder-events.patch b/patches/server/0511-Add-worldborder-events.patch similarity index 100% rename from patches/server/0513-Add-worldborder-events.patch rename to patches/server/0511-Add-worldborder-events.patch diff --git a/patches/server/0514-Add-PlayerNameEntityEvent.patch b/patches/server/0512-Add-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0514-Add-PlayerNameEntityEvent.patch rename to patches/server/0512-Add-PlayerNameEntityEvent.patch diff --git a/patches/server/0515-Add-recipe-to-cook-events.patch b/patches/server/0513-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0515-Add-recipe-to-cook-events.patch rename to patches/server/0513-Add-recipe-to-cook-events.patch diff --git a/patches/server/0516-Add-Block-isValidTool.patch b/patches/server/0514-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0516-Add-Block-isValidTool.patch rename to patches/server/0514-Add-Block-isValidTool.patch diff --git a/patches/server/0517-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0515-Allow-using-signs-inside-spawn-protection.patch similarity index 100% rename from patches/server/0517-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0515-Allow-using-signs-inside-spawn-protection.patch diff --git a/patches/server/0518-Expand-world-key-API.patch b/patches/server/0516-Expand-world-key-API.patch similarity index 100% rename from patches/server/0518-Expand-world-key-API.patch rename to patches/server/0516-Expand-world-key-API.patch diff --git a/patches/server/0519-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0517-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0519-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0517-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0520-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0518-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0520-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0518-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0521-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0519-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0521-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0519-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0522-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0520-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 100% rename from patches/server/0522-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0520-Don-t-ignore-result-of-PlayerEditBookEvent.patch diff --git a/patches/server/0523-Expose-protocol-version.patch b/patches/server/0521-Expose-protocol-version.patch similarity index 100% rename from patches/server/0523-Expose-protocol-version.patch rename to patches/server/0521-Expose-protocol-version.patch diff --git a/patches/server/0524-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0522-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0524-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0522-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0525-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0523-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 100% rename from patches/server/0525-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0523-Fix-PlayerItemConsumeEvent-cancelling-properly.patch diff --git a/patches/server/0526-Add-bypass-host-check.patch b/patches/server/0524-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0526-Add-bypass-host-check.patch rename to patches/server/0524-Add-bypass-host-check.patch diff --git a/patches/server/0527-Set-area-affect-cloud-rotation.patch b/patches/server/0525-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0527-Set-area-affect-cloud-rotation.patch rename to patches/server/0525-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0528-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0526-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0528-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0526-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0529-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0527-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0529-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0527-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0530-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0528-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0530-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0528-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0531-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0529-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0531-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0529-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0532-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0530-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 100% rename from patches/server/0532-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0530-fix-PlayerItemHeldEvent-firing-twice.patch diff --git a/patches/server/0533-Add-PlayerDeepSleepEvent.patch b/patches/server/0531-Add-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0533-Add-PlayerDeepSleepEvent.patch rename to patches/server/0531-Add-PlayerDeepSleepEvent.patch diff --git a/patches/server/0534-More-World-API.patch b/patches/server/0532-More-World-API.patch similarity index 100% rename from patches/server/0534-More-World-API.patch rename to patches/server/0532-More-World-API.patch diff --git a/patches/server/0535-Add-PlayerBedFailEnterEvent.patch b/patches/server/0533-Add-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0535-Add-PlayerBedFailEnterEvent.patch rename to patches/server/0533-Add-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0536-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0534-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0536-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0534-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0537-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch b/patches/server/0535-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch similarity index 100% rename from patches/server/0537-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch rename to patches/server/0535-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch diff --git a/patches/server/0538-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0536-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0538-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0536-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0539-Add-Channel-initialization-listeners.patch b/patches/server/0537-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0539-Add-Channel-initialization-listeners.patch rename to patches/server/0537-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0540-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0538-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0540-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0538-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0541-Add-more-WanderingTrader-API.patch b/patches/server/0539-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0541-Add-more-WanderingTrader-API.patch rename to patches/server/0539-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0542-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0540-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0542-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0540-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0543-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0541-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0543-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0541-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0544-Add-HiddenPotionEffect-API.patch b/patches/server/0542-Add-HiddenPotionEffect-API.patch similarity index 100% rename from patches/server/0544-Add-HiddenPotionEffect-API.patch rename to patches/server/0542-Add-HiddenPotionEffect-API.patch diff --git a/patches/server/0545-Inventory-close.patch b/patches/server/0543-Inventory-close.patch similarity index 100% rename from patches/server/0545-Inventory-close.patch rename to patches/server/0543-Inventory-close.patch diff --git a/patches/server/0546-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0544-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0546-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0544-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0547-Add-basic-Datapack-API.patch b/patches/server/0545-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0547-Add-basic-Datapack-API.patch rename to patches/server/0545-Add-basic-Datapack-API.patch diff --git a/patches/server/0548-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0546-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0548-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0546-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0549-Expand-PlayerGameModeChangeEvent.patch b/patches/server/0547-Expand-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/server/0549-Expand-PlayerGameModeChangeEvent.patch rename to patches/server/0547-Expand-PlayerGameModeChangeEvent.patch diff --git a/patches/server/0550-ItemStack-repair-check-API.patch b/patches/server/0548-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0550-ItemStack-repair-check-API.patch rename to patches/server/0548-ItemStack-repair-check-API.patch diff --git a/patches/server/0551-More-Enchantment-API.patch b/patches/server/0549-More-Enchantment-API.patch similarity index 100% rename from patches/server/0551-More-Enchantment-API.patch rename to patches/server/0549-More-Enchantment-API.patch diff --git a/patches/server/0552-Move-range-check-for-block-placing-up.patch b/patches/server/0550-Move-range-check-for-block-placing-up.patch similarity index 100% rename from patches/server/0552-Move-range-check-for-block-placing-up.patch rename to patches/server/0550-Move-range-check-for-block-placing-up.patch diff --git a/patches/server/0553-Add-Mob-lookAt-API.patch b/patches/server/0551-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0553-Add-Mob-lookAt-API.patch rename to patches/server/0551-Add-Mob-lookAt-API.patch diff --git a/patches/server/0554-Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/server/0552-Correctly-check-if-bucket-dispenses-will-succeed-for.patch similarity index 100% rename from patches/server/0554-Correctly-check-if-bucket-dispenses-will-succeed-for.patch rename to patches/server/0552-Correctly-check-if-bucket-dispenses-will-succeed-for.patch diff --git a/patches/server/0555-Add-Unix-domain-socket-support.patch b/patches/server/0553-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0555-Add-Unix-domain-socket-support.patch rename to patches/server/0553-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0556-Add-EntityInsideBlockEvent.patch b/patches/server/0554-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0556-Add-EntityInsideBlockEvent.patch rename to patches/server/0554-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0557-Fix-item-default-attributes-API.patch b/patches/server/0555-Fix-item-default-attributes-API.patch similarity index 100% rename from patches/server/0557-Fix-item-default-attributes-API.patch rename to patches/server/0555-Fix-item-default-attributes-API.patch diff --git a/patches/server/0558-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0556-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/server/0558-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0556-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/server/0559-More-Lidded-Block-API.patch b/patches/server/0557-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0559-More-Lidded-Block-API.patch rename to patches/server/0557-More-Lidded-Block-API.patch diff --git a/patches/server/0560-Limit-item-frame-cursors-on-maps.patch b/patches/server/0558-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0560-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0558-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0561-Add-PlayerKickEvent-causes.patch b/patches/server/0559-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/server/0561-Add-PlayerKickEvent-causes.patch rename to patches/server/0559-Add-PlayerKickEvent-causes.patch diff --git a/patches/server/0562-Add-PufferFishStateChangeEvent.patch b/patches/server/0560-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0562-Add-PufferFishStateChangeEvent.patch rename to patches/server/0560-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0563-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0561-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0563-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0561-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0564-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0562-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch similarity index 100% rename from patches/server/0564-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch rename to patches/server/0562-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch diff --git a/patches/server/0565-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0563-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0565-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0563-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0566-Add-BellRevealRaiderEvent.patch b/patches/server/0564-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0566-Add-BellRevealRaiderEvent.patch rename to patches/server/0564-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0567-Fix-invulnerable-end-crystals.patch b/patches/server/0565-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0567-Fix-invulnerable-end-crystals.patch rename to patches/server/0565-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0568-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0566-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0568-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0566-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0569-Fix-dangerous-end-portal-logic.patch b/patches/server/0567-Fix-dangerous-end-portal-logic.patch similarity index 100% rename from patches/server/0569-Fix-dangerous-end-portal-logic.patch rename to patches/server/0567-Fix-dangerous-end-portal-logic.patch diff --git a/patches/server/0570-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0568-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0570-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0568-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0571-Line-Of-Sight-Changes.patch b/patches/server/0569-Line-Of-Sight-Changes.patch similarity index 100% rename from patches/server/0571-Line-Of-Sight-Changes.patch rename to patches/server/0569-Line-Of-Sight-Changes.patch diff --git a/patches/server/0572-add-per-world-spawn-limits.patch b/patches/server/0570-add-per-world-spawn-limits.patch similarity index 100% rename from patches/server/0572-add-per-world-spawn-limits.patch rename to patches/server/0570-add-per-world-spawn-limits.patch diff --git a/patches/server/0573-Fix-potions-splash-events.patch b/patches/server/0571-Fix-potions-splash-events.patch similarity index 100% rename from patches/server/0573-Fix-potions-splash-events.patch rename to patches/server/0571-Fix-potions-splash-events.patch diff --git a/patches/server/0574-Add-more-LimitedRegion-API.patch b/patches/server/0572-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0574-Add-more-LimitedRegion-API.patch rename to patches/server/0572-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0575-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0573-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 100% rename from patches/server/0575-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0573-Fix-PlayerDropItemEvent-using-wrong-item.patch diff --git a/patches/server/0576-Missing-Entity-API.patch b/patches/server/0574-Missing-Entity-API.patch similarity index 100% rename from patches/server/0576-Missing-Entity-API.patch rename to patches/server/0574-Missing-Entity-API.patch diff --git a/patches/server/0577-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0575-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 100% rename from patches/server/0577-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0575-Ensure-disconnect-for-book-edit-is-called-on-main.patch diff --git a/patches/server/0578-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0576-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0578-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0576-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0579-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0577-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/server/0579-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0577-Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/server/0580-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0578-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0580-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0578-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0581-Add-PlayerArmSwingEvent.patch b/patches/server/0579-Add-PlayerArmSwingEvent.patch similarity index 100% rename from patches/server/0581-Add-PlayerArmSwingEvent.patch rename to patches/server/0579-Add-PlayerArmSwingEvent.patch diff --git a/patches/server/0582-Fix-kick-event-leave-message-not-being-sent.patch b/patches/server/0580-Fix-kick-event-leave-message-not-being-sent.patch similarity index 100% rename from patches/server/0582-Fix-kick-event-leave-message-not-being-sent.patch rename to patches/server/0580-Fix-kick-event-leave-message-not-being-sent.patch diff --git a/patches/server/0583-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0581-Don-t-apply-cramming-damage-to-players.patch similarity index 100% rename from patches/server/0583-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0581-Don-t-apply-cramming-damage-to-players.patch diff --git a/patches/server/0584-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0582-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0584-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0582-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0585-Add-missing-forceDrop-toggles.patch b/patches/server/0583-Add-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0585-Add-missing-forceDrop-toggles.patch rename to patches/server/0583-Add-missing-forceDrop-toggles.patch diff --git a/patches/server/0586-Stinger-API.patch b/patches/server/0584-Stinger-API.patch similarity index 100% rename from patches/server/0586-Stinger-API.patch rename to patches/server/0584-Stinger-API.patch diff --git a/patches/server/0587-Add-System.out-err-catcher.patch b/patches/server/0585-Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/0587-Add-System.out-err-catcher.patch rename to patches/server/0585-Add-System.out-err-catcher.patch diff --git a/patches/server/0588-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0586-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 100% rename from patches/server/0588-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0586-Prevent-AFK-kick-while-watching-end-credits.patch diff --git a/patches/server/0589-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0587-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0589-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0587-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0590-Add-PlayerSetSpawnEvent.patch b/patches/server/0588-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/server/0590-Add-PlayerSetSpawnEvent.patch rename to patches/server/0588-Add-PlayerSetSpawnEvent.patch diff --git a/patches/server/0591-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0589-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0591-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0589-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0592-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0590-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0592-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0590-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0593-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0591-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0593-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0591-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0594-Add-EntityDamageItemEvent.patch b/patches/server/0592-Add-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0594-Add-EntityDamageItemEvent.patch rename to patches/server/0592-Add-EntityDamageItemEvent.patch diff --git a/patches/server/0595-Optimize-indirect-passenger-iteration.patch b/patches/server/0593-Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/server/0595-Optimize-indirect-passenger-iteration.patch rename to patches/server/0593-Optimize-indirect-passenger-iteration.patch diff --git a/patches/server/0596-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0594-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0596-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0594-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0597-Clear-bucket-NBT-after-dispense.patch b/patches/server/0595-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0597-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0595-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0598-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0596-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0598-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0596-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0599-Add-BlockBreakBlockEvent.patch b/patches/server/0597-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0599-Add-BlockBreakBlockEvent.patch rename to patches/server/0597-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0600-Option-to-prevent-data-components-copy-in-smithing-r.patch b/patches/server/0598-Option-to-prevent-data-components-copy-in-smithing-r.patch similarity index 100% rename from patches/server/0600-Option-to-prevent-data-components-copy-in-smithing-r.patch rename to patches/server/0598-Option-to-prevent-data-components-copy-in-smithing-r.patch diff --git a/patches/server/0601-More-CommandBlock-API.patch b/patches/server/0599-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0601-More-CommandBlock-API.patch rename to patches/server/0599-More-CommandBlock-API.patch diff --git a/patches/server/0602-Add-missing-team-sidebar-display-slots.patch b/patches/server/0600-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0602-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0600-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0603-Add-back-EntityPortalExitEvent.patch b/patches/server/0601-Add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/server/0603-Add-back-EntityPortalExitEvent.patch rename to patches/server/0601-Add-back-EntityPortalExitEvent.patch diff --git a/patches/server/0604-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0602-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/server/0604-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0602-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/server/0605-Get-entity-default-attributes.patch b/patches/server/0603-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0605-Get-entity-default-attributes.patch rename to patches/server/0603-Get-entity-default-attributes.patch diff --git a/patches/server/0606-Left-handed-API.patch b/patches/server/0604-Left-handed-API.patch similarity index 100% rename from patches/server/0606-Left-handed-API.patch rename to patches/server/0604-Left-handed-API.patch diff --git a/patches/server/0607-Add-more-advancement-API.patch b/patches/server/0605-Add-more-advancement-API.patch similarity index 100% rename from patches/server/0607-Add-more-advancement-API.patch rename to patches/server/0605-Add-more-advancement-API.patch diff --git a/patches/server/0608-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0606-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/server/0608-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/server/0606-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/server/0609-Add-critical-damage-API.patch b/patches/server/0607-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0609-Add-critical-damage-API.patch rename to patches/server/0607-Add-critical-damage-API.patch diff --git a/patches/server/0610-Fix-issues-with-mob-conversion.patch b/patches/server/0608-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0610-Fix-issues-with-mob-conversion.patch rename to patches/server/0608-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0611-Add-isCollidable-methods-to-various-places.patch b/patches/server/0609-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/0611-Add-isCollidable-methods-to-various-places.patch rename to patches/server/0609-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/0612-Goat-ram-API.patch b/patches/server/0610-Goat-ram-API.patch similarity index 100% rename from patches/server/0612-Goat-ram-API.patch rename to patches/server/0610-Goat-ram-API.patch diff --git a/patches/server/0613-Add-API-for-resetting-a-single-score.patch b/patches/server/0611-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0613-Add-API-for-resetting-a-single-score.patch rename to patches/server/0611-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0614-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0612-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/server/0614-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0612-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/server/0615-Vanilla-command-permission-fixes.patch b/patches/server/0613-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0615-Vanilla-command-permission-fixes.patch rename to patches/server/0613-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0616-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0614-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 100% rename from patches/server/0616-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0614-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch diff --git a/patches/server/0617-Fix-GameProfileCache-concurrency.patch b/patches/server/0615-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0617-Fix-GameProfileCache-concurrency.patch rename to patches/server/0615-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0618-Improve-and-expand-AsyncCatcher.patch b/patches/server/0616-Improve-and-expand-AsyncCatcher.patch similarity index 100% rename from patches/server/0618-Improve-and-expand-AsyncCatcher.patch rename to patches/server/0616-Improve-and-expand-AsyncCatcher.patch diff --git a/patches/server/0619-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0617-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 100% rename from patches/server/0619-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/server/0617-Add-paper-mobcaps-and-paper-playermobcaps.patch diff --git a/patches/server/0620-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0618-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0620-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0618-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0621-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0619-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0621-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0619-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0622-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0620-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0622-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0620-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0623-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0621-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/0623-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0621-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/0624-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0622-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/0624-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/server/0622-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/0625-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch b/patches/server/0623-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch similarity index 100% rename from patches/server/0625-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch rename to patches/server/0623-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch diff --git a/patches/server/0626-Time-scoreboard-search.patch b/patches/server/0624-Time-scoreboard-search.patch similarity index 100% rename from patches/server/0626-Time-scoreboard-search.patch rename to patches/server/0624-Time-scoreboard-search.patch diff --git a/patches/server/0627-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0625-Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/server/0627-Oprimise-map-impl-for-tracked-players.patch rename to patches/server/0625-Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/server/0628-Add-missing-InventoryType.patch b/patches/server/0626-Add-missing-InventoryType.patch similarity index 100% rename from patches/server/0628-Add-missing-InventoryType.patch rename to patches/server/0626-Add-missing-InventoryType.patch diff --git a/patches/server/0629-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0627-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0629-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/server/0627-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0630-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0628-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 100% rename from patches/server/0630-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/server/0628-Fix-merchant-inventory-not-closing-on-entity-removal.patch diff --git a/patches/server/0631-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0629-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0631-Check-requirement-before-suggesting-root-nodes.patch rename to patches/server/0629-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0632-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0630-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 100% rename from patches/server/0632-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/server/0630-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch diff --git a/patches/server/0633-Add-packet-limiter-config.patch b/patches/server/0631-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0633-Add-packet-limiter-config.patch rename to patches/server/0631-Add-packet-limiter-config.patch diff --git a/patches/server/0634-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0632-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0634-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/server/0632-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/0635-Ensure-valid-vehicle-status.patch b/patches/server/0633-Ensure-valid-vehicle-status.patch similarity index 100% rename from patches/server/0635-Ensure-valid-vehicle-status.patch rename to patches/server/0633-Ensure-valid-vehicle-status.patch diff --git a/patches/server/0636-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0634-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0636-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/server/0634-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0637-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0635-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0637-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/server/0635-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0638-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0636-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0638-Don-t-log-debug-logging-being-disabled.patch rename to patches/server/0636-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0639-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0637-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0639-fix-various-menus-with-empty-level-accesses.patch rename to patches/server/0637-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0640-Preserve-overstacked-loot.patch b/patches/server/0638-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0640-Preserve-overstacked-loot.patch rename to patches/server/0638-Preserve-overstacked-loot.patch diff --git a/patches/server/0641-Update-head-rotation-in-missing-places.patch b/patches/server/0639-Update-head-rotation-in-missing-places.patch similarity index 100% rename from patches/server/0641-Update-head-rotation-in-missing-places.patch rename to patches/server/0639-Update-head-rotation-in-missing-places.patch diff --git a/patches/server/0642-prevent-unintended-light-block-manipulation.patch b/patches/server/0640-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0642-prevent-unintended-light-block-manipulation.patch rename to patches/server/0640-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0643-Fix-CraftCriteria-defaults-map.patch b/patches/server/0641-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0643-Fix-CraftCriteria-defaults-map.patch rename to patches/server/0641-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0644-Fix-upstreams-block-state-factories.patch b/patches/server/0642-Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/server/0644-Fix-upstreams-block-state-factories.patch rename to patches/server/0642-Fix-upstreams-block-state-factories.patch diff --git a/patches/server/0645-Configurable-feature-seeds.patch b/patches/server/0643-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0645-Configurable-feature-seeds.patch rename to patches/server/0643-Configurable-feature-seeds.patch diff --git a/patches/server/0646-Add-root-admin-user-detection.patch b/patches/server/0644-Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/0646-Add-root-admin-user-detection.patch rename to patches/server/0644-Add-root-admin-user-detection.patch diff --git a/patches/server/0647-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0645-don-t-attempt-to-teleport-dead-entities.patch similarity index 100% rename from patches/server/0647-don-t-attempt-to-teleport-dead-entities.patch rename to patches/server/0645-don-t-attempt-to-teleport-dead-entities.patch diff --git a/patches/server/0648-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0646-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 100% rename from patches/server/0648-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/server/0646-Prevent-excessive-velocity-through-repeated-crits.patch diff --git a/patches/server/0649-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0647-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0649-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/server/0647-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0650-Fix-Spigot-growth-modifiers.patch b/patches/server/0648-Fix-Spigot-growth-modifiers.patch similarity index 100% rename from patches/server/0650-Fix-Spigot-growth-modifiers.patch rename to patches/server/0648-Fix-Spigot-growth-modifiers.patch diff --git a/patches/server/0651-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0649-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0651-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/server/0649-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0652-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0650-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0652-Add-PlayerItemFrameChangeEvent.patch rename to patches/server/0650-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0653-Optimize-HashMapPalette.patch b/patches/server/0651-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0653-Optimize-HashMapPalette.patch rename to patches/server/0651-Optimize-HashMapPalette.patch diff --git a/patches/server/0654-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0652-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/server/0654-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0652-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/server/0655-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0653-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0655-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/server/0653-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0656-Add-more-Campfire-API.patch b/patches/server/0654-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0656-Add-more-Campfire-API.patch rename to patches/server/0654-Add-more-Campfire-API.patch diff --git a/patches/server/0657-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0655-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/0657-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/server/0655-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/0658-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0656-Forward-CraftEntity-in-teleport-command.patch similarity index 100% rename from patches/server/0658-Forward-CraftEntity-in-teleport-command.patch rename to patches/server/0656-Forward-CraftEntity-in-teleport-command.patch diff --git a/patches/server/0659-Improve-scoreboard-entries.patch b/patches/server/0657-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0659-Improve-scoreboard-entries.patch rename to patches/server/0657-Improve-scoreboard-entries.patch diff --git a/patches/server/0660-Entity-powdered-snow-API.patch b/patches/server/0658-Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/0660-Entity-powdered-snow-API.patch rename to patches/server/0658-Entity-powdered-snow-API.patch diff --git a/patches/server/0661-Add-API-for-item-entity-health.patch b/patches/server/0659-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0661-Add-API-for-item-entity-health.patch rename to patches/server/0659-Add-API-for-item-entity-health.patch diff --git a/patches/server/0662-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0660-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0662-Configurable-max-block-light-for-monster-spawning.patch rename to patches/server/0660-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0663-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0661-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0663-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/server/0661-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0664-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0662-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0664-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/server/0662-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0665-Bucketable-API.patch b/patches/server/0663-Bucketable-API.patch similarity index 100% rename from patches/server/0665-Bucketable-API.patch rename to patches/server/0663-Bucketable-API.patch diff --git a/patches/server/0666-Validate-usernames.patch b/patches/server/0664-Validate-usernames.patch similarity index 100% rename from patches/server/0666-Validate-usernames.patch rename to patches/server/0664-Validate-usernames.patch diff --git a/patches/server/0667-Make-water-animal-spawn-height-configurable.patch b/patches/server/0665-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0667-Make-water-animal-spawn-height-configurable.patch rename to patches/server/0665-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0668-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0666-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/server/0668-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/server/0666-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/server/0669-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0667-Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/server/0669-Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/server/0667-Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/server/0670-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0668-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch similarity index 100% rename from patches/server/0670-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch rename to patches/server/0668-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch diff --git a/patches/server/0671-Multiple-Entries-with-Scoreboards.patch b/patches/server/0669-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/0671-Multiple-Entries-with-Scoreboards.patch rename to patches/server/0669-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/0672-Reset-placed-block-on-exception.patch b/patches/server/0670-Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/0672-Reset-placed-block-on-exception.patch rename to patches/server/0670-Reset-placed-block-on-exception.patch diff --git a/patches/server/0673-Add-configurable-height-for-slime-spawn.patch b/patches/server/0671-Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/server/0673-Add-configurable-height-for-slime-spawn.patch rename to patches/server/0671-Add-configurable-height-for-slime-spawn.patch diff --git a/patches/server/0674-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0672-Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/server/0674-Fix-xp-reward-for-baby-zombies.patch rename to patches/server/0672-Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/server/0675-Multi-Block-Change-API-Implementation.patch b/patches/server/0673-Multi-Block-Change-API-Implementation.patch similarity index 100% rename from patches/server/0675-Multi-Block-Change-API-Implementation.patch rename to patches/server/0673-Multi-Block-Change-API-Implementation.patch diff --git a/patches/server/0676-Fix-NotePlayEvent.patch b/patches/server/0674-Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/0676-Fix-NotePlayEvent.patch rename to patches/server/0674-Fix-NotePlayEvent.patch diff --git a/patches/server/0677-Freeze-Tick-Lock-API.patch b/patches/server/0675-Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/server/0677-Freeze-Tick-Lock-API.patch rename to patches/server/0675-Freeze-Tick-Lock-API.patch diff --git a/patches/server/0678-More-PotionEffectType-API.patch b/patches/server/0676-More-PotionEffectType-API.patch similarity index 100% rename from patches/server/0678-More-PotionEffectType-API.patch rename to patches/server/0676-More-PotionEffectType-API.patch diff --git a/patches/server/0679-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0677-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/0679-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/server/0677-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/0680-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0678-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/server/0680-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/server/0678-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/server/0681-Add-missing-structure-set-seed-configs.patch b/patches/server/0679-Add-missing-structure-set-seed-configs.patch similarity index 100% rename from patches/server/0681-Add-missing-structure-set-seed-configs.patch rename to patches/server/0679-Add-missing-structure-set-seed-configs.patch diff --git a/patches/server/0682-Implement-regenerateChunk.patch b/patches/server/0680-Implement-regenerateChunk.patch similarity index 100% rename from patches/server/0682-Implement-regenerateChunk.patch rename to patches/server/0680-Implement-regenerateChunk.patch diff --git a/patches/server/0683-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0681-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 100% rename from patches/server/0683-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/server/0681-Fix-cancelled-powdered-snow-bucket-placement.patch diff --git a/patches/server/0684-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0682-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 100% rename from patches/server/0684-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/server/0682-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch diff --git a/patches/server/0685-Add-GameEvent-tags.patch b/patches/server/0683-Add-GameEvent-tags.patch similarity index 100% rename from patches/server/0685-Add-GameEvent-tags.patch rename to patches/server/0683-Add-GameEvent-tags.patch diff --git a/patches/server/0686-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0684-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 100% rename from patches/server/0686-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/server/0684-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch diff --git a/patches/server/0687-Furnace-RecipesUsed-API.patch b/patches/server/0685-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/server/0687-Furnace-RecipesUsed-API.patch rename to patches/server/0685-Furnace-RecipesUsed-API.patch diff --git a/patches/server/0688-Configurable-sculk-sensor-listener-range.patch b/patches/server/0686-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/server/0688-Configurable-sculk-sensor-listener-range.patch rename to patches/server/0686-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/server/0689-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0687-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/server/0689-Add-missing-block-data-mins-and-maxes.patch rename to patches/server/0687-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/server/0690-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0688-Option-to-have-default-CustomSpawners-in-custom-worl.patch similarity index 100% rename from patches/server/0690-Option-to-have-default-CustomSpawners-in-custom-worl.patch rename to patches/server/0688-Option-to-have-default-CustomSpawners-in-custom-worl.patch diff --git a/patches/server/0691-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0689-Put-world-into-worldlist-before-initing-the-world.patch similarity index 100% rename from patches/server/0691-Put-world-into-worldlist-before-initing-the-world.patch rename to patches/server/0689-Put-world-into-worldlist-before-initing-the-world.patch diff --git a/patches/server/0692-Fix-Entity-Position-Desync.patch b/patches/server/0690-Fix-Entity-Position-Desync.patch similarity index 100% rename from patches/server/0692-Fix-Entity-Position-Desync.patch rename to patches/server/0690-Fix-Entity-Position-Desync.patch diff --git a/patches/server/0693-Custom-Potion-Mixes.patch b/patches/server/0691-Custom-Potion-Mixes.patch similarity index 100% rename from patches/server/0693-Custom-Potion-Mixes.patch rename to patches/server/0691-Custom-Potion-Mixes.patch diff --git a/patches/server/0694-Force-close-world-loading-screen.patch b/patches/server/0692-Force-close-world-loading-screen.patch similarity index 100% rename from patches/server/0694-Force-close-world-loading-screen.patch rename to patches/server/0692-Force-close-world-loading-screen.patch diff --git a/patches/server/0695-Fix-falling-block-spawn-methods.patch b/patches/server/0693-Fix-falling-block-spawn-methods.patch similarity index 100% rename from patches/server/0695-Fix-falling-block-spawn-methods.patch rename to patches/server/0693-Fix-falling-block-spawn-methods.patch diff --git a/patches/server/0696-Expose-furnace-minecart-push-values.patch b/patches/server/0694-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/server/0696-Expose-furnace-minecart-push-values.patch rename to patches/server/0694-Expose-furnace-minecart-push-values.patch diff --git a/patches/server/0697-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0695-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch similarity index 100% rename from patches/server/0697-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch rename to patches/server/0695-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch diff --git a/patches/server/0698-More-Projectile-API.patch b/patches/server/0696-More-Projectile-API.patch similarity index 100% rename from patches/server/0698-More-Projectile-API.patch rename to patches/server/0696-More-Projectile-API.patch diff --git a/patches/server/0699-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0697-Fix-swamp-hut-cat-generation-deadlock.patch similarity index 100% rename from patches/server/0699-Fix-swamp-hut-cat-generation-deadlock.patch rename to patches/server/0697-Fix-swamp-hut-cat-generation-deadlock.patch diff --git a/patches/server/0700-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0698-Don-t-allow-vehicle-movement-from-players-while-tele.patch similarity index 100% rename from patches/server/0700-Don-t-allow-vehicle-movement-from-players-while-tele.patch rename to patches/server/0698-Don-t-allow-vehicle-movement-from-players-while-tele.patch diff --git a/patches/server/0701-Implement-getComputedBiome-API.patch b/patches/server/0699-Implement-getComputedBiome-API.patch similarity index 100% rename from patches/server/0701-Implement-getComputedBiome-API.patch rename to patches/server/0699-Implement-getComputedBiome-API.patch diff --git a/patches/server/0702-Make-some-itemstacks-nonnull.patch b/patches/server/0700-Make-some-itemstacks-nonnull.patch similarity index 100% rename from patches/server/0702-Make-some-itemstacks-nonnull.patch rename to patches/server/0700-Make-some-itemstacks-nonnull.patch diff --git a/patches/server/0703-Implement-enchantWithLevels-API.patch b/patches/server/0701-Implement-enchantWithLevels-API.patch similarity index 100% rename from patches/server/0703-Implement-enchantWithLevels-API.patch rename to patches/server/0701-Implement-enchantWithLevels-API.patch diff --git a/patches/server/0704-Fix-saving-in-unloadWorld.patch b/patches/server/0702-Fix-saving-in-unloadWorld.patch similarity index 100% rename from patches/server/0704-Fix-saving-in-unloadWorld.patch rename to patches/server/0702-Fix-saving-in-unloadWorld.patch diff --git a/patches/server/0705-Buffer-OOB-setBlock-calls.patch b/patches/server/0703-Buffer-OOB-setBlock-calls.patch similarity index 100% rename from patches/server/0705-Buffer-OOB-setBlock-calls.patch rename to patches/server/0703-Buffer-OOB-setBlock-calls.patch diff --git a/patches/server/0706-Add-TameableDeathMessageEvent.patch b/patches/server/0704-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/server/0706-Add-TameableDeathMessageEvent.patch rename to patches/server/0704-Add-TameableDeathMessageEvent.patch diff --git a/patches/server/0707-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0705-Fix-new-block-data-for-EntityChangeBlockEvent.patch similarity index 100% rename from patches/server/0707-Fix-new-block-data-for-EntityChangeBlockEvent.patch rename to patches/server/0705-Fix-new-block-data-for-EntityChangeBlockEvent.patch diff --git a/patches/server/0708-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0706-fix-player-loottables-running-when-mob-loot-gamerule.patch similarity index 100% rename from patches/server/0708-fix-player-loottables-running-when-mob-loot-gamerule.patch rename to patches/server/0706-fix-player-loottables-running-when-mob-loot-gamerule.patch diff --git a/patches/server/0709-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0707-Ensure-entity-passenger-world-matches-ridden-entity.patch similarity index 100% rename from patches/server/0709-Ensure-entity-passenger-world-matches-ridden-entity.patch rename to patches/server/0707-Ensure-entity-passenger-world-matches-ridden-entity.patch diff --git a/patches/server/0710-cache-resource-keys.patch b/patches/server/0708-cache-resource-keys.patch similarity index 100% rename from patches/server/0710-cache-resource-keys.patch rename to patches/server/0708-cache-resource-keys.patch diff --git a/patches/server/0711-Allow-changing-the-EnderDragon-podium.patch b/patches/server/0709-Allow-changing-the-EnderDragon-podium.patch similarity index 100% rename from patches/server/0711-Allow-changing-the-EnderDragon-podium.patch rename to patches/server/0709-Allow-changing-the-EnderDragon-podium.patch diff --git a/patches/server/0712-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0710-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch similarity index 100% rename from patches/server/0712-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch rename to patches/server/0710-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch diff --git a/patches/server/0713-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0711-Prevent-tile-entity-copies-loading-chunks.patch similarity index 100% rename from patches/server/0713-Prevent-tile-entity-copies-loading-chunks.patch rename to patches/server/0711-Prevent-tile-entity-copies-loading-chunks.patch diff --git a/patches/server/0714-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0712-Use-username-instead-of-display-name-in-PlayerList-g.patch similarity index 100% rename from patches/server/0714-Use-username-instead-of-display-name-in-PlayerList-g.patch rename to patches/server/0712-Use-username-instead-of-display-name-in-PlayerList-g.patch diff --git a/patches/server/0715-Expand-PlayerItemDamageEvent.patch b/patches/server/0713-Expand-PlayerItemDamageEvent.patch similarity index 100% rename from patches/server/0715-Expand-PlayerItemDamageEvent.patch rename to patches/server/0713-Expand-PlayerItemDamageEvent.patch diff --git a/patches/server/0716-WorldCreator-keepSpawnLoaded.patch b/patches/server/0714-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/server/0716-WorldCreator-keepSpawnLoaded.patch rename to patches/server/0714-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/server/0717-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0715-Fix-CME-in-CraftPersistentDataTypeRegistry.patch similarity index 100% rename from patches/server/0717-Fix-CME-in-CraftPersistentDataTypeRegistry.patch rename to patches/server/0715-Fix-CME-in-CraftPersistentDataTypeRegistry.patch diff --git a/patches/server/0718-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0716-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch similarity index 100% rename from patches/server/0718-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch rename to patches/server/0716-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch diff --git a/patches/server/0719-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0717-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/server/0719-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/server/0717-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/server/0720-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0718-Fire-CauldronLevelChange-on-initial-fill.patch similarity index 100% rename from patches/server/0720-Fire-CauldronLevelChange-on-initial-fill.patch rename to patches/server/0718-Fire-CauldronLevelChange-on-initial-fill.patch diff --git a/patches/server/0721-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0719-fix-powder-snow-cauldrons-not-turning-to-water.patch similarity index 100% rename from patches/server/0721-fix-powder-snow-cauldrons-not-turning-to-water.patch rename to patches/server/0719-fix-powder-snow-cauldrons-not-turning-to-water.patch diff --git a/patches/server/0722-Add-PlayerStopUsingItemEvent.patch b/patches/server/0720-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/server/0722-Add-PlayerStopUsingItemEvent.patch rename to patches/server/0720-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/server/0723-Don-t-tick-markers.patch b/patches/server/0721-Don-t-tick-markers.patch similarity index 100% rename from patches/server/0723-Don-t-tick-markers.patch rename to patches/server/0721-Don-t-tick-markers.patch diff --git a/patches/server/0724-Expand-FallingBlock-API.patch b/patches/server/0722-Expand-FallingBlock-API.patch similarity index 100% rename from patches/server/0724-Expand-FallingBlock-API.patch rename to patches/server/0722-Expand-FallingBlock-API.patch diff --git a/patches/server/0725-Add-support-for-Proxy-Protocol.patch b/patches/server/0723-Add-support-for-Proxy-Protocol.patch similarity index 96% rename from patches/server/0725-Add-support-for-Proxy-Protocol.patch rename to patches/server/0723-Add-support-for-Proxy-Protocol.patch index c94fcd99d4..7c99aeac41 100644 --- a/patches/server/0725-Add-support-for-Proxy-Protocol.patch +++ b/patches/server/0723-Add-support-for-Proxy-Protocol.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add support for Proxy Protocol diff --git a/build.gradle.kts b/build.gradle.kts -index fb7e956fd7beb741984780a9492230916a330504..41767422b521ff095592d799b14b2f36c3b5c5cb 100644 +index ecd857d58be4a7aa9944934af2ad6a83b2d1b647..9f9ee63e2fd2b3fac5781b50435e26ec079c94fd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -31,6 +31,7 @@ dependencies { +@@ -29,6 +29,7 @@ dependencies { log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - Needed to generate meta for our Log4j plugins runtimeOnly(log4jPlugins.output) alsoShade(log4jPlugins.output) diff --git a/patches/server/0726-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0724-Fix-OfflinePlayer-getBedSpawnLocation.patch similarity index 100% rename from patches/server/0726-Fix-OfflinePlayer-getBedSpawnLocation.patch rename to patches/server/0724-Fix-OfflinePlayer-getBedSpawnLocation.patch diff --git a/patches/server/0727-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0725-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch similarity index 100% rename from patches/server/0727-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch rename to patches/server/0725-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch diff --git a/patches/server/0728-Sanitize-sent-BlockEntity-NBT.patch b/patches/server/0726-Sanitize-sent-BlockEntity-NBT.patch similarity index 100% rename from patches/server/0728-Sanitize-sent-BlockEntity-NBT.patch rename to patches/server/0726-Sanitize-sent-BlockEntity-NBT.patch diff --git a/patches/server/0729-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0727-Disable-component-selector-resolving-in-books-by-def.patch similarity index 100% rename from patches/server/0729-Disable-component-selector-resolving-in-books-by-def.patch rename to patches/server/0727-Disable-component-selector-resolving-in-books-by-def.patch diff --git a/patches/server/0730-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0728-Prevent-entity-loading-causing-async-lookups.patch similarity index 100% rename from patches/server/0730-Prevent-entity-loading-causing-async-lookups.patch rename to patches/server/0728-Prevent-entity-loading-causing-async-lookups.patch diff --git a/patches/server/0731-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0729-Throw-exception-on-world-create-while-being-ticked.patch similarity index 100% rename from patches/server/0731-Throw-exception-on-world-create-while-being-ticked.patch rename to patches/server/0729-Throw-exception-on-world-create-while-being-ticked.patch diff --git a/patches/server/0732-Dont-resent-entity-on-art-update.patch b/patches/server/0730-Dont-resent-entity-on-art-update.patch similarity index 100% rename from patches/server/0732-Dont-resent-entity-on-art-update.patch rename to patches/server/0730-Dont-resent-entity-on-art-update.patch diff --git a/patches/server/0733-Add-WardenAngerChangeEvent.patch b/patches/server/0731-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/server/0733-Add-WardenAngerChangeEvent.patch rename to patches/server/0731-Add-WardenAngerChangeEvent.patch diff --git a/patches/server/0734-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0732-Add-option-for-strict-advancement-dimension-checks.patch similarity index 100% rename from patches/server/0734-Add-option-for-strict-advancement-dimension-checks.patch rename to patches/server/0732-Add-option-for-strict-advancement-dimension-checks.patch diff --git a/patches/server/0735-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0733-Add-missing-important-BlockStateListPopulator-method.patch similarity index 100% rename from patches/server/0735-Add-missing-important-BlockStateListPopulator-method.patch rename to patches/server/0733-Add-missing-important-BlockStateListPopulator-method.patch diff --git a/patches/server/0736-Nameable-Banner-API.patch b/patches/server/0734-Nameable-Banner-API.patch similarity index 100% rename from patches/server/0736-Nameable-Banner-API.patch rename to patches/server/0734-Nameable-Banner-API.patch diff --git a/patches/server/0737-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0735-Don-t-broadcast-messages-to-command-blocks.patch similarity index 100% rename from patches/server/0737-Don-t-broadcast-messages-to-command-blocks.patch rename to patches/server/0735-Don-t-broadcast-messages-to-command-blocks.patch diff --git a/patches/server/0738-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0736-Prevent-empty-items-from-being-added-to-world.patch similarity index 100% rename from patches/server/0738-Prevent-empty-items-from-being-added-to-world.patch rename to patches/server/0736-Prevent-empty-items-from-being-added-to-world.patch diff --git a/patches/server/0739-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0737-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch similarity index 100% rename from patches/server/0739-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch rename to patches/server/0737-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch diff --git a/patches/server/0740-Add-Player-getFishHook.patch b/patches/server/0738-Add-Player-getFishHook.patch similarity index 100% rename from patches/server/0740-Add-Player-getFishHook.patch rename to patches/server/0738-Add-Player-getFishHook.patch diff --git a/patches/server/0741-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0739-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch similarity index 100% rename from patches/server/0741-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch rename to patches/server/0739-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch diff --git a/patches/server/0742-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0740-Add-various-missing-EntityDropItemEvent-calls.patch similarity index 100% rename from patches/server/0742-Add-various-missing-EntityDropItemEvent-calls.patch rename to patches/server/0740-Add-various-missing-EntityDropItemEvent-calls.patch diff --git a/patches/server/0743-Fix-Bee-flower-NPE.patch b/patches/server/0741-Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/server/0743-Fix-Bee-flower-NPE.patch rename to patches/server/0741-Fix-Bee-flower-NPE.patch diff --git a/patches/server/0744-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0742-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch similarity index 100% rename from patches/server/0744-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch rename to patches/server/0742-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch diff --git a/patches/server/0745-More-Teleport-API.patch b/patches/server/0743-More-Teleport-API.patch similarity index 100% rename from patches/server/0745-More-Teleport-API.patch rename to patches/server/0743-More-Teleport-API.patch diff --git a/patches/server/0746-Add-EntityPortalReadyEvent.patch b/patches/server/0744-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/server/0746-Add-EntityPortalReadyEvent.patch rename to patches/server/0744-Add-EntityPortalReadyEvent.patch diff --git a/patches/server/0747-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0745-Don-t-use-level-random-in-entity-constructors.patch similarity index 100% rename from patches/server/0747-Don-t-use-level-random-in-entity-constructors.patch rename to patches/server/0745-Don-t-use-level-random-in-entity-constructors.patch diff --git a/patches/server/0748-Send-block-entities-after-destroy-prediction.patch b/patches/server/0746-Send-block-entities-after-destroy-prediction.patch similarity index 100% rename from patches/server/0748-Send-block-entities-after-destroy-prediction.patch rename to patches/server/0746-Send-block-entities-after-destroy-prediction.patch diff --git a/patches/server/0749-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0747-Warn-on-plugins-accessing-faraway-chunks.patch similarity index 100% rename from patches/server/0749-Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/server/0747-Warn-on-plugins-accessing-faraway-chunks.patch diff --git a/patches/server/0750-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0748-Custom-Chat-Completion-Suggestions-API.patch similarity index 100% rename from patches/server/0750-Custom-Chat-Completion-Suggestions-API.patch rename to patches/server/0748-Custom-Chat-Completion-Suggestions-API.patch diff --git a/patches/server/0751-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0749-Add-and-fix-missing-BlockFadeEvents.patch similarity index 100% rename from patches/server/0751-Add-and-fix-missing-BlockFadeEvents.patch rename to patches/server/0749-Add-and-fix-missing-BlockFadeEvents.patch diff --git a/patches/server/0752-Collision-API.patch b/patches/server/0750-Collision-API.patch similarity index 100% rename from patches/server/0752-Collision-API.patch rename to patches/server/0750-Collision-API.patch diff --git a/patches/server/0753-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0751-Fix-suggest-command-message-for-brigadier-syntax-exc.patch similarity index 100% rename from patches/server/0753-Fix-suggest-command-message-for-brigadier-syntax-exc.patch rename to patches/server/0751-Fix-suggest-command-message-for-brigadier-syntax-exc.patch diff --git a/patches/server/0754-Block-Ticking-API.patch b/patches/server/0752-Block-Ticking-API.patch similarity index 100% rename from patches/server/0754-Block-Ticking-API.patch rename to patches/server/0752-Block-Ticking-API.patch diff --git a/patches/server/0755-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0753-Add-Velocity-IP-Forwarding-Support.patch similarity index 100% rename from patches/server/0755-Add-Velocity-IP-Forwarding-Support.patch rename to patches/server/0753-Add-Velocity-IP-Forwarding-Support.patch diff --git a/patches/server/0756-Add-NamespacedKey-biome-methods.patch b/patches/server/0754-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/server/0756-Add-NamespacedKey-biome-methods.patch rename to patches/server/0754-Add-NamespacedKey-biome-methods.patch diff --git a/patches/server/0757-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0755-Fix-plugin-loggers-on-server-shutdown.patch similarity index 100% rename from patches/server/0757-Fix-plugin-loggers-on-server-shutdown.patch rename to patches/server/0755-Fix-plugin-loggers-on-server-shutdown.patch diff --git a/patches/server/0758-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0756-Stop-large-look-changes-from-crashing-the-server.patch similarity index 100% rename from patches/server/0758-Stop-large-look-changes-from-crashing-the-server.patch rename to patches/server/0756-Stop-large-look-changes-from-crashing-the-server.patch diff --git a/patches/server/0759-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0757-Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/server/0759-Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/server/0757-Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/server/0760-Missing-eating-regain-reason.patch b/patches/server/0758-Missing-eating-regain-reason.patch similarity index 100% rename from patches/server/0760-Missing-eating-regain-reason.patch rename to patches/server/0758-Missing-eating-regain-reason.patch diff --git a/patches/server/0761-Missing-effect-cause.patch b/patches/server/0759-Missing-effect-cause.patch similarity index 100% rename from patches/server/0761-Missing-effect-cause.patch rename to patches/server/0759-Missing-effect-cause.patch diff --git a/patches/server/0762-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0760-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/server/0762-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/server/0760-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/server/0763-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0761-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/server/0763-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/server/0761-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/server/0764-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0762-Call-BlockPhysicsEvent-more-often.patch similarity index 100% rename from patches/server/0764-Call-BlockPhysicsEvent-more-often.patch rename to patches/server/0762-Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/server/0765-Configurable-chat-thread-limit.patch b/patches/server/0763-Configurable-chat-thread-limit.patch similarity index 100% rename from patches/server/0765-Configurable-chat-thread-limit.patch rename to patches/server/0763-Configurable-chat-thread-limit.patch diff --git a/patches/server/0766-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0764-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/server/0766-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/server/0764-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/server/0767-fix-Jigsaw-block-kicking-user.patch b/patches/server/0765-fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/server/0767-fix-Jigsaw-block-kicking-user.patch rename to patches/server/0765-fix-Jigsaw-block-kicking-user.patch diff --git a/patches/server/0768-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0766-use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 100% rename from patches/server/0768-use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/server/0766-use-BlockFormEvent-for-mud-converting-into-clay.patch diff --git a/patches/server/0769-Add-getDrops-to-BlockState.patch b/patches/server/0767-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/server/0769-Add-getDrops-to-BlockState.patch rename to patches/server/0767-Add-getDrops-to-BlockState.patch diff --git a/patches/server/0770-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0768-Fix-a-bunch-of-vanilla-bugs.patch similarity index 100% rename from patches/server/0770-Fix-a-bunch-of-vanilla-bugs.patch rename to patches/server/0768-Fix-a-bunch-of-vanilla-bugs.patch diff --git a/patches/server/0771-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0769-Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 100% rename from patches/server/0771-Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/server/0769-Remove-unnecessary-onTrackingStart-during-navigation.patch diff --git a/patches/server/0772-Fix-custom-piglin-loved-items.patch b/patches/server/0770-Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/server/0772-Fix-custom-piglin-loved-items.patch rename to patches/server/0770-Fix-custom-piglin-loved-items.patch diff --git a/patches/server/0773-EntityPickupItemEvent-fixes.patch b/patches/server/0771-EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/server/0773-EntityPickupItemEvent-fixes.patch rename to patches/server/0771-EntityPickupItemEvent-fixes.patch diff --git a/patches/server/0774-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0772-Correctly-handle-interactions-with-items-on-cooldown.patch similarity index 100% rename from patches/server/0774-Correctly-handle-interactions-with-items-on-cooldown.patch rename to patches/server/0772-Correctly-handle-interactions-with-items-on-cooldown.patch diff --git a/patches/server/0775-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0773-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/server/0775-Add-PlayerInventorySlotChangeEvent.patch rename to patches/server/0773-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/server/0776-Elder-Guardian-appearance-API.patch b/patches/server/0774-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/server/0776-Elder-Guardian-appearance-API.patch rename to patches/server/0774-Elder-Guardian-appearance-API.patch diff --git a/patches/server/0777-Allow-changing-bed-s-occupied-property.patch b/patches/server/0775-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/server/0777-Allow-changing-bed-s-occupied-property.patch rename to patches/server/0775-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/server/0778-Add-entity-knockback-API.patch b/patches/server/0776-Add-entity-knockback-API.patch similarity index 100% rename from patches/server/0778-Add-entity-knockback-API.patch rename to patches/server/0776-Add-entity-knockback-API.patch diff --git a/patches/server/0779-Detect-headless-JREs.patch b/patches/server/0777-Detect-headless-JREs.patch similarity index 100% rename from patches/server/0779-Detect-headless-JREs.patch rename to patches/server/0777-Detect-headless-JREs.patch diff --git a/patches/server/0780-fix-entity-vehicle-collision-event-not-called.patch b/patches/server/0778-fix-entity-vehicle-collision-event-not-called.patch similarity index 100% rename from patches/server/0780-fix-entity-vehicle-collision-event-not-called.patch rename to patches/server/0778-fix-entity-vehicle-collision-event-not-called.patch diff --git a/patches/server/0781-Add-EntityToggleSitEvent.patch b/patches/server/0779-Add-EntityToggleSitEvent.patch similarity index 100% rename from patches/server/0781-Add-EntityToggleSitEvent.patch rename to patches/server/0779-Add-EntityToggleSitEvent.patch diff --git a/patches/server/0782-Add-fire-tick-delay-option.patch b/patches/server/0780-Add-fire-tick-delay-option.patch similarity index 100% rename from patches/server/0782-Add-fire-tick-delay-option.patch rename to patches/server/0780-Add-fire-tick-delay-option.patch diff --git a/patches/server/0783-Add-Moving-Piston-API.patch b/patches/server/0781-Add-Moving-Piston-API.patch similarity index 100% rename from patches/server/0783-Add-Moving-Piston-API.patch rename to patches/server/0781-Add-Moving-Piston-API.patch diff --git a/patches/server/0784-Ignore-impossible-spawn-tick.patch b/patches/server/0782-Ignore-impossible-spawn-tick.patch similarity index 100% rename from patches/server/0784-Ignore-impossible-spawn-tick.patch rename to patches/server/0782-Ignore-impossible-spawn-tick.patch diff --git a/patches/server/0785-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0783-Fix-EntityArgument-suggestion-permissions-to-align-w.patch similarity index 100% rename from patches/server/0785-Fix-EntityArgument-suggestion-permissions-to-align-w.patch rename to patches/server/0783-Fix-EntityArgument-suggestion-permissions-to-align-w.patch diff --git a/patches/server/0786-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0784-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 100% rename from patches/server/0786-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/server/0784-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch diff --git a/patches/server/0787-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0785-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/server/0787-Add-PrePlayerAttackEntityEvent.patch rename to patches/server/0785-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/server/0788-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0786-ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/0788-ensure-reset-EnderDragon-boss-event-name.patch rename to patches/server/0786-ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/0789-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0787-fix-MC-252817-green-map-markers-do-not-disappear.patch similarity index 100% rename from patches/server/0789-fix-MC-252817-green-map-markers-do-not-disappear.patch rename to patches/server/0787-fix-MC-252817-green-map-markers-do-not-disappear.patch diff --git a/patches/server/0790-Add-Player-Warden-Warning-API.patch b/patches/server/0788-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/server/0790-Add-Player-Warden-Warning-API.patch rename to patches/server/0788-Add-Player-Warden-Warning-API.patch diff --git a/patches/server/0791-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0789-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/server/0791-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/server/0789-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/server/0792-Add-paper-dumplisteners-command.patch b/patches/server/0790-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/0792-Add-paper-dumplisteners-command.patch rename to patches/server/0790-Add-paper-dumplisteners-command.patch diff --git a/patches/server/0793-check-global-player-list-where-appropriate.patch b/patches/server/0791-check-global-player-list-where-appropriate.patch similarity index 100% rename from patches/server/0793-check-global-player-list-where-appropriate.patch rename to patches/server/0791-check-global-player-list-where-appropriate.patch diff --git a/patches/server/0794-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0792-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/server/0794-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/server/0792-Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/server/0795-ItemStack-damage-API.patch b/patches/server/0793-ItemStack-damage-API.patch similarity index 100% rename from patches/server/0795-ItemStack-damage-API.patch rename to patches/server/0793-ItemStack-damage-API.patch diff --git a/patches/server/0796-Friction-API.patch b/patches/server/0794-Friction-API.patch similarity index 100% rename from patches/server/0796-Friction-API.patch rename to patches/server/0794-Friction-API.patch diff --git a/patches/server/0797-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0795-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0797-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/server/0795-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0798-Fix-premature-player-kicks-on-shutdown.patch b/patches/server/0796-Fix-premature-player-kicks-on-shutdown.patch similarity index 100% rename from patches/server/0798-Fix-premature-player-kicks-on-shutdown.patch rename to patches/server/0796-Fix-premature-player-kicks-on-shutdown.patch diff --git a/patches/server/0799-Sync-offhand-slot-in-menus.patch b/patches/server/0797-Sync-offhand-slot-in-menus.patch similarity index 100% rename from patches/server/0799-Sync-offhand-slot-in-menus.patch rename to patches/server/0797-Sync-offhand-slot-in-menus.patch diff --git a/patches/server/0800-Player-Entity-Tracking-Events.patch b/patches/server/0798-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/server/0800-Player-Entity-Tracking-Events.patch rename to patches/server/0798-Player-Entity-Tracking-Events.patch diff --git a/patches/server/0801-Limit-pet-look-distance.patch b/patches/server/0799-Limit-pet-look-distance.patch similarity index 100% rename from patches/server/0801-Limit-pet-look-distance.patch rename to patches/server/0799-Limit-pet-look-distance.patch diff --git a/patches/server/0802-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0800-Fixes-and-additions-to-the-SpawnReason-API.patch similarity index 100% rename from patches/server/0802-Fixes-and-additions-to-the-SpawnReason-API.patch rename to patches/server/0800-Fixes-and-additions-to-the-SpawnReason-API.patch diff --git a/patches/server/0803-fix-Instruments.patch b/patches/server/0801-fix-Instruments.patch similarity index 100% rename from patches/server/0803-fix-Instruments.patch rename to patches/server/0801-fix-Instruments.patch diff --git a/patches/server/0804-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0802-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/server/0804-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/server/0802-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/server/0805-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0803-Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/server/0805-Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/server/0803-Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/server/0806-Add-BlockLockCheckEvent.patch b/patches/server/0804-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/server/0806-Add-BlockLockCheckEvent.patch rename to patches/server/0804-Add-BlockLockCheckEvent.patch diff --git a/patches/server/0807-Add-Sneaking-API-for-Entities.patch b/patches/server/0805-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/server/0807-Add-Sneaking-API-for-Entities.patch rename to patches/server/0805-Add-Sneaking-API-for-Entities.patch diff --git a/patches/server/0808-Improve-logging-and-errors.patch b/patches/server/0806-Improve-logging-and-errors.patch similarity index 100% rename from patches/server/0808-Improve-logging-and-errors.patch rename to patches/server/0806-Improve-logging-and-errors.patch diff --git a/patches/server/0809-Improve-PortalEvents.patch b/patches/server/0807-Improve-PortalEvents.patch similarity index 100% rename from patches/server/0809-Improve-PortalEvents.patch rename to patches/server/0807-Improve-PortalEvents.patch diff --git a/patches/server/0810-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0808-Add-config-option-for-spider-worldborder-climbing.patch similarity index 100% rename from patches/server/0810-Add-config-option-for-spider-worldborder-climbing.patch rename to patches/server/0808-Add-config-option-for-spider-worldborder-climbing.patch diff --git a/patches/server/0811-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0809-Add-missing-SpigotConfig-logCommands-check.patch similarity index 100% rename from patches/server/0811-Add-missing-SpigotConfig-logCommands-check.patch rename to patches/server/0809-Add-missing-SpigotConfig-logCommands-check.patch diff --git a/patches/server/0812-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0810-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/server/0812-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/server/0810-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/server/0813-Flying-Fall-Damage.patch b/patches/server/0811-Flying-Fall-Damage.patch similarity index 100% rename from patches/server/0813-Flying-Fall-Damage.patch rename to patches/server/0811-Flying-Fall-Damage.patch diff --git a/patches/server/0814-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0812-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch similarity index 100% rename from patches/server/0814-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch rename to patches/server/0812-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch diff --git a/patches/server/0815-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0813-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/server/0815-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/server/0813-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/server/0816-config-for-disabling-entity-tag-tags.patch b/patches/server/0814-config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/0816-config-for-disabling-entity-tag-tags.patch rename to patches/server/0814-config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/0817-Use-single-player-info-update-packet-on-join.patch b/patches/server/0815-Use-single-player-info-update-packet-on-join.patch similarity index 100% rename from patches/server/0817-Use-single-player-info-update-packet-on-join.patch rename to patches/server/0815-Use-single-player-info-update-packet-on-join.patch diff --git a/patches/server/0818-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0816-Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 100% rename from patches/server/0818-Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/server/0816-Correctly-shrink-items-during-EntityResurrectEvent.patch diff --git a/patches/server/0819-Win-Screen-API.patch b/patches/server/0817-Win-Screen-API.patch similarity index 100% rename from patches/server/0819-Win-Screen-API.patch rename to patches/server/0817-Win-Screen-API.patch diff --git a/patches/server/0820-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0818-Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 100% rename from patches/server/0820-Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/server/0818-Remove-CraftItemStack-setAmount-null-assignment.patch diff --git a/patches/server/0821-Fix-force-opening-enchantment-tables.patch b/patches/server/0819-Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/server/0821-Fix-force-opening-enchantment-tables.patch rename to patches/server/0819-Fix-force-opening-enchantment-tables.patch diff --git a/patches/server/0822-Add-Entity-Body-Yaw-API.patch b/patches/server/0820-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/server/0822-Add-Entity-Body-Yaw-API.patch rename to patches/server/0820-Add-Entity-Body-Yaw-API.patch diff --git a/patches/server/0823-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0821-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/server/0823-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/server/0821-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/server/0824-Add-EntityFertilizeEggEvent.patch b/patches/server/0822-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/server/0824-Add-EntityFertilizeEggEvent.patch rename to patches/server/0822-Add-EntityFertilizeEggEvent.patch diff --git a/patches/server/0825-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0823-Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 100% rename from patches/server/0825-Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/server/0823-Fix-HumanEntity-drop-not-updating-the-client-inv.patch diff --git a/patches/server/0826-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0824-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/0826-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/server/0824-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/0827-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0825-Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/server/0827-Correctly-handle-ArmorStand-invisibility.patch rename to patches/server/0825-Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/server/0828-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0826-Fix-advancement-triggers-for-entity-damage.patch similarity index 100% rename from patches/server/0828-Fix-advancement-triggers-for-entity-damage.patch rename to patches/server/0826-Fix-advancement-triggers-for-entity-damage.patch diff --git a/patches/server/0829-Fix-text-display-error-on-spawn.patch b/patches/server/0827-Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/server/0829-Fix-text-display-error-on-spawn.patch rename to patches/server/0827-Fix-text-display-error-on-spawn.patch diff --git a/patches/server/0830-Fix-inventories-returning-null-Locations.patch b/patches/server/0828-Fix-inventories-returning-null-Locations.patch similarity index 100% rename from patches/server/0830-Fix-inventories-returning-null-Locations.patch rename to patches/server/0828-Fix-inventories-returning-null-Locations.patch diff --git a/patches/server/0831-Add-Shearable-API.patch b/patches/server/0829-Add-Shearable-API.patch similarity index 100% rename from patches/server/0831-Add-Shearable-API.patch rename to patches/server/0829-Add-Shearable-API.patch diff --git a/patches/server/0832-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0830-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/server/0832-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/server/0830-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/server/0833-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0831-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch similarity index 100% rename from patches/server/0833-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch rename to patches/server/0831-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch diff --git a/patches/server/0834-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0832-Treat-sequence-violations-like-they-should-be.patch similarity index 100% rename from patches/server/0834-Treat-sequence-violations-like-they-should-be.patch rename to patches/server/0832-Treat-sequence-violations-like-they-should-be.patch diff --git a/patches/server/0835-remove-duplicate-animate-packet-for-records.patch b/patches/server/0833-remove-duplicate-animate-packet-for-records.patch similarity index 100% rename from patches/server/0835-remove-duplicate-animate-packet-for-records.patch rename to patches/server/0833-remove-duplicate-animate-packet-for-records.patch diff --git a/patches/server/0836-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0834-Prevent-causing-expired-keys-from-impacting-new-join.patch similarity index 100% rename from patches/server/0836-Prevent-causing-expired-keys-from-impacting-new-join.patch rename to patches/server/0834-Prevent-causing-expired-keys-from-impacting-new-join.patch diff --git a/patches/server/0837-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0835-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch similarity index 100% rename from patches/server/0837-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch rename to patches/server/0835-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch diff --git a/patches/server/0838-Use-array-for-gamerule-storage.patch b/patches/server/0836-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0838-Use-array-for-gamerule-storage.patch rename to patches/server/0836-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0839-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0837-Fix-a-couple-of-upstream-bed-issues.patch similarity index 100% rename from patches/server/0839-Fix-a-couple-of-upstream-bed-issues.patch rename to patches/server/0837-Fix-a-couple-of-upstream-bed-issues.patch diff --git a/patches/server/0840-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0838-Fix-demo-flag-not-enabling-demo-mode.patch similarity index 100% rename from patches/server/0840-Fix-demo-flag-not-enabling-demo-mode.patch rename to patches/server/0838-Fix-demo-flag-not-enabling-demo-mode.patch diff --git a/patches/server/0841-Add-Mob-Experience-reward-API.patch b/patches/server/0839-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/server/0841-Add-Mob-Experience-reward-API.patch rename to patches/server/0839-Add-Mob-Experience-reward-API.patch diff --git a/patches/server/0842-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0840-Break-redstone-on-top-of-trap-doors-early.patch similarity index 100% rename from patches/server/0842-Break-redstone-on-top-of-trap-doors-early.patch rename to patches/server/0840-Break-redstone-on-top-of-trap-doors-early.patch diff --git a/patches/server/0843-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0841-Avoid-Lazy-Initialization-for-Enum-Fields.patch similarity index 100% rename from patches/server/0843-Avoid-Lazy-Initialization-for-Enum-Fields.patch rename to patches/server/0841-Avoid-Lazy-Initialization-for-Enum-Fields.patch diff --git a/patches/server/0844-More-accurate-isInOpenWater-impl.patch b/patches/server/0842-More-accurate-isInOpenWater-impl.patch similarity index 100% rename from patches/server/0844-More-accurate-isInOpenWater-impl.patch rename to patches/server/0842-More-accurate-isInOpenWater-impl.patch diff --git a/patches/server/0845-Expand-PlayerItemMendEvent.patch b/patches/server/0843-Expand-PlayerItemMendEvent.patch similarity index 100% rename from patches/server/0845-Expand-PlayerItemMendEvent.patch rename to patches/server/0843-Expand-PlayerItemMendEvent.patch diff --git a/patches/server/0846-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0844-Refresh-ProjectileSource-for-projectiles.patch similarity index 100% rename from patches/server/0846-Refresh-ProjectileSource-for-projectiles.patch rename to patches/server/0844-Refresh-ProjectileSource-for-projectiles.patch diff --git a/patches/server/0847-Add-transient-modifier-API.patch b/patches/server/0845-Add-transient-modifier-API.patch similarity index 100% rename from patches/server/0847-Add-transient-modifier-API.patch rename to patches/server/0845-Add-transient-modifier-API.patch diff --git a/patches/server/0848-Fix-block-place-logic.patch b/patches/server/0846-Fix-block-place-logic.patch similarity index 100% rename from patches/server/0848-Fix-block-place-logic.patch rename to patches/server/0846-Fix-block-place-logic.patch diff --git a/patches/server/0849-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0847-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch similarity index 100% rename from patches/server/0849-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch rename to patches/server/0847-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch diff --git a/patches/server/0850-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0848-Call-BlockGrowEvent-for-missing-blocks.patch similarity index 100% rename from patches/server/0850-Call-BlockGrowEvent-for-missing-blocks.patch rename to patches/server/0848-Call-BlockGrowEvent-for-missing-blocks.patch diff --git a/patches/server/0851-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0849-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch similarity index 100% rename from patches/server/0851-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch rename to patches/server/0849-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch diff --git a/patches/server/0852-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0850-fix-MapLike-spam-for-missing-key-selector.patch similarity index 100% rename from patches/server/0852-fix-MapLike-spam-for-missing-key-selector.patch rename to patches/server/0850-fix-MapLike-spam-for-missing-key-selector.patch diff --git a/patches/server/0853-Fix-sniffer-removeExploredLocation.patch b/patches/server/0851-Fix-sniffer-removeExploredLocation.patch similarity index 100% rename from patches/server/0853-Fix-sniffer-removeExploredLocation.patch rename to patches/server/0851-Fix-sniffer-removeExploredLocation.patch diff --git a/patches/server/0854-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0852-Add-method-to-remove-all-active-potion-effects.patch similarity index 100% rename from patches/server/0854-Add-method-to-remove-all-active-potion-effects.patch rename to patches/server/0852-Add-method-to-remove-all-active-potion-effects.patch diff --git a/patches/server/0855-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0853-Fix-incorrect-crafting-result-amount-for-fireworks.patch similarity index 100% rename from patches/server/0855-Fix-incorrect-crafting-result-amount-for-fireworks.patch rename to patches/server/0853-Fix-incorrect-crafting-result-amount-for-fireworks.patch diff --git a/patches/server/0856-Add-event-for-player-editing-sign.patch b/patches/server/0854-Add-event-for-player-editing-sign.patch similarity index 100% rename from patches/server/0856-Add-event-for-player-editing-sign.patch rename to patches/server/0854-Add-event-for-player-editing-sign.patch diff --git a/patches/server/0857-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0855-Only-tick-item-frames-if-players-can-see-it.patch similarity index 100% rename from patches/server/0857-Only-tick-item-frames-if-players-can-see-it.patch rename to patches/server/0855-Only-tick-item-frames-if-players-can-see-it.patch diff --git a/patches/server/0858-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0856-Fix-cmd-permission-levels-for-command-blocks.patch similarity index 100% rename from patches/server/0858-Fix-cmd-permission-levels-for-command-blocks.patch rename to patches/server/0856-Fix-cmd-permission-levels-for-command-blocks.patch diff --git a/patches/server/0859-Add-option-to-disable-block-updates.patch b/patches/server/0857-Add-option-to-disable-block-updates.patch similarity index 100% rename from patches/server/0859-Add-option-to-disable-block-updates.patch rename to patches/server/0857-Add-option-to-disable-block-updates.patch diff --git a/patches/server/0860-Call-missing-BlockDispenseEvent.patch b/patches/server/0858-Call-missing-BlockDispenseEvent.patch similarity index 100% rename from patches/server/0860-Call-missing-BlockDispenseEvent.patch rename to patches/server/0858-Call-missing-BlockDispenseEvent.patch diff --git a/patches/server/0861-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0859-Don-t-load-chunks-for-supporting-block-checks.patch similarity index 100% rename from patches/server/0861-Don-t-load-chunks-for-supporting-block-checks.patch rename to patches/server/0859-Don-t-load-chunks-for-supporting-block-checks.patch diff --git a/patches/server/0862-Optimize-player-lookups-for-beacons.patch b/patches/server/0860-Optimize-player-lookups-for-beacons.patch similarity index 100% rename from patches/server/0862-Optimize-player-lookups-for-beacons.patch rename to patches/server/0860-Optimize-player-lookups-for-beacons.patch diff --git a/patches/server/0863-Add-Sign-getInteractableSideFor.patch b/patches/server/0861-Add-Sign-getInteractableSideFor.patch similarity index 100% rename from patches/server/0863-Add-Sign-getInteractableSideFor.patch rename to patches/server/0861-Add-Sign-getInteractableSideFor.patch diff --git a/patches/server/0864-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0862-fix-item-meta-for-tadpole-buckets.patch similarity index 100% rename from patches/server/0864-fix-item-meta-for-tadpole-buckets.patch rename to patches/server/0862-fix-item-meta-for-tadpole-buckets.patch diff --git a/patches/server/0865-Fix-BanList-API.patch b/patches/server/0863-Fix-BanList-API.patch similarity index 100% rename from patches/server/0865-Fix-BanList-API.patch rename to patches/server/0863-Fix-BanList-API.patch diff --git a/patches/server/0866-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0864-Determine-lava-and-water-fluid-explosion-resistance-.patch similarity index 100% rename from patches/server/0866-Determine-lava-and-water-fluid-explosion-resistance-.patch rename to patches/server/0864-Determine-lava-and-water-fluid-explosion-resistance-.patch diff --git a/patches/server/0867-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0865-Fix-possible-NPE-on-painting-creation.patch similarity index 100% rename from patches/server/0867-Fix-possible-NPE-on-painting-creation.patch rename to patches/server/0865-Fix-possible-NPE-on-painting-creation.patch diff --git a/patches/server/0868-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0866-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/server/0868-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/server/0866-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/server/0869-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0867-ExperienceOrb-should-call-EntitySpawnEvent.patch similarity index 100% rename from patches/server/0869-ExperienceOrb-should-call-EntitySpawnEvent.patch rename to patches/server/0867-ExperienceOrb-should-call-EntitySpawnEvent.patch diff --git a/patches/server/0870-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0868-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch similarity index 100% rename from patches/server/0870-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch rename to patches/server/0868-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch diff --git a/patches/server/0871-Add-whitelist-events.patch b/patches/server/0869-Add-whitelist-events.patch similarity index 100% rename from patches/server/0871-Add-whitelist-events.patch rename to patches/server/0869-Add-whitelist-events.patch diff --git a/patches/server/0872-Implement-PlayerFailMoveEvent.patch b/patches/server/0870-Implement-PlayerFailMoveEvent.patch similarity index 100% rename from patches/server/0872-Implement-PlayerFailMoveEvent.patch rename to patches/server/0870-Implement-PlayerFailMoveEvent.patch diff --git a/patches/server/0873-Folia-scheduler-and-owned-region-API.patch b/patches/server/0871-Folia-scheduler-and-owned-region-API.patch similarity index 100% rename from patches/server/0873-Folia-scheduler-and-owned-region-API.patch rename to patches/server/0871-Folia-scheduler-and-owned-region-API.patch diff --git a/patches/server/0874-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0872-Only-erase-allay-memory-on-non-item-targets.patch similarity index 100% rename from patches/server/0874-Only-erase-allay-memory-on-non-item-targets.patch rename to patches/server/0872-Only-erase-allay-memory-on-non-item-targets.patch diff --git a/patches/server/0875-API-for-updating-recipes-on-clients.patch b/patches/server/0873-API-for-updating-recipes-on-clients.patch similarity index 100% rename from patches/server/0875-API-for-updating-recipes-on-clients.patch rename to patches/server/0873-API-for-updating-recipes-on-clients.patch diff --git a/patches/server/0876-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0874-Fix-rotation-when-spawning-display-entities.patch similarity index 100% rename from patches/server/0876-Fix-rotation-when-spawning-display-entities.patch rename to patches/server/0874-Fix-rotation-when-spawning-display-entities.patch diff --git a/patches/server/0877-Only-capture-actual-tree-growth.patch b/patches/server/0875-Only-capture-actual-tree-growth.patch similarity index 100% rename from patches/server/0877-Only-capture-actual-tree-growth.patch rename to patches/server/0875-Only-capture-actual-tree-growth.patch diff --git a/patches/server/0878-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0876-Use-correct-source-for-mushroom-block-spread-event.patch similarity index 100% rename from patches/server/0878-Use-correct-source-for-mushroom-block-spread-event.patch rename to patches/server/0876-Use-correct-source-for-mushroom-block-spread-event.patch diff --git a/patches/server/0879-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0877-Respect-randomizeData-on-more-entities-when-spawning.patch similarity index 100% rename from patches/server/0879-Respect-randomizeData-on-more-entities-when-spawning.patch rename to patches/server/0877-Respect-randomizeData-on-more-entities-when-spawning.patch diff --git a/patches/server/0880-Use-correct-seed-on-api-world-load.patch b/patches/server/0878-Use-correct-seed-on-api-world-load.patch similarity index 100% rename from patches/server/0880-Use-correct-seed-on-api-world-load.patch rename to patches/server/0878-Use-correct-seed-on-api-world-load.patch diff --git a/patches/server/0881-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0879-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch similarity index 100% rename from patches/server/0881-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch rename to patches/server/0879-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch diff --git a/patches/server/0882-Cache-map-ids-on-item-frames.patch b/patches/server/0880-Cache-map-ids-on-item-frames.patch similarity index 100% rename from patches/server/0882-Cache-map-ids-on-item-frames.patch rename to patches/server/0880-Cache-map-ids-on-item-frames.patch diff --git a/patches/server/0883-Fix-custom-statistic-criteria-creation.patch b/patches/server/0881-Fix-custom-statistic-criteria-creation.patch similarity index 100% rename from patches/server/0883-Fix-custom-statistic-criteria-creation.patch rename to patches/server/0881-Fix-custom-statistic-criteria-creation.patch diff --git a/patches/server/0884-Bandaid-fix-for-Effect.patch b/patches/server/0882-Bandaid-fix-for-Effect.patch similarity index 100% rename from patches/server/0884-Bandaid-fix-for-Effect.patch rename to patches/server/0882-Bandaid-fix-for-Effect.patch diff --git a/patches/server/0885-SculkCatalyst-bloom-API.patch b/patches/server/0883-SculkCatalyst-bloom-API.patch similarity index 100% rename from patches/server/0885-SculkCatalyst-bloom-API.patch rename to patches/server/0883-SculkCatalyst-bloom-API.patch diff --git a/patches/server/0886-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0884-API-for-an-entity-s-scoreboard-name.patch similarity index 100% rename from patches/server/0886-API-for-an-entity-s-scoreboard-name.patch rename to patches/server/0884-API-for-an-entity-s-scoreboard-name.patch diff --git a/patches/server/0887-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0885-Deprecate-and-replace-methods-with-old-StructureType.patch similarity index 100% rename from patches/server/0887-Deprecate-and-replace-methods-with-old-StructureType.patch rename to patches/server/0885-Deprecate-and-replace-methods-with-old-StructureType.patch diff --git a/patches/server/0888-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0886-Don-t-tab-complete-namespaced-commands-if-send-names.patch similarity index 100% rename from patches/server/0888-Don-t-tab-complete-namespaced-commands-if-send-names.patch rename to patches/server/0886-Don-t-tab-complete-namespaced-commands-if-send-names.patch diff --git a/patches/server/0889-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0887-Properly-handle-BlockBreakEvent-isDropItems.patch similarity index 100% rename from patches/server/0889-Properly-handle-BlockBreakEvent-isDropItems.patch rename to patches/server/0887-Properly-handle-BlockBreakEvent-isDropItems.patch diff --git a/patches/server/0890-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0888-Fire-entity-death-event-for-ender-dragon.patch similarity index 100% rename from patches/server/0890-Fire-entity-death-event-for-ender-dragon.patch rename to patches/server/0888-Fire-entity-death-event-for-ender-dragon.patch diff --git a/patches/server/0891-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0889-Configurable-entity-tracking-range-by-Y-coordinate.patch similarity index 100% rename from patches/server/0891-Configurable-entity-tracking-range-by-Y-coordinate.patch rename to patches/server/0889-Configurable-entity-tracking-range-by-Y-coordinate.patch diff --git a/patches/server/0892-Add-Listing-API-for-Player.patch b/patches/server/0890-Add-Listing-API-for-Player.patch similarity index 100% rename from patches/server/0892-Add-Listing-API-for-Player.patch rename to patches/server/0890-Add-Listing-API-for-Player.patch diff --git a/patches/server/0893-Configurable-Region-Compression-Format.patch b/patches/server/0891-Configurable-Region-Compression-Format.patch similarity index 100% rename from patches/server/0893-Configurable-Region-Compression-Format.patch rename to patches/server/0891-Configurable-Region-Compression-Format.patch diff --git a/patches/server/0894-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0892-Add-BlockFace-to-BlockDamageEvent.patch similarity index 100% rename from patches/server/0894-Add-BlockFace-to-BlockDamageEvent.patch rename to patches/server/0892-Add-BlockFace-to-BlockDamageEvent.patch diff --git a/patches/server/0895-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0893-Fix-NPE-on-Boat-getStatus.patch similarity index 100% rename from patches/server/0895-Fix-NPE-on-Boat-getStatus.patch rename to patches/server/0893-Fix-NPE-on-Boat-getStatus.patch diff --git a/patches/server/0896-Expand-Pose-API.patch b/patches/server/0894-Expand-Pose-API.patch similarity index 100% rename from patches/server/0896-Expand-Pose-API.patch rename to patches/server/0894-Expand-Pose-API.patch diff --git a/patches/server/0897-More-DragonBattle-API.patch b/patches/server/0895-More-DragonBattle-API.patch similarity index 100% rename from patches/server/0897-More-DragonBattle-API.patch rename to patches/server/0895-More-DragonBattle-API.patch diff --git a/patches/server/0898-Add-PlayerPickItemEvent.patch b/patches/server/0896-Add-PlayerPickItemEvent.patch similarity index 100% rename from patches/server/0898-Add-PlayerPickItemEvent.patch rename to patches/server/0896-Add-PlayerPickItemEvent.patch diff --git a/patches/server/0899-Allow-trident-custom-damage.patch b/patches/server/0897-Allow-trident-custom-damage.patch similarity index 100% rename from patches/server/0899-Allow-trident-custom-damage.patch rename to patches/server/0897-Allow-trident-custom-damage.patch diff --git a/patches/server/0900-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0898-Expose-hand-in-BlockCanBuildEvent.patch similarity index 100% rename from patches/server/0900-Expose-hand-in-BlockCanBuildEvent.patch rename to patches/server/0898-Expose-hand-in-BlockCanBuildEvent.patch diff --git a/patches/server/0901-Optimize-nearest-structure-border-iteration.patch b/patches/server/0899-Optimize-nearest-structure-border-iteration.patch similarity index 100% rename from patches/server/0901-Optimize-nearest-structure-border-iteration.patch rename to patches/server/0899-Optimize-nearest-structure-border-iteration.patch diff --git a/patches/server/0902-Implement-OfflinePlayer-isConnected.patch b/patches/server/0900-Implement-OfflinePlayer-isConnected.patch similarity index 100% rename from patches/server/0902-Implement-OfflinePlayer-isConnected.patch rename to patches/server/0900-Implement-OfflinePlayer-isConnected.patch diff --git a/patches/server/0903-Fix-inventory-desync.patch b/patches/server/0901-Fix-inventory-desync.patch similarity index 100% rename from patches/server/0903-Fix-inventory-desync.patch rename to patches/server/0901-Fix-inventory-desync.patch diff --git a/patches/server/0904-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0902-Add-titleOverride-to-InventoryOpenEvent.patch similarity index 100% rename from patches/server/0904-Add-titleOverride-to-InventoryOpenEvent.patch rename to patches/server/0902-Add-titleOverride-to-InventoryOpenEvent.patch diff --git a/patches/server/0905-Configure-sniffer-egg-hatch-time.patch b/patches/server/0903-Configure-sniffer-egg-hatch-time.patch similarity index 100% rename from patches/server/0905-Configure-sniffer-egg-hatch-time.patch rename to patches/server/0903-Configure-sniffer-egg-hatch-time.patch diff --git a/patches/server/0906-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0904-Do-crystal-portal-proximity-check-before-entity-look.patch similarity index 100% rename from patches/server/0906-Do-crystal-portal-proximity-check-before-entity-look.patch rename to patches/server/0904-Do-crystal-portal-proximity-check-before-entity-look.patch diff --git a/patches/server/0907-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0905-Skip-POI-finding-if-stuck-in-vehicle.patch similarity index 100% rename from patches/server/0907-Skip-POI-finding-if-stuck-in-vehicle.patch rename to patches/server/0905-Skip-POI-finding-if-stuck-in-vehicle.patch diff --git a/patches/server/0908-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0906-Add-slot-sanity-checks-in-container-clicks.patch similarity index 100% rename from patches/server/0908-Add-slot-sanity-checks-in-container-clicks.patch rename to patches/server/0906-Add-slot-sanity-checks-in-container-clicks.patch diff --git a/patches/server/0909-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0907-Call-BlockRedstoneEvents-for-lecterns.patch similarity index 100% rename from patches/server/0909-Call-BlockRedstoneEvents-for-lecterns.patch rename to patches/server/0907-Call-BlockRedstoneEvents-for-lecterns.patch diff --git a/patches/server/0910-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0908-Allow-proper-checking-of-empty-item-stacks.patch similarity index 100% rename from patches/server/0910-Allow-proper-checking-of-empty-item-stacks.patch rename to patches/server/0908-Allow-proper-checking-of-empty-item-stacks.patch diff --git a/patches/server/0911-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0909-Fix-silent-equipment-change-for-mobs.patch similarity index 100% rename from patches/server/0911-Fix-silent-equipment-change-for-mobs.patch rename to patches/server/0909-Fix-silent-equipment-change-for-mobs.patch diff --git a/patches/server/0912-Fix-spigot-s-Forced-Stats.patch b/patches/server/0910-Fix-spigot-s-Forced-Stats.patch similarity index 100% rename from patches/server/0912-Fix-spigot-s-Forced-Stats.patch rename to patches/server/0910-Fix-spigot-s-Forced-Stats.patch diff --git a/patches/server/0913-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0911-Add-missing-InventoryHolders-to-inventories.patch similarity index 100% rename from patches/server/0913-Add-missing-InventoryHolders-to-inventories.patch rename to patches/server/0911-Add-missing-InventoryHolders-to-inventories.patch diff --git a/patches/server/0914-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0912-Do-not-read-tile-entities-in-chunks-that-are-positio.patch similarity index 100% rename from patches/server/0914-Do-not-read-tile-entities-in-chunks-that-are-positio.patch rename to patches/server/0912-Do-not-read-tile-entities-in-chunks-that-are-positio.patch diff --git a/patches/server/0915-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0913-Add-missing-logs-for-log-ips-config-option.patch similarity index 100% rename from patches/server/0915-Add-missing-logs-for-log-ips-config-option.patch rename to patches/server/0913-Add-missing-logs-for-log-ips-config-option.patch diff --git a/patches/server/0916-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0914-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch similarity index 100% rename from patches/server/0916-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch rename to patches/server/0914-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch diff --git a/patches/server/0917-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0915-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch similarity index 100% rename from patches/server/0917-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch rename to patches/server/0915-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch diff --git a/patches/server/0918-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0916-Fix-team-sidebar-objectives-not-being-cleared.patch similarity index 100% rename from patches/server/0918-Fix-team-sidebar-objectives-not-being-cleared.patch rename to patches/server/0916-Fix-team-sidebar-objectives-not-being-cleared.patch diff --git a/patches/server/0919-Fix-missing-map-initialize-event-call.patch b/patches/server/0917-Fix-missing-map-initialize-event-call.patch similarity index 100% rename from patches/server/0919-Fix-missing-map-initialize-event-call.patch rename to patches/server/0917-Fix-missing-map-initialize-event-call.patch diff --git a/patches/server/0920-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/0918-Update-entity-data-when-attaching-firework-to-entity.patch similarity index 100% rename from patches/server/0920-Update-entity-data-when-attaching-firework-to-entity.patch rename to patches/server/0918-Update-entity-data-when-attaching-firework-to-entity.patch diff --git a/patches/server/0921-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0919-Fix-UnsafeValues-loadAdvancement.patch similarity index 100% rename from patches/server/0921-Fix-UnsafeValues-loadAdvancement.patch rename to patches/server/0919-Fix-UnsafeValues-loadAdvancement.patch diff --git a/patches/server/0922-Add-player-idle-duration-API.patch b/patches/server/0920-Add-player-idle-duration-API.patch similarity index 100% rename from patches/server/0922-Add-player-idle-duration-API.patch rename to patches/server/0920-Add-player-idle-duration-API.patch diff --git a/patches/server/0923-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0921-Don-t-check-if-we-can-see-non-visible-entities.patch similarity index 100% rename from patches/server/0923-Don-t-check-if-we-can-see-non-visible-entities.patch rename to patches/server/0921-Don-t-check-if-we-can-see-non-visible-entities.patch diff --git a/patches/server/0924-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0922-Fix-NPE-in-SculkBloomEvent-world-access.patch similarity index 100% rename from patches/server/0924-Fix-NPE-in-SculkBloomEvent-world-access.patch rename to patches/server/0922-Fix-NPE-in-SculkBloomEvent-world-access.patch diff --git a/patches/server/0925-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0923-Allow-null-itemstack-for-Player-sendEquipmentChange.patch similarity index 100% rename from patches/server/0925-Allow-null-itemstack-for-Player-sendEquipmentChange.patch rename to patches/server/0923-Allow-null-itemstack-for-Player-sendEquipmentChange.patch diff --git a/patches/server/0926-Optimize-VarInts.patch b/patches/server/0924-Optimize-VarInts.patch similarity index 100% rename from patches/server/0926-Optimize-VarInts.patch rename to patches/server/0924-Optimize-VarInts.patch diff --git a/patches/server/0927-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0925-Add-API-to-get-the-collision-shape-of-a-block-before.patch similarity index 100% rename from patches/server/0927-Add-API-to-get-the-collision-shape-of-a-block-before.patch rename to patches/server/0925-Add-API-to-get-the-collision-shape-of-a-block-before.patch diff --git a/patches/server/0928-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0926-Add-predicate-for-blocks-when-raytracing.patch similarity index 100% rename from patches/server/0928-Add-predicate-for-blocks-when-raytracing.patch rename to patches/server/0926-Add-predicate-for-blocks-when-raytracing.patch diff --git a/patches/server/0929-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0927-Broadcast-take-item-packets-with-collector-as-source.patch similarity index 100% rename from patches/server/0929-Broadcast-take-item-packets-with-collector-as-source.patch rename to patches/server/0927-Broadcast-take-item-packets-with-collector-as-source.patch diff --git a/patches/server/0930-Expand-LingeringPotion-API.patch b/patches/server/0928-Expand-LingeringPotion-API.patch similarity index 100% rename from patches/server/0930-Expand-LingeringPotion-API.patch rename to patches/server/0928-Expand-LingeringPotion-API.patch diff --git a/patches/server/0931-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0929-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch similarity index 100% rename from patches/server/0931-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch rename to patches/server/0929-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch diff --git a/patches/server/0932-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0930-Add-hand-to-fish-event-for-all-player-interactions.patch similarity index 100% rename from patches/server/0932-Add-hand-to-fish-event-for-all-player-interactions.patch rename to patches/server/0930-Add-hand-to-fish-event-for-all-player-interactions.patch diff --git a/patches/server/0933-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0931-Fix-several-issues-with-EntityBreedEvent.patch similarity index 100% rename from patches/server/0933-Fix-several-issues-with-EntityBreedEvent.patch rename to patches/server/0931-Fix-several-issues-with-EntityBreedEvent.patch diff --git a/patches/server/0934-Add-UUID-attribute-modifier-API.patch b/patches/server/0932-Add-UUID-attribute-modifier-API.patch similarity index 100% rename from patches/server/0934-Add-UUID-attribute-modifier-API.patch rename to patches/server/0932-Add-UUID-attribute-modifier-API.patch diff --git a/patches/server/0935-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0933-Fix-missing-event-call-for-entity-teleport-API.patch similarity index 100% rename from patches/server/0935-Fix-missing-event-call-for-entity-teleport-API.patch rename to patches/server/0933-Fix-missing-event-call-for-entity-teleport-API.patch diff --git a/patches/server/0936-Lazily-create-LootContext-for-criterions.patch b/patches/server/0934-Lazily-create-LootContext-for-criterions.patch similarity index 100% rename from patches/server/0936-Lazily-create-LootContext-for-criterions.patch rename to patches/server/0934-Lazily-create-LootContext-for-criterions.patch diff --git a/patches/server/0937-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0935-Don-t-fire-sync-events-during-worldgen.patch similarity index 100% rename from patches/server/0937-Don-t-fire-sync-events-during-worldgen.patch rename to patches/server/0935-Don-t-fire-sync-events-during-worldgen.patch diff --git a/patches/server/0938-Add-Structure-check-API.patch b/patches/server/0936-Add-Structure-check-API.patch similarity index 100% rename from patches/server/0938-Add-Structure-check-API.patch rename to patches/server/0936-Add-Structure-check-API.patch diff --git a/patches/server/0939-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0937-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch similarity index 100% rename from patches/server/0939-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch rename to patches/server/0937-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch diff --git a/patches/server/0940-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0938-Restore-vanilla-entity-drops-behavior.patch similarity index 100% rename from patches/server/0940-Restore-vanilla-entity-drops-behavior.patch rename to patches/server/0938-Restore-vanilla-entity-drops-behavior.patch diff --git a/patches/server/0941-Dont-resend-blocks-on-interactions.patch b/patches/server/0939-Dont-resend-blocks-on-interactions.patch similarity index 100% rename from patches/server/0941-Dont-resend-blocks-on-interactions.patch rename to patches/server/0939-Dont-resend-blocks-on-interactions.patch diff --git a/patches/server/0942-add-more-scoreboard-API.patch b/patches/server/0940-add-more-scoreboard-API.patch similarity index 100% rename from patches/server/0942-add-more-scoreboard-API.patch rename to patches/server/0940-add-more-scoreboard-API.patch diff --git a/patches/server/0943-Improve-Registry.patch b/patches/server/0941-Improve-Registry.patch similarity index 100% rename from patches/server/0943-Improve-Registry.patch rename to patches/server/0941-Improve-Registry.patch diff --git a/patches/server/0944-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0942-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch similarity index 100% rename from patches/server/0944-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch rename to patches/server/0942-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch diff --git a/patches/server/0945-Add-experience-points-API.patch b/patches/server/0943-Add-experience-points-API.patch similarity index 100% rename from patches/server/0945-Add-experience-points-API.patch rename to patches/server/0943-Add-experience-points-API.patch diff --git a/patches/server/0946-Add-drops-to-shear-events.patch b/patches/server/0944-Add-drops-to-shear-events.patch similarity index 100% rename from patches/server/0946-Add-drops-to-shear-events.patch rename to patches/server/0944-Add-drops-to-shear-events.patch diff --git a/patches/server/0947-Add-PlayerShieldDisableEvent.patch b/patches/server/0945-Add-PlayerShieldDisableEvent.patch similarity index 100% rename from patches/server/0947-Add-PlayerShieldDisableEvent.patch rename to patches/server/0945-Add-PlayerShieldDisableEvent.patch diff --git a/patches/server/0948-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0946-Validate-ResourceLocation-in-NBT-reading.patch similarity index 100% rename from patches/server/0948-Validate-ResourceLocation-in-NBT-reading.patch rename to patches/server/0946-Validate-ResourceLocation-in-NBT-reading.patch diff --git a/patches/server/0949-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/0947-Properly-handle-experience-dropping-on-block-break.patch similarity index 100% rename from patches/server/0949-Properly-handle-experience-dropping-on-block-break.patch rename to patches/server/0947-Properly-handle-experience-dropping-on-block-break.patch diff --git a/patches/server/0950-Fixup-NamespacedKey-handling.patch b/patches/server/0948-Fixup-NamespacedKey-handling.patch similarity index 100% rename from patches/server/0950-Fixup-NamespacedKey-handling.patch rename to patches/server/0948-Fixup-NamespacedKey-handling.patch diff --git a/patches/server/0951-Expose-LootTable-of-DecoratedPot.patch b/patches/server/0949-Expose-LootTable-of-DecoratedPot.patch similarity index 100% rename from patches/server/0951-Expose-LootTable-of-DecoratedPot.patch rename to patches/server/0949-Expose-LootTable-of-DecoratedPot.patch diff --git a/patches/server/0952-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0950-Reduce-allocation-of-Vec3D-by-entity-tracker.patch similarity index 100% rename from patches/server/0952-Reduce-allocation-of-Vec3D-by-entity-tracker.patch rename to patches/server/0950-Reduce-allocation-of-Vec3D-by-entity-tracker.patch diff --git a/patches/server/0953-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0951-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0953-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/server/0951-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/0954-Add-ShulkerDuplicateEvent.patch b/patches/server/0952-Add-ShulkerDuplicateEvent.patch similarity index 100% rename from patches/server/0954-Add-ShulkerDuplicateEvent.patch rename to patches/server/0952-Add-ShulkerDuplicateEvent.patch diff --git a/patches/server/0955-Add-api-for-spawn-egg-texture-colors.patch b/patches/server/0953-Add-api-for-spawn-egg-texture-colors.patch similarity index 100% rename from patches/server/0955-Add-api-for-spawn-egg-texture-colors.patch rename to patches/server/0953-Add-api-for-spawn-egg-texture-colors.patch diff --git a/patches/server/0956-Add-Lifecycle-Event-system.patch b/patches/server/0954-Add-Lifecycle-Event-system.patch similarity index 100% rename from patches/server/0956-Add-Lifecycle-Event-system.patch rename to patches/server/0954-Add-Lifecycle-Event-system.patch diff --git a/patches/server/0957-ItemStack-Tooltip-API.patch b/patches/server/0955-ItemStack-Tooltip-API.patch similarity index 100% rename from patches/server/0957-ItemStack-Tooltip-API.patch rename to patches/server/0955-ItemStack-Tooltip-API.patch diff --git a/patches/server/0958-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/0956-Add-getChunkSnapshot-includeLightData-parameter.patch similarity index 100% rename from patches/server/0958-Add-getChunkSnapshot-includeLightData-parameter.patch rename to patches/server/0956-Add-getChunkSnapshot-includeLightData-parameter.patch diff --git a/patches/server/0959-Add-FluidState-API.patch b/patches/server/0957-Add-FluidState-API.patch similarity index 100% rename from patches/server/0959-Add-FluidState-API.patch rename to patches/server/0957-Add-FluidState-API.patch diff --git a/patches/server/0960-add-number-format-api.patch b/patches/server/0958-add-number-format-api.patch similarity index 100% rename from patches/server/0960-add-number-format-api.patch rename to patches/server/0958-add-number-format-api.patch diff --git a/patches/server/0961-improve-BanList-types.patch b/patches/server/0959-improve-BanList-types.patch similarity index 100% rename from patches/server/0961-improve-BanList-types.patch rename to patches/server/0959-improve-BanList-types.patch diff --git a/patches/server/0962-Expanded-Hopper-API.patch b/patches/server/0960-Expanded-Hopper-API.patch similarity index 100% rename from patches/server/0962-Expanded-Hopper-API.patch rename to patches/server/0960-Expanded-Hopper-API.patch diff --git a/patches/server/0963-Add-BlockBreakProgressUpdateEvent.patch b/patches/server/0961-Add-BlockBreakProgressUpdateEvent.patch similarity index 100% rename from patches/server/0963-Add-BlockBreakProgressUpdateEvent.patch rename to patches/server/0961-Add-BlockBreakProgressUpdateEvent.patch diff --git a/patches/server/0964-Deprecate-ItemStack-setType.patch b/patches/server/0962-Deprecate-ItemStack-setType.patch similarity index 100% rename from patches/server/0964-Deprecate-ItemStack-setType.patch rename to patches/server/0962-Deprecate-ItemStack-setType.patch diff --git a/patches/server/0965-Add-CartographyItemEvent.patch b/patches/server/0963-Add-CartographyItemEvent.patch similarity index 100% rename from patches/server/0965-Add-CartographyItemEvent.patch rename to patches/server/0963-Add-CartographyItemEvent.patch diff --git a/patches/server/0966-More-Raid-API.patch b/patches/server/0964-More-Raid-API.patch similarity index 100% rename from patches/server/0966-More-Raid-API.patch rename to patches/server/0964-More-Raid-API.patch diff --git a/patches/server/0967-Add-onboarding-message-for-initial-server-start.patch b/patches/server/0965-Add-onboarding-message-for-initial-server-start.patch similarity index 100% rename from patches/server/0967-Add-onboarding-message-for-initial-server-start.patch rename to patches/server/0965-Add-onboarding-message-for-initial-server-start.patch diff --git a/patches/server/0968-Configurable-max-block-fluid-ticks.patch b/patches/server/0966-Configurable-max-block-fluid-ticks.patch similarity index 100% rename from patches/server/0968-Configurable-max-block-fluid-ticks.patch rename to patches/server/0966-Configurable-max-block-fluid-ticks.patch diff --git a/patches/server/0969-Fix-bees-aging-inside-hives.patch b/patches/server/0967-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0969-Fix-bees-aging-inside-hives.patch rename to patches/server/0967-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0970-Disable-memory-reserve-allocating.patch b/patches/server/0968-Disable-memory-reserve-allocating.patch similarity index 100% rename from patches/server/0970-Disable-memory-reserve-allocating.patch rename to patches/server/0968-Disable-memory-reserve-allocating.patch diff --git a/patches/server/0971-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/server/0969-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch similarity index 100% rename from patches/server/0971-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch rename to patches/server/0969-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch diff --git a/patches/server/0972-Fix-DamageSource-API.patch b/patches/server/0970-Fix-DamageSource-API.patch similarity index 100% rename from patches/server/0972-Fix-DamageSource-API.patch rename to patches/server/0970-Fix-DamageSource-API.patch diff --git a/patches/server/0973-Fix-creation-of-invalid-block-entity-during-world-ge.patch b/patches/server/0971-Fix-creation-of-invalid-block-entity-during-world-ge.patch similarity index 100% rename from patches/server/0973-Fix-creation-of-invalid-block-entity-during-world-ge.patch rename to patches/server/0971-Fix-creation-of-invalid-block-entity-during-world-ge.patch diff --git a/patches/server/0974-Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/server/0972-Fix-possible-StackOverflowError-for-some-dispenses.patch similarity index 100% rename from patches/server/0974-Fix-possible-StackOverflowError-for-some-dispenses.patch rename to patches/server/0972-Fix-possible-StackOverflowError-for-some-dispenses.patch diff --git a/patches/server/0975-Improve-tag-parser-handling.patch b/patches/server/0973-Improve-tag-parser-handling.patch similarity index 100% rename from patches/server/0975-Improve-tag-parser-handling.patch rename to patches/server/0973-Improve-tag-parser-handling.patch diff --git a/patches/server/0976-Item-Mutation-Fixes.patch b/patches/server/0974-Item-Mutation-Fixes.patch similarity index 100% rename from patches/server/0976-Item-Mutation-Fixes.patch rename to patches/server/0974-Item-Mutation-Fixes.patch diff --git a/patches/server/0977-Per-world-ticks-per-spawn-settings.patch b/patches/server/0975-Per-world-ticks-per-spawn-settings.patch similarity index 100% rename from patches/server/0977-Per-world-ticks-per-spawn-settings.patch rename to patches/server/0975-Per-world-ticks-per-spawn-settings.patch diff --git a/patches/server/0978-Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/0976-Properly-track-the-changed-item-from-dispense-events.patch similarity index 100% rename from patches/server/0978-Properly-track-the-changed-item-from-dispense-events.patch rename to patches/server/0976-Properly-track-the-changed-item-from-dispense-events.patch diff --git a/patches/server/0979-Rewrite-dataconverter-system.patch b/patches/server/0977-Rewrite-dataconverter-system.patch similarity index 100% rename from patches/server/0979-Rewrite-dataconverter-system.patch rename to patches/server/0977-Rewrite-dataconverter-system.patch diff --git a/patches/server/0980-Suspicious-Effect-Entry-API.patch b/patches/server/0978-Suspicious-Effect-Entry-API.patch similarity index 100% rename from patches/server/0980-Suspicious-Effect-Entry-API.patch rename to patches/server/0978-Suspicious-Effect-Entry-API.patch diff --git a/patches/server/0981-check-if-itemstack-is-stackable-first.patch b/patches/server/0979-check-if-itemstack-is-stackable-first.patch similarity index 100% rename from patches/server/0981-check-if-itemstack-is-stackable-first.patch rename to patches/server/0979-check-if-itemstack-is-stackable-first.patch diff --git a/patches/server/0982-disable-forced-empty-world-ticks.patch b/patches/server/0980-disable-forced-empty-world-ticks.patch similarity index 100% rename from patches/server/0982-disable-forced-empty-world-ticks.patch rename to patches/server/0980-disable-forced-empty-world-ticks.patch diff --git a/patches/server/0983-Starlight.patch b/patches/server/0981-Starlight.patch similarity index 100% rename from patches/server/0983-Starlight.patch rename to patches/server/0981-Starlight.patch diff --git a/patches/server/0984-Rewrite-chunk-system.patch b/patches/server/0982-Rewrite-chunk-system.patch similarity index 100% rename from patches/server/0984-Rewrite-chunk-system.patch rename to patches/server/0982-Rewrite-chunk-system.patch diff --git a/patches/server/0985-incremental-chunk-and-player-saving.patch b/patches/server/0983-incremental-chunk-and-player-saving.patch similarity index 100% rename from patches/server/0985-incremental-chunk-and-player-saving.patch rename to patches/server/0983-incremental-chunk-and-player-saving.patch diff --git a/patches/server/0986-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0984-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch similarity index 100% rename from patches/server/0986-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch rename to patches/server/0984-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch diff --git a/patches/server/0987-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0985-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch similarity index 100% rename from patches/server/0987-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch rename to patches/server/0985-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch diff --git a/patches/server/0988-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0986-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch similarity index 100% rename from patches/server/0988-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch rename to patches/server/0986-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch diff --git a/patches/server/0989-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0987-Optimize-Network-Manager-and-add-advanced-packet-sup.patch similarity index 100% rename from patches/server/0989-Optimize-Network-Manager-and-add-advanced-packet-sup.patch rename to patches/server/0987-Optimize-Network-Manager-and-add-advanced-packet-sup.patch diff --git a/patches/server/0990-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0988-Allow-Saving-of-Oversized-Chunks.patch similarity index 100% rename from patches/server/0990-Allow-Saving-of-Oversized-Chunks.patch rename to patches/server/0988-Allow-Saving-of-Oversized-Chunks.patch diff --git a/patches/server/0991-Fix-World-isChunkGenerated-calls.patch b/patches/server/0989-Fix-World-isChunkGenerated-calls.patch similarity index 100% rename from patches/server/0991-Fix-World-isChunkGenerated-calls.patch rename to patches/server/0989-Fix-World-isChunkGenerated-calls.patch diff --git a/patches/server/0992-Flat-bedrock-generator-settings.patch b/patches/server/0990-Flat-bedrock-generator-settings.patch similarity index 100% rename from patches/server/0992-Flat-bedrock-generator-settings.patch rename to patches/server/0990-Flat-bedrock-generator-settings.patch diff --git a/patches/server/0993-Entity-Activation-Range-2.0.patch b/patches/server/0991-Entity-Activation-Range-2.0.patch similarity index 100% rename from patches/server/0993-Entity-Activation-Range-2.0.patch rename to patches/server/0991-Entity-Activation-Range-2.0.patch diff --git a/patches/server/0994-Optional-per-player-mob-spawns.patch b/patches/server/0992-Optional-per-player-mob-spawns.patch similarity index 100% rename from patches/server/0994-Optional-per-player-mob-spawns.patch rename to patches/server/0992-Optional-per-player-mob-spawns.patch diff --git a/patches/server/0995-Anti-Xray.patch b/patches/server/0993-Anti-Xray.patch similarity index 100% rename from patches/server/0995-Anti-Xray.patch rename to patches/server/0993-Anti-Xray.patch diff --git a/patches/server/0996-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0994-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch similarity index 100% rename from patches/server/0996-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch rename to patches/server/0994-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch diff --git a/patches/server/0997-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0995-Optimize-Collision-to-not-load-chunks.patch similarity index 100% rename from patches/server/0997-Optimize-Collision-to-not-load-chunks.patch rename to patches/server/0995-Optimize-Collision-to-not-load-chunks.patch diff --git a/patches/server/0998-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0996-Optimize-GoalSelector-Goal.Flag-Set-operations.patch similarity index 100% rename from patches/server/0998-Optimize-GoalSelector-Goal.Flag-Set-operations.patch rename to patches/server/0996-Optimize-GoalSelector-Goal.Flag-Set-operations.patch diff --git a/patches/server/0999-Entity-load-save-limit-per-chunk.patch b/patches/server/0997-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/0999-Entity-load-save-limit-per-chunk.patch rename to patches/server/0997-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/1000-Improved-Watchdog-Support.patch b/patches/server/0998-Improved-Watchdog-Support.patch similarity index 100% rename from patches/server/1000-Improved-Watchdog-Support.patch rename to patches/server/0998-Improved-Watchdog-Support.patch diff --git a/patches/server/1001-Optimize-Voxel-Shape-Merging.patch b/patches/server/0999-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/1001-Optimize-Voxel-Shape-Merging.patch rename to patches/server/0999-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/1002-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/1000-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 100% rename from patches/server/1002-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to patches/server/1000-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch diff --git a/patches/server/1003-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/1001-Use-distance-map-to-optimise-entity-tracker.patch similarity index 100% rename from patches/server/1003-Use-distance-map-to-optimise-entity-tracker.patch rename to patches/server/1001-Use-distance-map-to-optimise-entity-tracker.patch diff --git a/patches/server/1004-Optimize-Bit-Operations-by-inlining.patch b/patches/server/1002-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/1004-Optimize-Bit-Operations-by-inlining.patch rename to patches/server/1002-Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/1005-Remove-streams-from-hot-code.patch b/patches/server/1003-Remove-streams-from-hot-code.patch similarity index 100% rename from patches/server/1005-Remove-streams-from-hot-code.patch rename to patches/server/1003-Remove-streams-from-hot-code.patch diff --git a/patches/server/1006-Eigencraft-redstone-implementation.patch b/patches/server/1004-Eigencraft-redstone-implementation.patch similarity index 100% rename from patches/server/1006-Eigencraft-redstone-implementation.patch rename to patches/server/1004-Eigencraft-redstone-implementation.patch diff --git a/patches/server/1007-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/1005-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/1007-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/server/1005-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/1008-Improve-boat-collision-performance.patch b/patches/server/1006-Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/1008-Improve-boat-collision-performance.patch rename to patches/server/1006-Improve-boat-collision-performance.patch diff --git a/patches/server/1009-Optimise-general-POI-access.patch b/patches/server/1007-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/1009-Optimise-general-POI-access.patch rename to patches/server/1007-Optimise-general-POI-access.patch diff --git a/patches/server/1010-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/1008-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/1010-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/1008-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/1011-Execute-chunk-tasks-mid-tick.patch b/patches/server/1009-Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/server/1011-Execute-chunk-tasks-mid-tick.patch rename to patches/server/1009-Execute-chunk-tasks-mid-tick.patch diff --git a/patches/server/1012-Optimise-random-block-ticking.patch b/patches/server/1010-Optimise-random-block-ticking.patch similarity index 100% rename from patches/server/1012-Optimise-random-block-ticking.patch rename to patches/server/1010-Optimise-random-block-ticking.patch diff --git a/patches/server/1013-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/1011-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/1013-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/1011-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/1014-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/1012-Use-Velocity-compression-and-cipher-natives.patch similarity index 99% rename from patches/server/1014-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/1012-Use-Velocity-compression-and-cipher-natives.patch index c357a07cf3..30eed62d11 100644 --- a/patches/server/1014-Use-Velocity-compression-and-cipher-natives.patch +++ b/patches/server/1012-Use-Velocity-compression-and-cipher-natives.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Use Velocity compression and cipher natives diff --git a/build.gradle.kts b/build.gradle.kts -index 41767422b521ff095592d799b14b2f36c3b5c5cb..aab4d1f15745bce838329ba0359e3f9ca70f2e1f 100644 +index 9f9ee63e2fd2b3fac5781b50435e26ec079c94fd..9f69c079ad2c65d94de27ac11d02e236f48bc308 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -38,6 +38,11 @@ dependencies { +@@ -36,6 +36,11 @@ dependencies { implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files implementation("commons-lang:commons-lang:2.6") runtimeOnly("com.lmax:disruptor:3.4.4") // Paper diff --git a/patches/server/1015-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1013-Detail-more-information-in-watchdog-dumps.patch similarity index 100% rename from patches/server/1015-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/1013-Detail-more-information-in-watchdog-dumps.patch diff --git a/patches/server/1016-Collision-optimisations.patch b/patches/server/1014-Collision-optimisations.patch similarity index 100% rename from patches/server/1016-Collision-optimisations.patch rename to patches/server/1014-Collision-optimisations.patch diff --git a/patches/server/1017-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/1015-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 100% rename from patches/server/1017-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/1015-Optimise-collision-checking-in-player-move-packet-ha.patch diff --git a/patches/server/1018-Fix-tripwire-disarming-not-working-as-intended.patch b/patches/server/1016-Fix-tripwire-disarming-not-working-as-intended.patch similarity index 100% rename from patches/server/1018-Fix-tripwire-disarming-not-working-as-intended.patch rename to patches/server/1016-Fix-tripwire-disarming-not-working-as-intended.patch diff --git a/patches/server/1019-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/1017-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/1019-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/1017-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/1020-Add-Alternate-Current-redstone-implementation.patch b/patches/server/1018-Add-Alternate-Current-redstone-implementation.patch similarity index 100% rename from patches/server/1020-Add-Alternate-Current-redstone-implementation.patch rename to patches/server/1018-Add-Alternate-Current-redstone-implementation.patch diff --git a/patches/server/1021-optimize-dirt-and-snow-spreading.patch b/patches/server/1019-optimize-dirt-and-snow-spreading.patch similarity index 100% rename from patches/server/1021-optimize-dirt-and-snow-spreading.patch rename to patches/server/1019-optimize-dirt-and-snow-spreading.patch diff --git a/patches/server/1022-Properly-resend-entities.patch b/patches/server/1020-Properly-resend-entities.patch similarity index 100% rename from patches/server/1022-Properly-resend-entities.patch rename to patches/server/1020-Properly-resend-entities.patch diff --git a/patches/server/1023-Optimize-Hoppers.patch b/patches/server/1021-Optimize-Hoppers.patch similarity index 100% rename from patches/server/1023-Optimize-Hoppers.patch rename to patches/server/1021-Optimize-Hoppers.patch diff --git a/patches/server/1024-Improve-performance-of-mass-crafts.patch b/patches/server/1022-Improve-performance-of-mass-crafts.patch similarity index 100% rename from patches/server/1024-Improve-performance-of-mass-crafts.patch rename to patches/server/1022-Improve-performance-of-mass-crafts.patch diff --git a/patches/server/1025-Actually-optimise-explosions.patch b/patches/server/1023-Actually-optimise-explosions.patch similarity index 100% rename from patches/server/1025-Actually-optimise-explosions.patch rename to patches/server/1023-Actually-optimise-explosions.patch diff --git a/patches/server/1026-Optimise-chunk-tick-iteration.patch b/patches/server/1024-Optimise-chunk-tick-iteration.patch similarity index 100% rename from patches/server/1026-Optimise-chunk-tick-iteration.patch rename to patches/server/1024-Optimise-chunk-tick-iteration.patch diff --git a/patches/server/1027-Lag-compensation-ticks.patch b/patches/server/1025-Lag-compensation-ticks.patch similarity index 100% rename from patches/server/1027-Lag-compensation-ticks.patch rename to patches/server/1025-Lag-compensation-ticks.patch diff --git a/patches/server/1028-Optimise-nearby-player-retrieval.patch b/patches/server/1026-Optimise-nearby-player-retrieval.patch similarity index 100% rename from patches/server/1028-Optimise-nearby-player-retrieval.patch rename to patches/server/1026-Optimise-nearby-player-retrieval.patch diff --git a/patches/server/1029-Distance-manager-tick-timings.patch b/patches/server/1027-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/1029-Distance-manager-tick-timings.patch rename to patches/server/1027-Distance-manager-tick-timings.patch diff --git a/patches/server/1030-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/1028-Handle-Oversized-block-entities-in-chunks.patch similarity index 100% rename from patches/server/1030-Handle-Oversized-block-entities-in-chunks.patch rename to patches/server/1028-Handle-Oversized-block-entities-in-chunks.patch diff --git a/patches/server/1031-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/1029-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/1031-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/server/1029-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/1032-Fix-and-optimise-world-force-upgrading.patch b/patches/server/1030-Fix-and-optimise-world-force-upgrading.patch similarity index 100% rename from patches/server/1032-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/1030-Fix-and-optimise-world-force-upgrading.patch diff --git a/patches/server/1033-API-for-checking-sent-chunks.patch b/patches/server/1031-API-for-checking-sent-chunks.patch similarity index 100% rename from patches/server/1033-API-for-checking-sent-chunks.patch rename to patches/server/1031-API-for-checking-sent-chunks.patch diff --git a/patches/server/1034-Properly-handle-pdc-and-custom-tags-in-ItemMeta.patch b/patches/server/1032-Properly-handle-pdc-and-custom-tags-in-ItemMeta.patch similarity index 100% rename from patches/server/1034-Properly-handle-pdc-and-custom-tags-in-ItemMeta.patch rename to patches/server/1032-Properly-handle-pdc-and-custom-tags-in-ItemMeta.patch diff --git a/patches/server/1035-handle-converting-old-serialized-names-to-new-names.patch b/patches/server/1033-handle-converting-old-serialized-names-to-new-names.patch similarity index 100% rename from patches/server/1035-handle-converting-old-serialized-names-to-new-names.patch rename to patches/server/1033-handle-converting-old-serialized-names-to-new-names.patch diff --git a/patches/server/1036-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/1034-Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/server/1036-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/1034-Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/server/1037-Deep-clone-nbt-tags-in-PDC.patch b/patches/server/1035-Deep-clone-nbt-tags-in-PDC.patch similarity index 100% rename from patches/server/1037-Deep-clone-nbt-tags-in-PDC.patch rename to patches/server/1035-Deep-clone-nbt-tags-in-PDC.patch diff --git a/patches/server/1038-Support-old-UUID-format-for-NBT.patch b/patches/server/1036-Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/server/1038-Support-old-UUID-format-for-NBT.patch rename to patches/server/1036-Support-old-UUID-format-for-NBT.patch diff --git a/patches/server/1039-Fix-shield-disable-inconsistency.patch b/patches/server/1037-Fix-shield-disable-inconsistency.patch similarity index 100% rename from patches/server/1039-Fix-shield-disable-inconsistency.patch rename to patches/server/1037-Fix-shield-disable-inconsistency.patch diff --git a/patches/server/1040-Write-SavedData-IO-async.patch b/patches/server/1038-Write-SavedData-IO-async.patch similarity index 100% rename from patches/server/1040-Write-SavedData-IO-async.patch rename to patches/server/1038-Write-SavedData-IO-async.patch diff --git a/patches/server/1041-Don-t-lose-removed-data-components-in-ItemMeta.patch b/patches/server/1039-Don-t-lose-removed-data-components-in-ItemMeta.patch similarity index 100% rename from patches/server/1041-Don-t-lose-removed-data-components-in-ItemMeta.patch rename to patches/server/1039-Don-t-lose-removed-data-components-in-ItemMeta.patch diff --git a/patches/server/1042-Add-experimental-improved-give-command.patch b/patches/server/1040-Add-experimental-improved-give-command.patch similarity index 100% rename from patches/server/1042-Add-experimental-improved-give-command.patch rename to patches/server/1040-Add-experimental-improved-give-command.patch diff --git a/patches/server/1043-Handle-Large-Packets-disconnecting-client.patch b/patches/server/1041-Handle-Large-Packets-disconnecting-client.patch similarity index 100% rename from patches/server/1043-Handle-Large-Packets-disconnecting-client.patch rename to patches/server/1041-Handle-Large-Packets-disconnecting-client.patch diff --git a/patches/server/1044-Fix-ItemFlag-HIDE_DESTROYES-HIDE_PLACED_ON.patch b/patches/server/1042-Fix-ItemFlag-HIDE_DESTROYES-HIDE_PLACED_ON.patch similarity index 100% rename from patches/server/1044-Fix-ItemFlag-HIDE_DESTROYES-HIDE_PLACED_ON.patch rename to patches/server/1042-Fix-ItemFlag-HIDE_DESTROYES-HIDE_PLACED_ON.patch diff --git a/patches/server/1045-Fix-helmet-damage-reduction-inconsistencies.patch b/patches/server/1043-Fix-helmet-damage-reduction-inconsistencies.patch similarity index 100% rename from patches/server/1045-Fix-helmet-damage-reduction-inconsistencies.patch rename to patches/server/1043-Fix-helmet-damage-reduction-inconsistencies.patch