CCloseWindowPacket

OpenWindowPacket
2021-05-08 21:08:14 +03:00 · 2021-05-08 20:54:50 +03:00
6 changed files with 103 additions and 256 deletions
--- a/protocol/src/main/java/mc/protocol/State.java
+++ b/protocol/src/main/java/mc/protocol/State.java
@@ -46,6 +46,7 @@ public enum State {
 			Map.of(
 					0x00, TeleportConfirmPacket.class,
 					0x04, ClientSettingsPacket.class,
+					0x08, CCloseWindowPacket.class,
 					0x09, PluginMessagePacket.class,
 					0x0B, PingPacket.class,
 					0x0D, PlayerPositionPacket.class,
@@ -55,14 +56,13 @@ public enum State {
 			),
 			// client bound
 			Map.of(
+					OpenWindowPacket.class, 0x13,
 					PingPacket.class, 0x1F,
 					ChunkDataPacket.class, 0x20,
 					JoinGamePacket.class, 0x23,
 					PlayerAbilitiesPacket.class,0x2C,
-					PlayerListItemPacket.class,0x2E,
 					SPlayerPositionAndLookPacket.class, 0x2F,
-					SpawnPositionPacket.class, 0x46,
-					PlayerListHeaderAndFooterPacket.class,0x4A
+					SpawnPositionPacket.class, 0x46
 			)
 	);

--- a/protocol/src/main/java/mc/protocol/packets/client/CCloseWindowPacket.java
+++ b/protocol/src/main/java/mc/protocol/packets/client/CCloseWindowPacket.java
@@ -0,0 +1,46 @@
+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.packets.server.OpenWindowPacket;
+
+/**
+ * Close window packet.
+ *
+ * <p>Структура пакета</p>
+ * <pre>
+ * | FIELD     | TYPE          | NOTES                     |
+ * |-----------|---------------|---------------------------|
+ * | Window ID | Unsigned Byte | ID окна, которое закрыли. |
+ * </pre>
+ *
+ * <p>
+ *     Vanilla клиент отправляет данный пакет с "Window ID" = 0, при закрытии инвентаря игрока.
+ *     Даже в тех случаях, когда для открытия инвентаря не посылался пакет {@link OpenWindowPacket}
+ * </p>
+ *
+ * @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Close_Window_.28clientbound.29" target="_top">Close Window (serverbound)</a>
+ * @see OpenWindowPacket
+ */
+@NoArgsConstructor
+@Getter
+@EqualsAndHashCode
+@ToString
+public class CCloseWindowPacket implements ClientSidePacket {
+
+	private int windowId;
+
+	@Override
+	public void readSelf(NetByteBuf netByteBuf) {
+		this.windowId = netByteBuf.readUnsignedByte();
+	}
+
+	@Override
+	public void passivate() {
+		this.windowId = 0;
+	}
+}
--- a/protocol/src/main/java/mc/protocol/packets/server/OpenWindowPacket.java
+++ b/protocol/src/main/java/mc/protocol/packets/server/OpenWindowPacket.java
@@ -0,0 +1,45 @@
+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.packets.client.CCloseWindowPacket;
+import mc.protocol.serializer.TextSerializer;
+
+/**
+ * Open Window packet.
+ *
+ * <p>Структура пакета</p>
+ * <pre>
+ * | FIELD           | TYPE          | NOTES                                                        |
+ * |-----------------|---------------|--------------------------------------------------------------|
+ * | Window ID       | Unsigned Byte | Уникальный ID окна                                           |
+ * | Window Type     | String (32)   | Тип окна. [1]                                                |
+ * | Window Title    | Text          | Заголовок окна                                               |
+ * | Number Of Slots | Unsigned Byte | Количество слотов в окне (без учета слотов инвенторя игрока) |
+ * |                 |               | Всегда 0 для окон без хранения (например Anvil)              |
+ *
+ * [1] - <a href="https://wiki.vg/index.php?title=Inventory&oldid=14093">Inventory</a>
+ * </pre>
+ *
+ * @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Open_Window">Open Window</a>
+ * @see <a href="https://wiki.vg/index.php?title=Inventory&oldid=14093">Inventory</a>
+ * @see CCloseWindowPacket
+ */
+@Data
+public class OpenWindowPacket implements ServerSidePacket {
+
+	private int windowId;
+	private String windowType;
+	private Text windowTitle;
+	private int numberOfSlots;
+
+	@Override
+	public void writeSelf(NetByteBuf netByteBuf) {
+		netByteBuf.writeUnsignedByte(this.windowId);
+		netByteBuf.writeString(this.windowType);
+		netByteBuf.writeString(TextSerializer.toJsonObject(this.windowTitle).toString());
+		netByteBuf.writeUnsignedByte(this.numberOfSlots);
+	}
+}
--- a/protocol/src/main/java/mc/protocol/packets/server/PlayerListHeaderAndFooterPacket.java
+++ b/protocol/src/main/java/mc/protocol/packets/server/PlayerListHeaderAndFooterPacket.java
@@ -1,50 +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;
-
-/**
- * Установка текста для "шапки" и "подвала" 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());
-		}
-	}
-}
--- a/protocol/src/main/java/mc/protocol/packets/server/PlayerListItemPacket.java
+++ b/protocol/src/main/java/mc/protocol/packets/server/PlayerListItemPacket.java
@@ -1,172 +0,0 @@
-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;
-	}
-}
--- a/server/src/main/java/mc/server/PacketHandler.java
+++ b/server/src/main/java/mc/server/PacketHandler.java
@@ -8,7 +8,6 @@ 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;
@@ -70,20 +69,16 @@ 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(playerUuid);
-		loginSuccessPacket.setName(playerName);
+		loginSuccessPacket.setUuid(UUID.randomUUID());
+		loginSuccessPacket.setName(loginStartPacket.getName());

 		context.sendNow(loginSuccessPacket);
 		context.setState(State.PLAY);

 		var joinGamePacket = new JoinGamePacket();
 		joinGamePacket.setEntityId(random.nextInt());
-		joinGamePacket.setGameMode(playerGamemode);
+		joinGamePacket.setGameMode(GameMode.SURVIVAL);
 		joinGamePacket.setDimension(0/*Overworld*/);
 		joinGamePacket.setDifficulty(Difficulty.PEACEFUL);
 		joinGamePacket.setLevelType(LevelType.FLAT);
@@ -131,30 +126,13 @@ public class PacketHandler {

 		// -- Эксперименты -- //

-		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());
+		var openWindowPacket = new OpenWindowPacket();
+		openWindowPacket.setWindowId(random.nextInt());
+		openWindowPacket.setWindowType("minecraft:chest");
+		openWindowPacket.setWindowTitle(Text.of("Some Title"));
+		openWindowPacket.setNumberOfSlots(9);

-		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();
+		context.sendNow(openWindowPacket);
 	}

 	private static String faviconToBase64(Path iconPath) {
Author	SHA1	Message	Date
DmitriyMX	808710e314	CCloseWindowPacket	2021-05-08 21:08:14 +03:00
DmitriyMX	bbba1715b7	OpenWindowPacket	2021-05-08 20:54:50 +03:00