AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-08-03 11:26:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge 6443508effee19124a6d19ac607b4a74ddebaf22 into 9969dc60c5278340b6b9a4d7facdde620e99d1f5

Browse Source
This commit is contained in:
Zkitefly 2025-08-02 14:10:14 +00:00 committed by GitHub
commit 7b806d3a0a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java
View File

@ -295,7 +295,7 @@ class ModListPageSkin extends SkinBase<ModListPage> {
message.append(", ").append(i18n("archive.author")).append(": ").append(localModFile.getAuthors());
this.message = message.toString();
this.mod = ModTranslations.MOD.getModById(localModFile.getId());
this.mod = ModTranslations.MOD.getMod(localModFile.getName(), localModFile.getId());
}
String getTitle() {

32
HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModTranslations.java
View File

@ -67,7 +67,7 @@ public enum ModTranslations {
private final String resourceName;
private List<Mod> mods;
private Map<String, Mod> modIdMap; // mod id -> mod
private Map<String, Mod> modMap; // mod id and subname -> mod
private Map<String, Mod> curseForgeMap; // curseforge id -> mod
private List<Pair<String, Mod>> keywords;
private int maxKeywordLength = -1;
@ -84,10 +84,19 @@ public enum ModTranslations {
}
@Nullable
public Mod getModById(String id) {
if (StringUtils.isBlank(id) || !loadModIdMap()) return null;
public Mod getMod(String subname, String id) {
if (!loadModMap()) return null;
return modIdMap.get(id);
if (StringUtils.isNotBlank(subname)) {
String filteredSubName = "subname-" + subname.replaceAll("[^a-zA-Z]", "");
return modMap.get(filteredSubName);
}
if (StringUtils.isNotBlank(id)) {
return modMap.get(id);
}
return null;
}
public abstract String getMcmodUrl(Mod mod);
@ -149,8 +158,8 @@ public enum ModTranslations {
return true;
}
private boolean loadModIdMap() {
if (modIdMap != null) {
private boolean loadModMap() {
if (modMap != null) {
return true;
}
@ -158,11 +167,18 @@ public enum ModTranslations {
if (!loadFromResource()) return false;
}
modIdMap = new HashMap<>();
modMap = new HashMap<>();
for (Mod mod : mods) {
String subname = mod.getSubname();
if (StringUtils.isNotBlank(subname) && !"examplemod".equals(subname)) {
String filteredSubName = "subname-" + subname.replaceAll("[^a-zA-Z]", "");
if (!filteredSubName.isEmpty()) {
modMap.put(filteredSubName, mod);
}
}
for (String id : mod.getModIds()) {
if (StringUtils.isNotBlank(id) && !"examplemod".equals(id)) {
modIdMap.put(id, mod);
modMap.put(id, mod);
}
}
}