refactory

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;
 

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 {

src/main/java/mc/core/network/CSPacket.java

@@ -2,7 +2,9 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2018-04-08
  */
-package mc.core;
+package mc.core.network;
+
+import mc.core.network.NetStream;
 
 public interface CSPacket {
     default void readSelf(NetStream netStream) {

src/main/java/mc/core/network/NetChannel.java

@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2018-04-13
  */
-package mc.core;
+package mc.core.network;
 
 public interface NetChannel {
     void write(Object obj);

src/main/java/mc/core/network/NetStream.java

@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2018-03-28
  */
-package mc.core;
+package mc.core.network;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/mc/core/network/SCPacket.java

@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2018-04-08
  */
-package mc.core;
+package mc.core.network;
 
 public interface SCPacket {
     byte[] toByteArray();

src/main/java/mc/core/network/Server.java

@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2018-03-25
  */
-package mc.core;
+package mc.core.network;
 
 public interface Server {
     void start(String host, int port) throws StartServerException;

src/main/java/mc/core/network/StartServerException.java

@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2018-03-25
  */
-package mc.core;
+package mc.core.network;
 
 public class StartServerException extends Exception {
     public StartServerException(Throwable cause) {

src/main/java/mc/core/network/proto_125/ByteArrayOutputNetStream.java

@@ -2,10 +2,10 @@
  * DmitriyMX <dimon550@gmail.com>
  * 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;

src/main/java/mc/core/network/proto_125/netty/NettyServer.java

@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 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.network.Server;
-import mc.core.StartServerException;
+import mc.core.network.StartServerException;
 
 @Slf4j
 public class NettyServer implements Server {

src/main/java/mc/core/network/proto_125/netty/PacketDecoder.java

@@ -2,15 +2,15 @@
  * DmitriyMX <dimon550@gmail.com>
  * 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.network.CSPacket;
-import mc.core.NetStream;
+import mc.core.network.NetStream;
-import mc.core.netty.proto_125.wrappers.WrapperNetStream;
+import mc.core.network.proto_125.netty.wrappers.WrapperNetStream;
 
 import java.util.List;
 

src/main/java/mc/core/network/proto_125/netty/PacketEncoder.java

@@ -2,13 +2,13 @@
  * DmitriyMX <dimon550@gmail.com>
  * 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<SCPacket> {

src/main/java/mc/core/network/proto_125/netty/PacketHandler.java

@@ -2,19 +2,19 @@
  * DmitriyMX <dimon550@gmail.com>
  * 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.network.proto_125.packets.HandshakePacket;
-import mc.core.netty.proto_125.packets.KickPacket;
+import mc.core.network.proto_125.packets.KickPacket;
-import mc.core.netty.proto_125.packets.LoginPacket;
+import mc.core.network.proto_125.packets.LoginPacket;
-import mc.core.netty.proto_125.packets.PingPacket;
+import mc.core.network.proto_125.packets.PingPacket;
 
 import java.lang.reflect.Method;
 import java.util.Arrays;

src/main/java/mc/core/network/proto_125/netty/PacketManager.java

@@ -2,16 +2,16 @@
  * DmitriyMX <dimon550@gmail.com>
  * 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.network.CSPacket;
-import mc.core.SCPacket;
+import mc.core.network.SCPacket;
-import mc.core.netty.proto_125.packets.HandshakePacket;
+import mc.core.network.proto_125.packets.HandshakePacket;
-import mc.core.netty.proto_125.packets.KickPacket;
+import mc.core.network.proto_125.packets.KickPacket;
-import mc.core.netty.proto_125.packets.LoginPacket;
+import mc.core.network.proto_125.packets.LoginPacket;
-import mc.core.netty.proto_125.packets.PingPacket;
+import mc.core.network.proto_125.packets.PingPacket;
 
 public class PacketManager {
     private static final BiMap<Integer, Class<?>> packetMap = ImmutableBiMap.of(

src/main/java/mc/core/network/proto_125/netty/wrappers/WrapperNetChannel.java

@@ -2,11 +2,11 @@
  * DmitriyMX <dimon550@gmail.com>
  * 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 {

src/main/java/mc/core/network/proto_125/netty/wrappers/WrapperNetStream.java

@@ -2,12 +2,12 @@
  * DmitriyMX <dimon550@gmail.com>
  * 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;
 

src/main/java/mc/core/network/proto_125/packets/HandshakePacket.java

@@ -2,14 +2,14 @@
  * DmitriyMX <dimon550@gmail.com>
  * 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.network.CSPacket;
-import mc.core.NetStream;
+import mc.core.network.NetStream;
-import mc.core.SCPacket;
+import mc.core.network.SCPacket;
-import mc.core.netty.proto_125.ByteArrayOutputNetStream;
+import mc.core.network.proto_125.ByteArrayOutputNetStream;
 
 @Getter
 @ToString

src/main/java/mc/core/network/proto_125/packets/KickPacket.java

@@ -2,11 +2,11 @@
  * DmitriyMX <dimon550@gmail.com>
  * 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.network.SCPacket;
-import mc.core.netty.proto_125.ByteArrayOutputNetStream;
+import mc.core.network.proto_125.ByteArrayOutputNetStream;
 
 public class KickPacket implements SCPacket {
     @Setter

src/main/java/mc/core/network/proto_125/packets/LoginPacket.java

@@ -2,15 +2,15 @@
  * DmitriyMX <dimon550@gmail.com>
  * 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.network.CSPacket;
-import mc.core.NetStream;
+import mc.core.network.NetStream;
-import mc.core.SCPacket;
+import mc.core.network.SCPacket;
-import mc.core.netty.proto_125.ByteArrayOutputNetStream;
+import mc.core.network.proto_125.ByteArrayOutputNetStream;
 
 @ToString
 public class LoginPacket implements CSPacket, SCPacket {

src/main/java/mc/core/network/proto_125/packets/PingPacket.java

@@ -2,9 +2,9 @@
  * DmitriyMX <dimon550@gmail.com>
  * 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 {
 }

src/main/resources/spring.xml

@@ -10,5 +10,5 @@
         <property name="port" value="25565"/>
     </bean>
 
-    <bean id="server" class="mc.core.netty.proto_125.NettyServer"/>
+    <bean id="server" class="mc.core.network.proto_125.netty.NettyServer"/>
 </beans>