From c96ae8fce4e53ea9fad111ac7f479f2fa33ef859 Mon Sep 17 00:00:00 2001 From: mat Date: Mon, 13 Dec 2021 00:07:21 -0600 Subject: start implementing joining servers --- .../src/packets/login/clientbound_hello_packet.rs | 40 ++++++++++++++++++++++ minecraft-protocol/src/packets/login/mod.rs | 7 ++++ .../src/packets/login/serverbound_hello_packet.rs | 29 ++++++++++++++++ 3 files changed, 76 insertions(+) create mode 100644 minecraft-protocol/src/packets/login/clientbound_hello_packet.rs create mode 100644 minecraft-protocol/src/packets/login/serverbound_hello_packet.rs (limited to 'minecraft-protocol/src/packets/login') diff --git a/minecraft-protocol/src/packets/login/clientbound_hello_packet.rs b/minecraft-protocol/src/packets/login/clientbound_hello_packet.rs new file mode 100644 index 00000000..878ca456 --- /dev/null +++ b/minecraft-protocol/src/packets/login/clientbound_hello_packet.rs @@ -0,0 +1,40 @@ +use async_trait::async_trait; +use std::hash::Hash; +use tokio::io::BufReader; + +use crate::{ + mc_buf, + packets::{Packet, PacketTrait}, +}; + +#[derive(Hash, Clone, Debug)] +pub struct ClientboundHelloPacket { + pub server_id: String, + pub public_key: Vec, + pub nonce: Vec, +} + +#[async_trait] +impl PacketTrait for ClientboundHelloPacket { + fn get(self) -> Packet { + Packet::ClientboundHelloPacket(self) + } + fn write(&self, _buf: &mut Vec) { + panic!("ClientboundHelloPacket::write not implemented") + } + + async fn read( + buf: &mut BufReader, + ) -> Result { + let server_id = mc_buf::read_utf_with_len(buf, 20).await?; + let public_key = mc_buf::read_byte_array(buf).await?; + let nonce = mc_buf::read_byte_array(buf).await?; + + Ok(ClientboundHelloPacket { + server_id, + public_key, + nonce, + } + .get()) + } +} diff --git a/minecraft-protocol/src/packets/login/mod.rs b/minecraft-protocol/src/packets/login/mod.rs index 8b137891..47193f92 100644 --- a/minecraft-protocol/src/packets/login/mod.rs +++ b/minecraft-protocol/src/packets/login/mod.rs @@ -1 +1,8 @@ +pub mod clientbound_hello_packet; +pub mod serverbound_hello_packet; +#[derive(Clone, Debug)] +pub enum LoginPacket { + ServerboundHelloPacket(serverbound_hello_packet::ServerboundHelloPacket), + ClientboundHelloPacket(clientbound_hello_packet::ClientboundHelloPacket), +} diff --git a/minecraft-protocol/src/packets/login/serverbound_hello_packet.rs b/minecraft-protocol/src/packets/login/serverbound_hello_packet.rs new file mode 100644 index 00000000..cadf9f7b --- /dev/null +++ b/minecraft-protocol/src/packets/login/serverbound_hello_packet.rs @@ -0,0 +1,29 @@ +use async_trait::async_trait; +use std::hash::Hash; +use tokio::io::BufReader; + +use crate::{ + mc_buf, + packets::{Packet, PacketTrait}, +}; + +#[derive(Hash, Clone, Debug)] +pub struct ServerboundHelloPacket { + pub username: String, +} + +#[async_trait] +impl PacketTrait for ServerboundHelloPacket { + fn get(self) -> Packet { + Packet::ServerboundHelloPacket(self) + } + fn write(&self, buf: &mut Vec) { + mc_buf::write_utf(buf, &self.username); + } + + async fn read( + _buf: &mut BufReader, + ) -> Result { + Err("ServerboundHelloPacket::read not implemented".to_string()) + } +} -- cgit v1.2.3