BossBarPacket

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

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

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

@@ -1,52 +0,0 @@
-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/client/UpdateSignPacket.java

@@ -1,57 +0,0 @@
-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.model.Location;
-import mc.protocol.packets.ClientSidePacket;
-import mc.protocol.packets.server.OpenSignEditorPacket;
-import mc.protocol.serializer.LocationSerializer;
-
-/**
- * Update Sign packet.
- *
- * <p>Отправляется клиентом, когда нажата кнопка "Done" в окне редактирования таблички.</p>
- *
- * <p>Структура пакета</p>
- * <pre>
- * | FIELD    | TYPE         | NOTES                          |
- * |----------|--------------|--------------------------------|
- * | Location | Location     | Позиция редактируемой табилчки |
- * | Line 1   | String (384) | Строка таблички                |
- * | Line 2   | String (384) | Строка таблички                |
- * | Line 3   | String (384) | Строка таблички                |
- * | Line 4   | String (384) | Строка таблички                |
- * </pre>
- *
- * @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Update_Sign" target="_top">Update Sign</a>
- * @see OpenSignEditorPacket
- */
-@NoArgsConstructor
-@Getter
-@EqualsAndHashCode
-@ToString
-public class UpdateSignPacket implements ClientSidePacket {
-
-	private Location location;
-	@SuppressWarnings("MismatchedReadAndWriteOfArray")
-	private String[] lines;
-
-	@Override
-	public void readSelf(NetByteBuf netByteBuf) {
-		this.location = LocationSerializer.fromLongValue(netByteBuf.readLong());
-		this.lines = new String[4];
-		this.lines[0] = netByteBuf.readString(384);
-		this.lines[1] = netByteBuf.readString(384);
-		this.lines[2] = netByteBuf.readString(384);
-		this.lines[3] = netByteBuf.readString(384);
-	}
-
-	@Override
-	public void passivate() {
-		this.location = null;
-		this.lines = null;
-	}
-}

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

@@ -0,0 +1,117 @@
+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/OpenSignEditorPacket.java

@@ -1,33 +0,0 @@
-package mc.protocol.packets.server;
-
-import lombok.Data;
-import mc.protocol.io.NetByteBuf;
-import mc.protocol.model.Location;
-import mc.protocol.packets.ServerSidePacket;
-import mc.protocol.packets.client.UpdateSignPacket;
-import mc.protocol.serializer.LocationSerializer;
-
-/**
- * Открыть окно редактирования таблички.
- *
- * <p>Структура пакета</p>
- * <pre>
- * | FIELD    | TYPE     | NOTES |
- * |----------|----------|-------|
- * | Location | Location |       |
- * </pre>
- *
- * @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Open_Sign_Editor">Open Sign Editor</a>
- * @see UpdateSignPacket
- */
-@Data
-public class OpenSignEditorPacket implements ServerSidePacket {
-
-	private Location location;
-
-	@Override
-	public void writeSelf(NetByteBuf netByteBuf) {
-		long value = LocationSerializer.toLongValue(this.location);
-		netByteBuf.writeLong(value);
-	}
-}

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

@@ -4,7 +4,6 @@ import lombok.Data;
 import mc.protocol.io.NetByteBuf;
 import mc.protocol.model.Location;
 import mc.protocol.packets.ServerSidePacket;
-import mc.protocol.serializer.LocationSerializer;
 
 /**
  * Спавн позиция игрока.
@@ -15,7 +14,7 @@ import mc.protocol.serializer.LocationSerializer;
  * <pre>
  * | FIELD    | TYPE     | NOTES                 |
  * |----------|----------|-----------------------|
- * | Location | Location | Локация спавна игрока |
+ * | Location | Position | Локация спавна игрока |
  * </pre>
  *
  * @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Spawn_Position">Spawn Position</a>
@@ -27,7 +26,16 @@ public class SpawnPositionPacket implements ServerSidePacket {
 
 	@Override
 	public void writeSelf(NetByteBuf netByteBuf) {
-		long spawnSerialized = LocationSerializer.toLongValue(this.spawn);
+		long spawnSerialized =
+				((long) (floorDouble(spawn.getX()) & 0x3FFFFFF) << 38)
+				| ((long) (floorDouble(spawn.getY()) & 0xFFF) << 26)
+				| (floorDouble(spawn.getZ()) & 0x3FFFFFF);
 		netByteBuf.writeLong(spawnSerialized);
 	}
+
+	private static int floorDouble(double value) {
+		int i = (int) value;
+		return value < (double) i ? i - 1 : i;
+	}
+
 }

protocol/src/main/java/mc/protocol/serializer/LocationSerializer.java

@@ -1,26 +0,0 @@
-package mc.protocol.serializer;
-
-import lombok.experimental.UtilityClass;
-import mc.protocol.model.Location;
-
-@UtilityClass
-public class LocationSerializer {
-
-	public long toLongValue(Location location) {
-		return ((long) (floorDouble(location.getX()) & 0x3FFFFFF) << 38)
-				| ((long) (floorDouble(location.getY()) & 0xFFF) << 26)
-				| (floorDouble(location.getZ()) & 0x3FFFFFF);
-	}
-
-	public Location fromLongValue(long value) {
-		return new Location(
-				value >> 38,
-				(value >> 26) & 0xFFF,
-				value << 38 >> 38);
-	}
-
-	private static int floorDouble(double value) {
-		int i = (int) value;
-		return value < (double) i ? i - 1 : i;
-	}
-}

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

@@ -0,0 +1,17 @@
+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

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,17 @@
+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

@@ -1,33 +0,0 @@
-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

@@ -7,15 +7,14 @@ 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;
 import mc.protocol.packets.client.StatusServerRequestPacket;
 import mc.protocol.packets.server.*;
 import mc.protocol.serializer.TextSerializer;
-import mc.protocol.utils.Difficulty;
+import mc.protocol.utils.*;
-import mc.protocol.utils.GameMode;
-import mc.protocol.utils.LevelType;
 import mc.server.config.Config;
 import org.apache.commons.io.IOUtils;
 
@@ -77,14 +76,14 @@ public class PacketHandler {
 
 		var joinGamePacket = new JoinGamePacket();
 		joinGamePacket.setEntityId(random.nextInt());
-		joinGamePacket.setGameMode(GameMode.SURVIVAL);
+		joinGamePacket.setGameMode(GameMode.SPECTATOR);
 		joinGamePacket.setDimension(0/*Overworld*/);
 		joinGamePacket.setDifficulty(Difficulty.PEACEFUL);
 		joinGamePacket.setLevelType(LevelType.FLAT);
 
 		context.send(joinGamePacket);
 
-		Location spawnLocation = new Location(7d, 130d, 7d);
+		Location spawnLocation = new Location(0d, 63d, 0d);
 
 		var spawnPositionPacket = new SpawnPositionPacket();
 		spawnPositionPacket.setSpawn(spawnLocation);
@@ -125,10 +124,15 @@ public class PacketHandler {
 
 		// -- Эксперименты -- //
 
-		var openSignEditorPacket = new OpenSignEditorPacket();
+		BossBarPacket boss1 = new BossBarPacket();
-		openSignEditorPacket.setLocation(spawnLocation);
+		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);
 
-		context.sendNow(openSignEditorPacket);
+		context.sendNow(boss1);
 	}
 
 	private static String faviconToBase64(Path iconPath) {