Make Bevy dependencies optional in azalea-protocol (#303)

* Make Bevy dependencies optional in azalea-protocol

* derive serde traits on Direction again

* update docs for types that may not have Component

8 files changed, 11 insertions, 8 deletions

diff --git a/azalea-client/Cargo.toml b/azalea-client/Cargo.toml
index 5dc05151..b6ed7f12 100644
--- a/azalea-client/Cargo.toml
+++ b/azalea-client/Cargo.toml
@@ -17,7 +17,7 @@ azalea-crypto.workspace = true
 azalea-entity.workspace = true
 azalea-inventory.workspace = true
 azalea-physics.workspace = true
-azalea-protocol = { workspace = true, features = ["connecting"] }
+azalea-protocol = { workspace = true, features = ["connecting", "bevy_ecs"] }
 azalea-registry.workspace = true
 azalea-world.workspace = true
 bevy_app.workspace = true
diff --git a/azalea-client/src/plugins/disconnect.rs b/azalea-client/src/plugins/disconnect.rs
index 8c5036e1..081c174e 100644
--- a/azalea-client/src/plugins/disconnect.rs
+++ b/azalea-client/src/plugins/disconnect.rs
@@ -4,7 +4,7 @@ use azalea_chat::FormattedText;
 use azalea_entity::{
     EntityBundle, HasClientLoaded, InLoadedChunk, LocalEntity, metadata::PlayerMetadataBundle,
 };
-use azalea_world::MinecraftEntityId;
+use azalea_core::entity_id::MinecraftEntityId;
 use bevy_app::{App, Plugin, PostUpdate};
 use bevy_ecs::prelude::*;
 use derive_more::Deref;
diff --git a/azalea-client/src/plugins/movement.rs b/azalea-client/src/plugins/movement.rs
index c9473ebf..40cc108e 100644
--- a/azalea-client/src/plugins/movement.rs
+++ b/azalea-client/src/plugins/movement.rs
@@ -1,4 +1,5 @@
 use azalea_core::{
+    entity_id::MinecraftEntityId,
     game_type::GameMode,
     position::{Vec2, Vec3},
     tick::GameTick,
@@ -30,7 +31,7 @@ use azalea_protocol::{
     },
 };
 use azalea_registry::builtin::EntityKind;
-use azalea_world::{Instance, MinecraftEntityId};
+use azalea_world::Instance;
 use bevy_app::{App, Plugin, Update};
 use bevy_ecs::prelude::*;
 
diff --git a/azalea-client/src/plugins/packet/game/mod.rs b/azalea-client/src/plugins/packet/game/mod.rs
index 93057ef4..f93a02ea 100644
--- a/azalea-client/src/plugins/packet/game/mod.rs
+++ b/azalea-client/src/plugins/packet/game/mod.rs
@@ -3,6 +3,7 @@ mod events;
 use std::{collections::HashSet, sync::Arc};
 
 use azalea_core::{
+    entity_id::MinecraftEntityId,
     game_type::GameMode,
     position::{ChunkPos, Vec3},
 };
@@ -18,7 +19,7 @@ use azalea_protocol::{
     packets::{ConnectionProtocol, game::*},
 };
 use azalea_registry::builtin::EntityKind;
-use azalea_world::{InstanceContainer, InstanceName, MinecraftEntityId, PartialInstance};
+use azalea_world::{InstanceContainer, InstanceName, PartialInstance};
 use bevy_ecs::{prelude::*, system::SystemState};
 pub use events::*;
 use tracing::{debug, error, trace, warn};
diff --git a/azalea-client/src/test_utils/simulation.rs b/azalea-client/src/test_utils/simulation.rs
index a6bc22ab..0e480b92 100644
--- a/azalea-client/src/test_utils/simulation.rs
+++ b/azalea-client/src/test_utils/simulation.rs
@@ -5,6 +5,7 @@ use azalea_block::BlockState;
 use azalea_buf::AzaleaWrite;
 use azalea_core::{
     delta::LpVec3,
+    entity_id::MinecraftEntityId,
     game_type::{GameMode, OptionalGameType},
     position::{BlockPos, ChunkPos, Vec3},
     tick::GameTick,
@@ -30,7 +31,7 @@ use azalea_registry::{
     data::{Biome, DimensionKind},
     identifier::Identifier,
 };
-use azalea_world::{Chunk, Instance, MinecraftEntityId, Section, palette::PalettedContainer};
+use azalea_world::{Chunk, Instance, Section, palette::PalettedContainer};
 use bevy_app::App;
 use bevy_ecs::{
     component::Mutable,
diff --git a/azalea-client/tests/simulation/move_and_despawn_entity.rs b/azalea-client/tests/simulation/move_and_despawn_entity.rs
index 6c334a47..f05c64f4 100644
--- a/azalea-client/tests/simulation/move_and_despawn_entity.rs
+++ b/azalea-client/tests/simulation/move_and_despawn_entity.rs
@@ -8,7 +8,7 @@ use azalea_protocol::{
     },
 };
 use azalea_registry::builtin::EntityKind;
-use azalea_world::MinecraftEntityId;
+use azalea_core::entity_id::MinecraftEntityId;
 
 #[test]
 fn test_move_and_despawn_entity() {
diff --git a/azalea-client/tests/simulation/move_despawned_entity.rs b/azalea-client/tests/simulation/move_despawned_entity.rs
index 7a171dae..48c22bf6 100644
--- a/azalea-client/tests/simulation/move_despawned_entity.rs
+++ b/azalea-client/tests/simulation/move_despawned_entity.rs
@@ -3,7 +3,7 @@ use azalea_core::position::ChunkPos;
 use azalea_entity::metadata::Cow;
 use azalea_protocol::packets::{ConnectionProtocol, game::ClientboundMoveEntityRot};
 use azalea_registry::builtin::EntityKind;
-use azalea_world::MinecraftEntityId;
+use azalea_core::entity_id::MinecraftEntityId;
 use bevy_ecs::query::With;
 use tracing::Level;
 
diff --git a/azalea-client/tests/simulation/teleport_movement.rs b/azalea-client/tests/simulation/teleport_movement.rs
index 06a8f0b6..ff06ebb5 100644
--- a/azalea-client/tests/simulation/teleport_movement.rs
+++ b/azalea-client/tests/simulation/teleport_movement.rs
@@ -16,7 +16,7 @@ use azalea_protocol::{
     },
 };
 use azalea_registry::builtin::BlockKind;
-use azalea_world::MinecraftEntityId;
+use azalea_core::entity_id::MinecraftEntityId;
 
 #[test]
 fn test_teleport_movement() {