chore(mod reader): use UnpackZipException for better error handling

MovTery · MovTery · commit 15a2d7959064 · 2025-08-09T18:13:43.000+08:00
diff --git a/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/game/version/mod/reader/FabricModMetadataReader.kt b/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/game/version/mod/reader/FabricModMetadataReader.kt
@@ -6,13 +6,13 @@ import com.movtery.zalithlauncher.game.version.mod.LocalMod
 import com.movtery.zalithlauncher.game.version.mod.ModMetadataReader
 import com.movtery.zalithlauncher.game.version.mod.meta.FabricModMetadata
 import com.movtery.zalithlauncher.utils.GSON
+import com.movtery.zalithlauncher.utils.file.UnpackZipException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.apache.commons.compress.archivers.zip.ZipFile
 import org.apache.commons.io.FileUtils
 import java.io.File
 import java.io.IOException
-import java.util.zip.ZipException
 import java.util.zip.ZipFile as JDKZipFile
 
 /**
@@ -30,13 +30,12 @@ object FabricModMetadataReader : ModMetadataReader {
                         return@withContext parseFabricModMetadata(zip, modFile, reader.readText())
                     }
                 } catch (e: Exception) {
-                    throw RuntimeException(e)
+                    throw UnpackZipException(e)
                 }
             }
-        } catch (_: ZipException) {
-            return@withContext readWithApacheZip(modFile)
-        } catch (_: IOException) {
-            return@withContext readWithApacheZip(modFile)
+        } catch (e: Exception) {
+            if (e !is UnpackZipException) return@withContext readWithApacheZip(modFile)
+            else throw e
         }
     }
 
diff --git a/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/game/version/mod/reader/ForgeNewModMetadataReader.kt b/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/game/version/mod/reader/ForgeNewModMetadataReader.kt
@@ -6,6 +6,7 @@ import com.movtery.zalithlauncher.game.version.mod.LocalMod
 import com.movtery.zalithlauncher.game.version.mod.ModMetadataReader
 import com.movtery.zalithlauncher.game.version.mod.meta.ForgeNewModMetadata
 import com.movtery.zalithlauncher.utils.GSON
+import com.movtery.zalithlauncher.utils.file.UnpackZipException
 import com.movtery.zalithlauncher.utils.logging.Logger.lWarning
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -15,7 +16,6 @@ import java.io.File
 import java.io.IOException
 import java.util.jar.Attributes
 import java.util.jar.Manifest
-import java.util.zip.ZipException
 import java.util.zip.ZipFile as JDKZipFile
 
 /**
@@ -50,12 +50,11 @@ object ForgeNewModMetadataReader : ModMetadataReader {
                     )
                 }.onSuccess { return@withContext it }
 
-                throw RuntimeException("File $modFile is not a Forge 1.13+ or NeoForge mod.")
+                throw UnpackZipException("File $modFile is not a Forge 1.13+ or NeoForge mod.")
             }
-        } catch (_: ZipException) {
-            return@withContext readWithApacheZip(modFile)
-        } catch (_: IOException) {
-            return@withContext readWithApacheZip(modFile)
+        } catch (e: Exception) {
+            if (e !is UnpackZipException) return@withContext readWithApacheZip(modFile)
+            else throw e
         }
     }
 
diff --git a/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/game/version/mod/reader/ForgeOldModMetadataReader.kt b/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/game/version/mod/reader/ForgeOldModMetadataReader.kt
@@ -6,13 +6,13 @@ import com.movtery.zalithlauncher.game.version.mod.LocalMod
 import com.movtery.zalithlauncher.game.version.mod.ModMetadataReader
 import com.movtery.zalithlauncher.game.version.mod.meta.ForgeOldModMetadata
 import com.movtery.zalithlauncher.utils.GSON
+import com.movtery.zalithlauncher.utils.file.UnpackZipException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.apache.commons.compress.archivers.zip.ZipFile
 import org.apache.commons.io.FileUtils
 import java.io.File
 import java.io.IOException
-import java.util.zip.ZipException
 import java.util.zip.ZipFile as JDKZipFile
 
 /**
@@ -53,13 +53,12 @@ object ForgeOldModMetadataReader : ModMetadataReader {
                         )
                     }
                 } catch (e: Exception) {
-                    throw RuntimeException(e)
+                    throw UnpackZipException(e)
                 }
             }
-        } catch (_: ZipException) {
-            return@withContext readWithApacheZip(modFile)
-        } catch (_: IOException) {
-            return@withContext readWithApacheZip(modFile)
+        } catch (e: Exception) {
+            if (e !is UnpackZipException) return@withContext readWithApacheZip(modFile)
+            else throw e
         }
     }
 
diff --git a/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/game/version/mod/reader/LiteModMetadataReader.kt b/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/game/version/mod/reader/LiteModMetadataReader.kt
@@ -5,6 +5,7 @@ import com.movtery.zalithlauncher.game.version.mod.LocalMod
 import com.movtery.zalithlauncher.game.version.mod.ModMetadataReader
 import com.movtery.zalithlauncher.game.version.mod.meta.LiteModMetadata
 import com.movtery.zalithlauncher.utils.GSON
+import com.movtery.zalithlauncher.utils.file.UnpackZipException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.apache.commons.compress.archivers.zip.ZipFile
@@ -13,7 +14,6 @@ import java.io.File
 import java.io.IOException
 import java.io.InputStreamReader
 import java.nio.charset.StandardCharsets
-import java.util.zip.ZipException
 import java.util.zip.ZipFile as JDKZipFile
 
 /**
@@ -45,13 +45,12 @@ object LiteModMetadataReader : ModMetadataReader {
                         )
                     }
                 } catch (e: Exception) {
-                    throw RuntimeException(e)
+                    throw UnpackZipException(e)
                 }
             }
-        } catch (_: ZipException) {
-            return@withContext readWithApacheZip(modFile)
-        } catch (_: IOException) {
-            return@withContext readWithApacheZip(modFile)
+        } catch (e: Exception) {
+            if (e !is UnpackZipException) return@withContext readWithApacheZip(modFile)
+            else throw e
         }
     }
 
diff --git a/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/game/version/mod/reader/PackMcMetadataReader.kt b/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/game/version/mod/reader/PackMcMetadataReader.kt
@@ -6,14 +6,14 @@ import com.movtery.zalithlauncher.game.version.mod.LocalMod.Companion.isDisabled
 import com.movtery.zalithlauncher.game.version.mod.ModMetadataReader
 import com.movtery.zalithlauncher.game.version.mod.meta.PackMcMeta
 import com.movtery.zalithlauncher.utils.GSON
+import com.movtery.zalithlauncher.utils.file.UnpackZipException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.apache.commons.compress.archivers.zip.ZipFile
 import org.apache.commons.io.FileUtils
 import java.io.File
 import java.io.IOException
 import java.io.InputStreamReader
-import java.util.zip.ZipException
 import java.util.zip.ZipFile as JDKZipFile
 
 /**
@@ -46,13 +46,12 @@ object PackMcMetadataReader : ModMetadataReader {
                         }
                     }
                 } catch (e: Exception) {
-                    throw RuntimeException(e)
+                    throw UnpackZipException(e)
                 }
             }
-        } catch (_: ZipException) {
-            return@withContext readWithApacheZip(modFile)
-        } catch (_: IOException) {
-            return@withContext readWithApacheZip(modFile)
+        } catch (e: Exception) {
+            if (e !is UnpackZipException) return@withContext readWithApacheZip(modFile)
+            else throw e
         }
     }
 
diff --git a/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/game/version/mod/reader/QuiltModMetadataReader.kt b/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/game/version/mod/reader/QuiltModMetadataReader.kt
@@ -7,13 +7,13 @@ import com.movtery.zalithlauncher.game.version.mod.LocalMod
 import com.movtery.zalithlauncher.game.version.mod.ModMetadataReader
 import com.movtery.zalithlauncher.game.version.mod.meta.QuiltModMetadata
 import com.movtery.zalithlauncher.utils.GSON
+import com.movtery.zalithlauncher.utils.file.UnpackZipException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.apache.commons.compress.archivers.zip.ZipFile
 import org.apache.commons.io.FileUtils
 import java.io.File
 import java.io.IOException
-import java.util.zip.ZipException
 import java.util.zip.ZipFile as JDKZipFile
 
 /**
@@ -54,13 +54,12 @@ object QuiltModMetadataReader : ModMetadataReader {
                         )
                     }
                 } catch (e: Exception) {
-                    throw RuntimeException(e)
+                    throw UnpackZipException(e)
                 }
             }
-        } catch (_: ZipException) {
-            return@withContext readWithApacheZip(modFile)
-        } catch (_: IOException) {
-            return@withContext readWithApacheZip(modFile)
+        } catch (e: Exception) {
+            if (e !is UnpackZipException) return@withContext readWithApacheZip(modFile)
+            else throw e
         }
     }
 
diff --git a/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/utils/file/UnpackZipException.java b/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/utils/file/UnpackZipException.java
@@ -11,4 +11,16 @@ public UnpackZipException() {
     public UnpackZipException(String message) {
         super(message);
     }
+
+    public UnpackZipException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    protected UnpackZipException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+
+    public UnpackZipException(Throwable cause) {
+        super(cause);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,13 @@ import com.movtery.zalithlauncher.game.version.mod.LocalMod`
`6`	`6`	`import com.movtery.zalithlauncher.game.version.mod.ModMetadataReader`
`7`	`7`	`import com.movtery.zalithlauncher.game.version.mod.meta.ForgeOldModMetadata`
`8`	`8`	`import com.movtery.zalithlauncher.utils.GSON`
	`9`	`+import com.movtery.zalithlauncher.utils.file.UnpackZipException`
`9`	`10`	`import kotlinx.coroutines.Dispatchers`
`10`	`11`	`import kotlinx.coroutines.withContext`
`11`	`12`	`import org.apache.commons.compress.archivers.zip.ZipFile`
`12`	`13`	`import org.apache.commons.io.FileUtils`
`13`	`14`	`import java.io.File`
`14`	`15`	`import java.io.IOException`
`15`		`-import java.util.zip.ZipException`
`16`	`16`	`import java.util.zip.ZipFile as JDKZipFile`
`17`	`17`
`18`	`18`	`/**`
`@@ -53,13 +53,12 @@ object ForgeOldModMetadataReader : ModMetadataReader {`
`53`	`53`	`)`
`54`	`54`	`}`
`55`	`55`	`} catch (e: Exception) {`
`56`		`- throw RuntimeException(e)`
	`56`	`+ throw UnpackZipException(e)`
`57`	`57`	`}`
`58`	`58`	`}`
`59`		`- } catch (_: ZipException) {`
`60`		`- return@withContext readWithApacheZip(modFile)`
`61`		`- } catch (_: IOException) {`
`62`		`- return@withContext readWithApacheZip(modFile)`
	`59`	`+ } catch (e: Exception) {`
	`60`	`+ if (e !is UnpackZipException) return@withContext readWithApacheZip(modFile)`
	`61`	`+ else throw e`
`63`	`62`	`}`
`64`	`63`	`}`
`65`	`64`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import com.movtery.zalithlauncher.game.version.mod.LocalMod`
`5`	`5`	`import com.movtery.zalithlauncher.game.version.mod.ModMetadataReader`
`6`	`6`	`import com.movtery.zalithlauncher.game.version.mod.meta.LiteModMetadata`
`7`	`7`	`import com.movtery.zalithlauncher.utils.GSON`
	`8`	`+import com.movtery.zalithlauncher.utils.file.UnpackZipException`
`8`	`9`	`import kotlinx.coroutines.Dispatchers`
`9`	`10`	`import kotlinx.coroutines.withContext`
`10`	`11`	`import org.apache.commons.compress.archivers.zip.ZipFile`
`@@ -13,7 +14,6 @@ import java.io.File`
`13`	`14`	`import java.io.IOException`
`14`	`15`	`import java.io.InputStreamReader`
`15`	`16`	`import java.nio.charset.StandardCharsets`
`16`		`-import java.util.zip.ZipException`
`17`	`17`	`import java.util.zip.ZipFile as JDKZipFile`
`18`	`18`
`19`	`19`	`/**`
`@@ -45,13 +45,12 @@ object LiteModMetadataReader : ModMetadataReader {`
`45`	`45`	`)`
`46`	`46`	`}`
`47`	`47`	`} catch (e: Exception) {`
`48`		`- throw RuntimeException(e)`
	`48`	`+ throw UnpackZipException(e)`
`49`	`49`	`}`
`50`	`50`	`}`
`51`		`- } catch (_: ZipException) {`
`52`		`- return@withContext readWithApacheZip(modFile)`
`53`		`- } catch (_: IOException) {`
`54`		`- return@withContext readWithApacheZip(modFile)`
	`51`	`+ } catch (e: Exception) {`
	`52`	`+ if (e !is UnpackZipException) return@withContext readWithApacheZip(modFile)`
	`53`	`+ else throw e`
`55`	`54`	`}`
`56`	`55`	`}`
`57`	`56`
Original file line number	Diff line number	Diff line change
`@@ -6,14 +6,14 @@ import com.movtery.zalithlauncher.game.version.mod.LocalMod.Companion.isDisabled`
`6`	`6`	`import com.movtery.zalithlauncher.game.version.mod.ModMetadataReader`
`7`	`7`	`import com.movtery.zalithlauncher.game.version.mod.meta.PackMcMeta`
`8`	`8`	`import com.movtery.zalithlauncher.utils.GSON`
	`9`	`+import com.movtery.zalithlauncher.utils.file.UnpackZipException`
`9`	`10`	`import kotlinx.coroutines.Dispatchers`
`10`	`11`	`import kotlinx.coroutines.withContext`
`11`	`12`	`import org.apache.commons.compress.archivers.zip.ZipFile`
`12`	`13`	`import org.apache.commons.io.FileUtils`
`13`	`14`	`import java.io.File`
`14`	`15`	`import java.io.IOException`
`15`	`16`	`import java.io.InputStreamReader`
`16`		`-import java.util.zip.ZipException`
`17`	`17`	`import java.util.zip.ZipFile as JDKZipFile`
`18`	`18`
`19`	`19`	`/**`
`@@ -46,13 +46,12 @@ object PackMcMetadataReader : ModMetadataReader {`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`	`} catch (e: Exception) {`
`49`		`- throw RuntimeException(e)`
	`49`	`+ throw UnpackZipException(e)`
`50`	`50`	`}`
`51`	`51`	`}`
`52`		`- } catch (_: ZipException) {`
`53`		`- return@withContext readWithApacheZip(modFile)`
`54`		`- } catch (_: IOException) {`
`55`		`- return@withContext readWithApacheZip(modFile)`
	`52`	`+ } catch (e: Exception) {`
	`53`	`+ if (e !is UnpackZipException) return@withContext readWithApacheZip(modFile)`
	`54`	`+ else throw e`
`56`	`55`	`}`
`57`	`56`	`}`
`58`	`57`
Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,13 @@ import com.movtery.zalithlauncher.game.version.mod.LocalMod`
`7`	`7`	`import com.movtery.zalithlauncher.game.version.mod.ModMetadataReader`
`8`	`8`	`import com.movtery.zalithlauncher.game.version.mod.meta.QuiltModMetadata`
`9`	`9`	`import com.movtery.zalithlauncher.utils.GSON`
	`10`	`+import com.movtery.zalithlauncher.utils.file.UnpackZipException`
`10`	`11`	`import kotlinx.coroutines.Dispatchers`
`11`	`12`	`import kotlinx.coroutines.withContext`
`12`	`13`	`import org.apache.commons.compress.archivers.zip.ZipFile`
`13`	`14`	`import org.apache.commons.io.FileUtils`
`14`	`15`	`import java.io.File`
`15`	`16`	`import java.io.IOException`
`16`		`-import java.util.zip.ZipException`
`17`	`17`	`import java.util.zip.ZipFile as JDKZipFile`
`18`	`18`
`19`	`19`	`/**`
`@@ -54,13 +54,12 @@ object QuiltModMetadataReader : ModMetadataReader {`
`54`	`54`	`)`
`55`	`55`	`}`
`56`	`56`	`} catch (e: Exception) {`
`57`		`- throw RuntimeException(e)`
	`57`	`+ throw UnpackZipException(e)`
`58`	`58`	`}`
`59`	`59`	`}`
`60`		`- } catch (_: ZipException) {`
`61`		`- return@withContext readWithApacheZip(modFile)`
`62`		`- } catch (_: IOException) {`
`63`		`- return@withContext readWithApacheZip(modFile)`
	`60`	`+ } catch (e: Exception) {`
	`61`	`+ if (e !is UnpackZipException) return@withContext readWithApacheZip(modFile)`
	`62`	`+ else throw e`
`64`	`63`	`}`
`65`	`64`	`}`
`66`	`65`