[FIX] Изменены пакеты классов websocket

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

@@ -72,7 +72,7 @@
 import pro.gravit.launchserver.manangers.SessionManager;
 import pro.gravit.launchserver.manangers.hook.AuthHookManager;
 import pro.gravit.launchserver.manangers.hook.BuildHookManager;
-import pro.gravit.launchserver.websocket.NettyServerSocketHandler;
+import pro.gravit.launchserver.socket.handlers.NettyServerSocketHandler;
 import pro.gravit.utils.Version;
 import pro.gravit.utils.command.CommandHandler;
 import pro.gravit.utils.command.JLineCommandHandler;
@@ -82,7 +82,6 @@
 import pro.gravit.utils.helper.JVMHelper;
 import pro.gravit.utils.helper.LogHelper;
 import pro.gravit.utils.helper.SecurityHelper;
-import pro.gravit.utils.helper.VerifyHelper;
 
 public final class LaunchServer implements Runnable, AutoCloseable, Reloadable {
     @Override

LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/NoProtectHandler.java

@@ -1,6 +1,6 @@
 package pro.gravit.launchserver.auth.protect;
 
-import pro.gravit.launchserver.websocket.json.auth.AuthResponse;
+import pro.gravit.launchserver.socket.response.auth.AuthResponse;
 import pro.gravit.utils.helper.SecurityHelper;
 
 public class NoProtectHandler extends ProtectHandler {

LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/ProtectHandler.java

@@ -1,6 +1,6 @@
 package pro.gravit.launchserver.auth.protect;
 
-import pro.gravit.launchserver.websocket.json.auth.AuthResponse;
+import pro.gravit.launchserver.socket.response.auth.AuthResponse;
 import pro.gravit.utils.ProviderMap;
 
 public abstract class ProtectHandler {

LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/StdProtectHandler.java

@@ -1,6 +1,6 @@
 package pro.gravit.launchserver.auth.protect;
 
-import pro.gravit.launchserver.websocket.json.auth.AuthResponse;
+import pro.gravit.launchserver.socket.response.auth.AuthResponse;
 import pro.gravit.utils.helper.SecurityHelper;
 
 public class StdProtectHandler extends ProtectHandler {

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

@@ -3,7 +3,7 @@
 import pro.gravit.launcher.events.PingEvent;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.command.Command;
-import pro.gravit.launchserver.websocket.NettyServerSocketHandler;
+import pro.gravit.launchserver.socket.handlers.NettyServerSocketHandler;
 import pro.gravit.utils.helper.CommonHelper;
 
 public class TestCommand extends Command {

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

@@ -7,7 +7,7 @@
 import pro.gravit.launcher.NeedGarbageCollection;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.socket.Client;
-import pro.gravit.launchserver.websocket.json.auth.AuthResponse;
+import pro.gravit.launchserver.socket.response.auth.AuthResponse;
 import pro.gravit.utils.BiHookSet.Hook;
 import pro.gravit.utils.HookException;
 

LaunchServer/src/main/java/pro/gravit/launchserver/manangers/hook/AuthHookManager.java

@@ -1,10 +1,10 @@
 package pro.gravit.launchserver.manangers.hook;
 
 import pro.gravit.launchserver.socket.Client;
-import pro.gravit.launchserver.websocket.json.auth.AuthResponse;
+import pro.gravit.launchserver.socket.response.auth.AuthResponse;
-import pro.gravit.launchserver.websocket.json.auth.CheckServerResponse;
+import pro.gravit.launchserver.socket.response.auth.CheckServerResponse;
-import pro.gravit.launchserver.websocket.json.auth.JoinServerResponse;
+import pro.gravit.launchserver.socket.response.auth.JoinServerResponse;
-import pro.gravit.launchserver.websocket.json.auth.SetProfileResponse;
+import pro.gravit.launchserver.socket.response.auth.SetProfileResponse;
 import pro.gravit.utils.BiHookSet;
 
 public class AuthHookManager {

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

@@ -1,4 +1,4 @@
-package pro.gravit.launchserver.websocket;
+package pro.gravit.launchserver.socket;
 
 import java.net.InetSocketAddress;
 
@@ -19,7 +19,9 @@
 import pro.gravit.launcher.request.auth.AuthRequest;
 import pro.gravit.launcher.request.websockets.StandartClientWebSocketService;
 import pro.gravit.launchserver.LaunchServer;
-import pro.gravit.launchserver.websocket.fileserver.FileServerHandler;
+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.helper.LogHelper;
 
 public class LauncherNettyServer implements AutoCloseable {

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

@@ -1,4 +1,4 @@
-package pro.gravit.launchserver.websocket;
+package pro.gravit.launchserver.socket;
 
 public class NettyConnectContext {
     public String ip = null;

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

@@ -1,4 +1,4 @@
-package pro.gravit.launchserver.websocket;
+package pro.gravit.launchserver.socket;
 
 import java.lang.reflect.Type;
 import java.util.HashMap;
@@ -25,28 +25,27 @@
 import pro.gravit.launcher.request.ResultInterface;
 import pro.gravit.launcher.request.admin.ProxyRequest;
 import pro.gravit.launchserver.LaunchServer;
-import pro.gravit.launchserver.socket.Client;
+import pro.gravit.launchserver.socket.response.JsonResponseAdapter;
-import pro.gravit.launchserver.websocket.json.JsonResponseAdapter;
+import pro.gravit.launchserver.socket.response.JsonResponseInterface;
-import pro.gravit.launchserver.websocket.json.JsonResponseInterface;
+import pro.gravit.launchserver.socket.response.SimpleResponse;
-import pro.gravit.launchserver.websocket.json.SimpleResponse;
+import pro.gravit.launchserver.socket.response.admin.AddLogListenerResponse;
-import pro.gravit.launchserver.websocket.json.admin.AddLogListenerResponse;
+import pro.gravit.launchserver.socket.response.admin.ExecCommandResponse;
-import pro.gravit.launchserver.websocket.json.admin.ExecCommandResponse;
+import pro.gravit.launchserver.socket.response.admin.ProxyCommandResponse;
-import pro.gravit.launchserver.websocket.json.admin.ProxyCommandResponse;
+import pro.gravit.launchserver.socket.response.auth.AuthResponse;
-import pro.gravit.launchserver.websocket.json.auth.AuthResponse;
+import pro.gravit.launchserver.socket.response.auth.CheckServerResponse;
-import pro.gravit.launchserver.websocket.json.auth.CheckServerResponse;
+import pro.gravit.launchserver.socket.response.auth.GetAvailabilityAuthResponse;
-import pro.gravit.launchserver.websocket.json.auth.GetAvailabilityAuthResponse;
+import pro.gravit.launchserver.socket.response.auth.JoinServerResponse;
-import pro.gravit.launchserver.websocket.json.auth.JoinServerResponse;
+import pro.gravit.launchserver.socket.response.auth.ProfilesResponse;
-import pro.gravit.launchserver.websocket.json.auth.ProfilesResponse;
+import pro.gravit.launchserver.socket.response.auth.RestoreSessionResponse;
-import pro.gravit.launchserver.websocket.json.auth.RestoreSessionResponse;
+import pro.gravit.launchserver.socket.response.auth.SetProfileResponse;
-import pro.gravit.launchserver.websocket.json.auth.SetProfileResponse;
+import pro.gravit.launchserver.socket.response.profile.BatchProfileByUsername;
-import pro.gravit.launchserver.websocket.json.profile.BatchProfileByUsername;
+import pro.gravit.launchserver.socket.response.profile.ProfileByUUIDResponse;
-import pro.gravit.launchserver.websocket.json.profile.ProfileByUUIDResponse;
+import pro.gravit.launchserver.socket.response.profile.ProfileByUsername;
-import pro.gravit.launchserver.websocket.json.profile.ProfileByUsername;
+import pro.gravit.launchserver.socket.response.secure.GetSecureTokenResponse;
-import pro.gravit.launchserver.websocket.json.secure.GetSecureTokenResponse;
+import pro.gravit.launchserver.socket.response.secure.VerifySecureTokenResponse;
-import pro.gravit.launchserver.websocket.json.secure.VerifySecureTokenResponse;
+import pro.gravit.launchserver.socket.response.update.LauncherResponse;
-import pro.gravit.launchserver.websocket.json.update.LauncherResponse;
+import pro.gravit.launchserver.socket.response.update.UpdateListResponse;
-import pro.gravit.launchserver.websocket.json.update.UpdateListResponse;
+import pro.gravit.launchserver.socket.response.update.UpdateResponse;
-import pro.gravit.launchserver.websocket.json.update.UpdateResponse;
 import pro.gravit.utils.helper.IOHelper;
 import pro.gravit.utils.helper.LogHelper;
 
@@ -69,7 +68,7 @@ public WebSocketService(ChannelGroup channels, LaunchServer server, GsonBuilder
     private final Gson gson;
     private final GsonBuilder gsonBuiler;
 
-    void process(ChannelHandlerContext ctx, TextWebSocketFrame frame, Client client, String ip) {
+    public void process(ChannelHandlerContext ctx, TextWebSocketFrame frame, Client client, String ip) {
         String request = frame.text();
         JsonResponseInterface response = gson.fromJson(request, JsonResponseInterface.class);
         if (server.config.netty.proxy.enabled) {

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

@@ -1,4 +1,4 @@
-package pro.gravit.launchserver.websocket;
+package pro.gravit.launchserver.socket.handlers;
 
 import java.util.List;
 
@@ -7,6 +7,7 @@
 import io.netty.handler.codec.http.HttpHeaders;
 import io.netty.handler.codec.http.HttpRequest;
 import io.netty.util.ReferenceCounted;
+import pro.gravit.launchserver.socket.NettyConnectContext;
 import pro.gravit.utils.helper.LogHelper;
 
 public class NettyIpForwardHandler extends MessageToMessageDecoder<HttpRequest> {

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

@@ -1,4 +1,4 @@
-package pro.gravit.launchserver.websocket;
+package pro.gravit.launchserver.socket.handlers;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -20,6 +20,7 @@
 import pro.gravit.launcher.ssl.LauncherKeyStore;
 import pro.gravit.launcher.ssl.LauncherTrustManager;
 import pro.gravit.launchserver.LaunchServer;
+import pro.gravit.launchserver.socket.LauncherNettyServer;
 import pro.gravit.utils.helper.LogHelper;
 
 @SuppressWarnings({"unused", "rawtypes"})

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

@@ -1,4 +1,4 @@
-package pro.gravit.launchserver.websocket;
+package pro.gravit.launchserver.socket.handlers;
 
 import java.util.concurrent.TimeUnit;
 
@@ -15,6 +15,8 @@
 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/ClosingChannelFutureListener.java

@@ -1,4 +1,4 @@
-package pro.gravit.launchserver.websocket.fileserver;
+package pro.gravit.launchserver.socket.handlers.fileserver;
 
 import java.io.Closeable;
 

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

@@ -1,4 +1,4 @@
-package pro.gravit.launchserver.websocket.fileserver;
+package pro.gravit.launchserver.socket.handlers.fileserver;
 
 import static io.netty.handler.codec.http.HttpMethod.GET;
 import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/JsonResponseAdapter.java

@@ -1,4 +1,4 @@
-package pro.gravit.launchserver.websocket.json;
+package pro.gravit.launchserver.socket.response;
 
 import java.lang.reflect.Type;
 
@@ -11,7 +11,7 @@
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 
-import pro.gravit.launchserver.websocket.WebSocketService;
+import pro.gravit.launchserver.socket.WebSocketService;
 
 public class JsonResponseAdapter implements JsonSerializer<JsonResponseInterface>, JsonDeserializer<JsonResponseInterface> {
     private final WebSocketService service;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/JsonResponseInterface.java

@@ -1,4 +1,4 @@
-package pro.gravit.launchserver.websocket.json;
+package pro.gravit.launchserver.socket.response;
 
 import io.netty.channel.ChannelHandlerContext;
 import pro.gravit.launcher.request.websockets.RequestInterface;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/SimpleResponse.java

@@ -1,4 +1,4 @@
-package pro.gravit.launchserver.websocket.json;
+package pro.gravit.launchserver.socket.response;
 
 import java.util.UUID;
 
@@ -7,7 +7,7 @@
 import pro.gravit.launcher.events.request.ErrorRequestEvent;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.socket.Client;
-import pro.gravit.launchserver.websocket.WebSocketService;
+import pro.gravit.launchserver.socket.WebSocketService;
 
 public abstract class SimpleResponse implements JsonResponseInterface {
     public UUID requestUUID;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/admin/AddLogListenerResponse.java

@@ -1,9 +1,9 @@
-package pro.gravit.launchserver.websocket.json.admin;
+package pro.gravit.launchserver.socket.response.admin;
 
 import io.netty.channel.ChannelHandlerContext;
 import pro.gravit.launcher.events.request.LogEvent;
 import pro.gravit.launchserver.socket.Client;
-import pro.gravit.launchserver.websocket.json.SimpleResponse;
+import pro.gravit.launchserver.socket.response.SimpleResponse;
 import pro.gravit.utils.helper.LogHelper;
 
 public class AddLogListenerResponse extends SimpleResponse {

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/admin/ExecCommandResponse.java

@@ -1,9 +1,9 @@
-package pro.gravit.launchserver.websocket.json.admin;
+package pro.gravit.launchserver.socket.response.admin;
 
 import io.netty.channel.ChannelHandlerContext;
 import pro.gravit.launcher.events.request.ExecCommandRequestEvent;
 import pro.gravit.launchserver.socket.Client;
-import pro.gravit.launchserver.websocket.json.SimpleResponse;
+import pro.gravit.launchserver.socket.response.SimpleResponse;
 
 public class ExecCommandResponse extends SimpleResponse {
     public String cmd;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/admin/ProxyCommandResponse.java

@@ -1,9 +1,9 @@
-package pro.gravit.launchserver.websocket.json.admin;
+package pro.gravit.launchserver.socket.response.admin;
 
 import io.netty.channel.ChannelHandlerContext;
 import pro.gravit.launchserver.socket.Client;
-import pro.gravit.launchserver.websocket.json.JsonResponseInterface;
+import pro.gravit.launchserver.socket.response.JsonResponseInterface;
-import pro.gravit.launchserver.websocket.json.SimpleResponse;
+import pro.gravit.launchserver.socket.response.SimpleResponse;
 
 public class ProxyCommandResponse extends SimpleResponse {
     public JsonResponseInterface response;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/AuthResponse.java

@@ -1,4 +1,4 @@
-package pro.gravit.launchserver.websocket.json.auth;
+package pro.gravit.launchserver.socket.response.auth;
 
 import java.security.SecureRandom;
 import java.util.Collection;
@@ -18,8 +18,8 @@
 import pro.gravit.launchserver.auth.provider.AuthProvider;
 import pro.gravit.launchserver.auth.provider.AuthProviderResult;
 import pro.gravit.launchserver.socket.Client;
-import pro.gravit.launchserver.websocket.json.SimpleResponse;
+import pro.gravit.launchserver.socket.response.SimpleResponse;
-import pro.gravit.launchserver.websocket.json.profile.ProfileByUUIDResponse;
+import pro.gravit.launchserver.socket.response.profile.ProfileByUUIDResponse;
 import pro.gravit.utils.HookException;
 import pro.gravit.utils.helper.IOHelper;
 import pro.gravit.utils.helper.LogHelper;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/CheckServerResponse.java

@@ -1,11 +1,11 @@
-package pro.gravit.launchserver.websocket.json.auth;
+package pro.gravit.launchserver.socket.response.auth;
 
 import io.netty.channel.ChannelHandlerContext;
 import pro.gravit.launcher.events.request.CheckServerRequestEvent;
 import pro.gravit.launchserver.auth.AuthException;
 import pro.gravit.launchserver.socket.Client;
-import pro.gravit.launchserver.websocket.json.SimpleResponse;
+import pro.gravit.launchserver.socket.response.SimpleResponse;
-import pro.gravit.launchserver.websocket.json.profile.ProfileByUUIDResponse;
+import pro.gravit.launchserver.socket.response.profile.ProfileByUUIDResponse;
 import pro.gravit.utils.HookException;
 import pro.gravit.utils.helper.LogHelper;
 

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/GetAvailabilityAuthResponse.java

@@ -1,4 +1,4 @@
-package pro.gravit.launchserver.websocket.json.auth;
+package pro.gravit.launchserver.socket.response.auth;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -7,7 +7,7 @@
 import pro.gravit.launcher.events.request.GetAvailabilityAuthRequestEvent;
 import pro.gravit.launchserver.auth.AuthProviderPair;
 import pro.gravit.launchserver.socket.Client;
-import pro.gravit.launchserver.websocket.json.SimpleResponse;
+import pro.gravit.launchserver.socket.response.SimpleResponse;
 
 public class GetAvailabilityAuthResponse extends SimpleResponse {
     @Override

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/JoinServerResponse.java

@@ -1,10 +1,10 @@
-package pro.gravit.launchserver.websocket.json.auth;
+package pro.gravit.launchserver.socket.response.auth;
 
 import io.netty.channel.ChannelHandlerContext;
 import pro.gravit.launcher.events.request.JoinServerRequestEvent;
 import pro.gravit.launchserver.auth.AuthException;
 import pro.gravit.launchserver.socket.Client;
-import pro.gravit.launchserver.websocket.json.SimpleResponse;
+import pro.gravit.launchserver.socket.response.SimpleResponse;
 import pro.gravit.utils.HookException;
 import pro.gravit.utils.helper.LogHelper;
 

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/ProfilesResponse.java

@@ -1,10 +1,10 @@
-package pro.gravit.launchserver.websocket.json.auth;
+package pro.gravit.launchserver.socket.response.auth;
 
 import io.netty.channel.ChannelHandlerContext;
 import pro.gravit.launcher.events.request.ErrorRequestEvent;
 import pro.gravit.launcher.events.request.ProfilesRequestEvent;
 import pro.gravit.launchserver.socket.Client;
-import pro.gravit.launchserver.websocket.json.SimpleResponse;
+import pro.gravit.launchserver.socket.response.SimpleResponse;
 
 public class ProfilesResponse extends SimpleResponse {
     @Override

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/RestoreSessionResponse.java

@@ -1,11 +1,11 @@
-package pro.gravit.launchserver.websocket.json.auth;
+package pro.gravit.launchserver.socket.response.auth;
 
 import io.netty.channel.ChannelHandlerContext;
 import pro.gravit.launcher.LauncherNetworkAPI;
 import pro.gravit.launcher.events.request.RestoreSessionRequestEvent;
 import pro.gravit.launchserver.socket.Client;
-import pro.gravit.launchserver.websocket.WebSocketFrameHandler;
+import pro.gravit.launchserver.socket.handlers.WebSocketFrameHandler;
-import pro.gravit.launchserver.websocket.json.SimpleResponse;
+import pro.gravit.launchserver.socket.response.SimpleResponse;
 
 public class RestoreSessionResponse extends SimpleResponse {
     @LauncherNetworkAPI

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/SetProfileResponse.java

@@ -1,4 +1,4 @@
-package pro.gravit.launchserver.websocket.json.auth;
+package pro.gravit.launchserver.socket.response.auth;
 
 import java.util.Collection;
 
@@ -6,7 +6,7 @@
 import pro.gravit.launcher.events.request.SetProfileRequestEvent;
 import pro.gravit.launcher.profiles.ClientProfile;
 import pro.gravit.launchserver.socket.Client;
-import pro.gravit.launchserver.websocket.json.SimpleResponse;
+import pro.gravit.launchserver.socket.response.SimpleResponse;
 import pro.gravit.utils.HookException;
 
 public class SetProfileResponse extends SimpleResponse {

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/profile/BatchProfileByUsername.java

@@ -1,4 +1,4 @@
-package pro.gravit.launchserver.websocket.json.profile;
+package pro.gravit.launchserver.socket.response.profile;
 
 import java.util.UUID;
 
@@ -6,7 +6,7 @@
 import pro.gravit.launcher.events.request.BatchProfileByUsernameRequestEvent;
 import pro.gravit.launcher.profiles.PlayerProfile;
 import pro.gravit.launchserver.socket.Client;
-import pro.gravit.launchserver.websocket.json.SimpleResponse;
+import pro.gravit.launchserver.socket.response.SimpleResponse;
 import pro.gravit.utils.helper.LogHelper;
 
 public class BatchProfileByUsername extends SimpleResponse {

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/profile/ProfileByUUIDResponse.java

@@ -1,4 +1,4 @@
-package pro.gravit.launchserver.websocket.json.profile;
+package pro.gravit.launchserver.socket.response.profile;
 
 import java.io.IOException;
 import java.util.UUID;
@@ -10,7 +10,7 @@
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.auth.texture.TextureProvider;
 import pro.gravit.launchserver.socket.Client;
-import pro.gravit.launchserver.websocket.json.SimpleResponse;
+import pro.gravit.launchserver.socket.response.SimpleResponse;
 import pro.gravit.utils.helper.LogHelper;
 
 public class ProfileByUUIDResponse extends SimpleResponse {

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/profile/ProfileByUsername.java

@@ -1,11 +1,11 @@
-package pro.gravit.launchserver.websocket.json.profile;
+package pro.gravit.launchserver.socket.response.profile;
 
 import java.util.UUID;
 
 import io.netty.channel.ChannelHandlerContext;
 import pro.gravit.launcher.events.request.ProfileByUsernameRequestEvent;
 import pro.gravit.launchserver.socket.Client;
-import pro.gravit.launchserver.websocket.json.SimpleResponse;
+import pro.gravit.launchserver.socket.response.SimpleResponse;
 import pro.gravit.utils.helper.LogHelper;
 
 public class ProfileByUsername extends SimpleResponse {

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/secure/GetSecureTokenResponse.java

@@ -1,9 +1,9 @@
-package pro.gravit.launchserver.websocket.json.secure;
+package pro.gravit.launchserver.socket.response.secure;
 
 import io.netty.channel.ChannelHandlerContext;
 import pro.gravit.launcher.events.request.GetSecureTokenRequestEvent;
 import pro.gravit.launchserver.socket.Client;
-import pro.gravit.launchserver.websocket.json.SimpleResponse;
+import pro.gravit.launchserver.socket.response.SimpleResponse;
 
 public class GetSecureTokenResponse extends SimpleResponse {
     @Override

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/secure/VerifySecureTokenResponse.java

@@ -1,9 +1,9 @@
-package pro.gravit.launchserver.websocket.json.secure;
+package pro.gravit.launchserver.socket.response.secure;
 
 import io.netty.channel.ChannelHandlerContext;
 import pro.gravit.launcher.events.request.VerifySecureTokenRequestEvent;
 import pro.gravit.launchserver.socket.Client;
-import pro.gravit.launchserver.websocket.json.SimpleResponse;
+import pro.gravit.launchserver.socket.response.SimpleResponse;
 
 public class VerifySecureTokenResponse extends SimpleResponse {
     public String secureToken;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/update/LauncherResponse.java

@@ -1,4 +1,4 @@
-package pro.gravit.launchserver.websocket.json.update;
+package pro.gravit.launchserver.socket.response.update;
 
 import java.util.Arrays;
 import java.util.Base64;
@@ -6,7 +6,7 @@
 import io.netty.channel.ChannelHandlerContext;
 import pro.gravit.launcher.events.request.LauncherRequestEvent;
 import pro.gravit.launchserver.socket.Client;
-import pro.gravit.launchserver.websocket.json.SimpleResponse;
+import pro.gravit.launchserver.socket.response.SimpleResponse;
 import pro.gravit.utils.Version;
 
 public class LauncherResponse extends SimpleResponse {

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/update/UpdateListResponse.java

@@ -1,4 +1,4 @@
-package pro.gravit.launchserver.websocket.json.update;
+package pro.gravit.launchserver.socket.response.update;
 
 import java.util.HashSet;
 import java.util.Map;
@@ -8,7 +8,7 @@
 import pro.gravit.launcher.hasher.HashedDir;
 import pro.gravit.launcher.serialize.signed.SignedObjectHolder;
 import pro.gravit.launchserver.socket.Client;
-import pro.gravit.launchserver.websocket.json.SimpleResponse;
+import pro.gravit.launchserver.socket.response.SimpleResponse;
 
 public class UpdateListResponse extends SimpleResponse {
 

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/update/UpdateResponse.java

@@ -1,4 +1,4 @@
-package pro.gravit.launchserver.websocket.json.update;
+package pro.gravit.launchserver.socket.response.update;
 
 import io.netty.channel.ChannelHandlerContext;
 import pro.gravit.launcher.events.request.ErrorRequestEvent;
@@ -8,7 +8,7 @@
 import pro.gravit.launcher.serialize.signed.SignedObjectHolder;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.socket.Client;
-import pro.gravit.launchserver.websocket.json.SimpleResponse;
+import pro.gravit.launchserver.socket.response.SimpleResponse;
 import pro.gravit.utils.helper.IOHelper;
 
 public class UpdateResponse extends SimpleResponse {