PlayerListHeaderAndFooterPacket

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

@@ -50,17 +50,19 @@ public enum State {
 					0x0B, PingPacket.class,
 					0x0D, PlayerPositionPacket.class,
 					0x0E, CPlayerPositionAndLookPacket.class,
-					0x0F, PlayerLookPacket.class
+					0x0F, PlayerLookPacket.class,
+					0x15, EntityActionPacket.class
 			),
 			// client bound
 			Map.of(
-					BossBarPacket.class, 0x0C,
 					PingPacket.class, 0x1F,
-					JoinGamePacket.class, 0x23,
-					SpawnPositionPacket.class, 0x46,
 					ChunkDataPacket.class, 0x20,
+					JoinGamePacket.class, 0x23,
 					PlayerAbilitiesPacket.class,0x2C,
-					SPlayerPositionAndLookPacket.class, 0x2F
+					PlayerListItemPacket.class,0x2E,
+					SPlayerPositionAndLookPacket.class, 0x2F,
+					SpawnPositionPacket.class, 0x46,
+					PlayerListHeaderAndFooterPacket.class,0x4A
 			)
 	);
 

protocol/src/main/java/mc/protocol/packets/client/EntityActionPacket.java

@@ -0,0 +1,52 @@
+package mc.protocol.packets.client;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import mc.protocol.io.NetByteBuf;
+import mc.protocol.packets.ClientSidePacket;
+import mc.protocol.utils.EntityActionAction;
+
+/**
+ * Entity Action packet.
+ *
+ * <p>Структура пакета</p>
+ * <pre>
+ * | FIELD      | TYPE   | NOTES                                     |
+ * |------------|--------|-------------------------------------------|
+ * | Entity ID  | VarInt | ID игрока                                 |
+ * | Action ID  | VarInt | ID действия                               |
+ * | Jump Boost | VarInt | Используется только при "Action ID" = 5.  |
+ * |            |        | В этом случае значение будет от 0 до 100. |
+ * |            |        | В остальных случаях значение 0.           |
+ * </pre>
+ *
+ * @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Entity_Action" target="_top">Entity Action</a>
+ */
+@NoArgsConstructor
+@Getter
+@EqualsAndHashCode
+@ToString
+public class EntityActionPacket implements ClientSidePacket {
+
+	private Integer entityId;
+	private EntityActionAction action;
+	private Integer jumpBoost;
+
+	@Override
+	public void readSelf(NetByteBuf netByteBuf) {
+		this.entityId = netByteBuf.readVarInt();
+		int actionId = netByteBuf.readVarInt();
+		this.jumpBoost = netByteBuf.readVarInt();
+
+		this.action = EntityActionAction.valueOfCode(actionId);
+	}
+
+	@Override
+	public void passivate() {
+		this.entityId = null;
+		this.action = null;
+		this.jumpBoost = null;
+	}
+}

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

