From 38091e8685320ec64549f8ec4c0d951bdc7c0560 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Mon, 26 Apr 2021 15:02:54 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81=20?= =?UTF-8?q?=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