From b7fd9efe682630effebd4a5d5a3cfcc1fee49d6c Mon Sep 17 00:00:00 2001
From: Martijn Muijsers <martijnmuijsers@live.nl>
Date: Wed, 22 Mar 2023 16:49:11 +0100
Subject: [PATCH] Simplify development run JVM arguments

---
 ...Modify-JVM-args-for-development-runs.patch | 23 -------------------
 ...a-installation-for-development-runs.patch} |  2 +-
 ...irtual-threads-for-development-runs.patch} | 16 ++++++-------
 ...patch => 0006-Gale-branding-changes.patch} |  2 +-
 ...-metrics.patch => 0007-Gale-metrics.patch} |  0
 ...on.patch => 0008-Gale-configuration.patch} |  0
 ...h => 0009-Set-Gale-permissions-root.patch} |  0
 ...ommands.patch => 0010-Gale-commands.patch} |  0
 ...> 0011-Include-time-in-startup-logs.patch} |  0
 ...nclude-server.properties-in-timings.patch} |  0
 ...3-Include-hardware-specs-in-timings.patch} |  0
 ...tch => 0014-Use-timin.gs-by-default.patch} |  0
 ...ommend-disabling-timings-on-startup.patch} |  0
 ...ch => 0016-Make-timings-calls-final.patch} |  0
 ...tch => 0017-Remove-vanilla-profiler.patch} |  0
 ...ing-for-EntityLiving-hasLineOfSight.patch} |  0
 ...pelessRecipe-comparison-for-vanilla.patch} |  0
 ...020-Reduce-projectile-chunk-loading.patch} |  0
 ...een.patch => 0021-Predict-Halloween.patch} |  0
 ...tch => 0022-Move-random-tick-random.patch} |  0
 ...imize-random-calls-in-chunk-ticking.patch} |  0
 ...uce-enderman-teleport-chunk-lookups.patch} |  0
 ...duce-acquire-POI-for-stuck-entities.patch} |  0
 ...e-iterators-from-Inventory-contains.patch} |  0
 ...ing-range-before-getting-visibility.patch} |  0
 ...-for-plugins-not-shutting-down-task.patch} |  0
 ...029-Improve-fluid-direction-caching.patch} |  0
 ...ch => 0030-Cache-on-climbable-check.patch} |  0
 ...0031-Use-array-for-gamerule-storage.patch} |  0
 ...lisionContext-a-live-representation.patch} |  0
 ...ve-container-checking-with-a-bitset.patch} |  0
 ...r-checking-for-useless-move-packets.patch} |  0
 ...0035-Use-fast-item-merge-raytracing.patch} |  0
 ...-aging-cache-for-biome-temperatures.patch} |  0
 ...t.patch => 0037-Inline-level-height.patch} |  0
 ...ThreadUnsafeRandom-for-mob-spawning.patch} |  0
 ...eams-and-iterators-from-range-check.patch} |  0
 ...streams-from-getting-nearby-players.patch} |  0
 ...> 0041-Skip-cloning-loot-parameters.patch} |  0
 ...042-Block-goal-does-not-load-chunks.patch} |  0
 ...h => 0043-Reduce-entity-allocations.patch} |  0
 ...44-Remove-lambda-from-ticking-guard.patch} |  0
 ...e-entity-fluid-lookups-if-no-fluids.patch} |  0
 ...-support.patch => 0046-SIMD-support.patch} | 14 +++++------
 ...0047-Make-book-writing-configurable.patch} |  0
 ...0048-Optimize-entity-coordinate-key.patch} |  0
 ...patch => 0049-Reduce-in-wall-checks.patch} |  0
 ...hat-order-verification-configurable.patch} |  0
 ...-Make-saving-fireworks-configurable.patch} |  0
 ...table-refresh-for-non-player-intera.patch} |  0
 ...h => 0053-Reduce-hopper-item-checks.patch} |  0
 ...0054-Reduce-villager-item-re-pickup.patch} |  0
 ...55-Variable-entity-wake-up-duration.patch} |  0
 ...at-commands-before-player-has-joine.patch} |  0
 ... 0057-Do-not-log-invalid-statistics.patch} |  0
 ...8-Do-not-log-empty-message-warnings.patch} |  0
 ...059-Do-not-log-ignored-advancements.patch} |  0
 ...0-Do-not-log-setBlock-in-far-chunks.patch} |  0
 ...061-Do-not-log-unrecognized-recipes.patch} |  0
 ...-log-legacy-Material-initialization.patch} |  0
 ...Do-not-log-expired-message-warnings.patch} |  0
 ...t-log-out-of-order-message-warnings.patch} |  0
 ...> 0065-Do-not-log-Not-Secure-marker.patch} |  0
 ...0066-Do-not-log-run-as-root-warning.patch} |  0
 ...067-Do-not-log-offline-mode-warning.patch} |  0
 ...tly-log-invalid-pool-element-errors.patch} |  0
 ...> 0069-Fix-legacy-colors-in-console.patch} |  0
 ...er-showing-in-ping-before-server-fu.patch} |  0
 ...1-Make-sand-duping-fix-configurable.patch} |  0
 ...-238526.patch => 0072-Fix-MC-238526.patch} |  0
 ...-123848.patch => 0073-Fix-MC-123848.patch} |  0
 ...ow-rotation-when-shearing-mooshroom.patch} |  0
 ...-121706.patch => 0075-Fix-MC-121706.patch} |  0
 ...-110386.patch => 0076-Fix-MC-110386.patch} |  0
 ...MC-31819.patch => 0077-Fix-MC-31819.patch} |  0
 ...MC-26304.patch => 0078-Fix-MC-26304.patch} |  0
 ...ould-check-if-entity-can-use-portal.patch} |  0
 ...eating-blocks-in-non-ticking-chunks.patch} |  0
 ...nt-resetting-despawn-counter-config.patch} |  0
 ...ogging-login-locations-configurable.patch} |  0
 ...ch => 0083-Reduce-array-allocations.patch} |  0
 ...atch => 0084-Optimize-sun-burn-tick.patch} |  0
 ...-Optional-allocation-in-EntityBased.patch} |  0
 ...-goal-set-with-optimized-collection.patch} |  0
 ...rules-map-with-optimized-collection.patch} |  0
 ...tributes-with-optimized-collections.patch} |  0
 ...class-map-with-optimized-collection.patch} |  0
 ...tracker-map-with-optimized-collecti.patch} |  0
 ...ape-full-block-cache-with-hashtable.patch} |  0
 ...ignableFrom-call-in-ClassInstanceMu.patch} |  0
 ...> 0093-Cache-BlockStatePairKey-hash.patch} |  0
 ...94-Cache-CubeVoxelShape-shape-array.patch} |  0
 ...by-multiplication-in-CubePointRange.patch} |  0
 ...ace-parts-by-size-in-CubePointRange.patch} |  0
 ...k-frozen-ticks-before-landing-block.patch} |  0
 ... => 0098-Faster-chunk-serialization.patch} |  0
 ...=> 0099-Update-boss-bar-within-tick.patch} |  0
 ...h => 0100-Cache-ominous-banner-item.patch} |  0
 ...d-generation-chunk-and-block-access.patch} |  0
 ...102-Cache-world-generator-sea-level.patch} |  0
 ...Skip-secondary-POI-sensor-if-absent.patch} |  0
 ...0104-Optimize-villager-data-storage.patch} |  0
 ...kip-entity-move-if-movement-is-zero.patch} |  0
 ...> 0106-Store-mob-counts-in-an-array.patch} |  0
 ...-Use-linked-map-for-entity-trackers.patch} |  0
 ...h => 0108-Optimize-noise-generation.patch} |  0
 ...0109-Optimize-sheep-offspring-color.patch} |  2 +-
 ...durability-change-equipment-updates.patch} |  2 +-
 ...es-on-entities-with-fire-resistance.patch} |  0
 ...2-Skip-cloning-advancement-criteria.patch} |  0
 ...lock-destruction-packet-allocations.patch} |  0
 ...ation-packets-only-for-living-entit.patch} |  2 +-
 ...-Spread-out-sending-all-player-info.patch} |  0
 ...player-list-for-sending-player-info.patch} |  0
 ...dSendEvent-if-there-are-no-listener.patch} |  0
 ...18-Send-multiple-keep-alive-packets.patch} |  0
 ...ake-slow-login-timeout-configurable.patch} |  0
 ...x-interaction-distance-configurable.patch} |  0
 ...nation-chunk-before-entity-teleport.patch} |  0
 ...Don-t-load-chunks-to-spawn-phantoms.patch} |  2 +-
 ...hunks-to-activate-climbing-entities.patch} |  2 +-
 ...imations-as-the-entity-being-critte.patch} |  0
 ...5-Ignore-null-legacy-structure-data.patch} |  0
 ...Don-t-double-save-stored-user-lists.patch} |  0
 ...necessary-mob-spawning-computations.patch} |  0
 ...random-strolling-into-non-ticking-c.patch} |  0
 ...er-in-world-if-kicked-before-being-.patch} |  0
 ... 0130-CraftBukkit-UUID-to-world-map.patch} |  0
 ...file.patch => 0131-Global-EULA-file.patch} |  0
 ...h => 0132-Specific-interval-TPS-API.patch} |  0
 ....patch => 0133-5-second-TPS-average.patch} |  0
 ...atch => 0134-Measure-last-tick-time.patch} |  0
 ...PI.patch => 0135-Last-tick-time-API.patch} |  0
 ...-Show-last-tick-time-in-tps-command.patch} |  0
 ...crease-time-statistics-in-intervals.patch} |  0
 ...eck-has-physics-before-same-vehicle.patch} |  0
 ...ible-planar-movement-multiplication.patch} |  0
 ...0140-Optimize-identical-item-checks.patch} |  0
 ... 0141-Reduce-RandomSource-instances.patch} |  0
 ...hread-priority-environment-variable.patch} |  0
 ...h => 0143-Thread-safety-annotations.patch} |  0
 ....patch => 0144-CPU-cores-estimation.patch} |  0
 ...tch => 0145-Virtual-threads-utility.patch} |  0
 ...patch => 0146-CheckableLock-utility.patch} |  0
 ...utility.patch => 0147-Mutex-utility.patch} |  0
 ...h => 0148-Thread-aware-lock-utility.patch} |  0
 ... 0149-Unterminable-executor-utility.patch} |  0
 ... 0150-FIFO-concurrent-queue-utility.patch} |  0
 ...pool.patch => 0151-Base-thread-pool.patch} |  0
 ...152-Watch-for-blocking-base-threads.patch} | 14 +++++------
 ... => 0153-Non-blocking-PooledObjects.patch} |  0
 ... => 0154-Yielding-memoized-Supplier.patch} |  0
 ...=> 0155-Yielding-ChunkHolderManager.patch} |  0
 ...-executor-tasks-on-base-thread-pool.patch} |  0
 ...-executor-tasks-on-base-thread-pool.patch} |  0
 ...d-upgrade-tasks-on-base-thread-pool.patch} |  0
 ...ompletion-tasks-on-base-thread-pool.patch} |  0
 ...xt-filter-tasks-on-base-thread-pool.patch} |  0
 ...n-cleaner-tasks-on-base-thread-pool.patch} |  0
 ...unk-cache-tasks-on-base-thread-pool.patch} |  0
 ...ead-chunk-tasks-on-base-thread-pool.patch} |  0
 ...tisedQueueExecutorThread-agent-util.patch} |  0
 ...nk-worker-tasks-on-base-thread-pool.patch} |  0
 ...teps.patch => 0166-Split-tick-steps.patch} |  0
 ...patch => 0167-Multithreaded-ticking.patch} |  0
 ...=> 0168-Yielding-ChunkTaskScheduler.patch} |  0
 166 files changed, 29 insertions(+), 52 deletions(-)
 delete mode 100644 patches/server/0004-Modify-JVM-args-for-development-runs.patch
 rename patches/server/{0005-Use-default-Java-installation-for-development-runs.patch => 0004-Use-default-Java-installation-for-development-runs.patch} (91%)
 rename patches/server/{0006-Enable-virtual-threads-for-development-runs.patch => 0005-Enable-virtual-threads-for-development-runs.patch} (53%)
 rename patches/server/{0007-Gale-branding-changes.patch => 0006-Gale-branding-changes.patch} (99%)
 rename patches/server/{0008-Gale-metrics.patch => 0007-Gale-metrics.patch} (100%)
 rename patches/server/{0009-Gale-configuration.patch => 0008-Gale-configuration.patch} (100%)
 rename patches/server/{0010-Set-Gale-permissions-root.patch => 0009-Set-Gale-permissions-root.patch} (100%)
 rename patches/server/{0011-Gale-commands.patch => 0010-Gale-commands.patch} (100%)
 rename patches/server/{0012-Include-time-in-startup-logs.patch => 0011-Include-time-in-startup-logs.patch} (100%)
 rename patches/server/{0013-Include-server.properties-in-timings.patch => 0012-Include-server.properties-in-timings.patch} (100%)
 rename patches/server/{0014-Include-hardware-specs-in-timings.patch => 0013-Include-hardware-specs-in-timings.patch} (100%)
 rename patches/server/{0015-Use-timin.gs-by-default.patch => 0014-Use-timin.gs-by-default.patch} (100%)
 rename patches/server/{0016-Recommend-disabling-timings-on-startup.patch => 0015-Recommend-disabling-timings-on-startup.patch} (100%)
 rename patches/server/{0017-Make-timings-calls-final.patch => 0016-Make-timings-calls-final.patch} (100%)
 rename patches/server/{0018-Remove-vanilla-profiler.patch => 0017-Remove-vanilla-profiler.patch} (100%)
 rename patches/server/{0019-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch => 0018-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch} (100%)
 rename patches/server/{0020-Simpler-ShapelessRecipe-comparison-for-vanilla.patch => 0019-Simpler-ShapelessRecipe-comparison-for-vanilla.patch} (100%)
 rename patches/server/{0021-Reduce-projectile-chunk-loading.patch => 0020-Reduce-projectile-chunk-loading.patch} (100%)
 rename patches/server/{0022-Predict-Halloween.patch => 0021-Predict-Halloween.patch} (100%)
 rename patches/server/{0023-Move-random-tick-random.patch => 0022-Move-random-tick-random.patch} (100%)
 rename patches/server/{0024-Optimize-random-calls-in-chunk-ticking.patch => 0023-Optimize-random-calls-in-chunk-ticking.patch} (100%)
 rename patches/server/{0025-Reduce-enderman-teleport-chunk-lookups.patch => 0024-Reduce-enderman-teleport-chunk-lookups.patch} (100%)
 rename patches/server/{0026-Reduce-acquire-POI-for-stuck-entities.patch => 0025-Reduce-acquire-POI-for-stuck-entities.patch} (100%)
 rename patches/server/{0027-Remove-iterators-from-Inventory-contains.patch => 0026-Remove-iterators-from-Inventory-contains.patch} (100%)
 rename patches/server/{0028-Check-targeting-range-before-getting-visibility.patch => 0027-Check-targeting-range-before-getting-visibility.patch} (100%)
 rename patches/server/{0029-Print-stack-trace-for-plugins-not-shutting-down-task.patch => 0028-Print-stack-trace-for-plugins-not-shutting-down-task.patch} (100%)
 rename patches/server/{0030-Improve-fluid-direction-caching.patch => 0029-Improve-fluid-direction-caching.patch} (100%)
 rename patches/server/{0031-Cache-on-climbable-check.patch => 0030-Cache-on-climbable-check.patch} (100%)
 rename patches/server/{0032-Use-array-for-gamerule-storage.patch => 0031-Use-array-for-gamerule-storage.patch} (100%)
 rename patches/server/{0033-Make-EntityCollisionContext-a-live-representation.patch => 0032-Make-EntityCollisionContext-a-live-representation.patch} (100%)
 rename patches/server/{0034-Improve-container-checking-with-a-bitset.patch => 0033-Improve-container-checking-with-a-bitset.patch} (100%)
 rename patches/server/{0035-Better-checking-for-useless-move-packets.patch => 0034-Better-checking-for-useless-move-packets.patch} (100%)
 rename patches/server/{0036-Use-fast-item-merge-raytracing.patch => 0035-Use-fast-item-merge-raytracing.patch} (100%)
 rename patches/server/{0037-Use-aging-cache-for-biome-temperatures.patch => 0036-Use-aging-cache-for-biome-temperatures.patch} (100%)
 rename patches/server/{0038-Inline-level-height.patch => 0037-Inline-level-height.patch} (100%)
 rename patches/server/{0039-Use-ThreadUnsafeRandom-for-mob-spawning.patch => 0038-Use-ThreadUnsafeRandom-for-mob-spawning.patch} (100%)
 rename patches/server/{0040-Remove-streams-and-iterators-from-range-check.patch => 0039-Remove-streams-and-iterators-from-range-check.patch} (100%)
 rename patches/server/{0041-Remove-streams-from-getting-nearby-players.patch => 0040-Remove-streams-from-getting-nearby-players.patch} (100%)
 rename patches/server/{0042-Skip-cloning-loot-parameters.patch => 0041-Skip-cloning-loot-parameters.patch} (100%)
 rename patches/server/{0043-Block-goal-does-not-load-chunks.patch => 0042-Block-goal-does-not-load-chunks.patch} (100%)
 rename patches/server/{0044-Reduce-entity-allocations.patch => 0043-Reduce-entity-allocations.patch} (100%)
 rename patches/server/{0045-Remove-lambda-from-ticking-guard.patch => 0044-Remove-lambda-from-ticking-guard.patch} (100%)
 rename patches/server/{0046-Reduce-entity-fluid-lookups-if-no-fluids.patch => 0045-Reduce-entity-fluid-lookups-if-no-fluids.patch} (100%)
 rename patches/server/{0047-SIMD-support.patch => 0046-SIMD-support.patch} (90%)
 rename patches/server/{0048-Make-book-writing-configurable.patch => 0047-Make-book-writing-configurable.patch} (100%)
 rename patches/server/{0049-Optimize-entity-coordinate-key.patch => 0048-Optimize-entity-coordinate-key.patch} (100%)
 rename patches/server/{0050-Reduce-in-wall-checks.patch => 0049-Reduce-in-wall-checks.patch} (100%)
 rename patches/server/{0051-Make-chat-order-verification-configurable.patch => 0050-Make-chat-order-verification-configurable.patch} (100%)
 rename patches/server/{0052-Make-saving-fireworks-configurable.patch => 0051-Make-saving-fireworks-configurable.patch} (100%)
 rename patches/server/{0053-Don-t-trigger-lootable-refresh-for-non-player-intera.patch => 0052-Don-t-trigger-lootable-refresh-for-non-player-intera.patch} (100%)
 rename patches/server/{0054-Reduce-hopper-item-checks.patch => 0053-Reduce-hopper-item-checks.patch} (100%)
 rename patches/server/{0055-Reduce-villager-item-re-pickup.patch => 0054-Reduce-villager-item-re-pickup.patch} (100%)
 rename patches/server/{0056-Variable-entity-wake-up-duration.patch => 0055-Variable-entity-wake-up-duration.patch} (100%)
 rename patches/server/{0057-Do-not-process-chat-commands-before-player-has-joine.patch => 0056-Do-not-process-chat-commands-before-player-has-joine.patch} (100%)
 rename patches/server/{0058-Do-not-log-invalid-statistics.patch => 0057-Do-not-log-invalid-statistics.patch} (100%)
 rename patches/server/{0059-Do-not-log-empty-message-warnings.patch => 0058-Do-not-log-empty-message-warnings.patch} (100%)
 rename patches/server/{0060-Do-not-log-ignored-advancements.patch => 0059-Do-not-log-ignored-advancements.patch} (100%)
 rename patches/server/{0061-Do-not-log-setBlock-in-far-chunks.patch => 0060-Do-not-log-setBlock-in-far-chunks.patch} (100%)
 rename patches/server/{0062-Do-not-log-unrecognized-recipes.patch => 0061-Do-not-log-unrecognized-recipes.patch} (100%)
 rename patches/server/{0063-Do-not-log-legacy-Material-initialization.patch => 0062-Do-not-log-legacy-Material-initialization.patch} (100%)
 rename patches/server/{0064-Do-not-log-expired-message-warnings.patch => 0063-Do-not-log-expired-message-warnings.patch} (100%)
 rename patches/server/{0065-Do-not-log-out-of-order-message-warnings.patch => 0064-Do-not-log-out-of-order-message-warnings.patch} (100%)
 rename patches/server/{0066-Do-not-log-Not-Secure-marker.patch => 0065-Do-not-log-Not-Secure-marker.patch} (100%)
 rename patches/server/{0067-Do-not-log-run-as-root-warning.patch => 0066-Do-not-log-run-as-root-warning.patch} (100%)
 rename patches/server/{0068-Do-not-log-offline-mode-warning.patch => 0067-Do-not-log-offline-mode-warning.patch} (100%)
 rename patches/server/{0069-Softly-log-invalid-pool-element-errors.patch => 0068-Softly-log-invalid-pool-element-errors.patch} (100%)
 rename patches/server/{0070-Fix-legacy-colors-in-console.patch => 0069-Fix-legacy-colors-in-console.patch} (100%)
 rename patches/server/{0071-Fix-outdated-server-showing-in-ping-before-server-fu.patch => 0070-Fix-outdated-server-showing-in-ping-before-server-fu.patch} (100%)
 rename patches/server/{0072-Make-sand-duping-fix-configurable.patch => 0071-Make-sand-duping-fix-configurable.patch} (100%)
 rename patches/server/{0073-Fix-MC-238526.patch => 0072-Fix-MC-238526.patch} (100%)
 rename patches/server/{0074-Fix-MC-123848.patch => 0073-Fix-MC-123848.patch} (100%)
 rename patches/server/{0075-Fix-cow-rotation-when-shearing-mooshroom.patch => 0074-Fix-cow-rotation-when-shearing-mooshroom.patch} (100%)
 rename patches/server/{0076-Fix-MC-121706.patch => 0075-Fix-MC-121706.patch} (100%)
 rename patches/server/{0077-Fix-MC-110386.patch => 0076-Fix-MC-110386.patch} (100%)
 rename patches/server/{0078-Fix-MC-31819.patch => 0077-Fix-MC-31819.patch} (100%)
 rename patches/server/{0079-Fix-MC-26304.patch => 0078-Fix-MC-26304.patch} (100%)
 rename patches/server/{0080-End-gateway-should-check-if-entity-can-use-portal.patch => 0079-End-gateway-should-check-if-entity-can-use-portal.patch} (100%)
 rename patches/server/{0081-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch => 0080-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch} (100%)
 rename patches/server/{0082-Make-arrow-movement-resetting-despawn-counter-config.patch => 0081-Make-arrow-movement-resetting-despawn-counter-config.patch} (100%)
 rename patches/server/{0083-Make-logging-login-locations-configurable.patch => 0082-Make-logging-login-locations-configurable.patch} (100%)
 rename patches/server/{0084-Reduce-array-allocations.patch => 0083-Reduce-array-allocations.patch} (100%)
 rename patches/server/{0085-Optimize-sun-burn-tick.patch => 0084-Optimize-sun-burn-tick.patch} (100%)
 rename patches/server/{0086-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch => 0085-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch} (100%)
 rename patches/server/{0087-Replace-AI-goal-set-with-optimized-collection.patch => 0086-Replace-AI-goal-set-with-optimized-collection.patch} (100%)
 rename patches/server/{0088-Replace-game-rules-map-with-optimized-collection.patch => 0087-Replace-game-rules-map-with-optimized-collection.patch} (100%)
 rename patches/server/{0089-Replace-AI-attributes-with-optimized-collections.patch => 0088-Replace-AI-attributes-with-optimized-collections.patch} (100%)
 rename patches/server/{0090-Replace-class-map-with-optimized-collection.patch => 0089-Replace-class-map-with-optimized-collection.patch} (100%)
 rename patches/server/{0091-Replace-throttle-tracker-map-with-optimized-collecti.patch => 0090-Replace-throttle-tracker-map-with-optimized-collecti.patch} (100%)
 rename patches/server/{0092-Replace-shape-full-block-cache-with-hashtable.patch => 0091-Replace-shape-full-block-cache-with-hashtable.patch} (100%)
 rename patches/server/{0093-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch => 0092-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch} (100%)
 rename patches/server/{0094-Cache-BlockStatePairKey-hash.patch => 0093-Cache-BlockStatePairKey-hash.patch} (100%)
 rename patches/server/{0095-Cache-CubeVoxelShape-shape-array.patch => 0094-Cache-CubeVoxelShape-shape-array.patch} (100%)
 rename patches/server/{0096-Replace-division-by-multiplication-in-CubePointRange.patch => 0095-Replace-division-by-multiplication-in-CubePointRange.patch} (100%)
 rename patches/server/{0097-Replace-parts-by-size-in-CubePointRange.patch => 0096-Replace-parts-by-size-in-CubePointRange.patch} (100%)
 rename patches/server/{0098-Check-frozen-ticks-before-landing-block.patch => 0097-Check-frozen-ticks-before-landing-block.patch} (100%)
 rename patches/server/{0099-Faster-chunk-serialization.patch => 0098-Faster-chunk-serialization.patch} (100%)
 rename patches/server/{0100-Update-boss-bar-within-tick.patch => 0099-Update-boss-bar-within-tick.patch} (100%)
 rename patches/server/{0101-Cache-ominous-banner-item.patch => 0100-Cache-ominous-banner-item.patch} (100%)
 rename patches/server/{0102-Optimize-world-generation-chunk-and-block-access.patch => 0101-Optimize-world-generation-chunk-and-block-access.patch} (100%)
 rename patches/server/{0103-Cache-world-generator-sea-level.patch => 0102-Cache-world-generator-sea-level.patch} (100%)
 rename patches/server/{0104-Skip-secondary-POI-sensor-if-absent.patch => 0103-Skip-secondary-POI-sensor-if-absent.patch} (100%)
 rename patches/server/{0105-Optimize-villager-data-storage.patch => 0104-Optimize-villager-data-storage.patch} (100%)
 rename patches/server/{0106-Skip-entity-move-if-movement-is-zero.patch => 0105-Skip-entity-move-if-movement-is-zero.patch} (100%)
 rename patches/server/{0107-Store-mob-counts-in-an-array.patch => 0106-Store-mob-counts-in-an-array.patch} (100%)
 rename patches/server/{0108-Use-linked-map-for-entity-trackers.patch => 0107-Use-linked-map-for-entity-trackers.patch} (100%)
 rename patches/server/{0109-Optimize-noise-generation.patch => 0108-Optimize-noise-generation.patch} (100%)
 rename patches/server/{0110-Optimize-sheep-offspring-color.patch => 0109-Optimize-sheep-offspring-color.patch} (98%)
 rename patches/server/{0111-Ignore-durability-change-equipment-updates.patch => 0110-Ignore-durability-change-equipment-updates.patch} (97%)
 rename patches/server/{0112-Hide-flames-on-entities-with-fire-resistance.patch => 0111-Hide-flames-on-entities-with-fire-resistance.patch} (100%)
 rename patches/server/{0113-Skip-cloning-advancement-criteria.patch => 0112-Skip-cloning-advancement-criteria.patch} (100%)
 rename patches/server/{0114-Reduce-block-destruction-packet-allocations.patch => 0113-Reduce-block-destruction-packet-allocations.patch} (100%)
 rename patches/server/{0115-Send-set-head-rotation-packets-only-for-living-entit.patch => 0114-Send-set-head-rotation-packets-only-for-living-entit.patch} (96%)
 rename patches/server/{0116-Spread-out-sending-all-player-info.patch => 0115-Spread-out-sending-all-player-info.patch} (100%)
 rename patches/server/{0117-Optimize-player-list-for-sending-player-info.patch => 0116-Optimize-player-list-for-sending-player-info.patch} (100%)
 rename patches/server/{0118-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch => 0117-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch} (100%)
 rename patches/server/{0119-Send-multiple-keep-alive-packets.patch => 0118-Send-multiple-keep-alive-packets.patch} (100%)
 rename patches/server/{0120-Make-slow-login-timeout-configurable.patch => 0119-Make-slow-login-timeout-configurable.patch} (100%)
 rename patches/server/{0121-Make-max-interaction-distance-configurable.patch => 0120-Make-max-interaction-distance-configurable.patch} (100%)
 rename patches/server/{0122-Load-portal-destination-chunk-before-entity-teleport.patch => 0121-Load-portal-destination-chunk-before-entity-teleport.patch} (100%)
 rename patches/server/{0123-Don-t-load-chunks-to-spawn-phantoms.patch => 0122-Don-t-load-chunks-to-spawn-phantoms.patch} (97%)
 rename patches/server/{0124-Don-t-load-chunks-to-activate-climbing-entities.patch => 0123-Don-t-load-chunks-to-activate-climbing-entities.patch} (98%)
 rename patches/server/{0125-Broadcast-crit-animations-as-the-entity-being-critte.patch => 0124-Broadcast-crit-animations-as-the-entity-being-critte.patch} (100%)
 rename patches/server/{0126-Ignore-null-legacy-structure-data.patch => 0125-Ignore-null-legacy-structure-data.patch} (100%)
 rename patches/server/{0127-Don-t-double-save-stored-user-lists.patch => 0126-Don-t-double-save-stored-user-lists.patch} (100%)
 rename patches/server/{0128-Skip-unnecessary-mob-spawning-computations.patch => 0127-Skip-unnecessary-mob-spawning-computations.patch} (100%)
 rename patches/server/{0129-Prevent-entities-random-strolling-into-non-ticking-c.patch => 0128-Prevent-entities-random-strolling-into-non-ticking-c.patch} (100%)
 rename patches/server/{0130-Do-not-place-player-in-world-if-kicked-before-being-.patch => 0129-Do-not-place-player-in-world-if-kicked-before-being-.patch} (100%)
 rename patches/server/{0131-CraftBukkit-UUID-to-world-map.patch => 0130-CraftBukkit-UUID-to-world-map.patch} (100%)
 rename patches/server/{0132-Global-EULA-file.patch => 0131-Global-EULA-file.patch} (100%)
 rename patches/server/{0133-Specific-interval-TPS-API.patch => 0132-Specific-interval-TPS-API.patch} (100%)
 rename patches/server/{0134-5-second-TPS-average.patch => 0133-5-second-TPS-average.patch} (100%)
 rename patches/server/{0135-Measure-last-tick-time.patch => 0134-Measure-last-tick-time.patch} (100%)
 rename patches/server/{0136-Last-tick-time-API.patch => 0135-Last-tick-time-API.patch} (100%)
 rename patches/server/{0137-Show-last-tick-time-in-tps-command.patch => 0136-Show-last-tick-time-in-tps-command.patch} (100%)
 rename patches/server/{0138-Increase-time-statistics-in-intervals.patch => 0137-Increase-time-statistics-in-intervals.patch} (100%)
 rename patches/server/{0139-For-collision-check-has-physics-before-same-vehicle.patch => 0138-For-collision-check-has-physics-before-same-vehicle.patch} (100%)
 rename patches/server/{0140-Skip-negligible-planar-movement-multiplication.patch => 0139-Skip-negligible-planar-movement-multiplication.patch} (100%)
 rename patches/server/{0141-Optimize-identical-item-checks.patch => 0140-Optimize-identical-item-checks.patch} (100%)
 rename patches/server/{0142-Reduce-RandomSource-instances.patch => 0141-Reduce-RandomSource-instances.patch} (100%)
 rename patches/server/{0143-Server-thread-priority-environment-variable.patch => 0142-Server-thread-priority-environment-variable.patch} (100%)
 rename patches/server/{0144-Thread-safety-annotations.patch => 0143-Thread-safety-annotations.patch} (100%)
 rename patches/server/{0145-CPU-cores-estimation.patch => 0144-CPU-cores-estimation.patch} (100%)
 rename patches/server/{0146-Virtual-threads-utility.patch => 0145-Virtual-threads-utility.patch} (100%)
 rename patches/server/{0147-CheckableLock-utility.patch => 0146-CheckableLock-utility.patch} (100%)
 rename patches/server/{0148-Mutex-utility.patch => 0147-Mutex-utility.patch} (100%)
 rename patches/server/{0149-Thread-aware-lock-utility.patch => 0148-Thread-aware-lock-utility.patch} (100%)
 rename patches/server/{0150-Unterminable-executor-utility.patch => 0149-Unterminable-executor-utility.patch} (100%)
 rename patches/server/{0151-FIFO-concurrent-queue-utility.patch => 0150-FIFO-concurrent-queue-utility.patch} (100%)
 rename patches/server/{0152-Base-thread-pool.patch => 0151-Base-thread-pool.patch} (100%)
 rename patches/server/{0153-Watch-for-blocking-base-threads.patch => 0152-Watch-for-blocking-base-threads.patch} (91%)
 rename patches/server/{0154-Non-blocking-PooledObjects.patch => 0153-Non-blocking-PooledObjects.patch} (100%)
 rename patches/server/{0155-Yielding-memoized-Supplier.patch => 0154-Yielding-memoized-Supplier.patch} (100%)
 rename patches/server/{0156-Yielding-ChunkHolderManager.patch => 0155-Yielding-ChunkHolderManager.patch} (100%)
 rename patches/server/{0157-Run-async-executor-tasks-on-base-thread-pool.patch => 0156-Run-async-executor-tasks-on-base-thread-pool.patch} (100%)
 rename patches/server/{0158-Run-background-executor-tasks-on-base-thread-pool.patch => 0157-Run-background-executor-tasks-on-base-thread-pool.patch} (100%)
 rename patches/server/{0159-Run-world-upgrade-tasks-on-base-thread-pool.patch => 0158-Run-world-upgrade-tasks-on-base-thread-pool.patch} (100%)
 rename patches/server/{0160-Run-tab-completion-tasks-on-base-thread-pool.patch => 0159-Run-tab-completion-tasks-on-base-thread-pool.patch} (100%)
 rename patches/server/{0161-Run-text-filter-tasks-on-base-thread-pool.patch => 0160-Run-text-filter-tasks-on-base-thread-pool.patch} (100%)
 rename patches/server/{0162-Run-cleaner-tasks-on-base-thread-pool.patch => 0161-Run-cleaner-tasks-on-base-thread-pool.patch} (100%)
 rename patches/server/{0163-Run-chunk-cache-tasks-on-base-thread-pool.patch => 0162-Run-chunk-cache-tasks-on-base-thread-pool.patch} (100%)
 rename patches/server/{0164-Run-TickThread-chunk-tasks-on-base-thread-pool.patch => 0163-Run-TickThread-chunk-tasks-on-base-thread-pool.patch} (100%)
 rename patches/server/{0165-BaseThread-PrioritisedQueueExecutorThread-agent-util.patch => 0164-BaseThread-PrioritisedQueueExecutorThread-agent-util.patch} (100%)
 rename patches/server/{0166-Run-chunk-worker-tasks-on-base-thread-pool.patch => 0165-Run-chunk-worker-tasks-on-base-thread-pool.patch} (100%)
 rename patches/server/{0167-Split-tick-steps.patch => 0166-Split-tick-steps.patch} (100%)
 rename patches/server/{0168-Multithreaded-ticking.patch => 0167-Multithreaded-ticking.patch} (100%)
 rename patches/server/{0169-Yielding-ChunkTaskScheduler.patch => 0168-Yielding-ChunkTaskScheduler.patch} (100%)

