From 476539c584a00a5dc8530d284a0ed0943d4de984 Mon Sep 17 00:00:00 2001 From: JFronny Date: Wed, 22 Mar 2023 19:12:14 +0100 Subject: [PATCH] Adjust server message decorator event phase --- .../gitlab/jfronny/googlechat/server/GoogleChatServer.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 a077a74..2b0dfe8 100644 --- a/src/main/java/io/gitlab/jfronny/googlechat/server/GoogleChatServer.java +++ b/src/main/java/io/gitlab/jfronny/googlechat/server/GoogleChatServer.java @@ -2,6 +2,7 @@ package io.gitlab.jfronny.googlechat.server; 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; import net.minecraft.text.Text; @@ -13,7 +14,10 @@ import static io.gitlab.jfronny.libjf.LibJf.LOGGER; public class GoogleChatServer implements DedicatedServerModInitializer { @Override public void onInitializeServer() { - ServerMessageDecoratorEvent.EVENT.register(ServerMessageDecoratorEvent.CONTENT_PHASE, (sender, message) -> { + // Default phase is executed between CONTENT and STYLING + // Perform translation there instead of during CONTENT to better support other mods (such as chat-transform) + // If this causes an incompatibility, I'll add my own phase + ServerMessageDecoratorEvent.EVENT.register(Event.DEFAULT_PHASE, (sender, message) -> { Text original; if (sender != null && hasTarget(GoogleChat.Direction.C2S)) { if (hasTarget(GoogleChat.Direction.S2C)) return CompletableFuture.completedFuture(message); // Do not translate back and forth