diff --git a/LaunchServer/source/auth/handler/FileAuthHandler.java b/LaunchServer/source/auth/handler/FileAuthHandler.java index a480bad..c29c161 100644 --- a/LaunchServer/source/auth/handler/FileAuthHandler.java +++ b/LaunchServer/source/auth/handler/FileAuthHandler.java @@ -206,7 +206,7 @@ @LauncherAPI public Entry(HInput input) throws IOException { - username = VerifyHelper.verifyUsername(input.readASCII(16)); + username = VerifyHelper.verifyUsername(input.readString(64)); if (input.readBoolean()) { accessToken = SecurityHelper.verifyToken(input.readASCII(-SecurityHelper.TOKEN_STRING_LENGTH)); if (input.readBoolean()) { @@ -217,7 +217,7 @@ @Override public void write(HOutput output) throws IOException { - output.writeASCII(username, 16); + output.writeString(username, 64); output.writeBoolean(accessToken != null); if (accessToken != null) { output.writeASCII(accessToken, -SecurityHelper.TOKEN_STRING_LENGTH); diff --git a/LaunchServer/source/response/auth/CheckServerResponse.java b/LaunchServer/source/response/auth/CheckServerResponse.java index fb7a647..a71d99c 100644 --- a/LaunchServer/source/response/auth/CheckServerResponse.java +++ b/LaunchServer/source/response/auth/CheckServerResponse.java @@ -20,7 +20,7 @@ @Override public void reply() throws IOException { - String username = VerifyHelper.verifyUsername(input.readASCII(16)); + String username = VerifyHelper.verifyUsername(input.readString(64)); String serverID = JoinServerRequest.verifyServerID(input.readASCII(41)); // With minus sign debug("Username: %s, Server ID: %s", username, serverID); diff --git a/LaunchServer/source/response/auth/JoinServerResponse.java b/LaunchServer/source/response/auth/JoinServerResponse.java index 7dd4200..5b39635 100644 --- a/LaunchServer/source/response/auth/JoinServerResponse.java +++ b/LaunchServer/source/response/auth/JoinServerResponse.java @@ -19,7 +19,7 @@ @Override public void reply() throws IOException { - String username = VerifyHelper.verifyUsername(input.readASCII(16)); + String username = VerifyHelper.verifyUsername(input.readString(64)); String accessToken = SecurityHelper.verifyToken(input.readASCII(-SecurityHelper.TOKEN_STRING_LENGTH)); String serverID = JoinServerRequest.verifyServerID(input.readASCII(41)); // With minus sign diff --git a/LaunchServer/source/response/profile/BatchProfileByUsernameResponse.java b/LaunchServer/source/response/profile/BatchProfileByUsernameResponse.java index 758fa98..6ad7c57 100644 --- a/LaunchServer/source/response/profile/BatchProfileByUsernameResponse.java +++ b/LaunchServer/source/response/profile/BatchProfileByUsernameResponse.java @@ -19,7 +19,7 @@ public void reply() throws IOException { String[] usernames = new String[input.readLength(BatchProfileByUsernameRequest.MAX_BATCH_SIZE)]; for (int i = 0; i < usernames.length; i++) { - usernames[i] = VerifyHelper.verifyUsername(input.readASCII(16)); + usernames[i] = VerifyHelper.verifyUsername(input.readString(64)); } debug("Usernames: " + Arrays.toString(usernames)); diff --git a/LaunchServer/source/response/profile/ProfileByUsernameResponse.java b/LaunchServer/source/response/profile/ProfileByUsernameResponse.java index 04f5040..b20c685 100644 --- a/LaunchServer/source/response/profile/ProfileByUsernameResponse.java +++ b/LaunchServer/source/response/profile/ProfileByUsernameResponse.java @@ -16,7 +16,7 @@ @Override public void reply() throws IOException { - String username = VerifyHelper.verifyUsername(input.readASCII(16)); + String username = VerifyHelper.verifyUsername(input.readString(64)); debug("Username: " + username); // Write response diff --git a/Launcher/source/client/PlayerProfile.java b/Launcher/source/client/PlayerProfile.java index eb07379..b6629f9 100644 --- a/Launcher/source/client/PlayerProfile.java +++ b/Launcher/source/client/PlayerProfile.java @@ -24,7 +24,7 @@ @LauncherAPI public PlayerProfile(HInput input) throws IOException { uuid = input.readUUID(); - username = VerifyHelper.verifyUsername(input.readASCII(16)); + username = VerifyHelper.verifyUsername(input.readString(64)); skin = input.readBoolean() ? new Texture(input) : null; cloak = input.readBoolean() ? new Texture(input) : null; } @@ -40,7 +40,7 @@ @Override public void write(HOutput output) throws IOException { output.writeUUID(uuid); - output.writeASCII(username, 16); + output.writeString(username, 64); // Write textures output.writeBoolean(skin != null); diff --git a/Launcher/source/request/auth/CheckServerRequest.java b/Launcher/source/request/auth/CheckServerRequest.java index 1a5e18e..c2e980f 100644 --- a/Launcher/source/request/auth/CheckServerRequest.java +++ b/Launcher/source/request/auth/CheckServerRequest.java @@ -34,7 +34,7 @@ @Override protected PlayerProfile requestDo(HInput input, HOutput output) throws IOException { - output.writeASCII(username, 16); + output.writeString(username, 64); output.writeASCII(serverID, 41); // 1 char for minus sign output.flush(); diff --git a/Launcher/source/request/auth/JoinServerRequest.java b/Launcher/source/request/auth/JoinServerRequest.java index e1c3551..ad59f31 100644 --- a/Launcher/source/request/auth/JoinServerRequest.java +++ b/Launcher/source/request/auth/JoinServerRequest.java @@ -3,7 +3,6 @@ import java.io.IOException; import java.util.regex.Pattern; -import launcher.Launcher; import launcher.Launcher.Config; import launcher.LauncherAPI; import launcher.helper.SecurityHelper; @@ -40,7 +39,7 @@ @Override protected Boolean requestDo(HInput input, HOutput output) throws IOException { - output.writeASCII(username, 16); + output.writeString(username, 64); output.writeASCII(accessToken, -SecurityHelper.TOKEN_STRING_LENGTH); output.writeASCII(serverID, 41); // 1 char for minus sign output.flush(); diff --git a/Launcher/source/request/uuid/BatchProfileByUsernameRequest.java b/Launcher/source/request/uuid/BatchProfileByUsernameRequest.java index b8d7a05..6d06707 100644 --- a/Launcher/source/request/uuid/BatchProfileByUsernameRequest.java +++ b/Launcher/source/request/uuid/BatchProfileByUsernameRequest.java @@ -39,7 +39,7 @@ protected PlayerProfile[] requestDo(HInput input, HOutput output) throws IOException { output.writeLength(usernames.length, MAX_BATCH_SIZE); for (String username : usernames) { - output.writeASCII(username, 16); + output.writeString(username, 64); } output.flush(); diff --git a/Launcher/source/request/uuid/ProfileByUsernameRequest.java b/Launcher/source/request/uuid/ProfileByUsernameRequest.java index 176bf8c..c485e67 100644 --- a/Launcher/source/request/uuid/ProfileByUsernameRequest.java +++ b/Launcher/source/request/uuid/ProfileByUsernameRequest.java @@ -31,7 +31,7 @@ @Override protected PlayerProfile requestDo(HInput input, HOutput output) throws IOException { - output.writeASCII(username, 16); + output.writeString(username, 64); output.flush(); // Return profile