diff --git a/Cargo.toml b/Cargo.toml index 611160e..14b6c24 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,10 +27,7 @@ use-webrtc = [ ] [dependencies] -bevy_app = "0.5" -bevy_core = "0.5" -bevy_ecs = "0.5" -bevy_tasks = "0.5" +bevy = {version = "0.5", default-features = false} turbulence = "0.3" naia-client-socket = { version = "0.6", features = ["multithread"] } bytes = "1.0" diff --git a/src/channels.rs b/src/channels.rs index 3136bf2..6a47c3e 100644 --- a/src/channels.rs +++ b/src/channels.rs @@ -1,6 +1,6 @@ #![allow(unused)] -use bevy_tasks::{Task, TaskPool}; +use bevy::tasks::{Task, TaskPool}; use futures::{stream, Stream}; use futures_timer::Delay; use std::{ diff --git a/src/lib.rs b/src/lib.rs index e37c373..697d5bb 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,7 +1,9 @@ -use bevy_app::{AppBuilder, Events, Plugin, CoreStage}; -use bevy_ecs::prelude::*; -use bevy_tasks::{IoTaskPool, TaskPool}; -use bevy_core::{FixedTimestep}; +use bevy::{ + app::{AppBuilder, Events, Plugin, CoreStage}, + ecs::prelude::*, + tasks::{IoTaskPool, TaskPool, Task}, + core::FixedTimestep, +}; #[cfg(not(target_arch = "wasm32"))] use crossbeam_channel::{unbounded, Receiver, Sender, SendError as CrossbeamSendError}; @@ -120,7 +122,7 @@ pub struct NetworkResource { #[cfg(not(target_arch = "wasm32"))] #[allow(dead_code)] // FIXME: remove this struct? struct ServerListener { - receiver_task: bevy_tasks::Task<()>, + receiver_task: Task<()>, // needed to keep receiver_task alive sender: ServerSender, socket_address: SocketAddr, diff --git a/src/transport.rs b/src/transport.rs index 9af7c04..704d4ef 100644 --- a/src/transport.rs +++ b/src/transport.rs @@ -1,6 +1,6 @@ #[cfg(not(target_arch = "wasm32"))] -use bevy_tasks::Task; -use bevy_tasks::TaskPool; +use bevy::tasks::Task; +use bevy::tasks::TaskPool; use bytes::Bytes; use std::{error::Error, net::SocketAddr, sync::{Arc, RwLock}}; use instant::{Instant, Duration};