Don't escape vm args if on 0.10.0.188 or above since Loom does it for us

This commit is contained in:
shedaniel
2022-08-28 14:27:39 +09:00
parent c10db9b558
commit 260ae64d19
5 changed files with 11 additions and 8 deletions

View File

@@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
id "org.jetbrains.kotlin.jvm" version "1.5.10"
id "org.jetbrains.kotlin.jvm" version "1.6.10"
id "java"
id "idea"
id "eclipse"

View File

@@ -57,5 +57,7 @@ class LoomInterface010(private val project: Project) : LoomInterface {
override fun addVmArg(vmArg: String) {
config.vmArgs.add(vmArg)
}
override fun escape(arg: String): String = arg
}
}

View File

@@ -78,5 +78,7 @@ class LoomInterface011(private val project: Project) : LoomInterface {
override fun addVmArg(vmArg: String) {
config.vmArgs.add(vmArg)
}
override fun escape(arg: String): String = arg
}
}

View File

@@ -182,6 +182,7 @@ open class ArchitectPluginExtension(val project: Project) {
}
loom.settingsPostEdit { config ->
fun String.escapeSpaces(): String = config.escape(this)
val s = config.mainClass
config.mainClass = "dev.architectury.transformer.TransformerRuntime"
mainClassTransformerFile.writeText(s)
@@ -206,13 +207,6 @@ open class ArchitectPluginExtension(val project: Project) {
}
}
private fun String.escapeSpaces(): String {
if (any(Char::isWhitespace)) {
return "\"$this\""
}
return this
}
@JvmOverloads
fun fabric(action: Action<Transform> = Action {}) {
loader(ModLoader.FABRIC, action)

View File

@@ -64,5 +64,10 @@ interface LoomInterface {
var mainClass: String
fun addVmArg(vmArg: String)
fun escape(arg: String): String {
if (arg.any(Char::isWhitespace)) return "\"$arg\""
return arg
}
}
}