Rainnny/RESTfulMC
1
0
Fork 0
Code Issues 1 Pull Requests 10 Actions Wiki Activity

Slight refactor

Browse Source
This commit is contained in:
Braydon 2024-04-06 14:46:42 -04:00
parent 2c54defef3
commit 3347ac6dcb
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/me/braydon/mc/model/token/MojangUsernameToUUIDToken.java
View File

@ -1,6 +1,9 @@
package me.braydon.mc.model.token;
import lombok.*;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
/**
* A token representing a Mojang username to UUID response.

13
src/main/java/me/braydon/mc/service/MojangAPI.java
View File

@ -1,13 +0,0 @@
package me.braydon.mc.service;
/**
* Endpoints for the Mojang API.
*
* @author Braydon
*/
public class MojangAPI {
private static final String SESSION_SERVER_ENDPOINT = "https://sessionserver.mojang.com";
private static final String API_ENDPOINT = "https://api.mojang.com";
protected static final String UUID_TO_PROFILE = SESSION_SERVER_ENDPOINT + "/session/minecraft/profile/%s";
protected static final String USERNAME_TO_UUID = API_ENDPOINT + "/users/profiles/minecraft/%s";
}

9
src/main/java/me/braydon/mc/service/MojangService.java
View File

@ -23,6 +23,11 @@ import java.util.UUID;
@Service
@Log4j2(topic = "Mojang Service")
public final class MojangService {
private static final String SESSION_SERVER_ENDPOINT = "https://sessionserver.mojang.com";
private static final String API_ENDPOINT = "https://api.mojang.com";
private static final String UUID_TO_PROFILE = SESSION_SERVER_ENDPOINT + "/session/minecraft/profile/%s";
private static final String USERNAME_TO_UUID = API_ENDPOINT + "/users/profiles/minecraft/%s";
/**
* Get a player by their username or UUID.
*
@ -54,7 +59,7 @@ public final class MojangService {
try {
log.info("Retrieving player profile for UUID: {}", uuid);
MojangProfileToken token = JsonWebRequest.makeRequest(
MojangAPI.UUID_TO_PROFILE.formatted(uuid), HttpMethod.GET
UUID_TO_PROFILE.formatted(uuid), HttpMethod.GET
).execute(MojangProfileToken.class);
// Return our player model representing the requested player
@ -80,7 +85,7 @@ public final class MojangService {
// Make a request to Mojang requesting the UUID
try {
MojangUsernameToUUIDToken token = JsonWebRequest.makeRequest(
MojangAPI.USERNAME_TO_UUID.formatted(username), HttpMethod.GET
USERNAME_TO_UUID.formatted(username), HttpMethod.GET
).execute(MojangUsernameToUUIDToken.class);
return UUIDUtils.addDashes(token.getId()); // Return the UUID with dashes
} catch (JsonWebException ex) {