From fefafc30c179ac0b860fc33b141c204d8987f1f5 Mon Sep 17 00:00:00 2001 From: Gravit Date: Thu, 4 Apr 2019 19:10:28 +0700 Subject: [PATCH] =?UTF-8?q?[REFRACTOR]=20=D0=9F=D1=80=D0=B8=D0=B2=D0=B8?= =?UTF-8?q?=D0=B4=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=20=D0=BF=D0=BE=D1=80?= =?UTF-8?q?=D1=8F=D0=B4=D0=BE=D0=BA=20=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82?= =?UTF-8?q?=D1=83=D1=80=D1=8B=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=BE=D0=B2?= =?UTF-8?q?=20LaunchServer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru/gravit/launchserver/LaunchServer.java | 8 +++--- .../launchserver/auth/AuthProviderPair.java | 2 +- .../auth/protect/NoProtectHandler.java | 2 +- .../auth/protect/ProtectHandler.java | 2 +- .../texture/NullTextureProvider.java | 2 +- .../texture/RequestTextureProvider.java | 2 +- .../{ => auth}/texture/TextureProvider.java | 2 +- .../texture/VoidTextureProvider.java | 2 +- .../command/basic/TestCommand.java | 2 +- .../components/AuthLimiterComponent.java | 2 +- .../adapter/TextureProviderAdapter.java | 2 +- .../{response => legacy}/PingResponse.java | 2 +- .../{response => legacy}/Response.java | 6 ++--- .../update/LauncherResponse.java | 4 +-- .../update/LegacyLauncherResponse.java | 4 +-- .../manangers/hook/AuthHookManager.java | 2 +- .../launchserver/socket/ResponseThread.java | 2 +- .../NettyServerSocketHandler.java | 7 +++-- .../websocket/WebSocketFrameHandler.java | 2 +- .../websocket/WebSocketIndexPageHandler.java | 2 +- .../websocket/WebSocketServerIndexPage.java | 2 +- .../websocket/WebSocketService.java | 26 +++++++++---------- .../ClosingChannelFutureListener.java | 2 +- .../fileserver/FileServerHandler.java | 2 +- .../websocket/json/EchoResponse.java | 4 +-- .../websocket/json/JsonResponseAdapter.java | 4 +-- .../websocket/json/JsonResponseInterface.java | 4 +-- .../websocket/json/SimpleResponse.java | 4 +-- .../json/admin/AddLogListenerResponse.java | 6 ++--- .../json/admin/ExecCommandResponse.java | 6 ++--- .../websocket/json/auth/AuthResponse.java | 8 +++--- .../json/auth/CheckServerResponse.java | 8 +++--- .../json/auth/JoinServerResponse.java | 6 ++--- .../websocket/json/auth/ProfilesResponse.java | 6 ++--- .../json/auth/RestoreSessionResponse.java | 8 +++--- .../json/auth/SetProfileResponse.java | 6 ++--- .../json/profile/BatchProfileByUsername.java | 6 ++--- .../json/profile/ProfileByUUIDResponse.java | 8 +++--- .../json/profile/ProfileByUsername.java | 8 +++--- .../json/update/LauncherResponse.java | 6 ++--- .../json/update/UpdateListResponse.java | 6 ++--- .../websocket/json/update/UpdateResponse.java | 6 ++--- 42 files changed, 100 insertions(+), 101 deletions(-) rename LaunchServer/src/main/java/ru/gravit/launchserver/{ => auth}/texture/NullTextureProvider.java (96%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{ => auth}/texture/RequestTextureProvider.java (97%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{ => auth}/texture/TextureProvider.java (97%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{ => auth}/texture/VoidTextureProvider.java (91%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{response => legacy}/PingResponse.java (93%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{response => legacy}/Response.java (93%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{response => legacy}/update/LauncherResponse.java (93%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{response => legacy}/update/LegacyLauncherResponse.java (92%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{socket => websocket}/NettyServerSocketHandler.java (97%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{socket => }/websocket/WebSocketFrameHandler.java (97%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{socket => }/websocket/WebSocketIndexPageHandler.java (98%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{socket => }/websocket/WebSocketServerIndexPage.java (98%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{socket => }/websocket/WebSocketService.java (83%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{ => websocket}/fileserver/ClosingChannelFutureListener.java (90%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{ => websocket}/fileserver/FileServerHandler.java (99%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{socket => }/websocket/json/EchoResponse.java (85%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{socket => }/websocket/json/JsonResponseAdapter.java (90%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{socket => }/websocket/json/JsonResponseInterface.java (68%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{socket => }/websocket/json/SimpleResponse.java (74%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{socket => }/websocket/json/admin/AddLogListenerResponse.java (89%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{socket => }/websocket/json/admin/ExecCommandResponse.java (82%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{socket => }/websocket/json/auth/AuthResponse.java (95%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{socket => }/websocket/json/auth/CheckServerResponse.java (84%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{socket => }/websocket/json/auth/JoinServerResponse.java (88%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{socket => }/websocket/json/auth/ProfilesResponse.java (81%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{socket => }/websocket/json/auth/RestoreSessionResponse.java (79%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{socket => }/websocket/json/auth/SetProfileResponse.java (87%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{socket => }/websocket/json/profile/BatchProfileByUsername.java (85%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{socket => }/websocket/json/profile/ProfileByUUIDResponse.java (87%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{socket => }/websocket/json/profile/ProfileByUsername.java (72%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{socket => }/websocket/json/update/LauncherResponse.java (91%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{socket => }/websocket/json/update/UpdateListResponse.java (84%) rename LaunchServer/src/main/java/ru/gravit/launchserver/{socket => }/websocket/json/update/UpdateResponse.java (87%) diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java b/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java index b27255c9..05fa2927 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java @@ -29,11 +29,11 @@ import ru.gravit.launchserver.manangers.hook.AuthHookManager; import ru.gravit.launchserver.manangers.hook.BuildHookManager; import ru.gravit.launchserver.manangers.hook.SocketHookManager; -import ru.gravit.launchserver.response.Response; -import ru.gravit.launchserver.socket.NettyServerSocketHandler; +import ru.gravit.launchserver.legacy.Response; +import ru.gravit.launchserver.websocket.NettyServerSocketHandler; import ru.gravit.launchserver.socket.ServerSocketHandler; -import ru.gravit.launchserver.texture.RequestTextureProvider; -import ru.gravit.launchserver.texture.TextureProvider; +import ru.gravit.launchserver.auth.texture.RequestTextureProvider; +import ru.gravit.launchserver.auth.texture.TextureProvider; import ru.gravit.utils.command.CommandHandler; import ru.gravit.utils.command.JLineCommandHandler; import ru.gravit.utils.command.StdCommandHandler; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/AuthProviderPair.java b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/AuthProviderPair.java index 5710ec5d..4fd8bf32 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/AuthProviderPair.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/AuthProviderPair.java @@ -2,7 +2,7 @@ import ru.gravit.launchserver.auth.handler.AuthHandler; import ru.gravit.launchserver.auth.provider.AuthProvider; -import ru.gravit.launchserver.texture.TextureProvider; +import ru.gravit.launchserver.auth.texture.TextureProvider; import java.io.IOException; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/protect/NoProtectHandler.java b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/protect/NoProtectHandler.java index b5128efb..915875e6 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/protect/NoProtectHandler.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/protect/NoProtectHandler.java @@ -1,6 +1,6 @@ package ru.gravit.launchserver.auth.protect; -import ru.gravit.launchserver.socket.websocket.json.auth.AuthResponse; +import ru.gravit.launchserver.websocket.json.auth.AuthResponse; import ru.gravit.utils.helper.SecurityHelper; public class NoProtectHandler extends ProtectHandler { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/protect/ProtectHandler.java b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/protect/ProtectHandler.java index f7813855..1d3401f6 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/protect/ProtectHandler.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/protect/ProtectHandler.java @@ -1,6 +1,6 @@ package ru.gravit.launchserver.auth.protect; -import ru.gravit.launchserver.socket.websocket.json.auth.AuthResponse; +import ru.gravit.launchserver.websocket.json.auth.AuthResponse; import ru.gravit.utils.helper.VerifyHelper; import java.util.Map; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/texture/NullTextureProvider.java b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/texture/NullTextureProvider.java similarity index 96% rename from LaunchServer/src/main/java/ru/gravit/launchserver/texture/NullTextureProvider.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/auth/texture/NullTextureProvider.java index e1a855e7..bcd63cde 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/texture/NullTextureProvider.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/texture/NullTextureProvider.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.texture; +package ru.gravit.launchserver.auth.texture; import ru.gravit.launcher.profiles.Texture; import ru.gravit.utils.helper.VerifyHelper; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/texture/RequestTextureProvider.java b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/texture/RequestTextureProvider.java similarity index 97% rename from LaunchServer/src/main/java/ru/gravit/launchserver/texture/RequestTextureProvider.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/auth/texture/RequestTextureProvider.java index 4c663126..0d3fc1ff 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/texture/RequestTextureProvider.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/texture/RequestTextureProvider.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.texture; +package ru.gravit.launchserver.auth.texture; import ru.gravit.launcher.Launcher; import ru.gravit.launcher.profiles.Texture; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/texture/TextureProvider.java b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/texture/TextureProvider.java similarity index 97% rename from LaunchServer/src/main/java/ru/gravit/launchserver/texture/TextureProvider.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/auth/texture/TextureProvider.java index 16c9be50..e9db005e 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/texture/TextureProvider.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/texture/TextureProvider.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.texture; +package ru.gravit.launchserver.auth.texture; import ru.gravit.launcher.profiles.Texture; import ru.gravit.utils.helper.VerifyHelper; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/texture/VoidTextureProvider.java b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/texture/VoidTextureProvider.java similarity index 91% rename from LaunchServer/src/main/java/ru/gravit/launchserver/texture/VoidTextureProvider.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/auth/texture/VoidTextureProvider.java index 0b77312e..9a5cad7c 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/texture/VoidTextureProvider.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/texture/VoidTextureProvider.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.texture; +package ru.gravit.launchserver.auth.texture; import ru.gravit.launcher.profiles.Texture; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/TestCommand.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/TestCommand.java index 850e573e..9ed6b48e 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/TestCommand.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/TestCommand.java @@ -2,7 +2,7 @@ import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.command.Command; -import ru.gravit.launchserver.socket.NettyServerSocketHandler; +import ru.gravit.launchserver.websocket.NettyServerSocketHandler; import ru.gravit.utils.helper.CommonHelper; public class TestCommand extends Command { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/components/AuthLimiterComponent.java b/LaunchServer/src/main/java/ru/gravit/launchserver/components/AuthLimiterComponent.java index 8d9d98c8..d6c44235 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/components/AuthLimiterComponent.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/components/AuthLimiterComponent.java @@ -5,7 +5,7 @@ import ru.gravit.launchserver.auth.AuthException; import ru.gravit.launchserver.auth.provider.AuthProvider; import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.socket.websocket.json.auth.AuthResponse; +import ru.gravit.launchserver.websocket.json.auth.AuthResponse; import java.util.ArrayList; import java.util.HashMap; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/config/adapter/TextureProviderAdapter.java b/LaunchServer/src/main/java/ru/gravit/launchserver/config/adapter/TextureProviderAdapter.java index 80d81cd3..a67c5635 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/config/adapter/TextureProviderAdapter.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/config/adapter/TextureProviderAdapter.java @@ -1,7 +1,7 @@ package ru.gravit.launchserver.config.adapter; import com.google.gson.*; -import ru.gravit.launchserver.texture.TextureProvider; +import ru.gravit.launchserver.auth.texture.TextureProvider; import ru.gravit.utils.helper.LogHelper; import java.lang.reflect.Type; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/PingResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/legacy/PingResponse.java similarity index 93% rename from LaunchServer/src/main/java/ru/gravit/launchserver/response/PingResponse.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/legacy/PingResponse.java index 3a88b84b..1575aec7 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/PingResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/legacy/PingResponse.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.response; +package ru.gravit.launchserver.legacy; import ru.gravit.launcher.serialize.HInput; import ru.gravit.launcher.serialize.HOutput; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/Response.java b/LaunchServer/src/main/java/ru/gravit/launchserver/legacy/Response.java similarity index 93% rename from LaunchServer/src/main/java/ru/gravit/launchserver/response/Response.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/legacy/Response.java index 28dfee1f..e3d48b4e 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/Response.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/legacy/Response.java @@ -1,12 +1,12 @@ -package ru.gravit.launchserver.response; +package ru.gravit.launchserver.legacy; import ru.gravit.launcher.request.RequestException; import ru.gravit.launcher.request.RequestType; import ru.gravit.launcher.serialize.HInput; import ru.gravit.launcher.serialize.HOutput; import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.response.update.LauncherResponse; -import ru.gravit.launchserver.response.update.LegacyLauncherResponse; +import ru.gravit.launchserver.legacy.update.LauncherResponse; +import ru.gravit.launchserver.legacy.update.LegacyLauncherResponse; import ru.gravit.launchserver.socket.Client; import ru.gravit.utils.helper.LogHelper; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/LauncherResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/legacy/update/LauncherResponse.java similarity index 93% rename from LaunchServer/src/main/java/ru/gravit/launchserver/response/update/LauncherResponse.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/legacy/update/LauncherResponse.java index 242e657b..883b5274 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/LauncherResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/legacy/update/LauncherResponse.java @@ -1,11 +1,11 @@ -package ru.gravit.launchserver.response.update; +package ru.gravit.launchserver.legacy.update; import ru.gravit.launcher.serialize.HInput; import ru.gravit.launcher.serialize.HOutput; import ru.gravit.launcher.serialize.SerializeLimits; import ru.gravit.launcher.serialize.signed.DigestBytesHolder; import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.response.Response; +import ru.gravit.launchserver.legacy.Response; import ru.gravit.launchserver.socket.Client; import java.io.IOException; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/LegacyLauncherResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/legacy/update/LegacyLauncherResponse.java similarity index 92% rename from LaunchServer/src/main/java/ru/gravit/launchserver/response/update/LegacyLauncherResponse.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/legacy/update/LegacyLauncherResponse.java index 2994bdd7..e1c11a78 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/response/update/LegacyLauncherResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/legacy/update/LegacyLauncherResponse.java @@ -1,10 +1,10 @@ -package ru.gravit.launchserver.response.update; +package ru.gravit.launchserver.legacy.update; import ru.gravit.launcher.serialize.HInput; import ru.gravit.launcher.serialize.HOutput; import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.binary.LauncherBinary; -import ru.gravit.launchserver.response.Response; +import ru.gravit.launchserver.legacy.Response; import ru.gravit.launchserver.socket.Client; import ru.gravit.utils.helper.SecurityHelper; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/hook/AuthHookManager.java b/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/hook/AuthHookManager.java index 1097150c..a0c0ba1c 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/hook/AuthHookManager.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/hook/AuthHookManager.java @@ -2,7 +2,7 @@ import ru.gravit.launchserver.auth.AuthException; import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.socket.websocket.json.auth.AuthResponse; +import ru.gravit.launchserver.websocket.json.auth.AuthResponse; import java.util.HashSet; import java.util.Set; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/ResponseThread.java b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/ResponseThread.java index d7c78cde..91dab3af 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/ResponseThread.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/ResponseThread.java @@ -7,7 +7,7 @@ import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.manangers.SessionManager; import ru.gravit.launchserver.manangers.hook.SocketHookManager; -import ru.gravit.launchserver.response.Response; +import ru.gravit.launchserver.legacy.Response; import ru.gravit.utils.helper.IOHelper; import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.SecurityHelper; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/NettyServerSocketHandler.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/NettyServerSocketHandler.java similarity index 97% rename from LaunchServer/src/main/java/ru/gravit/launchserver/socket/NettyServerSocketHandler.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/websocket/NettyServerSocketHandler.java index f2f5d5f3..85fae5c6 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/NettyServerSocketHandler.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/NettyServerSocketHandler.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.socket; +package ru.gravit.launchserver.websocket; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.ChannelFuture; @@ -17,9 +17,8 @@ import ru.gravit.launcher.ssl.LauncherKeyStore; import ru.gravit.launcher.ssl.LauncherTrustManager; import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.fileserver.FileServerHandler; -import ru.gravit.launchserver.response.Response; -import ru.gravit.launchserver.socket.websocket.WebSocketFrameHandler; +import ru.gravit.launchserver.websocket.fileserver.FileServerHandler; +import ru.gravit.launchserver.legacy.Response; import ru.gravit.utils.helper.CommonHelper; import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.VerifyHelper; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketFrameHandler.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketFrameHandler.java similarity index 97% rename from LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketFrameHandler.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketFrameHandler.java index 71a7d370..d08a7c41 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketFrameHandler.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketFrameHandler.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.socket.websocket; +package ru.gravit.launchserver.websocket; import com.google.gson.GsonBuilder; import io.netty.channel.ChannelHandlerContext; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketIndexPageHandler.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketIndexPageHandler.java similarity index 98% rename from LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketIndexPageHandler.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketIndexPageHandler.java index b65f25a7..011e11c0 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketIndexPageHandler.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketIndexPageHandler.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.socket.websocket; +package ru.gravit.launchserver.websocket; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketServerIndexPage.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketServerIndexPage.java similarity index 98% rename from LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketServerIndexPage.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketServerIndexPage.java index 0795c15e..8d2ba9e2 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketServerIndexPage.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketServerIndexPage.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.socket.websocket; +package ru.gravit.launchserver.websocket; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketService.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketService.java similarity index 83% rename from LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketService.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketService.java index 899708aa..6e108ed2 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketService.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketService.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.socket.websocket; +package ru.gravit.launchserver.websocket; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -13,18 +13,18 @@ import ru.gravit.launcher.request.ResultInterface; import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.socket.websocket.json.EchoResponse; -import ru.gravit.launchserver.socket.websocket.json.JsonResponseAdapter; -import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; -import ru.gravit.launchserver.socket.websocket.json.admin.AddLogListenerResponse; -import ru.gravit.launchserver.socket.websocket.json.admin.ExecCommandResponse; -import ru.gravit.launchserver.socket.websocket.json.auth.*; -import ru.gravit.launchserver.socket.websocket.json.profile.BatchProfileByUsername; -import ru.gravit.launchserver.socket.websocket.json.profile.ProfileByUUIDResponse; -import ru.gravit.launchserver.socket.websocket.json.profile.ProfileByUsername; -import ru.gravit.launchserver.socket.websocket.json.update.LauncherResponse; -import ru.gravit.launchserver.socket.websocket.json.update.UpdateListResponse; -import ru.gravit.launchserver.socket.websocket.json.update.UpdateResponse; +import ru.gravit.launchserver.websocket.json.EchoResponse; +import ru.gravit.launchserver.websocket.json.JsonResponseAdapter; +import ru.gravit.launchserver.websocket.json.JsonResponseInterface; +import ru.gravit.launchserver.websocket.json.admin.AddLogListenerResponse; +import ru.gravit.launchserver.websocket.json.admin.ExecCommandResponse; +import ru.gravit.launchserver.websocket.json.auth.*; +import ru.gravit.launchserver.websocket.json.profile.BatchProfileByUsername; +import ru.gravit.launchserver.websocket.json.profile.ProfileByUUIDResponse; +import ru.gravit.launchserver.websocket.json.profile.ProfileByUsername; +import ru.gravit.launchserver.websocket.json.update.LauncherResponse; +import ru.gravit.launchserver.websocket.json.update.UpdateListResponse; +import ru.gravit.launchserver.websocket.json.update.UpdateResponse; import ru.gravit.utils.helper.LogHelper; import java.lang.reflect.Type; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/fileserver/ClosingChannelFutureListener.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/fileserver/ClosingChannelFutureListener.java similarity index 90% rename from LaunchServer/src/main/java/ru/gravit/launchserver/fileserver/ClosingChannelFutureListener.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/websocket/fileserver/ClosingChannelFutureListener.java index 6b29eed0..e9cc5a3b 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/fileserver/ClosingChannelFutureListener.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/fileserver/ClosingChannelFutureListener.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.fileserver; +package ru.gravit.launchserver.websocket.fileserver; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFutureListener; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/fileserver/FileServerHandler.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/fileserver/FileServerHandler.java similarity index 99% rename from LaunchServer/src/main/java/ru/gravit/launchserver/fileserver/FileServerHandler.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/websocket/fileserver/FileServerHandler.java index 8d6165d1..491becdf 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/fileserver/FileServerHandler.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/fileserver/FileServerHandler.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.fileserver; +package ru.gravit.launchserver.websocket.fileserver; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/EchoResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/EchoResponse.java similarity index 85% rename from LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/EchoResponse.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/EchoResponse.java index eb91724c..763c3ab8 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/EchoResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/EchoResponse.java @@ -1,9 +1,9 @@ -package ru.gravit.launchserver.socket.websocket.json; +package ru.gravit.launchserver.websocket.json; import io.netty.channel.ChannelHandlerContext; import ru.gravit.launcher.events.request.EchoRequestEvent; import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.socket.websocket.WebSocketService; +import ru.gravit.launchserver.websocket.WebSocketService; import ru.gravit.utils.helper.LogHelper; public class EchoResponse implements JsonResponseInterface { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/JsonResponseAdapter.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/JsonResponseAdapter.java similarity index 90% rename from LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/JsonResponseAdapter.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/JsonResponseAdapter.java index f967c952..f6f0610f 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/JsonResponseAdapter.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/JsonResponseAdapter.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.socket.websocket.json; +package ru.gravit.launchserver.websocket.json; import com.google.gson.*; -import ru.gravit.launchserver.socket.websocket.WebSocketService; +import ru.gravit.launchserver.websocket.WebSocketService; import java.lang.reflect.Type; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/JsonResponseInterface.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/JsonResponseInterface.java similarity index 68% rename from LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/JsonResponseInterface.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/JsonResponseInterface.java index bf55f6cb..6a5799f1 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/JsonResponseInterface.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/JsonResponseInterface.java @@ -1,8 +1,8 @@ -package ru.gravit.launchserver.socket.websocket.json; +package ru.gravit.launchserver.websocket.json; import io.netty.channel.ChannelHandlerContext; import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.socket.websocket.WebSocketService; +import ru.gravit.launchserver.websocket.WebSocketService; public interface JsonResponseInterface { String getType(); diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/SimpleResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/SimpleResponse.java similarity index 74% rename from LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/SimpleResponse.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/SimpleResponse.java index 7f78179d..0eb42c82 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/SimpleResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/SimpleResponse.java @@ -1,8 +1,8 @@ -package ru.gravit.launchserver.socket.websocket.json; +package ru.gravit.launchserver.websocket.json; import io.netty.channel.ChannelHandlerContext; import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.socket.websocket.WebSocketService; +import ru.gravit.launchserver.websocket.WebSocketService; public class SimpleResponse implements JsonResponseInterface { @Override diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/admin/AddLogListenerResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/admin/AddLogListenerResponse.java similarity index 89% rename from LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/admin/AddLogListenerResponse.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/admin/AddLogListenerResponse.java index 9f9b4754..eaebab44 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/admin/AddLogListenerResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/admin/AddLogListenerResponse.java @@ -1,11 +1,11 @@ -package ru.gravit.launchserver.socket.websocket.json.admin; +package ru.gravit.launchserver.websocket.json.admin; import io.netty.channel.ChannelHandlerContext; import ru.gravit.launcher.events.request.ErrorRequestEvent; import ru.gravit.launcher.events.request.LogEvent; import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.socket.websocket.WebSocketService; -import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; +import ru.gravit.launchserver.websocket.WebSocketService; +import ru.gravit.launchserver.websocket.json.JsonResponseInterface; import ru.gravit.utils.helper.LogHelper; public class AddLogListenerResponse implements JsonResponseInterface { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/admin/ExecCommandResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/admin/ExecCommandResponse.java similarity index 82% rename from LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/admin/ExecCommandResponse.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/admin/ExecCommandResponse.java index c7c0fd9d..f787dbad 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/admin/ExecCommandResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/admin/ExecCommandResponse.java @@ -1,12 +1,12 @@ -package ru.gravit.launchserver.socket.websocket.json.admin; +package ru.gravit.launchserver.websocket.json.admin; import io.netty.channel.ChannelHandlerContext; import ru.gravit.launcher.events.request.ErrorRequestEvent; import ru.gravit.launcher.events.request.ExecCommandRequestEvent; import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.socket.websocket.WebSocketService; -import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; +import ru.gravit.launchserver.websocket.WebSocketService; +import ru.gravit.launchserver.websocket.json.JsonResponseInterface; public class ExecCommandResponse implements JsonResponseInterface { public String cmd; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/AuthResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/AuthResponse.java similarity index 95% rename from LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/AuthResponse.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/AuthResponse.java index 70aa4dda..f6d4b266 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/AuthResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/AuthResponse.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.socket.websocket.json.auth; +package ru.gravit.launchserver.websocket.json.auth; import io.netty.channel.ChannelHandlerContext; import ru.gravit.launcher.OshiHWID; @@ -12,9 +12,9 @@ import ru.gravit.launchserver.auth.provider.AuthProvider; import ru.gravit.launchserver.auth.provider.AuthProviderResult; import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.socket.websocket.WebSocketService; -import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; -import ru.gravit.launchserver.socket.websocket.json.profile.ProfileByUUIDResponse; +import ru.gravit.launchserver.websocket.WebSocketService; +import ru.gravit.launchserver.websocket.json.JsonResponseInterface; +import ru.gravit.launchserver.websocket.json.profile.ProfileByUUIDResponse; import ru.gravit.utils.helper.IOHelper; import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.SecurityHelper; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/CheckServerResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/CheckServerResponse.java similarity index 84% rename from LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/CheckServerResponse.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/CheckServerResponse.java index b5b0b858..584b6e8e 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/CheckServerResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/CheckServerResponse.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.socket.websocket.json.auth; +package ru.gravit.launchserver.websocket.json.auth; import io.netty.channel.ChannelHandlerContext; import ru.gravit.launcher.events.request.CheckServerRequestEvent; @@ -6,9 +6,9 @@ import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.auth.AuthException; import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.socket.websocket.WebSocketService; -import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; -import ru.gravit.launchserver.socket.websocket.json.profile.ProfileByUUIDResponse; +import ru.gravit.launchserver.websocket.WebSocketService; +import ru.gravit.launchserver.websocket.json.JsonResponseInterface; +import ru.gravit.launchserver.websocket.json.profile.ProfileByUUIDResponse; import ru.gravit.utils.helper.LogHelper; public class CheckServerResponse implements JsonResponseInterface { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/JoinServerResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/JoinServerResponse.java similarity index 88% rename from LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/JoinServerResponse.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/JoinServerResponse.java index c5ff5234..325727a9 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/JoinServerResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/JoinServerResponse.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.socket.websocket.json.auth; +package ru.gravit.launchserver.websocket.json.auth; import io.netty.channel.ChannelHandlerContext; import ru.gravit.launcher.events.request.ErrorRequestEvent; @@ -6,8 +6,8 @@ import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.auth.AuthException; import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.socket.websocket.WebSocketService; -import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; +import ru.gravit.launchserver.websocket.WebSocketService; +import ru.gravit.launchserver.websocket.json.JsonResponseInterface; import ru.gravit.utils.helper.LogHelper; public class JoinServerResponse implements JsonResponseInterface { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/ProfilesResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/ProfilesResponse.java similarity index 81% rename from LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/ProfilesResponse.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/ProfilesResponse.java index a4d1a24b..3d1d3fa3 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/ProfilesResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/ProfilesResponse.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.socket.websocket.json.auth; +package ru.gravit.launchserver.websocket.json.auth; import io.netty.channel.ChannelHandlerContext; import ru.gravit.launcher.events.request.ErrorRequestEvent; @@ -6,8 +6,8 @@ import ru.gravit.launcher.profiles.ClientProfile; import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.socket.websocket.WebSocketService; -import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; +import ru.gravit.launchserver.websocket.WebSocketService; +import ru.gravit.launchserver.websocket.json.JsonResponseInterface; import java.util.List; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/RestoreSessionResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/RestoreSessionResponse.java similarity index 79% rename from LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/RestoreSessionResponse.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/RestoreSessionResponse.java index 45c7f085..08f12c65 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/RestoreSessionResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/RestoreSessionResponse.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.socket.websocket.json.auth; +package ru.gravit.launchserver.websocket.json.auth; import io.netty.channel.ChannelHandlerContext; import ru.gravit.launcher.LauncherNetworkAPI; @@ -6,9 +6,9 @@ import ru.gravit.launcher.events.request.RestoreSessionRequestEvent; import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.socket.websocket.WebSocketFrameHandler; -import ru.gravit.launchserver.socket.websocket.WebSocketService; -import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; +import ru.gravit.launchserver.websocket.WebSocketFrameHandler; +import ru.gravit.launchserver.websocket.WebSocketService; +import ru.gravit.launchserver.websocket.json.JsonResponseInterface; public class RestoreSessionResponse implements JsonResponseInterface { @LauncherNetworkAPI diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/SetProfileResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/SetProfileResponse.java similarity index 87% rename from LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/SetProfileResponse.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/SetProfileResponse.java index 25cd7b2e..1472651f 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/SetProfileResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/SetProfileResponse.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.socket.websocket.json.auth; +package ru.gravit.launchserver.websocket.json.auth; import io.netty.channel.ChannelHandlerContext; import ru.gravit.launcher.events.request.ErrorRequestEvent; @@ -6,8 +6,8 @@ import ru.gravit.launcher.profiles.ClientProfile; import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.socket.websocket.WebSocketService; -import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; +import ru.gravit.launchserver.websocket.WebSocketService; +import ru.gravit.launchserver.websocket.json.JsonResponseInterface; import java.util.Collection; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/profile/BatchProfileByUsername.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/profile/BatchProfileByUsername.java similarity index 85% rename from LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/profile/BatchProfileByUsername.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/profile/BatchProfileByUsername.java index a1127bf8..7b22e4d2 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/profile/BatchProfileByUsername.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/profile/BatchProfileByUsername.java @@ -1,12 +1,12 @@ -package ru.gravit.launchserver.socket.websocket.json.profile; +package ru.gravit.launchserver.websocket.json.profile; import io.netty.channel.ChannelHandlerContext; import ru.gravit.launcher.events.request.BatchProfileByUsernameRequestEvent; import ru.gravit.launcher.profiles.PlayerProfile; import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.socket.websocket.WebSocketService; -import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; +import ru.gravit.launchserver.websocket.WebSocketService; +import ru.gravit.launchserver.websocket.json.JsonResponseInterface; import java.util.UUID; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/profile/ProfileByUUIDResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/profile/ProfileByUUIDResponse.java similarity index 87% rename from LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/profile/ProfileByUUIDResponse.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/profile/ProfileByUUIDResponse.java index 4a6905b0..5b9a4a44 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/profile/ProfileByUUIDResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/profile/ProfileByUUIDResponse.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.socket.websocket.json.profile; +package ru.gravit.launchserver.websocket.json.profile; import io.netty.channel.ChannelHandlerContext; import ru.gravit.launcher.events.request.ProfileByUUIDRequestEvent; @@ -6,9 +6,9 @@ import ru.gravit.launcher.profiles.Texture; import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.socket.websocket.WebSocketService; -import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; -import ru.gravit.launchserver.texture.TextureProvider; +import ru.gravit.launchserver.websocket.WebSocketService; +import ru.gravit.launchserver.websocket.json.JsonResponseInterface; +import ru.gravit.launchserver.auth.texture.TextureProvider; import ru.gravit.utils.helper.LogHelper; import java.io.IOException; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/profile/ProfileByUsername.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/profile/ProfileByUsername.java similarity index 72% rename from LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/profile/ProfileByUsername.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/profile/ProfileByUsername.java index 509ea295..ea9a8f96 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/profile/ProfileByUsername.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/profile/ProfileByUsername.java @@ -1,15 +1,15 @@ -package ru.gravit.launchserver.socket.websocket.json.profile; +package ru.gravit.launchserver.websocket.json.profile; import io.netty.channel.ChannelHandlerContext; import ru.gravit.launcher.events.request.ProfileByUsernameRequestEvent; import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.socket.websocket.WebSocketService; -import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; +import ru.gravit.launchserver.websocket.WebSocketService; +import ru.gravit.launchserver.websocket.json.JsonResponseInterface; import java.util.UUID; -import static ru.gravit.launchserver.socket.websocket.json.profile.ProfileByUUIDResponse.getProfile; +import static ru.gravit.launchserver.websocket.json.profile.ProfileByUUIDResponse.getProfile; public class ProfileByUsername implements JsonResponseInterface { String username; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/update/LauncherResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/update/LauncherResponse.java similarity index 91% rename from LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/update/LauncherResponse.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/update/LauncherResponse.java index 7036093a..d931c860 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/update/LauncherResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/update/LauncherResponse.java @@ -1,12 +1,12 @@ -package ru.gravit.launchserver.socket.websocket.json.update; +package ru.gravit.launchserver.websocket.json.update; import io.netty.channel.ChannelHandlerContext; import ru.gravit.launcher.events.request.ErrorRequestEvent; import ru.gravit.launcher.events.request.LauncherRequestEvent; import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.socket.websocket.WebSocketService; -import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; +import ru.gravit.launchserver.websocket.WebSocketService; +import ru.gravit.launchserver.websocket.json.JsonResponseInterface; import ru.gravit.utils.Version; import java.util.Arrays; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/update/UpdateListResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/update/UpdateListResponse.java similarity index 84% rename from LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/update/UpdateListResponse.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/update/UpdateListResponse.java index d21165ad..78809d75 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/update/UpdateListResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/update/UpdateListResponse.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.socket.websocket.json.update; +package ru.gravit.launchserver.websocket.json.update; import io.netty.channel.ChannelHandlerContext; import ru.gravit.launcher.events.request.ErrorRequestEvent; @@ -7,8 +7,8 @@ import ru.gravit.launcher.serialize.signed.SignedObjectHolder; import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.socket.websocket.WebSocketService; -import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; +import ru.gravit.launchserver.websocket.WebSocketService; +import ru.gravit.launchserver.websocket.json.JsonResponseInterface; import java.util.HashSet; import java.util.Map; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/update/UpdateResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/update/UpdateResponse.java similarity index 87% rename from LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/update/UpdateResponse.java rename to LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/update/UpdateResponse.java index 890b2a6e..b5b0655b 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/update/UpdateResponse.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/update/UpdateResponse.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.socket.websocket.json.update; +package ru.gravit.launchserver.websocket.json.update; import io.netty.channel.ChannelHandlerContext; import ru.gravit.launcher.events.request.ErrorRequestEvent; @@ -6,8 +6,8 @@ import ru.gravit.launcher.profiles.ClientProfile; import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.socket.websocket.WebSocketService; -import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; +import ru.gravit.launchserver.websocket.WebSocketService; +import ru.gravit.launchserver.websocket.json.JsonResponseInterface; public class UpdateResponse implements JsonResponseInterface { public String dirName;