From f77f98d19d9f050af9414be465c58c99d09d7a7e Mon Sep 17 00:00:00 2001
From: JFronny <git@akbvopenfl1.hopto.org>
Date: Fri, 22 Sep 2023 21:52:38 +0200
Subject: [PATCH] chore: update to 1.20.2

---
 build.gradle.kts                              | 36 ++++++++++++++-----
 gradle.properties                             | 17 ---------
 .../jfronny/globalization/Globalization.java  |  2 +-
 .../globalization/GlobalizationConfig.java    |  4 +--
 4 files changed, 31 insertions(+), 28 deletions(-)
 delete mode 100644 gradle.properties

diff --git a/build.gradle.kts b/build.gradle.kts
index 5249b38..b3207e2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,15 +1,35 @@
-import io.gitlab.jfronny.scripts.*
-
 plugins {
-    id("jfmod") version "1.3-SNAPSHOT"
+    id("jfmod") version "1.5-SNAPSHOT"
+}
+
+allprojects { group = "io.gitlab.jfronny" }
+base.archivesName = "globalization"
+
+jfMod {
+    minecraftVersion = "1.20.2"
+    yarn("build.1")
+    loaderVersion = "0.14.22"
+    libJfVersion = "3.13.1"
+
+    modrinth {
+        projectId = "globalization"
+        requiredDependencies.add("libjf")
+        optionalDependencies.add("modmenu")
+    }
+
+    curseforge {
+        projectId = "839010"
+        requiredDependencies.add("libjf")
+        optionalDependencies.add("modmenu")
+    }
 }
 
 dependencies {
-    modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${prop("libjf_version")}")
-    modImplementation("io.gitlab.jfronny.libjf:libjf-translate-v1:${prop("libjf_version")}")
+    modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v2:${jfMod.libJfVersion.get()}")
+    modImplementation("io.gitlab.jfronny.libjf:libjf-translate-v1:${jfMod.libJfVersion.get()}")
 
     // Dev env
-    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:7.0.1")
+    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny:${jfMod.libJfVersion.get()}")
+    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${jfMod.libJfVersion.get()}")
+    modLocalRuntime("com.terraformersmc:modmenu:8.0.0-beta.2")
 }
diff --git a/gradle.properties b/gradle.properties
deleted file mode 100644
index ad01d41..0000000
--- a/gradle.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# https://fabricmc.net/develop/
-minecraft_version=1.20
-yarn_mappings=build.1
-loader_version=0.14.21
-
-maven_group=io.gitlab.jfronny
-archives_base_name=globalization
-
-modrinth_id=globalization
-modrinth_required_dependencies=libjf
-modrinth_optional_dependencies=modmenu
-curseforge_id=839010
-curseforge_required_dependencies=libjf
-curseforge_optional_dependencies=modmenu
-
-libjf_version=3.8.0
-fabric_version=0.83.0+1.20
diff --git a/src/main/java/io/gitlab/jfronny/globalization/Globalization.java b/src/main/java/io/gitlab/jfronny/globalization/Globalization.java
index 239dd9c..ef54ce1 100644
--- a/src/main/java/io/gitlab/jfronny/globalization/Globalization.java
+++ b/src/main/java/io/gitlab/jfronny/globalization/Globalization.java
@@ -1,6 +1,6 @@
 package io.gitlab.jfronny.globalization;
 
-import io.gitlab.jfronny.commons.log.Logger;
+import io.gitlab.jfronny.commons.logging.Logger;
 
 public class Globalization {
     public static final Logger LOG = Logger.forName("globalization");
diff --git a/src/main/java/io/gitlab/jfronny/globalization/GlobalizationConfig.java b/src/main/java/io/gitlab/jfronny/globalization/GlobalizationConfig.java
index 9368ba8..a5357e7 100644
--- a/src/main/java/io/gitlab/jfronny/globalization/GlobalizationConfig.java
+++ b/src/main/java/io/gitlab/jfronny/globalization/GlobalizationConfig.java
@@ -1,7 +1,7 @@
 package io.gitlab.jfronny.globalization;
 
-import io.gitlab.jfronny.libjf.config.api.v1.Entry;
-import io.gitlab.jfronny.libjf.config.api.v1.JfConfig;
+import io.gitlab.jfronny.libjf.config.api.v2.Entry;
+import io.gitlab.jfronny.libjf.config.api.v2.JfConfig;
 
 @JfConfig(referencedConfigs = "libjf-translate-v1")
 public class GlobalizationConfig {