11 files changed, 12 insertions(+), 10 deletions(-)

M crates/unified/src/client/mod.rs
M crates/unified/src/client/starguide/init.rs
M crates/unified/src/client/starguide/orbit.rs
M crates/unified/src/main.rs
M crates/unified/src/server/earth_parts.rs
M crates/unified/src/server/gravity.rs
M crates/unified/src/server/mod.rs
M crates/unified/src/server/player.rs
M crates/unified/src/server/player/join.rs
M crates/unified/src/shared_plugins.rs
R crates/unified/src/{server => }/world_config.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;

@@ 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,
     );

@@ 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);

@@ 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;

@@ 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;

@@ 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));

@@ 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)

@@ 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;
 

@@ 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
+}

@@ 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::<GlobalWorldConfig>::new(&["wc.toml"]))