chore: update to 1.20.2

build.gradle.kts

@@ -1,15 +1,36 @@
-import io.gitlab.jfronny.scripts.*
-
 plugins {
-    id("jfmod") version "1.3-SNAPSHOT"
+    id("jfmod") version "1.5-SNAPSHOT"
+}
+
+allprojects { group = "io.gitlab.jfronny" }
+base.archivesName = "combit"
+
+val fabricVersion = "0.89.1+1.20.2"
+jfMod {
+    minecraftVersion = "1.20.2"
+    yarn("build.1")
+    loaderVersion = "0.14.22"
+    libJfVersion = "3.13.1"
+
+    modrinth {
+        projectId = "combit"
+        requiredDependencies.add("libjf")
+        optionalDependencies.add("modmenu")
+    }
+
+    curseforge {
+        projectId = "561742"
+        requiredDependencies.add("libjf")
+        optionalDependencies.add("modmenu")
+    }
 }
 
 dependencies {
-    modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${prop("libjf_version")}")
-    modImplementation(fabricApi.module("fabric-api-base", prop("fabric_version")))
+    modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v2:${jfMod.libJfVersion.get()}")
+    modImplementation(fabricApi.module("fabric-api-base", 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:${jfMod.libJfVersion.get()}")
+    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${jfMod.libJfVersion.get()}")
+    modLocalRuntime("com.terraformersmc:modmenu:8.0.0-beta.2")
 }

gradle.properties

@@ -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=combit
-
-modrinth_id=combit
-modrinth_required_dependencies=libjf
-modrinth_optional_dependencies=modmenu
-curseforge_id=561742
-curseforge_required_dependencies=libjf
-curseforge_optional_dependencies=modmenu
-
-fabric_version=0.83.0+1.20
-libjf_version=3.8.0

src/main/java/io/gitlab/jfronny/combit/CombitConfig.java

@@ -1,6 +1,6 @@
 package io.gitlab.jfronny.combit;
 
-import io.gitlab.jfronny.libjf.config.api.v1.*;
+import io.gitlab.jfronny.libjf.config.api.v2.*;
 import net.fabricmc.loader.api.FabricLoader;
 
 import java.util.HashSet;