@@ -1,117 +0,0 @@
-package mc.protocol.packets.server;
-
-import lombok.Data;
-import mc.protocol.io.NetByteBuf;
-import mc.protocol.model.text.Text;
-import mc.protocol.packets.ServerSidePacket;
-import mc.protocol.serializer.TextSerializer;
-import mc.protocol.utils.BossBarAction;
-import mc.protocol.utils.BossBarColor;
-import mc.protocol.utils.BossBarDivision;
-
-import java.util.UUID;
-
-/**
- * Boss bar packet.
- *
- * <p>Управление босс-баром.</p>
- *
- * <p>Структура пакета</p>
- * <pre>
- * | FIELD       | TYPE   | NOTES                            |
- * |-------------|--------|----------------------------------|
- * | UUID        | String | Уникальный ID для бара           |
- * | Action      | VarInt | Код действия                     |
- * | Data fields | -      | Зависит от значния поля "Action" |
- * </pre>
- *
- * <p>Варианты "Action" и поля в "Data action"</p>
- * <pre>
- * | ACTION                | DATA FIELD | TYPE          | NOTES                                                  |
- * | VALUE | DESCRIPTION   |            |               |                                                        |
- * |-------|-------------  |------------|---------------|--------------------------------------------------------|
- * | 0     | add           | Title      | Text          | Название бара                                          |
- * |       |               | Health     | Float         | Число от 0 до 1. Определяет процент заполненности бара |
- * |       |               | Color      | VarInt        | Цвет бара. См. ниже значения                           |
- * |       |               | Division   | VarInt        | Тип делений. См. ниже значения                         |
- * |       |               | Flags      | Unsigned Byte | Битовая маска:                                         |
- * |       |               |            |               | 0x01 - затемняет небо                                  |
- * |       |               |            |               | 0x02 - является босс-баром Ender Dragon                |
- * |       |               |            |               |        (используется для воспроизведения музыки)       |
- * | 1     | remove        | -          | -             | Не имеет дополнительных полей. Удаляет текущий бар.    |
- * | 2     | update health | Health     | Float         | (см. выше)                                             |
- * | 3     | update title  | Title      | Text          | (см. выше)                                             |
- * | 4     | update style  | Color      | VarInt        | (см. выше)                                             |
- * |       |               | Division   | VarInt        | (см. выше)                                             |
- * | 5     | update flags  | Flags      | Unsigned Byte | (см. выше)                                             |
- * </pre>
- *
- * <p>Варианты цветов бара</p>
- * <pre>
- * | CODE | COLOR  |
- * |------|--------|
- * | 0    | Pink   |
- * | 1    | Blue   |
- * | 2    | Red    |
- * | 3    | Green  |
- * | 4    | Yellow |
- * | 5    | Purple |
- * | 6    | White  |
- * </pre>
- *
- * <p>Типы делений бара</p>
- * <pre>
- * | CODE | DIVISION    |
- * |------|-------------|
- * | 0    | Нет делений |
- * | 1    | 6 делений   |
- * | 2    | 10 делений  |
- * | 3    | 12 делений  |
- * | 4    | 20 делений  |
- * </pre>
- *
- * @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Boss_Bar" target="_top">Boss bar</a>
- */
-@Data
-public class BossBarPacket implements ServerSidePacket {
-
-	private UUID uuid;
-	private BossBarAction action;
-
-	private Text title;
-	private Float health;
-	private BossBarColor color;
-	private BossBarDivision division;
-
-	@Override
-	public void writeSelf(NetByteBuf netByteBuf) {
-		netByteBuf.writeUUID(this.uuid);
-		netByteBuf.writeVarInt(this.action.getCode());
-
-		switch (this.action) {
-			case ADD:
-				netByteBuf.writeString(TextSerializer.toJsonObject(this.title).toString());
-				netByteBuf.writeFloat(this.health);
-				netByteBuf.writeVarInt(this.color.getCode());
-				netByteBuf.writeVarInt(this.division.getCode());
-				netByteBuf.writeUnsignedByte(0x00); // Flags
-				break;
-			case UPDATE_HEALTH:
-				netByteBuf.writeFloat(this.health);
-				break;
-			case UPDATE_TITLE:
-				netByteBuf.writeString(TextSerializer.toJsonObject(this.title).toString());
-				break;
-			case UPDATE_STYLE:
-				netByteBuf.writeVarInt(this.color.getCode());
-				netByteBuf.writeVarInt(this.division.getCode());
-				break;
-			case UPDATE_FLAGS:
-				netByteBuf.writeUnsignedByte(0x00); // Flags
-				break;
-			case REMOVE:
-			default:
-				break;
-		}
-	}
-}

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

@@ -0,0 +1,50 @@
+package mc.protocol.packets.server;
+
+import lombok.Data;
+import mc.protocol.io.NetByteBuf;
+import mc.protocol.model.text.Text;
+import mc.protocol.packets.ServerSidePacket;
+import mc.protocol.serializer.TextSerializer;
+
+/**
+ * Установка текста для "шапки" и "подвала" Tab-листа.
+ *
+ * <p>Структура пакета</p>
+ * <pre>
+ * | FIELD  | TYPE | NOTES |
+ * |--------|------|-------|
+ * | Header | Text |       |
+ * | Footer | Text |       |
+ * </pre>
+ *
+ * <p>Для удаления "шапки" и/или "подвала", нужно отправить следующий {@link Text} компонент:</p>
+ * <pre>
+ * {"translate":""}
+ * </pre>
+ *
+ * @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Player_List_Header_And_Footer">Player List Header And Footer</a>
+ * @see PlayerListItemPacket
+ */
+@Data
+public class PlayerListHeaderAndFooterPacket implements ServerSidePacket {
+
+	private static final String REMOVE_COMPONENT = "{\"translate\":\"\"}";
+
+	private Text header;
+	private Text foother;
+
+	@Override
+	public void writeSelf(NetByteBuf netByteBuf) {
+		if (this.header == null) {
+			netByteBuf.writeString(REMOVE_COMPONENT);
+		} else {
+			netByteBuf.writeString(TextSerializer.toJsonObject(this.header).toString());
+		}
+
+		if (this.foother == null) {
+			netByteBuf.writeString(REMOVE_COMPONENT);
+		} else {
+			netByteBuf.writeString(TextSerializer.toJsonObject(this.foother).toString());
+		}
+	}
+}

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

