diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/addon/AddonProjectInfoRegistry.java b/HMCL/src/main/java/org/jackhuang/hmcl/addon/AddonProjectInfoRegistry.java index be0f6b5e9b..ac6ab34f84 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/addon/AddonProjectInfoRegistry.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/addon/AddonProjectInfoRegistry.java @@ -16,11 +16,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.lang.ref.SoftReference; import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.locks.ReentrantLock; import static org.jackhuang.hmcl.util.logging.Logger.LOG; @@ -364,7 +360,7 @@ public abstract class AddonProjectInfoRegistry { || ".+\\".indexOf(ch) >= 0; } - /// Removes supported separators and pictographs from a secondary name. + /// Removes supported separators from a secondary name. /// Returns an empty string for null, blank or unsupported names; matching is case-sensitive. private static String cleanSubname(@Nullable String subname) { if (StringUtils.isBlank(subname)) @@ -389,8 +385,7 @@ public abstract class AddonProjectInfoRegistry { if (isSupportedSubnameChar(ch)) { builder.appendCodePoint(ch); } else if (!(Character.isWhitespace(ch) - || "':_-/&()[]{}|,!?~•".indexOf(ch) >= 0 - || ch >= 0x1F300 && ch <= 0x1FAFF)) { + || "':_-/&()[]{}|,!?~•".indexOf(ch) >= 0)) { return ""; } offset += Character.charCount(ch); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/ModListPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/ModListPage.java index 0bc73f4942..50dd8ad565 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/ModListPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/ModListPage.java @@ -30,16 +30,18 @@ import javafx.stage.FileChooser; import javafx.util.Duration; import org.jackhuang.hmcl.addon.AddonLoader; import org.jackhuang.hmcl.addon.AddonProjectInfoRegistry; -import org.jackhuang.hmcl.addon.mod.ModProjectInfo; import org.jackhuang.hmcl.addon.RemoteAddon; import org.jackhuang.hmcl.addon.RemoteAddonRepository; -import org.jackhuang.hmcl.addon.repository.CurseForgeRemoteAddonRepository; -import org.jackhuang.hmcl.addon.repository.ModrinthRemoteAddonRepository; -import org.jackhuang.hmcl.addon.update.AddonCheckUpdatesTask; -import org.jackhuang.hmcl.game.*; import org.jackhuang.hmcl.addon.mod.LocalModFile; import org.jackhuang.hmcl.addon.mod.ModLoaderType; import org.jackhuang.hmcl.addon.mod.ModManager; +import org.jackhuang.hmcl.addon.mod.ModProjectInfo; +import org.jackhuang.hmcl.addon.repository.CurseForgeRemoteAddonRepository; +import org.jackhuang.hmcl.addon.repository.ModrinthRemoteAddonRepository; +import org.jackhuang.hmcl.addon.update.AddonCheckUpdatesTask; +import org.jackhuang.hmcl.game.GameInstanceID; +import org.jackhuang.hmcl.game.HMCLGameInstance; +import org.jackhuang.hmcl.game.HMCLGameRepository; import org.jackhuang.hmcl.setting.DownloadProviders; import org.jackhuang.hmcl.setting.GameDirectory; import org.jackhuang.hmcl.setting.GameInstanceIconType; @@ -50,7 +52,10 @@ import org.jackhuang.hmcl.ui.animation.AnimationUtils; import org.jackhuang.hmcl.ui.animation.ContainerAnimations; import org.jackhuang.hmcl.ui.animation.TransitionPane; import org.jackhuang.hmcl.ui.construct.*; -import org.jackhuang.hmcl.util.*; +import org.jackhuang.hmcl.util.Lazy; +import org.jackhuang.hmcl.util.Pair; +import org.jackhuang.hmcl.util.StringUtils; +import org.jackhuang.hmcl.util.TaskCancellationAction; import org.jackhuang.hmcl.util.i18n.I18n; import org.jackhuang.hmcl.util.io.CompressingUtils; import org.jackhuang.hmcl.util.io.FileUtils; @@ -626,10 +631,15 @@ public final class ModListPage extends ListPageBase i TwoLineListItem title = new TwoLineListItem(); title.getTitleLabel().setWrapText(true); - if (modInfo.getProjectInfo() != null && I18n.isUseChinese()) - title.setTitle(modInfo.getProjectInfo().displayName()); - else - title.setTitle(modInfo.getModInfo().getName()); + String displayName = modInfo.getModInfo().getName(); + if (modInfo.getProjectInfo() != null && I18n.isUseChinese()) { + String chineseName = modInfo.getProjectInfo().mainName(); + if (StringUtils.containsChinese(chineseName)) { + if (StringUtils.isNotBlank(chineseName) && !displayName.equalsIgnoreCase(chineseName)) + displayName = chineseName + " (" + displayName + ")"; + } + } + title.setTitle(displayName); StringJoiner subtitle = new StringJoiner("\n"); subtitle.add(i18n("archive.file.name") + ": " + FileUtils.getName(modInfo.getModInfo().getFile())); @@ -811,20 +821,8 @@ public final class ModListPage extends ListPageBase i if (projectInfo != null && I18n.isUseChinese()) { String chineseName = projectInfo.mainName(); if (StringUtils.containsChinese(chineseName)) { - if (StringUtils.containsEmoji(chineseName)) { - StringBuilder builder = new StringBuilder(); - - chineseName.codePoints().forEach(ch -> { - if (ch < 0x1F300 || ch > 0x1FAFF) - builder.appendCodePoint(ch); - }); - - chineseName = builder.toString().trim(); - } - - if (StringUtils.isNotBlank(chineseName) && !displayName.equalsIgnoreCase(chineseName)) { - displayName = displayName + " (" + chineseName + ")"; - } + if (StringUtils.isNotBlank(chineseName) && !displayName.equalsIgnoreCase(chineseName)) + displayName = chineseName + " (" + displayName + ")"; } } content.setTitle(displayName);