diff options
Diffstat (limited to 'azalea-protocol/src')
| -rw-r--r-- | azalea-protocol/src/connect.rs | 49 | ||||
| -rw-r--r-- | azalea-protocol/src/read.rs | 16 |
2 files changed, 39 insertions, 26 deletions
diff --git a/azalea-protocol/src/connect.rs b/azalea-protocol/src/connect.rs index bd8cf115..5268554d 100644 --- a/azalea-protocol/src/connect.rs +++ b/azalea-protocol/src/connect.rs @@ -1,29 +1,40 @@ //! Connect to remote servers/clients. -use std::fmt::{self, Debug, Display}; -use std::io::{self, Cursor}; -use std::marker::PhantomData; -use std::net::SocketAddr; - -use azalea_auth::game_profile::GameProfile; -use azalea_auth::sessionserver::{ClientSessionServerError, ServerSessionServerError}; +use std::{ + fmt::{self, Debug, Display}, + io::{self, Cursor}, + marker::PhantomData, + net::SocketAddr, +}; + +use azalea_auth::{ + game_profile::GameProfile, + sessionserver::{ClientSessionServerError, ServerSessionServerError}, +}; use azalea_crypto::{Aes128CfbDec, Aes128CfbEnc}; use thiserror::Error; -use tokio::io::{AsyncWriteExt, BufStream}; -use tokio::net::TcpStream; -use tokio::net::tcp::{OwnedReadHalf, OwnedWriteHalf, ReuniteError}; +use tokio::{ + io::{AsyncWriteExt, BufStream}, + net::{ + TcpStream, + tcp::{OwnedReadHalf, OwnedWriteHalf, ReuniteError}, + }, +}; use tracing::{error, info}; use uuid::Uuid; -use crate::packets::ProtocolPacket; -use crate::packets::config::{ClientboundConfigPacket, ServerboundConfigPacket}; -use crate::packets::game::{ClientboundGamePacket, ServerboundGamePacket}; -use crate::packets::handshake::{ClientboundHandshakePacket, ServerboundHandshakePacket}; -use crate::packets::login::c_hello::ClientboundHello; -use crate::packets::login::{ClientboundLoginPacket, ServerboundLoginPacket}; -use crate::packets::status::{ClientboundStatusPacket, ServerboundStatusPacket}; -use crate::read::{ReadPacketError, deserialize_packet, read_raw_packet, try_read_raw_packet}; -use crate::write::{serialize_packet, write_raw_packet}; +use crate::{ + packets::{ + ProtocolPacket, + config::{ClientboundConfigPacket, ServerboundConfigPacket}, + game::{ClientboundGamePacket, ServerboundGamePacket}, + handshake::{ClientboundHandshakePacket, ServerboundHandshakePacket}, + login::{ClientboundLoginPacket, ServerboundLoginPacket, c_hello::ClientboundHello}, + status::{ClientboundStatusPacket, ServerboundStatusPacket}, + }, + read::{ReadPacketError, deserialize_packet, read_raw_packet, try_read_raw_packet}, + write::{serialize_packet, write_raw_packet}, +}; pub struct RawReadConnection { pub read_stream: OwnedReadHalf, diff --git a/azalea-protocol/src/read.rs b/azalea-protocol/src/read.rs index 422d7f7a..433a2718 100644 --- a/azalea-protocol/src/read.rs +++ b/azalea-protocol/src/read.rs @@ -1,23 +1,25 @@ //! Read packets from a stream. -use std::backtrace::Backtrace; -use std::sync::LazyLock; -use std::{env, io}; use std::{ + backtrace::Backtrace, + env, fmt::Debug, + io, io::{Cursor, Read}, + sync::LazyLock, }; -use azalea_buf::AzaleaReadVar; -use azalea_buf::BufReadError; +use azalea_buf::{AzaleaReadVar, BufReadError}; use azalea_crypto::Aes128CfbDec; use flate2::read::ZlibDecoder; use futures::StreamExt; use futures_lite::future; use thiserror::Error; use tokio::io::AsyncRead; -use tokio_util::bytes::Buf; -use tokio_util::codec::{BytesCodec, FramedRead}; +use tokio_util::{ + bytes::Buf, + codec::{BytesCodec, FramedRead}, +}; use tracing::trace; use crate::packets::ProtocolPacket; |
