From 22c19fdc8eb0f65856e566270705d82ceaacabb6 Mon Sep 17 00:00:00 2001 From: macuguita Date: Fri, 16 Oct 2026 13:04:12 +0200 Subject: [PATCH] cleanup some persista stuff --- .../macuguita/lib/impl/persista/Persista.java | 8 ++++-- .../lib/impl/persista/PersistaAPIImpl.java | 2 ++ .../lib/impl/persista/PersistaClient.java | 1 + .../impl/persista/{ => auth}/AuthSession.java | 28 +++++++++++-------- .../lib/impl/persista/auth/package-info.java | 6 ++++ .../impl/persista/{ => data}/CachedValue.java | 3 +- .../impl/persista/{ => data}/DataCache.java | 10 ++++--- .../impl/persista/{ => data}/DataEntry.java | 8 ++++-- .../persista/{ => data}/DataRegistry.java | 8 +++--- .../impl/persista/{ => data}/FetchResult.java | 2 +- .../lib/impl/persista/data/package-info.java | 6 ++++ .../ClientboundDataUpdatedPacket.java | 5 +++- .../{ => net}/PersistaHttpHelper.java | 7 +++-- .../ServerboundDataUpdatedPacket.java | 4 ++- .../lib/impl/persista/net/package-info.java | 6 ++++ 15 files changed, 73 insertions(+), 31 deletions(-) rename src/main/java/com/macuguita/lib/impl/persista/{ => auth}/AuthSession.java (84%) create mode 100644 src/main/java/com/macuguita/lib/impl/persista/auth/package-info.java rename src/main/java/com/macuguita/lib/impl/persista/{ => data}/CachedValue.java (97%) rename src/main/java/com/macuguita/lib/impl/persista/{ => data}/DataCache.java (89%) rename src/main/java/com/macuguita/lib/impl/persista/{ => data}/DataEntry.java (94%) rename src/main/java/com/macuguita/lib/impl/persista/{ => data}/DataRegistry.java (87%) rename src/main/java/com/macuguita/lib/impl/persista/{ => data}/FetchResult.java (95%) create mode 100644 src/main/java/com/macuguita/lib/impl/persista/data/package-info.java rename src/main/java/com/macuguita/lib/impl/persista/{ => net}/ClientboundDataUpdatedPacket.java (92%) rename src/main/java/com/macuguita/lib/impl/persista/{ => net}/PersistaHttpHelper.java (85%) rename src/main/java/com/macuguita/lib/impl/persista/{ => net}/ServerboundDataUpdatedPacket.java (94%) create mode 100644 src/main/java/com/macuguita/lib/impl/persista/net/package-info.java diff --git a/src/main/java/com/macuguita/lib/impl/persista/Persista.java b/src/main/java/com/macuguita/lib/impl/persista/Persista.java index 26e62f7..c2b7e80 100644 --- a/src/main/java/com/macuguita/lib/impl/persista/Persista.java +++ b/src/main/java/com/macuguita/lib/impl/persista/Persista.java @@ -30,12 +30,14 @@ import org.slf4j.LoggerFactory; import com.macuguita.lib.api.network.PacketRegistry; import com.macuguita.lib.impl.MacuLib; +import com.macuguita.lib.impl.persista.net.ClientboundDataUpdatedPacket; +import com.macuguita.lib.impl.persista.net.ServerboundDataUpdatedPacket; public class Persista implements ModInitializer { - static final Logger LOGGER = LoggerFactory.getLogger("(" + MacuLib.MOD_ID + ") persista-client"); - static final boolean HAS_INTERNET = checkInternet(); - static final Duration REQUEST_TIMEOUT = Duration.ofMillis(MacuLib.CONFIG.persista.requestTimeout); + public static final Logger LOGGER = LoggerFactory.getLogger("(" + MacuLib.MOD_ID + ") persista-client"); + public static final boolean HAS_INTERNET = checkInternet(); + public static final Duration REQUEST_TIMEOUT = Duration.ofMillis(MacuLib.CONFIG.persista.requestTimeout); @Override public void onInitialize(ModContainer mod) { diff --git a/src/main/java/com/macuguita/lib/impl/persista/PersistaAPIImpl.java b/src/main/java/com/macuguita/lib/impl/persista/PersistaAPIImpl.java index 09d020a..1883e2b 100644 --- a/src/main/java/com/macuguita/lib/impl/persista/PersistaAPIImpl.java +++ b/src/main/java/com/macuguita/lib/impl/persista/PersistaAPIImpl.java @@ -27,6 +27,8 @@ import com.mojang.serialization.Codec; import com.macuguita.lib.api.persista.DataToken; import com.macuguita.lib.impl.MacuLib; +import com.macuguita.lib.impl.persista.data.DataCache; +import com.macuguita.lib.impl.persista.data.DataRegistry; @ApiStatus.Internal public final class PersistaAPIImpl { diff --git a/src/main/java/com/macuguita/lib/impl/persista/PersistaClient.java b/src/main/java/com/macuguita/lib/impl/persista/PersistaClient.java index f2662bf..419f7ae 100644 --- a/src/main/java/com/macuguita/lib/impl/persista/PersistaClient.java +++ b/src/main/java/com/macuguita/lib/impl/persista/PersistaClient.java @@ -20,6 +20,7 @@ import dev.yumi.mc.core.api.ModContainer; import dev.yumi.mc.core.api.entrypoint.client.ClientModInitializer; import com.macuguita.lib.api.network.PacketRegistry; +import com.macuguita.lib.impl.persista.net.ClientboundDataUpdatedPacket; public class PersistaClient implements ClientModInitializer { diff --git a/src/main/java/com/macuguita/lib/impl/persista/AuthSession.java b/src/main/java/com/macuguita/lib/impl/persista/auth/AuthSession.java similarity index 84% rename from src/main/java/com/macuguita/lib/impl/persista/AuthSession.java rename to src/main/java/com/macuguita/lib/impl/persista/auth/AuthSession.java index 5bb9cbd..47cc4b7 100644 --- a/src/main/java/com/macuguita/lib/impl/persista/AuthSession.java +++ b/src/main/java/com/macuguita/lib/impl/persista/auth/AuthSession.java @@ -14,7 +14,7 @@ * See the Licence for the specific language governing permissions and * limitations under the Licence. */ -package com.macuguita.lib.impl.persista; +package com.macuguita.lib.impl.persista.auth; import java.net.URI; import java.net.http.HttpResponse; @@ -22,6 +22,7 @@ import java.time.Instant; import java.util.Optional; import java.util.UUID; +import com.google.gson.JsonObject; import com.google.gson.JsonParser; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; @@ -33,10 +34,12 @@ import com.mojang.authlib.exceptions.AuthenticationException; import com.macuguita.lib.api.persista.PersistaAPI; import com.macuguita.lib.impl.net.HttpHelper; +import com.macuguita.lib.impl.persista.Persista; +import com.macuguita.lib.impl.persista.net.PersistaHttpHelper; // Manages the mojang auth and stores JWT session @ApiStatus.Internal -final class AuthSession { +public final class AuthSession { private static Instant loginCooldownUntil = Instant.MIN; @@ -44,13 +47,13 @@ final class AuthSession { private AuthSession() {} - record Session(String accessToken, Instant expiresAt) { + public record Session(String accessToken, Instant expiresAt) { boolean isValid() { return Instant.now().isBefore(expiresAt.minusSeconds(60)); } } - static Optional getOrLogin() { + public static Optional getOrLogin() { if (current != null && current.isValid()) { return Optional.of(current); } @@ -61,12 +64,12 @@ final class AuthSession { return login(); } - static Optional getClientPlayerId() { + public static Optional getClientPlayerId() { var profile = Minecraft.getInstance().getGameProfile(); return Optional.of(profile.id()); } - static boolean isOffline() { + public static boolean isOffline() { var profile = Minecraft.getInstance().getGameProfile(); return UUIDUtil.createOfflinePlayerUUID(profile.name()).equals(profile.id()); } @@ -94,8 +97,9 @@ final class AuthSession { @SuppressWarnings("resource") private static Optional fetchChallenge(UUID playerId) throws Exception { var uri = URI.create(PersistaAPI.API_URL + "/auth/mojang/challenge"); - var body = "{\"id\":\"" + playerId + "\"}"; - var request = PersistaHttpHelper.post(uri, body).build(); + var body = new JsonObject(); + body.addProperty("id", playerId.toString()); + var request = PersistaHttpHelper.post(uri, body.toString()).build(); var response = HttpHelper.client().send(request, HttpResponse.BodyHandlers.ofString()); if (response.statusCode() != 200) { Persista.LOGGER.error("Challenge request failed with status {}", response.statusCode()); @@ -118,9 +122,11 @@ final class AuthSession { @SuppressWarnings("resource") private static Optional verify(UUID playerId, String username, String challenge) throws Exception { var uri = URI.create(PersistaAPI.API_URL + "/auth/mojang"); - var body = String.format("{\"id\":\"%s\",\"username\":\"%s\",\"token\":\"%s\"}", - playerId, username, challenge); - var request = PersistaHttpHelper.post(uri, body).build(); + var body = new JsonObject(); + body.addProperty("id", playerId.toString()); + body.addProperty("username", username); + body.addProperty("token", challenge); + var request = PersistaHttpHelper.post(uri, body.toString()).build(); var response = HttpHelper.client().send(request, HttpResponse.BodyHandlers.ofString()); if (response.statusCode() != 200) { Persista.LOGGER.error("Persista verify failed with status {}", response.statusCode()); diff --git a/src/main/java/com/macuguita/lib/impl/persista/auth/package-info.java b/src/main/java/com/macuguita/lib/impl/persista/auth/package-info.java new file mode 100644 index 0000000..9ca6b94 --- /dev/null +++ b/src/main/java/com/macuguita/lib/impl/persista/auth/package-info.java @@ -0,0 +1,6 @@ +@ApiStatus.Internal +@NullMarked +package com.macuguita.lib.impl.persista.auth; + +import org.jetbrains.annotations.ApiStatus; +import org.jspecify.annotations.NullMarked; diff --git a/src/main/java/com/macuguita/lib/impl/persista/CachedValue.java b/src/main/java/com/macuguita/lib/impl/persista/data/CachedValue.java similarity index 97% rename from src/main/java/com/macuguita/lib/impl/persista/CachedValue.java rename to src/main/java/com/macuguita/lib/impl/persista/data/CachedValue.java index 6c97887..fe3df4e 100644 --- a/src/main/java/com/macuguita/lib/impl/persista/CachedValue.java +++ b/src/main/java/com/macuguita/lib/impl/persista/data/CachedValue.java @@ -14,7 +14,7 @@ * See the Licence for the specific language governing permissions and * limitations under the Licence. */ -package com.macuguita.lib.impl.persista; +package com.macuguita.lib.impl.persista.data; import java.time.Instant; import java.util.Optional; @@ -26,6 +26,7 @@ import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; import com.macuguita.lib.api.persista.PersistaAPI; +import com.macuguita.lib.impl.persista.Persista; // Holds cached value for specific player and entry @ApiStatus.Internal diff --git a/src/main/java/com/macuguita/lib/impl/persista/DataCache.java b/src/main/java/com/macuguita/lib/impl/persista/data/DataCache.java similarity index 89% rename from src/main/java/com/macuguita/lib/impl/persista/DataCache.java rename to src/main/java/com/macuguita/lib/impl/persista/data/DataCache.java index e4fd059..58023f1 100644 --- a/src/main/java/com/macuguita/lib/impl/persista/DataCache.java +++ b/src/main/java/com/macuguita/lib/impl/persista/data/DataCache.java @@ -14,7 +14,7 @@ * See the Licence for the specific language governing permissions and * limitations under the Licence. */ -package com.macuguita.lib.impl.persista; +package com.macuguita.lib.impl.persista.data; import java.time.Duration; import java.time.Instant; @@ -28,9 +28,11 @@ import org.jetbrains.annotations.ApiStatus; import net.minecraft.resources.Identifier; +import com.macuguita.lib.impl.persista.Persista; + // In-memory cache of player data, keyed by player UUID and data identifier @ApiStatus.Internal -final class DataCache { +public final class DataCache { private static final Map>> STORE = new HashMap<>(); @@ -54,7 +56,7 @@ final class DataCache { } } - static CachedValue lookup(UUID playerId, DataEntry entry, boolean forceRefresh) { + public static CachedValue lookup(UUID playerId, DataEntry entry, boolean forceRefresh) { var value = getOrCreate(playerId, entry); if (forceRefresh) { value.reload(); @@ -66,7 +68,7 @@ final class DataCache { return getOrEmpty(playerId, entry).value(); } - static CompletableFuture refresh(UUID playerId, boolean force) { + public static CompletableFuture refresh(UUID playerId, boolean force) { var startTime = Instant.now(); return CompletableFuture.allOf( DataRegistry.values().parallelStream() diff --git a/src/main/java/com/macuguita/lib/impl/persista/DataEntry.java b/src/main/java/com/macuguita/lib/impl/persista/data/DataEntry.java similarity index 94% rename from src/main/java/com/macuguita/lib/impl/persista/DataEntry.java rename to src/main/java/com/macuguita/lib/impl/persista/data/DataEntry.java index c02d6de..d0b62df 100644 --- a/src/main/java/com/macuguita/lib/impl/persista/DataEntry.java +++ b/src/main/java/com/macuguita/lib/impl/persista/data/DataEntry.java @@ -14,7 +14,7 @@ * See the Licence for the specific language governing permissions and * limitations under the Licence. */ -package com.macuguita.lib.impl.persista; +package com.macuguita.lib.impl.persista.data; import java.io.IOException; import java.net.ConnectException; @@ -40,11 +40,15 @@ import com.mojang.serialization.JsonOps; import com.macuguita.lib.api.persista.DataToken; import com.macuguita.lib.api.persista.PersistaAPI; import com.macuguita.lib.impl.net.HttpHelper; +import com.macuguita.lib.impl.persista.Persista; +import com.macuguita.lib.impl.persista.auth.AuthSession; +import com.macuguita.lib.impl.persista.net.PersistaHttpHelper; +import com.macuguita.lib.impl.persista.net.ServerboundDataUpdatedPacket; import com.macuguita.lib.impl.platform.CommonAbstraction; // Internal impl of DataToken handles fetching and stuff @ApiStatus.Internal -record DataEntry(Identifier id, Codec codec) implements DataToken { +public record DataEntry(Identifier id, Codec codec) implements DataToken { private static final AtomicReference GLOBAL_BACKOFF = new AtomicReference<>(Instant.MIN); diff --git a/src/main/java/com/macuguita/lib/impl/persista/DataRegistry.java b/src/main/java/com/macuguita/lib/impl/persista/data/DataRegistry.java similarity index 87% rename from src/main/java/com/macuguita/lib/impl/persista/DataRegistry.java rename to src/main/java/com/macuguita/lib/impl/persista/data/DataRegistry.java index f66b2f7..b3c7a68 100644 --- a/src/main/java/com/macuguita/lib/impl/persista/DataRegistry.java +++ b/src/main/java/com/macuguita/lib/impl/persista/data/DataRegistry.java @@ -14,7 +14,7 @@ * See the Licence for the specific language governing permissions and * limitations under the Licence. */ -package com.macuguita.lib.impl.persista; +package com.macuguita.lib.impl.persista.data; import java.util.*; @@ -28,13 +28,13 @@ import com.macuguita.lib.api.persista.DataToken; // Internal registry of all registered DataEntries @ApiStatus.Internal -final class DataRegistry { +public final class DataRegistry { private static final Map> REGISTRY = new LinkedHashMap<>(); private DataRegistry() {} - static DataToken add(Identifier id, Codec codec) { + public static DataToken add(Identifier id, Codec codec) { if (REGISTRY.containsKey(id)) { throw new IllegalStateException("DataToken already registered for: " + id); } @@ -51,7 +51,7 @@ final class DataRegistry { return REGISTRY.size(); } - static Optional> getById(Identifier id) { + public static Optional> getById(Identifier id) { return Optional.ofNullable(REGISTRY.get(id)); } } diff --git a/src/main/java/com/macuguita/lib/impl/persista/FetchResult.java b/src/main/java/com/macuguita/lib/impl/persista/data/FetchResult.java similarity index 95% rename from src/main/java/com/macuguita/lib/impl/persista/FetchResult.java rename to src/main/java/com/macuguita/lib/impl/persista/data/FetchResult.java index 745d373..0b25626 100644 --- a/src/main/java/com/macuguita/lib/impl/persista/FetchResult.java +++ b/src/main/java/com/macuguita/lib/impl/persista/data/FetchResult.java @@ -14,7 +14,7 @@ * See the Licence for the specific language governing permissions and * limitations under the Licence. */ -package com.macuguita.lib.impl.persista; +package com.macuguita.lib.impl.persista.data; sealed interface FetchResult permits FetchResult.Found, FetchResult.NotFound, FetchResult.Unavailable { record Found(T value) implements FetchResult {} diff --git a/src/main/java/com/macuguita/lib/impl/persista/data/package-info.java b/src/main/java/com/macuguita/lib/impl/persista/data/package-info.java new file mode 100644 index 0000000..7460e01 --- /dev/null +++ b/src/main/java/com/macuguita/lib/impl/persista/data/package-info.java @@ -0,0 +1,6 @@ +@ApiStatus.Internal +@NullMarked +package com.macuguita.lib.impl.persista.data; + +import org.jetbrains.annotations.ApiStatus; +import org.jspecify.annotations.NullMarked; diff --git a/src/main/java/com/macuguita/lib/impl/persista/ClientboundDataUpdatedPacket.java b/src/main/java/com/macuguita/lib/impl/persista/net/ClientboundDataUpdatedPacket.java similarity index 92% rename from src/main/java/com/macuguita/lib/impl/persista/ClientboundDataUpdatedPacket.java rename to src/main/java/com/macuguita/lib/impl/persista/net/ClientboundDataUpdatedPacket.java index c94ffa0..20234bc 100644 --- a/src/main/java/com/macuguita/lib/impl/persista/ClientboundDataUpdatedPacket.java +++ b/src/main/java/com/macuguita/lib/impl/persista/net/ClientboundDataUpdatedPacket.java @@ -14,7 +14,7 @@ * See the Licence for the specific language governing permissions and * limitations under the Licence. */ -package com.macuguita.lib.impl.persista; +package com.macuguita.lib.impl.persista.net; import java.util.UUID; @@ -31,6 +31,9 @@ import net.minecraft.server.level.ServerPlayer; import com.macuguita.lib.api.network.PacketDistributor; import com.macuguita.lib.impl.MacuLib; +import com.macuguita.lib.impl.persista.Persista; +import com.macuguita.lib.impl.persista.data.DataCache; +import com.macuguita.lib.impl.persista.data.DataRegistry; @ApiStatus.Internal public record ClientboundDataUpdatedPacket(UUID playerId, Identifier dataId) implements CustomPacketPayload { diff --git a/src/main/java/com/macuguita/lib/impl/persista/PersistaHttpHelper.java b/src/main/java/com/macuguita/lib/impl/persista/net/PersistaHttpHelper.java similarity index 85% rename from src/main/java/com/macuguita/lib/impl/persista/PersistaHttpHelper.java rename to src/main/java/com/macuguita/lib/impl/persista/net/PersistaHttpHelper.java index bb762b8..e0aded5 100644 --- a/src/main/java/com/macuguita/lib/impl/persista/PersistaHttpHelper.java +++ b/src/main/java/com/macuguita/lib/impl/persista/net/PersistaHttpHelper.java @@ -14,25 +14,26 @@ * See the Licence for the specific language governing permissions and * limitations under the Licence. */ -package com.macuguita.lib.impl.persista; +package com.macuguita.lib.impl.persista.net; import java.net.URI; import java.net.http.HttpRequest; import com.macuguita.lib.impl.MacuLib; +import com.macuguita.lib.impl.persista.Persista; public final class PersistaHttpHelper { private PersistaHttpHelper() {} - static HttpRequest.Builder get(URI uri) { + public static HttpRequest.Builder get(URI uri) { return HttpRequest.newBuilder(uri) .GET() .header("User-Agent", MacuLib.USER_AGENT == null ? MacuLib.MOD_ID + "/unknown" : MacuLib.USER_AGENT) .timeout(Persista.REQUEST_TIMEOUT); } - static HttpRequest.Builder post(URI uri, String body) { + public static HttpRequest.Builder post(URI uri, String body) { return HttpRequest.newBuilder(uri) .POST(HttpRequest.BodyPublishers.ofString(body)) .header("Content-Type", "application/json") diff --git a/src/main/java/com/macuguita/lib/impl/persista/ServerboundDataUpdatedPacket.java b/src/main/java/com/macuguita/lib/impl/persista/net/ServerboundDataUpdatedPacket.java similarity index 94% rename from src/main/java/com/macuguita/lib/impl/persista/ServerboundDataUpdatedPacket.java rename to src/main/java/com/macuguita/lib/impl/persista/net/ServerboundDataUpdatedPacket.java index 60f415d..8defb68 100644 --- a/src/main/java/com/macuguita/lib/impl/persista/ServerboundDataUpdatedPacket.java +++ b/src/main/java/com/macuguita/lib/impl/persista/net/ServerboundDataUpdatedPacket.java @@ -14,7 +14,7 @@ * See the Licence for the specific language governing permissions and * limitations under the Licence. */ -package com.macuguita.lib.impl.persista; +package com.macuguita.lib.impl.persista.net; import java.util.UUID; @@ -28,6 +28,8 @@ import net.minecraft.server.level.ServerPlayer; import com.macuguita.lib.api.network.PacketDistributor; import com.macuguita.lib.impl.MacuLib; +import com.macuguita.lib.impl.persista.data.DataCache; +import com.macuguita.lib.impl.persista.data.DataRegistry; @ApiStatus.Internal public record ServerboundDataUpdatedPacket(Identifier dataId) implements CustomPacketPayload { diff --git a/src/main/java/com/macuguita/lib/impl/persista/net/package-info.java b/src/main/java/com/macuguita/lib/impl/persista/net/package-info.java new file mode 100644 index 0000000..bb688a3 --- /dev/null +++ b/src/main/java/com/macuguita/lib/impl/persista/net/package-info.java @@ -0,0 +1,6 @@ +@ApiStatus.Internal +@NullMarked +package com.macuguita.lib.impl.persista.net; + +import org.jetbrains.annotations.ApiStatus; +import org.jspecify.annotations.NullMarked; -- knotmirror 0.0.1