Merge pull request #560 from an-anime-team/next

Release 3.16.0

Author: JohnTheCoolingFan

CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.16.0] - 13.09.2025
+
+### Changed
+
+- Removed support for launching with Proton from the launcher.
+  Launching with proton externally is unaffected.
+
 ## [3.15.6] - 19.08.2025
 
 ### Fixed
@@ -694,7 +701,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <br>
 
-[unreleased]: https://github.com/an-anime-team/an-anime-game-launcher/compare/3.15.6...next
+[unreleased]: https://github.com/an-anime-team/an-anime-game-launcher/compare/3.16.0...next
+[3.16.0]: https://github.com/an-anime-team/an-anime-game-launcher/compare/3.15.6...3.16.0
 [3.15.6]: https://github.com/an-anime-team/an-anime-game-launcher/compare/3.15.5...3.15.6
 [3.15.5]: https://github.com/an-anime-team/an-anime-game-launcher/compare/3.15.4...3.15.5
 [3.15.4]: https://github.com/an-anime-team/an-anime-game-launcher/compare/3.15.3...3.15.4

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "anime-game-launcher"
-version = "3.15.6"
+version = "3.16.0"
 description = "Anime Game launcher"
 authors = ["Nikita Podvirnyi <krypt0nn@vk.com>"]
 homepage = "https://github.com/an-anime-team/an-anime-game-launcher"
@@ -19,7 +19,7 @@ glib-build-tools = "0.20"
 
 [dependencies.anime-launcher-sdk]
 git = "https://github.com/an-anime-team/anime-launcher-sdk"
-tag = "1.31.0"
+tag = "1.31.3"
 features = ["all", "genshin"]
 
 # path = "../anime-launcher-sdk" # ! for dev purposes only

Cargo.toml

@@ -85,11 +85,10 @@ impl SimpleComponent for AboutDialog {
 
             set_release_notes_version: &APP_VERSION,
             set_release_notes: &[
-                "<p>Fixed</p>",
+                "<p>Changed</p>",
 
                 "<ul>",
-                    "<li>Fixed some places that should have localized strings being empty instead</li>",
-                    "<li>Fixed \"Failed to find game diff\" error</li>",
+                    "<li>Removed support for launching with Proton from the launcher. Launching with proton externally is unaffected.</li>",
                 "</ul>"
             ].join("\n")
         }

src/ui/about.rs

@@ -7,7 +7,6 @@ use anime_launcher_sdk::anime_game_core::prelude::*;
 use anime_launcher_sdk::wincompatlib::prelude::*;
 
 use anime_launcher_sdk::components::*;
-use anime_launcher_sdk::components::wine::UnifiedWine;
 
 use anime_launcher_sdk::config::ConfigExt;
 use anime_launcher_sdk::genshin::config::Config;
