ReCentralize Packets

Cargo.toml

@@ -55,6 +55,7 @@ valence_network = { workspace = true, optional = true }
 valence_player_list = { workspace = true, optional = true }
 valence_registry.workspace = true
 valence_world_border = { workspace = true, optional = true }
+valence_packet.workspace = true
 
 [dev-dependencies]
 anyhow.workspace = true
@@ -167,6 +168,7 @@ valence_block.path = "crates/valence_block"
 valence_build_utils.path = "crates/valence_build_utils"
 valence_client.path = "crates/valence_client"
 valence_core_macros.path = "crates/valence_core_macros"
+valence_packet_macros.path = "crates/valence_packet_macros"
 valence_core.path = "crates/valence_core"
 valence_dimension.path = "crates/valence_dimension"
 valence_entity.path = "crates/valence_entity"
@@ -178,5 +180,6 @@ valence_player_list.path = "crates/valence_player_list"
 valence_registry.path = "crates/valence_registry"
 valence_world_border.path = "crates/valence_world_border"
 valence_boss_bar.path = "crates/valence_boss_bar"
+valence_packet.path = "crates/valence_packet"
 valence.path = "."
 zip = "0.6.3"

benches/many_players.rs

@@ -7,16 +7,15 @@ use rand::Rng;
 use valence::testing::create_mock_client;
 use valence::DefaultPlugins;
 use valence_biome::BiomeRegistry;
-use valence_client::hand_swing::HandSwingC2s;
 use valence_client::keepalive::KeepaliveSettings;
-use valence_client::movement::FullC2s;
 use valence_core::chunk_pos::ChunkPos;
 use valence_core::{ident, CoreSettings, Server};
 use valence_dimension::DimensionTypeRegistry;
 use valence_entity::Position;
 use valence_instance::chunk::UnloadedChunk;
 use valence_instance::Instance;
 use valence_network::NetworkPlugin;
+use valence_packet::packets::play::{FullC2s, HandSwingC2s};
 
 const CLIENT_COUNT: usize = 3000;
 const VIEW_DIST: u8 = 20;

benches/packet.rs

@@ -3,17 +3,14 @@ use std::hint::black_box;
 
 use criterion::Criterion;
 use valence::nbt::{compound, List};
+use valence::packet::packets::play::{ChunkDataS2c, EntitySpawnS2c, PlayerListHeaderS2c};
+use valence::packet::protocol::decode::PacketDecoder;
+use valence::packet::protocol::encode::{PacketEncoder, PacketWriter, WritePacket};
 use valence::prelude::*;
 use valence::protocol::array::LengthPrefixedArray;
 use valence::protocol::byte_angle::ByteAngle;
-use valence::protocol::decode::PacketDecoder;
-use valence::protocol::encode::PacketEncoder;
 use valence::protocol::var_int::VarInt;
 use valence::text::IntoText;
