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

6 files changed, 16 insertions, 10 deletions

diff --git a/azalea/src/client_impl/mod.rs b/azalea/src/client_impl/mod.rs
index fd6506d0..f884898f 100644
--- a/azalea/src/client_impl/mod.rs
+++ b/azalea/src/client_impl/mod.rs
@@ -13,7 +13,10 @@ use azalea_client::{
     start_ecs_runner,
     tick_counter::TicksConnected,
 };
-use azalea_core::data_registry::{DataRegistryWithKey, ResolvableDataRegistry};
+use azalea_core::{
+    data_registry::{DataRegistryWithKey, ResolvableDataRegistry},
+    entity_id::MinecraftEntityId,
+};
 use azalea_entity::indexing::{EntityIdIndex, EntityUuidIndex};
 use azalea_protocol::{
     address::{ResolvableAddr, ResolvedAddr},
@@ -22,7 +25,7 @@ use azalea_protocol::{
     resolve::ResolveError,
 };
 use azalea_registry::{DataRegistryKeyRef, identifier::Identifier};
-use azalea_world::{Instance, InstanceName, MinecraftEntityId, PartialInstance};
+use azalea_world::{Instance, InstanceName, PartialInstance};
 use bevy_app::App;
 use bevy_ecs::{
     entity::Entity,
diff --git a/azalea/src/entity_ref/shared_impls.rs b/azalea/src/entity_ref/shared_impls.rs
index 5e2255c5..f6aa332e 100644
--- a/azalea/src/entity_ref/shared_impls.rs
+++ b/azalea/src/entity_ref/shared_impls.rs
@@ -1,8 +1,8 @@
-use azalea_core::position::Vec3;
+use azalea_core::{entity_id::MinecraftEntityId, position::Vec3};
 use azalea_entity::{
     Attributes, Dead, EntityUuid, Physics, Position, dimensions::EntityDimensions, metadata::Health,
 };
-use azalea_world::{InstanceName, MinecraftEntityId};
+use azalea_world::InstanceName;
 use uuid::Uuid;
 
 use super::EntityRef;
diff --git a/azalea/src/events.rs b/azalea/src/events.rs
index 0920dbd8..18d24773 100644
--- a/azalea/src/events.rs
+++ b/azalea/src/events.rs
@@ -4,10 +4,10 @@
 use std::sync::Arc;
 
 use azalea_chat::FormattedText;
-use azalea_core::{position::ChunkPos, tick::GameTick};
+use azalea_core::{entity_id::MinecraftEntityId, position::ChunkPos, tick::GameTick};
 use azalea_entity::{Dead, InLoadedChunk};
 use azalea_protocol::packets::game::c_player_combat_kill::ClientboundPlayerCombatKill;
-use azalea_world::{InstanceName, MinecraftEntityId};
+use azalea_world::InstanceName;
 use bevy_app::{App, Plugin, PreUpdate, Update};
 use bevy_ecs::prelude::*;
 use derive_more::{Deref, DerefMut};
diff --git a/azalea/src/nearest_entity.rs b/azalea/src/nearest_entity.rs
index 6e94e331..bf3f2fdb 100644
--- a/azalea/src/nearest_entity.rs
+++ b/azalea/src/nearest_entity.rs
@@ -1,5 +1,6 @@
+use azalea_core::entity_id::MinecraftEntityId;
 use azalea_entity::Position;
-use azalea_world::{InstanceName, MinecraftEntityId};
+use azalea_world::InstanceName;
 use bevy_ecs::{
     prelude::Entity,
     query::{QueryFilter, With},
diff --git a/azalea/src/pathfinder/simulation.rs b/azalea/src/pathfinder/simulation.rs
index 957cef37..ca5e4f36 100644
--- a/azalea/src/pathfinder/simulation.rs
+++ b/azalea/src/pathfinder/simulation.rs
@@ -6,13 +6,15 @@ use azalea_client::{
     PhysicsState, interact::BlockStatePredictionHandler, local_player::LocalGameMode,
     mining::MineBundle,
 };
-use azalea_core::{game_type::GameMode, position::Vec3, tick::GameTick};
+use azalea_core::{
+    entity_id::MinecraftEntityId, game_type::GameMode, position::Vec3, tick::GameTick,
+};
 use azalea_entity::{
     Attributes, LookDirection, Physics, Position, dimensions::EntityDimensions,
     inventory::Inventory,
 };
 use azalea_registry::{builtin::EntityKind, identifier::Identifier};
-use azalea_world::{ChunkStorage, Instance, InstanceContainer, MinecraftEntityId, PartialInstance};
+use azalea_world::{ChunkStorage, Instance, InstanceContainer, PartialInstance};
 use bevy_app::App;
 use bevy_ecs::prelude::*;
 use parking_lot::RwLock;
diff --git a/azalea/src/swarm/events.rs b/azalea/src/swarm/events.rs
index 107a676a..ee5859ca 100644
--- a/azalea/src/swarm/events.rs
+++ b/azalea/src/swarm/events.rs
@@ -1,5 +1,5 @@
 use azalea_client::local_player::InstanceHolder;
-use azalea_world::MinecraftEntityId;
+use azalea_core::entity_id::MinecraftEntityId;
 use bevy_app::{App, Plugin, Update};
 use bevy_ecs::prelude::*;
 use derive_more::{Deref, DerefMut};