From 57a7eaccf56d7985d98892558dbe21694e1c9428 Mon Sep 17 00:00:00 2001 From: huanghongxun Date: Sun, 18 Feb 2018 17:16:42 +0800 Subject: [PATCH] Optimize imports --- .../org/jackhuang/hmcl/game/AccountHelper.java | 2 -- .../org/jackhuang/hmcl/game/HMCLGameBuilder.java | 1 - .../jackhuang/hmcl/game/HMCLGameDownloadTask.java | 1 - .../jackhuang/hmcl/game/HMCLGameRepository.java | 2 -- .../hmcl/game/HMCLModpackInstallTask.java | 5 ++++- .../org/jackhuang/hmcl/game/LauncherHelper.java | 6 +++--- .../java/org/jackhuang/hmcl/setting/Profile.java | 1 - .../java/org/jackhuang/hmcl/setting/Settings.java | 8 ++++---- .../org/jackhuang/hmcl/ui/AccountLoginPane.java | 7 ++++--- .../java/org/jackhuang/hmcl/ui/AccountsPage.java | 13 +++++++------ .../hmcl/ui/AuthlibInjectorServerItem.java | 2 -- .../java/org/jackhuang/hmcl/ui/Decorator.java | 3 --- .../org/jackhuang/hmcl/ui/DialogController.java | 1 - .../main/java/org/jackhuang/hmcl/ui/FXUtils.java | 5 ----- .../org/jackhuang/hmcl/ui/LeftPaneController.java | 1 - .../main/java/org/jackhuang/hmcl/ui/MainPage.java | 4 ---- .../java/org/jackhuang/hmcl/ui/SettingsPage.java | 1 - .../hmcl/ui/VersionSettingsController.java | 2 -- .../hmcl/ui/animation/TransitionHandler.java | 4 ---- .../hmcl/ui/construct/RipplerContainer.java | 1 - .../hmcl/ui/download/DownloadWizardProvider.java | 7 +------ .../jackhuang/hmcl/ui/download/VersionsPage.java | 2 -- .../hmcl/ui/wizard/AbstractWizardDisplayer.java | 7 ------- .../hmcl/ui/wizard/DefaultWizardDisplayer.java | 1 - .../main/resources/assets/fxml/account-item.fxml | 3 +-- HMCL/src/main/resources/assets/fxml/account.fxml | 6 +----- .../assets/fxml/authlib-injector-servers.fxml | 15 +++------------ .../src/main/resources/assets/fxml/decorator.fxml | 2 +- .../resources/assets/fxml/download/dltype.fxml | 4 +--- .../assets/fxml/download/versions-list-item.fxml | 4 ++-- .../resources/assets/fxml/download/versions.fxml | 8 ++------ .../main/resources/assets/fxml/input-dialog.fxml | 2 +- HMCL/src/main/resources/assets/fxml/main.fxml | 5 ++--- .../resources/assets/fxml/message-dialog.fxml | 5 +---- HMCL/src/main/resources/assets/fxml/setting.fxml | 6 +----- .../main/resources/assets/fxml/task-dialog.fxml | 10 +++------- .../assets/fxml/version/version-settings.fxml | 6 ++---- .../hmcl/auth/InvalidTokenException.java | 1 - .../java/org/jackhuang/hmcl/launch/Launcher.java | 1 - .../jackhuang/hmcl/mod/MinecraftInstanceTask.java | 2 -- .../jackhuang/hmcl/mod/ModpackConfiguration.java | 4 +++- .../jackhuang/hmcl/mod/ModpackInstallTask.java | 5 ++++- .../hmcl/mod/MultiMCModpackInstallTask.java | 5 ++++- .../java/org/jackhuang/hmcl/task/CoupleTask.java | 1 - .../org/jackhuang/hmcl/task/FinalizedTask.java | 5 ----- .../org/jackhuang/hmcl/task/TaskExecutor.java | 5 ++++- .../org/jackhuang/hmcl/task/TaskListener.java | 2 -- 47 files changed, 59 insertions(+), 135 deletions(-) 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 b11f8e653..7e57aac24 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/game/AccountHelper.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/AccountHelper.java @@ -30,11 +30,9 @@ import org.jackhuang.hmcl.task.Scheduler; import org.jackhuang.hmcl.task.Schedulers; import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.ui.DialogController; -import org.jackhuang.hmcl.ui.FXUtils; import org.jackhuang.hmcl.util.NetworkUtils; import java.io.File; -import java.io.IOException; import java.net.Proxy; import java.util.Collection; import java.util.LinkedList; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameBuilder.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameBuilder.java index b0ecd61ba..180651a57 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameBuilder.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameBuilder.java @@ -17,7 +17,6 @@ */ package org.jackhuang.hmcl.game; -import org.jackhuang.hmcl.download.DefaultDependencyManager; import org.jackhuang.hmcl.download.DefaultGameBuilder; import org.jackhuang.hmcl.setting.Profile; import org.jackhuang.hmcl.task.Task; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameDownloadTask.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameDownloadTask.java index 9a7bbc084..2296bd6c9 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameDownloadTask.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameDownloadTask.java @@ -17,7 +17,6 @@ */ package org.jackhuang.hmcl.game; -import org.jackhuang.hmcl.download.DefaultDependencyManager; import org.jackhuang.hmcl.setting.Profile; import org.jackhuang.hmcl.setting.Settings; import org.jackhuang.hmcl.task.FileDownloadTask; 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 9887f8e95..0230615eb 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameRepository.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameRepository.java @@ -26,8 +26,6 @@ import org.jackhuang.hmcl.setting.EnumGameDirectory; import org.jackhuang.hmcl.setting.Profile; import org.jackhuang.hmcl.setting.Settings; import org.jackhuang.hmcl.setting.VersionSetting; -import org.jackhuang.hmcl.task.Schedulers; -import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.util.FileUtils; import org.jackhuang.hmcl.util.Lang; import org.jackhuang.hmcl.util.Logging; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLModpackInstallTask.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLModpackInstallTask.java index 265e12e06..2d28a28fe 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLModpackInstallTask.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLModpackInstallTask.java @@ -21,7 +21,10 @@ import com.google.gson.JsonParseException; import com.google.gson.reflect.TypeToken; import org.jackhuang.hmcl.download.DependencyManager; import org.jackhuang.hmcl.download.game.VersionJsonSaveTask; -import org.jackhuang.hmcl.mod.*; +import org.jackhuang.hmcl.mod.MinecraftInstanceTask; +import org.jackhuang.hmcl.mod.Modpack; +import org.jackhuang.hmcl.mod.ModpackConfiguration; +import org.jackhuang.hmcl.mod.ModpackInstallTask; import org.jackhuang.hmcl.setting.Profile; import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.util.CompressingUtils; 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 09134092e..eb53305a2 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java @@ -28,13 +28,13 @@ import org.jackhuang.hmcl.setting.*; import org.jackhuang.hmcl.task.*; import org.jackhuang.hmcl.ui.Controllers; import org.jackhuang.hmcl.ui.DialogController; -import org.jackhuang.hmcl.ui.construct.MessageDialogPane; -import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogPane; import org.jackhuang.hmcl.ui.LogWindow; 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.*; -import java.io.*; +import java.io.File; import java.util.*; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.CountDownLatch; 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 6c4bfc7a2..f5d75b90f 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java @@ -19,7 +19,6 @@ package org.jackhuang.hmcl.setting; import com.google.gson.*; import javafx.beans.InvalidationListener; -import org.jackhuang.hmcl.download.DefaultDependencyManager; import org.jackhuang.hmcl.game.HMCLDependencyManager; import org.jackhuang.hmcl.game.HMCLGameRepository; import org.jackhuang.hmcl.mod.ModManager; 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 7146156ea..65d139940 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java @@ -19,17 +19,14 @@ package org.jackhuang.hmcl.setting; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import javafx.beans.property.BooleanProperty; import javafx.beans.property.ObjectProperty; import javafx.beans.property.StringProperty; import javafx.beans.value.ObservableValue; -import javafx.scene.image.Image; import javafx.scene.text.Font; import org.jackhuang.hmcl.Main; import org.jackhuang.hmcl.auth.Account; import org.jackhuang.hmcl.auth.AccountFactory; import org.jackhuang.hmcl.auth.yggdrasil.AuthlibInjectorAccount; -import org.jackhuang.hmcl.auth.yggdrasil.AuthlibInjectorBuildInfo; import org.jackhuang.hmcl.download.BMCLAPIDownloadProvider; import org.jackhuang.hmcl.download.DownloadProvider; import org.jackhuang.hmcl.download.MojangDownloadProvider; @@ -41,7 +38,10 @@ import org.jackhuang.hmcl.util.*; import java.io.File; import java.io.IOException; -import java.net.*; +import java.net.Authenticator; +import java.net.InetSocketAddress; +import java.net.PasswordAuthentication; +import java.net.Proxy; import java.util.*; import java.util.logging.Level; import java.util.stream.Collectors; 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 e0bd80f98..567fb78c1 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AccountLoginPane.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AccountLoginPane.java @@ -23,9 +23,10 @@ import com.jfoenix.controls.JFXProgressBar; import javafx.fxml.FXML; import javafx.scene.control.Label; import javafx.scene.layout.StackPane; -import org.jackhuang.hmcl.auth.*; -import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount; -import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccountFactory; +import org.jackhuang.hmcl.auth.Account; +import org.jackhuang.hmcl.auth.AuthInfo; +import org.jackhuang.hmcl.auth.NoSelectedCharacterException; +import org.jackhuang.hmcl.auth.SpecificCharacterSelector; import org.jackhuang.hmcl.setting.Accounts; import org.jackhuang.hmcl.setting.Settings; import org.jackhuang.hmcl.task.Schedulers; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AccountsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AccountsPage.java index 36b7b8ca8..59a3be412 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AccountsPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AccountsPage.java @@ -25,17 +25,20 @@ import javafx.beans.property.StringProperty; import javafx.fxml.FXML; import javafx.geometry.Pos; import javafx.scene.Node; -import javafx.scene.control.*; +import javafx.scene.control.Hyperlink; +import javafx.scene.control.Label; +import javafx.scene.control.ScrollPane; +import javafx.scene.control.ToggleGroup; import javafx.scene.image.Image; import javafx.scene.image.ImageView; import javafx.scene.layout.BorderPane; import javafx.scene.layout.HBox; import javafx.scene.layout.StackPane; -import javafx.util.Callback; import org.jackhuang.hmcl.Main; import org.jackhuang.hmcl.auth.*; -import org.jackhuang.hmcl.auth.yggdrasil.*; -import org.jackhuang.hmcl.auth.InvalidCredentialsException; +import org.jackhuang.hmcl.auth.yggdrasil.AuthlibInjectorAccount; +import org.jackhuang.hmcl.auth.yggdrasil.GameProfile; +import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount; import org.jackhuang.hmcl.game.AccountHelper; import org.jackhuang.hmcl.setting.Accounts; import org.jackhuang.hmcl.setting.Settings; @@ -45,8 +48,6 @@ import org.jackhuang.hmcl.ui.construct.AdvancedListBox; import org.jackhuang.hmcl.ui.construct.IconedItem; import org.jackhuang.hmcl.ui.construct.Validator; import org.jackhuang.hmcl.ui.wizard.DecoratorPage; -import org.jackhuang.hmcl.util.Pair; -import org.jackhuang.hmcl.util.ReflectionHelper; import java.util.Collection; import java.util.LinkedList; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServerItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServerItem.java index 436113b31..9e35a66d8 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServerItem.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServerItem.java @@ -23,9 +23,7 @@ import javafx.geometry.Pos; import javafx.scene.control.Label; import javafx.scene.layout.BorderPane; import javafx.scene.layout.VBox; -import org.jackhuang.hmcl.Main; import org.jackhuang.hmcl.auth.yggdrasil.AuthlibInjectorServerInfo; -import org.jackhuang.hmcl.mod.ModInfo; import java.util.function.Consumer; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java index ba59e5ad5..3e2ef8ea3 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java @@ -21,7 +21,6 @@ import com.jfoenix.controls.JFXButton; import com.jfoenix.controls.JFXDialog; import com.jfoenix.controls.JFXDrawer; import com.jfoenix.controls.JFXHamburger; -import com.jfoenix.effects.JFXDepthManager; import com.jfoenix.svg.SVGGlyph; import javafx.application.Platform; import javafx.beans.binding.Bindings; @@ -60,8 +59,6 @@ import org.jackhuang.hmcl.util.Lang; import org.jackhuang.hmcl.util.StringUtils; import java.io.File; -import java.util.Arrays; -import java.util.List; import java.util.Queue; import java.util.Random; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/DialogController.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/DialogController.java index 3c78406ce..7cabf931d 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/DialogController.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/DialogController.java @@ -19,7 +19,6 @@ package org.jackhuang.hmcl.ui; import com.jfoenix.concurrency.JFXUtilities; import org.jackhuang.hmcl.auth.Account; -import org.jackhuang.hmcl.auth.AccountFactory; import org.jackhuang.hmcl.auth.AuthInfo; import org.jackhuang.hmcl.auth.MultiCharacterSelector; import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount; 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 8eef22adc..85978c49e 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java @@ -30,15 +30,11 @@ import javafx.beans.value.WeakChangeListener; import javafx.event.EventHandler; import javafx.fxml.FXMLLoader; import javafx.scene.Node; -import javafx.scene.Parent; -import javafx.scene.Scene; import javafx.scene.control.*; import javafx.scene.image.Image; import javafx.scene.image.ImageView; -import javafx.scene.image.WritableImage; import javafx.scene.input.MouseEvent; import javafx.scene.input.ScrollEvent; -import javafx.scene.layout.Pane; import javafx.scene.layout.Region; import javafx.scene.shape.Rectangle; import javafx.util.Duration; @@ -46,7 +42,6 @@ import org.jackhuang.hmcl.Main; import org.jackhuang.hmcl.util.Lang; import org.jackhuang.hmcl.util.Logging; import org.jackhuang.hmcl.util.OperatingSystem; -import org.jackhuang.hmcl.util.Pair; import java.io.File; import java.io.IOException; 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 745d1e796..f4f48ab01 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/LeftPaneController.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LeftPaneController.java @@ -24,7 +24,6 @@ import javafx.scene.Node; import javafx.scene.image.Image; import javafx.scene.layout.BorderPane; import javafx.scene.layout.VBox; -import javafx.scene.paint.Paint; import javafx.scene.text.Text; import org.jackhuang.hmcl.Main; import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount; 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 ca7753e0f..3fd754721 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPage.java @@ -32,8 +32,6 @@ import javafx.scene.input.MouseButton; import javafx.scene.layout.StackPane; import javafx.stage.FileChooser; import org.jackhuang.hmcl.Main; -import org.jackhuang.hmcl.download.MaintainTask; -import org.jackhuang.hmcl.download.game.VersionJsonSaveTask; import org.jackhuang.hmcl.event.EventBus; import org.jackhuang.hmcl.event.ProfileChangedEvent; import org.jackhuang.hmcl.event.ProfileLoadingEvent; @@ -50,7 +48,6 @@ import org.jackhuang.hmcl.ui.construct.MessageBox; import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogPane; import org.jackhuang.hmcl.ui.download.DownloadWizardProvider; import org.jackhuang.hmcl.ui.wizard.DecoratorPage; -import org.jackhuang.hmcl.util.Lang; import org.jackhuang.hmcl.util.OperatingSystem; import org.jackhuang.hmcl.util.StringUtils; @@ -58,7 +55,6 @@ import java.io.File; import java.io.IOException; import java.util.LinkedList; import java.util.List; -import java.util.function.Consumer; public final class MainPage extends StackPane implements DecoratorPage { 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 a394aadcf..b9f4b2090 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java @@ -18,7 +18,6 @@ package org.jackhuang.hmcl.ui; import com.jfoenix.controls.*; -import javafx.application.Platform; import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; import javafx.collections.FXCollections; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/VersionSettingsController.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/VersionSettingsController.java index 23ec595f6..752f8f07f 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/VersionSettingsController.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/VersionSettingsController.java @@ -28,7 +28,6 @@ import javafx.scene.control.Tooltip; import javafx.scene.image.Image; import javafx.scene.image.ImageView; import javafx.scene.layout.VBox; -import javafx.scene.paint.Color; import javafx.stage.FileChooser; import org.jackhuang.hmcl.Main; import org.jackhuang.hmcl.setting.EnumGameDirectory; @@ -38,7 +37,6 @@ import org.jackhuang.hmcl.task.Schedulers; import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.ui.construct.ComponentList; import org.jackhuang.hmcl.ui.construct.MultiFileItem; -import org.jackhuang.hmcl.ui.construct.NumberValidator; import org.jackhuang.hmcl.util.*; import java.io.File; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/animation/TransitionHandler.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/animation/TransitionHandler.java index f0a1e5d9b..0fb21b342 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/animation/TransitionHandler.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/animation/TransitionHandler.java @@ -21,12 +21,8 @@ import javafx.animation.KeyFrame; import javafx.animation.Timeline; import javafx.scene.Node; import javafx.scene.Parent; -import javafx.scene.SnapshotParameters; -import javafx.scene.image.ImageView; -import javafx.scene.image.WritableImage; import javafx.scene.layout.StackPane; import javafx.util.Duration; -import org.jackhuang.hmcl.ui.FXUtils; public final class TransitionHandler implements AnimationHandler { private final StackPane view; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/RipplerContainer.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/RipplerContainer.java index df7073f5a..55270bd74 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/RipplerContainer.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/RipplerContainer.java @@ -30,7 +30,6 @@ import javafx.beans.property.SimpleObjectProperty; import javafx.css.*; import javafx.geometry.Insets; import javafx.scene.Node; -import javafx.scene.Parent; import javafx.scene.layout.Background; import javafx.scene.layout.BackgroundFill; import javafx.scene.layout.CornerRadii; 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 01281ebff..a639e45d3 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 @@ -21,15 +21,10 @@ import javafx.scene.Node; import org.jackhuang.hmcl.Main; import org.jackhuang.hmcl.download.DownloadProvider; import org.jackhuang.hmcl.download.GameBuilder; -import org.jackhuang.hmcl.game.HMCLModpackInstallTask; -import org.jackhuang.hmcl.game.HMCLModpackManifest; import org.jackhuang.hmcl.game.ModpackHelper; -import org.jackhuang.hmcl.game.MultiMCInstallVersionSettingTask; -import org.jackhuang.hmcl.mod.*; -import org.jackhuang.hmcl.setting.EnumGameDirectory; +import org.jackhuang.hmcl.mod.Modpack; import org.jackhuang.hmcl.setting.Profile; import org.jackhuang.hmcl.setting.Settings; -import org.jackhuang.hmcl.setting.VersionSetting; import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.ui.wizard.WizardController; import org.jackhuang.hmcl.ui.wizard.WizardProvider; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPage.java index 543a34215..360fd4e64 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPage.java @@ -27,7 +27,6 @@ import javafx.scene.layout.HBox; 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.download.VersionList; import org.jackhuang.hmcl.download.game.GameRemoteVersionTag; import org.jackhuang.hmcl.download.game.GameVersionList; @@ -42,7 +41,6 @@ import org.jackhuang.hmcl.ui.wizard.WizardPage; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import java.util.stream.Stream; public final class VersionsPage extends StackPane implements WizardPage, Refreshable { private final WizardController controller; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/wizard/AbstractWizardDisplayer.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/wizard/AbstractWizardDisplayer.java index 0f9071a5c..ed51416e2 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/wizard/AbstractWizardDisplayer.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/wizard/AbstractWizardDisplayer.java @@ -17,21 +17,14 @@ */ package org.jackhuang.hmcl.ui.wizard; -import com.jfoenix.controls.JFXProgressBar; -import javafx.application.Platform; import javafx.scene.control.Label; -import javafx.scene.layout.StackPane; -import javafx.scene.layout.VBox; import org.jackhuang.hmcl.task.Schedulers; import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.task.TaskExecutor; -import org.jackhuang.hmcl.task.TaskListener; import org.jackhuang.hmcl.ui.construct.TaskListPane; -import org.jackhuang.hmcl.util.Lang; import java.util.Map; import java.util.Queue; -import java.util.concurrent.atomic.AtomicInteger; public interface AbstractWizardDisplayer extends WizardDisplayer { WizardController getWizardController(); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/wizard/DefaultWizardDisplayer.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/wizard/DefaultWizardDisplayer.java index 22f52ba36..928a53c0b 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/wizard/DefaultWizardDisplayer.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/wizard/DefaultWizardDisplayer.java @@ -28,7 +28,6 @@ import org.jackhuang.hmcl.ui.FXUtils; import org.jackhuang.hmcl.ui.animation.TransitionHandler; import org.jackhuang.hmcl.util.StringUtils; -import java.util.Map; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/HMCL/src/main/resources/assets/fxml/account-item.fxml b/HMCL/src/main/resources/assets/fxml/account-item.fxml index 1f4facc91..347b92021 100644 --- a/HMCL/src/main/resources/assets/fxml/account-item.fxml +++ b/HMCL/src/main/resources/assets/fxml/account-item.fxml @@ -4,8 +4,7 @@ - - + diff --git a/HMCL/src/main/resources/assets/fxml/account.fxml b/HMCL/src/main/resources/assets/fxml/account.fxml index 73ff37f18..4a3273708 100644 --- a/HMCL/src/main/resources/assets/fxml/account.fxml +++ b/HMCL/src/main/resources/assets/fxml/account.fxml @@ -2,13 +2,9 @@ - - - + - - diff --git a/HMCL/src/main/resources/assets/fxml/authlib-injector-servers.fxml b/HMCL/src/main/resources/assets/fxml/authlib-injector-servers.fxml index 159ae9659..8bd06485b 100644 --- a/HMCL/src/main/resources/assets/fxml/authlib-injector-servers.fxml +++ b/HMCL/src/main/resources/assets/fxml/authlib-injector-servers.fxml @@ -1,19 +1,10 @@ - - - - - - - - - - - + + + - diff --git a/HMCL/src/main/resources/assets/fxml/decorator.fxml b/HMCL/src/main/resources/assets/fxml/decorator.fxml index ccdc18de4..098a30f7a 100644 --- a/HMCL/src/main/resources/assets/fxml/decorator.fxml +++ b/HMCL/src/main/resources/assets/fxml/decorator.fxml @@ -6,8 +6,8 @@ - + diff --git a/HMCL/src/main/resources/assets/fxml/download/dltype.fxml b/HMCL/src/main/resources/assets/fxml/download/dltype.fxml index 5e077f6ac..c558bc756 100644 --- a/HMCL/src/main/resources/assets/fxml/download/dltype.fxml +++ b/HMCL/src/main/resources/assets/fxml/download/dltype.fxml @@ -2,9 +2,7 @@ - - - + diff --git a/HMCL/src/main/resources/assets/fxml/download/versions-list-item.fxml b/HMCL/src/main/resources/assets/fxml/download/versions-list-item.fxml index 3d741e6ee..75ec6a77b 100644 --- a/HMCL/src/main/resources/assets/fxml/download/versions-list-item.fxml +++ b/HMCL/src/main/resources/assets/fxml/download/versions-list-item.fxml @@ -1,9 +1,9 @@ - - + + - - - + - - - + + - diff --git a/HMCL/src/main/resources/assets/fxml/main.fxml b/HMCL/src/main/resources/assets/fxml/main.fxml index e6810378d..ab850ee43 100644 --- a/HMCL/src/main/resources/assets/fxml/main.fxml +++ b/HMCL/src/main/resources/assets/fxml/main.fxml @@ -1,12 +1,11 @@ + - + - - - - - - + - - - - - + + - - - - - - - + + - - - - + + diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/InvalidTokenException.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/InvalidTokenException.java index 42493743a..7aeffdebb 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/InvalidTokenException.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/InvalidTokenException.java @@ -17,7 +17,6 @@ */ package org.jackhuang.hmcl.auth; -import org.jackhuang.hmcl.auth.AuthenticationException; import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount; /** diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/Launcher.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/Launcher.java index ca11aef0d..48f7062ec 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/Launcher.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/Launcher.java @@ -25,7 +25,6 @@ import org.jackhuang.hmcl.util.ManagedProcess; import java.io.File; import java.io.IOException; -import java.util.List; /** * diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/MinecraftInstanceTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/MinecraftInstanceTask.java index a10e768d5..713340246 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/MinecraftInstanceTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/MinecraftInstanceTask.java @@ -26,10 +26,8 @@ import org.jackhuang.hmcl.util.FileUtils; import java.io.File; import java.io.FileInputStream; -import java.util.HashMap; import java.util.LinkedList; import java.util.List; -import java.util.Map; public final class MinecraftInstanceTask extends Task { diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModpackConfiguration.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModpackConfiguration.java index 9141dabb9..341bd82f7 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModpackConfiguration.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModpackConfiguration.java @@ -21,7 +21,9 @@ import com.google.gson.JsonParseException; import org.jackhuang.hmcl.util.Immutable; import org.jackhuang.hmcl.util.Validation; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; @Immutable public final class ModpackConfiguration implements Validation { diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModpackInstallTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModpackInstallTask.java index 24350edb7..5fed87069 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModpackInstallTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModpackInstallTask.java @@ -25,7 +25,10 @@ import org.jackhuang.hmcl.util.FileUtils; import org.jackhuang.hmcl.util.IOUtils; import java.io.*; -import java.util.*; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import java.util.function.Predicate; public class ModpackInstallTask extends Task { diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/MultiMCModpackInstallTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/MultiMCModpackInstallTask.java index 6443d4c1a..e678e3c1d 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/MultiMCModpackInstallTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/MultiMCModpackInstallTask.java @@ -27,7 +27,10 @@ import org.jackhuang.hmcl.game.Arguments; import org.jackhuang.hmcl.game.DefaultGameRepository; import org.jackhuang.hmcl.game.Version; import org.jackhuang.hmcl.task.Task; -import org.jackhuang.hmcl.util.*; +import org.jackhuang.hmcl.util.Constants; +import org.jackhuang.hmcl.util.FileUtils; +import org.jackhuang.hmcl.util.IOUtils; +import org.jackhuang.hmcl.util.Lang; import java.io.File; import java.io.IOException; diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/CoupleTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/CoupleTask.java index e34064086..2ad8b0712 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/CoupleTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/CoupleTask.java @@ -24,7 +24,6 @@ import java.util.Collection; import java.util.Collections; import java.util.LinkedList; import java.util.List; -import java.util.function.Function; /** * A task that combines two tasks and make sure [pred] runs before succ. diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/FinalizedTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/FinalizedTask.java index c2b3ac82a..dbfd695c7 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/FinalizedTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/FinalizedTask.java @@ -17,13 +17,8 @@ */ package org.jackhuang.hmcl.task; -import org.jackhuang.hmcl.util.AutoTypingMap; -import org.jackhuang.hmcl.util.ExceptionalFunction; - import java.util.Collection; import java.util.Collections; -import java.util.LinkedList; -import java.util.List; /** * A task that combines two tasks and make sure [pred] runs before succ. diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/TaskExecutor.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/TaskExecutor.java index c1397dd4d..48adaccbd 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/TaskExecutor.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/TaskExecutor.java @@ -23,7 +23,10 @@ import org.jackhuang.hmcl.util.Lang; import org.jackhuang.hmcl.util.Logging; import java.util.*; -import java.util.concurrent.*; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Future; +import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/TaskListener.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/TaskListener.java index 4c8bd0872..f5559a641 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/TaskListener.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/TaskListener.java @@ -17,8 +17,6 @@ */ package org.jackhuang.hmcl.task; -import org.jackhuang.hmcl.util.AutoTypingMap; - import java.util.EventListener; /**