Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-11-15 11:39:11 +03:00
Code Issues Projects Releases Packages Wiki Activity

[REFRACTOR] Привидение в порядок структуры пакетов LaunchServer

Browse source
This commit is contained in:
Gravit 2019-04-04 19:10:28 +07:00
parent 902936ddd7
commit fefafc30c1
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
42 changed files with 100 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java
View file

@ -29,11 +29,11 @@
import ru.gravit.launchserver.manangers.hook.AuthHookManager; import ru.gravit.launchserver.manangers.hook.AuthHookManager;
import ru.gravit.launchserver.manangers.hook.BuildHookManager; import ru.gravit.launchserver.manangers.hook.BuildHookManager;
import ru.gravit.launchserver.manangers.hook.SocketHookManager; import ru.gravit.launchserver.manangers.hook.SocketHookManager;
import ru.gravit.launchserver.response.Response; import ru.gravit.launchserver.legacy.Response;
import ru.gravit.launchserver.socket.NettyServerSocketHandler; import ru.gravit.launchserver.websocket.NettyServerSocketHandler;
import ru.gravit.launchserver.socket.ServerSocketHandler; import ru.gravit.launchserver.socket.ServerSocketHandler;
import ru.gravit.launchserver.texture.RequestTextureProvider; import ru.gravit.launchserver.auth.texture.RequestTextureProvider;
import ru.gravit.launchserver.texture.TextureProvider; import ru.gravit.launchserver.auth.texture.TextureProvider;
import ru.gravit.utils.command.CommandHandler; import ru.gravit.utils.command.CommandHandler;
import ru.gravit.utils.command.JLineCommandHandler; import ru.gravit.utils.command.JLineCommandHandler;
import ru.gravit.utils.command.StdCommandHandler; import ru.gravit.utils.command.StdCommandHandler;

2
LaunchServer/src/main/java/ru/gravit/launchserver/auth/AuthProviderPair.java
View file

@ -2,7 +2,7 @@
import ru.gravit.launchserver.auth.handler.AuthHandler; import ru.gravit.launchserver.auth.handler.AuthHandler;
import ru.gravit.launchserver.auth.provider.AuthProvider; import ru.gravit.launchserver.auth.provider.AuthProvider;
import ru.gravit.launchserver.texture.TextureProvider; import ru.gravit.launchserver.auth.texture.TextureProvider;
import java.io.IOException; import java.io.IOException;

2
LaunchServer/src/main/java/ru/gravit/launchserver/auth/protect/NoProtectHandler.java
View file

