From b85cd1ee9401d5ad260a0f8e95eae3a9fa378178 Mon Sep 17 00:00:00 2001
From: JFronny <git@akbvopenfl1.hopto.org>
Date: Tue, 18 Jul 2023 20:47:33 +0200
Subject: [PATCH] build: use jfMod DSL

---
 build.gradle.kts  | 39 +++++++++++++++++++++++++++++----------
 gradle.properties | 17 -----------------
 2 files changed, 29 insertions(+), 27 deletions(-)
 delete mode 100644 gradle.properties

diff --git a/build.gradle.kts b/build.gradle.kts
index bd07985..6eb36a4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,17 +1,36 @@
-import io.gitlab.jfronny.scripts.*
-
 plugins {
-    id("jfmod") version "1.3-SNAPSHOT"
-    id("jf.taskgraph") version "1.3-SNAPSHOT"
+    id("jfmod") version "1.5-SNAPSHOT"
+}
+
+allprojects { group = "io.gitlab.jfronny" }
+base.archivesName = "google-chat"
+
+val fabricVersion = "0.83.0+1.20"
+jfMod {
+    minecraftVersion = "1.20.1"
+    yarn("build.9")
+    loaderVersion = "0.14.21"
+    libJfVersion = "3.10.1"
+
+    modrinth {
+        projectId = "google-chat"
+        requiredDependencies.add("libjf")
+        optionalDependencies.add("modmenu")
+    }
+    curseforge {
+        projectId = "574331"
+        requiredDependencies.add("libjf")
+        optionalDependencies.add("modmenu")
+    }
 }
 
 dependencies {
-    modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${prop("libjf_version")}")
-    modImplementation("io.gitlab.jfronny.libjf:libjf-translate-v1:${prop("libjf_version")}")
-    include(modImplementation(fabricApi.module("fabric-message-api-v1", prop("fabric_version")))!!)
+    modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${jfMod.libJfVersion.get()}")
+    modImplementation("io.gitlab.jfronny.libjf:libjf-translate-v1:${jfMod.libJfVersion.get()}")
+    include(modImplementation(fabricApi.module("fabric-message-api-v1", fabricVersion))!!)
 
     // Dev env
-    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${prop("libjf_version")}")
-    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${prop("libjf_version")}")
-    modLocalRuntime("com.terraformersmc:modmenu:7.0.1")
+    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${jfMod.libJfVersion.get()}")
+    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${jfMod.libJfVersion.get()}")
+    modLocalRuntime("com.terraformersmc:modmenu:7.1.0")
 }
diff --git a/gradle.properties b/gradle.properties
deleted file mode 100644
index 426b3a1..0000000
--- a/gradle.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# https://fabricmc.net/develop/
-minecraft_version=1.20
-yarn_mappings=build.1
-loader_version=0.14.21
-
-maven_group=io.gitlab.jfronny
-archives_base_name=google-chat
-
-modrinth_id=google-chat
-modrinth_required_dependencies=libjf
-modrinth_optional_dependencies=modmenu
-curseforge_id=574331
-curseforge_required_dependencies=libjf
-curseforge_optional_dependencies=modmenu
-
-libjf_version=3.8.0
-fabric_version=0.83.0+1.20