warren/MCModpackManager
1
0
Fork 0
mirror of https://github.com/WarrenHood/MCModpackManager.git synced 2025-04-30 00:04:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename mod_name to name

Browse source
This commit is contained in:
Warren Hood 2024-08-15 01:05:55 +02:00
parent 5b04b78d0a
commit b360901285
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/modpack.rs
View file

@ -29,7 +29,7 @@ impl std::str::FromStr for ModProvider {
#[derive(Debug, Serialize, Deserialize, PartialEq)] #[derive(Debug, Serialize, Deserialize, PartialEq)]
pub struct ModMeta { pub struct ModMeta {
mod_name: String, name: String,
version: String, version: String,
providers: Option<Vec<ModProvider>>, providers: Option<Vec<ModProvider>>,
download_url: Option<String>, download_url: Option<String>,
@ -43,13 +43,13 @@ impl ModMeta {
return Err(format!("Invalid mod with version constraint: '{}'", &mod_name).into()); return Err(format!("Invalid mod with version constraint: '{}'", &mod_name).into());
} }
return Ok(Self { return Ok(Self {
mod_name: mod_name_and_version[0].into(), name: mod_name_and_version[0].into(),
version: mod_name_and_version[1].into(), version: mod_name_and_version[1].into(),
..Default::default() ..Default::default()
}); });
} }
Ok(Self { Ok(Self {
mod_name: mod_name.into(), name: mod_name.into(),
..Default::default() ..Default::default()
}) })
} }
@ -79,7 +79,7 @@ impl ModMeta {
impl Default for ModMeta { impl Default for ModMeta {
fn default() -> Self { fn default() -> Self {
Self { Self {
mod_name: Default::default(), name: Default::default(),
version: "*".into(), version: "*".into(),
providers: None, providers: None,
download_url: Default::default(), download_url: Default::default(),
@ -159,16 +159,16 @@ impl ModpackMeta {
} }
pub fn add_mod(mut self, mod_meta: ModMeta) -> Self { pub fn add_mod(mut self, mod_meta: ModMeta) -> Self {
if let Some(old_mod_meta) = self.mods.get(&mod_meta.mod_name) { if let Some(old_mod_meta) = self.mods.get(&mod_meta.name) {
println!("Updating {} version {}->{}", mod_meta.mod_name, old_mod_meta.version, mod_meta.version); println!("Updating {} version {}->{}", mod_meta.name, old_mod_meta.version, mod_meta.version);
} }
else { else {
println!( println!(
"Adding {}@{} to modpack '{}'...", "Adding {}@{} to modpack '{}'...",
mod_meta.mod_name, mod_meta.version, self.pack_name mod_meta.name, mod_meta.version, self.pack_name
); );
} }
self.mods.insert(mod_meta.mod_name.to_string(), mod_meta); self.mods.insert(mod_meta.name.to_string(), mod_meta);
self self
} }