Skip to content

简化 DefaultLauncher#getEnvVars 与 McbbsModpackExportTask#execute #6197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CiiLu wants to merge 4 commits into
base: main
Choose a base branch
from
Open

简化 DefaultLauncher#getEnvVars 与 McbbsModpackExportTask#execute #6197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bb6e48d
qwq
CiiLu Jun 19, 2026
f31eef1
qwq
CiiLu Jun 19, 2026
3a966b0
Merge branch 'main' into pkce
CiiLu Jun 27, 2026
60659ca
qwq
CiiLu Jun 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions HMCLCore/src/main/java/org/jackhuang/hmcl/download/LibraryAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,12 @@ public static boolean isModded(VersionProvider provider, Version version) {
|| mainClass.startsWith("cpw.mods"));
}

public Set<LibraryType> getLibraries() {
return Arrays.stream(LibraryType.values())
.filter(this::has)
.collect(Collectors.toSet());
}

public Set<ModLoaderType> getModLoaders() {
return Arrays.stream(LibraryType.values())
.filter(LibraryType::isModLoader)
Expand Down
27 changes: 7 additions & 20 deletions HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.download.LibraryAnalyzer;
import org.jackhuang.hmcl.game.*;
Expand Down Expand Up @@ -681,30 +682,16 @@ else if (driver instanceof Renderer.Vulkan vulkanDriver) {
}
}

if (analyzer.has(LibraryAnalyzer.LibraryType.FORGE)) {
env.put("INST_FORGE", "1");
}
if (analyzer.has(LibraryAnalyzer.LibraryType.CLEANROOM)) {
env.put("INST_CLEANROOM", "1");
}
if (analyzer.has(LibraryAnalyzer.LibraryType.NEO_FORGE)) {
env.put("INST_NEOFORGE", "1");
}
if (analyzer.has(LibraryAnalyzer.LibraryType.LITELOADER)) {
env.put("INST_LITELOADER", "1");
}
if (analyzer.has(LibraryAnalyzer.LibraryType.FABRIC)) {
env.put("INST_FABRIC", "1");
for (ModLoaderType type : analyzer.getModLoaders()) {
if (type == ModLoaderType.NEO_FORGE) env.put("INST_NEOFORGE", "1");
else if (type == ModLoaderType.LEGACY_FABRIC) env.put("INST_LEGACYFABRIC", "1");
else if (type == ModLoaderType.LITE_LOADER) env.put("INST_LITELOADER", "1");
else env.put("INST_" + type.name().toUpperCase(Locale.ROOT), "1");
}

if (analyzer.has(LibraryAnalyzer.LibraryType.OPTIFINE)) {
env.put("INST_OPTIFINE", "1");
}
if (analyzer.has(LibraryAnalyzer.LibraryType.QUILT)) {
env.put("INST_QUILT", "1");
}
if (analyzer.has(LibraryAnalyzer.LibraryType.LEGACY_FABRIC)) {
env.put("INST_LEGACYFABRIC", "1");
}

env.putAll(options.getEnvironmentVariables());

Expand Down
20 changes: 4 additions & 16 deletions HMCLCore/src/main/java/org/jackhuang/hmcl/modpack/mcbbs/McbbsModpackExportTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,22 +95,10 @@ public void execute() throws Exception {
// Mcbbs manifest
List<McbbsModpackManifest.Addon> addons = new ArrayList<>();
addons.add(new McbbsModpackManifest.Addon(MINECRAFT.getPatchId(), gameVersion));
analyzer.getVersion(FORGE).ifPresent(forgeVersion ->
addons.add(new McbbsModpackManifest.Addon(FORGE.getPatchId(), forgeVersion)));
analyzer.getVersion(CLEANROOM).ifPresent(cleanroomVersion ->
addons.add(new McbbsModpackManifest.Addon(CLEANROOM.getPatchId(), cleanroomVersion)));
analyzer.getVersion(NEO_FORGE).ifPresent(neoForgeVersion ->
addons.add(new McbbsModpackManifest.Addon(NEO_FORGE.getPatchId(), neoForgeVersion)));
analyzer.getVersion(LITELOADER).ifPresent(liteLoaderVersion ->
addons.add(new McbbsModpackManifest.Addon(LITELOADER.getPatchId(), liteLoaderVersion)));
analyzer.getVersion(OPTIFINE).ifPresent(optifineVersion ->
addons.add(new McbbsModpackManifest.Addon(OPTIFINE.getPatchId(), optifineVersion)));
analyzer.getVersion(FABRIC).ifPresent(fabricVersion ->
addons.add(new McbbsModpackManifest.Addon(FABRIC.getPatchId(), fabricVersion)));
analyzer.getVersion(QUILT).ifPresent(quiltVersion ->
addons.add(new McbbsModpackManifest.Addon(QUILT.getPatchId(), quiltVersion)));
analyzer.getVersion(LEGACY_FABRIC).ifPresent(legacyfabricVersion ->
addons.add(new McbbsModpackManifest.Addon(LEGACY_FABRIC.getPatchId(), legacyfabricVersion)));
for (LibraryAnalyzer.LibraryType type : analyzer.getLibraries()) {
if (type == BOOTSTRAP_LAUNCHER || type == MINECRAFT) continue;
else addons.add(new McbbsModpackManifest.Addon(type.getPatchId(), analyzer.getVersion(type).orElseThrow()));
}

List<Library> libraries = new ArrayList<>();
// TODO libraries
Expand Down