update

Author: Andrew Gazelka

vendor/valence/crates/valence_protocol/src/lib.rs

@@ -196,7 +196,7 @@ pub trait Encode {
     /// specialization is unavailable in stable Rust at the time of writing,
     /// we must make the slice specialization part of this trait.
     ///
-    /// [`write_all`]: Write:write_all
+    /// [`write_all`]: std::io::Write::write_all
     fn encode_slice(slice: &[Self], mut w: impl Write) -> anyhow::Result<()>
     where
         Self: Sized,

vendor/valence/crates/valence_protocol/src/raw.rs

@@ -14,7 +14,7 @@ use crate::{Bounded, DecodeBytes, Encode};
 /// slice. The input will be at the EOF state after this is decoded.
 ///
 /// [encoding]: Encode
-/// [decoding]: Decode
+/// [decoding]: crate::DecodeBytes
 #[derive(
     Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Default, Debug, Deref, DerefMut, From, Into,
 )]

vendor/valence/crates/valence_server/src/abilities.rs

@@ -5,7 +5,7 @@ pub use valence_protocol::packets::play::player_abilities_s2c::PlayerAbilitiesFl
 use valence_protocol::packets::play::{PlayerAbilitiesS2c, UpdatePlayerAbilitiesC2s};
 use valence_protocol::{GameMode, WritePacket};
 
-use crate::client::{update_game_mode, Client, UpdateClientsSet};
+use crate::client::{Client, UpdateClientsSet, update_game_mode};
 use crate::event_loop::{EventLoopPreUpdate, PacketEvent};
 
 /// [`Component`] that stores the player's flying speed ability.

vendor/valence/crates/valence_server/src/brand.rs

@@ -1,6 +1,7 @@
-use valence_bytes::CowUtf8Bytes;
+use valence_bytes::CowBytes;
 use valence_protocol::packets::play::CustomPayloadS2c;
-use valence_protocol::{ident, Bounded, Encode, VarInt, WritePacket};
+use valence_protocol::raw::RawBytes;
+use valence_protocol::{Bounded, Encode, VarInt, WritePacket, ident};
 
 pub trait SetBrand {
     /// Sets the brand of the server.
@@ -23,7 +24,7 @@ impl<T: WritePacket> SetBrand for T {
         buf.extend_from_slice(brand.as_bytes());
         self.write_packet(&CustomPayloadS2c {
             channel: ident!("minecraft:brand"),
-            data: Bounded(buf.into()),
+            data: Bounded(RawBytes(CowBytes::from(buf))),
         });
     }
 }

vendor/valence/crates/valence_server/src/client.rs

@@ -13,6 +13,7 @@ use bytes::{Bytes, BytesMut};
 use derive_more::{Deref, DerefMut, From, Into};
 use tracing::warn;
 use uuid::Uuid;
+use valence_bytes::CowBytes;
 use valence_entity::attributes::{EntityAttributes, TrackedEntityAttributes};
 use valence_entity::living::Health;
 use valence_entity::player::{Food, PlayerEntityBundle, Saturation};
@@ -33,15 +34,16 @@ use valence_protocol::packets::play::{
     ParticleS2c, PlaySoundS2c, UnloadChunkS2c,
 };
 use valence_protocol::profile::Property;
+use valence_protocol::raw::RawBytes;
 use valence_protocol::sound::{Sound, SoundCategory, SoundId};
 use valence_protocol::text::{IntoText, Text};
 use valence_protocol::var_int::VarInt;
 use valence_protocol::{BlockPos, ChunkPos, Encode, GameMode, Packet};
 use valence_registry::RegistrySet;
 use valence_server_common::{Despawned, UniqueId};
 
-use crate::layer::{ChunkLayer, EntityLayer, UpdateLayersPostClientSet, UpdateLayersPreClientSet};
 use crate::ChunkView;
+use crate::layer::{ChunkLayer, EntityLayer, UpdateLayersPostClientSet, UpdateLayersPreClientSet};
 
 pub struct ClientPlugin;
 
