oiupoyt/OneLauncher-Cracked
1
1
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

LAUNCHER-2 fix: new PrismLauncher minecraft folder name

Browse source
This commit is contained in:
LynithDev 2024-12-22 11:18:30 +01:00
parent 1c05791f70
commit e8ad2e0da7
2 changed files with 27 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/core/src/api/package/import/mod.rs
View file

@ -95,7 +95,7 @@ impl ImportType {
pub async fn get_launcher_instances(import: ImportType, path: Option<PathBuf>) -> crate::Result<(PathBuf, Vec<String>)> {
let base_path = &path.unwrap_or(
default_launcher_path(import)
.ok_or(anyhow::anyhow!("could not get launcher base path for {import}"))?
.ok_or_else(|| anyhow::anyhow!("could not get launcher base path for {import}"))?
);
let instances_dir = import.get_instances_subpath(base_path).await?;

87
packages/core/src/api/package/import/multibased.rs
View file

@ -195,55 +195,23 @@ pub async fn import_mmc(
cluster_path: cluster_path.clone(),
};
let backup_name = "Imported Modpack".to_string();
let mut minecraft_folder = mmc_base_path
.join("instances")
.join(instance_folder);
if instance_cfg.managed_pack.unwrap_or(false) {
if minecraft_folder.join("minecraft").exists() {
minecraft_folder = minecraft_folder.join("minecraft");
} else if minecraft_folder.join(".minecraft").exists() {
minecraft_folder = minecraft_folder.join(".minecraft");
}
let backup_name = if instance_cfg.managed_pack.unwrap_or(false) {
match instance_cfg.managed_pack_type {
Some(MMCManagedPackType::Modrinth) => {
let backup_name = "Imported Modrinth Modpack".to_string();
let minecraft_folder = mmc_base_path
.join("instances")
.join(instance_folder)
.join(".minecraft");
import_mmc_unmanaged(
cluster_path,
minecraft_folder,
backup_name,
description,
mmc_pack,
)
.await?;
}
Some(MMCManagedPackType::Flame | MMCManagedPackType::ATLauncher) => {
// Same as unmanaged, but with 'minecraft' folder instead of '.minecraft'
let minecraft_folder = mmc_base_path
.join("instances")
.join(instance_folder)
.join("minecraft");
import_mmc_unmanaged(
cluster_path,
minecraft_folder,
backup_name,
description,
mmc_pack,
)
.await?;
}
Some(_) => {
let backup_name = "ImportedModpack".to_string();
let minecraft_folder = mmc_base_path
.join("instances")
.join(instance_folder)
.join(".minecraft");
import_mmc_unmanaged(
cluster_path,
minecraft_folder,
backup_name,
description,
mmc_pack,
)
.await?;
}
Some(MMCManagedPackType::Modrinth) => "Imported Modrinth Modpack".to_string(),
Some(MMCManagedPackType::Flame) => "Imported CurseForge Modpack".to_string(),
Some(MMCManagedPackType::ATLauncher) => "Imported ATLauncher Modpack".to_string(),
Some(_) => "ImportedModpack".to_string(),
_ => {
return Err(anyhow::anyhow!(
"Instance is managed, but managed pack type not specified in instance.cfg"
@ -252,20 +220,17 @@ pub async fn import_mmc(
}
}
} else {
let backup_name = "Imported Modpack".to_string();
let minecraft_folder = mmc_base_path
.join("instances")
.join(instance_folder)
.join(".minecraft");
import_mmc_unmanaged(
cluster_path,
minecraft_folder,
backup_name,
description,
mmc_pack,
)
.await?;
}
"Imported Modpack".to_string()
};
import_mmc_unmanaged(
cluster_path,
minecraft_folder,
backup_name,
description,
mmc_pack,
)
.await?;
Ok(())
}