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

рефакторинг протокола

Browse Source
This commit is contained in:
DmitriyMX
2021-05-06 13:58:05 +03:00
parent a3eb0eba86
commit d02a80299f
9 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
protocol/src/main/java/mc/protocol/NettyServer.java
View File

@@ -17,8 +17,8 @@ import mc.protocol.io.codec.ProtocolDecoder;
import mc.protocol.io.codec.ProtocolEncoder; import mc.protocol.io.codec.ProtocolEncoder;
import mc.protocol.io.codec.ProtocolSplitter; import mc.protocol.io.codec.ProtocolSplitter;
import mc.protocol.packets.ClientSidePacket; import mc.protocol.packets.ClientSidePacket;
import mc.protocol.utils.EventBus; import mc.protocol.event.EventBus;
import mc.protocol.utils.PacketPool; import mc.protocol.pool.PacketPool;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@@ -58,6 +58,7 @@ public class NettyServer implements Server {
} }
@Override @Override
@SuppressWarnings("java:S2326") // Сонар, ты бредишь
public <P extends ClientSidePacket> void listenPacket(State state, Class<P> packetClass, EventBus.EventHandler<P> eventHandler) { public <P extends ClientSidePacket> void listenPacket(State state, Class<P> packetClass, EventBus.EventHandler<P> eventHandler) {
this.eventBus.subscribe(state, packetClass, eventHandler); this.eventBus.subscribe(state, packetClass, eventHandler);
} }

4
protocol/src/main/java/mc/protocol/PacketInboundHandler.java
View File

@@ -4,8 +4,8 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.SimpleChannelInboundHandler; import io.netty.channel.SimpleChannelInboundHandler;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import mc.protocol.packets.ClientSidePacket; import mc.protocol.packets.ClientSidePacket;
import mc.protocol.utils.EventBus; import mc.protocol.event.EventBus;
import mc.protocol.utils.PacketPool; import mc.protocol.pool.PacketPool;
@RequiredArgsConstructor @RequiredArgsConstructor
public class PacketInboundHandler extends SimpleChannelInboundHandler<ClientSidePacket> { public class PacketInboundHandler extends SimpleChannelInboundHandler<ClientSidePacket> {

3
protocol/src/main/java/mc/protocol/api/Server.java
View File

@@ -2,7 +2,7 @@ package mc.protocol.api;
import mc.protocol.State; import mc.protocol.State;
import mc.protocol.packets.ClientSidePacket; import mc.protocol.packets.ClientSidePacket;
import mc.protocol.utils.EventBus; import mc.protocol.event.EventBus;
import java.util.function.Consumer; import java.util.function.Consumer;
@@ -13,5 +13,6 @@ public interface Server {
void onNewConnect(Consumer<ConnectionContext> consumer); void onNewConnect(Consumer<ConnectionContext> consumer);
void onDisonnect(Consumer<ConnectionContext> consumer); void onDisonnect(Consumer<ConnectionContext> consumer);
@SuppressWarnings("java:S2326") // Сонар, ты бредишь
<P extends ClientSidePacket> void listenPacket(State state, Class<P> packetClass, EventBus.EventHandler<P> eventHandler); <P extends ClientSidePacket> void listenPacket(State state, Class<P> packetClass, EventBus.EventHandler<P> eventHandler);
} }

8
protocol/src/main/java/mc/protocol/di/ProtocolModule.java
View File

@@ -7,10 +7,10 @@ import mc.protocol.State;
import mc.protocol.api.Server; import mc.protocol.api.Server;
import mc.protocol.packets.ClientSidePacket; import mc.protocol.packets.ClientSidePacket;
import mc.protocol.packets.UnknownPacket; import mc.protocol.packets.UnknownPacket;
import mc.protocol.utils.EventBus; import mc.protocol.event.EventBus;
import mc.protocol.utils.PacketFactory; import mc.protocol.pool.PacketFactory;
import mc.protocol.utils.PacketPool; import mc.protocol.pool.PacketPool;
import mc.protocol.utils.SimpleEventBus; import mc.protocol.event.SimpleEventBus;
import org.apache.commons.pool2.ObjectPool; import org.apache.commons.pool2.ObjectPool;
import org.apache.commons.pool2.impl.GenericObjectPool; import org.apache.commons.pool2.impl.GenericObjectPool;

2
protocol/src/main/java/mc/protocol/utils/EventBus.java → protocol/src/main/java/mc/protocol/event/EventBus.java
View File

@@ -1,4 +1,4 @@
package mc.protocol.utils; package mc.protocol.event;
import mc.protocol.State; import mc.protocol.State;
import mc.protocol.api.ConnectionContext; import mc.protocol.api.ConnectionContext;

3
protocol/src/main/java/mc/protocol/utils/SimpleEventBus.java → protocol/src/main/java/mc/protocol/event/SimpleEventBus.java
View File

@@ -1,8 +1,9 @@
package mc.protocol.utils; package mc.protocol.event;
import mc.protocol.State; import mc.protocol.State;
import mc.protocol.api.ConnectionContext; import mc.protocol.api.ConnectionContext;
import mc.protocol.packets.ClientSidePacket; import mc.protocol.packets.ClientSidePacket;
import mc.protocol.utils.Table;
@SuppressWarnings({ "rawtypes", "unchecked" }) @SuppressWarnings({ "rawtypes", "unchecked" })
public class SimpleEventBus implements EventBus { public class SimpleEventBus implements EventBus {

2
protocol/src/main/java/mc/protocol/io/codec/ProtocolDecoder.java
View File

@@ -12,7 +12,7 @@ import mc.protocol.api.ConnectionContext;
import mc.protocol.io.NetByteBuf; import mc.protocol.io.NetByteBuf;
import mc.protocol.packets.ClientSidePacket; import mc.protocol.packets.ClientSidePacket;
import mc.protocol.packets.UnknownPacket; import mc.protocol.packets.UnknownPacket;
import mc.protocol.utils.PacketPool; import mc.protocol.pool.PacketPool;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import java.util.List; import java.util.List;

2
protocol/src/main/java/mc/protocol/utils/PacketFactory.java → protocol/src/main/java/mc/protocol/pool/PacketFactory.java
View File

@@ -1,4 +1,4 @@
package mc.protocol.utils; package mc.protocol.pool;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

2
protocol/src/main/java/mc/protocol/utils/PacketPool.java → protocol/src/main/java/mc/protocol/pool/PacketPool.java
View File

@@ -1,4 +1,4 @@
package mc.protocol.utils; package mc.protocol.pool;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;