JfMods/GoogleChat
JfMods
/
GoogleChat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: update to 1.20.4
ci/woodpecker/push/jfmod Pipeline was successful Details

This commit is contained in:
Johannes Frohnmeyer 2023-12-07 19:50:50 +01:00
parent 49bdf4b921
commit e1d19df4c1
Signed by: Johannes
GPG Key ID: E76429612C2929F4
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle.kts
View File

@ -5,12 +5,12 @@ plugins {
allprojects { group = "io.gitlab.jfronny" } allprojects { group = "io.gitlab.jfronny" }
base.archivesName = "google-chat" base.archivesName = "google-chat"
val fabricVersion = "0.89.1+1.20.2" val fabricVersion = "0.91.1+1.20.4"
jfMod { jfMod {
minecraftVersion = "1.20.2" minecraftVersion = "1.20.4"
yarn("build.1") yarn("build.1")
loaderVersion = "0.14.22" loaderVersion = "0.15.0"
libJfVersion = "3.13.1" libJfVersion = "3.14.1"
modrinth { modrinth {
projectId = "google-chat" projectId = "google-chat"
@ -32,5 +32,5 @@ dependencies {
// Dev env // Dev env
modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny:${jfMod.libJfVersion.get()}") modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny:${jfMod.libJfVersion.get()}")
modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${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")
} }

6
src/main/java/io/gitlab/jfronny/googlechat/GoogleChat.java
View File

@ -91,7 +91,7 @@ public class GoogleChat implements ModInitializer {
} }
public static TextContent translateIfNeeded(TextContent source, TranslationDirection direction, boolean respectRegex) { 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; if (direction.shouldSkipOutright()) return source;
String sourceString = toString(source); String sourceString = toString(source);
if (respectRegex && direction.failsRegex(sourceString)) return source; if (respectRegex && direction.failsRegex(sourceString)) return source;
@ -108,8 +108,8 @@ public class GoogleChat implements ModInitializer {
else args[i] = args[i]; else args[i] = args[i];
} }
return new TranslatableTextContent(tx.getKey(), translateIfNeeded(tx.getFallback(), direction, false), args); return new TranslatableTextContent(tx.getKey(), translateIfNeeded(tx.getFallback(), direction, false), args);
} else if (t instanceof LiteralTextContent tx) { } else if (t instanceof PlainTextContent.Literal tx) {
return new LiteralTextContent(translateIfNeeded(tx.string(), direction, false)); return new PlainTextContent.Literal(translateIfNeeded(tx.string(), direction, false));
} else { } else {
// LOGGER.info("Unhandled text type: " + source.getClass() + " (" + source + ")"); // LOGGER.info("Unhandled text type: " + source.getClass() + " (" + source + ")");
return t; return t;