From 39b858696f37e5db31fc5c76297d3bc835f8e1ba Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Mon, 26 Apr 2021 14:00:19 +0300 Subject: [PATCH 1/6] =?UTF-8?q?=D1=83=D0=B1=D0=B8=D1=80=D0=B0=D0=B5=D0=BC?= =?UTF-8?q?=20LogicPlugin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 20 +++++++++++++++++-- .../gradle/extention/LogicExtention.java | 19 ------------------ .../dmitriymx/gradle/plugin/LogicPlugin.java | 13 ------------ 3 files changed, 18 insertions(+), 34 deletions(-) delete mode 100644 buildSrc/src/main/java/ru/dmitriymx/gradle/extention/LogicExtention.java delete mode 100644 buildSrc/src/main/java/ru/dmitriymx/gradle/plugin/LogicPlugin.java diff --git a/build.gradle b/build.gradle index 7de1955..9598373 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,22 @@ */ import ru.dmitriymx.gradle.plugin.LibsPlugin -import ru.dmitriymx.gradle.plugin.LogicPlugin + +class Logic { + private final Project project + + Logic(Project project) { + this.project = project + } + + String getProperty1(String propertyName1, String propertyName2) { + return (String) (project.hasProperty(propertyName1) ? project.property(propertyName1) : project.property(propertyName2)) + } + + String getProperty1(String propertyName) { + return (String) (project.hasProperty(propertyName) ? project.property(propertyName) : null) + } +} plugins { id 'java' @@ -12,7 +27,8 @@ plugins { } apply plugin: LibsPlugin -apply plugin: LogicPlugin + +def logic = new Logic(project) project.group = logic.getProperty1('project.group') project.version = logic.getProperty1('project.version') diff --git a/buildSrc/src/main/java/ru/dmitriymx/gradle/extention/LogicExtention.java b/buildSrc/src/main/java/ru/dmitriymx/gradle/extention/LogicExtention.java deleted file mode 100644 index c596a13..0000000 --- a/buildSrc/src/main/java/ru/dmitriymx/gradle/extention/LogicExtention.java +++ /dev/null @@ -1,19 +0,0 @@ -package ru.dmitriymx.gradle.extention; - -import org.gradle.api.Project; - -public class LogicExtention { - private final Project project; - - public LogicExtention(Project project) { - this.project = project; - } - - public String getProperty1(String propertyName1, String propertyName2) { - return (String) (project.hasProperty(propertyName1) ? project.property(propertyName1) : project.property(propertyName2)); - } - - public String getProperty1(String propertyName) { - return (String) (project.hasProperty(propertyName) ? project.property(propertyName) : null); - } -} diff --git a/buildSrc/src/main/java/ru/dmitriymx/gradle/plugin/LogicPlugin.java b/buildSrc/src/main/java/ru/dmitriymx/gradle/plugin/LogicPlugin.java deleted file mode 100644 index 4068cf4..0000000 --- a/buildSrc/src/main/java/ru/dmitriymx/gradle/plugin/LogicPlugin.java +++ /dev/null @@ -1,13 +0,0 @@ -package ru.dmitriymx.gradle.plugin; - -import org.gradle.api.Plugin; -import org.gradle.api.Project; -import ru.dmitriymx.gradle.extention.LogicExtention; - -public class LogicPlugin implements Plugin { - - @Override - public void apply(Project project) { - project.getExtensions().create("logic", LogicExtention.class, project); - } -} From 612eef236172a5d0addd54aaafefa7b6bf227b56 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Mon, 26 Apr 2021 14:34:58 +0300 Subject: [PATCH 2/6] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81?= =?UTF-8?q?=20=D1=82=D0=B8=D0=BF=D0=B8=D1=87=D0=BD=D1=8B=D1=85=20=D0=BD?= =?UTF-8?q?=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B5=D0=BA=20=D0=B2=20logic.gra?= =?UTF-8?q?dle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 33 +-------------------------------- logic.gradle | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 32 deletions(-) create mode 100644 logic.gradle diff --git a/build.gradle b/build.gradle index 9598373..bce7640 100644 --- a/build.gradle +++ b/build.gradle @@ -5,44 +5,13 @@ import ru.dmitriymx.gradle.plugin.LibsPlugin -class Logic { - private final Project project - - Logic(Project project) { - this.project = project - } - - String getProperty1(String propertyName1, String propertyName2) { - return (String) (project.hasProperty(propertyName1) ? project.property(propertyName1) : project.property(propertyName2)) - } - - String getProperty1(String propertyName) { - return (String) (project.hasProperty(propertyName) ? project.property(propertyName) : null) - } -} - plugins { id 'java' id 'application' } apply plugin: LibsPlugin - -def logic = new Logic(project) - -project.group = logic.getProperty1('project.group') -project.version = logic.getProperty1('project.version') -jar.archiveBaseName.set(logic.getProperty1('project.name')) - -compileJava { - sourceCompatibility = targetCompatibility = JavaVersion.VERSION_11 - options.encoding = 'UTF-8' -} - -repositories { - mavenLocal() - mavenCentral() -} +apply from: rootDir.toPath().resolve('logic.gradle').toFile() dependencies { annotationProcessor libs.lombok diff --git a/logic.gradle b/logic.gradle new file mode 100644 index 0000000..0e9a252 --- /dev/null +++ b/logic.gradle @@ -0,0 +1,17 @@ +String getProperty1(String propertyName1, String propertyName2) { + return (String) (project.hasProperty(propertyName1) ? project.property(propertyName1) : project.property(propertyName2)) +} + +project.group = getProperty1('module.group', 'project.group') +project.version = getProperty1('module.version', 'project.version') +project.jar.archiveBaseName.set(getProperty1('module.name', 'project.name')) + +compileJava { + sourceCompatibility = targetCompatibility = JavaVersion.VERSION_11 + options.encoding = 'UTF-8' +} + +repositories { + mavenLocal() + mavenCentral() +} \ No newline at end of file From a8f567ad2cff38e78ecc088c64999ecf84dc1ec9 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Mon, 26 Apr 2021 14:47:16 +0300 Subject: [PATCH 3/6] =?UTF-8?q?=D1=83=D0=B1=D0=B8=D1=80=D0=B0=D0=B5=D0=BC?= =?UTF-8?q?=20LibsPlugin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 36 +++++++++++++-- .../gradle/extention/LibsExtention.java | 46 ------------------- .../dmitriymx/gradle/plugin/LibsPlugin.java | 13 ------ 3 files changed, 33 insertions(+), 62 deletions(-) delete mode 100644 buildSrc/src/main/java/ru/dmitriymx/gradle/extention/LibsExtention.java delete mode 100644 buildSrc/src/main/java/ru/dmitriymx/gradle/plugin/LibsPlugin.java diff --git a/build.gradle b/build.gradle index bce7640..fd18383 100644 --- a/build.gradle +++ b/build.gradle @@ -3,16 +3,46 @@ gradle run */ -import ru.dmitriymx.gradle.plugin.LibsPlugin - plugins { id 'java' id 'application' } -apply plugin: LibsPlugin apply from: rootDir.toPath().resolve('logic.gradle').toFile() +ext { + slf4j_version = '1.7.30' + logback_version = '1.2.3' + dagger2_version = '2.33' + junit_version = '5.5.2' + + libs = [ + lombok : 'org.projectlombok:lombok:1.18.12', + annotations: 'com.google.code.findbugs:jsr305:3.0.2', + guava : 'com.google.guava:guava:30.1-jre', + lang3 : 'org.apache.commons:commons-lang3:3.11', + ] + + libs.logger = [ + slf4j : ["org.slf4j:slf4j-api:${slf4j_version}", + "org.slf4j:jcl-over-slf4j:${slf4j_version}"], + logback: ["ch.qos.logback:logback-core:${logback_version}", + "ch.qos.logback:logback-classic:${logback_version}"] + ] + + libs.dagger2 = [ + implementation: "com.google.dagger:dagger:${dagger2_version}", + annotationProcessor: "com.google.dagger:dagger-compiler:${dagger2_version}" + ] + + libs.junit5 = [ + api: "org.junit.jupiter:junit-jupiter-api:${junit_version}", + //runtime only + engine: "org.junit.jupiter:junit-jupiter-engine:${junit_version}", + params: "org.junit.jupiter:junit-jupiter-params:${junit_version}" + ] +} + dependencies { annotationProcessor libs.lombok compileOnly libs.lombok diff --git a/buildSrc/src/main/java/ru/dmitriymx/gradle/extention/LibsExtention.java b/buildSrc/src/main/java/ru/dmitriymx/gradle/extention/LibsExtention.java deleted file mode 100644 index 05123ee..0000000 --- a/buildSrc/src/main/java/ru/dmitriymx/gradle/extention/LibsExtention.java +++ /dev/null @@ -1,46 +0,0 @@ -package ru.dmitriymx.gradle.extention; - -import java.util.List; - -public class LibsExtention { - - public final String lombok = "org.projectlombok:lombok:1.18.12"; - public final String annotations = "com.google.code.findbugs:jsr305:3.0.2"; - public final String guava = "com.google.guava:guava:30.1-jre"; - public final String lang3 = "org.apache.commons:commons-lang3:3.11"; - - public final LoggerLibs logger = new LoggerLibs(); - public final Dagger2Libs dagger2 = new Dagger2Libs(); - public final Junit5Libs junit5 = new Junit5Libs(); - - public static final class LoggerLibs { - private final String slf4j_version = "1.7.30"; - private final String logback_version = "1.2.3"; - - public final List slf4j = List.of( - "org.slf4j:slf4j-api:" + slf4j_version, - "org.slf4j:jcl-over-slf4j:" + slf4j_version - ); - - public final List logback = List.of( - "ch.qos.logback:logback-core:" + logback_version, - "ch.qos.logback:logback-classic:" + logback_version - ); - } - - public static final class Dagger2Libs { - private final String dagger2_version = "2.33"; - - public final String implementation = "com.google.dagger:dagger:" + dagger2_version; - public final String annotationProcessor = "com.google.dagger:dagger-compiler:" + dagger2_version; - } - - public static final class Junit5Libs { - private final String junit_version = "5.5.2"; - - public final String api = "org.junit.jupiter:junit-jupiter-api:" + junit_version; - /** runtimeOnly */ - public final String engine = "org.junit.jupiter:junit-jupiter-engine:" + junit_version; - public final String params = "org.junit.jupiter:junit-jupiter-params:" + junit_version; - } -} diff --git a/buildSrc/src/main/java/ru/dmitriymx/gradle/plugin/LibsPlugin.java b/buildSrc/src/main/java/ru/dmitriymx/gradle/plugin/LibsPlugin.java deleted file mode 100644 index 243fa5d..0000000 --- a/buildSrc/src/main/java/ru/dmitriymx/gradle/plugin/LibsPlugin.java +++ /dev/null @@ -1,13 +0,0 @@ -package ru.dmitriymx.gradle.plugin; - -import org.gradle.api.Plugin; -import org.gradle.api.Project; -import ru.dmitriymx.gradle.extention.LibsExtention; - -public class LibsPlugin implements Plugin { - - @Override - public void apply(Project project) { - project.getExtensions().create("libs", LibsExtention.class); - } -} From 65a2f4ef817dead73e1cd14264eeeb023c2b8cc4 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Mon, 26 Apr 2021 14:51:21 +0300 Subject: [PATCH 4/6] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81?= =?UTF-8?q?=20=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5=D0=BA=20?= =?UTF-8?q?=D0=B2=20libs.gradle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 34 +--------------------------------- libs.gradle | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 33 deletions(-) create mode 100644 libs.gradle diff --git a/build.gradle b/build.gradle index fd18383..3180acf 100644 --- a/build.gradle +++ b/build.gradle @@ -9,39 +9,7 @@ plugins { } apply from: rootDir.toPath().resolve('logic.gradle').toFile() - -ext { - slf4j_version = '1.7.30' - logback_version = '1.2.3' - dagger2_version = '2.33' - junit_version = '5.5.2' - - libs = [ - lombok : 'org.projectlombok:lombok:1.18.12', - annotations: 'com.google.code.findbugs:jsr305:3.0.2', - guava : 'com.google.guava:guava:30.1-jre', - lang3 : 'org.apache.commons:commons-lang3:3.11', - ] - - libs.logger = [ - slf4j : ["org.slf4j:slf4j-api:${slf4j_version}", - "org.slf4j:jcl-over-slf4j:${slf4j_version}"], - logback: ["ch.qos.logback:logback-core:${logback_version}", - "ch.qos.logback:logback-classic:${logback_version}"] - ] - - libs.dagger2 = [ - implementation: "com.google.dagger:dagger:${dagger2_version}", - annotationProcessor: "com.google.dagger:dagger-compiler:${dagger2_version}" - ] - - libs.junit5 = [ - api: "org.junit.jupiter:junit-jupiter-api:${junit_version}", - //runtime only - engine: "org.junit.jupiter:junit-jupiter-engine:${junit_version}", - params: "org.junit.jupiter:junit-jupiter-params:${junit_version}" - ] -} +apply from: rootDir.toPath().resolve('libs.gradle').toFile() dependencies { annotationProcessor libs.lombok diff --git a/libs.gradle b/libs.gradle new file mode 100644 index 0000000..600bd97 --- /dev/null +++ b/libs.gradle @@ -0,0 +1,35 @@ +//file:noinspection GroovyAssignabilityCheck +//file:noinspection GrUnresolvedAccess + +def slf4j_version = '1.7.30' +def logback_version = '1.2.3' +def dagger2_version = '2.33' +def junit_version = '5.5.2' + +ext { + libs = [ + lombok : 'org.projectlombok:lombok:1.18.12', + annotations: 'com.google.code.findbugs:jsr305:3.0.2', + guava : 'com.google.guava:guava:30.1-jre', + lang3 : 'org.apache.commons:commons-lang3:3.11', + ] + + libs.logger = [ + slf4j : ["org.slf4j:slf4j-api:${slf4j_version}", + "org.slf4j:jcl-over-slf4j:${slf4j_version}"], + logback: ["ch.qos.logback:logback-core:${logback_version}", + "ch.qos.logback:logback-classic:${logback_version}"] + ] + + libs.dagger2 = [ + implementation : "com.google.dagger:dagger:${dagger2_version}", + annotationProcessor: "com.google.dagger:dagger-compiler:${dagger2_version}" + ] + + libs.junit5 = [ + api : "org.junit.jupiter:junit-jupiter-api:${junit_version}", + //runtime only + engine: "org.junit.jupiter:junit-jupiter-engine:${junit_version}", + params: "org.junit.jupiter:junit-jupiter-params:${junit_version}" + ] +} \ No newline at end of file From 38091e8685320ec64549f8ec4c0d951bdc7c0560 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Mon, 26 Apr 2021 15:02:54 +0300 Subject: [PATCH 5/6] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81?= =?UTF-8?q?=20=D0=BA=D0=BE=D0=B4=D0=B0=20=D0=B2=20=D0=BF=D0=BE=D0=B4=D0=BC?= =?UTF-8?q?=D0=BE=D0=B4=D1=83=D0=BB=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logic.gradle | 2 ++ build.gradle => server/build.gradle | 7 ++----- server/gradle.properties | 3 +++ .../src}/main/java/mc/protocol/NetworkAttributes.java | 0 {src => server/src}/main/java/mc/protocol/State.java | 0 .../src}/main/java/mc/protocol/io/DecoderException.java | 0 .../src}/main/java/mc/protocol/io/NetByteBuf.java | 0 .../main/java/mc/protocol/io/codec/ProtocolDecoder.java | 0 .../main/java/mc/protocol/io/codec/ProtocolEncoder.java | 0 .../main/java/mc/protocol/io/codec/ProtocolSplitter.java | 0 .../src}/main/java/mc/protocol/packets/EmptyPacket.java | 0 .../src}/main/java/mc/protocol/packets/Packet.java | 0 .../main/java/mc/protocol/packets/PacketDirection.java | 0 .../src}/main/java/mc/protocol/packets/UnknownPacket.java | 0 .../java/mc/protocol/packets/client/HandshakePacket.java | 0 .../java/mc/protocol/packets/client/LoginStartPacket.java | 0 .../mc/protocol/packets/client/StatusServerRequest.java | 0 .../java/mc/protocol/packets/server/DisconnectPacket.java | 0 .../mc/protocol/packets/server/StatusServerResponse.java | 0 {src => server/src}/main/java/mc/server/Main.java | 0 .../src}/main/java/mc/server/di/NetworkComponent.java | 0 .../src}/main/java/mc/server/di/NetworkModule.java | 0 .../src}/main/java/mc/server/network/Server.java | 0 .../main/java/mc/server/network/netty/NettyServer.java | 0 .../network/netty/handler/AbstractPacketHandler.java | 0 .../mc/server/network/netty/handler/HandshakeHandler.java | 0 .../java/mc/server/network/netty/handler/LoginHandler.java | 0 .../mc/server/network/netty/handler/StatusHandler.java | 0 {src => server/src}/main/resources/logback.xml | 0 .../src}/test/java/mc/protocol/io/NetByteBufReadTest.java | 0 .../src}/test/java/mc/protocol/io/NetByteBufWriteTest.java | 0 31 files changed, 7 insertions(+), 5 deletions(-) rename build.gradle => server/build.gradle (95%) create mode 100644 server/gradle.properties rename {src => server/src}/main/java/mc/protocol/NetworkAttributes.java (100%) rename {src => server/src}/main/java/mc/protocol/State.java (100%) rename {src => server/src}/main/java/mc/protocol/io/DecoderException.java (100%) rename {src => server/src}/main/java/mc/protocol/io/NetByteBuf.java (100%) rename {src => server/src}/main/java/mc/protocol/io/codec/ProtocolDecoder.java (100%) rename {src => server/src}/main/java/mc/protocol/io/codec/ProtocolEncoder.java (100%) rename {src => server/src}/main/java/mc/protocol/io/codec/ProtocolSplitter.java (100%) rename {src => server/src}/main/java/mc/protocol/packets/EmptyPacket.java (100%) rename {src => server/src}/main/java/mc/protocol/packets/Packet.java (100%) rename {src => server/src}/main/java/mc/protocol/packets/PacketDirection.java (100%) rename {src => server/src}/main/java/mc/protocol/packets/UnknownPacket.java (100%) rename {src => server/src}/main/java/mc/protocol/packets/client/HandshakePacket.java (100%) rename {src => server/src}/main/java/mc/protocol/packets/client/LoginStartPacket.java (100%) rename {src => server/src}/main/java/mc/protocol/packets/client/StatusServerRequest.java (100%) rename {src => server/src}/main/java/mc/protocol/packets/server/DisconnectPacket.java (100%) rename {src => server/src}/main/java/mc/protocol/packets/server/StatusServerResponse.java (100%) rename {src => server/src}/main/java/mc/server/Main.java (100%) rename {src => server/src}/main/java/mc/server/di/NetworkComponent.java (100%) rename {src => server/src}/main/java/mc/server/di/NetworkModule.java (100%) rename {src => server/src}/main/java/mc/server/network/Server.java (100%) rename {src => server/src}/main/java/mc/server/network/netty/NettyServer.java (100%) rename {src => server/src}/main/java/mc/server/network/netty/handler/AbstractPacketHandler.java (100%) rename {src => server/src}/main/java/mc/server/network/netty/handler/HandshakeHandler.java (100%) rename {src => server/src}/main/java/mc/server/network/netty/handler/LoginHandler.java (100%) rename {src => server/src}/main/java/mc/server/network/netty/handler/StatusHandler.java (100%) rename {src => server/src}/main/resources/logback.xml (100%) rename {src => server/src}/test/java/mc/protocol/io/NetByteBufReadTest.java (100%) rename {src => server/src}/test/java/mc/protocol/io/NetByteBufWriteTest.java (100%) diff --git a/logic.gradle b/logic.gradle index 0e9a252..9254004 100644 --- a/logic.gradle +++ b/logic.gradle @@ -1,3 +1,5 @@ +apply plugin: 'java' + String getProperty1(String propertyName1, String propertyName2) { return (String) (project.hasProperty(propertyName1) ? project.property(propertyName1) : project.property(propertyName2)) } diff --git a/build.gradle b/server/build.gradle similarity index 95% rename from build.gradle rename to server/build.gradle index 3180acf..2155b25 100644 --- a/build.gradle +++ b/server/build.gradle @@ -3,14 +3,11 @@ gradle run */ -plugins { - id 'java' - id 'application' -} - apply from: rootDir.toPath().resolve('logic.gradle').toFile() apply from: rootDir.toPath().resolve('libs.gradle').toFile() +apply plugin: 'application' + dependencies { annotationProcessor libs.lombok compileOnly libs.lombok diff --git a/server/gradle.properties b/server/gradle.properties new file mode 100644 index 0000000..e2373fb --- /dev/null +++ b/server/gradle.properties @@ -0,0 +1,3 @@ +# suppress inspection "UnusedProperty" for whole file +module.name=server +module.version=1.0-SNAPSHOT \ No newline at end of file diff --git a/src/main/java/mc/protocol/NetworkAttributes.java b/server/src/main/java/mc/protocol/NetworkAttributes.java similarity index 100% rename from src/main/java/mc/protocol/NetworkAttributes.java rename to server/src/main/java/mc/protocol/NetworkAttributes.java diff --git a/src/main/java/mc/protocol/State.java b/server/src/main/java/mc/protocol/State.java similarity index 100% rename from src/main/java/mc/protocol/State.java rename to server/src/main/java/mc/protocol/State.java diff --git a/src/main/java/mc/protocol/io/DecoderException.java b/server/src/main/java/mc/protocol/io/DecoderException.java similarity index 100% rename from src/main/java/mc/protocol/io/DecoderException.java rename to server/src/main/java/mc/protocol/io/DecoderException.java diff --git a/src/main/java/mc/protocol/io/NetByteBuf.java b/server/src/main/java/mc/protocol/io/NetByteBuf.java similarity index 100% rename from src/main/java/mc/protocol/io/NetByteBuf.java rename to server/src/main/java/mc/protocol/io/NetByteBuf.java diff --git a/src/main/java/mc/protocol/io/codec/ProtocolDecoder.java b/server/src/main/java/mc/protocol/io/codec/ProtocolDecoder.java similarity index 100% rename from src/main/java/mc/protocol/io/codec/ProtocolDecoder.java rename to server/src/main/java/mc/protocol/io/codec/ProtocolDecoder.java diff --git a/src/main/java/mc/protocol/io/codec/ProtocolEncoder.java b/server/src/main/java/mc/protocol/io/codec/ProtocolEncoder.java similarity index 100% rename from src/main/java/mc/protocol/io/codec/ProtocolEncoder.java rename to server/src/main/java/mc/protocol/io/codec/ProtocolEncoder.java diff --git a/src/main/java/mc/protocol/io/codec/ProtocolSplitter.java b/server/src/main/java/mc/protocol/io/codec/ProtocolSplitter.java similarity index 100% rename from src/main/java/mc/protocol/io/codec/ProtocolSplitter.java rename to server/src/main/java/mc/protocol/io/codec/ProtocolSplitter.java diff --git a/src/main/java/mc/protocol/packets/EmptyPacket.java b/server/src/main/java/mc/protocol/packets/EmptyPacket.java similarity index 100% rename from src/main/java/mc/protocol/packets/EmptyPacket.java rename to server/src/main/java/mc/protocol/packets/EmptyPacket.java diff --git a/src/main/java/mc/protocol/packets/Packet.java b/server/src/main/java/mc/protocol/packets/Packet.java similarity index 100% rename from src/main/java/mc/protocol/packets/Packet.java rename to server/src/main/java/mc/protocol/packets/Packet.java diff --git a/src/main/java/mc/protocol/packets/PacketDirection.java b/server/src/main/java/mc/protocol/packets/PacketDirection.java similarity index 100% rename from src/main/java/mc/protocol/packets/PacketDirection.java rename to server/src/main/java/mc/protocol/packets/PacketDirection.java diff --git a/src/main/java/mc/protocol/packets/UnknownPacket.java b/server/src/main/java/mc/protocol/packets/UnknownPacket.java similarity index 100% rename from src/main/java/mc/protocol/packets/UnknownPacket.java rename to server/src/main/java/mc/protocol/packets/UnknownPacket.java diff --git a/src/main/java/mc/protocol/packets/client/HandshakePacket.java b/server/src/main/java/mc/protocol/packets/client/HandshakePacket.java similarity index 100% rename from src/main/java/mc/protocol/packets/client/HandshakePacket.java rename to server/src/main/java/mc/protocol/packets/client/HandshakePacket.java diff --git a/src/main/java/mc/protocol/packets/client/LoginStartPacket.java b/server/src/main/java/mc/protocol/packets/client/LoginStartPacket.java similarity index 100% rename from src/main/java/mc/protocol/packets/client/LoginStartPacket.java rename to server/src/main/java/mc/protocol/packets/client/LoginStartPacket.java diff --git a/src/main/java/mc/protocol/packets/client/StatusServerRequest.java b/server/src/main/java/mc/protocol/packets/client/StatusServerRequest.java similarity index 100% rename from src/main/java/mc/protocol/packets/client/StatusServerRequest.java rename to server/src/main/java/mc/protocol/packets/client/StatusServerRequest.java diff --git a/src/main/java/mc/protocol/packets/server/DisconnectPacket.java b/server/src/main/java/mc/protocol/packets/server/DisconnectPacket.java similarity index 100% rename from src/main/java/mc/protocol/packets/server/DisconnectPacket.java rename to server/src/main/java/mc/protocol/packets/server/DisconnectPacket.java diff --git a/src/main/java/mc/protocol/packets/server/StatusServerResponse.java b/server/src/main/java/mc/protocol/packets/server/StatusServerResponse.java similarity index 100% rename from src/main/java/mc/protocol/packets/server/StatusServerResponse.java rename to server/src/main/java/mc/protocol/packets/server/StatusServerResponse.java diff --git a/src/main/java/mc/server/Main.java b/server/src/main/java/mc/server/Main.java similarity index 100% rename from src/main/java/mc/server/Main.java rename to server/src/main/java/mc/server/Main.java diff --git a/src/main/java/mc/server/di/NetworkComponent.java b/server/src/main/java/mc/server/di/NetworkComponent.java similarity index 100% rename from src/main/java/mc/server/di/NetworkComponent.java rename to server/src/main/java/mc/server/di/NetworkComponent.java diff --git a/src/main/java/mc/server/di/NetworkModule.java b/server/src/main/java/mc/server/di/NetworkModule.java similarity index 100% rename from src/main/java/mc/server/di/NetworkModule.java rename to server/src/main/java/mc/server/di/NetworkModule.java diff --git a/src/main/java/mc/server/network/Server.java b/server/src/main/java/mc/server/network/Server.java similarity index 100% rename from src/main/java/mc/server/network/Server.java rename to server/src/main/java/mc/server/network/Server.java diff --git a/src/main/java/mc/server/network/netty/NettyServer.java b/server/src/main/java/mc/server/network/netty/NettyServer.java similarity index 100% rename from src/main/java/mc/server/network/netty/NettyServer.java rename to server/src/main/java/mc/server/network/netty/NettyServer.java diff --git a/src/main/java/mc/server/network/netty/handler/AbstractPacketHandler.java b/server/src/main/java/mc/server/network/netty/handler/AbstractPacketHandler.java similarity index 100% rename from src/main/java/mc/server/network/netty/handler/AbstractPacketHandler.java rename to server/src/main/java/mc/server/network/netty/handler/AbstractPacketHandler.java diff --git a/src/main/java/mc/server/network/netty/handler/HandshakeHandler.java b/server/src/main/java/mc/server/network/netty/handler/HandshakeHandler.java similarity index 100% rename from src/main/java/mc/server/network/netty/handler/HandshakeHandler.java rename to server/src/main/java/mc/server/network/netty/handler/HandshakeHandler.java diff --git a/src/main/java/mc/server/network/netty/handler/LoginHandler.java b/server/src/main/java/mc/server/network/netty/handler/LoginHandler.java similarity index 100% rename from src/main/java/mc/server/network/netty/handler/LoginHandler.java rename to server/src/main/java/mc/server/network/netty/handler/LoginHandler.java diff --git a/src/main/java/mc/server/network/netty/handler/StatusHandler.java b/server/src/main/java/mc/server/network/netty/handler/StatusHandler.java similarity index 100% rename from src/main/java/mc/server/network/netty/handler/StatusHandler.java rename to server/src/main/java/mc/server/network/netty/handler/StatusHandler.java diff --git a/src/main/resources/logback.xml b/server/src/main/resources/logback.xml similarity index 100% rename from src/main/resources/logback.xml rename to server/src/main/resources/logback.xml diff --git a/src/test/java/mc/protocol/io/NetByteBufReadTest.java b/server/src/test/java/mc/protocol/io/NetByteBufReadTest.java similarity index 100% rename from src/test/java/mc/protocol/io/NetByteBufReadTest.java rename to server/src/test/java/mc/protocol/io/NetByteBufReadTest.java diff --git a/src/test/java/mc/protocol/io/NetByteBufWriteTest.java b/server/src/test/java/mc/protocol/io/NetByteBufWriteTest.java similarity index 100% rename from src/test/java/mc/protocol/io/NetByteBufWriteTest.java rename to server/src/test/java/mc/protocol/io/NetByteBufWriteTest.java From fcfcb16e6daeebbf13425b8adfc206807534ec2e Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Mon, 26 Apr 2021 15:27:59 +0300 Subject: [PATCH 6/6] =?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=20mc.protocol=20=D0=B8=20mc.server=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=BF=D0=BE=D0=B4=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.MD | 10 ++++++- libs.gradle | 7 ++++- logic.gradle | 27 +++++++++++++++-- protocol/build.gradle | 8 +++++ protocol/gradle.properties | 3 ++ .../java/mc/protocol/NetworkAttributes.java | 0 .../src/main/java/mc/protocol/State.java | 0 .../java/mc/protocol/io/DecoderException.java | 0 .../main/java/mc/protocol/io/NetByteBuf.java | 0 .../mc/protocol/io/codec/ProtocolDecoder.java | 0 .../mc/protocol/io/codec/ProtocolEncoder.java | 0 .../protocol/io/codec/ProtocolSplitter.java | 0 .../java/mc/protocol/packets/EmptyPacket.java | 0 .../main/java/mc/protocol/packets/Packet.java | 0 .../mc/protocol/packets/PacketDirection.java | 0 .../mc/protocol/packets/UnknownPacket.java | 0 .../packets/client/HandshakePacket.java | 0 .../packets/client/LoginStartPacket.java | 0 .../packets/client/StatusServerRequest.java | 0 .../packets/server/DisconnectPacket.java | 0 .../packets/server/StatusServerResponse.java | 0 .../mc/protocol/io/NetByteBufReadTest.java | 1 - .../mc/protocol/io/NetByteBufWriteTest.java | 0 server/build.gradle | 30 ++++--------------- settings.gradle | 1 + 25 files changed, 58 insertions(+), 29 deletions(-) create mode 100644 protocol/build.gradle create mode 100644 protocol/gradle.properties rename {server => protocol}/src/main/java/mc/protocol/NetworkAttributes.java (100%) rename {server => protocol}/src/main/java/mc/protocol/State.java (100%) rename {server => protocol}/src/main/java/mc/protocol/io/DecoderException.java (100%) rename {server => protocol}/src/main/java/mc/protocol/io/NetByteBuf.java (100%) rename {server => protocol}/src/main/java/mc/protocol/io/codec/ProtocolDecoder.java (100%) rename {server => protocol}/src/main/java/mc/protocol/io/codec/ProtocolEncoder.java (100%) rename {server => protocol}/src/main/java/mc/protocol/io/codec/ProtocolSplitter.java (100%) rename {server => protocol}/src/main/java/mc/protocol/packets/EmptyPacket.java (100%) rename {server => protocol}/src/main/java/mc/protocol/packets/Packet.java (100%) rename {server => protocol}/src/main/java/mc/protocol/packets/PacketDirection.java (100%) rename {server => protocol}/src/main/java/mc/protocol/packets/UnknownPacket.java (100%) rename {server => protocol}/src/main/java/mc/protocol/packets/client/HandshakePacket.java (100%) rename {server => protocol}/src/main/java/mc/protocol/packets/client/LoginStartPacket.java (100%) rename {server => protocol}/src/main/java/mc/protocol/packets/client/StatusServerRequest.java (100%) rename {server => protocol}/src/main/java/mc/protocol/packets/server/DisconnectPacket.java (100%) rename {server => protocol}/src/main/java/mc/protocol/packets/server/StatusServerResponse.java (100%) rename {server => protocol}/src/test/java/mc/protocol/io/NetByteBufReadTest.java (99%) rename {server => protocol}/src/test/java/mc/protocol/io/NetByteBufWriteTest.java (100%) diff --git a/README.MD b/README.MD index 3d7113f..f0e5040 100644 --- a/README.MD +++ b/README.MD @@ -6,4 +6,12 @@ --- -* Java 11 \ No newline at end of file +* Java 11 + +--- + +## Запуск + +```shell +gradle :server:run +``` \ No newline at end of file diff --git a/libs.gradle b/libs.gradle index 600bd97..365ee1a 100644 --- a/libs.gradle +++ b/libs.gradle @@ -1,5 +1,6 @@ //file:noinspection GroovyAssignabilityCheck //file:noinspection GrUnresolvedAccess +//file:noinspection GroovyConstructorNamedArguments def slf4j_version = '1.7.30' def logback_version = '1.2.3' @@ -26,7 +27,11 @@ ext { annotationProcessor: "com.google.dagger:dagger-compiler:${dagger2_version}" ] - libs.junit5 = [ + libs.test = [ + logger: "org.slf4j:slf4j-simple:${slf4j_version}" + ] + + libs.test.junit5 = [ api : "org.junit.jupiter:junit-jupiter-api:${junit_version}", //runtime only engine: "org.junit.jupiter:junit-jupiter-engine:${junit_version}", diff --git a/logic.gradle b/logic.gradle index 9254004..eb5630f 100644 --- a/logic.gradle +++ b/logic.gradle @@ -1,4 +1,6 @@ +//file:noinspection GrUnresolvedAccess apply plugin: 'java' +apply from: rootDir.toPath().resolve('libs.gradle').toFile() String getProperty1(String propertyName1, String propertyName2) { return (String) (project.hasProperty(propertyName1) ? project.property(propertyName1) : project.property(propertyName2)) @@ -6,7 +8,7 @@ String getProperty1(String propertyName1, String propertyName2) { project.group = getProperty1('module.group', 'project.group') project.version = getProperty1('module.version', 'project.version') -project.jar.archiveBaseName.set(getProperty1('module.name', 'project.name')) +jar.archiveBaseName.set(getProperty1('module.name', 'project.name')) compileJava { sourceCompatibility = targetCompatibility = JavaVersion.VERSION_11 @@ -16,4 +18,25 @@ compileJava { repositories { mavenLocal() mavenCentral() -} \ No newline at end of file +} + +dependencies { + annotationProcessor libs.lombok + compileOnly libs.lombok + compileOnly libs.annotations + + implementation libs.logger.slf4j + + implementation libs.dagger2.implementation + annotationProcessor libs.dagger2.annotationProcessor + + testImplementation libs.test.junit5.api + testImplementation libs.test.junit5.params + testRuntimeOnly libs.test.junit5.engine + + testRuntimeOnly libs.test.logger +} + +test { + useJUnitPlatform() +} diff --git a/protocol/build.gradle b/protocol/build.gradle new file mode 100644 index 0000000..4e4b0da --- /dev/null +++ b/protocol/build.gradle @@ -0,0 +1,8 @@ +apply from: rootDir.toPath().resolve('logic.gradle').toFile() + +dependencies { + implementation 'io.netty:netty-all:4.1.22.Final' + implementation libs.guava + + testImplementation libs.lang3 +} diff --git a/protocol/gradle.properties b/protocol/gradle.properties new file mode 100644 index 0000000..572e805 --- /dev/null +++ b/protocol/gradle.properties @@ -0,0 +1,3 @@ +# suppress inspection "UnusedProperty" for whole file +module.name=protocol +module.version=1.0-SNAPSHOT \ No newline at end of file diff --git a/server/src/main/java/mc/protocol/NetworkAttributes.java b/protocol/src/main/java/mc/protocol/NetworkAttributes.java similarity index 100% rename from server/src/main/java/mc/protocol/NetworkAttributes.java rename to protocol/src/main/java/mc/protocol/NetworkAttributes.java diff --git a/server/src/main/java/mc/protocol/State.java b/protocol/src/main/java/mc/protocol/State.java similarity index 100% rename from server/src/main/java/mc/protocol/State.java rename to protocol/src/main/java/mc/protocol/State.java diff --git a/server/src/main/java/mc/protocol/io/DecoderException.java b/protocol/src/main/java/mc/protocol/io/DecoderException.java similarity index 100% rename from server/src/main/java/mc/protocol/io/DecoderException.java rename to protocol/src/main/java/mc/protocol/io/DecoderException.java diff --git a/server/src/main/java/mc/protocol/io/NetByteBuf.java b/protocol/src/main/java/mc/protocol/io/NetByteBuf.java similarity index 100% rename from server/src/main/java/mc/protocol/io/NetByteBuf.java rename to protocol/src/main/java/mc/protocol/io/NetByteBuf.java diff --git a/server/src/main/java/mc/protocol/io/codec/ProtocolDecoder.java b/protocol/src/main/java/mc/protocol/io/codec/ProtocolDecoder.java similarity index 100% rename from server/src/main/java/mc/protocol/io/codec/ProtocolDecoder.java rename to protocol/src/main/java/mc/protocol/io/codec/ProtocolDecoder.java diff --git a/server/src/main/java/mc/protocol/io/codec/ProtocolEncoder.java b/protocol/src/main/java/mc/protocol/io/codec/ProtocolEncoder.java similarity index 100% rename from server/src/main/java/mc/protocol/io/codec/ProtocolEncoder.java rename to protocol/src/main/java/mc/protocol/io/codec/ProtocolEncoder.java diff --git a/server/src/main/java/mc/protocol/io/codec/ProtocolSplitter.java b/protocol/src/main/java/mc/protocol/io/codec/ProtocolSplitter.java similarity index 100% rename from server/src/main/java/mc/protocol/io/codec/ProtocolSplitter.java rename to protocol/src/main/java/mc/protocol/io/codec/ProtocolSplitter.java diff --git a/server/src/main/java/mc/protocol/packets/EmptyPacket.java b/protocol/src/main/java/mc/protocol/packets/EmptyPacket.java similarity index 100% rename from server/src/main/java/mc/protocol/packets/EmptyPacket.java rename to protocol/src/main/java/mc/protocol/packets/EmptyPacket.java diff --git a/server/src/main/java/mc/protocol/packets/Packet.java b/protocol/src/main/java/mc/protocol/packets/Packet.java similarity index 100% rename from server/src/main/java/mc/protocol/packets/Packet.java rename to protocol/src/main/java/mc/protocol/packets/Packet.java diff --git a/server/src/main/java/mc/protocol/packets/PacketDirection.java b/protocol/src/main/java/mc/protocol/packets/PacketDirection.java similarity index 100% rename from server/src/main/java/mc/protocol/packets/PacketDirection.java rename to protocol/src/main/java/mc/protocol/packets/PacketDirection.java diff --git a/server/src/main/java/mc/protocol/packets/UnknownPacket.java b/protocol/src/main/java/mc/protocol/packets/UnknownPacket.java similarity index 100% rename from server/src/main/java/mc/protocol/packets/UnknownPacket.java rename to protocol/src/main/java/mc/protocol/packets/UnknownPacket.java diff --git a/server/src/main/java/mc/protocol/packets/client/HandshakePacket.java b/protocol/src/main/java/mc/protocol/packets/client/HandshakePacket.java similarity index 100% rename from server/src/main/java/mc/protocol/packets/client/HandshakePacket.java rename to protocol/src/main/java/mc/protocol/packets/client/HandshakePacket.java diff --git a/server/src/main/java/mc/protocol/packets/client/LoginStartPacket.java b/protocol/src/main/java/mc/protocol/packets/client/LoginStartPacket.java similarity index 100% rename from server/src/main/java/mc/protocol/packets/client/LoginStartPacket.java rename to protocol/src/main/java/mc/protocol/packets/client/LoginStartPacket.java diff --git a/server/src/main/java/mc/protocol/packets/client/StatusServerRequest.java b/protocol/src/main/java/mc/protocol/packets/client/StatusServerRequest.java similarity index 100% rename from server/src/main/java/mc/protocol/packets/client/StatusServerRequest.java rename to protocol/src/main/java/mc/protocol/packets/client/StatusServerRequest.java diff --git a/server/src/main/java/mc/protocol/packets/server/DisconnectPacket.java b/protocol/src/main/java/mc/protocol/packets/server/DisconnectPacket.java similarity index 100% rename from server/src/main/java/mc/protocol/packets/server/DisconnectPacket.java rename to protocol/src/main/java/mc/protocol/packets/server/DisconnectPacket.java diff --git a/server/src/main/java/mc/protocol/packets/server/StatusServerResponse.java b/protocol/src/main/java/mc/protocol/packets/server/StatusServerResponse.java similarity index 100% rename from server/src/main/java/mc/protocol/packets/server/StatusServerResponse.java rename to protocol/src/main/java/mc/protocol/packets/server/StatusServerResponse.java diff --git a/server/src/test/java/mc/protocol/io/NetByteBufReadTest.java b/protocol/src/test/java/mc/protocol/io/NetByteBufReadTest.java similarity index 99% rename from server/src/test/java/mc/protocol/io/NetByteBufReadTest.java rename to protocol/src/test/java/mc/protocol/io/NetByteBufReadTest.java index c48b6b4..6337ec5 100644 --- a/server/src/test/java/mc/protocol/io/NetByteBufReadTest.java +++ b/protocol/src/test/java/mc/protocol/io/NetByteBufReadTest.java @@ -1,6 +1,5 @@ package mc.protocol.io; -import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/server/src/test/java/mc/protocol/io/NetByteBufWriteTest.java b/protocol/src/test/java/mc/protocol/io/NetByteBufWriteTest.java similarity index 100% rename from server/src/test/java/mc/protocol/io/NetByteBufWriteTest.java rename to protocol/src/test/java/mc/protocol/io/NetByteBufWriteTest.java diff --git a/server/build.gradle b/server/build.gradle index 2155b25..68acb11 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -1,41 +1,23 @@ /* Запуск - gradle run + gradle :server:run */ apply from: rootDir.toPath().resolve('logic.gradle').toFile() -apply from: rootDir.toPath().resolve('libs.gradle').toFile() - apply plugin: 'application' +application { + mainClassName = 'mc.server.Main' +} + dependencies { - annotationProcessor libs.lombok - compileOnly libs.lombok - compileOnly libs.annotations + implementation project(':protocol') - implementation libs.logger.slf4j implementation libs.logger.logback - implementation libs.dagger2.implementation - annotationProcessor libs.dagger2.annotationProcessor - implementation platform('io.projectreactor:reactor-bom:2020.0.6') implementation 'io.projectreactor:reactor-core' implementation 'io.netty:netty-all:4.1.22.Final' implementation libs.guava - - testImplementation libs.junit5.api - testImplementation libs.junit5.params - testRuntimeOnly libs.junit5.engine - - testImplementation libs.lang3 -} - -application { - mainClassName = 'mc.server.Main' -} - -test { - useJUnitPlatform() } diff --git a/settings.gradle b/settings.gradle index 925cad0..03dd498 100644 --- a/settings.gradle +++ b/settings.gradle @@ -10,4 +10,5 @@ rootProject.projectDir.toPath().resolve('gradle.properties').readLines().forEach rootProject.name = map.get('project.name') +include('protocol') include('server') \ No newline at end of file