CCloseWindowPacket

OpenWindowPacket
EntityActionPacket
2021-05-08 21:08:14 +03:00 · 2021-05-08 20:54:50 +03:00 · 2021-05-08 20:14:14 +03:00 · 2021-05-08 19:50:09 +03:00
8 changed files with 188 additions and 108 deletions
--- a/protocol/src/main/java/mc/protocol/State.java
+++ b/protocol/src/main/java/mc/protocol/State.java
@@ -46,21 +46,23 @@ public enum State {
 			Map.of(
 					0x00, TeleportConfirmPacket.class,
 					0x04, ClientSettingsPacket.class,
+					0x08, CCloseWindowPacket.class,
 					0x09, PluginMessagePacket.class,
 					0x0B, PingPacket.class,
 					0x0D, PlayerPositionPacket.class,
 					0x0E, CPlayerPositionAndLookPacket.class,
-					0x0F, PlayerLookPacket.class
+					0x0F, PlayerLookPacket.class,
+					0x15, EntityActionPacket.class
 			),
 			// client bound
 			Map.of(
+					OpenWindowPacket.class, 0x13,
 					PingPacket.class, 0x1F,
-					JoinGamePacket.class, 0x23,
-					SpawnPositionPacket.class, 0x46,
 					ChunkDataPacket.class, 0x20,
+					JoinGamePacket.class, 0x23,
 					PlayerAbilitiesPacket.class,0x2C,
 					SPlayerPositionAndLookPacket.class, 0x2F,
-					TitlePacket.class, 0x48
+					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/client/EntityActionPacket.java
+++ b/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;
+	}
+}
--- 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/TitlePacket.java
+++ b/protocol/src/main/java/mc/protocol/packets/server/TitlePacket.java
@@ -1,82 +0,0 @@
-package mc.protocol.packets.server;
-
-import lombok.Data;
-import mc.protocol.io.NetByteBuf;
-import mc.protocol.model.text.Text;
-import mc.protocol.model.text.TextColor;
-import mc.protocol.model.text.TextStyle;
-import mc.protocol.packets.ServerSidePacket;
-import mc.protocol.serializer.TextSerializer;
-import mc.protocol.utils.TitleAction;
-
-/**
- * Title packet.
- *
- * <p>Структура пакета</p>
- * <pre>
- * | FIELD       | TYPE        | NOTES                            |
- * |-------------|-------------|----------------------------------|
- * | Action      | VarInt      | Определяет остальные поля пакета |
- * | Data fields | -           | зависят от "Action"              |
- * </pre>
- *
- * <p>Варианты "Action"</p>
- * <pre>
- * | ACTION                        | FIELD           | TYPE    | NOTES                                           |
- * | VALUE | DESCRIPTION           |                 |         |                                                 |
- * |-------|-----------------------|-----------------|---------|-------------------------------------------------|
- * | 0     | set title             | Title Text      | Text    |                                                 |
- * | 1     | set subtitle          | Subtitle Text   | Text    |                                                 |
- * | 2     | set action bar        | Action bar text | Text    | [*]                                             |
- * | 3     | set times and display | Fade In         | Integer | Время (в тиках (tick)) на эфект появления       |
- * |       |                       | Stay            | Integer | Время (в тиках (tick)) на отображение на экране |
- * |       |                       | Fade Out        | Integer | Время (в тиках (tick)) на эфект исчезания       |
- * | 4     | hide                  | -               | -       |                                                 |
- * | 5     | reset                 | -               | -       |                                                 |
- * </pre>
- *
- * <p>
- *     * - стоит обратить внимание, что {@link TextColor} и {@link TextStyle} не работают: клиент не применяет
- *     стилистику в таком виде. Однако метод через символ "§" (\<span>u00a7</span>) работает.
- * </p>
- *
- * @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Title">Title</a>
- */
-@Data
-public class TitlePacket implements ServerSidePacket {
-
-	private TitleAction action;
-
-	private Text title;
-	private Text subtitle;
-	private Text actionbar;
-	private Integer fadeIn;
-	private Integer stay;
-	private Integer fadeOut;
-
-	@Override
-	public void writeSelf(NetByteBuf netByteBuf) {
-		netByteBuf.writeVarInt(this.action.getCode());
-
-		switch (this.action) {
-			case SET_TITLE:
-				netByteBuf.writeString(TextSerializer.toJsonObject(this.title).toString());
-				break;
-			case SET_SUBTITLE:
-				netByteBuf.writeString(TextSerializer.toJsonObject(this.subtitle).toString());
-				break;
-			case SET_ACTIONBAR:
-				netByteBuf.writeString(TextSerializer.toJsonObject(this.actionbar).toString());
-				break;
-			case SET_TIMES_AND_DISPLAY:
-				netByteBuf.writeInt(fadeIn);
-				netByteBuf.writeInt(stay);
-				netByteBuf.writeInt(fadeOut);
-				break;
-			case HIDE:
-			case RESET:
-			default:
-				break;
-		}
-	}
-}
--- a/protocol/src/main/java/mc/protocol/utils/EntityActionAction.java
+++ b/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;
+}
--- a/protocol/src/main/java/mc/protocol/utils/TitleAction.java
+++ b/protocol/src/main/java/mc/protocol/utils/TitleAction.java
@@ -1,17 +0,0 @@
-package mc.protocol.utils;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-@RequiredArgsConstructor
-public enum TitleAction {
-	SET_TITLE(0),
-	SET_SUBTITLE(1),
-	SET_ACTIONBAR(2),
-	SET_TIMES_AND_DISPLAY(3),
-	HIDE(4),
-	RESET(5);
-
-	@Getter
-	private final int code;
-}
--- a/server/src/main/java/mc/server/PacketHandler.java
+++ b/server/src/main/java/mc/server/PacketHandler.java
@@ -17,7 +17,6 @@ import mc.protocol.serializer.TextSerializer;
 import mc.protocol.utils.Difficulty;
 import mc.protocol.utils.GameMode;
 import mc.protocol.utils.LevelType;
-import mc.protocol.utils.TitleAction;
 import mc.server.config.Config;
 import org.apache.commons.io.IOUtils;

@@ -127,11 +126,13 @@ public class PacketHandler {

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

-		var titlePacket = new TitlePacket();
-		titlePacket.setAction(TitleAction.SET_TITLE);
-		titlePacket.setTitle(Text.of("HELLO"));
+		var openWindowPacket = new OpenWindowPacket();
+		openWindowPacket.setWindowId(random.nextInt());
+		openWindowPacket.setWindowType("minecraft:chest");
+		openWindowPacket.setWindowTitle(Text.of("Some Title"));
+		openWindowPacket.setNumberOfSlots(9);

-		context.sendNow(titlePacket);
+		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
DmitriyMX	c6669af651	EntityActionPacket	2021-05-08 20:14:14 +03:00
DmitriyMX	3984ab3fca	порядок пакетов в State	2021-05-08 19:50:09 +03:00