50 errors help

Author: Umatriz

crates/client/src/collections.rs

@@ -9,7 +9,7 @@ use nomi_modding::modrinth::{
 
 use crate::{
     errors_pool::ErrorPoolExt,
-    views::{ProfilesConfig, SimpleDependency},
+    views::{InstancesConfig, SimpleDependency},
 };
 
 pub struct FabricDataCollection;
@@ -73,7 +73,7 @@ impl<'c> TasksCollection<'c> for JavaCollection {
 pub struct GameDownloadingCollection;
 
 impl<'c> TasksCollection<'c> for GameDownloadingCollection {
-    type Context = &'c ProfilesConfig;
+    type Context = &'c InstancesConfig;
 
     type Target = Option<()>;
 
@@ -85,7 +85,7 @@ impl<'c> TasksCollection<'c> for GameDownloadingCollection {
 
     fn handle(context: Self::Context) -> Handler<'c, Self::Target> {
         Handler::new(|_| {
-            context.update_config().report_error();
+            context.update_config_sync().report_error();
         })
     }
 }
@@ -182,7 +182,7 @@ impl<'c> TasksCollection<'c> for DependenciesCollection {
 pub struct ModsDownloadingCollection;
 
 impl<'c> TasksCollection<'c> for ModsDownloadingCollection {
-    type Context = &'c ProfilesConfig;
+    type Context = &'c InstancesConfig;
 
     type Target = Option<()>;
 
@@ -194,7 +194,7 @@ impl<'c> TasksCollection<'c> for ModsDownloadingCollection {
 
     fn handle(context: Self::Context) -> Handler<'c, Self::Target> {
         Handler::new(|_| {
-            context.update_config().report_error();
+            context.update_config_sync().report_error();
         })
     }
 }
@@ -220,7 +220,7 @@ impl<'c> TasksCollection<'c> for GameRunnerCollection {
 pub struct DownloadAddedModsCollection;
 
 impl<'c> TasksCollection<'c> for DownloadAddedModsCollection {
-    type Context = (&'c mut HashSet<ProjectId>, &'c ProfilesConfig);
+    type Context = (&'c mut HashSet<ProjectId>, &'c InstancesConfig);
 
     type Target = ProjectId;
 
@@ -233,7 +233,7 @@ impl<'c> TasksCollection<'c> for DownloadAddedModsCollection {
     fn handle(context: Self::Context) -> Handler<'c, Self::Target> {
         Handler::new(|id| {
             context.0.remove(&id);
-            context.1.update_config().report_error();
+            context.1.update_config_sync().report_error();
         })
     }
 }

crates/client/src/context.rs

@@ -69,11 +69,11 @@ impl TabViewer for MyContext {
         match &tab.kind {
             TabKind::Mods { profile } => {
                 let profile = profile.read();
-                self.states.profiles.profiles.find_profile(profile.profile.id).is_none()
+                self.states.profiles.instances.find_instance(profile.profile.id).is_none()
             }
             TabKind::ProfileInfo { profile } => {
                 let profile = profile.read();
-                self.states.profiles.profiles.find_profile(profile.profile.id).is_none()
+                self.states.profiles.instances.find_instance(profile.profile.id).is_none()
             }
             _ => false,
         }
@@ -117,13 +117,13 @@ impl TabViewer for MyContext {
             }
             TabKind::Mods { profile } => ModManager {
                 task_manager: &mut self.manager,
-                profiles_config: &mut self.states.profiles.profiles,
+                profiles_config: &mut self.states.profiles.instances,
                 mod_manager_state: &mut self.states.mod_manager,
                 profile: profile.clone(),
             }
             .ui(ui),
             TabKind::ProfileInfo { profile } => ProfileInfo {
-                profiles: &self.states.profiles.profiles,
+                profiles: &self.states.profiles.instances,
                 task_manager: &mut self.manager,
                 profile: profile.clone(),
                 tabs_state: &mut self.states.tabs,

crates/client/src/download.rs

@@ -10,7 +10,7 @@ use nomi_core::{
         AssetsDownloader, DownloadQueue,
     },
     game_paths::GamePaths,
-    instance::{launch::LaunchSettings, Instance},
+    instance::{launch::LaunchSettings, Profile},
     loaders::{
         fabric::Fabric,
         forge::{Forge, ForgeVersion},
@@ -48,46 +48,37 @@ async fn try_download_version(profile: Arc<RwLock<ModdedProfile>>, progress_shar
         let game_paths = GamePaths {
             game: mc_dir.clone(),
             assets: mc_dir.join("assets"),
-            version: mc_dir.join("versions").join(version),
+            profile: mc_dir.join("versions").join(version),
             libraries: mc_dir.join("libraries"),
         };
 
-        let builder = Instance::builder()
+        let builder = Profile::builder()
             .name(version_profile.name.clone())
             .version(version_profile.version().to_string())
             .game_paths(game_paths.clone());
 
         let instance = match loader {
-            Loader::Vanilla => builder.instance(Box::new(Vanilla::new(version_profile.version(), game_paths.clone()).await?)),
-            Loader::Fabric { version } => builder.instance(Box::new(
+            Loader::Vanilla => builder.downloader(Box::new(Vanilla::new(version_profile.version(), game_paths.clone()).await?)),
+            Loader::Fabric { version } => builder.downloader(Box::new(
                 Fabric::new(version_profile.version(), version.as_ref(), game_paths.clone()).await?,
             )),
-            Loader::Forge => builder.instance(Box::new(
+            Loader::Forge => builder.downloader(Box::new(
                 Forge::new(version_profile.version(), ForgeVersion::Recommended, game_paths.clone()).await?,
             )),
         }
         .build();
 
         let settings = LaunchSettings {
-            assets: instance.game_paths.assets.clone(),
-            game_dir: instance.game_paths.game.clone(),
-            java_bin: JavaRunner::default(),
-            libraries_dir: instance.game_paths.libraries.clone(),
-            manifest_file: instance.game_paths.version.join(format!("{}.json", &version)),
-            natives_dir: instance.game_paths.version.join("natives"),
-            version_jar_file: instance.game_paths.version.join(format!("{}.jar", &version)),
+            java_runner: None,
             version: version.to_string(),
             version_type: version_type.clone(),
         };
 
         let launch_instance = instance.launch_instance(settings, Some(vec!["-Xms2G".to_string(), "-Xmx4G".to_string()]));
 
-        let instance = instance.instance();
-
+        let instance = instance.downloader();
         let io = instance.io();
-
         let downloader: Box<dyn Downloader<Data = DownloadResult>> = instance.into_downloader();
-
         io.await?;
 
         let downloader = DownloadQueue::new().with_downloader_dyn(downloader);

crates/client/src/main.rs

@@ -140,19 +140,19 @@ impl eframe::App for MyTabs {
             .add_collection::<collections::AssetsCollection>(())
             .add_collection::<collections::FabricDataCollection>(&mut self.context.states.add_profile_menu_state.fabric_versions)
             .add_collection::<collections::GameDeletionCollection>(())
-            .add_collection::<collections::GameDownloadingCollection>(&self.context.states.profiles.profiles)
+            .add_collection::<collections::GameDownloadingCollection>(&self.context.states.profiles.instances)
             .add_collection::<collections::JavaCollection>(())
             .add_collection::<collections::ProjectCollection>(&mut self.context.states.mod_manager.current_project)
             .add_collection::<collections::ProjectVersionsCollection>(&mut self.context.states.mod_manager.current_versions)
             .add_collection::<collections::DependenciesCollection>((
                 &mut self.context.states.mod_manager.current_dependencies,
                 self.context.states.mod_manager.current_project.as_ref().map(|p| &p.id),
             ))
-            .add_collection::<collections::ModsDownloadingCollection>(&self.context.states.profiles.profiles)
+            .add_collection::<collections::ModsDownloadingCollection>(&self.context.states.profiles.instances)
             .add_collection::<collections::GameRunnerCollection>(())
             .add_collection::<collections::DownloadAddedModsCollection>((
                 &mut self.context.states.profile_info.currently_downloading_mods,
-                &self.context.states.profiles.profiles,
+                &self.context.states.profiles.instances,
             ));
 
         ctx.set_pixels_per_point(self.context.states.client_settings.pixels_per_point);

crates/client/src/states.rs

@@ -4,7 +4,7 @@ use egui_task_manager::{Caller, Task, TaskManager};
 use nomi_core::{
     downloads::{java::JavaDownloader, progress::MappedSender, traits::Downloader},
     fs::read_toml_config_sync,
-    DOT_NOMI_JAVA_DIR, DOT_NOMI_JAVA_EXECUTABLE, DOT_NOMI_PROFILES_CONFIG, DOT_NOMI_SETTINGS_CONFIG,
+    DOT_NOMI_JAVA_DIR, DOT_NOMI_JAVA_EXECUTABLE, DOT_NOMI_SETTINGS_CONFIG,
 };
 use tracing::info;
 
@@ -15,7 +15,7 @@ use crate::{
         add_tab_menu::TabsState,
         profiles::ProfilesState,
         settings::{ClientSettingsState, SettingsState},
-        AddProfileMenuState, LogsState, ModManagerState, ProfileInfoState, ProfilesConfig,
+        AddProfileMenuState, InstancesConfig, LogsState, ModManagerState, ProfileInfoState,
     },
 };
 
@@ -44,7 +44,7 @@ impl Default for States {
             java: JavaState::new(),
             profiles: ProfilesState {
                 currently_downloading_profiles: HashSet::new(),
-                profiles: read_toml_config_sync::<ProfilesConfig>(DOT_NOMI_PROFILES_CONFIG).unwrap_or_default(),
+                instances: read_toml_config_sync::<InstancesConfig>(DOT_NOMI_PROFILES_CONFIG).unwrap_or_default(),
             },
             client_settings: settings.client_settings.clone(),
             settings,

crates/client/src/views/add_profile_menu.rs

@@ -202,8 +202,8 @@ impl View for AddProfileMenu<'_> {
             )
             .clicked()
         {
-            self.profiles_state.profiles.add_profile(ModdedProfile::new(VersionProfile {
-                id: self.profiles_state.profiles.create_id(),
+            self.profiles_state.instances.add_instance(ModdedProfile::new(VersionProfile {
+                id: self.profiles_state.instances.next_id(),
                 name: self.menu_state.profile_name_buf.trim_end().to_owned(),
                 state: ProfileState::NotDownloaded {
                     // PANICS: It will never panic because it's
@@ -213,7 +213,7 @@ impl View for AddProfileMenu<'_> {
                     version_type: self.menu_state.selected_version_type.clone(),
                 },
             }));
-            self.profiles_state.profiles.update_config().report_error();
+            self.profiles_state.instances.update_config_sync().report_error();
         }
     }
 }

crates/client/src/views/mods_manager.rs

@@ -28,13 +28,13 @@ use crate::{
     DOT_NOMI_MODS_STASH_DIR,
 };
 
-use super::{ModdedProfile, ProfilesConfig, View};
+use super::{InstancesConfig, ModdedProfile, View};
 
 pub use crate::mods::*;
 
 pub struct ModManager<'a> {
     pub task_manager: &'a mut TaskManager,
-    pub profiles_config: &'a mut ProfilesConfig,
+    pub profiles_config: &'a mut InstancesConfig,
     pub profile: Arc<RwLock<ModdedProfile>>,
     pub mod_manager_state: &'a mut ModManagerState,
 }
@@ -586,7 +586,7 @@ impl View for ModManager<'_> {
 
                                 let project_type = project.project_type;
 
-                                let _ = self.profiles_config.update_config().report_error();
+                                let _ = self.profiles_config.update_config_sync().report_error();
                                 let is_data_pack = self.mod_manager_state.is_datapack;
                                 let profile_id = {
                                     let lock = profile.read();

crates/client/src/views/profile_info.rs

@@ -7,14 +7,14 @@ use nomi_modding::modrinth::project::ProjectId;
 use parking_lot::RwLock;
 
 use crate::{
-    collections::DownloadAddedModsCollection, errors_pool::ErrorPoolExt, open_directory::open_directory_native, ui_ext::UiExt, views::ProfilesConfig,
-    TabKind, DOT_NOMI_MODS_STASH_DIR,
+    collections::DownloadAddedModsCollection, errors_pool::ErrorPoolExt, open_directory::open_directory_native, ui_ext::UiExt,
+    views::InstancesConfig, TabKind, DOT_NOMI_MODS_STASH_DIR,
 };
 
 use super::{download_added_mod, Mod, ModdedProfile, TabsState, View};
 
 pub struct ProfileInfo<'a> {
-    pub profiles: &'a ProfilesConfig,
+    pub profiles: &'a InstancesConfig,
     pub task_manager: &'a mut TaskManager,
     pub profile: Arc<RwLock<ModdedProfile>>,
     pub tabs_state: &'a mut TabsState,
@@ -273,7 +273,7 @@ impl View for ProfileInfo<'_> {
                         }
 
                         {
-                            self.profiles.update_config().report_error();
+                            self.profiles.update_config_sync().report_error();
                         }
 
                         self.profile_info_state.mods_to_import.clear();
@@ -377,7 +377,7 @@ impl View for ProfileInfo<'_> {
                     }
                 }
 
-                self.profiles.update_config().report_error();
+                self.profiles.update_config_sync().report_error();
             }
 
             if ui.button("Reset").clicked() {
@@ -476,7 +476,7 @@ impl View for ProfileInfo<'_> {
 
             vec.retain(|m| !mods_to_remove.contains(&m.project_id));
             if !mods_to_remove.is_empty() {
-                self.profiles.update_config().report_error();
+                self.profiles.update_config_sync().report_error();
             }
 
             let _ = std::mem::replace(&mut self.profile.write().mods.mods, vec);