fullscreen (#360)

* fullscreen

* improvements, and error catching

* yarn prettier

* discord rpc

* fixed uninitialized options.txt

* working discord version

* incorrect boolean

* change

* merge issue; regex solution

* fixed error

* multi line mode

* moved \n to start

theseus/src/api/mod.rs

@@ -27,7 +27,7 @@ pub mod prelude {
         jre, metadata, pack, process,
         profile::{self, create, Profile},
         settings,
-        state::JavaGlobals,
+        state::{JavaGlobals, SetFullscreen},
         state::{ProfilePathId, ProjectPathId},
         util::{
             io::{canonicalize, IOError},

theseus/src/api/pack/import/atlauncher.rs

@@ -1,7 +1,6 @@
 use std::{collections::HashMap, path::PathBuf};
 
 use serde::{Deserialize, Serialize};
-use tokio::fs;
 
 use crate::{
     event::LoadingBarId,
@@ -106,7 +105,7 @@ pub struct ATLauncherMod {
 // Check if folder has a instance.json that parses
 pub async fn is_valid_atlauncher(instance_folder: PathBuf) -> bool {
     let instance: String =
-        fs::read_to_string(&instance_folder.join("instance.json"))
+        io::read_to_string(&instance_folder.join("instance.json"))
             .await
             .unwrap_or("".to_string());
     let instance: Result<ATInstance, serde_json::Error> =

theseus/src/api/pack/import/curseforge.rs

@@ -1,7 +1,6 @@
 use std::path::PathBuf;
 
 use serde::{Deserialize, Serialize};
-use tokio::fs;
 
 use crate::{
     prelude::{ModLoader, ProfilePathId},
@@ -42,7 +41,7 @@ pub struct MinecraftInstance {
 // Check if folder has a minecraftinstance.json that parses
 pub async fn is_valid_curseforge(instance_folder: PathBuf) -> bool {
     let minecraftinstance: String =
-        fs::read_to_string(&instance_folder.join("minecraftinstance.json"))
+        io::read_to_string(&instance_folder.join("minecraftinstance.json"))
             .await
             .unwrap_or("".to_string());
     let minecraftinstance: Result<MinecraftInstance, serde_json::Error> =

theseus/src/api/pack/import/gdlauncher.rs

@@ -1,7 +1,6 @@
 use std::path::PathBuf;
 
 use serde::{Deserialize, Serialize};
-use tokio::fs;
 
 use crate::{
     prelude::{ModLoader, ProfilePathId},
@@ -32,7 +31,7 @@ pub struct GDLauncherLoader {
 // Check if folder has a config.json that parses
 pub async fn is_valid_gdlauncher(instance_folder: PathBuf) -> bool {
     let config: String =
-        fs::read_to_string(&instance_folder.join("config.json"))
+        io::read_to_string(&instance_folder.join("config.json"))
             .await
             .unwrap_or("".to_string());
     let config: Result<GDLauncherConfig, serde_json::Error> =

theseus/src/api/pack/import/mmc.rs

@@ -1,7 +1,6 @@
 use std::path::{Path, PathBuf};
 
 use serde::{de, Deserialize, Serialize};
-use tokio::fs;
 
 use crate::{
     pack::{
@@ -126,7 +125,7 @@ pub async fn is_valid_mmc(instance_folder: PathBuf) -> bool {
     let instance_cfg = instance_folder.join("instance.cfg");
     let mmc_pack = instance_folder.join("mmc-pack.json");
 
-    let mmc_pack = match fs::read_to_string(&mmc_pack).await {
+    let mmc_pack = match io::read_to_string(&mmc_pack).await {
         Ok(mmc_pack) => mmc_pack,
         Err(_) => return false,
     };

theseus/src/api/pack/import/mod.rs

@@ -66,45 +66,46 @@ pub async fn get_importable_instances(
 }
 
 // Import an instance from a launcher type and base path
+// Note: this *deletes* the submitted empty profile
 #[theseus_macros::debug_pin]
 #[tracing::instrument]
 pub async fn import_instance(
-    profile_path: ProfilePathId,
+    profile_path: ProfilePathId, // This should be a blank profile
     launcher_type: ImportLauncherType,
     base_path: PathBuf,
     instance_folder: String,
 ) -> crate::Result<()> {
     tracing::debug!("Importing instance from {instance_folder}");
-    match launcher_type {
+    let res = match launcher_type {
         ImportLauncherType::MultiMC | ImportLauncherType::PrismLauncher => {
             mmc::import_mmc(
-                base_path,       // path to base mmc folder
-                instance_folder, // instance folder in mmc_base_path
-                profile_path,    // path to profile
+                base_path,            // path to base mmc folder
+                instance_folder,      // instance folder in mmc_base_path
+                profile_path.clone(), // path to profile
             )
-            .await?;
+            .await
         }
         ImportLauncherType::ATLauncher => {
             atlauncher::import_atlauncher(
-                base_path,       // path to atlauncher folder
-                instance_folder, // instance folder in atlauncher
-                profile_path,    // path to profile
+                base_path,            // path to atlauncher folder
+                instance_folder,      // instance folder in atlauncher
+                profile_path.clone(), // path to profile
             )
-            .await?;
+            .await
         }
         ImportLauncherType::GDLauncher => {
             gdlauncher::import_gdlauncher(
                 base_path.join("instances").join(instance_folder), // path to gdlauncher folder
-                profile_path, // path to profile
+                profile_path.clone(), // path to profile
             )
-            .await?;
+            .await
         }
         ImportLauncherType::Curseforge => {
             curseforge::import_curseforge(
                 base_path.join("Instances").join(instance_folder), // path to curseforge folder
-                profile_path, // path to profile
+                profile_path.clone(), // path to profile
             )
-            .await?;
+            .await
         }
         ImportLauncherType::Unknown => {
             return Err(crate::ErrorKind::InputError(
@@ -112,6 +113,16 @@ pub async fn import_instance(
             )
             .into());
         }
+    };
+
+    // If import failed, delete the profile
+    match res {
+        Ok(_) => {}
+        Err(e) => {
+            tracing::warn!("Import failed: {:?}", e);
+            let _ = crate::api::profile::remove(&profile_path).await;
+            return Err(e);
+        }
     }
 
     // Check existing managed packs for potential updates

theseus/src/api/process.rs

@@ -121,7 +121,7 @@ pub async fn wait_for_by_uuid(uuid: &Uuid) -> crate::Result<()> {
     }
 }
 
-// Kill a running child process directly, and wait for it to be killed
+// Kill a running child process directly
 #[tracing::instrument(skip(running))]
 pub async fn kill(running: &mut MinecraftChild) -> crate::Result<()> {
     running
@@ -131,7 +131,7 @@ pub async fn kill(running: &mut MinecraftChild) -> crate::Result<()> {
         .kill()
         .await
         .map_err(IOError::from)?;
-    wait_for(running).await
+    Ok(())
 }
 
 // Await on the completion of a child process directly

theseus/src/api/profile/mod.rs

@@ -7,7 +7,9 @@ use crate::event::LoadingBarType;
 use crate::pack::install_from::{
     EnvType, PackDependency, PackFile, PackFileHash, PackFormat,
 };
-use crate::prelude::{JavaVersion, ProfilePathId, ProjectPathId};
+use crate::prelude::{
+    JavaVersion, ProfilePathId, ProjectPathId, SetFullscreen,
+};
 use crate::state::ProjectMetadata;
 
 use crate::util::io::{self, IOError};
@@ -838,9 +840,23 @@ pub async fn run_credentials(
         None
     };
 
+    // Any options.txt settings that we want set, add here
+    let mut mc_set_options: Vec<(String, String)> = Vec::new();
+    match profile.force_fullscreen {
+        SetFullscreen::LeaveUnset => {}
+        SetFullscreen::SetWindowed => {
+            mc_set_options
+                .push(("fullscreen".to_string(), "false".to_string()));
+        }
+        SetFullscreen::SetFullscreen => {
+            mc_set_options.push(("fullscreen".to_string(), "true".to_string()));
+        }
+    }
+
     let mc_process = crate::launcher::launch_minecraft(
         java_args,
         env_args,
+        &mc_set_options,
         wrapper,
         &memory,
         &resolution,