From f2fa3514bd331bdcb639b897bc2e71d820c6a3c9 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Sun, 23 Mar 2025 12:03:04 +0800 Subject: [PATCH] Updated Upstream(Folia) --- gradle.properties | 2 +- ...ist-length-while-generating-tick-re.patch} | 0 ...e-tick-thread-to-run-shutdown-logics.patch | 19 ------------------- ...aiiju-Don-t-pathfind-outside-region.patch} | 0 ...ju-Vanilla-end-portal-teleportation.patch} | 0 ...iju-Entity-tick-and-removal-limiter.patch} | 0 ...8-Purpur-Use-alternative-keep-alive.patch} | 0 ...9-Purpur-Lobotomize-stuck-villagers.patch} | 0 ...rpur-Barrels-and-enderchests-6-rows.patch} | 0 ...ch => 0031-Petal-Reduce-sensor-work.patch} | 0 ...Cache-climbing-check-for-activation.patch} | 0 ...erfish-Reduce-chunk-loading-lookups.patch} | 0 ...34-Gale-Use-platform-math-functions.patch} | 0 ...le-Variable-entity-wake-up-duration.patch} | 0 ...kip-entity-move-if-movement-is-zero.patch} | 0 ...ttributes-with-optimized-collection.patch} | 0 ...0038-Gale-Optimize-noise-generation.patch} | 0 ...SparklyPaper-Optimize-canSee-checks.patch} | 0 ...-distanceToSqr-call-in-ServerEntity.patch} | 0 ...Secure-seed-and-matter-seed-command.patch} | 0 ...ss-creating-stats-json-bases-on-pla.patch} | 0 ...rain-maps-with-optimized-collection.patch} | 0 ...vent-zombie-reinforcements-loading-.patch} | 0 ...ntities-in-NearestLivingEntitySenso.patch} | 0 ...-api.patch => 0046-Tick-regions-api.patch} | 0 ...issing-teleportation-apis-for-folia.patch} | 0 ... => 0048-Leaves-Revert-raid-changes.patch} | 0 ...ves-Disable-moved-wrongly-threshold.patch} | 0 ...ect-Collision-Behavior-for-Block-Sh.patch} | 0 ... 0051-Raytracing-tracker-experiment.patch} | 0 30 files changed, 1 insertion(+), 20 deletions(-) rename luminol-server/minecraft-patches/features/{0025-Use-the-correct-list-length-while-generating-tick-re.patch => 0024-Use-the-correct-list-length-while-generating-tick-re.patch} (100%) delete mode 100644 luminol-server/minecraft-patches/features/0024-Wake-up-the-tick-thread-to-run-shutdown-logics.patch rename luminol-server/minecraft-patches/features/{0026-Kaiiju-Don-t-pathfind-outside-region.patch => 0025-Kaiiju-Don-t-pathfind-outside-region.patch} (100%) rename luminol-server/minecraft-patches/features/{0027-Kaiiju-Vanilla-end-portal-teleportation.patch => 0026-Kaiiju-Vanilla-end-portal-teleportation.patch} (100%) rename luminol-server/minecraft-patches/features/{0028-Kaiiju-Entity-tick-and-removal-limiter.patch => 0027-Kaiiju-Entity-tick-and-removal-limiter.patch} (100%) rename luminol-server/minecraft-patches/features/{0029-Purpur-Use-alternative-keep-alive.patch => 0028-Purpur-Use-alternative-keep-alive.patch} (100%) rename luminol-server/minecraft-patches/features/{0030-Purpur-Lobotomize-stuck-villagers.patch => 0029-Purpur-Lobotomize-stuck-villagers.patch} (100%) rename luminol-server/minecraft-patches/features/{0031-Purpur-Barrels-and-enderchests-6-rows.patch => 0030-Purpur-Barrels-and-enderchests-6-rows.patch} (100%) rename luminol-server/minecraft-patches/features/{0032-Petal-Reduce-sensor-work.patch => 0031-Petal-Reduce-sensor-work.patch} (100%) rename luminol-server/minecraft-patches/features/{0033-Pufferfish-Cache-climbing-check-for-activation.patch => 0032-Pufferfish-Cache-climbing-check-for-activation.patch} (100%) rename luminol-server/minecraft-patches/features/{0034-Pufferfish-Reduce-chunk-loading-lookups.patch => 0033-Pufferfish-Reduce-chunk-loading-lookups.patch} (100%) rename luminol-server/minecraft-patches/features/{0035-Gale-Use-platform-math-functions.patch => 0034-Gale-Use-platform-math-functions.patch} (100%) rename luminol-server/minecraft-patches/features/{0036-Gale-Variable-entity-wake-up-duration.patch => 0035-Gale-Variable-entity-wake-up-duration.patch} (100%) rename luminol-server/minecraft-patches/features/{0037-Gale-Skip-entity-move-if-movement-is-zero.patch => 0036-Gale-Skip-entity-move-if-movement-is-zero.patch} (100%) rename luminol-server/minecraft-patches/features/{0038-Gale-Replace-AI-attributes-with-optimized-collection.patch => 0037-Gale-Replace-AI-attributes-with-optimized-collection.patch} (100%) rename luminol-server/minecraft-patches/features/{0039-Gale-Optimize-noise-generation.patch => 0038-Gale-Optimize-noise-generation.patch} (100%) rename luminol-server/minecraft-patches/features/{0040-SparklyPaper-Optimize-canSee-checks.patch => 0039-SparklyPaper-Optimize-canSee-checks.patch} (100%) rename luminol-server/minecraft-patches/features/{0041-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch => 0040-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch} (100%) rename luminol-server/minecraft-patches/features/{0042-Leaf-Secure-seed-and-matter-seed-command.patch => 0041-Leaf-Secure-seed-and-matter-seed-command.patch} (100%) rename luminol-server/minecraft-patches/features/{0043-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch => 0042-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch} (100%) rename luminol-server/minecraft-patches/features/{0044-Leaf-Replace-brain-maps-with-optimized-collection.patch => 0043-Leaf-Replace-brain-maps-with-optimized-collection.patch} (100%) rename luminol-server/minecraft-patches/features/{0045-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch => 0044-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch} (100%) rename luminol-server/minecraft-patches/features/{0046-Leaf-Smart-sort-entities-in-NearestLivingEntitySenso.patch => 0045-Leaf-Smart-sort-entities-in-NearestLivingEntitySenso.patch} (100%) rename luminol-server/minecraft-patches/features/{0047-Tick-regions-api.patch => 0046-Tick-regions-api.patch} (100%) rename luminol-server/minecraft-patches/features/{0048-Add-missing-teleportation-apis-for-folia.patch => 0047-Add-missing-teleportation-apis-for-folia.patch} (100%) rename luminol-server/minecraft-patches/features/{0049-Leaves-Revert-raid-changes.patch => 0048-Leaves-Revert-raid-changes.patch} (100%) rename luminol-server/minecraft-patches/features/{0050-Leaves-Disable-moved-wrongly-threshold.patch => 0049-Leaves-Disable-moved-wrongly-threshold.patch} (100%) rename luminol-server/minecraft-patches/features/{0051-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch => 0050-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch} (100%) rename luminol-server/minecraft-patches/features/{0052-Raytracing-tracker-experiment.patch => 0051-Raytracing-tracker-experiment.patch} (100%) diff --git a/gradle.properties b/gradle.properties index 156607e..b653fed 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = me.earthme.luminol version=1.21.4-R0.1-SNAPSHOT mcVersion=1.21.4 -foliaRef=23ed0843b037dba77262378a7db0ed98cd0ed035 +foliaRef=bb12eee2bdc68452dd643dd6e4efe8ecf68df3ce org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/luminol-server/minecraft-patches/features/0025-Use-the-correct-list-length-while-generating-tick-re.patch b/luminol-server/minecraft-patches/features/0024-Use-the-correct-list-length-while-generating-tick-re.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0025-Use-the-correct-list-length-while-generating-tick-re.patch rename to luminol-server/minecraft-patches/features/0024-Use-the-correct-list-length-while-generating-tick-re.patch diff --git a/luminol-server/minecraft-patches/features/0024-Wake-up-the-tick-thread-to-run-shutdown-logics.patch b/luminol-server/minecraft-patches/features/0024-Wake-up-the-tick-thread-to-run-shutdown-logics.patch deleted file mode 100644 index 634fbbf..0000000 --- a/luminol-server/minecraft-patches/features/0024-Wake-up-the-tick-thread-to-run-shutdown-logics.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MrHua269 -Date: Sat, 22 Mar 2025 12:28:58 +0800 -Subject: [PATCH] Wake up the tick thread to run shutdown logics - -A fix of: https://github.com/PaperMC/Folia/issues/338 - -diff --git a/io/papermc/paper/threadedregions/ScheduledTaskThreadPool.java b/io/papermc/paper/threadedregions/ScheduledTaskThreadPool.java -index c7627ababadf72231682baa9c056a4082170410a..3b01a88c7a7010b89083b86aef5a5ed9ab9625e8 100644 ---- a/io/papermc/paper/threadedregions/ScheduledTaskThreadPool.java -+++ b/io/papermc/paper/threadedregions/ScheduledTaskThreadPool.java -@@ -773,6 +773,7 @@ public final class ScheduledTaskThreadPool { - - private void halt() { - this.setStateVolatile(STATE_HALTED); -+ LockSupport.unpark(this.thread); // Luminol - Wake up the tick thread to run shutdown logics - } - - private boolean isHalted() { diff --git a/luminol-server/minecraft-patches/features/0026-Kaiiju-Don-t-pathfind-outside-region.patch b/luminol-server/minecraft-patches/features/0025-Kaiiju-Don-t-pathfind-outside-region.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0026-Kaiiju-Don-t-pathfind-outside-region.patch rename to luminol-server/minecraft-patches/features/0025-Kaiiju-Don-t-pathfind-outside-region.patch diff --git a/luminol-server/minecraft-patches/features/0027-Kaiiju-Vanilla-end-portal-teleportation.patch b/luminol-server/minecraft-patches/features/0026-Kaiiju-Vanilla-end-portal-teleportation.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0027-Kaiiju-Vanilla-end-portal-teleportation.patch rename to luminol-server/minecraft-patches/features/0026-Kaiiju-Vanilla-end-portal-teleportation.patch diff --git a/luminol-server/minecraft-patches/features/0028-Kaiiju-Entity-tick-and-removal-limiter.patch b/luminol-server/minecraft-patches/features/0027-Kaiiju-Entity-tick-and-removal-limiter.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0028-Kaiiju-Entity-tick-and-removal-limiter.patch rename to luminol-server/minecraft-patches/features/0027-Kaiiju-Entity-tick-and-removal-limiter.patch diff --git a/luminol-server/minecraft-patches/features/0029-Purpur-Use-alternative-keep-alive.patch b/luminol-server/minecraft-patches/features/0028-Purpur-Use-alternative-keep-alive.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0029-Purpur-Use-alternative-keep-alive.patch rename to luminol-server/minecraft-patches/features/0028-Purpur-Use-alternative-keep-alive.patch diff --git a/luminol-server/minecraft-patches/features/0030-Purpur-Lobotomize-stuck-villagers.patch b/luminol-server/minecraft-patches/features/0029-Purpur-Lobotomize-stuck-villagers.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0030-Purpur-Lobotomize-stuck-villagers.patch rename to luminol-server/minecraft-patches/features/0029-Purpur-Lobotomize-stuck-villagers.patch diff --git a/luminol-server/minecraft-patches/features/0031-Purpur-Barrels-and-enderchests-6-rows.patch b/luminol-server/minecraft-patches/features/0030-Purpur-Barrels-and-enderchests-6-rows.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0031-Purpur-Barrels-and-enderchests-6-rows.patch rename to luminol-server/minecraft-patches/features/0030-Purpur-Barrels-and-enderchests-6-rows.patch diff --git a/luminol-server/minecraft-patches/features/0032-Petal-Reduce-sensor-work.patch b/luminol-server/minecraft-patches/features/0031-Petal-Reduce-sensor-work.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0032-Petal-Reduce-sensor-work.patch rename to luminol-server/minecraft-patches/features/0031-Petal-Reduce-sensor-work.patch diff --git a/luminol-server/minecraft-patches/features/0033-Pufferfish-Cache-climbing-check-for-activation.patch b/luminol-server/minecraft-patches/features/0032-Pufferfish-Cache-climbing-check-for-activation.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0033-Pufferfish-Cache-climbing-check-for-activation.patch rename to luminol-server/minecraft-patches/features/0032-Pufferfish-Cache-climbing-check-for-activation.patch diff --git a/luminol-server/minecraft-patches/features/0034-Pufferfish-Reduce-chunk-loading-lookups.patch b/luminol-server/minecraft-patches/features/0033-Pufferfish-Reduce-chunk-loading-lookups.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0034-Pufferfish-Reduce-chunk-loading-lookups.patch rename to luminol-server/minecraft-patches/features/0033-Pufferfish-Reduce-chunk-loading-lookups.patch diff --git a/luminol-server/minecraft-patches/features/0035-Gale-Use-platform-math-functions.patch b/luminol-server/minecraft-patches/features/0034-Gale-Use-platform-math-functions.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0035-Gale-Use-platform-math-functions.patch rename to luminol-server/minecraft-patches/features/0034-Gale-Use-platform-math-functions.patch diff --git a/luminol-server/minecraft-patches/features/0036-Gale-Variable-entity-wake-up-duration.patch b/luminol-server/minecraft-patches/features/0035-Gale-Variable-entity-wake-up-duration.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0036-Gale-Variable-entity-wake-up-duration.patch rename to luminol-server/minecraft-patches/features/0035-Gale-Variable-entity-wake-up-duration.patch diff --git a/luminol-server/minecraft-patches/features/0037-Gale-Skip-entity-move-if-movement-is-zero.patch b/luminol-server/minecraft-patches/features/0036-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0037-Gale-Skip-entity-move-if-movement-is-zero.patch rename to luminol-server/minecraft-patches/features/0036-Gale-Skip-entity-move-if-movement-is-zero.patch diff --git a/luminol-server/minecraft-patches/features/0038-Gale-Replace-AI-attributes-with-optimized-collection.patch b/luminol-server/minecraft-patches/features/0037-Gale-Replace-AI-attributes-with-optimized-collection.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0038-Gale-Replace-AI-attributes-with-optimized-collection.patch rename to luminol-server/minecraft-patches/features/0037-Gale-Replace-AI-attributes-with-optimized-collection.patch diff --git a/luminol-server/minecraft-patches/features/0039-Gale-Optimize-noise-generation.patch b/luminol-server/minecraft-patches/features/0038-Gale-Optimize-noise-generation.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0039-Gale-Optimize-noise-generation.patch rename to luminol-server/minecraft-patches/features/0038-Gale-Optimize-noise-generation.patch diff --git a/luminol-server/minecraft-patches/features/0040-SparklyPaper-Optimize-canSee-checks.patch b/luminol-server/minecraft-patches/features/0039-SparklyPaper-Optimize-canSee-checks.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0040-SparklyPaper-Optimize-canSee-checks.patch rename to luminol-server/minecraft-patches/features/0039-SparklyPaper-Optimize-canSee-checks.patch diff --git a/luminol-server/minecraft-patches/features/0041-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/luminol-server/minecraft-patches/features/0040-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0041-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch rename to luminol-server/minecraft-patches/features/0040-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch diff --git a/luminol-server/minecraft-patches/features/0042-Leaf-Secure-seed-and-matter-seed-command.patch b/luminol-server/minecraft-patches/features/0041-Leaf-Secure-seed-and-matter-seed-command.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0042-Leaf-Secure-seed-and-matter-seed-command.patch rename to luminol-server/minecraft-patches/features/0041-Leaf-Secure-seed-and-matter-seed-command.patch diff --git a/luminol-server/minecraft-patches/features/0043-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch b/luminol-server/minecraft-patches/features/0042-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0043-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch rename to luminol-server/minecraft-patches/features/0042-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch diff --git a/luminol-server/minecraft-patches/features/0044-Leaf-Replace-brain-maps-with-optimized-collection.patch b/luminol-server/minecraft-patches/features/0043-Leaf-Replace-brain-maps-with-optimized-collection.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0044-Leaf-Replace-brain-maps-with-optimized-collection.patch rename to luminol-server/minecraft-patches/features/0043-Leaf-Replace-brain-maps-with-optimized-collection.patch diff --git a/luminol-server/minecraft-patches/features/0045-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch b/luminol-server/minecraft-patches/features/0044-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0045-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch rename to luminol-server/minecraft-patches/features/0044-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch diff --git a/luminol-server/minecraft-patches/features/0046-Leaf-Smart-sort-entities-in-NearestLivingEntitySenso.patch b/luminol-server/minecraft-patches/features/0045-Leaf-Smart-sort-entities-in-NearestLivingEntitySenso.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0046-Leaf-Smart-sort-entities-in-NearestLivingEntitySenso.patch rename to luminol-server/minecraft-patches/features/0045-Leaf-Smart-sort-entities-in-NearestLivingEntitySenso.patch diff --git a/luminol-server/minecraft-patches/features/0047-Tick-regions-api.patch b/luminol-server/minecraft-patches/features/0046-Tick-regions-api.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0047-Tick-regions-api.patch rename to luminol-server/minecraft-patches/features/0046-Tick-regions-api.patch diff --git a/luminol-server/minecraft-patches/features/0048-Add-missing-teleportation-apis-for-folia.patch b/luminol-server/minecraft-patches/features/0047-Add-missing-teleportation-apis-for-folia.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0048-Add-missing-teleportation-apis-for-folia.patch rename to luminol-server/minecraft-patches/features/0047-Add-missing-teleportation-apis-for-folia.patch diff --git a/luminol-server/minecraft-patches/features/0049-Leaves-Revert-raid-changes.patch b/luminol-server/minecraft-patches/features/0048-Leaves-Revert-raid-changes.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0049-Leaves-Revert-raid-changes.patch rename to luminol-server/minecraft-patches/features/0048-Leaves-Revert-raid-changes.patch diff --git a/luminol-server/minecraft-patches/features/0050-Leaves-Disable-moved-wrongly-threshold.patch b/luminol-server/minecraft-patches/features/0049-Leaves-Disable-moved-wrongly-threshold.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0050-Leaves-Disable-moved-wrongly-threshold.patch rename to luminol-server/minecraft-patches/features/0049-Leaves-Disable-moved-wrongly-threshold.patch diff --git a/luminol-server/minecraft-patches/features/0051-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch b/luminol-server/minecraft-patches/features/0050-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0051-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch rename to luminol-server/minecraft-patches/features/0050-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch diff --git a/luminol-server/minecraft-patches/features/0052-Raytracing-tracker-experiment.patch b/luminol-server/minecraft-patches/features/0051-Raytracing-tracker-experiment.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0052-Raytracing-tracker-experiment.patch rename to luminol-server/minecraft-patches/features/0051-Raytracing-tracker-experiment.patch