From 980088b15724930a0f2dd46e1056167268ee00d1 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Mon, 18 May 2020 11:37:17 +0300 Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B0=D0=B7=D0=B4=D0=B5=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0=20=D0=B4=D0=B2=D0=B0=20=D0=BC?= =?UTF-8?q?=D0=BE=D0=B4=D1=83=D0=BB=D1=8F:=20server-api=20=D0=B8=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 77 ++++++++---------- .../main/java/mc/server/network/Server.java | 0 server/build.gradle | 23 ++++++ .../src}/main/java/mc/server/Main.java | 2 +- .../server/network}/config/NetworkModule.java | 2 +- .../network/impl/ChannelInitializer.java | 0 .../server/network/impl/NettyConstants.java | 0 .../mc/server/network/impl/NettyServer.java | 1 - .../network/impl/codec/PacketDecoder.java | 0 .../network/impl/codec/PacketEncoder.java | 0 .../network/impl/codec/PacketSplitter.java | 0 .../impl/handler/AbstractPacketHandler.java | 0 .../impl/handler/HandshakeHandler.java | 0 .../network/impl/handler/LoginHandler.java | 0 .../network/impl/handler/PingHandler.java | 0 .../network/impl/handler/StatusHandler.java | 0 .../impl/io/ByteBufNetInputStream.java | 0 .../impl/io/ByteBufNetOutputStream.java | 0 {src => server/src}/main/resources/icon.png | Bin settings.gradle | 5 +- 20 files changed, 62 insertions(+), 48 deletions(-) rename {src => server-api/src}/main/java/mc/server/network/Server.java (100%) create mode 100644 server/build.gradle rename {src => server/src}/main/java/mc/server/Main.java (89%) rename {src/main/java/mc/server => server/src/main/java/mc/server/network}/config/NetworkModule.java (98%) rename {src => server/src}/main/java/mc/server/network/impl/ChannelInitializer.java (100%) rename {src => server/src}/main/java/mc/server/network/impl/NettyConstants.java (100%) rename {src => server/src}/main/java/mc/server/network/impl/NettyServer.java (99%) rename {src => server/src}/main/java/mc/server/network/impl/codec/PacketDecoder.java (100%) rename {src => server/src}/main/java/mc/server/network/impl/codec/PacketEncoder.java (100%) rename {src => server/src}/main/java/mc/server/network/impl/codec/PacketSplitter.java (100%) rename {src => server/src}/main/java/mc/server/network/impl/handler/AbstractPacketHandler.java (100%) rename {src => server/src}/main/java/mc/server/network/impl/handler/HandshakeHandler.java (100%) rename {src => server/src}/main/java/mc/server/network/impl/handler/LoginHandler.java (100%) rename {src => server/src}/main/java/mc/server/network/impl/handler/PingHandler.java (100%) rename {src => server/src}/main/java/mc/server/network/impl/handler/StatusHandler.java (100%) rename {src => server/src}/main/java/mc/server/network/impl/io/ByteBufNetInputStream.java (100%) rename {src => server/src}/main/java/mc/server/network/impl/io/ByteBufNetOutputStream.java (100%) rename {src => server/src}/main/resources/icon.png (100%) diff --git a/build.gradle b/build.gradle index e5b7eca..dd0aae9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,47 +1,36 @@ -apply plugin: 'java' +subprojects { + apply plugin: 'java' -project.group = projectGroup -project.version = projectVersion + project.group = projectGroup + project.version = projectVersion -compileJava { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 - options.encoding = 'UTF-8' + compileJava { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 + options.encoding = 'UTF-8' + } + + repositories { + mavenLocal() + mavenCentral() + } + + ext { + slf4j_version = '1.7.30' + + library = [ + lombok: 'org.projectlombok:lombok:1.18.2', + slf4j: ["org.slf4j:slf4j-api:$slf4j_version", + "org.slf4j:jcl-over-slf4j:$slf4j_version"], + ] + } + + dependencies { + /* LOGGER */ + implementation library.slf4j + + /* LOMBOK */ + annotationProcessor library.lombok + compileOnly library.lombok + } } - -repositories { - mavenLocal() - mavenCentral() -} - -ext { - slf4j_version = '1.7.30' - 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"], - lombok: ['org.projectlombok:lombok:1.18.2'], - netty: ['io.netty:netty-all:4.1.22.Final'], - 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') -} \ No newline at end of file diff --git a/src/main/java/mc/server/network/Server.java b/server-api/src/main/java/mc/server/network/Server.java similarity index 100% rename from src/main/java/mc/server/network/Server.java rename to server-api/src/main/java/mc/server/network/Server.java diff --git a/server/build.gradle b/server/build.gradle new file mode 100644 index 0000000..929988a --- /dev/null +++ b/server/build.gradle @@ -0,0 +1,23 @@ +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 +} diff --git a/src/main/java/mc/server/Main.java b/server/src/main/java/mc/server/Main.java similarity index 89% rename from src/main/java/mc/server/Main.java rename to server/src/main/java/mc/server/Main.java index 1ea7689..64d9c3f 100644 --- a/src/main/java/mc/server/Main.java +++ b/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 { diff --git a/src/main/java/mc/server/config/NetworkModule.java b/server/src/main/java/mc/server/network/config/NetworkModule.java similarity index 98% rename from src/main/java/mc/server/config/NetworkModule.java rename to server/src/main/java/mc/server/network/config/NetworkModule.java index 19c4b70..6b0cf2a 100644 --- a/src/main/java/mc/server/config/NetworkModule.java +++ b/server/src/main/java/mc/server/network/config/NetworkModule.java @@ -1,4 +1,4 @@ -package mc.server.config; +package mc.server.network.config; import com.google.inject.AbstractModule; import com.google.inject.Provides; diff --git a/src/main/java/mc/server/network/impl/ChannelInitializer.java b/server/src/main/java/mc/server/network/impl/ChannelInitializer.java similarity index 100% rename from src/main/java/mc/server/network/impl/ChannelInitializer.java rename to server/src/main/java/mc/server/network/impl/ChannelInitializer.java diff --git a/src/main/java/mc/server/network/impl/NettyConstants.java b/server/src/main/java/mc/server/network/impl/NettyConstants.java similarity index 100% rename from src/main/java/mc/server/network/impl/NettyConstants.java rename to server/src/main/java/mc/server/network/impl/NettyConstants.java diff --git a/src/main/java/mc/server/network/impl/NettyServer.java b/server/src/main/java/mc/server/network/impl/NettyServer.java similarity index 99% rename from src/main/java/mc/server/network/impl/NettyServer.java rename to server/src/main/java/mc/server/network/impl/NettyServer.java index 2b580ae..304d575 100644 --- a/src/main/java/mc/server/network/impl/NettyServer.java +++ b/server/src/main/java/mc/server/network/impl/NettyServer.java @@ -6,7 +6,6 @@ import io.netty.bootstrap.ServerBootstrap; import lombok.extern.slf4j.Slf4j; import mc.server.network.Server; - @Slf4j public class NettyServer implements Server { diff --git a/src/main/java/mc/server/network/impl/codec/PacketDecoder.java b/server/src/main/java/mc/server/network/impl/codec/PacketDecoder.java similarity index 100% rename from src/main/java/mc/server/network/impl/codec/PacketDecoder.java rename to server/src/main/java/mc/server/network/impl/codec/PacketDecoder.java diff --git a/src/main/java/mc/server/network/impl/codec/PacketEncoder.java b/server/src/main/java/mc/server/network/impl/codec/PacketEncoder.java similarity index 100% rename from src/main/java/mc/server/network/impl/codec/PacketEncoder.java rename to server/src/main/java/mc/server/network/impl/codec/PacketEncoder.java diff --git a/src/main/java/mc/server/network/impl/codec/PacketSplitter.java b/server/src/main/java/mc/server/network/impl/codec/PacketSplitter.java similarity index 100% rename from src/main/java/mc/server/network/impl/codec/PacketSplitter.java rename to server/src/main/java/mc/server/network/impl/codec/PacketSplitter.java diff --git a/src/main/java/mc/server/network/impl/handler/AbstractPacketHandler.java b/server/src/main/java/mc/server/network/impl/handler/AbstractPacketHandler.java similarity index 100% rename from src/main/java/mc/server/network/impl/handler/AbstractPacketHandler.java rename to server/src/main/java/mc/server/network/impl/handler/AbstractPacketHandler.java diff --git a/src/main/java/mc/server/network/impl/handler/HandshakeHandler.java b/server/src/main/java/mc/server/network/impl/handler/HandshakeHandler.java similarity index 100% rename from src/main/java/mc/server/network/impl/handler/HandshakeHandler.java rename to server/src/main/java/mc/server/network/impl/handler/HandshakeHandler.java diff --git a/src/main/java/mc/server/network/impl/handler/LoginHandler.java b/server/src/main/java/mc/server/network/impl/handler/LoginHandler.java similarity index 100% rename from src/main/java/mc/server/network/impl/handler/LoginHandler.java rename to server/src/main/java/mc/server/network/impl/handler/LoginHandler.java diff --git a/src/main/java/mc/server/network/impl/handler/PingHandler.java b/server/src/main/java/mc/server/network/impl/handler/PingHandler.java similarity index 100% rename from src/main/java/mc/server/network/impl/handler/PingHandler.java rename to server/src/main/java/mc/server/network/impl/handler/PingHandler.java diff --git a/src/main/java/mc/server/network/impl/handler/StatusHandler.java b/server/src/main/java/mc/server/network/impl/handler/StatusHandler.java similarity index 100% rename from src/main/java/mc/server/network/impl/handler/StatusHandler.java rename to server/src/main/java/mc/server/network/impl/handler/StatusHandler.java diff --git a/src/main/java/mc/server/network/impl/io/ByteBufNetInputStream.java b/server/src/main/java/mc/server/network/impl/io/ByteBufNetInputStream.java similarity index 100% rename from src/main/java/mc/server/network/impl/io/ByteBufNetInputStream.java rename to server/src/main/java/mc/server/network/impl/io/ByteBufNetInputStream.java diff --git a/src/main/java/mc/server/network/impl/io/ByteBufNetOutputStream.java b/server/src/main/java/mc/server/network/impl/io/ByteBufNetOutputStream.java similarity index 100% rename from src/main/java/mc/server/network/impl/io/ByteBufNetOutputStream.java rename to server/src/main/java/mc/server/network/impl/io/ByteBufNetOutputStream.java diff --git a/src/main/resources/icon.png b/server/src/main/resources/icon.png similarity index 100% rename from src/main/resources/icon.png rename to server/src/main/resources/icon.png diff --git a/settings.gradle b/settings.gradle index f234c19..71cbfd0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,7 @@ rootProject.name = projectName include ':protocol' -project(':protocol').projectDir = new File(settingsDir, '../mc-protocol') \ No newline at end of file +project(':protocol').projectDir = new File(settingsDir, '../mc-protocol') + +include ':server-api' +include ':server' \ No newline at end of file