cf: provide option to force reinstall modpack's modloader (#388)

itzg · Feb 5, 2024 · 76a30ea · 76a30ea
1 parent d522439
commit 76a30ea
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/src/main/java/me/itzg/helpers/curseforge/CurseForgeInstaller.java b/src/main/java/me/itzg/helpers/curseforge/CurseForgeInstaller.java
@@ -108,6 +108,9 @@ public class CurseForgeInstaller {
     @Getter @Setter
     private List<String> overridesExclusions;
 
+    @Getter @Setter
+    private boolean forceReinstallModloader;
+
     /**
      * @throws MissingModsException if any mods need to be manually downloaded
      */
@@ -879,7 +882,8 @@ private void prepareModLoader(String id, String minecraftVersion) {
 
     private void prepareFabric(String minecraftVersion, String loaderVersion) {
         final FabricLauncherInstaller installer = new FabricLauncherInstaller(outputDir)
-            .setResultsFile(resultsFile);
+            .setResultsFile(resultsFile)
+            .setForceReinstall(forceReinstallModloader);
         installer.installUsingVersions(minecraftVersion, loaderVersion, null);
     }
 
@@ -889,7 +893,7 @@ private void prepareForge(SharedFetch sharedFetch, String minecraftVersion, Stri
                 minecraftVersion, forgeVersion
             )
         )
-            .install(outputDir, resultsFile, false, "Forge");
+            .install(outputDir, resultsFile, forceReinstallModloader, "Forge");
     }
 
     private MinecraftModpackManifest extractModpackManifest(Path modpackZip) throws IOException {

diff --git a/src/main/java/me/itzg/helpers/curseforge/InstallCurseForgeCommand.java b/src/main/java/me/itzg/helpers/curseforge/InstallCurseForgeCommand.java
@@ -123,6 +123,9 @@ static class Listed {
     @Option(names = "--force-synchronize")
     boolean forceSynchronize;
 
+    @Option(names = "--force-reinstall-modloader")
+    boolean forceReinstallModloader;
+
     @Option(names = "--set-level-from",
         description = "When WORLD_FILE, a world file included the modpack will be unzipped into a folder under 'saves' and referenced as 'LEVEL' in the results file."
             + "\nWhen OVERRIDES and the overrides contains a world save directory (contains level.dat), then that directory will be referenced as 'LEVEL' in the results file."
@@ -190,6 +193,7 @@ public Integer call() throws Exception {
         final CurseForgeInstaller installer = new CurseForgeInstaller(outputDirectory, resultsFile)
             .setExcludeIncludes(excludeIncludes)
             .setForceSynchronize(forceSynchronize)
+            .setForceReinstallModloader(forceReinstallModloader)
             .setLevelFrom(levelFrom)
             .setOverridesSkipExisting(overridesSkipExisting)
             .setOverridesExclusions(overridesExclusions)

diff --git a/src/main/java/me/itzg/helpers/fabric/FabricLauncherInstaller.java b/src/main/java/me/itzg/helpers/fabric/FabricLauncherInstaller.java
@@ -36,10 +36,12 @@ public class FabricLauncherInstaller {
     @Setter
     private Path resultsFile;
 
-    @Getter
-    @Setter
+    @Getter @Setter
     private String fabricMetaBaseUrl = "https://meta.fabricmc.net";
 
+    @Getter @Setter
+    private boolean forceReinstall;
+
     public void installUsingVersions(
         @NonNull String minecraftVersion,
         @Nullable String loaderVersion,
@@ -86,6 +88,7 @@ private Mono<FabricManifest> downloadResolvedLauncher(FabricMetaClient fabricMet
 
         final boolean needsInstall =
             prevManifest == null
+                || forceReinstall
                 || prevManifest.getOrigin() == null
                 || !prevManifest.getOrigin().equals(expectedVersions)
                 || !Manifests.allFilesPresent(outputDir, prevManifest);