-use valence_core::protocol::encode::{PacketWriter, WritePacket};
-use valence_entity::packet::EntitySpawnS2c;
-use valence_instance::packet::ChunkDataS2c;
-use valence_player_list::packet::PlayerListHeaderS2c;
 
 pub fn packet(c: &mut Criterion) {
     let mut group = c.benchmark_group("packet");

crates/valence_advancement/Cargo.toml

@@ -6,6 +6,7 @@ edition.workspace = true
 [dependencies]
 valence_core.workspace = true
 valence_client.workspace = true
+valence_packet.workspace = true
 bevy_app.workspace = true
 bevy_ecs.workspace = true
 bevy_hierarchy.workspace = true

crates/valence_advancement/src/event.rs

@@ -1,8 +1,7 @@
 use bevy_ecs::prelude::*;
 use valence_client::event_loop::PacketEvent;
 use valence_core::ident::Ident;
-
-use crate::packet::AdvancementTabC2s;
+use valence_packet::packets::play::AdvancementTabC2s;
 
 /// This event sends when the client changes or closes advancement's tab.
 #[derive(Event, Clone, PartialEq, Eq, Debug)]

crates/valence_advancement/src/lib.rs

@@ -2,7 +2,6 @@
 #![allow(clippy::type_complexity)]
 
 pub mod event;
-pub mod packet;
 
 use std::borrow::Cow;
 use std::io::Write;
@@ -14,16 +13,17 @@ use bevy_ecs::system::SystemParam;
 pub use bevy_hierarchy;
 use bevy_hierarchy::{Children, HierarchyPlugin, Parent};
 use event::{handle_advancement_tab_change, AdvancementTabChangeEvent};
-use packet::SelectAdvancementTabS2c;
 use rustc_hash::FxHashMap;
 use valence_client::{Client, FlushPacketsSet, SpawnClientsSet};
 use valence_core::ident::Ident;
 use valence_core::item::ItemStack;
-use valence_core::protocol::encode::WritePacket;
 use valence_core::protocol::raw::RawBytes;
 use valence_core::protocol::var_int::VarInt;
-use valence_core::protocol::{packet_id, Encode, Packet, PacketSide, PacketState};
+use valence_core::protocol::Encode;
 use valence_core::text::Text;
+use valence_packet::packets::play::{advancement_update_s2c as packet, SelectAdvancementTabS2c};
+use valence_packet::protocol::encode::WritePacket;
+use valence_packet::protocol::{packet_id, Packet, PacketSide, PacketState};
 
 pub struct AdvancementPlugin;
 
@@ -54,8 +54,8 @@ impl Plugin for AdvancementPlugin {
             .add_systems(
                 PostUpdate,
                 (
-                    update_advancement_cached_bytes,
-                    send_advancement_update_packet,
+                    update_advancement_cached_bytes.in_set(WriteAdvancementToCacheSet),
+                    send_advancement_update_packet.in_set(WriteAdvancementPacketToClientsSet),
                 ),
             );
     }

crates/valence_boss_bar/Cargo.toml

@@ -12,6 +12,7 @@ valence_core.workspace = true
 valence_network.workspace = true
 valence_entity.workspace = true
 valence_client.workspace = true
+valence_packet.workspace = true
 uuid.workspace = true
 bitfield-struct.workspace = true
 bevy_app.workspace = true

crates/valence_boss_bar/src/components.rs

@@ -6,50 +6,7 @@ use valence_core::protocol::{Decode, Encode};
 use valence_core::text::Text;
 use valence_core::uuid::UniqueId;
 
-/// The bundle of components that make up a boss bar.
-#[derive(Bundle)]
-pub struct BossBarBundle {
-    pub id: UniqueId,
-    pub title: BossBarTitle,
-    pub health: BossBarHealth,
-    pub style: BossBarStyle,
-    pub flags: BossBarFlags,
-    pub viewers: BossBarViewers,
-}
-
-impl BossBarBundle {
-    pub fn new(
-        title: Text,
-        color: BossBarColor,
-        division: BossBarDivision,
-        flags: BossBarFlags,
-    ) -> BossBarBundle {
-        BossBarBundle {
-            id: UniqueId::default(),
-            title: BossBarTitle(title),
-            health: BossBarHealth(1.0),
-            style: BossBarStyle { color, division },
-            flags,
-            viewers: BossBarViewers::default(),
-        }
-    }
-}
-
-/// The title of a boss bar.
-#[derive(Component, Clone)]
-pub struct BossBarTitle(pub Text);
 
-/// The health of a boss bar.
-#[derive(Component)]
-pub struct BossBarHealth(pub f32);
-
-/// The style of a boss bar. This includes the color and division of the boss
-/// bar.
-#[derive(Component)]
-pub struct BossBarStyle {
-    pub color: BossBarColor,
-    pub division: BossBarDivision,
-}
 
 /// The color of a boss bar.
 #[derive(Component, Copy, Clone, PartialEq, Eq, Debug, Encode, Decode)]
@@ -84,13 +41,3 @@ pub struct BossBarFlags {
     _pad: u8,
 }
 
-/// The viewers of a boss bar.
-#[derive(Component, Default)]
-pub struct BossBarViewers {
-    /// The current viewers of the boss bar. It is the list that should be
-    /// updated.
-    pub viewers: BTreeSet<Entity>,
-    /// The viewers of the last tick in order to determine which viewers have
-    /// been added and removed.
-    pub(crate) old_viewers: BTreeSet<Entity>,
-}

crates/valence_boss_bar/src/lib.rs

@@ -19,19 +19,75 @@
 )]
 
 use std::borrow::Cow;
+use std::collections::BTreeSet;
 
 use bevy_app::prelude::*;
 use bevy_ecs::prelude::*;
-use packet::{BossBarAction, BossBarS2c};
 use valence_client::{Client, FlushPacketsSet};
 use valence_core::despawn::Despawned;
-use valence_core::protocol::encode::WritePacket;
+use valence_core::text::Text;
 use valence_core::uuid::UniqueId;
+pub use valence_packet::packets::play::boss_bar_s2c::{
+    BossBarAction, BossBarColor, BossBarDivision, BossBarFlags,
+};
+use valence_packet::packets::play::BossBarS2c;
+use valence_packet::protocol::encode::WritePacket;
 
-mod components;
-pub use components::*;
+/// The bundle of components that make up a boss bar.
+#[derive(Bundle)]
+pub struct BossBarBundle {
+    pub id: UniqueId,
+    pub title: BossBarTitle,
+    pub health: BossBarHealth,
+    pub style: BossBarStyle,
+    pub flags: BossBarFlags,
+    pub viewers: BossBarViewers,
+}
+
+impl BossBarBundle {
+    pub fn new(
+        title: Text,
+        color: BossBarColor,
+        division: BossBarDivision,
+        flags: BossBarFlags,
+    ) -> BossBarBundle {
+        BossBarBundle {
+            id: UniqueId::default(),
+            title: BossBarTitle(title),
+            health: BossBarHealth(1.0),
+            style: BossBarStyle { color, division },
+            flags,
+            viewers: BossBarViewers::default(),
+        }
+    }
+}
 