@@ -445,12 +447,12 @@ pub struct Properties(pub Vec<Property>);
 impl Properties {
     /// Finds the property with the name "textures".
     pub fn textures(&self) -> Option<&Property> {
-        self.0.iter().find(|p| p.name == "textures")
+        self.0.iter().find(|p| p.name == "textures".into())
     }
 
     /// Finds the property with the name "textures" mutably.
     pub fn textures_mut(&mut self) -> Option<&mut Property> {
-        self.0.iter_mut().find(|p| p.name == "textures")
+        self.0.iter_mut().find(|p| p.name == "textures".into())
     }
 
     /// Returns the value of the "textures" property. It's a base64-encoded
@@ -468,13 +470,13 @@ impl Properties {
     /// Mojang.
     pub fn set_skin(&mut self, skin: impl Into<String>, signature: impl Into<String>) {
         if let Some(prop) = self.textures_mut() {
-            prop.value = skin.into();
-            prop.signature = Some(signature.into());
+            prop.value = skin.into().into();
+            prop.signature = Some(signature.into().into());
         } else {
             self.0.push(Property {
-                name: "textures".to_owned(),
-                value: skin.into(),
-                signature: Some(signature.into()),
+                name: "textures".into(),
+                value: skin.into().into(),
+                signature: Some(signature.into().into()),
             });
         }
     }
@@ -1151,7 +1153,7 @@ fn init_tracked_data(mut clients: Query<(&mut Client, &TrackedData), Added<Track
         if let Some(init_data) = tracked_data.init_data() {
             client.write_packet(&EntityTrackerUpdateS2c {
                 entity_id: VarInt(0),
-                tracked_values: init_data.into(),
+                tracked_values: RawBytes(CowBytes::from(init_data)),
             });
         }
     }
@@ -1162,7 +1164,7 @@ fn update_tracked_data(mut clients: Query<(&mut Client, &TrackedData)>) {
         if let Some(update_data) = tracked_data.update_data() {
             client.write_packet(&EntityTrackerUpdateS2c {
                 entity_id: VarInt(0),
-                tracked_values: update_data.into(),
+                tracked_values: RawBytes(CowBytes::from(update_data)),
             });
         }
     }

vendor/valence/crates/valence_server/src/client_command.rs

@@ -1,9 +1,9 @@
 use bevy_app::prelude::*;
 use bevy_ecs::prelude::*;
 use valence_entity::entity::Flags;
-use valence_entity::{entity, Pose};
-pub use valence_protocol::packets::play::client_command_c2s::ClientCommand;
+use valence_entity::{Pose, entity};
 use valence_protocol::packets::play::ClientCommandC2s;
+pub use valence_protocol::packets::play::client_command_c2s::ClientCommand;
 
 use crate::event_loop::{EventLoopPreUpdate, PacketEvent};
 

vendor/valence/crates/valence_server/src/client_settings.rs

@@ -1,8 +1,8 @@
 use bevy_app::prelude::*;
 use bevy_ecs::prelude::*;
 use valence_entity::player::{self, PlayerModelParts};
-use valence_protocol::packets::play::client_settings_c2s::ChatMode;
 use valence_protocol::packets::play::ClientSettingsC2s;
+use valence_protocol::packets::play::client_settings_c2s::ChatMode;
 
 use crate::client::ViewDistance;
 use crate::event_loop::{EventLoopPreUpdate, PacketEvent};

vendor/valence/crates/valence_server/src/custom_payload.rs

@@ -1,6 +1,8 @@
 use bevy_app::prelude::*;
 use bevy_ecs::prelude::*;
+use valence_bytes::CowBytes;
 use valence_protocol::packets::play::{CustomPayloadC2s, CustomPayloadS2c};
+use valence_protocol::raw::RawBytes;
 use valence_protocol::{Bounded, Ident, WritePacket};
 
 use crate::client::Client;
@@ -26,7 +28,7 @@ impl Client {
     pub fn send_custom_payload(&mut self, channel: Ident, data: &[u8]) {
         self.write_packet(&CustomPayloadS2c {
             channel: channel.into(),
-            data: Bounded(data.into()),
+            data: Bounded(RawBytes(CowBytes::from(data))),
         });
     }
 }
@@ -40,7 +42,7 @@ fn handle_custom_payload(
             events.send(CustomPayloadEvent {
                 client: packet.client,
                 channel: pkt.channel.into(),
-                data: pkt.data.0 .0.into(),
+                data: pkt.data.0.0.into(),
             })
         }
     }

vendor/valence/crates/valence_server/src/event_loop.rs

@@ -1,7 +1,7 @@
 use std::time::Instant;
 
-use bevy_app::prelude::*;
 use bevy_app::MainScheduleOrder;
+use bevy_app::prelude::*;
 use bevy_ecs::prelude::*;
 use bevy_ecs::schedule::ScheduleLabel;
 use bevy_ecs::system::SystemState;

vendor/valence/crates/valence_server/src/hand_swing.rs

@@ -1,8 +1,8 @@
 use bevy_app::prelude::*;
 use bevy_ecs::prelude::*;
 use valence_entity::{EntityAnimation, EntityAnimations};
-use valence_protocol::packets::play::HandSwingC2s;
 use valence_protocol::Hand;
+use valence_protocol::packets::play::HandSwingC2s;
 
 use crate::event_loop::{EventLoopPreUpdate, PacketEvent};