From bb37e3fafa76bb86974fdcfa3313b28d13dc78c5 Mon Sep 17 00:00:00 2001 From: Glavo Date: Fri, 23 May 2025 00:25:28 +0800 Subject: [PATCH] Use StringUtils.isASCII to check if a string contains non-ASCII characters (#3931) --- .../java/org/jackhuang/hmcl/ui/download/InstallersPage.java | 4 ++-- .../java/org/jackhuang/hmcl/ui/download/LocalModpackPage.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/InstallersPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/InstallersPage.java index 6f07812ab..2a4124abe 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/InstallersPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/InstallersPage.java @@ -27,8 +27,8 @@ import org.jackhuang.hmcl.ui.construct.MessageDialogPane; import org.jackhuang.hmcl.ui.construct.RequiredValidator; import org.jackhuang.hmcl.ui.construct.Validator; import org.jackhuang.hmcl.ui.wizard.WizardController; +import org.jackhuang.hmcl.util.StringUtils; -import java.nio.charset.StandardCharsets; import java.util.Map; import static javafx.beans.binding.Bindings.createBooleanBinding; @@ -81,7 +81,7 @@ public class InstallersPage extends AbstractInstallersPage { String name = txtName.getText(); // Check for non-ASCII characters. - if (!StandardCharsets.US_ASCII.newEncoder().canEncode(name)) { + if (!StringUtils.isASCII(name)) { Controllers.dialog(new MessageDialogPane.Builder( i18n("install.name.invalid"), i18n("message.warning"), diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/LocalModpackPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/LocalModpackPage.java index 9c3b4fab2..7fe6c5ac4 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/LocalModpackPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/LocalModpackPage.java @@ -42,7 +42,6 @@ import org.jackhuang.hmcl.util.io.FileUtils; import java.io.File; import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; import java.util.Map; import java.util.Optional; @@ -153,7 +152,7 @@ public final class LocalModpackPage extends ModpackPage { String name = txtModpackName.getText(); // Check for non-ASCII characters. - if (!StandardCharsets.US_ASCII.newEncoder().canEncode(name)) { + if (!StringUtils.isASCII(name)) { Controllers.dialog(new MessageDialogPane.Builder( i18n("install.name.invalid"), i18n("message.warning"),