Fixes

Author: Rollczi

build.gradle.kts

@@ -34,81 +34,75 @@ tasks.register<ShadowJar>("shadowChatFormatter") {
             .files
     }
 
-    val merger = JarMerger(outputFile, shadowJarFiles)
-
     this.doLast {
-        merger.merge()
+        mergeJars(outputFile, shadowJarFiles)
     }
 }
 
-class JarMerger(
-    private val outputFile: File,
-    private val inputFiles: List<File>
-) : Serializable {
 
-    fun merge() {
-        val outputDir = this.outputFile.parentFile
-            ?: throw IllegalStateException("Cannot find output directory")
+fun mergeJars(outputFile: File, inputFiles: List<File>) {
+    val outputDir = outputFile.parentFile
+        ?: throw IllegalStateException("Cannot find output directory")
 
-        if (!outputDir.exists() && !outputDir.mkdirs()) {
-            throw IllegalStateException("Failed to create directory: ${outputDir.absolutePath}")
-        }
+    if (!outputDir.exists() && !outputDir.mkdirs()) {
+        throw IllegalStateException("Failed to create directory: ${outputDir.absolutePath}")
+    }
 
-        if (this.outputFile.exists() && !this.outputFile.delete()) {
-            throw IllegalStateException("Cannot delete existing file: ${this.outputFile.absolutePath}")
-        }
+    if (outputFile.exists() && !outputFile.delete()) {
+        throw IllegalStateException("Cannot delete existing file: ${outputFile.absolutePath}")
+    }
 
-        if (!this.outputFile.createNewFile()) {
-            throw IllegalStateException("Cannot create output file: ${this.outputFile.absolutePath}")
-        }
+    if (!outputFile.createNewFile()) {
+        throw IllegalStateException("Cannot create output file: ${outputFile.absolutePath}")
+    }
 
-        JarOutputStream(FileOutputStream(this.outputFile)).use { outputJar ->
-            val processedEntries = mutableSetOf<String>()
+    JarOutputStream(FileOutputStream(outputFile)).use { outputJar ->
+        val processedEntries = mutableSetOf<String>()
 
-            for (jarFile in this.inputFiles) {
-                this.processJarFile(jarFile, outputJar, processedEntries)
-            }
+        for (jarFile in inputFiles) {
+            processJarFile(jarFile, outputJar, processedEntries)
         }
     }
+}
 
-    private fun processJarFile(
-        jarFile: File,
-        outputJar: JarOutputStream,
-        processedEntries: MutableSet<String>
-    ) {
-        JarFile(jarFile).use { sourceJar ->
-            for (entry in sourceJar.entries()) {
-                if (entry.isDirectory || processedEntries.contains(entry.name)) {
-                    continue
-                }
 
-                try {
-                    this.copyJarEntry(sourceJar, entry, outputJar)
-                    processedEntries.add(entry.name)
-                } catch (exception: IOException) {
-                    if (exception.message?.contains("duplicate entry:") != true) {
-                        throw exception
-                    }
+fun processJarFile(
+    jarFile: File,
+    outputJar: JarOutputStream,
+    processedEntries: MutableSet<String>
+) {
+    JarFile(jarFile).use { sourceJar ->
+        for (entry in sourceJar.entries()) {
+            if (entry.isDirectory || processedEntries.contains(entry.name)) {
+                continue
+            }
+
+            try {
+                copyJarEntry(sourceJar, entry, outputJar)
+                processedEntries.add(entry.name)
+            } catch (exception: IOException) {
+                if (exception.message?.contains("duplicate entry:") != true) {
+                    throw exception
                 }
             }
         }
     }
+}
 
-    private fun copyJarEntry(
-        sourceJar: JarFile,
-        entry: JarEntry,
-        outputJar: JarOutputStream
-    ) {
-        val entryBytes = sourceJar.getInputStream(entry).use { it.readBytes() }
-        val newEntry = JarEntry(entry.name).apply {
-            this.time = System.currentTimeMillis()
-            this.size = entryBytes.size.toLong()
-        }
-
-        outputJar.putNextEntry(newEntry)
-        outputJar.write(entryBytes)
-        outputJar.closeEntry()
+fun copyJarEntry(
+    sourceJar: JarFile,
+    entry: JarEntry,
+    outputJar: JarOutputStream
+) {
+    val entryBytes = sourceJar.getInputStream(entry).use { it.readBytes() }
+    val newEntry = JarEntry(entry.name).apply {
+        this.time = System.currentTimeMillis()
+        this.size = entryBytes.size.toLong()
     }
+
+    outputJar.putNextEntry(newEntry)
+    outputJar.write(entryBytes)
+    outputJar.closeEntry()
 }
 
 runPaper {