diff --git a/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/MinecraftProvider.kt b/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/MinecraftProvider.kt index a844d34b..d129b6ca 100644 --- a/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/MinecraftProvider.kt +++ b/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/MinecraftProvider.kt @@ -819,7 +819,7 @@ open class MinecraftProvider(project: Project, sourceSet: SourceSet) : Minecraft workingDir = defaultWorkingDir classpath = sourceSet.runtimeClasspath mainClass.set(minecraftData.metadata.mainClass) - jvmArgs = minecraftData.metadata.getJVMArgs() + betacraftArgs + jvmArgs(minecraftData.metadata.getJVMArgs() + betacraftArgs) args = minecraftData.metadata.getGameArgs() (mcPatcher as AbstractMinecraftTransformer).applyClientRunTransform(this) diff --git a/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/forge/fg3/FG3MinecraftTransformer.kt b/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/forge/fg3/FG3MinecraftTransformer.kt index e3e5fa00..c4287adf 100644 --- a/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/forge/fg3/FG3MinecraftTransformer.kt +++ b/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/forge/fg3/FG3MinecraftTransformer.kt @@ -484,7 +484,7 @@ open class FG3MinecraftTransformer(project: Project, val parent: ForgeLikeMinecr addProperties(config) config.mainClass.set(mainClass) config.args = args.map { getArgValue(it) } - config.jvmArgs = jvmArgs.map { getArgValue(it) } + config.jvmArgs(jvmArgs.map { getArgValue(it) }) config.jvmArgs(props.map { "-D${it.key}=${getArgValue(it.value)}" }) config.environment["FORGE_SPEC"] = userdevCfg.get("spec").asNumber.toString() config.environment.putAll(env.map { it.key to getArgValue(it.value) }) @@ -529,7 +529,7 @@ open class FG3MinecraftTransformer(project: Project, val parent: ForgeLikeMinecr addProperties(config) config.mainClass.set(mainClass) config.args = args.map { getArgValue(it) } - config.jvmArgs = jvmArgs.map { getArgValue(it) } + config.jvmArgs(jvmArgs.map { getArgValue(it) }) config.jvmArgs(props.map { "-D${it.key}=${getArgValue(it.value)}" }) config.environment["FORGE_SPEC"] = userdevCfg.get("spec").asNumber.toString() config.environment.putAll(env.map { it.key to getArgValue(it.value) }) diff --git a/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/jarmod/JarModAgentMinecraftTransformer.kt b/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/jarmod/JarModAgentMinecraftTransformer.kt index 693812ae..68f1d6eb 100644 --- a/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/jarmod/JarModAgentMinecraftTransformer.kt +++ b/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/patch/jarmod/JarModAgentMinecraftTransformer.kt @@ -121,9 +121,10 @@ open class JarModAgentMinecraftTransformer( val classpath = (task as RemapJarTaskImpl).provider.sourceSet.runtimeClasspath.files.toMutableSet() val result = SubprocessExecutor.exec(project) { - it.jvmArgs = listOf( + it.jvmArgs(listOf( "-D${JMA_TRANSFORMERS}=${transforms.joinToString(File.pathSeparator)}", - "-D${JMA_DEBUG}=true") + "-D${JMA_DEBUG}=true" + )) it.args = listOf( input.absolutePathString(), classpath.joinToString(File.pathSeparator) { it.absolutePath },