From 1c0072c9dfd6b39b1b5ededa547dc91c9f11ed95 Mon Sep 17 00:00:00 2001
From: JFronny <git@akbvopenfl1.hopto.org>
Date: Sun, 28 Aug 2022 12:24:32 +0200
Subject: [PATCH] Upgrade to LibJF 3

---
 build.gradle                                  | 20 +++++++++----------
 gradle.properties                             | 10 +++++-----
 .../jfronny/googlechat/GoogleChatConfig.java  |  5 +++--
 src/main/resources/fabric.mod.json            |  5 +++--
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/build.gradle b/build.gradle
index af69cfe..b5a0f0d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,15 +1,13 @@
-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-translate-v1:${project.jfapi_version}")
+    modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${project.libjf_version}")
+    modImplementation("io.gitlab.jfronny.libjf:libjf-translate-v1:${project.libjf_version}")
+    include(modImplementation(fabricApi.module("fabric-message-api-v1", project.fabric_version)))
 
-    //modRuntimeOnly("io.gitlab.jfronny.libjf:libjf-devutil-v0:${project.jfapi_version}")
-
-    modImplementation "com.terraformersmc:modmenu:4.0.5"
-
-    // Compat fix
-    include modImplementation(fabricApi.module("fabric-command-api-v2", project.fabric_version))
-    include modImplementation(fabricApi.module("fabric-lifecycle-events-v1", project.fabric_version))
-    include modImplementation(fabricApi.module("fabric-message-api-v1", 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 240fd70..51bdf5c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,12 +1,12 @@
 # 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=GoogleChat
 
-jfapi_version=2.10.0
-fabric_version=0.58.5+1.19.1
+libjf_version=3.0.1
+fabric_version=0.60.0+1.19.2
 
 modrinth_id=google-chat
 modrinth_required_dependencies=libjf
diff --git a/src/main/java/io/gitlab/jfronny/googlechat/GoogleChatConfig.java b/src/main/java/io/gitlab/jfronny/googlechat/GoogleChatConfig.java
index d957377..c3e2799 100644
--- a/src/main/java/io/gitlab/jfronny/googlechat/GoogleChatConfig.java
+++ b/src/main/java/io/gitlab/jfronny/googlechat/GoogleChatConfig.java
@@ -1,10 +1,11 @@
 package io.gitlab.jfronny.googlechat;
 
-import io.gitlab.jfronny.libjf.config.api.*;
+import io.gitlab.jfronny.libjf.config.api.v1.*;
 import net.fabricmc.api.*;
 import net.fabricmc.loader.api.*;
 
-public class GoogleChatConfig implements JfConfig {
+@JfConfig
+public class GoogleChatConfig {
     @Entry public static Boolean enabled = true;
     @Entry public static String serverLanguage = "auto";
     @Entry public static String clientLanguage = "en";
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 39c3892..899691d 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -27,8 +27,9 @@
   "depends": {
     "fabricloader": ">=0.12.12",
     "minecraft": "*",
-    "libjf-config-v0": "*",
-    "libjf-translate-v1": "*"
+    "libjf-config-core-v1": "*",
+    "libjf-translate-v1": "*",
+    "fabric-message-api-v1": "*"
   },
   "custom": {
     "libjf:config": {