diff --git a/build.gradle.kts b/build.gradle.kts index 47e0808..7044edb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,12 +5,12 @@ plugins { allprojects { group = "io.gitlab.jfronny" } base.archivesName = "google-chat" -val fabricVersion = "0.89.1+1.20.2" +val fabricVersion = "0.91.1+1.20.4" jfMod { - minecraftVersion = "1.20.2" + minecraftVersion = "1.20.4" yarn("build.1") - loaderVersion = "0.14.22" - libJfVersion = "3.13.1" + loaderVersion = "0.15.0" + libJfVersion = "3.14.1" modrinth { projectId = "google-chat" @@ -32,5 +32,5 @@ dependencies { // 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:8.0.0-beta.2") + modLocalRuntime("com.terraformersmc:modmenu:9.0.0-pre.1") } diff --git a/src/main/java/io/gitlab/jfronny/googlechat/GoogleChat.java b/src/main/java/io/gitlab/jfronny/googlechat/GoogleChat.java index f5f8ed8..da75488 100644 --- a/src/main/java/io/gitlab/jfronny/googlechat/GoogleChat.java +++ b/src/main/java/io/gitlab/jfronny/googlechat/GoogleChat.java @@ -91,7 +91,7 @@ public class GoogleChat implements ModInitializer { } public static TextContent translateIfNeeded(TextContent source, TranslationDirection direction, boolean respectRegex) { - if (source == null) return null; + if (source == null || source == PlainTextContent.EMPTY) return source; if (direction.shouldSkipOutright()) return source; String sourceString = toString(source); if (respectRegex && direction.failsRegex(sourceString)) return source; @@ -108,8 +108,8 @@ public class GoogleChat implements ModInitializer { else args[i] = args[i]; } return new TranslatableTextContent(tx.getKey(), translateIfNeeded(tx.getFallback(), direction, false), args); - } else if (t instanceof LiteralTextContent tx) { - return new LiteralTextContent(translateIfNeeded(tx.string(), direction, false)); + } else if (t instanceof PlainTextContent.Literal tx) { + return new PlainTextContent.Literal(translateIfNeeded(tx.string(), direction, false)); } else { // LOGGER.info("Unhandled text type: " + source.getClass() + " (" + source + ")"); return t;