From 31d4047bcf2a1ea107149dc5cd873963dfff5124 Mon Sep 17 00:00:00 2001
From: JFronny <git@akbvopenfl1.hopto.org>
Date: Sun, 28 Aug 2022 16:49:12 +0200
Subject: [PATCH] Update to LibJF 3

---
 build.gradle                                     | 16 ++++++++--------
 gradle.properties                                |  8 ++++----
 src/client/java/io/gitlab/jfronny/slyde/Cfg.java | 16 +++++++---------
 src/{client => main}/resources/fabric.mod.json   |  2 +-
 4 files changed, 20 insertions(+), 22 deletions(-)
 rename src/{client => main}/resources/fabric.mod.json (94%)

diff --git a/build.gradle b/build.gradle
index 14a7b96..46818b9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,21 +1,21 @@
-apply from: "https://jfmods.gitlab.io/scripts/jfmod.gradle"
+apply from: "https://jfmods.gitlab.io/scripts/gradle/v2.gradle"
 
 loom {
     accessWidenerPath = file("src/client/resources/slyde.accesswidener")
 }
 
 repositories {
-    maven { url 'https://api.modrinth.com/maven' }
+    maven { url "https://api.modrinth.com/maven" }
 }
 
 dependencies {
-    // For testing in dev environment
-    modRuntimeOnly "net.fabricmc.fabric-api:fabric-api:0.58.5+1.19.1"
-
     modCompileOnly("maven.modrinth:sodium:mc1.19-0.4.2")
 
-    modImplementation("io.gitlab.jfronny.libjf:libjf-config-v0:${project.jfapi_version}")
-    modRuntimeOnly("io.gitlab.jfronny.libjf:libjf-devutil-v0:${project.jfapi_version}")
+    modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${project.libjf_version}")
 
-    modImplementation "com.terraformersmc:modmenu:4.0.5"
+    // For testing in dev environment
+    modLocalRuntime("net.fabricmc.fabric-api:fabric-api:0.60.0+1.19.2")
+    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${project.libjf_version}")
+    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-reflect-v1:${project.libjf_version}")
+    modLocalRuntime("com.terraformersmc:modmenu:4.0.6")
 }
diff --git a/gradle.properties b/gradle.properties
index 24aab58..ec98e7a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,11 +1,11 @@
 # https://fabricmc.net/develop/
-minecraft_version=1.19.1
-yarn_mappings=build.1
-loader_version=0.14.8
+minecraft_version=1.19.2
+yarn_mappings=build.8
+loader_version=0.14.9
 maven_group=io.gitlab.jfronny
 archives_base_name=Slyde
 
-jfapi_version=2.10.0
+libjf_version=3.0.3
 
 modrinth_id=slyde
 modrinth_required_dependencies=libjf
diff --git a/src/client/java/io/gitlab/jfronny/slyde/Cfg.java b/src/client/java/io/gitlab/jfronny/slyde/Cfg.java
index 136e5e1..ca4a811 100644
--- a/src/client/java/io/gitlab/jfronny/slyde/Cfg.java
+++ b/src/client/java/io/gitlab/jfronny/slyde/Cfg.java
@@ -1,13 +1,11 @@
 package io.gitlab.jfronny.slyde;
 
-import io.gitlab.jfronny.libjf.config.api.Entry;
-import io.gitlab.jfronny.libjf.config.api.JfConfig;
+import io.gitlab.jfronny.libjf.config.api.v1.Entry;
+import io.gitlab.jfronny.libjf.config.api.v1.JfConfig;
 
-public class Cfg implements JfConfig {
-    @Entry
-    public static boolean sodiumCompat = true;
-    @Entry
-    public static boolean forceSodiumCompat = false;
-    @Entry
-    public static boolean holdKeyToActivate = false;
+@JfConfig(referencedConfigs = "libjf-web-v0")
+public class Cfg {
+    @Entry public static boolean sodiumCompat = true;
+    @Entry public static boolean forceSodiumCompat = false;
+    @Entry public static boolean holdKeyToActivate = false;
 }
diff --git a/src/client/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
similarity index 94%
rename from src/client/resources/fabric.mod.json
rename to src/main/resources/fabric.mod.json
index fdb5dc9..e8c67a6 100644
--- a/src/client/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -25,6 +25,6 @@
   "depends": {
     "fabricloader": ">=0.12.0",
     "minecraft": "*",
-    "libjf-config-v0": ">=2.1.3"
+    "libjf-config-core-v1": ">=2.1.3"
   }
 }