From ef9b0413107b4319741f1aaf77badf1580d17b76 Mon Sep 17 00:00:00 2001 From: huanghongxun Date: Sat, 10 Jul 2021 21:14:52 +0800 Subject: [PATCH] feat: Support placeholders in version.json. Closes #923 --- .../org/jackhuang/hmcl/launch/DefaultLauncher.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java index bef11c9e8..3c291a6aa 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java @@ -45,12 +45,7 @@ import java.io.OutputStreamWriter; import java.net.InetSocketAddress; import java.net.Proxy; import java.nio.file.Files; -import java.util.Arrays; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.util.*; import java.util.function.Supplier; import static org.jackhuang.hmcl.util.Lang.mapOf; @@ -177,6 +172,10 @@ public class DefaultLauncher extends Launcher { configuration.put("${game_assets}", gameAssets.getAbsolutePath()); configuration.put("${assets_root}", gameAssets.getAbsolutePath()); configuration.put("${libraries_directory}", repository.getLibrariesDirectory(version).getAbsolutePath()); + configuration.put("${library_directory}", repository.getLibrariesDirectory(version).getAbsolutePath()); + configuration.put("${classpath_separator}", OperatingSystem.PATH_SEPARATOR); + configuration.put("${primary_jar}", repository.getVersionJar(version).getAbsolutePath()); + configuration.put("${language}", Locale.getDefault().toString()); res.addAll(Arguments.parseArguments(version.getArguments().map(Arguments::getJvm).orElseGet(this::getDefaultJVMArguments), configuration)); if (authInfo.getArguments() != null && authInfo.getArguments().getJvm() != null && !authInfo.getArguments().getJvm().isEmpty())