Skip to content

fix(labrinth): let fabric-family loaders share a version with other loaders' game versions #7930

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
rhysdh540 wants to merge 1 commit into
base: main
Choose a base branch
from
+32 −8
Open

fix(labrinth): let fabric-family loaders share a version with other loaders' game versions #7930

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
40 changes: 32 additions & 8 deletions apps/labrinth/src/validate/fabric.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,19 @@ pub(super) fn validate_game_versions(
})
};

let mut checks: Vec<Box<dyn Fn(&MinecraftVersionEntry) -> bool>> =
Vec::new();
let mut has_unconstrained_loader = false;

for loader in loaders {
let (valid, requirement) = match loader.0.as_str() {
let (supports, requirement): (
Box<dyn Fn(&MinecraftVersionEntry) -> bool>,
&str,
) = match loader.0.as_str() {
"fabric" => {
let minimum = release_date("18w43b")?;
(
game_versions.iter().all(|version| {
Box::new(move |version| {
minecraft_version_date(version) >= minimum
}),
"`18w43b` or later",
Expand All @@ -108,21 +115,22 @@ pub(super) fn validate_game_versions(
"legacy-fabric" => {
let supported = release_date("1.3")?..=release_date("1.13.2")?;
(
game_versions.iter().all(|version| {
Box::new(move |version| {
supported.contains(&minecraft_version_date(version))
}),
"between `1.3` and `1.13.2`, inclusive",
)
}
"babric" | "bta-babric" => (
game_versions
.iter()
.all(|version| version.name.0 == "b1.7.3"),
Box::new(|version| version.name.0 == "b1.7.3"),
"`b1.7.3` only",
),
_ => continue,
_ => {
has_unconstrained_loader = true;
continue;
}
};
if game_versions.is_empty() || !valid {
if !game_versions.iter().any(&supports) {
return Err(ValidationError::InvalidInput(
format!(
"the `{}` loader requires minecraft versions {requirement}",
Expand All @@ -131,6 +139,22 @@ pub(super) fn validate_game_versions(
.into(),
));
}
checks.push(supports);
}

if !has_unconstrained_loader
&& !checks.is_empty()
&& let Some(version) = game_versions
.iter()
.find(|version| !checks.iter().any(|supports| supports(version)))
{
return Err(ValidationError::InvalidInput(
format!(
"minecraft version `{}` is not supported by any of the selected loaders",
version.name.0,
)
.into(),
));
}
Ok(())
}