From 88d44b673707c38e008b809a596292cec885de49 Mon Sep 17 00:00:00 2001 From: JFronny Date: Fri, 22 Sep 2023 20:07:32 +0200 Subject: [PATCH] chore: bump to 1.20.2 --- build.gradle.kts | 16 +++++------ .../gitlab/jfronny/googlechat/GoogleChat.java | 4 +-- .../jfronny/googlechat/GoogleChatConfig.java | 6 ++--- .../googlechat/server/GoogleChatServer.java | 27 +++++++++++++------ 4 files changed, 32 insertions(+), 21 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4ce1d93..47e0808 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.83.0+1.20" +val fabricVersion = "0.89.1+1.20.2" jfMod { - minecraftVersion = "1.20.1" - yarn("build.9") - loaderVersion = "0.14.21" - libJfVersion = "3.10.2" + minecraftVersion = "1.20.2" + yarn("build.1") + loaderVersion = "0.14.22" + libJfVersion = "3.13.1" modrinth { projectId = "google-chat" @@ -25,12 +25,12 @@ jfMod { } dependencies { - modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${jfMod.libJfVersion.get()}") + modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v2:${jfMod.libJfVersion.get()}") modImplementation("io.gitlab.jfronny.libjf:libjf-translate-v1:${jfMod.libJfVersion.get()}") include(modImplementation(fabricApi.module("fabric-message-api-v1", fabricVersion))!!) // Dev env - modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${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("com.terraformersmc:modmenu:7.1.0") + modLocalRuntime("com.terraformersmc:modmenu:8.0.0-beta.2") } diff --git a/src/main/java/io/gitlab/jfronny/googlechat/GoogleChat.java b/src/main/java/io/gitlab/jfronny/googlechat/GoogleChat.java index dd7b81d..68cf31e 100644 --- a/src/main/java/io/gitlab/jfronny/googlechat/GoogleChat.java +++ b/src/main/java/io/gitlab/jfronny/googlechat/GoogleChat.java @@ -1,7 +1,7 @@ package io.gitlab.jfronny.googlechat; -import io.gitlab.jfronny.commons.cache.FixedSizeMap; -import io.gitlab.jfronny.commons.log.Logger; +import io.gitlab.jfronny.commons.io.cache.FixedSizeMap; +import io.gitlab.jfronny.commons.logging.Logger; import io.gitlab.jfronny.libjf.translate.api.Language; import io.gitlab.jfronny.libjf.translate.api.TranslateService; import net.fabricmc.api.EnvType; diff --git a/src/main/java/io/gitlab/jfronny/googlechat/GoogleChatConfig.java b/src/main/java/io/gitlab/jfronny/googlechat/GoogleChatConfig.java index c642dd5..bfb3fda 100644 --- a/src/main/java/io/gitlab/jfronny/googlechat/GoogleChatConfig.java +++ b/src/main/java/io/gitlab/jfronny/googlechat/GoogleChatConfig.java @@ -1,8 +1,8 @@ package io.gitlab.jfronny.googlechat; -import io.gitlab.jfronny.commons.serialize.gson.api.v1.Ignore; -import io.gitlab.jfronny.libjf.config.api.v1.*; -import io.gitlab.jfronny.libjf.config.api.v1.dsl.ConfigBuilder; +import io.gitlab.jfronny.commons.serialize.gson.api.v2.Ignore; +import io.gitlab.jfronny.libjf.config.api.v2.*; +import io.gitlab.jfronny.libjf.config.api.v2.dsl.ConfigBuilder; import net.fabricmc.api.*; import net.fabricmc.loader.api.*; diff --git a/src/main/java/io/gitlab/jfronny/googlechat/server/GoogleChatServer.java b/src/main/java/io/gitlab/jfronny/googlechat/server/GoogleChatServer.java index ffc5fb0..55953e3 100644 --- a/src/main/java/io/gitlab/jfronny/googlechat/server/GoogleChatServer.java +++ b/src/main/java/io/gitlab/jfronny/googlechat/server/GoogleChatServer.java @@ -1,7 +1,6 @@ package io.gitlab.jfronny.googlechat.server; -import io.gitlab.jfronny.googlechat.GoogleChatConfig; -import io.gitlab.jfronny.googlechat.TranslationDirection; +import io.gitlab.jfronny.googlechat.*; import net.fabricmc.api.DedicatedServerModInitializer; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.message.v1.ServerMessageDecoratorEvent; @@ -11,6 +10,7 @@ import net.minecraft.text.Text; import org.jetbrains.annotations.Nullable; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; public class GoogleChatServer implements DedicatedServerModInitializer, MessageDecorator { @Override @@ -22,12 +22,23 @@ public class GoogleChatServer implements DedicatedServerModInitializer, MessageD } @Override - public CompletableFuture decorate(@Nullable ServerPlayerEntity sender, Text original) { - final CompletableFuture future = CompletableFuture.completedFuture(original); - if (!GoogleChatConfig.General.enabled) return future; - return GoogleChatConfig.Advanced.async - ? decorate(sender, new TranslatableContainer.Async(future)).text() - : CompletableFuture.completedFuture(decorate(sender, new TranslatableContainer.Sync(original)).text()); + public Text decorate(@Nullable ServerPlayerEntity sender, Text original) { + if (!GoogleChatConfig.General.enabled) return original; + if (!GoogleChatConfig.Advanced.async) { + return decorate(sender, new TranslatableContainer.Sync(original)).text(); + } + try { + return decorate(sender, new TranslatableContainer.Async(CompletableFuture.completedFuture(original))) + .text() + .exceptionally(e -> { + GoogleChat.LOGGER.error("Could not compute translation", e); + return original; + }) + .get(); + } catch (InterruptedException | ExecutionException e) { + GoogleChat.LOGGER.error("Could not synchronize async translation for synchronous decorator", e); + return original; + } } private > T decorate(@Nullable ServerPlayerEntity sender, T original) {