add checkbox whether to include flap

Author: moehreag

locales/de.json

@@ -35,6 +35,7 @@
     "gui.mode.mmc": "MultiMC/PrismLauncher",
     "gui.mode.server": "Server",
     "gui.ui.show_loader_betas": "Beta-Versionen Anzeigen",
+    "gui.checkbox.include_flap": "Flap mitliefern",
     "client.error.directory_does_not_exist": "Der Ordner %{dir} existiert nicht. Stelle sicher, dass du den richtigen Ordner ausgewählt und dass du das Spiel mindestens einmal vorher gestartet hast.",
     "client.info.installation_start": "Installiere client für %{version} mit %{loader} Loader %{loader_version} nach %{destination}",
     "client.info.fetching_launch_jsons": "Hole Start-jsons...",

locales/en.json

@@ -35,6 +35,7 @@
     "gui.mode.mmc": "MultiMC/PrismLauncher",
     "gui.mode.server": "Server",
     "gui.ui.show_loader_betas": "Show Betas",
+    "gui.checkbox.include_flap":"Include Flap",
     "client.error.directory_does_not_exist": "The directory %{dir} does not exist. Make sure you selected the correct folder and that you have started the game at least once before.",
     "client.info.installation_start": "Installing client for %{version} using %{loader} Loader %{loader_version} to %{destination}",
     "client.info.fetching_launch_jsons": "Fetching launch jsons...",

src/actions/client.rs

