Optimize imports

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;

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) {

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;

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.*;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
 
 public final class AccountHelper {
 

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;

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(){}

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
  */

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;
 

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;
 

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;

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;

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;

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;

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;

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;

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;

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
  */

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;

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;

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

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

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;

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 com.google.gson.Gson;
-import static org.jackhuang.hmcl.util.Lang.tryCast;
+import com.google.gson.GsonBuilder;
-import static org.jackhuang.hmcl.util.Pair.pair;
+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 static org.jackhuang.hmcl.util.Lang.mapOf;
-import org.jackhuang.hmcl.util.UUIDTypeAdapter;
+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;
 
 public class YggdrasilSession {
 

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;
 
 /**

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.
  *

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<Version> {

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 org.jackhuang.hmcl.util.FileUtils;
-
+import org.jackhuang.hmcl.util.IOUtils;
-import static org.jackhuang.hmcl.util.DigestUtils.digest;
+import org.jackhuang.hmcl.util.Logging;
-import static org.jackhuang.hmcl.util.Hex.encodeHex;
+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;

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

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;

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;

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.
  *