Persistent world

.gitignore

@@ -3,3 +3,5 @@
 # vim stuff
 tree-sitter-rust
 *-E
+
+backups/

Cargo.toml

@@ -29,9 +29,11 @@ bincode = "1.3.3"
 rand = {version = "0.9.0", features = ["small_rng"]}
 renet = "1.2.0"
 serde = { version = "1.0.203", features = ["derive"] }
+serde_derive = "1.0.228"
 serde-big-array = "0.5.1"
 chrono = "0.4.38"
 rayon = "1.10.0"
+clap = { version = "4.5.54", features = ["derive"] }
 
 [patch.crates-io]
 # TODO: Remove patch once egui requirement is more flexible.
@@ -44,9 +46,6 @@ renet = {git = "https://github.com/cb341/renet.git" }
 [profile.dev.package."*"]
 opt-level = 3
 
-[profile.dev.package.objc2]
-debug-assertions = false
-
 [profile.release]
 opt-level = 3
 

README.md

@@ -11,6 +11,8 @@ A stupid little Minecraft clone written in Rust, powered by the Bevy engine.
 * World update synchronization between game clients
 * World physics using rapier
 * World updates using primitive ray casting
+* World saving/loading with `.rsmcw` files
+* Periodic world backups in `./backups/` directory
 * Modular architecture using ECS
 
 ## Installation
@@ -24,30 +26,29 @@ A stupid little Minecraft clone written in Rust, powered by the Bevy engine.
 Just run the cargo command to install the dependencies and start the game:
 
 ```bash
-cargo run --bin server
-cargo run --bin client
+cargo rs # run server
+cargo rc # run client
+```
+
+Loading world
 
+```bash
+car rs -- -w my_world.rsmcw
 ```
 
 ### More optimal setup
 
 Release Builds (for better performance):
 
 ```bash
-cargo run --bin server --release
-cargo run --bin client --release
+cargo run rs --release
+cargo run rc --release
 ```
 
-Dynamic Linking (to reduce compile times):
-```bash
-cargo run --bin server --features dynamic_linking
-cargo run --bin client --features dynamic_linking
-```
+Hot reload client
 
-Automatic Reloading (with [cargo watch](https://docs.rs/crate/cargo-watch)):
 ```bash
-cargo watch -x 'run --bin server'
-cargo watch -x 'run --bin client'
+bin/dev
 ```
 
 ### Installation on NixOS
@@ -56,10 +57,10 @@ Nix shell can be used to run the code using the given [Nix Shell Config File](./
 Strongly inspired by the [Bevy NixOS installation guide](https://github.com/bevyengine/bevy/blob/latest/docs/linux_dependencies.md)
 
 ```bash
-nix-shell --run "cargo run --bin server"
-nix-shell --run "cargo run --bin client"
+nix-shell --run "cargo rs"
+nix-shell --run "cargo rc"
 ```
 
 ## Notes
 
-Checkout the [Wiki](https://github.com/CuddlyBunion341/rsmc/wiki) for additional project information.
+Checkout the [Wiki](https://github.com/cb341/rsmc/wiki) for additional project information.

src/client/terrain/systems.rs

@@ -89,7 +89,7 @@ pub fn handle_chunk_mesh_update_events_system(
             "Received chunk mesh update event for chunk {:?}",
             event.chunk_position
         );
-        let chunk_option = chunk_manager.get_chunk(event.chunk_position);
+        let chunk_option = chunk_manager.get_chunk(&event.chunk_position);
         match chunk_option {
             Some(chunk) => {
                 tasks.task_list.push(FutureChunkMesh {

src/server/main.rs

@@ -4,6 +4,8 @@ pub mod player;
 pub mod prelude;
 pub mod terrain;
 
+use clap::Parser;
+
 #[cfg(feature = "egui_layer")]
 use bevy::DefaultPlugins;
 #[cfg(feature = "egui_layer")]
@@ -14,8 +16,16 @@ use bevy::log::LogPlugin;
 
 use crate::prelude::*;
 
+#[derive(Parser, Debug)]
+#[command(version, about, long_about = None)]
+struct Args {
+    #[arg(short, long, default_value = None)]
+    world_file_path: Option<String>,
+}
+
 fn main() {
     let mut app = App::new();
+
     #[cfg(not(feature = "egui_layer"))]
     {
         app.add_plugins(MinimalPlugins);
@@ -30,9 +40,16 @@ fn main() {
         app.add_systems(Startup, gui::setup_camera_system);
     }
 
+    let args = Args::parse();
+    let file_path = args.world_file_path;
+    let terrain_plugin = file_path
+        .as_ref()
+        .and_then(|path| terrain::TerrainPlugin::from_path(path).ok())
+        .unwrap_or_else(|| terrain::TerrainPlugin::from_seed(0));
+    app.add_plugins(terrain_plugin);
+
     app.add_plugins(player::PlayerPlugin);
     app.add_plugins(networking::NetworkingPlugin);
-    app.add_plugins(terrain::TerrainPlugin);
 
     #[cfg(feature = "chat")]
     app.add_plugins(chat::ChatPlugin);

src/server/networking/systems.rs

@@ -4,6 +4,7 @@ pub fn receive_message_system(
     mut server: ResMut<RenetServer>,
     mut player_states: ResMut<player_resources::PlayerStates>,
     mut past_block_updates: ResMut<terrain_resources::PastBlockUpdates>,
+    mut chunk_manager: ResMut<ChunkManager>,
     mut request_queue: ResMut<terrain_resources::ClientChunkRequests>,
     #[cfg(feature = "chat")] mut chat_message_events: MessageWriter<
         chat_events::PlayerChatMessageSendEvent,
@@ -20,6 +21,7 @@ pub fn receive_message_system(
                         "Received block update from client {} {} {:?}",
                         client_id, position, block
                     );
+                    chunk_manager.update_block(position, block);
                     past_block_updates
                         .updates
                         .push(terrain_events::BlockUpdateEvent { position, block });