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

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

Browse Source
This commit is contained in:
DmitriyMX
2021-05-06 13:14:42 +03:00
parent 87dc18f009
commit 5f431ff138
13 changed files with 200 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/src/main/java/mc/server/Main.java
View File

@@ -7,8 +7,10 @@ import joptsimple.OptionParser;
import joptsimple.OptionSet;
import joptsimple.util.PathConverter;
import lombok.extern.slf4j.Slf4j;
import mc.protocol.NettyServer;
import mc.protocol.State;
import mc.protocol.api.Server;
import mc.protocol.di.DaggerProtocolComponent;
import mc.protocol.di.ProtocolComponent;
import mc.protocol.packets.PingPacket;
import mc.protocol.packets.client.HandshakePacket;
import mc.protocol.packets.client.LoginStartPacket;
@@ -38,6 +40,8 @@ public class Main {
private void run(OptionSet optionSet) {
log.info("mc-project launch");
ProtocolComponent protocolComponent = DaggerProtocolComponent.create();
ConfigModule configModule = new ConfigModule((Path) optionSet.valueOf(CLI_CONFIG));
ServerComponent serverComponent = DaggerServerComponent.builder()
@@ -46,9 +50,12 @@ public class Main {
Config config = serverComponent.getConfig();
NettyServer server = NettyServer.createServer();
Server server = protocolComponent.getServer();
PacketHandler packetHandler = serverComponent.getPacketHandler();
server.onNewConnect(connectionContext -> connectionContext.setState(State.HANDSHAKING));
server.onDisonnect(connectionContext -> connectionContext.setState(null));
State.HANDSHAKING.packetFlux(HandshakePacket.class).subscribe(packetHandler::onHandshake);
State.STATUS.packetFlux(PingPacket.class).subscribe(packetHandler::onKeepAlive);
State.STATUS.packetFlux(StatusServerRequestPacket.class).subscribe(packetHandler::onServerStatus);

44
server/src/main/java/mc/server/PacketHandler.java
View File

@@ -3,6 +3,7 @@ package mc.server;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import mc.protocol.*;
import mc.protocol.api.ConnectionContext;
import mc.protocol.model.Location;
import mc.protocol.model.Look;
import mc.protocol.model.ServerInfo;
@@ -27,22 +28,23 @@ import java.util.UUID;
@RequiredArgsConstructor
public class PacketHandler {
private final Config config;
private final Random random = new Random(System.currentTimeMillis());
private final Config config;
public void onHandshake(ChannelContext<HandshakePacket> channel) {
channel.setState(channel.getPacket().getNextState());
public void onHandshake(ConnectionContext<HandshakePacket> context) {
context.setState(context.clientPacket().getNextState());
}
public void onKeepAlive(ChannelContext<PingPacket> channel) {
channel.getCtx().writeAndFlush(channel.getPacket()).channel().disconnect();
public void onKeepAlive(ConnectionContext<PingPacket> context) {
context.sendNow(context.clientPacket());
context.disconnect();
}
public void onKeepAlivePlay(ChannelContext<PingPacket> channel) {
channel.getCtx().writeAndFlush(channel.getPacket());
public void onKeepAlivePlay(ConnectionContext<PingPacket> context) {
context.sendNow(context.clientPacket());
}
public void onServerStatus(ChannelContext<StatusServerRequestPacket> channel) {
public void onServerStatus(ConnectionContext<StatusServerRequestPacket> context) {
ServerInfo serverInfo = new ServerInfo();
serverInfo.version().name(ProtocolConstant.PROTOCOL_NAME);
serverInfo.version().protocol(ProtocolConstant.PROTOCOL_NUMBER);
@@ -58,18 +60,18 @@ public class PacketHandler {
StatusServerResponse response = new StatusServerResponse();
response.setInfo(serverInfo);
channel.getCtx().writeAndFlush(response);
context.sendNow(response);
}
public void onLoginStart(ChannelContext<LoginStartPacket> channel) {
LoginStartPacket loginStartPacket = channel.getPacket();
public void onLoginStart(ConnectionContext<LoginStartPacket> context) {
LoginStartPacket loginStartPacket = context.clientPacket();
var loginSuccessPacket = new LoginSuccessPacket();
loginSuccessPacket.setUuid(UUID.randomUUID());
loginSuccessPacket.setName(loginStartPacket.getName());
channel.getCtx().writeAndFlush(loginSuccessPacket);
channel.setState(State.PLAY);
context.sendNow(loginSuccessPacket);
context.setState(State.PLAY);
var joinGamePacket = new JoinGamePacket();
joinGamePacket.setEntityId(random.nextInt());
@@ -78,14 +80,14 @@ public class PacketHandler {
joinGamePacket.setDifficulty(Difficulty.PEACEFUL);
joinGamePacket.setLevelType(LevelType.FLAT);
channel.getCtx().write(joinGamePacket);
context.send(joinGamePacket);
Location spawnLocation = new Location(0d, 63d, 0d);
var spawnPositionPacket = new SpawnPositionPacket();
spawnPositionPacket.setSpawn(spawnLocation);
channel.getCtx().write(spawnPositionPacket);
context.send(spawnPositionPacket);
var playerAbilitiesPacket = new PlayerAbilitiesPacket();
playerAbilitiesPacket.setCatFly(true);
@@ -95,29 +97,29 @@ public class PacketHandler {
playerAbilitiesPacket.setFieldOfView(0.0f);
playerAbilitiesPacket.setFlyingSpeed(0.05f);
channel.getCtx().write(playerAbilitiesPacket);
context.send(playerAbilitiesPacket);
channel.getCtx().flush();
context.flushSending();
var chunkDataPacket = new ChunkDataPacket();
chunkDataPacket.setX(0);
chunkDataPacket.setZ(0);
channel.getCtx().writeAndFlush(chunkDataPacket);
context.sendNow(chunkDataPacket);
var playerPositionAndLookPacket = new SPlayerPositionAndLookPacket();
playerPositionAndLookPacket.setPosition(spawnLocation);
playerPositionAndLookPacket.setLook(new Look(0f, 0f));
playerPositionAndLookPacket.setTeleportId(random.nextInt());
channel.getCtx().write(playerPositionAndLookPacket);
context.send(playerPositionAndLookPacket);
PingPacket pingPacket = new PingPacket();
pingPacket.setPayload(System.currentTimeMillis());
channel.getCtx().write(pingPacket);
context.send(pingPacket);
channel.getCtx().flush();
context.flushSending();
}
private static String faviconToBase64(Path iconPath) {