From 9642558f8f8d983a7087f15d68be8cf07a85f0c2 Mon Sep 17 00:00:00 2001 From: mat Date: Wed, 15 Dec 2021 23:10:55 -0600 Subject: azalea --- .../login/clientbound_custom_query_packet.rs | 41 -------------- .../src/packets/login/clientbound_hello_packet.rs | 38 ------------- minecraft-protocol/src/packets/login/mod.rs | 63 ---------------------- .../src/packets/login/serverbound_hello_packet.rs | 27 ---------- 4 files changed, 169 deletions(-) delete mode 100644 minecraft-protocol/src/packets/login/clientbound_custom_query_packet.rs delete mode 100644 minecraft-protocol/src/packets/login/clientbound_hello_packet.rs delete mode 100644 minecraft-protocol/src/packets/login/mod.rs delete 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_custom_query_packet.rs b/minecraft-protocol/src/packets/login/clientbound_custom_query_packet.rs deleted file mode 100644 index 093176eb..00000000 --- a/minecraft-protocol/src/packets/login/clientbound_custom_query_packet.rs +++ /dev/null @@ -1,41 +0,0 @@ -use std::hash::Hash; -use tokio::io::BufReader; - -use crate::mc_buf::{self, Readable, Writable}; - -use super::LoginPacket; - -#[derive(Hash, Clone, Debug)] -pub struct ClientboundCustomQueryPacket { - pub transaction_id: u32, - // TODO: this should be a resource location - pub identifier: String, - pub data: Vec, -} - -impl ClientboundCustomQueryPacket { - pub fn get(self) -> LoginPacket { - LoginPacket::ClientboundCustomQueryPacket(self) - } - - pub fn write(&self, buf: &mut Vec) { - buf.write_varint(self.transaction_id as i32).unwrap(); - buf.write_utf(&self.identifier).unwrap(); - buf.write_bytes(&self.data).unwrap(); - } - - pub async fn read( - buf: &mut BufReader, - ) -> Result { - let transaction_id = buf.read_varint().await?.0 as u32; - // TODO: this should be a resource location - let identifier = buf.read_utf().await?; - let data = buf.read_bytes(1048576).await?; - Ok(ClientboundCustomQueryPacket { - transaction_id, - identifier, - data, - } - .get()) - } -} diff --git a/minecraft-protocol/src/packets/login/clientbound_hello_packet.rs b/minecraft-protocol/src/packets/login/clientbound_hello_packet.rs deleted file mode 100644 index 36a48706..00000000 --- a/minecraft-protocol/src/packets/login/clientbound_hello_packet.rs +++ /dev/null @@ -1,38 +0,0 @@ -use std::hash::Hash; -use tokio::io::BufReader; - -use crate::mc_buf::Readable; - -use super::LoginPacket; - -#[derive(Hash, Clone, Debug)] -pub struct ClientboundHelloPacket { - pub server_id: String, - pub public_key: Vec, - pub nonce: Vec, -} - -impl ClientboundHelloPacket { - pub fn get(self) -> LoginPacket { - LoginPacket::ClientboundHelloPacket(self) - } - - pub fn write(&self, _buf: &mut Vec) { - panic!("ClientboundHelloPacket::write not implemented") - } - - pub async fn read( - buf: &mut BufReader, - ) -> Result { - let server_id = buf.read_utf_with_len(20).await?; - let public_key = buf.read_byte_array().await?; - let nonce = buf.read_byte_array().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 deleted file mode 100644 index f0ed6717..00000000 --- a/minecraft-protocol/src/packets/login/mod.rs +++ /dev/null @@ -1,63 +0,0 @@ -pub mod clientbound_custom_query_packet; -pub mod clientbound_hello_packet; -pub mod serverbound_hello_packet; - -use async_trait::async_trait; -use tokio::io::BufReader; - -use crate::connect::PacketFlow; - -use super::ProtocolPacket; - -#[derive(Clone, Debug)] -pub enum LoginPacket -where - Self: Sized, -{ - ClientboundCustomQueryPacket(clientbound_custom_query_packet::ClientboundCustomQueryPacket), - ServerboundHelloPacket(serverbound_hello_packet::ServerboundHelloPacket), - ClientboundHelloPacket(clientbound_hello_packet::ClientboundHelloPacket), -} - -#[async_trait] -impl ProtocolPacket for LoginPacket { - fn id(&self) -> u32 { - match self { - LoginPacket::ClientboundCustomQueryPacket(_packet) => 0x04, - LoginPacket::ServerboundHelloPacket(_packet) => 0x00, - LoginPacket::ClientboundHelloPacket(_packet) => 0x01, - } - } - - fn write(&self, buf: &mut Vec) { - match self { - LoginPacket::ClientboundCustomQueryPacket(packet) => packet.write(buf), - LoginPacket::ServerboundHelloPacket(packet) => packet.write(buf), - LoginPacket::ClientboundHelloPacket(packet) => packet.write(buf), - } - } - - /// Read a packet by its id, ConnectionProtocol, and flow - async fn read( - id: u32, - flow: &PacketFlow, - buf: &mut BufReader, - ) -> Result - where - Self: Sized, - { - Ok(match flow { - PacketFlow::ServerToClient => match id { - 0x01 => clientbound_hello_packet::ClientboundHelloPacket::read(buf).await?, - 0x04 => { - clientbound_custom_query_packet::ClientboundCustomQueryPacket::read(buf).await? - } - _ => return Err(format!("Unknown ServerToClient status packet id: {}", id)), - }, - PacketFlow::ClientToServer => match id { - 0x00 => serverbound_hello_packet::ServerboundHelloPacket::read(buf).await?, - _ => return Err(format!("Unknown ClientToServer status packet id: {}", id)), - }, - }) - } -} diff --git a/minecraft-protocol/src/packets/login/serverbound_hello_packet.rs b/minecraft-protocol/src/packets/login/serverbound_hello_packet.rs deleted file mode 100644 index 32a6dadc..00000000 --- a/minecraft-protocol/src/packets/login/serverbound_hello_packet.rs +++ /dev/null @@ -1,27 +0,0 @@ -use std::hash::Hash; -use tokio::io::BufReader; - -use crate::mc_buf::Writable; - -use super::LoginPacket; - -#[derive(Hash, Clone, Debug)] -pub struct ServerboundHelloPacket { - pub username: String, -} - -impl ServerboundHelloPacket { - pub fn get(self) -> LoginPacket { - LoginPacket::ServerboundHelloPacket(self) - } - - pub fn write(&self, buf: &mut Vec) { - buf.write_utf(&self.username).unwrap(); - } - - pub async fn read( - _buf: &mut BufReader, - ) -> Result { - Err("ServerboundHelloPacket::read not implemented".to_string()) - } -} -- cgit v1.2.3