From 2a6517ed60abfaf09f320628589d0768eb37b878 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Fri, 19 Feb 2021 10:58:42 +0800
Subject: [PATCH] Escape paths in properties to make it work with spaced paths

---
 .../plugin/ArchitectPluginExtension.kt        | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/main/kotlin/me/shedaniel/architect/plugin/ArchitectPluginExtension.kt b/src/main/kotlin/me/shedaniel/architect/plugin/ArchitectPluginExtension.kt
index 5ac0b23..ef456b2 100644
--- a/src/main/kotlin/me/shedaniel/architect/plugin/ArchitectPluginExtension.kt
+++ b/src/main/kotlin/me/shedaniel/architect/plugin/ArchitectPluginExtension.kt
@@ -114,15 +114,15 @@ open class ArchitectPluginExtension(val project: Project) {
                         val s = config.mainClass
                         config.mainClass = "me.shedaniel.architectury.transformer.TransformerRuntime"
                         mainClassTransformerFile.writeText(s)
-                        config.vmArgs += " -Darchitectury.main.class=$mainClassTransformerFile"
-                        config.vmArgs += " -Darchitectury.runtime.transformer=$runtimeTransformerFile"
-                        config.vmArgs += " -Darchitectury.properties=$propertiesTransformerFile"
+                        config.vmArgs += " -Darchitectury.main.class=${mainClassTransformerFile.absolutePath.encodeEscaped()}"
+                        config.vmArgs += " -Darchitectury.runtime.transformer=${runtimeTransformerFile.absolutePath.encodeEscaped()}"
+                        config.vmArgs += " -Darchitectury.properties=${propertiesTransformerFile.absolutePath.encodeEscaped()}"
                         config.vmArgs += " -Djdk.attach.allowAttachSelf=true"
                         if (architecturyJavaAgents.toList().size == 1) {
                             if (!agentFile.exists() || agentFile.delete()) {
                                 architecturyJavaAgents.first().copyTo(agentFile, overwrite = true)
                             }
-                            config.vmArgs += " -javaagent:${agentFile.absolutePath}"
+                            config.vmArgs += " -javaagent:${agentFile.absolutePath.encodeEscaped()}"
                         } else {
                             throw IllegalStateException(
                                 "Illegal Count of Architectury Java Agents! " + architecturyJavaAgents.toList()
@@ -137,6 +137,19 @@ open class ArchitectPluginExtension(val project: Project) {
         }
     }
 
+    private fun String.encodeEscaped(): String {
+        val ret = StringBuilder()
+        for (i in indices) {
+            val c = this[i]
+            if (c == '@' && i > 0 && this[i - 1] == '@' || c == ' ') {
+                ret.append(String.format("@@%04x", c.toInt()))
+            } else {
+                ret.append(c)
+            }
+        }
+        return ret.toString()
+    }
+
     fun fabric() {
         transform("fabric", Action {
             it.setupFabricTransforms()