diff --git a/src/main/java/mc/core/Main.java b/src/main/java/mc/core/Main.java index 440cf83..d5a749b 100644 --- a/src/main/java/mc/core/Main.java +++ b/src/main/java/mc/core/Main.java @@ -5,6 +5,8 @@ package mc.core; import lombok.extern.slf4j.Slf4j; +import mc.core.network.Server; +import mc.core.network.StartServerException; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/src/main/java/mc/core/Player.java b/src/main/java/mc/core/Player.java index 58b2847..33ab283 100644 --- a/src/main/java/mc/core/Player.java +++ b/src/main/java/mc/core/Player.java @@ -4,6 +4,8 @@ */ package mc.core; +import mc.core.network.NetChannel; + import java.net.InetAddress; public interface Player { diff --git a/src/main/java/mc/core/CSPacket.java b/src/main/java/mc/core/network/CSPacket.java similarity index 70% rename from src/main/java/mc/core/CSPacket.java rename to src/main/java/mc/core/network/CSPacket.java index 319ba81..ef9d3e2 100644 --- a/src/main/java/mc/core/CSPacket.java +++ b/src/main/java/mc/core/network/CSPacket.java @@ -2,7 +2,9 @@ * DmitriyMX * 2018-04-08 */ -package mc.core; +package mc.core.network; + +import mc.core.network.NetStream; public interface CSPacket { default void readSelf(NetStream netStream) { diff --git a/src/main/java/mc/core/NetChannel.java b/src/main/java/mc/core/network/NetChannel.java similarity index 87% rename from src/main/java/mc/core/NetChannel.java rename to src/main/java/mc/core/network/NetChannel.java index c82e93c..a88f29a 100644 --- a/src/main/java/mc/core/NetChannel.java +++ b/src/main/java/mc/core/network/NetChannel.java @@ -2,7 +2,7 @@ * DmitriyMX * 2018-04-13 */ -package mc.core; +package mc.core.network; public interface NetChannel { void write(Object obj); diff --git a/src/main/java/mc/core/NetStream.java b/src/main/java/mc/core/network/NetStream.java similarity index 98% rename from src/main/java/mc/core/NetStream.java rename to src/main/java/mc/core/network/NetStream.java index 4f819ec..7fb84bb 100644 --- a/src/main/java/mc/core/NetStream.java +++ b/src/main/java/mc/core/network/NetStream.java @@ -2,7 +2,7 @@ * DmitriyMX * 2018-03-28 */ -package mc.core; +package mc.core.network; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/mc/core/SCPacket.java b/src/main/java/mc/core/network/SCPacket.java similarity index 81% rename from src/main/java/mc/core/SCPacket.java rename to src/main/java/mc/core/network/SCPacket.java index 161b47e..27d501e 100644 --- a/src/main/java/mc/core/SCPacket.java +++ b/src/main/java/mc/core/network/SCPacket.java @@ -2,7 +2,7 @@ * DmitriyMX * 2018-04-08 */ -package mc.core; +package mc.core.network; public interface SCPacket { byte[] toByteArray(); diff --git a/src/main/java/mc/core/Server.java b/src/main/java/mc/core/network/Server.java similarity index 85% rename from src/main/java/mc/core/Server.java rename to src/main/java/mc/core/network/Server.java index 19ee13b..c02aae9 100644 --- a/src/main/java/mc/core/Server.java +++ b/src/main/java/mc/core/network/Server.java @@ -2,7 +2,7 @@ * DmitriyMX * 2018-03-25 */ -package mc.core; +package mc.core.network; public interface Server { void start(String host, int port) throws StartServerException; diff --git a/src/main/java/mc/core/StartServerException.java b/src/main/java/mc/core/network/StartServerException.java similarity index 88% rename from src/main/java/mc/core/StartServerException.java rename to src/main/java/mc/core/network/StartServerException.java index 9005c3e..5657ee6 100644 --- a/src/main/java/mc/core/StartServerException.java +++ b/src/main/java/mc/core/network/StartServerException.java @@ -2,7 +2,7 @@ * DmitriyMX * 2018-03-25 */ -package mc.core; +package mc.core.network; public class StartServerException extends Exception { public StartServerException(Throwable cause) { diff --git a/src/main/java/mc/core/netty/proto_125/ByteArrayOutputNetStream.java b/src/main/java/mc/core/network/proto_125/ByteArrayOutputNetStream.java similarity index 96% rename from src/main/java/mc/core/netty/proto_125/ByteArrayOutputNetStream.java rename to src/main/java/mc/core/network/proto_125/ByteArrayOutputNetStream.java index 8a19e5b..d2d130e 100644 --- a/src/main/java/mc/core/netty/proto_125/ByteArrayOutputNetStream.java +++ b/src/main/java/mc/core/network/proto_125/ByteArrayOutputNetStream.java @@ -2,10 +2,10 @@ * DmitriyMX * 2018-04-08 */ -package mc.core.netty.proto_125; +package mc.core.network.proto_125; import lombok.extern.slf4j.Slf4j; -import mc.core.NetStream; +import mc.core.network.NetStream; import java.io.ByteArrayOutputStream; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/mc/core/netty/proto_125/NettyServer.java b/src/main/java/mc/core/network/proto_125/netty/NettyServer.java similarity index 93% rename from src/main/java/mc/core/netty/proto_125/NettyServer.java rename to src/main/java/mc/core/network/proto_125/netty/NettyServer.java index 3fc7c1e..5297b9d 100644 --- a/src/main/java/mc/core/netty/proto_125/NettyServer.java +++ b/src/main/java/mc/core/network/proto_125/netty/NettyServer.java @@ -2,7 +2,7 @@ * DmitriyMX * 2018-04-10 */ -package mc.core.netty.proto_125; +package mc.core.network.proto_125.netty; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.ChannelInitializer; @@ -12,8 +12,8 @@ import io.netty.channel.socket.SocketChannel; import io.netty.channel.socket.nio.NioServerSocketChannel; import io.netty.handler.logging.LoggingHandler; import lombok.extern.slf4j.Slf4j; -import mc.core.Server; -import mc.core.StartServerException; +import mc.core.network.Server; +import mc.core.network.StartServerException; @Slf4j public class NettyServer implements Server { diff --git a/src/main/java/mc/core/netty/proto_125/PacketDecoder.java b/src/main/java/mc/core/network/proto_125/netty/PacketDecoder.java similarity index 85% rename from src/main/java/mc/core/netty/proto_125/PacketDecoder.java rename to src/main/java/mc/core/network/proto_125/netty/PacketDecoder.java index 590d490..913be85 100644 --- a/src/main/java/mc/core/netty/proto_125/PacketDecoder.java +++ b/src/main/java/mc/core/network/proto_125/netty/PacketDecoder.java @@ -2,15 +2,15 @@ * DmitriyMX * 2018-03-25 */ -package mc.core.netty.proto_125; +package mc.core.network.proto_125.netty; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.ByteToMessageDecoder; import lombok.extern.slf4j.Slf4j; -import mc.core.CSPacket; -import mc.core.NetStream; -import mc.core.netty.proto_125.wrappers.WrapperNetStream; +import mc.core.network.CSPacket; +import mc.core.network.NetStream; +import mc.core.network.proto_125.netty.wrappers.WrapperNetStream; import java.util.List; diff --git a/src/main/java/mc/core/netty/proto_125/PacketEncoder.java b/src/main/java/mc/core/network/proto_125/netty/PacketEncoder.java similarity index 90% rename from src/main/java/mc/core/netty/proto_125/PacketEncoder.java rename to src/main/java/mc/core/network/proto_125/netty/PacketEncoder.java index 6217d25..753f1e8 100644 --- a/src/main/java/mc/core/netty/proto_125/PacketEncoder.java +++ b/src/main/java/mc/core/network/proto_125/netty/PacketEncoder.java @@ -2,13 +2,13 @@ * DmitriyMX * 2018-04-10 */ -package mc.core.netty.proto_125; +package mc.core.network.proto_125.netty; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToByteEncoder; import lombok.extern.slf4j.Slf4j; -import mc.core.SCPacket; +import mc.core.network.SCPacket; @Slf4j public class PacketEncoder extends MessageToByteEncoder { diff --git a/src/main/java/mc/core/netty/proto_125/PacketHandler.java b/src/main/java/mc/core/network/proto_125/netty/PacketHandler.java similarity index 87% rename from src/main/java/mc/core/netty/proto_125/PacketHandler.java rename to src/main/java/mc/core/network/proto_125/netty/PacketHandler.java index 67d247a..3aa5fa9 100644 --- a/src/main/java/mc/core/netty/proto_125/PacketHandler.java +++ b/src/main/java/mc/core/network/proto_125/netty/PacketHandler.java @@ -2,19 +2,19 @@ * DmitriyMX * 2018-04-10 */ -package mc.core.netty.proto_125; +package mc.core.network.proto_125.netty; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; import lombok.extern.slf4j.Slf4j; -import mc.core.CSPacket; +import mc.core.network.CSPacket; import mc.core.Config; import mc.core.Main; -import mc.core.netty.proto_125.packets.HandshakePacket; -import mc.core.netty.proto_125.packets.KickPacket; -import mc.core.netty.proto_125.packets.LoginPacket; -import mc.core.netty.proto_125.packets.PingPacket; +import mc.core.network.proto_125.packets.HandshakePacket; +import mc.core.network.proto_125.packets.KickPacket; +import mc.core.network.proto_125.packets.LoginPacket; +import mc.core.network.proto_125.packets.PingPacket; import java.lang.reflect.Method; import java.util.Arrays; diff --git a/src/main/java/mc/core/netty/proto_125/PacketManager.java b/src/main/java/mc/core/network/proto_125/netty/PacketManager.java similarity index 69% rename from src/main/java/mc/core/netty/proto_125/PacketManager.java rename to src/main/java/mc/core/network/proto_125/netty/PacketManager.java index 2f4d18a..e2b5f70 100644 --- a/src/main/java/mc/core/netty/proto_125/PacketManager.java +++ b/src/main/java/mc/core/network/proto_125/netty/PacketManager.java @@ -2,16 +2,16 @@ * DmitriyMX * 2018-04-10 */ -package mc.core.netty.proto_125; +package mc.core.network.proto_125.netty; import com.google.common.collect.BiMap; import com.google.common.collect.ImmutableBiMap; -import mc.core.CSPacket; -import mc.core.SCPacket; -import mc.core.netty.proto_125.packets.HandshakePacket; -import mc.core.netty.proto_125.packets.KickPacket; -import mc.core.netty.proto_125.packets.LoginPacket; -import mc.core.netty.proto_125.packets.PingPacket; +import mc.core.network.CSPacket; +import mc.core.network.SCPacket; +import mc.core.network.proto_125.packets.HandshakePacket; +import mc.core.network.proto_125.packets.KickPacket; +import mc.core.network.proto_125.packets.LoginPacket; +import mc.core.network.proto_125.packets.PingPacket; public class PacketManager { private static final BiMap> packetMap = ImmutableBiMap.of( diff --git a/src/main/java/mc/core/netty/proto_125/wrappers/WrapperNetChannel.java b/src/main/java/mc/core/network/proto_125/netty/wrappers/WrapperNetChannel.java similarity index 85% rename from src/main/java/mc/core/netty/proto_125/wrappers/WrapperNetChannel.java rename to src/main/java/mc/core/network/proto_125/netty/wrappers/WrapperNetChannel.java index 41dd042..68adccc 100644 --- a/src/main/java/mc/core/netty/proto_125/wrappers/WrapperNetChannel.java +++ b/src/main/java/mc/core/network/proto_125/netty/wrappers/WrapperNetChannel.java @@ -2,11 +2,11 @@ * DmitriyMX * 2018-04-13 */ -package mc.core.netty.proto_125.wrappers; +package mc.core.network.proto_125.netty.wrappers; import io.netty.channel.Channel; import lombok.RequiredArgsConstructor; -import mc.core.NetChannel; +import mc.core.network.NetChannel; @RequiredArgsConstructor public class WrapperNetChannel implements NetChannel { diff --git a/src/main/java/mc/core/netty/proto_125/wrappers/WrapperNetStream.java b/src/main/java/mc/core/network/proto_125/netty/wrappers/WrapperNetStream.java similarity index 93% rename from src/main/java/mc/core/netty/proto_125/wrappers/WrapperNetStream.java rename to src/main/java/mc/core/network/proto_125/netty/wrappers/WrapperNetStream.java index 2801962..56e8b6a 100644 --- a/src/main/java/mc/core/netty/proto_125/wrappers/WrapperNetStream.java +++ b/src/main/java/mc/core/network/proto_125/netty/wrappers/WrapperNetStream.java @@ -2,12 +2,12 @@ * DmitriyMX * 2018-04-08 */ -package mc.core.netty.proto_125.wrappers; +package mc.core.network.proto_125.netty.wrappers; import io.netty.buffer.ByteBuf; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import mc.core.NetStream; +import mc.core.network.NetStream; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/mc/core/netty/proto_125/packets/HandshakePacket.java b/src/main/java/mc/core/network/proto_125/packets/HandshakePacket.java similarity index 81% rename from src/main/java/mc/core/netty/proto_125/packets/HandshakePacket.java rename to src/main/java/mc/core/network/proto_125/packets/HandshakePacket.java index b89f72a..6292317 100644 --- a/src/main/java/mc/core/netty/proto_125/packets/HandshakePacket.java +++ b/src/main/java/mc/core/network/proto_125/packets/HandshakePacket.java @@ -2,14 +2,14 @@ * DmitriyMX * 2018-04-10 */ -package mc.core.netty.proto_125.packets; +package mc.core.network.proto_125.packets; import lombok.Getter; import lombok.ToString; -import mc.core.CSPacket; -import mc.core.NetStream; -import mc.core.SCPacket; -import mc.core.netty.proto_125.ByteArrayOutputNetStream; +import mc.core.network.CSPacket; +import mc.core.network.NetStream; +import mc.core.network.SCPacket; +import mc.core.network.proto_125.ByteArrayOutputNetStream; @Getter @ToString diff --git a/src/main/java/mc/core/netty/proto_125/packets/KickPacket.java b/src/main/java/mc/core/network/proto_125/packets/KickPacket.java similarity index 80% rename from src/main/java/mc/core/netty/proto_125/packets/KickPacket.java rename to src/main/java/mc/core/network/proto_125/packets/KickPacket.java index 09379da..1080f74 100644 --- a/src/main/java/mc/core/netty/proto_125/packets/KickPacket.java +++ b/src/main/java/mc/core/network/proto_125/packets/KickPacket.java @@ -2,11 +2,11 @@ * DmitriyMX * 2018-04-10 */ -package mc.core.netty.proto_125.packets; +package mc.core.network.proto_125.packets; import lombok.Setter; -import mc.core.SCPacket; -import mc.core.netty.proto_125.ByteArrayOutputNetStream; +import mc.core.network.SCPacket; +import mc.core.network.proto_125.ByteArrayOutputNetStream; public class KickPacket implements SCPacket { @Setter diff --git a/src/main/java/mc/core/netty/proto_125/packets/LoginPacket.java b/src/main/java/mc/core/network/proto_125/packets/LoginPacket.java similarity index 85% rename from src/main/java/mc/core/netty/proto_125/packets/LoginPacket.java rename to src/main/java/mc/core/network/proto_125/packets/LoginPacket.java index 9421d36..b7b0328 100644 --- a/src/main/java/mc/core/netty/proto_125/packets/LoginPacket.java +++ b/src/main/java/mc/core/network/proto_125/packets/LoginPacket.java @@ -2,15 +2,15 @@ * DmitriyMX * 2018-04-10 */ -package mc.core.netty.proto_125.packets; +package mc.core.network.proto_125.packets; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import mc.core.CSPacket; -import mc.core.NetStream; -import mc.core.SCPacket; -import mc.core.netty.proto_125.ByteArrayOutputNetStream; +import mc.core.network.CSPacket; +import mc.core.network.NetStream; +import mc.core.network.SCPacket; +import mc.core.network.proto_125.ByteArrayOutputNetStream; @ToString public class LoginPacket implements CSPacket, SCPacket { diff --git a/src/main/java/mc/core/netty/proto_125/packets/PingPacket.java b/src/main/java/mc/core/network/proto_125/packets/PingPacket.java similarity index 58% rename from src/main/java/mc/core/netty/proto_125/packets/PingPacket.java rename to src/main/java/mc/core/network/proto_125/packets/PingPacket.java index 08f8fb8..953353b 100644 --- a/src/main/java/mc/core/netty/proto_125/packets/PingPacket.java +++ b/src/main/java/mc/core/network/proto_125/packets/PingPacket.java @@ -2,9 +2,9 @@ * DmitriyMX * 2018-04-10 */ -package mc.core.netty.proto_125.packets; +package mc.core.network.proto_125.packets; -import mc.core.CSPacket; +import mc.core.network.CSPacket; public class PingPacket implements CSPacket { } diff --git a/src/main/resources/spring.xml b/src/main/resources/spring.xml index 38241de..7d09237 100644 --- a/src/main/resources/spring.xml +++ b/src/main/resources/spring.xml @@ -10,5 +10,5 @@ - + \ No newline at end of file