diff --git a/Cargo.lock b/Cargo.lock index 91ed97aa..58e1d009 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -557,8 +557,6 @@ dependencies = [ [[package]] name = "bevy_networking_turbulence" version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d841756229b2a5e75191c7c0bd5d52abe4025e847b1f10663ee81158a371243" dependencies = [ "bevy", "bytes", @@ -3477,7 +3475,6 @@ dependencies = [ "bevy", "bevy_egui", "bevy_fly_camera", - "bevy_networking_turbulence", "bevy_rapier3d", "byond", "cfg-if 1.0.0", diff --git a/Cargo.toml b/Cargo.toml index a0b46e12..2b04ee1b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,6 @@ futures-lite = "1.4.0" log = "0.4.8" glam = "0.20.2" nalgebra = { version = "*", features = ["convert-glam020"] } -bevy_networking_turbulence = "*" serde = { version = "*", features = ["derive"] } clap = { version = "3.0.13", features = ["derive"] } diff --git a/crates/networking/Cargo.toml b/crates/networking/Cargo.toml index df714430..6690dbdd 100644 --- a/crates/networking/Cargo.toml +++ b/crates/networking/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] bevy = "0.6" -bevy_networking_turbulence = "0.4.1" +bevy_networking_turbulence = { version = "0.4.1", path = "../../../bevy_networking_turbulence" } serde = { version = "*", features = ["derive"] } bincode = "1.3.3" bevy_rapier3d = { version = "0.12.0" } diff --git a/crates/networking/src/lib.rs b/crates/networking/src/lib.rs index ae880b03..d81fa978 100644 --- a/crates/networking/src/lib.rs +++ b/crates/networking/src/lib.rs @@ -4,6 +4,8 @@ pub mod visibility; pub mod spawning; pub mod transform; +pub use bevy_networking_turbulence::NetworkResource; + use std::{net::SocketAddr, fmt::Display}; use bevy::{ @@ -15,7 +17,7 @@ use bevy::{ }; use bevy_networking_turbulence::{ MessageFlushingStrategy, - NetworkEvent, NetworkResource, + NetworkEvent, }; use identity::IdentityPlugin; use messaging::{MessageSender, MessageReceivers, MessageEvent, MessagingPlugin, AppExt}; diff --git a/src/main.rs b/src/main.rs index 13ae4ba8..e443a1f4 100644 --- a/src/main.rs +++ b/src/main.rs @@ -16,7 +16,6 @@ use bevy::log::LogPlugin; use bevy::prelude::*; use bevy::tasks::{AsyncComputeTaskPool, Task}; use bevy_fly_camera::{FlyCamera, FlyCameraPlugin}; -use bevy_networking_turbulence::NetworkResource; use bevy_rapier3d::na::{Point3, Vector3}; use bevy_rapier3d::physics::{ ColliderBundle, NoUserData, RapierPhysicsPlugin, RigidBodyPositionSync, @@ -46,7 +45,7 @@ use networking::identity::{EntityCommandsExt as NetworkingEntityCommandsExt, Net use networking::spawning::{NetworkedEntityEvent, PrefabPath, ClientControls, ClientControlled}; use networking::transform::{NetworkedTransform, NetworkTransform}; use networking::visibility::NetworkObserver; -use networking::{NetworkRole, NetworkingPlugin, ClientEvent, ConnectionId, ServerEvent}; +use networking::{NetworkRole, NetworkingPlugin, ClientEvent, ConnectionId, ServerEvent, NetworkResource}; #[derive(Parser)] struct Args {