Fix DownloadService and specify patch files are always LF

Author: DenWav

.editorconfig

@@ -0,0 +1,2 @@
+[*.patch]
+end_of_line = lf

.gitattributes

@@ -5,3 +5,5 @@ gradlew text eol=lf
 *.bat text eol=crlf
 
 *.jar binary
+
+*.patch text eol=lf

build-logic/src/main/kotlin/MacheExtension.kt

@@ -37,6 +37,8 @@ open class MacheExtension(objects: ObjectFactory) {
                 "-dcc=true",
                 // Skip Extra Files: Skip copying non-class files from the input folder or file to the output
                 "-sef=true",
+                // New Line Seperator: Character that seperates lines in the decompiled output.
+                "-nls=1",
             ),
         )
     }

build-logic/src/main/kotlin/io/papermc/mache/DownloadService.kt

@@ -11,6 +11,9 @@ import java.net.http.HttpResponse.BodyHandlers
 import java.nio.channels.Channels
 import java.nio.channels.FileChannel
 import java.nio.file.Path
+import java.nio.file.StandardOpenOption.CREATE
+import java.nio.file.StandardOpenOption.TRUNCATE_EXISTING
+import java.nio.file.StandardOpenOption.WRITE
 import java.nio.file.attribute.FileTime
 import java.time.Duration
 import java.time.Instant
@@ -24,7 +27,6 @@ import kotlin.io.path.deleteIfExists
 import kotlin.io.path.exists
 import kotlin.io.path.getLastModifiedTime
 import kotlin.io.path.name
-import kotlin.io.path.outputStream
 import kotlin.io.path.readText
 import kotlin.io.path.setLastModifiedTime
 import kotlin.io.path.writeText
@@ -128,7 +130,7 @@ abstract class DownloadService : BuildService<BuildServiceParameters.None> {
 
         downloadCallback()
 
-        FileChannel.open(target).use { output ->
+        FileChannel.open(target, CREATE, TRUNCATE_EXISTING, WRITE).use { output ->
             Channels.newChannel(response.body()).use { input ->
                 output.transferFrom(input, 0, Long.MAX_VALUE)
             }

build-logic/src/main/kotlin/io/papermc/mache/tasks/ApplyPatches.kt

@@ -66,6 +66,7 @@ abstract class ApplyPatches : DefaultTask() {
                 .patchesPath(patchDir.convertToPath(), null)
                 .basePath(inputFile.convertToPath(), ArchiveFormat.ZIP)
                 .outputPath(outputJar.convertToPath(), ArchiveFormat.ZIP)
+                .lineEnding("\n")
                 .mode(PatchMode.EXACT)
                 .level(Level.FINE)
                 .verbose(true)

build-logic/src/main/kotlin/io/papermc/mache/tasks/RebuildPatches.kt

@@ -64,6 +64,7 @@ abstract class RebuildPatches : DefaultTask() {
                     .aPath(decompJar.convertToPath(), ArchiveFormat.ZIP)
                     .bPath(copied.convertToPath(), ArchiveFormat.ZIP)
                     .outputPath(patchDir.convertToPath(), null)
+                    .lineEnding("\n")
                     .logTo(ps)
                     .level(Level.FINE)
                     .verbose(true)

build-logic/src/main/kotlin/io/papermc/mache/tasks/SetupSources.kt

@@ -134,22 +134,21 @@ abstract class SetupSources : DefaultTask() {
     }
 
     private fun endingNewlines(path: Path) {
-        val seps = System.lineSeparator()
-        val sepLength = seps.length
+        val sep: Byte = '\n'.code.toByte()
+        val bytes = ByteBuffer.allocate(1)
 
-        val expectedBytes = ByteBuffer.wrap(ByteArray(sepLength) { i -> seps[i].code.toByte() })
-        val bytes = ByteBuffer.allocate(sepLength)
+        val sepBuffer = ByteBuffer.wrap(byteArrayOf(sep))
 
         for (file in path.walk().filter { it.name.endsWith(".java") }) {
             // try to check and fix each file without reading / writing the whole file
             FileChannel.open(file, READ, WRITE).use { f ->
-                f.position(f.size() - sepLength)
+                f.position(f.size() - 1)
                 f.read(bytes)
                 bytes.position(0)
-                if (bytes != expectedBytes) {
+                if (bytes[0] != sep) {
                     f.position(f.size())
-                    f.write(expectedBytes)
-                    expectedBytes.position(0)
+                    f.write(sepBuffer)
+                    sepBuffer.position(0)
                 }
             }
         }