MrSphay/Modrinth-plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix daedalus NeoForge (#5713)

Browse Source 
* Support NeoForge version for year-based Minecraft versions

* Run on CI

* Fix

* Fix branch

* Undo branch switch
This commit is contained in:
François-Xavier Talbot
2026-03-30 13:53:29 -04:00
committed by GitHub
parent 4cd6c1a72d
commit 90deb7310e
2 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/daedalus_client/src/error.rs
View File

@@ -33,6 +33,8 @@ pub enum ErrorKind {
Tracing(#[from] tracing::subscriber::SetGlobalDefaultError), Tracing(#[from] tracing::subscriber::SetGlobalDefaultError),
#[error("Zip error: {0}")] #[error("Zip error: {0}")]
Zip(#[from] async_zip::error::ZipError), Zip(#[from] async_zip::error::ZipError),
#[error("Failed to parse an integer: {0}")]
ParseIntError(#[from] std::num::ParseIntError),
} }
#[derive(Debug)] #[derive(Debug)]

36
apps/daedalus_client/src/forge.rs
View File

@@ -141,9 +141,16 @@ pub async fn fetch_neo(
}).chain(neo_versions.versioning.versions.version.into_iter().map(|loader_version| { }).chain(neo_versions.versioning.versions.version.into_iter().map(|loader_version| {
let mut parts = loader_version.split('.'); let mut parts = loader_version.split('.');
// NeoForge Forge versions are in this format: 20.2.29-beta, 20.6.119 // NeoForge Forge versions are in either of these formats:
// Where the first number is the major MC version, the second is the minor MC version, and the third is the NeoForge version // - 20.2.29-beta, 20.6.119
let major = parts.next().ok_or_else( // - 26.1.0.10-beta, 26.1.0.16
//
// The first format is the "modern" format for Minecraft versions starting with 1, where the first number is the major MC version,
// the second is the minor MC version, and the third is the NeoForge version.
//
// The second format is the "new-modern" format for Minecraft versions in year-based format, where the first three numbers
// are the Minecraft version (year.release.hotfix), and the fourth, the NeoForge release version, with an optional "beta" suffix.
let major_or_year = parts.next().ok_or_else(
|| crate::ErrorKind::InvalidInput(format!("Unable to find major game version for NeoForge {loader_version}")) || crate::ErrorKind::InvalidInput(format!("Unable to find major game version for NeoForge {loader_version}"))
)?; )?;
@@ -151,11 +158,24 @@ pub async fn fetch_neo(
|| crate::ErrorKind::InvalidInput(format!("Unable to find minor game version for NeoForge {loader_version}")) || crate::ErrorKind::InvalidInput(format!("Unable to find minor game version for NeoForge {loader_version}"))
)?; )?;
let game_version = if minor == "0" { let major_or_year = major_or_year.parse::<u32>()?;
format!("1.{major}")
} else { // Year-based MC versions started in 2026
format!("1.{major}.{minor}") let game_version = match major_or_year {
}; 26.. => {
let hotfix = parts.next().ok_or_else(
|| crate::ErrorKind::InvalidInput(format!("Unable to find hotfix version for NeoForge {loader_version}"))
)?;
if hotfix == "0" {
format!("{major_or_year}.{minor}")
} else {
format!("{major_or_year}.{minor}.{hotfix}")
}
}
..26 if minor == "0" => format!("1.{major_or_year}"),
..26 => format!("1.{major_or_year}.{minor}"),
};
Ok(ForgeVersion { Ok(ForgeVersion {
format_version: 2, format_version: 2,