Merge pull request #80 from AnyBananaGAME/develop

feat(protocol): add ClientToServerHandshakePacket
SerenityJS · Aug 24, 2024 · 8cd7598 · 8cd7598
2 parents da231e2 + ca3cab3
commit 8cd7598
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 2 deletions.
diff --git a/packages/network/src/types/events.ts b/packages/network/src/types/events.ts
@@ -101,7 +101,8 @@ import type {
 	AvailableActorIdentifiersPacket,
 	StructureBlockUpdatePacket,
 	DimensionDataPacket,
-	PlayerEnchantOptionsPacket
+	PlayerEnchantOptionsPacket,
+	ClientToServerHandshakePacket
 } from "@serenityjs/protocol";
 import type { NetworkPacketEvent } from "./packet-event";
 
@@ -114,6 +115,9 @@ interface NetworkEvents {
 	[Packet.ServerToClientHandshake]: [
 		NetworkPacketEvent<ServerToClientHandshakePacket>
 	];
+	[Packet.ClientToServerHandshake]: [
+		NetworkPacketEvent<ClientToServerHandshakePacket>
+	]
 	[Packet.Disconnect]: [NetworkPacketEvent<DisconnectPacket>];
 	[Packet.ResourcePacksInfo]: [NetworkPacketEvent<ResourcePacksInfoPacket>];
 	[Packet.ResourcePackStack]: [NetworkPacketEvent<ResourcePackStackPacket>];

diff --git a/packages/protocol/src/enums/packet.ts b/packages/protocol/src/enums/packet.ts
@@ -4,7 +4,7 @@ enum Packet {
 	Login = 0x01, // 1
 	PlayStatus = 0x02, // 2
 	ServerToClientHandshake = 0x03, // 3
-	// ClientToServerHandshake = 0x04, // 4
+	ClientToServerHandshake = 0x04, // 4
 	Disconnect = 0x05, // 5
 	ResourcePacksInfo = 0x06, // 6
 	ResourcePackStack = 0x07, // 7

diff --git a/packages/protocol/src/proto/data/client-to-server-handshake.ts b/packages/protocol/src/proto/data/client-to-server-handshake.ts
@@ -0,0 +1,10 @@
+import { DataPacket } from "./data-packet";
+
+import { Proto } from "@serenityjs/raknet";
+
+import { Packet } from "../../enums";
+
+@Proto(Packet.ClientToServerHandshake)
+class ClientToServerHandshakePacket extends DataPacket { }
+
+export { ClientToServerHandshakePacket }
diff --git a/packages/protocol/src/proto/data/index.ts b/packages/protocol/src/proto/data/index.ts
@@ -107,3 +107,4 @@ export * from "./camera-instructions";
 export * from "./structure-block-update";
 export * from "./dimension-data";
 export * from "./player-enchant-options";
+export * from './client-to-server-handshake'
diff --git a/packages/protocol/src/proto/data/packets.ts b/packages/protocol/src/proto/data/packets.ts
@@ -104,11 +104,13 @@ import { AvailableActorIdentifiersPacket } from "./available-actor-identifiers";
 import { StructureBlockUpdatePacket } from "./structure-block-update";
 import { DimensionDataPacket } from "./dimension-data";
 import { PlayerEnchantOptionsPacket } from "./player-enchant-options";
+import { ClientToServerHandshakePacket } from "./client-to-server-handshake";
 
 const Packets = {
 	[Packet.Login]: LoginPacket, // 1
 	[Packet.PlayStatus]: PlayStatusPacket, // 2
 	[Packet.ServerToClientHandshake]: ServerToClientHandshakePacket, // 3
+	[Packet.ClientToServerHandshake]: ClientToServerHandshakePacket, // 4
 	[Packet.Disconnect]: DisconnectPacket, // 5
 	[Packet.ResourcePacksInfo]: ResourcePacksInfoPacket, // 6
 	[Packet.ResourcePackStack]: ResourcePackStackPacket, // 7