Merge pull request #58 from SkyderG/develop

feat(protocol): added SetPlayerInventoryOptionsPacket
SerenityJS · Jul 11, 2024 · 23c6921 · 23c6921
2 parents 3a0e773 + da712c4
commit 23c6921
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 1 deletion.
diff --git a/packages/network/src/types/events.ts b/packages/network/src/types/events.ts
@@ -83,7 +83,8 @@ import type {
 	BlockActorDataPacket,
 	AwardAchievementPacket,
 	ServerToClientHandshakePacket,
-	ClientboundCloseFormPacket
+	ClientboundCloseFormPacket,
+	SetPlayerInventoryOptionsPacket
 } from "@serenityjs/protocol";
 import type { NetworkPacketEvent } from "./packet-event";
 
@@ -196,6 +197,9 @@ interface NetworkEvents {
 	[Packet.RequestNetworkSettings]: [
 		NetworkPacketEvent<RequestNetworkSettingsPacket>
 	];
+	[Packet.SetPlayerInventoryOptions]: [
+		NetworkPacketEvent<SetPlayerInventoryOptionsPacket>
+	];
 	[Packet.SetHud]: [NetworkPacketEvent<SetHudPacket>];
 	[Packet.AwardAchievement]: [NetworkPacketEvent<AwardAchievementPacket>];
 	[Packet.ClientboundCloseForm]: [

diff --git a/packages/protocol/src/enums/index.ts b/packages/protocol/src/enums/index.ts
@@ -60,3 +60,6 @@ export * from "./npc-dialogue-action";
 export * from "./actor-event-id";
 export * from "./emote-flag";
 export * from "./equipment-slot";
+export * from "./inventory-layout";
+export * from "./inventory-left-tab";
+export * from "./inventory-right-tab";
diff --git a/packages/protocol/src/enums/inventory-layout.ts b/packages/protocol/src/enums/inventory-layout.ts
@@ -0,0 +1,8 @@
+enum InventoryLayout {
+	NONE,
+	SURVIVAL,
+	RECIPE_BOOK,
+	CREATIVE
+}
+
+export { InventoryLayout };
diff --git a/packages/protocol/src/enums/inventory-left-tab.ts b/packages/protocol/src/enums/inventory-left-tab.ts
@@ -0,0 +1,11 @@
+enum InventoryLeftTab {
+	NONE,
+	CONSTRUCTION,
+	EQUIPMENT,
+	ITEMS,
+	NATURE,
+	SEARCH,
+	SURVIVAL
+}
+
+export { InventoryLeftTab };
diff --git a/packages/protocol/src/enums/inventory-right-tab.ts b/packages/protocol/src/enums/inventory-right-tab.ts
@@ -0,0 +1,8 @@
+enum InventoryRightTab {
+	NONE,
+	FULL_SCREEN,
+	CRAFTING,
+	ARMOR
+}
+
+export { InventoryRightTab };
diff --git a/packages/protocol/src/enums/packet.ts b/packages/protocol/src/enums/packet.ts
@@ -88,6 +88,7 @@ enum Packet {
 	UpdateAdventureSettings = 0xbc, // 188
 	DeathInfo = 0xbd, // 189
 	RequestNetworkSettings = 0xc1, // 193
+	SetPlayerInventoryOptions = 0x1_33, // 307
 	SetHud = 0x1_34, // 308
 	AwardAchievement = 0x1_35, // 309
 	ClientboundCloseForm = 0x1_36 // 310

diff --git a/packages/protocol/src/proto/data/index.ts b/packages/protocol/src/proto/data/index.ts
@@ -86,6 +86,7 @@ export * from "./resource-pack-data-info";
 export * from "./resource-pack-chunk-data";
 export * from "./resource-pack-chunk-request";
 export * from "./transfer";
+export * from "./set-player-inventory-options";
 export * from "./set-hud";
 export * from "./award-achievement";
 export * from "./clientbound-close-form";
diff --git a/packages/protocol/src/proto/data/packets.ts b/packages/protocol/src/proto/data/packets.ts
@@ -85,6 +85,7 @@ import { BlockActorDataPacket } from "./block-actor-data";
 import { AwardAchievementPacket } from "./award-achievement";
 import { ServerToClientHandshakePacket } from "./server-to-client-handshake";
 import { DeathInfoPacket } from "./death-info";
+import { SetPlayerInventoryOptionsPacket } from "./set-player-inventory-options";
 import { ClientboundCloseFormPacket } from "./clientbound-close-form";
 
 const Packets = {
@@ -169,6 +170,7 @@ const Packets = {
 	[Packet.UpdateAdventureSettings]: UpdateAdventureSettingsPacket, // 188
 	[Packet.DeathInfo]: DeathInfoPacket, // 189
 	[Packet.RequestNetworkSettings]: RequestNetworkSettingsPacket, // 193
+	[Packet.SetPlayerInventoryOptions]: SetPlayerInventoryOptionsPacket, // 307
 	[Packet.SetHud]: SetHudPacket, // 308
 	[Packet.AwardAchievement]: AwardAchievementPacket, // 309
 	[Packet.ClientboundCloseForm]: ClientboundCloseFormPacket // 310

diff --git a/packages/protocol/src/proto/data/set-player-inventory-options.ts b/packages/protocol/src/proto/data/set-player-inventory-options.ts
@@ -0,0 +1,22 @@
+import { Proto, Serialize } from "@serenityjs/raknet";
+import { Bool, VarInt } from "@serenityjs/binarystream";
+
+import {
+	InventoryLayout,
+	InventoryLeftTab,
+	InventoryRightTab,
+	Packet
+} from "../../enums";
+
+import { DataPacket } from "./data-packet";
+
+@Proto(Packet.SetPlayerInventoryOptions)
+class SetPlayerInventoryOptionsPacket extends DataPacket {
+	@Serialize(VarInt) public leftTab!: InventoryLeftTab;
+	@Serialize(VarInt) public rightTab!: InventoryRightTab;
+	@Serialize(Bool) public filtering!: boolean;
+	@Serialize(VarInt) public layout!: InventoryLayout;
+	@Serialize(VarInt) public craftingLayout!: InventoryLayout;
+}
+
+export { SetPlayerInventoryOptionsPacket };