Mod Garden API v2 + Database v6

.gitignore

@@ -41,6 +41,9 @@ bin/
 ### Mac OS ###
 .DS_Store
 
+### Linux ###
+.directory
+
 ### Custom
 /.idea
 /run

build.gradle.kts

@@ -1,4 +1,3 @@
-import org.jetbrains.gradle.ext.Application
 import org.jetbrains.gradle.ext.runConfigurations
 import org.jetbrains.gradle.ext.settings
 
@@ -14,7 +13,7 @@ group = "net.modgarden"
 version = project.properties["version"].toString()
 
 java {
-	toolchain.languageVersion.set(JavaLanguageVersion.of(21))
+	toolchain.languageVersion.set(JavaLanguageVersion.of(25))
 	withJavadocJar()
 }
 
@@ -30,13 +29,13 @@ dependencies {
 	implementation(libs.javalin)
     implementation(libs.logback)
     implementation(libs.sqlite)
-    implementation(libs.snowflakeid)
 	implementation(libs.dotenv)
 	implementation(libs.jwt.api)
 	implementation(libs.jwt.impl)
 	implementation(libs.jwt.gson)
-    implementation(libs.base62)
 	implementation(libs.jetbrains.annotations)
+
+	implementation(libs.argon2.jvm)
 }
 
 tasks {
@@ -81,18 +80,23 @@ application {
     mainClass = "net.modgarden.backend.ModGardenBackend"
 }
 
+// When refreshing the project, the entire build.gradle.kts may visually error because of IDEA Ext.
+// Refresh the project again to fix this. We'll likely have to report this to JetBrains.
 idea {
-    project {
-        settings.runConfigurations {
-            create("Run", Application::class.java) {
-                workingDirectory = "${rootProject.projectDir}/run"
-                mainClass = "net.modgarden.backend.ModGardenBackend"
-                moduleName = project.idea.module.name + ".main"
-                includeProvidedDependencies = true
-				envs = mapOf(
-					"env" to "development"
-				)
-            }
-        }
-    }
+	project {
+		settings {
+			runConfigurations {
+				create("Run Backend", org.jetbrains.gradle.ext.Application::class.java) {
+					workingDirectory = "${rootProject.projectDir}/run"
+					mainClass = "net.modgarden.backend.ModGardenBackend"
+					moduleName = project.idea.module.name + ".main"
+					includeProvidedDependencies = true
+					envs = mapOf(
+						"env" to "development",
+					)
+					jvmArgs = "--enable-native-access=ALL-UNNAMED"
+				}
+			}
+		}
+	}
 }

gradle.properties

@@ -1 +1 @@
-version = 1.4.0
+version = 2.0.0-beta.1

gradle/libs.versions.toml

@@ -1,28 +1,28 @@
 [versions]
 dfu = "8.0.16"
-javalin = "6.4.0"
-logback = "1.5.18"
-sqlite = "3.47.1.0"
-snowflakeid = "0.0.2"
+javalin = "6.7.0"
+logback = "1.5.21"
+sqlite = "3.51.0.0"
 dotenv = "2.3.0"
 jwt = "0.11.5"
-base62 = "0.1.3"
 jetbrains_annotations = "0.1.3"
 
-idea_ext = "1.1.9"
+argon2-jvm = "2.12"
+
+idea_ext = "1.3"
 
 [libraries]
 dfu = { group = "com.mojang", name = "datafixerupper", version.ref = "dfu" }
 javalin = { group = "io.javalin", name = "javalin", version.ref = "javalin" }
 logback = { group = "ch.qos.logback", name = "logback-classic", version.ref = "logback" }
 sqlite = { group = "org.xerial", name = "sqlite-jdbc", version.ref = "sqlite" }
 dotenv = { group = "io.github.cdimascio", name = "dotenv-java", version.ref = "dotenv" }
-snowflakeid = { group = "de.mkammerer.snowflake-id", name = "snowflake-id", version.ref = "snowflakeid" }
 jwt_api = { group = "io.jsonwebtoken", name = "jjwt-api", version.ref = "jwt" }
 jwt_impl = { group = "io.jsonwebtoken", name = "jjwt-impl", version.ref = "jwt" }
 jwt_gson = { group = "io.jsonwebtoken", name = "jjwt-gson", version.ref = "jwt" }
-base62 = { group = "io.seruco.encoding", name = "base62", version.ref = "base62" }
 jetbrains_annotations = { group = "org.jetbrains", name = "annotations", version.ref = "jetbrains_annotations" }
 
+argon2-jvm = { group = "de.mkammerer", name = "argon2-jvm", version.ref = "argon2-jvm" }
+
 [plugins]
 idea_ext = { id = "org.jetbrains.gradle.plugin.idea-ext", version.ref = "idea_ext" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/net/modgarden/backend/HypertextResult.java

@@ -0,0 +1,52 @@
+package net.modgarden.backend;
+
+import io.javalin.http.Context;
+import org.jetbrains.annotations.Nullable;
+
+public final class HypertextResult<T> {
+	private final boolean success;
+	private final int status;
+	private String message;
+	private T object;
+
+	public HypertextResult(int status, String message) {
+		this.success = false;
+		this.status = status;
+		this.message = message;
+	}
+
+	public HypertextResult(T object) {
+		this.success = true;
+		this.status = 200;
+		this.object = object;
+	}
+
+	public boolean isSuccess() {
+		return success;
+	}
+
+	public int getStatus() {
+		return status;
+	}
+
+	public String getMessage() {
+		if (success) throw new IllegalStateException("result succeeded");
+		return message;
+	}
+
+	public T getObject() {
+		if (!success) throw new IllegalStateException("result failed");
+		return object;
+	}
+
+	@Nullable
+	public T unwrap(Context ctx) {
+		if (!success) {
+			ctx.result(message);
+			ctx.status(status);
+			return null;
+		}
+
+		return object;
+	}
+}