From 3759a1a93a36b6ecc489eea0adcab080735ed7ff Mon Sep 17 00:00:00 2001 From: 404Setup <153366651+404Setup@users.noreply.github.com> Date: Tue, 22 Oct 2024 11:31:57 +0800 Subject: [PATCH] Some nbt changes --- patches/server/0005-VineLogger.patch | 15 +-- patches/server/0007-List-Utils.patch | 40 ++++++++ ...d-Utils.patch => 0008-Command-Utils.patch} | 0 ...Util.patch => 0009-Vine-Config-Util.patch} | 0 ...g-Fix.patch => 0010-Vine-Config-Fix.patch} | 0 ...e.patch => 0011-Vine-Config-Feature.patch} | 0 ....patch => 0012-Vine-Config-Optimize.patch} | 0 ...ommand.patch => 0013-Config-command.patch} | 0 ...d-Utils.patch => 0014-Preload-Utils.patch} | 0 ...ddedpaper-configuration-files-to-sp.patch} | 0 ...ze.patch => 0016-Fix-console-freeze.patch} | 0 ...Utils.patch => 0017-AnyThread-Utils.patch} | 0 ...tManager.patch => 0018-EventManager.patch} | 0 ...ger.patch => 0019-PermissionManager.patch} | 0 ...and.patch => 0020-ThreadInfoCommand.patch} | 0 ...0-Nbt-Utils.patch => 0021-Nbt-Utils.patch} | 0 ...0.patch => 0022-Virtual-threads-1.0.patch} | 0 ...tch => 0023-Virtual-Thread-2.0-Beta.patch} | 0 ...SectorFile.patch => 0024-SectorFile.patch} | 0 .../{0024-Linear.patch => 0025-Linear.patch} | 0 ...ssBarTask.patch => 0026-BossBarTask.patch} | 0 ...6-GUI-Theme.patch => 0027-GUI-Theme.patch} | 0 ...GLOBAL_SOUND-is-disabled-by-default.patch} | 0 ...ate-too-many-threads-at-the-default.patch} | 0 ...0030-The-anvil-becomes-a-drop-at-Y0.patch} | 0 ...31-Don-t-save-FireworkRocket-Entity.patch} | 0 ...tch => 0032-Disable-respawn-ceiling.patch} | 0 ...Store-gamerules-in-fastutil-hashmap.patch} | 0 ...e-spark.patch => 0034-disable-spark.patch} | 0 ... 0035-SIMD-support-range-adjustment.patch} | 0 ...nts.patch => 0036-Skip-empty-events.patch} | 0 patches/server/0037-Some-nbt-changes.patch | 95 +++++++++++++++++++ ...17.patch => 0038-Leaf-Fix-MC-119417.patch} | 0 ...34.patch => 0039-Leaf-Fix-MC-266334.patch} | 0 ...18.patch => 0040-Leaf-Fix-MC-200418.patch} | 0 ...18.patch => 0041-Leaf-Fix-MC-183518.patch} | 0 ...atch => 0042-Leaf-Fix-sprint-glitch.patch} | 0 ...m-in-BlockBehaviour-cache-blockstat.patch} | 0 ...m-and-double-iteration-in-enough-de.patch} | 0 ...eaf-Don-t-save-falling-block-entity.patch} | 0 ...6-Leaf-Don-t-save-primed-tnt-entity.patch} | 0 ...7-Leaf-Optimize-Minecart-collisions.patch} | 0 ...ncing-of-futures-for-chunk-structur.patch} | 0 ...049-Leaf-Cache-player-profileResult.patch} | 0 ...-cache-kickPermission-instead-of-us.patch} | 0 ...tch => 0051-Leaves-Zero-tick-plants.patch} | 0 ...s.patch => 0052-Leaves-Entity-Utils.patch} | 0 ...053-Leaves-Return-nether-portal-fix.patch} | 0 ...patch => 0054-Leaves-Vanilla-hopper.patch} | 0 ...ves-Raider-die-skip-self-raid-check.patch} | 0 ...s-Fix-villagers-dont-release-memory.patch} | 0 ...-Fix-falling-block-s-block-location.patch} | 0 ...fish-Optimize-entity-coordinate-key.patch} | 0 ...ve-container-checking-with-a-bitset.patch} | 0 ...btimizations-RePathing-optimization.patch} | 0 ...timization-Zombie-Search-And-Destro.patch} | 0 ...> 0062-Divine-Implement-Secure-Seed.patch} | 0 ...9.patch => 0063-Divine-Fix-MC-31819.patch} | 0 ....patch => 0064-Divine-Fix-MC-172801.patch} | 0 ...25.patch => 0065-Divine-Fix-MC-2025.patch} | 0 ...h => 0066-Divine-C2ME-reduce_allocs.patch} | 0 ...patch => 0067-Divine-C2ME-opts-math.patch} | 0 ...69.patch => 0068-Divine-Fix-MC-7569.patch} | 0 ...> 0069-Divine-lithium-math.sine_lut.patch} | 0 ...0070-Divine-lithium-cached_hashcode.patch} | 0 ...6.patch => 0071-Divine-Fix-MC-93826.patch} | 0 ....patch => 0072-Divine-Fix-MC-110386.patch} | 0 ...3-Divine-Fix-MC-98160-and-MC-105103.patch} | 0 ...8.patch => 0074-Divine-Fix-MC-93018.patch} | 0 ...8.patch => 0075-Divine-Fix-MC-65198.patch} | 0 ....patch => 0076-Divine-Fix-MC-167242.patch} | 0 ...-Dont-load-chunks-to-spawn-phantoms.patch} | 0 ...-Optimize-Math.round-and-Math.hypot.patch} | 0 ...79-Canvas-Entity-Goal-Optimizations.patch} | 0 ...-Canvas-Optimize-Entity-Pathfinding.patch} | 0 ...1-CarpetFix-incorrectBounceLogicFix.patch} | 0 ...-explosionBreaksItemFrameInWaterFix.patch} | 0 ...rpetFix-Use-optimized-RecipeManager.patch} | 0 ...CarpetFix-Optimized-getBiome-method.patch} | 0 ...on-Random-flatten-triangular-distri.patch} | 0 ...-distanceToSqr-call-in-ServerEntity.patch} | 0 ...-dirty-stats-copy-when-requesting-p.patch} | 0 ...t-dirty-flag-when-loading-maps-from.patch} | 0 ...-Rewrite-framed-map-tracker-ticking.patch} | 0 ...90-Gale-Use-platform-math-functions.patch} | 0 ...ster-floating-point-positive-modulo.patch} | 0 ...0092-Gale-Specific-interval-TPS-API.patch} | 0 ...lock-destruction-packet-allocations.patch} | 0 ...-Gale-Optimize-matching-item-checks.patch} | 0 ...5-Gale-Store-mob-counts-in-an-array.patch} | 0 ...n-check-has-physics-before-same-veh.patch} | 0 ...ible-planar-movement-multiplication.patch} | 0 ...0098-Gale-Pre-compute-VarLong-sizes.patch} | 0 ...mize-VarInt-write-and-VarLong-write.patch} | 0 ...hunks-to-activate-climbing-entities.patch} | 0 ...duce-acquire-POI-for-stuck-entities.patch} | 0 ...e.patch => 0102-MemoryLeakFix-Biome.patch} | 0 ...lock-type-in-SculkSensorBlock-canAc.patch} | 0 ...er-Update-Alternate-Current-to-v1.9.patch} | 0 ...05-Paper-PR-Update-Velocity-natives.patch} | 0 ...ork-done-in-CraftMapCanvas.drawImag.patch} | 0 ...ondition-check-order-of-entity-trac.patch} | 0 ...hing-biomes-during-world-generation.patch} | 0 ...uring-inactive-ticks-for-non-aware-.patch} | 0 ...110-lithium-precompute-shape-arrays.patch} | 0 ...0111-lithium-fast-powder-snow-check.patch} | 0 ....raid.patch => 0112-lithium-ai.raid.patch} | 0 ...atch => 0113-vmp-TypeFilterableList.patch} | 0 ...kip-entity-move-if-movement-is-zero.patch} | 0 ...lice-Improve-map-saving-performance.patch} | 0 ...Slice-noEntityCollisions-for-Entity.patch} | 0 ...Allow-inventory-clicks-in-Spectator.patch} | 0 ...ble-sending-Entity-Movement-Packets.patch} | 0 ...karin-Save-Json-list-asynchronously.patch} | 0 ...-Remove-stream-in-PoiCompetitorScan.patch} | 0 ...-ScalableLux-Upstream-Starlight-Fix.patch} | 0 ...=> 0122-Kiterino-New-liquid-physics.patch} | 0 117 files changed, 143 insertions(+), 7 deletions(-) create mode 100644 patches/server/0007-List-Utils.patch rename patches/server/{0007-Command-Utils.patch => 0008-Command-Utils.patch} (100%) rename patches/server/{0008-Vine-Config-Util.patch => 0009-Vine-Config-Util.patch} (100%) rename patches/server/{0009-Vine-Config-Fix.patch => 0010-Vine-Config-Fix.patch} (100%) rename patches/server/{0010-Vine-Config-Feature.patch => 0011-Vine-Config-Feature.patch} (100%) rename patches/server/{0011-Vine-Config-Optimize.patch => 0012-Vine-Config-Optimize.patch} (100%) rename patches/server/{0012-Config-command.patch => 0013-Config-command.patch} (100%) rename patches/server/{0013-Preload-Utils.patch => 0014-Preload-Utils.patch} (100%) rename patches/server/{0014-Add-vine-and-shreddedpaper-configuration-files-to-sp.patch => 0015-Add-vine-and-shreddedpaper-configuration-files-to-sp.patch} (100%) rename patches/server/{0015-Fix-console-freeze.patch => 0016-Fix-console-freeze.patch} (100%) rename patches/server/{0016-AnyThread-Utils.patch => 0017-AnyThread-Utils.patch} (100%) rename patches/server/{0017-EventManager.patch => 0018-EventManager.patch} (100%) rename patches/server/{0018-PermissionManager.patch => 0019-PermissionManager.patch} (100%) rename patches/server/{0019-ThreadInfoCommand.patch => 0020-ThreadInfoCommand.patch} (100%) rename patches/server/{0020-Nbt-Utils.patch => 0021-Nbt-Utils.patch} (100%) rename patches/server/{0021-Virtual-threads-1.0.patch => 0022-Virtual-threads-1.0.patch} (100%) rename patches/server/{0022-Virtual-Thread-2.0-Beta.patch => 0023-Virtual-Thread-2.0-Beta.patch} (100%) rename patches/server/{0023-SectorFile.patch => 0024-SectorFile.patch} (100%) rename patches/server/{0024-Linear.patch => 0025-Linear.patch} (100%) rename patches/server/{0025-BossBarTask.patch => 0026-BossBarTask.patch} (100%) rename patches/server/{0026-GUI-Theme.patch => 0027-GUI-Theme.patch} (100%) rename patches/server/{0027-GLOBAL_SOUND-is-disabled-by-default.patch => 0028-GLOBAL_SOUND-is-disabled-by-default.patch} (100%) rename patches/server/{0028-Don-t-allocate-too-many-threads-at-the-default.patch => 0029-Don-t-allocate-too-many-threads-at-the-default.patch} (100%) rename patches/server/{0029-The-anvil-becomes-a-drop-at-Y0.patch => 0030-The-anvil-becomes-a-drop-at-Y0.patch} (100%) rename patches/server/{0030-Don-t-save-FireworkRocket-Entity.patch => 0031-Don-t-save-FireworkRocket-Entity.patch} (100%) rename patches/server/{0031-Disable-respawn-ceiling.patch => 0032-Disable-respawn-ceiling.patch} (100%) rename patches/server/{0032-Store-gamerules-in-fastutil-hashmap.patch => 0033-Store-gamerules-in-fastutil-hashmap.patch} (100%) rename patches/server/{0033-disable-spark.patch => 0034-disable-spark.patch} (100%) rename patches/server/{0034-SIMD-support-range-adjustment.patch => 0035-SIMD-support-range-adjustment.patch} (100%) rename patches/server/{0035-Skip-empty-events.patch => 0036-Skip-empty-events.patch} (100%) create mode 100644 patches/server/0037-Some-nbt-changes.patch rename patches/server/{0036-Leaf-Fix-MC-119417.patch => 0038-Leaf-Fix-MC-119417.patch} (100%) rename patches/server/{0037-Leaf-Fix-MC-266334.patch => 0039-Leaf-Fix-MC-266334.patch} (100%) rename patches/server/{0038-Leaf-Fix-MC-200418.patch => 0040-Leaf-Fix-MC-200418.patch} (100%) rename patches/server/{0039-Leaf-Fix-MC-183518.patch => 0041-Leaf-Fix-MC-183518.patch} (100%) rename patches/server/{0040-Leaf-Fix-sprint-glitch.patch => 0042-Leaf-Fix-sprint-glitch.patch} (100%) rename patches/server/{0041-Leaf-Remove-stream-in-BlockBehaviour-cache-blockstat.patch => 0043-Leaf-Remove-stream-in-BlockBehaviour-cache-blockstat.patch} (100%) rename patches/server/{0042-Leaf-Remove-stream-and-double-iteration-in-enough-de.patch => 0044-Leaf-Remove-stream-and-double-iteration-in-enough-de.patch} (100%) rename patches/server/{0043-Leaf-Don-t-save-falling-block-entity.patch => 0045-Leaf-Don-t-save-falling-block-entity.patch} (100%) rename patches/server/{0044-Leaf-Don-t-save-primed-tnt-entity.patch => 0046-Leaf-Don-t-save-primed-tnt-entity.patch} (100%) rename patches/server/{0045-Leaf-Optimize-Minecart-collisions.patch => 0047-Leaf-Optimize-Minecart-collisions.patch} (100%) rename patches/server/{0046-Leaf-Faster-sequencing-of-futures-for-chunk-structur.patch => 0048-Leaf-Faster-sequencing-of-futures-for-chunk-structur.patch} (100%) rename patches/server/{0047-Leaf-Cache-player-profileResult.patch => 0049-Leaf-Cache-player-profileResult.patch} (100%) rename patches/server/{0048-Leaf-Use-caffeine-cache-kickPermission-instead-of-us.patch => 0050-Leaf-Use-caffeine-cache-kickPermission-instead-of-us.patch} (100%) rename patches/server/{0049-Leaves-Zero-tick-plants.patch => 0051-Leaves-Zero-tick-plants.patch} (100%) rename patches/server/{0050-Leaves-Entity-Utils.patch => 0052-Leaves-Entity-Utils.patch} (100%) rename patches/server/{0051-Leaves-Return-nether-portal-fix.patch => 0053-Leaves-Return-nether-portal-fix.patch} (100%) rename patches/server/{0052-Leaves-Vanilla-hopper.patch => 0054-Leaves-Vanilla-hopper.patch} (100%) rename patches/server/{0053-Leaves-Raider-die-skip-self-raid-check.patch => 0055-Leaves-Raider-die-skip-self-raid-check.patch} (100%) rename patches/server/{0054-Leaves-Fix-villagers-dont-release-memory.patch => 0056-Leaves-Fix-villagers-dont-release-memory.patch} (100%) rename patches/server/{0055-Leaves-Fix-falling-block-s-block-location.patch => 0057-Leaves-Fix-falling-block-s-block-location.patch} (100%) rename patches/server/{0056-Pufferfish-Optimize-entity-coordinate-key.patch => 0058-Pufferfish-Optimize-entity-coordinate-key.patch} (100%) rename patches/server/{0057-Pufferfish-Improve-container-checking-with-a-bitset.patch => 0059-Pufferfish-Improve-container-checking-with-a-bitset.patch} (100%) rename patches/server/{0058-Mobtimizations-RePathing-optimization.patch => 0060-Mobtimizations-RePathing-optimization.patch} (100%) rename patches/server/{0059-Mobtimizations-Optimization-Zombie-Search-And-Destro.patch => 0061-Mobtimizations-Optimization-Zombie-Search-And-Destro.patch} (100%) rename patches/server/{0060-Divine-Implement-Secure-Seed.patch => 0062-Divine-Implement-Secure-Seed.patch} (100%) rename patches/server/{0061-Divine-Fix-MC-31819.patch => 0063-Divine-Fix-MC-31819.patch} (100%) rename patches/server/{0062-Divine-Fix-MC-172801.patch => 0064-Divine-Fix-MC-172801.patch} (100%) rename patches/server/{0063-Divine-Fix-MC-2025.patch => 0065-Divine-Fix-MC-2025.patch} (100%) rename patches/server/{0064-Divine-C2ME-reduce_allocs.patch => 0066-Divine-C2ME-reduce_allocs.patch} (100%) rename patches/server/{0065-Divine-C2ME-opts-math.patch => 0067-Divine-C2ME-opts-math.patch} (100%) rename patches/server/{0066-Divine-Fix-MC-7569.patch => 0068-Divine-Fix-MC-7569.patch} (100%) rename patches/server/{0067-Divine-lithium-math.sine_lut.patch => 0069-Divine-lithium-math.sine_lut.patch} (100%) rename patches/server/{0068-Divine-lithium-cached_hashcode.patch => 0070-Divine-lithium-cached_hashcode.patch} (100%) rename patches/server/{0069-Divine-Fix-MC-93826.patch => 0071-Divine-Fix-MC-93826.patch} (100%) rename patches/server/{0070-Divine-Fix-MC-110386.patch => 0072-Divine-Fix-MC-110386.patch} (100%) rename patches/server/{0071-Divine-Fix-MC-98160-and-MC-105103.patch => 0073-Divine-Fix-MC-98160-and-MC-105103.patch} (100%) rename patches/server/{0072-Divine-Fix-MC-93018.patch => 0074-Divine-Fix-MC-93018.patch} (100%) rename patches/server/{0073-Divine-Fix-MC-65198.patch => 0075-Divine-Fix-MC-65198.patch} (100%) rename patches/server/{0074-Divine-Fix-MC-167242.patch => 0076-Divine-Fix-MC-167242.patch} (100%) rename patches/server/{0075-Canvas-Dont-load-chunks-to-spawn-phantoms.patch => 0077-Canvas-Dont-load-chunks-to-spawn-phantoms.patch} (100%) rename patches/server/{0076-Canvas-Optimize-Math.round-and-Math.hypot.patch => 0078-Canvas-Optimize-Math.round-and-Math.hypot.patch} (100%) rename patches/server/{0077-Canvas-Entity-Goal-Optimizations.patch => 0079-Canvas-Entity-Goal-Optimizations.patch} (100%) rename patches/server/{0078-Canvas-Optimize-Entity-Pathfinding.patch => 0080-Canvas-Optimize-Entity-Pathfinding.patch} (100%) rename patches/server/{0079-CarpetFix-incorrectBounceLogicFix.patch => 0081-CarpetFix-incorrectBounceLogicFix.patch} (100%) rename patches/server/{0080-CarpetFix-explosionBreaksItemFrameInWaterFix.patch => 0082-CarpetFix-explosionBreaksItemFrameInWaterFix.patch} (100%) rename patches/server/{0081-CarpetFix-Use-optimized-RecipeManager.patch => 0083-CarpetFix-Use-optimized-RecipeManager.patch} (100%) rename patches/server/{0082-CarpetFix-Optimized-getBiome-method.patch => 0084-CarpetFix-Optimized-getBiome-method.patch} (100%) rename patches/server/{0083-Carpet-TIS-Addition-Random-flatten-triangular-distri.patch => 0085-Carpet-TIS-Addition-Random-flatten-triangular-distri.patch} (100%) rename patches/server/{0084-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch => 0086-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch} (100%) rename patches/server/{0085-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch => 0087-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch} (100%) rename patches/server/{0086-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch => 0088-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch} (100%) rename patches/server/{0087-SparklyPaper-Rewrite-framed-map-tracker-ticking.patch => 0089-SparklyPaper-Rewrite-framed-map-tracker-ticking.patch} (100%) rename patches/server/{0088-Gale-Use-platform-math-functions.patch => 0090-Gale-Use-platform-math-functions.patch} (100%) rename patches/server/{0089-Gale-Faster-floating-point-positive-modulo.patch => 0091-Gale-Faster-floating-point-positive-modulo.patch} (100%) rename patches/server/{0090-Gale-Specific-interval-TPS-API.patch => 0092-Gale-Specific-interval-TPS-API.patch} (100%) rename patches/server/{0091-Gale-Reduce-block-destruction-packet-allocations.patch => 0093-Gale-Reduce-block-destruction-packet-allocations.patch} (100%) rename patches/server/{0092-Gale-Optimize-matching-item-checks.patch => 0094-Gale-Optimize-matching-item-checks.patch} (100%) rename patches/server/{0093-Gale-Store-mob-counts-in-an-array.patch => 0095-Gale-Store-mob-counts-in-an-array.patch} (100%) rename patches/server/{0094-Gale-For-collision-check-has-physics-before-same-veh.patch => 0096-Gale-For-collision-check-has-physics-before-same-veh.patch} (100%) rename patches/server/{0095-Gale-Skip-negligible-planar-movement-multiplication.patch => 0097-Gale-Skip-negligible-planar-movement-multiplication.patch} (100%) rename patches/server/{0096-Gale-Pre-compute-VarLong-sizes.patch => 0098-Gale-Pre-compute-VarLong-sizes.patch} (100%) rename patches/server/{0097-Gale-Optimize-VarInt-write-and-VarLong-write.patch => 0099-Gale-Optimize-VarInt-write-and-VarLong-write.patch} (100%) rename patches/server/{0098-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch => 0100-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch} (100%) rename patches/server/{0099-Gale-Reduce-acquire-POI-for-stuck-entities.patch => 0101-Gale-Reduce-acquire-POI-for-stuck-entities.patch} (100%) rename patches/server/{0100-MemoryLeakFix-Biome.patch => 0102-MemoryLeakFix-Biome.patch} (100%) rename patches/server/{0101-Paper-Check-for-block-type-in-SculkSensorBlock-canAc.patch => 0103-Paper-Check-for-block-type-in-SculkSensorBlock-canAc.patch} (100%) rename patches/server/{0102-Paper-Update-Alternate-Current-to-v1.9.patch => 0104-Paper-Update-Alternate-Current-to-v1.9.patch} (100%) rename patches/server/{0103-Paper-PR-Update-Velocity-natives.patch => 0105-Paper-PR-Update-Velocity-natives.patch} (100%) rename patches/server/{0104-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch => 0106-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch} (100%) rename patches/server/{0105-Paper-PR-Change-condition-check-order-of-entity-trac.patch => 0107-Paper-PR-Change-condition-check-order-of-entity-trac.patch} (100%) rename patches/server/{0106-Paper-PR-Fix-fetching-biomes-during-world-generation.patch => 0108-Paper-PR-Fix-fetching-biomes-during-world-generation.patch} (100%) rename patches/server/{0107-PaperPR-Skip-AI-during-inactive-ticks-for-non-aware-.patch => 0109-PaperPR-Skip-AI-during-inactive-ticks-for-non-aware-.patch} (100%) rename patches/server/{0108-lithium-precompute-shape-arrays.patch => 0110-lithium-precompute-shape-arrays.patch} (100%) rename patches/server/{0109-lithium-fast-powder-snow-check.patch => 0111-lithium-fast-powder-snow-check.patch} (100%) rename patches/server/{0110-lithium-ai.raid.patch => 0112-lithium-ai.raid.patch} (100%) rename patches/server/{0111-vmp-TypeFilterableList.patch => 0113-vmp-TypeFilterableList.patch} (100%) rename patches/server/{0112-vmp-skip-entity-move-if-movement-is-zero.patch => 0114-vmp-skip-entity-move-if-movement-is-zero.patch} (100%) rename patches/server/{0113-Slice-Improve-map-saving-performance.patch => 0115-Slice-Improve-map-saving-performance.patch} (100%) rename patches/server/{0114-Slice-noEntityCollisions-for-Entity.patch => 0116-Slice-noEntityCollisions-for-Entity.patch} (100%) rename patches/server/{0115-Slice-Allow-inventory-clicks-in-Spectator.patch => 0117-Slice-Allow-inventory-clicks-in-Spectator.patch} (100%) rename patches/server/{0116-Slice-Disable-sending-Entity-Movement-Packets.patch => 0118-Slice-Disable-sending-Entity-Movement-Packets.patch} (100%) rename patches/server/{0117-Akarin-Save-Json-list-asynchronously.patch => 0119-Akarin-Save-Json-list-asynchronously.patch} (100%) rename patches/server/{0118-Airplane-Remove-stream-in-PoiCompetitorScan.patch => 0120-Airplane-Remove-stream-in-PoiCompetitorScan.patch} (100%) rename patches/server/{0119-ScalableLux-Upstream-Starlight-Fix.patch => 0121-ScalableLux-Upstream-Starlight-Fix.patch} (100%) rename patches/server/{0120-Kiterino-New-liquid-physics.patch => 0122-Kiterino-New-liquid-physics.patch} (100%) diff --git a/patches/server/0005-VineLogger.patch b/patches/server/0005-VineLogger.patch index 1d8fe9d..ae7729f 100644 --- a/patches/server/0005-VineLogger.patch +++ b/patches/server/0005-VineLogger.patch @@ -6,18 +6,19 @@ Subject: [PATCH] VineLogger diff --git a/src/main/kotlin/one/tranic/vine/util/VineLogger.kt b/src/main/kotlin/one/tranic/vine/util/VineLogger.kt new file mode 100644 -index 0000000000000000000000000000000000000000..817eb350fc7cce5bed9b7afffc681b7f42d92e2f +index 0000000000000000000000000000000000000000..9c3a9a5c74d16b2cd650188c3d2a386d9e885da4 --- /dev/null +++ b/src/main/kotlin/one/tranic/vine/util/VineLogger.kt -@@ -0,0 +1,53 @@ +@@ -0,0 +1,54 @@ +package one.tranic.vine.util + +import net.minecraft.server.MinecraftServer ++import org.slf4j.Logger + +object VineLogger { -+ private val logger: org.slf4j.Logger = MinecraftServer.LOGGER ++ private val logger: Logger = MinecraftServer.LOGGER + -+ fun get(): org.slf4j.Logger { ++ fun get(): Logger { + return logger + } + @@ -29,7 +30,7 @@ index 0000000000000000000000000000000000000000..817eb350fc7cce5bed9b7afffc681b7f + logger.info(msg, args) + } + -+ fun info(msg: List) { ++ fun info(msg: kotlin.collections.List) { + for (str in msg) { + logger.info(str) + } @@ -43,7 +44,7 @@ index 0000000000000000000000000000000000000000..817eb350fc7cce5bed9b7afffc681b7f + logger.warn(msg, args) + } + -+ fun warn(msg: List) { ++ fun warn(msg: kotlin.collections.List) { + for (str in msg) { + logger.warn(str) + } @@ -57,7 +58,7 @@ index 0000000000000000000000000000000000000000..817eb350fc7cce5bed9b7afffc681b7f + logger.error(msg, args) + } + -+ fun error(msg: List) { ++ fun error(msg: kotlin.collections.List) { + for (str in msg) { + logger.error(str) + } diff --git a/patches/server/0007-List-Utils.patch b/patches/server/0007-List-Utils.patch new file mode 100644 index 0000000..bef4447 --- /dev/null +++ b/patches/server/0007-List-Utils.patch @@ -0,0 +1,40 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: 404Setup <153366651+404Setup@users.noreply.github.com> +Date: Tue, 22 Oct 2024 11:16:12 +0800 +Subject: [PATCH] List Utils + + +diff --git a/src/main/java/one/tranic/vine/util/List.java b/src/main/java/one/tranic/vine/util/List.java +new file mode 100644 +index 0000000000000000000000000000000000000000..2f782f7bca06ded6000c697c0d937352e8b6c710 +--- /dev/null ++++ b/src/main/java/one/tranic/vine/util/List.java +@@ -0,0 +1,28 @@ ++package one.tranic.vine.util; ++ ++import com.google.common.collect.Iterators; ++import org.jetbrains.annotations.Nullable; ++ ++import java.util.Collection; ++ ++import static com.google.common.base.Preconditions.checkNotNull; ++ ++public class List { ++ public static java.util.List newList() { ++ return new it.unimi.dsi.fastutil.objects.ObjectArrayList<>(); ++ } ++ ++ public static java.util.List newList(Iterable elements) { ++ checkNotNull(elements); ++ if (elements instanceof Collection) { ++ return newList((Collection) elements); ++ } ++ java.util.List list = newList(); ++ Iterators.addAll(list, elements.iterator()); ++ return list; ++ } ++ ++ public static java.util.List newList(Collection c) { ++ return new it.unimi.dsi.fastutil.objects.ObjectArrayList<>(c); ++ } ++} diff --git a/patches/server/0007-Command-Utils.patch b/patches/server/0008-Command-Utils.patch similarity index 100% rename from patches/server/0007-Command-Utils.patch rename to patches/server/0008-Command-Utils.patch diff --git a/patches/server/0008-Vine-Config-Util.patch b/patches/server/0009-Vine-Config-Util.patch similarity index 100% rename from patches/server/0008-Vine-Config-Util.patch rename to patches/server/0009-Vine-Config-Util.patch diff --git a/patches/server/0009-Vine-Config-Fix.patch b/patches/server/0010-Vine-Config-Fix.patch similarity index 100% rename from patches/server/0009-Vine-Config-Fix.patch rename to patches/server/0010-Vine-Config-Fix.patch diff --git a/patches/server/0010-Vine-Config-Feature.patch b/patches/server/0011-Vine-Config-Feature.patch similarity index 100% rename from patches/server/0010-Vine-Config-Feature.patch rename to patches/server/0011-Vine-Config-Feature.patch diff --git a/patches/server/0011-Vine-Config-Optimize.patch b/patches/server/0012-Vine-Config-Optimize.patch similarity index 100% rename from patches/server/0011-Vine-Config-Optimize.patch rename to patches/server/0012-Vine-Config-Optimize.patch diff --git a/patches/server/0012-Config-command.patch b/patches/server/0013-Config-command.patch similarity index 100% rename from patches/server/0012-Config-command.patch rename to patches/server/0013-Config-command.patch diff --git a/patches/server/0013-Preload-Utils.patch b/patches/server/0014-Preload-Utils.patch similarity index 100% rename from patches/server/0013-Preload-Utils.patch rename to patches/server/0014-Preload-Utils.patch diff --git a/patches/server/0014-Add-vine-and-shreddedpaper-configuration-files-to-sp.patch b/patches/server/0015-Add-vine-and-shreddedpaper-configuration-files-to-sp.patch similarity index 100% rename from patches/server/0014-Add-vine-and-shreddedpaper-configuration-files-to-sp.patch rename to patches/server/0015-Add-vine-and-shreddedpaper-configuration-files-to-sp.patch diff --git a/patches/server/0015-Fix-console-freeze.patch b/patches/server/0016-Fix-console-freeze.patch similarity index 100% rename from patches/server/0015-Fix-console-freeze.patch rename to patches/server/0016-Fix-console-freeze.patch diff --git a/patches/server/0016-AnyThread-Utils.patch b/patches/server/0017-AnyThread-Utils.patch similarity index 100% rename from patches/server/0016-AnyThread-Utils.patch rename to patches/server/0017-AnyThread-Utils.patch diff --git a/patches/server/0017-EventManager.patch b/patches/server/0018-EventManager.patch similarity index 100% rename from patches/server/0017-EventManager.patch rename to patches/server/0018-EventManager.patch diff --git a/patches/server/0018-PermissionManager.patch b/patches/server/0019-PermissionManager.patch similarity index 100% rename from patches/server/0018-PermissionManager.patch rename to patches/server/0019-PermissionManager.patch diff --git a/patches/server/0019-ThreadInfoCommand.patch b/patches/server/0020-ThreadInfoCommand.patch similarity index 100% rename from patches/server/0019-ThreadInfoCommand.patch rename to patches/server/0020-ThreadInfoCommand.patch diff --git a/patches/server/0020-Nbt-Utils.patch b/patches/server/0021-Nbt-Utils.patch similarity index 100% rename from patches/server/0020-Nbt-Utils.patch rename to patches/server/0021-Nbt-Utils.patch diff --git a/patches/server/0021-Virtual-threads-1.0.patch b/patches/server/0022-Virtual-threads-1.0.patch similarity index 100% rename from patches/server/0021-Virtual-threads-1.0.patch rename to patches/server/0022-Virtual-threads-1.0.patch diff --git a/patches/server/0022-Virtual-Thread-2.0-Beta.patch b/patches/server/0023-Virtual-Thread-2.0-Beta.patch similarity index 100% rename from patches/server/0022-Virtual-Thread-2.0-Beta.patch rename to patches/server/0023-Virtual-Thread-2.0-Beta.patch diff --git a/patches/server/0023-SectorFile.patch b/patches/server/0024-SectorFile.patch similarity index 100% rename from patches/server/0023-SectorFile.patch rename to patches/server/0024-SectorFile.patch diff --git a/patches/server/0024-Linear.patch b/patches/server/0025-Linear.patch similarity index 100% rename from patches/server/0024-Linear.patch rename to patches/server/0025-Linear.patch diff --git a/patches/server/0025-BossBarTask.patch b/patches/server/0026-BossBarTask.patch similarity index 100% rename from patches/server/0025-BossBarTask.patch rename to patches/server/0026-BossBarTask.patch diff --git a/patches/server/0026-GUI-Theme.patch b/patches/server/0027-GUI-Theme.patch similarity index 100% rename from patches/server/0026-GUI-Theme.patch rename to patches/server/0027-GUI-Theme.patch diff --git a/patches/server/0027-GLOBAL_SOUND-is-disabled-by-default.patch b/patches/server/0028-GLOBAL_SOUND-is-disabled-by-default.patch similarity index 100% rename from patches/server/0027-GLOBAL_SOUND-is-disabled-by-default.patch rename to patches/server/0028-GLOBAL_SOUND-is-disabled-by-default.patch diff --git a/patches/server/0028-Don-t-allocate-too-many-threads-at-the-default.patch b/patches/server/0029-Don-t-allocate-too-many-threads-at-the-default.patch similarity index 100% rename from patches/server/0028-Don-t-allocate-too-many-threads-at-the-default.patch rename to patches/server/0029-Don-t-allocate-too-many-threads-at-the-default.patch diff --git a/patches/server/0029-The-anvil-becomes-a-drop-at-Y0.patch b/patches/server/0030-The-anvil-becomes-a-drop-at-Y0.patch similarity index 100% rename from patches/server/0029-The-anvil-becomes-a-drop-at-Y0.patch rename to patches/server/0030-The-anvil-becomes-a-drop-at-Y0.patch diff --git a/patches/server/0030-Don-t-save-FireworkRocket-Entity.patch b/patches/server/0031-Don-t-save-FireworkRocket-Entity.patch similarity index 100% rename from patches/server/0030-Don-t-save-FireworkRocket-Entity.patch rename to patches/server/0031-Don-t-save-FireworkRocket-Entity.patch diff --git a/patches/server/0031-Disable-respawn-ceiling.patch b/patches/server/0032-Disable-respawn-ceiling.patch similarity index 100% rename from patches/server/0031-Disable-respawn-ceiling.patch rename to patches/server/0032-Disable-respawn-ceiling.patch diff --git a/patches/server/0032-Store-gamerules-in-fastutil-hashmap.patch b/patches/server/0033-Store-gamerules-in-fastutil-hashmap.patch similarity index 100% rename from patches/server/0032-Store-gamerules-in-fastutil-hashmap.patch rename to patches/server/0033-Store-gamerules-in-fastutil-hashmap.patch diff --git a/patches/server/0033-disable-spark.patch b/patches/server/0034-disable-spark.patch similarity index 100% rename from patches/server/0033-disable-spark.patch rename to patches/server/0034-disable-spark.patch diff --git a/patches/server/0034-SIMD-support-range-adjustment.patch b/patches/server/0035-SIMD-support-range-adjustment.patch similarity index 100% rename from patches/server/0034-SIMD-support-range-adjustment.patch rename to patches/server/0035-SIMD-support-range-adjustment.patch diff --git a/patches/server/0035-Skip-empty-events.patch b/patches/server/0036-Skip-empty-events.patch similarity index 100% rename from patches/server/0035-Skip-empty-events.patch rename to patches/server/0036-Skip-empty-events.patch diff --git a/patches/server/0037-Some-nbt-changes.patch b/patches/server/0037-Some-nbt-changes.patch new file mode 100644 index 0000000..35b5cd5 --- /dev/null +++ b/patches/server/0037-Some-nbt-changes.patch @@ -0,0 +1,95 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: 404Setup <153366651+404Setup@users.noreply.github.com> +Date: Tue, 22 Oct 2024 10:21:19 +0800 +Subject: [PATCH] Some nbt changes + + +diff --git a/src/main/java/net/minecraft/nbt/CompoundTag.java b/src/main/java/net/minecraft/nbt/CompoundTag.java +index 4e005b7b062e3231f564d284887ea1c2783a4e7d..9d306ae46d4a5720561b1628f7440d6ef99e9f6c 100644 +--- a/src/main/java/net/minecraft/nbt/CompoundTag.java ++++ b/src/main/java/net/minecraft/nbt/CompoundTag.java +@@ -492,7 +492,7 @@ public class CompoundTag implements Tag { + } + + protected CompoundTag shallowCopy() { +- return new CompoundTag(new HashMap<>(this.tags)); ++ return new CompoundTag(new it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap<>(this.tags)); + } + + @Override +diff --git a/src/main/java/net/minecraft/nbt/ListTag.java b/src/main/java/net/minecraft/nbt/ListTag.java +index 154bffd341e43be0a0fa710cfbed1a2094f249a3..3b77b59be0d09b77efc3ec3eb6f50c073bfcfc27 100644 +--- a/src/main/java/net/minecraft/nbt/ListTag.java ++++ b/src/main/java/net/minecraft/nbt/ListTag.java +@@ -1,7 +1,6 @@ + package net.minecraft.nbt; + + import com.google.common.collect.Iterables; +-import com.google.common.collect.Lists; + import java.io.DataInput; + import java.io.DataOutput; + import java.io.IOException; +@@ -35,7 +34,7 @@ public class ListTag extends CollectionTag { + } else { + tracker.accountBytes(4L, (long)i); + TagType tagType = TagTypes.getType(b); +- List list = Lists.newArrayListWithCapacity(i); ++ List list = new it.unimi.dsi.fastutil.objects.ObjectArrayList<>(i); + + for (int j = 0; j < i; j++) { + list.add(tagType.load(input, tracker)); +@@ -142,7 +141,7 @@ public class ListTag extends CollectionTag { + } + + public ListTag() { +- this(Lists.newArrayList(), (byte)0); ++ this(new it.unimi.dsi.fastutil.objects.ObjectArrayList<>(), (byte)0); + } + + @Override +@@ -363,8 +362,8 @@ public class ListTag extends CollectionTag { + + @Override + public ListTag copy() { +- Iterable iterable = (Iterable)(TagTypes.getType(this.type).isValue() ? this.list : Iterables.transform(this.list, Tag::copy)); +- List list = Lists.newArrayList(iterable); ++ Iterable iterable = TagTypes.getType(this.type).isValue() ? this.list : Iterables.transform(this.list, Tag::copy); ++ List list = one.tranic.vine.util.List.newList(iterable); + return new ListTag(list, this.type); + } + +diff --git a/src/main/java/net/minecraft/nbt/NbtOps.java b/src/main/java/net/minecraft/nbt/NbtOps.java +index 576a92501660dad06f6a40bc5d6d878592be6044..fb3396ae8239eaf8a699fc2927e26153e185d385 100644 +--- a/src/main/java/net/minecraft/nbt/NbtOps.java ++++ b/src/main/java/net/minecraft/nbt/NbtOps.java +@@ -127,7 +127,7 @@ public class NbtOps implements DynamicOps { + return DataResult.error(() -> "mergeToMap called with not a map: " + tag, tag); + } else { + CompoundTag compoundTag2 = tag instanceof CompoundTag compoundTag ? compoundTag.shallowCopy() : new CompoundTag(); +- List list = new ArrayList<>(); ++ List list = new it.unimi.dsi.fastutil.objects.ObjectArrayList<>(); + mapLike.entries().forEach(pair -> { + Tag tagx = pair.getFirst(); + if (!(tagx instanceof StringTag)) { +@@ -145,7 +145,7 @@ public class NbtOps implements DynamicOps { + return DataResult.error(() -> "mergeToMap called with not a map: " + tag, tag); + } else { + CompoundTag compoundTag2 = tag instanceof CompoundTag compoundTag ? compoundTag.shallowCopy() : new CompoundTag(); +- List list = new ArrayList<>(); ++ List list = new it.unimi.dsi.fastutil.objects.ObjectArrayList<>(); + + for (Entry entry : map.entrySet()) { + Tag tag2 = entry.getKey(); +diff --git a/src/main/java/net/minecraft/nbt/NbtUtils.java b/src/main/java/net/minecraft/nbt/NbtUtils.java +index f88dd37783b3c155c23b547c360b8d3c16e030c0..a14a3e62258a77d6f135accacb90f46672980607 100644 +--- a/src/main/java/net/minecraft/nbt/NbtUtils.java ++++ b/src/main/java/net/minecraft/nbt/NbtUtils.java +@@ -306,7 +306,7 @@ public final class NbtUtils { + break; + case 10: + CompoundTag compoundTag = (CompoundTag)nbt; +- List list = Lists.newArrayList(compoundTag.getAllKeys()); ++ List list = one.tranic.vine.util.List.newList(compoundTag.getAllKeys()); + Collections.sort(list); + indent(depth, stringBuilder).append('{'); + if (stringBuilder.length() - stringBuilder.lastIndexOf("\n") > 2 * (depth + 1)) { diff --git a/patches/server/0036-Leaf-Fix-MC-119417.patch b/patches/server/0038-Leaf-Fix-MC-119417.patch similarity index 100% rename from patches/server/0036-Leaf-Fix-MC-119417.patch rename to patches/server/0038-Leaf-Fix-MC-119417.patch diff --git a/patches/server/0037-Leaf-Fix-MC-266334.patch b/patches/server/0039-Leaf-Fix-MC-266334.patch similarity index 100% rename from patches/server/0037-Leaf-Fix-MC-266334.patch rename to patches/server/0039-Leaf-Fix-MC-266334.patch diff --git a/patches/server/0038-Leaf-Fix-MC-200418.patch b/patches/server/0040-Leaf-Fix-MC-200418.patch similarity index 100% rename from patches/server/0038-Leaf-Fix-MC-200418.patch rename to patches/server/0040-Leaf-Fix-MC-200418.patch diff --git a/patches/server/0039-Leaf-Fix-MC-183518.patch b/patches/server/0041-Leaf-Fix-MC-183518.patch similarity index 100% rename from patches/server/0039-Leaf-Fix-MC-183518.patch rename to patches/server/0041-Leaf-Fix-MC-183518.patch diff --git a/patches/server/0040-Leaf-Fix-sprint-glitch.patch b/patches/server/0042-Leaf-Fix-sprint-glitch.patch similarity index 100% rename from patches/server/0040-Leaf-Fix-sprint-glitch.patch rename to patches/server/0042-Leaf-Fix-sprint-glitch.patch diff --git a/patches/server/0041-Leaf-Remove-stream-in-BlockBehaviour-cache-blockstat.patch b/patches/server/0043-Leaf-Remove-stream-in-BlockBehaviour-cache-blockstat.patch similarity index 100% rename from patches/server/0041-Leaf-Remove-stream-in-BlockBehaviour-cache-blockstat.patch rename to patches/server/0043-Leaf-Remove-stream-in-BlockBehaviour-cache-blockstat.patch diff --git a/patches/server/0042-Leaf-Remove-stream-and-double-iteration-in-enough-de.patch b/patches/server/0044-Leaf-Remove-stream-and-double-iteration-in-enough-de.patch similarity index 100% rename from patches/server/0042-Leaf-Remove-stream-and-double-iteration-in-enough-de.patch rename to patches/server/0044-Leaf-Remove-stream-and-double-iteration-in-enough-de.patch diff --git a/patches/server/0043-Leaf-Don-t-save-falling-block-entity.patch b/patches/server/0045-Leaf-Don-t-save-falling-block-entity.patch similarity index 100% rename from patches/server/0043-Leaf-Don-t-save-falling-block-entity.patch rename to patches/server/0045-Leaf-Don-t-save-falling-block-entity.patch diff --git a/patches/server/0044-Leaf-Don-t-save-primed-tnt-entity.patch b/patches/server/0046-Leaf-Don-t-save-primed-tnt-entity.patch similarity index 100% rename from patches/server/0044-Leaf-Don-t-save-primed-tnt-entity.patch rename to patches/server/0046-Leaf-Don-t-save-primed-tnt-entity.patch diff --git a/patches/server/0045-Leaf-Optimize-Minecart-collisions.patch b/patches/server/0047-Leaf-Optimize-Minecart-collisions.patch similarity index 100% rename from patches/server/0045-Leaf-Optimize-Minecart-collisions.patch rename to patches/server/0047-Leaf-Optimize-Minecart-collisions.patch diff --git a/patches/server/0046-Leaf-Faster-sequencing-of-futures-for-chunk-structur.patch b/patches/server/0048-Leaf-Faster-sequencing-of-futures-for-chunk-structur.patch similarity index 100% rename from patches/server/0046-Leaf-Faster-sequencing-of-futures-for-chunk-structur.patch rename to patches/server/0048-Leaf-Faster-sequencing-of-futures-for-chunk-structur.patch diff --git a/patches/server/0047-Leaf-Cache-player-profileResult.patch b/patches/server/0049-Leaf-Cache-player-profileResult.patch similarity index 100% rename from patches/server/0047-Leaf-Cache-player-profileResult.patch rename to patches/server/0049-Leaf-Cache-player-profileResult.patch diff --git a/patches/server/0048-Leaf-Use-caffeine-cache-kickPermission-instead-of-us.patch b/patches/server/0050-Leaf-Use-caffeine-cache-kickPermission-instead-of-us.patch similarity index 100% rename from patches/server/0048-Leaf-Use-caffeine-cache-kickPermission-instead-of-us.patch rename to patches/server/0050-Leaf-Use-caffeine-cache-kickPermission-instead-of-us.patch diff --git a/patches/server/0049-Leaves-Zero-tick-plants.patch b/patches/server/0051-Leaves-Zero-tick-plants.patch similarity index 100% rename from patches/server/0049-Leaves-Zero-tick-plants.patch rename to patches/server/0051-Leaves-Zero-tick-plants.patch diff --git a/patches/server/0050-Leaves-Entity-Utils.patch b/patches/server/0052-Leaves-Entity-Utils.patch similarity index 100% rename from patches/server/0050-Leaves-Entity-Utils.patch rename to patches/server/0052-Leaves-Entity-Utils.patch diff --git a/patches/server/0051-Leaves-Return-nether-portal-fix.patch b/patches/server/0053-Leaves-Return-nether-portal-fix.patch similarity index 100% rename from patches/server/0051-Leaves-Return-nether-portal-fix.patch rename to patches/server/0053-Leaves-Return-nether-portal-fix.patch diff --git a/patches/server/0052-Leaves-Vanilla-hopper.patch b/patches/server/0054-Leaves-Vanilla-hopper.patch similarity index 100% rename from patches/server/0052-Leaves-Vanilla-hopper.patch rename to patches/server/0054-Leaves-Vanilla-hopper.patch diff --git a/patches/server/0053-Leaves-Raider-die-skip-self-raid-check.patch b/patches/server/0055-Leaves-Raider-die-skip-self-raid-check.patch similarity index 100% rename from patches/server/0053-Leaves-Raider-die-skip-self-raid-check.patch rename to patches/server/0055-Leaves-Raider-die-skip-self-raid-check.patch diff --git a/patches/server/0054-Leaves-Fix-villagers-dont-release-memory.patch b/patches/server/0056-Leaves-Fix-villagers-dont-release-memory.patch similarity index 100% rename from patches/server/0054-Leaves-Fix-villagers-dont-release-memory.patch rename to patches/server/0056-Leaves-Fix-villagers-dont-release-memory.patch diff --git a/patches/server/0055-Leaves-Fix-falling-block-s-block-location.patch b/patches/server/0057-Leaves-Fix-falling-block-s-block-location.patch similarity index 100% rename from patches/server/0055-Leaves-Fix-falling-block-s-block-location.patch rename to patches/server/0057-Leaves-Fix-falling-block-s-block-location.patch diff --git a/patches/server/0056-Pufferfish-Optimize-entity-coordinate-key.patch b/patches/server/0058-Pufferfish-Optimize-entity-coordinate-key.patch similarity index 100% rename from patches/server/0056-Pufferfish-Optimize-entity-coordinate-key.patch rename to patches/server/0058-Pufferfish-Optimize-entity-coordinate-key.patch diff --git a/patches/server/0057-Pufferfish-Improve-container-checking-with-a-bitset.patch b/patches/server/0059-Pufferfish-Improve-container-checking-with-a-bitset.patch similarity index 100% rename from patches/server/0057-Pufferfish-Improve-container-checking-with-a-bitset.patch rename to patches/server/0059-Pufferfish-Improve-container-checking-with-a-bitset.patch diff --git a/patches/server/0058-Mobtimizations-RePathing-optimization.patch b/patches/server/0060-Mobtimizations-RePathing-optimization.patch similarity index 100% rename from patches/server/0058-Mobtimizations-RePathing-optimization.patch rename to patches/server/0060-Mobtimizations-RePathing-optimization.patch diff --git a/patches/server/0059-Mobtimizations-Optimization-Zombie-Search-And-Destro.patch b/patches/server/0061-Mobtimizations-Optimization-Zombie-Search-And-Destro.patch similarity index 100% rename from patches/server/0059-Mobtimizations-Optimization-Zombie-Search-And-Destro.patch rename to patches/server/0061-Mobtimizations-Optimization-Zombie-Search-And-Destro.patch diff --git a/patches/server/0060-Divine-Implement-Secure-Seed.patch b/patches/server/0062-Divine-Implement-Secure-Seed.patch similarity index 100% rename from patches/server/0060-Divine-Implement-Secure-Seed.patch rename to patches/server/0062-Divine-Implement-Secure-Seed.patch diff --git a/patches/server/0061-Divine-Fix-MC-31819.patch b/patches/server/0063-Divine-Fix-MC-31819.patch similarity index 100% rename from patches/server/0061-Divine-Fix-MC-31819.patch rename to patches/server/0063-Divine-Fix-MC-31819.patch diff --git a/patches/server/0062-Divine-Fix-MC-172801.patch b/patches/server/0064-Divine-Fix-MC-172801.patch similarity index 100% rename from patches/server/0062-Divine-Fix-MC-172801.patch rename to patches/server/0064-Divine-Fix-MC-172801.patch diff --git a/patches/server/0063-Divine-Fix-MC-2025.patch b/patches/server/0065-Divine-Fix-MC-2025.patch similarity index 100% rename from patches/server/0063-Divine-Fix-MC-2025.patch rename to patches/server/0065-Divine-Fix-MC-2025.patch diff --git a/patches/server/0064-Divine-C2ME-reduce_allocs.patch b/patches/server/0066-Divine-C2ME-reduce_allocs.patch similarity index 100% rename from patches/server/0064-Divine-C2ME-reduce_allocs.patch rename to patches/server/0066-Divine-C2ME-reduce_allocs.patch diff --git a/patches/server/0065-Divine-C2ME-opts-math.patch b/patches/server/0067-Divine-C2ME-opts-math.patch similarity index 100% rename from patches/server/0065-Divine-C2ME-opts-math.patch rename to patches/server/0067-Divine-C2ME-opts-math.patch diff --git a/patches/server/0066-Divine-Fix-MC-7569.patch b/patches/server/0068-Divine-Fix-MC-7569.patch similarity index 100% rename from patches/server/0066-Divine-Fix-MC-7569.patch rename to patches/server/0068-Divine-Fix-MC-7569.patch diff --git a/patches/server/0067-Divine-lithium-math.sine_lut.patch b/patches/server/0069-Divine-lithium-math.sine_lut.patch similarity index 100% rename from patches/server/0067-Divine-lithium-math.sine_lut.patch rename to patches/server/0069-Divine-lithium-math.sine_lut.patch diff --git a/patches/server/0068-Divine-lithium-cached_hashcode.patch b/patches/server/0070-Divine-lithium-cached_hashcode.patch similarity index 100% rename from patches/server/0068-Divine-lithium-cached_hashcode.patch rename to patches/server/0070-Divine-lithium-cached_hashcode.patch diff --git a/patches/server/0069-Divine-Fix-MC-93826.patch b/patches/server/0071-Divine-Fix-MC-93826.patch similarity index 100% rename from patches/server/0069-Divine-Fix-MC-93826.patch rename to patches/server/0071-Divine-Fix-MC-93826.patch diff --git a/patches/server/0070-Divine-Fix-MC-110386.patch b/patches/server/0072-Divine-Fix-MC-110386.patch similarity index 100% rename from patches/server/0070-Divine-Fix-MC-110386.patch rename to patches/server/0072-Divine-Fix-MC-110386.patch diff --git a/patches/server/0071-Divine-Fix-MC-98160-and-MC-105103.patch b/patches/server/0073-Divine-Fix-MC-98160-and-MC-105103.patch similarity index 100% rename from patches/server/0071-Divine-Fix-MC-98160-and-MC-105103.patch rename to patches/server/0073-Divine-Fix-MC-98160-and-MC-105103.patch diff --git a/patches/server/0072-Divine-Fix-MC-93018.patch b/patches/server/0074-Divine-Fix-MC-93018.patch similarity index 100% rename from patches/server/0072-Divine-Fix-MC-93018.patch rename to patches/server/0074-Divine-Fix-MC-93018.patch diff --git a/patches/server/0073-Divine-Fix-MC-65198.patch b/patches/server/0075-Divine-Fix-MC-65198.patch similarity index 100% rename from patches/server/0073-Divine-Fix-MC-65198.patch rename to patches/server/0075-Divine-Fix-MC-65198.patch diff --git a/patches/server/0074-Divine-Fix-MC-167242.patch b/patches/server/0076-Divine-Fix-MC-167242.patch similarity index 100% rename from patches/server/0074-Divine-Fix-MC-167242.patch rename to patches/server/0076-Divine-Fix-MC-167242.patch diff --git a/patches/server/0075-Canvas-Dont-load-chunks-to-spawn-phantoms.patch b/patches/server/0077-Canvas-Dont-load-chunks-to-spawn-phantoms.patch similarity index 100% rename from patches/server/0075-Canvas-Dont-load-chunks-to-spawn-phantoms.patch rename to patches/server/0077-Canvas-Dont-load-chunks-to-spawn-phantoms.patch diff --git a/patches/server/0076-Canvas-Optimize-Math.round-and-Math.hypot.patch b/patches/server/0078-Canvas-Optimize-Math.round-and-Math.hypot.patch similarity index 100% rename from patches/server/0076-Canvas-Optimize-Math.round-and-Math.hypot.patch rename to patches/server/0078-Canvas-Optimize-Math.round-and-Math.hypot.patch diff --git a/patches/server/0077-Canvas-Entity-Goal-Optimizations.patch b/patches/server/0079-Canvas-Entity-Goal-Optimizations.patch similarity index 100% rename from patches/server/0077-Canvas-Entity-Goal-Optimizations.patch rename to patches/server/0079-Canvas-Entity-Goal-Optimizations.patch diff --git a/patches/server/0078-Canvas-Optimize-Entity-Pathfinding.patch b/patches/server/0080-Canvas-Optimize-Entity-Pathfinding.patch similarity index 100% rename from patches/server/0078-Canvas-Optimize-Entity-Pathfinding.patch rename to patches/server/0080-Canvas-Optimize-Entity-Pathfinding.patch diff --git a/patches/server/0079-CarpetFix-incorrectBounceLogicFix.patch b/patches/server/0081-CarpetFix-incorrectBounceLogicFix.patch similarity index 100% rename from patches/server/0079-CarpetFix-incorrectBounceLogicFix.patch rename to patches/server/0081-CarpetFix-incorrectBounceLogicFix.patch diff --git a/patches/server/0080-CarpetFix-explosionBreaksItemFrameInWaterFix.patch b/patches/server/0082-CarpetFix-explosionBreaksItemFrameInWaterFix.patch similarity index 100% rename from patches/server/0080-CarpetFix-explosionBreaksItemFrameInWaterFix.patch rename to patches/server/0082-CarpetFix-explosionBreaksItemFrameInWaterFix.patch diff --git a/patches/server/0081-CarpetFix-Use-optimized-RecipeManager.patch b/patches/server/0083-CarpetFix-Use-optimized-RecipeManager.patch similarity index 100% rename from patches/server/0081-CarpetFix-Use-optimized-RecipeManager.patch rename to patches/server/0083-CarpetFix-Use-optimized-RecipeManager.patch diff --git a/patches/server/0082-CarpetFix-Optimized-getBiome-method.patch b/patches/server/0084-CarpetFix-Optimized-getBiome-method.patch similarity index 100% rename from patches/server/0082-CarpetFix-Optimized-getBiome-method.patch rename to patches/server/0084-CarpetFix-Optimized-getBiome-method.patch diff --git a/patches/server/0083-Carpet-TIS-Addition-Random-flatten-triangular-distri.patch b/patches/server/0085-Carpet-TIS-Addition-Random-flatten-triangular-distri.patch similarity index 100% rename from patches/server/0083-Carpet-TIS-Addition-Random-flatten-triangular-distri.patch rename to patches/server/0085-Carpet-TIS-Addition-Random-flatten-triangular-distri.patch diff --git a/patches/server/0084-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/patches/server/0086-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 100% rename from patches/server/0084-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch rename to patches/server/0086-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch diff --git a/patches/server/0085-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch b/patches/server/0087-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch similarity index 100% rename from patches/server/0085-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch rename to patches/server/0087-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch diff --git a/patches/server/0086-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch b/patches/server/0088-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch similarity index 100% rename from patches/server/0086-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch rename to patches/server/0088-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch diff --git a/patches/server/0087-SparklyPaper-Rewrite-framed-map-tracker-ticking.patch b/patches/server/0089-SparklyPaper-Rewrite-framed-map-tracker-ticking.patch similarity index 100% rename from patches/server/0087-SparklyPaper-Rewrite-framed-map-tracker-ticking.patch rename to patches/server/0089-SparklyPaper-Rewrite-framed-map-tracker-ticking.patch diff --git a/patches/server/0088-Gale-Use-platform-math-functions.patch b/patches/server/0090-Gale-Use-platform-math-functions.patch similarity index 100% rename from patches/server/0088-Gale-Use-platform-math-functions.patch rename to patches/server/0090-Gale-Use-platform-math-functions.patch diff --git a/patches/server/0089-Gale-Faster-floating-point-positive-modulo.patch b/patches/server/0091-Gale-Faster-floating-point-positive-modulo.patch similarity index 100% rename from patches/server/0089-Gale-Faster-floating-point-positive-modulo.patch rename to patches/server/0091-Gale-Faster-floating-point-positive-modulo.patch diff --git a/patches/server/0090-Gale-Specific-interval-TPS-API.patch b/patches/server/0092-Gale-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0090-Gale-Specific-interval-TPS-API.patch rename to patches/server/0092-Gale-Specific-interval-TPS-API.patch diff --git a/patches/server/0091-Gale-Reduce-block-destruction-packet-allocations.patch b/patches/server/0093-Gale-Reduce-block-destruction-packet-allocations.patch similarity index 100% rename from patches/server/0091-Gale-Reduce-block-destruction-packet-allocations.patch rename to patches/server/0093-Gale-Reduce-block-destruction-packet-allocations.patch diff --git a/patches/server/0092-Gale-Optimize-matching-item-checks.patch b/patches/server/0094-Gale-Optimize-matching-item-checks.patch similarity index 100% rename from patches/server/0092-Gale-Optimize-matching-item-checks.patch rename to patches/server/0094-Gale-Optimize-matching-item-checks.patch diff --git a/patches/server/0093-Gale-Store-mob-counts-in-an-array.patch b/patches/server/0095-Gale-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0093-Gale-Store-mob-counts-in-an-array.patch rename to patches/server/0095-Gale-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0094-Gale-For-collision-check-has-physics-before-same-veh.patch b/patches/server/0096-Gale-For-collision-check-has-physics-before-same-veh.patch similarity index 100% rename from patches/server/0094-Gale-For-collision-check-has-physics-before-same-veh.patch rename to patches/server/0096-Gale-For-collision-check-has-physics-before-same-veh.patch diff --git a/patches/server/0095-Gale-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0097-Gale-Skip-negligible-planar-movement-multiplication.patch similarity index 100% rename from patches/server/0095-Gale-Skip-negligible-planar-movement-multiplication.patch rename to patches/server/0097-Gale-Skip-negligible-planar-movement-multiplication.patch diff --git a/patches/server/0096-Gale-Pre-compute-VarLong-sizes.patch b/patches/server/0098-Gale-Pre-compute-VarLong-sizes.patch similarity index 100% rename from patches/server/0096-Gale-Pre-compute-VarLong-sizes.patch rename to patches/server/0098-Gale-Pre-compute-VarLong-sizes.patch diff --git a/patches/server/0097-Gale-Optimize-VarInt-write-and-VarLong-write.patch b/patches/server/0099-Gale-Optimize-VarInt-write-and-VarLong-write.patch similarity index 100% rename from patches/server/0097-Gale-Optimize-VarInt-write-and-VarLong-write.patch rename to patches/server/0099-Gale-Optimize-VarInt-write-and-VarLong-write.patch diff --git a/patches/server/0098-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0100-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 100% rename from patches/server/0098-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch rename to patches/server/0100-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch diff --git a/patches/server/0099-Gale-Reduce-acquire-POI-for-stuck-entities.patch b/patches/server/0101-Gale-Reduce-acquire-POI-for-stuck-entities.patch similarity index 100% rename from patches/server/0099-Gale-Reduce-acquire-POI-for-stuck-entities.patch rename to patches/server/0101-Gale-Reduce-acquire-POI-for-stuck-entities.patch diff --git a/patches/server/0100-MemoryLeakFix-Biome.patch b/patches/server/0102-MemoryLeakFix-Biome.patch similarity index 100% rename from patches/server/0100-MemoryLeakFix-Biome.patch rename to patches/server/0102-MemoryLeakFix-Biome.patch diff --git a/patches/server/0101-Paper-Check-for-block-type-in-SculkSensorBlock-canAc.patch b/patches/server/0103-Paper-Check-for-block-type-in-SculkSensorBlock-canAc.patch similarity index 100% rename from patches/server/0101-Paper-Check-for-block-type-in-SculkSensorBlock-canAc.patch rename to patches/server/0103-Paper-Check-for-block-type-in-SculkSensorBlock-canAc.patch diff --git a/patches/server/0102-Paper-Update-Alternate-Current-to-v1.9.patch b/patches/server/0104-Paper-Update-Alternate-Current-to-v1.9.patch similarity index 100% rename from patches/server/0102-Paper-Update-Alternate-Current-to-v1.9.patch rename to patches/server/0104-Paper-Update-Alternate-Current-to-v1.9.patch diff --git a/patches/server/0103-Paper-PR-Update-Velocity-natives.patch b/patches/server/0105-Paper-PR-Update-Velocity-natives.patch similarity index 100% rename from patches/server/0103-Paper-PR-Update-Velocity-natives.patch rename to patches/server/0105-Paper-PR-Update-Velocity-natives.patch diff --git a/patches/server/0104-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch b/patches/server/0106-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch similarity index 100% rename from patches/server/0104-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch rename to patches/server/0106-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch diff --git a/patches/server/0105-Paper-PR-Change-condition-check-order-of-entity-trac.patch b/patches/server/0107-Paper-PR-Change-condition-check-order-of-entity-trac.patch similarity index 100% rename from patches/server/0105-Paper-PR-Change-condition-check-order-of-entity-trac.patch rename to patches/server/0107-Paper-PR-Change-condition-check-order-of-entity-trac.patch diff --git a/patches/server/0106-Paper-PR-Fix-fetching-biomes-during-world-generation.patch b/patches/server/0108-Paper-PR-Fix-fetching-biomes-during-world-generation.patch similarity index 100% rename from patches/server/0106-Paper-PR-Fix-fetching-biomes-during-world-generation.patch rename to patches/server/0108-Paper-PR-Fix-fetching-biomes-during-world-generation.patch diff --git a/patches/server/0107-PaperPR-Skip-AI-during-inactive-ticks-for-non-aware-.patch b/patches/server/0109-PaperPR-Skip-AI-during-inactive-ticks-for-non-aware-.patch similarity index 100% rename from patches/server/0107-PaperPR-Skip-AI-during-inactive-ticks-for-non-aware-.patch rename to patches/server/0109-PaperPR-Skip-AI-during-inactive-ticks-for-non-aware-.patch diff --git a/patches/server/0108-lithium-precompute-shape-arrays.patch b/patches/server/0110-lithium-precompute-shape-arrays.patch similarity index 100% rename from patches/server/0108-lithium-precompute-shape-arrays.patch rename to patches/server/0110-lithium-precompute-shape-arrays.patch diff --git a/patches/server/0109-lithium-fast-powder-snow-check.patch b/patches/server/0111-lithium-fast-powder-snow-check.patch similarity index 100% rename from patches/server/0109-lithium-fast-powder-snow-check.patch rename to patches/server/0111-lithium-fast-powder-snow-check.patch diff --git a/patches/server/0110-lithium-ai.raid.patch b/patches/server/0112-lithium-ai.raid.patch similarity index 100% rename from patches/server/0110-lithium-ai.raid.patch rename to patches/server/0112-lithium-ai.raid.patch diff --git a/patches/server/0111-vmp-TypeFilterableList.patch b/patches/server/0113-vmp-TypeFilterableList.patch similarity index 100% rename from patches/server/0111-vmp-TypeFilterableList.patch rename to patches/server/0113-vmp-TypeFilterableList.patch diff --git a/patches/server/0112-vmp-skip-entity-move-if-movement-is-zero.patch b/patches/server/0114-vmp-skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0112-vmp-skip-entity-move-if-movement-is-zero.patch rename to patches/server/0114-vmp-skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0113-Slice-Improve-map-saving-performance.patch b/patches/server/0115-Slice-Improve-map-saving-performance.patch similarity index 100% rename from patches/server/0113-Slice-Improve-map-saving-performance.patch rename to patches/server/0115-Slice-Improve-map-saving-performance.patch diff --git a/patches/server/0114-Slice-noEntityCollisions-for-Entity.patch b/patches/server/0116-Slice-noEntityCollisions-for-Entity.patch similarity index 100% rename from patches/server/0114-Slice-noEntityCollisions-for-Entity.patch rename to patches/server/0116-Slice-noEntityCollisions-for-Entity.patch diff --git a/patches/server/0115-Slice-Allow-inventory-clicks-in-Spectator.patch b/patches/server/0117-Slice-Allow-inventory-clicks-in-Spectator.patch similarity index 100% rename from patches/server/0115-Slice-Allow-inventory-clicks-in-Spectator.patch rename to patches/server/0117-Slice-Allow-inventory-clicks-in-Spectator.patch diff --git a/patches/server/0116-Slice-Disable-sending-Entity-Movement-Packets.patch b/patches/server/0118-Slice-Disable-sending-Entity-Movement-Packets.patch similarity index 100% rename from patches/server/0116-Slice-Disable-sending-Entity-Movement-Packets.patch rename to patches/server/0118-Slice-Disable-sending-Entity-Movement-Packets.patch diff --git a/patches/server/0117-Akarin-Save-Json-list-asynchronously.patch b/patches/server/0119-Akarin-Save-Json-list-asynchronously.patch similarity index 100% rename from patches/server/0117-Akarin-Save-Json-list-asynchronously.patch rename to patches/server/0119-Akarin-Save-Json-list-asynchronously.patch diff --git a/patches/server/0118-Airplane-Remove-stream-in-PoiCompetitorScan.patch b/patches/server/0120-Airplane-Remove-stream-in-PoiCompetitorScan.patch similarity index 100% rename from patches/server/0118-Airplane-Remove-stream-in-PoiCompetitorScan.patch rename to patches/server/0120-Airplane-Remove-stream-in-PoiCompetitorScan.patch diff --git a/patches/server/0119-ScalableLux-Upstream-Starlight-Fix.patch b/patches/server/0121-ScalableLux-Upstream-Starlight-Fix.patch similarity index 100% rename from patches/server/0119-ScalableLux-Upstream-Starlight-Fix.patch rename to patches/server/0121-ScalableLux-Upstream-Starlight-Fix.patch diff --git a/patches/server/0120-Kiterino-New-liquid-physics.patch b/patches/server/0122-Kiterino-New-liquid-physics.patch similarity index 100% rename from patches/server/0120-Kiterino-New-liquid-physics.patch rename to patches/server/0122-Kiterino-New-liquid-physics.patch