Use bevy_simple_prefs

Cargo.toml

@@ -16,7 +16,7 @@ bevy_rapier3d = "0.27"
 bevy_asset_loader = "0.21"
 bevy-inspector-egui = { version = "0.25", optional = true }
 leafwing-input-manager = "0.14"
-bevy_jornet = "0.8"
+bevy_jornet = { git = "https://github.com/rparrett/jornet.git", branch = "reflect-player-14" }
 # https://github.com/BraymatterOrg/bevy_tiling_background/pull/25
 bevy_tiling_background = { git = "https://github.com/rparrett/bevy_tiling_background.git", branch = "bevy-0.14" }
 bevy_mod_debugdump = { version = "0.11", optional = true }
@@ -27,6 +27,7 @@ interpolation = "0.2"
 serde = "*"
 ron = "0.8"
 rand = "0.8"
+bevy_simple_prefs = "0.2.0"
 
 # Dependencies for WASM only.
 [target.'cfg(target_arch = "wasm32")'.dependencies]

src/leaderboard.rs

@@ -21,7 +21,7 @@ impl Plugin for LeaderboardPlugin {
                 .init_resource::<RefreshTimer>()
                 .add_plugins(JornetPlugin::with_leaderboard(id, key))
                 .add_systems(Update, save_leaderboard_setting)
-                .add_systems(OnEnter(GameState::Loading), create_player)
+                .add_systems(OnEnter(GameState::MainMenu), create_player)
                 .add_systems(
                     OnEnter(GameState::Leaderboard),
                     (save_score, spawn_leaderboard),

src/save.rs

@@ -1,154 +1,25 @@
 use crate::settings::{LeaderboardSetting, MusicSetting, SfxSetting, ShadowSetting};
 
 use bevy::prelude::*;
-use ron::ser::PrettyConfig;
-use serde::{Deserialize, Serialize};
-
-#[cfg(not(target_arch = "wasm32"))]
-const SAVE_FILE: &str = "save.ron";
-#[cfg(target_arch = "wasm32")]
-const LOCAL_STORAGE_KEY: &str = "combine-racers-save";
+use bevy_simple_prefs::{Prefs, PrefsPlugin};
 
 pub struct SavePlugin;
 impl Plugin for SavePlugin {
     fn build(&self, app: &mut App) {
-        app.add_systems(Update, save_system);
-        app.add_systems(Startup, load_system);
+        app.add_plugins(PrefsPlugin::<SaveFile> {
+            #[cfg(not(target_arch = "wasm32"))]
+            filename: "save.ron".to_string(),
+            #[cfg(target_arch = "wasm32")]
+            filename: "combine-racers-save".to_string(),
+            ..default()
+        });
     }
 }
 
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Prefs, Reflect, Default)]
 struct SaveFile {
     sfx: SfxSetting,
     music: MusicSetting,
     leaderboard: LeaderboardSetting,
     shadow: ShadowSetting,
 }
