From f73656c66fcec95e0957a7500c291926e0dcab2e Mon Sep 17 00:00:00 2001 From: core Date: Fri, 24 Nov 2023 18:03:27 -0500 Subject: [PATCH] the server currently does much nothing --- Cargo.lock | 23 ++++++++++++----------- Cargo.toml | 5 +---- server/Cargo.toml | 3 ++- server/src/main.rs | 15 ++++++++++----- 4 files changed, 25 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c9a90973b793d3c2b4fd3bb2a6f473ec9b06b5c3..425321303d2363089982c5eba75a20e754b26948 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2970,17 +2970,6 @@ dependencies = [ "serde", ] -[[package]] -name = "server" -version = "0.0.1" -dependencies = [ - "bevy", - "bevy_twite", - "rmp", - "rmp-serde", - "serde", -] - [[package]] name = "sha1" version = "0.10.5" @@ -3059,6 +3048,18 @@ dependencies = [ "num-traits", ] +[[package]] +name = "starkingdoms-server" +version = "0.0.1" +dependencies = [ + "bevy", + "bevy_twite", + "rmp", + "rmp-serde", + "serde", + "tracing-subscriber", +] + [[package]] name = "static_assertions" version = "1.1.0" diff --git a/Cargo.toml b/Cargo.toml index c7a31ee54f4dd6a6da7eb36c615734e1484fab0e..964c1bd5bb35dc67d5fe70c5c0c97fa71034c939 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,4 @@ [workspace] members = [ "server", -] - -[profile.dev.package.rapier2d-f64] -opt-level = 3 +] \ No newline at end of file diff --git a/server/Cargo.toml b/server/Cargo.toml index 9f9d74ceb5f406103261a5ce0f25fcefb895a92a..1b65b12561482fe30512fe6e80b3ae4d9b98df5f 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "server" +name = "starkingdoms-server" version = "0.0.1" edition = "2021" @@ -9,3 +9,4 @@ rmp = "^0.8" rmp-serde = "1.1.2" serde = "1.0.192" bevy_twite = { git = "https://gitlab.com/ghostlyzsh/twite.git" } +tracing-subscriber = "0.3" \ No newline at end of file diff --git a/server/src/main.rs b/server/src/main.rs index 61923e97f1eee362edfac27d1ca7efe0d28858d5..51e9d0963de1c4a2371d39ab3e12213347d37516 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -1,32 +1,37 @@ -extern crate rmp; -extern crate rmp_serde as rmps; -extern crate serde; - mod component; mod packet; use std::collections::HashMap; use bevy::{prelude::*, ecs::event::ManualEventReader}; +use bevy::utils::tracing; use bevy_twite::{TwiteServerPlugin, TwiteServerConfig, ServerEvent, twite::frame::MessageType}; use component::*; use packet::*; -use rmps::Serializer; +use rmp_serde::Serializer; use serde::Serialize; fn main() { + let subscriber = tracing_subscriber::FmtSubscriber::new(); + tracing::subscriber::set_global_default(subscriber).unwrap(); + info!("StarKingdoms server v{} starting up", env!("CARGO_PKG_VERSION")); + App::new() .insert_resource(TwiteServerConfig { port: 3000, }) + .add_plugins(MinimalPlugins) .add_plugins(TwiteServerPlugin) .add_systems(Startup, spawn_planets) .add_systems(Update, on_connection) .add_systems(Update, on_position_change) .run(); + + info!("Goodbye!"); } fn spawn_planets(mut commands: Commands) { + debug!("Spawning planets"); let earth_pos = Transform::from_xyz(0.0, 0.0, 0.0); commands.spawn(PlanetBundle { planet_type: PlanetType::Earth,