Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
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
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