feat: use kaleido

build.gradle

@@ -42,6 +42,7 @@ allprojects {
         // See https://docs.gradle.org/current/userguide/declaring_repositories.html
         // for more information about repositories.
         maven { url 'https://jitpack.io' }
+        maven { url 'https://repo.sleeping.town/' }
     }
 
     tasks.withType(JavaCompile) {

common/build.gradle

@@ -13,6 +13,7 @@ dependencies {
     implementation("com.github.vgskye.netty-incubator-codec-quic:netty-incubator-codec-classes-quic:${rootProject.quic_version}") {
         exclude(group: "io.netty")
     }
+    implementation 'folk.sisby:kaleido-config:0.3.1+1.3.1'
 }
 
 publishing {

common/src/main/java/link/e4mc/Agnos.java

@@ -2,9 +2,16 @@
 
 import dev.architectury.injectables.annotations.ExpectPlatform;
 
+import java.nio.file.Path;
+
 public class Agnos {
     @ExpectPlatform
     public static boolean isClient() {
         return false;
     }
+
+    @ExpectPlatform
+    public static Path configDir() {
+        return null;
+    }
 }

common/src/main/java/link/e4mc/Config.java

@@ -0,0 +1,16 @@
+package link.e4mc;
+
+import folk.sisby.kaleido.api.ReflectiveConfig;
+import folk.sisby.kaleido.lib.quiltconfig.api.annotations.Comment;
+import folk.sisby.kaleido.lib.quiltconfig.api.values.TrackedValue;
+
+public class Config extends ReflectiveConfig {
+    public static final Config INSTANCE = Config.createToml(Agnos.configDir(), "e4mc", "e4mc", Config.class);
+
+    @Comment("Whether to use the broker to get the best relay based on location or use a hard-coded relay.")
+    public final TrackedValue<Boolean> useBroker = this.value(true);
+    public final TrackedValue<String> brokerUrl = this.value("https://broker.e4mc.link/getBestRelay");
+
+    public final TrackedValue<String> relayHost = this.value("test.e4mc.link");
+    public final TrackedValue<Integer> relayPort = this.value(25575);
+}

common/src/main/java/link/e4mc/QuiclimeSession.java

@@ -236,11 +236,11 @@ public void startAsync() {
         thread.start();
     }
 
-    public void start() {
-        try {
+    private static BrokerResponse getRelay() throws Exception {
+        if (Config.INSTANCE.useBroker.value()) {
             var httpClient = HttpClient.newHttpClient();
             var request = HttpRequest
-                    .newBuilder(new URI("https://broker.e4mc.link/getBestRelay"))
+                    .newBuilder(new URI(Config.INSTANCE.brokerUrl.value()))
                     .header("Accept", "application/json")
                     .build();
             LOGGER.info("req: {}", request);
@@ -249,7 +249,19 @@ public void start() {
             if (response.statusCode() != 200) {
                 throw new RuntimeException();
             }
-            var relayInfo = gson.fromJson(response.body(), BrokerResponse.class);
+            return gson.fromJson(response.body(), BrokerResponse.class);
+        } else {
+            var resp = new BrokerResponse();
+            resp.id = "custom";
+            resp.host = Config.INSTANCE.relayHost.value();
+            resp.port = Config.INSTANCE.relayPort.value();
+            return resp;
+        }
+    }
+
+    public void start() {
+        try {
+            var relayInfo = getRelay();
             LOGGER.info("using relay {}", relayInfo.id);
             QuicSslContext context = QuicSslContextBuilder
                     .forClient()

fabric/build.gradle

@@ -29,6 +29,7 @@ dependencies {
     shadowCommon(implementation("com.github.vgskye.netty-incubator-codec-quic:netty-incubator-codec-classes-quic:${rootProject.quic_version}") {
         exclude(group: "io.netty")
     })
+    include 'folk.sisby:kaleido-config:0.3.1+1.3.1'
 }
 
 processResources {

fabric/src/main/java/link/e4mc/fabric/AgnosImpl.java

@@ -1,6 +1,5 @@
 package link.e4mc.fabric;
 
-import link.e4mc.Agnos;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.loader.api.FabricLoader;
 
@@ -10,4 +9,8 @@ public class AgnosImpl {
     public static boolean isClient() {
         return FabricLoader.getInstance().getEnvironmentType().equals(EnvType.CLIENT);
     }
+
+    public static Path configDir() {
+        return FabricLoader.getInstance().getConfigDir();
+    }
 }

forge/build.gradle

@@ -36,6 +36,7 @@ dependencies {
     shadowCommon(implementation("com.github.vgskye.netty-incubator-codec-quic:netty-incubator-codec-classes-quic:${rootProject.quic_version}") {
         exclude(group: "io.netty")
     })
+    shadowCommon('folk.sisby:kaleido-config:0.3.1+1.3.1')
 }
 
 processResources {
@@ -52,6 +53,9 @@ shadowJar {
 
     configurations = [project.configurations.shadowCommon]
     archiveClassifier = "dev-shadow"
+
+    relocate 'com.electronwill.nightconfig', 'link.e4mc.shadow.nightconfig'
+    relocate 'folk.sisby.kaleido', 'link.e4mc.shadow.kaleido'
 }
 
 remapJar {

forge/src/main/java/link/e4mc/forge/AgnosImpl.java

@@ -1,6 +1,5 @@
 package link.e4mc.forge;
 
-import link.e4mc.Agnos;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.fml.loading.FMLLoader;
 import net.minecraftforge.fml.loading.FMLPaths;
@@ -11,4 +10,8 @@ public class AgnosImpl {
     public static boolean isClient() {
         return FMLLoader.getDist().equals(Dist.CLIENT);
     }
+
+    public static Path configDir() {
+        return FMLPaths.CONFIGDIR.get();
+    }
 }

gradle.properties

@@ -4,7 +4,7 @@ minecraft_version=1.18.2
 enabled_platforms=fabric,forge
 
 archives_base_name=e4mc_minecraft
-mod_version=5.0.0
+mod_version=5.1.0
 maven_group=link.e4mc
 
 architectury_version=4.11.93