Fix phantom state of opted-out files made non-optional

src/main/kotlin/link/infra/packwiz/installer/DownloadTask.kt

@@ -182,13 +182,13 @@ internal class DownloadTask private constructor(val metadata: IndexFile.File, de
 
 		// Ensure wrong-side or optional false files are removed
 		cachedFile?.let {
-			if (!it.optionValue || !correctSide()) {
+			if ((it.isOptional && !it.optionValue) || !correctSide()) {
-				if (it.cachedLocation == null) return
+				if (it.cachedLocation != null) {
-
+					try {
-				try {
+						Files.deleteIfExists(Paths.get(packFolder, it.cachedLocation))
-					Files.deleteIfExists(Paths.get(packFolder, it.cachedLocation))
+					} catch (e: IOException) {
-				} catch (e: IOException) {
+						Log.warn("Failed to delete file before downloading", e)
-					Log.warn("Failed to delete file before downloading", e)
+					}
 				}
 				it.cachedLocation = null
 			}

src/main/kotlin/link/infra/packwiz/installer/UpdateManager.kt

@@ -128,7 +128,9 @@ class UpdateManager internal constructor(private val opts: Options, val ui: IUse
 		if (manifest.packFileHash?.let { packFileSource.hashIsEqual(it) } == true && invalidatedUris.isEmpty()) {
 			// todo: --force?
 			ui.submitProgress(InstallProgress("Modpack is already up to date!", 1, 1))
-			ui.awaitOptionalButton(false)
+			if (manifest.cachedFiles.any { it.value.isOptional }) {
+				ui.awaitOptionalButton(false)
+			}
 			if (!ui.optionsButtonPressed) {
 				return
 			}
@@ -186,7 +188,9 @@ class UpdateManager internal constructor(private val opts: Options, val ui: IUse
 	private fun processIndex(indexUri: SpaceSafeURI, indexHash: Hash, hashFormat: String, manifest: ManifestFile, invalidatedUris: List<SpaceSafeURI>) {
 		if (manifest.indexFileHash == indexHash && invalidatedUris.isEmpty()) {
 			ui.submitProgress(InstallProgress("Modpack files are already up to date!", 1, 1))
-			ui.awaitOptionalButton(false)
+			if (manifest.cachedFiles.any { it.value.isOptional }) {
+				ui.awaitOptionalButton(false)
+			}
 			if (!ui.optionsButtonPressed) {
 				return
 			}