From ade2542fc7b644f54ab5b03a33cf11dca10a740c Mon Sep 17 00:00:00 2001 From: ghostly_zsh Date: Fri, 28 Nov 2025 16:49:15 -0600 Subject: [PATCH] fix: world config is on client too now --- crates/unified/src/client/mod.rs | 1 + crates/unified/src/client/starguide/init.rs | 2 +- crates/unified/src/client/starguide/orbit.rs | 2 +- crates/unified/src/main.rs | 1 + crates/unified/src/server/earth_parts.rs | 2 +- crates/unified/src/server/gravity.rs | 2 +- crates/unified/src/server/mod.rs | 4 +--- crates/unified/src/server/player.rs | 2 +- crates/unified/src/server/player/join.rs | 4 ++-- crates/unified/src/shared_plugins.rs | 2 ++ crates/unified/src/{server => }/world_config.rs | 0 11 files changed, 12 insertions(+), 10 deletions(-) rename crates/unified/src/{server => }/world_config.rs (100%) diff --git a/crates/unified/src/client/mod.rs b/crates/unified/src/client/mod.rs index 2e8395d39417545065dfcee44deea287a5a2c44e..099e9e4d3888c421b50e42828e302b0c95660bc9 100644 --- a/crates/unified/src/client/mod.rs +++ b/crates/unified/src/client/mod.rs @@ -14,6 +14,7 @@ use crate::prelude::*; use planet::incoming_planets::incoming_planets_plugin; use crate::client::ship::attachment::client_attachment_plugin; use crate::ecs::{Me, GameplayState, STARGUIDE_LAYER}; +use crate::world_config::world_config_plugin; pub mod colors; pub mod key_input; diff --git a/crates/unified/src/client/starguide/init.rs b/crates/unified/src/client/starguide/init.rs index 9a8b0e7b5c7545901c4f940797fe1a378c625ed6..48026fef48bcecd7d60ccaba42cb6b06edd90df5 100644 --- a/crates/unified/src/client/starguide/init.rs +++ b/crates/unified/src/client/starguide/init.rs @@ -47,7 +47,7 @@ pub fn init_starguide( height: window.height() as u32, depth_or_array_layers: 1, }, TextureDimension::D2, - &(Color::WHITE.to_srgba().to_u8_array()), + &(Color::BLACK.to_srgba().to_u8_array()), TextureFormat::Rgba8UnormSrgb, RenderAssetUsages::MAIN_WORLD | RenderAssetUsages::RENDER_WORLD, ); diff --git a/crates/unified/src/client/starguide/orbit.rs b/crates/unified/src/client/starguide/orbit.rs index 2c0d9f93b9c1a3791ce3dee495362ac0834c9991..e40da6691c7f6642958b7e951028abccd409ac91 100644 --- a/crates/unified/src/client/starguide/orbit.rs +++ b/crates/unified/src/client/starguide/orbit.rs @@ -20,7 +20,7 @@ fn update_orbits( return }; let Projection::Orthographic(ref projection) = camera.2.clone() else { return }; - image.clear(&(Color::WHITE.to_srgba().to_u8_array())); + image.clear(&(Color::BLACK.to_srgba().to_u8_array())); let player_pos = me.translation - orbit.translation; let player_pos = Vec3::new(player_pos.x, -player_pos.y, player_pos.z); diff --git a/crates/unified/src/main.rs b/crates/unified/src/main.rs index 9efef618f31484e4205305a210e58ac34b72b2b1..fbe67a228efcc93d9ab8a8be1ec45d2687852436 100644 --- a/crates/unified/src/main.rs +++ b/crates/unified/src/main.rs @@ -34,6 +34,7 @@ pub mod server; #[cfg(feature = "server")] pub mod server_plugins; pub mod shared_plugins; +pub mod world_config; pub mod physics; pub mod prelude; diff --git a/crates/unified/src/server/earth_parts.rs b/crates/unified/src/server/earth_parts.rs index 0666afc46505260719665af6f99e319681119062..79705578805c9be4d6ade0500f400d2deed61107 100644 --- a/crates/unified/src/server/earth_parts.rs +++ b/crates/unified/src/server/earth_parts.rs @@ -1,6 +1,6 @@ use crate::config::planet::Planet; use crate::server::part::{SpawnPartBundle, SpawnPartRequest}; -use crate::server::world_config::WorldConfigResource; +use crate::world_config::WorldConfigResource; use bevy::app::App; use crate::prelude::*; use bevy::time::Time; diff --git a/crates/unified/src/server/gravity.rs b/crates/unified/src/server/gravity.rs index 2ffb5f4f4203405ae732c67fd8536c19d0caf7eb..ad3dfdec22749b20e83eb6e95c224061123d7a56 100644 --- a/crates/unified/src/server/gravity.rs +++ b/crates/unified/src/server/gravity.rs @@ -3,7 +3,7 @@ use crate::config::planet::Planet; use crate::ecs::Part; use crate::prelude::*; use crate::server::system_sets::WorldUpdateSet; -use crate::server::world_config::WorldConfigResource; +use crate::world_config::WorldConfigResource; pub fn newtonian_gravity_plugin(app: &mut App) { app.add_systems(Update, update_gravity.in_set(WorldUpdateSet)); diff --git a/crates/unified/src/server/mod.rs b/crates/unified/src/server/mod.rs index cc89e5a1ed489e0fae2811ebcd783986155f5d92..cf82008212946e6b34ec0407884f7b68888b5c69 100644 --- a/crates/unified/src/server/mod.rs +++ b/crates/unified/src/server/mod.rs @@ -4,7 +4,6 @@ mod part; pub mod planets; pub mod player; mod system_sets; -mod world_config; use crate::server::earth_parts::spawn_parts_plugin; use crate::server::gravity::newtonian_gravity_plugin; @@ -12,7 +11,7 @@ use crate::server::part::part_management_plugin; use crate::server::planets::planets_plugin; use crate::server::player::player_management_plugin; use crate::server::system_sets::{PlayerInputSet, WorldUpdateSet}; -use crate::server::world_config::world_config_plugin; +use crate::world_config::world_config_plugin; use aeronet::io::Session; use aeronet::io::connection::{DisconnectReason, Disconnected, LocalAddr}; use aeronet::io::server::Server; @@ -45,7 +44,6 @@ impl Plugin for ServerPlugin { .add_observer(on_connected) .add_observer(on_disconnected) .add_plugins(planets_plugin) - .add_plugins(world_config_plugin) .add_plugins(newtonian_gravity_plugin) .add_plugins(player_management_plugin) .add_plugins(spawn_parts_plugin) diff --git a/crates/unified/src/server/player.rs b/crates/unified/src/server/player.rs index 509d88f25c24b502a91df28d6da35ef7000afef6..b9867a8f2705ce28ff02cc1ecd103a8f1a3d9ffb 100644 --- a/crates/unified/src/server/player.rs +++ b/crates/unified/src/server/player.rs @@ -6,7 +6,7 @@ use crate::ecs::{DragRequestEvent, Part, Player, PlayerStorage}; use crate::server::system_sets::PlayerInputSet; use crate::server::ConnectedNetworkEntity; use crate::prelude::*; -use crate::server::world_config::WorldConfigResource; +use crate::world_config::WorldConfigResource; use bevy_replicon::prelude::{ClientId, FromClient}; use std::f32::consts::PI; diff --git a/crates/unified/src/server/player/join.rs b/crates/unified/src/server/player/join.rs index 8e7d0a3bb9bf3c96a996f25100e6c8161a0a2015..8f20bc7401ced1d794656bf06d859dd5e09d626b 100644 --- a/crates/unified/src/server/player/join.rs +++ b/crates/unified/src/server/player/join.rs @@ -4,7 +4,7 @@ use crate::ecs::{Hi, Player, PlayerStorage}; use crate::prelude::*; use crate::server::ConnectedGameEntity; use crate::server::part::SpawnPartRequest; -use crate::server::world_config::WorldConfigResource; +use crate::world_config::WorldConfigResource; fn join_player(joined_player: Entity, mut commands: Commands, wc: &GlobalWorldConfig, planets: Query<(&Transform, &Planet)>, asset_server: &AssetServer) { trace!(?joined_player, "detected joined player!"); @@ -113,4 +113,4 @@ pub fn ls_magically_invent_player( crate::ecs::Me )).id(); debug!(?fake_network_entity, ?local_player, "listenserver: magically invented a player"); -} \ No newline at end of file +} diff --git a/crates/unified/src/shared_plugins.rs b/crates/unified/src/shared_plugins.rs index 6c75235827dd66bde965d45b092f1b4654f3fa9a..67fa48e6edb7e02d9d4305db68f274ab4196e067 100644 --- a/crates/unified/src/shared_plugins.rs +++ b/crates/unified/src/shared_plugins.rs @@ -10,6 +10,7 @@ use crate::config::world::GlobalWorldConfig; use crate::ecs::thruster::{Thruster, ThrusterOfPart}; use crate::physics::register_physics_components_for_replication; use crate::thrust::ThrustSolution; +use crate::world_config::world_config_plugin; pub struct SharedPluginGroup; @@ -21,6 +22,7 @@ impl PluginGroup for SharedPluginGroup { .add(physics_setup_plugin) .add(register_everything) .add(register_physics_components_for_replication) + .add(world_config_plugin) /* Assets */ .add(TomlAssetPlugin::::new(&["wc.toml"])) diff --git a/crates/unified/src/server/world_config.rs b/crates/unified/src/world_config.rs similarity index 100% rename from crates/unified/src/server/world_config.rs rename to crates/unified/src/world_config.rs