fix small issues

instance_builder/README.md

@@ -18,7 +18,7 @@ The `spec.json` file is used to define the specifications for generating instanc
       "include_no_overwrite": ["string"],
       "include_from": "string",
       "replace_download_urls": "boolean",
-      "auth_provider": {
+      "auth_backend": {
         "type": "string",
         "data_field1": "data_value1",
         "other_data_fields": "other_data_values"
@@ -52,7 +52,7 @@ The `spec.json` file is used to define the specifications for generating instanc
 - **include**: A list of additional files or directories to include in the instance (optional; e.g., mods).
 - **include_no_overwrite**: A list of files or directories to include without overwriting existing files (optional; e.g., configs).
 - **include_from**: A directory from which to include files (optional).
-- **auth_provider**: Authentication data for accessing protected resources (optional).
+- **auth_backend**: Authentication data for accessing protected resources (optional).
   - **type**: The authentication provider name (e.g., "telegram" for [this telegram format](https://foxlab.dev/minecraft/tgauth-backend)).
   - Any additional fields for the selected authentication provider.
 - **exec_before**: A command to execute before processing this version (optional).

instance_builder/spec.json.example

@@ -15,7 +15,7 @@
                 "config"
             ],
             "include_from": "<...>/PrismLauncher/instances/Monifactory/minecraft",
-            "auth_provider": {
+            "auth_backend": {
                 "type": "telegram",
                 "auth_base_url": "https://mc-auth.vanutp.dev"
             }

instance_builder/src/spec.rs

@@ -55,7 +55,7 @@ pub struct Version {
 
     pub include_from: Option<String>,
 
-    pub auth_provider: Option<AuthBackend>,
+    pub auth_backend: Option<AuthBackend>,
 
     pub exec_before: Option<String>,
     pub exec_after: Option<String>,
@@ -208,7 +208,7 @@ impl VersionsSpec {
                 resources_url_base,
                 self.download_server_base.clone(),
                 result.extra_libs_paths,
-                version.auth_provider.clone(),
+                version.auth_backend.clone(),
             );
             let extra_generator_result = extra_generator.generate(work_dir).await?;
             mapping.extend(extra_generator_result.include_mapping.into_iter().map(

launcher/src/app/app.rs

@@ -39,7 +39,7 @@ pub struct LauncherApp {
 pub fn run_gui(config: Config) {
     let native_options = eframe::NativeOptions {
         viewport: egui::ViewportBuilder::default()
-            .with_inner_size((650.0, 500.0))
+            .with_inner_size((650.0, 450.0))
             .with_icon(utils::get_icon_data())
             .with_resizable(false),
         ..Default::default()
@@ -295,9 +295,12 @@ impl LauncherApp {
                 let force_launch_result = self.launch_state.render_download_ui(
                     ui,
                     &mut self.config,
-                    !self.java_state.checking_java()
-                        && some_version_selected
-                        && have_some_auth_data,
+                    self.instance_sync_state.is_syncing()
+                        || self.manifest_state.is_fetching()
+                        || self.metadata_state.is_getting()
+                        || self.java_state.checking_java()
+                        || !some_version_selected
+                        || !have_some_auth_data,
                 );
                 match force_launch_result {
                     ForceLaunchResult::ForceLaunchSelected => {

launcher/src/app/launch_state.rs

@@ -154,13 +154,13 @@ impl LaunchState {
         &mut self,
         ui: &mut egui::Ui,
         config: &mut Config,
-        enabled: bool,
+        disabled: bool,
     ) -> ForceLaunchResult {
         let lang = config.lang;
 
         if !self.force_launch {
             let mut button_clicked = false;
-            ui.add_enabled_ui(enabled, |ui| {
+            ui.add_enabled_ui(!disabled, |ui| {
                 if LaunchState::big_button_clicked(
                     ui,
                     &LangMessage::DownloadAndLaunch.to_string(lang),
@@ -174,7 +174,7 @@ impl LaunchState {
             }
         } else {
             let mut cancel_clicked = false;
-            ui.add_enabled_ui(enabled, |ui| {
+            ui.add_enabled_ui(!disabled, |ui| {
                 if LaunchState::big_button_clicked(ui, &LangMessage::CancelLaunch.to_string(lang)) {
                     self.force_launch = false;
                     cancel_clicked = true;

launcher/src/app/metadata_state.rs

@@ -1,6 +1,6 @@
 use std::{path::Path, sync::Arc};
 
-use log::error;
+use log::{error, info};
 use shared::version::version_manifest::VersionInfo;
 use tokio::runtime::Runtime;
 
@@ -52,6 +52,7 @@ fn get_metadata(
                     CompleteVersionMetadata::read_local(&version_info, &data_dir).await;
                 MetadataFetchResult {
                     status: if connect_error {
+                        info!("Metadata offline mode");
                         GetStatus::ReadLocalOffline
                     } else if let Some(local_error) = local_metadata.as_ref().err() {
                         error!(

launcher/src/version/instance_storage.rs

@@ -106,15 +106,17 @@ impl InstanceStorage {
                 status: InstanceStatus::Missing,
             });
 
-        if let Some(mut instance) = local_instance {
-            if let Some(remote_instance) = remote_instance {
+        if let Some(mut remote_instance) = remote_instance {
+            if let Some(instance) = local_instance {
                 if remote_instance.version_info != instance.version_info {
-                    instance.status = InstanceStatus::Outdated;
+                    remote_instance.status = InstanceStatus::Outdated;
+                } else {
+                    remote_instance.status = InstanceStatus::UpToDate;
                 }
             }
-            Some(instance)
+            Some(remote_instance)
         } else {
-            remote_instance
+            local_instance
         }
     }
 

shared/src/version/extra_version_metadata.rs

@@ -82,6 +82,7 @@ impl AuthBackend {
 
 #[derive(Deserialize, Serialize)]
 pub struct ExtraVersionMetadata {
+    #[serde(default)]
     pub auth_backend: Option<AuthBackend>,
 
     #[serde(default)]