From c90bae063a44cb8e4aa800f0ec28f0e0c0b45837 Mon Sep 17 00:00:00 2001
From: TheMode <themode@outlook.fr>
Date: Sun, 20 Jun 2021 22:19:03 +0200
Subject: [PATCH] Update netty

---
 build.gradle                                         |  9 ++++-----
 .../minestom/server/network/netty/NettyServer.java   | 12 +-----------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0a5100995..c1286d6e6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -108,11 +108,10 @@ dependencies {
     testCompileOnly "org.mockito:mockito-core:2.28.2"
 
     // Netty
-    api 'io.netty:netty-handler:4.1.63.Final'
-    api 'io.netty:netty-codec:4.1.63.Final'
-    api 'io.netty:netty-transport-native-epoll:4.1.63.Final:linux-x86_64'
-    api 'io.netty:netty-transport-native-kqueue:4.1.63.Final:osx-x86_64'
-    api 'io.netty.incubator:netty-incubator-transport-native-io_uring:0.0.5.Final:linux-x86_64'
+    api 'io.netty:netty-handler:4.1.65.Final'
+    api 'io.netty:netty-codec:4.1.65.Final'
+    api 'io.netty:netty-transport-native-epoll:4.1.65.Final:linux-x86_64'
+    api 'io.netty:netty-transport-native-kqueue:4.1.65.Final:osx-x86_64'
 
     // https://mvnrepository.com/artifact/it.unimi.dsi/fastutil
     api 'it.unimi.dsi:fastutil:8.5.4'
diff --git a/src/main/java/net/minestom/server/network/netty/NettyServer.java b/src/main/java/net/minestom/server/network/netty/NettyServer.java
index a3f77c388..c9adc82b9 100644
--- a/src/main/java/net/minestom/server/network/netty/NettyServer.java
+++ b/src/main/java/net/minestom/server/network/netty/NettyServer.java
@@ -13,9 +13,6 @@ import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.ServerSocketChannel;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
-import io.netty.incubator.channel.uring.IOUring;
-import io.netty.incubator.channel.uring.IOUringEventLoopGroup;
-import io.netty.incubator.channel.uring.IOUringServerSocketChannel;
 import net.minestom.server.MinecraftServer;
 import net.minestom.server.network.PacketProcessor;
 import net.minestom.server.network.netty.channel.ClientChannel;
@@ -82,14 +79,7 @@ public final class NettyServer {
 
         // Find boss/worker event group
         {
-            if (IOUring.isAvailable()) {
-                boss = new IOUringEventLoopGroup(2);
-                worker = new IOUringEventLoopGroup(workerThreadCount);
-
-                channel = IOUringServerSocketChannel.class;
-
-                LOGGER.info("Using io_uring");
-            } else if (Epoll.isAvailable()) {
+            if (Epoll.isAvailable()) {
                 boss = new EpollEventLoopGroup(2);
                 worker = new EpollEventLoopGroup(workerThreadCount);