From 8251b267916566763da0bf25fab7d50672400e72 Mon Sep 17 00:00:00 2001
From: JFronny <git@akbvopenfl1.hopto.org>
Date: Thu, 29 Dec 2022 16:05:35 +0100
Subject: [PATCH] Use new config compiler

---
 build.gradle.kts                                          | 6 ++----
 gradle.properties                                         | 8 ++++----
 settings.gradle.kts                                       | 4 ----
 src/main/java/io/gitlab/jfronny/modsmod/ModsMod.java      | 1 +
 .../java/io/gitlab/jfronny/modsmod/ModsModConfig.java     | 4 ++++
 src/main/resources/fabric.mod.json                        | 2 +-
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 65cb567..7d20d4a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,8 +1,7 @@
 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 {
@@ -10,8 +9,7 @@ dependencies {
     modImplementation("io.gitlab.jfronny.libjf:libjf-unsafe-v0:${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")
 }
diff --git a/gradle.properties b/gradle.properties
index 8f6d6cd..6f73eed 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 # 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=modsmod
@@ -13,5 +13,5 @@ curseforge_id=405095
 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 9427b73..51927e4 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 = "modsmod"
diff --git a/src/main/java/io/gitlab/jfronny/modsmod/ModsMod.java b/src/main/java/io/gitlab/jfronny/modsmod/ModsMod.java
index 9df61c2..7d11bec 100644
--- a/src/main/java/io/gitlab/jfronny/modsmod/ModsMod.java
+++ b/src/main/java/io/gitlab/jfronny/modsmod/ModsMod.java
@@ -31,6 +31,7 @@ public class ModsMod implements UltraEarlyInit {
     @Override
     public void init() {
         try {
+            JFC_ModsModConfig.ensureInitialized();
             //Load config
             Path modsmodCfgFile = ConfigInstance.get(MOD_ID).getFilePath().orElseThrow();
             //make sure the modsmodcache dir is ok
diff --git a/src/main/java/io/gitlab/jfronny/modsmod/ModsModConfig.java b/src/main/java/io/gitlab/jfronny/modsmod/ModsModConfig.java
index dcf5df8..e6a0e03 100644
--- a/src/main/java/io/gitlab/jfronny/modsmod/ModsModConfig.java
+++ b/src/main/java/io/gitlab/jfronny/modsmod/ModsModConfig.java
@@ -8,4 +8,8 @@ public class ModsModConfig  {
     @Entry public static boolean parent = false;
     @Entry public static boolean cache = true;
     @Entry public static int modsCount = 26;
+
+    static {
+        JFC_ModsModConfig.ensureInitialized();
+    }
 }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 7e9db6b..323de55 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -15,7 +15,7 @@
   "icon": "assets/modsmod/icon.png",
   "environment": "*",
   "entrypoints": {
-    "libjf:config": ["io.gitlab.jfronny.modsmod.ModsModConfig"],
+    "libjf:config": ["io.gitlab.jfronny.modsmod.JFC_ModsModConfig"],
     "libjf:early": ["io.gitlab.jfronny.modsmod.ModsMod"]
   },
   "depends": {