From 494e714bb334401732bfc1b8ef281d85c04f873f Mon Sep 17 00:00:00 2001 From: Gravit Date: Mon, 1 Jul 2019 14:37:01 +0700 Subject: [PATCH] =?UTF-8?q?[FIX]=20=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D1=8B=20=D0=BA?= =?UTF-8?q?=D0=BB=D0=B0=D1=81=D1=81=D0=BE=D0=B2=20websocket?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pro/gravit/launchserver/LaunchServer.java | 3 +- .../auth/protect/NoProtectHandler.java | 2 +- .../auth/protect/ProtectHandler.java | 2 +- .../auth/protect/StdProtectHandler.java | 2 +- .../command/basic/TestCommand.java | 2 +- .../components/AuthLimiterComponent.java | 2 +- .../manangers/hook/AuthHookManager.java | 8 ++-- .../LauncherNettyServer.java | 6 ++- .../NettyConnectContext.java | 2 +- .../WebSocketService.java | 47 +++++++++---------- .../handlers}/NettyIpForwardHandler.java | 3 +- .../handlers}/NettyServerSocketHandler.java | 3 +- .../handlers}/WebSocketFrameHandler.java | 4 +- .../ClosingChannelFutureListener.java | 2 +- .../fileserver/FileServerHandler.java | 2 +- .../response}/JsonResponseAdapter.java | 4 +- .../response}/JsonResponseInterface.java | 2 +- .../response}/SimpleResponse.java | 4 +- .../admin/AddLogListenerResponse.java | 4 +- .../response}/admin/ExecCommandResponse.java | 4 +- .../response}/admin/ProxyCommandResponse.java | 6 +-- .../response}/auth/AuthResponse.java | 6 +-- .../response}/auth/CheckServerResponse.java | 6 +-- .../auth/GetAvailabilityAuthResponse.java | 4 +- .../response}/auth/JoinServerResponse.java | 4 +- .../response}/auth/ProfilesResponse.java | 4 +- .../auth/RestoreSessionResponse.java | 6 +-- .../response}/auth/SetProfileResponse.java | 4 +- .../profile/BatchProfileByUsername.java | 4 +- .../profile/ProfileByUUIDResponse.java | 4 +- .../response}/profile/ProfileByUsername.java | 4 +- .../secure/GetSecureTokenResponse.java | 4 +- .../secure/VerifySecureTokenResponse.java | 4 +- .../response}/update/LauncherResponse.java | 4 +- .../response}/update/UpdateListResponse.java | 4 +- .../response}/update/UpdateResponse.java | 4 +- 36 files changed, 92 insertions(+), 88 deletions(-) rename LaunchServer/src/main/java/pro/gravit/launchserver/{websocket => socket}/LauncherNettyServer.java (93%) rename LaunchServer/src/main/java/pro/gravit/launchserver/{websocket => socket}/NettyConnectContext.java (60%) rename LaunchServer/src/main/java/pro/gravit/launchserver/{websocket => socket}/WebSocketService.java (84%) rename LaunchServer/src/main/java/pro/gravit/launchserver/{websocket => socket/handlers}/NettyIpForwardHandler.java (92%) rename LaunchServer/src/main/java/pro/gravit/launchserver/{websocket => socket/handlers}/NettyServerSocketHandler.java (97%) rename LaunchServer/src/main/java/pro/gravit/launchserver/{websocket => socket/handlers}/WebSocketFrameHandler.java (94%) rename LaunchServer/src/main/java/pro/gravit/launchserver/{websocket => socket/handlers}/fileserver/ClosingChannelFutureListener.java (89%) rename LaunchServer/src/main/java/pro/gravit/launchserver/{websocket => socket/handlers}/fileserver/FileServerHandler.java (99%) rename LaunchServer/src/main/java/pro/gravit/launchserver/{websocket/json => socket/response}/JsonResponseAdapter.java (93%) rename LaunchServer/src/main/java/pro/gravit/launchserver/{websocket/json => socket/response}/JsonResponseInterface.java (86%) rename LaunchServer/src/main/java/pro/gravit/launchserver/{websocket/json => socket/response}/SimpleResponse.java (91%) rename LaunchServer/src/main/java/pro/gravit/launchserver/{websocket/json => socket/response}/admin/AddLogListenerResponse.java (92%) rename LaunchServer/src/main/java/pro/gravit/launchserver/{websocket/json => socket/response}/admin/ExecCommandResponse.java (84%) rename LaunchServer/src/main/java/pro/gravit/launchserver/{websocket/json => socket/response}/admin/ProxyCommandResponse.java (78%) rename LaunchServer/src/main/java/pro/gravit/launchserver/{websocket/json => socket/response}/auth/AuthResponse.java (97%) rename LaunchServer/src/main/java/pro/gravit/launchserver/{websocket/json => socket/response}/auth/CheckServerResponse.java (88%) rename LaunchServer/src/main/java/pro/gravit/launchserver/{websocket/json => socket/response}/auth/GetAvailabilityAuthResponse.java (87%) rename LaunchServer/src/main/java/pro/gravit/launchserver/{websocket/json => socket/response}/auth/JoinServerResponse.java (92%) rename LaunchServer/src/main/java/pro/gravit/launchserver/{websocket/json => socket/response}/auth/ProfilesResponse.java (85%) rename LaunchServer/src/main/java/pro/gravit/launchserver/{websocket/json => socket/response}/auth/RestoreSessionResponse.java (81%) rename LaunchServer/src/main/java/pro/gravit/launchserver/{websocket/json => socket/response}/auth/SetProfileResponse.java (91%) rename LaunchServer/src/main/java/pro/gravit/launchserver/{websocket/json => socket/response}/profile/BatchProfileByUsername.java (91%) rename LaunchServer/src/main/java/pro/gravit/launchserver/{websocket/json => socket/response}/profile/ProfileByUUIDResponse.java (94%) rename LaunchServer/src/main/java/pro/gravit/launchserver/{websocket/json => socket/response}/profile/ProfileByUsername.java (88%) rename LaunchServer/src/main/java/pro/gravit/launchserver/{websocket/json => socket/response}/secure/GetSecureTokenResponse.java (83%) rename LaunchServer/src/main/java/pro/gravit/launchserver/{websocket/json => socket/response}/secure/VerifySecureTokenResponse.java (84%) rename LaunchServer/src/main/java/pro/gravit/launchserver/{websocket/json => socket/response}/update/LauncherResponse.java (94%) rename LaunchServer/src/main/java/pro/gravit/launchserver/{websocket/json => socket/response}/update/UpdateListResponse.java (88%) rename LaunchServer/src/main/java/pro/gravit/launchserver/{websocket/json => socket/response}/update/UpdateResponse.java (94%) diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java b/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java index d2408571..6799d7b7 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java +++ b/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 diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/NoProtectHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/NoProtectHandler.java index 7f220703..7985c744 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/NoProtectHandler.java +++ b/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 { diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/ProtectHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/ProtectHandler.java index c96a15f6..9cd5a200 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/ProtectHandler.java +++ b/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 { diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/StdProtectHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/StdProtectHandler.java index d88e6163..0c37166e 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/StdProtectHandler.java +++ b/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 { diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/TestCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/TestCommand.java index 7acf72b9..917b9f9b 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/TestCommand.java +++ b/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 { diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/components/AuthLimiterComponent.java b/LaunchServer/src/main/java/pro/gravit/launchserver/components/AuthLimiterComponent.java index 61b889c4..844a9e56 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/components/AuthLimiterComponent.java +++ b/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; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/hook/AuthHookManager.java b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/hook/AuthHookManager.java index fa42d7bd..ef181c2f 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/hook/AuthHookManager.java +++ b/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.websocket.json.auth.CheckServerResponse; -import pro.gravit.launchserver.websocket.json.auth.JoinServerResponse; -import pro.gravit.launchserver.websocket.json.auth.SetProfileResponse; +import pro.gravit.launchserver.socket.response.auth.AuthResponse; +import pro.gravit.launchserver.socket.response.auth.CheckServerResponse; +import pro.gravit.launchserver.socket.response.auth.JoinServerResponse; +import pro.gravit.launchserver.socket.response.auth.SetProfileResponse; import pro.gravit.utils.BiHookSet; public class AuthHookManager { diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/LauncherNettyServer.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/LauncherNettyServer.java similarity index 93% rename from LaunchServer/src/main/java/pro/gravit/launchserver/websocket/LauncherNettyServer.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/LauncherNettyServer.java index d127069e..0c24db50 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/LauncherNettyServer.java +++ b/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 { diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/NettyConnectContext.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/NettyConnectContext.java similarity index 60% rename from LaunchServer/src/main/java/pro/gravit/launchserver/websocket/NettyConnectContext.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/NettyConnectContext.java index c9f95cad..6b7297a7 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/NettyConnectContext.java +++ b/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; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/WebSocketService.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/WebSocketService.java similarity index 84% rename from LaunchServer/src/main/java/pro/gravit/launchserver/websocket/WebSocketService.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/WebSocketService.java index 034c4732..e939c68d 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/WebSocketService.java +++ b/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.websocket.json.JsonResponseAdapter; -import pro.gravit.launchserver.websocket.json.JsonResponseInterface; -import pro.gravit.launchserver.websocket.json.SimpleResponse; -import pro.gravit.launchserver.websocket.json.admin.AddLogListenerResponse; -import pro.gravit.launchserver.websocket.json.admin.ExecCommandResponse; -import pro.gravit.launchserver.websocket.json.admin.ProxyCommandResponse; -import pro.gravit.launchserver.websocket.json.auth.AuthResponse; -import pro.gravit.launchserver.websocket.json.auth.CheckServerResponse; -import pro.gravit.launchserver.websocket.json.auth.GetAvailabilityAuthResponse; -import pro.gravit.launchserver.websocket.json.auth.JoinServerResponse; -import pro.gravit.launchserver.websocket.json.auth.ProfilesResponse; -import pro.gravit.launchserver.websocket.json.auth.RestoreSessionResponse; -import pro.gravit.launchserver.websocket.json.auth.SetProfileResponse; -import pro.gravit.launchserver.websocket.json.profile.BatchProfileByUsername; -import pro.gravit.launchserver.websocket.json.profile.ProfileByUUIDResponse; -import pro.gravit.launchserver.websocket.json.profile.ProfileByUsername; -import pro.gravit.launchserver.websocket.json.secure.GetSecureTokenResponse; -import pro.gravit.launchserver.websocket.json.secure.VerifySecureTokenResponse; -import pro.gravit.launchserver.websocket.json.update.LauncherResponse; -import pro.gravit.launchserver.websocket.json.update.UpdateListResponse; -import pro.gravit.launchserver.websocket.json.update.UpdateResponse; +import pro.gravit.launchserver.socket.response.JsonResponseAdapter; +import pro.gravit.launchserver.socket.response.JsonResponseInterface; +import pro.gravit.launchserver.socket.response.SimpleResponse; +import pro.gravit.launchserver.socket.response.admin.AddLogListenerResponse; +import pro.gravit.launchserver.socket.response.admin.ExecCommandResponse; +import pro.gravit.launchserver.socket.response.admin.ProxyCommandResponse; +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.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; +import pro.gravit.launchserver.socket.response.secure.GetSecureTokenResponse; +import pro.gravit.launchserver.socket.response.secure.VerifySecureTokenResponse; +import pro.gravit.launchserver.socket.response.update.LauncherResponse; +import pro.gravit.launchserver.socket.response.update.UpdateListResponse; +import pro.gravit.launchserver.socket.response.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) { diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/NettyIpForwardHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/handlers/NettyIpForwardHandler.java similarity index 92% rename from LaunchServer/src/main/java/pro/gravit/launchserver/websocket/NettyIpForwardHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/handlers/NettyIpForwardHandler.java index c9554763..4908b4e4 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/NettyIpForwardHandler.java +++ b/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 { diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/NettyServerSocketHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/handlers/NettyServerSocketHandler.java similarity index 97% rename from LaunchServer/src/main/java/pro/gravit/launchserver/websocket/NettyServerSocketHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/handlers/NettyServerSocketHandler.java index 09b353be..e87f814d 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/NettyServerSocketHandler.java +++ b/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"}) diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/WebSocketFrameHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/handlers/WebSocketFrameHandler.java similarity index 94% rename from LaunchServer/src/main/java/pro/gravit/launchserver/websocket/WebSocketFrameHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/handlers/WebSocketFrameHandler.java index e9c267d6..b27c9280 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/WebSocketFrameHandler.java +++ b/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; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/fileserver/ClosingChannelFutureListener.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/handlers/fileserver/ClosingChannelFutureListener.java similarity index 89% rename from LaunchServer/src/main/java/pro/gravit/launchserver/websocket/fileserver/ClosingChannelFutureListener.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/handlers/fileserver/ClosingChannelFutureListener.java index a6396acc..987c6a2a 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/fileserver/ClosingChannelFutureListener.java +++ b/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; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/fileserver/FileServerHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/handlers/fileserver/FileServerHandler.java similarity index 99% rename from LaunchServer/src/main/java/pro/gravit/launchserver/websocket/fileserver/FileServerHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/handlers/fileserver/FileServerHandler.java index a058581a..88e762ac 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/fileserver/FileServerHandler.java +++ b/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; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/JsonResponseAdapter.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/JsonResponseAdapter.java similarity index 93% rename from LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/JsonResponseAdapter.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/JsonResponseAdapter.java index df43e3be..0ebc0327 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/JsonResponseAdapter.java +++ b/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, JsonDeserializer { private final WebSocketService service; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/JsonResponseInterface.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/JsonResponseInterface.java similarity index 86% rename from LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/JsonResponseInterface.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/JsonResponseInterface.java index 7a0431fd..1e44ba4e 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/JsonResponseInterface.java +++ b/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; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/SimpleResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/SimpleResponse.java similarity index 91% rename from LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/SimpleResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/SimpleResponse.java index b7496b66..cd90c345 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/SimpleResponse.java +++ b/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; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/admin/AddLogListenerResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/admin/AddLogListenerResponse.java similarity index 92% rename from LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/admin/AddLogListenerResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/admin/AddLogListenerResponse.java index f8a321da..1a7ec741 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/admin/AddLogListenerResponse.java +++ b/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 { diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/admin/ExecCommandResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/admin/ExecCommandResponse.java similarity index 84% rename from LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/admin/ExecCommandResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/admin/ExecCommandResponse.java index 1af1f411..9c7a3d44 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/admin/ExecCommandResponse.java +++ b/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; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/admin/ProxyCommandResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/admin/ProxyCommandResponse.java similarity index 78% rename from LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/admin/ProxyCommandResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/admin/ProxyCommandResponse.java index d13ede9e..356fd471 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/admin/ProxyCommandResponse.java +++ b/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.websocket.json.SimpleResponse; +import pro.gravit.launchserver.socket.response.JsonResponseInterface; +import pro.gravit.launchserver.socket.response.SimpleResponse; public class ProxyCommandResponse extends SimpleResponse { public JsonResponseInterface response; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/AuthResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/AuthResponse.java similarity index 97% rename from LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/AuthResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/AuthResponse.java index 858550f2..c5f0d8e2 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/AuthResponse.java +++ b/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.websocket.json.profile.ProfileByUUIDResponse; +import pro.gravit.launchserver.socket.response.SimpleResponse; +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; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/CheckServerResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/CheckServerResponse.java similarity index 88% rename from LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/CheckServerResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/CheckServerResponse.java index 02f65056..f660672e 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/CheckServerResponse.java +++ b/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.websocket.json.profile.ProfileByUUIDResponse; +import pro.gravit.launchserver.socket.response.SimpleResponse; +import pro.gravit.launchserver.socket.response.profile.ProfileByUUIDResponse; import pro.gravit.utils.HookException; import pro.gravit.utils.helper.LogHelper; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/GetAvailabilityAuthResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/GetAvailabilityAuthResponse.java similarity index 87% rename from LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/GetAvailabilityAuthResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/GetAvailabilityAuthResponse.java index 5a855a60..ffa5a032 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/GetAvailabilityAuthResponse.java +++ b/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 diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/JoinServerResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/JoinServerResponse.java similarity index 92% rename from LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/JoinServerResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/JoinServerResponse.java index 24e814c3..c1a66a7f 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/JoinServerResponse.java +++ b/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; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/ProfilesResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/ProfilesResponse.java similarity index 85% rename from LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/ProfilesResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/ProfilesResponse.java index dfff2930..5c00006e 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/ProfilesResponse.java +++ b/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 diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/RestoreSessionResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/RestoreSessionResponse.java similarity index 81% rename from LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/RestoreSessionResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/RestoreSessionResponse.java index bff4b6ab..db432c09 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/RestoreSessionResponse.java +++ b/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.websocket.json.SimpleResponse; +import pro.gravit.launchserver.socket.handlers.WebSocketFrameHandler; +import pro.gravit.launchserver.socket.response.SimpleResponse; public class RestoreSessionResponse extends SimpleResponse { @LauncherNetworkAPI diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/SetProfileResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/SetProfileResponse.java similarity index 91% rename from LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/SetProfileResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/SetProfileResponse.java index 206ac069..9087369f 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/SetProfileResponse.java +++ b/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 { diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/profile/BatchProfileByUsername.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/profile/BatchProfileByUsername.java similarity index 91% rename from LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/profile/BatchProfileByUsername.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/profile/BatchProfileByUsername.java index 7e8e86ad..bdb16f23 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/profile/BatchProfileByUsername.java +++ b/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 { diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/profile/ProfileByUUIDResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/profile/ProfileByUUIDResponse.java similarity index 94% rename from LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/profile/ProfileByUUIDResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/profile/ProfileByUUIDResponse.java index d2a23b7d..c782c297 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/profile/ProfileByUUIDResponse.java +++ b/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 { diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/profile/ProfileByUsername.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/profile/ProfileByUsername.java similarity index 88% rename from LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/profile/ProfileByUsername.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/profile/ProfileByUsername.java index e50d5b9f..0f303e1c 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/profile/ProfileByUsername.java +++ b/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 { diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/secure/GetSecureTokenResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/secure/GetSecureTokenResponse.java similarity index 83% rename from LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/secure/GetSecureTokenResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/secure/GetSecureTokenResponse.java index 238683ca..9beb1ec5 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/secure/GetSecureTokenResponse.java +++ b/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 diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/secure/VerifySecureTokenResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/secure/VerifySecureTokenResponse.java similarity index 84% rename from LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/secure/VerifySecureTokenResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/secure/VerifySecureTokenResponse.java index 44adff98..e59170c5 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/secure/VerifySecureTokenResponse.java +++ b/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; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/update/LauncherResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/update/LauncherResponse.java similarity index 94% rename from LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/update/LauncherResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/update/LauncherResponse.java index d029228f..765374f1 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/update/LauncherResponse.java +++ b/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 { diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/update/UpdateListResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/update/UpdateListResponse.java similarity index 88% rename from LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/update/UpdateListResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/update/UpdateListResponse.java index 59ab9b44..118d72ed 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/update/UpdateListResponse.java +++ b/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 { diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/update/UpdateResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/update/UpdateResponse.java similarity index 94% rename from LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/update/UpdateResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/update/UpdateResponse.java index a40ba1a4..6d4f8431 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/update/UpdateResponse.java +++ b/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 {