skip intermediary copy when filtering jars (#220)

paperweight-lib/src/main/kotlin/io/papermc/paperweight/util/filter-jar.kt

@@ -31,22 +31,20 @@ fun filterJar(
     includes: List<String>,
     predicate: (Path) -> Boolean = { false }
 ) {
-    val target = outputJar.resolveSibling("${outputJar.name}.dir")
-    target.createDirectories()
+    ensureDeleted(outputJar)
 
-    inputJar.openZip().use { zip ->
-        val matchers = includes.map { zip.getPathMatcher("glob:$it") }
+    outputJar.writeZip().use { outputFs ->
+        inputJar.openZip().use { inputFs ->
+            val matchers = includes.map { inputFs.getPathMatcher("glob:$it") }
 
-        zip.walk().use { stream ->
-            stream.filter { p -> predicate(p) || matchers.any { matcher -> matcher.matches(p) } }
-                .forEach { p ->
-                    val targetFile = target.resolve(p.absolutePathString().substring(1))
-                    targetFile.parent.createDirectories()
-                    p.copyTo(targetFile)
-                }
+            inputFs.walk().use { stream ->
+                stream.filter { p -> predicate(p) || matchers.any { matcher -> matcher.matches(p) } }
+                    .forEach { p ->
+                        val targetFile = outputFs.getPath(p.toAbsolutePath().invariantSeparatorsPathString.substring(1))
+                        targetFile.parent?.createDirectories()
+                        p.copyTo(targetFile)
+                    }
+            }
         }
     }
-
-    zip(target, outputJar)
-    target.deleteRecursively()
 }

paperweight-userdev/src/main/kotlin/io/papermc/paperweight/userdev/internal/setup/step/RunPaperclip.kt

@@ -64,7 +64,7 @@ class RunPaperclip(
         val logFile = outputJar.siblingLogFile()
 
         val work = createTempDirectory()
-        logFile.deleteForcefully()
+        ensureDeleted(logFile)
 
         // Copy in mojang jar, so we don't download it twice
         val cache = work.resolve("cache")
@@ -85,7 +85,7 @@ class RunPaperclip(
             handleOldPaperclip(work, outputJar)
         }
 
-        work.deleteRecursively()
+        ensureDeleted(work)
     }
 
     private fun handleBundler(paperclip: Path, work: Path, outputJar: Path) {