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