@@ -0,0 +1,172 @@
+package mc.protocol.packets.server;
+
+import lombok.*;
+import mc.protocol.io.NetByteBuf;
+import mc.protocol.packets.ServerSidePacket;
+import mc.protocol.utils.GameMode;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.UUID;
+import java.util.function.BiConsumer;
+
+/**
+ * Player List Item packet.
+ *
+ * <p>Обновление списка игроков, по кнопке TAB.</p>
+ *
+ * <p>Структура пакета</p>
+ * <pre>
+ * | FIELD             | TYPE        | NOTES                                           |
+ * |-------------------|-------------|-------------------------------------------------|
+ * | Action            | VarInt      | Определяет поля для секции "Player"             |
+ * | Number of players | VarInt      | Количество элементов в секции "Players"         |
+ * | Players           | Array       | Перечисление полей для каждого игрока (player). |
+ * |                   |             | Поля определяются по "Action"                   |
+ * </pre>
+ *
+ * <p>Варианты "Action"</p>
+ * <pre>
+ * | ACTION                      | PLAYER FIELD         | TYPE        | NOTES                                              |
+ * | VALUE | DESCRIPTION         |                      |             |                                                    |
+ * |-------|---------------------|----------------------|-------------|----------------------------------------------------|
+ * | 0     | add player          | UUID                 | UUID        |                                                    |
+ * |       |                     | Name                 | String (16) |                                                    |
+ * |       |                     | Number Of Properties | VarInt      | Количество элементов "Properties"                  |
+ * |       |                     | Properties           | -           | см. поля ниже                                      |
+ * |       |                     | Gamemode             | VarInt      |                                                    |
+ * |       |                     | Ping                 | VarInt      | в милисекундах                                     |
+ * |       |                     | Has Display Name     | Boolean     |                                                    |
+ * |       |                     | Display Name         | Text        | Опционально. Только если "Has Display Name" = true |
+ * | 1     | update gamemode     | UUID                 | UUID        |                                                    |
+ * |       |                     | Gamemode             | VarInt      |                                                    |
+ * | 2     | update latency      | UUID                 | UUID        |                                                    |
+ * |       |                     | Ping                 | VarInt      | (см. выше)                                         |
+ * | 3     | update display name | UUID                 | UUID        |                                                    |
+ * |       |                     | Has Display Name     | Boolean     |                                                    |
+ * |       |                     | Display Name         | Text        | (см. выше)                                         |
+ * | 4     | remove player       | UUID                 | UUID        |                                                    |
+ * </pre>
+ *
+ * <p>Поля секции "Properties"</p>
+ * <pre>
+ * | FIELD     | TYPE           | NOTES                                       |
+ * |-----------|-------------   |---------------------------------------------|
+ * | Name      | String (32767) |                                             |
+ * | Value     | String (32767) |                                             |
+ * | Is Signed | Boolean        |                                             |
+ * | Signature | String (32767) | Опционально. Только если "Is Signed" = true |
+ * </pre>
+ *
+ * @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Player_List_Item">Player List Item</a>
+ * @see PlayerListHeaderAndFooterPacket
+ */
+@Data
+public class PlayerListItemPacket implements ServerSidePacket {
+
+	private final List<PlayerItem> playerItems = new ArrayList<>();
+
+	private Action action;
+
+	@Override
+	public void writeSelf(NetByteBuf netByteBuf) {
+		netByteBuf.writeVarInt(this.action.getCode());
+		netByteBuf.writeVarInt(playerItems.size());
+
+		BiConsumer<NetByteBuf, PlayerItem> consumer = null;
+		switch (this.action) {
+			//@formatter:off
+			case ADD_PLAYER: consumer = this::addPlayer; break;
+			case UPDATE_GAMEMODE: consumer = this::updateGamemode; break;
+			case UPDATE_LATENCY: consumer = this::updateLatency; break;
+			case UPDATE_DISPLAY_NAME: consumer = this::updateDisplayName; break;
+			case REMOVE_PLAYER: consumer = this::removePlayer; break;
+			//@formatter:on
+		}
+
+		Objects.requireNonNull(consumer);
+
+		for (PlayerItem playerItem : playerItems) {
+			consumer.accept(netByteBuf, playerItem);
+		}
+	}
+
+	private void addPlayer(NetByteBuf netByteBuf, PlayerItem playerItem) {
+		netByteBuf.writeUUID(playerItem.getUuid());
+		netByteBuf.writeString(playerItem.getName());
+		netByteBuf.writeVarInt(playerItem.getProperties().size());
+
+		for (PlayerProperties property : playerItem.getProperties()) {
+			netByteBuf.writeString(property.getName());
+			netByteBuf.writeString(property.getValue());
+			netByteBuf.writeBoolean(property.getIsSigned());
+			if (property.getIsSigned()) {
+				netByteBuf.writeString(property.getSignature());
+			}
+		}
+
+		netByteBuf.writeVarInt(playerItem.getGamemode().getId());
+		netByteBuf.writeVarInt(playerItem.getPing());
+		netByteBuf.writeBoolean(playerItem.getHasDisplayName());
+		if (playerItem.getHasDisplayName()) {
+			netByteBuf.writeString(playerItem.getDisplayName());
+		}
+	}
+
+	private void updateGamemode(NetByteBuf netByteBuf, PlayerItem playerItem) {
+		netByteBuf.writeUUID(playerItem.getUuid());
+		netByteBuf.writeVarInt(playerItem.getGamemode().getId());
+	}
+
+	private void updateLatency(NetByteBuf netByteBuf, PlayerItem playerItem) {
+		netByteBuf.writeUUID(playerItem.getUuid());
+		netByteBuf.writeVarInt(playerItem.getPing());
+	}
+
+	private void updateDisplayName(NetByteBuf netByteBuf, PlayerItem playerItem) {
+		netByteBuf.writeUUID(playerItem.getUuid());
+		netByteBuf.writeBoolean(playerItem.getHasDisplayName());
+		if (playerItem.getHasDisplayName()) {
+			netByteBuf.writeString(playerItem.getDisplayName());
+		}
+	}
+
+	private void removePlayer(NetByteBuf netByteBuf, PlayerItem playerItem) {
+		netByteBuf.writeUUID(playerItem.getUuid());
+	}
+
+	@RequiredArgsConstructor
+	public enum Action {
+		ADD_PLAYER(0),
+		UPDATE_GAMEMODE(1),
+		UPDATE_LATENCY(2),
+		UPDATE_DISPLAY_NAME(3),
+		REMOVE_PLAYER(4);
+
+		@Getter
+		private final int code;
+	}
+
+	@Builder(builderClassName = "Builder")
+	@Value
+	public static class PlayerItem {
+		List<PlayerProperties> properties = new ArrayList<>();
+
+		UUID uuid;
+		String name;
+		GameMode gamemode;
+		Integer ping;
+		Boolean hasDisplayName;
+		String displayName;
+	}
+
+	@Builder(builderClassName = "Builder")
+	@Value
+	public static class PlayerProperties {
+		String name;
+		String value;
+		Boolean isSigned;
+		String signature;
+	}
+}

