diff --git a/src/launcher.rs b/src/launcher.rs index 28c48c7..c43854a 100644 --- a/src/launcher.rs +++ b/src/launcher.rs @@ -12,7 +12,7 @@ use crate::minecraft::session::SignUpResponse; use crate::minecraft::versions::Version; use crate::{config::LauncherConfig, minecraft::versions::VersionConfig, util}; -const JAVA_ARGS: [&str; 23] = ["-Xms1024M", +const JAVA_ARGS: [&str; 22] = ["-Xms512M", "-XX:+UnlockExperimentalVMOptions", "-XX:+DisableExplicitGC", "-XX:MaxGCPauseMillis=200", @@ -28,7 +28,7 @@ const JAVA_ARGS: [&str; 23] = ["-Xms1024M", "-XX:G1MixedGCCountTarget=4", "-XX:G1MixedGCLiveThresholdPercent=90", "-XX:G1RSetUpdatingPauseTimePercent=5", -"-XX:+UseStringDeduplication", "-Xmx1024M", "-Dfile.encoding=UTF-8", "-Dfml.ignoreInvalidMinecraftCertificates=true", "-Dfml.ignorePatchDiscrepancies=true", "-Djava.net.useSystemProxies=true", "-XX:HeapDumpPath=MojangTricksIntelDriversForPerformance_javaw.exe_minecraft.exe.heapdump"]; +"-XX:+UseStringDeduplication", "-Dfile.encoding=UTF-8", "-Dfml.ignoreInvalidMinecraftCertificates=true", "-Dfml.ignorePatchDiscrepancies=true", "-Djava.net.useSystemProxies=true", "-XX:HeapDumpPath=MojangTricksIntelDriversForPerformance_javaw.exe_minecraft.exe.heapdump"]; #[derive(Default)] pub struct Launcher { @@ -145,11 +145,13 @@ impl Launcher { client_jar.push(&instance_name); client_jar.push("client.jar"); - let mut cmd = Command::new("java"); + let mut cmd = Command::new(&self.config.java_path); for arg in JAVA_ARGS { cmd.arg(arg.to_string()); } + + cmd.arg(["-Xmx", &self.config.ram_amount.to_string(), "M"].concat()); let mut natives_path = self.config.launcher_dir(); natives_path.push("instances"); diff --git a/src/main.rs b/src/main.rs index 64b89c8..e1fbedf 100644 --- a/src/main.rs +++ b/src/main.rs @@ -186,6 +186,15 @@ async fn main() { "fetch_settings" => { responder.respond(Response::new(serde_json::to_vec(&UIMessage { params: vec!["fetch_settings_response".to_string(), launcher.config.show_alpha.to_string(), launcher.config.show_beta.to_string(), launcher.config.show_snapshots.to_string(), launcher.config.java_path.clone(), launcher.config.ram_amount.to_string()] }).unwrap())); } + "update_settings" => { + let params = ¶ms.unwrap().params; + launcher.config.java_path = params[3].clone(); + launcher.config.ram_amount = params[4].parse().unwrap(); + launcher.config.show_alpha = params[0].parse().unwrap(); + launcher.config.show_beta = params[1].parse().unwrap(); + launcher.config.show_snapshots = params[2].parse().unwrap(); + launcher.save_config(); + } _ => {} } } diff --git a/src/www/portable.html b/src/www/portable.html index 066603b..5add9c4 100644 --- a/src/www/portable.html +++ b/src/www/portable.html @@ -194,7 +194,7 @@
Choose how you want to set up Minecraft.
@@ -258,18 +258,15 @@