diff options
| author | mat <27899617+mat-1@users.noreply.github.com> | 2024-11-27 19:31:40 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-27 19:31:40 -0600 |
| commit | 08958c2278b15ebeac8a964f392ebb792e479b61 (patch) | |
| tree | 4ae3664cea38d7fd1a8f1e95ed06fac04ffe519e /azalea-client/src/ping.rs | |
| parent | 139d77d3c2b0922fba5e9d4fa2bd9819d78bd773 (diff) | |
| download | azalea-drasl-08958c2278b15ebeac8a964f392ebb792e479b61.tar.xz | |
Refactor azalea-protocol (#190)
* start updating to 1.21.4
* fix block codegen and stop using block data from burger
* rename packet related modules and structs to be simpler
* ItemSlot -> ItemStack for more consistency with mojmap
* .get() -> .into_packet()
* simplify declare_state_packets by removing packet ids
* rename read_from and write_into to azalea_read and azalea_write
* rename McBufReadable and McBufWritable to AzaleaRead and AzaleaWrite
* McBuf -> AzBuf
* remove most uses of into_variant
* update codegen and use resourcelocation names for packets
* implement #[limit(i)] attribute for AzBuf derive macro
* fixes for 1.21.4
* fix examples
* update some physics code and fix ChatType
* remove unused imports in codegen
* re-add some things to migrate.py and update +mc version numbers automatically
* downgrade to 1.21.3 lol
Diffstat (limited to 'azalea-client/src/ping.rs')
| -rwxr-xr-x | azalea-client/src/ping.rs | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/azalea-client/src/ping.rs b/azalea-client/src/ping.rs index ded1b521..f5d714cd 100755 --- a/azalea-client/src/ping.rs +++ b/azalea-client/src/ping.rs @@ -5,14 +5,13 @@ use std::io; use azalea_protocol::{ connect::{Connection, ConnectionError, Proxy}, packets::{ - handshaking::{ - client_intention_packet::ClientIntentionPacket, ClientboundHandshakePacket, + handshake::{ + s_intention::ServerboundIntention, ClientboundHandshakePacket, ServerboundHandshakePacket, }, status::{ - clientbound_status_response_packet::ClientboundStatusResponsePacket, - serverbound_status_request_packet::ServerboundStatusRequestPacket, - ClientboundStatusPacket, + c_status_response::ClientboundStatusResponse, + s_status_request::ServerboundStatusRequest, ClientboundStatusPacket, }, ClientIntention, PROTOCOL_VERSION, }, @@ -49,7 +48,7 @@ pub enum PingError { /// ``` pub async fn ping_server( address: impl TryInto<ServerAddress>, -) -> Result<ClientboundStatusResponsePacket, PingError> { +) -> Result<ClientboundStatusResponse, PingError> { let address: ServerAddress = address.try_into().map_err(|_| PingError::InvalidAddress)?; let resolved_address = resolver::resolve_address(&address).await?; let conn = Connection::new(&resolved_address).await?; @@ -60,7 +59,7 @@ pub async fn ping_server( pub async fn ping_server_with_proxy( address: impl TryInto<ServerAddress>, proxy: Proxy, -) -> Result<ClientboundStatusResponsePacket, PingError> { +) -> Result<ClientboundStatusResponse, PingError> { let address: ServerAddress = address.try_into().map_err(|_| PingError::InvalidAddress)?; let resolved_address = resolver::resolve_address(&address).await?; let conn = Connection::new_with_proxy(&resolved_address, proxy).await?; @@ -73,22 +72,19 @@ pub async fn ping_server_with_proxy( pub async fn ping_server_with_connection( address: ServerAddress, mut conn: Connection<ClientboundHandshakePacket, ServerboundHandshakePacket>, -) -> Result<ClientboundStatusResponsePacket, PingError> { +) -> Result<ClientboundStatusResponse, PingError> { // send the client intention packet and switch to the status state - conn.write( - ClientIntentionPacket { - protocol_version: PROTOCOL_VERSION, - hostname: address.host.clone(), - port: address.port, - intention: ClientIntention::Status, - } - .get(), - ) + conn.write(ServerboundIntention { + protocol_version: PROTOCOL_VERSION, + hostname: address.host.clone(), + port: address.port, + intention: ClientIntention::Status, + }) .await?; let mut conn = conn.status(); // send the empty status request packet - conn.write(ServerboundStatusRequestPacket {}.get()).await?; + conn.write(ServerboundStatusRequest {}).await?; let packet = conn.read().await?; |