@@ -561,53 +560,36 @@ impl SimpleAsyncComponent for DownloadComponentsApp {
 
                 let wine = self.selected_wine.clone().unwrap();
                 let dxvk = self.selected_dxvk.clone().unwrap();
+                
+                // Apply DXVK
+                let wine = wine
+                    .to_wine(config.components.path, Some(config.game.wine.builds.join(&wine.name)))
+                    .with_loader(WineLoader::Current)
+                    .with_arch(WineArch::Win64)
+                    .with_prefix(config.game.wine.prefix);
 
-                let group = wine.find_group(&config.components.path).unwrap().unwrap();
-
-                // Apply DXVK if we need it
-                if wine.features_in(&group).unwrap_or_default().need_dxvk {
-                    let wine = wine
-                        .to_wine(config.components.path, Some(config.game.wine.builds.join(&wine.name)))
-                        .with_loader(WineLoader::Current)
-                        .with_arch(WineArch::Win64)
-                        .with_prefix(config.game.wine.prefix);
-
-                    std::thread::spawn(move || {
-                        let params = InstallParams {
-                            // We just created prefix so don't need to repair it
-                            repair_dlls: false,
-
-                            ..InstallParams::default()
-                        };
-
-                        let UnifiedWine::Default(wine) = wine else {
-                            sender.input(DownloadComponentsAppMsg::Continue);
+                std::thread::spawn(move || {
+                    let params = InstallParams {
+                        // We just created prefix so don't need to repair it
+                        repair_dlls: false,
 
-                            return;
-                        };
+                        ..InstallParams::default()
+                    };
 
-                        match wine.install_dxvk(config.game.dxvk.builds.join(&dxvk.name), params) {
-                            // Go to next page
-                            Ok(_) => sender.input(DownloadComponentsAppMsg::Continue),
+                    match wine.install_dxvk(config.game.dxvk.builds.join(&dxvk.name), params) {
+                        // Go to next page
+                        Ok(_) => sender.input(DownloadComponentsAppMsg::Continue),
 
-                            Err(err) => {
-                                tracing::error!("Failed to apply DXVK: {err}");
+                        Err(err) => {
+                            tracing::error!("Failed to apply DXVK: {err}");
 
-                                sender.output(Self::Output::Toast {
-                                    title: tr!("dxvk-apply-error"),
-                                    description: Some(err.to_string())
-                                });
-                            }
+                            sender.output(Self::Output::Toast {
+                                title: tr!("dxvk-apply-error"),
+                                description: Some(err.to_string())
+                            });
                         }
-                    });
-                }
-
-                // Skip DXVK applying if we don't need it
-                else {
-                    tracing::info!("Selected wine version has `need_dxvk = false` feature. Skipping DXVK applying...");
-
-                    sender.input(DownloadComponentsAppMsg::Continue);
-                }
+                    }
+                });
             }
 
             #[allow(unused_must_use)]

src/ui/first_run/download_components.rs

@@ -188,7 +188,7 @@ impl SimpleAsyncComponent for GamePage {
                     if let Ok(config) = Config::get() {
                         self.session_name_entry.set_text("");
 
-                        match Sessions::update(name.clone(), config.get_wine_prefix_path()) {
+                        match Sessions::update(name.clone(), config.game.wine.prefix) {
                             Ok(()) => {
                                 let check_button = gtk::CheckButton::new();
 
@@ -215,7 +215,7 @@ impl SimpleAsyncComponent for GamePage {
             GamePageMsg::UpdateSession(index) => {
                 if let Some(session) = self.sessions.guard().get(index) {
                     if let Ok(config) = Config::get() {
-                        if let Err(err) = Sessions::update(session.name.clone(), config.get_wine_prefix_path()) {
+                        if let Err(err) = Sessions::update(session.name.clone(), config.game.wine.prefix) {
                             sender.output(EnhancementsAppMsg::Toast {
                                 title: tr!("game-session-update-failed"),
                                 description: Some(err.to_string())
@@ -257,7 +257,7 @@ impl SimpleAsyncComponent for GamePage {
                             return;
                         }
 
-                        if let Err(err) = Sessions::apply(session.name.clone(), config.get_wine_prefix_path()) {
+                        if let Err(err) = Sessions::apply(session.name.clone(), config.game.wine.prefix) {
                             sender.output(EnhancementsAppMsg::Toast {
                                 title: tr!("game-session-apply-failed"),
                                 description: Some(err.to_string())

src/ui/preferences/enhancements/game.rs

@@ -5,7 +5,6 @@ use adw::prelude::*;
 use anime_launcher_sdk::wincompatlib::prelude::*;
 
 use anime_launcher_sdk::components::*;
-use anime_launcher_sdk::components::wine::UnifiedWine;
 
 use super::GeneralAppMsg;
 
@@ -18,7 +17,6 @@ pub struct ComponentsPage {
 
     downloaded_wine_versions: Vec<(wine::Version, wine::Features)>,
     downloaded_dxvk_versions: Vec<dxvk::Version>,
-    allow_dxvk_selection: bool,
 
     selected_wine_version: u32,
     selected_dxvk_version: u32,
@@ -167,16 +165,6 @@ impl SimpleAsyncComponent for ComponentsPage {
                     add = &adw::PreferencesGroup {
                         set_title: &tr!("dxvk-version"),
 
-                        #[watch]
-                        set_description: Some(&if !model.allow_dxvk_selection {
-                            tr!("dxvk-selection-disabled")
-                        } else {
-                            String::new()
-                        }),
-
-                        #[watch]
-                        set_sensitive: model.allow_dxvk_selection,
-
                         adw::ComboRow {
                             set_title: &tr!("selected-version"),
 
@@ -225,9 +213,6 @@ impl SimpleAsyncComponent for ComponentsPage {
                     },
 
                     add = &adw::PreferencesGroup {
-                        #[watch]
-                        set_sensitive: model.allow_dxvk_selection,
-
                         add = model.dxvk_components.widget(),
                     },
                 }
@@ -304,15 +289,6 @@ impl SimpleAsyncComponent for ComponentsPage {
             downloaded_wine_versions: vec![],
             downloaded_dxvk_versions: vec![],
 
-            allow_dxvk_selection: match &CONFIG.game.wine.selected {
-                Some(version) => match wine::Group::find_in(&CONFIG.components.path, version) {
-                    Ok(Some(group)) => group.features.unwrap_or_default().need_dxvk,
-                    _ => true
-                }
-
-                None => true
-            },
-
             selected_wine_version: 0,
             selected_dxvk_version: 0,
 
@@ -398,10 +374,9 @@ impl SimpleAsyncComponent for ComponentsPage {
 
             ComponentsPageMsg::SelectWine(index) => {
                 if let Ok(mut config) = Config::get() {
-                    if let Some((version, features)) = self.downloaded_wine_versions.get(index) {
+                    if let Some((version, _)) = self.downloaded_wine_versions.get(index) {
                         if config.game.wine.selected.as_ref() != Some(&version.title) {
                             self.selecting_wine_version = true;
-                            self.allow_dxvk_selection = features.need_dxvk;
 
                             let wine = version
                                 .to_wine(&config.components.path, Some(&config.game.wine.builds.join(&version.name)))
@@ -448,10 +423,7 @@ impl SimpleAsyncComponent for ComponentsPage {
 
                                 let mut wine = match config.get_selected_wine() {
                                     Ok(Some(version)) => {
-                                        match version.to_wine(config.components.path, Some(config.game.wine.builds.join(&version.name))) {
-                                            UnifiedWine::Default(wine) => wine,
-                                            UnifiedWine::Proton(_) => return
-                                        }
+                                        version.to_wine(config.components.path, Some(config.game.wine.builds.join(&version.name)))
                                     }
 
                                     _ => Wine::default()