Scoreboard works

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

@@ -54,9 +54,12 @@ public enum State {
 			),
 			// client bound
 			Map.of(
-					BossBarPacket.class, 0x0C,
 					PingPacket.class, 0x1F,
 					JoinGamePacket.class, 0x23,
+					ScoreboardDisplayPacket.class, 0x3B,
+					ScoreboardObjectivePacket.class, 0x42,
+					TeamsPacket.class, 0x44,
+					ScoreboardUpdateScorePacket.class, 0x45,
 					SpawnPositionPacket.class, 0x46,
 					ChunkDataPacket.class, 0x20,
 					PlayerAbilitiesPacket.class,0x2C,

protocol/src/main/java/mc/protocol/io/NetByteBuf.java

@@ -99,6 +99,11 @@ public class NetByteBuf extends ByteBuf {
 	}
 
 	public void writeString(String string) {
+		if (string == null) {
+			writeVarInt(0);
+			return;
+		}
+
 		byte[] buf = string.getBytes(StandardCharsets.UTF_8);
 
 		if (buf.length > Short.MAX_VALUE) {

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/ScoreboardDisplayPacket.java

@@ -0,0 +1,39 @@
+package mc.protocol.packets.server;
+
+import lombok.Data;
+import mc.protocol.io.NetByteBuf;
+import mc.protocol.packets.ServerSidePacket;
+
+/**
+ * Отображение Scoreboard.
+ *
+ * <p>Структура пакета</p>
+ * <pre>
+ * | FIELD      | TYPE        | NOTES                          |
+ * |------------|-------------|--------------------------------|
+ * | Position   | Byte        | Положение:                     |
+ * |            |             | 0 - list                       |
+ * |            |             | 1 - sidebar                    |
+ * |            |             | 2 - below name                 |
+ * |            |             | 3-18 - team specific sidebar   |
+ * | Score Name | String (16) | Уникальное название Scoreboard |
+ * </pre>
+ *
+ * @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Display_Scoreboard" target="_top">Display Scoreboard</a>
+ */
+@Data
+public class ScoreboardDisplayPacket implements ServerSidePacket {
+
+	private int position;
+	private String scoreName;
+
+	public void setPosition(int position) {
+		this.position = (position < 0) ? 0 : (Math.min(position, 18));
+	}
+
+	@Override
+	public void writeSelf(NetByteBuf netByteBuf) {
+		netByteBuf.writeByte(this.position);
+		netByteBuf.writeString(this.scoreName);
+	}
+}

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

@@ -0,0 +1,44 @@
+package mc.protocol.packets.server;
+
+import lombok.Data;
+import mc.protocol.io.NetByteBuf;
+import mc.protocol.packets.ServerSidePacket;
+import mc.protocol.utils.ScoreboardObjectiveMode;
+import mc.protocol.utils.ScoreboardObjectiveType;
+
+/**
+ * Scoreboard objective packet.
+ *
+ * <p>Структура пакета</p>
+ * <pre>
+ * | FIELD           | TYPE        | NOTES                                             |
+ * |-----------------|-------------|---------------------------------------------------|
+ * | Objective Name  | String (16) | Уникальное наименование цели (objective)          |
+ * | Mode            | Byte        | 0 - создание Scoreboard                           |
+ * |                 |             | 1 - удаление Scoreboard                           |
+ * |                 |             | 2 - обновление Scoreboard                         |
+ * | Objective Value | String (32) | Если "Mode" равен 0 или 2. Отображаемый текст     |
+ * | Type            | String (16) | Если "Mode" равен 0 или 2. "integer" или "hearts" |
+ * </pre>
+ *
+ * @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Scoreboard_Objective" target="_top">Scoreboard Objective</a>
+ */
+@Data
+public class ScoreboardObjectivePacket implements ServerSidePacket {
+
+	private String objectiveName;
+	private ScoreboardObjectiveMode mode;
+	private String objectiveValue;
+	private ScoreboardObjectiveType type;
+
+	@Override
+	public void writeSelf(NetByteBuf netByteBuf) {
+		netByteBuf.writeString(this.objectiveName);
+		netByteBuf.writeByte(this.mode.getCode());
+
+		if (ScoreboardObjectiveMode.CREATE.equals(this.mode) || ScoreboardObjectiveMode.UPDATE.equals(this.mode)) {
+			netByteBuf.writeString(this.objectiveValue);
+			netByteBuf.writeString(this.type.name().toLowerCase());
+		}
+	}
+}

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

@@ -0,0 +1,43 @@
+package mc.protocol.packets.server;
+
+import lombok.Data;
+import mc.protocol.io.NetByteBuf;
+import mc.protocol.packets.ServerSidePacket;
+import mc.protocol.utils.ScoreboardUpdateScoreAction;
+
+/**
+ * Update score packet.
+ *
+ * <p>Структура пакета</p>
+ * <pre>
+ * | FIELD           | TYPE        | NOTES                                              |
+ * |-----------------|-------------|--------------------------------------------------- |
+ * | Entity Name     | String (40) | Сущность, которой принадлежит счет (score).        |
+ * |                 |             | Для Игроков - это ник                              |
+ * |                 |             | Для других сущностей - это UUID                    |
+ * | Action          | Byte        | 0 - создать или обновить счет (score); 1 - удалить |
+ * | Objective Name  | String (16) | Имя сущности, которой принадлежит счет (score)     |
+ * | Value           | VarInt      | Если "Action" = 0. Значение счета (score)          |
+ * </pre>
+ *
+ * @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Update_Score" target="_top">Update Score</a>
+ */
+@Data
+public class ScoreboardUpdateScorePacket implements ServerSidePacket {
+
+	private String entityName;
+	private ScoreboardUpdateScoreAction action;
+	private String objective;
+	private int value;
+
+	@Override
+	public void writeSelf(NetByteBuf netByteBuf) {
+		netByteBuf.writeString(this.entityName);
+		netByteBuf.writeByte(this.action.getCode());
+		netByteBuf.writeString(this.objective);
+
+		if (ScoreboardUpdateScoreAction.CREATE_OR_UPDATE.equals(this.action)) {
+			netByteBuf.writeVarInt(this.value);
+		}
+	}
+}

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

@@ -0,0 +1,119 @@
+package mc.protocol.packets.server;
+
+import lombok.Data;
+import mc.protocol.io.NetByteBuf;
+import mc.protocol.packets.ServerSidePacket;
+import mc.protocol.utils.TeamsCollisionRule;
+import mc.protocol.utils.TeamsMode;
+import mc.protocol.utils.TeamsNameTagVisibility;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Teams packet.
+ *
+ * <p>Структура пакета</p>
+ * <pre>
+ * | FIELD       | TYPE        | NOTES                                                 |
+ * |------------ |-------------|-------------------------------------------------------|
+ * | Team Name   | String (16) | Уникальное название команды (совместно со scoreboard) |
+ * | Mode        | Byte        | Режим. Определяет остальые поля пакета                |
+ * | Data Fields | -           | Определяется "Mode"                                   |
+ * </pre>
+ *
+ * <p>Варианты "Mode"</p>
+ * <pre>
+ * | MODE                             | DATA FIELD          | TYPE                 | NOTES                                             |
+ * | VALUE | DESCRIPTION              |                     |                      |                                                   |
+ * |-------|--------------------------|---------------------|----------------------|---------------------------------------------------|
+ * | 0     | create team              | Team Display Name   | String (32)          |                                                   |
+ * |       |                          | Team Prefix         | String (16)          | Отображается перед именем игроков текущей команды |
+ * |       |                          | Team Suffix         | String (16)          | Отображается после имени игроков текущей команды  |
+ * |       |                          | Friendly Flags      | Byte                 | Битовая маска:                                    |
+ * |       |                          |                     |                      | 0x01 - разрешён friendly fire                     |
+ * |       |                          |                     |                      | 0x02 - могут видеть невидимок своей команды       |
+ * |       |                          | Name Tag Visibility | String (32)          | фиксированные значения:                           |
+ * |       |                          |                     |                      | - always                                          |
+ * |       |                          |                     |                      | - hideForOtherTeams                               |
+ * |       |                          |                     |                      | - hideForOwnTeam                                  |
+ * |       |                          |                     |                      | - never                                           |
+ * |       |                          | Collision Rule      | String (32)          | фиксированные значения:                           |
+ * |       |                          |                     |                      | - always                                          |
+ * |       |                          |                     |                      | - pushOtherTeams                                  |
+ * |       |                          |                     |                      | - pushOwnTeam                                     |
+ * |       |                          |                     |                      | - never                                           |
+ * |       |                          | Color               | Byte                 | For colors, the same Chat colors (0-15).          |
+ * |       |                          |                     |                      | -1 indicates RESET/no color.                      |
+ * |       |                          | Entity Count        | VarInt               | Количество элементов в поле "Entities"            |
+ * |       |                          | Entities            | Array of String (40) | Уникальные идентификаторы участников команды.     |
+ * |       |                          |                     |                      | Для Игроков - это Имена                           |
+ * |       |                          |                     |                      | Для любых других сущностей - это UUID             |
+ * | 1     | remove team              | -                   | -                    | удаление текущей команды                          |
+ * | 2     | update team info         | Team Display Name   | String (32)          |                                                   |
+ * |       |                          | Team Prefix         | String (16)          | (см. выше)                                        |
+ * |       |                          | Team Suffix         | String (16)          | (см. выше)                                        |
+ * |       |                          | Friendly Flags      | Byte                 | (см. выше)                                        |
+ * |       |                          | Name Tag Visibility | String (32)          | (см. выше)                                        |
+ * |       |                          | Collision Rule      | String (32)          | (см. выше)                                        |
+ * |       |                          | Color               | Byte                 | (см. выше)                                        |
+ * | 3     | add players to team      | Entity Count        | VarInt               | (см. выше)                                        |
+ * |       |                          | Entities            | Array of String (40) | (см. выше)                                        |
+ * | 4     | remove players from team | Entity Count        | VarInt               | (см. выше)                                        |
+ * |       |                          | Entities            | Array of String (40) | (см. выше)                                        |
+ * </pre>
+ *
+ * @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Teams" target="_top">Teams</a>
+ */
+@Data
+public class TeamsPacket implements ServerSidePacket {
+
+	private final List<String> members = new ArrayList<>();
+
+	private String name;
+	private TeamsMode mode;
+
+	private String displayName;
+	private String prefix;
+	private String suffix;
+	private TeamsNameTagVisibility nameTagVisibility;
+	private TeamsCollisionRule collisionRule;
+	private int color;
+
+	@Override
+	public void writeSelf(NetByteBuf netByteBuf) {
+		netByteBuf.writeString(this.name);
+		netByteBuf.writeByte(this.mode.getCode());
+
+		switch (this.mode) {
+			case CREATE:
+				netByteBuf.writeString(this.displayName);
+				netByteBuf.writeString(this.prefix);
+				netByteBuf.writeString(this.suffix);
+				netByteBuf.writeByte(0); // Friendly Flags
+				netByteBuf.writeString(this.nameTagVisibility.getCode());
+				netByteBuf.writeString(this.collisionRule.getCode());
+				netByteBuf.writeByte(this.color);
+				netByteBuf.writeVarInt(this.members.size());
+				this.members.forEach(netByteBuf::writeString);
+				break;
+			case UPDATE:
+				netByteBuf.writeString(this.displayName);
+				netByteBuf.writeString(this.prefix);
+				netByteBuf.writeString(this.suffix);
+				netByteBuf.writeByte(0); // Friendly Flags
+				netByteBuf.writeString(this.nameTagVisibility.getCode());
+				netByteBuf.writeString(this.collisionRule.getCode());
+				netByteBuf.writeByte(this.color);
+				break;
+			case ADD_MEMBER:
+			case REMOVE_MEMBER:
+				netByteBuf.writeVarInt(this.members.size());
+				this.members.forEach(netByteBuf::writeString);
+				break;
+			case REMOVE:
+			default:
+				break;
+		}
+	}
+}

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

@@ -4,13 +4,10 @@ import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
-public enum BossBarAction {
-	ADD(0),
+public enum ScoreboardObjectiveMode {
+	CREATE(0),
 	REMOVE(1),
-	UPDATE_HEALTH(2),
-	UPDATE_TITLE(3),
-	UPDATE_STYLE(4),
-	UPDATE_FLAGS(5);
+	UPDATE(2);
 
 	@Getter
 	private final int code;

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

@@ -0,0 +1,6 @@
+package mc.protocol.utils;
+
+public enum ScoreboardObjectiveType {
+	INTEGER,
+	HEARTS
+}

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

@@ -0,0 +1,10 @@
+package mc.protocol.utils;
+
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class ScoreboardPosition {
+	public final int LIST = 0;
+	public final int SIDEBAR = 1;
+	public final int BELOW_NAME = 2;
+}

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

@@ -4,14 +4,9 @@ import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
-public enum BossBarColor {
-	PINK(0),
-	BLUE(1),
-	RED(2),
-	GREEN(3),
-	YELLOW(4),
-	PURPLE(5),
-	WHITE(6);
+public enum ScoreboardUpdateScoreAction {
+	CREATE_OR_UPDATE(0),
+	REMOVE(1);
 
 	@Getter
 	private final int code;

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

@@ -0,0 +1,15 @@
+package mc.protocol.utils;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public enum TeamsCollisionRule {
+	ALWAYS("always"),
+	PUSH_OTHER_TEAMS("pushOtherTeams"),
+	PUSH_OWN_TEAM("pushOwnTeam"),
+	NEVER("never");
+
+	@Getter
+	private final String code;
+}

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

@@ -4,13 +4,12 @@ import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
-@SuppressWarnings("java:S115")
-public enum BossBarDivision {
-	NONE(0),
-	_6(1),
-	_10(2),
-	_12(3),
-	_20(4);
+public enum TeamsMode {
+	CREATE(0),
+	REMOVE(1),
+	UPDATE(2),
+	ADD_MEMBER(3),
+	REMOVE_MEMBER(4);
 
 	@Getter
 	private final int code;

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

@@ -0,0 +1,15 @@
+package mc.protocol.utils;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public enum TeamsNameTagVisibility {
+	ALWAYS("always"),
+	HIDE_FOR_OTHER_TEAMS("hideForOtherTeams"),
+	HIDE_FOR_OWN_TEAM("hideForOwnTeam"),
+	NEVER("never");
+
+	@Getter
+	private final String code;
+}

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

@@ -7,7 +7,6 @@ import mc.protocol.api.ConnectionContext;
 import mc.protocol.model.Location;
 import mc.protocol.model.Look;
 import mc.protocol.model.ServerInfo;
-import mc.protocol.model.text.Text;
 import mc.protocol.packets.PingPacket;
 import mc.protocol.packets.client.HandshakePacket;
 import mc.protocol.packets.client.LoginStartPacket;
@@ -67,15 +66,19 @@ public class PacketHandler {
 	}
 
 	public void onLoginStart(ConnectionContext context, LoginStartPacket loginStartPacket) {
+		UUID playerUuid = UUID.randomUUID();
+		int playerEid = random.nextInt();
+		String playerName = loginStartPacket.getName();
+
 		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.setEntityId(playerEid);
 		joinGamePacket.setGameMode(GameMode.SPECTATOR);
 		joinGamePacket.setDimension(0/*Overworld*/);
 		joinGamePacket.setDifficulty(Difficulty.PEACEFUL);
@@ -122,17 +125,33 @@ public class PacketHandler {
 
 		context.flushSending();
 
-		// -- Эксперименты -- //
+		// --- Эксперименты --- //
 
-		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);
+		String scoreboardName = "Score::List";
 
-		context.sendNow(boss1);
+		var scoreboardObjectivePacket = new ScoreboardObjectivePacket();
+		scoreboardObjectivePacket.setObjectiveName(scoreboardName);
+		scoreboardObjectivePacket.setMode(ScoreboardObjectiveMode.CREATE);
+		scoreboardObjectivePacket.setObjectiveValue(scoreboardName);
+		scoreboardObjectivePacket.setType(ScoreboardObjectiveType.INTEGER);
+
+		context.send(scoreboardObjectivePacket);
+
+		var scoreboardDisplayPacket = new ScoreboardDisplayPacket();
+		scoreboardDisplayPacket.setPosition(ScoreboardPosition.SIDEBAR);
+		scoreboardDisplayPacket.setScoreName(scoreboardName);
+
+		context.send(scoreboardDisplayPacket);
+
+		var scoreboardUpdateScorePacket = new ScoreboardUpdateScorePacket();
+		scoreboardUpdateScorePacket.setEntityName(playerName);
+		scoreboardUpdateScorePacket.setAction(ScoreboardUpdateScoreAction.CREATE_OR_UPDATE);
+		scoreboardUpdateScorePacket.setObjective(scoreboardName);
+		scoreboardUpdateScorePacket.setValue(100500);
+
+		context.send(scoreboardUpdateScorePacket);
+
+		context.flushSending();
 	}
 
 	private static String faviconToBase64(Path iconPath) {