From 390a704d5c1543ab591d07aa3349ac781a7dd69c Mon Sep 17 00:00:00 2001
From: JFronny <git@akbvopenfl1.hopto.org>
Date: Thu, 29 Dec 2022 14:31:08 +0100
Subject: [PATCH] Use new config compiler

---
 build.gradle.kts                                         | 6 ++----
 gradle.properties                                        | 8 ++++----
 settings.gradle.kts                                      | 4 ----
 src/main/java/io/gitlab/jfronny/combit/CombitConfig.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 2250432..1a17cde 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")
 }
diff --git a/gradle.properties b/gradle.properties
index fddd821..895c5d0 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=combit
@@ -13,5 +13,5 @@ curseforge_id=561742
 curseforge_required_dependencies=libjf
 curseforge_optional_dependencies=modmenu, cloth-config
 
-fabric_version=0.68.1+1.19.3
-libjf_version=3.3.1
+fabric_version=0.70.0+1.19.3
+libjf_version=3.4.1
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 623b0a9..6f494bf 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 = "combit"
diff --git a/src/main/java/io/gitlab/jfronny/combit/CombitConfig.java b/src/main/java/io/gitlab/jfronny/combit/CombitConfig.java
index da1a366..01d0bf9 100644
--- a/src/main/java/io/gitlab/jfronny/combit/CombitConfig.java
+++ b/src/main/java/io/gitlab/jfronny/combit/CombitConfig.java
@@ -129,4 +129,8 @@ public class CombitConfig {
     @Preset public static void noInvulnerability() {
         iFrameInterval = 0;
     }
+
+    static {
+        JFC_CombitConfig.ensureInitialized();
+    }
 }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 4f1290e..2d19fec 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -16,7 +16,7 @@
   "environment": "*",
   "entrypoints": {
     "main": ["io.gitlab.jfronny.combit.Combit"],
-    "libjf:config": ["io.gitlab.jfronny.combit.CombitConfig"]
+    "libjf:config": ["io.gitlab.jfronny.combit.JFC_CombitConfig"]
   },
   "mixins": [
     "combit.mixins.json",