CCloseWindowPacket

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(
-					SChatPacket.class, 0x0F,
+					OpenWindowPacket.class, 0x13,
 					PingPacket.class, 0x1F,
-					JoinGamePacket.class, 0x23,
-					SpawnPositionPacket.class, 0x46,
 					ChunkDataPacket.class, 0x20,
+					JoinGamePacket.class, 0x23,
 					PlayerAbilitiesPacket.class,0x2C,
-					SPlayerPositionAndLookPacket.class, 0x2F
+					SPlayerPositionAndLookPacket.class, 0x2F,
+					SpawnPositionPacket.class, 0x46
 			)
 	);
 

protocol/src/main/java/mc/protocol/model/text/TextColor.java

@@ -25,12 +25,6 @@ public enum TextColor {
 	WHITE      ("white",       'f');
 	//@formatter:on
 
-	public static final char SPECIAL_CHAR = '\u00a7';
-
 	private final String name;
 	private final char code;
-
-	public String toLegacy() {
-		return "" + SPECIAL_CHAR + code;
-	}
 }

protocol/src/main/java/mc/protocol/model/text/TextStyleLegacy.java

@@ -1,20 +0,0 @@
-package mc.protocol.model.text;
-
-import lombok.RequiredArgsConstructor;
-
-@RequiredArgsConstructor
-public enum TextStyleLegacy {
-
-	OBFUSCATED('k'),
-	BOLD('l'),
-	STRIKETHOUGH('m'),
-	UNDERLINE('n'),
-	ITALIC('o'),
-	RESET('r');
-
-	private final char code;
-
-	public String toLegacy() {
-		return "" + TextColor.SPECIAL_CHAR + code;
-	}
-}

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;
+	}
+}

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/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);
+	}
+}

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

@@ -1,43 +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.ChatPosition;
-
-/**
- * Chat packet.
- *
- * <p>Структура пакета</p>
- * <pre>
- * | FIELD     | TYPE | NOTES                                         |
- * |-----------|------|-----------------------------------------------|
- * | JSON Data | Text | Текст*                                        |
- * | Position  | Byte | 0 - сообщение чата                            |
- * |           |      | 1 - системное сообщение (отображается в чате) |
- * |           |      | 2 - над панелью быстрого доступа (hotbar)     |
- * </pre>
- *
- * <p>
- *     * - стоит обратить внимание, что {@link TextColor} и {@link TextStyle} не работают: клиент не применяет
- *     стилистику в таком виде. Однако метод через символ "§" (\<span>u00a7</span>) работает.
- * </p>
- *
- * @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Chat_Message_.28clientbound.29">Chat Message (clientbound)</a>
- */
-@Data
-public class SChatPacket implements ServerSidePacket {
-
-	private Text message;
-	private ChatPosition position;
-
-	@Override
-	public void writeSelf(NetByteBuf netByteBuf) {
-		netByteBuf.writeString(TextSerializer.toJsonObject(this.message).toString());
-		netByteBuf.writeByte(this.position.getCode());
-	}
-}

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

@@ -1,15 +0,0 @@
-package mc.protocol.utils;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-@RequiredArgsConstructor
-public enum ChatPosition {
-
-	CHAT(0),
-	SYSTEM(1),
-	HOTBAR(2);
-
-	@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,15 +8,12 @@ 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.model.text.TextStyleLegacy;
 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.ChatPosition;
 import mc.protocol.utils.Difficulty;
 import mc.protocol.utils.GameMode;
 import mc.protocol.utils.LevelType;
@@ -129,25 +126,13 @@ public class PacketHandler {
 
 		// -- Эксперименты -- //
 
-		var chatPacket = new SChatPacket();
+		var openWindowPacket = new OpenWindowPacket();
-		chatPacket.setMessage(Text.of(TextColor.RED.toLegacy() + "== Hello! =="));
+		openWindowPacket.setWindowId(random.nextInt());
-		chatPacket.setPosition(ChatPosition.CHAT);
+		openWindowPacket.setWindowType("minecraft:chest");
+		openWindowPacket.setWindowTitle(Text.of("Some Title"));
+		openWindowPacket.setNumberOfSlots(9);
 
-		context.send(chatPacket);
+		context.sendNow(openWindowPacket);
-
-		var systemChatPacket = new SChatPacket();
-		systemChatPacket.setMessage(Text.of(TextColor.RED.toLegacy() + "[SYSTEM]"));
-		systemChatPacket.setPosition(ChatPosition.SYSTEM);
-
-		context.send(systemChatPacket);
-
-		var hotbarChatPacket = new SChatPacket();
-		hotbarChatPacket.setMessage(Text.of(TextColor.RED.toLegacy() + TextStyleLegacy.BOLD.toLegacy() + "In game info"));
-		hotbarChatPacket.setPosition(ChatPosition.HOTBAR);
-
-		context.send(hotbarChatPacket);
-
-		context.flushSending();
 	}
 
 	private static String faviconToBase64(Path iconPath) {