diff --git a/build.gradle.kts b/build.gradle.kts index f3084c4..dc8a2b0 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,6 +9,5 @@ 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("com.terraformersmc:modmenu:5.0.0-alpha.4") + modLocalRuntime("com.terraformersmc:modmenu:5.0.2") } diff --git a/gradle.properties b/gradle.properties index d529d69..6ed61f8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ # check these on 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=dynres @@ -13,5 +13,5 @@ curseforge_id=407012 curseforge_required_dependencies=libjf curseforge_optional_dependencies=modmenu -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 5905000..b6e5b2c 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 = "dynres" diff --git a/src/main/java/io/gitlab/jfronny/dynres/Cfg.java b/src/main/java/io/gitlab/jfronny/dynres/Cfg.java index 05c3748..c5a6dc0 100644 --- a/src/main/java/io/gitlab/jfronny/dynres/Cfg.java +++ b/src/main/java/io/gitlab/jfronny/dynres/Cfg.java @@ -7,4 +7,8 @@ import io.gitlab.jfronny.libjf.config.api.v1.JfConfig; public class Cfg { @Entry public static String resourcesFile = "resources.zip"; @Entry public static boolean hashResources = false; + + static { + JFC_Cfg.ensureInitialized(); + } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 44da046..1a01f5b 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -17,7 +17,7 @@ "entrypoints": { "libjf:web": ["io.gitlab.jfronny.dynres.DynRes"], "client": ["io.gitlab.jfronny.dynres.DebugClient"], - "libjf:config": ["io.gitlab.jfronny.dynres.Cfg"] + "libjf:config": ["io.gitlab.jfronny.dynres.JFC_Cfg"] }, "mixins": [ "dynres.mixins.json",