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-protocol/src/packets/configuration | |
| 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-protocol/src/packets/configuration')
9 files changed, 99 insertions, 17 deletions
diff --git a/azalea-protocol/src/packets/configuration/clientbound_cookie_request_packet.rs b/azalea-protocol/src/packets/configuration/clientbound_cookie_request_packet.rs new file mode 100644 index 00000000..38566564 --- /dev/null +++ b/azalea-protocol/src/packets/configuration/clientbound_cookie_request_packet.rs @@ -0,0 +1,8 @@ +use azalea_buf::McBuf; +use azalea_core::resource_location::ResourceLocation; +use azalea_protocol_macros::ClientboundConfigurationPacket; + +#[derive(Clone, Debug, McBuf, ClientboundConfigurationPacket)] +pub struct ClientboundCookieRequestPacket { + pub key: ResourceLocation, +} diff --git a/azalea-protocol/src/packets/configuration/clientbound_registry_data_packet.rs b/azalea-protocol/src/packets/configuration/clientbound_registry_data_packet.rs index 0e782092..8bada6ca 100644 --- a/azalea-protocol/src/packets/configuration/clientbound_registry_data_packet.rs +++ b/azalea-protocol/src/packets/configuration/clientbound_registry_data_packet.rs @@ -1,8 +1,12 @@ +use std::collections::HashMap; + use azalea_buf::McBuf; -use azalea_core::registry_holder::RegistryHolder; +use azalea_core::resource_location::ResourceLocation; use azalea_protocol_macros::ClientboundConfigurationPacket; +use simdnbt::owned::NbtCompound; #[derive(Clone, Debug, McBuf, ClientboundConfigurationPacket)] pub struct ClientboundRegistryDataPacket { - pub registry_holder: RegistryHolder, + pub registry_id: ResourceLocation, + pub entries: HashMap<ResourceLocation, Option<NbtCompound>>, } diff --git a/azalea-protocol/src/packets/configuration/clientbound_reset_chat_packet.rs b/azalea-protocol/src/packets/configuration/clientbound_reset_chat_packet.rs new file mode 100644 index 00000000..75afa8c1 --- /dev/null +++ b/azalea-protocol/src/packets/configuration/clientbound_reset_chat_packet.rs @@ -0,0 +1,5 @@ +use azalea_buf::McBuf; +use azalea_protocol_macros::ClientboundConfigurationPacket; + +#[derive(Clone, Debug, McBuf, ClientboundConfigurationPacket)] +pub struct ClientboundResetChatPacket; diff --git a/azalea-protocol/src/packets/configuration/clientbound_select_known_packs_packet.rs b/azalea-protocol/src/packets/configuration/clientbound_select_known_packs_packet.rs new file mode 100644 index 00000000..0f22b054 --- /dev/null +++ b/azalea-protocol/src/packets/configuration/clientbound_select_known_packs_packet.rs @@ -0,0 +1,9 @@ +use azalea_buf::McBuf; +use azalea_protocol_macros::ClientboundConfigurationPacket; + +use super::serverbound_select_known_packs_packet::KnownPack; + +#[derive(Clone, Debug, McBuf, ClientboundConfigurationPacket)] +pub struct ClientboundSelectKnownPacksPacket { + pub known_packs: Vec<KnownPack>, +} diff --git a/azalea-protocol/src/packets/configuration/clientbound_store_cookie_packet.rs b/azalea-protocol/src/packets/configuration/clientbound_store_cookie_packet.rs new file mode 100644 index 00000000..fda16689 --- /dev/null +++ b/azalea-protocol/src/packets/configuration/clientbound_store_cookie_packet.rs @@ -0,0 +1,9 @@ +use azalea_buf::McBuf; +use azalea_core::resource_location::ResourceLocation; +use azalea_protocol_macros::ClientboundConfigurationPacket; + +#[derive(Clone, Debug, McBuf, ClientboundConfigurationPacket)] +pub struct ClientboundStoreCookiePacket { + pub key: ResourceLocation, + pub payload: Vec<u8>, +} diff --git a/azalea-protocol/src/packets/configuration/clientbound_transfer_packet.rs b/azalea-protocol/src/packets/configuration/clientbound_transfer_packet.rs new file mode 100644 index 00000000..88f0054a --- /dev/null +++ b/azalea-protocol/src/packets/configuration/clientbound_transfer_packet.rs @@ -0,0 +1,9 @@ +use azalea_buf::McBuf; +use azalea_protocol_macros::ClientboundConfigurationPacket; + +#[derive(Clone, Debug, McBuf, ClientboundConfigurationPacket)] +pub struct ClientboundTransferPacket { + pub host: String, + #[var] + pub port: u32, +} diff --git a/azalea-protocol/src/packets/configuration/mod.rs b/azalea-protocol/src/packets/configuration/mod.rs index 9516935f..757c496c 100755 --- a/azalea-protocol/src/packets/configuration/mod.rs +++ b/azalea-protocol/src/packets/configuration/mod.rs @@ -1,41 +1,56 @@ +pub mod clientbound_cookie_request_packet; pub mod clientbound_custom_payload_packet; pub mod clientbound_disconnect_packet; pub mod clientbound_finish_configuration_packet; pub mod clientbound_keep_alive_packet; pub mod clientbound_ping_packet; pub mod clientbound_registry_data_packet; +pub mod clientbound_reset_chat_packet; pub mod clientbound_resource_pack_pop_packet; pub mod clientbound_resource_pack_push_packet; +pub mod clientbound_select_known_packs_packet; +pub mod clientbound_store_cookie_packet; +pub mod clientbound_transfer_packet; pub mod clientbound_update_enabled_features_packet; pub mod clientbound_update_tags_packet; pub mod serverbound_client_information_packet; +pub mod serverbound_cookie_response_packet; pub mod serverbound_custom_payload_packet; pub mod serverbound_finish_configuration_packet; pub mod serverbound_keep_alive_packet; pub mod serverbound_pong_packet; pub mod serverbound_resource_pack_packet; +pub mod serverbound_select_known_packs_packet; + use azalea_protocol_macros::declare_state_packets; declare_state_packets!( ConfigurationPacket, Serverbound => { 0x00: serverbound_client_information_packet::ServerboundClientInformationPacket, - 0x01: serverbound_custom_payload_packet::ServerboundCustomPayloadPacket, - 0x02: serverbound_finish_configuration_packet::ServerboundFinishConfigurationPacket, - 0x03: serverbound_keep_alive_packet::ServerboundKeepAlivePacket, - 0x04: serverbound_pong_packet::ServerboundPongPacket, - 0x05: serverbound_resource_pack_packet::ServerboundResourcePackPacket, + 0x01: serverbound_cookie_response_packet::ServerboundCookieResponsePacket, + 0x02: serverbound_custom_payload_packet::ServerboundCustomPayloadPacket, + 0x03: serverbound_finish_configuration_packet::ServerboundFinishConfigurationPacket, + 0x04: serverbound_keep_alive_packet::ServerboundKeepAlivePacket, + 0x05: serverbound_pong_packet::ServerboundPongPacket, + 0x06: serverbound_resource_pack_packet::ServerboundResourcePackPacket, + 0x07: serverbound_select_known_packs_packet::ServerboundSelectKnownPacksPacket, }, Clientbound => { - 0x00: clientbound_custom_payload_packet::ClientboundCustomPayloadPacket, - 0x01: clientbound_disconnect_packet::ClientboundDisconnectPacket, - 0x02: clientbound_finish_configuration_packet::ClientboundFinishConfigurationPacket, - 0x03: clientbound_keep_alive_packet::ClientboundKeepAlivePacket, - 0x04: clientbound_ping_packet::ClientboundPingPacket, - 0x05: clientbound_registry_data_packet::ClientboundRegistryDataPacket, - 0x06: clientbound_resource_pack_pop_packet::ClientboundResourcePackPopPacket, - 0x07: clientbound_resource_pack_push_packet::ClientboundResourcePackPushPacket, - 0x08: clientbound_update_enabled_features_packet::ClientboundUpdateEnabledFeaturesPacket, - 0x09: clientbound_update_tags_packet::ClientboundUpdateTagsPacket, + 0x00: clientbound_cookie_request_packet::ClientboundCookieRequestPacket, + 0x01: clientbound_custom_payload_packet::ClientboundCustomPayloadPacket, + 0x02: clientbound_disconnect_packet::ClientboundDisconnectPacket, + 0x03: clientbound_finish_configuration_packet::ClientboundFinishConfigurationPacket, + 0x04: clientbound_keep_alive_packet::ClientboundKeepAlivePacket, + 0x05: clientbound_ping_packet::ClientboundPingPacket, + 0x06: clientbound_reset_chat_packet::ClientboundResetChatPacket, + 0x07: clientbound_registry_data_packet::ClientboundRegistryDataPacket, + 0x08: clientbound_resource_pack_pop_packet::ClientboundResourcePackPopPacket, + 0x09: clientbound_resource_pack_push_packet::ClientboundResourcePackPushPacket, + 0x0a: clientbound_store_cookie_packet::ClientboundStoreCookiePacket, + 0x0b: clientbound_transfer_packet::ClientboundTransferPacket, + 0x0c: clientbound_update_enabled_features_packet::ClientboundUpdateEnabledFeaturesPacket, + 0x0d: clientbound_update_tags_packet::ClientboundUpdateTagsPacket, + 0x0e: clientbound_select_known_packs_packet::ClientboundSelectKnownPacksPacket, } ); diff --git a/azalea-protocol/src/packets/configuration/serverbound_cookie_response_packet.rs b/azalea-protocol/src/packets/configuration/serverbound_cookie_response_packet.rs new file mode 100644 index 00000000..6c62c1c8 --- /dev/null +++ b/azalea-protocol/src/packets/configuration/serverbound_cookie_response_packet.rs @@ -0,0 +1,9 @@ +use azalea_buf::McBuf; +use azalea_core::resource_location::ResourceLocation; +use azalea_protocol_macros::ServerboundConfigurationPacket; + +#[derive(Clone, Debug, McBuf, ServerboundConfigurationPacket)] +pub struct ServerboundCookieResponsePacket { + pub key: ResourceLocation, + pub payload: Option<Vec<u8>>, +} diff --git a/azalea-protocol/src/packets/configuration/serverbound_select_known_packs_packet.rs b/azalea-protocol/src/packets/configuration/serverbound_select_known_packs_packet.rs new file mode 100644 index 00000000..fe379a17 --- /dev/null +++ b/azalea-protocol/src/packets/configuration/serverbound_select_known_packs_packet.rs @@ -0,0 +1,14 @@ +use azalea_buf::McBuf; +use azalea_protocol_macros::ServerboundConfigurationPacket; + +#[derive(Clone, Debug, McBuf, ServerboundConfigurationPacket)] +pub struct ServerboundSelectKnownPacksPacket { + pub known_packs: Vec<KnownPack>, +} + +#[derive(Clone, Debug, McBuf)] +pub struct KnownPack { + pub namespace: String, + pub id: String, + pub version: String, +} |