-pub mod packet;
+/// The title of a boss bar.
+#[derive(Component, Clone)]
+pub struct BossBarTitle(pub Text);
+
+/// The health of a boss bar.
+#[derive(Component)]
+pub struct BossBarHealth(pub f32);
+
+/// The style of a boss bar. This includes the color and division of the boss
+/// bar.
+#[derive(Component)]
+pub struct BossBarStyle {
+    pub color: BossBarColor,
+    pub division: BossBarDivision,
+}
+
+/// The viewers of a boss bar.
+#[derive(Component, Default)]
+pub struct BossBarViewers {
+    /// The current viewers of the boss bar. It is the list that should be
+    /// updated.
+    pub viewers: BTreeSet<Entity>,
+    /// The viewers of the last tick in order to determine which viewers have
+    /// been added and removed.
+    pub(crate) old_viewers: BTreeSet<Entity>,
+}
 
 pub struct BossBarPlugin;
 

crates/valence_client/Cargo.toml

@@ -19,5 +19,6 @@ valence_core.workspace = true
 valence_dimension.workspace = true
 valence_entity.workspace = true
 valence_instance.workspace = true
+valence_packet.workspace = true
 valence_nbt.workspace = true
 valence_registry.workspace = true

crates/valence_client/src/action.rs

@@ -1,11 +1,11 @@
 use valence_core::block_pos::BlockPos;
 use valence_core::direction::Direction;
 use valence_core::protocol::var_int::VarInt;
-use valence_core::protocol::{packet_id, Decode, Encode, Packet};
+use valence_packet::packets::play::player_action_c2s::PlayerAction;
+use valence_packet::packets::play::{PlayerActionC2s, PlayerActionResponseS2c};
 
 use super::*;
 use crate::event_loop::{EventLoopPreUpdate, PacketEvent};
-use crate::packet::{PlayerAction, PlayerActionC2s};
 
 pub(super) fn build(app: &mut App) {
     app.add_event::<DiggingEvent>()
@@ -99,9 +99,3 @@ fn acknowledge_player_actions(
         }
     }
 }
-
-#[derive(Copy, Clone, Debug, Encode, Decode, Packet)]
-#[packet(id = packet_id::PLAYER_ACTION_RESPONSE_S2C)]
-pub struct PlayerActionResponseS2c {
-    pub sequence: VarInt,
-}

crates/valence_client/src/command.rs

@@ -1,9 +1,9 @@
 use bevy_app::prelude::*;
 use bevy_ecs::prelude::*;
-use valence_core::protocol::var_int::VarInt;
-use valence_core::protocol::{packet_id, Decode, Encode, Packet};
 use valence_entity::entity::Flags;
 use valence_entity::{entity, Pose};
+pub use valence_packet::packets::play::client_command_c2s::ClientCommand;
+use valence_packet::packets::play::ClientCommandC2s;
 
 use crate::event_loop::{EventLoopPreUpdate, PacketEvent};
 
@@ -141,24 +141,3 @@ fn handle_client_command(
         }
     }
 }
-
-#[derive(Copy, Clone, Debug, Encode, Decode, Packet)]
-#[packet(id = packet_id::CLIENT_COMMAND_C2S)]
-pub struct ClientCommandC2s {
-    pub entity_id: VarInt,
-    pub action: ClientCommand,
-    pub jump_boost: VarInt,
-}
-
-#[derive(Copy, Clone, PartialEq, Eq, Debug, Encode, Decode)]
-pub enum ClientCommand {
-    StartSneaking,
-    StopSneaking,
-    LeaveBed,
-    StartSprinting,
-    StopSprinting,
-    StartJumpWithHorse,
-    StopJumpWithHorse,
-    OpenHorseInventory,
-    StartFlyingWithElytra,
-}

crates/valence_client/src/custom_payload.rs

@@ -1,5 +1,4 @@
-use valence_core::protocol::raw::RawBytes;
-use valence_core::protocol::{packet_id, Decode, Encode};
+use valence_packet::packets::play::{CustomPayloadC2s, CustomPayloadS2c};
 
 use super::*;
 use crate::event_loop::{EventLoopPreUpdate, PacketEvent};
@@ -39,17 +38,3 @@ fn handle_custom_payload(
         }
     }
 }
-
-#[derive(Clone, Debug, Encode, Decode, Packet)]
-#[packet(id = packet_id::CUSTOM_PAYLOAD_C2S)]
-pub struct CustomPayloadC2s<'a> {
-    pub channel: Ident<Cow<'a, str>>,
-    pub data: RawBytes<'a>,
-}
-
-#[derive(Clone, Debug, Encode, Decode, Packet)]
-#[packet(id = packet_id::CUSTOM_PAYLOAD_S2C)]
-pub struct CustomPayloadS2c<'a> {
-    pub channel: Ident<Cow<'a, str>>,
-    pub data: RawBytes<'a>,
-}