diff --git a/patches/unapplied/server/0971-Rewrite-dataconverter-system.patch b/patches/unapplied/server/0989-Rewrite-dataconverter-system.patch
similarity index 100%
rename from patches/unapplied/server/0971-Rewrite-dataconverter-system.patch
rename to patches/unapplied/server/0989-Rewrite-dataconverter-system.patch
diff --git a/patches/unapplied/server/0972-Suspicious-Effect-Entry-API.patch b/patches/unapplied/server/0990-Suspicious-Effect-Entry-API.patch
similarity index 100%
rename from patches/unapplied/server/0972-Suspicious-Effect-Entry-API.patch
rename to patches/unapplied/server/0990-Suspicious-Effect-Entry-API.patch
diff --git a/patches/unapplied/server/0973-check-if-itemstack-is-stackable-first.patch b/patches/unapplied/server/0991-check-if-itemstack-is-stackable-first.patch
similarity index 100%
rename from patches/unapplied/server/0973-check-if-itemstack-is-stackable-first.patch
rename to patches/unapplied/server/0991-check-if-itemstack-is-stackable-first.patch
diff --git a/patches/unapplied/server/0974-disable-forced-empty-world-ticks.patch b/patches/unapplied/server/0992-disable-forced-empty-world-ticks.patch
similarity index 100%
rename from patches/unapplied/server/0974-disable-forced-empty-world-ticks.patch
rename to patches/unapplied/server/0992-disable-forced-empty-world-ticks.patch
diff --git a/patches/unapplied/server/0975-Starlight.patch b/patches/unapplied/server/0993-Starlight.patch
similarity index 100%
rename from patches/unapplied/server/0975-Starlight.patch
rename to patches/unapplied/server/0993-Starlight.patch
diff --git a/patches/unapplied/server/0976-Rewrite-chunk-system.patch b/patches/unapplied/server/0994-Rewrite-chunk-system.patch
similarity index 100%
rename from patches/unapplied/server/0976-Rewrite-chunk-system.patch
rename to patches/unapplied/server/0994-Rewrite-chunk-system.patch
diff --git a/patches/unapplied/server/0977-incremental-chunk-and-player-saving.patch b/patches/unapplied/server/0995-incremental-chunk-and-player-saving.patch
similarity index 100%
rename from patches/unapplied/server/0977-incremental-chunk-and-player-saving.patch
rename to patches/unapplied/server/0995-incremental-chunk-and-player-saving.patch
diff --git a/patches/unapplied/server/0978-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/unapplied/server/0996-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
similarity index 100%
rename from patches/unapplied/server/0978-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
rename to patches/unapplied/server/0996-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
diff --git a/patches/unapplied/server/0979-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/unapplied/server/0997-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 100%
rename from patches/unapplied/server/0979-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to patches/unapplied/server/0997-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/unapplied/server/0980-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/unapplied/server/0998-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
similarity index 100%
rename from patches/unapplied/server/0980-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
rename to patches/unapplied/server/0998-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
diff --git a/patches/unapplied/server/0981-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/unapplied/server/0999-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 100%
rename from patches/unapplied/server/0981-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to patches/unapplied/server/0999-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/unapplied/server/0982-Allow-Saving-of-Oversized-Chunks.patch b/patches/unapplied/server/1000-Allow-Saving-of-Oversized-Chunks.patch
similarity index 100%
rename from patches/unapplied/server/0982-Allow-Saving-of-Oversized-Chunks.patch
rename to patches/unapplied/server/1000-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/unapplied/server/0983-Fix-World-isChunkGenerated-calls.patch b/patches/unapplied/server/1001-Fix-World-isChunkGenerated-calls.patch
similarity index 100%
rename from patches/unapplied/server/0983-Fix-World-isChunkGenerated-calls.patch
rename to patches/unapplied/server/1001-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/unapplied/server/0984-Flat-bedrock-generator-settings.patch b/patches/unapplied/server/1002-Flat-bedrock-generator-settings.patch
similarity index 100%
rename from patches/unapplied/server/0984-Flat-bedrock-generator-settings.patch
rename to patches/unapplied/server/1002-Flat-bedrock-generator-settings.patch
diff --git a/patches/unapplied/server/0985-Entity-Activation-Range-2.0.patch b/patches/unapplied/server/1003-Entity-Activation-Range-2.0.patch
similarity index 100%
rename from patches/unapplied/server/0985-Entity-Activation-Range-2.0.patch
rename to patches/unapplied/server/1003-Entity-Activation-Range-2.0.patch
diff --git a/patches/unapplied/server/0986-Optional-per-player-mob-spawns.patch b/patches/unapplied/server/1004-Optional-per-player-mob-spawns.patch
similarity index 100%
rename from patches/unapplied/server/0986-Optional-per-player-mob-spawns.patch
rename to patches/unapplied/server/1004-Optional-per-player-mob-spawns.patch
diff --git a/patches/unapplied/server/0987-Anti-Xray.patch b/patches/unapplied/server/1005-Anti-Xray.patch
similarity index 100%
rename from patches/unapplied/server/0987-Anti-Xray.patch
rename to patches/unapplied/server/1005-Anti-Xray.patch
diff --git a/patches/unapplied/server/0988-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/unapplied/server/1006-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
similarity index 100%
rename from patches/unapplied/server/0988-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
rename to patches/unapplied/server/1006-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/unapplied/server/0989-Optimize-Collision-to-not-load-chunks.patch b/patches/unapplied/server/1007-Optimize-Collision-to-not-load-chunks.patch
similarity index 100%
rename from patches/unapplied/server/0989-Optimize-Collision-to-not-load-chunks.patch
rename to patches/unapplied/server/1007-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/unapplied/server/0990-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/unapplied/server/1008-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
similarity index 100%
rename from patches/unapplied/server/0990-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
rename to patches/unapplied/server/1008-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/unapplied/server/0991-Entity-load-save-limit-per-chunk.patch b/patches/unapplied/server/1009-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/unapplied/server/0991-Entity-load-save-limit-per-chunk.patch
rename to patches/unapplied/server/1009-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/unapplied/server/0992-Improved-Watchdog-Support.patch b/patches/unapplied/server/1010-Improved-Watchdog-Support.patch
similarity index 100%
rename from patches/unapplied/server/0992-Improved-Watchdog-Support.patch
rename to patches/unapplied/server/1010-Improved-Watchdog-Support.patch
diff --git a/patches/unapplied/server/0993-Optimize-Voxel-Shape-Merging.patch b/patches/unapplied/server/1011-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from patches/unapplied/server/0993-Optimize-Voxel-Shape-Merging.patch
rename to patches/unapplied/server/1011-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/unapplied/server/0995-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/0995-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/0996-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/0996-Optimize-Bit-Operations-by-inlining.patch
rename to patches/unapplied/server/1013-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/unapplied/server/0997-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/0997-Remove-streams-from-hot-code.patch
rename to patches/unapplied/server/1014-Remove-streams-from-hot-code.patch
diff --git a/patches/unapplied/server/0998-Eigencraft-redstone-implementation.patch b/patches/unapplied/server/1015-Eigencraft-redstone-implementation.patch
similarity index 100%
rename from patches/unapplied/server/0998-Eigencraft-redstone-implementation.patch
rename to patches/unapplied/server/1015-Eigencraft-redstone-implementation.patch
diff --git a/patches/unapplied/server/0999-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/0999-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/1000-Improve-boat-collision-performance.patch b/patches/unapplied/server/1017-Improve-boat-collision-performance.patch
similarity index 100%
rename from patches/unapplied/server/1000-Improve-boat-collision-performance.patch
rename to patches/unapplied/server/1017-Improve-boat-collision-performance.patch
diff --git a/patches/unapplied/server/1001-Optimise-general-POI-access.patch b/patches/unapplied/server/1018-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/unapplied/server/1001-Optimise-general-POI-access.patch
rename to patches/unapplied/server/1018-Optimise-general-POI-access.patch
diff --git a/patches/unapplied/server/1002-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/unapplied/server/1019-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/unapplied/server/1002-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/unapplied/server/1019-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/unapplied/server/1003-Execute-chunk-tasks-mid-tick.patch b/patches/unapplied/server/1020-Execute-chunk-tasks-mid-tick.patch
similarity index 100%
rename from patches/unapplied/server/1003-Execute-chunk-tasks-mid-tick.patch
rename to patches/unapplied/server/1020-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/unapplied/server/1004-Optimise-random-block-ticking.patch b/patches/unapplied/server/1021-Optimise-random-block-ticking.patch
similarity index 100%
rename from patches/unapplied/server/1004-Optimise-random-block-ticking.patch
rename to patches/unapplied/server/1021-Optimise-random-block-ticking.patch
diff --git a/patches/unapplied/server/1005-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/unapplied/server/1022-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/unapplied/server/1005-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/unapplied/server/1022-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/unapplied/server/1006-Use-Velocity-compression-and-cipher-natives.patch b/patches/unapplied/server/1023-Use-Velocity-compression-and-cipher-natives.patch
similarity index 100%
rename from patches/unapplied/server/1006-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/unapplied/server/1023-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/unapplied/server/1007-Detail-more-information-in-watchdog-dumps.patch b/patches/unapplied/server/1024-Detail-more-information-in-watchdog-dumps.patch
similarity index 100%
rename from patches/unapplied/server/1007-Detail-more-information-in-watchdog-dumps.patch
rename to patches/unapplied/server/1024-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/unapplied/server/1008-Collision-optimisations.patch b/patches/unapplied/server/1025-Collision-optimisations.patch
similarity index 100%
rename from patches/unapplied/server/1008-Collision-optimisations.patch
rename to patches/unapplied/server/1025-Collision-optimisations.patch
diff --git a/patches/unapplied/server/1009-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/unapplied/server/1026-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 100%
rename from patches/unapplied/server/1009-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/unapplied/server/1026-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/unapplied/server/1011-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/unapplied/server/1027-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/unapplied/server/1011-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/unapplied/server/1027-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/unapplied/server/1012-Add-Alternate-Current-redstone-implementation.patch b/patches/unapplied/server/1028-Add-Alternate-Current-redstone-implementation.patch
similarity index 100%
rename from patches/unapplied/server/1012-Add-Alternate-Current-redstone-implementation.patch
rename to patches/unapplied/server/1028-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/unapplied/server/1013-optimize-dirt-and-snow-spreading.patch b/patches/unapplied/server/1029-optimize-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/unapplied/server/1013-optimize-dirt-and-snow-spreading.patch
rename to patches/unapplied/server/1029-optimize-dirt-and-snow-spreading.patch
diff --git a/patches/unapplied/server/1014-Properly-resend-entities.patch b/patches/unapplied/server/1030-Properly-resend-entities.patch
similarity index 100%
rename from patches/unapplied/server/1014-Properly-resend-entities.patch
rename to patches/unapplied/server/1030-Properly-resend-entities.patch
diff --git a/patches/unapplied/server/1015-Optimize-Hoppers.patch b/patches/unapplied/server/1031-Optimize-Hoppers.patch
similarity index 100%
rename from patches/unapplied/server/1015-Optimize-Hoppers.patch
rename to patches/unapplied/server/1031-Optimize-Hoppers.patch
diff --git a/patches/unapplied/server/1016-Improve-performance-of-mass-crafts.patch b/patches/unapplied/server/1032-Improve-performance-of-mass-crafts.patch
similarity index 100%
rename from patches/unapplied/server/1016-Improve-performance-of-mass-crafts.patch
rename to patches/unapplied/server/1032-Improve-performance-of-mass-crafts.patch
diff --git a/patches/unapplied/server/1017-Actually-optimise-explosions.patch b/patches/unapplied/server/1033-Actually-optimise-explosions.patch
similarity index 100%
rename from patches/unapplied/server/1017-Actually-optimise-explosions.patch
rename to patches/unapplied/server/1033-Actually-optimise-explosions.patch
diff --git a/patches/unapplied/server/1018-Optimise-chunk-tick-iteration.patch b/patches/unapplied/server/1034-Optimise-chunk-tick-iteration.patch
similarity index 100%
rename from patches/unapplied/server/1018-Optimise-chunk-tick-iteration.patch
rename to patches/unapplied/server/1034-Optimise-chunk-tick-iteration.patch
diff --git a/patches/unapplied/server/1019-Lag-compensation-ticks.patch b/patches/unapplied/server/1035-Lag-compensation-ticks.patch
similarity index 100%
rename from patches/unapplied/server/1019-Lag-compensation-ticks.patch
rename to patches/unapplied/server/1035-Lag-compensation-ticks.patch
diff --git a/patches/unapplied/server/1020-Optimise-nearby-player-retrieval.patch b/patches/unapplied/server/1036-Optimise-nearby-player-retrieval.patch
similarity index 100%
rename from patches/unapplied/server/1020-Optimise-nearby-player-retrieval.patch
rename to patches/unapplied/server/1036-Optimise-nearby-player-retrieval.patch
diff --git a/patches/unapplied/server/1021-Distance-manager-tick-timings.patch b/patches/unapplied/server/1037-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/unapplied/server/1021-Distance-manager-tick-timings.patch
rename to patches/unapplied/server/1037-Distance-manager-tick-timings.patch
diff --git a/patches/unapplied/server/1022-Handle-Oversized-block-entities-in-chunks.patch b/patches/unapplied/server/1038-Handle-Oversized-block-entities-in-chunks.patch
similarity index 100%
rename from patches/unapplied/server/1022-Handle-Oversized-block-entities-in-chunks.patch
rename to patches/unapplied/server/1038-Handle-Oversized-block-entities-in-chunks.patch
diff --git a/patches/unapplied/server/1023-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/unapplied/server/1039-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/unapplied/server/1023-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/unapplied/server/1039-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/unapplied/server/1024-API-for-checking-sent-chunks.patch b/patches/unapplied/server/1040-API-for-checking-sent-chunks.patch
similarity index 100%
rename from patches/unapplied/server/1024-API-for-checking-sent-chunks.patch
rename to patches/unapplied/server/1040-API-for-checking-sent-chunks.patch
diff --git a/patches/unapplied/server/1029-Write-SavedData-IO-async.patch b/patches/unapplied/server/1041-Write-SavedData-IO-async.patch
similarity index 100%
rename from patches/unapplied/server/1029-Write-SavedData-IO-async.patch
rename to patches/unapplied/server/1041-Write-SavedData-IO-async.patch