Revert to GeoTimeZone

src/main/java/xyz/verarr/synchrono/config/SynchronoConfig.java

@@ -1,7 +1,6 @@
 package xyz.verarr.synchrono.config;
 
 import java.time.ZoneId;
-import java.time.ZoneOffset;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -17,7 +16,7 @@
 import dev.isxander.yacl3.config.v2.api.SerialEntry;
 import dev.isxander.yacl3.config.v2.api.serializer.GsonConfigSerializerBuilder;
 import net.fabricmc.loader.api.FabricLoader;
-import xyz.verarr.synchrono.external_apis.GeoNamesAPI;
+import xyz.verarr.synchrono.external_apis.GeoTimeZoneAPI;
 
 public class SynchronoConfig {
     public static ConfigClassHandler<SynchronoConfig> HANDLER =
@@ -97,13 +96,11 @@ public int hashCode() {
         }
     }
 
-    private static final Map<Coordinates, ZoneOffset> zoneOffsetCache = new HashMap<>(1);
+    private static final Map<Coordinates, ZoneId> zoneIdCache = new HashMap<>(1);
 
     public static ZoneId timezone() {
-        return ZoneId.ofOffset(
-            "UTC",
-            zoneOffsetCache.computeIfAbsent(
-                new Coordinates(latitude, longitude),
-                coordinates -> GeoNamesAPI.query(coordinates.latitude, coordinates.longitude)));
+        return zoneIdCache.computeIfAbsent(
+            new Coordinates(latitude, longitude),
+            coordinates -> GeoTimeZoneAPI.query(coordinates.latitude, coordinates.longitude));
     }
 }

src/main/java/xyz/verarr/synchrono/external_apis/GeoNamesAPI.java → src/main/java/xyz/verarr/synchrono/external_apis/GeoTimeZoneAPI.java

@@ -2,7 +2,7 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.time.ZoneOffset;
+import java.time.ZoneId;
 import java.util.Formatter;
 import java.util.Locale;
 
@@ -12,16 +12,15 @@
 
 import org.jetbrains.annotations.NotNull;
 
-public class GeoNamesAPI {
-    private static final String API_URL = "http://api.geonames.org/timezoneJSON";
+public class GeoTimeZoneAPI {
+    private static final String API_URL = "https://api.geotimezone.com/public/timezone";
 
-    public static @NotNull ZoneOffset query(double latitude, double longitude) {
+    public static @NotNull ZoneId query(double latitude, double longitude) {
         URI uri;
         try {
             Formatter formatter = new Formatter(Locale.ROOT);
-            uri                 = new URI(
-                API_URL
-                + formatter.format("?lat=%f&lng=%f&username=synchrono_mod", latitude, longitude));
+            uri                 = new URI(API_URL
+                                          + formatter.format("?latitude=%f&longitude=%f", latitude, longitude));
         } catch (URISyntaxException e) { throw new RuntimeException(e); }
 
         String result = HTTPHelper.get(uri);
@@ -33,8 +32,6 @@ public class GeoNamesAPI {
             throw new RuntimeException(e + " URL: " + uri + " JSON: " + result);
         }
 
-        float rawOffset = jsonObject.get("rawOffset").getAsFloat();
-
-        return ZoneOffset.of((rawOffset >= 0 ? "+" : "") + (int) rawOffset);
+        return ZoneId.of(jsonObject.get("iana_timezone").getAsString());
     }
 }