gradle: upgrade to 6.5.1

build.gradle

@@ -1,4 +1,3 @@
-subprojects {
 apply plugin: 'java'
 
 project.group = projectGroup
@@ -17,20 +16,35 @@ subprojects {
 
 ext {
     slf4j_version = '1.7.30'
+    logback_version = '1.2.3'
+    netty_version = '4.1.22.Final'
 
     library = [
-                lombok: 'org.projectlombok:lombok:1.18.2',
+            guice: ['com.google.inject:guice:4.1.0'],
+            logger: ["ch.qos.logback:logback-core:$logback_version",
+                     "ch.qos.logback:logback-classic:$logback_version"],
+            lombok: ['org.projectlombok:lombok:1.18.2'],
+            netty: ["io.netty:netty-transport:$netty_version",
+                    "io.netty:netty-codec:$netty_version",
+                    "io.netty:netty-handler:$netty_version" /*for logger handler*/],
             slf4j: ["org.slf4j:slf4j-api:$slf4j_version",
                     "org.slf4j:jcl-over-slf4j:$slf4j_version"],
+            commons: ['commons-io:commons-io:2.6']
     ]
 }
 
 dependencies {
     /* LOGGER */
     implementation library.slf4j
+    implementation library.logger
 
     /* LOMBOK */
     annotationProcessor library.lombok
     compileOnly library.lombok
-    }
+
+    /* COMPONENTS */
+    implementation library.guice
+    implementation library.netty
+    implementation library.commons
+    implementation project(':protocol')
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 # suppress inspection "UnusedProperty" for whole file
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

server/build.gradle

@@ -1,23 +0,0 @@
-ext {
-    logback_version = '1.2.3'
-
-    library = [
-            guice: ['com.google.inject:guice:4.1.0'],
-            logger: ["ch.qos.logback:logback-core:$logback_version",
-                     "ch.qos.logback:logback-classic:$logback_version"],
-            netty: ['io.netty:netty-all:4.1.22.Final'],
-            commons: ['commons-io:commons-io:2.6']
-    ]
-}
-
-dependencies {
-    /* LOGGER */
-    implementation library.logger
-
-    /* COMPONENTS */
-    implementation project(':protocol')
-    implementation project(':server-api')
-    implementation library.guice
-    implementation library.netty
-    implementation library.commons
-}

settings.gradle

@@ -2,6 +2,3 @@ rootProject.name = projectName
 
 include ':protocol'
 project(':protocol').projectDir = new File(settingsDir, '../mc-protocol')
-
-include ':server-api'
-include ':server'

src/main/java/mc/server/Main.java

@@ -2,8 +2,8 @@ package mc.server;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
+import mc.server.config.NetworkModule;
 import mc.server.network.Server;
-import mc.server.network.config.NetworkModule;
 
 public class Main {
 

src/main/java/mc/server/config/NetworkModule.java

@@ -1,4 +1,4 @@
-package mc.server.network.config;
+package mc.server.config;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
@@ -23,7 +23,7 @@ import mc.server.network.impl.codec.PacketEncoder;
 import mc.server.network.impl.codec.PacketSplitter;
 import mc.server.network.impl.handler.HandshakeHandler;
 
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 public class NetworkModule extends AbstractModule {
@@ -52,7 +52,7 @@ public class NetworkModule extends AbstractModule {
     @Provides
     @Named("channelHandlerMap")
     Map<String, ChannelHandler> channelHandlerMap(HandshakeHandler handshakeHandler) {
-        final Map<String, ChannelHandler> map = new HashMap<>();
+        final Map<String, ChannelHandler> map = new LinkedHashMap<>();
 
         map.put("logger", new LoggingHandler());
         map.put("packet_splitter", new PacketSplitter(new ProtocolSplitter()));

src/main/java/mc/server/network/impl/NettyServer.java

@@ -6,6 +6,7 @@ import io.netty.bootstrap.ServerBootstrap;
 import lombok.extern.slf4j.Slf4j;
 import mc.server.network.Server;
 
+
 @Slf4j
 public class NettyServer implements Server {