diff --git a/README.md b/README.md index 428aa55f..5c55b52e 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,6 @@ If these excellent projects hadn't appeared, Leaf wouldn't have become great. • Luminol
Nitori
Moonrise
- • DivineMC

diff --git a/patches/server/0149-SparklyPaper-Throttle-hopper-when-full.patch b/patches/server/0058-SparklyPaper-Throttle-hopper-when-full.patch similarity index 100% rename from patches/server/0149-SparklyPaper-Throttle-hopper-when-full.patch rename to patches/server/0058-SparklyPaper-Throttle-hopper-when-full.patch diff --git a/patches/server/0058-Polpot-Make-egg-and-snowball-can-knockback-player.patch b/patches/server/0059-Polpot-Make-egg-and-snowball-can-knockback-player.patch similarity index 100% rename from patches/server/0058-Polpot-Make-egg-and-snowball-can-knockback-player.patch rename to patches/server/0059-Polpot-Make-egg-and-snowball-can-knockback-player.patch diff --git a/patches/server/0059-Moonrise-Bitstorage-optimisations.patch b/patches/server/0060-Moonrise-Bitstorage-optimisations.patch similarity index 100% rename from patches/server/0059-Moonrise-Bitstorage-optimisations.patch rename to patches/server/0060-Moonrise-Bitstorage-optimisations.patch diff --git a/patches/server/0060-Moonrise-Optimize-nearby-players-for-spawning-iterat.patch b/patches/server/0061-Moonrise-Optimize-nearby-players-for-spawning-iterat.patch similarity index 100% rename from patches/server/0060-Moonrise-Optimize-nearby-players-for-spawning-iterat.patch rename to patches/server/0061-Moonrise-Optimize-nearby-players-for-spawning-iterat.patch diff --git a/patches/server/0061-Moonrise-block-counting-optimisations.patch b/patches/server/0062-Moonrise-block-counting-optimisations.patch similarity index 100% rename from patches/server/0061-Moonrise-block-counting-optimisations.patch rename to patches/server/0062-Moonrise-block-counting-optimisations.patch diff --git a/patches/server/0062-Moonrise-Optimise-BiomeManager-getFiddle.patch b/patches/server/0063-Moonrise-Optimise-BiomeManager-getFiddle.patch similarity index 100% rename from patches/server/0062-Moonrise-Optimise-BiomeManager-getFiddle.patch rename to patches/server/0063-Moonrise-Optimise-BiomeManager-getFiddle.patch diff --git a/patches/server/0063-Moonrise-Do-not-send-chunk-radius-packet-from-Player.patch b/patches/server/0064-Moonrise-Do-not-send-chunk-radius-packet-from-Player.patch similarity index 100% rename from patches/server/0063-Moonrise-Do-not-send-chunk-radius-packet-from-Player.patch rename to patches/server/0064-Moonrise-Do-not-send-chunk-radius-packet-from-Player.patch diff --git a/patches/server/0064-Moonrise-Add-direct-lookup-by-chunk-for-NearbyPlayer.patch b/patches/server/0065-Moonrise-Add-direct-lookup-by-chunk-for-NearbyPlayer.patch similarity index 100% rename from patches/server/0064-Moonrise-Add-direct-lookup-by-chunk-for-NearbyPlayer.patch rename to patches/server/0065-Moonrise-Add-direct-lookup-by-chunk-for-NearbyPlayer.patch diff --git a/patches/server/0065-Moonrise-Optimise-checkInsideBlocks.patch b/patches/server/0066-Moonrise-Optimise-checkInsideBlocks.patch similarity index 100% rename from patches/server/0065-Moonrise-Optimise-checkInsideBlocks.patch rename to patches/server/0066-Moonrise-Optimise-checkInsideBlocks.patch diff --git a/patches/server/0066-Moonrise-Avoid-streams-for-block-retrieval-in-Entity.patch b/patches/server/0067-Moonrise-Avoid-streams-for-block-retrieval-in-Entity.patch similarity index 100% rename from patches/server/0066-Moonrise-Avoid-streams-for-block-retrieval-in-Entity.patch rename to patches/server/0067-Moonrise-Avoid-streams-for-block-retrieval-in-Entity.patch diff --git a/patches/server/0067-Moonrise-Optimise-countEntries-for-low-size-SimpleBi.patch b/patches/server/0068-Moonrise-Optimise-countEntries-for-low-size-SimpleBi.patch similarity index 100% rename from patches/server/0067-Moonrise-Optimise-countEntries-for-low-size-SimpleBi.patch rename to patches/server/0068-Moonrise-Optimise-countEntries-for-low-size-SimpleBi.patch diff --git a/patches/server/0068-Moonrise-fluid-method-optimisations.patch b/patches/server/0069-Moonrise-fluid-method-optimisations.patch similarity index 100% rename from patches/server/0068-Moonrise-fluid-method-optimisations.patch rename to patches/server/0069-Moonrise-fluid-method-optimisations.patch diff --git a/patches/server/0069-Moonrise-optimise-palette-reads.patch b/patches/server/0070-Moonrise-optimise-palette-reads.patch similarity index 100% rename from patches/server/0069-Moonrise-optimise-palette-reads.patch rename to patches/server/0070-Moonrise-optimise-palette-reads.patch diff --git a/patches/server/0070-Redirect-vanilla-getProfiler-in-PathNavigationRegion.patch b/patches/server/0071-Redirect-vanilla-getProfiler-in-PathNavigationRegion.patch similarity index 100% rename from patches/server/0070-Redirect-vanilla-getProfiler-in-PathNavigationRegion.patch rename to patches/server/0071-Redirect-vanilla-getProfiler-in-PathNavigationRegion.patch diff --git a/patches/server/0071-Fix-MC-65198.patch b/patches/server/0072-Fix-MC-65198.patch similarity index 100% rename from patches/server/0071-Fix-MC-65198.patch rename to patches/server/0072-Fix-MC-65198.patch diff --git a/patches/server/0072-Including-5s-in-getTPS.patch b/patches/server/0073-Including-5s-in-getTPS.patch similarity index 100% rename from patches/server/0072-Including-5s-in-getTPS.patch rename to patches/server/0073-Including-5s-in-getTPS.patch diff --git a/patches/server/0073-Remove-useless-creating-stats-json-bases-on-player-n.patch b/patches/server/0074-Remove-useless-creating-stats-json-bases-on-player-n.patch similarity index 100% rename from patches/server/0073-Remove-useless-creating-stats-json-bases-on-player-n.patch rename to patches/server/0074-Remove-useless-creating-stats-json-bases-on-player-n.patch diff --git a/patches/server/0074-Don-t-throw-exception-on-missing-ResourceKey-value.patch b/patches/server/0075-Don-t-throw-exception-on-missing-ResourceKey-value.patch similarity index 100% rename from patches/server/0074-Don-t-throw-exception-on-missing-ResourceKey-value.patch rename to patches/server/0075-Don-t-throw-exception-on-missing-ResourceKey-value.patch diff --git a/patches/server/0075-Improve-Purpur-AFK-system.patch b/patches/server/0076-Improve-Purpur-AFK-system.patch similarity index 100% rename from patches/server/0075-Improve-Purpur-AFK-system.patch rename to patches/server/0076-Improve-Purpur-AFK-system.patch diff --git a/patches/server/0076-Virtual-Thread-for-async-scheduler.patch b/patches/server/0077-Virtual-Thread-for-async-scheduler.patch similarity index 100% rename from patches/server/0076-Virtual-Thread-for-async-scheduler.patch rename to patches/server/0077-Virtual-Thread-for-async-scheduler.patch diff --git a/patches/server/0077-Mirai-Configurable-chat-message-signatures.patch b/patches/server/0078-Mirai-Configurable-chat-message-signatures.patch similarity index 100% rename from patches/server/0077-Mirai-Configurable-chat-message-signatures.patch rename to patches/server/0078-Mirai-Configurable-chat-message-signatures.patch diff --git a/patches/server/0078-Cache-player-profileResult.patch b/patches/server/0079-Cache-player-profileResult.patch similarity index 100% rename from patches/server/0078-Cache-player-profileResult.patch rename to patches/server/0079-Cache-player-profileResult.patch diff --git a/patches/server/0079-Prevent-change-non-editable-sign-warning-spam-in-con.patch b/patches/server/0080-Prevent-change-non-editable-sign-warning-spam-in-con.patch similarity index 100% rename from patches/server/0079-Prevent-change-non-editable-sign-warning-spam-in-con.patch rename to patches/server/0080-Prevent-change-non-editable-sign-warning-spam-in-con.patch diff --git a/patches/server/0080-Matter-Secure-Seed.patch b/patches/server/0081-Matter-Secure-Seed.patch similarity index 100% rename from patches/server/0080-Matter-Secure-Seed.patch rename to patches/server/0081-Matter-Secure-Seed.patch diff --git a/patches/server/0081-Matter-Seed-Command.patch b/patches/server/0082-Matter-Seed-Command.patch similarity index 100% rename from patches/server/0081-Matter-Seed-Command.patch rename to patches/server/0082-Matter-Seed-Command.patch diff --git a/patches/server/0082-Ignore-terminal-provider-warning.patch b/patches/server/0083-Ignore-terminal-provider-warning.patch similarity index 100% rename from patches/server/0082-Ignore-terminal-provider-warning.patch rename to patches/server/0083-Ignore-terminal-provider-warning.patch diff --git a/patches/server/0083-Fix-console-freeze-above-JAVA-22.patch b/patches/server/0084-Fix-console-freeze-above-JAVA-22.patch similarity index 100% rename from patches/server/0083-Fix-console-freeze-above-JAVA-22.patch rename to patches/server/0084-Fix-console-freeze-above-JAVA-22.patch diff --git a/patches/server/0084-Fix-console-output-display-on-Pterodactyl-panel.patch b/patches/server/0085-Fix-console-output-display-on-Pterodactyl-panel.patch similarity index 100% rename from patches/server/0084-Fix-console-output-display-on-Pterodactyl-panel.patch rename to patches/server/0085-Fix-console-output-display-on-Pterodactyl-panel.patch diff --git a/patches/server/0085-Faster-Random-Generator.patch b/patches/server/0086-Faster-Random-Generator.patch similarity index 100% rename from patches/server/0085-Faster-Random-Generator.patch rename to patches/server/0086-Faster-Random-Generator.patch diff --git a/patches/server/0086-Don-t-save-primed-tnt-entity.patch b/patches/server/0087-Don-t-save-primed-tnt-entity.patch similarity index 100% rename from patches/server/0086-Don-t-save-primed-tnt-entity.patch rename to patches/server/0087-Don-t-save-primed-tnt-entity.patch diff --git a/patches/server/0087-Don-t-save-falling-block-entity.patch b/patches/server/0088-Don-t-save-falling-block-entity.patch similarity index 100% rename from patches/server/0087-Don-t-save-falling-block-entity.patch rename to patches/server/0088-Don-t-save-falling-block-entity.patch diff --git a/patches/server/0088-Configurable-connection-message.patch b/patches/server/0089-Configurable-connection-message.patch similarity index 100% rename from patches/server/0088-Configurable-connection-message.patch rename to patches/server/0089-Configurable-connection-message.patch diff --git a/patches/server/0089-Configurable-unknown-command-message.patch b/patches/server/0090-Configurable-unknown-command-message.patch similarity index 100% rename from patches/server/0089-Configurable-unknown-command-message.patch rename to patches/server/0090-Configurable-unknown-command-message.patch diff --git a/patches/server/0090-Airplane-Remove-stream-in-PoiCompetitorScan.patch b/patches/server/0091-Airplane-Remove-stream-in-PoiCompetitorScan.patch similarity index 100% rename from patches/server/0090-Airplane-Remove-stream-in-PoiCompetitorScan.patch rename to patches/server/0091-Airplane-Remove-stream-in-PoiCompetitorScan.patch diff --git a/patches/server/0091-Remove-stream-in-BlockBehaviour-cache-blockstate.patch b/patches/server/0092-Remove-stream-in-BlockBehaviour-cache-blockstate.patch similarity index 100% rename from patches/server/0091-Remove-stream-in-BlockBehaviour-cache-blockstate.patch rename to patches/server/0092-Remove-stream-in-BlockBehaviour-cache-blockstate.patch diff --git a/patches/server/0092-Remove-stream-in-RecipeManager-getRecipeFor.patch b/patches/server/0093-Remove-stream-in-RecipeManager-getRecipeFor.patch similarity index 100% rename from patches/server/0092-Remove-stream-in-RecipeManager-getRecipeFor.patch rename to patches/server/0093-Remove-stream-in-RecipeManager-getRecipeFor.patch diff --git a/patches/server/0093-Remove-stream-in-entity-visible-effects-filter.patch b/patches/server/0094-Remove-stream-in-entity-visible-effects-filter.patch similarity index 100% rename from patches/server/0093-Remove-stream-in-entity-visible-effects-filter.patch rename to patches/server/0094-Remove-stream-in-entity-visible-effects-filter.patch diff --git a/patches/server/0094-Remove-stream-and-double-iteration-in-enough-deep-sl.patch b/patches/server/0095-Remove-stream-and-double-iteration-in-enough-deep-sl.patch similarity index 100% rename from patches/server/0094-Remove-stream-and-double-iteration-in-enough-deep-sl.patch rename to patches/server/0095-Remove-stream-and-double-iteration-in-enough-deep-sl.patch diff --git a/patches/server/0095-Remove-stream-in-trial-spawner-ticking.patch b/patches/server/0096-Remove-stream-in-trial-spawner-ticking.patch similarity index 100% rename from patches/server/0095-Remove-stream-in-trial-spawner-ticking.patch rename to patches/server/0096-Remove-stream-in-trial-spawner-ticking.patch diff --git a/patches/server/0096-Remove-stream-in-Brain.patch b/patches/server/0097-Remove-stream-in-Brain.patch similarity index 100% rename from patches/server/0096-Remove-stream-in-Brain.patch rename to patches/server/0097-Remove-stream-in-Brain.patch diff --git a/patches/server/0097-Remove-stream-in-BehaviorUtils.patch b/patches/server/0098-Remove-stream-in-BehaviorUtils.patch similarity index 100% rename from patches/server/0097-Remove-stream-in-BehaviorUtils.patch rename to patches/server/0098-Remove-stream-in-BehaviorUtils.patch diff --git a/patches/server/0098-Remove-stream-in-YieldJobSite.patch b/patches/server/0099-Remove-stream-in-YieldJobSite.patch similarity index 100% rename from patches/server/0098-Remove-stream-in-YieldJobSite.patch rename to patches/server/0099-Remove-stream-in-YieldJobSite.patch diff --git a/patches/server/0099-Remove-stream-in-PlayerSensor.patch b/patches/server/0100-Remove-stream-in-PlayerSensor.patch similarity index 100% rename from patches/server/0099-Remove-stream-in-PlayerSensor.patch rename to patches/server/0100-Remove-stream-in-PlayerSensor.patch diff --git a/patches/server/0100-Remove-stream-in-GolemSensor.patch b/patches/server/0101-Remove-stream-in-GolemSensor.patch similarity index 100% rename from patches/server/0100-Remove-stream-in-GolemSensor.patch rename to patches/server/0101-Remove-stream-in-GolemSensor.patch diff --git a/patches/server/0101-Replace-Entity-active-effects-map-with-optimized-col.patch b/patches/server/0102-Replace-Entity-active-effects-map-with-optimized-col.patch similarity index 100% rename from patches/server/0101-Replace-Entity-active-effects-map-with-optimized-col.patch rename to patches/server/0102-Replace-Entity-active-effects-map-with-optimized-col.patch diff --git a/patches/server/0102-Replace-criterion-map-with-optimized-collection.patch b/patches/server/0103-Replace-criterion-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0102-Replace-criterion-map-with-optimized-collection.patch rename to patches/server/0103-Replace-criterion-map-with-optimized-collection.patch diff --git a/patches/server/0103-Replace-world-map-with-optimized-collection.patch b/patches/server/0104-Replace-world-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0103-Replace-world-map-with-optimized-collection.patch rename to patches/server/0104-Replace-world-map-with-optimized-collection.patch diff --git a/patches/server/0104-Reduce-worldgen-allocations.patch b/patches/server/0105-Reduce-worldgen-allocations.patch similarity index 100% rename from patches/server/0104-Reduce-worldgen-allocations.patch rename to patches/server/0105-Reduce-worldgen-allocations.patch diff --git a/patches/server/0105-Replace-brain-maps-with-optimized-collection.patch b/patches/server/0106-Replace-brain-maps-with-optimized-collection.patch similarity index 100% rename from patches/server/0105-Replace-brain-maps-with-optimized-collection.patch rename to patches/server/0106-Replace-brain-maps-with-optimized-collection.patch diff --git a/patches/server/0106-Fix-MC-183518.patch b/patches/server/0107-Fix-MC-183518.patch similarity index 96% rename from patches/server/0106-Fix-MC-183518.patch rename to patches/server/0107-Fix-MC-183518.patch index 1747e4ae..e52d719f 100644 --- a/patches/server/0106-Fix-MC-183518.patch +++ b/patches/server/0107-Fix-MC-183518.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix-MC-183518 Related MC issue: https://bugs.mojang.com/browse/MC-183518 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 705becd8d234ff6b73c1a1e88d2d0b0633a3479b..37c377761b45eefab39164a7e714e585a02a4447 100644 +index 21ef94bed550a5b6662a68be44efc4d805281999..36442bdcce41cd7116ca52ed71304cb0161233ba 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -312,6 +312,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop Date: Wed, 23 Oct 2024 23:54:00 +0800 Subject: [PATCH] Asynchronous locator -This patch was ported from project: https://github.com/thebrightspark/AsyncLocator +Original license: MIT +Original project: https://github.com/thebrightspark/AsyncLocator diff --git a/src/main/java/ca/spottedleaf/moonrise/common/util/TickThread.java b/src/main/java/ca/spottedleaf/moonrise/common/util/TickThread.java index 11b7f15755dde766140c29bedca456c80d53293f..749d00449ac3f3c79bfc73a5517ea3a07675e447 100644 diff --git a/patches/server/0130-Virtual-thread-for-chat-executor.patch b/patches/server/0131-Virtual-thread-for-chat-executor.patch similarity index 96% rename from patches/server/0130-Virtual-thread-for-chat-executor.patch rename to patches/server/0131-Virtual-thread-for-chat-executor.patch index 631ae0dd..1f5dbe36 100644 --- a/patches/server/0130-Virtual-thread-for-chat-executor.patch +++ b/patches/server/0131-Virtual-thread-for-chat-executor.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Virtual thread for chat executor diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 37c377761b45eefab39164a7e714e585a02a4447..09e55f62b4cea5b058e04356252f4f56957646b8 100644 +index 36442bdcce41cd7116ca52ed71304cb0161233ba..b9d87acd4e59047caa542a4581f35938641f1be3 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -2894,7 +2894,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop Date: Mon, 1 Nov 2077 00:00:00 +0800 Subject: [PATCH] TT20 Lag compensation -This patch was ported from project: https://github.com/snackbag/TT20 -Project license: AGPL-3.0 +Original license: AGPL-3.0 +Original project: https://github.com/snackbag/TT20 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index 09e55f62b4cea5b058e04356252f4f56957646b8..279289e0c3dc65fed0ee4b2f5b0ef077ab433d5e 100644 diff --git a/patches/server/0137-Fix-wrong-entity-behavior-in-fluid-caused-by-inconsi.patch b/patches/server/0139-Fix-wrong-entity-behavior-in-fluid-caused-by-inconsi.patch similarity index 100% rename from patches/server/0137-Fix-wrong-entity-behavior-in-fluid-caused-by-inconsi.patch rename to patches/server/0139-Fix-wrong-entity-behavior-in-fluid-caused-by-inconsi.patch diff --git a/patches/server/0139-C2ME-Reduce-Allocations.patch b/patches/server/0140-C2ME-Reduce-Allocations.patch similarity index 100% rename from patches/server/0139-C2ME-Reduce-Allocations.patch rename to patches/server/0140-C2ME-Reduce-Allocations.patch diff --git a/patches/server/0140-DivineMC-Lithium-entity.fast_elytra_check-entity.fas.patch b/patches/server/0141-DivineMC-Lithium-entity.fast_elytra_check-entity.fas.patch similarity index 100% rename from patches/server/0140-DivineMC-Lithium-entity.fast_elytra_check-entity.fas.patch rename to patches/server/0141-DivineMC-Lithium-entity.fast_elytra_check-entity.fas.patch diff --git a/patches/server/0141-Lithium-fast-util.patch b/patches/server/0142-Lithium-fast-util.patch similarity index 100% rename from patches/server/0141-Lithium-fast-util.patch rename to patches/server/0142-Lithium-fast-util.patch diff --git a/patches/server/0142-Lithium-CompactSineLUT.patch b/patches/server/0143-Lithium-CompactSineLUT.patch similarity index 100% rename from patches/server/0142-Lithium-CompactSineLUT.patch rename to patches/server/0143-Lithium-CompactSineLUT.patch diff --git a/patches/server/0143-Lithium-IterateOutwardsCache.patch b/patches/server/0144-Lithium-IterateOutwardsCache.patch similarity index 100% rename from patches/server/0143-Lithium-IterateOutwardsCache.patch rename to patches/server/0144-Lithium-IterateOutwardsCache.patch diff --git a/patches/server/0144-Lithium-HashedList.patch b/patches/server/0145-Lithium-HashedList.patch similarity index 100% rename from patches/server/0144-Lithium-HashedList.patch rename to patches/server/0145-Lithium-HashedList.patch diff --git a/patches/server/0145-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EXECUTOR.patch b/patches/server/0146-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EXECUTOR.patch similarity index 100% rename from patches/server/0145-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EXECUTOR.patch rename to patches/server/0146-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EXECUTOR.patch diff --git a/patches/server/0146-Fix-tick-function-tag-running-before-load.patch b/patches/server/0147-Fix-tick-function-tag-running-before-load.patch similarity index 100% rename from patches/server/0146-Fix-tick-function-tag-running-before-load.patch rename to patches/server/0147-Fix-tick-function-tag-running-before-load.patch diff --git a/patches/server/0147-Better-inline-world-height.patch b/patches/server/0148-Better-inline-world-height.patch similarity index 100% rename from patches/server/0147-Better-inline-world-height.patch rename to patches/server/0148-Better-inline-world-height.patch diff --git a/patches/server/0148-Branchless-clamp-logic.patch b/patches/server/0149-Branchless-clamp-logic.patch similarity index 100% rename from patches/server/0148-Branchless-clamp-logic.patch rename to patches/server/0149-Branchless-clamp-logic.patch