Skip to content

Prefix3 #574

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

Closed
wants to merge 9 commits into from
Closed

Prefix3 #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ae21a2b
add modrinth folia support
kingcavespider1 Jun 7, 2025
5475ed9
add prefix system
kingcavespider1 Jun 8, 2025
b168afe
Merge branch 'itzg:master' into prefix
kingcavespider1 Jun 8, 2025
901b555
change loaderRef to loader
kingcavespider1 Jun 9, 2025
873662f
add lowercase
kingcavespider1 Jun 9, 2025
c3c778c
String.split looks seems better
kingcavespider1 Jun 9, 2025
bc24af6
Update src/main/java/me/itzg/helpers/modrinth/ModrinthCommand.java
kingcavespider1 Jun 10, 2025
fc95399
Update src/main/java/me/itzg/helpers/modrinth/ModrinthCommand.java
kingcavespider1 Jun 10, 2025
ee4e8fe
idk
kingcavespider1 Jun 11, 2025
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
8 changes: 3 additions & 5 deletions src/main/java/me/itzg/helpers/modrinth/ModrinthApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,8 @@ public Mono<Version> resolveProjectVersion(Project project, ProjectRef projectRe
@Nullable Loader loader, String gameVersion,
VersionType defaultVersionType) {

final Loader loaderToQuery = projectRef.isDatapack() ? Loader.datapack : loader;

if (projectRef.hasVersionName()) {
return getVersionsForProject(project.getId(), loaderToQuery, gameVersion)
return getVersionsForProject(project.getId(), loader, gameVersion)
.flatMap(versions ->
Mono.justOrEmpty(versions.stream()
.filter(version ->
Expand All @@ -144,7 +142,7 @@ public Mono<Version> resolveProjectVersion(Project project, ProjectRef projectRe
));
}
if (projectRef.hasVersionType()) {
return getVersionsForProject(project.getId(), loaderToQuery, gameVersion)
return getVersionsForProject(project.getId(), loader, gameVersion)
.mapNotNull(versions -> pickVersion(project, versions, projectRef.getVersionType()));
} else if (projectRef.hasVersionId()) {
return getVersionFromId(projectRef.getVersionId())
Expand All @@ -153,7 +151,7 @@ public Mono<Version> resolveProjectVersion(Project project, ProjectRef projectRe
projectRef.getVersionId(), project.getSlug()))
);
} else {
return getVersionsForProject(project.getId(), loaderToQuery, gameVersion)
return getVersionsForProject(project.getId(), loader, gameVersion)
.mapNotNull(versions -> pickVersion(project, versions, defaultVersionType));
}
}
Expand Down
Loading