update README

README.MD

@@ -1,12 +1,13 @@
 # MC-SERVER
 
-![version: 1.0-SNAPSHOT](https://img.shields.io/badge/version-1.0-05b.svg?style=flat)
-![codename: ZERO](https://img.shields.io/badge/codename-ZERO-509.svg?style=flat)
+![version: 1.1](https://img.shields.io/badge/version-1.1-05b.svg?style=flat)
+![codename: VOID](https://img.shields.io/badge/codename-VOID-509.svg?style=flat)
 ![protocol: 1.12.2](https://img.shields.io/badge/protocol-1.12.2-075.svg?style=flat)
 
 Написанный с нуля сервер **Minecraft 1.12.2**.
 
-На данный момент может только показывать информацию о себе. Подключение к серверу не возможно.
+На данный момент сервер может показывать о себе информацию в списке серверов (motd, онлайн, иконка) и позволять
+игрокам подключиться к себе. Загружается пустой мир.
 
 ---
 

gradle.properties

@@ -1,3 +1,3 @@
 project.group=mc-project
 project.name=mc-server
-project.version=1.1-SNAPSHOT
+project.version=1.1

protocol/src/main/java/mc/protocol/NettyConnectionContext.java

@@ -2,12 +2,16 @@ package mc.protocol;
 
 import io.netty.channel.ChannelHandlerContext;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 import mc.protocol.api.ConnectionContext;
 import mc.protocol.packets.ServerSidePacket;
 import mc.protocol.pool.Passivable;
 
+import java.util.Map;
+import java.util.Optional;
+
 @EqualsAndHashCode
 public class NettyConnectionContext implements ConnectionContext, Passivable {
 
@@ -15,6 +19,14 @@ public class NettyConnectionContext implements ConnectionContext, Passivable {
 	@Setter
 	private ChannelHandlerContext ctx;
 
+	/**
+	 * @deprecated костыль
+	 */
+	@Deprecated
+	@Getter
+	@Setter
+	private boolean usedContext;
+
 	@Override
 	public State getState() {
 		return ctx.channel().attr(NetworkAttributes.STATE).get();
@@ -25,6 +37,27 @@ public class NettyConnectionContext implements ConnectionContext, Passivable {
 		ctx.channel().attr(NetworkAttributes.STATE).set(state);
 	}
 
+	/**
+	 * @deprecated костыль
+	 */
+	@Deprecated
+	@Override
+	public <T> void setCustomProperty(String key, T value) {
+		Map<String, Object> map = ctx.channel().attr(NetworkAttributes.CUSTOM_PROPERTIES).get();
+		map.put(key, value);
+	}
+
+	/**
+	 * @deprecated костыль
+	 */
+	@Deprecated
+	@SuppressWarnings("unchecked")
+	@Override
+	public <T> Optional<T> getCustomProperty(String key, Class<T> classResult) {
+		Map<String, Object> map = ctx.channel().attr(NetworkAttributes.CUSTOM_PROPERTIES).get();
+		return (Optional<T>) Optional.ofNullable(map.getOrDefault(key, null));
+	}
+
 	@Override
 	public void send(ServerSidePacket packet) {
 		ctx.write(packet);

protocol/src/main/java/mc/protocol/NetworkAttributes.java

@@ -3,8 +3,16 @@ 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");
 }

protocol/src/main/java/mc/protocol/PacketInboundHandler.java

@@ -3,14 +3,20 @@ package mc.protocol;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import mc.protocol.packets.ClientSidePacket;
 import mc.protocol.event.EventBus;
 import mc.protocol.pool.PacketPool;
 import org.apache.commons.pool2.ObjectPool;
 
+import java.io.IOException;
+
+@Slf4j
 @RequiredArgsConstructor
 public class PacketInboundHandler extends SimpleChannelInboundHandler<ClientSidePacket> {
 
+	private static final String CLIENT_FORCE_DISCONNECTED_IOEXCEPTION_MESSAGE_RU = "Программа на вашем хост-компьютере разорвала установленное подключение";
+
 	private final ObjectPool<NettyConnectionContext> poolNettyConnectionContext;
 	private final PacketPool poolPackets;
 	private final EventBus eventBus;
@@ -22,7 +28,21 @@ public class PacketInboundHandler extends SimpleChannelInboundHandler<ClientSide
 		NettyConnectionContext context = poolNettyConnectionContext.borrowObject().setCtx(ctx);
 		eventBus.emit(state, context, packet);
 
-		poolNettyConnectionContext.returnObject(context);
+		if (!context.isUsedContext()) {
+			poolNettyConnectionContext.returnObject(context);
+		}
 		poolPackets.returnObject(packet);
 	}
+
+	@Override
+	public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
+		if (cause instanceof IOException && cause.getLocalizedMessage().equalsIgnoreCase(CLIENT_FORCE_DISCONNECTED_IOEXCEPTION_MESSAGE_RU)) {
+			log.warn("Client '{}' force disconnected", ctx.channel().remoteAddress());
+			if (log.isTraceEnabled()) {
+				log.trace("", cause);
+			}
+		} else {
+			log.error("{}", cause.getMessage(), cause);
+		}
+	}
 }

protocol/src/main/java/mc/protocol/State.java

@@ -4,7 +4,7 @@ import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import mc.protocol.packets.ClientSidePacket;
 import mc.protocol.packets.Packet;
-import mc.protocol.packets.PingPacket;
+import mc.protocol.packets.KeepAlivePacket;
 import mc.protocol.packets.ServerSidePacket;
 import mc.protocol.packets.client.*;
 import mc.protocol.packets.server.*;
@@ -24,12 +24,12 @@ public enum State {
 			// client side
 			Map.of(
 					0x00, StatusServerRequestPacket.class,
-					0x01, PingPacket.class
+					0x01, KeepAlivePacket.class
 			),
 			// server side
 			Map.of(
 					StatusServerResponse.class, 0x00,
-					PingPacket.class, 0x01
+					KeepAlivePacket.class, 0x01
 			)
 	),
 	LOGIN(2,
@@ -47,7 +47,7 @@ public enum State {
 					0x00, TeleportConfirmPacket.class,
 					0x04, ClientSettingsPacket.class,
 					0x09, PluginMessagePacket.class,
-					0x0B, PingPacket.class,
+					0x0B, KeepAlivePacket.class,
 					0x0D, PlayerPositionPacket.class,
 					0x0E, CPlayerPositionAndLookPacket.class,
 					0x0F, PlayerLookPacket.class,
@@ -55,7 +55,7 @@ public enum State {
 			),
 			// client bound
 			Map.of(
-					PingPacket.class, 0x1F,
+					KeepAlivePacket.class, 0x1F,
 					ChunkDataPacket.class, 0x20,
 					JoinGamePacket.class, 0x23,
 					PlayerAbilitiesPacket.class,0x2C,

protocol/src/main/java/mc/protocol/api/ConnectionContext.java

@@ -3,11 +3,37 @@ package mc.protocol.api;
 import mc.protocol.State;
 import mc.protocol.packets.ServerSidePacket;
 
+import java.util.Optional;
+
 public interface ConnectionContext {
 
+	/**
+	 * @deprecated костыль
+	 */
+	@Deprecated
+	void setUsedContext(boolean value);
+
+	/**
+	 * @deprecated костыль
+	 */
+	@Deprecated
+	boolean isUsedContext();
+
 	State getState();
 	void setState(State state);
 
+	/**
+	 * @deprecated костыль
+	 */
+	@Deprecated
+	<T> void setCustomProperty(String key, T value);
+
+	/**
+	 * @deprecated костыль
+	 */
+	@Deprecated
+	<T> Optional<T> getCustomProperty(String key, Class<T> classResult);
+
 	void send(ServerSidePacket packet);
 	void sendNow(ServerSidePacket packet);
 	void flushSending();

protocol/src/main/java/mc/protocol/io/codec/ProtocolDecoder.java

@@ -17,6 +17,7 @@ import mc.protocol.pool.PacketPool;
 import org.apache.commons.pool2.ObjectPool;
 
 import javax.annotation.Nonnull;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Consumer;
@@ -36,6 +37,8 @@ public class ProtocolDecoder extends ByteToMessageDecoder {
 
 	@Override
 	public void channelActive(@Nonnull ChannelHandlerContext ctx) throws Exception {
+		ctx.channel().attr(NetworkAttributes.CUSTOM_PROPERTIES).set(new HashMap<>());
+
 		NettyConnectionContext context = poolNettyConnectionContext.borrowObject().setCtx(ctx);
 		consumerNewConnection.accept(context);
 
@@ -48,6 +51,9 @@ public class ProtocolDecoder extends ByteToMessageDecoder {
 		NettyConnectionContext context = poolNettyConnectionContext.borrowObject().setCtx(ctx);
 		consumerDisconnect.accept(context);
 
+		ctx.channel().attr(NetworkAttributes.CUSTOM_PROPERTIES).get().clear();
+		ctx.channel().attr(NetworkAttributes.CUSTOM_PROPERTIES).set(null);
+
 		poolNettyConnectionContext.returnObject(context);
 		super.channelInactive(ctx);
 	}

protocol/src/main/java/mc/protocol/model/Location.java

@@ -9,4 +9,16 @@ public class Location {
 	private double x;
 	private double y;
 	private double z;
+
+	public int getIntX() {
+		return (int) x;
+	}
+
+	public int getIntZ() {
+		return (int) z;
+	}
+
+	public Location toChunkXZ() {
+		return new Location(this.getIntX() >> 4, 0d, this.getIntZ() >> 4);
+	}
 }

protocol/src/main/java/mc/protocol/packets/KeepAlivePacket.java

@@ -25,7 +25,7 @@ import mc.protocol.io.NetByteBuf;
  * @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=7368#Keep_Alive">Keep Alive</a>
  */
 @Data
-public class PingPacket implements ClientSidePacket, ServerSidePacket {
+public class KeepAlivePacket implements ClientSidePacket, ServerSidePacket {
 
 	private Long payload;
 

protocol/src/main/java/mc/protocol/packets/server/ChunkDataPacket.java

@@ -28,13 +28,17 @@ import mc.protocol.packets.ServerSidePacket;
 @Data
 public class ChunkDataPacket implements ServerSidePacket {
 
+	private static NetByteBuf voidData;
+
 	private int x;
 	private int z;
 
+	@SuppressWarnings("java:S125")
 	@Override
 	public void writeSelf(NetByteBuf netByteBuf) {
 		netByteBuf.writeInt(x);
 		netByteBuf.writeInt(z);
+		/* Временное отключение кода
 		netByteBuf.writeBoolean(true); // Is Full chunk
 		netByteBuf.writeVarInt(0b11111111); // Available Sections
 
@@ -64,6 +68,41 @@ public class ChunkDataPacket implements ServerSidePacket {
 		netByteBuf.writeVarInt(data.readableBytes()); // Size of Data
 		netByteBuf.writeBytes(data); // Data
 		netByteBuf.writeVarInt(0); // Number of block entities
-		/* write NBT's */
+		// write NBT's
+		 */
+
+		netByteBuf.writeBytes(voidData);
+
+		voidData.resetReaderIndex();
+		voidData.resetWriterIndex();
+	}
+
+	static {
+		voidData = new NetByteBuf(Unpooled.buffer());
+		voidData.writeBoolean(true); // Is Full chunk
+		voidData.writeVarInt(0b11111111); // Available Sections
+
+		NetByteBuf data = new NetByteBuf(Unpooled.buffer());
+		for (int i = 0; i < 16; i++) {
+			NetByteBuf dataBuff = new NetByteBuf(Unpooled.wrappedBuffer(new byte[4096]));
+			NetByteBuf blockLight = new NetByteBuf(Unpooled.wrappedBuffer(new byte[2048]));
+			NetByteBuf skyLight = new NetByteBuf(Unpooled.wrappedBuffer(new byte[2048]));
+			NetByteBuf biomes = new NetByteBuf(Unpooled.wrappedBuffer(new byte[256]));
+
+			data.writeUnsignedByte(13);
+			data.writeUnsignedByte(0);
+			data.writeVarInt(dataBuff.readableBytes());
+			data.writeBytes(dataBuff);
+			data.writeBytes(blockLight);
+			data.writeBytes(skyLight);
+			data.writeBytes(biomes);
+		}
+
+		voidData.writeVarInt(data.readableBytes());
+		voidData.writeBytes(data);
+		voidData.writeVarInt(0);
+
+		voidData.markReaderIndex();
+		voidData.markWriterIndex();
 	}
 }

protocol/src/main/java/mc/protocol/world/Chunk.java

@@ -0,0 +1,7 @@
+package mc.protocol.world;
+
+public interface Chunk {
+
+	int getX();
+	int getZ();
+}

protocol/src/main/java/mc/protocol/world/World.java

@@ -0,0 +1,13 @@
+package mc.protocol.world;
+
+import mc.protocol.model.Location;
+import mc.protocol.utils.LevelType;
+
+public interface World {
+
+	LevelType getLevelType();
+
+	Location getSpawn();
+
+	Chunk getChunk(int x, int z);
+}

server/src/main/java/mc/server/Main.java

@@ -12,7 +12,7 @@ import mc.protocol.api.Server;
 import mc.protocol.di.DaggerProtocolComponent;
 import mc.protocol.di.ProtocolComponent;
 import mc.protocol.di.ProtocolModule;
-import mc.protocol.packets.PingPacket;
+import mc.protocol.packets.KeepAlivePacket;
 import mc.protocol.packets.client.HandshakePacket;
 import mc.protocol.packets.client.LoginStartPacket;
 import mc.protocol.packets.client.StatusServerRequestPacket;
@@ -20,6 +20,7 @@ import mc.server.config.Config;
 import mc.server.di.ConfigModule;
 import mc.server.di.DaggerServerComponent;
 import mc.server.di.ServerComponent;
+import mc.server.service.PlayerManager;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.LoggerFactory;
 
@@ -48,6 +49,7 @@ public class Main {
 				.build();
 
 		Config config = serverComponent.getConfig();
+		PlayerManager playerManager = serverComponent.getPlayerManager();
 
 		ProtocolComponent protocolComponent = DaggerProtocolComponent.builder()
 				.protocolModule(new ProtocolModule(true))
@@ -57,13 +59,16 @@ public class Main {
 		PacketHandler packetHandler = serverComponent.getPacketHandler();
 
 		server.onNewConnect(connectionContext -> connectionContext.setState(State.HANDSHAKING));
-		server.onDisonnect(connectionContext -> connectionContext.setState(null));
+		server.onDisonnect(connectionContext -> {
+			connectionContext.setState(null);
+			connectionContext.getCustomProperty("player", Player.class).ifPresent(playerManager::remove);
+		});
 
 		server.listenPacket(State.HANDSHAKING, HandshakePacket.class, packetHandler::onHandshake);
-		server.listenPacket(State.STATUS, PingPacket.class, packetHandler::onKeepAlive);
+		server.listenPacket(State.STATUS, KeepAlivePacket.class, packetHandler::onKeepAlive);
 		server.listenPacket(State.STATUS, StatusServerRequestPacket.class, packetHandler::onServerStatus);
 		server.listenPacket(State.LOGIN, LoginStartPacket.class, packetHandler::onLoginStart);
-		server.listenPacket(State.PLAY, PingPacket.class, packetHandler::onKeepAlivePlay);
+		server.listenPacket(State.PLAY, KeepAlivePacket.class, packetHandler::onKeepAlivePlay);
 
 		server.bind(config.server().host(), config.server().port());
 	}

server/src/main/java/mc/server/PacketHandler.java

@@ -7,7 +7,7 @@ import mc.protocol.api.ConnectionContext;
 import mc.protocol.model.Location;
 import mc.protocol.model.Look;
 import mc.protocol.model.ServerInfo;
-import mc.protocol.packets.PingPacket;
+import mc.protocol.packets.KeepAlivePacket;
 import mc.protocol.packets.client.HandshakePacket;
 import mc.protocol.packets.client.LoginStartPacket;
 import mc.protocol.packets.client.StatusServerRequestPacket;
@@ -15,8 +15,10 @@ import mc.protocol.packets.server.*;
 import mc.protocol.serializer.TextSerializer;
 import mc.protocol.utils.Difficulty;
 import mc.protocol.utils.GameMode;
-import mc.protocol.utils.LevelType;
+import mc.protocol.world.Chunk;
+import mc.protocol.world.World;
 import mc.server.config.Config;
+import mc.server.service.PlayerManager;
 import org.apache.commons.io.IOUtils;
 
 import java.io.IOException;
@@ -25,7 +27,7 @@ import java.nio.file.Path;
 import java.util.Base64;
 import java.util.Collections;
 import java.util.Random;
-import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 
 @Slf4j
 @RequiredArgsConstructor
@@ -33,18 +35,27 @@ public class PacketHandler {
 
 	private final Random random = new Random(System.currentTimeMillis());
 	private final Config config;
+	private final World world;
+	private final PlayerManager playerManager;
 
 	public void onHandshake(ConnectionContext context, HandshakePacket packet) {
 		context.setState(packet.getNextState());
 	}
 
-	public void onKeepAlive(ConnectionContext context, PingPacket packet) {
+	public void onKeepAlive(ConnectionContext context, KeepAlivePacket packet) {
 		context.sendNow(packet);
 		context.disconnect();
 	}
 
-	public void onKeepAlivePlay(ConnectionContext context, PingPacket packet) {
-		context.sendNow(packet);
+	public void onKeepAlivePlay(ConnectionContext context, KeepAlivePacket packet) {
+		try {
+			TimeUnit.MILLISECONDS.sleep(50);
+			context.sendNow(packet);
+		} catch (InterruptedException e) {
+			if (log.isTraceEnabled()) {
+				log.trace("{}", e.getMessage(), e);
+			}
+		}
 	}
 
 	@SuppressWarnings("unused")
@@ -53,7 +64,11 @@ public class PacketHandler {
 		serverInfo.version().name(ProtocolConstant.PROTOCOL_NAME);
 		serverInfo.version().protocol(ProtocolConstant.PROTOCOL_NUMBER);
 		serverInfo.players().max(config.players().maxOnlile());
-		serverInfo.players().online(config.players().onlile());
+		if (config.players().fakeOnline().enable()) {
+			serverInfo.players().online(config.players().fakeOnline().value());
+		} else {
+			serverInfo.players().online(playerManager.online());
+		}
 		serverInfo.players().sample(Collections.emptyList());
 		serverInfo.description(TextSerializer.fromPlain(config.motd()));
 
@@ -67,27 +82,29 @@ public class PacketHandler {
 		context.sendNow(response);
 	}
 
+	@SuppressWarnings("java:S2589")
 	public void onLoginStart(ConnectionContext context, LoginStartPacket loginStartPacket) {
+		Player player = playerManager.addAndCreate(context, loginStartPacket.getName(), GameMode.SURVIVAL, world.getSpawn());
+		context.setCustomProperty("player", player);
+
 		var loginSuccessPacket = new LoginSuccessPacket();
-		loginSuccessPacket.setUuid(UUID.randomUUID());
-		loginSuccessPacket.setName(loginStartPacket.getName());
+		loginSuccessPacket.setUuid(player.getUuid());
+		loginSuccessPacket.setName(player.getName());
 
 		context.sendNow(loginSuccessPacket);
 		context.setState(State.PLAY);
 
 		var joinGamePacket = new JoinGamePacket();
 		joinGamePacket.setEntityId(random.nextInt());
-		joinGamePacket.setGameMode(GameMode.SURVIVAL);
+		joinGamePacket.setGameMode(player.getGameMode());
 		joinGamePacket.setDimension(0/*Overworld*/);
 		joinGamePacket.setDifficulty(Difficulty.PEACEFUL);
-		joinGamePacket.setLevelType(LevelType.FLAT);
+		joinGamePacket.setLevelType(world.getLevelType());
 
 		context.send(joinGamePacket);
 
-		Location spawnLocation = new Location(7d, 130d, 7d);
-
 		var spawnPositionPacket = new SpawnPositionPacket();
-		spawnPositionPacket.setSpawn(spawnLocation);
+		spawnPositionPacket.setSpawn(player.getLocation());
 
 		context.send(spawnPositionPacket);
 
@@ -103,23 +120,47 @@ public class PacketHandler {
 
 		context.flushSending();
 
-		var chunkDataPacket = new ChunkDataPacket();
-		chunkDataPacket.setX(0);
-		chunkDataPacket.setZ(0);
+		Location chunkLocation = player.getLocation().toChunkXZ();
+		Chunk chunk = world.getChunk(chunkLocation.getIntX(), chunkLocation.getIntZ());
 
-		context.sendNow(chunkDataPacket);
+		var chunkDataPacket = new ChunkDataPacket();
+		chunkDataPacket.setX(chunk.getX());
+		chunkDataPacket.setZ(chunk.getZ());
+
+		context.send(chunkDataPacket);
+
+		for (int i = 1; i <= config.world().viewDistance(); i++) {
+			int minX = chunkLocation.getIntX() - i;
+			int minZ = chunkLocation.getIntZ() - i;
+			int maxX = chunkLocation.getIntX() + i;
+			int maxZ = chunkLocation.getIntZ() + i;
+
+			for (int z = minZ; z <= maxZ; z++) {
+				for (int x = minX; x <= maxX; x++) {
+					if ((z == minZ || z == maxZ) || (x == minX || x == maxX)) {
+						chunkDataPacket = new ChunkDataPacket();
+						chunkDataPacket.setX(x);
+						chunkDataPacket.setZ(z);
+
+						context.send(chunkDataPacket);
+					}
+				}
+			}
+		}
+
+		context.flushSending();
 
 		var playerPositionAndLookPacket = new SPlayerPositionAndLookPacket();
-		playerPositionAndLookPacket.setPosition(spawnLocation);
+		playerPositionAndLookPacket.setPosition(player.getLocation());
 		playerPositionAndLookPacket.setLook(new Look(0f, 0f));
 		playerPositionAndLookPacket.setTeleportId(random.nextInt());
 
 		context.send(playerPositionAndLookPacket);
 
-		PingPacket pingPacket = new PingPacket();
-		pingPacket.setPayload(System.currentTimeMillis());
+		KeepAlivePacket keepAlivePacket = new KeepAlivePacket();
+		keepAlivePacket.setPayload(System.currentTimeMillis());
 
-		context.send(pingPacket);
+		context.send(keepAlivePacket);
 
 		context.flushSending();
 	}

server/src/main/java/mc/server/Player.java

@@ -0,0 +1,20 @@
+package mc.server;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import mc.protocol.api.ConnectionContext;
+import mc.protocol.model.Location;
+import mc.protocol.utils.GameMode;
+
+import java.util.UUID;
+
+@RequiredArgsConstructor
+@Getter
+public class Player {
+
+	private final ConnectionContext connectionContext;
+	private final UUID uuid;
+	private final String name;
+	private final GameMode gameMode;
+	private final Location location;
+}

server/src/main/java/mc/server/config/Config.java

@@ -15,6 +15,7 @@ public class Config {
 
 	private final Server server = new Server();
 	private final Players players = new Players();
+	private final World world = new World();
 
 	private String motd;
 	private String disconnectReason;
@@ -32,7 +33,23 @@ public class Config {
 	@Setter
 	@ToString
 	public static class Players {
+		private final FakeOnline fakeOnline = new FakeOnline();
+
 		private int maxOnlile;
-		private int onlile;
+	}
+
+	@Getter
+	@Setter
+	@ToString
+	public static class FakeOnline {
+		private boolean enable;
+		private int value;
+	}
+
+	@Getter
+	@Setter
+	@ToString
+	public static class World {
+		private int viewDistance;
 	}
 }

server/src/main/java/mc/server/di/ConfigModule.java

@@ -27,10 +27,15 @@ public class ConfigModule {
 
 		config.server().host(fromYamlPath("server/host", map, "127.0.0.1"));
 		config.server().port(fromYamlPath("server/port", map, 25565));
+
 		config.motd(fromYamlPath("motd", map, ""));
 		config.disconnectReason(fromYamlPath("disconnect-reason", map, ""));
+
 		config.players().maxOnlile(fromYamlPath("players/max-online", map, 0));
-		config.players().onlile(fromYamlPath("players/online", map, 0));
+		config.players().fakeOnline().enable(fromYamlPath("players/fake-online/enable", map, false));
+		config.players().fakeOnline().value(fromYamlPath("players/fake-online/value", map, 0));
+
+		config.world().viewDistance(fromYamlPath("world/view-distance", map, 0));
 
 		if (Boolean.TRUE.equals(fromYamlPath("icon/enable", map, false))) {
 			config.iconPath(Paths.get(fromYamlPath("icon/path", map, "favicon.png")));

server/src/main/java/mc/server/di/PacketHandlerModule.java

@@ -2,14 +2,16 @@ package mc.server.di;
 
 import dagger.Module;
 import dagger.Provides;
+import mc.protocol.world.World;
 import mc.server.PacketHandler;
 import mc.server.config.Config;
+import mc.server.service.PlayerManager;
 
 @Module
 public class PacketHandlerModule {
 
 	@Provides
-	public PacketHandler providePacketHandler(Config config) {
-		return new PacketHandler(config);
+	public PacketHandler providePacketHandler(Config config, World world, PlayerManager playerManager) {
+		return new PacketHandler(config, world, playerManager);
 	}
 }

server/src/main/java/mc/server/di/PlayersModule.java

@@ -0,0 +1,16 @@
+package mc.server.di;
+
+import dagger.Module;
+import dagger.Provides;
+import mc.protocol.di.ServerScope;
+import mc.server.service.PlayerManager;
+
+@Module
+public class PlayersModule {
+
+	@Provides
+	@ServerScope
+	PlayerManager providePlayerManager() {
+		return new PlayerManager();
+	}
+}

server/src/main/java/mc/server/di/ServerComponent.java

@@ -1,14 +1,18 @@
 package mc.server.di;
 
 import dagger.Component;
+import mc.protocol.di.ServerScope;
 import mc.server.PacketHandler;
 import mc.server.config.Config;
+import mc.server.service.PlayerManager;
 
 @Component(modules = {
-		ConfigModule.class, PacketHandlerModule.class
+		ConfigModule.class, PacketHandlerModule.class, WorldModule.class, PlayersModule.class
 })
+@ServerScope
 public interface ServerComponent {
 
 	Config getConfig();
 	PacketHandler getPacketHandler();
+	PlayerManager getPlayerManager();
 }

server/src/main/java/mc/server/di/WorldModule.java

@@ -0,0 +1,17 @@
+package mc.server.di;
+
+import dagger.Module;
+import dagger.Provides;
+import mc.protocol.di.ServerScope;
+import mc.protocol.world.World;
+import mc.server.world.VoidWorld;
+
+@Module
+public class WorldModule {
+
+	@Provides
+	@ServerScope
+	public World provideWorld() {
+		return new VoidWorld();
+	}
+}

server/src/main/java/mc/server/service/PlayerManager.java

@@ -0,0 +1,29 @@
+package mc.server.service;
+
+import mc.protocol.api.ConnectionContext;
+import mc.protocol.model.Location;
+import mc.protocol.utils.GameMode;
+import mc.server.Player;
+
+import java.util.LinkedList;
+import java.util.UUID;
+
+public class PlayerManager {
+
+	private final LinkedList<Player> players = new LinkedList<>();
+
+	public Player addAndCreate(ConnectionContext context, String name, GameMode gameMode, Location location) {
+		context.setUsedContext(true);
+		Player player = new Player(context, UUID.randomUUID(), name, gameMode, location);
+		players.add(player);
+		return player;
+	}
+
+	public void remove(Player player) {
+		players.remove(player);
+	}
+
+	public int online() {
+		return players.size();
+	}
+}

server/src/main/java/mc/server/world/VoidChunk.java

@@ -0,0 +1,13 @@
+package mc.server.world;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import mc.protocol.world.Chunk;
+
+@RequiredArgsConstructor
+@Getter
+public class VoidChunk implements Chunk {
+
+	private final int x;
+	private final int z;
+}

server/src/main/java/mc/server/world/VoidWorld.java

@@ -0,0 +1,26 @@
+package mc.server.world;
+
+import mc.protocol.model.Location;
+import mc.protocol.utils.LevelType;
+import mc.protocol.world.Chunk;
+import mc.protocol.world.World;
+
+public class VoidWorld implements World {
+
+	private static final Location spawn = new Location(7d, 130d, 7d);
+
+	@Override
+	public LevelType getLevelType() {
+		return LevelType.FLAT;
+	}
+
+	@Override
+	public Location getSpawn() {
+		return VoidWorld.spawn;
+	}
+
+	@Override
+	public Chunk getChunk(int x, int z) {
+		return new VoidChunk(x, z);
+	}
+}

server/src/main/resources/config-sample.yml

@@ -10,9 +10,14 @@ disconnect-reason: '&4Server is not available.'
 
 players:
   max-online: 0
-  online: 0
+  fake-online:
+    enable: false
+    value: 0
 
 # Размер значка: 64x64 px
 icon:
   enable: false
-  path: favicon.png
+  path: favicon.png
+
+world:
+  view-distance: 1