From a7123a389ea6230c66bcbce12fe9ec669d3edfe5 Mon Sep 17 00:00:00 2001 From: Layue13 Date: Sun, 8 Nov 2026 15:03:48 +0800 Subject: [PATCH] style: fix checkstyle indentation, unused imports and a Classical Chinese spelling check Co-Authored-By: Claude Sonnet 5.5 --- .../org/jackhuang/hmcl/ui/Controllers.java | 1 - .../hmcl/ui/decorator/MainWindowPane.java | 3 --- .../hmcl/ui/instances/Instances.java | 1 - .../org/jackhuang/hmcl/ui/main/MainPage.java | 11 -------- .../org/jackhuang/hmcl/ui/main/RootPage.java | 4 --- .../resources/assets/lang/I18N_lzh.properties | 2 +- .../hmcl/launch/DefaultLauncher.java | 26 ++++++++++--------- 7 files changed, 15 insertions(+), 33 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java index dd0ac070d3..88a8d16e06 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java @@ -41,7 +41,6 @@ import org.jackhuang.hmcl.ui.main.LauncherSettingsPage; import org.jackhuang.hmcl.ui.main.RootPage; import org.jackhuang.hmcl.ui.instances.GameInstancePage; import org.jackhuang.hmcl.ui.instances.Instances; -import org.jackhuang.hmcl.upgrade.IntegrityChecker; import org.jackhuang.hmcl.util.*; import org.jackhuang.hmcl.util.function.ExceptionalRunnable; import org.jackhuang.hmcl.util.io.FileUtils; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/MainWindowPane.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/MainWindowPane.java index f84d4fde01..1b2d8257bd 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/MainWindowPane.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/MainWindowPane.java @@ -21,11 +21,8 @@ import javafx.scene.layout.Pane; import javafx.scene.layout.Priority; import javafx.scene.layout.Region; import javafx.scene.layout.StackPane; -import javafx.scene.paint.Color; import javafx.scene.shape.Rectangle; import javafx.util.Duration; -import org.glavo.monetfx.ColorRole; -import org.glavo.monetfx.ColorScheme; import org.jackhuang.hmcl.theme.Themes; import org.jackhuang.hmcl.util.platform.OperatingSystem; import org.jackhuang.hmcl.theme.WarmPalette; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/Instances.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/Instances.java index 428e15aa5c..416e175124 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/Instances.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/Instances.java @@ -17,7 +17,6 @@ import org.jackhuang.hmcl.task.Schedulers; import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.ui.Controllers; import org.jackhuang.hmcl.ui.FXUtils; -import org.jackhuang.hmcl.ui.account.CreateAccountPane; import org.jackhuang.hmcl.ui.account.FirstRunAccountDialog; import org.jackhuang.hmcl.ui.construct.DialogCloseEvent; import org.jackhuang.hmcl.ui.construct.MessageDialogPane; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/MainPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/MainPage.java index f44c00769c..003aad6206 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/MainPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/MainPage.java @@ -4,40 +4,30 @@ package org.jackhuang.hmcl.ui.main; import com.jfoenix.controls.JFXButton; import com.jfoenix.controls.JFXPopup; -import javafx.animation.RotateTransition; import javafx.beans.property.*; import javafx.beans.value.ObservableValue; import javafx.collections.FXCollections; import javafx.collections.ObservableList; -import javafx.event.EventHandler; import javafx.geometry.Insets; import javafx.geometry.Pos; import javafx.scene.Cursor; import javafx.scene.Node; import javafx.scene.control.Label; -import javafx.scene.control.Tooltip; -import javafx.scene.image.ImageView; -import javafx.scene.input.MouseButton; -import javafx.scene.input.MouseEvent; import javafx.scene.layout.HBox; import javafx.scene.layout.Priority; import javafx.scene.layout.Region; import javafx.scene.layout.StackPane; import javafx.scene.layout.VBox; -import javafx.util.Duration; import org.jackhuang.hmcl.game.*; import org.jackhuang.hmcl.setting.GameDirectoryManager; import org.jackhuang.hmcl.theme.Themes; import org.jackhuang.hmcl.ui.Controllers; import org.jackhuang.hmcl.ui.FXUtils; -import org.jackhuang.hmcl.ui.SVG; -import org.jackhuang.hmcl.ui.animation.AnimationUtils; import org.jackhuang.hmcl.ui.construct.IconedMenuItem; import org.jackhuang.hmcl.ui.construct.PopupMenu; import org.jackhuang.hmcl.ui.decorator.DecoratorPage; import org.jackhuang.hmcl.ui.instances.Instances; import org.jackhuang.hmcl.task.Schedulers; -import org.jackhuang.hmcl.util.Lang; import org.jackhuang.hmcl.util.ServerAddress; import org.jackhuang.hmcl.util.ServerStatusPing; import org.jackhuang.hmcl.util.i18n.I18n; @@ -48,7 +38,6 @@ import org.jetbrains.annotations.UnmodifiableView; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import java.util.function.Consumer; import static org.jackhuang.hmcl.util.i18n.I18n.i18n; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/RootPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/RootPage.java index 7ee23d9369..22ff961f62 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/RootPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/RootPage.java @@ -4,8 +4,6 @@ package org.jackhuang.hmcl.ui.main; import com.jfoenix.controls.JFXPopup; import javafx.beans.property.ReadOnlyObjectProperty; -import javafx.scene.layout.Region; -import org.jackhuang.hmcl.game.GameInstanceID; import org.jackhuang.hmcl.game.HMCLGameInstance; import org.jackhuang.hmcl.game.ModpackHelper; import org.jackhuang.hmcl.setting.Accounts; @@ -22,12 +20,10 @@ import org.jackhuang.hmcl.ui.decorator.DecoratorPage; import org.jackhuang.hmcl.ui.download.ModpackInstallWizardProvider; import org.jackhuang.hmcl.ui.instances.GameAdvancedListItem; import org.jackhuang.hmcl.ui.instances.Instances; -import org.jackhuang.hmcl.util.Lang; import org.jackhuang.hmcl.util.io.FileUtils; import org.jetbrains.annotations.Nullable; import java.nio.file.Path; -import java.util.Locale; import static org.jackhuang.hmcl.util.i18n.I18n.i18n; diff --git a/HMCL/src/main/resources/assets/lang/I18N_lzh.properties b/HMCL/src/main/resources/assets/lang/I18N_lzh.properties index cb02be73b8..312af8ad62 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_lzh.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_lzh.properties @@ -625,7 +625,7 @@ first_run.description=入服用此名。可改登微軟之帳。 first_run.name=名 first_run.accept=始 first_run.microsoft=登正版 -first_run.invalid=一至十六字，限英文數字底線。 +first_run.invalid=一至十六字，限英文數字底綫。 home.server=服 home.server.unreachable=不通 server.join=入服 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 70061d4213..29098c375a 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java @@ -360,19 +360,21 @@ public class DefaultLauncher extends Launcher { // WebSocket routes are resolved by the client-side WebSocket mod; hand the URL over untouched. res.add("--server"); res.add(address); - } else try { - ServerAddress parsed = ServerAddress.parse(address); - if (World.supportQuickPlay(GameVersionNumber.asGameVersion(gameVersion))) { - res.add("--quickPlayMultiplayer"); - res.add(parsed.port() >= 0 ? address : parsed.host() + ":25565"); - } else { - res.add("--server"); - res.add(parsed.host()); - res.add("--port"); - res.add(parsed.port() >= 0 ? String.valueOf(parsed.port()) : "25565"); + } else { + try { + ServerAddress parsed = ServerAddress.parse(address); + if (World.supportQuickPlay(GameVersionNumber.asGameVersion(gameVersion))) { + res.add("--quickPlayMultiplayer"); + res.add(parsed.port() >= 0 ? address : parsed.host() + ":25565"); + } else { + res.add("--server"); + res.add(parsed.host()); + res.add("--port"); + res.add(parsed.port() >= 0 ? String.valueOf(parsed.port()) : "25565"); + } + } catch (IllegalArgumentException e) { + LOG.warning("Invalid server address: " + address, e); } - } catch (IllegalArgumentException e) { - LOG.warning("Invalid server address: " + address, e); } } else if (options.getQuickPlayOption() instanceof QuickPlayOption.SinglePlayer singlePlayer && World.supportQuickPlay(GameVersionNumber.asGameVersion(gameVersion))) {