diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/AuthServerRequest.java b/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/AuthServerRequest.java index 3c5fd0e8..a3526ee3 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/AuthServerRequest.java +++ b/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/AuthServerRequest.java @@ -3,6 +3,7 @@ import ru.gravit.launcher.ClientPermissions; import ru.gravit.launcher.LauncherAPI; import ru.gravit.launcher.LauncherConfig; +import ru.gravit.launcher.LauncherNetworkAPI; import ru.gravit.launcher.profiles.PlayerProfile; import ru.gravit.launcher.request.Request; import ru.gravit.launcher.request.RequestType; @@ -26,11 +27,13 @@ private Result(PlayerProfile pp, String accessToken) { this.accessToken = accessToken; } } - + @LauncherNetworkAPI private final String login; - + @LauncherNetworkAPI private final byte[] encryptedPassword; + @LauncherNetworkAPI private final String auth_id; + @LauncherNetworkAPI private final String title; @LauncherAPI diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/CheckServerRequest.java b/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/CheckServerRequest.java index 4521f814..53e923d4 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/CheckServerRequest.java +++ b/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/CheckServerRequest.java @@ -3,6 +3,7 @@ import ru.gravit.launcher.Launcher; import ru.gravit.launcher.LauncherAPI; import ru.gravit.launcher.LauncherConfig; +import ru.gravit.launcher.LauncherNetworkAPI; import ru.gravit.launcher.events.request.CheckServerRequestEvent; import ru.gravit.launcher.profiles.PlayerProfile; import ru.gravit.launcher.request.Request; @@ -19,7 +20,9 @@ import java.io.IOException; public final class CheckServerRequest extends Request implements RequestInterface { + @LauncherNetworkAPI private final String username; + @LauncherNetworkAPI private final String serverID; @LauncherAPI diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/JoinServerRequest.java b/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/JoinServerRequest.java index f1d2dc35..d104a131 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/JoinServerRequest.java +++ b/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/JoinServerRequest.java @@ -2,6 +2,7 @@ import ru.gravit.launcher.LauncherAPI; import ru.gravit.launcher.LauncherConfig; +import ru.gravit.launcher.LauncherNetworkAPI; import ru.gravit.launcher.events.request.JoinServerRequestEvent; import ru.gravit.launcher.request.Request; import ru.gravit.launcher.request.RequestType; @@ -18,8 +19,11 @@ public final class JoinServerRequest extends Request implements RequestInterface { // Instance + @LauncherNetworkAPI private final String username; + @LauncherNetworkAPI private final String accessToken; + @LauncherNetworkAPI private final String serverID; @LauncherAPI diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/SetProfileRequest.java b/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/SetProfileRequest.java index 9b5a50f6..2ae366e4 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/SetProfileRequest.java +++ b/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/SetProfileRequest.java @@ -1,6 +1,7 @@ package ru.gravit.launcher.request.auth; import ru.gravit.launcher.LauncherConfig; +import ru.gravit.launcher.LauncherNetworkAPI; import ru.gravit.launcher.events.request.SetProfileRequestEvent; import ru.gravit.launcher.profiles.ClientProfile; import ru.gravit.launcher.request.Request; @@ -13,7 +14,7 @@ public class SetProfileRequest extends Request implements RequestInterface { private transient ClientProfile profile; - + @LauncherNetworkAPI public String client; public SetProfileRequest(LauncherConfig config, ClientProfile profile) { diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/UpdateRequest.java b/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/UpdateRequest.java index 03812156..c8066a3a 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/UpdateRequest.java +++ b/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/UpdateRequest.java @@ -3,6 +3,7 @@ import ru.gravit.launcher.Launcher; import ru.gravit.launcher.LauncherAPI; import ru.gravit.launcher.LauncherConfig; +import ru.gravit.launcher.LauncherNetworkAPI; import ru.gravit.launcher.downloader.ListDownloader; import ru.gravit.launcher.events.request.UpdateRequestEvent; import ru.gravit.launcher.hasher.FileNameMatcher; @@ -220,6 +221,7 @@ public UpdateRequestEvent requestWebSockets() throws Exception { } // Instance + @LauncherNetworkAPI private final String dirName; private transient final Path dir; private transient final FileNameMatcher matcher;