diff --git a/patches/server/0014-Io_uring-channel-type-support.patch b/patches/server/0014-Io_uring-channel-type-support.patch deleted file mode 100644 index ddfc346..0000000 --- a/patches/server/0014-Io_uring-channel-type-support.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MrHua269 -Date: Wed, 7 Feb 2024 07:41:47 +0000 -Subject: [PATCH] Io_uring channel type support - - -diff --git a/build.gradle.kts b/build.gradle.kts -index 247598b6c73aca3743f4b16b47520f8ba16b2ed0..546c5ad9de8fb8bae23220547c74005f087c6597 100644 ---- a/build.gradle.kts -+++ b/build.gradle.kts -@@ -35,6 +35,7 @@ dependencies { - log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - Needed to generate meta for our Log4j plugins - runtimeOnly(log4jPlugins.output) - alsoShade(log4jPlugins.output) -+ implementation("io.netty.incubator:netty-incubator-transport-native-io_uring:0.0.21.Final:linux-x86_64") //Luminol - io_uring Libraries - implementation("io.netty:netty-codec-haproxy:4.1.97.Final") // Paper - Add support for proxy protocol - // Paper end - implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion -diff --git a/src/main/java/me/earthme/luminol/config/modules/misc/IOUringSupportConfig.java b/src/main/java/me/earthme/luminol/config/modules/misc/IOUringSupportConfig.java -new file mode 100644 -index 0000000000000000000000000000000000000000..f3090b6e11d82d02528c7afd358ef4db61707092 ---- /dev/null -+++ b/src/main/java/me/earthme/luminol/config/modules/misc/IOUringSupportConfig.java -@@ -0,0 +1,22 @@ -+package me.earthme.luminol.config.modules.misc; -+ -+import me.earthme.luminol.config.ConfigInfo; -+import me.earthme.luminol.config.EnumConfigCategory; -+import me.earthme.luminol.config.HotReloadUnsupported; -+import me.earthme.luminol.config.IConfigModule; -+ -+public class IOUringSupportConfig implements IConfigModule { -+ @HotReloadUnsupported -+ @ConfigInfo(baseName = "enabled") -+ public static boolean enabled = false; -+ -+ @Override -+ public EnumConfigCategory getCategory() { -+ return EnumConfigCategory.MISC; -+ } -+ -+ @Override -+ public String getBaseName() { -+ return "io_uring_support"; -+ } -+} -diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java -index 6e95017f4c36208abdf344e3b7d55efe2d5b4e10..bf87a55d78155ea5c303ec28d6a0154e80d7fce3 100644 ---- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java -+++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java -@@ -73,6 +73,10 @@ public class ServerConnectionListener { - } - // Paper end - prevent blocking on adding a new connection while the server is ticking - -+ //Luminol start - io_uring support -+ public static final Supplier SERVER_IO_URING_WORKER_GROUP = Suppliers.memoize(() -> new io.netty.incubator.channel.uring.IOUringEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty IO_URING Server IO #%d").setDaemon(true).setUncaughtExceptionHandler(new net.minecraft.DefaultUncaughtExceptionHandlerWithName(LOGGER)).build())); -+ //Luminol end -+ - public ServerConnectionListener(MinecraftServer server) { - this.server = server; - this.running = true; -@@ -90,7 +94,14 @@ public class ServerConnectionListener { - Class oclass; - EventLoopGroup eventloopgroup; - -- if (Epoll.isAvailable() && this.server.isEpollEnabled()) { -+ //Luminol start - io_uring support -+ if (io.netty.incubator.channel.uring.IOUring.isAvailable() && me.earthme.luminol.config.modules.misc.IOUringSupportConfig.enabled){ -+ eventloopgroup = SERVER_IO_URING_WORKER_GROUP.get(); -+ oclass = io.netty.incubator.channel.uring.IOUringServerSocketChannel.class; -+ ServerConnectionListener.LOGGER.info("Using io_uring channel type"); -+ } -+ else if (Epoll.isAvailable() && this.server.isEpollEnabled()) { -+ //Luminol end - // Paper start - Unix domain socket support - if (address instanceof io.netty.channel.unix.DomainSocketAddress) { - oclass = io.netty.channel.epoll.EpollServerDomainSocketChannel.class; diff --git a/patches/server/0015-Try-fixing-folia-spector-teleportation.patch b/patches/server/0014-Try-fixing-folia-spector-teleportation.patch similarity index 100% rename from patches/server/0015-Try-fixing-folia-spector-teleportation.patch rename to patches/server/0014-Try-fixing-folia-spector-teleportation.patch diff --git a/patches/server/0016-Teleport-async-if-entity-was-moving-to-another-regio.patch b/patches/server/0015-Teleport-async-if-entity-was-moving-to-another-regio.patch similarity index 100% rename from patches/server/0016-Teleport-async-if-entity-was-moving-to-another-regio.patch rename to patches/server/0015-Teleport-async-if-entity-was-moving-to-another-regio.patch diff --git a/patches/server/0017-Prevent-teleportAsync-calling-during-moving-event-be.patch b/patches/server/0016-Prevent-teleportAsync-calling-during-moving-event-be.patch similarity index 100% rename from patches/server/0017-Prevent-teleportAsync-calling-during-moving-event-be.patch rename to patches/server/0016-Prevent-teleportAsync-calling-during-moving-event-be.patch diff --git a/patches/server/0018-Kaiiju-linear-region-format-and-settings.patch b/patches/server/0017-Kaiiju-linear-region-format-and-settings.patch similarity index 99% rename from patches/server/0018-Kaiiju-linear-region-format-and-settings.patch rename to patches/server/0017-Kaiiju-linear-region-format-and-settings.patch index 53d6e52..4fbdf1a 100644 --- a/patches/server/0018-Kaiiju-linear-region-format-and-settings.patch +++ b/patches/server/0017-Kaiiju-linear-region-format-and-settings.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Kaiiju linear region format and settings diff --git a/build.gradle.kts b/build.gradle.kts -index 546c5ad9de8fb8bae23220547c74005f087c6597..ff14a65d284448f3eea15ee4c38e73ed61004a97 100644 +index 247598b6c73aca3743f4b16b47520f8ba16b2ed0..dd0a3477d69ab8f59f00ae930e983b57eaf322e2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,6 +20,10 @@ dependencies { diff --git a/patches/server/0019-Kaiiju-Don-t-pathfind-outside-region.patch b/patches/server/0018-Kaiiju-Don-t-pathfind-outside-region.patch similarity index 100% rename from patches/server/0019-Kaiiju-Don-t-pathfind-outside-region.patch rename to patches/server/0018-Kaiiju-Don-t-pathfind-outside-region.patch diff --git a/patches/server/0020-Kaiiju-Vanilla-end-portal-teleportation.patch b/patches/server/0019-Kaiiju-Vanilla-end-portal-teleportation.patch similarity index 100% rename from patches/server/0020-Kaiiju-Vanilla-end-portal-teleportation.patch rename to patches/server/0019-Kaiiju-Vanilla-end-portal-teleportation.patch diff --git a/patches/server/0021-Kaiiju-Async-path-processing.patch b/patches/server/0020-Kaiiju-Async-path-processing.patch similarity index 100% rename from patches/server/0021-Kaiiju-Async-path-processing.patch rename to patches/server/0020-Kaiiju-Async-path-processing.patch diff --git a/patches/server/0022-Petal-Reduce-sensor-work.patch b/patches/server/0021-Petal-Reduce-sensor-work.patch similarity index 100% rename from patches/server/0022-Petal-Reduce-sensor-work.patch rename to patches/server/0021-Petal-Reduce-sensor-work.patch diff --git a/patches/server/0023-Pufferfish-Optimize-entity-coordinate-key.patch b/patches/server/0022-Pufferfish-Optimize-entity-coordinate-key.patch similarity index 100% rename from patches/server/0023-Pufferfish-Optimize-entity-coordinate-key.patch rename to patches/server/0022-Pufferfish-Optimize-entity-coordinate-key.patch diff --git a/patches/server/0024-Pufferfish-Cache-climbing-check-for-activation.patch b/patches/server/0023-Pufferfish-Cache-climbing-check-for-activation.patch similarity index 100% rename from patches/server/0024-Pufferfish-Cache-climbing-check-for-activation.patch rename to patches/server/0023-Pufferfish-Cache-climbing-check-for-activation.patch diff --git a/patches/server/0025-Pufferfish-Improve-fluid-direction-caching.patch b/patches/server/0024-Pufferfish-Improve-fluid-direction-caching.patch similarity index 100% rename from patches/server/0025-Pufferfish-Improve-fluid-direction-caching.patch rename to patches/server/0024-Pufferfish-Improve-fluid-direction-caching.patch diff --git a/patches/server/0026-Pufferfish-Optimize-suffocation.patch b/patches/server/0025-Pufferfish-Optimize-suffocation.patch similarity index 100% rename from patches/server/0026-Pufferfish-Optimize-suffocation.patch rename to patches/server/0025-Pufferfish-Optimize-suffocation.patch diff --git a/patches/server/0027-Pufferfish-Early-return-optimization-for-target-find.patch b/patches/server/0026-Pufferfish-Early-return-optimization-for-target-find.patch similarity index 100% rename from patches/server/0027-Pufferfish-Early-return-optimization-for-target-find.patch rename to patches/server/0026-Pufferfish-Early-return-optimization-for-target-find.patch diff --git a/patches/server/0028-Pufferfish-Reduce-chunk-loading-lookups.patch b/patches/server/0027-Pufferfish-Reduce-chunk-loading-lookups.patch similarity index 100% rename from patches/server/0028-Pufferfish-Reduce-chunk-loading-lookups.patch rename to patches/server/0027-Pufferfish-Reduce-chunk-loading-lookups.patch diff --git a/patches/server/0029-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch b/patches/server/0028-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch similarity index 100% rename from patches/server/0029-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch rename to patches/server/0028-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch diff --git a/patches/server/0030-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/server/0029-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch similarity index 100% rename from patches/server/0030-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch rename to patches/server/0029-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch diff --git a/patches/server/0031-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch b/patches/server/0030-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch similarity index 100% rename from patches/server/0031-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch rename to patches/server/0030-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch diff --git a/patches/server/0032-Pufferfish-Entity-TTL.patch b/patches/server/0031-Pufferfish-Entity-TTL.patch similarity index 100% rename from patches/server/0032-Pufferfish-Entity-TTL.patch rename to patches/server/0031-Pufferfish-Entity-TTL.patch diff --git a/patches/server/0033-Pufferfish-Reduce-projectile-chunk-loading.patch b/patches/server/0032-Pufferfish-Reduce-projectile-chunk-loading.patch similarity index 100% rename from patches/server/0033-Pufferfish-Reduce-projectile-chunk-loading.patch rename to patches/server/0032-Pufferfish-Reduce-projectile-chunk-loading.patch diff --git a/patches/server/0034-Pufferfish-Dynamic-Activation-of-Brain.patch b/patches/server/0033-Pufferfish-Dynamic-Activation-of-Brain.patch similarity index 100% rename from patches/server/0034-Pufferfish-Dynamic-Activation-of-Brain.patch rename to patches/server/0033-Pufferfish-Dynamic-Activation-of-Brain.patch diff --git a/patches/server/0035-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch b/patches/server/0034-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch similarity index 100% rename from patches/server/0035-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch rename to patches/server/0034-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch diff --git a/patches/server/0036-Pufferfish-Reduce-entity-allocations.patch b/patches/server/0035-Pufferfish-Reduce-entity-allocations.patch similarity index 100% rename from patches/server/0036-Pufferfish-Reduce-entity-allocations.patch rename to patches/server/0035-Pufferfish-Reduce-entity-allocations.patch diff --git a/patches/server/0037-Pufferfish-Improve-container-checking-with-a-bitset.patch b/patches/server/0036-Pufferfish-Improve-container-checking-with-a-bitset.patch similarity index 100% rename from patches/server/0037-Pufferfish-Improve-container-checking-with-a-bitset.patch rename to patches/server/0036-Pufferfish-Improve-container-checking-with-a-bitset.patch diff --git a/patches/server/0038-Gale-Variable-entity-wake-up-duration.patch b/patches/server/0037-Gale-Variable-entity-wake-up-duration.patch similarity index 100% rename from patches/server/0038-Gale-Variable-entity-wake-up-duration.patch rename to patches/server/0037-Gale-Variable-entity-wake-up-duration.patch diff --git a/patches/server/0039-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0038-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 100% rename from patches/server/0039-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch rename to patches/server/0038-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch diff --git a/patches/server/0040-Gale-Optimize-sun-burn-tick.patch b/patches/server/0039-Gale-Optimize-sun-burn-tick.patch similarity index 100% rename from patches/server/0040-Gale-Optimize-sun-burn-tick.patch rename to patches/server/0039-Gale-Optimize-sun-burn-tick.patch diff --git a/patches/server/0041-Gale-Check-frozen-ticks-before-landing-block.patch b/patches/server/0040-Gale-Check-frozen-ticks-before-landing-block.patch similarity index 100% rename from patches/server/0041-Gale-Check-frozen-ticks-before-landing-block.patch rename to patches/server/0040-Gale-Check-frozen-ticks-before-landing-block.patch diff --git a/patches/server/0042-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.patch b/patches/server/0041-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.patch similarity index 100% rename from patches/server/0042-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.patch rename to patches/server/0041-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.patch diff --git a/patches/server/0043-Gale-Use-platform-math-functions.patch b/patches/server/0042-Gale-Use-platform-math-functions.patch similarity index 100% rename from patches/server/0043-Gale-Use-platform-math-functions.patch rename to patches/server/0042-Gale-Use-platform-math-functions.patch diff --git a/patches/server/0044-Gale-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0043-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0044-Gale-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0043-Gale-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0045-Gale-Optimize-world-generation-chunk-and-block-acces.patch b/patches/server/0044-Gale-Optimize-world-generation-chunk-and-block-acces.patch similarity index 100% rename from patches/server/0045-Gale-Optimize-world-generation-chunk-and-block-acces.patch rename to patches/server/0044-Gale-Optimize-world-generation-chunk-and-block-acces.patch diff --git a/patches/server/0046-Gale-Optimize-noise-generation.patch b/patches/server/0045-Gale-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0046-Gale-Optimize-noise-generation.patch rename to patches/server/0045-Gale-Optimize-noise-generation.patch diff --git a/patches/server/0047-Gale-Faster-chunk-serialization.patch b/patches/server/0046-Gale-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0047-Gale-Faster-chunk-serialization.patch rename to patches/server/0046-Gale-Faster-chunk-serialization.patch diff --git a/patches/server/0048-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch b/patches/server/0047-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch similarity index 100% rename from patches/server/0048-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch rename to patches/server/0047-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch diff --git a/patches/server/0049-Gale-Replace-AI-goal-set-with-optimized-collection.patch b/patches/server/0048-Gale-Replace-AI-goal-set-with-optimized-collection.patch similarity index 100% rename from patches/server/0049-Gale-Replace-AI-goal-set-with-optimized-collection.patch rename to patches/server/0048-Gale-Replace-AI-goal-set-with-optimized-collection.patch diff --git a/patches/server/0050-Gale-Replace-AI-attributes-with-optimized-collection.patch b/patches/server/0049-Gale-Replace-AI-attributes-with-optimized-collection.patch similarity index 100% rename from patches/server/0050-Gale-Replace-AI-attributes-with-optimized-collection.patch rename to patches/server/0049-Gale-Replace-AI-attributes-with-optimized-collection.patch diff --git a/patches/server/0051-Gale-Replace-throttle-tracker-map-with-optimized-col.patch b/patches/server/0050-Gale-Replace-throttle-tracker-map-with-optimized-col.patch similarity index 100% rename from patches/server/0051-Gale-Replace-throttle-tracker-map-with-optimized-col.patch rename to patches/server/0050-Gale-Replace-throttle-tracker-map-with-optimized-col.patch diff --git a/patches/server/0052-LinearPaper-Remove-all-locks-on-region-files.patch b/patches/server/0051-LinearPaper-Remove-all-locks-on-region-files.patch similarity index 100% rename from patches/server/0052-LinearPaper-Remove-all-locks-on-region-files.patch rename to patches/server/0051-LinearPaper-Remove-all-locks-on-region-files.patch diff --git a/patches/server/0053-Sparkly-Paper-Optimize-canSee-checks.patch b/patches/server/0052-Sparkly-Paper-Optimize-canSee-checks.patch similarity index 100% rename from patches/server/0053-Sparkly-Paper-Optimize-canSee-checks.patch rename to patches/server/0052-Sparkly-Paper-Optimize-canSee-checks.patch diff --git a/patches/server/0054-Purpur-use-alternative-keep-alive.patch b/patches/server/0053-Purpur-use-alternative-keep-alive.patch similarity index 100% rename from patches/server/0054-Purpur-use-alternative-keep-alive.patch rename to patches/server/0053-Purpur-use-alternative-keep-alive.patch diff --git a/patches/server/0055-Leaves-Protocol-Core.patch b/patches/server/0054-Leaves-Protocol-Core.patch similarity index 100% rename from patches/server/0055-Leaves-Protocol-Core.patch rename to patches/server/0054-Leaves-Protocol-Core.patch diff --git a/patches/server/0056-Leaves-Bladeren-Protocol.patch b/patches/server/0055-Leaves-Bladeren-Protocol.patch similarity index 100% rename from patches/server/0056-Leaves-Bladeren-Protocol.patch rename to patches/server/0055-Leaves-Bladeren-Protocol.patch diff --git a/patches/server/0057-Leaves-Fix-Bladeren-Protocol.patch b/patches/server/0056-Leaves-Fix-Bladeren-Protocol.patch similarity index 100% rename from patches/server/0057-Leaves-Fix-Bladeren-Protocol.patch rename to patches/server/0056-Leaves-Fix-Bladeren-Protocol.patch diff --git a/patches/server/0058-Leaves-carpet-protocol-support.patch b/patches/server/0057-Leaves-carpet-protocol-support.patch similarity index 100% rename from patches/server/0058-Leaves-carpet-protocol-support.patch rename to patches/server/0057-Leaves-carpet-protocol-support.patch diff --git a/patches/server/0059-Threaded-region-start-tick-and-finished-tick-event.patch b/patches/server/0058-Threaded-region-start-tick-and-finished-tick-event.patch similarity index 100% rename from patches/server/0059-Threaded-region-start-tick-and-finished-tick-event.patch rename to patches/server/0058-Threaded-region-start-tick-and-finished-tick-event.patch diff --git a/patches/server/0060-Leaves-Replay-Mod-API.patch b/patches/server/0059-Leaves-Replay-Mod-API.patch similarity index 100% rename from patches/server/0060-Leaves-Replay-Mod-API.patch rename to patches/server/0059-Leaves-Replay-Mod-API.patch diff --git a/patches/server/0061-Fix-MC-172047.patch b/patches/server/0060-Fix-MC-172047.patch similarity index 100% rename from patches/server/0061-Fix-MC-172047.patch rename to patches/server/0060-Fix-MC-172047.patch diff --git a/patches/server/0062-Fix-MC-2025.patch b/patches/server/0061-Fix-MC-2025.patch similarity index 100% rename from patches/server/0062-Fix-MC-2025.patch rename to patches/server/0061-Fix-MC-2025.patch