| author | b0in
<b0in@proton.me> 2023-11-30 05:38:12 UTC |
| committer | b0in
<b0in@proton.me> 2023-11-30 05:38:12 UTC |
| parent | b2d7d7f51a5fa972b953de818bbe58aa210bcf8a |
| crow.game.codec.api/src/main/java/crow/game/codec/PacketHandler.java | +4 | -4 |
| crow.game.codec.api/src/main/java/crow/game/codec/PacketRule.java | +1 | -1 |
| crow.game.codec.netty/src/main/java/crow/game/codec/netty/FrameCodec.java | +1 | -1 |
| crow.game.examples.pingpong/src/main/java/crow/game/examples/pingpong/proto/RootContext.java | +6 | -6 |
diff --git a/crow.game.codec.api/src/main/java/crow/game/codec/PacketHandler.java b/crow.game.codec.api/src/main/java/crow/game/codec/PacketHandler.java index ff8c554..b3715ba 100644 --- a/crow.game.codec.api/src/main/java/crow/game/codec/PacketHandler.java +++ b/crow.game.codec.api/src/main/java/crow/game/codec/PacketHandler.java @@ -22,7 +22,7 @@ public interface PacketHandler<T> { * * @throws Exception */ - public T fromPacket(Context ctx, ByteBuf buffer) throws Exception; + T fromPacket(Context ctx, ByteBuf buffer) throws Exception; /** * Writes the object of type T to the byte buffer. @@ -33,7 +33,7 @@ public interface PacketHandler<T> { * * @throws Exception */ - public void toPacket(Context ctx, ByteBuf buffer, T src) throws Exception; + void toPacket(Context ctx, ByteBuf buffer, T src) throws Exception; /** * @see PacketRule @@ -42,7 +42,7 @@ public interface PacketHandler<T> { * @return The packet rule object which specifies when this packet handler * should be called. */ - public PacketRule rule(Context ctx); + PacketRule rule(Context ctx); /** * Parses the address and port pair from the kro server byte stream. @@ -54,7 +54,7 @@ public interface PacketHandler<T> { */ static InetAddressAndPort readInetAddressAndPort(ByteBuf buf) throws UnknownHostException { - byte addrBuf[] = new byte[4]; + byte[] addrBuf = new byte[4]; buf.readBytes(addrBuf); InetAddress address = InetAddress.getByAddress(addrBuf); diff --git a/crow.game.codec.api/src/main/java/crow/game/codec/PacketRule.java b/crow.game.codec.api/src/main/java/crow/game/codec/PacketRule.java index 1273cdd..6c0136d 100644 --- a/crow.game.codec.api/src/main/java/crow/game/codec/PacketRule.java +++ b/crow.game.codec.api/src/main/java/crow/game/codec/PacketRule.java @@ -12,7 +12,7 @@ public record PacketRule( /** * The type of packet, currently only 2. see classdoc. */ - public static enum Type { + public enum Type { STATIC, DYNAMIC, } diff --git a/crow.game.codec.netty/src/main/java/crow/game/codec/netty/FrameCodec.java b/crow.game.codec.netty/src/main/java/crow/game/codec/netty/FrameCodec.java index 55befc9..6af1a9d 100644 --- a/crow.game.codec.netty/src/main/java/crow/game/codec/netty/FrameCodec.java +++ b/crow.game.codec.netty/src/main/java/crow/game/codec/netty/FrameCodec.java @@ -59,7 +59,7 @@ public class FrameCodec extends ByteToMessageCodec<Packet> { protected void encode(ChannelHandlerContext ctx, Packet msg, ByteBuf out) { PacketRule pr = msg.rule(); - short prefix = (short) pr.prefix(); + short prefix = pr.prefix(); out.writeShortLE(prefix); if (pr.type() == PacketRule.Type.DYNAMIC) { if (pr.data() == 2) { diff --git a/crow.game.examples.pingpong/src/main/java/crow/game/examples/pingpong/proto/RootContext.java b/crow.game.examples.pingpong/src/main/java/crow/game/examples/pingpong/proto/RootContext.java index 0de4000..5f8f4bb 100644 --- a/crow.game.examples.pingpong/src/main/java/crow/game/examples/pingpong/proto/RootContext.java +++ b/crow.game.examples.pingpong/src/main/java/crow/game/examples/pingpong/proto/RootContext.java @@ -39,22 +39,22 @@ public class RootContext implements Context { @Override public List<PacketHandler<?>> lookupPacketHandler(int prefix) { if (prefix == Constants.PING_PREFIX) { - return Arrays.asList(pingPacketHandler); + return List.of(pingPacketHandler); } else if (prefix == Constants.PONG_PREFIX) { - return Arrays.asList(pongPacketHandler); + return List.of(pongPacketHandler); } else { - return Arrays.asList(); + return List.of(); } } @Override public List<PacketHandler<?>> lookupPacketHandler(Class<?> clz) { if (clz.isAssignableFrom(Ping.class)) { - return Arrays.asList(pingPacketHandler); + return List.of(pingPacketHandler); } else if (clz.isAssignableFrom(Pong.class)) { - return Arrays.asList(pongPacketHandler); + return List.of(pongPacketHandler); } else { - return Arrays.asList(); + return List.of(); } }