diff options
| author | mat <27899617+mat-1@users.noreply.github.com> | 2023-09-21 11:16:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-21 11:16:29 -0500 |
| commit | 7b3e2e4bf793466a351510c7fbbd08234e93bb0e (patch) | |
| tree | 7177a919de9982d9e3c7f36a76d2025696f465b6 /azalea-protocol/src/packets/login | |
| parent | 83cce236145cdab1872a472a70943b669a880965 (diff) | |
| download | azalea-drasl-7b3e2e4bf793466a351510c7fbbd08234e93bb0e.tar.xz | |
1.20.2 (#99)
* add configuration state
* start updating to 23w31a
* implement a bit more of 23w31a
* chunk batching
* start adding configuration state
* ioasfhjgsd
* almost works
* configuration state mostly implemented
* handle other packets in configuration state and fix keepalive
* cleanup, fix warnings
* 23w32a
* fix some doctests
* 23w33a
* 23w35a
* 1.20.2-pre2
* fix system conflicts
* 1.20.2-pre4
* make tests compile
* tests pass
* 1.20.2-rc2
* 1.20.2
* Revert "1.20.2"
This reverts commit dd152fd265332ead333c919e585ded6d609d7468.
* didn't mean to commit that code
---------
Co-authored-by: mat <git@matdoes.dev>
Diffstat (limited to 'azalea-protocol/src/packets/login')
4 files changed, 21 insertions, 4 deletions
diff --git a/azalea-protocol/src/packets/login/mod.rs b/azalea-protocol/src/packets/login/mod.rs index 1186304a..f9bf8dad 100755 --- a/azalea-protocol/src/packets/login/mod.rs +++ b/azalea-protocol/src/packets/login/mod.rs @@ -3,9 +3,10 @@ pub mod clientbound_game_profile_packet; pub mod clientbound_hello_packet; pub mod clientbound_login_compression_packet; pub mod clientbound_login_disconnect_packet; -pub mod serverbound_custom_query_packet; +pub mod serverbound_custom_query_answer_packet; pub mod serverbound_hello_packet; pub mod serverbound_key_packet; +pub mod serverbound_login_acknowledged_packet; use azalea_protocol_macros::declare_state_packets; @@ -14,7 +15,8 @@ declare_state_packets!( Serverbound => { 0x00: serverbound_hello_packet::ServerboundHelloPacket, 0x01: serverbound_key_packet::ServerboundKeyPacket, - 0x02: serverbound_custom_query_packet::ServerboundCustomQueryPacket, + 0x02: serverbound_custom_query_answer_packet::ServerboundCustomQueryAnswerPacket, + 0x03: serverbound_login_acknowledged_packet::ServerboundLoginAcknowledgedPacket, }, Clientbound => { 0x00: clientbound_login_disconnect_packet::ClientboundLoginDisconnectPacket, diff --git a/azalea-protocol/src/packets/login/serverbound_custom_query_answer_packet.rs b/azalea-protocol/src/packets/login/serverbound_custom_query_answer_packet.rs new file mode 100644 index 00000000..7eb8b28f --- /dev/null +++ b/azalea-protocol/src/packets/login/serverbound_custom_query_answer_packet.rs @@ -0,0 +1,10 @@ +use azalea_buf::{McBuf, UnsizedByteArray}; +use azalea_protocol_macros::ServerboundLoginPacket; +use std::hash::Hash; + +#[derive(Hash, Clone, Debug, McBuf, ServerboundLoginPacket)] +pub struct ServerboundCustomQueryAnswerPacket { + #[var] + pub transaction_id: u32, + pub data: Option<UnsizedByteArray>, +} diff --git a/azalea-protocol/src/packets/login/serverbound_hello_packet.rs b/azalea-protocol/src/packets/login/serverbound_hello_packet.rs index c0fc7b1e..d46fe308 100755 --- a/azalea-protocol/src/packets/login/serverbound_hello_packet.rs +++ b/azalea-protocol/src/packets/login/serverbound_hello_packet.rs @@ -5,7 +5,7 @@ use uuid::Uuid; #[derive(Clone, Debug, PartialEq, Eq, McBuf, ServerboundLoginPacket)] pub struct ServerboundHelloPacket { pub name: String, - pub profile_id: Option<Uuid>, + pub profile_id: Uuid, } #[cfg(test)] @@ -19,7 +19,7 @@ mod tests { fn test_read_write() { let packet = ServerboundHelloPacket { name: "test".to_string(), - profile_id: Some(Uuid::nil()), + profile_id: Uuid::nil(), }; let mut buf: Vec<u8> = Vec::new(); packet.write_into(&mut buf).unwrap(); diff --git a/azalea-protocol/src/packets/login/serverbound_login_acknowledged_packet.rs b/azalea-protocol/src/packets/login/serverbound_login_acknowledged_packet.rs new file mode 100644 index 00000000..c242a494 --- /dev/null +++ b/azalea-protocol/src/packets/login/serverbound_login_acknowledged_packet.rs @@ -0,0 +1,5 @@ +use azalea_buf::McBuf; +use azalea_protocol_macros::ServerboundLoginPacket; + +#[derive(Clone, Debug, McBuf, ServerboundLoginPacket)] +pub struct ServerboundLoginAcknowledgedPacket {} |
