From f640922a5078de079a08f0faaf0bbd1d30d06a73 Mon Sep 17 00:00:00 2001 From: huangyuhui Date: Fri, 8 Jun 2018 12:47:34 +0800 Subject: [PATCH] Optimize imports --- .../java/org/jackhuang/hmcl/Launcher.java | 1 - .../main/java/org/jackhuang/hmcl/Main.java | 3 +- .../hmcl/event/AccountLoadingEvent.java | 1 - .../jackhuang/hmcl/game/AccountHelper.java | 6 +-- .../hmcl/game/HMCLGameRepository.java | 1 - .../jackhuang/hmcl/game/LauncherHelper.java | 6 +-- .../org/jackhuang/hmcl/setting/Accounts.java | 10 +++-- .../jackhuang/hmcl/ui/AccountLoginPane.java | 3 -- .../org/jackhuang/hmcl/ui/Controllers.java | 3 -- .../java/org/jackhuang/hmcl/ui/FXUtils.java | 4 -- .../java/org/jackhuang/hmcl/ui/MainPage.java | 1 - .../hmcl/ui/construct/InputDialogPane.java | 1 - .../hmcl/ui/construct/MessageBox.java | 1 - .../hmcl/ui/construct/MessageDialogPane.java | 1 - .../hmcl/ui/construct/URLValidator.java | 1 - .../hmcl/ui/export/ExportWizardProvider.java | 1 - .../ui/export/ModpackFileSelectionPage.java | 6 +-- .../hmcl/ui/export/ModpackInfoPage.java | 1 - .../hmcl/upgrade/AppDataUpgrader.java | 1 - .../org/jackhuang/hmcl/auth/AuthInfo.java | 4 +- .../hmcl/auth/offline/OfflineAccount.java | 14 +++---- .../hmcl/auth/yggdrasil/YggdrasilService.java | 37 +++++++------------ .../hmcl/auth/yggdrasil/YggdrasilSession.java | 15 ++++---- .../download/BMCLAPIDownloadProvider.java | 1 - .../download/game/GameAssetRefreshTask.java | 4 +- .../download/game/LibrariesUniqueTask.java | 6 ++- .../download/game/LibraryDownloadTask.java | 11 ++++-- .../hmcl/launch/DefaultLauncher.java | 6 +-- .../jackhuang/hmcl/task/FileDownloadTask.java | 5 ++- .../org/jackhuang/hmcl/util/JavaVersion.java | 5 ++- .../jackhuang/hmcl/util/OperatingSystem.java | 7 ++-- 31 files changed, 70 insertions(+), 97 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java b/HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java index 83abb02b3..69df97a21 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java @@ -31,7 +31,6 @@ import org.jackhuang.hmcl.upgrade.UpdateChecker; import org.jackhuang.hmcl.util.*; import java.io.File; -import java.io.IOException; import java.net.URISyntaxException; import java.net.URL; import java.net.URLClassLoader; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/Main.java b/HMCL/src/main/java/org/jackhuang/hmcl/Main.java index 6e8ae0916..af6c99880 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/Main.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/Main.java @@ -17,10 +17,9 @@ */ package org.jackhuang.hmcl; +import javax.swing.*; import java.io.File; -import javax.swing.JOptionPane; - public final class Main { public static void main(String[] args) { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/event/AccountLoadingEvent.java b/HMCL/src/main/java/org/jackhuang/hmcl/event/AccountLoadingEvent.java index 02485fc97..de4fdc167 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/event/AccountLoadingEvent.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/event/AccountLoadingEvent.java @@ -18,7 +18,6 @@ package org.jackhuang.hmcl.event; import org.jackhuang.hmcl.auth.Account; -import org.jackhuang.hmcl.setting.Profile; import org.jackhuang.hmcl.util.ToStringBuilder; import java.util.Collection; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/AccountHelper.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/AccountHelper.java index fdca46992..7bc572bd2 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/game/AccountHelper.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/AccountHelper.java @@ -34,11 +34,7 @@ import org.jackhuang.hmcl.util.NetworkUtils; import java.io.File; import java.net.Proxy; -import java.util.Collection; -import java.util.LinkedList; -import java.util.List; -import java.util.Optional; -import java.util.UUID; +import java.util.*; public final class AccountHelper { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameRepository.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameRepository.java index b98f7355f..2b242795e 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameRepository.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameRepository.java @@ -27,7 +27,6 @@ import org.jackhuang.hmcl.setting.Profile; import org.jackhuang.hmcl.setting.Settings; import org.jackhuang.hmcl.setting.VersionSetting; import org.jackhuang.hmcl.util.FileUtils; -import org.jackhuang.hmcl.util.Lang; import org.jackhuang.hmcl.util.Logging; import java.io.File; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java index 1f0bd4a9a..2095e95c5 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java @@ -17,9 +17,6 @@ */ package org.jackhuang.hmcl.game; -import static org.jackhuang.hmcl.util.Lang.mapOf; -import static org.jackhuang.hmcl.util.Pair.pair; - import javafx.application.Platform; import org.jackhuang.hmcl.Launcher; import org.jackhuang.hmcl.auth.Account; @@ -48,6 +45,9 @@ import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; +import static org.jackhuang.hmcl.util.Lang.mapOf; +import static org.jackhuang.hmcl.util.Pair.pair; + public final class LauncherHelper { public static final LauncherHelper INSTANCE = new LauncherHelper(); private LauncherHelper(){} 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 0af6fa611..2cd40af11 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Accounts.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Accounts.java @@ -17,9 +17,6 @@ */ package org.jackhuang.hmcl.setting; -import static org.jackhuang.hmcl.util.Lang.mapOf; -import static org.jackhuang.hmcl.util.Pair.pair; - import org.jackhuang.hmcl.Launcher; import org.jackhuang.hmcl.auth.Account; import org.jackhuang.hmcl.auth.AccountFactory; @@ -35,7 +32,9 @@ import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccountFactory; import org.jackhuang.hmcl.task.FileDownloadTask; import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.task.TaskResult; -import org.jackhuang.hmcl.util.*; +import org.jackhuang.hmcl.util.Constants; +import org.jackhuang.hmcl.util.FileUtils; +import org.jackhuang.hmcl.util.NetworkUtils; import java.io.File; import java.io.IOException; @@ -43,6 +42,9 @@ import java.net.URL; import java.util.HashMap; import java.util.Map; +import static org.jackhuang.hmcl.util.Lang.mapOf; +import static org.jackhuang.hmcl.util.Pair.pair; + /** * @author huangyuhui */ diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AccountLoginPane.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AccountLoginPane.java index 344099d5f..f7f6195a7 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AccountLoginPane.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AccountLoginPane.java @@ -17,7 +17,6 @@ */ package org.jackhuang.hmcl.ui; -import com.jfoenix.controls.JFXDialog; import com.jfoenix.controls.JFXPasswordField; import com.jfoenix.controls.JFXProgressBar; import javafx.fxml.FXML; @@ -29,8 +28,6 @@ import org.jackhuang.hmcl.auth.AuthInfo; import org.jackhuang.hmcl.auth.NoSelectedCharacterException; import org.jackhuang.hmcl.task.Schedulers; import org.jackhuang.hmcl.task.Task; -import org.jackhuang.hmcl.ui.AddAccountPane; -import org.jackhuang.hmcl.ui.FXUtils; import java.util.function.Consumer; 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 5521399a4..bc7d9e3fa 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java @@ -17,8 +17,6 @@ */ package org.jackhuang.hmcl.ui; -import com.jfoenix.concurrency.JFXUtilities; -import com.jfoenix.controls.JFXDialog; import javafx.scene.Node; import javafx.scene.Scene; import javafx.scene.image.Image; @@ -33,7 +31,6 @@ import org.jackhuang.hmcl.ui.construct.MessageBox; import org.jackhuang.hmcl.ui.construct.MessageDialogPane; import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogPane; import org.jackhuang.hmcl.util.JavaVersion; -import org.jackhuang.hmcl.util.Lang; import java.util.function.Consumer; 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 fe2505b61..ef3659ab4 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java @@ -17,9 +17,7 @@ */ package org.jackhuang.hmcl.ui; -import com.jfoenix.adapters.ReflectionHelper; import com.jfoenix.controls.*; - import javafx.animation.Animation; import javafx.animation.Interpolator; import javafx.animation.KeyFrame; @@ -43,7 +41,6 @@ import javafx.scene.input.ScrollEvent; import javafx.scene.layout.Region; import javafx.scene.shape.Rectangle; import javafx.util.Duration; - import org.jackhuang.hmcl.Launcher; import org.jackhuang.hmcl.util.*; @@ -52,7 +49,6 @@ import java.io.IOException; import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.net.URI; -import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; 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 d9cb99f1d..edabc4d43 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPage.java @@ -51,7 +51,6 @@ import org.jackhuang.hmcl.util.OperatingSystem; import java.io.File; import java.io.IOException; import java.util.List; -import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/InputDialogPane.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/InputDialogPane.java index 6488ad18c..5fbb315a7 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/InputDialogPane.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/InputDialogPane.java @@ -18,7 +18,6 @@ package org.jackhuang.hmcl.ui.construct; import com.jfoenix.controls.JFXButton; -import com.jfoenix.controls.JFXDialog; import com.jfoenix.controls.JFXTextField; import javafx.fxml.FXML; import javafx.scene.control.Label; 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 528e0b55a..939f39e4a 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 @@ -17,7 +17,6 @@ */ package org.jackhuang.hmcl.ui.construct; -import com.jfoenix.concurrency.JFXUtilities; import javafx.scene.control.Alert; import javafx.scene.control.ButtonType; import javafx.scene.control.TextInputDialog; 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 df97902ef..306467b23 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 @@ -18,7 +18,6 @@ package org.jackhuang.hmcl.ui.construct; import com.jfoenix.controls.JFXButton; -import com.jfoenix.controls.JFXDialog; import javafx.fxml.FXML; import javafx.scene.control.Label; import javafx.scene.layout.HBox; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/URLValidator.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/URLValidator.java index 3a79fd997..87a5f38fa 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/URLValidator.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/URLValidator.java @@ -1,7 +1,6 @@ package org.jackhuang.hmcl.ui.construct; import com.jfoenix.validation.base.ValidatorBase; -import javafx.beans.NamedArg; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.scene.control.TextInputControl; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ExportWizardProvider.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ExportWizardProvider.java index 2bdb58be7..6d13755db 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ExportWizardProvider.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ExportWizardProvider.java @@ -28,7 +28,6 @@ import org.jackhuang.hmcl.setting.Settings; import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.ui.wizard.WizardController; import org.jackhuang.hmcl.ui.wizard.WizardProvider; -import org.jackhuang.hmcl.util.Constants; import org.jackhuang.hmcl.util.ZipEngine; import java.io.File; 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 72c8b2845..5915c4d9e 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 @@ -17,9 +17,6 @@ */ package org.jackhuang.hmcl.ui.export; -import static org.jackhuang.hmcl.util.Lang.mapOf; -import static org.jackhuang.hmcl.util.Pair.pair; - import com.jfoenix.controls.JFXTreeView; import javafx.fxml.FXML; import javafx.scene.control.CheckBox; @@ -44,6 +41,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import static org.jackhuang.hmcl.util.Lang.mapOf; +import static org.jackhuang.hmcl.util.Pair.pair; + /** * @author huangyuhui */ 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 5bfa2240b..a178be5bf 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,7 +33,6 @@ 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 org.jackhuang.hmcl.util.FileUtils; import java.io.File; import java.util.List; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/AppDataUpgrader.java b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/AppDataUpgrader.java index 3bf965e34..d713536c2 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/AppDataUpgrader.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/AppDataUpgrader.java @@ -23,7 +23,6 @@ import com.jfoenix.concurrency.JFXUtilities; import javafx.scene.layout.Region; import org.jackhuang.hmcl.Launcher; import org.jackhuang.hmcl.task.FileDownloadTask; -import org.jackhuang.hmcl.task.Schedulers; import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.task.TaskExecutor; import org.jackhuang.hmcl.ui.Controllers; diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/AuthInfo.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/AuthInfo.java index 2663b0b12..18b3a81cc 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/AuthInfo.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/AuthInfo.java @@ -17,11 +17,11 @@ */ package org.jackhuang.hmcl.auth; -import java.util.UUID; - import org.jackhuang.hmcl.game.Arguments; import org.jackhuang.hmcl.util.Immutable; +import java.util.UUID; + /** * * @author huangyuhui diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/offline/OfflineAccount.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/offline/OfflineAccount.java index 83e2e68e2..aee8c60ed 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/offline/OfflineAccount.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/offline/OfflineAccount.java @@ -17,13 +17,6 @@ */ package org.jackhuang.hmcl.auth.offline; -import static org.jackhuang.hmcl.util.Lang.mapOf; -import static org.jackhuang.hmcl.util.Pair.pair; - -import java.util.Map; -import java.util.Objects; -import java.util.UUID; - import org.jackhuang.hmcl.auth.Account; import org.jackhuang.hmcl.auth.AuthInfo; import org.jackhuang.hmcl.auth.AuthenticationException; @@ -31,6 +24,13 @@ import org.jackhuang.hmcl.util.StringUtils; import org.jackhuang.hmcl.util.ToStringBuilder; import org.jackhuang.hmcl.util.UUIDTypeAdapter; +import java.util.Map; +import java.util.Objects; +import java.util.UUID; + +import static org.jackhuang.hmcl.util.Lang.mapOf; +import static org.jackhuang.hmcl.util.Pair.pair; + /** * * @author huang 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 264942248..aa9fefbc1 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 @@ -1,34 +1,23 @@ 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.util.NetworkUtils; +import org.jackhuang.hmcl.util.StringUtils; +import org.jackhuang.hmcl.util.UUIDTypeAdapter; + +import java.io.IOException; +import java.net.Proxy; +import java.net.URL; +import java.util.*; + import static java.nio.charset.StandardCharsets.UTF_8; import static org.jackhuang.hmcl.util.Lang.liftFunction; import static org.jackhuang.hmcl.util.Lang.mapOf; import static org.jackhuang.hmcl.util.Pair.pair; -import java.io.IOException; -import java.net.Proxy; -import java.net.URL; -import java.util.Base64; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.UUID; - -import org.jackhuang.hmcl.auth.AuthenticationException; -import org.jackhuang.hmcl.auth.InvalidCredentialsException; -import org.jackhuang.hmcl.auth.InvalidPasswordException; -import org.jackhuang.hmcl.auth.InvalidTokenException; -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; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonParseException; - public class YggdrasilService { private final YggdrasilProvider provider; diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/yggdrasil/YggdrasilSession.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/yggdrasil/YggdrasilSession.java index f9d00280a..fce330102 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/yggdrasil/YggdrasilSession.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/yggdrasil/YggdrasilSession.java @@ -1,18 +1,17 @@ package org.jackhuang.hmcl.auth.yggdrasil; -import static org.jackhuang.hmcl.util.Lang.mapOf; -import static org.jackhuang.hmcl.util.Lang.tryCast; -import static org.jackhuang.hmcl.util.Pair.pair; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import org.jackhuang.hmcl.auth.AuthInfo; +import org.jackhuang.hmcl.util.UUIDTypeAdapter; import java.util.Map; import java.util.Optional; import java.util.UUID; -import org.jackhuang.hmcl.auth.AuthInfo; -import org.jackhuang.hmcl.util.UUIDTypeAdapter; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; +import static org.jackhuang.hmcl.util.Lang.mapOf; +import static org.jackhuang.hmcl.util.Lang.tryCast; +import static org.jackhuang.hmcl.util.Pair.pair; public class YggdrasilSession { diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/BMCLAPIDownloadProvider.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/BMCLAPIDownloadProvider.java index 8f8a25829..2dc370af8 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/BMCLAPIDownloadProvider.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/BMCLAPIDownloadProvider.java @@ -20,7 +20,6 @@ package org.jackhuang.hmcl.download; import org.jackhuang.hmcl.download.forge.ForgeVersionList; import org.jackhuang.hmcl.download.game.GameVersionList; import org.jackhuang.hmcl.download.liteloader.LiteLoaderBMCLVersionList; -import org.jackhuang.hmcl.download.liteloader.LiteLoaderVersionList; import org.jackhuang.hmcl.download.optifine.OptiFineBMCLVersionList; /** diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameAssetRefreshTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameAssetRefreshTask.java index cf7c81886..a7b34f51c 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameAssetRefreshTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameAssetRefreshTask.java @@ -17,8 +17,6 @@ */ package org.jackhuang.hmcl.download.game; -import static org.jackhuang.hmcl.util.Pair.pair; - import org.jackhuang.hmcl.download.AbstractDependencyManager; import org.jackhuang.hmcl.game.AssetIndex; import org.jackhuang.hmcl.game.AssetIndexInfo; @@ -35,6 +33,8 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; +import static org.jackhuang.hmcl.util.Pair.pair; + /** * This task is to extract all asset objects described in asset index json. * diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/LibrariesUniqueTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/LibrariesUniqueTask.java index e6565ab75..36ce51161 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/LibrariesUniqueTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/LibrariesUniqueTask.java @@ -22,11 +22,13 @@ import org.jackhuang.hmcl.game.Library; import org.jackhuang.hmcl.game.Version; import org.jackhuang.hmcl.task.TaskResult; import org.jackhuang.hmcl.util.Constants; -import org.jackhuang.hmcl.util.Platform; import org.jackhuang.hmcl.util.SimpleMultimap; import org.jackhuang.hmcl.util.VersionNumber; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; import java.util.stream.Collectors; public class LibrariesUniqueTask extends TaskResult { diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/LibraryDownloadTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/LibraryDownloadTask.java index d80deda9c..e5bac6171 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/LibraryDownloadTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/LibraryDownloadTask.java @@ -5,10 +5,10 @@ import org.jackhuang.hmcl.download.AbstractDependencyManager; import org.jackhuang.hmcl.game.Library; import org.jackhuang.hmcl.task.FileDownloadTask; import org.jackhuang.hmcl.task.Task; -import org.jackhuang.hmcl.util.*; - -import static org.jackhuang.hmcl.util.DigestUtils.digest; -import static org.jackhuang.hmcl.util.Hex.encodeHex; +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 java.io.*; import java.nio.charset.Charset; @@ -18,6 +18,9 @@ import java.util.jar.JarInputStream; import java.util.jar.JarOutputStream; import java.util.jar.Pack200; +import static org.jackhuang.hmcl.util.DigestUtils.digest; +import static org.jackhuang.hmcl.util.Hex.encodeHex; + public final class LibraryDownloadTask extends Task { private final FileDownloadTask xzTask; private final FileDownloadTask task; 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 775cee0e5..d41355c5b 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java @@ -17,9 +17,6 @@ */ package org.jackhuang.hmcl.launch; -import static org.jackhuang.hmcl.util.Lang.mapOf; -import static org.jackhuang.hmcl.util.Pair.pair; - import org.jackhuang.hmcl.auth.AuthInfo; import org.jackhuang.hmcl.game.*; import org.jackhuang.hmcl.util.*; @@ -30,6 +27,9 @@ import java.util.*; import java.util.function.Supplier; import java.util.stream.Collectors; +import static org.jackhuang.hmcl.util.Lang.mapOf; +import static org.jackhuang.hmcl.util.Pair.pair; + /** * * @author huangyuhui 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 ece2fc70a..8e19ecb24 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/FileDownloadTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/FileDownloadTask.java @@ -19,7 +19,10 @@ package org.jackhuang.hmcl.task; import org.jackhuang.hmcl.event.EventManager; import org.jackhuang.hmcl.event.FailedEvent; -import org.jackhuang.hmcl.util.*; +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 java.io.File; import java.io.IOException; 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 96714f06c..15bdd700a 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/JavaVersion.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/JavaVersion.java @@ -22,7 +22,10 @@ import java.nio.file.Files; import java.nio.file.LinkOption; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.*; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Optional; import java.util.concurrent.CountDownLatch; import java.util.logging.Level; import java.util.regex.Matcher; diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/OperatingSystem.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/OperatingSystem.java index 30cbbf58f..045c93cae 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/OperatingSystem.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/OperatingSystem.java @@ -20,16 +20,15 @@ package org.jackhuang.hmcl.util; import javafx.scene.input.Clipboard; import javafx.scene.input.ClipboardContent; +import javax.management.JMException; +import javax.management.MBeanServer; +import javax.management.ObjectName; import java.io.File; import java.lang.management.ManagementFactory; import java.nio.charset.Charset; import java.util.Locale; import java.util.Optional; -import javax.management.JMException; -import javax.management.MBeanServer; -import javax.management.ObjectName; - /** * Represents the operating system. *