diff --git a/patches/server/0004-Modify-JVM-args-for-development-runs.patch b/patches/server/0004-Modify-JVM-args-for-development-runs.patch
deleted file mode 100644
index 57664d8..0000000
--- a/patches/server/0004-Modify-JVM-args-for-development-runs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Martijn Muijsers <martijnmuijsers@live.nl>
-Date: Tue, 21 Mar 2023 17:45:34 +0100
-Subject: [PATCH] Modify JVM args for development runs
-
-License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
-Gale - https://galemc.org
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index 0b3f1508c2d461a11cf26e9e298e15e3650daccf..9c65dd95153ffa1f2ffafb52b28c0912bbc46766 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -173,6 +173,10 @@ fun TaskContainer.registerRunTask(
-     val memoryGb = providers.gradleProperty("paper.runMemoryGb").getOrElse("2")
-     minHeapSize = "${memoryGb}G"
-     maxHeapSize = "${memoryGb}G"
-+    // Gale start - modify JVM args for development runs
-+    val modifiedJvmArgs = ArrayList(jvmArgs) ?: arrayListOf()
-+    jvmArgs = modifiedJvmArgs
-+    // Gale end - modify JVM args for development runs
- 
-     doFirst {
-         workingDir.mkdirs()
diff --git a/patches/server/0005-Use-default-Java-installation-for-development-runs.patch b/patches/server/0004-Use-default-Java-installation-for-development-runs.patch
similarity index 91%
rename from patches/server/0005-Use-default-Java-installation-for-development-runs.patch
rename to patches/server/0004-Use-default-Java-installation-for-development-runs.patch
index 80be305..9fa80dc 100644
--- a/patches/server/0005-Use-default-Java-installation-for-development-runs.patch
+++ b/patches/server/0004-Use-default-Java-installation-for-development-runs.patch
@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 9c65dd95153ffa1f2ffafb52b28c0912bbc46766..ed232200841977a988814849e4068315710cbe0a 100644
+index 0b3f1508c2d461a11cf26e9e298e15e3650daccf..1f7d0aa2d36b59c23a04e94dc117da987bc1a0b2 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -150,6 +150,15 @@ fun TaskContainer.registerRunTask(
diff --git a/patches/server/0006-Enable-virtual-threads-for-development-runs.patch b/patches/server/0005-Enable-virtual-threads-for-development-runs.patch
similarity index 53%
rename from patches/server/0006-Enable-virtual-threads-for-development-runs.patch
rename to patches/server/0005-Enable-virtual-threads-for-development-runs.patch
index 523f0a2..c615c1e 100644
--- a/patches/server/0006-Enable-virtual-threads-for-development-runs.patch
+++ b/patches/server/0005-Enable-virtual-threads-for-development-runs.patch
@@ -7,17 +7,17 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index ed232200841977a988814849e4068315710cbe0a..0b4f6466a01fe114a265068c2b4664d5ad4d71e6 100644
+index 1f7d0aa2d36b59c23a04e94dc117da987bc1a0b2..6394d18f32d190e4eee34c40c1aa9ffe65662e6b 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -184,6 +184,10 @@ fun TaskContainer.registerRunTask(
+@@ -182,6 +182,10 @@ fun TaskContainer.registerRunTask(
+     val memoryGb = providers.gradleProperty("paper.runMemoryGb").getOrElse("2")
+     minHeapSize = "${memoryGb}G"
      maxHeapSize = "${memoryGb}G"
-     // Gale start - modify JVM args for development runs
-     val modifiedJvmArgs = ArrayList(jvmArgs) ?: arrayListOf()
 +    // Gale start - enable virtual threads for development runs
-+    modifiedJvmArgs.add("--enable-preview")
-+    modifiedJvmArgs.addAll(listOf("--add-opens=java.base/java.lang=ALL-UNNAMED"))
++    jvmArgs("--enable-preview")
++    jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
 +    // Gale end - enable virtual threads for development runs
-     jvmArgs = modifiedJvmArgs
-     // Gale end - modify JVM args for development runs
  
+     doFirst {
+         workingDir.mkdirs()
diff --git a/patches/server/0007-Gale-branding-changes.patch b/patches/server/0006-Gale-branding-changes.patch
similarity index 99%
rename from patches/server/0007-Gale-branding-changes.patch
rename to patches/server/0006-Gale-branding-changes.patch
index 518bf3f..a744186 100644
--- a/patches/server/0007-Gale-branding-changes.patch
+++ b/patches/server/0006-Gale-branding-changes.patch
@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 0b4f6466a01fe114a265068c2b4664d5ad4d71e6..e71c29541c2ceaf49a256f2648ac15cf832bb629 100644
+index 6394d18f32d190e4eee34c40c1aa9ffe65662e6b..7d3b8f3c7616b5db72a6fccb51e5543a0e096125 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -78,7 +78,7 @@ tasks.jar {
diff --git a/patches/server/0008-Gale-metrics.patch b/patches/server/0007-Gale-metrics.patch
similarity index 100%
rename from patches/server/0008-Gale-metrics.patch
rename to patches/server/0007-Gale-metrics.patch
diff --git a/patches/server/0009-Gale-configuration.patch b/patches/server/0008-Gale-configuration.patch
similarity index 100%
rename from patches/server/0009-Gale-configuration.patch
rename to patches/server/0008-Gale-configuration.patch
diff --git a/patches/server/0010-Set-Gale-permissions-root.patch b/patches/server/0009-Set-Gale-permissions-root.patch
similarity index 100%
rename from patches/server/0010-Set-Gale-permissions-root.patch
rename to patches/server/0009-Set-Gale-permissions-root.patch
diff --git a/patches/server/0011-Gale-commands.patch b/patches/server/0010-Gale-commands.patch
similarity index 100%
rename from patches/server/0011-Gale-commands.patch
rename to patches/server/0010-Gale-commands.patch
diff --git a/patches/server/0012-Include-time-in-startup-logs.patch b/patches/server/0011-Include-time-in-startup-logs.patch
similarity index 100%
rename from patches/server/0012-Include-time-in-startup-logs.patch
rename to patches/server/0011-Include-time-in-startup-logs.patch
diff --git a/patches/server/0013-Include-server.properties-in-timings.patch b/patches/server/0012-Include-server.properties-in-timings.patch
similarity index 100%
rename from patches/server/0013-Include-server.properties-in-timings.patch
rename to patches/server/0012-Include-server.properties-in-timings.patch
diff --git a/patches/server/0014-Include-hardware-specs-in-timings.patch b/patches/server/0013-Include-hardware-specs-in-timings.patch
similarity index 100%
rename from patches/server/0014-Include-hardware-specs-in-timings.patch
rename to patches/server/0013-Include-hardware-specs-in-timings.patch
diff --git a/patches/server/0015-Use-timin.gs-by-default.patch b/patches/server/0014-Use-timin.gs-by-default.patch
similarity index 100%
rename from patches/server/0015-Use-timin.gs-by-default.patch
rename to patches/server/0014-Use-timin.gs-by-default.patch
diff --git a/patches/server/0016-Recommend-disabling-timings-on-startup.patch b/patches/server/0015-Recommend-disabling-timings-on-startup.patch
similarity index 100%
rename from patches/server/0016-Recommend-disabling-timings-on-startup.patch
rename to patches/server/0015-Recommend-disabling-timings-on-startup.patch
diff --git a/patches/server/0017-Make-timings-calls-final.patch b/patches/server/0016-Make-timings-calls-final.patch
similarity index 100%
rename from patches/server/0017-Make-timings-calls-final.patch
rename to patches/server/0016-Make-timings-calls-final.patch
diff --git a/patches/server/0018-Remove-vanilla-profiler.patch b/patches/server/0017-Remove-vanilla-profiler.patch
similarity index 100%
rename from patches/server/0018-Remove-vanilla-profiler.patch
rename to patches/server/0017-Remove-vanilla-profiler.patch
diff --git a/patches/server/0019-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0018-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
similarity index 100%
rename from patches/server/0019-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
rename to patches/server/0018-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
diff --git a/patches/server/0020-Simpler-ShapelessRecipe-comparison-for-vanilla.patch b/patches/server/0019-Simpler-ShapelessRecipe-comparison-for-vanilla.patch
similarity index 100%
rename from patches/server/0020-Simpler-ShapelessRecipe-comparison-for-vanilla.patch
rename to patches/server/0019-Simpler-ShapelessRecipe-comparison-for-vanilla.patch
diff --git a/patches/server/0021-Reduce-projectile-chunk-loading.patch b/patches/server/0020-Reduce-projectile-chunk-loading.patch
similarity index 100%
rename from patches/server/0021-Reduce-projectile-chunk-loading.patch
rename to patches/server/0020-Reduce-projectile-chunk-loading.patch
diff --git a/patches/server/0022-Predict-Halloween.patch b/patches/server/0021-Predict-Halloween.patch
similarity index 100%
rename from patches/server/0022-Predict-Halloween.patch
rename to patches/server/0021-Predict-Halloween.patch
diff --git a/patches/server/0023-Move-random-tick-random.patch b/patches/server/0022-Move-random-tick-random.patch
similarity index 100%
rename from patches/server/0023-Move-random-tick-random.patch
rename to patches/server/0022-Move-random-tick-random.patch
diff --git a/patches/server/0024-Optimize-random-calls-in-chunk-ticking.patch b/patches/server/0023-Optimize-random-calls-in-chunk-ticking.patch
similarity index 100%
rename from patches/server/0024-Optimize-random-calls-in-chunk-ticking.patch
rename to patches/server/0023-Optimize-random-calls-in-chunk-ticking.patch
diff --git a/patches/server/0025-Reduce-enderman-teleport-chunk-lookups.patch b/patches/server/0024-Reduce-enderman-teleport-chunk-lookups.patch
similarity index 100%
rename from patches/server/0025-Reduce-enderman-teleport-chunk-lookups.patch
rename to patches/server/0024-Reduce-enderman-teleport-chunk-lookups.patch
diff --git a/patches/server/0026-Reduce-acquire-POI-for-stuck-entities.patch b/patches/server/0025-Reduce-acquire-POI-for-stuck-entities.patch
similarity index 100%
rename from patches/server/0026-Reduce-acquire-POI-for-stuck-entities.patch
rename to patches/server/0025-Reduce-acquire-POI-for-stuck-entities.patch
diff --git a/patches/server/0027-Remove-iterators-from-Inventory-contains.patch b/patches/server/0026-Remove-iterators-from-Inventory-contains.patch
similarity index 100%
rename from patches/server/0027-Remove-iterators-from-Inventory-contains.patch
rename to patches/server/0026-Remove-iterators-from-Inventory-contains.patch
diff --git a/patches/server/0028-Check-targeting-range-before-getting-visibility.patch b/patches/server/0027-Check-targeting-range-before-getting-visibility.patch
similarity index 100%
rename from patches/server/0028-Check-targeting-range-before-getting-visibility.patch
rename to patches/server/0027-Check-targeting-range-before-getting-visibility.patch
diff --git a/patches/server/0029-Print-stack-trace-for-plugins-not-shutting-down-task.patch b/patches/server/0028-Print-stack-trace-for-plugins-not-shutting-down-task.patch
similarity index 100%
rename from patches/server/0029-Print-stack-trace-for-plugins-not-shutting-down-task.patch
rename to patches/server/0028-Print-stack-trace-for-plugins-not-shutting-down-task.patch
diff --git a/patches/server/0030-Improve-fluid-direction-caching.patch b/patches/server/0029-Improve-fluid-direction-caching.patch
similarity index 100%
rename from patches/server/0030-Improve-fluid-direction-caching.patch
rename to patches/server/0029-Improve-fluid-direction-caching.patch
diff --git a/patches/server/0031-Cache-on-climbable-check.patch b/patches/server/0030-Cache-on-climbable-check.patch
similarity index 100%
rename from patches/server/0031-Cache-on-climbable-check.patch
rename to patches/server/0030-Cache-on-climbable-check.patch
diff --git a/patches/server/0032-Use-array-for-gamerule-storage.patch b/patches/server/0031-Use-array-for-gamerule-storage.patch
similarity index 100%
rename from patches/server/0032-Use-array-for-gamerule-storage.patch
rename to patches/server/0031-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0033-Make-EntityCollisionContext-a-live-representation.patch b/patches/server/0032-Make-EntityCollisionContext-a-live-representation.patch
similarity index 100%
rename from patches/server/0033-Make-EntityCollisionContext-a-live-representation.patch
rename to patches/server/0032-Make-EntityCollisionContext-a-live-representation.patch
diff --git a/patches/server/0034-Improve-container-checking-with-a-bitset.patch b/patches/server/0033-Improve-container-checking-with-a-bitset.patch
similarity index 100%
rename from patches/server/0034-Improve-container-checking-with-a-bitset.patch
rename to patches/server/0033-Improve-container-checking-with-a-bitset.patch
diff --git a/patches/server/0035-Better-checking-for-useless-move-packets.patch b/patches/server/0034-Better-checking-for-useless-move-packets.patch
similarity index 100%
rename from patches/server/0035-Better-checking-for-useless-move-packets.patch
rename to patches/server/0034-Better-checking-for-useless-move-packets.patch
diff --git a/patches/server/0036-Use-fast-item-merge-raytracing.patch b/patches/server/0035-Use-fast-item-merge-raytracing.patch
similarity index 100%
rename from patches/server/0036-Use-fast-item-merge-raytracing.patch
rename to patches/server/0035-Use-fast-item-merge-raytracing.patch
diff --git a/patches/server/0037-Use-aging-cache-for-biome-temperatures.patch b/patches/server/0036-Use-aging-cache-for-biome-temperatures.patch
similarity index 100%
rename from patches/server/0037-Use-aging-cache-for-biome-temperatures.patch
rename to patches/server/0036-Use-aging-cache-for-biome-temperatures.patch
diff --git a/patches/server/0038-Inline-level-height.patch b/patches/server/0037-Inline-level-height.patch
similarity index 100%
rename from patches/server/0038-Inline-level-height.patch
rename to patches/server/0037-Inline-level-height.patch
diff --git a/patches/server/0039-Use-ThreadUnsafeRandom-for-mob-spawning.patch b/patches/server/0038-Use-ThreadUnsafeRandom-for-mob-spawning.patch
similarity index 100%
rename from patches/server/0039-Use-ThreadUnsafeRandom-for-mob-spawning.patch
rename to patches/server/0038-Use-ThreadUnsafeRandom-for-mob-spawning.patch
diff --git a/patches/server/0040-Remove-streams-and-iterators-from-range-check.patch b/patches/server/0039-Remove-streams-and-iterators-from-range-check.patch
similarity index 100%
rename from patches/server/0040-Remove-streams-and-iterators-from-range-check.patch
rename to patches/server/0039-Remove-streams-and-iterators-from-range-check.patch
diff --git a/patches/server/0041-Remove-streams-from-getting-nearby-players.patch b/patches/server/0040-Remove-streams-from-getting-nearby-players.patch
similarity index 100%
rename from patches/server/0041-Remove-streams-from-getting-nearby-players.patch
rename to patches/server/0040-Remove-streams-from-getting-nearby-players.patch
diff --git a/patches/server/0042-Skip-cloning-loot-parameters.patch b/patches/server/0041-Skip-cloning-loot-parameters.patch
similarity index 100%
rename from patches/server/0042-Skip-cloning-loot-parameters.patch
rename to patches/server/0041-Skip-cloning-loot-parameters.patch
diff --git a/patches/server/0043-Block-goal-does-not-load-chunks.patch b/patches/server/0042-Block-goal-does-not-load-chunks.patch
similarity index 100%
rename from patches/server/0043-Block-goal-does-not-load-chunks.patch
rename to patches/server/0042-Block-goal-does-not-load-chunks.patch
diff --git a/patches/server/0044-Reduce-entity-allocations.patch b/patches/server/0043-Reduce-entity-allocations.patch
similarity index 100%
rename from patches/server/0044-Reduce-entity-allocations.patch
rename to patches/server/0043-Reduce-entity-allocations.patch
diff --git a/patches/server/0045-Remove-lambda-from-ticking-guard.patch b/patches/server/0044-Remove-lambda-from-ticking-guard.patch
similarity index 100%
rename from patches/server/0045-Remove-lambda-from-ticking-guard.patch
rename to patches/server/0044-Remove-lambda-from-ticking-guard.patch
diff --git a/patches/server/0046-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/server/0045-Reduce-entity-fluid-lookups-if-no-fluids.patch
similarity index 100%
rename from patches/server/0046-Reduce-entity-fluid-lookups-if-no-fluids.patch
rename to patches/server/0045-Reduce-entity-fluid-lookups-if-no-fluids.patch
diff --git a/patches/server/0047-SIMD-support.patch b/patches/server/0046-SIMD-support.patch
similarity index 90%
rename from patches/server/0047-SIMD-support.patch
rename to patches/server/0046-SIMD-support.patch
index 7062656..bb22d08 100644
--- a/patches/server/0047-SIMD-support.patch
+++ b/patches/server/0046-SIMD-support.patch
@@ -13,7 +13,7 @@ As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index e71c29541c2ceaf49a256f2648ac15cf832bb629..bee1ab6d6f0ce42ac98e9c47ee69f3ea1f874097 100644
+index 7d3b8f3c7616b5db72a6fccb51e5543a0e096125..394b5044090c1c7b00b30036e4b8be4a6ac58ed1 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -63,6 +63,7 @@ tasks.withType<JavaCompile> {
@@ -24,14 +24,14 @@ index e71c29541c2ceaf49a256f2648ac15cf832bb629..bee1ab6d6f0ce42ac98e9c47ee69f3ea
  }
  // Gale end - hide irrelevant compilation warnings
  
-@@ -188,6 +189,7 @@ fun TaskContainer.registerRunTask(
-     modifiedJvmArgs.add("--enable-preview")
-     modifiedJvmArgs.addAll(listOf("--add-opens=java.base/java.lang=ALL-UNNAMED"))
+@@ -186,6 +187,7 @@ fun TaskContainer.registerRunTask(
+     jvmArgs("--enable-preview")
+     jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
      // Gale end - enable virtual threads for development runs
-+    modifiedJvmArgs.add("--add-modules=jdk.incubator.vector") // Gale - Pufferfish - SIMD support
-     jvmArgs = modifiedJvmArgs
-     // Gale end - modify JVM args for development runs
++    jvmArgs("--add-modules=jdk.incubator.vector") // Gale - Pufferfish - SIMD support
  
+     doFirst {
+         workingDir.mkdirs()
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 index 985f1a50438b325e33fba5d07e26519171504aab..54458601bbda3a4142c09f717e3b87a079ce096f 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
diff --git a/patches/server/0048-Make-book-writing-configurable.patch b/patches/server/0047-Make-book-writing-configurable.patch
similarity index 100%
rename from patches/server/0048-Make-book-writing-configurable.patch
rename to patches/server/0047-Make-book-writing-configurable.patch
diff --git a/patches/server/0049-Optimize-entity-coordinate-key.patch b/patches/server/0048-Optimize-entity-coordinate-key.patch
similarity index 100%
rename from patches/server/0049-Optimize-entity-coordinate-key.patch
rename to patches/server/0048-Optimize-entity-coordinate-key.patch
diff --git a/patches/server/0050-Reduce-in-wall-checks.patch b/patches/server/0049-Reduce-in-wall-checks.patch
similarity index 100%
rename from patches/server/0050-Reduce-in-wall-checks.patch
rename to patches/server/0049-Reduce-in-wall-checks.patch
diff --git a/patches/server/0051-Make-chat-order-verification-configurable.patch b/patches/server/0050-Make-chat-order-verification-configurable.patch
similarity index 100%
rename from patches/server/0051-Make-chat-order-verification-configurable.patch
rename to patches/server/0050-Make-chat-order-verification-configurable.patch
diff --git a/patches/server/0052-Make-saving-fireworks-configurable.patch b/patches/server/0051-Make-saving-fireworks-configurable.patch
similarity index 100%
rename from patches/server/0052-Make-saving-fireworks-configurable.patch
rename to patches/server/0051-Make-saving-fireworks-configurable.patch
diff --git a/patches/server/0053-Don-t-trigger-lootable-refresh-for-non-player-intera.patch b/patches/server/0052-Don-t-trigger-lootable-refresh-for-non-player-intera.patch
similarity index 100%
rename from patches/server/0053-Don-t-trigger-lootable-refresh-for-non-player-intera.patch
rename to patches/server/0052-Don-t-trigger-lootable-refresh-for-non-player-intera.patch
diff --git a/patches/server/0054-Reduce-hopper-item-checks.patch b/patches/server/0053-Reduce-hopper-item-checks.patch
similarity index 100%
rename from patches/server/0054-Reduce-hopper-item-checks.patch
rename to patches/server/0053-Reduce-hopper-item-checks.patch
diff --git a/patches/server/0055-Reduce-villager-item-re-pickup.patch b/patches/server/0054-Reduce-villager-item-re-pickup.patch
similarity index 100%
rename from patches/server/0055-Reduce-villager-item-re-pickup.patch
rename to patches/server/0054-Reduce-villager-item-re-pickup.patch
diff --git a/patches/server/0056-Variable-entity-wake-up-duration.patch b/patches/server/0055-Variable-entity-wake-up-duration.patch
similarity index 100%
rename from patches/server/0056-Variable-entity-wake-up-duration.patch
rename to patches/server/0055-Variable-entity-wake-up-duration.patch
diff --git a/patches/server/0057-Do-not-process-chat-commands-before-player-has-joine.patch b/patches/server/0056-Do-not-process-chat-commands-before-player-has-joine.patch
similarity index 100%
rename from patches/server/0057-Do-not-process-chat-commands-before-player-has-joine.patch
rename to patches/server/0056-Do-not-process-chat-commands-before-player-has-joine.patch
diff --git a/patches/server/0058-Do-not-log-invalid-statistics.patch b/patches/server/0057-Do-not-log-invalid-statistics.patch
similarity index 100%
rename from patches/server/0058-Do-not-log-invalid-statistics.patch
rename to patches/server/0057-Do-not-log-invalid-statistics.patch
diff --git a/patches/server/0059-Do-not-log-empty-message-warnings.patch b/patches/server/0058-Do-not-log-empty-message-warnings.patch
similarity index 100%
rename from patches/server/0059-Do-not-log-empty-message-warnings.patch
rename to patches/server/0058-Do-not-log-empty-message-warnings.patch
diff --git a/patches/server/0060-Do-not-log-ignored-advancements.patch b/patches/server/0059-Do-not-log-ignored-advancements.patch
similarity index 100%
rename from patches/server/0060-Do-not-log-ignored-advancements.patch
rename to patches/server/0059-Do-not-log-ignored-advancements.patch
diff --git a/patches/server/0061-Do-not-log-setBlock-in-far-chunks.patch b/patches/server/0060-Do-not-log-setBlock-in-far-chunks.patch
similarity index 100%
rename from patches/server/0061-Do-not-log-setBlock-in-far-chunks.patch
rename to patches/server/0060-Do-not-log-setBlock-in-far-chunks.patch
diff --git a/patches/server/0062-Do-not-log-unrecognized-recipes.patch b/patches/server/0061-Do-not-log-unrecognized-recipes.patch
similarity index 100%
rename from patches/server/0062-Do-not-log-unrecognized-recipes.patch
rename to patches/server/0061-Do-not-log-unrecognized-recipes.patch
diff --git a/patches/server/0063-Do-not-log-legacy-Material-initialization.patch b/patches/server/0062-Do-not-log-legacy-Material-initialization.patch
similarity index 100%
rename from patches/server/0063-Do-not-log-legacy-Material-initialization.patch
rename to patches/server/0062-Do-not-log-legacy-Material-initialization.patch
diff --git a/patches/server/0064-Do-not-log-expired-message-warnings.patch b/patches/server/0063-Do-not-log-expired-message-warnings.patch
similarity index 100%
rename from patches/server/0064-Do-not-log-expired-message-warnings.patch
rename to patches/server/0063-Do-not-log-expired-message-warnings.patch
diff --git a/patches/server/0065-Do-not-log-out-of-order-message-warnings.patch b/patches/server/0064-Do-not-log-out-of-order-message-warnings.patch
similarity index 100%
rename from patches/server/0065-Do-not-log-out-of-order-message-warnings.patch
rename to patches/server/0064-Do-not-log-out-of-order-message-warnings.patch
diff --git a/patches/server/0066-Do-not-log-Not-Secure-marker.patch b/patches/server/0065-Do-not-log-Not-Secure-marker.patch
similarity index 100%
rename from patches/server/0066-Do-not-log-Not-Secure-marker.patch
rename to patches/server/0065-Do-not-log-Not-Secure-marker.patch
diff --git a/patches/server/0067-Do-not-log-run-as-root-warning.patch b/patches/server/0066-Do-not-log-run-as-root-warning.patch
similarity index 100%
rename from patches/server/0067-Do-not-log-run-as-root-warning.patch
rename to patches/server/0066-Do-not-log-run-as-root-warning.patch
diff --git a/patches/server/0068-Do-not-log-offline-mode-warning.patch b/patches/server/0067-Do-not-log-offline-mode-warning.patch
similarity index 100%
rename from patches/server/0068-Do-not-log-offline-mode-warning.patch
rename to patches/server/0067-Do-not-log-offline-mode-warning.patch
diff --git a/patches/server/0069-Softly-log-invalid-pool-element-errors.patch b/patches/server/0068-Softly-log-invalid-pool-element-errors.patch
similarity index 100%
rename from patches/server/0069-Softly-log-invalid-pool-element-errors.patch
rename to patches/server/0068-Softly-log-invalid-pool-element-errors.patch
diff --git a/patches/server/0070-Fix-legacy-colors-in-console.patch b/patches/server/0069-Fix-legacy-colors-in-console.patch
similarity index 100%
rename from patches/server/0070-Fix-legacy-colors-in-console.patch
rename to patches/server/0069-Fix-legacy-colors-in-console.patch
diff --git a/patches/server/0071-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0070-Fix-outdated-server-showing-in-ping-before-server-fu.patch
similarity index 100%
rename from patches/server/0071-Fix-outdated-server-showing-in-ping-before-server-fu.patch
rename to patches/server/0070-Fix-outdated-server-showing-in-ping-before-server-fu.patch
diff --git a/patches/server/0072-Make-sand-duping-fix-configurable.patch b/patches/server/0071-Make-sand-duping-fix-configurable.patch
similarity index 100%
rename from patches/server/0072-Make-sand-duping-fix-configurable.patch
rename to patches/server/0071-Make-sand-duping-fix-configurable.patch
diff --git a/patches/server/0073-Fix-MC-238526.patch b/patches/server/0072-Fix-MC-238526.patch
similarity index 100%
rename from patches/server/0073-Fix-MC-238526.patch
rename to patches/server/0072-Fix-MC-238526.patch
diff --git a/patches/server/0074-Fix-MC-123848.patch b/patches/server/0073-Fix-MC-123848.patch
similarity index 100%
rename from patches/server/0074-Fix-MC-123848.patch
rename to patches/server/0073-Fix-MC-123848.patch
diff --git a/patches/server/0075-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0074-Fix-cow-rotation-when-shearing-mooshroom.patch
similarity index 100%
rename from patches/server/0075-Fix-cow-rotation-when-shearing-mooshroom.patch
rename to patches/server/0074-Fix-cow-rotation-when-shearing-mooshroom.patch
diff --git a/patches/server/0076-Fix-MC-121706.patch b/patches/server/0075-Fix-MC-121706.patch
similarity index 100%
rename from patches/server/0076-Fix-MC-121706.patch
rename to patches/server/0075-Fix-MC-121706.patch
diff --git a/patches/server/0077-Fix-MC-110386.patch b/patches/server/0076-Fix-MC-110386.patch
similarity index 100%
rename from patches/server/0077-Fix-MC-110386.patch
rename to patches/server/0076-Fix-MC-110386.patch
diff --git a/patches/server/0078-Fix-MC-31819.patch b/patches/server/0077-Fix-MC-31819.patch
similarity index 100%
rename from patches/server/0078-Fix-MC-31819.patch
rename to patches/server/0077-Fix-MC-31819.patch
diff --git a/patches/server/0079-Fix-MC-26304.patch b/patches/server/0078-Fix-MC-26304.patch
similarity index 100%
rename from patches/server/0079-Fix-MC-26304.patch
rename to patches/server/0078-Fix-MC-26304.patch
diff --git a/patches/server/0080-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0079-End-gateway-should-check-if-entity-can-use-portal.patch
similarity index 100%
rename from patches/server/0080-End-gateway-should-check-if-entity-can-use-portal.patch
rename to patches/server/0079-End-gateway-should-check-if-entity-can-use-portal.patch
diff --git a/patches/server/0081-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch b/patches/server/0080-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch
similarity index 100%
rename from patches/server/0081-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch
rename to patches/server/0080-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch
diff --git a/patches/server/0082-Make-arrow-movement-resetting-despawn-counter-config.patch b/patches/server/0081-Make-arrow-movement-resetting-despawn-counter-config.patch
similarity index 100%
rename from patches/server/0082-Make-arrow-movement-resetting-despawn-counter-config.patch
rename to patches/server/0081-Make-arrow-movement-resetting-despawn-counter-config.patch
diff --git a/patches/server/0083-Make-logging-login-locations-configurable.patch b/patches/server/0082-Make-logging-login-locations-configurable.patch
similarity index 100%
rename from patches/server/0083-Make-logging-login-locations-configurable.patch
rename to patches/server/0082-Make-logging-login-locations-configurable.patch
diff --git a/patches/server/0084-Reduce-array-allocations.patch b/patches/server/0083-Reduce-array-allocations.patch
similarity index 100%
rename from patches/server/0084-Reduce-array-allocations.patch
rename to patches/server/0083-Reduce-array-allocations.patch
diff --git a/patches/server/0085-Optimize-sun-burn-tick.patch b/patches/server/0084-Optimize-sun-burn-tick.patch
similarity index 100%
rename from patches/server/0085-Optimize-sun-burn-tick.patch
rename to patches/server/0084-Optimize-sun-burn-tick.patch
diff --git a/patches/server/0086-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0085-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
similarity index 100%
rename from patches/server/0086-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
rename to patches/server/0085-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
diff --git a/patches/server/0087-Replace-AI-goal-set-with-optimized-collection.patch b/patches/server/0086-Replace-AI-goal-set-with-optimized-collection.patch
similarity index 100%
rename from patches/server/0087-Replace-AI-goal-set-with-optimized-collection.patch
rename to patches/server/0086-Replace-AI-goal-set-with-optimized-collection.patch
diff --git a/patches/server/0088-Replace-game-rules-map-with-optimized-collection.patch b/patches/server/0087-Replace-game-rules-map-with-optimized-collection.patch
similarity index 100%
rename from patches/server/0088-Replace-game-rules-map-with-optimized-collection.patch
rename to patches/server/0087-Replace-game-rules-map-with-optimized-collection.patch
diff --git a/patches/server/0089-Replace-AI-attributes-with-optimized-collections.patch b/patches/server/0088-Replace-AI-attributes-with-optimized-collections.patch
similarity index 100%
rename from patches/server/0089-Replace-AI-attributes-with-optimized-collections.patch
rename to patches/server/0088-Replace-AI-attributes-with-optimized-collections.patch
diff --git a/patches/server/0090-Replace-class-map-with-optimized-collection.patch b/patches/server/0089-Replace-class-map-with-optimized-collection.patch
similarity index 100%
rename from patches/server/0090-Replace-class-map-with-optimized-collection.patch
rename to patches/server/0089-Replace-class-map-with-optimized-collection.patch
diff --git a/patches/server/0091-Replace-throttle-tracker-map-with-optimized-collecti.patch b/patches/server/0090-Replace-throttle-tracker-map-with-optimized-collecti.patch
similarity index 100%
rename from patches/server/0091-Replace-throttle-tracker-map-with-optimized-collecti.patch
rename to patches/server/0090-Replace-throttle-tracker-map-with-optimized-collecti.patch
diff --git a/patches/server/0092-Replace-shape-full-block-cache-with-hashtable.patch b/patches/server/0091-Replace-shape-full-block-cache-with-hashtable.patch
similarity index 100%
rename from patches/server/0092-Replace-shape-full-block-cache-with-hashtable.patch
rename to patches/server/0091-Replace-shape-full-block-cache-with-hashtable.patch
diff --git a/patches/server/0093-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/patches/server/0092-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
similarity index 100%
rename from patches/server/0093-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
rename to patches/server/0092-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
diff --git a/patches/server/0094-Cache-BlockStatePairKey-hash.patch b/patches/server/0093-Cache-BlockStatePairKey-hash.patch
similarity index 100%
rename from patches/server/0094-Cache-BlockStatePairKey-hash.patch
rename to patches/server/0093-Cache-BlockStatePairKey-hash.patch
diff --git a/patches/server/0095-Cache-CubeVoxelShape-shape-array.patch b/patches/server/0094-Cache-CubeVoxelShape-shape-array.patch
similarity index 100%
rename from patches/server/0095-Cache-CubeVoxelShape-shape-array.patch
rename to patches/server/0094-Cache-CubeVoxelShape-shape-array.patch
diff --git a/patches/server/0096-Replace-division-by-multiplication-in-CubePointRange.patch b/patches/server/0095-Replace-division-by-multiplication-in-CubePointRange.patch
similarity index 100%
rename from patches/server/0096-Replace-division-by-multiplication-in-CubePointRange.patch
rename to patches/server/0095-Replace-division-by-multiplication-in-CubePointRange.patch
diff --git a/patches/server/0097-Replace-parts-by-size-in-CubePointRange.patch b/patches/server/0096-Replace-parts-by-size-in-CubePointRange.patch
similarity index 100%
rename from patches/server/0097-Replace-parts-by-size-in-CubePointRange.patch
rename to patches/server/0096-Replace-parts-by-size-in-CubePointRange.patch
diff --git a/patches/server/0098-Check-frozen-ticks-before-landing-block.patch b/patches/server/0097-Check-frozen-ticks-before-landing-block.patch
similarity index 100%
rename from patches/server/0098-Check-frozen-ticks-before-landing-block.patch
rename to patches/server/0097-Check-frozen-ticks-before-landing-block.patch
diff --git a/patches/server/0099-Faster-chunk-serialization.patch b/patches/server/0098-Faster-chunk-serialization.patch
similarity index 100%
rename from patches/server/0099-Faster-chunk-serialization.patch
rename to patches/server/0098-Faster-chunk-serialization.patch
diff --git a/patches/server/0100-Update-boss-bar-within-tick.patch b/patches/server/0099-Update-boss-bar-within-tick.patch
similarity index 100%
rename from patches/server/0100-Update-boss-bar-within-tick.patch
rename to patches/server/0099-Update-boss-bar-within-tick.patch
diff --git a/patches/server/0101-Cache-ominous-banner-item.patch b/patches/server/0100-Cache-ominous-banner-item.patch
similarity index 100%
rename from patches/server/0101-Cache-ominous-banner-item.patch
rename to patches/server/0100-Cache-ominous-banner-item.patch
diff --git a/patches/server/0102-Optimize-world-generation-chunk-and-block-access.patch b/patches/server/0101-Optimize-world-generation-chunk-and-block-access.patch
similarity index 100%
rename from patches/server/0102-Optimize-world-generation-chunk-and-block-access.patch
rename to patches/server/0101-Optimize-world-generation-chunk-and-block-access.patch
diff --git a/patches/server/0103-Cache-world-generator-sea-level.patch b/patches/server/0102-Cache-world-generator-sea-level.patch
similarity index 100%
rename from patches/server/0103-Cache-world-generator-sea-level.patch
rename to patches/server/0102-Cache-world-generator-sea-level.patch
diff --git a/patches/server/0104-Skip-secondary-POI-sensor-if-absent.patch b/patches/server/0103-Skip-secondary-POI-sensor-if-absent.patch
similarity index 100%
rename from patches/server/0104-Skip-secondary-POI-sensor-if-absent.patch
rename to patches/server/0103-Skip-secondary-POI-sensor-if-absent.patch
diff --git a/patches/server/0105-Optimize-villager-data-storage.patch b/patches/server/0104-Optimize-villager-data-storage.patch
similarity index 100%
rename from patches/server/0105-Optimize-villager-data-storage.patch
rename to patches/server/0104-Optimize-villager-data-storage.patch
diff --git a/patches/server/0106-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0105-Skip-entity-move-if-movement-is-zero.patch
similarity index 100%
rename from patches/server/0106-Skip-entity-move-if-movement-is-zero.patch
rename to patches/server/0105-Skip-entity-move-if-movement-is-zero.patch
diff --git a/patches/server/0107-Store-mob-counts-in-an-array.patch b/patches/server/0106-Store-mob-counts-in-an-array.patch
similarity index 100%
rename from patches/server/0107-Store-mob-counts-in-an-array.patch
rename to patches/server/0106-Store-mob-counts-in-an-array.patch
diff --git a/patches/server/0108-Use-linked-map-for-entity-trackers.patch b/patches/server/0107-Use-linked-map-for-entity-trackers.patch
similarity index 100%
rename from patches/server/0108-Use-linked-map-for-entity-trackers.patch
rename to patches/server/0107-Use-linked-map-for-entity-trackers.patch
diff --git a/patches/server/0109-Optimize-noise-generation.patch b/patches/server/0108-Optimize-noise-generation.patch
similarity index 100%
rename from patches/server/0109-Optimize-noise-generation.patch
rename to patches/server/0108-Optimize-noise-generation.patch
diff --git a/patches/server/0110-Optimize-sheep-offspring-color.patch b/patches/server/0109-Optimize-sheep-offspring-color.patch
similarity index 98%
rename from patches/server/0110-Optimize-sheep-offspring-color.patch
rename to patches/server/0109-Optimize-sheep-offspring-color.patch
index ff786e0..2dc0453 100644
--- a/patches/server/0110-Optimize-sheep-offspring-color.patch
+++ b/patches/server/0109-Optimize-sheep-offspring-color.patch
@@ -110,7 +110,7 @@ index fb3777e158065a6ce306a2a6e66bec053da2aeb4..8b17dd156aa321686570da1e62010727
          DyeColor enumcolor1 = ((Sheep) secondParent).getColor();
          CraftingContainer inventorycrafting = Sheep.makeContainer(enumcolor, enumcolor1);
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index ffa0c986b59f33292ea769a30784d429ce59ae6c..bb6cd08bae9bfea0baced2c4ab839ef693465157 100644
+index 25aef23dcdce0bbd38a00bd725eb51b8139114e8..3ebd9c177453bf720c40c7f9d41e28a234c80467 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -47,6 +47,21 @@ public class GaleWorldConfiguration extends ConfigurationPart {
diff --git a/patches/server/0111-Ignore-durability-change-equipment-updates.patch b/patches/server/0110-Ignore-durability-change-equipment-updates.patch
similarity index 97%
rename from patches/server/0111-Ignore-durability-change-equipment-updates.patch
rename to patches/server/0110-Ignore-durability-change-equipment-updates.patch
index c40ec5b..e128478 100644
--- a/patches/server/0111-Ignore-durability-change-equipment-updates.patch
+++ b/patches/server/0110-Ignore-durability-change-equipment-updates.patch
@@ -53,7 +53,7 @@ index 8155a806ccb200b8883ce6734c5b7e34338060ee..08638e5982083835cd90243e6edf4508
          return stack.is(otherStack.getItem()) && ItemStack.tagMatches(stack, otherStack);
      }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index bb6cd08bae9bfea0baced2c4ab839ef693465157..418c57f1e8f14c0c92c7d46cb26e1064ee6a296c 100644
+index 3ebd9c177453bf720c40c7f9d41e28a234c80467..cdc53823b4903ab6a443a626503f62b732cc97cb 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -62,6 +62,8 @@ public class GaleWorldConfiguration extends ConfigurationPart {
diff --git a/patches/server/0112-Hide-flames-on-entities-with-fire-resistance.patch b/patches/server/0111-Hide-flames-on-entities-with-fire-resistance.patch
similarity index 100%
rename from patches/server/0112-Hide-flames-on-entities-with-fire-resistance.patch
rename to patches/server/0111-Hide-flames-on-entities-with-fire-resistance.patch
diff --git a/patches/server/0113-Skip-cloning-advancement-criteria.patch b/patches/server/0112-Skip-cloning-advancement-criteria.patch
similarity index 100%
rename from patches/server/0113-Skip-cloning-advancement-criteria.patch
rename to patches/server/0112-Skip-cloning-advancement-criteria.patch
diff --git a/patches/server/0114-Reduce-block-destruction-packet-allocations.patch b/patches/server/0113-Reduce-block-destruction-packet-allocations.patch
similarity index 100%
rename from patches/server/0114-Reduce-block-destruction-packet-allocations.patch
rename to patches/server/0113-Reduce-block-destruction-packet-allocations.patch
diff --git a/patches/server/0115-Send-set-head-rotation-packets-only-for-living-entit.patch b/patches/server/0114-Send-set-head-rotation-packets-only-for-living-entit.patch
similarity index 96%
rename from patches/server/0115-Send-set-head-rotation-packets-only-for-living-entit.patch
rename to patches/server/0114-Send-set-head-rotation-packets-only-for-living-entit.patch
index 6676efd..ad748aa 100644
--- a/patches/server/0115-Send-set-head-rotation-packets-only-for-living-entit.patch
+++ b/patches/server/0114-Send-set-head-rotation-packets-only-for-living-entit.patch
@@ -27,7 +27,7 @@ index 834b497053f4fa20cf94c00e1ee2db4838bdf233..b79e302cf4e0eae858e2322b5b260282
  
          if (this.entity instanceof LivingEntity) {
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 5246237d49be75f3113791126e6ae9c94cc06972..6ec49abd285e1e2c06842b4c25ca3bb262996452 100644
+index be1dc2ec007456f864941bf3e3d246610808888c..49ac6d7d324707b86364b393123ad695cfbe28e2 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -64,6 +64,8 @@ public class GaleWorldConfiguration extends ConfigurationPart {
diff --git a/patches/server/0116-Spread-out-sending-all-player-info.patch b/patches/server/0115-Spread-out-sending-all-player-info.patch
similarity index 100%
rename from patches/server/0116-Spread-out-sending-all-player-info.patch
rename to patches/server/0115-Spread-out-sending-all-player-info.patch
diff --git a/patches/server/0117-Optimize-player-list-for-sending-player-info.patch b/patches/server/0116-Optimize-player-list-for-sending-player-info.patch
similarity index 100%
rename from patches/server/0117-Optimize-player-list-for-sending-player-info.patch
rename to patches/server/0116-Optimize-player-list-for-sending-player-info.patch
diff --git a/patches/server/0118-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0117-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
similarity index 100%
rename from patches/server/0118-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
rename to patches/server/0117-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
diff --git a/patches/server/0119-Send-multiple-keep-alive-packets.patch b/patches/server/0118-Send-multiple-keep-alive-packets.patch
similarity index 100%
rename from patches/server/0119-Send-multiple-keep-alive-packets.patch
rename to patches/server/0118-Send-multiple-keep-alive-packets.patch
diff --git a/patches/server/0120-Make-slow-login-timeout-configurable.patch b/patches/server/0119-Make-slow-login-timeout-configurable.patch
similarity index 100%
rename from patches/server/0120-Make-slow-login-timeout-configurable.patch
rename to patches/server/0119-Make-slow-login-timeout-configurable.patch
diff --git a/patches/server/0121-Make-max-interaction-distance-configurable.patch b/patches/server/0120-Make-max-interaction-distance-configurable.patch
similarity index 100%
rename from patches/server/0121-Make-max-interaction-distance-configurable.patch
rename to patches/server/0120-Make-max-interaction-distance-configurable.patch
diff --git a/patches/server/0122-Load-portal-destination-chunk-before-entity-teleport.patch b/patches/server/0121-Load-portal-destination-chunk-before-entity-teleport.patch
similarity index 100%
rename from patches/server/0122-Load-portal-destination-chunk-before-entity-teleport.patch
rename to patches/server/0121-Load-portal-destination-chunk-before-entity-teleport.patch
diff --git a/patches/server/0123-Don-t-load-chunks-to-spawn-phantoms.patch b/patches/server/0122-Don-t-load-chunks-to-spawn-phantoms.patch
similarity index 97%
rename from patches/server/0123-Don-t-load-chunks-to-spawn-phantoms.patch
rename to patches/server/0122-Don-t-load-chunks-to-spawn-phantoms.patch
index 124445f..90b5d66 100644
--- a/patches/server/0123-Don-t-load-chunks-to-spawn-phantoms.patch
+++ b/patches/server/0122-Don-t-load-chunks-to-spawn-phantoms.patch
@@ -34,7 +34,7 @@ index e8ae4449696d73c8c9b8b27d4d2e20db933a72cc..ffef23b9455613e8d9e4cc4e21e52b76
  
                                          if (NaturalSpawner.isValidEmptySpawnBlock(world, blockposition1, iblockdata, fluid, EntityType.PHANTOM)) {
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 52eec168fa5788150da9ddd23d0cb0546e08d6df..0c045b6846d5f0f99d4a71d6dff0334304dd3496 100644
+index c8813fc7827d37896bc3c36f3de12bfbd62444f7..d99bed15c0dd58614c531469729a77ce53f6ac51 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -272,6 +272,23 @@ public class GaleWorldConfiguration extends ConfigurationPart {
diff --git a/patches/server/0124-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0123-Don-t-load-chunks-to-activate-climbing-entities.patch
similarity index 98%
rename from patches/server/0124-Don-t-load-chunks-to-activate-climbing-entities.patch
rename to patches/server/0123-Don-t-load-chunks-to-activate-climbing-entities.patch
index de77c5e..acffd3f 100644
--- a/patches/server/0124-Don-t-load-chunks-to-activate-climbing-entities.patch
+++ b/patches/server/0123-Don-t-load-chunks-to-activate-climbing-entities.patch
@@ -79,7 +79,7 @@ index 17dbade3fa91ccc3db8792b5c2c9374ad3d61337..a076e8b852a87b67602a21f07048da15
              if (iblockdata.is(BlockTags.CLIMBABLE)) {
                  this.lastClimbablePos = Optional.of(blockposition);
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 0c045b6846d5f0f99d4a71d6dff0334304dd3496..913803c3c4934b1ebcbe5f9f81f30b4a21e1acdf 100644
+index d99bed15c0dd58614c531469729a77ce53f6ac51..bf40c19d3449742ea1f08714f4d8096c6152108e 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -287,6 +287,18 @@ public class GaleWorldConfiguration extends ConfigurationPart {
diff --git a/patches/server/0125-Broadcast-crit-animations-as-the-entity-being-critte.patch b/patches/server/0124-Broadcast-crit-animations-as-the-entity-being-critte.patch
similarity index 100%
rename from patches/server/0125-Broadcast-crit-animations-as-the-entity-being-critte.patch
rename to patches/server/0124-Broadcast-crit-animations-as-the-entity-being-critte.patch
diff --git a/patches/server/0126-Ignore-null-legacy-structure-data.patch b/patches/server/0125-Ignore-null-legacy-structure-data.patch
similarity index 100%
rename from patches/server/0126-Ignore-null-legacy-structure-data.patch
rename to patches/server/0125-Ignore-null-legacy-structure-data.patch
diff --git a/patches/server/0127-Don-t-double-save-stored-user-lists.patch b/patches/server/0126-Don-t-double-save-stored-user-lists.patch
similarity index 100%
rename from patches/server/0127-Don-t-double-save-stored-user-lists.patch
rename to patches/server/0126-Don-t-double-save-stored-user-lists.patch
diff --git a/patches/server/0128-Skip-unnecessary-mob-spawning-computations.patch b/patches/server/0127-Skip-unnecessary-mob-spawning-computations.patch
similarity index 100%
rename from patches/server/0128-Skip-unnecessary-mob-spawning-computations.patch
rename to patches/server/0127-Skip-unnecessary-mob-spawning-computations.patch
diff --git a/patches/server/0129-Prevent-entities-random-strolling-into-non-ticking-c.patch b/patches/server/0128-Prevent-entities-random-strolling-into-non-ticking-c.patch
similarity index 100%
rename from patches/server/0129-Prevent-entities-random-strolling-into-non-ticking-c.patch
rename to patches/server/0128-Prevent-entities-random-strolling-into-non-ticking-c.patch
diff --git a/patches/server/0130-Do-not-place-player-in-world-if-kicked-before-being-.patch b/patches/server/0129-Do-not-place-player-in-world-if-kicked-before-being-.patch
similarity index 100%
rename from patches/server/0130-Do-not-place-player-in-world-if-kicked-before-being-.patch
rename to patches/server/0129-Do-not-place-player-in-world-if-kicked-before-being-.patch
diff --git a/patches/server/0131-CraftBukkit-UUID-to-world-map.patch b/patches/server/0130-CraftBukkit-UUID-to-world-map.patch
similarity index 100%
rename from patches/server/0131-CraftBukkit-UUID-to-world-map.patch
rename to patches/server/0130-CraftBukkit-UUID-to-world-map.patch
diff --git a/patches/server/0132-Global-EULA-file.patch b/patches/server/0131-Global-EULA-file.patch
similarity index 100%
rename from patches/server/0132-Global-EULA-file.patch
rename to patches/server/0131-Global-EULA-file.patch
diff --git a/patches/server/0133-Specific-interval-TPS-API.patch b/patches/server/0132-Specific-interval-TPS-API.patch
similarity index 100%
rename from patches/server/0133-Specific-interval-TPS-API.patch
rename to patches/server/0132-Specific-interval-TPS-API.patch
diff --git a/patches/server/0134-5-second-TPS-average.patch b/patches/server/0133-5-second-TPS-average.patch
similarity index 100%
rename from patches/server/0134-5-second-TPS-average.patch
rename to patches/server/0133-5-second-TPS-average.patch
diff --git a/patches/server/0135-Measure-last-tick-time.patch b/patches/server/0134-Measure-last-tick-time.patch
similarity index 100%
rename from patches/server/0135-Measure-last-tick-time.patch
rename to patches/server/0134-Measure-last-tick-time.patch
diff --git a/patches/server/0136-Last-tick-time-API.patch b/patches/server/0135-Last-tick-time-API.patch
similarity index 100%
rename from patches/server/0136-Last-tick-time-API.patch
rename to patches/server/0135-Last-tick-time-API.patch
diff --git a/patches/server/0137-Show-last-tick-time-in-tps-command.patch b/patches/server/0136-Show-last-tick-time-in-tps-command.patch
similarity index 100%
rename from patches/server/0137-Show-last-tick-time-in-tps-command.patch
rename to patches/server/0136-Show-last-tick-time-in-tps-command.patch
diff --git a/patches/server/0138-Increase-time-statistics-in-intervals.patch b/patches/server/0137-Increase-time-statistics-in-intervals.patch
similarity index 100%
rename from patches/server/0138-Increase-time-statistics-in-intervals.patch
rename to patches/server/0137-Increase-time-statistics-in-intervals.patch
diff --git a/patches/server/0139-For-collision-check-has-physics-before-same-vehicle.patch b/patches/server/0138-For-collision-check-has-physics-before-same-vehicle.patch
similarity index 100%
rename from patches/server/0139-For-collision-check-has-physics-before-same-vehicle.patch
rename to patches/server/0138-For-collision-check-has-physics-before-same-vehicle.patch
diff --git a/patches/server/0140-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0139-Skip-negligible-planar-movement-multiplication.patch
similarity index 100%
rename from patches/server/0140-Skip-negligible-planar-movement-multiplication.patch
rename to patches/server/0139-Skip-negligible-planar-movement-multiplication.patch
diff --git a/patches/server/0141-Optimize-identical-item-checks.patch b/patches/server/0140-Optimize-identical-item-checks.patch
similarity index 100%
rename from patches/server/0141-Optimize-identical-item-checks.patch
rename to patches/server/0140-Optimize-identical-item-checks.patch
diff --git a/patches/server/0142-Reduce-RandomSource-instances.patch b/patches/server/0141-Reduce-RandomSource-instances.patch
similarity index 100%
rename from patches/server/0142-Reduce-RandomSource-instances.patch
rename to patches/server/0141-Reduce-RandomSource-instances.patch
diff --git a/patches/server/0143-Server-thread-priority-environment-variable.patch b/patches/server/0142-Server-thread-priority-environment-variable.patch
similarity index 100%
rename from patches/server/0143-Server-thread-priority-environment-variable.patch
rename to patches/server/0142-Server-thread-priority-environment-variable.patch
diff --git a/patches/server/0144-Thread-safety-annotations.patch b/patches/server/0143-Thread-safety-annotations.patch
similarity index 100%
rename from patches/server/0144-Thread-safety-annotations.patch
rename to patches/server/0143-Thread-safety-annotations.patch
diff --git a/patches/server/0145-CPU-cores-estimation.patch b/patches/server/0144-CPU-cores-estimation.patch
similarity index 100%
rename from patches/server/0145-CPU-cores-estimation.patch
rename to patches/server/0144-CPU-cores-estimation.patch
diff --git a/patches/server/0146-Virtual-threads-utility.patch b/patches/server/0145-Virtual-threads-utility.patch
similarity index 100%
rename from patches/server/0146-Virtual-threads-utility.patch
rename to patches/server/0145-Virtual-threads-utility.patch
diff --git a/patches/server/0147-CheckableLock-utility.patch b/patches/server/0146-CheckableLock-utility.patch
similarity index 100%
rename from patches/server/0147-CheckableLock-utility.patch
rename to patches/server/0146-CheckableLock-utility.patch
diff --git a/patches/server/0148-Mutex-utility.patch b/patches/server/0147-Mutex-utility.patch
similarity index 100%
rename from patches/server/0148-Mutex-utility.patch
rename to patches/server/0147-Mutex-utility.patch
diff --git a/patches/server/0149-Thread-aware-lock-utility.patch b/patches/server/0148-Thread-aware-lock-utility.patch
similarity index 100%
rename from patches/server/0149-Thread-aware-lock-utility.patch
rename to patches/server/0148-Thread-aware-lock-utility.patch
diff --git a/patches/server/0150-Unterminable-executor-utility.patch b/patches/server/0149-Unterminable-executor-utility.patch
similarity index 100%
rename from patches/server/0150-Unterminable-executor-utility.patch
rename to patches/server/0149-Unterminable-executor-utility.patch
diff --git a/patches/server/0151-FIFO-concurrent-queue-utility.patch b/patches/server/0150-FIFO-concurrent-queue-utility.patch
similarity index 100%
rename from patches/server/0151-FIFO-concurrent-queue-utility.patch
rename to patches/server/0150-FIFO-concurrent-queue-utility.patch
diff --git a/patches/server/0152-Base-thread-pool.patch b/patches/server/0151-Base-thread-pool.patch
similarity index 100%
rename from patches/server/0152-Base-thread-pool.patch
rename to patches/server/0151-Base-thread-pool.patch
diff --git a/patches/server/0153-Watch-for-blocking-base-threads.patch b/patches/server/0152-Watch-for-blocking-base-threads.patch
similarity index 91%
rename from patches/server/0153-Watch-for-blocking-base-threads.patch
rename to patches/server/0152-Watch-for-blocking-base-threads.patch
index 41509a1..1c031ab 100644
--- a/patches/server/0153-Watch-for-blocking-base-threads.patch
+++ b/patches/server/0152-Watch-for-blocking-base-threads.patch
@@ -7,7 +7,7 @@ License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index bee1ab6d6f0ce42ac98e9c47ee69f3ea1f874097..bb7cb64ccf87508110325c1cae30ca56d036bd90 100644
+index 394b5044090c1c7b00b30036e4b8be4a6ac58ed1..4d16889cb85e2397e2f72d1ff3541ce8fe9a6bb5 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -15,6 +15,7 @@ dependencies {
@@ -26,14 +26,14 @@ index bee1ab6d6f0ce42ac98e9c47ee69f3ea1f874097..bb7cb64ccf87508110325c1cae30ca56
  
      val memoryGb = providers.gradleProperty("paper.runMemoryGb").getOrElse("2")
      minHeapSize = "${memoryGb}G"
-@@ -190,6 +192,7 @@ fun TaskContainer.registerRunTask(
-     modifiedJvmArgs.addAll(listOf("--add-opens=java.base/java.lang=ALL-UNNAMED"))
+@@ -188,6 +190,7 @@ fun TaskContainer.registerRunTask(
+     jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
      // Gale end - enable virtual threads for development runs
-     modifiedJvmArgs.add("--add-modules=jdk.incubator.vector") // Gale - Pufferfish - SIMD support
-+    modifiedJvmArgs.add("-XX:+AllowRedefinitionToAddDeleteMethods") // Gale - base thread pool - watch for blocking base threads
-     jvmArgs = modifiedJvmArgs
-     // Gale end - modify JVM args for development runs
+     jvmArgs("--add-modules=jdk.incubator.vector") // Gale - Pufferfish - SIMD support
++    jvmArgs("-XX:+AllowRedefinitionToAddDeleteMethods") // Gale - base thread pool - watch for blocking base threads
  
+     doFirst {
+         workingDir.mkdirs()
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
 index 7c38d14671b8a9a671deece654d2f89426b26081..b3ff28d9cac66ae076179b861fd4735e4ecb279b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
diff --git a/patches/server/0154-Non-blocking-PooledObjects.patch b/patches/server/0153-Non-blocking-PooledObjects.patch
similarity index 100%
rename from patches/server/0154-Non-blocking-PooledObjects.patch
rename to patches/server/0153-Non-blocking-PooledObjects.patch
diff --git a/patches/server/0155-Yielding-memoized-Supplier.patch b/patches/server/0154-Yielding-memoized-Supplier.patch
similarity index 100%
rename from patches/server/0155-Yielding-memoized-Supplier.patch
rename to patches/server/0154-Yielding-memoized-Supplier.patch
diff --git a/patches/server/0156-Yielding-ChunkHolderManager.patch b/patches/server/0155-Yielding-ChunkHolderManager.patch
similarity index 100%
rename from patches/server/0156-Yielding-ChunkHolderManager.patch
rename to patches/server/0155-Yielding-ChunkHolderManager.patch
diff --git a/patches/server/0157-Run-async-executor-tasks-on-base-thread-pool.patch b/patches/server/0156-Run-async-executor-tasks-on-base-thread-pool.patch
similarity index 100%
rename from patches/server/0157-Run-async-executor-tasks-on-base-thread-pool.patch
rename to patches/server/0156-Run-async-executor-tasks-on-base-thread-pool.patch
diff --git a/patches/server/0158-Run-background-executor-tasks-on-base-thread-pool.patch b/patches/server/0157-Run-background-executor-tasks-on-base-thread-pool.patch
similarity index 100%
rename from patches/server/0158-Run-background-executor-tasks-on-base-thread-pool.patch
rename to patches/server/0157-Run-background-executor-tasks-on-base-thread-pool.patch
diff --git a/patches/server/0159-Run-world-upgrade-tasks-on-base-thread-pool.patch b/patches/server/0158-Run-world-upgrade-tasks-on-base-thread-pool.patch
similarity index 100%
rename from patches/server/0159-Run-world-upgrade-tasks-on-base-thread-pool.patch
rename to patches/server/0158-Run-world-upgrade-tasks-on-base-thread-pool.patch
diff --git a/patches/server/0160-Run-tab-completion-tasks-on-base-thread-pool.patch b/patches/server/0159-Run-tab-completion-tasks-on-base-thread-pool.patch
similarity index 100%
rename from patches/server/0160-Run-tab-completion-tasks-on-base-thread-pool.patch
rename to patches/server/0159-Run-tab-completion-tasks-on-base-thread-pool.patch
diff --git a/patches/server/0161-Run-text-filter-tasks-on-base-thread-pool.patch b/patches/server/0160-Run-text-filter-tasks-on-base-thread-pool.patch
similarity index 100%
rename from patches/server/0161-Run-text-filter-tasks-on-base-thread-pool.patch
rename to patches/server/0160-Run-text-filter-tasks-on-base-thread-pool.patch
diff --git a/patches/server/0162-Run-cleaner-tasks-on-base-thread-pool.patch b/patches/server/0161-Run-cleaner-tasks-on-base-thread-pool.patch
similarity index 100%
rename from patches/server/0162-Run-cleaner-tasks-on-base-thread-pool.patch
rename to patches/server/0161-Run-cleaner-tasks-on-base-thread-pool.patch
diff --git a/patches/server/0163-Run-chunk-cache-tasks-on-base-thread-pool.patch b/patches/server/0162-Run-chunk-cache-tasks-on-base-thread-pool.patch
similarity index 100%
rename from patches/server/0163-Run-chunk-cache-tasks-on-base-thread-pool.patch
rename to patches/server/0162-Run-chunk-cache-tasks-on-base-thread-pool.patch
diff --git a/patches/server/0164-Run-TickThread-chunk-tasks-on-base-thread-pool.patch b/patches/server/0163-Run-TickThread-chunk-tasks-on-base-thread-pool.patch
similarity index 100%
rename from patches/server/0164-Run-TickThread-chunk-tasks-on-base-thread-pool.patch
rename to patches/server/0163-Run-TickThread-chunk-tasks-on-base-thread-pool.patch
diff --git a/patches/server/0165-BaseThread-PrioritisedQueueExecutorThread-agent-util.patch b/patches/server/0164-BaseThread-PrioritisedQueueExecutorThread-agent-util.patch
similarity index 100%
rename from patches/server/0165-BaseThread-PrioritisedQueueExecutorThread-agent-util.patch
rename to patches/server/0164-BaseThread-PrioritisedQueueExecutorThread-agent-util.patch
diff --git a/patches/server/0166-Run-chunk-worker-tasks-on-base-thread-pool.patch b/patches/server/0165-Run-chunk-worker-tasks-on-base-thread-pool.patch
similarity index 100%
rename from patches/server/0166-Run-chunk-worker-tasks-on-base-thread-pool.patch
rename to patches/server/0165-Run-chunk-worker-tasks-on-base-thread-pool.patch
diff --git a/patches/server/0167-Split-tick-steps.patch b/patches/server/0166-Split-tick-steps.patch
similarity index 100%
rename from patches/server/0167-Split-tick-steps.patch
rename to patches/server/0166-Split-tick-steps.patch
diff --git a/patches/server/0168-Multithreaded-ticking.patch b/patches/server/0167-Multithreaded-ticking.patch
similarity index 100%
rename from patches/server/0168-Multithreaded-ticking.patch
rename to patches/server/0167-Multithreaded-ticking.patch
diff --git a/patches/server/0169-Yielding-ChunkTaskScheduler.patch b/patches/server/0168-Yielding-ChunkTaskScheduler.patch
similarity index 100%
rename from patches/server/0169-Yielding-ChunkTaskScheduler.patch
rename to patches/server/0168-Yielding-ChunkTaskScheduler.patch