protocol/src/main/java/mc/protocol/utils/BossBarAction.java

@@ -1,17 +0,0 @@
-package mc.protocol.utils;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-@RequiredArgsConstructor
-public enum BossBarAction {
-	ADD(0),
-	REMOVE(1),
-	UPDATE_HEALTH(2),
-	UPDATE_TITLE(3),
-	UPDATE_STYLE(4),
-	UPDATE_FLAGS(5);
-
-	@Getter
-	private final int code;
-}

protocol/src/main/java/mc/protocol/utils/BossBarColor.java

@@ -1,18 +0,0 @@
-package mc.protocol.utils;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-@RequiredArgsConstructor
-public enum BossBarColor {
-	PINK(0),
-	BLUE(1),
-	RED(2),
-	GREEN(3),
-	YELLOW(4),
-	PURPLE(5),
-	WHITE(6);
-
-	@Getter
-	private final int code;
-}

protocol/src/main/java/mc/protocol/utils/BossBarDivision.java

@@ -1,17 +0,0 @@
-package mc.protocol.utils;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-@RequiredArgsConstructor
-@SuppressWarnings("java:S115")
-public enum BossBarDivision {
-	NONE(0),
-	_6(1),
-	_10(2),
-	_12(3),
-	_20(4);
-
-	@Getter
-	private final int code;
-}

protocol/src/main/java/mc/protocol/utils/EntityActionAction.java

