diff --git a/src/main/java/ru/nanit/limbo/connection/ClientChannelInitializer.java b/src/main/java/ru/nanit/limbo/connection/ClientChannelInitializer.java index 34c7712..5b3cd7a 100644 --- a/src/main/java/ru/nanit/limbo/connection/ClientChannelInitializer.java +++ b/src/main/java/ru/nanit/limbo/connection/ClientChannelInitializer.java @@ -4,11 +4,10 @@ import io.netty.channel.Channel; import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelPipeline; import io.netty.handler.timeout.ReadTimeoutHandler; -import ru.nanit.limbo.configuration.LimboConfig; -import ru.nanit.limbo.protocol.pipeline.VarIntFrameDecoder; -import ru.nanit.limbo.protocol.pipeline.PacketDecoder; -import ru.nanit.limbo.protocol.pipeline.PacketEncoder; -import ru.nanit.limbo.protocol.pipeline.VarIntLengthEncoder; +import ru.nanit.limbo.connection.pipeline.VarIntFrameDecoder; +import ru.nanit.limbo.connection.pipeline.PacketDecoder; +import ru.nanit.limbo.connection.pipeline.PacketEncoder; +import ru.nanit.limbo.connection.pipeline.VarIntLengthEncoder; import ru.nanit.limbo.server.LimboServer; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/ru/nanit/limbo/connection/ClientConnection.java b/src/main/java/ru/nanit/limbo/connection/ClientConnection.java index 718b06e..ed50803 100644 --- a/src/main/java/ru/nanit/limbo/connection/ClientConnection.java +++ b/src/main/java/ru/nanit/limbo/connection/ClientConnection.java @@ -10,8 +10,8 @@ import ru.nanit.limbo.protocol.ByteMessage; import ru.nanit.limbo.protocol.PreRenderedPacket; import ru.nanit.limbo.protocol.packets.login.*; import ru.nanit.limbo.protocol.packets.play.*; -import ru.nanit.limbo.protocol.pipeline.PacketDecoder; -import ru.nanit.limbo.protocol.pipeline.PacketEncoder; +import ru.nanit.limbo.connection.pipeline.PacketDecoder; +import ru.nanit.limbo.connection.pipeline.PacketEncoder; import ru.nanit.limbo.protocol.packets.PacketHandshake; import ru.nanit.limbo.protocol.packets.status.PacketStatusPing; import ru.nanit.limbo.protocol.packets.status.PacketStatusRequest; @@ -81,7 +81,7 @@ public class ClientConnection extends ChannelInboundHandlerAdapter { @Override public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { if (channel.isActive()){ - Logger.error("Unhandled exception: %s", cause.getMessage()); + Logger.error("Unhandled exception: ", cause); } } diff --git a/src/main/java/ru/nanit/limbo/protocol/pipeline/PacketDecoder.java b/src/main/java/ru/nanit/limbo/connection/pipeline/PacketDecoder.java similarity index 96% rename from src/main/java/ru/nanit/limbo/protocol/pipeline/PacketDecoder.java rename to src/main/java/ru/nanit/limbo/connection/pipeline/PacketDecoder.java index 191942c..5202447 100644 --- a/src/main/java/ru/nanit/limbo/protocol/pipeline/PacketDecoder.java +++ b/src/main/java/ru/nanit/limbo/connection/pipeline/PacketDecoder.java @@ -1,4 +1,4 @@ -package ru.nanit.limbo.protocol.pipeline; +package ru.nanit.limbo.connection.pipeline; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/src/main/java/ru/nanit/limbo/protocol/pipeline/PacketEncoder.java b/src/main/java/ru/nanit/limbo/connection/pipeline/PacketEncoder.java similarity index 97% rename from src/main/java/ru/nanit/limbo/protocol/pipeline/PacketEncoder.java rename to src/main/java/ru/nanit/limbo/connection/pipeline/PacketEncoder.java index 3680ce0..fe958ff 100644 --- a/src/main/java/ru/nanit/limbo/protocol/pipeline/PacketEncoder.java +++ b/src/main/java/ru/nanit/limbo/connection/pipeline/PacketEncoder.java @@ -1,4 +1,4 @@ -package ru.nanit.limbo.protocol.pipeline; +package ru.nanit.limbo.connection.pipeline; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/src/main/java/ru/nanit/limbo/protocol/pipeline/VarIntByteDecoder.java b/src/main/java/ru/nanit/limbo/connection/pipeline/VarIntByteDecoder.java similarity index 95% rename from src/main/java/ru/nanit/limbo/protocol/pipeline/VarIntByteDecoder.java rename to src/main/java/ru/nanit/limbo/connection/pipeline/VarIntByteDecoder.java index eabc956..624c8f6 100644 --- a/src/main/java/ru/nanit/limbo/protocol/pipeline/VarIntByteDecoder.java +++ b/src/main/java/ru/nanit/limbo/connection/pipeline/VarIntByteDecoder.java @@ -1,4 +1,4 @@ -package ru.nanit.limbo.protocol.pipeline; +package ru.nanit.limbo.connection.pipeline; import io.netty.util.ByteProcessor; diff --git a/src/main/java/ru/nanit/limbo/protocol/pipeline/VarIntFrameDecoder.java b/src/main/java/ru/nanit/limbo/connection/pipeline/VarIntFrameDecoder.java similarity index 96% rename from src/main/java/ru/nanit/limbo/protocol/pipeline/VarIntFrameDecoder.java rename to src/main/java/ru/nanit/limbo/connection/pipeline/VarIntFrameDecoder.java index 6839a35..4ea28c7 100644 --- a/src/main/java/ru/nanit/limbo/protocol/pipeline/VarIntFrameDecoder.java +++ b/src/main/java/ru/nanit/limbo/connection/pipeline/VarIntFrameDecoder.java @@ -1,4 +1,4 @@ -package ru.nanit.limbo.protocol.pipeline; +package ru.nanit.limbo.connection.pipeline; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/src/main/java/ru/nanit/limbo/protocol/pipeline/VarIntLengthEncoder.java b/src/main/java/ru/nanit/limbo/connection/pipeline/VarIntLengthEncoder.java similarity index 94% rename from src/main/java/ru/nanit/limbo/protocol/pipeline/VarIntLengthEncoder.java rename to src/main/java/ru/nanit/limbo/connection/pipeline/VarIntLengthEncoder.java index 18836fb..0a07fd3 100644 --- a/src/main/java/ru/nanit/limbo/protocol/pipeline/VarIntLengthEncoder.java +++ b/src/main/java/ru/nanit/limbo/connection/pipeline/VarIntLengthEncoder.java @@ -1,4 +1,4 @@ -package ru.nanit.limbo.protocol.pipeline; +package ru.nanit.limbo.connection.pipeline; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandler;