diff --git a/build.gradle.kts b/build.gradle.kts index 4bcb96d..785f692 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,16 +1,16 @@ plugins { - id("jfmod") version "1.5-SNAPSHOT" + id("jfmod") version "1.6-SNAPSHOT" } allprojects { group = "io.gitlab.jfronny" } base.archivesName = "chat-transform" -val fabricVersion = "0.91.1+1.20.4" 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 = "chat-transform" @@ -26,13 +26,17 @@ jfMod { } dependencies { - modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v2:${jfMod.libJfVersion.get()}") - include(modImplementation(fabricApi.module("fabric-message-api-v1", fabricVersion))!!) - include(modImplementation(fabricApi.module("fabric-command-api-v2", fabricVersion))!!) - modImplementation(fabricApi.module("fabric-networking-api-v1", fabricVersion)) + modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v2") + include(modImplementation("net.fabricmc.fabric-api:fabric-message-api-v1")!!) + include(modImplementation("net.fabricmc.fabric-api:fabric-command-api-v2")!!) + modImplementation("net.fabricmc.fabric-api:fabric-networking-api-v1") // 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/client/resources/assets/chat-transform/lang/en_us.json b/src/client/resources/assets/chat-transform/lang/en_us.json index 198983e..99b5368 100644 --- a/src/client/resources/assets/chat-transform/lang/en_us.json +++ b/src/client/resources/assets/chat-transform/lang/en_us.json @@ -17,5 +17,8 @@ "chat-transform.jfconfig.server.playerConfigurable": "Player Configurable", "chat-transform.jfconfig.server.playerConfigurable.tooltip": "Whether players should be able to toggle chat transformation", "chat-transform.jfconfig.server.defaultEnable": "Default Enable", - "chat-transform.jfconfig.server.defaultEnable.tooltip": "Whether players' chat should be transformed by default" + "chat-transform.jfconfig.server.defaultEnable.tooltip": "Whether players' chat should be transformed by default", + "chat-transform.jfconfig.owo": "OwO", + "chat-transform.jfconfig.katakana": "Katakana", + "chat-transform.jfconfig.hiragana": "Hiragana" } \ No newline at end of file diff --git a/src/main/java/io/gitlab/jfronny/chattransform/Cfg.java b/src/main/java/io/gitlab/jfronny/chattransform/Cfg.java index 02d90e6..560c7b0 100644 --- a/src/main/java/io/gitlab/jfronny/chattransform/Cfg.java +++ b/src/main/java/io/gitlab/jfronny/chattransform/Cfg.java @@ -1,7 +1,7 @@ package io.gitlab.jfronny.chattransform; import io.gitlab.jfronny.commons.data.String2ObjectMap; -import io.gitlab.jfronny.commons.serialize.gson.api.v2.Ignore; +import io.gitlab.jfronny.commons.serialize.annotations.Ignore; import io.gitlab.jfronny.libjf.config.api.v2.*; import java.util.HashMap; diff --git a/src/main/java/io/gitlab/jfronny/chattransform/ChatTransform.java b/src/main/java/io/gitlab/jfronny/chattransform/ChatTransform.java index 3f447dc..ab66b68 100644 --- a/src/main/java/io/gitlab/jfronny/chattransform/ChatTransform.java +++ b/src/main/java/io/gitlab/jfronny/chattransform/ChatTransform.java @@ -1,10 +1,10 @@ package io.gitlab.jfronny.chattransform; -import io.gitlab.jfronny.commons.logging.Logger; +import io.gitlab.jfronny.commons.logger.SystemLoggerPlus; public class ChatTransform { public static final String MOD_ID = "chat-transform"; - public static final Logger LOG = Logger.forName(MOD_ID); + public static final SystemLoggerPlus LOG = SystemLoggerPlus.forName(MOD_ID); public static String transform(String text) { return Cfg.substitutions.asSubstitution().apply(text);