From 80d409baeaa9d835425cd11d0c42670f625abcd7 Mon Sep 17 00:00:00 2001
From: Ashley Wright <ashley@msrandom.net>
Date: Sun, 16 Feb 2025 23:23:53 +0300
Subject: [PATCH] Fix MergeAccessWideners issue when no access wideners

---
 gradle.properties                                     |  2 +-
 .../minecraftcodev/fabric/task/MergeAccessWideners.kt | 11 ++++++++++-
 .../msrandom/minecraftcodev/remapper/RemapAction.kt   |  2 +-
 .../minecraftcodev/runs/MinecraftCodevRunsPlugin.kt   |  2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 6e495b1..d2feb08 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,5 +7,5 @@ org.gradle.configuration-cache=true
 # org.gradle.unsafe.isolated-projects=true
 
 group=net.msrandom
-version=0.5.11
+version=0.5.13
 kotlin.code.style=official
diff --git a/minecraft-codev-fabric/src/main/kotlin/net/msrandom/minecraftcodev/fabric/task/MergeAccessWideners.kt b/minecraft-codev-fabric/src/main/kotlin/net/msrandom/minecraftcodev/fabric/task/MergeAccessWideners.kt
index 1d482fa..eda9fbc 100644
--- a/minecraft-codev-fabric/src/main/kotlin/net/msrandom/minecraftcodev/fabric/task/MergeAccessWideners.kt
+++ b/minecraft-codev-fabric/src/main/kotlin/net/msrandom/minecraftcodev/fabric/task/MergeAccessWideners.kt
@@ -7,6 +7,8 @@ import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.*
+import kotlin.io.path.bufferedWriter
+import kotlin.io.path.deleteIfExists
 
 @CacheableTask
 abstract class MergeAccessWideners : DefaultTask() {
@@ -37,7 +39,14 @@ abstract class MergeAccessWideners : DefaultTask() {
 
     @TaskAction
     fun generate() {
-        output.get().asFile.bufferedWriter().use {
+        val output = output.get().asFile.toPath()
+
+        if (input.isEmpty) {
+            output.deleteIfExists()
+            return
+        }
+
+        output.bufferedWriter().use {
             val writer = AccessWidenerWriter()
             val reader = AccessWidenerReader(writer)
 
diff --git a/minecraft-codev-remapper/src/main/kotlin/net/msrandom/minecraftcodev/remapper/RemapAction.kt b/minecraft-codev-remapper/src/main/kotlin/net/msrandom/minecraftcodev/remapper/RemapAction.kt
index 61d841a..6e63b70 100644
--- a/minecraft-codev-remapper/src/main/kotlin/net/msrandom/minecraftcodev/remapper/RemapAction.kt
+++ b/minecraft-codev-remapper/src/main/kotlin/net/msrandom/minecraftcodev/remapper/RemapAction.kt
@@ -46,7 +46,7 @@ abstract class RemapAction : TransformAction<RemapAction.Parameters> {
             @Input get
 
         abstract val modFiles: ConfigurableFileCollection
-            @PathSensitive(PathSensitivity.ABSOLUTE)
+            @PathSensitive(PathSensitivity.NONE)
             @InputFiles
             get
 
diff --git a/minecraft-codev-runs/src/main/kotlin/net/msrandom/minecraftcodev/runs/MinecraftCodevRunsPlugin.kt b/minecraft-codev-runs/src/main/kotlin/net/msrandom/minecraftcodev/runs/MinecraftCodevRunsPlugin.kt
index e4d444d..4fae2e1 100644
--- a/minecraft-codev-runs/src/main/kotlin/net/msrandom/minecraftcodev/runs/MinecraftCodevRunsPlugin.kt
+++ b/minecraft-codev-runs/src/main/kotlin/net/msrandom/minecraftcodev/runs/MinecraftCodevRunsPlugin.kt
@@ -10,7 +10,7 @@ import org.gradle.api.plugins.ApplicationPlugin
 import org.gradle.api.plugins.PluginAware
 import org.gradle.api.tasks.JavaExec
 import org.gradle.api.tasks.SourceSet
-import org.gradle.configurationcache.extensions.serviceOf
+import org.gradle.internal.extensions.core.serviceOf
 import org.gradle.jvm.toolchain.JavaLanguageVersion
 import org.gradle.jvm.toolchain.JavaToolchainService
 import org.gradle.util.internal.GUtil