Minecraft/mc-server
Archived
0
Fork 0
Code Releases Activity

refactoring: ProtocolEncoder

Browse Source
This commit is contained in:
DmitriyMX
2021-05-10 03:21:12 +03:00
parent f9a71250b1
commit 38918f5eaf
3 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
protocol-new/src/main/java/mc/protocol/NettyAttributes.java Normal file
View File

@@ -0,0 +1,10 @@
package mc.protocol;
import io.netty.util.AttributeKey;
import lombok.experimental.UtilityClass;
@UtilityClass
public class NettyAttributes {
public static final AttributeKey<State> STATE = AttributeKey.newInstance("STATE");
}

8
protocol/src/main/java/mc/protocol/io/codec/ProtocolEncoder.java → protocol-new/src/main/java/mc/protocol/codec/ProtocolEncoder.java
View File

@@ -1,11 +1,11 @@
package mc.protocol.io.codec; package mc.protocol.codec;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled; import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToByteEncoder; import io.netty.handler.codec.MessageToByteEncoder;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import mc.protocol.NetworkAttributes; import mc.protocol.NettyAttributes;
import mc.protocol.State; import mc.protocol.State;
import mc.protocol.io.NetByteBuf; import mc.protocol.io.NetByteBuf;
import mc.protocol.packets.ServerSidePacket; import mc.protocol.packets.ServerSidePacket;
@@ -15,14 +15,16 @@ public class ProtocolEncoder extends MessageToByteEncoder<ServerSidePacket> {
@Override @Override
protected void encode(ChannelHandlerContext ctx, ServerSidePacket packet, ByteBuf out) { protected void encode(ChannelHandlerContext ctx, ServerSidePacket packet, ByteBuf out) {
State state = ctx.channel().attr(NetworkAttributes.STATE).get(); State state = ctx.channel().attr(NettyAttributes.STATE).get();
Integer packetId = state.getServerSidePacketId(packet.getClass()); Integer packetId = state.getServerSidePacketId(packet.getClass());
if (packetId == null) { if (packetId == null) {
log.error("Unknown send packet: State {} ; Class {}", state, packet.getClass()); log.error("Unknown send packet: State {} ; Class {}", state, packet.getClass());
return; return;
} }
if (log.isDebugEnabled()) {
log.debug("OUT: {}:{}", state, packet); log.debug("OUT: {}:{}", state, packet);
}
NetByteBuf buffer = new NetByteBuf(Unpooled.buffer()); NetByteBuf buffer = new NetByteBuf(Unpooled.buffer());
buffer.writeVarInt(packetId); buffer.writeVarInt(packetId);

18
protocol/src/main/java/mc/protocol/NetworkAttributes.java
View File

@@ -1,18 +0,0 @@
package mc.protocol;
import io.netty.util.AttributeKey;
import lombok.experimental.UtilityClass;
import java.util.Map;
@UtilityClass
public class NetworkAttributes {
public static final AttributeKey<State> STATE = AttributeKey.newInstance("STATE");
/**
* @deprecated костыль
*/
@Deprecated
public static final AttributeKey<Map<String, Object>> CUSTOM_PROPERTIES = AttributeKey.newInstance("CUSTOM_PROPERTIES");
}