From 5e1be48cf8cc010e0e145fe7cbbb6d02dc2f3800 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Mon, 7 Apr 2025 11:35:31 -0400 Subject: [PATCH] Some work --- ...00-Fix-Pufferfish-and-Purpur-patches.patch | 99 ++++++++----------- ...Purpur-Configurable-server-mod-name.patch} | 4 +- ...> 0102-Configurable-server-GUI-name.patch} | 0 ... 0103-Remove-vanilla-username-check.patch} | 0 ...ck-for-broken-BungeeCord-configurat.patch} | 0 ...emove-UseItemOnPacket-Too-Far-check.patch} | 2 +- ...ve-change-non-editable-sign-warning.patch} | 0 ...n-for-spigot-item-merging-mechanism.patch} | 0 ...pet-Fixes-Optimized-getBiome-method.patch} | 0 ...t-Fixes-Use-optimized-RecipeManager.patch} | 0 ...karin-Save-Json-list-asynchronously.patch} | 0 ...atch => 0111-Slice-Smooth-Teleports.patch} | 0 ...chment-Make-FixLight-use-action-bar.patch} | 0 ...tch => 0113-Petal-Async-Pathfinding.patch} | 6 +- ...duce-work-done-by-game-event-system.patch} | 0 ...rk.patch => 0115-Reduce-canSee-work.patch} | 0 ...tch.patch => 0116-Fix-sprint-glitch.patch} | 2 +- ...-of-futures-for-chunk-structure-gen.patch} | 0 ...e-items-finding-hopper-nearby-check.patch} | 0 ...-distanceToSqr-call-in-ServerEntity.patch} | 0 ...-MapItem-update-if-the-map-does-not.patch} | 0 ...-EntityScheduler-s-executeTick-chec.patch} | 8 +- ...SparklyPaper-Optimize-canSee-checks.patch} | 0 ...w-throttling-hopper-checks-if-the-t.patch} | 0 ...g-and-snowball-can-knockback-player.patch} | 0 ...getProfiler-to-inactive-in-PathNavi.patch} | 0 ...eating-stats-json-bases-on-player-n.patch} | 0 ...27-Virtual-thread-for-chat-executor.patch} | 4 +- ...rtual-thread-for-user-authenticator.patch} | 0 ...onfigurable-chat-message-signatures.patch} | 0 ... => 0130-Cache-player-profileResult.patch} | 0 ...ed.patch => 0131-Matter-Secure-Seed.patch} | 0 ... => 0132-Matter-Secure-Seed-command.patch} | 0 ...tch => 0133-Faster-random-generator.patch} | 2 +- ...> 0134-Don-t-save-primed-tnt-entity.patch} | 0 ...135-Don-t-save-falling-block-entity.patch} | 0 ...136-Configurable-connection-message.patch} | 0 ...onfigurable-unknown-command-message.patch} | 0 ...-in-BlockBehaviour-cache-blockstate.patch} | 0 ...am-in-entity-visible-effects-filter.patch} | 2 +- ...-double-iteration-in-enough-deep-sl.patch} | 0 ...ove-stream-in-trial-spawner-ticking.patch} | 0 ...atch => 0142-Remove-stream-in-Brain.patch} | 0 ...0143-Remove-stream-in-BehaviorUtils.patch} | 0 ... 0144-Remove-stream-in-YieldJobSite.patch} | 0 ... 0145-Remove-stream-in-PlayerSensor.patch} | 0 ...> 0146-Remove-stream-in-GolemSensor.patch} | 0 ... 0147-Remove-stream-in-GateBehavior.patch} | 0 ...-Remove-stream-in-updateFluidOnEyes.patch} | 4 +- ... 0149-Remove-stream-in-matchingSlot.patch} | 0 ...entity-mountedOrDismounted-changes-.patch} | 0 ...tive-effects-map-with-optimized-col.patch} | 2 +- ...erion-map-with-optimized-collection.patch} | 0 ...rain-maps-with-optimized-collection.patch} | 0 ...=> 0154-Reduce-worldgen-allocations.patch} | 0 ...MC-65198.patch => 0155-Fix-MC-65198.patch} | 0 ...-200418.patch => 0156-Fix-MC-200418.patch} | 0 ...-119417.patch => 0157-Fix-MC-119417.patch} | 0 ...-223153.patch => 0158-Fix-MC-223153.patch} | 0 ...onfigurable-player-knockback-zombie.patch} | 2 +- ...during-inactive-ticks-for-non-aware.patch} | 2 +- ...zombie-reinforcements-loading-chunk.patch} | 0 ...aperPR-Fix-some-beacon-event-issues.patch} | 0 ...63-Dont-send-useless-entity-packets.patch} | 0 ...patch => 0164-Multithreaded-Tracker.patch} | 2 +- ...> 0165-Nitori-Async-playerdata-Save.patch} | 2 +- ...e-nearby-alive-players-for-spawning.patch} | 0 ...> 0167-Cache-blockstate-cache-array.patch} | 0 .../features/0002-Gale-metrics.patch | 12 +-- ...10-Fix-Pufferfish-and-Purpur-patches.patch | 0 ...pelessRecipe-comparison-for-vanilla.patch} | 0 ...-for-plugins-not-shutting-down-task.patch} | 0 ...-support.patch => 0013-SIMD-support.patch} | 2 +- ...0014-Make-book-writing-configurable.patch} | 0 ...0015-Optimize-entity-coordinate-key.patch} | 0 ...-log-legacy-Material-initialization.patch} | 0 ...> 0017-Do-not-log-Not-Secure-marker.patch} | 0 ...ch => 0018-Reduce-array-allocations.patch} | 0 ... 0019-CraftBukkit-UUID-to-world-map.patch} | 0 ...h => 0020-Specific-interval-TPS-API.patch} | 0 ....patch => 0021-5-second-TPS-average.patch} | 0 ...PI.patch => 0022-Last-tick-time-API.patch} | 0 ...-Show-last-tick-time-in-tps-command.patch} | 0 ...h => 0024-Pre-compute-VarLong-sizes.patch} | 0 ...mize-VarInt-write-and-VarLong-write.patch} | 0 ...atch => 0026-Virtual-thread-support.patch} | 2 +- ...imings.patch => 0027-Remove-Timings.patch} | 0 ...patch => 0028-KeYi-Player-Skull-API.patch} | 0 ...atch => 0029-Slice-Smooth-Teleports.patch} | 0 ... => 0030-Skip-event-if-no-listeners.patch} | 0 ...-EntityScheduler-s-executeTick-chec.patch} | 0 ...SparklyPaper-Optimize-canSee-checks.patch} | 0 ...atch => 0033-Including-5s-in-getTPS.patch} | 0 ...eption-on-missing-ResourceKey-value.patch} | 0 ...-Virtual-Thread-for-async-scheduler.patch} | 0 ...onfigurable-chat-message-signatures.patch} | 0 ...ed.patch => 0037-Matter-Secure-Seed.patch} | 0 ...tch => 0038-Faster-random-generator.patch} | 0 ...onfigurable-unknown-command-message.patch} | 0 ...world-map-with-optimized-collection.patch} | 0 ...ntityType-minecraftToBukkit-convert.patch} | 0 ...patch => 0042-Multithreaded-Tracker.patch} | 0 ....patch => 0043-Asynchronous-locator.patch} | 0 ...-snapshots-for-acquiring-blockstate.patch} | 0 ...CraftServer-getworlds-list-creation.patch} | 0 ...k-key.patch => 0046-Cache-chunk-key.patch} | 0 ... => 0047-Async-structure-locate-api.patch} | 0 ...> 0048-PlayerInventoryOverflowEvent.patch} | 0 ...SparklyPaper-Parallel-world-ticking.patch} | 0 ...r-PR-Throttle-failed-spawn-attempts.patch} | 0 ...tch => 0051-Async-playerdata-saving.patch} | 0 111 files changed, 71 insertions(+), 88 deletions(-) rename leaf-archived-patches/unapplied/server/minecraft-patches/features/0008-Fix-Pufferfish-and-Purpur-patches.patch => leaf-server/minecraft-patches/features/0100-Fix-Pufferfish-and-Purpur-patches.patch (82%) rename leaf-server/minecraft-patches/features/{0100-Purpur-Configurable-server-mod-name.patch => 0101-Purpur-Configurable-server-mod-name.patch} (84%) rename leaf-server/minecraft-patches/features/{0101-Configurable-server-GUI-name.patch => 0102-Configurable-server-GUI-name.patch} (100%) rename leaf-server/minecraft-patches/features/{0102-Remove-vanilla-username-check.patch => 0103-Remove-vanilla-username-check.patch} (100%) rename leaf-server/minecraft-patches/features/{0103-Remove-Spigot-check-for-broken-BungeeCord-configurat.patch => 0104-Remove-Spigot-check-for-broken-BungeeCord-configurat.patch} (100%) rename leaf-server/minecraft-patches/features/{0104-Remove-UseItemOnPacket-Too-Far-check.patch => 0105-Remove-UseItemOnPacket-Too-Far-check.patch} (95%) rename leaf-server/minecraft-patches/features/{0105-Remove-change-non-editable-sign-warning.patch => 0106-Remove-change-non-editable-sign-warning.patch} (100%) rename leaf-server/minecraft-patches/features/{0106-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch => 0107-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch} (100%) rename leaf-server/minecraft-patches/features/{0107-Carpet-Fixes-Optimized-getBiome-method.patch => 0108-Carpet-Fixes-Optimized-getBiome-method.patch} (100%) rename leaf-server/minecraft-patches/features/{0108-Carpet-Fixes-Use-optimized-RecipeManager.patch => 0109-Carpet-Fixes-Use-optimized-RecipeManager.patch} (100%) rename leaf-server/minecraft-patches/features/{0109-Akarin-Save-Json-list-asynchronously.patch => 0110-Akarin-Save-Json-list-asynchronously.patch} (100%) rename leaf-server/minecraft-patches/features/{0110-Slice-Smooth-Teleports.patch => 0111-Slice-Smooth-Teleports.patch} (100%) rename leaf-server/minecraft-patches/features/{0111-Parchment-Make-FixLight-use-action-bar.patch => 0112-Parchment-Make-FixLight-use-action-bar.patch} (100%) rename leaf-server/minecraft-patches/features/{0112-Petal-Async-Pathfinding.patch => 0113-Petal-Async-Pathfinding.patch} (99%) rename leaf-server/minecraft-patches/features/{0113-Petal-reduce-work-done-by-game-event-system.patch => 0114-Petal-reduce-work-done-by-game-event-system.patch} (100%) rename leaf-server/minecraft-patches/features/{0114-Reduce-canSee-work.patch => 0115-Reduce-canSee-work.patch} (100%) rename leaf-server/minecraft-patches/features/{0115-Fix-sprint-glitch.patch => 0116-Fix-sprint-glitch.patch} (90%) rename leaf-server/minecraft-patches/features/{0116-Faster-sequencing-of-futures-for-chunk-structure-gen.patch => 0117-Faster-sequencing-of-futures-for-chunk-structure-gen.patch} (100%) rename leaf-server/minecraft-patches/features/{0117-Reduce-active-items-finding-hopper-nearby-check.patch => 0118-Reduce-active-items-finding-hopper-nearby-check.patch} (100%) rename leaf-server/minecraft-patches/features/{0118-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch => 0119-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch} (100%) rename leaf-server/minecraft-patches/features/{0119-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch => 0120-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch} (100%) rename leaf-server/minecraft-patches/features/{0120-SparklyPaper-Skip-EntityScheduler-s-executeTick-chec.patch => 0121-SparklyPaper-Skip-EntityScheduler-s-executeTick-chec.patch} (89%) rename leaf-server/minecraft-patches/features/{0121-SparklyPaper-Optimize-canSee-checks.patch => 0122-SparklyPaper-Optimize-canSee-checks.patch} (100%) rename leaf-server/minecraft-patches/features/{0122-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch => 0123-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch} (100%) rename leaf-server/minecraft-patches/features/{0123-Polpot-Make-egg-and-snowball-can-knockback-player.patch => 0124-Polpot-Make-egg-and-snowball-can-knockback-player.patch} (100%) rename leaf-server/minecraft-patches/features/{0124-Redirect-vanilla-getProfiler-to-inactive-in-PathNavi.patch => 0125-Redirect-vanilla-getProfiler-to-inactive-in-PathNavi.patch} (100%) rename leaf-server/minecraft-patches/features/{0125-Remove-useless-creating-stats-json-bases-on-player-n.patch => 0126-Remove-useless-creating-stats-json-bases-on-player-n.patch} (100%) rename leaf-server/minecraft-patches/features/{0126-Virtual-thread-for-chat-executor.patch => 0127-Virtual-thread-for-chat-executor.patch} (90%) rename leaf-server/minecraft-patches/features/{0127-Virtual-thread-for-user-authenticator.patch => 0128-Virtual-thread-for-user-authenticator.patch} (100%) rename leaf-server/minecraft-patches/features/{0128-Mirai-Configurable-chat-message-signatures.patch => 0129-Mirai-Configurable-chat-message-signatures.patch} (100%) rename leaf-server/minecraft-patches/features/{0129-Cache-player-profileResult.patch => 0130-Cache-player-profileResult.patch} (100%) rename leaf-server/minecraft-patches/features/{0130-Matter-Secure-Seed.patch => 0131-Matter-Secure-Seed.patch} (100%) rename leaf-server/minecraft-patches/features/{0131-Matter-Secure-Seed-command.patch => 0132-Matter-Secure-Seed-command.patch} (100%) rename leaf-server/minecraft-patches/features/{0132-Faster-random-generator.patch => 0133-Faster-random-generator.patch} (99%) rename leaf-server/minecraft-patches/features/{0133-Don-t-save-primed-tnt-entity.patch => 0134-Don-t-save-primed-tnt-entity.patch} (100%) rename leaf-server/minecraft-patches/features/{0134-Don-t-save-falling-block-entity.patch => 0135-Don-t-save-falling-block-entity.patch} (100%) rename leaf-server/minecraft-patches/features/{0135-Configurable-connection-message.patch => 0136-Configurable-connection-message.patch} (100%) rename leaf-server/minecraft-patches/features/{0136-Configurable-unknown-command-message.patch => 0137-Configurable-unknown-command-message.patch} (100%) rename leaf-server/minecraft-patches/features/{0137-Remove-stream-in-BlockBehaviour-cache-blockstate.patch => 0138-Remove-stream-in-BlockBehaviour-cache-blockstate.patch} (100%) rename leaf-server/minecraft-patches/features/{0138-Remove-stream-in-entity-visible-effects-filter.patch => 0139-Remove-stream-in-entity-visible-effects-filter.patch} (93%) rename leaf-server/minecraft-patches/features/{0139-Remove-stream-and-double-iteration-in-enough-deep-sl.patch => 0140-Remove-stream-and-double-iteration-in-enough-deep-sl.patch} (100%) rename leaf-server/minecraft-patches/features/{0140-Remove-stream-in-trial-spawner-ticking.patch => 0141-Remove-stream-in-trial-spawner-ticking.patch} (100%) rename leaf-server/minecraft-patches/features/{0141-Remove-stream-in-Brain.patch => 0142-Remove-stream-in-Brain.patch} (100%) rename leaf-server/minecraft-patches/features/{0142-Remove-stream-in-BehaviorUtils.patch => 0143-Remove-stream-in-BehaviorUtils.patch} (100%) rename leaf-server/minecraft-patches/features/{0143-Remove-stream-in-YieldJobSite.patch => 0144-Remove-stream-in-YieldJobSite.patch} (100%) rename leaf-server/minecraft-patches/features/{0144-Remove-stream-in-PlayerSensor.patch => 0145-Remove-stream-in-PlayerSensor.patch} (100%) rename leaf-server/minecraft-patches/features/{0145-Remove-stream-in-GolemSensor.patch => 0146-Remove-stream-in-GolemSensor.patch} (100%) rename leaf-server/minecraft-patches/features/{0146-Remove-stream-in-GateBehavior.patch => 0147-Remove-stream-in-GateBehavior.patch} (100%) rename leaf-server/minecraft-patches/features/{0147-Remove-stream-in-updateFluidOnEyes.patch => 0148-Remove-stream-in-updateFluidOnEyes.patch} (95%) rename leaf-server/minecraft-patches/features/{0148-Remove-stream-in-matchingSlot.patch => 0149-Remove-stream-in-matchingSlot.patch} (100%) rename leaf-server/minecraft-patches/features/{0149-Remove-stream-in-entity-mountedOrDismounted-changes-.patch => 0150-Remove-stream-in-entity-mountedOrDismounted-changes-.patch} (100%) rename leaf-server/minecraft-patches/features/{0150-Replace-Entity-active-effects-map-with-optimized-col.patch => 0151-Replace-Entity-active-effects-map-with-optimized-col.patch} (96%) rename leaf-server/minecraft-patches/features/{0151-Replace-criterion-map-with-optimized-collection.patch => 0152-Replace-criterion-map-with-optimized-collection.patch} (100%) rename leaf-server/minecraft-patches/features/{0152-Replace-brain-maps-with-optimized-collection.patch => 0153-Replace-brain-maps-with-optimized-collection.patch} (100%) rename leaf-server/minecraft-patches/features/{0153-Reduce-worldgen-allocations.patch => 0154-Reduce-worldgen-allocations.patch} (100%) rename leaf-server/minecraft-patches/features/{0154-Fix-MC-65198.patch => 0155-Fix-MC-65198.patch} (100%) rename leaf-server/minecraft-patches/features/{0155-Fix-MC-200418.patch => 0156-Fix-MC-200418.patch} (100%) rename leaf-server/minecraft-patches/features/{0156-Fix-MC-119417.patch => 0157-Fix-MC-119417.patch} (100%) rename leaf-server/minecraft-patches/features/{0157-Fix-MC-223153.patch => 0158-Fix-MC-223153.patch} (100%) rename leaf-server/minecraft-patches/features/{0158-Configurable-player-knockback-zombie.patch => 0159-Configurable-player-knockback-zombie.patch} (95%) rename leaf-server/minecraft-patches/features/{0159-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch => 0160-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch} (96%) rename leaf-server/minecraft-patches/features/{0160-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch => 0161-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch} (100%) rename leaf-server/minecraft-patches/features/{0161-PaperPR-Fix-some-beacon-event-issues.patch => 0162-PaperPR-Fix-some-beacon-event-issues.patch} (100%) rename leaf-server/minecraft-patches/features/{0162-Dont-send-useless-entity-packets.patch => 0163-Dont-send-useless-entity-packets.patch} (100%) rename leaf-server/minecraft-patches/features/{0163-Multithreaded-Tracker.patch => 0164-Multithreaded-Tracker.patch} (99%) rename leaf-server/minecraft-patches/features/{0164-Nitori-Async-playerdata-Save.patch => 0165-Nitori-Async-playerdata-Save.patch} (99%) rename leaf-server/minecraft-patches/features/{0165-Optimize-nearby-alive-players-for-spawning.patch => 0166-Optimize-nearby-alive-players-for-spawning.patch} (100%) rename leaf-server/minecraft-patches/features/{0166-Cache-blockstate-cache-array.patch => 0167-Cache-blockstate-cache-array.patch} (100%) rename leaf-archived-patches/unapplied/server/paper-patches/features/0006-Fix-Pufferfish-and-Purpur-patches.patch => leaf-server/paper-patches/features/0010-Fix-Pufferfish-and-Purpur-patches.patch (100%) rename leaf-server/paper-patches/features/{0010-Simpler-ShapelessRecipe-comparison-for-vanilla.patch => 0011-Simpler-ShapelessRecipe-comparison-for-vanilla.patch} (100%) rename leaf-server/paper-patches/features/{0011-Print-stack-trace-for-plugins-not-shutting-down-task.patch => 0012-Print-stack-trace-for-plugins-not-shutting-down-task.patch} (100%) rename leaf-server/paper-patches/features/{0012-SIMD-support.patch => 0013-SIMD-support.patch} (97%) rename leaf-server/paper-patches/features/{0013-Make-book-writing-configurable.patch => 0014-Make-book-writing-configurable.patch} (100%) rename leaf-server/paper-patches/features/{0014-Optimize-entity-coordinate-key.patch => 0015-Optimize-entity-coordinate-key.patch} (100%) rename leaf-server/paper-patches/features/{0015-Do-not-log-legacy-Material-initialization.patch => 0016-Do-not-log-legacy-Material-initialization.patch} (100%) rename leaf-server/paper-patches/features/{0016-Do-not-log-Not-Secure-marker.patch => 0017-Do-not-log-Not-Secure-marker.patch} (100%) rename leaf-server/paper-patches/features/{0017-Reduce-array-allocations.patch => 0018-Reduce-array-allocations.patch} (100%) rename leaf-server/paper-patches/features/{0018-CraftBukkit-UUID-to-world-map.patch => 0019-CraftBukkit-UUID-to-world-map.patch} (100%) rename leaf-server/paper-patches/features/{0019-Specific-interval-TPS-API.patch => 0020-Specific-interval-TPS-API.patch} (100%) rename leaf-server/paper-patches/features/{0020-5-second-TPS-average.patch => 0021-5-second-TPS-average.patch} (100%) rename leaf-server/paper-patches/features/{0021-Last-tick-time-API.patch => 0022-Last-tick-time-API.patch} (100%) rename leaf-server/paper-patches/features/{0022-Show-last-tick-time-in-tps-command.patch => 0023-Show-last-tick-time-in-tps-command.patch} (100%) rename leaf-server/paper-patches/features/{0023-Pre-compute-VarLong-sizes.patch => 0024-Pre-compute-VarLong-sizes.patch} (100%) rename leaf-server/paper-patches/features/{0024-Optimize-VarInt-write-and-VarLong-write.patch => 0025-Optimize-VarInt-write-and-VarLong-write.patch} (100%) rename leaf-server/paper-patches/features/{0025-Virtual-thread-support.patch => 0026-Virtual-thread-support.patch} (94%) rename leaf-server/paper-patches/features/{0026-Remove-Timings.patch => 0027-Remove-Timings.patch} (100%) rename leaf-server/paper-patches/features/{0027-KeYi-Player-Skull-API.patch => 0028-KeYi-Player-Skull-API.patch} (100%) rename leaf-server/paper-patches/features/{0028-Slice-Smooth-Teleports.patch => 0029-Slice-Smooth-Teleports.patch} (100%) rename leaf-server/paper-patches/features/{0029-Skip-event-if-no-listeners.patch => 0030-Skip-event-if-no-listeners.patch} (100%) rename leaf-server/paper-patches/features/{0030-SparklyPaper-Skip-EntityScheduler-s-executeTick-chec.patch => 0031-SparklyPaper-Skip-EntityScheduler-s-executeTick-chec.patch} (100%) rename leaf-server/paper-patches/features/{0031-SparklyPaper-Optimize-canSee-checks.patch => 0032-SparklyPaper-Optimize-canSee-checks.patch} (100%) rename leaf-server/paper-patches/features/{0032-Including-5s-in-getTPS.patch => 0033-Including-5s-in-getTPS.patch} (100%) rename leaf-server/paper-patches/features/{0033-Don-t-throw-exception-on-missing-ResourceKey-value.patch => 0034-Don-t-throw-exception-on-missing-ResourceKey-value.patch} (100%) rename leaf-server/paper-patches/features/{0034-Virtual-Thread-for-async-scheduler.patch => 0035-Virtual-Thread-for-async-scheduler.patch} (100%) rename leaf-server/paper-patches/features/{0035-Mirai-Configurable-chat-message-signatures.patch => 0036-Mirai-Configurable-chat-message-signatures.patch} (100%) rename leaf-server/paper-patches/features/{0036-Matter-Secure-Seed.patch => 0037-Matter-Secure-Seed.patch} (100%) rename leaf-server/paper-patches/features/{0037-Faster-random-generator.patch => 0038-Faster-random-generator.patch} (100%) rename leaf-server/paper-patches/features/{0038-Configurable-unknown-command-message.patch => 0039-Configurable-unknown-command-message.patch} (100%) rename leaf-server/paper-patches/features/{0039-Replace-world-map-with-optimized-collection.patch => 0040-Replace-world-map-with-optimized-collection.patch} (100%) rename leaf-server/paper-patches/features/{0040-Cache-CraftEntityType-minecraftToBukkit-convert.patch => 0041-Cache-CraftEntityType-minecraftToBukkit-convert.patch} (100%) rename leaf-server/paper-patches/features/{0041-Multithreaded-Tracker.patch => 0042-Multithreaded-Tracker.patch} (100%) rename leaf-server/paper-patches/features/{0042-Asynchronous-locator.patch => 0043-Asynchronous-locator.patch} (100%) rename leaf-server/paper-patches/features/{0043-EMC-Don-t-use-snapshots-for-acquiring-blockstate.patch => 0044-EMC-Don-t-use-snapshots-for-acquiring-blockstate.patch} (100%) rename leaf-server/paper-patches/features/{0044-Faster-CraftServer-getworlds-list-creation.patch => 0045-Faster-CraftServer-getworlds-list-creation.patch} (100%) rename leaf-server/paper-patches/features/{0045-Cache-chunk-key.patch => 0046-Cache-chunk-key.patch} (100%) rename leaf-server/paper-patches/features/{0046-Async-structure-locate-api.patch => 0047-Async-structure-locate-api.patch} (100%) rename leaf-server/paper-patches/features/{0047-PlayerInventoryOverflowEvent.patch => 0048-PlayerInventoryOverflowEvent.patch} (100%) rename leaf-server/paper-patches/features/{0048-SparklyPaper-Parallel-world-ticking.patch => 0049-SparklyPaper-Parallel-world-ticking.patch} (100%) rename leaf-server/paper-patches/features/{0049-Paper-PR-Throttle-failed-spawn-attempts.patch => 0050-Paper-PR-Throttle-failed-spawn-attempts.patch} (100%) rename leaf-server/paper-patches/features/{0050-Async-playerdata-saving.patch => 0051-Async-playerdata-saving.patch} (100%) diff --git a/leaf-archived-patches/unapplied/server/minecraft-patches/features/0008-Fix-Pufferfish-and-Purpur-patches.patch b/leaf-server/minecraft-patches/features/0100-Fix-Pufferfish-and-Purpur-patches.patch similarity index 82% rename from leaf-archived-patches/unapplied/server/minecraft-patches/features/0008-Fix-Pufferfish-and-Purpur-patches.patch rename to leaf-server/minecraft-patches/features/0100-Fix-Pufferfish-and-Purpur-patches.patch index 1e985b04..16a23f19 100644 --- a/leaf-archived-patches/unapplied/server/minecraft-patches/features/0008-Fix-Pufferfish-and-Purpur-patches.patch +++ b/leaf-server/minecraft-patches/features/0100-Fix-Pufferfish-and-Purpur-patches.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix Pufferfish and Purpur patches diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index 5fb7a76faf72f7d91122e5bf01c51853164a73c0..011b1a8c13d41c6f1d54d9247b7e61a548f43382 100644 +index 91fa7f0bac5681413cd8d66fe1ebf2029713408f..3a970b1f751726e4eec2832e94295c242cc7c997 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java -@@ -277,7 +277,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop pluginsBlockingSleep = new java.util.HashSet<>(); // Paper - API to allow/disallow tick sleeping public static final long SERVER_INIT = System.nanoTime(); // Paper - Lag compensation - protected boolean upnp = false; // Purpur - UPnP Port Forwarding - public gg.pufferfish.pufferfish.util.AsyncExecutor mobSpawnExecutor = new gg.pufferfish.pufferfish.util.AsyncExecutor("MobSpawning"); // Pufferfish - optimize mob spawning + public gg.pufferfish.pufferfish.util.AsyncExecutor mobSpawnExecutor = new gg.pufferfish.pufferfish.util.AsyncExecutor("Leaf Async Mob Spawn Thread"); // Pufferfish - optimize mob spawning // Leaf - Fix Pufferfish and Purpur patches - Unify thread name + public boolean lagging = false; // Purpur - Lagging threshold + protected boolean upnp = false; // Purpur - UPnP Port Forwarding - public static S spin(Function threadFunction) { - ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.init(); // Paper - rewrite data converter system -@@ -1250,9 +1250,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop byteAllowed) { @@ -91,10 +78,10 @@ index 1ba275fd76970774922bcd91bea6bf779bab32b7..a96f4f45d465b6f0e5b061877bd11f3c this.disconnectAsync(Component.literal("Book too large!"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION); // Paper - kick event cause // Paper - add proper async disconnect return; diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index a5a8bdecddadac3de1b5a0c1a9849ce1cd52a530..f500f4e32e676712fcd0c877498acc2722baae98 100644 +index 1539e039d4d5fd539cfc552a4d420ae5a6fb8b56..109ec179bd7e960cb09a98e1ec6179a60b2cba57 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -533,23 +533,37 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -522,23 +522,36 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } // Purpur end - Add canSaveToDisk to Entity @@ -103,13 +90,12 @@ index a5a8bdecddadac3de1b5a0c1a9849ce1cd52a530..f500f4e32e676712fcd0c877498acc27 + private BlockPos cached_eye_blockpos; + private net.minecraft.world.phys.Vec3 cached_position; + // Gale end - JettPack - optimize sun burn tick - cache eye blockpos -+ // Purpur start - copied from Mob - API for any mob to burn daylight public boolean isSunBurnTick() { - if (this.level().isDay() && !this.level().isClientSide) { + if (this.level().isBrightOutside() && !this.level().isClientSide) { - float lightLevelDependentMagicValue = this.getLightLevelDependentMagicValue(); - BlockPos blockPos = BlockPos.containing(this.getX(), this.getEyeY(), this.getZ()); -- boolean flag = this.isInWaterRainOrBubble() || this.isInPowderSnow || this.wasInPowderSnow; +- boolean flag = this.isInWaterOrRain() || this.isInPowderSnow || this.wasInPowderSnow; - if (lightLevelDependentMagicValue > 0.5F - && this.random.nextFloat() * 30.0F < (lightLevelDependentMagicValue - 0.4F) * 2.0F - && !flag @@ -128,7 +114,7 @@ index a5a8bdecddadac3de1b5a0c1a9849ce1cd52a530..f500f4e32e676712fcd0c877498acc27 + if (this.random.nextFloat() * 30.0F >= (lightLevelDependentMagicValue - 0.4F) * 2.0F) return false; + // Gale end - JettPack - optimize sun burn tick - optimizations and cache eye blockpos + -+ boolean flag = this.isInWaterRainOrBubble() || this.isInPowderSnow || this.wasInPowderSnow; ++ boolean flag = this.isInWaterOrRain() || this.isInPowderSnow || this.wasInPowderSnow; + + return !flag && this.level().canSeeSky(this.cached_eye_blockpos); // Gale - JettPack - optimize sun burn tick - optimizations and cache eye blockpos } @@ -142,7 +128,7 @@ index a5a8bdecddadac3de1b5a0c1a9849ce1cd52a530..f500f4e32e676712fcd0c877498acc27 public Entity(EntityType entityType, Level level) { this.type = entityType; diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index ac006d8738592bc5cb77033adc8c442ce302a476..ce2a9b6c4b903e5285e77f7ee64defd8e81029ae 100644 +index dfca015796b87059b19db55b4911bd0de2580798..40ab67a6930242553ed7acc9d6cc474a36e23888 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -1024,13 +1024,13 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -164,10 +150,10 @@ index ac006d8738592bc5cb77033adc8c442ce302a476..ce2a9b6c4b903e5285e77f7ee64defd8 } // Purpur end - Mob head visibility percent diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java -index fbcb803fb575cb1f81afa9d03d5fddbf6352155d..b326c87c1c958bb18fc961010768f7d9f0e414cf 100644 +index ba2f9ab55e52e25788b38c81e1070ae953b66371..33c99f3b24596fbbf3283b455ea8bf340203e01b 100644 --- a/net/minecraft/world/entity/Mob.java +++ b/net/minecraft/world/entity/Mob.java -@@ -1632,11 +1632,6 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -1505,10 +1505,6 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab protected void playAttackSound() { } @@ -175,15 +161,14 @@ index fbcb803fb575cb1f81afa9d03d5fddbf6352155d..b326c87c1c958bb18fc961010768f7d9 - private BlockPos cached_eye_blockpos; - private net.minecraft.world.phys.Vec3 cached_position; - // Gale end - JettPack - optimize sun burn tick - cache eye blockpos -- public boolean isSunBurnTick() { // Purpur - implemented in Entity - API for any mob to burn daylight return super.isSunBurnTick(); diff --git a/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java b/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java -index 135e19e921c9592cec83f6f940f2abe47757fbb8..9fa0c2f09ddfa17a778d4ea8d1ec9314f11a6efd 100644 +index 60ec389615cfcad388ed37b8d3ee04e87db36755..34fe1d3bd6603225f84ab18794bbb1189d4b4f49 100644 --- a/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java +++ b/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java -@@ -22,21 +22,17 @@ public class SecondaryPoiSensor extends Sensor { +@@ -22,20 +22,17 @@ public class SecondaryPoiSensor extends Sensor { @Override protected void doTick(ServerLevel level, Villager entity) { @@ -191,8 +176,7 @@ index 135e19e921c9592cec83f6f940f2abe47757fbb8..9fa0c2f09ddfa17a778d4ea8d1ec9314 + // Leaf start - Fix Pufferfish and Purpur patches + // Purpur: Option for Villager Clerics to farm Nether Wart - make sure clerics don't wander to soul sand when the option is off + // Gale: Lithium - skip secondary POI sensor if absent - var secondaryPoi = entity.getVillagerData().getProfession().secondaryPoi(); -- + var secondaryPoi = entity.getVillagerData().profession().value().secondaryPoi(); - if (secondaryPoi.isEmpty()) { - entity.getBrain().eraseMemory(MemoryModuleType.SECONDARY_JOB_SITE); - return; @@ -200,22 +184,21 @@ index 135e19e921c9592cec83f6f940f2abe47757fbb8..9fa0c2f09ddfa17a778d4ea8d1ec9314 - // Gale end - Lithium - skip secondary POI sensor if absent - // Purpur start - Option for Villager Clerics to farm Nether Wart - make sure clerics don't wander to soul sand when the option is off Brain brain = entity.getBrain(); -- if (!level.purpurConfig.villagerClericsFarmWarts && entity.getVillagerData().getProfession() == net.minecraft.world.entity.npc.VillagerProfession.CLERIC) { -+ -+ if (secondaryPoi.isEmpty() || (!level.purpurConfig.villagerClericsFarmWarts && entity.getVillagerData().getProfession() == net.minecraft.world.entity.npc.VillagerProfession.CLERIC)) { +- if (!level.purpurConfig.villagerClericsFarmWarts && entity.getVillagerData().profession().is(net.minecraft.world.entity.npc.VillagerProfession.CLERIC)) { ++ if (secondaryPoi.isEmpty() || !level.purpurConfig.villagerClericsFarmWarts && entity.getVillagerData().profession().is(net.minecraft.world.entity.npc.VillagerProfession.CLERIC)) { brain.eraseMemory(MemoryModuleType.SECONDARY_JOB_SITE); return; } -- // Purpur end - Option for Villager Clerics to farm Nether Wart + // Purpur end - Option for Villager Clerics to farm Nether Wart + // Leaf end - Fix Pufferfish and Purpur patches ResourceKey resourceKey = level.dimension(); BlockPos blockPos = entity.blockPosition(); List list = Lists.newArrayList(); diff --git a/net/minecraft/world/entity/animal/allay/Allay.java b/net/minecraft/world/entity/animal/allay/Allay.java -index 10d2a1138d814b83ce4233205a7f0ab2ed1f399d..a642533eddd1aca96ad57c2a219f00870a615f71 100644 +index 441287e74243a413c97a98b7898bab7833ac6458..18107d9be4d9ba816852ee4595a5349867834bef 100644 --- a/net/minecraft/world/entity/animal/allay/Allay.java +++ b/net/minecraft/world/entity/animal/allay/Allay.java -@@ -287,8 +287,7 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS +@@ -283,8 +283,7 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS private int behaviorTick = 0; // Pufferfish @Override protected void customServerAiStep(ServerLevel level) { @@ -226,10 +209,10 @@ index 10d2a1138d814b83ce4233205a7f0ab2ed1f399d..a642533eddd1aca96ad57c2a219f0087 AllayAi.updateActivity(this); super.customServerAiStep(level); diff --git a/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/net/minecraft/world/entity/animal/axolotl/Axolotl.java -index 1323cedcacd3072cdf5f1eac644688cd098b53db..ad19bbd6989bfb98966872b304f6ece0e869f7a4 100644 +index de207d747026453fabe2e6e725d2aa8504fbc9a1..524a7c31708a03f7a9dae75731caa8a450a6488d 100644 --- a/net/minecraft/world/entity/animal/axolotl/Axolotl.java +++ b/net/minecraft/world/entity/animal/axolotl/Axolotl.java -@@ -347,8 +347,7 @@ public class Axolotl extends Animal implements VariantHolder, B +@@ -372,8 +372,7 @@ public class Axolotl extends Animal implements Bucketable { private int behaviorTick = 0; // Pufferfish @Override protected void customServerAiStep(ServerLevel level) { @@ -240,10 +223,10 @@ index 1323cedcacd3072cdf5f1eac644688cd098b53db..ad19bbd6989bfb98966872b304f6ece0 AxolotlAi.updateActivity(this); if (!this.isNoAi()) { diff --git a/net/minecraft/world/entity/animal/frog/Frog.java b/net/minecraft/world/entity/animal/frog/Frog.java -index aca0877319d507c3a672589bd4de5268d7a4c3dc..e5ec23c413e0d7da6f6b9c43925a7aa247946895 100644 +index 89fa6a785ff73b30effd58dde4fbcbf99fdad168..71bae5f5ed284fed30262872771f85de97383d6d 100644 --- a/net/minecraft/world/entity/animal/frog/Frog.java +++ b/net/minecraft/world/entity/animal/frog/Frog.java -@@ -242,8 +242,7 @@ public class Frog extends Animal implements VariantHolder> { +@@ -259,8 +259,7 @@ public class Frog extends Animal { private int behaviorTick = 0; // Pufferfish @Override protected void customServerAiStep(ServerLevel level) { @@ -254,10 +237,10 @@ index aca0877319d507c3a672589bd4de5268d7a4c3dc..e5ec23c413e0d7da6f6b9c43925a7aa2 FrogAi.updateActivity(this); super.customServerAiStep(level); diff --git a/net/minecraft/world/entity/animal/frog/Tadpole.java b/net/minecraft/world/entity/animal/frog/Tadpole.java -index 0ca35514a920dddf230d749bc1a5fe15f1c7940a..ec9db1c12426db80dbf02d704e6c7ec867d59f6f 100644 +index a445bbe84d919ffadd8f3f0006b12140cd8060fd..7a3bfa91ffc5c7c6b04eef7b1b1d3c04c5a6d856 100644 --- a/net/minecraft/world/entity/animal/frog/Tadpole.java +++ b/net/minecraft/world/entity/animal/frog/Tadpole.java -@@ -133,8 +133,7 @@ public class Tadpole extends AbstractFish { +@@ -134,8 +134,7 @@ public class Tadpole extends AbstractFish { private int behaviorTick = 0; // Pufferfish @Override protected void customServerAiStep(ServerLevel level) { @@ -268,10 +251,10 @@ index 0ca35514a920dddf230d749bc1a5fe15f1c7940a..ec9db1c12426db80dbf02d704e6c7ec8 TadpoleAi.updateActivity(this); super.customServerAiStep(level); diff --git a/net/minecraft/world/entity/animal/goat/Goat.java b/net/minecraft/world/entity/animal/goat/Goat.java -index 35d1b99b873d9f8c9aa2a1178a449a8625b18406..9b3ff19b3ce1a4780cab01bae6561d45e60fdddc 100644 +index 40ba2e6dc6b1efbd17dba582561c133f6b41df25..39d4da47dcd7bbb33ad907b428dc0f65eaa23a82 100644 --- a/net/minecraft/world/entity/animal/goat/Goat.java +++ b/net/minecraft/world/entity/animal/goat/Goat.java -@@ -223,8 +223,7 @@ public class Goat extends Animal { +@@ -226,8 +226,7 @@ public class Goat extends Animal { private int behaviorTick = 0; // Pufferfish @Override protected void customServerAiStep(ServerLevel level) { @@ -282,10 +265,10 @@ index 35d1b99b873d9f8c9aa2a1178a449a8625b18406..9b3ff19b3ce1a4780cab01bae6561d45 GoatAi.updateActivity(this); super.customServerAiStep(level); diff --git a/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/net/minecraft/world/entity/monster/hoglin/Hoglin.java -index 7c119b089259add643cd112efac55f92024d0275..f20ae21f38b621b0e3bab887c40bbb8237b87e34 100644 +index 584955d151e95727406bc68d6a6f15a33c0f920c..865a83fc73d79893e9bdedad37a6e3986d15fc2b 100644 --- a/net/minecraft/world/entity/monster/hoglin/Hoglin.java +++ b/net/minecraft/world/entity/monster/hoglin/Hoglin.java -@@ -203,8 +203,7 @@ public class Hoglin extends Animal implements Enemy, HoglinBase { +@@ -206,8 +206,7 @@ public class Hoglin extends Animal implements Enemy, HoglinBase { private int behaviorTick; // Pufferfish @Override protected void customServerAiStep(ServerLevel level) { @@ -296,10 +279,10 @@ index 7c119b089259add643cd112efac55f92024d0275..f20ae21f38b621b0e3bab887c40bbb82 HoglinAi.updateActivity(this); if (this.isConverting()) { diff --git a/net/minecraft/world/entity/monster/piglin/Piglin.java b/net/minecraft/world/entity/monster/piglin/Piglin.java -index 242b2545b6082f567d0bb7900ef06ded3c0fdcdd..fe6eb99ea3d2deda317efe90ecb0987bb367313f 100644 +index bac328ebdf9f94d156211e03d3913157e2b80374..bf1b33b7bb71ec8387d95d9089f199627a041945 100644 --- a/net/minecraft/world/entity/monster/piglin/Piglin.java +++ b/net/minecraft/world/entity/monster/piglin/Piglin.java -@@ -382,8 +382,7 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento +@@ -357,8 +357,7 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento private int behaviorTick; // Pufferfish @Override protected void customServerAiStep(ServerLevel level) { @@ -310,10 +293,10 @@ index 242b2545b6082f567d0bb7900ef06ded3c0fdcdd..fe6eb99ea3d2deda317efe90ecb0987b PiglinAi.updateActivity(this); super.customServerAiStep(level); diff --git a/net/minecraft/world/entity/projectile/Projectile.java b/net/minecraft/world/entity/projectile/Projectile.java -index a33641dd6e0839fd1b557d8583fe8bb929fcc1cb..d5ef2ec5e15b6d250aafb0b8282b350c03f8ef2c 100644 +index bde9370798c037c494a9c73f328cb251e68c21b1..3a6be0122d49b20f78be6cc8f1c7acb5c2e45f39 100644 --- a/net/minecraft/world/entity/projectile/Projectile.java +++ b/net/minecraft/world/entity/projectile/Projectile.java -@@ -81,7 +81,7 @@ public abstract class Projectile extends Entity implements TraceableEntity { +@@ -85,7 +85,7 @@ public abstract class Projectile extends Entity implements TraceableEntity { if (maxChunkLoadsPerProjectile >= 0 && this.chunksLoadedByProjectile >= maxChunkLoadsPerProjectile) { if (maxProjectileChunkLoadsConfig.perProjectile.removeFromWorldAfterReachLimit) { diff --git a/leaf-server/minecraft-patches/features/0100-Purpur-Configurable-server-mod-name.patch b/leaf-server/minecraft-patches/features/0101-Purpur-Configurable-server-mod-name.patch similarity index 84% rename from leaf-server/minecraft-patches/features/0100-Purpur-Configurable-server-mod-name.patch rename to leaf-server/minecraft-patches/features/0101-Purpur-Configurable-server-mod-name.patch index 2b3b190a..8adbffc4 100644 --- a/leaf-server/minecraft-patches/features/0100-Purpur-Configurable-server-mod-name.patch +++ b/leaf-server/minecraft-patches/features/0101-Purpur-Configurable-server-mod-name.patch @@ -7,10 +7,10 @@ Original license: MIT Original project: https://github.com/PurpurMC/Purpur diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index 91fa7f0bac5681413cd8d66fe1ebf2029713408f..626ce084ace620bd3883fb3f542b0bd77dfb5f8e 100644 +index 3a970b1f751726e4eec2832e94295c242cc7c997..3f8c4d048e813bb4af53a17e0e231927b2694889 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java -@@ -1844,7 +1844,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 1.18.x that updated by Mojang. By removing this check, it gives ability for hackers to use some modules of hack clients. diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 4b59db324e71846d233e43bafcdae658bcc70328..eba90724a6e5e8a93d775d3e0703a0b37a77e7e5 100644 +index 413fac2acf8cc467d328ccb1fe01399722d02941..776c23f64fdda3bcc93d66e811be7438c22be1f7 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2003,8 +2003,13 @@ public class ServerGamePacketListenerImpl diff --git a/leaf-server/minecraft-patches/features/0105-Remove-change-non-editable-sign-warning.patch b/leaf-server/minecraft-patches/features/0106-Remove-change-non-editable-sign-warning.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0105-Remove-change-non-editable-sign-warning.patch rename to leaf-server/minecraft-patches/features/0106-Remove-change-non-editable-sign-warning.patch diff --git a/leaf-server/minecraft-patches/features/0106-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch b/leaf-server/minecraft-patches/features/0107-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0106-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch rename to leaf-server/minecraft-patches/features/0107-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch diff --git a/leaf-server/minecraft-patches/features/0107-Carpet-Fixes-Optimized-getBiome-method.patch b/leaf-server/minecraft-patches/features/0108-Carpet-Fixes-Optimized-getBiome-method.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0107-Carpet-Fixes-Optimized-getBiome-method.patch rename to leaf-server/minecraft-patches/features/0108-Carpet-Fixes-Optimized-getBiome-method.patch diff --git a/leaf-server/minecraft-patches/features/0108-Carpet-Fixes-Use-optimized-RecipeManager.patch b/leaf-server/minecraft-patches/features/0109-Carpet-Fixes-Use-optimized-RecipeManager.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0108-Carpet-Fixes-Use-optimized-RecipeManager.patch rename to leaf-server/minecraft-patches/features/0109-Carpet-Fixes-Use-optimized-RecipeManager.patch diff --git a/leaf-server/minecraft-patches/features/0109-Akarin-Save-Json-list-asynchronously.patch b/leaf-server/minecraft-patches/features/0110-Akarin-Save-Json-list-asynchronously.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0109-Akarin-Save-Json-list-asynchronously.patch rename to leaf-server/minecraft-patches/features/0110-Akarin-Save-Json-list-asynchronously.patch diff --git a/leaf-server/minecraft-patches/features/0110-Slice-Smooth-Teleports.patch b/leaf-server/minecraft-patches/features/0111-Slice-Smooth-Teleports.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0110-Slice-Smooth-Teleports.patch rename to leaf-server/minecraft-patches/features/0111-Slice-Smooth-Teleports.patch diff --git a/leaf-server/minecraft-patches/features/0111-Parchment-Make-FixLight-use-action-bar.patch b/leaf-server/minecraft-patches/features/0112-Parchment-Make-FixLight-use-action-bar.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0111-Parchment-Make-FixLight-use-action-bar.patch rename to leaf-server/minecraft-patches/features/0112-Parchment-Make-FixLight-use-action-bar.patch diff --git a/leaf-server/minecraft-patches/features/0112-Petal-Async-Pathfinding.patch b/leaf-server/minecraft-patches/features/0113-Petal-Async-Pathfinding.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0112-Petal-Async-Pathfinding.patch rename to leaf-server/minecraft-patches/features/0113-Petal-Async-Pathfinding.patch index 1989bdc1..fcb5068d 100644 --- a/leaf-server/minecraft-patches/features/0112-Petal-Async-Pathfinding.patch +++ b/leaf-server/minecraft-patches/features/0113-Petal-Async-Pathfinding.patch @@ -19,7 +19,7 @@ This patch was ported downstream from the Petal fork. Makes most pathfinding-related work happen asynchronously diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java -index ba2f9ab55e52e25788b38c81e1070ae953b66371..86d07d8f7c171a8930990ab02360e79066cad7d5 100644 +index 33c99f3b24596fbbf3283b455ea8bf340203e01b..e9ebf23b0b1af85e3738a70acc0eaa3e8980261f 100644 --- a/net/minecraft/world/entity/Mob.java +++ b/net/minecraft/world/entity/Mob.java @@ -243,6 +243,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab @@ -582,10 +582,10 @@ index e9dfff7e3726cd2229f89bb39fa1ca4815d99a6d..654ecd20ef4a43f7ffc447c15434ce46 } } diff --git a/net/minecraft/world/entity/animal/frog/Frog.java b/net/minecraft/world/entity/animal/frog/Frog.java -index 89fa6a785ff73b30effd58dde4fbcbf99fdad168..5e0f34a929ddad69807db2edcf473a6c00392926 100644 +index 71bae5f5ed284fed30262872771f85de97383d6d..50f9a11f8cb53fd1fa34017598ff3fe828b3ca25 100644 --- a/net/minecraft/world/entity/animal/frog/Frog.java +++ b/net/minecraft/world/entity/animal/frog/Frog.java -@@ -489,9 +489,25 @@ public class Frog extends Animal { +@@ -488,9 +488,25 @@ public class Frog extends Animal { return pathType != PathType.WATER_BORDER && super.canCutCorner(pathType); } diff --git a/leaf-server/minecraft-patches/features/0113-Petal-reduce-work-done-by-game-event-system.patch b/leaf-server/minecraft-patches/features/0114-Petal-reduce-work-done-by-game-event-system.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0113-Petal-reduce-work-done-by-game-event-system.patch rename to leaf-server/minecraft-patches/features/0114-Petal-reduce-work-done-by-game-event-system.patch diff --git a/leaf-server/minecraft-patches/features/0114-Reduce-canSee-work.patch b/leaf-server/minecraft-patches/features/0115-Reduce-canSee-work.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0114-Reduce-canSee-work.patch rename to leaf-server/minecraft-patches/features/0115-Reduce-canSee-work.patch diff --git a/leaf-server/minecraft-patches/features/0115-Fix-sprint-glitch.patch b/leaf-server/minecraft-patches/features/0116-Fix-sprint-glitch.patch similarity index 90% rename from leaf-server/minecraft-patches/features/0115-Fix-sprint-glitch.patch rename to leaf-server/minecraft-patches/features/0116-Fix-sprint-glitch.patch index 9c9deabe..3f40b4ff 100644 --- a/leaf-server/minecraft-patches/features/0115-Fix-sprint-glitch.patch +++ b/leaf-server/minecraft-patches/features/0116-Fix-sprint-glitch.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix sprint glitch diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index dfca015796b87059b19db55b4911bd0de2580798..6cb9b8be0bd5d9fb225472f8eefd50233d3bbdb2 100644 +index 40ab67a6930242553ed7acc9d6cc474a36e23888..ab7bdbce80046df43e4889c20c4d3d9fb1d2e2c4 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -1387,7 +1387,8 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/leaf-server/minecraft-patches/features/0116-Faster-sequencing-of-futures-for-chunk-structure-gen.patch b/leaf-server/minecraft-patches/features/0117-Faster-sequencing-of-futures-for-chunk-structure-gen.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0116-Faster-sequencing-of-futures-for-chunk-structure-gen.patch rename to leaf-server/minecraft-patches/features/0117-Faster-sequencing-of-futures-for-chunk-structure-gen.patch diff --git a/leaf-server/minecraft-patches/features/0117-Reduce-active-items-finding-hopper-nearby-check.patch b/leaf-server/minecraft-patches/features/0118-Reduce-active-items-finding-hopper-nearby-check.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0117-Reduce-active-items-finding-hopper-nearby-check.patch rename to leaf-server/minecraft-patches/features/0118-Reduce-active-items-finding-hopper-nearby-check.patch diff --git a/leaf-server/minecraft-patches/features/0118-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/leaf-server/minecraft-patches/features/0119-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0118-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch rename to leaf-server/minecraft-patches/features/0119-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch diff --git a/leaf-server/minecraft-patches/features/0119-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch b/leaf-server/minecraft-patches/features/0120-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0119-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch rename to leaf-server/minecraft-patches/features/0120-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch diff --git a/leaf-server/minecraft-patches/features/0120-SparklyPaper-Skip-EntityScheduler-s-executeTick-chec.patch b/leaf-server/minecraft-patches/features/0121-SparklyPaper-Skip-EntityScheduler-s-executeTick-chec.patch similarity index 89% rename from leaf-server/minecraft-patches/features/0120-SparklyPaper-Skip-EntityScheduler-s-executeTick-chec.patch rename to leaf-server/minecraft-patches/features/0121-SparklyPaper-Skip-EntityScheduler-s-executeTick-chec.patch index d74f13c5..fba8524a 100644 --- a/leaf-server/minecraft-patches/features/0120-SparklyPaper-Skip-EntityScheduler-s-executeTick-chec.patch +++ b/leaf-server/minecraft-patches/features/0121-SparklyPaper-Skip-EntityScheduler-s-executeTick-chec.patch @@ -13,18 +13,18 @@ To avoid the hefty ArrayDeque's size() call, we check if we *really* need to exe Most entities won't have any scheduled tasks, so this is a nice performance bonus. These optimizations, however, wouldn't work in a Folia environment, but because in SparklyPaper executeTick is always executed on the main thread, it ain't an issue for us (yay). diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index 626ce084ace620bd3883fb3f542b0bd77dfb5f8e..9b61d82b59715f7de484dca663113cc2cf9be3b2 100644 +index 3f8c4d048e813bb4af53a17e0e231927b2694889..6f150603d9083c7e4b673e127b6d43aa33242f02 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -289,6 +289,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop entitiesWithScheduledTasks = java.util.concurrent.ConcurrentHashMap.newKeySet(); // SparklyPaper - skip EntityScheduler's executeTick checks if there isn't any tasks to be run (concurrent because plugins may schedule tasks async) public static S spin(Function threadFunction) { AtomicReference atomicReference = new AtomicReference<>(); -@@ -1669,6 +1670,22 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { for (final net.minecraft.world.entity.Entity entity : level.getEntities().getAll()) { if (entity.isRemoved()) { -@@ -1680,6 +1697,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop eyeY) { diff --git a/leaf-server/minecraft-patches/features/0148-Remove-stream-in-matchingSlot.patch b/leaf-server/minecraft-patches/features/0149-Remove-stream-in-matchingSlot.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0148-Remove-stream-in-matchingSlot.patch rename to leaf-server/minecraft-patches/features/0149-Remove-stream-in-matchingSlot.patch diff --git a/leaf-server/minecraft-patches/features/0149-Remove-stream-in-entity-mountedOrDismounted-changes-.patch b/leaf-server/minecraft-patches/features/0150-Remove-stream-in-entity-mountedOrDismounted-changes-.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0149-Remove-stream-in-entity-mountedOrDismounted-changes-.patch rename to leaf-server/minecraft-patches/features/0150-Remove-stream-in-entity-mountedOrDismounted-changes-.patch diff --git a/leaf-server/minecraft-patches/features/0150-Replace-Entity-active-effects-map-with-optimized-col.patch b/leaf-server/minecraft-patches/features/0151-Replace-Entity-active-effects-map-with-optimized-col.patch similarity index 96% rename from leaf-server/minecraft-patches/features/0150-Replace-Entity-active-effects-map-with-optimized-col.patch rename to leaf-server/minecraft-patches/features/0151-Replace-Entity-active-effects-map-with-optimized-col.patch index 8d1aac50..74e17cac 100644 --- a/leaf-server/minecraft-patches/features/0150-Replace-Entity-active-effects-map-with-optimized-col.patch +++ b/leaf-server/minecraft-patches/features/0151-Replace-Entity-active-effects-map-with-optimized-col.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Replace Entity active effects map with optimized collection Dreeam TODO: check this diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index 19c1dca135ada485e5aab78a0c0622ee9856e1e9..534dd27d27395f9c98c62ea7014bb3a8df8caa2e 100644 +index 916a964263a9b71d20007c29302341dd50c94b85..fe201ffb28df1171bc22f7ed40cd729b9f3f1017 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -196,6 +196,10 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/leaf-server/minecraft-patches/features/0151-Replace-criterion-map-with-optimized-collection.patch b/leaf-server/minecraft-patches/features/0152-Replace-criterion-map-with-optimized-collection.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0151-Replace-criterion-map-with-optimized-collection.patch rename to leaf-server/minecraft-patches/features/0152-Replace-criterion-map-with-optimized-collection.patch diff --git a/leaf-server/minecraft-patches/features/0152-Replace-brain-maps-with-optimized-collection.patch b/leaf-server/minecraft-patches/features/0153-Replace-brain-maps-with-optimized-collection.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0152-Replace-brain-maps-with-optimized-collection.patch rename to leaf-server/minecraft-patches/features/0153-Replace-brain-maps-with-optimized-collection.patch diff --git a/leaf-server/minecraft-patches/features/0153-Reduce-worldgen-allocations.patch b/leaf-server/minecraft-patches/features/0154-Reduce-worldgen-allocations.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0153-Reduce-worldgen-allocations.patch rename to leaf-server/minecraft-patches/features/0154-Reduce-worldgen-allocations.patch diff --git a/leaf-server/minecraft-patches/features/0154-Fix-MC-65198.patch b/leaf-server/minecraft-patches/features/0155-Fix-MC-65198.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0154-Fix-MC-65198.patch rename to leaf-server/minecraft-patches/features/0155-Fix-MC-65198.patch diff --git a/leaf-server/minecraft-patches/features/0155-Fix-MC-200418.patch b/leaf-server/minecraft-patches/features/0156-Fix-MC-200418.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0155-Fix-MC-200418.patch rename to leaf-server/minecraft-patches/features/0156-Fix-MC-200418.patch diff --git a/leaf-server/minecraft-patches/features/0156-Fix-MC-119417.patch b/leaf-server/minecraft-patches/features/0157-Fix-MC-119417.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0156-Fix-MC-119417.patch rename to leaf-server/minecraft-patches/features/0157-Fix-MC-119417.patch diff --git a/leaf-server/minecraft-patches/features/0157-Fix-MC-223153.patch b/leaf-server/minecraft-patches/features/0158-Fix-MC-223153.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0157-Fix-MC-223153.patch rename to leaf-server/minecraft-patches/features/0158-Fix-MC-223153.patch diff --git a/leaf-server/minecraft-patches/features/0158-Configurable-player-knockback-zombie.patch b/leaf-server/minecraft-patches/features/0159-Configurable-player-knockback-zombie.patch similarity index 95% rename from leaf-server/minecraft-patches/features/0158-Configurable-player-knockback-zombie.patch rename to leaf-server/minecraft-patches/features/0159-Configurable-player-knockback-zombie.patch index ccdbc86f..93679332 100644 --- a/leaf-server/minecraft-patches/features/0158-Configurable-player-knockback-zombie.patch +++ b/leaf-server/minecraft-patches/features/0159-Configurable-player-knockback-zombie.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable player knockback zombie diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index 534dd27d27395f9c98c62ea7014bb3a8df8caa2e..be774fafac70360ea9872ba74dd766619a98c00b 100644 +index fe201ffb28df1171bc22f7ed40cd729b9f3f1017..f36af61d7620f57f396d879d669161b8b1a30875 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -2079,6 +2079,8 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/leaf-server/minecraft-patches/features/0159-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch b/leaf-server/minecraft-patches/features/0160-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch similarity index 96% rename from leaf-server/minecraft-patches/features/0159-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch rename to leaf-server/minecraft-patches/features/0160-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch index 2304c2b5..75c1fab1 100644 --- a/leaf-server/minecraft-patches/features/0159-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch +++ b/leaf-server/minecraft-patches/features/0160-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch @@ -8,7 +8,7 @@ Original project: https://github.com/PaperMC/Paper Paper pull request: https://github.com/PaperMC/Paper/pull/10990 diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java -index 86d07d8f7c171a8930990ab02360e79066cad7d5..f138ce7c55bb5241b0c27874151183bfef983cce 100644 +index e9ebf23b0b1af85e3738a70acc0eaa3e8980261f..d473c09e98eb5d3ef7b3e096197c7bf9a6219c56 100644 --- a/net/minecraft/world/entity/Mob.java +++ b/net/minecraft/world/entity/Mob.java @@ -207,6 +207,11 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab diff --git a/leaf-server/minecraft-patches/features/0160-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch b/leaf-server/minecraft-patches/features/0161-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0160-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch rename to leaf-server/minecraft-patches/features/0161-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch diff --git a/leaf-server/minecraft-patches/features/0161-PaperPR-Fix-some-beacon-event-issues.patch b/leaf-server/minecraft-patches/features/0162-PaperPR-Fix-some-beacon-event-issues.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0161-PaperPR-Fix-some-beacon-event-issues.patch rename to leaf-server/minecraft-patches/features/0162-PaperPR-Fix-some-beacon-event-issues.patch diff --git a/leaf-server/minecraft-patches/features/0162-Dont-send-useless-entity-packets.patch b/leaf-server/minecraft-patches/features/0163-Dont-send-useless-entity-packets.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0162-Dont-send-useless-entity-packets.patch rename to leaf-server/minecraft-patches/features/0163-Dont-send-useless-entity-packets.patch diff --git a/leaf-server/minecraft-patches/features/0163-Multithreaded-Tracker.patch b/leaf-server/minecraft-patches/features/0164-Multithreaded-Tracker.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0163-Multithreaded-Tracker.patch rename to leaf-server/minecraft-patches/features/0164-Multithreaded-Tracker.patch index e3e575e1..c3bb1969 100644 --- a/leaf-server/minecraft-patches/features/0163-Multithreaded-Tracker.patch +++ b/leaf-server/minecraft-patches/features/0164-Multithreaded-Tracker.patch @@ -212,7 +212,7 @@ index d23ed8dbda5132337c8c96c67cf924e438ea9f4b..889b7e8752129dd3b5ba196c4b294496 } diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index eba90724a6e5e8a93d775d3e0703a0b37a77e7e5..1692d243a147e927c910890bd168f2fc5b166e29 100644 +index 776c23f64fdda3bcc93d66e811be7438c22be1f7..38b2714c4f0b53b91f61c89de42965919d586025 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1811,7 +1811,7 @@ public class ServerGamePacketListenerImpl diff --git a/leaf-server/minecraft-patches/features/0164-Nitori-Async-playerdata-Save.patch b/leaf-server/minecraft-patches/features/0165-Nitori-Async-playerdata-Save.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0164-Nitori-Async-playerdata-Save.patch rename to leaf-server/minecraft-patches/features/0165-Nitori-Async-playerdata-Save.patch index 9eacd393..5588d163 100644 --- a/leaf-server/minecraft-patches/features/0164-Nitori-Async-playerdata-Save.patch +++ b/leaf-server/minecraft-patches/features/0165-Nitori-Async-playerdata-Save.patch @@ -7,7 +7,7 @@ Original license: GPL v3 Original project: https://github.com/Gensokyo-Reimagined/Nitori diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index 18a0150536a847f9617a736245086d590bf80b74..10084fa3c0b8e1e6eaefc4fd733fc74ff295d588 100644 +index 17d3a8a2cc3c86ed6aae9c20ed9f281dc9715cf5..354823def23167feb1e7b35cd9db5ef1584e7e8c 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -1067,6 +1067,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { String minecraftVersion = Bukkit.getVersion(); @@ -51,18 +51,18 @@ index 6abc57669e87f7f98f3b76af3c0e50825fea6eb1..d561202169d6f19c1e9ad8009415af9e metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size())); metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() ? "online" : "offline")); - final String paperVersion; -+ final String galeVersion; // Gale - branding changes - metrics ++ final String leafVersion; // Gale - branding changes - metrics // Leaf - metrics final String implVersion = org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion(); if (implVersion != null) { final String buildOrHash = implVersion.substring(implVersion.lastIndexOf('-') + 1); - paperVersion = "git-Paper-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); -+ galeVersion = "git-Gale-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); // Gale - branding changes - metrics ++ leafVersion = "git-Leaf-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); // Gale - branding changes - metrics // Leaf - metrics } else { - paperVersion = "unknown"; -+ galeVersion = "unknown"; // Gale - branding changes - metrics ++ leafVersion = "unknown"; // Gale - branding changes - metrics // Leaf - metrics } - metrics.addCustomChart(new Metrics.SimplePie("paper_version", () -> paperVersion)); -+ metrics.addCustomChart(new Metrics.SimplePie("gale_version", () -> galeVersion)); // Gale - branding changes - metrics ++ metrics.addCustomChart(new Metrics.SimplePie("leaf_version", () -> leafVersion)); // Gale - branding changes - metrics // Leaf - metrics metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> { - Map> map = new HashMap<>(); diff --git a/leaf-archived-patches/unapplied/server/paper-patches/features/0006-Fix-Pufferfish-and-Purpur-patches.patch b/leaf-server/paper-patches/features/0010-Fix-Pufferfish-and-Purpur-patches.patch similarity index 100% rename from leaf-archived-patches/unapplied/server/paper-patches/features/0006-Fix-Pufferfish-and-Purpur-patches.patch rename to leaf-server/paper-patches/features/0010-Fix-Pufferfish-and-Purpur-patches.patch diff --git a/leaf-server/paper-patches/features/0010-Simpler-ShapelessRecipe-comparison-for-vanilla.patch b/leaf-server/paper-patches/features/0011-Simpler-ShapelessRecipe-comparison-for-vanilla.patch similarity index 100% rename from leaf-server/paper-patches/features/0010-Simpler-ShapelessRecipe-comparison-for-vanilla.patch rename to leaf-server/paper-patches/features/0011-Simpler-ShapelessRecipe-comparison-for-vanilla.patch diff --git a/leaf-server/paper-patches/features/0011-Print-stack-trace-for-plugins-not-shutting-down-task.patch b/leaf-server/paper-patches/features/0012-Print-stack-trace-for-plugins-not-shutting-down-task.patch similarity index 100% rename from leaf-server/paper-patches/features/0011-Print-stack-trace-for-plugins-not-shutting-down-task.patch rename to leaf-server/paper-patches/features/0012-Print-stack-trace-for-plugins-not-shutting-down-task.patch diff --git a/leaf-server/paper-patches/features/0012-SIMD-support.patch b/leaf-server/paper-patches/features/0013-SIMD-support.patch similarity index 97% rename from leaf-server/paper-patches/features/0012-SIMD-support.patch rename to leaf-server/paper-patches/features/0013-SIMD-support.patch index 8055726e..b67f3853 100644 --- a/leaf-server/paper-patches/features/0012-SIMD-support.patch +++ b/leaf-server/paper-patches/features/0013-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/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java -index 612eacf43f8b6b92354fa43479bd0ead728dd7b9..a35c0af0c53bab4c1b3623e903d3057c816e5d3b 100644 +index c9c7590a5635d966a0ca262ed5985714d9e66598..119d26ada18ad1451b893657a1c9fa3bc2be6be4 100644 --- a/src/main/java/com/destroystokyo/paper/Metrics.java +++ b/src/main/java/com/destroystokyo/paper/Metrics.java @@ -936,6 +936,46 @@ public class Metrics { diff --git a/leaf-server/paper-patches/features/0013-Make-book-writing-configurable.patch b/leaf-server/paper-patches/features/0014-Make-book-writing-configurable.patch similarity index 100% rename from leaf-server/paper-patches/features/0013-Make-book-writing-configurable.patch rename to leaf-server/paper-patches/features/0014-Make-book-writing-configurable.patch diff --git a/leaf-server/paper-patches/features/0014-Optimize-entity-coordinate-key.patch b/leaf-server/paper-patches/features/0015-Optimize-entity-coordinate-key.patch similarity index 100% rename from leaf-server/paper-patches/features/0014-Optimize-entity-coordinate-key.patch rename to leaf-server/paper-patches/features/0015-Optimize-entity-coordinate-key.patch diff --git a/leaf-server/paper-patches/features/0015-Do-not-log-legacy-Material-initialization.patch b/leaf-server/paper-patches/features/0016-Do-not-log-legacy-Material-initialization.patch similarity index 100% rename from leaf-server/paper-patches/features/0015-Do-not-log-legacy-Material-initialization.patch rename to leaf-server/paper-patches/features/0016-Do-not-log-legacy-Material-initialization.patch diff --git a/leaf-server/paper-patches/features/0016-Do-not-log-Not-Secure-marker.patch b/leaf-server/paper-patches/features/0017-Do-not-log-Not-Secure-marker.patch similarity index 100% rename from leaf-server/paper-patches/features/0016-Do-not-log-Not-Secure-marker.patch rename to leaf-server/paper-patches/features/0017-Do-not-log-Not-Secure-marker.patch diff --git a/leaf-server/paper-patches/features/0017-Reduce-array-allocations.patch b/leaf-server/paper-patches/features/0018-Reduce-array-allocations.patch similarity index 100% rename from leaf-server/paper-patches/features/0017-Reduce-array-allocations.patch rename to leaf-server/paper-patches/features/0018-Reduce-array-allocations.patch diff --git a/leaf-server/paper-patches/features/0018-CraftBukkit-UUID-to-world-map.patch b/leaf-server/paper-patches/features/0019-CraftBukkit-UUID-to-world-map.patch similarity index 100% rename from leaf-server/paper-patches/features/0018-CraftBukkit-UUID-to-world-map.patch rename to leaf-server/paper-patches/features/0019-CraftBukkit-UUID-to-world-map.patch diff --git a/leaf-server/paper-patches/features/0019-Specific-interval-TPS-API.patch b/leaf-server/paper-patches/features/0020-Specific-interval-TPS-API.patch similarity index 100% rename from leaf-server/paper-patches/features/0019-Specific-interval-TPS-API.patch rename to leaf-server/paper-patches/features/0020-Specific-interval-TPS-API.patch diff --git a/leaf-server/paper-patches/features/0020-5-second-TPS-average.patch b/leaf-server/paper-patches/features/0021-5-second-TPS-average.patch similarity index 100% rename from leaf-server/paper-patches/features/0020-5-second-TPS-average.patch rename to leaf-server/paper-patches/features/0021-5-second-TPS-average.patch diff --git a/leaf-server/paper-patches/features/0021-Last-tick-time-API.patch b/leaf-server/paper-patches/features/0022-Last-tick-time-API.patch similarity index 100% rename from leaf-server/paper-patches/features/0021-Last-tick-time-API.patch rename to leaf-server/paper-patches/features/0022-Last-tick-time-API.patch diff --git a/leaf-server/paper-patches/features/0022-Show-last-tick-time-in-tps-command.patch b/leaf-server/paper-patches/features/0023-Show-last-tick-time-in-tps-command.patch similarity index 100% rename from leaf-server/paper-patches/features/0022-Show-last-tick-time-in-tps-command.patch rename to leaf-server/paper-patches/features/0023-Show-last-tick-time-in-tps-command.patch diff --git a/leaf-server/paper-patches/features/0023-Pre-compute-VarLong-sizes.patch b/leaf-server/paper-patches/features/0024-Pre-compute-VarLong-sizes.patch similarity index 100% rename from leaf-server/paper-patches/features/0023-Pre-compute-VarLong-sizes.patch rename to leaf-server/paper-patches/features/0024-Pre-compute-VarLong-sizes.patch diff --git a/leaf-server/paper-patches/features/0024-Optimize-VarInt-write-and-VarLong-write.patch b/leaf-server/paper-patches/features/0025-Optimize-VarInt-write-and-VarLong-write.patch similarity index 100% rename from leaf-server/paper-patches/features/0024-Optimize-VarInt-write-and-VarLong-write.patch rename to leaf-server/paper-patches/features/0025-Optimize-VarInt-write-and-VarLong-write.patch diff --git a/leaf-server/paper-patches/features/0025-Virtual-thread-support.patch b/leaf-server/paper-patches/features/0026-Virtual-thread-support.patch similarity index 94% rename from leaf-server/paper-patches/features/0025-Virtual-thread-support.patch rename to leaf-server/paper-patches/features/0026-Virtual-thread-support.patch index e5878bd6..5d976306 100644 --- a/leaf-server/paper-patches/features/0025-Virtual-thread-support.patch +++ b/leaf-server/paper-patches/features/0026-Virtual-thread-support.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/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java -index a35c0af0c53bab4c1b3623e903d3057c816e5d3b..3e9bbe0dae0cd1bdb390f68612dbf824b6ed4df7 100644 +index 119d26ada18ad1451b893657a1c9fa3bc2be6be4..8685b42dd00c964b0fbf42334cd6d23f187b2658 100644 --- a/src/main/java/com/destroystokyo/paper/Metrics.java +++ b/src/main/java/com/destroystokyo/paper/Metrics.java @@ -976,6 +976,22 @@ public class Metrics { diff --git a/leaf-server/paper-patches/features/0026-Remove-Timings.patch b/leaf-server/paper-patches/features/0027-Remove-Timings.patch similarity index 100% rename from leaf-server/paper-patches/features/0026-Remove-Timings.patch rename to leaf-server/paper-patches/features/0027-Remove-Timings.patch diff --git a/leaf-server/paper-patches/features/0027-KeYi-Player-Skull-API.patch b/leaf-server/paper-patches/features/0028-KeYi-Player-Skull-API.patch similarity index 100% rename from leaf-server/paper-patches/features/0027-KeYi-Player-Skull-API.patch rename to leaf-server/paper-patches/features/0028-KeYi-Player-Skull-API.patch diff --git a/leaf-server/paper-patches/features/0028-Slice-Smooth-Teleports.patch b/leaf-server/paper-patches/features/0029-Slice-Smooth-Teleports.patch similarity index 100% rename from leaf-server/paper-patches/features/0028-Slice-Smooth-Teleports.patch rename to leaf-server/paper-patches/features/0029-Slice-Smooth-Teleports.patch diff --git a/leaf-server/paper-patches/features/0029-Skip-event-if-no-listeners.patch b/leaf-server/paper-patches/features/0030-Skip-event-if-no-listeners.patch similarity index 100% rename from leaf-server/paper-patches/features/0029-Skip-event-if-no-listeners.patch rename to leaf-server/paper-patches/features/0030-Skip-event-if-no-listeners.patch diff --git a/leaf-server/paper-patches/features/0030-SparklyPaper-Skip-EntityScheduler-s-executeTick-chec.patch b/leaf-server/paper-patches/features/0031-SparklyPaper-Skip-EntityScheduler-s-executeTick-chec.patch similarity index 100% rename from leaf-server/paper-patches/features/0030-SparklyPaper-Skip-EntityScheduler-s-executeTick-chec.patch rename to leaf-server/paper-patches/features/0031-SparklyPaper-Skip-EntityScheduler-s-executeTick-chec.patch diff --git a/leaf-server/paper-patches/features/0031-SparklyPaper-Optimize-canSee-checks.patch b/leaf-server/paper-patches/features/0032-SparklyPaper-Optimize-canSee-checks.patch similarity index 100% rename from leaf-server/paper-patches/features/0031-SparklyPaper-Optimize-canSee-checks.patch rename to leaf-server/paper-patches/features/0032-SparklyPaper-Optimize-canSee-checks.patch diff --git a/leaf-server/paper-patches/features/0032-Including-5s-in-getTPS.patch b/leaf-server/paper-patches/features/0033-Including-5s-in-getTPS.patch similarity index 100% rename from leaf-server/paper-patches/features/0032-Including-5s-in-getTPS.patch rename to leaf-server/paper-patches/features/0033-Including-5s-in-getTPS.patch diff --git a/leaf-server/paper-patches/features/0033-Don-t-throw-exception-on-missing-ResourceKey-value.patch b/leaf-server/paper-patches/features/0034-Don-t-throw-exception-on-missing-ResourceKey-value.patch similarity index 100% rename from leaf-server/paper-patches/features/0033-Don-t-throw-exception-on-missing-ResourceKey-value.patch rename to leaf-server/paper-patches/features/0034-Don-t-throw-exception-on-missing-ResourceKey-value.patch diff --git a/leaf-server/paper-patches/features/0034-Virtual-Thread-for-async-scheduler.patch b/leaf-server/paper-patches/features/0035-Virtual-Thread-for-async-scheduler.patch similarity index 100% rename from leaf-server/paper-patches/features/0034-Virtual-Thread-for-async-scheduler.patch rename to leaf-server/paper-patches/features/0035-Virtual-Thread-for-async-scheduler.patch diff --git a/leaf-server/paper-patches/features/0035-Mirai-Configurable-chat-message-signatures.patch b/leaf-server/paper-patches/features/0036-Mirai-Configurable-chat-message-signatures.patch similarity index 100% rename from leaf-server/paper-patches/features/0035-Mirai-Configurable-chat-message-signatures.patch rename to leaf-server/paper-patches/features/0036-Mirai-Configurable-chat-message-signatures.patch diff --git a/leaf-server/paper-patches/features/0036-Matter-Secure-Seed.patch b/leaf-server/paper-patches/features/0037-Matter-Secure-Seed.patch similarity index 100% rename from leaf-server/paper-patches/features/0036-Matter-Secure-Seed.patch rename to leaf-server/paper-patches/features/0037-Matter-Secure-Seed.patch diff --git a/leaf-server/paper-patches/features/0037-Faster-random-generator.patch b/leaf-server/paper-patches/features/0038-Faster-random-generator.patch similarity index 100% rename from leaf-server/paper-patches/features/0037-Faster-random-generator.patch rename to leaf-server/paper-patches/features/0038-Faster-random-generator.patch diff --git a/leaf-server/paper-patches/features/0038-Configurable-unknown-command-message.patch b/leaf-server/paper-patches/features/0039-Configurable-unknown-command-message.patch similarity index 100% rename from leaf-server/paper-patches/features/0038-Configurable-unknown-command-message.patch rename to leaf-server/paper-patches/features/0039-Configurable-unknown-command-message.patch diff --git a/leaf-server/paper-patches/features/0039-Replace-world-map-with-optimized-collection.patch b/leaf-server/paper-patches/features/0040-Replace-world-map-with-optimized-collection.patch similarity index 100% rename from leaf-server/paper-patches/features/0039-Replace-world-map-with-optimized-collection.patch rename to leaf-server/paper-patches/features/0040-Replace-world-map-with-optimized-collection.patch diff --git a/leaf-server/paper-patches/features/0040-Cache-CraftEntityType-minecraftToBukkit-convert.patch b/leaf-server/paper-patches/features/0041-Cache-CraftEntityType-minecraftToBukkit-convert.patch similarity index 100% rename from leaf-server/paper-patches/features/0040-Cache-CraftEntityType-minecraftToBukkit-convert.patch rename to leaf-server/paper-patches/features/0041-Cache-CraftEntityType-minecraftToBukkit-convert.patch diff --git a/leaf-server/paper-patches/features/0041-Multithreaded-Tracker.patch b/leaf-server/paper-patches/features/0042-Multithreaded-Tracker.patch similarity index 100% rename from leaf-server/paper-patches/features/0041-Multithreaded-Tracker.patch rename to leaf-server/paper-patches/features/0042-Multithreaded-Tracker.patch diff --git a/leaf-server/paper-patches/features/0042-Asynchronous-locator.patch b/leaf-server/paper-patches/features/0043-Asynchronous-locator.patch similarity index 100% rename from leaf-server/paper-patches/features/0042-Asynchronous-locator.patch rename to leaf-server/paper-patches/features/0043-Asynchronous-locator.patch diff --git a/leaf-server/paper-patches/features/0043-EMC-Don-t-use-snapshots-for-acquiring-blockstate.patch b/leaf-server/paper-patches/features/0044-EMC-Don-t-use-snapshots-for-acquiring-blockstate.patch similarity index 100% rename from leaf-server/paper-patches/features/0043-EMC-Don-t-use-snapshots-for-acquiring-blockstate.patch rename to leaf-server/paper-patches/features/0044-EMC-Don-t-use-snapshots-for-acquiring-blockstate.patch diff --git a/leaf-server/paper-patches/features/0044-Faster-CraftServer-getworlds-list-creation.patch b/leaf-server/paper-patches/features/0045-Faster-CraftServer-getworlds-list-creation.patch similarity index 100% rename from leaf-server/paper-patches/features/0044-Faster-CraftServer-getworlds-list-creation.patch rename to leaf-server/paper-patches/features/0045-Faster-CraftServer-getworlds-list-creation.patch diff --git a/leaf-server/paper-patches/features/0045-Cache-chunk-key.patch b/leaf-server/paper-patches/features/0046-Cache-chunk-key.patch similarity index 100% rename from leaf-server/paper-patches/features/0045-Cache-chunk-key.patch rename to leaf-server/paper-patches/features/0046-Cache-chunk-key.patch diff --git a/leaf-server/paper-patches/features/0046-Async-structure-locate-api.patch b/leaf-server/paper-patches/features/0047-Async-structure-locate-api.patch similarity index 100% rename from leaf-server/paper-patches/features/0046-Async-structure-locate-api.patch rename to leaf-server/paper-patches/features/0047-Async-structure-locate-api.patch diff --git a/leaf-server/paper-patches/features/0047-PlayerInventoryOverflowEvent.patch b/leaf-server/paper-patches/features/0048-PlayerInventoryOverflowEvent.patch similarity index 100% rename from leaf-server/paper-patches/features/0047-PlayerInventoryOverflowEvent.patch rename to leaf-server/paper-patches/features/0048-PlayerInventoryOverflowEvent.patch diff --git a/leaf-server/paper-patches/features/0048-SparklyPaper-Parallel-world-ticking.patch b/leaf-server/paper-patches/features/0049-SparklyPaper-Parallel-world-ticking.patch similarity index 100% rename from leaf-server/paper-patches/features/0048-SparklyPaper-Parallel-world-ticking.patch rename to leaf-server/paper-patches/features/0049-SparklyPaper-Parallel-world-ticking.patch diff --git a/leaf-server/paper-patches/features/0049-Paper-PR-Throttle-failed-spawn-attempts.patch b/leaf-server/paper-patches/features/0050-Paper-PR-Throttle-failed-spawn-attempts.patch similarity index 100% rename from leaf-server/paper-patches/features/0049-Paper-PR-Throttle-failed-spawn-attempts.patch rename to leaf-server/paper-patches/features/0050-Paper-PR-Throttle-failed-spawn-attempts.patch diff --git a/leaf-server/paper-patches/features/0050-Async-playerdata-saving.patch b/leaf-server/paper-patches/features/0051-Async-playerdata-saving.patch similarity index 100% rename from leaf-server/paper-patches/features/0050-Async-playerdata-saving.patch rename to leaf-server/paper-patches/features/0051-Async-playerdata-saving.patch