@ -1,6 +1,6 @@
package ru.gravit.launchserver.auth.protect; 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; import ru.gravit.utils.helper.SecurityHelper;
public class NoProtectHandler extends ProtectHandler { public class NoProtectHandler extends ProtectHandler {

2
LaunchServer/src/main/java/ru/gravit/launchserver/auth/protect/ProtectHandler.java
View file

@ -1,6 +1,6 @@
package ru.gravit.launchserver.auth.protect; 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 ru.gravit.utils.helper.VerifyHelper;
import java.util.Map; import java.util.Map;

2
LaunchServer/src/main/java/ru/gravit/launchserver/texture/NullTextureProvider.java → LaunchServer/src/main/java/ru/gravit/launchserver/auth/texture/NullTextureProvider.java
View file

@ -1,4 +1,4 @@
package ru.gravit.launchserver.texture; package ru.gravit.launchserver.auth.texture;
import ru.gravit.launcher.profiles.Texture; import ru.gravit.launcher.profiles.Texture;
import ru.gravit.utils.helper.VerifyHelper; import ru.gravit.utils.helper.VerifyHelper;

2
LaunchServer/src/main/java/ru/gravit/launchserver/texture/RequestTextureProvider.java → LaunchServer/src/main/java/ru/gravit/launchserver/auth/texture/RequestTextureProvider.java
View file

@ -1,4 +1,4 @@
package ru.gravit.launchserver.texture; package ru.gravit.launchserver.auth.texture;
import ru.gravit.launcher.Launcher; import ru.gravit.launcher.Launcher;
import ru.gravit.launcher.profiles.Texture; import ru.gravit.launcher.profiles.Texture;

2
LaunchServer/src/main/java/ru/gravit/launchserver/texture/TextureProvider.java → LaunchServer/src/main/java/ru/gravit/launchserver/auth/texture/TextureProvider.java
View file

@ -1,4 +1,4 @@
package ru.gravit.launchserver.texture; package ru.gravit.launchserver.auth.texture;
import ru.gravit.launcher.profiles.Texture; import ru.gravit.launcher.profiles.Texture;
import ru.gravit.utils.helper.VerifyHelper; import ru.gravit.utils.helper.VerifyHelper;

2
LaunchServer/src/main/java/ru/gravit/launchserver/texture/VoidTextureProvider.java → LaunchServer/src/main/java/ru/gravit/launchserver/auth/texture/VoidTextureProvider.java
View file

@ -1,4 +1,4 @@
package ru.gravit.launchserver.texture; package ru.gravit.launchserver.auth.texture;
import ru.gravit.launcher.profiles.Texture; import ru.gravit.launcher.profiles.Texture;

2
LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/TestCommand.java
View file

@ -2,7 +2,7 @@
import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.LaunchServer;
import ru.gravit.launchserver.command.Command; import ru.gravit.launchserver.command.Command;
import ru.gravit.launchserver.socket.NettyServerSocketHandler; import ru.gravit.launchserver.websocket.NettyServerSocketHandler;
import ru.gravit.utils.helper.CommonHelper; import ru.gravit.utils.helper.CommonHelper;
public class TestCommand extends Command { public class TestCommand extends Command {

2
LaunchServer/src/main/java/ru/gravit/launchserver/components/AuthLimiterComponent.java
View file

@ -5,7 +5,7 @@
import ru.gravit.launchserver.auth.AuthException; import ru.gravit.launchserver.auth.AuthException;
import ru.gravit.launchserver.auth.provider.AuthProvider; import ru.gravit.launchserver.auth.provider.AuthProvider;
import ru.gravit.launchserver.socket.Client; 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.ArrayList;
import java.util.HashMap; import java.util.HashMap;

2
LaunchServer/src/main/java/ru/gravit/launchserver/config/adapter/TextureProviderAdapter.java
View file

@ -1,7 +1,7 @@
package ru.gravit.launchserver.config.adapter; package ru.gravit.launchserver.config.adapter;
import com.google.gson.*; import com.google.gson.*;
import ru.gravit.launchserver.texture.TextureProvider; import ru.gravit.launchserver.auth.texture.TextureProvider;
import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.LogHelper;
import java.lang.reflect.Type; import java.lang.reflect.Type;

2
LaunchServer/src/main/java/ru/gravit/launchserver/response/PingResponse.java → LaunchServer/src/main/java/ru/gravit/launchserver/legacy/PingResponse.java
View file

@ -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.HInput;
import ru.gravit.launcher.serialize.HOutput; import ru.gravit.launcher.serialize.HOutput;

6
LaunchServer/src/main/java/ru/gravit/launchserver/response/Response.java → LaunchServer/src/main/java/ru/gravit/launchserver/legacy/Response.java
View file

@ -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.RequestException;
import ru.gravit.launcher.request.RequestType; import ru.gravit.launcher.request.RequestType;
import ru.gravit.launcher.serialize.HInput; import ru.gravit.launcher.serialize.HInput;
import ru.gravit.launcher.serialize.HOutput; import ru.gravit.launcher.serialize.HOutput;
import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.LaunchServer;
import ru.gravit.launchserver.response.update.LauncherResponse; import ru.gravit.launchserver.legacy.update.LauncherResponse;
import ru.gravit.launchserver.response.update.LegacyLauncherResponse; import ru.gravit.launchserver.legacy.update.LegacyLauncherResponse;
import ru.gravit.launchserver.socket.Client; import ru.gravit.launchserver.socket.Client;
import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.LogHelper;

4
LaunchServer/src/main/java/ru/gravit/launchserver/response/update/LauncherResponse.java → LaunchServer/src/main/java/ru/gravit/launchserver/legacy/update/LauncherResponse.java
View file

@ -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.HInput;
import ru.gravit.launcher.serialize.HOutput; import ru.gravit.launcher.serialize.HOutput;
import ru.gravit.launcher.serialize.SerializeLimits; import ru.gravit.launcher.serialize.SerializeLimits;
import ru.gravit.launcher.serialize.signed.DigestBytesHolder; import ru.gravit.launcher.serialize.signed.DigestBytesHolder;
import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.LaunchServer;
import ru.gravit.launchserver.response.Response; import ru.gravit.launchserver.legacy.Response;
import ru.gravit.launchserver.socket.Client; import ru.gravit.launchserver.socket.Client;
import java.io.IOException; import java.io.IOException;

4
LaunchServer/src/main/java/ru/gravit/launchserver/response/update/LegacyLauncherResponse.java → LaunchServer/src/main/java/ru/gravit/launchserver/legacy/update/LegacyLauncherResponse.java
View file

@ -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.HInput;
import ru.gravit.launcher.serialize.HOutput; import ru.gravit.launcher.serialize.HOutput;
import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.LaunchServer;
import ru.gravit.launchserver.binary.LauncherBinary; 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.launchserver.socket.Client;
import ru.gravit.utils.helper.SecurityHelper; import ru.gravit.utils.helper.SecurityHelper;

2
LaunchServer/src/main/java/ru/gravit/launchserver/manangers/hook/AuthHookManager.java
View file

@ -2,7 +2,7 @@
import ru.gravit.launchserver.auth.AuthException; import ru.gravit.launchserver.auth.AuthException;
import ru.gravit.launchserver.socket.Client; 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.HashSet;
import java.util.Set; import java.util.Set;

2
LaunchServer/src/main/java/ru/gravit/launchserver/socket/ResponseThread.java
View file

@ -7,7 +7,7 @@
import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.LaunchServer;
import ru.gravit.launchserver.manangers.SessionManager; import ru.gravit.launchserver.manangers.SessionManager;
import ru.gravit.launchserver.manangers.hook.SocketHookManager; 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.IOHelper;
import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.LogHelper;
import ru.gravit.utils.helper.SecurityHelper; import ru.gravit.utils.helper.SecurityHelper;

7
LaunchServer/src/main/java/ru/gravit/launchserver/socket/NettyServerSocketHandler.java → LaunchServer/src/main/java/ru/gravit/launchserver/websocket/NettyServerSocketHandler.java
View file

@ -1,4 +1,4 @@
package ru.gravit.launchserver.socket; package ru.gravit.launchserver.websocket;
import io.netty.bootstrap.ServerBootstrap; import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFuture;
@ -17,9 +17,8 @@
import ru.gravit.launcher.ssl.LauncherKeyStore; import ru.gravit.launcher.ssl.LauncherKeyStore;
import ru.gravit.launcher.ssl.LauncherTrustManager; import ru.gravit.launcher.ssl.LauncherTrustManager;
import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.LaunchServer;
import ru.gravit.launchserver.fileserver.FileServerHandler; import ru.gravit.launchserver.websocket.fileserver.FileServerHandler;
import ru.gravit.launchserver.response.Response; import ru.gravit.launchserver.legacy.Response;
import ru.gravit.launchserver.socket.websocket.WebSocketFrameHandler;
import ru.gravit.utils.helper.CommonHelper; import ru.gravit.utils.helper.CommonHelper;
import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.LogHelper;
import ru.gravit.utils.helper.VerifyHelper; import ru.gravit.utils.helper.VerifyHelper;

2
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketFrameHandler.java → LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketFrameHandler.java
View file

@ -1,4 +1,4 @@
package ru.gravit.launchserver.socket.websocket; package ru.gravit.launchserver.websocket;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;

2
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketIndexPageHandler.java → LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketIndexPageHandler.java
View file

@ -1,4 +1,4 @@
package ru.gravit.launchserver.socket.websocket; package ru.gravit.launchserver.websocket;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled; import io.netty.buffer.Unpooled;

2
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketServerIndexPage.java → LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketServerIndexPage.java
View file

@ -1,4 +1,4 @@
package ru.gravit.launchserver.socket.websocket; package ru.gravit.launchserver.websocket;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled; import io.netty.buffer.Unpooled;

26
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketService.java → LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketService.java
View file

@ -1,4 +1,4 @@
package ru.gravit.launchserver.socket.websocket; package ru.gravit.launchserver.websocket;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
@ -13,18 +13,18 @@
import ru.gravit.launcher.request.ResultInterface; import ru.gravit.launcher.request.ResultInterface;
import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.LaunchServer;
import ru.gravit.launchserver.socket.Client; import ru.gravit.launchserver.socket.Client;
import ru.gravit.launchserver.socket.websocket.json.EchoResponse; import ru.gravit.launchserver.websocket.json.EchoResponse;
import ru.gravit.launchserver.socket.websocket.json.JsonResponseAdapter; import ru.gravit.launchserver.websocket.json.JsonResponseAdapter;
import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; import ru.gravit.launchserver.websocket.json.JsonResponseInterface;
import ru.gravit.launchserver.socket.websocket.json.admin.AddLogListenerResponse; import ru.gravit.launchserver.websocket.json.admin.AddLogListenerResponse;
import ru.gravit.launchserver.socket.websocket.json.admin.ExecCommandResponse; import ru.gravit.launchserver.websocket.json.admin.ExecCommandResponse;
import ru.gravit.launchserver.socket.websocket.json.auth.*; import ru.gravit.launchserver.websocket.json.auth.*;
import ru.gravit.launchserver.socket.websocket.json.profile.BatchProfileByUsername; import ru.gravit.launchserver.websocket.json.profile.BatchProfileByUsername;
import ru.gravit.launchserver.socket.websocket.json.profile.ProfileByUUIDResponse; import ru.gravit.launchserver.websocket.json.profile.ProfileByUUIDResponse;
import ru.gravit.launchserver.socket.websocket.json.profile.ProfileByUsername; import ru.gravit.launchserver.websocket.json.profile.ProfileByUsername;
import ru.gravit.launchserver.socket.websocket.json.update.LauncherResponse; import ru.gravit.launchserver.websocket.json.update.LauncherResponse;
import ru.gravit.launchserver.socket.websocket.json.update.UpdateListResponse; import ru.gravit.launchserver.websocket.json.update.UpdateListResponse;
import ru.gravit.launchserver.socket.websocket.json.update.UpdateResponse; import ru.gravit.launchserver.websocket.json.update.UpdateResponse;
import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.LogHelper;
import java.lang.reflect.Type; import java.lang.reflect.Type;

2
LaunchServer/src/main/java/ru/gravit/launchserver/fileserver/ClosingChannelFutureListener.java → LaunchServer/src/main/java/ru/gravit/launchserver/websocket/fileserver/ClosingChannelFutureListener.java
View file

@ -1,4 +1,4 @@
package ru.gravit.launchserver.fileserver; package ru.gravit.launchserver.websocket.fileserver;
import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelFutureListener;

2
LaunchServer/src/main/java/ru/gravit/launchserver/fileserver/FileServerHandler.java → LaunchServer/src/main/java/ru/gravit/launchserver/websocket/fileserver/FileServerHandler.java
View file

@ -1,4 +1,4 @@
package ru.gravit.launchserver.fileserver; package ru.gravit.launchserver.websocket.fileserver;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled; import io.netty.buffer.Unpooled;

4
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/EchoResponse.java → LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/EchoResponse.java
View file

@ -1,9 +1,9 @@
package ru.gravit.launchserver.socket.websocket.json; package ru.gravit.launchserver.websocket.json;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import ru.gravit.launcher.events.request.EchoRequestEvent; import ru.gravit.launcher.events.request.EchoRequestEvent;
import ru.gravit.launchserver.socket.Client; 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; import ru.gravit.utils.helper.LogHelper;
public class EchoResponse implements JsonResponseInterface { public class EchoResponse implements JsonResponseInterface {

4
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/JsonResponseAdapter.java → LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/JsonResponseAdapter.java
View file

@ -1,7 +1,7 @@
package ru.gravit.launchserver.socket.websocket.json; package ru.gravit.launchserver.websocket.json;
import com.google.gson.*; import com.google.gson.*;
import ru.gravit.launchserver.socket.websocket.WebSocketService; import ru.gravit.launchserver.websocket.WebSocketService;
import java.lang.reflect.Type; import java.lang.reflect.Type;

4
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/JsonResponseInterface.java → LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/JsonResponseInterface.java
View file

@ -1,8 +1,8 @@
package ru.gravit.launchserver.socket.websocket.json; package ru.gravit.launchserver.websocket.json;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import ru.gravit.launchserver.socket.Client; import ru.gravit.launchserver.socket.Client;
import ru.gravit.launchserver.socket.websocket.WebSocketService; import ru.gravit.launchserver.websocket.WebSocketService;
public interface JsonResponseInterface { public interface JsonResponseInterface {
String getType(); String getType();

4
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/SimpleResponse.java → LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/SimpleResponse.java
View file

@ -1,8 +1,8 @@
package ru.gravit.launchserver.socket.websocket.json; package ru.gravit.launchserver.websocket.json;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import ru.gravit.launchserver.socket.Client; import ru.gravit.launchserver.socket.Client;
import ru.gravit.launchserver.socket.websocket.WebSocketService; import ru.gravit.launchserver.websocket.WebSocketService;
public class SimpleResponse implements JsonResponseInterface { public class SimpleResponse implements JsonResponseInterface {
@Override @Override

6
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/admin/AddLogListenerResponse.java → LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/admin/AddLogListenerResponse.java
View file

@ -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 io.netty.channel.ChannelHandlerContext;
import ru.gravit.launcher.events.request.ErrorRequestEvent; import ru.gravit.launcher.events.request.ErrorRequestEvent;
import ru.gravit.launcher.events.request.LogEvent; import ru.gravit.launcher.events.request.LogEvent;
import ru.gravit.launchserver.socket.Client; import ru.gravit.launchserver.socket.Client;
import ru.gravit.launchserver.socket.websocket.WebSocketService; import ru.gravit.launchserver.websocket.WebSocketService;
import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; import ru.gravit.launchserver.websocket.json.JsonResponseInterface;
import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.LogHelper;
public class AddLogListenerResponse implements JsonResponseInterface { public class AddLogListenerResponse implements JsonResponseInterface {

6
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/admin/ExecCommandResponse.java → LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/admin/ExecCommandResponse.java
View file

@ -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 io.netty.channel.ChannelHandlerContext;
import ru.gravit.launcher.events.request.ErrorRequestEvent; import ru.gravit.launcher.events.request.ErrorRequestEvent;
import ru.gravit.launcher.events.request.ExecCommandRequestEvent; import ru.gravit.launcher.events.request.ExecCommandRequestEvent;
import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.LaunchServer;
import ru.gravit.launchserver.socket.Client; import ru.gravit.launchserver.socket.Client;
import ru.gravit.launchserver.socket.websocket.WebSocketService; import ru.gravit.launchserver.websocket.WebSocketService;
import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; import ru.gravit.launchserver.websocket.json.JsonResponseInterface;
public class ExecCommandResponse implements JsonResponseInterface { public class ExecCommandResponse implements JsonResponseInterface {
public String cmd; public String cmd;

8
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/AuthResponse.java → LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/AuthResponse.java
View file

@ -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 io.netty.channel.ChannelHandlerContext;
import ru.gravit.launcher.OshiHWID; import ru.gravit.launcher.OshiHWID;
@ -12,9 +12,9 @@
import ru.gravit.launchserver.auth.provider.AuthProvider; import ru.gravit.launchserver.auth.provider.AuthProvider;
import ru.gravit.launchserver.auth.provider.AuthProviderResult; import ru.gravit.launchserver.auth.provider.AuthProviderResult;
import ru.gravit.launchserver.socket.Client; import ru.gravit.launchserver.socket.Client;
import ru.gravit.launchserver.socket.websocket.WebSocketService; import ru.gravit.launchserver.websocket.WebSocketService;
import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; import ru.gravit.launchserver.websocket.json.JsonResponseInterface;
import ru.gravit.launchserver.socket.websocket.json.profile.ProfileByUUIDResponse; import ru.gravit.launchserver.websocket.json.profile.ProfileByUUIDResponse;
import ru.gravit.utils.helper.IOHelper; import ru.gravit.utils.helper.IOHelper;
import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.LogHelper;
import ru.gravit.utils.helper.SecurityHelper; import ru.gravit.utils.helper.SecurityHelper;

8
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/CheckServerResponse.java → LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/CheckServerResponse.java
View file

@ -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 io.netty.channel.ChannelHandlerContext;
import ru.gravit.launcher.events.request.CheckServerRequestEvent; import ru.gravit.launcher.events.request.CheckServerRequestEvent;
@ -6,9 +6,9 @@
import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.LaunchServer;
import ru.gravit.launchserver.auth.AuthException; import ru.gravit.launchserver.auth.AuthException;
import ru.gravit.launchserver.socket.Client; import ru.gravit.launchserver.socket.Client;
import ru.gravit.launchserver.socket.websocket.WebSocketService; import ru.gravit.launchserver.websocket.WebSocketService;
import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; import ru.gravit.launchserver.websocket.json.JsonResponseInterface;
import ru.gravit.launchserver.socket.websocket.json.profile.ProfileByUUIDResponse; import ru.gravit.launchserver.websocket.json.profile.ProfileByUUIDResponse;
import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.LogHelper;
public class CheckServerResponse implements JsonResponseInterface { public class CheckServerResponse implements JsonResponseInterface {

6
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/JoinServerResponse.java → LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/JoinServerResponse.java
View file

@ -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 io.netty.channel.ChannelHandlerContext;
import ru.gravit.launcher.events.request.ErrorRequestEvent; import ru.gravit.launcher.events.request.ErrorRequestEvent;
@ -6,8 +6,8 @@
import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.LaunchServer;
import ru.gravit.launchserver.auth.AuthException; import ru.gravit.launchserver.auth.AuthException;
import ru.gravit.launchserver.socket.Client; import ru.gravit.launchserver.socket.Client;
import ru.gravit.launchserver.socket.websocket.WebSocketService; import ru.gravit.launchserver.websocket.WebSocketService;
import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; import ru.gravit.launchserver.websocket.json.JsonResponseInterface;
import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.LogHelper;
public class JoinServerResponse implements JsonResponseInterface { public class JoinServerResponse implements JsonResponseInterface {

6
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/ProfilesResponse.java → LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/ProfilesResponse.java
View file

@ -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 io.netty.channel.ChannelHandlerContext;
import ru.gravit.launcher.events.request.ErrorRequestEvent; import ru.gravit.launcher.events.request.ErrorRequestEvent;
@ -6,8 +6,8 @@
import ru.gravit.launcher.profiles.ClientProfile; import ru.gravit.launcher.profiles.ClientProfile;
import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.LaunchServer;
import ru.gravit.launchserver.socket.Client; import ru.gravit.launchserver.socket.Client;
import ru.gravit.launchserver.socket.websocket.WebSocketService; import ru.gravit.launchserver.websocket.WebSocketService;
import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; import ru.gravit.launchserver.websocket.json.JsonResponseInterface;
import java.util.List; import java.util.List;

8
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/RestoreSessionResponse.java → LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/RestoreSessionResponse.java
View file

@ -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 io.netty.channel.ChannelHandlerContext;
import ru.gravit.launcher.LauncherNetworkAPI; import ru.gravit.launcher.LauncherNetworkAPI;
@ -6,9 +6,9 @@
import ru.gravit.launcher.events.request.RestoreSessionRequestEvent; import ru.gravit.launcher.events.request.RestoreSessionRequestEvent;
import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.LaunchServer;
import ru.gravit.launchserver.socket.Client; import ru.gravit.launchserver.socket.Client;
import ru.gravit.launchserver.socket.websocket.WebSocketFrameHandler; import ru.gravit.launchserver.websocket.WebSocketFrameHandler;
import ru.gravit.launchserver.socket.websocket.WebSocketService; import ru.gravit.launchserver.websocket.WebSocketService;
import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; import ru.gravit.launchserver.websocket.json.JsonResponseInterface;
public class RestoreSessionResponse implements JsonResponseInterface { public class RestoreSessionResponse implements JsonResponseInterface {
@LauncherNetworkAPI @LauncherNetworkAPI

6
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/SetProfileResponse.java → LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/SetProfileResponse.java
View file

@ -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 io.netty.channel.ChannelHandlerContext;
import ru.gravit.launcher.events.request.ErrorRequestEvent; import ru.gravit.launcher.events.request.ErrorRequestEvent;
@ -6,8 +6,8 @@
import ru.gravit.launcher.profiles.ClientProfile; import ru.gravit.launcher.profiles.ClientProfile;
import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.LaunchServer;
import ru.gravit.launchserver.socket.Client; import ru.gravit.launchserver.socket.Client;
import ru.gravit.launchserver.socket.websocket.WebSocketService; import ru.gravit.launchserver.websocket.WebSocketService;
import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; import ru.gravit.launchserver.websocket.json.JsonResponseInterface;
import java.util.Collection; import java.util.Collection;

6
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/profile/BatchProfileByUsername.java → LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/profile/BatchProfileByUsername.java
View file

@ -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 io.netty.channel.ChannelHandlerContext;
import ru.gravit.launcher.events.request.BatchProfileByUsernameRequestEvent; import ru.gravit.launcher.events.request.BatchProfileByUsernameRequestEvent;
import ru.gravit.launcher.profiles.PlayerProfile; import ru.gravit.launcher.profiles.PlayerProfile;
import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.LaunchServer;
import ru.gravit.launchserver.socket.Client; import ru.gravit.launchserver.socket.Client;
import ru.gravit.launchserver.socket.websocket.WebSocketService; import ru.gravit.launchserver.websocket.WebSocketService;
import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; import ru.gravit.launchserver.websocket.json.JsonResponseInterface;
import java.util.UUID; import java.util.UUID;

8
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/profile/ProfileByUUIDResponse.java → LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/profile/ProfileByUUIDResponse.java
View file

@ -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 io.netty.channel.ChannelHandlerContext;
import ru.gravit.launcher.events.request.ProfileByUUIDRequestEvent; import ru.gravit.launcher.events.request.ProfileByUUIDRequestEvent;
@ -6,9 +6,9 @@
import ru.gravit.launcher.profiles.Texture; import ru.gravit.launcher.profiles.Texture;
import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.LaunchServer;
import ru.gravit.launchserver.socket.Client; import ru.gravit.launchserver.socket.Client;
import ru.gravit.launchserver.socket.websocket.WebSocketService; import ru.gravit.launchserver.websocket.WebSocketService;
import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; import ru.gravit.launchserver.websocket.json.JsonResponseInterface;
import ru.gravit.launchserver.texture.TextureProvider; import ru.gravit.launchserver.auth.texture.TextureProvider;
import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.LogHelper;
import java.io.IOException; import java.io.IOException;

8
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/profile/ProfileByUsername.java → LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/profile/ProfileByUsername.java
View file

@ -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 io.netty.channel.ChannelHandlerContext;
import ru.gravit.launcher.events.request.ProfileByUsernameRequestEvent; import ru.gravit.launcher.events.request.ProfileByUsernameRequestEvent;
import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.LaunchServer;
import ru.gravit.launchserver.socket.Client; import ru.gravit.launchserver.socket.Client;
import ru.gravit.launchserver.socket.websocket.WebSocketService; import ru.gravit.launchserver.websocket.WebSocketService;
import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; import ru.gravit.launchserver.websocket.json.JsonResponseInterface;
import java.util.UUID; 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 { public class ProfileByUsername implements JsonResponseInterface {
String username; String username;

6
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/update/LauncherResponse.java → LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/update/LauncherResponse.java
View file

@ -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 io.netty.channel.ChannelHandlerContext;
import ru.gravit.launcher.events.request.ErrorRequestEvent; import ru.gravit.launcher.events.request.ErrorRequestEvent;
import ru.gravit.launcher.events.request.LauncherRequestEvent; import ru.gravit.launcher.events.request.LauncherRequestEvent;
import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.LaunchServer;
import ru.gravit.launchserver.socket.Client; import ru.gravit.launchserver.socket.Client;
import ru.gravit.launchserver.socket.websocket.WebSocketService; import ru.gravit.launchserver.websocket.WebSocketService;
import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; import ru.gravit.launchserver.websocket.json.JsonResponseInterface;
import ru.gravit.utils.Version; import ru.gravit.utils.Version;
import java.util.Arrays; import java.util.Arrays;

6
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/update/UpdateListResponse.java → LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/update/UpdateListResponse.java
View file

@ -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 io.netty.channel.ChannelHandlerContext;
import ru.gravit.launcher.events.request.ErrorRequestEvent; import ru.gravit.launcher.events.request.ErrorRequestEvent;
@ -7,8 +7,8 @@
import ru.gravit.launcher.serialize.signed.SignedObjectHolder; import ru.gravit.launcher.serialize.signed.SignedObjectHolder;
import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.LaunchServer;
import ru.gravit.launchserver.socket.Client; import ru.gravit.launchserver.socket.Client;
import ru.gravit.launchserver.socket.websocket.WebSocketService; import ru.gravit.launchserver.websocket.WebSocketService;
import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; import ru.gravit.launchserver.websocket.json.JsonResponseInterface;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;

6
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/update/UpdateResponse.java → LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/update/UpdateResponse.java
View file

@ -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 io.netty.channel.ChannelHandlerContext;
import ru.gravit.launcher.events.request.ErrorRequestEvent; import ru.gravit.launcher.events.request.ErrorRequestEvent;
@ -6,8 +6,8 @@
import ru.gravit.launcher.profiles.ClientProfile; import ru.gravit.launcher.profiles.ClientProfile;
import ru.gravit.launchserver.LaunchServer; import ru.gravit.launchserver.LaunchServer;
import ru.gravit.launchserver.socket.Client; import ru.gravit.launchserver.socket.Client;
import ru.gravit.launchserver.socket.websocket.WebSocketService; import ru.gravit.launchserver.websocket.WebSocketService;
import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface; import ru.gravit.launchserver.websocket.json.JsonResponseInterface;
public class UpdateResponse implements JsonResponseInterface { public class UpdateResponse implements JsonResponseInterface {
public String dirName; public String dirName;