[ANY] Рефакторинг (Organize imports).

LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java

@@ -19,7 +19,6 @@
 import java.security.interfaces.RSAPrivateKey;
 import java.security.interfaces.RSAPublicKey;
 import java.security.spec.InvalidKeySpecException;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -34,11 +33,10 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.zip.CRC32;
 
-import io.netty.handler.logging.LogLevel;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
 import org.bouncycastle.crypto.util.PrivateKeyFactory;
-import org.bouncycastle.crypto.util.PrivateKeyInfoFactory;
 import org.bouncycastle.operator.OperatorCreationException;
+
+import io.netty.handler.logging.LogLevel;
 import pro.gravit.launcher.Launcher;
 import pro.gravit.launcher.LauncherConfig;
 import pro.gravit.launcher.NeedGarbageCollection;
@@ -61,13 +59,24 @@
 import pro.gravit.launchserver.auth.provider.RejectAuthProvider;
 import pro.gravit.launchserver.auth.texture.RequestTextureProvider;
 import pro.gravit.launchserver.auth.texture.TextureProvider;
-import pro.gravit.launchserver.binary.*;
+import pro.gravit.launchserver.binary.EXEL4JLauncherBinary;
+import pro.gravit.launchserver.binary.EXELauncherBinary;
+import pro.gravit.launchserver.binary.JARLauncherBinary;
+import pro.gravit.launchserver.binary.LauncherBinary;
+import pro.gravit.launchserver.binary.ProguardConf;
+import pro.gravit.launchserver.binary.SimpleEXELauncherBinary;
 import pro.gravit.launchserver.components.AuthLimiterComponent;
 import pro.gravit.launchserver.components.Component;
 import pro.gravit.launchserver.components.RegLimiterComponent;
 import pro.gravit.launchserver.config.LaunchServerRuntimeConfig;
 import pro.gravit.launchserver.dao.provider.DaoProvider;
-import pro.gravit.launchserver.manangers.*;
+import pro.gravit.launchserver.manangers.CertificateManager;
+import pro.gravit.launchserver.manangers.LaunchServerGsonManager;
+import pro.gravit.launchserver.manangers.MirrorManager;
+import pro.gravit.launchserver.manangers.ModulesManager;
+import pro.gravit.launchserver.manangers.ReconfigurableManager;
+import pro.gravit.launchserver.manangers.ReloadManager;
+import pro.gravit.launchserver.manangers.SessionManager;
 import pro.gravit.launchserver.manangers.hook.AuthHookManager;
 import pro.gravit.launchserver.manangers.hook.BuildHookManager;
 import pro.gravit.launchserver.socket.WebSocketService;

LaunchServer/src/main/java/pro/gravit/launchserver/binary/LauncherBinary.java

@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.nio.file.Path;
 
-import pro.gravit.launcher.serialize.signed.DigestBytesHolder;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.utils.helper.IOHelper;
 import pro.gravit.utils.helper.SecurityHelper;

LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/TestCommand.java

@@ -1,16 +1,15 @@
 package pro.gravit.launchserver.command.basic;
 
+import java.nio.file.Paths;
+import java.security.KeyPair;
+
 import org.bouncycastle.cert.X509CertificateHolder;
-import pro.gravit.launcher.events.PingEvent;
+
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.command.Command;
 import pro.gravit.launchserver.socket.handlers.NettyServerSocketHandler;
 import pro.gravit.utils.helper.CommonHelper;
 