@@ -0,0 +1,33 @@
+package mc.protocol.utils;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import javax.annotation.Nullable;
+
+@RequiredArgsConstructor
+public enum EntityActionAction {
+	START_SNEAKING(0),
+	STOP_SNEAKING(1),
+	LEAVE_BED(2),
+	START_SPRINTING(3),
+	STOP_SPRINTING(4),
+	START_JUMP_WITH_HORSE(5),
+	STOP_JUMP_WITH_HORSE(6),
+	OPEN_HORSE_INVENTORY(7),
+	START_FLYING_WITH_ELYTRA(8);
+
+	@Nullable
+	public static EntityActionAction valueOfCode(int code) {
+		for (EntityActionAction action : EntityActionAction.values()) {
+			if (action.code == code) {
+				return action;
+			}
+		}
+
+		return null;
+	}
+
+	@Getter
+	private final int code;
+}

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

@@ -8,13 +8,16 @@ import mc.protocol.model.Location;
 import mc.protocol.model.Look;
 import mc.protocol.model.ServerInfo;
 import mc.protocol.model.text.Text;
+import mc.protocol.model.text.TextColor;
 import mc.protocol.packets.PingPacket;
 import mc.protocol.packets.client.HandshakePacket;
 import mc.protocol.packets.client.LoginStartPacket;
 import mc.protocol.packets.client.StatusServerRequestPacket;
 import mc.protocol.packets.server.*;
 import mc.protocol.serializer.TextSerializer;
-import mc.protocol.utils.*;
+import mc.protocol.utils.Difficulty;
+import mc.protocol.utils.GameMode;
+import mc.protocol.utils.LevelType;
 import mc.server.config.Config;
 import org.apache.commons.io.IOUtils;
 
@@ -67,23 +70,27 @@ public class PacketHandler {
 	}
 
 	public void onLoginStart(ConnectionContext context, LoginStartPacket loginStartPacket) {
+		var playerUuid = UUID.randomUUID();
+		var playerName = loginStartPacket.getName();
+		var playerGamemode = GameMode.SURVIVAL;
+
 		var loginSuccessPacket = new LoginSuccessPacket();
-		loginSuccessPacket.setUuid(UUID.randomUUID());
-		loginSuccessPacket.setName(loginStartPacket.getName());
+		loginSuccessPacket.setUuid(playerUuid);
+		loginSuccessPacket.setName(playerName);
 
 		context.sendNow(loginSuccessPacket);
 		context.setState(State.PLAY);
 
 		var joinGamePacket = new JoinGamePacket();
 		joinGamePacket.setEntityId(random.nextInt());
-		joinGamePacket.setGameMode(GameMode.SPECTATOR);
+		joinGamePacket.setGameMode(playerGamemode);
 		joinGamePacket.setDimension(0/*Overworld*/);
 		joinGamePacket.setDifficulty(Difficulty.PEACEFUL);
 		joinGamePacket.setLevelType(LevelType.FLAT);
 
 		context.send(joinGamePacket);
 
-		Location spawnLocation = new Location(0d, 63d, 0d);
+		Location spawnLocation = new Location(7d, 130d, 7d);
 
 		var spawnPositionPacket = new SpawnPositionPacket();
 		spawnPositionPacket.setSpawn(spawnLocation);
@@ -124,15 +131,30 @@ public class PacketHandler {
 
 		// -- Эксперименты -- //
 
-		BossBarPacket boss1 = new BossBarPacket();
-		boss1.setUuid(UUID.randomUUID());
-		boss1.setAction(BossBarAction.ADD);
-		boss1.setTitle(Text.of("BOSS-1"));
-		boss1.setHealth(1.0f);
-		boss1.setColor(BossBarColor.RED);
-		boss1.setDivision(BossBarDivision.NONE);
+		var playerListItemPacket = new PlayerListItemPacket();
+		playerListItemPacket.setAction(PlayerListItemPacket.Action.ADD_PLAYER);
+		playerListItemPacket.getPlayerItems().add(PlayerListItemPacket.PlayerItem.builder()
+				.uuid(playerUuid)
+				.name(playerName)
+				.gamemode(playerGamemode)
+				.ping(100)
+				.hasDisplayName(false)
+				.build());
 
-		context.sendNow(boss1);
+		context.send(playerListItemPacket);
+
+		var playerListHeaderAndFooterPacket = new PlayerListHeaderAndFooterPacket();
+		playerListHeaderAndFooterPacket.setHeader(Text.builder()
+				.append("") //TODO bug component
+				.append(Text.of(TextColor.GREEN, "==="))
+				.append(Text.of(TextColor.RED, " MC-PROJECT "))
+				.append(Text.of(TextColor.GREEN, "==="))
+				.build());
+		playerListHeaderAndFooterPacket.setFoother(Text.of(TextColor.GRAY, "develop by DmitriyMX"));
+
+		context.send(playerListHeaderAndFooterPacket);
+
+		context.flushSending();
 	}
 
 	private static String faviconToBase64(Path iconPath) {