diff options
| author | mat <27899617+mat-1@users.noreply.github.com> | 2024-04-23 10:34:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-23 10:34:50 -0500 |
| commit | 1d80f531b74bc3b31023753acb81b35efcdadd73 (patch) | |
| tree | 675635c7c41fbb456e3e0dd7b9f09c7211d356f0 /azalea-client/src/client.rs | |
| parent | 0ddad8bd9c7c0e8846aec8bc90c95416418c9a63 (diff) | |
| download | azalea-drasl-1d80f531b74bc3b31023753acb81b35efcdadd73.tar.xz | |
1.20.5 (#127)
* 23w51b
* make recalculate_near_end_of_path public
so other plugins can do .after(recalculate_near_end_of_path)
* update to 24w03a i think
* start implementing 24w13a
* registries work (but a lot of packets are still broken)
* fix recipes and commands packets
* i love codecs :D i am not going insane :D mojang's java is very readable :D
* item components are "implemented" meowmeowmeowmeowmeowmeowmeowmeowmeowmeowmeowmeowmeowmeowmeowmeowmeowmeow
* update to 1.20.5-pre3
* fix all the broken packets and clippy (mojang please don't do an update like this again or i will murder someone)
* 1.20.5-rc1
* fix failing tests
* 1.20.5
Diffstat (limited to 'azalea-client/src/client.rs')
| -rw-r--r-- | azalea-client/src/client.rs | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/azalea-client/src/client.rs b/azalea-client/src/client.rs index 93852c75..39cc504c 100644 --- a/azalea-client/src/client.rs +++ b/azalea-client/src/client.rs @@ -306,6 +306,14 @@ impl Client { run_schedule_sender.clone(), ); + let instance = Instance::default(); + let instance_holder = crate::local_player::InstanceHolder::new( + entity, + // default to an empty world, it'll be set correctly later when we + // get the login packet + Arc::new(RwLock::new(instance)), + ); + ecs.entity_mut(entity).insert(( // these stay when we switch to the game state LocalPlayerBundle { @@ -318,6 +326,7 @@ impl Client { local_player_events: LocalPlayerEvents(tx), game_profile: GameProfileComponent(game_profile), client_information: crate::ClientInformation::default(), + instance_holder, }, InConfigurationState, )); @@ -394,7 +403,7 @@ impl Client { match packet { ClientboundLoginPacket::Hello(p) => { debug!("Got encryption request"); - let e = azalea_crypto::encrypt(&p.public_key, &p.nonce).unwrap(); + let e = azalea_crypto::encrypt(&p.public_key, &p.challenge).unwrap(); if let Some(access_token) = &account.access_token { // keep track of the number of times we tried @@ -436,7 +445,7 @@ impl Client { conn.write( ServerboundKeyPacket { key_bytes: e.encrypted_public_key, - encrypted_challenge: e.encrypted_nonce, + encrypted_challenge: e.encrypted_challenge, } .get(), ) @@ -466,6 +475,9 @@ impl Client { // replying to custom query is done in // packet_handling::login::process_packet_events } + ClientboundLoginPacket::CookieRequest(p) => { + debug!("Got cookie request {:?}", p); + } } }; @@ -666,6 +678,7 @@ pub struct LocalPlayerBundle { pub local_player_events: LocalPlayerEvents, pub game_profile: GameProfileComponent, pub client_information: ClientInformation, + pub instance_holder: InstanceHolder, } /// A bundle for the components that are present on a local player that is |
