1 files changed, 17 insertions, 20 deletions

diff --git a/azalea-client/src/configuration.rs b/azalea-client/src/configuration.rs
index 99b97f60..bfaa36f0 100644
--- a/azalea-client/src/configuration.rs
+++ b/azalea-client/src/configuration.rs
@@ -1,17 +1,16 @@
-use azalea_buf::McBufWritable;
+use azalea_buf::AzaleaWrite;
 use azalea_core::resource_location::ResourceLocation;
-use azalea_protocol::packets::configuration::{
-    serverbound_client_information_packet::{
-        ClientInformation, ServerboundClientInformationPacket,
+use azalea_protocol::{
+    common::client_information::ClientInformation,
+    packets::config::{
+        s_client_information::ServerboundClientInformation,
+        s_custom_payload::ServerboundCustomPayload,
     },
-    serverbound_custom_payload_packet::ServerboundCustomPayloadPacket,
 };
 use bevy_app::prelude::*;
 use bevy_ecs::prelude::*;
 
-use crate::{
-    client::InConfigurationState, packet_handling::configuration::SendConfigurationPacketEvent,
-};
+use crate::{client::InConfigurationState, packet_handling::configuration::SendConfigurationEvent};
 
 pub struct ConfigurationPlugin;
 impl Plugin for ConfigurationPlugin {
@@ -26,27 +25,25 @@ impl Plugin for ConfigurationPlugin {
 
 fn handle_in_configuration_state(
     query: Query<(Entity, &ClientInformation), Added<InConfigurationState>>,
-    mut send_packet_events: EventWriter<SendConfigurationPacketEvent>,
+    mut send_packet_events: EventWriter<SendConfigurationEvent>,
 ) {
     for (entity, client_information) in query.iter() {
         let mut brand_data = Vec::new();
         // they don't have to know :)
-        "vanilla".write_into(&mut brand_data).unwrap();
-        send_packet_events.send(SendConfigurationPacketEvent {
+        "vanilla".azalea_write(&mut brand_data).unwrap();
+        send_packet_events.send(SendConfigurationEvent::new(
             entity,
-            packet: ServerboundCustomPayloadPacket {
+            ServerboundCustomPayload {
                 identifier: ResourceLocation::new("brand"),
                 data: brand_data.into(),
-            }
-            .get(),
-        });
+            },
+        ));
 
-        send_packet_events.send(SendConfigurationPacketEvent {
+        send_packet_events.send(SendConfigurationEvent::new(
             entity,
-            packet: ServerboundClientInformationPacket {
+            ServerboundClientInformation {
                 information: client_information.clone(),
-            }
-            .get(),
-        });
+            },
+        ));
     }
 }