diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java b/HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java index ea08579b0..0d16a2802 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java @@ -17,13 +17,10 @@ */ package org.jackhuang.hmcl; -import static org.jackhuang.hmcl.util.Logging.LOG; - import com.jfoenix.concurrency.JFXUtilities; import javafx.application.Application; import javafx.application.Platform; import javafx.stage.Stage; - import org.jackhuang.hmcl.task.Schedulers; import org.jackhuang.hmcl.ui.Controllers; import org.jackhuang.hmcl.upgrade.UpdateChecker; @@ -39,6 +36,8 @@ import java.util.LinkedList; import java.util.List; import java.util.concurrent.TimeUnit; +import static org.jackhuang.hmcl.util.Logging.LOG; + public final class Launcher extends Application { @Override diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/Main.java b/HMCL/src/main/java/org/jackhuang/hmcl/Main.java index 8ec04eb0a..6e274726c 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/Main.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/Main.java @@ -17,9 +17,13 @@ */ package org.jackhuang.hmcl; -import static org.jackhuang.hmcl.util.Logging.LOG; -import static org.jackhuang.hmcl.util.i18n.I18n.i18n; +import org.jackhuang.hmcl.setting.ConfigHolder; +import org.jackhuang.hmcl.upgrade.UpdateHandler; +import javax.net.ssl.TrustManager; +import javax.net.ssl.TrustManagerFactory; +import javax.net.ssl.X509TrustManager; +import javax.swing.*; import java.io.File; import java.io.IOException; import java.nio.file.Paths; @@ -29,13 +33,8 @@ import java.security.NoSuchAlgorithmException; import java.security.cert.X509Certificate; import java.util.logging.Level; -import javax.net.ssl.TrustManager; -import javax.net.ssl.TrustManagerFactory; -import javax.net.ssl.X509TrustManager; -import javax.swing.JOptionPane; - -import org.jackhuang.hmcl.setting.ConfigHolder; -import org.jackhuang.hmcl.upgrade.UpdateHandler; +import static org.jackhuang.hmcl.util.Logging.LOG; +import static org.jackhuang.hmcl.util.i18n.I18n.i18n; public final class Main { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Accounts.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Accounts.java index 422e236ed..8f0c210ae 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Accounts.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Accounts.java @@ -17,6 +17,12 @@ */ package org.jackhuang.hmcl.setting; +import javafx.beans.Observable; +import javafx.beans.property.ObjectProperty; +import javafx.beans.property.ReadOnlyListProperty; +import javafx.beans.property.ReadOnlyListWrapper; +import javafx.beans.property.SimpleObjectProperty; +import javafx.collections.ObservableList; import org.jackhuang.hmcl.Launcher; import org.jackhuang.hmcl.auth.Account; import org.jackhuang.hmcl.auth.AccountFactory; @@ -30,13 +36,6 @@ import org.jackhuang.hmcl.auth.yggdrasil.MojangYggdrasilProvider; import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount; import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccountFactory; -import javafx.beans.Observable; -import javafx.beans.property.ObjectProperty; -import javafx.beans.property.ReadOnlyListProperty; -import javafx.beans.property.ReadOnlyListWrapper; -import javafx.beans.property.SimpleObjectProperty; -import javafx.collections.ObservableList; - import java.io.IOException; import java.util.Map; import java.util.Optional; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java index 69d12c3f3..5988f8621 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java @@ -17,13 +17,17 @@ */ package org.jackhuang.hmcl.setting; -import java.io.File; -import java.lang.reflect.Modifier; -import java.net.Proxy; -import java.util.Map; -import java.util.TreeMap; -import java.util.stream.Stream; - +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonParseException; +import com.google.gson.annotations.SerializedName; +import javafx.beans.InvalidationListener; +import javafx.beans.Observable; +import javafx.beans.property.*; +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import javafx.collections.ObservableMap; +import javafx.collections.ObservableSet; import org.hildan.fxgson.creators.ObservableListCreator; import org.hildan.fxgson.creators.ObservableMapCreator; import org.hildan.fxgson.creators.ObservableSetCreator; @@ -37,27 +41,12 @@ import org.jackhuang.hmcl.util.ObservableHelper; import org.jackhuang.hmcl.util.i18n.Locales; import org.jackhuang.hmcl.util.i18n.Locales.SupportedLocale; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonParseException; -import com.google.gson.annotations.SerializedName; - -import javafx.beans.InvalidationListener; -import javafx.beans.Observable; -import javafx.beans.property.BooleanProperty; -import javafx.beans.property.DoubleProperty; -import javafx.beans.property.IntegerProperty; -import javafx.beans.property.ObjectProperty; -import javafx.beans.property.SimpleBooleanProperty; -import javafx.beans.property.SimpleDoubleProperty; -import javafx.beans.property.SimpleIntegerProperty; -import javafx.beans.property.SimpleObjectProperty; -import javafx.beans.property.SimpleStringProperty; -import javafx.beans.property.StringProperty; -import javafx.collections.FXCollections; -import javafx.collections.ObservableList; -import javafx.collections.ObservableMap; -import javafx.collections.ObservableSet; +import java.io.File; +import java.lang.reflect.Modifier; +import java.net.Proxy; +import java.util.Map; +import java.util.TreeMap; +import java.util.stream.Stream; public final class Config implements Cloneable, Observable { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/ConfigHolder.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/ConfigHolder.java index ae04bf89a..41130ec76 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/ConfigHolder.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/ConfigHolder.java @@ -17,8 +17,9 @@ */ package org.jackhuang.hmcl.setting; -import static java.nio.charset.StandardCharsets.UTF_8; -import static org.jackhuang.hmcl.util.Logging.LOG; +import com.google.gson.Gson; +import com.google.gson.JsonParseException; +import org.jackhuang.hmcl.util.OperatingSystem; import java.io.IOException; import java.nio.file.Files; @@ -27,10 +28,8 @@ import java.nio.file.Paths; import java.util.Map; import java.util.logging.Level; -import com.google.gson.Gson; -import com.google.gson.JsonParseException; - -import org.jackhuang.hmcl.util.OperatingSystem; +import static java.nio.charset.StandardCharsets.UTF_8; +import static org.jackhuang.hmcl.util.Logging.LOG; public final class ConfigHolder { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java index 78a6ca28a..7a93df564 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java @@ -18,11 +18,9 @@ package org.jackhuang.hmcl.setting; import com.google.gson.*; -import com.jfoenix.concurrency.JFXUtilities; import javafx.beans.InvalidationListener; import javafx.beans.Observable; import javafx.beans.property.*; - import org.jackhuang.hmcl.event.EventBus; import org.jackhuang.hmcl.event.RefreshedVersionsEvent; import org.jackhuang.hmcl.game.HMCLDependencyManager; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profiles.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profiles.java index 7bfe7496f..619708f84 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profiles.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profiles.java @@ -18,7 +18,10 @@ package org.jackhuang.hmcl.setting; import javafx.beans.Observable; -import javafx.beans.property.*; +import javafx.beans.property.ObjectProperty; +import javafx.beans.property.ReadOnlyListProperty; +import javafx.beans.property.ReadOnlyListWrapper; +import javafx.beans.property.SimpleObjectProperty; import javafx.collections.ObservableList; import org.jackhuang.hmcl.Launcher; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/ProxyManager.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/ProxyManager.java index 0cababf5f..723af4bb3 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/ProxyManager.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/ProxyManager.java @@ -17,7 +17,11 @@ */ package org.jackhuang.hmcl.setting; -import static org.jackhuang.hmcl.setting.ConfigHolder.config; +import javafx.beans.binding.Bindings; +import javafx.beans.binding.ObjectBinding; +import javafx.beans.value.ObservableObjectValue; +import org.jackhuang.hmcl.util.Lang; +import org.jackhuang.hmcl.util.StringUtils; import java.net.Authenticator; import java.net.InetSocketAddress; @@ -25,12 +29,7 @@ import java.net.PasswordAuthentication; import java.net.Proxy; import java.net.Proxy.Type; -import org.jackhuang.hmcl.util.Lang; -import org.jackhuang.hmcl.util.StringUtils; - -import javafx.beans.binding.Bindings; -import javafx.beans.binding.ObjectBinding; -import javafx.beans.value.ObservableObjectValue; +import static org.jackhuang.hmcl.setting.ConfigHolder.config; public final class ProxyManager { private ProxyManager() { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java index ca227baa0..0f1a8e806 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java @@ -17,17 +17,9 @@ */ package org.jackhuang.hmcl.setting; -import javafx.beans.value.ObservableValue; import javafx.scene.text.Font; - import org.jackhuang.hmcl.Launcher; import org.jackhuang.hmcl.download.DownloadProvider; -import org.jackhuang.hmcl.event.*; -import org.jackhuang.hmcl.task.Schedulers; -import org.jackhuang.hmcl.util.*; - -import java.util.*; -import java.util.stream.Collectors; import static org.jackhuang.hmcl.setting.ConfigHolder.config; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Theme.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Theme.java index 2c9ab1334..d143eacdf 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Theme.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Theme.java @@ -17,6 +17,8 @@ */ package org.jackhuang.hmcl.setting; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; import javafx.beans.binding.Bindings; import javafx.beans.binding.ObjectBinding; import javafx.scene.paint.Color; @@ -24,16 +26,13 @@ import org.jackhuang.hmcl.util.FileUtils; import org.jackhuang.hmcl.util.IOUtils; import org.jackhuang.hmcl.util.Logging; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; - -import static org.jackhuang.hmcl.setting.ConfigHolder.config; - import java.io.File; import java.io.IOException; import java.util.Optional; import java.util.logging.Level; +import static org.jackhuang.hmcl.setting.ConfigHolder.config; + public class Theme { public static final Theme BLUE = new Theme("blue", "#5C6BC0"); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/VersionSetting.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/VersionSetting.java index 5be163d44..43af5831c 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/VersionSetting.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/VersionSetting.java @@ -19,7 +19,6 @@ package org.jackhuang.hmcl.setting; import com.google.gson.*; import javafx.beans.InvalidationListener; - import org.jackhuang.hmcl.Metadata; import org.jackhuang.hmcl.game.LaunchOptions; import org.jackhuang.hmcl.util.*; 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 a12b7ce7d..3156b281d 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java @@ -39,10 +39,10 @@ import org.jackhuang.hmcl.ui.versions.VersionPage; import org.jackhuang.hmcl.util.FutureCallback; import org.jackhuang.hmcl.util.JavaVersion; -import static org.jackhuang.hmcl.setting.ConfigHolder.config; - import java.util.function.Consumer; +import static org.jackhuang.hmcl.setting.ConfigHolder.config; + public final class Controllers { private static Scene scene; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/CrashWindow.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/CrashWindow.java index 84a4c07f7..6d6be4394 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/CrashWindow.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/CrashWindow.java @@ -27,12 +27,11 @@ import javafx.scene.layout.BorderPane; import javafx.scene.layout.HBox; import javafx.scene.layout.StackPane; import javafx.stage.Stage; - -import static org.jackhuang.hmcl.util.i18n.I18n.i18n; - import org.jackhuang.hmcl.Metadata; import org.jackhuang.hmcl.upgrade.UpdateChecker; +import static org.jackhuang.hmcl.util.i18n.I18n.i18n; + /** * @author huangyuhui */ diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java index 1e7ffc8ae..cfe0dbc7d 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java @@ -31,11 +31,7 @@ import javafx.beans.value.WeakChangeListener; import javafx.event.EventHandler; import javafx.fxml.FXMLLoader; import javafx.scene.Node; -import javafx.scene.control.ListCell; -import javafx.scene.control.ListView; -import javafx.scene.control.ScrollBar; -import javafx.scene.control.ScrollPane; -import javafx.scene.control.Tooltip; +import javafx.scene.control.*; import javafx.scene.image.ImageView; import javafx.scene.input.MouseEvent; import javafx.scene.input.ScrollEvent; @@ -44,7 +40,6 @@ import javafx.scene.shape.Rectangle; import javafx.util.Callback; import javafx.util.Duration; import javafx.util.StringConverter; - import org.jackhuang.hmcl.util.*; import org.jackhuang.hmcl.util.i18n.I18n; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/InstallerItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/InstallerItem.java index 4c990af53..314bc52c7 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/InstallerItem.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/InstallerItem.java @@ -22,10 +22,10 @@ import javafx.fxml.FXML; import javafx.scene.control.Label; import javafx.scene.layout.BorderPane; -import static org.jackhuang.hmcl.util.i18n.I18n.i18n; - import java.util.function.Consumer; +import static org.jackhuang.hmcl.util.i18n.I18n.i18n; + /** * @author huangyuhui */ diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/LeftPaneController.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LeftPaneController.java index 07c3acfae..7bf44aa17 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/LeftPaneController.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LeftPaneController.java @@ -27,13 +27,17 @@ import org.jackhuang.hmcl.game.HMCLGameRepository; import org.jackhuang.hmcl.game.ModpackHelper; import org.jackhuang.hmcl.mod.Modpack; import org.jackhuang.hmcl.mod.UnsupportedModpackException; -import org.jackhuang.hmcl.setting.*; +import org.jackhuang.hmcl.setting.Accounts; +import org.jackhuang.hmcl.setting.Profiles; +import org.jackhuang.hmcl.setting.Theme; import org.jackhuang.hmcl.task.Schedulers; import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.task.TaskExecutor; import org.jackhuang.hmcl.ui.account.AccountAdvancedListItem; import org.jackhuang.hmcl.ui.account.AddAccountPane; -import org.jackhuang.hmcl.ui.construct.*; +import org.jackhuang.hmcl.ui.construct.AdvancedListBox; +import org.jackhuang.hmcl.ui.construct.DialogCloseEvent; +import org.jackhuang.hmcl.ui.construct.IconedItem; import org.jackhuang.hmcl.ui.profile.ProfileAdvancedListItem; import org.jackhuang.hmcl.ui.versions.GameAdvancedListItem; import org.jackhuang.hmcl.upgrade.UpdateChecker; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/LogWindow.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LogWindow.java index ac835799d..2662fc632 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/LogWindow.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LogWindow.java @@ -30,7 +30,6 @@ import javafx.scene.layout.StackPane; import javafx.scene.web.WebEngine; import javafx.scene.web.WebView; import javafx.stage.Stage; - import org.jackhuang.hmcl.event.Event; import org.jackhuang.hmcl.event.EventManager; import org.jackhuang.hmcl.game.LauncherHelper; @@ -43,11 +42,11 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; +import java.util.concurrent.CountDownLatch; + import static org.jackhuang.hmcl.setting.ConfigHolder.config; import static org.jackhuang.hmcl.util.i18n.I18n.i18n; -import java.util.concurrent.CountDownLatch; - /** * * @author huangyuhui diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPage.java index 263ca1af5..4219c8cec 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPage.java @@ -17,7 +17,6 @@ */ package org.jackhuang.hmcl.ui; -import com.jfoenix.controls.JFXButton; import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; import javafx.fxml.FXML; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/ModItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/ModItem.java index 27f131b00..7488b3784 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/ModItem.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/ModItem.java @@ -23,16 +23,15 @@ import com.jfoenix.controls.JFXCheckBox; import com.jfoenix.effects.JFXDepthManager; import javafx.geometry.Pos; import javafx.scene.layout.BorderPane; - import org.jackhuang.hmcl.mod.ModInfo; import org.jackhuang.hmcl.setting.Theme; import org.jackhuang.hmcl.ui.construct.TwoLineListItem; import org.jackhuang.hmcl.util.StringUtils; -import static org.jackhuang.hmcl.util.i18n.I18n.i18n; - import java.util.function.Consumer; +import static org.jackhuang.hmcl.util.i18n.I18n.i18n; + public final class ModItem extends BorderPane { public ModItem(ModInfo info, Consumer deleteCallback) { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java index 803984150..f395a18da 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java @@ -17,7 +17,7 @@ */ package org.jackhuang.hmcl.ui; -import com.jfoenix.controls.*; +import com.jfoenix.controls.JFXColorPicker; import com.jfoenix.effects.JFXDepthManager; import javafx.application.Platform; import javafx.beans.InvalidationListener; @@ -37,22 +37,22 @@ import javafx.scene.text.Font; import org.jackhuang.hmcl.setting.*; import org.jackhuang.hmcl.ui.construct.Validator; import org.jackhuang.hmcl.ui.decorator.DecoratorPage; -import org.jackhuang.hmcl.upgrade.UpdateChannel; import org.jackhuang.hmcl.upgrade.RemoteVersion; +import org.jackhuang.hmcl.upgrade.UpdateChannel; import org.jackhuang.hmcl.upgrade.UpdateChecker; import org.jackhuang.hmcl.upgrade.UpdateHandler; import org.jackhuang.hmcl.util.Lang; import org.jackhuang.hmcl.util.i18n.Locales; -import static org.jackhuang.hmcl.setting.ConfigHolder.config; -import static org.jackhuang.hmcl.util.i18n.I18n.i18n; - import java.net.Proxy; import java.util.Arrays; import java.util.Collections; import java.util.Objects; import java.util.Optional; +import static org.jackhuang.hmcl.setting.ConfigHolder.config; +import static org.jackhuang.hmcl.util.i18n.I18n.i18n; + public final class SettingsPage extends SettingsView implements DecoratorPage { private final StringProperty title = new SimpleStringProperty(this, "title", i18n("settings.launcher")); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/VersionItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/VersionItem.java index ba39ab8f9..11d9897f9 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/VersionItem.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/VersionItem.java @@ -34,12 +34,12 @@ import javafx.scene.input.MouseEvent; import javafx.scene.layout.*; import javafx.scene.paint.Color; import javafx.scene.text.TextAlignment; - import org.jackhuang.hmcl.setting.Theme; -import static org.jackhuang.hmcl.util.i18n.I18n.i18n; import java.util.Optional; +import static org.jackhuang.hmcl.util.i18n.I18n.i18n; + public final class VersionItem extends StackPane { @FXML private Pane icon; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AddAccountPane.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AddAccountPane.java index 92436bbca..5d2e9f54f 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AddAccountPane.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AddAccountPane.java @@ -19,7 +19,6 @@ package org.jackhuang.hmcl.ui.account; import com.jfoenix.concurrency.JFXUtilities; import com.jfoenix.controls.*; - import javafx.beans.binding.Bindings; import javafx.beans.property.ReadOnlyObjectProperty; import javafx.fxml.FXML; @@ -31,7 +30,6 @@ import javafx.scene.image.ImageView; import javafx.scene.layout.BorderPane; import javafx.scene.layout.HBox; import javafx.scene.layout.StackPane; - import org.jackhuang.hmcl.auth.*; import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer; import org.jackhuang.hmcl.auth.yggdrasil.GameProfile; @@ -43,12 +41,7 @@ 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.construct.TwoLineListItem; -import org.jackhuang.hmcl.ui.construct.AdvancedListBox; -import org.jackhuang.hmcl.ui.construct.DialogCloseEvent; -import org.jackhuang.hmcl.ui.construct.IconedItem; -import org.jackhuang.hmcl.ui.construct.SpinnerPane; -import org.jackhuang.hmcl.ui.construct.Validator; +import org.jackhuang.hmcl.ui.construct.*; import org.jackhuang.hmcl.util.Constants; import org.jackhuang.hmcl.util.Logging; @@ -58,9 +51,7 @@ import java.util.logging.Level; import static java.util.Objects.requireNonNull; import static org.jackhuang.hmcl.setting.ConfigHolder.config; -import static org.jackhuang.hmcl.ui.FXUtils.jfxListCellFactory; -import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating; -import static org.jackhuang.hmcl.ui.FXUtils.stringConverter; +import static org.jackhuang.hmcl.ui.FXUtils.*; import static org.jackhuang.hmcl.util.i18n.I18n.i18n; public class AddAccountPane extends StackPane { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AddAuthlibInjectorServerPane.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AddAuthlibInjectorServerPane.java index c875e1c01..d7d567069 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AddAuthlibInjectorServerPane.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AddAuthlibInjectorServerPane.java @@ -17,10 +17,13 @@ */ package org.jackhuang.hmcl.ui.account; -import static org.jackhuang.hmcl.ui.FXUtils.loadFXML; -import static org.jackhuang.hmcl.util.i18n.I18n.i18n; - -import java.io.IOException; +import com.jfoenix.controls.JFXButton; +import com.jfoenix.controls.JFXDialogLayout; +import com.jfoenix.controls.JFXTextField; +import javafx.beans.binding.Bindings; +import javafx.fxml.FXML; +import javafx.scene.control.Label; +import javafx.scene.layout.StackPane; import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer; import org.jackhuang.hmcl.task.Schedulers; import org.jackhuang.hmcl.task.Task; @@ -30,16 +33,11 @@ import org.jackhuang.hmcl.ui.construct.DialogCloseEvent; import org.jackhuang.hmcl.ui.construct.SpinnerPane; import org.jackhuang.hmcl.util.NetworkUtils; -import com.jfoenix.controls.JFXButton; -import com.jfoenix.controls.JFXDialogLayout; -import com.jfoenix.controls.JFXTextField; - -import javafx.beans.binding.Bindings; -import javafx.fxml.FXML; -import javafx.scene.control.Label; -import javafx.scene.layout.StackPane; +import java.io.IOException; import static org.jackhuang.hmcl.setting.ConfigHolder.config; +import static org.jackhuang.hmcl.ui.FXUtils.loadFXML; +import static org.jackhuang.hmcl.util.i18n.I18n.i18n; public class AddAuthlibInjectorServerPane extends StackPane { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AuthlibInjectorServersPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AuthlibInjectorServersPage.java index 70c20d4c4..b792331a3 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AuthlibInjectorServersPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AuthlibInjectorServersPage.java @@ -17,15 +17,6 @@ */ package org.jackhuang.hmcl.ui.account; -import static org.jackhuang.hmcl.ui.FXUtils.loadFXML; -import static org.jackhuang.hmcl.ui.FXUtils.smoothScrolling; -import static org.jackhuang.hmcl.util.i18n.I18n.i18n; - -import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer; -import org.jackhuang.hmcl.ui.Controllers; -import org.jackhuang.hmcl.ui.decorator.DecoratorPage; -import org.jackhuang.hmcl.util.MappedObservableList; - import javafx.beans.binding.Bindings; import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; @@ -34,8 +25,15 @@ import javafx.fxml.FXML; import javafx.scene.control.ScrollPane; import javafx.scene.layout.StackPane; import javafx.scene.layout.VBox; +import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer; +import org.jackhuang.hmcl.ui.Controllers; +import org.jackhuang.hmcl.ui.decorator.DecoratorPage; +import org.jackhuang.hmcl.util.MappedObservableList; import static org.jackhuang.hmcl.setting.ConfigHolder.config; +import static org.jackhuang.hmcl.ui.FXUtils.loadFXML; +import static org.jackhuang.hmcl.ui.FXUtils.smoothScrolling; +import static org.jackhuang.hmcl.util.i18n.I18n.i18n; public class AuthlibInjectorServersPage extends StackPane implements DecoratorPage { private final StringProperty title = new SimpleStringProperty(this, "title", i18n("account.injector.manage.title")); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/AdvancedListItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/AdvancedListItem.java index 356d7d7cd..a7141c3ad 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/AdvancedListItem.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/AdvancedListItem.java @@ -17,7 +17,10 @@ */ package org.jackhuang.hmcl.ui.construct; -import javafx.beans.property.*; +import javafx.beans.property.ObjectProperty; +import javafx.beans.property.SimpleObjectProperty; +import javafx.beans.property.SimpleStringProperty; +import javafx.beans.property.StringProperty; import javafx.event.ActionEvent; import javafx.event.EventHandler; import javafx.geometry.Rectangle2D; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/DialogCloseEvent.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/DialogCloseEvent.java index b4282dacd..7081b4288 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/DialogCloseEvent.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/DialogCloseEvent.java @@ -17,12 +17,11 @@ */ package org.jackhuang.hmcl.ui.construct; -import org.jackhuang.hmcl.ui.Controllers; - import javafx.event.Event; import javafx.event.EventTarget; import javafx.event.EventType; import javafx.scene.layout.Region; +import org.jackhuang.hmcl.ui.Controllers; /** * Indicates a close operation on the dialog. diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/FileItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/FileItem.java index f2a90c47f..86146c6ac 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/FileItem.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/FileItem.java @@ -18,7 +18,6 @@ package org.jackhuang.hmcl.ui.construct; import com.jfoenix.controls.JFXButton; - import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleStringProperty; @@ -28,19 +27,18 @@ import javafx.scene.control.Tooltip; import javafx.scene.layout.BorderPane; import javafx.scene.layout.VBox; import javafx.stage.DirectoryChooser; - import org.jackhuang.hmcl.setting.Theme; import org.jackhuang.hmcl.ui.Controllers; import org.jackhuang.hmcl.ui.FXUtils; import org.jackhuang.hmcl.ui.SVG; -import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating; -import static org.jackhuang.hmcl.util.i18n.I18n.i18n; - import java.io.File; import java.nio.file.Path; import java.nio.file.Paths; +import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating; +import static org.jackhuang.hmcl.util.i18n.I18n.i18n; + public class FileItem extends BorderPane { private final Label lblPath = new Label(); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/ImagePickerItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/ImagePickerItem.java index 398a4eff4..df67d3989 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/ImagePickerItem.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/ImagePickerItem.java @@ -15,13 +15,12 @@ import javafx.scene.input.MouseEvent; import javafx.scene.layout.BorderPane; import javafx.scene.layout.HBox; import javafx.scene.layout.VBox; - -import static org.jackhuang.hmcl.util.i18n.I18n.i18n; - import org.jackhuang.hmcl.setting.Theme; import org.jackhuang.hmcl.ui.FXUtils; import org.jackhuang.hmcl.ui.SVG; +import static org.jackhuang.hmcl.util.i18n.I18n.i18n; + @DefaultProperty("image") public final class ImagePickerItem extends BorderPane { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MessageBox.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MessageBox.java index af8142965..4bf2ef4c3 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MessageBox.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MessageBox.java @@ -20,14 +20,13 @@ package org.jackhuang.hmcl.ui.construct; import javafx.scene.control.Alert; import javafx.scene.control.ButtonType; import javafx.scene.control.TextInputDialog; - import org.jackhuang.hmcl.ui.FXUtils; + import javax.swing.*; +import java.util.Optional; import static org.jackhuang.hmcl.util.i18n.I18n.i18n; -import java.util.Optional; - public final class MessageBox { private MessageBox() { } diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MessageDialogPane.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MessageDialogPane.java index 842832d97..67b7868e5 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MessageDialogPane.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MessageDialogPane.java @@ -22,14 +22,14 @@ import javafx.fxml.FXML; import javafx.scene.control.Label; import javafx.scene.layout.HBox; import javafx.scene.layout.StackPane; - import org.jackhuang.hmcl.setting.Theme; import org.jackhuang.hmcl.ui.FXUtils; import org.jackhuang.hmcl.ui.SVG; -import static org.jackhuang.hmcl.util.i18n.I18n.i18n; import java.util.Optional; +import static org.jackhuang.hmcl.util.i18n.I18n.i18n; + public final class MessageDialogPane extends StackPane { @FXML diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MultiColorItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MultiColorItem.java index 9def56278..4cb7ef2ba 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MultiColorItem.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MultiColorItem.java @@ -13,14 +13,14 @@ import javafx.scene.layout.BorderPane; import javafx.scene.layout.HBox; import javafx.scene.layout.VBox; import javafx.scene.paint.Color; - import org.jackhuang.hmcl.ui.FXUtils; -import static org.jackhuang.hmcl.util.i18n.I18n.i18n; import java.util.Collection; import java.util.Optional; import java.util.function.Consumer; +import static org.jackhuang.hmcl.util.i18n.I18n.i18n; + public class MultiColorItem extends ComponentList { private final StringProperty customTitle = new SimpleStringProperty(this, "customTitle", i18n("selector.custom")); private final StringProperty chooserTitle = new SimpleStringProperty(this, "chooserTitle", i18n("selector.choose_file")); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MultiFileItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MultiFileItem.java index 8bcdf8d80..c8fcc6ca6 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MultiFileItem.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MultiFileItem.java @@ -34,18 +34,18 @@ import javafx.scene.layout.HBox; import javafx.scene.layout.VBox; import javafx.stage.DirectoryChooser; import javafx.stage.FileChooser; - import org.jackhuang.hmcl.setting.Theme; import org.jackhuang.hmcl.ui.Controllers; import org.jackhuang.hmcl.ui.FXUtils; import org.jackhuang.hmcl.ui.SVG; -import static org.jackhuang.hmcl.util.i18n.I18n.i18n; import java.io.File; import java.util.Collection; import java.util.Optional; import java.util.function.Consumer; +import static org.jackhuang.hmcl.util.i18n.I18n.i18n; + public class MultiFileItem extends ComponentList { private final StringProperty customTitle = new SimpleStringProperty(this, "customTitle", i18n("selector.custom")); private final StringProperty chooserTitle = new SimpleStringProperty(this, "chooserTitle", i18n("selector.choose_file")); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/Navigator.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/Navigator.java index 15e50c090..dab15abe4 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/Navigator.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/Navigator.java @@ -22,7 +22,6 @@ import javafx.beans.property.ReadOnlyBooleanWrapper; import javafx.beans.property.SimpleObjectProperty; import javafx.event.Event; import javafx.event.EventHandler; -import javafx.event.EventTarget; import javafx.event.EventType; import javafx.scene.Node; import javafx.scene.layout.Region; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TaskListPane.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TaskListPane.java index 5c1fc0845..7ce551ff4 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TaskListPane.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TaskListPane.java @@ -23,7 +23,6 @@ import javafx.scene.control.Label; import javafx.scene.layout.BorderPane; import javafx.scene.layout.StackPane; import javafx.scene.layout.VBox; - import org.jackhuang.hmcl.download.forge.ForgeInstallTask; import org.jackhuang.hmcl.download.game.GameAssetDownloadTask; import org.jackhuang.hmcl.download.game.GameAssetRefreshTask; @@ -35,11 +34,12 @@ import org.jackhuang.hmcl.mod.*; import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.task.TaskExecutor; import org.jackhuang.hmcl.task.TaskListener; -import static org.jackhuang.hmcl.util.i18n.I18n.i18n; import java.util.HashMap; import java.util.Map; +import static org.jackhuang.hmcl.util.i18n.I18n.i18n; + public final class TaskListPane extends StackPane { private final AdvancedListBox listBox = new AdvancedListBox(); private final Map nodes = new HashMap<>(); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorController.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorController.java index 469b4b4ba..8b524d5b7 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorController.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorController.java @@ -24,7 +24,6 @@ import javafx.animation.KeyValue; import javafx.animation.Timeline; import javafx.beans.binding.Bindings; import javafx.event.EventHandler; -import javafx.event.EventTarget; import javafx.geometry.Insets; import javafx.scene.Cursor; import javafx.scene.Node; @@ -43,7 +42,6 @@ import org.jackhuang.hmcl.setting.EnumBackgroundImage; import org.jackhuang.hmcl.task.TaskExecutor; import org.jackhuang.hmcl.ui.Controllers; import org.jackhuang.hmcl.ui.FXUtils; -import org.jackhuang.hmcl.ui.construct.Navigator; import org.jackhuang.hmcl.ui.account.AddAuthlibInjectorServerPane; import org.jackhuang.hmcl.ui.construct.*; import org.jackhuang.hmcl.ui.wizard.Refreshable; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/AdditionalInstallersPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/AdditionalInstallersPage.java index 630371e3f..27627c62e 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/AdditionalInstallersPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/AdditionalInstallersPage.java @@ -22,7 +22,6 @@ import javafx.fxml.FXML; import javafx.scene.control.Label; import javafx.scene.layout.StackPane; import javafx.scene.layout.VBox; - import org.jackhuang.hmcl.download.DownloadProvider; import org.jackhuang.hmcl.download.RemoteVersion; import org.jackhuang.hmcl.game.GameRepository; @@ -30,11 +29,12 @@ import org.jackhuang.hmcl.ui.FXUtils; import org.jackhuang.hmcl.ui.wizard.WizardController; import org.jackhuang.hmcl.ui.wizard.WizardPage; import org.jackhuang.hmcl.util.Lang; -import static org.jackhuang.hmcl.util.i18n.I18n.i18n; import java.util.Map; import java.util.Optional; +import static org.jackhuang.hmcl.util.i18n.I18n.i18n; + class AdditionalInstallersPage extends StackPane implements WizardPage { private final InstallerWizardProvider provider; private final WizardController controller; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/DownloadWizardProvider.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/DownloadWizardProvider.java index e11925936..d5067f540 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/DownloadWizardProvider.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/DownloadWizardProvider.java @@ -18,7 +18,6 @@ package org.jackhuang.hmcl.ui.download; import javafx.scene.Node; - import org.jackhuang.hmcl.download.DownloadProvider; import org.jackhuang.hmcl.download.GameBuilder; import org.jackhuang.hmcl.download.RemoteVersion; @@ -26,11 +25,11 @@ import org.jackhuang.hmcl.game.ModpackHelper; import org.jackhuang.hmcl.mod.Modpack; import org.jackhuang.hmcl.setting.Profile; import org.jackhuang.hmcl.setting.Profiles; -import org.jackhuang.hmcl.setting.Settings; import org.jackhuang.hmcl.task.Schedulers; import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.ui.wizard.WizardController; import org.jackhuang.hmcl.ui.wizard.WizardProvider; + import java.io.File; import java.util.Map; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/InstallerWizardProvider.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/InstallerWizardProvider.java index c98451914..293937bba 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/InstallerWizardProvider.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/InstallerWizardProvider.java @@ -18,7 +18,6 @@ package org.jackhuang.hmcl.ui.download; import javafx.scene.Node; - import org.jackhuang.hmcl.download.DownloadProvider; import org.jackhuang.hmcl.download.LibraryAnalyzer; import org.jackhuang.hmcl.download.RemoteVersion; @@ -28,10 +27,11 @@ import org.jackhuang.hmcl.setting.Profile; import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.ui.wizard.WizardController; import org.jackhuang.hmcl.ui.wizard.WizardProvider; -import static org.jackhuang.hmcl.util.i18n.I18n.i18n; import java.util.Map; +import static org.jackhuang.hmcl.util.i18n.I18n.i18n; + public final class InstallerWizardProvider implements WizardProvider { private final Profile profile; private final String gameVersion; 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 4f48a2acf..8a658f11b 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 @@ -23,7 +23,6 @@ import javafx.fxml.FXML; import javafx.scene.control.Label; import javafx.scene.layout.StackPane; import javafx.scene.layout.VBox; - import org.jackhuang.hmcl.download.DownloadProvider; import org.jackhuang.hmcl.download.RemoteVersion; import org.jackhuang.hmcl.game.GameRepository; @@ -32,10 +31,11 @@ import org.jackhuang.hmcl.ui.construct.Validator; import org.jackhuang.hmcl.ui.wizard.WizardController; import org.jackhuang.hmcl.ui.wizard.WizardPage; import org.jackhuang.hmcl.util.StringUtils; -import static org.jackhuang.hmcl.util.i18n.I18n.i18n; import java.util.Map; +import static org.jackhuang.hmcl.util.i18n.I18n.i18n; + public class InstallersPage extends StackPane implements WizardPage { private final WizardController controller; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackPage.java index 1716c2b64..b6ceab3ad 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackPage.java @@ -25,7 +25,6 @@ import javafx.scene.control.Label; import javafx.scene.layout.Region; import javafx.scene.layout.StackPane; import javafx.stage.FileChooser; - import org.jackhuang.hmcl.game.ModpackHelper; import org.jackhuang.hmcl.mod.Modpack; import org.jackhuang.hmcl.mod.UnsupportedModpackException; @@ -37,11 +36,12 @@ import org.jackhuang.hmcl.ui.construct.Validator; import org.jackhuang.hmcl.ui.wizard.WizardController; import org.jackhuang.hmcl.ui.wizard.WizardPage; import org.jackhuang.hmcl.util.StringUtils; -import static org.jackhuang.hmcl.util.i18n.I18n.i18n; import java.io.File; import java.util.Map; +import static org.jackhuang.hmcl.util.i18n.I18n.i18n; + public final class ModpackPage extends StackPane implements WizardPage { private final WizardController controller; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPageItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPageItem.java index bfdc5ae91..dddca340f 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPageItem.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPageItem.java @@ -23,17 +23,17 @@ import javafx.scene.image.Image; import javafx.scene.image.ImageView; import javafx.scene.layout.HBox; import javafx.scene.layout.StackPane; - import org.jackhuang.hmcl.download.RemoteVersion; import org.jackhuang.hmcl.download.forge.ForgeRemoteVersion; import org.jackhuang.hmcl.download.game.GameRemoteVersion; import org.jackhuang.hmcl.download.liteloader.LiteLoaderRemoteVersion; import org.jackhuang.hmcl.download.optifine.OptiFineRemoteVersion; import org.jackhuang.hmcl.ui.FXUtils; -import static org.jackhuang.hmcl.util.i18n.I18n.i18n; import java.util.Objects; +import static org.jackhuang.hmcl.util.i18n.I18n.i18n; + /** * @author huangyuhui */ diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackFileSelectionPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackFileSelectionPage.java index 2d79f7e72..92c8306d2 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackFileSelectionPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackFileSelectionPage.java @@ -25,7 +25,6 @@ import javafx.scene.control.Label; import javafx.scene.control.TreeItem; import javafx.scene.layout.HBox; import javafx.scene.layout.StackPane; - import org.jackhuang.hmcl.game.ModAdviser; import org.jackhuang.hmcl.setting.Profile; import org.jackhuang.hmcl.ui.FXUtils; @@ -34,6 +33,7 @@ import org.jackhuang.hmcl.ui.wizard.WizardController; import org.jackhuang.hmcl.ui.wizard.WizardPage; import org.jackhuang.hmcl.util.FileUtils; import org.jackhuang.hmcl.util.StringUtils; + import java.io.File; import java.util.LinkedList; import java.util.List; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackInfoPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackInfoPage.java index a72bb0baa..6d728d58c 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackInfoPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackInfoPage.java @@ -33,13 +33,14 @@ import org.jackhuang.hmcl.ui.Controllers; import org.jackhuang.hmcl.ui.FXUtils; import org.jackhuang.hmcl.ui.wizard.WizardController; import org.jackhuang.hmcl.ui.wizard.WizardPage; -import static org.jackhuang.hmcl.util.i18n.I18n.i18n; import java.io.File; import java.util.List; import java.util.Map; import java.util.Optional; +import static org.jackhuang.hmcl.util.i18n.I18n.i18n; + public final class ModpackInfoPage extends StackPane implements WizardPage { private final WizardController controller; @FXML diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/profile/ProfileAdvancedListItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/profile/ProfileAdvancedListItem.java index 47bd4b01a..86f21e752 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/profile/ProfileAdvancedListItem.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/profile/ProfileAdvancedListItem.java @@ -24,8 +24,6 @@ import org.jackhuang.hmcl.setting.Profile; import org.jackhuang.hmcl.setting.Profiles; import org.jackhuang.hmcl.ui.construct.AdvancedListItem; -import static org.jackhuang.hmcl.util.i18n.I18n.i18n; - public class ProfileAdvancedListItem extends AdvancedListItem { private ObjectProperty profile = new SimpleObjectProperty() { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/profile/ProfileListItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/profile/ProfileListItem.java index e49db6441..846577f6a 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/profile/ProfileListItem.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/profile/ProfileListItem.java @@ -17,24 +17,15 @@ */ package org.jackhuang.hmcl.ui.profile; -import javafx.beans.property.*; -import javafx.geometry.Rectangle2D; +import javafx.beans.property.BooleanProperty; +import javafx.beans.property.SimpleBooleanProperty; +import javafx.beans.property.SimpleStringProperty; +import javafx.beans.property.StringProperty; import javafx.scene.control.Control; import javafx.scene.control.Skin; import javafx.scene.control.ToggleGroup; -import javafx.scene.image.Image; -import org.jackhuang.hmcl.auth.Account; -import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount; -import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer; -import org.jackhuang.hmcl.auth.offline.OfflineAccount; -import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount; -import org.jackhuang.hmcl.game.AccountHelper; -import org.jackhuang.hmcl.setting.Accounts; import org.jackhuang.hmcl.setting.Profile; import org.jackhuang.hmcl.setting.Profiles; -import org.jackhuang.hmcl.task.Schedulers; - -import static org.jackhuang.hmcl.util.i18n.I18n.i18n; public class ProfileListItem extends Control { private final Profile profile; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/profile/ProfilePage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/profile/ProfilePage.java index b85c904ff..9faa58adb 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/profile/ProfilePage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/profile/ProfilePage.java @@ -24,7 +24,6 @@ import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; import javafx.fxml.FXML; import javafx.scene.layout.StackPane; - import org.jackhuang.hmcl.setting.Profile; import org.jackhuang.hmcl.setting.Profiles; import org.jackhuang.hmcl.ui.Controllers; @@ -32,11 +31,12 @@ import org.jackhuang.hmcl.ui.FXUtils; import org.jackhuang.hmcl.ui.construct.FileItem; import org.jackhuang.hmcl.ui.decorator.DecoratorPage; import org.jackhuang.hmcl.util.StringUtils; -import static org.jackhuang.hmcl.util.i18n.I18n.i18n; import java.io.File; import java.util.Optional; +import static org.jackhuang.hmcl.util.i18n.I18n.i18n; + public final class ProfilePage extends StackPane implements DecoratorPage { private final StringProperty title; private final StringProperty location; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameAdvancedListItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameAdvancedListItem.java index 58fbb22c2..211167fe2 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameAdvancedListItem.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameAdvancedListItem.java @@ -24,8 +24,8 @@ import org.jackhuang.hmcl.event.EventBus; import org.jackhuang.hmcl.event.RefreshedVersionsEvent; import org.jackhuang.hmcl.setting.Profile; import org.jackhuang.hmcl.setting.Profiles; -import org.jackhuang.hmcl.ui.construct.AdvancedListItem; import org.jackhuang.hmcl.ui.WeakListenerHelper; +import org.jackhuang.hmcl.ui.construct.AdvancedListItem; import java.io.File; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameList.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameList.java index 5655cefd3..fff5b55d3 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameList.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameList.java @@ -30,8 +30,8 @@ import org.jackhuang.hmcl.game.HMCLGameRepository; import org.jackhuang.hmcl.setting.Profile; import org.jackhuang.hmcl.setting.Profiles; import org.jackhuang.hmcl.ui.Controllers; -import org.jackhuang.hmcl.ui.download.DownloadWizardProvider; import org.jackhuang.hmcl.ui.decorator.DecoratorPage; +import org.jackhuang.hmcl.ui.download.DownloadWizardProvider; import org.jackhuang.hmcl.util.VersionNumber; import org.jackhuang.hmcl.util.i18n.I18n; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameListItemSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameListItemSkin.java index 4835e544d..f59273765 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameListItemSkin.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameListItemSkin.java @@ -18,7 +18,10 @@ package org.jackhuang.hmcl.ui.versions; import com.jfoenix.concurrency.JFXUtilities; -import com.jfoenix.controls.*; +import com.jfoenix.controls.JFXButton; +import com.jfoenix.controls.JFXListView; +import com.jfoenix.controls.JFXPopup; +import com.jfoenix.controls.JFXRadioButton; import com.jfoenix.effects.JFXDepthManager; import javafx.geometry.Pos; import javafx.scene.control.SkinBase; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/InstallerController.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/InstallerController.java index e4eae6aed..941096802 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/InstallerController.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/InstallerController.java @@ -20,7 +20,6 @@ package org.jackhuang.hmcl.ui.versions; import javafx.fxml.FXML; import javafx.scene.control.ScrollPane; import javafx.scene.layout.VBox; - import org.jackhuang.hmcl.download.LibraryAnalyzer; import org.jackhuang.hmcl.download.MaintainTask; import org.jackhuang.hmcl.download.game.VersionJsonSaveTask; @@ -34,13 +33,14 @@ import org.jackhuang.hmcl.ui.Controllers; import org.jackhuang.hmcl.ui.FXUtils; import org.jackhuang.hmcl.ui.InstallerItem; import org.jackhuang.hmcl.ui.download.InstallerWizardProvider; -import static org.jackhuang.hmcl.util.i18n.I18n.i18n; import java.util.LinkedList; import java.util.Optional; import java.util.function.Consumer; import java.util.function.Function; +import static org.jackhuang.hmcl.util.i18n.I18n.i18n; + public class InstallerController { private Profile profile; private String versionId; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModController.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModController.java index 5f8425bba..57e172a8d 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModController.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModController.java @@ -26,7 +26,6 @@ import javafx.scene.input.TransferMode; import javafx.scene.layout.StackPane; import javafx.scene.layout.VBox; import javafx.stage.FileChooser; - import org.jackhuang.hmcl.mod.ModInfo; import org.jackhuang.hmcl.mod.ModManager; import org.jackhuang.hmcl.task.Schedulers; @@ -36,7 +35,6 @@ import org.jackhuang.hmcl.ui.FXUtils; import org.jackhuang.hmcl.ui.ModItem; import org.jackhuang.hmcl.util.FileUtils; import org.jackhuang.hmcl.util.Logging; -import static org.jackhuang.hmcl.util.i18n.I18n.i18n; import java.io.File; import java.io.IOException; @@ -47,6 +45,8 @@ import java.util.List; import java.util.logging.Level; import java.util.stream.Collectors; +import static org.jackhuang.hmcl.util.i18n.I18n.i18n; + public final class ModController { @FXML private ScrollPane scrollPane; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java index 582c5d360..a2edfefe1 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java @@ -17,7 +17,10 @@ */ package org.jackhuang.hmcl.ui.versions; -import com.jfoenix.controls.*; +import com.jfoenix.controls.JFXCheckBox; +import com.jfoenix.controls.JFXComboBox; +import com.jfoenix.controls.JFXTextField; +import com.jfoenix.controls.JFXToggleButton; import javafx.application.Platform; import javafx.beans.InvalidationListener; import javafx.beans.binding.Bindings; @@ -31,7 +34,6 @@ import javafx.scene.layout.BorderPane; import javafx.scene.layout.StackPane; import javafx.scene.layout.VBox; import javafx.stage.FileChooser; - import org.jackhuang.hmcl.setting.EnumGameDirectory; import org.jackhuang.hmcl.setting.Profile; import org.jackhuang.hmcl.setting.VersionSetting; @@ -43,9 +45,10 @@ import org.jackhuang.hmcl.ui.construct.ComponentList; import org.jackhuang.hmcl.ui.construct.ImagePickerItem; import org.jackhuang.hmcl.ui.construct.MultiFileItem; import org.jackhuang.hmcl.ui.decorator.DecoratorPage; -import org.jackhuang.hmcl.ui.versions.Versions; -import org.jackhuang.hmcl.util.*; -import static org.jackhuang.hmcl.util.i18n.I18n.i18n; +import org.jackhuang.hmcl.util.FileUtils; +import org.jackhuang.hmcl.util.JavaVersion; +import org.jackhuang.hmcl.util.Logging; +import org.jackhuang.hmcl.util.OperatingSystem; import java.io.File; import java.io.IOException; @@ -55,6 +58,8 @@ import java.util.List; import java.util.logging.Level; import java.util.stream.Collectors; +import static org.jackhuang.hmcl.util.i18n.I18n.i18n; + public final class VersionSettingsPage extends StackPane implements DecoratorPage { private final StringProperty title = new SimpleStringProperty(); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/wizard/TaskExecutorDialogWizardDisplayer.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/wizard/TaskExecutorDialogWizardDisplayer.java index 4e4aeb76a..178fa0657 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/wizard/TaskExecutorDialogWizardDisplayer.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/wizard/TaskExecutorDialogWizardDisplayer.java @@ -19,17 +19,17 @@ package org.jackhuang.hmcl.ui.construct; import com.jfoenix.concurrency.JFXUtilities; import javafx.beans.property.StringProperty; - import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.task.TaskExecutor; import org.jackhuang.hmcl.task.TaskListener; import org.jackhuang.hmcl.ui.Controllers; import org.jackhuang.hmcl.ui.wizard.AbstractWizardDisplayer; import org.jackhuang.hmcl.util.StringUtils; -import static org.jackhuang.hmcl.util.i18n.I18n.i18n; import java.util.Map; +import static org.jackhuang.hmcl.util.i18n.I18n.i18n; + public interface TaskExecutorDialogWizardDisplayer extends AbstractWizardDisplayer { @Override diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/ExecutableHeaderHelper.java b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/ExecutableHeaderHelper.java index 7aee62983..bd9179f5a 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/ExecutableHeaderHelper.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/ExecutableHeaderHelper.java @@ -17,12 +17,7 @@ */ package org.jackhuang.hmcl.upgrade; -import static java.nio.file.StandardOpenOption.CREATE; -import static java.nio.file.StandardOpenOption.READ; -import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING; -import static java.nio.file.StandardOpenOption.WRITE; -import static org.jackhuang.hmcl.util.Lang.mapOf; -import static org.jackhuang.hmcl.util.Pair.pair; +import org.jackhuang.hmcl.util.IOUtils; import java.io.IOException; import java.io.InputStream; @@ -35,7 +30,9 @@ import java.util.Optional; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import org.jackhuang.hmcl.util.IOUtils; +import static java.nio.file.StandardOpenOption.*; +import static org.jackhuang.hmcl.util.Lang.mapOf; +import static org.jackhuang.hmcl.util.Pair.pair; /** * Helper class for adding/removing executable header from HMCL file. diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/HMCLDownloadTask.java b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/HMCLDownloadTask.java index 73df477c8..9e11f0062 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/HMCLDownloadTask.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/HMCLDownloadTask.java @@ -17,6 +17,10 @@ */ package org.jackhuang.hmcl.upgrade; +import org.jackhuang.hmcl.task.FileDownloadTask; +import org.jackhuang.hmcl.util.NetworkUtils; +import org.tukaani.xz.XZInputStream; + import java.io.ByteArrayInputStream; import java.io.InputStream; import java.nio.file.Files; @@ -24,10 +28,6 @@ import java.nio.file.Path; import java.util.jar.JarOutputStream; import java.util.jar.Pack200; -import org.jackhuang.hmcl.task.FileDownloadTask; -import org.jackhuang.hmcl.util.NetworkUtils; -import org.tukaani.xz.XZInputStream; - class HMCLDownloadTask extends FileDownloadTask { private RemoteVersion.Type archiveFormat; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/IntegrityChecker.java b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/IntegrityChecker.java index 72fb69817..7079b4cf4 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/IntegrityChecker.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/IntegrityChecker.java @@ -17,8 +17,9 @@ */ package org.jackhuang.hmcl.upgrade; -import static java.nio.charset.StandardCharsets.UTF_8; -import static org.jackhuang.hmcl.util.Logging.LOG; +import org.jackhuang.hmcl.util.DigestUtils; +import org.jackhuang.hmcl.util.IOUtils; +import org.jackhuang.hmcl.util.JarUtils; import java.io.IOException; import java.io.InputStream; @@ -30,14 +31,13 @@ import java.security.Signature; import java.security.spec.X509EncodedKeySpec; import java.util.Map; import java.util.Map.Entry; -import java.util.logging.Level; import java.util.TreeMap; +import java.util.logging.Level; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import org.jackhuang.hmcl.util.DigestUtils; -import org.jackhuang.hmcl.util.IOUtils; -import org.jackhuang.hmcl.util.JarUtils; +import static java.nio.charset.StandardCharsets.UTF_8; +import static org.jackhuang.hmcl.util.Logging.LOG; /** * A class that checks the integrity of HMCL. diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/RemoteVersion.java b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/RemoteVersion.java index 504cdaeea..fbfcdcd94 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/RemoteVersion.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/RemoteVersion.java @@ -17,16 +17,15 @@ */ package org.jackhuang.hmcl.upgrade; -import java.io.IOException; -import java.util.Optional; - +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; import org.jackhuang.hmcl.task.FileDownloadTask.IntegrityCheck; import org.jackhuang.hmcl.util.JsonUtils; import org.jackhuang.hmcl.util.NetworkUtils; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; +import java.io.IOException; +import java.util.Optional; public class RemoteVersion { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateChecker.java b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateChecker.java index c5ae2ed8f..7e04dc6c2 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateChecker.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateChecker.java @@ -17,6 +17,18 @@ */ package org.jackhuang.hmcl.upgrade; +import javafx.application.Platform; +import javafx.beans.binding.Bindings; +import javafx.beans.binding.BooleanBinding; +import javafx.beans.property.*; +import javafx.beans.value.ObservableBooleanValue; +import org.jackhuang.hmcl.Metadata; +import org.jackhuang.hmcl.setting.ConfigHolder; +import org.jackhuang.hmcl.util.NetworkUtils; + +import java.io.IOException; +import java.util.logging.Level; + import static org.jackhuang.hmcl.setting.ConfigHolder.config; import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating; import static org.jackhuang.hmcl.util.Lang.mapOf; @@ -25,19 +37,6 @@ import static org.jackhuang.hmcl.util.Logging.LOG; import static org.jackhuang.hmcl.util.Pair.pair; import static org.jackhuang.hmcl.util.VersionNumber.asVersion; -import java.io.IOException; -import java.util.logging.Level; - -import javafx.beans.property.*; -import org.jackhuang.hmcl.Metadata; -import org.jackhuang.hmcl.setting.ConfigHolder; -import org.jackhuang.hmcl.util.NetworkUtils; - -import javafx.application.Platform; -import javafx.beans.binding.Bindings; -import javafx.beans.binding.BooleanBinding; -import javafx.beans.value.ObservableBooleanValue; - public final class UpdateChecker { private UpdateChecker() {} diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateHandler.java b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateHandler.java index 87a3f54b9..0a0ce70be 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateHandler.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateHandler.java @@ -17,26 +17,9 @@ */ package org.jackhuang.hmcl.upgrade; -import static java.nio.charset.StandardCharsets.UTF_8; -import static org.jackhuang.hmcl.ui.FXUtils.checkFxUserThread; -import static org.jackhuang.hmcl.util.Lang.thread; -import static org.jackhuang.hmcl.util.Logging.LOG; -import static org.jackhuang.hmcl.util.i18n.I18n.i18n; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.logging.Level; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import javax.swing.JOptionPane; - +import com.google.gson.Gson; +import javafx.application.Platform; +import javafx.scene.layout.Region; import org.jackhuang.hmcl.Launcher; import org.jackhuang.hmcl.Main; import org.jackhuang.hmcl.Metadata; @@ -49,10 +32,24 @@ import org.jackhuang.hmcl.util.JarUtils; import org.jackhuang.hmcl.util.JavaVersion; import org.jackhuang.hmcl.util.StringUtils; -import com.google.gson.Gson; +import javax.swing.*; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.logging.Level; +import java.util.regex.Matcher; +import java.util.regex.Pattern; -import javafx.application.Platform; -import javafx.scene.layout.Region; +import static java.nio.charset.StandardCharsets.UTF_8; +import static org.jackhuang.hmcl.ui.FXUtils.checkFxUserThread; +import static org.jackhuang.hmcl.util.Lang.thread; +import static org.jackhuang.hmcl.util.Logging.LOG; +import static org.jackhuang.hmcl.util.i18n.I18n.i18n; public final class UpdateHandler { private UpdateHandler() {} diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/CrashReporter.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/CrashReporter.java index c08edfd74..f2488daed 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/util/CrashReporter.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/CrashReporter.java @@ -18,17 +18,12 @@ package org.jackhuang.hmcl.util; import javafx.application.Platform; - import org.jackhuang.hmcl.Metadata; import org.jackhuang.hmcl.ui.CrashWindow; import org.jackhuang.hmcl.ui.construct.MessageBox; import org.jackhuang.hmcl.upgrade.IntegrityChecker; import org.jackhuang.hmcl.upgrade.UpdateChecker; -import static java.util.Collections.newSetFromMap; -import static org.jackhuang.hmcl.util.Logging.LOG; -import static org.jackhuang.hmcl.util.i18n.I18n.i18n; - import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Date; @@ -38,6 +33,10 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; +import static java.util.Collections.newSetFromMap; +import static org.jackhuang.hmcl.util.Logging.LOG; +import static org.jackhuang.hmcl.util.i18n.I18n.i18n; + /** * @author huangyuhui */ diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/I18n.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/I18n.java index eaaf59dbe..f11040815 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/I18n.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/I18n.java @@ -17,14 +17,14 @@ */ package org.jackhuang.hmcl.util.i18n; -import static org.jackhuang.hmcl.util.Logging.LOG; +import org.jackhuang.hmcl.setting.ConfigHolder; +import org.jackhuang.hmcl.util.i18n.Locales.SupportedLocale; import java.util.MissingResourceException; import java.util.ResourceBundle; import java.util.logging.Level; -import org.jackhuang.hmcl.setting.ConfigHolder; -import org.jackhuang.hmcl.util.i18n.Locales.SupportedLocale; +import static org.jackhuang.hmcl.util.Logging.LOG; public final class I18n { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/Locales.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/Locales.java index 009523407..f95bed99d 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/Locales.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/Locales.java @@ -17,10 +17,9 @@ */ package org.jackhuang.hmcl.util.i18n; -import org.jackhuang.hmcl.util.Lang; - import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; +import org.jackhuang.hmcl.util.Lang; import java.io.IOException; import java.util.List; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/UTF8Control.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/UTF8Control.java index e53acf7db..670b60906 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/UTF8Control.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/UTF8Control.java @@ -17,8 +17,6 @@ */ package org.jackhuang.hmcl.util.i18n; -import static java.nio.charset.StandardCharsets.UTF_8; - import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -28,6 +26,8 @@ import java.util.Locale; import java.util.PropertyResourceBundle; import java.util.ResourceBundle; +import static java.nio.charset.StandardCharsets.UTF_8; + final class UTF8Control extends ResourceBundle.Control { public static final UTF8Control INSTANCE = new UTF8Control(); diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/Account.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/Account.java index f045c1251..ab0274492 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/Account.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/Account.java @@ -17,12 +17,11 @@ */ package org.jackhuang.hmcl.auth; -import org.jackhuang.hmcl.util.ObservableHelper; -import org.jackhuang.hmcl.util.ToStringBuilder; - import javafx.application.Platform; import javafx.beans.InvalidationListener; import javafx.beans.Observable; +import org.jackhuang.hmcl.util.ObservableHelper; +import org.jackhuang.hmcl.util.ToStringBuilder; import java.util.Map; import java.util.Optional; diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorAccount.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorAccount.java index 43c40ccb2..a96ec83a7 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorAccount.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorAccount.java @@ -29,18 +29,13 @@ import org.jackhuang.hmcl.util.ExceptionalSupplier; import org.jackhuang.hmcl.util.Lang; import org.jackhuang.hmcl.util.NetworkUtils; -import java.util.Base64; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.UUID; +import java.io.IOException; +import java.util.*; import java.util.logging.Level; import static java.nio.charset.StandardCharsets.UTF_8; import static org.jackhuang.hmcl.util.Logging.LOG; -import java.io.IOException; - public class AuthlibInjectorAccount extends YggdrasilAccount { private AuthlibInjectorServer server; private ExceptionalSupplier authlibInjectorDownloader; diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorDnD.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorDnD.java index 0568df0ce..ec6de3446 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorDnD.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorDnD.java @@ -17,16 +17,16 @@ */ package org.jackhuang.hmcl.auth.authlibinjector; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import java.util.Optional; -import java.util.function.Consumer; - import javafx.event.EventHandler; import javafx.scene.input.DragEvent; import javafx.scene.input.Dragboard; import javafx.scene.input.TransferMode; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.util.Optional; +import java.util.function.Consumer; + /** * @author yushijinhun * @see https://github.com/yushijinhun/authlib-injector/wiki/%E5%90%AF%E5%8A%A8%E5%99%A8%E6%8A%80%E6%9C%AF%E8%A7%84%E8%8C%83#dnd-%E6%96%B9%E5%BC%8F%E6%B7%BB%E5%8A%A0-yggdrasil-%E6%9C%8D%E5%8A%A1%E7%AB%AF diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorDownloader.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorDownloader.java index 40b03aa17..77a4df615 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorDownloader.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorDownloader.java @@ -17,7 +17,13 @@ */ package org.jackhuang.hmcl.auth.authlibinjector; -import static org.jackhuang.hmcl.util.Logging.LOG; +import com.google.gson.JsonParseException; +import com.google.gson.annotations.SerializedName; +import org.jackhuang.hmcl.download.DownloadProvider; +import org.jackhuang.hmcl.task.FileDownloadTask; +import org.jackhuang.hmcl.task.FileDownloadTask.IntegrityCheck; +import org.jackhuang.hmcl.util.JsonUtils; +import org.jackhuang.hmcl.util.NetworkUtils; import java.io.IOException; import java.net.URL; @@ -30,14 +36,7 @@ import java.util.jar.Attributes; import java.util.jar.JarFile; import java.util.logging.Level; -import org.jackhuang.hmcl.download.DownloadProvider; -import org.jackhuang.hmcl.task.FileDownloadTask; -import org.jackhuang.hmcl.task.FileDownloadTask.IntegrityCheck; -import org.jackhuang.hmcl.util.JsonUtils; -import org.jackhuang.hmcl.util.NetworkUtils; - -import com.google.gson.JsonParseException; -import com.google.gson.annotations.SerializedName; +import static org.jackhuang.hmcl.util.Logging.LOG; public class AuthlibInjectorDownloader { diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorServer.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorServer.java index d48a71ed9..b331e9c86 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorServer.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorServer.java @@ -17,17 +17,16 @@ */ package org.jackhuang.hmcl.auth.authlibinjector; -import static org.jackhuang.hmcl.util.Lang.tryCast; +import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; +import com.google.gson.JsonPrimitive; +import org.jackhuang.hmcl.util.JsonUtils; +import org.jackhuang.hmcl.util.NetworkUtils; import java.io.IOException; import java.util.Optional; -import org.jackhuang.hmcl.util.JsonUtils; -import org.jackhuang.hmcl.util.NetworkUtils; - -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; -import com.google.gson.JsonPrimitive; +import static org.jackhuang.hmcl.util.Lang.tryCast; public class AuthlibInjectorServer { diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/yggdrasil/YggdrasilService.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/yggdrasil/YggdrasilService.java index a56483e46..6e6282099 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/yggdrasil/YggdrasilService.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/yggdrasil/YggdrasilService.java @@ -3,7 +3,9 @@ package org.jackhuang.hmcl.auth.yggdrasil; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonParseException; -import org.jackhuang.hmcl.auth.*; +import org.jackhuang.hmcl.auth.AuthenticationException; +import org.jackhuang.hmcl.auth.ServerDisconnectException; +import org.jackhuang.hmcl.auth.ServerResponseMalformedException; import org.jackhuang.hmcl.util.NetworkUtils; import org.jackhuang.hmcl.util.StringUtils; import org.jackhuang.hmcl.util.UUIDTypeAdapter; diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/DefaultDependencyManager.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/DefaultDependencyManager.java index 0378279a2..16150408f 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/DefaultDependencyManager.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/DefaultDependencyManager.java @@ -19,7 +19,10 @@ package org.jackhuang.hmcl.download; import org.jackhuang.hmcl.download.forge.ForgeInstallTask; import org.jackhuang.hmcl.download.forge.ForgeRemoteVersion; -import org.jackhuang.hmcl.download.game.*; +import org.jackhuang.hmcl.download.game.GameAssetDownloadTask; +import org.jackhuang.hmcl.download.game.GameLibrariesTask; +import org.jackhuang.hmcl.download.game.LibrariesUniqueTask; +import org.jackhuang.hmcl.download.game.VersionJsonSaveTask; import org.jackhuang.hmcl.download.liteloader.LiteLoaderInstallTask; import org.jackhuang.hmcl.download.liteloader.LiteLoaderRemoteVersion; import org.jackhuang.hmcl.download.optifine.OptiFineInstallTask; diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/MaintainTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/MaintainTask.java index ea4df2f5e..e9727bd34 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/MaintainTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/MaintainTask.java @@ -17,12 +17,18 @@ */ package org.jackhuang.hmcl.download; -import org.jackhuang.hmcl.game.*; +import org.jackhuang.hmcl.game.Argument; +import org.jackhuang.hmcl.game.Arguments; +import org.jackhuang.hmcl.game.StringArgument; +import org.jackhuang.hmcl.game.Version; import org.jackhuang.hmcl.task.TaskResult; import org.jackhuang.hmcl.util.CommandBuilder; import org.jackhuang.hmcl.util.StringUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; public class MaintainTask extends TaskResult { diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/liteloader/LiteLoaderInstallTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/liteloader/LiteLoaderInstallTask.java index f6043cd9e..d9fd49da4 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/liteloader/LiteLoaderInstallTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/liteloader/LiteLoaderInstallTask.java @@ -19,7 +19,10 @@ package org.jackhuang.hmcl.download.liteloader; import org.jackhuang.hmcl.download.DefaultDependencyManager; import org.jackhuang.hmcl.download.game.GameLibrariesTask; -import org.jackhuang.hmcl.game.*; +import org.jackhuang.hmcl.game.LibrariesDownloadInfo; +import org.jackhuang.hmcl.game.Library; +import org.jackhuang.hmcl.game.LibraryDownloadInfo; +import org.jackhuang.hmcl.game.Version; import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.task.TaskResult; import org.jackhuang.hmcl.util.Lang; diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/optifine/OptiFineInstallTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/optifine/OptiFineInstallTask.java index e3c4da317..f2ca3bce4 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/optifine/OptiFineInstallTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/optifine/OptiFineInstallTask.java @@ -19,7 +19,10 @@ package org.jackhuang.hmcl.download.optifine; import org.jackhuang.hmcl.download.DefaultDependencyManager; import org.jackhuang.hmcl.download.game.GameLibrariesTask; -import org.jackhuang.hmcl.game.*; +import org.jackhuang.hmcl.game.LibrariesDownloadInfo; +import org.jackhuang.hmcl.game.Library; +import org.jackhuang.hmcl.game.LibraryDownloadInfo; +import org.jackhuang.hmcl.game.Version; import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.task.TaskResult; import org.jackhuang.hmcl.util.Lang; diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/RiftModMetadata.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/RiftModMetadata.java index 710e0a570..bf324364c 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/RiftModMetadata.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/RiftModMetadata.java @@ -18,7 +18,10 @@ package org.jackhuang.hmcl.mod; import com.google.gson.JsonParseException; -import org.jackhuang.hmcl.util.*; +import org.jackhuang.hmcl.util.CompressingUtils; +import org.jackhuang.hmcl.util.IOUtils; +import org.jackhuang.hmcl.util.Immutable; +import org.jackhuang.hmcl.util.JsonUtils; import java.io.File; import java.io.IOException; diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/FileDownloadTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/FileDownloadTask.java index 056f7d08d..008c44ddf 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/FileDownloadTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/FileDownloadTask.java @@ -19,11 +19,7 @@ package org.jackhuang.hmcl.task; import org.jackhuang.hmcl.event.EventManager; import org.jackhuang.hmcl.event.FailedEvent; -import org.jackhuang.hmcl.util.ChecksumMismatchException; -import org.jackhuang.hmcl.util.FileUtils; -import org.jackhuang.hmcl.util.IOUtils; -import org.jackhuang.hmcl.util.Logging; -import org.jackhuang.hmcl.util.NetworkUtils; +import org.jackhuang.hmcl.util.*; import java.io.File; import java.io.IOException; diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/CommandBuilder.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/CommandBuilder.java index 70ae1eb7b..c4cb08194 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/CommandBuilder.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/CommandBuilder.java @@ -17,7 +17,9 @@ */ package org.jackhuang.hmcl.util; -import java.util.*; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; import java.util.function.Predicate; import java.util.stream.Collectors; diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Constants.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Constants.java index 8337473dd..7324b0495 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Constants.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Constants.java @@ -19,11 +19,9 @@ package org.jackhuang.hmcl.util; import com.google.gson.Gson; import com.google.gson.GsonBuilder; - import javafx.beans.binding.Bindings; import javafx.beans.binding.ObjectBinding; import javafx.scene.image.Image; - import org.jackhuang.hmcl.game.Argument; import org.jackhuang.hmcl.game.Library; import org.jackhuang.hmcl.game.RuledArgument; diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/EnumOrdinalDeserializer.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/EnumOrdinalDeserializer.java index e1c3cc95b..b5c1e91d4 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/EnumOrdinalDeserializer.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/EnumOrdinalDeserializer.java @@ -17,16 +17,16 @@ */ package org.jackhuang.hmcl.util; -import java.lang.reflect.Type; -import java.util.HashMap; -import java.util.Map; - import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonParseException; import com.google.gson.annotations.SerializedName; +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.Map; + /** * A deserializer that supports deserializing strings and **numbers** into enums. * diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/IOUtils.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/IOUtils.java index 999b8c53f..9e7dc3f06 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/IOUtils.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/IOUtils.java @@ -17,7 +17,10 @@ */ package org.jackhuang.hmcl.util; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.nio.charset.Charset; /** diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/JavaVersion.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/JavaVersion.java index 7a04e1fd6..51518363d 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/JavaVersion.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/JavaVersion.java @@ -17,7 +17,10 @@ */ package org.jackhuang.hmcl.util; -import java.io.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; import java.nio.file.Files; import java.nio.file.LinkOption; import java.nio.file.Path; diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/MappedObservableList.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/MappedObservableList.java index 21ab225eb..92683231c 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/MappedObservableList.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/MappedObservableList.java @@ -17,17 +17,6 @@ */ package org.jackhuang.hmcl.util; -import static java.util.stream.Collectors.toCollection; -import static javafx.collections.FXCollections.unmodifiableObservableList; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.IdentityHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.function.Function; - import javafx.beans.InvalidationListener; import javafx.beans.Observable; import javafx.collections.FXCollections; @@ -35,6 +24,12 @@ import javafx.collections.ListChangeListener; import javafx.collections.ObservableList; import javafx.collections.WeakListChangeListener; +import java.util.*; +import java.util.function.Function; + +import static java.util.stream.Collectors.toCollection; +import static javafx.collections.FXCollections.unmodifiableObservableList; + /** * @author yushijinhun */ diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ObservableHelper.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ObservableHelper.java index ba5a9a882..796e1c29f 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ObservableHelper.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ObservableHelper.java @@ -17,12 +17,12 @@ */ package org.jackhuang.hmcl.util; -import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; - import javafx.beans.InvalidationListener; import javafx.beans.Observable; +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; + /** * Helper class for implementing {@link Observable}. * diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/VersionNumber.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/VersionNumber.java index 3ecafe2f1..6e09503c8 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/VersionNumber.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/VersionNumber.java @@ -17,7 +17,10 @@ */ package org.jackhuang.hmcl.util; -import java.util.*; +import java.util.Comparator; +import java.util.List; +import java.util.Objects; +import java.util.Optional; /** * The formatted version number represents a version string.