diff --git a/launcher/src/main/java/com/skcraft/launcher/auth/UserType.java b/launcher/src/main/java/com/skcraft/launcher/auth/UserType.java index 1d60b29..a697886 100644 --- a/launcher/src/main/java/com/skcraft/launcher/auth/UserType.java +++ b/launcher/src/main/java/com/skcraft/launcher/auth/UserType.java @@ -10,28 +10,31 @@ * Represents the type of user for the account. */ public enum UserType { - /** * Legacy accounts login with an account username. */ - LEGACY, + LEGACY("legacy"), /** * Mojang accounts login with an email address. */ - MOJANG, + MOJANG("mojang"), /** * Microsoft accounts login via OAuth. */ - MICROSOFT; + MICROSOFT("msa"); - /** - * Return a lowercase version of the enum type. - * - * @return the lowercase name - */ - public String getName() { - return name().toLowerCase(); + private final String id; + + UserType(String id) { + this.id = id; } - + /** + * Return the account type string as the game understands it + * + * @return the account type ID for passing to the game + */ + public String getId() { + return this.id; + } } diff --git a/launcher/src/main/java/com/skcraft/launcher/launch/Runner.java b/launcher/src/main/java/com/skcraft/launcher/launch/Runner.java index 0278a5f..7846861 100644 --- a/launcher/src/main/java/com/skcraft/launcher/launch/Runner.java +++ b/launcher/src/main/java/com/skcraft/launcher/launch/Runner.java @@ -447,7 +447,7 @@ map.put("auth_uuid", session.getUuid()); map.put("profile_name", session.getName()); - map.put("user_type", session.getUserType().getName()); + map.put("user_type", session.getUserType().getId()); map.put("user_properties", mapper.writeValueAsString(session.getUserProperties())); map.put("game_directory", instance.getContentDir().getAbsolutePath());