update commons-compress

unimined · Nov 26, 2024 · 1e66f6f · 1e66f6f
1 parent cfede99
commit 1e66f6f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -166,7 +166,7 @@ dependencies {
     implementation("commons-io:commons-io:2.16.1")
 
     // pack200 provided by apache commons-compress
-    implementation("org.apache.commons:commons-compress:1.26.1")
+    implementation("org.apache.commons:commons-compress:1.27.1")
 
     // aw
     implementation("net.fabricmc:access-widener:2.1.0")

diff --git a/...lin/xyz/wagyourtail/unimined/internal/minecraft/patch/forge/fg2/FG2TaskApplyBinPatches.kt b/...lin/xyz/wagyourtail/unimined/internal/minecraft/patch/forge/fg2/FG2TaskApplyBinPatches.kt
@@ -101,16 +101,13 @@ class FG2TaskApplyBinPatches(private val project: Project) {
     fun setup(patches: File, side: String) {
         val matcher = Pattern.compile(String.format("binpatch/%s/.*.binpatch", side))
         val jis: JarInputStream
-        try {
-            val binpatchesDecompressed = LzmaInputStream(FileInputStream(patches), Decoder())
-            val inBytes = ByteArrayInputStream(binpatchesDecompressed.readBytes())
-            val jarBytes = ByteArrayOutputStream()
-            val jos = JarOutputStream(jarBytes)
+        val binpatchesDecompressed = LzmaInputStream(FileInputStream(patches), Decoder())
+        val inBytes = ByteArrayInputStream(binpatchesDecompressed.readBytes())
+        val jarBytes = ByteArrayOutputStream()
+        JarOutputStream(jarBytes).use { jos ->
             Pack200UnpackerAdapter().unpack(inBytes, jos)
-            jis = JarInputStream(ByteArrayInputStream(jarBytes.toByteArray()))
-        } catch (e: Exception) {
-            throw RuntimeException(e)
         }
+        jis = JarInputStream(ByteArrayInputStream(jarBytes.toByteArray()))
         log("Reading Patches:")
         do {
             try {
@@ -133,7 +130,7 @@ class FG2TaskApplyBinPatches(private val project: Project) {
     @Throws(IOException::class)
     private fun readPatch(patchEntry: JarEntry, jis: JarInputStream): ClassPatch {
         log("\t%s", patchEntry.name)
-        val input = ByteStreams.newDataInput(ByteStreams.toByteArray(jis))
+        val input = ByteStreams.newDataInput(jis.readBytes())
         val name = input.readUTF()
         val sourceClassName = input.readUTF()
         val targetClassName = input.readUTF()