@@ -23,6 +23,7 @@ pub async fn install(
     generation: Option<u32>,
     location: PathBuf,
     create_profile: bool,
+    include_flap: bool,
 ) -> Result<(), InstallerError> {
     if !location.exists() {
         return Err(InstallerError::from(t!(
@@ -76,24 +77,26 @@ pub async fn install(
         std::fs::remove_dir_all(&profile_dir)?;
     }
 
-    maven::download_latest_release("flap", &flap_jar).await?;
-
-    if let Some(obj) = ornithe_launch_json.as_object_mut() {
-        if !obj.contains_key("arguments") {
-            let a = Value::Object(Map::new());
-            obj.insert("arguments".to_string(), a);
-        };
-        let arguments = obj.get_mut("arguments").unwrap();
-        if let Some(args) = arguments.as_object_mut() {
-            if !args.contains_key("jvm") {
-                args.insert("jvm".to_string(), Value::Array(Vec::new()));
-            }
-            let jvm_args = args.get_mut("jvm").unwrap().as_array_mut();
-            if let Some(jvm) = jvm_args {
-                jvm.insert(
-                    0,
-                    json!(format!("-javaagent:{}", flap_jar.to_string_lossy())),
-                );
+    if include_flap {
+        maven::download_latest_release("flap", &flap_jar).await?;
+
+        if let Some(obj) = ornithe_launch_json.as_object_mut() {
+            if !obj.contains_key("arguments") {
+                let a = Value::Object(Map::new());
+                obj.insert("arguments".to_string(), a);
+            };
+            let arguments = obj.get_mut("arguments").unwrap();
+            if let Some(args) = arguments.as_object_mut() {
+                if !args.contains_key("jvm") {
+                    args.insert("jvm".to_string(), Value::Array(Vec::new()));
+                }
+                let jvm_args = args.get_mut("jvm").unwrap().as_array_mut();
+                if let Some(jvm) = jvm_args {
+                    jvm.insert(
+                        0,
+                        json!(format!("-javaagent:{}", flap_jar.to_string_lossy())),
+                    );
+                }
             }
         }
     }

src/actions/mmc_pack.rs

@@ -30,6 +30,7 @@ pub async fn install(
     copy_profile_path: bool,
     generate_zip: bool,
     generation: Option<u32>,
+    include_flap: bool,
 ) -> Result<(), InstallerError> {
     let _ = sender.send((
         0.1,
@@ -210,26 +211,29 @@ pub async fn install(
         )?;
     }
 
-    zip.write_file(
-        "patches/net.ornithemc.flap.json",
-        serde_json::to_string(&json!({
-            "formatVersion": 1,
-            "name": "Flap",
-            "type": "release",
-            "uid": "net.ornithemc.flap",
-            "version": flap_version,
-            "+agents": [{
-                "name": format!("net.ornithemc:flap:{}", flap_version),
-                "url": maven::MAVEN_URL
-            }]
-        }))?
-        .as_bytes(),
-    )?;
-    pack_components.push(json!({
-        "cachedName": "Flap",
-        "cachedVersion": flap_version,
-        "uid": "net.ornithemc.flap"
-    }));
+    if include_flap {
+        zip.write_file(
+            "patches/net.ornithemc.flap.json",
+            serde_json::to_string(&json!({
+                "formatVersion": 1,
+                "name": "Flap",
+                "type": "release",
+                "uid": "net.ornithemc.flap",
+                "version": flap_version,
+                "+agents": [{
+                    "name": format!("net.ornithemc:flap:{}", flap_version),
+                    "url": maven::MAVEN_URL
+                }]
+            }))?
+            .as_bytes(),
+        )?;
+
+        pack_components.push(json!({
+            "cachedName": "Flap",
+            "cachedVersion": flap_version,
+            "uid": "net.ornithemc.flap"
+        }));
+    }
 
     zip.write_file(
         "mmc-pack.json",

src/actions/server.rs

@@ -31,6 +31,7 @@ pub async fn install(
     generation: Option<u32>,
     location: PathBuf,
     install_server: bool,
+    include_flap: bool,
 ) -> Result<(), InstallerError> {
     install_path(
         sender.clone(),
@@ -41,6 +42,7 @@ pub async fn install(
         &generation,
         &location,
         install_server,
+        include_flap,
     )
     .await?;
 
@@ -68,6 +70,7 @@ async fn install_path(
     generation: &Option<u32>,
     location: &PathBuf,
     install_server: bool,
+    include_flap: bool,
 ) -> Result<(), InstallerError> {
     if !location.exists() {
         std::fs::create_dir_all(&location)?;
@@ -168,13 +171,17 @@ async fn install_path(
         library_files.spawn(async move { download_library(&dir, name, url).await });
     }
 
-    let flap_version = maven::get_latest_version("flap").await?;
-    let flap_path = library_dir.join(format!(
-        "net/ornithemc/flap/flap-{}.jar",
-        flap_version.version
-    ));
-    {
-        let out_path = flap_path.clone();
+    let flap_path = if include_flap {
+        let flap_version = maven::get_latest_version("flap").await?;
+        Some(library_dir.join(format!(
+            "net/ornithemc/flap/flap-{}.jar",
+            flap_version.version
+        )))
+    } else {
+        None
+    };
+    if include_flap {
+        let out_path = flap_path.as_ref().unwrap().clone();
         library_files.spawn(async move {
             maven::download_latest_release("flap", &out_path).await?;
             Ok(out_path)
@@ -246,7 +253,7 @@ async fn install_path(
         &launch_main_class,
         &downloaded_library_files,
         jvm_args,
-        flap_path.strip_prefix(&location.canonicalize()?)?,
+        flap_path.as_deref(),
     )
     .await?;
 
@@ -269,7 +276,7 @@ async fn create_launch_jar(
     launch_main_class: &str,
     library_files: &Vec<PathBuf>,
     jvm_args: Vec<String>,
-    flap_jar_path: &Path,
+    flap_jar_path: Option<&Path>,
 ) -> Result<(), InstallerError> {
     let jar_out = install_location.join(loader_type.get_name().to_owned() + "-server-launch.jar");
     if jar_out.exists() {
@@ -288,10 +295,19 @@ async fn create_launch_jar(
         }
     }
 
-    let mut jar_manifest = launch_jar.by_path("META-INF/MANIFEST.MF")?;
-    let mut mf = String::new();
-    jar_manifest.read_to_string(&mut mf)?;
-    write!(manifest, "{}", mf.replace("\n\r\n", "\n"))?;
+    if flap_jar_path.is_some() {
+        let mut jar_manifest = launch_jar.by_path("META-INF/MANIFEST.MF")?;
+        let mut mf = String::new();
+        jar_manifest.read_to_string(&mut mf)?;
+        write!(manifest, "{}", mf.replace("\n\r\n", "\n"))?;
+    } else {
+        writeln!(manifest, "Manifest-Version: 1.0\r")?;
+        writeln!(
+            manifest,
+            "{}\r",
+            wrap_manifest_line(&format!("Main-Class: {}", launch_main_class))
+        )?;
+    }
     zip.start_file("META-INF/MANIFEST.MF", SimpleFileOptions::default())?;
 
     let mut class_path = String::from("Class-Path: ");
@@ -310,12 +326,14 @@ async fn create_launch_jar(
     )?;
     zip.write_all(&manifest)?;
 
-    zip.start_file("ornithe-args.json", SimpleFileOptions::default())?;
-    zip.write_all(&serde_json::to_vec(&json!({
-        "flap_jar": flap_jar_path,
-        "main_class": launch_main_class,
-        "jvm_args": jvm_args
-    }))?)?;
+    if let Some(flap_path) = flap_jar_path {
+        zip.start_file("ornithe-args.json", SimpleFileOptions::default())?;
+        zip.write_all(&serde_json::to_vec(&json!({
+            "flap_jar": flap_path,
+            "main_class": launch_main_class,
+            "jvm_args": jvm_args
+        }))?)?;
+    }
 
     if loader_type == &LoaderType::Fabric {
         zip.start_file(
@@ -399,6 +417,7 @@ pub async fn install_and_run<I, S>(
     loader_version: LoaderVersion,
     generation: Option<u32>,
     location: PathBuf,
+    include_flap: bool,
     java: Option<&PathBuf>,
     args: Option<I>,
 ) -> Result<bool, InstallerError>
@@ -429,6 +448,7 @@ where
             &generation,
             &location,
             true,
+            include_flap,
         )
         .await?;
     }

src/ui/cli.rs

@@ -223,6 +223,7 @@ async fn do_install(
             info.calamus_generation,
             location,
             create_profile,
+            !matches.get_flag("exclude-flap"),
         )
         .await?;
         return Ok(InstallationResult::Installed);
@@ -249,6 +250,7 @@ async fn do_install(
                 loader_version,
                 info.calamus_generation,
                 location,
+                !matches.get_flag("exclude-flap"),
                 java,
                 run_args.map(|s| s.split(" ")),
             )
@@ -267,6 +269,7 @@ async fn do_install(
             info.calamus_generation,
             location,
             matches.get_flag("download-minecraft"),
+            !matches.get_flag("exclude-flap"),
         )
         .await?;
         return Ok(InstallationResult::Installed);
@@ -296,6 +299,7 @@ async fn do_install(
             copy_profile_path,
             generate_zip,
             info.calamus_generation,
+            !matches.get_flag("exclude-flap"),
         )
         .await?;
         return Ok(InstallationResult::Installed);
@@ -417,6 +421,7 @@ fn add_arguments(command: Command) -> Command {
                 .value_parser(["fabric", "quilt"]),
         )
         .arg(arg!(--"loader-version" <VERSION> "Loader version to use").default_value("latest"))
+        .arg(arg!(--"exclude-flap" "Do not include Flap (Cross-Intermediary Generation Remapper)"))
 }
 
 fn add_gen_argument(command: Command) -> Command {