-import java.nio.file.Paths;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-
 public class TestCommand extends Command {
     public TestCommand(LaunchServer server) {
         super(server);

LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ConfigCommand.java

@@ -2,8 +2,6 @@
 
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.command.Command;
-import pro.gravit.launchserver.manangers.ReconfigurableManager;
-import pro.gravit.utils.helper.LogHelper;
 
 public class ConfigCommand extends Command {
     public ConfigCommand(LaunchServer server) {

LaunchServer/src/main/java/pro/gravit/launchserver/components/AbstractLimiter.java

@@ -1,10 +1,10 @@
 package pro.gravit.launchserver.components;
 
-import pro.gravit.launcher.NeedGarbageCollection;
-
 import java.util.HashMap;
 import java.util.Map;
 
+import pro.gravit.launcher.NeedGarbageCollection;
+
 public class AbstractLimiter<T> implements NeedGarbageCollection {
     public final int maxTrys;
     public final int banMillis;

LaunchServer/src/main/java/pro/gravit/launchserver/components/AuthLimiterComponent.java

@@ -1,14 +1,12 @@
 package pro.gravit.launchserver.components;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
 import pro.gravit.launcher.NeedGarbageCollection;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.socket.Client;
 import pro.gravit.launchserver.socket.response.auth.AuthResponse;
-import pro.gravit.utils.BiHookSet.Hook;
 import pro.gravit.utils.HookException;
 
 public class AuthLimiterComponent extends Component implements NeedGarbageCollection, AutoCloseable {

LaunchServer/src/main/java/pro/gravit/launchserver/components/RegLimiterComponent.java

@@ -1,14 +1,12 @@
 package pro.gravit.launchserver.components;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import pro.gravit.launcher.NeedGarbageCollection;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.manangers.hook.AuthHookManager;
 import pro.gravit.utils.HookException;
-import pro.gravit.utils.HookSet;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
 
 public class RegLimiterComponent extends Component implements NeedGarbageCollection, AutoCloseable {
 

LaunchServer/src/main/java/pro/gravit/launchserver/dao/User.java

@@ -7,7 +7,16 @@
 import java.util.Collection;
 import java.util.UUID;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
 
 import pro.gravit.launcher.ClientPermissions;
 import pro.gravit.utils.helper.LogHelper;

LaunchServer/src/main/java/pro/gravit/launchserver/dao/UserDAO.java

@@ -1,10 +1,10 @@
 package pro.gravit.launchserver.dao;
 
-import pro.gravit.launcher.hwid.OshiHWID;
-
 import java.util.List;
 import java.util.UUID;
 
+import pro.gravit.launcher.hwid.OshiHWID;
+
 public interface UserDAO {
     User findById(int id);
     User findByUsername(String username);

LaunchServer/src/main/java/pro/gravit/launchserver/dao/UserHWID.java

@@ -1,11 +1,16 @@
 package pro.gravit.launchserver.dao;
 
+import java.util.function.Supplier;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
 import pro.gravit.launcher.hwid.HWID;
 import pro.gravit.launcher.hwid.OshiHWID;
 
-import javax.persistence.*;
-import java.util.function.Supplier;
-
 @Entity
 @Table(name = "users_hwids")
 public class UserHWID implements HWID {

LaunchServer/src/main/java/pro/gravit/launchserver/dao/UserService.java

@@ -3,8 +3,6 @@
 import java.util.List;
 import java.util.UUID;
 
-import pro.gravit.launchserver.LaunchServer;
-
 public class UserService {
 
     private final UserDAO usersDao;

LaunchServer/src/main/java/pro/gravit/launchserver/manangers/CertificateManager.java

@@ -1,6 +1,26 @@
 package pro.gravit.launchserver.manangers;
 
 
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.Writer;
+import java.math.BigInteger;
+import java.nio.file.Path;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.spec.ECGenParameterSpec;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
+import java.util.Date;
+
 import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
 import org.bouncycastle.asn1.x500.X500Name;
 import org.bouncycastle.asn1.x500.X500NameBuilder;
@@ -20,26 +40,10 @@
 import org.bouncycastle.util.io.pem.PemObject;
 import org.bouncycastle.util.io.pem.PemReader;
 import org.bouncycastle.util.io.pem.PemWriter;
+
 import pro.gravit.utils.helper.IOHelper;
 import pro.gravit.utils.helper.SecurityHelper;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
-import java.math.BigInteger;
-import java.nio.file.Path;
-import java.security.*;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.spec.ECGenParameterSpec;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.temporal.ChronoUnit;
-import java.util.Date;
-
 public class CertificateManager {
     public X509CertificateHolder ca;
     public AsymmetricKeyParameter caKey;

LaunchServer/src/main/java/pro/gravit/launchserver/manangers/LaunchServerGsonManager.java

@@ -2,14 +2,11 @@
 
 import com.google.gson.GsonBuilder;
 
-import pro.gravit.launcher.hasher.HashedEntry;
-import pro.gravit.launcher.hasher.HashedEntryAdapter;
 import pro.gravit.launcher.hwid.HWID;
 import pro.gravit.launcher.hwid.HWIDProvider;
 import pro.gravit.launcher.managers.GsonManager;
 import pro.gravit.launcher.request.JsonResultSerializeAdapter;
 import pro.gravit.launcher.request.WebSocketEvent;
-import pro.gravit.launcher.request.websockets.ClientWebSocketService;
 import pro.gravit.launchserver.auth.handler.AuthHandler;
 import pro.gravit.launchserver.auth.hwid.HWIDHandler;
 import pro.gravit.launchserver.auth.permissions.PermissionsHandler;

LaunchServer/src/main/java/pro/gravit/launchserver/manangers/ReconfigurableManager.java

@@ -2,13 +2,11 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
 
 import pro.gravit.launchserver.Reconfigurable;
 import pro.gravit.utils.command.Command;
 import pro.gravit.utils.command.CommandException;
 import pro.gravit.utils.command.basic.HelpCommand;
-import pro.gravit.utils.helper.LogHelper;
 import pro.gravit.utils.helper.VerifyHelper;
 
 public class ReconfigurableManager {

LaunchServer/src/main/java/pro/gravit/launchserver/socket/LauncherNettyServer.java

@@ -15,15 +15,11 @@
 import io.netty.handler.codec.http.websocketx.extensions.compression.WebSocketServerCompressionHandler;
 import io.netty.handler.logging.LoggingHandler;
 import io.netty.util.concurrent.GlobalEventExecutor;
-import pro.gravit.launcher.request.Request;
-import pro.gravit.launcher.request.auth.AuthRequest;
-import pro.gravit.launcher.request.websockets.StandartClientWebSocketService;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.socket.handlers.NettyIpForwardHandler;
 import pro.gravit.launchserver.socket.handlers.WebSocketFrameHandler;
 import pro.gravit.launchserver.socket.handlers.fileserver.FileServerHandler;
 import pro.gravit.utils.BiHookSet;
-import pro.gravit.utils.HookSet;
 import pro.gravit.utils.helper.JVMHelper;
 import pro.gravit.utils.helper.LogHelper;
 

LaunchServer/src/main/java/pro/gravit/launchserver/socket/WebSocketService.java

@@ -16,11 +16,18 @@
 import pro.gravit.launcher.events.request.ErrorRequestEvent;
 import pro.gravit.launcher.request.WebSocketEvent;
 import pro.gravit.launchserver.LaunchServer;
-import pro.gravit.launchserver.socket.response.WebSocketServerResponse;
 import pro.gravit.launchserver.socket.response.SimpleResponse;
+import pro.gravit.launchserver.socket.response.WebSocketServerResponse;
 import pro.gravit.launchserver.socket.response.admin.AddLogListenerResponse;
 import pro.gravit.launchserver.socket.response.admin.ExecCommandResponse;
-import pro.gravit.launchserver.socket.response.auth.*;
+import pro.gravit.launchserver.socket.response.auth.AuthResponse;
+import pro.gravit.launchserver.socket.response.auth.CheckServerResponse;
+import pro.gravit.launchserver.socket.response.auth.GetAvailabilityAuthResponse;
+import pro.gravit.launchserver.socket.response.auth.JoinServerResponse;
+import pro.gravit.launchserver.socket.response.auth.ProfilesResponse;
+import pro.gravit.launchserver.socket.response.auth.RegisterResponse;
+import pro.gravit.launchserver.socket.response.auth.RestoreSessionResponse;
+import pro.gravit.launchserver.socket.response.auth.SetProfileResponse;
 import pro.gravit.launchserver.socket.response.profile.BatchProfileByUsername;
 import pro.gravit.launchserver.socket.response.profile.ProfileByUUIDResponse;
 import pro.gravit.launchserver.socket.response.profile.ProfileByUsername;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/handlers/NettyServerSocketHandler.java

@@ -23,7 +23,7 @@
 import pro.gravit.launchserver.socket.LauncherNettyServer;
 import pro.gravit.utils.helper.LogHelper;
 
-@SuppressWarnings({"unused", "rawtypes"})
+@SuppressWarnings("unused")
 public final class NettyServerSocketHandler implements Runnable, AutoCloseable {
     private SSLServerSocketFactory ssf;
 

LaunchServer/src/main/java/pro/gravit/launchserver/socket/handlers/WebSocketFrameHandler.java

@@ -2,22 +2,17 @@
 
 import java.util.concurrent.TimeUnit;
 
-import com.google.gson.GsonBuilder;
-
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
-import io.netty.channel.group.DefaultChannelGroup;
 import io.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
 import io.netty.handler.codec.http.websocketx.PingWebSocketFrame;
 import io.netty.handler.codec.http.websocketx.PongWebSocketFrame;
 import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
 import io.netty.handler.codec.http.websocketx.WebSocketFrame;
-import io.netty.util.concurrent.GlobalEventExecutor;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.socket.Client;
 import pro.gravit.launchserver.socket.NettyConnectContext;
 import pro.gravit.launchserver.socket.WebSocketService;
-import pro.gravit.utils.helper.CommonHelper;
 import pro.gravit.utils.helper.IOHelper;
 import pro.gravit.utils.helper.LogHelper;
 

LaunchServer/src/main/java/pro/gravit/launchserver/socket/handlers/fileserver/FileServerHandler.java

@@ -14,10 +14,8 @@
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.RandomAccessFile;
-import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URLDecoder;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.text.SimpleDateFormat;

LauncherAPI/src/main/java/pro/gravit/launcher/events/ControlEvent.java

@@ -4,7 +4,8 @@
 
 //Набор стандартных событий
 public class ControlEvent {
-    private static final UUID uuid = UUID.fromString("f1051a64-0cd0-4ed8-8430-d856a196e91f");
+    @SuppressWarnings("unused")
+	private static final UUID uuid = UUID.fromString("f1051a64-0cd0-4ed8-8430-d856a196e91f");
 
     public enum ControlCommand {
         STOP, START, PAUSE, CONTINUE, CRASH

LauncherAPI/src/main/java/pro/gravit/launcher/events/request/AuthRequestEvent.java

@@ -1,7 +1,5 @@
 package pro.gravit.launcher.events.request;
 
-import java.util.UUID;
-
 import pro.gravit.launcher.ClientPermissions;
 import pro.gravit.launcher.LauncherNetworkAPI;
 import pro.gravit.launcher.events.RequestEvent;

LauncherAPI/src/main/java/pro/gravit/launcher/events/request/BatchProfileByUsernameRequestEvent.java

@@ -1,7 +1,5 @@
 package pro.gravit.launcher.events.request;
 
-import java.util.UUID;
-
 import pro.gravit.launcher.LauncherNetworkAPI;
 import pro.gravit.launcher.events.RequestEvent;
 import pro.gravit.launcher.profiles.PlayerProfile;

LauncherAPI/src/main/java/pro/gravit/launcher/events/request/CheckServerRequestEvent.java

@@ -8,7 +8,8 @@
 
 
 public class CheckServerRequestEvent extends RequestEvent {
-    private static final UUID _uuid = UUID.fromString("8801d07c-51ba-4059-b61d-fe1f1510b28a");
+    @SuppressWarnings("unused")
+	private static final UUID _uuid = UUID.fromString("8801d07c-51ba-4059-b61d-fe1f1510b28a");
     @LauncherNetworkAPI
     public UUID uuid;
     @LauncherNetworkAPI

LauncherAPI/src/main/java/pro/gravit/launcher/events/request/JoinServerRequestEvent.java

@@ -7,7 +7,8 @@
 
 
 public class JoinServerRequestEvent extends RequestEvent {
-    private static final UUID uuid = UUID.fromString("2a12e7b5-3f4a-4891-a2f9-ea141c8e1995");
+    @SuppressWarnings("unused")
+	private static final UUID uuid = UUID.fromString("2a12e7b5-3f4a-4891-a2f9-ea141c8e1995");
 
     public JoinServerRequestEvent(boolean allow) {
         this.allow = allow;

LauncherAPI/src/main/java/pro/gravit/launcher/events/request/LauncherRequestEvent.java

@@ -7,7 +7,8 @@
 
 
 public class LauncherRequestEvent extends RequestEvent {
-    private static final UUID uuid = UUID.fromString("d54cc12a-4f59-4f23-9b10-f527fdd2e38f");
+    @SuppressWarnings("unused")
+	private static final UUID uuid = UUID.fromString("d54cc12a-4f59-4f23-9b10-f527fdd2e38f");
     @LauncherNetworkAPI
     public String url;
     @LauncherNetworkAPI

LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfileByUUIDRequestEvent.java

@@ -8,7 +8,8 @@
 
 
 public class ProfileByUUIDRequestEvent extends RequestEvent {
-    private static final UUID uuid = UUID.fromString("b9014cf3-4b95-4d38-8c5f-867f190a18a0");
+    @SuppressWarnings("unused")
+	private static final UUID uuid = UUID.fromString("b9014cf3-4b95-4d38-8c5f-867f190a18a0");
     @LauncherNetworkAPI
     public String error;
     @LauncherNetworkAPI

LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfileByUsernameRequestEvent.java

@@ -8,7 +8,8 @@
 
 
 public class ProfileByUsernameRequestEvent extends RequestEvent {
-    private static final UUID uuid = UUID.fromString("06204302-ff6b-4779-b97d-541e3bc39aa1");
+    @SuppressWarnings("unused")
+	private static final UUID uuid = UUID.fromString("06204302-ff6b-4779-b97d-541e3bc39aa1");
     @LauncherNetworkAPI
     public String error;
     @LauncherNetworkAPI

LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfilesRequestEvent.java

@@ -9,7 +9,8 @@
 
 
 public class ProfilesRequestEvent extends RequestEvent {
-    private static final UUID uuid = UUID.fromString("2f26fbdf-598a-46dd-92fc-1699c0e173b1");
+    @SuppressWarnings("unused")
+	private static final UUID uuid = UUID.fromString("2f26fbdf-598a-46dd-92fc-1699c0e173b1");
     @LauncherNetworkAPI
     public List<ClientProfile> profiles;
 

LauncherAPI/src/main/java/pro/gravit/launcher/events/request/SetProfileRequestEvent.java

@@ -8,7 +8,8 @@
 
 
 public class SetProfileRequestEvent extends RequestEvent {
-    private static final UUID uuid = UUID.fromString("08c0de9e-4364-4152-9066-8354a3a48541");
+    @SuppressWarnings("unused")
+	private static final UUID uuid = UUID.fromString("08c0de9e-4364-4152-9066-8354a3a48541");
     @LauncherNetworkAPI
     public ClientProfile newProfile;
 

LauncherAPI/src/main/java/pro/gravit/launcher/events/request/UpdateListRequestEvent.java

@@ -8,7 +8,8 @@
 
 
 public class UpdateListRequestEvent extends RequestEvent {
-    private static final UUID uuid = UUID.fromString("5fa836ae-6b61-401c-96ac-d8396f07ec6b");
+    @SuppressWarnings("unused")
+	private static final UUID uuid = UUID.fromString("5fa836ae-6b61-401c-96ac-d8396f07ec6b");
     @LauncherNetworkAPI
     public final HashSet<String> dirs;
 

LauncherAPI/src/main/java/pro/gravit/launcher/hwid/LauncherHWIDInterface.java

@@ -1,7 +1,5 @@
 package pro.gravit.launcher.hwid;
 
-import pro.gravit.launcher.hwid.HWID;
-
 @FunctionalInterface
 public interface LauncherHWIDInterface {
     HWID getHWID();

LauncherAPI/src/main/java/pro/gravit/launcher/hwid/OshiHWID.java

@@ -4,6 +4,7 @@
 import java.util.StringJoiner;
 
 import com.google.gson.Gson;
+
 import pro.gravit.launcher.LauncherAPI;
 
 public class OshiHWID implements HWID {

LauncherAPI/src/main/java/pro/gravit/launcher/request/Request.java

@@ -6,8 +6,8 @@
 import pro.gravit.launcher.Launcher;
 import pro.gravit.launcher.LauncherAPI;
 import pro.gravit.launcher.LauncherNetworkAPI;
-import pro.gravit.launcher.request.websockets.WebSocketRequest;
 import pro.gravit.launcher.request.websockets.StandartClientWebSocketService;
+import pro.gravit.launcher.request.websockets.WebSocketRequest;
 import pro.gravit.utils.helper.SecurityHelper;
 
 public abstract class Request<R extends WebSocketEvent> implements WebSocketRequest {

LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/AuthRequest.java

@@ -1,10 +1,9 @@
 package pro.gravit.launcher.request.auth;
 
-import pro.gravit.launcher.hwid.HWID;
 import pro.gravit.launcher.LauncherAPI;
 import pro.gravit.launcher.LauncherNetworkAPI;
 import pro.gravit.launcher.events.request.AuthRequestEvent;
-import pro.gravit.launcher.hwid.OshiHWID;
+import pro.gravit.launcher.hwid.HWID;
 import pro.gravit.launcher.request.Request;
 import pro.gravit.launcher.request.websockets.WebSocketRequest;
 import pro.gravit.utils.helper.VerifyHelper;

LauncherAPI/src/main/java/pro/gravit/launcher/request/update/LauncherRequest.java

@@ -11,8 +11,8 @@
 import pro.gravit.launcher.downloader.ListDownloader;
 import pro.gravit.launcher.events.request.LauncherRequestEvent;
 import pro.gravit.launcher.request.Request;
-import pro.gravit.launcher.request.websockets.WebSocketRequest;
 import pro.gravit.launcher.request.websockets.StandartClientWebSocketService;
+import pro.gravit.launcher.request.websockets.WebSocketRequest;
 import pro.gravit.utils.helper.IOHelper;
 import pro.gravit.utils.helper.JVMHelper;
 import pro.gravit.utils.helper.LogHelper;

LauncherAPI/src/main/java/pro/gravit/launcher/request/update/UpdateRequest.java

@@ -21,8 +21,8 @@
 import pro.gravit.launcher.hasher.HashedFile;
 import pro.gravit.launcher.request.Request;
 import pro.gravit.launcher.request.update.UpdateRequest.State.Callback;
-import pro.gravit.launcher.request.websockets.WebSocketRequest;
 import pro.gravit.launcher.request.websockets.StandartClientWebSocketService;
+import pro.gravit.launcher.request.websockets.WebSocketRequest;
 import pro.gravit.utils.helper.IOHelper;
 import pro.gravit.utils.helper.LogHelper;
 

LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/ClientWebSocketService.java

@@ -12,7 +12,25 @@
 
 import pro.gravit.launcher.Launcher;
 import pro.gravit.launcher.events.ExceptionEvent;
-import pro.gravit.launcher.events.request.*;
+import pro.gravit.launcher.events.request.AuthRequestEvent;
+import pro.gravit.launcher.events.request.BatchProfileByUsernameRequestEvent;
+import pro.gravit.launcher.events.request.CheckServerRequestEvent;
+import pro.gravit.launcher.events.request.ErrorRequestEvent;
+import pro.gravit.launcher.events.request.ExecCommandRequestEvent;
+import pro.gravit.launcher.events.request.GetAvailabilityAuthRequestEvent;
+import pro.gravit.launcher.events.request.GetSecureTokenRequestEvent;
+import pro.gravit.launcher.events.request.JoinServerRequestEvent;
+import pro.gravit.launcher.events.request.LauncherRequestEvent;
+import pro.gravit.launcher.events.request.LogEvent;
+import pro.gravit.launcher.events.request.ProfileByUUIDRequestEvent;
+import pro.gravit.launcher.events.request.ProfileByUsernameRequestEvent;
+import pro.gravit.launcher.events.request.ProfilesRequestEvent;
+import pro.gravit.launcher.events.request.RegisterRequestEvent;
+import pro.gravit.launcher.events.request.RestoreSessionRequestEvent;
+import pro.gravit.launcher.events.request.SetProfileRequestEvent;
+import pro.gravit.launcher.events.request.UpdateListRequestEvent;
+import pro.gravit.launcher.events.request.UpdateRequestEvent;
+import pro.gravit.launcher.events.request.VerifySecureTokenRequestEvent;
 import pro.gravit.launcher.hasher.HashedEntry;
 import pro.gravit.launcher.hasher.HashedEntryAdapter;
 import pro.gravit.launcher.request.WebSocketEvent;

LauncherCore/src/main/java/pro/gravit/utils/command/JLineCommandHandler.java

@@ -1,7 +1,6 @@
 package pro.gravit.utils.command;
 
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.List;
 
 import org.jline.reader.Candidate;