From 4ebc70ced44097e921ce6594ce55000e1cac311b Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Fri, 13 Apr 2018 08:24:13 +0300 Subject: [PATCH] add Player interface --- src/main/java/mc/core/NetChannel.java | 12 ++++++++ src/main/java/mc/core/Player.java | 14 +++++++++ .../core/netty/proto_125/PacketDecoder.java | 1 + .../proto_125/wrappers/WrapperNetChannel.java | 29 +++++++++++++++++++ .../{ => wrappers}/WrapperNetStream.java | 2 +- 5 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 src/main/java/mc/core/NetChannel.java create mode 100644 src/main/java/mc/core/Player.java create mode 100644 src/main/java/mc/core/netty/proto_125/wrappers/WrapperNetChannel.java rename src/main/java/mc/core/netty/proto_125/{ => wrappers}/WrapperNetStream.java (96%) diff --git a/src/main/java/mc/core/NetChannel.java b/src/main/java/mc/core/NetChannel.java new file mode 100644 index 0000000..c82e93c --- /dev/null +++ b/src/main/java/mc/core/NetChannel.java @@ -0,0 +1,12 @@ +/* + * DmitriyMX + * 2018-04-13 + */ +package mc.core; + +public interface NetChannel { + void write(Object obj); + void flush(); + void writeAndFlush(Object obj); + +} diff --git a/src/main/java/mc/core/Player.java b/src/main/java/mc/core/Player.java new file mode 100644 index 0000000..58b2847 --- /dev/null +++ b/src/main/java/mc/core/Player.java @@ -0,0 +1,14 @@ +/* + * DmitriyMX + * 2018-04-13 + */ +package mc.core; + +import java.net.InetAddress; + +public interface Player { + int getId(); + String getName(); + InetAddress getAddress(); + NetChannel getChannel(); +} diff --git a/src/main/java/mc/core/netty/proto_125/PacketDecoder.java b/src/main/java/mc/core/netty/proto_125/PacketDecoder.java index 70fe06f..590d490 100644 --- a/src/main/java/mc/core/netty/proto_125/PacketDecoder.java +++ b/src/main/java/mc/core/netty/proto_125/PacketDecoder.java @@ -10,6 +10,7 @@ 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 java.util.List; diff --git a/src/main/java/mc/core/netty/proto_125/wrappers/WrapperNetChannel.java b/src/main/java/mc/core/netty/proto_125/wrappers/WrapperNetChannel.java new file mode 100644 index 0000000..41dd042 --- /dev/null +++ b/src/main/java/mc/core/netty/proto_125/wrappers/WrapperNetChannel.java @@ -0,0 +1,29 @@ +/* + * DmitriyMX + * 2018-04-13 + */ +package mc.core.netty.proto_125.wrappers; + +import io.netty.channel.Channel; +import lombok.RequiredArgsConstructor; +import mc.core.NetChannel; + +@RequiredArgsConstructor +public class WrapperNetChannel implements NetChannel { + private final Channel channel; + + @Override + public void write(Object obj) { + channel.write(obj); + } + + @Override + public void flush() { + channel.flush(); + } + + @Override + public void writeAndFlush(Object obj) { + channel.writeAndFlush(obj); + } +} diff --git a/src/main/java/mc/core/netty/proto_125/WrapperNetStream.java b/src/main/java/mc/core/netty/proto_125/wrappers/WrapperNetStream.java similarity index 96% rename from src/main/java/mc/core/netty/proto_125/WrapperNetStream.java rename to src/main/java/mc/core/netty/proto_125/wrappers/WrapperNetStream.java index a277117..2801962 100644 --- a/src/main/java/mc/core/netty/proto_125/WrapperNetStream.java +++ b/src/main/java/mc/core/netty/proto_125/wrappers/WrapperNetStream.java @@ -2,7 +2,7 @@ * DmitriyMX * 2018-04-08 */ -package mc.core.netty.proto_125; +package mc.core.netty.proto_125.wrappers; import io.netty.buffer.ByteBuf; import lombok.RequiredArgsConstructor;