From e1a6b57f226b0c0f037b3baf85532bf5726df34d Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Tue, 19 May 2026 13:02:31 -0400 Subject: [PATCH] Expose ZDT to the API --- api/build.gradle.kts | 1 + .../java/dev/plex/util/adapter/ZonedDateTimeAdapter.java | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) rename {server => api}/src/main/java/dev/plex/util/adapter/ZonedDateTimeAdapter.java (85%) diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 713dc0f..f58fbd1 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -6,6 +6,7 @@ plugins { dependencies { compileOnly("io.papermc.paper:paper-api:26.1.2.build.+") compileOnly("org.apache.logging.log4j:log4j-api:2.26.0") + compileOnly("com.google.code.gson:gson:2.13.2") compileOnly("org.jetbrains:annotations:26.1.0") } diff --git a/server/src/main/java/dev/plex/util/adapter/ZonedDateTimeAdapter.java b/api/src/main/java/dev/plex/util/adapter/ZonedDateTimeAdapter.java similarity index 85% rename from server/src/main/java/dev/plex/util/adapter/ZonedDateTimeAdapter.java rename to api/src/main/java/dev/plex/util/adapter/ZonedDateTimeAdapter.java index 37cd64a..d6bda05 100644 --- a/server/src/main/java/dev/plex/util/adapter/ZonedDateTimeAdapter.java +++ b/api/src/main/java/dev/plex/util/adapter/ZonedDateTimeAdapter.java @@ -7,8 +7,6 @@ import com.google.gson.JsonParseException; import com.google.gson.JsonPrimitive; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; -import dev.plex.util.TimeUtils; - import java.lang.reflect.Type; import java.time.Instant; import java.time.ZoneId; @@ -16,7 +14,7 @@ import java.time.ZonedDateTime; public class ZonedDateTimeAdapter implements JsonSerializer, JsonDeserializer { - private static final String TIMEZONE = TimeUtils.TIMEZONE; + private static final ZoneId UTC = ZoneId.of("Etc/UTC"); @Override public JsonElement serialize(ZonedDateTime src, Type typeOfSrc, JsonSerializationContext context) @@ -28,6 +26,6 @@ public class ZonedDateTimeAdapter implements JsonSerializer, Json public ZonedDateTime deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { Instant instant = Instant.ofEpochMilli(json.getAsJsonPrimitive().getAsLong()); - return ZonedDateTime.ofInstant(instant, ZoneId.of(TIMEZONE)); + return ZonedDateTime.ofInstant(instant, UTC); } }