Skip to content

cf: add support for modpacks that use NeoForge #444

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

Merged
itzg merged 1 commit into from
Jul 1, 2024
Merged

cf: add support for modpacks that use NeoForge #444

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
21 changes: 19 additions & 2 deletions src/main/java/me/itzg/helpers/curseforge/CurseForgeInstaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import me.itzg.helpers.files.ResultsFileWriter;
import me.itzg.helpers.forge.ForgeInstaller;
import me.itzg.helpers.forge.ForgeInstallerResolver;
import me.itzg.helpers.forge.NeoForgeInstallerResolver;
import me.itzg.helpers.http.FailedRequestException;
import me.itzg.helpers.http.Fetch;
import me.itzg.helpers.http.SharedFetch;
Expand Down Expand Up @@ -931,9 +932,16 @@ private void prepareModLoader(String id, String minecraftVersion) {
prepareForge(sharedFetch, minecraftVersion, parts[1]);
break;

case "neoforge":
prepareNeoForge(sharedFetch, minecraftVersion, parts[1]);
break;

case "fabric":
prepareFabric(minecraftVersion, parts[1]);
break;

default:
throw new InvalidParameterException(String.format("ModLoader %s is not yet supported", parts[0]));
}
}
}
Expand All @@ -945,15 +953,24 @@ private void prepareFabric(String minecraftVersion, String loaderVersion) {
installer.installUsingVersions(minecraftVersion, loaderVersion, null);
}

private void prepareForge(SharedFetch sharedFetch, String minecraftVersion, String forgeVersion) {
private void prepareForge(SharedFetch sharedFetch, String minecraftVersion, String loaderVersion) {
new ForgeInstaller(
new ForgeInstallerResolver(sharedFetch,
minecraftVersion, forgeVersion
minecraftVersion, loaderVersion
)
)
.install(outputDir, resultsFile, forceReinstallModloader, "Forge");
}

private void prepareNeoForge(SharedFetch sharedFetch, String minecraftVersion, String loaderVersion) {
new ForgeInstaller(
new NeoForgeInstallerResolver(sharedFetch,
minecraftVersion, loaderVersion
)
)
.install(outputDir, resultsFile, forceReinstallModloader, "NeoForge");
}

private MinecraftModpackManifest extractModpackManifest(Path modpackZip) throws IOException {
try (ZipFile zipFile = ZipFile.builder().setPath(modpackZip).get()) {
final ZipArchiveEntry entry = zipFile.getEntry("manifest.json");
Expand Down