diff options
| author | 2025-01-15 00:55:05 -0600 | |
|---|---|---|
| committer | 2025-01-15 00:55:05 -0600 | |
| commit | 7db451eab4de13ac2dfd1b570a9e01a6afded919 (patch) | |
| tree | 3f3e216e0e447367b25a78558b006716ad0a7c38 /src/launcher.rs | |
| parent | fix stuff (diff) | |
get started on assets
Diffstat (limited to 'src/launcher.rs')
| -rw-r--r-- | src/launcher.rs | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/launcher.rs b/src/launcher.rs index 96ba3bd..970386a 100644 --- a/src/launcher.rs +++ b/src/launcher.rs @@ -225,6 +225,8 @@ impl Launcher { } async fn log_config_ensure(&self, config: &Logging) -> Result<Option<String>, LogConfigError> { + info!("Ensuring log configuration exists and is valid."); + if config.client.log_type != "log4j2-xml" { return Err(LogConfigError::UnknownType(config.client.log_type.clone())); } @@ -349,9 +351,9 @@ impl Launcher { * - (done) redownload necessary libraries * - (if offline mode and there are libraries to download, then explode violently) * - extract natives - * - logging - * - download the config if present and necessary - * - (explode if offline mode and we need to download stuff) + * - (done) logging + * - (done) download the config if present and necessary + * - (done) (explode if offline mode and we need to download stuff) * - assets * - get asset index (check if our local copy is good and redownload if not) * - check what ones are good and what needs to be downloaded @@ -364,6 +366,8 @@ impl Launcher { * - launch the game * - build argument list and whatnot also */ + info!("Preparing launch for \"{}\"...", profile.version_id); + let ver_res = self.versions.get_version_lazy(&profile.version_id); let ver = match ver_res { VersionResult::Remote(mv) => Cow::Owned(self.versions.load_remote_version(mv).await.map_err(|e| LaunchError::LoadVersion(e))?), @@ -375,6 +379,8 @@ impl Launcher { let ver = self.versions.resolve_version(ver.as_ref()).await.map_err(|e| LaunchError::ResolveVersion(e))?; ver.rules_apply(&self.system_info, |_| false).map_err(|e| LaunchError::IncompatibleVersion(e))?; + + info!("Resolved launch version {}!", ver.id); let mut libs = Vec::new(); let mut downloads = Vec::new(); @@ -406,7 +412,7 @@ impl Launcher { debug!("Verifying library {}", dl.get_path().display()); util::verify_file(dl.get_path(), dl.get_expect_size(), dl.get_expect_sha1()).await })) - .try_buffer_unordered(5) + .try_buffer_unordered(8) .try_fold((), |_, _| async {Ok(())}) .await .map_err(|e| { @@ -418,7 +424,6 @@ impl Launcher { let log_arg; if let Some(logging) = ver.logging.as_ref() { - info!("Ensuring log configuration exists and is valid."); log_arg = self.log_config_ensure(logging).await .map_err(|e| LaunchError::LogConfig(e))?; } else { |
