From acf24d4d6bf8d58f5c8bec634b70707689ff3c62 Mon Sep 17 00:00:00 2001
From: chris <reichel32574@gmail.com>
Date: Thu, 7 Sep 2023 09:07:42 +0200
Subject: [PATCH] Revert sending actionbar messages as jukebox, avoid pink
 system chat overlays (#4066)

System chat overlays too aren't pink anymore - they're still sent as jukebox for better visibility though.
---
 .../protocol/java/JavaSystemChatTranslator.java |  7 ++++++-
 .../title/JavaSetActionBarTextTranslator.java   | 17 +++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaSystemChatTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaSystemChatTranslator.java
index c1f318645..e400773c8 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaSystemChatTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaSystemChatTranslator.java
@@ -29,6 +29,7 @@ import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundSy
 import net.kyori.adventure.text.TranslatableComponent;
 import org.cloudburstmc.protocol.bedrock.packet.TextPacket;
 import org.geysermc.geyser.session.GeyserSession;
+import org.geysermc.geyser.text.ChatColor;
 import org.geysermc.geyser.text.GeyserLocale;
 import org.geysermc.geyser.translator.protocol.PacketTranslator;
 import org.geysermc.geyser.translator.protocol.Translator;
@@ -55,7 +56,11 @@ public class JavaSystemChatTranslator extends PacketTranslator<ClientboundSystem
         textPacket.setType(packet.isOverlay() ? TextPacket.Type.JUKEBOX_POPUP : TextPacket.Type.SYSTEM);
 
         textPacket.setNeedsTranslation(false);
-        textPacket.setMessage(MessageTranslator.convertMessage(packet.getContent(), session.locale()));
+        if (packet.isOverlay()) {
+            textPacket.setMessage(ChatColor.WHITE + MessageTranslator.convertMessage(packet.getContent(), session.locale()));
+        } else {
+            textPacket.setMessage(MessageTranslator.convertMessage(packet.getContent(), session.locale()));
+        }
 
         if (session.isSentSpawnPacket()) {
             session.sendUpstreamPacket(textPacket);
diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/title/JavaSetActionBarTextTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/title/JavaSetActionBarTextTranslator.java
index bf0a889b3..c2dfc85ff 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/title/JavaSetActionBarTextTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/title/JavaSetActionBarTextTranslator.java
@@ -26,7 +26,7 @@
 package org.geysermc.geyser.translator.protocol.java.title;
 
 import com.github.steveice10.mc.protocol.packet.ingame.clientbound.title.ClientboundSetActionBarTextPacket;
-import org.cloudburstmc.protocol.bedrock.packet.TextPacket;
+import org.cloudburstmc.protocol.bedrock.packet.SetTitlePacket;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.translator.protocol.PacketTranslator;
 import org.geysermc.geyser.translator.protocol.Translator;
@@ -44,14 +44,11 @@ public class JavaSetActionBarTextTranslator extends PacketTranslator<Clientbound
             text = MessageTranslator.convertMessage(packet.getText(), session.locale());
         }
 
-        // Type seems wrong, but is intentional to avoid collisions with armor/remaining air bars
-        TextPacket textPacket = new TextPacket();
-        textPacket.setType(TextPacket.Type.JUKEBOX_POPUP);
-        textPacket.setNeedsTranslation(false);
-        textPacket.setSourceName("");
-        textPacket.setMessage(text);
-        textPacket.setXuid("");
-        textPacket.setPlatformChatId("");
-        session.sendUpstreamPacket(textPacket);
+        SetTitlePacket titlePacket = new SetTitlePacket();
+        titlePacket.setType(SetTitlePacket.Type.ACTIONBAR);
+        titlePacket.setText(text);
+        titlePacket.setXuid("");
+        titlePacket.setPlatformOnlineId("");
+        session.sendUpstreamPacket(titlePacket);
     }
 }