From 00cd20a6e99923b74ce5262b2b28baae912269cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=9E=E5=BA=90?= <109708109+CiiLu@users.noreply.github.com> Date: Thu, 3 Sep 2026 21:56:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=20`DefaultLauncher#getEnvVar?= =?UTF-8?q?s`=20(#6197)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Glavo --- .../hmcl/addon/mod/ModLoaderType.java | 30 ++++++++++++++----- .../hmcl/launch/DefaultLauncher.java | 26 ++++------------ 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java index 61ba46cea8..24ae055b66 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java @@ -17,13 +17,27 @@ */ package org.jackhuang.hmcl.addon.mod; +import org.jetbrains.annotations.NotNullByDefault; +import org.jetbrains.annotations.Nullable; + +@NotNullByDefault public enum ModLoaderType { - UNKNOWN, - FORGE, - CLEANROOM, - NEO_FORGE, - FABRIC, - QUILT, - LITE_LOADER, - LEGACY_FABRIC + UNKNOWN(null), + FORGE("INST_FORGE"), + CLEANROOM("INST_CLEANROOM"), + NEO_FORGE("INST_NEOFORGE"), + FABRIC("INST_FABRIC"), + QUILT("INST_QUILT"), + LITE_LOADER("INST_LITELOADER"), + LEGACY_FABRIC("INST_LEGACYFABRIC"); + + private final @Nullable String envVarName; + + ModLoaderType(@Nullable String envVarName) { + this.envVarName = envVarName; + } + + public @Nullable String getEnvVarName() { + return envVarName; + } } 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 82f16243a2..b483dbe138 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java @@ -18,6 +18,7 @@ package org.jackhuang.hmcl.launch; import org.glavo.uuid.UUIDs; +import org.jackhuang.hmcl.addon.mod.ModLoaderType; import org.jackhuang.hmcl.auth.AuthInfo; import org.jackhuang.hmcl.game.*; import org.jackhuang.hmcl.util.Lang; @@ -799,30 +800,15 @@ public class DefaultLauncher extends Launcher { } } - if (instance.hasComponent(GameComponentType.FORGE)) { - env.put("INST_FORGE", "1"); - } - if (instance.hasComponent(GameComponentType.CLEANROOM)) { - env.put("INST_CLEANROOM", "1"); - } - if (instance.hasComponent(GameComponentType.NEO_FORGE)) { - env.put("INST_NEOFORGE", "1"); - } - if (instance.hasComponent(GameComponentType.LITELOADER)) { - env.put("INST_LITELOADER", "1"); - } - if (instance.hasComponent(GameComponentType.FABRIC)) { - env.put("INST_FABRIC", "1"); + for (ModLoaderType modLoader : instance.getModLoaders()) { + if (modLoader.getEnvVarName() != null) { + env.put(modLoader.getEnvVarName(), "1"); + } } + if (instance.hasComponent(GameComponentType.OPTIFINE)) { env.put("INST_OPTIFINE", "1"); } - if (instance.hasComponent(GameComponentType.QUILT)) { - env.put("INST_QUILT", "1"); - } - if (instance.hasComponent(GameComponentType.LEGACY_FABRIC)) { - env.put("INST_LEGACYFABRIC", "1"); - } env.putAll(options.getEnvironmentVariables());