1.17.3

Added hash check for fpsunlocker

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "anime-launcher-sdk"
-version = "1.16.10"
+version = "1.17.3"
 authors = ["Nikita Podvirnyi <krypt0nn@vk.com>"]
 license = "GPL-3.0"
 readme = "README.md"
@@ -9,7 +9,7 @@ edition = "2021"
 
 [dependencies.anime-game-core]
 git = "https://github.com/an-anime-team/anime-game-core"
-tag = "1.21.3"
+tag = "1.22.2"
 features = ["all"]
 
 # path = "../anime-game-core" # ! for dev purposes only
@@ -21,7 +21,7 @@ tracing = "0.1"
 serde = { version = "1.0", features = ["derive"], optional = true }
 serde_json = { version = "1.0", optional = true }
 
-cached = { version = "0.52", features = ["proc_macro"] }
+cached = { version = "0.53", features = ["proc_macro"] }
 enum-ordinalize = { version = "4.3", optional = true }
 
 wincompatlib = { version = "0.7.4", features = ["all"], optional = true }

src/games/genshin/config/schema/mod.rs

@@ -26,8 +26,6 @@ pub mod components;
 pub mod prelude {
     pub use super::launcher::prelude::*;
     pub use super::game::prelude::*;
-
-    pub use super::launcher::prelude::*;
     pub use super::game::*;
 
     #[cfg(feature = "components")]

src/games/genshin/fps_unlocker.rs

@@ -48,7 +48,24 @@ impl FpsUnlocker {
         }
 
         match downloader.download(dir.join("fpsunlock.exe"), |_, _| {}) {
-            Ok(_) => Ok(Self { dir }),
+            Ok(_) => {
+                match Self::from_dir(dir) {
+                    Ok(Some(me)) => Ok(me),
+
+                    Ok(None) => {
+                        tracing::error!("Invalid hash");
+
+                        anyhow::bail!("Downloading failed: invalid fps unlocker hash");
+                    }
+
+                    Err(err) => {
+                        tracing::error!("Downloading failed: {err}");
+
+                        Err(err.into())
+                    }
+                }
+            }
+
             Err(err) => {
                 tracing::error!("Downloading failed: {err}");
 

src/games/honkai/config/mod.rs

@@ -42,7 +42,7 @@ impl ConfigExt for Config {
     #[inline]
     fn get() -> anyhow::Result<Self::Schema> {
         unsafe {
-            match &CONFIG {
+            match CONFIG.as_ref() {
                 Some(config) => Ok(config.clone()),
                 None => Self::get_raw()
             }

src/games/honkai/config/schema/mod.rs

@@ -27,8 +27,6 @@ pub mod components;
 pub mod prelude {
     pub use super::launcher::prelude::*;
     pub use super::game::prelude::*;
-
-    pub use super::launcher::prelude::*;
     pub use super::game::*;
     pub use super::patch::*;
 

src/games/honkai/config/schema/patch.rs

@@ -7,8 +7,7 @@ use crate::honkai::consts::launcher_dir;
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Patch {
-    pub path: PathBuf,
+    pub path: PathBuf
-    pub apply_mfplat: bool
 }
 
 impl Default for Patch {
@@ -17,12 +16,7 @@ impl Default for Patch {
         let launcher_dir = launcher_dir().expect("Failed to get launcher dir");
 
         Self {
-            path: launcher_dir.join("patch"),
+            path: launcher_dir.join("patch")
-
-            // Seems to not be needed with wine 8+
-            // which is recommended by default, so will work
-            // for most of users
-            apply_mfplat: false
         }
     }
 }
@@ -35,11 +29,6 @@ impl From<&JsonValue> for Patch {
             path: match value.get("path").and_then(|path| path.as_str()).map(PathBuf::from) {
                 Some(path) => path,
                 None => default.path
-            },
-
-            apply_mfplat: match value.get("apply_mfplat") {
-                Some(value) => value.as_bool().unwrap_or(default.apply_mfplat),
-                None => default.apply_mfplat
             }
         }
     }

src/games/honkai/game.rs

@@ -1,6 +1,9 @@
 use std::io::{Read, Write};
 use std::process::{Command, Stdio};
 use std::path::PathBuf;
+use std::fs::File;
+use std::sync::{Arc, Mutex};
+use std::sync::atomic::{AtomicUsize, Ordering};
 
 use anime_game_core::honkai::telemetry;
 

src/games/pgr/config/schema/mod.rs

@@ -26,8 +26,6 @@ pub mod components;
 pub mod prelude {
     pub use super::launcher::prelude::*;
     pub use super::game::prelude::*;
-
-    pub use super::launcher::prelude::*;
     pub use super::game::*;
 
     #[cfg(feature = "components")]

src/games/pgr/game.rs

@@ -1,5 +1,9 @@
+use std::io::{Read, Write};
 use std::process::{Command, Stdio};
 use std::path::PathBuf;
+use std::fs::File;
+use std::sync::{Arc, Mutex};
+use std::sync::atomic::{AtomicUsize, Ordering};
 
 use anime_game_core::pgr::telemetry;
 

src/games/star_rail/config/schema/mod.rs

@@ -27,8 +27,6 @@ pub mod components;
 pub mod prelude {
     pub use super::launcher::prelude::*;
     pub use super::game::prelude::*;
-
-    pub use super::launcher::prelude::*;
     pub use super::game::*;
     pub use super::patch::*;
 

src/games/star_rail/game.rs

@@ -1,5 +1,9 @@
+use std::io::{Read, Write};
 use std::process::{Command, Stdio};
 use std::path::PathBuf;
+use std::fs::File;
+use std::sync::{Arc, Mutex};
+use std::sync::atomic::{AtomicUsize, Ordering};
 
 use anime_game_core::star_rail::telemetry;
 

src/games/wuwa/game.rs

@@ -1,5 +1,9 @@
+use std::io::{Read, Write};
 use std::process::{Command, Stdio};
 use std::path::PathBuf;
+use std::fs::File;
+use std::sync::{Arc, Mutex};
+use std::sync::atomic::{AtomicUsize, Ordering};
 
 use anime_game_core::wuwa::telemetry;
 

src/games/zzz/config/schema/mod.rs

@@ -26,7 +26,6 @@ pub mod components;
 pub mod prelude {
     pub use super::launcher::prelude::*;
     pub use super::game::prelude::*;
-
     pub use super::game::*;
 
     #[cfg(feature = "components")]

src/games/zzz/game.rs

@@ -1,5 +1,9 @@
+use std::io::{Read, Write};
 use std::process::{Command, Stdio};
 use std::path::PathBuf;
+use std::fs::File;
+use std::sync::{Arc, Mutex};
+use std::sync::atomic::{AtomicUsize, Ordering};
 
 use anime_game_core::prelude::*;
 use anime_game_core::zzz::telemetry;