diff options
| author | mat <27899617+mat-1@users.noreply.github.com> | 2023-03-07 14:14:36 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-07 14:14:36 -0600 |
| commit | 719379a8a76ab0685f2bd14bebe2f0cd1e97f06b (patch) | |
| tree | ce5d6c62bc36fb1d1ec31083bc8e81a0109c12df /azalea/src/swarm/mod.rs | |
| parent | bf4ff517890cad3ff4e36b4b78959504192e5374 (diff) | |
| download | azalea-drasl-719379a8a76ab0685f2bd14bebe2f0cd1e97f06b.tar.xz | |
Bevy 0.10 (#79)
* replace 0.9.1 with 0.10.0
* start migrating to bevy .10
* well it compiles
* doesn't immediately panic
* remove unused imports
* fmt
* delete azalea-ecs
* make RelativeEntityUpdate an EntityCommand
* fix a doc test
* explain what FixedUpdate does
Diffstat (limited to 'azalea/src/swarm/mod.rs')
| -rw-r--r-- | azalea/src/swarm/mod.rs | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/azalea/src/swarm/mod.rs b/azalea/src/swarm/mod.rs index c0d9cb56..97020153 100644 --- a/azalea/src/swarm/mod.rs +++ b/azalea/src/swarm/mod.rs @@ -6,19 +6,14 @@ pub mod prelude; use crate::{bot::DefaultBotPlugins, HandleFn}; use azalea_client::{chat::ChatPacket, init_ecs_app, start_ecs, Account, Client, Event, JoinError}; -use azalea_ecs::{ - app::{App, Plugin, PluginGroup, PluginGroupBuilder}, - component::Component, - ecs::Ecs, - entity::Entity, - system::Resource, -}; use azalea_protocol::{ connect::ConnectionError, resolver::{self, ResolverError}, ServerAddress, }; use azalea_world::WorldContainer; +use bevy_app::{App, Plugin, PluginGroup, PluginGroupBuilder}; +use bevy_ecs::{component::Component, entity::Entity, system::Resource, world::World}; use futures::future::join_all; use log::error; use parking_lot::{Mutex, RwLock}; @@ -35,7 +30,7 @@ use tokio::sync::mpsc; /// It's used to make the [`Swarm::add`] function work. #[derive(Clone, Resource)] pub struct Swarm { - pub ecs_lock: Arc<Mutex<Ecs>>, + pub ecs_lock: Arc<Mutex<World>>, bots: Arc<Mutex<HashMap<Entity, Client>>>, |
