From 6123bb8fa280fe1c3e2811df93560d44484e56ac Mon Sep 17 00:00:00 2001
From: JFronny <git@akbvopenfl1.hopto.org>
Date: Thu, 29 Dec 2022 14:02:11 +0100
Subject: [PATCH] Use v2 config compiler

---
 build.gradle.kts                                        | 6 ++----
 gradle.properties                                       | 8 ++++----
 settings.gradle.kts                                     | 4 ----
 src/main/java/io/gitlab/jfronny/versionchanger/Cfg.java | 4 ++++
 src/main/resources/fabric.mod.json                      | 2 +-
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index c77acfd..ab74792 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,16 +1,14 @@
 import io.gitlab.jfronny.scripts.*
 
 plugins {
-    id("jfmod") version "1.2-SNAPSHOT"
-    id("io.gitlab.jfronny.libjf.libjf-config-compiler-plugin")
+    id("jfmod") version "1.3-SNAPSHOT"
 }
 
 dependencies {
     modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${prop("libjf_version")}")
 
     // Dev env
-    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-reflect-v1:${prop("libjf_version")}")
     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:5.0.0-alpha.4")
+    modLocalRuntime("com.terraformersmc:modmenu:5.0.2")
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 745c826..4d7eab3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 # Fabric Properties https://fabricmc.net/develop/
 minecraft_version=1.19.3
-yarn_mappings=build.2
-loader_version=0.14.11
+yarn_mappings=build.5
+loader_version=0.14.12
 
 maven_group=io.gitlab.jfronny
 archives_base_name=versionchanger
@@ -13,5 +13,5 @@ curseforge_id=400771
 curseforge_required_dependencies=libjf
 curseforge_optional_dependencies=modmenu
 
-libjf_version=3.3.0
-fabric_version=0.68.1+1.19.3
+libjf_version=3.4.1
+fabric_version=0.70.0+1.19.3
diff --git a/settings.gradle.kts b/settings.gradle.kts
index ec4a44f..c1326be 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,13 +1,9 @@
 pluginManagement {
-    val libjf_version: String by settings
     repositories {
         maven("https://maven.fabricmc.net/") // FabricMC
         maven("https://maven.frohnmeyer-wds.de/artifacts") // scripts
         gradlePluginPortal()
     }
-    plugins {
-        id("io.gitlab.jfronny.libjf.libjf-config-compiler-plugin") version libjf_version
-    }
 }
 
 rootProject.name = "versionchanger"
diff --git a/src/main/java/io/gitlab/jfronny/versionchanger/Cfg.java b/src/main/java/io/gitlab/jfronny/versionchanger/Cfg.java
index d3af56d..ffb5e4f 100644
--- a/src/main/java/io/gitlab/jfronny/versionchanger/Cfg.java
+++ b/src/main/java/io/gitlab/jfronny/versionchanger/Cfg.java
@@ -6,4 +6,8 @@ import io.gitlab.jfronny.libjf.config.api.v1.JfConfig;
 @JfConfig
 public class Cfg  {
     @Entry public static String version = "1.7.10 Definitive Edition";
+
+    static {
+        JFC_Cfg.ensureInitialized();
+    }
 }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 1293467..213c6bb 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -15,7 +15,7 @@
   "icon": "assets/versionchanger/icon.png",
   "environment": "*",
   "entrypoints": {
-    "libjf:config": ["io.gitlab.jfronny.versionchanger.Cfg"]
+    "libjf:config": ["io.gitlab.jfronny.versionchanger.JFC_Cfg"]
   },
   "mixins": [
     "versionchanger.mixins.json"