Skip to content

Fix version manifest for NeoForge #5056

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kphrx wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix version manifest for NeoForge #5056

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 31 additions & 8 deletions apps/daedalus_client/src/forge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,22 +143,45 @@ pub async fn fetch_neo(
game_version: "1.20.1".to_string(), // All NeoForge Forge versions are for 1.20.1
})
}).chain(neo_versions.versioning.versions.version.into_iter().map(|loader_version| {
let mut parts = loader_version.split('.');
let mut parts = loader_version.split('+');
let version = parts.next().ok_or_else(
|| crate::ErrorKind::InvalidInput(format!("Unable to find game version for NeoForge {loader_version}"))
)?;

let mut version_parts = version.split('.');

// NeoForge Forge versions are in this format: 20.2.29-beta, 20.6.119
// NeoForge Forge versions are in this format: 20.2.29-beta, 20.6.119, 0.25w14craftmine.3-beta, 26.1.0.0-alpha.1+snapshot-1
// Where the first number is the major MC version, the second is the minor MC version, and the third is the NeoForge version
let major = parts.next().ok_or_else(
let major = version_parts.next().ok_or_else(
|| crate::ErrorKind::InvalidInput(format!("Unable to find major game version for NeoForge {loader_version}"))
)?;

let minor = parts.next().ok_or_else(
let minor = version_parts.next().ok_or_else(
|| crate::ErrorKind::InvalidInput(format!("Unable to find minor game version for NeoForge {loader_version}"))
)?;

let game_version = if minor == "0" {
format!("1.{major}")
} else {
format!("1.{major}.{minor}")
let game_version = match major {
"0" => minor.to_string(),
"20"|"21" => if minor == "0" {
format!("1.{major}")
} else {
format!("1.{major}.{minor}")
},
_ => {
let patch = version_parts.next().ok_or_else(
|| crate::ErrorKind::InvalidInput(format!("Unable to find patch game version for NeoForge {loader_version}"))
)?;
let v = if patch == "0" {
format!("{major}.{minor}")
} else {
format!("{major}.{minor}.{patch}")
};
if let Some(suffix) = parts.next() {
format!("{v}-{suffix}")
} else {
v
}
},
};

Ok(ForgeVersion {
Expand Down
Loading