diff --git a/build.gradle.kts b/build.gradle.kts index 2b77c18..70724d6 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" } loom { @@ -14,13 +13,13 @@ repositories { } dependencies { - modCompileOnly("maven.modrinth:sodium:mc1.19.3-0.4.5") + modCompileOnly("maven.modrinth:sodium:mc1.19.3-0.4.6") modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${prop("libjf_version")}") // For testing in dev environment - modLocalRuntime("net.fabricmc.fabric-api:fabric-api:0.68.1+1.19.3") + modLocalRuntime("net.fabricmc.fabric-api:fabric-api:0.70.0+1.19.3") modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${prop("libjf_version")}") - modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-reflect-v1:${prop("libjf_version")}") - modLocalRuntime("com.terraformersmc:modmenu:5.0.0-alpha.4") + modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${prop("libjf_version")}") + modLocalRuntime("com.terraformersmc:modmenu:5.0.2") } diff --git a/gradle.properties b/gradle.properties index e17fc72..a3d6c5e 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=slyde @@ -13,4 +13,4 @@ curseforge_id=411386 curseforge_required_dependencies=libjf curseforge_optional_dependencies=modmenu -libjf_version=3.3.1 +libjf_version=3.4.1 diff --git a/settings.gradle.kts b/settings.gradle.kts index 7f3bbe5..0b76b0e 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 = "slyde" diff --git a/src/client/java/io/gitlab/jfronny/slyde/Cfg.java b/src/client/java/io/gitlab/jfronny/slyde/Cfg.java index ca4a811..da66104 100644 --- a/src/client/java/io/gitlab/jfronny/slyde/Cfg.java +++ b/src/client/java/io/gitlab/jfronny/slyde/Cfg.java @@ -3,9 +3,13 @@ package io.gitlab.jfronny.slyde; import io.gitlab.jfronny.libjf.config.api.v1.Entry; import io.gitlab.jfronny.libjf.config.api.v1.JfConfig; -@JfConfig(referencedConfigs = "libjf-web-v0") +@JfConfig public class Cfg { @Entry public static boolean sodiumCompat = true; @Entry public static boolean forceSodiumCompat = false; @Entry public static boolean holdKeyToActivate = false; + + static { + JFC_Cfg.ensureInitialized(); + } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 92b7ed3..5555e02 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -15,7 +15,7 @@ "environment": "*", "icon": "assets/slyde/icon.png", "entrypoints": { - "libjf:config": ["io.gitlab.jfronny.slyde.Cfg"] + "libjf:config": ["io.gitlab.jfronny.slyde.JFC_Cfg"] }, "mixins": [ "slyde.mixins.json"