From 696d18cf41fb70b5bc5a415206b46bdd949e3def Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Thu, 17 Jun 2021 15:09:29 +0300 Subject: [PATCH] refactoring: swap modules --- {protocol-new => protocol}/build.gradle | 0 {protocol-new => protocol}/gradle.properties | 0 .../src/main/java/mc/protocol/ProtocolAttributes.java | 0 .../src/main/java/mc/protocol/ProtocolConstant.java | 0 .../src/main/java/mc/protocol/State.java | 0 .../src/main/java/mc/protocol/buffer/NetByteBuf.java | 0 .../src/main/java/mc/protocol/buffer/NetIOException.java | 0 .../main/java/mc/protocol/handler/ProtocolHandlersBus.java | 0 .../java/mc/protocol/handler/ProtocolInboundHandler.java | 0 .../java/mc/protocol/handler/codec/ProtocolDecoder.java | 0 .../java/mc/protocol/handler/codec/ProtocolEncoder.java | 0 .../java/mc/protocol/handler/codec/ProtocolSplitter.java | 0 .../src/main/java/mc/protocol/model/Location.java | 0 .../src/main/java/mc/protocol/model/Look.java | 0 .../src/main/java/mc/protocol/model/ServerInfo.java | 0 .../main/java/mc/protocol/model/ServerInfoSerializer.java | 0 .../src/main/java/mc/protocol/model/text/Text.java | 0 .../src/main/java/mc/protocol/model/text/TextColor.java | 0 .../main/java/mc/protocol/model/text/TextSerializer.java | 0 .../src/main/java/mc/protocol/model/text/TextStyle.java | 0 .../src/main/java/mc/protocol/packets/ClientSidePacket.java | 0 .../src/main/java/mc/protocol/packets/KeepAlivePacket.java | 0 .../src/main/java/mc/protocol/packets/Packet.java | 0 .../src/main/java/mc/protocol/packets/ServerSidePacket.java | 0 .../src/main/java/mc/protocol/packets/UnknownPacket.java | 0 .../packets/handshaking/client/HandshakePacket.java | 0 .../mc/protocol/packets/login/client/LoginStartPacket.java | 0 .../mc/protocol/packets/login/server/DisconnectPacket.java | 0 .../protocol/packets/login/server/LoginSuccessPacket.java | 0 .../packets/play/client/CPlayerPositionAndLookPacket.java | 0 .../protocol/packets/play/client/ClientSettingsPacket.java | 0 .../mc/protocol/packets/play/client/EntityActionPacket.java | 0 .../mc/protocol/packets/play/client/PlayerLookPacket.java | 0 .../protocol/packets/play/client/PlayerPositionPacket.java | 0 .../protocol/packets/play/client/PluginMessagePacket.java | 0 .../protocol/packets/play/client/TeleportConfirmPacket.java | 0 .../mc/protocol/packets/play/server/ChunkDataPacket.java | 0 .../mc/protocol/packets/play/server/JoinGamePacket.java | 0 .../protocol/packets/play/server/PlayerAbilitiesPacket.java | 0 .../packets/play/server/SPlayerPositionAndLookPacket.java | 0 .../protocol/packets/play/server/SpawnPositionPacket.java | 0 .../packets/status/client/StatusServerRequestPacket.java | 0 .../packets/status/server/StatusServerResponse.java | 0 .../src/main/java/mc/protocol/pool/LocationObjectPool.java | 0 .../src/main/java/mc/protocol/pool/LookObjectPool.java | 0 .../src/main/java/mc/protocol/pool/PacketObjectPool.java | 0 .../src/main/java/mc/protocol/utils/ChatMode.java | 0 .../src/main/java/mc/protocol/utils/Difficulty.java | 0 .../src/main/java/mc/protocol/utils/GameMode.java | 0 .../src/main/java/mc/protocol/utils/LevelType.java | 0 .../src/main/java/mc/protocol/utils/MainHand.java | 0 .../src/main/java/mc/protocol/utils/Table.java | 0 .../src/main/java/mc/protocol/world/Chunk.java | 0 .../src/main/java/mc/protocol/world/World.java | 0 .../test/java/mc/protocol/buffer/NetByteBufReadTest.java | 0 .../test/java/mc/protocol/buffer/NetByteBufWriteTest.java | 0 .../mc/protocol/handler/codec/ProtocolSplitterTest.java | 0 {server-new => server}/build.gradle | 2 +- {server-new => server}/gradle.properties | 0 {server-new => server}/src/main/java/mc/server/Main.java | 0 .../src/main/java/mc/server/NettyServer.java | 0 {server-new => server}/src/main/java/mc/server/Player.java | 0 .../src/main/java/mc/server/PlayerManager.java | 0 .../src/main/java/mc/server/ServetAttributes.java | 0 .../src/main/java/mc/server/di/ConfigComponent.java | 0 .../src/main/java/mc/server/di/ConfigModule.java | 0 .../src/main/java/mc/server/di/PlayerManagerModule.java | 0 .../src/main/java/mc/server/di/ProcessorModule.java | 0 .../src/main/java/mc/server/di/ServerComponent.java | 0 .../src/main/java/mc/server/di/ServerModule.java | 0 .../src/main/java/mc/server/di/WorldModule.java | 0 .../src/main/java/mc/server/processor/PacketProcessor.java | 0 .../main/java/mc/server/processor/ProcessorHandshake.java | 0 .../src/main/java/mc/server/processor/ProcessorLogin.java | 0 .../src/main/java/mc/server/processor/ProcessorPlay.java | 0 .../src/main/java/mc/server/processor/ProcessorStatus.java | 0 .../src/main/java/mc/server/util/LocationUtils.java | 0 .../src/main/java/mc/server/world/VoidChunk.java | 0 .../src/main/java/mc/server/world/VoidWorld.java | 0 .../src/main/resources/config-default.conf | 0 .../src/main/resources/logback-default.xml | 0 .../src/test/java/mc/server/di/ConfigModuleTest.java | 0 {server-new => server}/src/test/resources/config-1.conf | 0 {server-new => server}/src/test/resources/config-2.conf | 0 {server-new => server}/src/test/resources/config-3.conf | 0 {server-new => server}/src/test/resources/config-empty.conf | 0 settings.gradle | 6 ++---- 87 files changed, 3 insertions(+), 5 deletions(-) rename {protocol-new => protocol}/build.gradle (100%) rename {protocol-new => protocol}/gradle.properties (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/ProtocolAttributes.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/ProtocolConstant.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/State.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/buffer/NetByteBuf.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/buffer/NetIOException.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/handler/ProtocolHandlersBus.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/handler/ProtocolInboundHandler.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/handler/codec/ProtocolDecoder.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/handler/codec/ProtocolEncoder.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/handler/codec/ProtocolSplitter.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/model/Location.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/model/Look.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/model/ServerInfo.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/model/ServerInfoSerializer.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/model/text/Text.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/model/text/TextColor.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/model/text/TextSerializer.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/model/text/TextStyle.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/packets/ClientSidePacket.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/packets/KeepAlivePacket.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/packets/Packet.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/packets/ServerSidePacket.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/packets/UnknownPacket.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/packets/handshaking/client/HandshakePacket.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/packets/login/client/LoginStartPacket.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/packets/login/server/DisconnectPacket.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/packets/login/server/LoginSuccessPacket.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/packets/play/client/CPlayerPositionAndLookPacket.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/packets/play/client/ClientSettingsPacket.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/packets/play/client/EntityActionPacket.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/packets/play/client/PlayerLookPacket.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/packets/play/client/PlayerPositionPacket.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/packets/play/client/PluginMessagePacket.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/packets/play/client/TeleportConfirmPacket.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/packets/play/server/ChunkDataPacket.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/packets/play/server/JoinGamePacket.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/packets/play/server/PlayerAbilitiesPacket.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/packets/play/server/SPlayerPositionAndLookPacket.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/packets/play/server/SpawnPositionPacket.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/packets/status/client/StatusServerRequestPacket.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/packets/status/server/StatusServerResponse.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/pool/LocationObjectPool.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/pool/LookObjectPool.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/pool/PacketObjectPool.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/utils/ChatMode.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/utils/Difficulty.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/utils/GameMode.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/utils/LevelType.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/utils/MainHand.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/utils/Table.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/world/Chunk.java (100%) rename {protocol-new => protocol}/src/main/java/mc/protocol/world/World.java (100%) rename {protocol-new => protocol}/src/test/java/mc/protocol/buffer/NetByteBufReadTest.java (100%) rename {protocol-new => protocol}/src/test/java/mc/protocol/buffer/NetByteBufWriteTest.java (100%) rename {protocol-new => protocol}/src/test/java/mc/protocol/handler/codec/ProtocolSplitterTest.java (100%) rename {server-new => server}/build.gradle (95%) rename {server-new => server}/gradle.properties (100%) rename {server-new => server}/src/main/java/mc/server/Main.java (100%) rename {server-new => server}/src/main/java/mc/server/NettyServer.java (100%) rename {server-new => server}/src/main/java/mc/server/Player.java (100%) rename {server-new => server}/src/main/java/mc/server/PlayerManager.java (100%) rename {server-new => server}/src/main/java/mc/server/ServetAttributes.java (100%) rename {server-new => server}/src/main/java/mc/server/di/ConfigComponent.java (100%) rename {server-new => server}/src/main/java/mc/server/di/ConfigModule.java (100%) rename {server-new => server}/src/main/java/mc/server/di/PlayerManagerModule.java (100%) rename {server-new => server}/src/main/java/mc/server/di/ProcessorModule.java (100%) rename {server-new => server}/src/main/java/mc/server/di/ServerComponent.java (100%) rename {server-new => server}/src/main/java/mc/server/di/ServerModule.java (100%) rename {server-new => server}/src/main/java/mc/server/di/WorldModule.java (100%) rename {server-new => server}/src/main/java/mc/server/processor/PacketProcessor.java (100%) rename {server-new => server}/src/main/java/mc/server/processor/ProcessorHandshake.java (100%) rename {server-new => server}/src/main/java/mc/server/processor/ProcessorLogin.java (100%) rename {server-new => server}/src/main/java/mc/server/processor/ProcessorPlay.java (100%) rename {server-new => server}/src/main/java/mc/server/processor/ProcessorStatus.java (100%) rename {server-new => server}/src/main/java/mc/server/util/LocationUtils.java (100%) rename {server-new => server}/src/main/java/mc/server/world/VoidChunk.java (100%) rename {server-new => server}/src/main/java/mc/server/world/VoidWorld.java (100%) rename {server-new => server}/src/main/resources/config-default.conf (100%) rename {server-new => server}/src/main/resources/logback-default.xml (100%) rename {server-new => server}/src/test/java/mc/server/di/ConfigModuleTest.java (100%) rename {server-new => server}/src/test/resources/config-1.conf (100%) rename {server-new => server}/src/test/resources/config-2.conf (100%) rename {server-new => server}/src/test/resources/config-3.conf (100%) rename {server-new => server}/src/test/resources/config-empty.conf (100%) diff --git a/protocol-new/build.gradle b/protocol/build.gradle similarity index 100% rename from protocol-new/build.gradle rename to protocol/build.gradle diff --git a/protocol-new/gradle.properties b/protocol/gradle.properties similarity index 100% rename from protocol-new/gradle.properties rename to protocol/gradle.properties diff --git a/protocol-new/src/main/java/mc/protocol/ProtocolAttributes.java b/protocol/src/main/java/mc/protocol/ProtocolAttributes.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/ProtocolAttributes.java rename to protocol/src/main/java/mc/protocol/ProtocolAttributes.java diff --git a/protocol-new/src/main/java/mc/protocol/ProtocolConstant.java b/protocol/src/main/java/mc/protocol/ProtocolConstant.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/ProtocolConstant.java rename to protocol/src/main/java/mc/protocol/ProtocolConstant.java diff --git a/protocol-new/src/main/java/mc/protocol/State.java b/protocol/src/main/java/mc/protocol/State.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/State.java rename to protocol/src/main/java/mc/protocol/State.java diff --git a/protocol-new/src/main/java/mc/protocol/buffer/NetByteBuf.java b/protocol/src/main/java/mc/protocol/buffer/NetByteBuf.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/buffer/NetByteBuf.java rename to protocol/src/main/java/mc/protocol/buffer/NetByteBuf.java diff --git a/protocol-new/src/main/java/mc/protocol/buffer/NetIOException.java b/protocol/src/main/java/mc/protocol/buffer/NetIOException.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/buffer/NetIOException.java rename to protocol/src/main/java/mc/protocol/buffer/NetIOException.java diff --git a/protocol-new/src/main/java/mc/protocol/handler/ProtocolHandlersBus.java b/protocol/src/main/java/mc/protocol/handler/ProtocolHandlersBus.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/handler/ProtocolHandlersBus.java rename to protocol/src/main/java/mc/protocol/handler/ProtocolHandlersBus.java diff --git a/protocol-new/src/main/java/mc/protocol/handler/ProtocolInboundHandler.java b/protocol/src/main/java/mc/protocol/handler/ProtocolInboundHandler.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/handler/ProtocolInboundHandler.java rename to protocol/src/main/java/mc/protocol/handler/ProtocolInboundHandler.java diff --git a/protocol-new/src/main/java/mc/protocol/handler/codec/ProtocolDecoder.java b/protocol/src/main/java/mc/protocol/handler/codec/ProtocolDecoder.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/handler/codec/ProtocolDecoder.java rename to protocol/src/main/java/mc/protocol/handler/codec/ProtocolDecoder.java diff --git a/protocol-new/src/main/java/mc/protocol/handler/codec/ProtocolEncoder.java b/protocol/src/main/java/mc/protocol/handler/codec/ProtocolEncoder.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/handler/codec/ProtocolEncoder.java rename to protocol/src/main/java/mc/protocol/handler/codec/ProtocolEncoder.java diff --git a/protocol-new/src/main/java/mc/protocol/handler/codec/ProtocolSplitter.java b/protocol/src/main/java/mc/protocol/handler/codec/ProtocolSplitter.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/handler/codec/ProtocolSplitter.java rename to protocol/src/main/java/mc/protocol/handler/codec/ProtocolSplitter.java diff --git a/protocol-new/src/main/java/mc/protocol/model/Location.java b/protocol/src/main/java/mc/protocol/model/Location.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/model/Location.java rename to protocol/src/main/java/mc/protocol/model/Location.java diff --git a/protocol-new/src/main/java/mc/protocol/model/Look.java b/protocol/src/main/java/mc/protocol/model/Look.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/model/Look.java rename to protocol/src/main/java/mc/protocol/model/Look.java diff --git a/protocol-new/src/main/java/mc/protocol/model/ServerInfo.java b/protocol/src/main/java/mc/protocol/model/ServerInfo.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/model/ServerInfo.java rename to protocol/src/main/java/mc/protocol/model/ServerInfo.java diff --git a/protocol-new/src/main/java/mc/protocol/model/ServerInfoSerializer.java b/protocol/src/main/java/mc/protocol/model/ServerInfoSerializer.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/model/ServerInfoSerializer.java rename to protocol/src/main/java/mc/protocol/model/ServerInfoSerializer.java diff --git a/protocol-new/src/main/java/mc/protocol/model/text/Text.java b/protocol/src/main/java/mc/protocol/model/text/Text.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/model/text/Text.java rename to protocol/src/main/java/mc/protocol/model/text/Text.java diff --git a/protocol-new/src/main/java/mc/protocol/model/text/TextColor.java b/protocol/src/main/java/mc/protocol/model/text/TextColor.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/model/text/TextColor.java rename to protocol/src/main/java/mc/protocol/model/text/TextColor.java diff --git a/protocol-new/src/main/java/mc/protocol/model/text/TextSerializer.java b/protocol/src/main/java/mc/protocol/model/text/TextSerializer.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/model/text/TextSerializer.java rename to protocol/src/main/java/mc/protocol/model/text/TextSerializer.java diff --git a/protocol-new/src/main/java/mc/protocol/model/text/TextStyle.java b/protocol/src/main/java/mc/protocol/model/text/TextStyle.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/model/text/TextStyle.java rename to protocol/src/main/java/mc/protocol/model/text/TextStyle.java diff --git a/protocol-new/src/main/java/mc/protocol/packets/ClientSidePacket.java b/protocol/src/main/java/mc/protocol/packets/ClientSidePacket.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/packets/ClientSidePacket.java rename to protocol/src/main/java/mc/protocol/packets/ClientSidePacket.java diff --git a/protocol-new/src/main/java/mc/protocol/packets/KeepAlivePacket.java b/protocol/src/main/java/mc/protocol/packets/KeepAlivePacket.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/packets/KeepAlivePacket.java rename to protocol/src/main/java/mc/protocol/packets/KeepAlivePacket.java diff --git a/protocol-new/src/main/java/mc/protocol/packets/Packet.java b/protocol/src/main/java/mc/protocol/packets/Packet.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/packets/Packet.java rename to protocol/src/main/java/mc/protocol/packets/Packet.java diff --git a/protocol-new/src/main/java/mc/protocol/packets/ServerSidePacket.java b/protocol/src/main/java/mc/protocol/packets/ServerSidePacket.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/packets/ServerSidePacket.java rename to protocol/src/main/java/mc/protocol/packets/ServerSidePacket.java diff --git a/protocol-new/src/main/java/mc/protocol/packets/UnknownPacket.java b/protocol/src/main/java/mc/protocol/packets/UnknownPacket.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/packets/UnknownPacket.java rename to protocol/src/main/java/mc/protocol/packets/UnknownPacket.java diff --git a/protocol-new/src/main/java/mc/protocol/packets/handshaking/client/HandshakePacket.java b/protocol/src/main/java/mc/protocol/packets/handshaking/client/HandshakePacket.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/packets/handshaking/client/HandshakePacket.java rename to protocol/src/main/java/mc/protocol/packets/handshaking/client/HandshakePacket.java diff --git a/protocol-new/src/main/java/mc/protocol/packets/login/client/LoginStartPacket.java b/protocol/src/main/java/mc/protocol/packets/login/client/LoginStartPacket.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/packets/login/client/LoginStartPacket.java rename to protocol/src/main/java/mc/protocol/packets/login/client/LoginStartPacket.java diff --git a/protocol-new/src/main/java/mc/protocol/packets/login/server/DisconnectPacket.java b/protocol/src/main/java/mc/protocol/packets/login/server/DisconnectPacket.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/packets/login/server/DisconnectPacket.java rename to protocol/src/main/java/mc/protocol/packets/login/server/DisconnectPacket.java diff --git a/protocol-new/src/main/java/mc/protocol/packets/login/server/LoginSuccessPacket.java b/protocol/src/main/java/mc/protocol/packets/login/server/LoginSuccessPacket.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/packets/login/server/LoginSuccessPacket.java rename to protocol/src/main/java/mc/protocol/packets/login/server/LoginSuccessPacket.java diff --git a/protocol-new/src/main/java/mc/protocol/packets/play/client/CPlayerPositionAndLookPacket.java b/protocol/src/main/java/mc/protocol/packets/play/client/CPlayerPositionAndLookPacket.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/packets/play/client/CPlayerPositionAndLookPacket.java rename to protocol/src/main/java/mc/protocol/packets/play/client/CPlayerPositionAndLookPacket.java diff --git a/protocol-new/src/main/java/mc/protocol/packets/play/client/ClientSettingsPacket.java b/protocol/src/main/java/mc/protocol/packets/play/client/ClientSettingsPacket.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/packets/play/client/ClientSettingsPacket.java rename to protocol/src/main/java/mc/protocol/packets/play/client/ClientSettingsPacket.java diff --git a/protocol-new/src/main/java/mc/protocol/packets/play/client/EntityActionPacket.java b/protocol/src/main/java/mc/protocol/packets/play/client/EntityActionPacket.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/packets/play/client/EntityActionPacket.java rename to protocol/src/main/java/mc/protocol/packets/play/client/EntityActionPacket.java diff --git a/protocol-new/src/main/java/mc/protocol/packets/play/client/PlayerLookPacket.java b/protocol/src/main/java/mc/protocol/packets/play/client/PlayerLookPacket.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/packets/play/client/PlayerLookPacket.java rename to protocol/src/main/java/mc/protocol/packets/play/client/PlayerLookPacket.java diff --git a/protocol-new/src/main/java/mc/protocol/packets/play/client/PlayerPositionPacket.java b/protocol/src/main/java/mc/protocol/packets/play/client/PlayerPositionPacket.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/packets/play/client/PlayerPositionPacket.java rename to protocol/src/main/java/mc/protocol/packets/play/client/PlayerPositionPacket.java diff --git a/protocol-new/src/main/java/mc/protocol/packets/play/client/PluginMessagePacket.java b/protocol/src/main/java/mc/protocol/packets/play/client/PluginMessagePacket.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/packets/play/client/PluginMessagePacket.java rename to protocol/src/main/java/mc/protocol/packets/play/client/PluginMessagePacket.java diff --git a/protocol-new/src/main/java/mc/protocol/packets/play/client/TeleportConfirmPacket.java b/protocol/src/main/java/mc/protocol/packets/play/client/TeleportConfirmPacket.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/packets/play/client/TeleportConfirmPacket.java rename to protocol/src/main/java/mc/protocol/packets/play/client/TeleportConfirmPacket.java diff --git a/protocol-new/src/main/java/mc/protocol/packets/play/server/ChunkDataPacket.java b/protocol/src/main/java/mc/protocol/packets/play/server/ChunkDataPacket.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/packets/play/server/ChunkDataPacket.java rename to protocol/src/main/java/mc/protocol/packets/play/server/ChunkDataPacket.java diff --git a/protocol-new/src/main/java/mc/protocol/packets/play/server/JoinGamePacket.java b/protocol/src/main/java/mc/protocol/packets/play/server/JoinGamePacket.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/packets/play/server/JoinGamePacket.java rename to protocol/src/main/java/mc/protocol/packets/play/server/JoinGamePacket.java diff --git a/protocol-new/src/main/java/mc/protocol/packets/play/server/PlayerAbilitiesPacket.java b/protocol/src/main/java/mc/protocol/packets/play/server/PlayerAbilitiesPacket.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/packets/play/server/PlayerAbilitiesPacket.java rename to protocol/src/main/java/mc/protocol/packets/play/server/PlayerAbilitiesPacket.java diff --git a/protocol-new/src/main/java/mc/protocol/packets/play/server/SPlayerPositionAndLookPacket.java b/protocol/src/main/java/mc/protocol/packets/play/server/SPlayerPositionAndLookPacket.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/packets/play/server/SPlayerPositionAndLookPacket.java rename to protocol/src/main/java/mc/protocol/packets/play/server/SPlayerPositionAndLookPacket.java diff --git a/protocol-new/src/main/java/mc/protocol/packets/play/server/SpawnPositionPacket.java b/protocol/src/main/java/mc/protocol/packets/play/server/SpawnPositionPacket.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/packets/play/server/SpawnPositionPacket.java rename to protocol/src/main/java/mc/protocol/packets/play/server/SpawnPositionPacket.java diff --git a/protocol-new/src/main/java/mc/protocol/packets/status/client/StatusServerRequestPacket.java b/protocol/src/main/java/mc/protocol/packets/status/client/StatusServerRequestPacket.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/packets/status/client/StatusServerRequestPacket.java rename to protocol/src/main/java/mc/protocol/packets/status/client/StatusServerRequestPacket.java diff --git a/protocol-new/src/main/java/mc/protocol/packets/status/server/StatusServerResponse.java b/protocol/src/main/java/mc/protocol/packets/status/server/StatusServerResponse.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/packets/status/server/StatusServerResponse.java rename to protocol/src/main/java/mc/protocol/packets/status/server/StatusServerResponse.java diff --git a/protocol-new/src/main/java/mc/protocol/pool/LocationObjectPool.java b/protocol/src/main/java/mc/protocol/pool/LocationObjectPool.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/pool/LocationObjectPool.java rename to protocol/src/main/java/mc/protocol/pool/LocationObjectPool.java diff --git a/protocol-new/src/main/java/mc/protocol/pool/LookObjectPool.java b/protocol/src/main/java/mc/protocol/pool/LookObjectPool.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/pool/LookObjectPool.java rename to protocol/src/main/java/mc/protocol/pool/LookObjectPool.java diff --git a/protocol-new/src/main/java/mc/protocol/pool/PacketObjectPool.java b/protocol/src/main/java/mc/protocol/pool/PacketObjectPool.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/pool/PacketObjectPool.java rename to protocol/src/main/java/mc/protocol/pool/PacketObjectPool.java diff --git a/protocol-new/src/main/java/mc/protocol/utils/ChatMode.java b/protocol/src/main/java/mc/protocol/utils/ChatMode.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/utils/ChatMode.java rename to protocol/src/main/java/mc/protocol/utils/ChatMode.java diff --git a/protocol-new/src/main/java/mc/protocol/utils/Difficulty.java b/protocol/src/main/java/mc/protocol/utils/Difficulty.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/utils/Difficulty.java rename to protocol/src/main/java/mc/protocol/utils/Difficulty.java diff --git a/protocol-new/src/main/java/mc/protocol/utils/GameMode.java b/protocol/src/main/java/mc/protocol/utils/GameMode.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/utils/GameMode.java rename to protocol/src/main/java/mc/protocol/utils/GameMode.java diff --git a/protocol-new/src/main/java/mc/protocol/utils/LevelType.java b/protocol/src/main/java/mc/protocol/utils/LevelType.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/utils/LevelType.java rename to protocol/src/main/java/mc/protocol/utils/LevelType.java diff --git a/protocol-new/src/main/java/mc/protocol/utils/MainHand.java b/protocol/src/main/java/mc/protocol/utils/MainHand.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/utils/MainHand.java rename to protocol/src/main/java/mc/protocol/utils/MainHand.java diff --git a/protocol-new/src/main/java/mc/protocol/utils/Table.java b/protocol/src/main/java/mc/protocol/utils/Table.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/utils/Table.java rename to protocol/src/main/java/mc/protocol/utils/Table.java diff --git a/protocol-new/src/main/java/mc/protocol/world/Chunk.java b/protocol/src/main/java/mc/protocol/world/Chunk.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/world/Chunk.java rename to protocol/src/main/java/mc/protocol/world/Chunk.java diff --git a/protocol-new/src/main/java/mc/protocol/world/World.java b/protocol/src/main/java/mc/protocol/world/World.java similarity index 100% rename from protocol-new/src/main/java/mc/protocol/world/World.java rename to protocol/src/main/java/mc/protocol/world/World.java diff --git a/protocol-new/src/test/java/mc/protocol/buffer/NetByteBufReadTest.java b/protocol/src/test/java/mc/protocol/buffer/NetByteBufReadTest.java similarity index 100% rename from protocol-new/src/test/java/mc/protocol/buffer/NetByteBufReadTest.java rename to protocol/src/test/java/mc/protocol/buffer/NetByteBufReadTest.java diff --git a/protocol-new/src/test/java/mc/protocol/buffer/NetByteBufWriteTest.java b/protocol/src/test/java/mc/protocol/buffer/NetByteBufWriteTest.java similarity index 100% rename from protocol-new/src/test/java/mc/protocol/buffer/NetByteBufWriteTest.java rename to protocol/src/test/java/mc/protocol/buffer/NetByteBufWriteTest.java diff --git a/protocol-new/src/test/java/mc/protocol/handler/codec/ProtocolSplitterTest.java b/protocol/src/test/java/mc/protocol/handler/codec/ProtocolSplitterTest.java similarity index 100% rename from protocol-new/src/test/java/mc/protocol/handler/codec/ProtocolSplitterTest.java rename to protocol/src/test/java/mc/protocol/handler/codec/ProtocolSplitterTest.java diff --git a/server-new/build.gradle b/server/build.gradle similarity index 95% rename from server-new/build.gradle rename to server/build.gradle index 80f4366..fbc4c22 100644 --- a/server-new/build.gradle +++ b/server/build.gradle @@ -24,7 +24,7 @@ application { dependencies { implementation project(':cli-parser') - implementation project(':protocol-new') + implementation project(':protocol') implementation libs.logger.logback implementation libs.hocon diff --git a/server-new/gradle.properties b/server/gradle.properties similarity index 100% rename from server-new/gradle.properties rename to server/gradle.properties diff --git a/server-new/src/main/java/mc/server/Main.java b/server/src/main/java/mc/server/Main.java similarity index 100% rename from server-new/src/main/java/mc/server/Main.java rename to server/src/main/java/mc/server/Main.java diff --git a/server-new/src/main/java/mc/server/NettyServer.java b/server/src/main/java/mc/server/NettyServer.java similarity index 100% rename from server-new/src/main/java/mc/server/NettyServer.java rename to server/src/main/java/mc/server/NettyServer.java diff --git a/server-new/src/main/java/mc/server/Player.java b/server/src/main/java/mc/server/Player.java similarity index 100% rename from server-new/src/main/java/mc/server/Player.java rename to server/src/main/java/mc/server/Player.java diff --git a/server-new/src/main/java/mc/server/PlayerManager.java b/server/src/main/java/mc/server/PlayerManager.java similarity index 100% rename from server-new/src/main/java/mc/server/PlayerManager.java rename to server/src/main/java/mc/server/PlayerManager.java diff --git a/server-new/src/main/java/mc/server/ServetAttributes.java b/server/src/main/java/mc/server/ServetAttributes.java similarity index 100% rename from server-new/src/main/java/mc/server/ServetAttributes.java rename to server/src/main/java/mc/server/ServetAttributes.java diff --git a/server-new/src/main/java/mc/server/di/ConfigComponent.java b/server/src/main/java/mc/server/di/ConfigComponent.java similarity index 100% rename from server-new/src/main/java/mc/server/di/ConfigComponent.java rename to server/src/main/java/mc/server/di/ConfigComponent.java diff --git a/server-new/src/main/java/mc/server/di/ConfigModule.java b/server/src/main/java/mc/server/di/ConfigModule.java similarity index 100% rename from server-new/src/main/java/mc/server/di/ConfigModule.java rename to server/src/main/java/mc/server/di/ConfigModule.java diff --git a/server-new/src/main/java/mc/server/di/PlayerManagerModule.java b/server/src/main/java/mc/server/di/PlayerManagerModule.java similarity index 100% rename from server-new/src/main/java/mc/server/di/PlayerManagerModule.java rename to server/src/main/java/mc/server/di/PlayerManagerModule.java diff --git a/server-new/src/main/java/mc/server/di/ProcessorModule.java b/server/src/main/java/mc/server/di/ProcessorModule.java similarity index 100% rename from server-new/src/main/java/mc/server/di/ProcessorModule.java rename to server/src/main/java/mc/server/di/ProcessorModule.java diff --git a/server-new/src/main/java/mc/server/di/ServerComponent.java b/server/src/main/java/mc/server/di/ServerComponent.java similarity index 100% rename from server-new/src/main/java/mc/server/di/ServerComponent.java rename to server/src/main/java/mc/server/di/ServerComponent.java diff --git a/server-new/src/main/java/mc/server/di/ServerModule.java b/server/src/main/java/mc/server/di/ServerModule.java similarity index 100% rename from server-new/src/main/java/mc/server/di/ServerModule.java rename to server/src/main/java/mc/server/di/ServerModule.java diff --git a/server-new/src/main/java/mc/server/di/WorldModule.java b/server/src/main/java/mc/server/di/WorldModule.java similarity index 100% rename from server-new/src/main/java/mc/server/di/WorldModule.java rename to server/src/main/java/mc/server/di/WorldModule.java diff --git a/server-new/src/main/java/mc/server/processor/PacketProcessor.java b/server/src/main/java/mc/server/processor/PacketProcessor.java similarity index 100% rename from server-new/src/main/java/mc/server/processor/PacketProcessor.java rename to server/src/main/java/mc/server/processor/PacketProcessor.java diff --git a/server-new/src/main/java/mc/server/processor/ProcessorHandshake.java b/server/src/main/java/mc/server/processor/ProcessorHandshake.java similarity index 100% rename from server-new/src/main/java/mc/server/processor/ProcessorHandshake.java rename to server/src/main/java/mc/server/processor/ProcessorHandshake.java diff --git a/server-new/src/main/java/mc/server/processor/ProcessorLogin.java b/server/src/main/java/mc/server/processor/ProcessorLogin.java similarity index 100% rename from server-new/src/main/java/mc/server/processor/ProcessorLogin.java rename to server/src/main/java/mc/server/processor/ProcessorLogin.java diff --git a/server-new/src/main/java/mc/server/processor/ProcessorPlay.java b/server/src/main/java/mc/server/processor/ProcessorPlay.java similarity index 100% rename from server-new/src/main/java/mc/server/processor/ProcessorPlay.java rename to server/src/main/java/mc/server/processor/ProcessorPlay.java diff --git a/server-new/src/main/java/mc/server/processor/ProcessorStatus.java b/server/src/main/java/mc/server/processor/ProcessorStatus.java similarity index 100% rename from server-new/src/main/java/mc/server/processor/ProcessorStatus.java rename to server/src/main/java/mc/server/processor/ProcessorStatus.java diff --git a/server-new/src/main/java/mc/server/util/LocationUtils.java b/server/src/main/java/mc/server/util/LocationUtils.java similarity index 100% rename from server-new/src/main/java/mc/server/util/LocationUtils.java rename to server/src/main/java/mc/server/util/LocationUtils.java diff --git a/server-new/src/main/java/mc/server/world/VoidChunk.java b/server/src/main/java/mc/server/world/VoidChunk.java similarity index 100% rename from server-new/src/main/java/mc/server/world/VoidChunk.java rename to server/src/main/java/mc/server/world/VoidChunk.java diff --git a/server-new/src/main/java/mc/server/world/VoidWorld.java b/server/src/main/java/mc/server/world/VoidWorld.java similarity index 100% rename from server-new/src/main/java/mc/server/world/VoidWorld.java rename to server/src/main/java/mc/server/world/VoidWorld.java diff --git a/server-new/src/main/resources/config-default.conf b/server/src/main/resources/config-default.conf similarity index 100% rename from server-new/src/main/resources/config-default.conf rename to server/src/main/resources/config-default.conf diff --git a/server-new/src/main/resources/logback-default.xml b/server/src/main/resources/logback-default.xml similarity index 100% rename from server-new/src/main/resources/logback-default.xml rename to server/src/main/resources/logback-default.xml diff --git a/server-new/src/test/java/mc/server/di/ConfigModuleTest.java b/server/src/test/java/mc/server/di/ConfigModuleTest.java similarity index 100% rename from server-new/src/test/java/mc/server/di/ConfigModuleTest.java rename to server/src/test/java/mc/server/di/ConfigModuleTest.java diff --git a/server-new/src/test/resources/config-1.conf b/server/src/test/resources/config-1.conf similarity index 100% rename from server-new/src/test/resources/config-1.conf rename to server/src/test/resources/config-1.conf diff --git a/server-new/src/test/resources/config-2.conf b/server/src/test/resources/config-2.conf similarity index 100% rename from server-new/src/test/resources/config-2.conf rename to server/src/test/resources/config-2.conf diff --git a/server-new/src/test/resources/config-3.conf b/server/src/test/resources/config-3.conf similarity index 100% rename from server-new/src/test/resources/config-3.conf rename to server/src/test/resources/config-3.conf diff --git a/server-new/src/test/resources/config-empty.conf b/server/src/test/resources/config-empty.conf similarity index 100% rename from server-new/src/test/resources/config-empty.conf rename to server/src/test/resources/config-empty.conf diff --git a/settings.gradle b/settings.gradle index d6b1f20..e9e2a61 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,8 +11,6 @@ rootProject.projectDir.toPath().resolve('gradle.properties').readLines().forEach rootProject.name = map.get('prj.name') include('utils') -include('protocol-new') -include('server-new') include('cli-parser') -//include('protocol') -//include('server') \ No newline at end of file +include('protocol') +include('server')