diff --git a/build.gradle.kts b/build.gradle.kts index 3a26913..52fe679 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,15 +1,16 @@ plugins { - id("jfmod") version "1.5-SNAPSHOT" + id("jfmod") version "1.6-SNAPSHOT" } allprojects { group = "io.gitlab.jfronny" } base.archivesName = "quickmath" jfMod { - minecraftVersion = "1.20.4" + minecraftVersion = "1.20.5" yarn("build.1") - loaderVersion = "0.15.0" - libJfVersion = "3.14.1" + loaderVersion = "0.15.10" + libJfVersion = "3.15.5" + fabricApiVersion = "0.97.6+1.20.5" modrinth { projectId = "quickmath" @@ -24,11 +25,15 @@ jfMod { } dependencies { - modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v2:${jfMod.libJfVersion.get()}") - modImplementation("io.gitlab.jfronny.libjf:libjf-unsafe-v0:${jfMod.libJfVersion.get()}") + modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v2") + modImplementation("io.gitlab.jfronny.libjf:libjf-unsafe-v0") // Dev env - 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:9.0.0-pre.1") + modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny") + modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil") + modLocalRuntime("com.terraformersmc:modmenu:10.0.0-beta.1") + // for modmenu + modLocalRuntime("net.fabricmc.fabric-api:fabric-resource-loader-v0") + modLocalRuntime("net.fabricmc.fabric-api:fabric-screen-api-v1") + modLocalRuntime("net.fabricmc.fabric-api:fabric-key-binding-api-v1") } diff --git a/src/main/java/io/gitlab/jfronny/quickmath/Cfg.java b/src/main/java/io/gitlab/jfronny/quickmath/Cfg.java index a71b470..f27e3cf 100644 --- a/src/main/java/io/gitlab/jfronny/quickmath/Cfg.java +++ b/src/main/java/io/gitlab/jfronny/quickmath/Cfg.java @@ -3,6 +3,7 @@ package io.gitlab.jfronny.quickmath; import io.gitlab.jfronny.libjf.config.api.v2.Entry; import io.gitlab.jfronny.libjf.config.api.v2.JfConfig; import io.gitlab.jfronny.libjf.config.api.v2.dsl.ConfigBuilder; +import io.gitlab.jfronny.libjf.config.api.v2.dsl.Migration; @JfConfig(tweaker = Cfg.Migrations.class) public class Cfg { @@ -34,11 +35,11 @@ public class Cfg { public static class Migrations { public static ConfigBuilder tweak(ConfigBuilder builder) { - return builder.addMigration("corruptGenericMath2", reader -> { + return builder.addMigration("corruptGenericMath2", Migration.of(reader -> { if (reader.nextBoolean()) corruptGenericMath = CorruptionLevel2.FULL; - }).addMigration("corruptTrigonometry2", reader -> { + })).addMigration("corruptTrigonometry2", Migration.of(reader -> { if (!reader.nextBoolean()) corruptTrigonometry = CorruptionLevel2.MAJOR; - }); + })); } } } diff --git a/src/main/java/io/gitlab/jfronny/quickmath/ModMain.java b/src/main/java/io/gitlab/jfronny/quickmath/ModMain.java index 640f414..37627fc 100644 --- a/src/main/java/io/gitlab/jfronny/quickmath/ModMain.java +++ b/src/main/java/io/gitlab/jfronny/quickmath/ModMain.java @@ -1,10 +1,10 @@ package io.gitlab.jfronny.quickmath; -import io.gitlab.jfronny.commons.logging.*; +import io.gitlab.jfronny.commons.logger.SystemLoggerPlus; import net.fabricmc.api.*; public class ModMain implements ModInitializer { - public static final Logger LOGGER = Logger.forName("quickmäth"); + public static final SystemLoggerPlus LOGGER = SystemLoggerPlus.forName("quickmäth"); @Override public void onInitialize() { LOGGER.info("QuickMäth initialized, but why are you using this?");