Skip to content

Commit 692f319

Browse files
authored
modrinth: reverting installing informal modrinth packs (#292)
1 parent 6a69200 commit 692f319

14 files changed

+312
-1128
lines changed

Diff for: src/main/java/me/itzg/helpers/modrinth/InstallModrinthModpackCommand.java

+294-43
Large diffs are not rendered by default.

Diff for: src/main/java/me/itzg/helpers/modrinth/ModrinthApiClient.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import me.itzg.helpers.modrinth.model.Version;
2626
import me.itzg.helpers.modrinth.model.VersionFile;
2727
import me.itzg.helpers.modrinth.model.VersionType;
28-
import org.jetbrains.annotations.Nullable;
2928
import reactor.core.publisher.Mono;
3029
import reactor.core.scheduler.Schedulers;
3130

@@ -39,7 +38,7 @@ public ModrinthApiClient(String baseUrl, String command, Options options) {
3938
sharedFetch = Fetch.sharedFetch(command, options);
4039
}
4140

42-
public static VersionFile pickVersionFile(Version version) {
41+
static VersionFile pickVersionFile(Version version) {
4342
if (version.getFiles().size() == 1) {
4443
return version.getFiles().get(0);
4544
}
@@ -115,7 +114,7 @@ public Mono<List<ResolvedProject>> bulkGetProjects(Stream<ProjectRef> projectRef
115114
* @param gameVersion can be null for any
116115
*/
117116
public Mono<Version> resolveProjectVersion(Project project, ProjectRef projectRef,
118-
@Nullable Loader loader, String gameVersion,
117+
Loader loader, String gameVersion,
119118
VersionType defaultVersionType) {
120119
if (projectRef.hasVersionName()) {
121120
return getVersionsForProject(project.getId(), loader, gameVersion)
@@ -162,7 +161,7 @@ public Mono<Path> downloadMrPack(VersionFile versionFile) {
162161
* @param gameVersion can be null for any
163162
*/
164163
public Mono<List<Version>> getVersionsForProject(String projectIdOrSlug,
165-
@Nullable Loader loader, String gameVersion
164+
Loader loader, String gameVersion
166165
) {
167166
return sharedFetch.fetch(
168167
uriBuilder.resolve("/v2/project/{id|slug}/version",

Diff for: src/main/java/me/itzg/helpers/modrinth/ModrinthApiPackFetcher.java

-77
This file was deleted.

Diff for: src/main/java/me/itzg/helpers/modrinth/ModrinthHttpPackFetcher.java

-28
This file was deleted.

Diff for: src/main/java/me/itzg/helpers/modrinth/ModrinthPackFetcher.java

-9
This file was deleted.

Diff for: src/main/java/me/itzg/helpers/modrinth/ModrinthPackInstaller.java

-222
This file was deleted.

0 commit comments

Comments
 (0)