-
-pub fn load_system(mut commands: Commands) {
-    commands.insert_resource(SfxSetting::default());
-    commands.insert_resource(MusicSetting::default());
-    commands.insert_resource(LeaderboardSetting::default());
-    commands.insert_resource(ShadowSetting::default());
-
-    #[cfg(not(target_arch = "wasm32"))]
-    {
-        let file = match std::fs::File::open(SAVE_FILE) {
-            Ok(f) => f,
-            Err(_) => return,
-        };
-
-        let save_file: SaveFile = match ron::de::from_reader(file) {
-            Ok(s) => s,
-            Err(e) => {
-                warn!("Failed to deserialize save file: {:?}", e);
-                return;
-            }
-        };
-
-        info!("Loaded settings: {:?}", save_file);
-
-        commands.insert_resource(save_file.sfx);
-        commands.insert_resource(save_file.music);
-        commands.insert_resource(save_file.leaderboard);
-        commands.insert_resource(save_file.shadow);
-    }
-    #[cfg(target_arch = "wasm32")]
-    {
-        let window = match web_sys::window() {
-            Some(w) => w,
-            None => return,
-        };
-
-        let storage = match window.local_storage() {
-            Ok(Some(s)) => s,
-            _ => return,
-        };
-
-        let item = match storage.get_item(LOCAL_STORAGE_KEY) {
-            Ok(Some(i)) => i,
-            _ => return,
-        };
-
-        let save_file: SaveFile = match ron::de::from_str(&item) {
-            Ok(s) => s,
-            Err(e) => {
-                warn!("Failed to serialize save file: {:?}", e);
-                return;
-            }
-        };
-
-        info!("Loaded settings: {:?}", save_file);
-
-        commands.insert_resource(save_file.sfx);
-        commands.insert_resource(save_file.music);
-        commands.insert_resource(save_file.leaderboard);
-        commands.insert_resource(save_file.shadow);
-    }
-}
-
-pub fn save_system(
-    sfx: Res<SfxSetting>,
-    music: Res<MusicSetting>,
-    leaderboard: Res<LeaderboardSetting>,
-    shadow: Res<ShadowSetting>,
-) {
-    let sfx_changed = sfx.is_changed() && !sfx.is_added();
-    let music_changed = music.is_changed() && !music.is_added();
-    let leaderboard_changed = leaderboard.is_changed() && !leaderboard.is_added();
-    let shadow_changed = shadow.is_changed() && !shadow.is_added();
-
-    if !sfx_changed && !music_changed && !leaderboard_changed && !shadow_changed {
-        return;
-    }
-
-    info!("Saving settings.");
-
-    let save_file = SaveFile {
-        sfx: sfx.clone(),
-        music: music.clone(),
-        leaderboard: leaderboard.clone(),
-        shadow: shadow.clone(),
-    };
-
-    let pretty = PrettyConfig::new();
-
-    #[cfg(not(target_arch = "wasm32"))]
-    {
-        let file = match std::fs::File::create(SAVE_FILE) {
-            Ok(f) => f,
-            Err(e) => {
-                warn!("Failed to create save file: {:?}", e);
-                return;
-            }
-        };
-
-        if let Err(e) = ron::ser::to_writer_pretty(file, &save_file, pretty) {
-            warn!("Failed to serialize save data: {:?}", e);
-        }
-    }
-    #[cfg(target_arch = "wasm32")]
-    {
-        let data = match ron::ser::to_string_pretty(&save_file, pretty) {
-            Ok(d) => d,
-            Err(e) => {
-                warn!("Failed to serialize save data: {:?}", e);
-                return;
-            }
-        };
-
-        let window = match web_sys::window() {
-            Some(w) => w,
-            None => return,
-        };
-
-        let storage = match window.local_storage() {
-            Ok(Some(s)) => s,
-            _ => return,
-        };
-
-        if let Err(e) = storage.set_item(LOCAL_STORAGE_KEY, data.as_str()) {
-            warn!("Failed to store save file: {:?}", e);
-        }
-    }
-}

src/settings.rs

@@ -1,24 +1,23 @@
 use bevy::prelude::*;
-use serde::{Deserialize, Serialize};
 use std::fmt::Display;
 
-#[derive(Resource, Deref, DerefMut, Debug, Serialize, Deserialize, Clone)]
+#[derive(Resource, Deref, DerefMut, Debug, Clone, Reflect)]
 pub struct MusicSetting(u8);
 impl Default for MusicSetting {
     fn default() -> Self {
-        Self(100)
+        Self(50)
     }
 }
 
-#[derive(Resource, Deref, DerefMut, Debug, Serialize, Deserialize, Clone)]
+#[derive(Resource, Deref, DerefMut, Debug, Clone, Reflect)]
 pub struct SfxSetting(u8);
 impl Default for SfxSetting {
     fn default() -> Self {
-        Self(100)
+        Self(50)
     }
 }
 
-#[derive(Resource, Debug, Serialize, Deserialize, Clone, Default)]
+#[derive(Resource, Debug, Clone, Default, Reflect)]
 pub enum ShadowSetting {
     None,
     Low,
@@ -51,5 +50,5 @@ impl Display for ShadowSetting {
     }
 }
 
-#[derive(Resource, Default, Deref, DerefMut, Debug, Serialize, Deserialize, Clone)]
+#[derive(Resource, Default, Deref, DerefMut, Debug, Clone, Reflect)]
 pub struct LeaderboardSetting(pub Option<bevy_jornet::Player>);