diff options
| -rw-r--r-- | src/launcher.rs | 34 |
1 files changed, 7 insertions, 27 deletions
diff --git a/src/launcher.rs b/src/launcher.rs index 5e3668b..8c798e1 100644 --- a/src/launcher.rs +++ b/src/launcher.rs @@ -314,31 +314,11 @@ impl Launcher { Ok(strsub::replace_string(config.argument.as_str(), &PathSub(path.as_ref())).to_string()) } + /* TODO: + * - launch game using JNI + * - auth + */ pub async fn prepare_launch(&self, profile: &Profile, instance: &Instance) -> Result<Launch, LaunchError> { - /* tasks 2 l;aunch the gayme!!!! :3 - * - java runtime - * - normal process (good research, past figboot :3) - * - (done) libraries - * - (done) check which libraries we actually need (some have classifiers that don't apply to us) - * - (done) of the libraries we need, check which have correct size and sha1 - * - (done) redownload necessary libraries - * - (done) (if offline mode and there are libraries to download, then explode violently) - * - (done) extract natives - * - (done) logging - * - (done) download the config if present and necessary - * - (done) (explode if offline mode and we need to download stuff) - * - (done) assets - * - (done) get asset index (check if our local copy is good and redownload if not) - * - (done) check what ones are good and what needs to be downloaded - * - (done) download them - * - (done) (if offline mode, explode) - * - (done) if virtual or resource-mapped, copy (or perhaps hardlink? that would be cool) - * - (done) the actual client jar - * - (done) check integriddy and download if needed - * - (done) (explode if offline mode) - * - launch the game - * - build argument list and whatnot also - */ let start = Instant::now(); let feature_matcher = ProfileFeatureMatcher { profile }; let version_id = profile.get_version(); @@ -427,8 +407,6 @@ impl Launcher { } else { log_arg = None; } - - dbg!(log_arg); // download assets @@ -538,7 +516,9 @@ impl Launcher { }; // yuck - let jvm_args = profile.iter_arguments().map(OsString::from).chain(runner::build_arguments(&info, ver.as_ref(), ArgumentType::JVM).drain(..)).collect(); + let jvm_args = profile.iter_arguments().map(OsString::from) + .chain(runner::build_arguments(&info, ver.as_ref(), ArgumentType::JVM).drain(..)) + .chain(log_arg.iter().map(OsString::from)).collect(); let game_args = runner::build_arguments(&info, ver.as_ref(), ArgumentType::Game); let diff = Instant::now().duration_since(start); |