diff --git a/core/build.gradle.kts b/core/build.gradle.kts index be3e5095c..dc922ba2a 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -43,8 +43,8 @@ dependencies { implementation(libs.netty.transport.native.epoll) { artifact { classifier = "linux-x86_64" } } implementation(libs.netty.transport.native.epoll) { artifact { classifier = "linux-aarch_64" } } implementation(libs.netty.transport.native.kqueue) { artifact { classifier = "osx-x86_64" } } - implementation(libs.netty.transport.native.io.uring) { artifact { classifier = "linux-x86_64" } } - implementation(libs.netty.transport.native.io.uring) { artifact { classifier = "linux-aarch_64" } } +// implementation(libs.netty.transport.native.io.uring) { artifact { classifier = "linux-x86_64" } } +// implementation(libs.netty.transport.native.io.uring) { artifact { classifier = "linux-aarch_64" } } // Adventure text serialization api(libs.bundles.adventure) diff --git a/core/src/main/java/org/geysermc/geyser/network/netty/GeyserServer.java b/core/src/main/java/org/geysermc/geyser/network/netty/GeyserServer.java index 40a528fdc..eaed3edc8 100644 --- a/core/src/main/java/org/geysermc/geyser/network/netty/GeyserServer.java +++ b/core/src/main/java/org/geysermc/geyser/network/netty/GeyserServer.java @@ -38,9 +38,6 @@ import io.netty.channel.kqueue.KQueueEventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.DatagramChannel; import io.netty.channel.socket.nio.NioDatagramChannel; -import io.netty.incubator.channel.uring.IOUring; -import io.netty.incubator.channel.uring.IOUringDatagramChannel; -import io.netty.incubator.channel.uring.IOUringEventLoopGroup; import io.netty.util.concurrent.Future; import lombok.Getter; import net.jodah.expiringmap.ExpirationPolicy; @@ -417,11 +414,11 @@ public final class GeyserServer { } private static Transport compatibleTransport() { - if (isClassAvailable("io.netty.incubator.channel.uring.IOUring") - && IOUring.isAvailable() - && Boolean.parseBoolean(System.getProperty("Geyser.io_uring"))) { - return new Transport(IOUringDatagramChannel.class, IOUringEventLoopGroup::new); - } +// if (isClassAvailable("io.netty.incubator.channel.uring.IOUring") +// && IOUring.isAvailable() +// && Boolean.parseBoolean(System.getProperty("Geyser.io_uring"))) { +// return new Transport(IOUringDatagramChannel.class, IOUringEventLoopGroup::new); +// } if (isClassAvailable("io.netty.channel.epoll.Epoll") && Epoll.isAvailable()) { return new Transport(EpollDatagramChannel.class, EpollEventLoopGroup::new); diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 134cd3315..43fd9fc25 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ events = "1.1-SNAPSHOT" jackson = "2.17.0" fastutil = "8.5.2" netty = "4.1.107.Final" -netty-io-uring = "0.0.26.Final-SNAPSHOT" +netty-io-uring = "0.0.25.Final-SNAPSHOT" guava = "29.0-jre" gson = "2.3.1" # Provided by Spigot 1.8.8 websocket = "1.5.1"