Accept optional mods on the server rather than throwing an exception

build.gradle

@@ -50,21 +50,23 @@ task copyJar(type: Copy) {
 
 build.dependsOn copyJar
 
-githubRelease {
-    // IntelliJ u ok?
-    //noinspection GroovyAssignabilityCheck
-    owner "comp500"
-    //noinspection GroovyAssignabilityCheck
-    repo "packwiz-installer"
-    //noinspection GroovyAssignabilityCheck
-    tagName "${project.version}"
-    //noinspection GroovyAssignabilityCheck
-    releaseName "Release ${project.version}"
-    //noinspection GroovyAssignabilityCheck
-    draft true
-    //noinspection GroovyAssignabilityCheck
-    token getProperty("github.token")
-    releaseAssets = [jar.destinationDirectory.file("packwiz-installer.jar").get()]
-}
+if (project.hasProperty("github.token")) {
+    githubRelease {
+        // IntelliJ u ok?
+        //noinspection GroovyAssignabilityCheck
+        owner "comp500"
+        //noinspection GroovyAssignabilityCheck
+        repo "packwiz-installer"
+        //noinspection GroovyAssignabilityCheck
+        tagName "${project.version}"
+        //noinspection GroovyAssignabilityCheck
+        releaseName "Release ${project.version}"
+        //noinspection GroovyAssignabilityCheck
+        draft true
+        //noinspection GroovyAssignabilityCheck
+        token findProperty("github.token") ?: ""
+        releaseAssets = [jar.destinationDirectory.file("packwiz-installer.jar").get()]
+    }
 
-tasks.githubRelease.dependsOn(build)
+    tasks.githubRelease.dependsOn(build)
+}

src/main/java/link/infra/packwiz/installer/DownloadTask.java

@@ -97,6 +97,7 @@ class DownloadTask implements IOptionDetails, IExceptionDetails {
 					}
 				}
 				cachedFile.isOptional = isOptional();
+				cachedFile.onlyOtherSide = !correctSide();
 			}
 		}
 	}

src/main/java/link/infra/packwiz/installer/UpdateManager.java

@@ -35,6 +35,7 @@ public class UpdateManager {
 	private boolean cancelled;
 	private boolean cancelledStartGame = false;
 	private InputStateHandler stateHandler;
+	private boolean errorsOccurred = false;
 
 	public static class Options {
 		SpaceSafeURI downloadURI = null;
@@ -152,6 +153,10 @@ public class UpdateManager {
 		List<SpaceSafeURI> invalidatedUris = new ArrayList<>();
 		if (manifest.cachedFiles != null) {
 			for (Map.Entry<SpaceSafeURI, ManifestFile.File> entry : manifest.cachedFiles.entrySet()) {
+				// ignore onlyOtherSide files
+				if (entry.getValue().onlyOtherSide) {
+					continue;
+				}
 				boolean invalid = false;
 				// if isn't optional, or is optional but optionValue == true
 				if (!entry.getValue().isOptional || entry.getValue().optionValue) {
@@ -199,7 +204,14 @@ public class UpdateManager {
 
 		// TODO: update MMC params, java args etc
 
-		manifest.packFileHash = packFileSource.getHash();
+		// If there were errors, don't write the manifest/index hashes, to ensure they are rechecked later
+		if (errorsOccurred) {
+			manifest.indexFileHash = null;
+			manifest.packFileHash = null;
+		} else {
+			manifest.packFileHash = packFileSource.getHash();
+		}
+
 		manifest.cachedSide = opts.side;
 		try (Writer writer = new FileWriter(Paths.get(opts.packFolder, opts.manifestFile).toString())) {
 			gson.toJson(manifest, writer);
@@ -333,6 +345,7 @@ public class UpdateManager {
 
 		List<IExceptionDetails> failedTasks = tasks.stream().filter(t -> t.getException() != null).collect(Collectors.toList());
 		if (!failedTasks.isEmpty()) {
+			errorsOccurred = true;
 			IExceptionDetails.ExceptionListResult exceptionListResult;
 			try {
 				exceptionListResult = ui.showExceptions(failedTasks, tasks.size(), true).get();
@@ -429,8 +442,12 @@ public class UpdateManager {
 			}
 		}
 
+		// Shut down the thread pool when the update is done
+		threadPool.shutdown();
+
 		List<IExceptionDetails> failedTasks2ElectricBoogaloo = nonFailedFirstTasks.stream().filter(t -> t.getException() != null).collect(Collectors.toList());
-		if (failedTasks2ElectricBoogaloo.size() > 0) {
+		if (!failedTasks2ElectricBoogaloo.isEmpty()) {
+			errorsOccurred = true;
 			IExceptionDetails.ExceptionListResult exceptionListResult;
 			try {
 				exceptionListResult = ui.showExceptions(failedTasks2ElectricBoogaloo, tasks.size(), false).get();

src/main/java/link/infra/packwiz/installer/metadata/EfficientBooleanAdapter.java

@@ -0,0 +1,29 @@
+package link.infra.packwiz.installer.metadata;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.JsonWriter;
+
+import java.io.IOException;
+
+public class EfficientBooleanAdapter extends TypeAdapter<Boolean> {
+
+	@Override
+	public void write(JsonWriter out, Boolean value) throws IOException {
+		if (value == null || !value) {
+			out.nullValue();
+			return;
+		}
+		out.value(true);
+	}
+
+	@Override
+	public Boolean read(JsonReader in) throws IOException {
+		if (in.peek() == JsonToken.NULL) {
+			in.nextNull();
+			return false;
+		}
+		return in.nextBoolean();
+	}
+}

src/main/java/link/infra/packwiz/installer/metadata/ManifestFile.java

@@ -1,5 +1,6 @@
 package link.infra.packwiz.installer.metadata;
 
+import com.google.gson.annotations.JsonAdapter;
 import link.infra.packwiz.installer.UpdateManager;
 import link.infra.packwiz.installer.metadata.hash.Hash;
 
@@ -19,9 +20,13 @@ public class ManifestFile {
 		public Hash linkedFileHash = null;
 		public String cachedLocation = null;
 
+		@JsonAdapter(EfficientBooleanAdapter.class)
 		public boolean isOptional = false;
 		public boolean optionValue = true;
 
+		@JsonAdapter(EfficientBooleanAdapter.class)
+		public boolean onlyOtherSide = false;
+
 		// When an error occurs, the state needs to be reverted. To do this, I have a crude revert system.
 		public void backup() {
 			revert = new File();
@@ -30,6 +35,7 @@ public class ManifestFile {
 			revert.cachedLocation = cachedLocation;
 			revert.isOptional = isOptional;
 			revert.optionValue = optionValue;
+			revert.onlyOtherSide = onlyOtherSide;
 		}
 
 		public File getRevert() {

src/main/java/link/infra/packwiz/installer/ui/CLIHandler.java

@@ -35,8 +35,14 @@ public class CLIHandler implements IUserInterface {
 	}
 
 	@Override
-	public Future<Boolean> showOptions(List<IOptionDetails> option) {
-		throw new RuntimeException("Optional mods not implemented for CLI! Make sure your optional mods are only on the client side!");
+	public Future<Boolean> showOptions(List<IOptionDetails> options) {
+		for (IOptionDetails opt : options) {
+			opt.setOptionValue(true);
+			System.out.println("Warning: accepting option " + opt.getName() + " as option choosing is not implemented in the CLI");
+		}
+		CompletableFuture<Boolean> future = new CompletableFuture<>();
+		future.complete(false); // Can't be cancelled!
+		return future;
 	}
 
 	@Override