From ee0c91aa80d85204ae00b9b7728539e1ac9602d6 Mon Sep 17 00:00:00 2001
From: Geometrically <18202329+Geometrically@users.noreply.github.com>
Date: Thu, 11 May 2023 18:11:15 -0700
Subject: [PATCH] Performance improvements (#114)

* Performance improvements

* run fmt

* optimize creation modal

* remove print, fix mod loader editing

* Fix library update

* update extract loading bar

* Update theseus_gui/src-tauri/src/api/metadata.rs

Co-authored-by: triphora <emma@modrinth.com>

* fix cli

---------

Co-authored-by: triphora <emma@modrinth.com>
---
 theseus/src/api/metadata.rs                   |   8 +
 theseus/src/api/mod.rs                        |   3 +-
 theseus/src/api/pack.rs                       | 146 +++++++++---------
 theseus/src/api/profile.rs                    |  37 ++++-
 theseus/src/event/mod.rs                      |   2 +
 theseus/src/launcher/mod.rs                   |  24 +--
 theseus/src/state/children.rs                 |   8 +-
 theseus/src/state/profiles.rs                 |   2 +-
 theseus_cli/src/subcommands/profile.rs        |   2 +-
 theseus_gui/src-tauri/Cargo.toml              |   2 +-
 theseus_gui/src-tauri/src/api/jre.rs          |   2 +-
 theseus_gui/src-tauri/src/api/metadata.rs     |   6 +
 theseus_gui/src-tauri/src/api/profile.rs      |  30 +++-
 theseus_gui/src-tauri/src/main.rs             |   2 +
 theseus_gui/src/components/GridDisplay.vue    |   2 +-
 .../components/modrinth-loading-indicator.js  |   2 +-
 theseus_gui/src/components/ui/Instance.vue    |  60 +++----
 .../components/ui/InstanceCreationModal.vue   |  32 ++--
 .../components/ui/InstanceInstallModal.vue    |  34 ++--
 theseus_gui/src/helpers/metadata.js           |   6 +
 theseus_gui/src/helpers/profile.js            |  12 +-
 theseus_gui/src/helpers/utils.js              |  10 +-
 theseus_gui/src/pages/Browse.vue              |  10 +-
 theseus_gui/src/pages/Index.vue               |   6 +-
 theseus_gui/src/pages/Library.vue             |  12 +-
 theseus_gui/src/pages/instance/Index.vue      |   3 +-
 theseus_gui/src/pages/project/Index.vue       |  16 +-
 theseus_playground/src/main.rs                |  81 +++++-----
 28 files changed, 326 insertions(+), 234 deletions(-)

diff --git a/theseus/src/api/metadata.rs b/theseus/src/api/metadata.rs
index 4b90f738f..7227ae74c 100644
--- a/theseus/src/api/metadata.rs
+++ b/theseus/src/api/metadata.rs
@@ -25,3 +25,11 @@ pub async fn get_forge_versions() -> crate::Result<Manifest> {
 
     Ok(tags)
 }
+
+#[tracing::instrument]
+pub async fn get_quilt_versions() -> crate::Result<Manifest> {
+    let state = State::get().await?;
+    let tags = state.metadata.read().await.quilt.clone();
+
+    Ok(tags)
+}
diff --git a/theseus/src/api/mod.rs b/theseus/src/api/mod.rs
index b9d4c4969..009ad9f0b 100644
--- a/theseus/src/api/mod.rs
+++ b/theseus/src/api/mod.rs
@@ -13,7 +13,8 @@ pub mod tags;
 pub mod data {
     pub use crate::state::{
         DirectoryInfo, Hooks, JavaSettings, MemorySettings, ModLoader,
-        ProfileMetadata, Settings, Theme, WindowSize,
+        ModrinthProject, ModrinthTeamMember, ModrinthUser, ModrinthVersion,
+        ProfileMetadata, ProjectMetadata, Settings, Theme, WindowSize,
     };
 }
 
diff --git a/theseus/src/api/pack.rs b/theseus/src/api/pack.rs
index 796e3dc78..afb5b969d 100644
--- a/theseus/src/api/pack.rs
+++ b/theseus/src/api/pack.rs
@@ -6,7 +6,8 @@ use crate::event::emit::{
 };
 use crate::event::{LoadingBarId, LoadingBarType};
 use crate::state::{
-    LinkedData, ModrinthProject, ModrinthVersion, ProfileInstallStage, SideType,
+    LinkedData, ModrinthProject, ModrinthVersion, Profile, ProfileInstallStage,
+    SideType,
 };
 use crate::util::fetch::{
     fetch, fetch_advanced, fetch_json, fetch_mirrors, write, write_cached_icon,
@@ -325,6 +326,7 @@ async fn install_pack(
                 prof.metadata.icon = icon.clone();
                 prof.metadata.game_version = game_version.clone();
                 prof.metadata.loader_version = loader_version.clone();
+                prof.metadata.loader = mod_loader.unwrap_or(ModLoader::Vanilla);
 
                 async { Ok(()) }
             })
@@ -409,83 +411,79 @@ async fn install_pack(
                 )
                 .await?;
 
-                let extract_overrides = |overrides: String| async {
-                    let reader = Cursor::new(&file);
-
-                    let mut overrides_zip =
-                        ZipFileReader::new(reader).await.map_err(|_| {
-                            crate::Error::from(crate::ErrorKind::InputError(
-                                "Failed extract overrides Zip".to_string(),
-                            ))
-                        })?;
-
-                    let profile = profile.clone();
-                    async move {
-                        for index in 0..overrides_zip.file().entries().len() {
-                            let file = overrides_zip
-                                .file()
-                                .entries()
-                                .get(index)
-                                .unwrap()
-                                .entry()
-                                .clone();
-
-                            let file_path = PathBuf::from(file.filename());
-                            if file.filename().starts_with(&overrides)
-                                && !file.filename().ends_with('/')
-                            {
-                                // Reads the file into the 'content' variable
-                                let mut content = Vec::new();
-                                let mut reader =
-                                    overrides_zip.entry(index).await?;
-                                reader
-                                    .read_to_end_checked(&mut content, &file)
-                                    .await?;
-
-                                let mut new_path = PathBuf::new();
-                                let components = file_path.components().skip(1);
-
-                                for component in components {
-                                    new_path.push(component);
-                                }
-
-                                if new_path.file_name().is_some() {
-                                    write(
-                                        &profile.join(new_path),
-                                        &content,
-                                        &state.io_semaphore,
-                                    )
-                                    .await?;
-                                }
-                            }
-                        }
-
-                        Ok::<(), crate::Error>(())
-                    }
-                    .await
-                };
-
                 emit_loading(&loading_bar, 0.0, Some("Extracting overrides"))
                     .await?;
-                extract_overrides("overrides".to_string()).await?;
-                extract_overrides("client_overrides".to_string()).await?;
-                emit_loading(
-                    &loading_bar,
-                    29.9,
-                    Some("Done extracting overrides"),
-                )
-                .await?;
 
-                if let Some(profile) =
-                    crate::api::profile::get(&profile).await?
+                let mut total_len = 0;
+
+                for index in 0..zip_reader.file().entries().len() {
+                    let file =
+                        zip_reader.file().entries().get(index).unwrap().entry();
+
+                    if (file.filename().starts_with("overrides")
+                        || file.filename().starts_with("client_overrides"))
+                        && !file.filename().ends_with('/')
+                    {
+                        total_len += 1;
+                    }
+                }
+
+                for index in 0..zip_reader.file().entries().len() {
+                    let file = zip_reader
+                        .file()
+                        .entries()
+                        .get(index)
+                        .unwrap()
+                        .entry()
+                        .clone();
+
+                    let file_path = PathBuf::from(file.filename());
+                    if (file.filename().starts_with("overrides")
+                        || file.filename().starts_with("client_overrides"))
+                        && !file.filename().ends_with('/')
+                    {
+                        // Reads the file into the 'content' variable
+                        let mut content = Vec::new();
+                        let mut reader = zip_reader.entry(index).await?;
+                        reader.read_to_end_checked(&mut content, &file).await?;
+
+                        let mut new_path = PathBuf::new();
+                        let components = file_path.components().skip(1);
+
+                        for component in components {
+                            new_path.push(component);
+                        }
+
+                        if new_path.file_name().is_some() {
+                            write(
+                                &profile.join(new_path),
+                                &content,
+                                &state.io_semaphore,
+                            )
+                            .await?;
+                        }
+
+                        emit_loading(
+                            &loading_bar,
+                            30.0 / total_len as f64,
+                            Some(&format!(
+                                "Extracting override {}/{}",
+                                index, total_len
+                            )),
+                        )
+                        .await?;
+                    }
+                }
+
+                if let Some(profile_val) =
+                    crate::api::profile::get(&profile, None).await?
                 {
-                    tokio::try_join!(
-                        super::profile::sync(&profile.path),
-                        crate::launcher::install_minecraft(
-                            &profile,
-                            Some(loading_bar)
-                        ),
-                    )?;
+                    Profile::sync_projects_task(profile.clone());
+                    crate::launcher::install_minecraft(
+                        &profile_val,
+                        Some(loading_bar),
+                    )
+                    .await?;
                 }
 
                 Ok::<PathBuf, crate::Error>(profile.clone())
diff --git a/theseus/src/api/profile.rs b/theseus/src/api/profile.rs
index 7028b14bf..23c556390 100644
--- a/theseus/src/api/profile.rs
+++ b/theseus/src/api/profile.rs
@@ -12,6 +12,7 @@ pub use crate::{
     state::{JavaSettings, Profile},
     State,
 };
+use std::collections::HashMap;
 use std::{
     future::Future,
     path::{Path, PathBuf},
@@ -40,11 +41,21 @@ pub async fn remove(path: &Path) -> crate::Result<()> {
 
 /// Get a profile by path,
 #[tracing::instrument]
-pub async fn get(path: &Path) -> crate::Result<Option<Profile>> {
+pub async fn get(
+    path: &Path,
+    clear_projects: Option<bool>,
+) -> crate::Result<Option<Profile>> {
     let state = State::get().await?;
     let profiles = state.profiles.read().await;
+    let mut profile = profiles.0.get(path).cloned();
 
-    Ok(profiles.0.get(path).cloned())
+    if clear_projects.unwrap_or(false) {
+        if let Some(profile) = &mut profile {
+            profile.projects = HashMap::new();
+        }
+    }
+
+    Ok(profile)
 }
 
 /// Edit a profile using a given asynchronous closure
@@ -79,11 +90,23 @@ where
 
 /// Get a copy of the profile set
 #[tracing::instrument]
-pub async fn list() -> crate::Result<std::collections::HashMap<PathBuf, Profile>>
-{
+pub async fn list(
+    clear_projects: Option<bool>,
+) -> crate::Result<HashMap<PathBuf, Profile>> {
     let state = State::get().await?;
     let profiles = state.profiles.read().await;
-    Ok(profiles.0.clone())
+    Ok(profiles
+        .0
+        .clone()
+        .into_iter()
+        .map(|mut x| {
+            if clear_projects.unwrap_or(false) {
+                x.1.projects = HashMap::new();
+            }
+
+            x
+        })
+        .collect())
 }
 
 /// Query + sync profile's projects with the UI from the FS
@@ -117,7 +140,7 @@ pub async fn sync(path: &Path) -> crate::Result<()> {
 /// Installs/Repairs a profile
 #[tracing::instrument]
 pub async fn install(path: &Path) -> crate::Result<()> {
-    let profile = get(path).await?;
+    let profile = get(path, None).await?;
 
     if let Some(profile) = profile {
         crate::launcher::install_minecraft(&profile, None).await?;
@@ -398,7 +421,7 @@ pub async fn run_credentials(
         let state = State::get().await?;
         let settings = state.settings.read().await;
         let metadata = state.metadata.read().await;
-        let profile = get(path).await?.ok_or_else(|| {
+        let profile = get(path, None).await?.ok_or_else(|| {
             crate::ErrorKind::OtherError(format!(
                 "Tried to run a nonexistent or unloaded profile at path {}!",
                 path.display()
diff --git a/theseus/src/event/mod.rs b/theseus/src/event/mod.rs
index 1826c1f8f..f77f2cdb3 100644
--- a/theseus/src/event/mod.rs
+++ b/theseus/src/event/mod.rs
@@ -111,6 +111,8 @@ impl Drop for LoadingBar {
         let loader_uuid = self.loading_bar_uuid;
         let event = self.bar_type.clone();
         let fraction = self.current / self.total;
+
+        #[cfg(feature = "cli")]
         let cli_progress_bar = self.cli_progress_bar.clone();
 
         tokio::spawn(async move {
diff --git a/theseus/src/launcher/mod.rs b/theseus/src/launcher/mod.rs
index be89f0f52..d69d513f5 100644
--- a/theseus/src/launcher/mod.rs
+++ b/theseus/src/launcher/mod.rs
@@ -60,6 +60,18 @@ pub async fn install_minecraft(
     existing_loading_bar: Option<LoadingBarId>,
 ) -> crate::Result<()> {
     Box::pin(async move {
+        let loading_bar = init_or_edit_loading(
+            existing_loading_bar,
+            LoadingBarType::MinecraftDownload {
+                // If we are downloading minecraft for a profile, provide its name and uuid
+                profile_name: profile.metadata.name.clone(),
+                profile_path: profile.path.clone(),
+            },
+            100.0,
+            "Downloading Minecraft",
+        )
+            .await?;
+
         crate::api::profile::edit(&profile.path, |prof| {
             prof.install_stage = ProfileInstallStage::Installing;
 
@@ -90,18 +102,6 @@ pub async fn install_minecraft(
                 format!("{}-{}", version.id.clone(), it.id.clone())
             });
 
-        let loading_bar = init_or_edit_loading(
-            existing_loading_bar,
-            LoadingBarType::MinecraftDownload {
-                // If we are downloading minecraft for a profile, provide its name and uuid
-                profile_name: profile.metadata.name.clone(),
-                profile_path: profile.path.clone(),
-            },
-            100.0,
-            "Downloading Minecraft",
-        )
-        .await?;
-
         // Download version info (5)
         let mut version_info = download::download_version_info(
             &state,
diff --git a/theseus/src/state/children.rs b/theseus/src/state/children.rs
index 8f5dad29b..9cb079881 100644
--- a/theseus/src/state/children.rs
+++ b/theseus/src/state/children.rs
@@ -253,9 +253,11 @@ impl Children {
                 let child = child.clone();
                 let child = child.write().await;
                 if child.current_child.write().await.try_wait()?.is_none() {
-                    if let Some(prof) =
-                        crate::api::profile::get(&child.profile_path.clone())
-                            .await?
+                    if let Some(prof) = crate::api::profile::get(
+                        &child.profile_path.clone(),
+                        None,
+                    )
+                    .await?
                     {
                         profiles.push(prof);
                     }
diff --git a/theseus/src/state/profiles.rs b/theseus/src/state/profiles.rs
index 6148bd799..f6d777bec 100644
--- a/theseus/src/state/profiles.rs
+++ b/theseus/src/state/profiles.rs
@@ -210,7 +210,7 @@ impl Profile {
         tokio::task::spawn(async move {
             let res = async {
                 let state = State::get().await?;
-                let profile = crate::api::profile::get(&path).await?;
+                let profile = crate::api::profile::get(&path, None).await?;
 
                 if let Some(profile) = profile {
                     let paths = profile.get_profile_project_paths()?;
diff --git a/theseus_cli/src/subcommands/profile.rs b/theseus_cli/src/subcommands/profile.rs
index 6ecb4d303..92a92abfe 100644
--- a/theseus_cli/src/subcommands/profile.rs
+++ b/theseus_cli/src/subcommands/profile.rs
@@ -257,7 +257,7 @@ impl ProfileList {
         _args: &crate::Args,
         _largs: &ProfileCommand,
     ) -> Result<()> {
-        let profiles = profile::list().await?;
+        let profiles = profile::list(None).await?;
         let rows = profiles.values().map(ProfileRow::from);
 
         let table = table(rows).with(
diff --git a/theseus_gui/src-tauri/Cargo.toml b/theseus_gui/src-tauri/Cargo.toml
index dde54fc27..962110f14 100644
--- a/theseus_gui/src-tauri/Cargo.toml
+++ b/theseus_gui/src-tauri/Cargo.toml
@@ -15,7 +15,7 @@ tauri-build = { version = "1.2", features = [] }
 regex = "1.5"
 
 [dependencies]
-theseus = { path = "../../theseus", features = ["tauri", "cli"] }
+theseus = { path = "../../theseus", features = ["tauri"] }
 
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
diff --git a/theseus_gui/src-tauri/src/api/jre.rs b/theseus_gui/src-tauri/src/api/jre.rs
index 1666ba1d1..3fedad587 100644
--- a/theseus_gui/src-tauri/src/api/jre.rs
+++ b/theseus_gui/src-tauri/src/api/jre.rs
@@ -48,7 +48,7 @@ pub async fn jre_get_optimal_jre_key(profile: Profile) -> Result<String> {
 // The key can be used in the hashmap contained by JavaGlobals in Settings (if it exists)
 #[tauri::command]
 pub async fn jre_get_optimal_jre_key_by_path(path: &Path) -> Result<String> {
-    let profile = profile::get(path).await?.ok_or_else(|| {
+    let profile = profile::get(path, Some(true)).await?.ok_or_else(|| {
         TheseusSerializableError::NoProfileFound(path.display().to_string())
     })?;
     Ok(jre::get_optimal_jre_key(&profile).await?)
diff --git a/theseus_gui/src-tauri/src/api/metadata.rs b/theseus_gui/src-tauri/src/api/metadata.rs
index e7c01ad26..807f5ec3c 100644
--- a/theseus_gui/src-tauri/src/api/metadata.rs
+++ b/theseus_gui/src-tauri/src/api/metadata.rs
@@ -19,3 +19,9 @@ pub async fn metadata_get_fabric_versions() -> Result<Manifest> {
 pub async fn metadata_get_forge_versions() -> Result<Manifest> {
     Ok(theseus::metadata::get_forge_versions().await?)
 }
+
+/// Gets the quilt versions from daedalus
+#[tauri::command]
+pub async fn metadata_get_quilt_versions() -> Result<Manifest> {
+    Ok(theseus::metadata::get_quilt_versions().await?)
+}
diff --git a/theseus_gui/src-tauri/src/api/profile.rs b/theseus_gui/src-tauri/src/api/profile.rs
index d8ce08149..a552e0bf5 100644
--- a/theseus_gui/src-tauri/src/api/profile.rs
+++ b/theseus_gui/src-tauri/src/api/profile.rs
@@ -16,8 +16,11 @@ pub async fn profile_remove(path: &Path) -> Result<()> {
 // Get a profile by path
 // invoke('profile_add_path',path)
 #[tauri::command]
-pub async fn profile_get(path: &Path) -> Result<Option<Profile>> {
-    let res = profile::get(path).await?;
+pub async fn profile_get(
+    path: &Path,
+    clear_projects: Option<bool>,
+) -> Result<Option<Profile>> {
+    let res = profile::get(path, clear_projects).await?;
     Ok(res)
 }
 
@@ -25,11 +28,32 @@ pub async fn profile_get(path: &Path) -> Result<Option<Profile>> {
 // invoke('profile_list')
 #[tauri::command]
 pub async fn profile_list(
+    clear_projects: Option<bool>,
 ) -> Result<std::collections::HashMap<PathBuf, Profile>> {
-    let res = profile::list().await?;
+    let res = profile::list(clear_projects).await?;
     Ok(res)
 }
 
+#[tauri::command]
+pub async fn profile_check_installed(
+    path: &Path,
+    project_id: String,
+) -> Result<bool> {
+    let profile = profile_get(path, None).await?;
+    if let Some(profile) = profile {
+        Ok(profile.projects.into_iter().any(|(_, project)| {
+            if let ProjectMetadata::Modrinth { project, .. } = &project.metadata
+            {
+                project.id == project_id
+            } else {
+                false
+            }
+        }))
+    } else {
+        Ok(false)
+    }
+}
+
 /// Syncs a profile's in memory state with the state on the disk
 /// // invoke('profile_sync')
 #[tauri::command]
diff --git a/theseus_gui/src-tauri/src/main.rs b/theseus_gui/src-tauri/src/main.rs
index d51def999..af99868c7 100644
--- a/theseus_gui/src-tauri/src/main.rs
+++ b/theseus_gui/src-tauri/src/main.rs
@@ -93,6 +93,7 @@ fn main() {
             api::profile::profile_run_credentials,
             api::profile::profile_run_wait_credentials,
             api::profile::profile_edit,
+            api::profile::profile_check_installed,
             api::pack::pack_install_version_id,
             api::pack::pack_install_file,
             api::auth::auth_authenticate_begin_flow,
@@ -133,6 +134,7 @@ fn main() {
             api::metadata::metadata_get_game_versions,
             api::metadata::metadata_get_fabric_versions,
             api::metadata::metadata_get_forge_versions,
+            api::metadata::metadata_get_quilt_versions,
             api::logs::logs_get_logs,
             api::logs::logs_get_logs_by_datetime,
             api::logs::logs_get_stdout_by_datetime,
diff --git a/theseus_gui/src/components/GridDisplay.vue b/theseus_gui/src/components/GridDisplay.vue
index 958952098..e1d4983bc 100644
--- a/theseus_gui/src/components/GridDisplay.vue
+++ b/theseus_gui/src/components/GridDisplay.vue
@@ -103,7 +103,7 @@ const modsRow = ref(null)
     margin-right: auto;
     margin-top: 0.8rem;
     scroll-behavior: smooth;
-    overflow-y: scroll;
+    overflow-y: auto;
   }
 }
 
diff --git a/theseus_gui/src/components/modrinth-loading-indicator.js b/theseus_gui/src/components/modrinth-loading-indicator.js
index d3e78e3d9..adc9bf98c 100644
--- a/theseus_gui/src/components/modrinth-loading-indicator.js
+++ b/theseus_gui/src/components/modrinth-loading-indicator.js
@@ -63,7 +63,7 @@ export default defineComponent({
             background: props.color || undefined,
             backgroundSize: `${(100 / indicator.progress.value) * 100}% auto`,
             transition: 'width 0.1s, height 0.4s, opacity 0.4s',
-            zIndex: 99,
+            zIndex: 6,
           },
         },
         slots
diff --git a/theseus_gui/src/components/ui/Instance.vue b/theseus_gui/src/components/ui/Instance.vue
index b73e2855b..59619d45c 100644
--- a/theseus_gui/src/components/ui/Instance.vue
+++ b/theseus_gui/src/components/ui/Instance.vue
@@ -64,7 +64,7 @@ const install = async (e) => {
   )
 
   if (props.instance.project_type === 'modpack') {
-    const packs = Object.values(await list())
+    const packs = Object.values(await list(true))
 
     if (
       packs.length === 0 ||
@@ -125,9 +125,14 @@ await process_listener((e) => {
 
 <template>
   <div class="instance">
-    <Card v-if="props.small" class="instance-small-card button-base">
+    <Card v-if="props.small" class="instance-small-card button-base" @click="seeInstance">
       <Avatar
-        :src="convertFileSrc(props.instance.metadata.icon)"
+        :src="
+          !props.instance.metadata.icon ||
+          (props.instance.metadata.icon && props.instance.metadata.icon.startsWith('http'))
+            ? props.instance.metadata.icon
+            : convertFileSrc(instance.metadata?.icon)
+        "
         :alt="props.instance.metadata.name"
         size="sm"
       />
@@ -150,9 +155,10 @@ await process_listener((e) => {
         size="none"
         :src="
           props.instance.metadata
-            ? props.instance.metadata.icon && props.instance.metadata.icon.startsWith('http')
+            ? !props.instance.metadata.icon ||
+              (props.instance.metadata.icon && props.instance.metadata.icon.startsWith('http'))
               ? props.instance.metadata.icon
-              : convertFileSrc(props.instance.metadata?.icon)
+              : convertFileSrc(instance.metadata?.icon)
             : props.instance.icon_url
         "
         alt="Mod card"
@@ -166,25 +172,27 @@ await process_listener((e) => {
         </p>
       </div>
     </Card>
-    <div
-      v-if="props.instance.metadata && playing === false && modLoading === false"
-      class="install cta button-base"
-      @click="play"
-    >
-      <PlayIcon />
-    </div>
-    <div v-else-if="modLoading === true && playing === false" class="cta loading">
-      <AnimatedLogo class="loading" />
-    </div>
-    <div
-      v-else-if="playing === true"
-      class="stop cta button-base"
-      @click="stop"
-      @mousehover="checkProcess"
-    >
-      <XIcon />
-    </div>
-    <div v-else class="install cta buttonbase" @click="install"><SaveIcon /></div>
+    <template v-if="!props.small">
+      <div
+        v-if="props.instance.metadata && playing === false && modLoading === false"
+        class="install cta button-base"
+        @click="play"
+      >
+        <PlayIcon />
+      </div>
+      <div v-else-if="modLoading === true && playing === false" class="cta loading">
+        <AnimatedLogo class="loading" />
+      </div>
+      <div
+        v-else-if="playing === true"
+        class="stop cta button-base"
+        @click="stop"
+        @mousehover="checkProcess"
+      >
+        <XIcon />
+      </div>
+      <div v-else class="install cta buttonbase" @click="install"><SaveIcon /></div>
+    </template>
     <InstallConfirmModal ref="confirmModal" />
   </div>
 </template>
@@ -209,10 +217,6 @@ await process_listener((e) => {
       font-weight: bolder;
     }
   }
-
-  .cta {
-    display: none;
-  }
 }
 
 .instance {
diff --git a/theseus_gui/src/components/ui/InstanceCreationModal.vue b/theseus_gui/src/components/ui/InstanceCreationModal.vue
index 59c9d4b0f..91dce8ec2 100644
--- a/theseus_gui/src/components/ui/InstanceCreationModal.vue
+++ b/theseus_gui/src/components/ui/InstanceCreationModal.vue
@@ -86,13 +86,13 @@ import {
   CodeIcon,
   Checkbox,
 } from 'omorphia'
-import { computed, ref } from 'vue'
+import { computed, ref, shallowRef } from 'vue'
 import { get_game_versions, get_loaders } from '@/helpers/tags'
 import { create } from '@/helpers/profile'
 import { open } from '@tauri-apps/api/dialog'
 import { useRouter } from 'vue-router'
 import { tauri } from '@tauri-apps/api'
-import { get_fabric_versions, get_forge_versions } from '@/helpers/metadata'
+import { get_fabric_versions, get_forge_versions, get_quilt_versions } from '@/helpers/metadata'
 
 const router = useRouter()
 
@@ -129,20 +129,27 @@ defineExpose({
   },
 })
 
-const all_game_versions = ref(await get_game_versions())
+const [fabric_versions, forge_versions, quilt_versions, all_game_versions, loaders] =
+  await Promise.all([
+    get_fabric_versions().then(shallowRef),
+    get_forge_versions().then(shallowRef),
+    get_quilt_versions().then(shallowRef),
+    get_game_versions().then(shallowRef),
+    get_loaders()
+      .then((value) =>
+        value
+          .filter((item) => item.supported_project_types.includes('modpack'))
+          .map((item) => item.name.toLowerCase())
+      )
+      .then(ref),
+  ])
 
 const game_versions = computed(() => {
   return all_game_versions.value
     .filter((item) => item.version_type === 'release' || showSnapshots.value)
     .map((item) => item.version)
 })
-const loaders = ref(
-  await get_loaders().then((value) =>
-    value
-      .filter((item) => item.supported_project_types.includes('modpack'))
-      .map((item) => item.name.toLowerCase())
-  )
-)
+
 const modal = ref(null)
 
 const check_valid = computed(() => {
@@ -191,9 +198,6 @@ const reset_icon = () => {
   display_icon.value = null
 }
 
-const fabric_versions = ref(await get_fabric_versions())
-const forge_versions = ref(await get_forge_versions())
-
 const selectable_versions = computed(() => {
   if (game_version.value) {
     if (loader.value === 'fabric') {
@@ -202,6 +206,8 @@ const selectable_versions = computed(() => {
       return forge_versions.value.gameVersions
         .find((item) => item.id === game_version.value)
         .loaders.map((item) => item.id)
+    } else if (loader.value === 'quilt') {
+      return quilt_versions.value.gameVersions[0].loaders.map((item) => item.id)
     }
   }
   return []
diff --git a/theseus_gui/src/components/ui/InstanceInstallModal.vue b/theseus_gui/src/components/ui/InstanceInstallModal.vue
index c98441d58..8fffed4c9 100644
--- a/theseus_gui/src/components/ui/InstanceInstallModal.vue
+++ b/theseus_gui/src/components/ui/InstanceInstallModal.vue
@@ -11,14 +11,15 @@ import {
   RightArrowIcon,
   CheckIcon,
 } from 'omorphia'
-import { computed, ref } from 'vue'
-import { add_project_from_version as installMod, list } from '@/helpers/profile'
+import { computed, ref, shallowRef } from 'vue'
+import { add_project_from_version as installMod, check_installed, list } from '@/helpers/profile'
 import { tauri } from '@tauri-apps/api'
 import { open } from '@tauri-apps/api/dialog'
 import { convertFileSrc } from '@tauri-apps/api/tauri'
 import { useRouter } from 'vue-router'
 import { create } from '@/helpers/profile'
-import { checkInstalled, installVersionDependencies } from '@/helpers/utils'
+import { installVersionDependencies } from '@/helpers/utils'
+
 const router = useRouter()
 const versions = ref([])
 const project = ref('')
@@ -33,15 +34,17 @@ const gameVersion = ref(null)
 const creatingInstance = ref(false)
 
 defineExpose({
-  show: (projectId, selectedVersion) => {
+  show: async (projectId, selectedVersion) => {
     project.value = projectId
     versions.value = selectedVersion
     installModal.value.show()
     searchFilter.value = ''
+
+    profiles.value = await getData()
   },
 })
 
-const profiles = ref(await list().then(Object.values))
+const profiles = shallowRef(await getData())
 
 async function install(instance) {
   instance.installing = true
@@ -59,8 +62,10 @@ async function install(instance) {
   instance.installing = false
 }
 
-const filteredVersions = computed(() => {
-  const filtered = profiles.value
+async function getData() {
+  const projects = await list(true).then(Object.values)
+
+  const filtered = projects
     .filter((profile) => {
       return profile.metadata.name.toLowerCase().includes(searchFilter.value.toLowerCase())
     })
@@ -69,17 +74,20 @@ const filteredVersions = computed(() => {
         versions.value.flatMap((v) => v.game_versions).includes(profile.metadata.game_version) &&
         versions.value
           .flatMap((v) => v.loaders)
-          .some((value) => value === profile.metadata.loader || value === 'minecraft')
+          .some(
+            (value) =>
+              value === profile.metadata.loader || ['minecraft', 'iris', 'optifine'].includes(value)
+          )
       )
     })
 
-  filtered.map((profile) => {
+  for (let profile of filtered) {
     profile.installing = false
-    profile.installedMod = checkInstalled(profile, project.value)
-  })
+    profile.installedMod = await check_installed(profile.path, project.value)
+  }
 
   return filtered
-})
+}
 
 const toggleCreation = () => {
   showCreation.value = !showCreation.value
@@ -140,7 +148,7 @@ const check_valid = computed(() => {
     <div class="modal-body">
       <input v-model="searchFilter" type="text" class="search" placeholder="Search for a profile" />
       <div class="profiles">
-        <div v-for="profile in filteredVersions" :key="profile.metadata.name" class="option">
+        <div v-for="profile in profiles" :key="profile.metadata.name" class="option">
           <Button
             color="raised"
             class="profile-button"
diff --git a/theseus_gui/src/helpers/metadata.js b/theseus_gui/src/helpers/metadata.js
index de2482e1c..0a0a402cd 100644
--- a/theseus_gui/src/helpers/metadata.js
+++ b/theseus_gui/src/helpers/metadata.js
@@ -17,3 +17,9 @@ export async function get_fabric_versions() {
 export async function get_forge_versions() {
   return await invoke('metadata_get_forge_versions')
 }
+
+// Gets the quilt versions from daedalus
+// Returns Manifest
+export async function get_quilt_versions() {
+  return await invoke('metadata_get_quilt_versions')
+}
diff --git a/theseus_gui/src/helpers/profile.js b/theseus_gui/src/helpers/profile.js
index b8db0b609..f68b2d213 100644
--- a/theseus_gui/src/helpers/profile.js
+++ b/theseus_gui/src/helpers/profile.js
@@ -32,14 +32,18 @@ export async function remove(path) {
 
 // Get a profile by path
 // Returns a Profile
-export async function get(path) {
-  return await invoke('profile_get', { path })
+export async function get(path, clearProjects) {
+  return await invoke('profile_get', { path, clearProjects })
 }
 
 // Get a copy of the profile set
 // Returns hashmap of path -> Profile
-export async function list() {
-  return await invoke('profile_list')
+export async function list(clearProjects) {
+  return await invoke('profile_list', { clearProjects })
+}
+
+export async function check_installed(path, projectId) {
+  return await invoke('profile_check_installed', { path, projectId })
 }
 
 // Syncs a profile with the disk
diff --git a/theseus_gui/src/helpers/utils.js b/theseus_gui/src/helpers/utils.js
index 9e9ff599b..66ece6558 100644
--- a/theseus_gui/src/helpers/utils.js
+++ b/theseus_gui/src/helpers/utils.js
@@ -1,4 +1,4 @@
-import { add_project_from_version as installMod } from '@/helpers/profile'
+import { add_project_from_version as installMod, check_installed } from '@/helpers/profile'
 import { ofetch } from 'ofetch'
 
 export const releaseColor = (releaseType) => {
@@ -14,17 +14,13 @@ export const releaseColor = (releaseType) => {
   }
 }
 
-export const checkInstalled = (profile, projectId) => {
-  return Object.values(profile.projects).some((p) => p.metadata?.project?.id === projectId)
-}
-
 export const installVersionDependencies = async (profile, version) => {
   for (const dep of version.dependencies) {
     if (dep.version_id) {
-      if (checkInstalled(profile, dep.project_id)) continue
+      if (await check_installed(profile.path, dep.project_id)) continue
       await installMod(profile.path, dep.version_id)
     } else {
-      if (checkInstalled(profile, dep.project_id)) continue
+      if (await check_installed(profile.path, dep.project_id)) continue
       const depVersions = await ofetch(
         `https://api.modrinth.com/v2/project/${dep.project_id}/version`
       )
diff --git a/theseus_gui/src/pages/Browse.vue b/theseus_gui/src/pages/Browse.vue
index da378b43f..e06faf3b0 100644
--- a/theseus_gui/src/pages/Browse.vue
+++ b/theseus_gui/src/pages/Browse.vue
@@ -167,15 +167,17 @@ watch(
         v-if="
           showLoaders &&
           searchStore.projectType !== 'datapack' &&
-          searchStore.projectType !== 'resourcepack' &&
-          searchStore.projectType !== 'shader'
+          searchStore.projectType !== 'resourcepack'
         "
         class="loaders"
       >
         <h2>Loaders</h2>
         <div
-          v-for="loader in loaders.filter((l) =>
-            l.supported_project_types?.includes(searchStore.projectType)
+          v-for="loader in loaders.filter(
+            (l) =>
+              (searchStore.projectType !== 'mod' &&
+                l.supported_project_types?.includes(searchStore.projectType)) ||
+              (searchStore.projectType === 'mod' && ['fabric', 'forge', 'quilt'].includes(l.name))
           )"
           :key="loader"
         >
diff --git a/theseus_gui/src/pages/Index.vue b/theseus_gui/src/pages/Index.vue
index 14c523b15..5a99edd41 100644
--- a/theseus_gui/src/pages/Index.vue
+++ b/theseus_gui/src/pages/Index.vue
@@ -16,11 +16,11 @@ const breadcrumbs = useBreadcrumbs()
 
 breadcrumbs.setRootContext({ name: 'Home', link: route.path })
 
-const recentInstances = shallowRef(Object.values(await list()))
+const recentInstances = shallowRef([])
 
 const getInstances = async () => {
   filter.value = ''
-  const profiles = await list()
+  const profiles = await list(true)
   recentInstances.value = Object.values(profiles)
 
   const excludeIds = recentInstances.value.map((i) => i.metadata?.linked_data?.project_id)
@@ -47,8 +47,8 @@ await getInstances()
 await Promise.all([getFeaturedModpacks(), getFeaturedMods()])
 
 const unlisten = await profile_listener(async (e) => {
+  await getInstances()
   if (e.event === 'created' || e.event === 'removed') {
-    await getInstances()
     await Promise.all([getFeaturedModpacks(), getFeaturedMods()])
   }
 })
diff --git a/theseus_gui/src/pages/Library.vue b/theseus_gui/src/pages/Library.vue
index 3a2e18bef..5cf1f38c4 100644
--- a/theseus_gui/src/pages/Library.vue
+++ b/theseus_gui/src/pages/Library.vue
@@ -4,21 +4,19 @@ import GridDisplay from '@/components/GridDisplay.vue'
 import { list } from '@/helpers/profile.js'
 import { useRoute } from 'vue-router'
 import { useBreadcrumbs } from '@/store/breadcrumbs'
-import { loading_listener } from '@/helpers/events.js'
+import { profile_listener } from '@/helpers/events.js'
 
 const route = useRoute()
 const breadcrumbs = useBreadcrumbs()
 
 breadcrumbs.setRootContext({ name: 'Library', link: route.path })
 
-const profiles = await list()
+const profiles = await list(true)
 const instances = shallowRef(Object.values(profiles))
 
-loading_listener(async (profile) => {
-  if (profile.event === 'loaded') {
-    const profiles = await list()
-    instances.value = Object.values(profiles)
-  }
+profile_listener(async () => {
+  const profiles = await list(true)
+  instances.value = Object.values(profiles)
 })
 </script>
 
diff --git a/theseus_gui/src/pages/instance/Index.vue b/theseus_gui/src/pages/instance/Index.vue
index 619fecca5..d1669cda5 100644
--- a/theseus_gui/src/pages/instance/Index.vue
+++ b/theseus_gui/src/pages/instance/Index.vue
@@ -5,7 +5,8 @@
         <Avatar
           size="lg"
           :src="
-            instance.metadata.icon && instance.metadata.icon.startsWith('http')
+            !instance.metadata.icon ||
+            (instance.metadata.icon && instance.metadata.icon.startsWith('http'))
               ? instance.metadata.icon
               : convertFileSrc(instance.metadata?.icon)
           "
diff --git a/theseus_gui/src/pages/project/Index.vue b/theseus_gui/src/pages/project/Index.vue
index aa74473d6..666c09209 100644
--- a/theseus_gui/src/pages/project/Index.vue
+++ b/theseus_gui/src/pages/project/Index.vue
@@ -221,13 +221,13 @@ import {
 } from '@/assets/external'
 import { get_categories, get_loaders } from '@/helpers/tags'
 import { install as packInstall } from '@/helpers/pack'
-import { list, add_project_from_version as installMod } from '@/helpers/profile'
+import { list, add_project_from_version as installMod, check_installed } from '@/helpers/profile'
 import dayjs from 'dayjs'
 import relativeTime from 'dayjs/plugin/relativeTime'
 import { ofetch } from 'ofetch'
 import { useRoute, useRouter } from 'vue-router'
 import { ref, shallowRef, watch } from 'vue'
-import { checkInstalled, installVersionDependencies } from '@/helpers/utils'
+import { installVersionDependencies } from '@/helpers/utils'
 import InstallConfirmModal from '@/components/ui/InstallConfirmModal.vue'
 import InstanceInstallModal from '@/components/ui/InstanceInstallModal.vue'
 import Instance from '@/components/ui/Instance.vue'
@@ -242,19 +242,19 @@ const breadcrumbs = useBreadcrumbs()
 
 const confirmModal = ref(null)
 const modInstallModal = ref(null)
-const loaders = ref(await get_loaders())
-const categories = ref(await get_categories())
 const instance = ref(searchStore.instanceContext)
 const installing = ref(false)
 
-const [data, versions, members, dependencies] = await Promise.all([
+const [data, versions, members, dependencies, categories, loaders] = await Promise.all([
   ofetch(`https://api.modrinth.com/v2/project/${route.params.id}`).then(shallowRef),
   ofetch(`https://api.modrinth.com/v2/project/${route.params.id}/version`).then(shallowRef),
   ofetch(`https://api.modrinth.com/v2/project/${route.params.id}/members`).then(shallowRef),
   ofetch(`https://api.modrinth.com/v2/project/${route.params.id}/dependencies`).then(shallowRef),
+  get_loaders().then(ref),
+  get_categories().then(ref),
 ])
 
-const installed = ref(instance.value && checkInstalled(instance.value, data.value.id))
+const installed = ref(instance.value && (await check_installed(instance.value.path, data.value.id)))
 
 breadcrumbs.setName('Project', data.value.title)
 
@@ -284,7 +284,7 @@ async function install(version) {
   }
 
   if (data.value.project_type === 'modpack') {
-    const packs = Object.values(await list())
+    const packs = Object.values(await list(true))
     if (
       packs.length === 0 ||
       !packs
@@ -317,7 +317,7 @@ async function install(version) {
         await installMod(instance.value.path, queuedVersionData.id)
       }
 
-      installVersionDependencies(instance.value, queuedVersionData)
+      await installVersionDependencies(instance.value, queuedVersionData)
 
       installed.value = true
     } else {
diff --git a/theseus_playground/src/main.rs b/theseus_playground/src/main.rs
index 5f715aa54..fd2f9adf2 100644
--- a/theseus_playground/src/main.rs
+++ b/theseus_playground/src/main.rs
@@ -61,7 +61,7 @@ async fn main() -> theseus::Result<()> {
     // Clear profiles
     println!("Clearing profiles.");
     {
-        let h = profile::list().await?;
+        let h = profile::list(None).await?;
         for (path, _) in h.into_iter() {
             profile::remove(&path).await?;
         }
@@ -69,51 +69,52 @@ async fn main() -> theseus::Result<()> {
 
     println!("Creating/adding profile.");
 
-    let name = "Example".to_string();
-    let game_version = "1.19.2".to_string();
-    let modloader = ModLoader::Vanilla;
-    let loader_version = "stable".to_string();
-
-    let profile_path = profile_create(
-        name.clone(),
-        game_version,
-        modloader,
-        Some(loader_version),
-        None,
-        None,
-        None,
-        None,
-    )
-    .await?;
-
-    install(&profile_path).await.unwrap();
+    // let name = "Example".to_string();
+    // let game_version = "1.19.2".to_string();
+    // let modloader = ModLoader::Vanilla;
+    // let loader_version = "stable".to_string();
+    //
+    // let profile_path = profile_create(
+    //     name.clone(),
+    //     game_version,
+    //     modloader,
+    //     Some(loader_version),
+    //     None,
+    //     None,
+    //     None,
+    //     None,
+    // )
+    // .await?;
+    //
+    // install(&profile_path).await.unwrap();
 
     // let mut value = list().await?;
     // let profile_path = value.iter().next().map(|x| x.0).unwrap();
 
-    println!("Adding sodium");
-    let sodium_path = profile::add_project_from_version(
-        &profile_path,
-        "rAfhHfow".to_string(),
-    )
-    .await?;
-
-    let mod_menu_path = profile::add_project_from_version(
-        &profile_path,
-        "gSoPJyVn".to_string(),
-    )
-    .await?;
-
-    println!("Disabling sodium");
-    profile::toggle_disable_project(&profile_path, &sodium_path).await?;
+    // println!("Adding sodium");
+    // let sodium_path = profile::add_project_from_version(
+    //     &profile_path,
+    //     "rAfhHfow".to_string(),
+    // )
+    // .await?;
+    //
+    // let mod_menu_path = profile::add_project_from_version(
+    //     &profile_path,
+    //     "gSoPJyVn".to_string(),
+    // )
+    // .await?;
+    //
+    // println!("Disabling sodium");
+    // profile::toggle_disable_project(&profile_path, &sodium_path).await?;
 
     // profile::remove_project(&profile_path, &mod_menu_path).await?;
-    // let profile_path = pack::install_pack_from_version_id(
-    //     "zroFQG1k".to_string(),
-    //     Some("Technical Electrical".to_string()),
-    // )
-    // .await
-    // .unwrap();
+    let profile_path = pack::install_pack_from_version_id(
+        "CeeCkHke".to_string(),
+        "Technical Electrical".to_string(),
+        None,
+    )
+    .await
+    .unwrap();
 
     //  async closure for testing any desired edits
     // (ie: changing the java runtime of an added profile)