From eef15c6b2c8e7e92f77b1f010d41a91dd4c1fdc1 Mon Sep 17 00:00:00 2001
From: JFronny <git@akbvopenfl1.hopto.org>
Date: Fri, 22 Sep 2023 19:51:58 +0200
Subject: [PATCH] Bump to 1.20.2

---
 build.gradle.kts                              | 37 ++++++++++++++-----
 gradle.properties                             | 16 --------
 .../java/io/gitlab/jfronny/slyde/Cfg.java     |  4 +-
 3 files changed, 30 insertions(+), 27 deletions(-)
 delete mode 100644 gradle.properties

diff --git a/build.gradle.kts b/build.gradle.kts
index 8def7d2..6982859 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,25 +1,44 @@
-import io.gitlab.jfronny.scripts.*
-
 plugins {
-    id("jfmod") version "1.3-SNAPSHOT"
+    id("jfmod") version "1.5-SNAPSHOT"
 }
 
 loom {
     accessWidenerPath.set(file("src/client/resources/slyde.accesswidener"))
 }
 
+allprojects { group = "io.gitlab.jfronny" }
+base.archivesName = "slyde"
+
+jfMod {
+    minecraftVersion = "1.20.2"
+    yarn("build.1")
+    loaderVersion = "0.14.22"
+    libJfVersion = "3.13.1"
+
+    modrinth {
+        projectId = "slyde"
+        requiredDependencies.add("libjf")
+        optionalDependencies.add("modmenu")
+    }
+    curseforge {
+        projectId = "411386"
+        requiredDependencies.add("libjf")
+        optionalDependencies.add("modmenu")
+    }
+}
+
 repositories {
     maven("https://api.modrinth.com/maven")
 }
 
 dependencies {
-    modCompileOnly("maven.modrinth:sodium:mc1.20-0.4.10")
+    modCompileOnly("maven.modrinth:sodium:mc1.20.2-0.5.3")
 
-    modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${prop("libjf_version")}")
+    modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v2:${jfMod.libJfVersion.get()}")
 
     // For testing in dev environment
-    modLocalRuntime("net.fabricmc.fabric-api:fabric-api:0.83.0+1.20")
-    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${prop("libjf_version")}")
-    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${prop("libjf_version")}")
-    modLocalRuntime("com.terraformersmc:modmenu:7.0.1")
+    modLocalRuntime("net.fabricmc.fabric-api:fabric-api:0.89.1+1.20.2")
+    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${jfMod.libJfVersion.get()}")
+    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny:${jfMod.libJfVersion.get()}")
+    modLocalRuntime("com.terraformersmc:modmenu:8.0.0-beta.2")
 }
diff --git a/gradle.properties b/gradle.properties
deleted file mode 100644
index e376559..0000000
--- a/gradle.properties
+++ /dev/null
@@ -1,16 +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=slyde
-
-modrinth_id=slyde
-modrinth_required_dependencies=libjf
-modrinth_optional_dependencies=modmenu
-curseforge_id=411386
-curseforge_required_dependencies=libjf
-curseforge_optional_dependencies=modmenu
-
-libjf_version=3.8.0
diff --git a/src/client/java/io/gitlab/jfronny/slyde/Cfg.java b/src/client/java/io/gitlab/jfronny/slyde/Cfg.java
index da66104..3595bb2 100644
--- a/src/client/java/io/gitlab/jfronny/slyde/Cfg.java
+++ b/src/client/java/io/gitlab/jfronny/slyde/Cfg.java
@@ -1,7 +1,7 @@
 package io.gitlab.jfronny.slyde;
 
-import io.gitlab.jfronny.libjf.config.api.v1.Entry;
-import io.gitlab.jfronny.libjf.config.api.v1.JfConfig;
+import io.gitlab.jfronny.libjf.config.api.v2.Entry;
+import io.gitlab.jfronny.libjf.config.api.v2.JfConfig;
 
 @JfConfig
 public class Cfg {