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

---
 build.gradle                                     | 14 ++++++++------
 gradle.properties                                | 10 +++++-----
 .../java/io/gitlab/jfronny/modsmod/ModsMod.java  |  5 ++---
 .../io/gitlab/jfronny/modsmod/ModsModConfig.java | 16 +++++++---------
 src/main/resources/fabric.mod.json               |  4 ++--
 5 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/build.gradle b/build.gradle
index 91a6a24..c722228 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,12 @@
-apply from: "https://jfmods.gitlab.io/scripts/jfmod.gradle"
+apply from: "https://jfmods.gitlab.io/scripts/gradle/v2.gradle"
 
 dependencies {
-    modImplementation("io.gitlab.jfronny.libjf:libjf-config-v0:${project.jfapi_version}")
+    modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${project.libjf_version}")
+    modImplementation("io.gitlab.jfronny.libjf:libjf-unsafe-v0:${project.libjf_version}")
 
-    modImplementation "com.terraformersmc:modmenu:4.0.5"
-
-    // Compat fix
-    modImplementation(fabricApi.module("fabric-command-api-v2", "${project.fabric_version}"))
+    // Dev env
+    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-reflect-v1:${project.libjf_version}")
+    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${project.libjf_version}")
+    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${project.libjf_version}")
+    modLocalRuntime("com.terraformersmc:modmenu:4.0.6")
 }
diff --git a/gradle.properties b/gradle.properties
index 3c713ef..8a21053 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,13 +1,13 @@
 # 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
 # Mod Properties
 maven_group=io.gitlab.jfronny
 archives_base_name=modsmod
 
-jfapi_version=2.10.0
-fabric_version=0.58.5+1.19.1
+libjf_version=3.0.3
+fabric_version=0.60.0+1.19.2
 
 modrinth_id=modsmod
 modrinth_required_dependencies=libjf
diff --git a/src/main/java/io/gitlab/jfronny/modsmod/ModsMod.java b/src/main/java/io/gitlab/jfronny/modsmod/ModsMod.java
index 06ed24f..01540e5 100644
--- a/src/main/java/io/gitlab/jfronny/modsmod/ModsMod.java
+++ b/src/main/java/io/gitlab/jfronny/modsmod/ModsMod.java
@@ -2,8 +2,7 @@ package io.gitlab.jfronny.modsmod;
 
 import io.gitlab.jfronny.commons.log.*;
 import io.gitlab.jfronny.gson.Gson;
-import io.gitlab.jfronny.libjf.config.api.ConfigInstance;
-import io.gitlab.jfronny.libjf.config.impl.ConfigInstanceRoot;
+import io.gitlab.jfronny.libjf.config.api.v1.ConfigInstance;
 import io.gitlab.jfronny.libjf.unsafe.UltraEarlyInit;
 import io.gitlab.jfronny.modsmod.builder.JsonBuilder;
 import io.gitlab.jfronny.modsmod.builder.ModMeta;
@@ -33,7 +32,7 @@ public class ModsMod implements UltraEarlyInit {
     public void init() {
         try {
             //Load config
-            Path modsmodCfgFile = ((ConfigInstanceRoot)ConfigInstance.get(MOD_ID)).path;
+            Path modsmodCfgFile = ConfigInstance.get(MOD_ID).getFilePath().orElseThrow();
             //make sure the modsmodcache dir is ok
             Path path = LOADER.getConfigDir().resolve(CACHE_NAME);
             if (!Files.isDirectory(path)) {
diff --git a/src/main/java/io/gitlab/jfronny/modsmod/ModsModConfig.java b/src/main/java/io/gitlab/jfronny/modsmod/ModsModConfig.java
index 021e80e..dcf5df8 100644
--- a/src/main/java/io/gitlab/jfronny/modsmod/ModsModConfig.java
+++ b/src/main/java/io/gitlab/jfronny/modsmod/ModsModConfig.java
@@ -1,13 +1,11 @@
 package io.gitlab.jfronny.modsmod;
 
-import io.gitlab.jfronny.libjf.config.api.JfConfig;
-import io.gitlab.jfronny.libjf.config.api.Entry;
+import io.gitlab.jfronny.libjf.config.api.v1.JfConfig;
+import io.gitlab.jfronny.libjf.config.api.v1.Entry;
 
-public class ModsModConfig implements JfConfig {
-    @Entry
-    public static Boolean parent = false;
-    @Entry
-    public static Boolean cache = true;
-    @Entry
-    public static Integer modsCount = 26;
+@JfConfig
+public class ModsModConfig  {
+    @Entry public static boolean parent = false;
+    @Entry public static boolean cache = true;
+    @Entry public static int modsCount = 26;
 }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 8c41f74..c7e3ca6 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -20,8 +20,8 @@
   },
   "depends": {
     "fabricloader": ">=0.13.3",
-    "libjf-config-v0": ">=2.5.0",
-    "libjf-unsafe-v0": ">=2.5.0",
+    "libjf-config-core-v1": ">=3.0.3",
+    "libjf-unsafe-v0": ">=3.0.3",
     "minecraft": "*"
   }
 }