From 1a552fbd0c114f831ce9cea095d28d8583d8a768 Mon Sep 17 00:00:00 2001 From: DrPerkyLegit <116128211+DrPerkyLegit@users.noreply.github.com> Date: Thu, 16 Apr 2026 23:41:50 -0400 Subject: [PATCH] Fix broken Chat Formatting behavior (#1520) * fix formatting in chat iggy doesnt like multiple shadow colors * enforce html labels * dont format before sending packet, client formats anyway * move translateables to chat format, restore original empty message results * fix crappy string cutoff * forgot a line on last commit, reset color support * restore function to strip styling from player messages --- Minecraft.Client/ClientConnection.cpp | 10 +---- Minecraft.Client/Common/Consoles_App.cpp | 47 +++++++++++++--------- Minecraft.Client/Common/Consoles_App.h | 2 +- Minecraft.Client/Common/UI/UIScene_HUD.cpp | 2 + Minecraft.Client/Gui.cpp | 47 +++++++++++++++++----- 5 files changed, 70 insertions(+), 38 deletions(-) diff --git a/Minecraft.Client/ClientConnection.cpp b/Minecraft.Client/ClientConnection.cpp index 41a337d2..41108ace 100644 --- a/Minecraft.Client/ClientConnection.cpp +++ b/Minecraft.Client/ClientConnection.cpp @@ -65,7 +65,6 @@ #include "../Minecraft.World/DurangoStats.h" #include "../Minecraft.World/GenericStats.h" #endif -#include ClientConnection::ClientConnection(Minecraft *minecraft, const wstring& ip, int port) { @@ -1547,8 +1546,6 @@ void ClientConnection::handleChat(shared_ptr packet) bool replaceEntitySource = false; bool replaceItem = false; - static std::wregex IDS_Pattern(LR"(\{\*IDS_(\d+)\*\})"); //maybe theres a better way to do translateable IDS - int stringArgsSize = packet->m_stringArgs.size(); wstring playerDisplayName = L""; @@ -1565,15 +1562,10 @@ void ClientConnection::handleChat(shared_ptr packet) if (stringArgsSize >= 1) { message = packet->m_stringArgs[0]; - std::wsmatch match; - while (std::regex_search(message, match, IDS_Pattern)) { - message = replaceAll(message, match[0], app.GetString(std::stoi(match[1].str()))); - } - message = app.EscapeHTMLString(message); //do this to enforce escaped string message = app.FormatChatMessage(message); //this needs to be last cause it converts colors to html colors that would have been escaped } else { - message = L"empty message"; + message = L""; } displayOnGui = (packet->m_messageType == ChatPacket::e_ChatCustom); break; diff --git a/Minecraft.Client/Common/Consoles_App.cpp b/Minecraft.Client/Common/Consoles_App.cpp index 32338616..f733fd43 100644 --- a/Minecraft.Client/Common/Consoles_App.cpp +++ b/Minecraft.Client/Common/Consoles_App.cpp @@ -70,6 +70,7 @@ #endif #include "../Common/Leaderboards/LeaderboardManager.h" +#include //CMinecraftApp app; unsigned int CMinecraftApp::m_uiLastSignInData = 0; @@ -6618,60 +6619,70 @@ wstring CMinecraftApp::EscapeHTMLString(const wstring& desc) return finalString; } -wstring CMinecraftApp::FormatChatMessage(const wstring& desc, bool applyColor) +wstring CMinecraftApp::FormatChatMessage(const wstring& desc, bool applyStyling) { - static std::wstring_view colorFormatString = L""; + static std::wregex IDS_Pattern(LR"(\{\*IDS_(\d+)\*\})"); //maybe theres a better way to do translateable IDS + static std::wstring_view colorFormatString = L""; wstring results = desc; wchar_t replacements[64]; - swprintf(replacements, 64, (applyColor ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_0), 0xFFFFFFFF); + swprintf(replacements, 64, (applyStyling ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_0), 0xFFFFFFFF); results = replaceAll(results, L"§0", replacements); - swprintf(replacements, 64, (applyColor ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_1), 0xFFFFFFFF); + swprintf(replacements, 64, (applyStyling ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_1), 0xFFFFFFFF); results = replaceAll(results, L"§1", replacements); - swprintf(replacements, 64, (applyColor ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_2), 0xFFFFFFFF); + swprintf(replacements, 64, (applyStyling ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_2), 0xFFFFFFFF); results = replaceAll(results, L"§2", replacements); - swprintf(replacements, 64, (applyColor ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_3), 0xFFFFFFFF); + swprintf(replacements, 64, (applyStyling ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_3), 0xFFFFFFFF); results = replaceAll(results, L"§3", replacements); - swprintf(replacements, 64, (applyColor ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_4), 0xFFFFFFFF); + swprintf(replacements, 64, (applyStyling ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_4), 0xFFFFFFFF); results = replaceAll(results, L"§4", replacements); - swprintf(replacements, 64, (applyColor ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_5), 0xFFFFFFFF); + swprintf(replacements, 64, (applyStyling ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_5), 0xFFFFFFFF); results = replaceAll(results, L"§5", replacements); - swprintf(replacements, 64, (applyColor ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_6), 0xFFFFFFFF); + swprintf(replacements, 64, (applyStyling ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_6), 0xFFFFFFFF); results = replaceAll(results, L"§6", replacements); - swprintf(replacements, 64, (applyColor ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_7), 0xFFFFFFFF); + swprintf(replacements, 64, (applyStyling ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_7), 0xFFFFFFFF); results = replaceAll(results, L"§7", replacements); - swprintf(replacements, 64, (applyColor ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_8), 0xFFFFFFFF); + swprintf(replacements, 64, (applyStyling ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_8), 0xFFFFFFFF); results = replaceAll(results, L"§8", replacements); - swprintf(replacements, 64, (applyColor ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_9), 0xFFFFFFFF); + swprintf(replacements, 64, (applyStyling ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_9), 0xFFFFFFFF); results = replaceAll(results, L"§9", replacements); - swprintf(replacements, 64, (applyColor ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_a), 0xFFFFFFFF); + swprintf(replacements, 64, (applyStyling ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_a), 0xFFFFFFFF); results = replaceAll(results, L"§a", replacements); - swprintf(replacements, 64, (applyColor ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_b), 0xFFFFFFFF); + swprintf(replacements, 64, (applyStyling ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_b), 0xFFFFFFFF); results = replaceAll(results, L"§b", replacements); - swprintf(replacements, 64, (applyColor ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_c), 0xFFFFFFFF); + swprintf(replacements, 64, (applyStyling ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_c), 0xFFFFFFFF); results = replaceAll(results, L"§c", replacements); - swprintf(replacements, 64, (applyColor ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_d), 0xFFFFFFFF); + swprintf(replacements, 64, (applyStyling ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_d), 0xFFFFFFFF); results = replaceAll(results, L"§d", replacements); - swprintf(replacements, 64, (applyColor ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_e), 0xFFFFFFFF); + swprintf(replacements, 64, (applyStyling ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_e), 0xFFFFFFFF); results = replaceAll(results, L"§e", replacements); - swprintf(replacements, 64, (applyColor ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_f), 0xFFFFFFFF); + swprintf(replacements, 64, (applyStyling ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_f), 0xFFFFFFFF); results = replaceAll(results, L"§f", replacements); + results = replaceAll(results, L"§r", replacements); //we only support color so reset is the same as white color + + if (applyStyling) { + std::wsmatch match; + while (std::regex_search(results, match, IDS_Pattern)) { + results = replaceAll(results, match[0], app.GetString(std::stoi(match[1].str()))); + } + } + return results; } diff --git a/Minecraft.Client/Common/Consoles_App.h b/Minecraft.Client/Common/Consoles_App.h index fa0a4d8b..6401c839 100644 --- a/Minecraft.Client/Common/Consoles_App.h +++ b/Minecraft.Client/Common/Consoles_App.h @@ -566,7 +566,7 @@ public: int GetHTMLFontSize(EHTMLFontSize size); wstring FormatHTMLString(int iPad, const wstring& desc, int shadowColour = 0xFFFFFFFF); wstring EscapeHTMLString(const wstring &desc); - wstring FormatChatMessage(const wstring& desc, bool applyColor = true); + wstring FormatChatMessage(const wstring& desc, bool applyStyling = true); wstring GetActionReplacement(int iPad, unsigned char ucAction); wstring GetVKReplacement(unsigned int uiVKey); wstring GetIconReplacement(unsigned int uiIcon); diff --git a/Minecraft.Client/Common/UI/UIScene_HUD.cpp b/Minecraft.Client/Common/UI/UIScene_HUD.cpp index 6dc010c6..452fa09b 100644 --- a/Minecraft.Client/Common/UI/UIScene_HUD.cpp +++ b/Minecraft.Client/Common/UI/UIScene_HUD.cpp @@ -257,8 +257,10 @@ void UIScene_HUD::handleReload() for(unsigned int i = 0; i < CHAT_LINES_COUNT; ++i) { m_labelChatText[i].init(L""); + IggyValueSetBooleanRS(m_labelChatText[i].getIggyValuePath(), 0, "m_bUseHtmlText", true); } m_labelJukebox.init(L""); + IggyValueSetBooleanRS(m_labelJukebox.getIggyValuePath(), 0, "m_bUseHtmlText", true); int iGuiScale; Minecraft *pMinecraft = Minecraft::GetInstance(); diff --git a/Minecraft.Client/Gui.cpp b/Minecraft.Client/Gui.cpp index 8ffae6a2..7e056e15 100644 --- a/Minecraft.Client/Gui.cpp +++ b/Minecraft.Client/Gui.cpp @@ -1437,6 +1437,37 @@ void Gui::clearMessages(int iPad) } } +int getVisibleMessageLength(const wstring& _string) { + int visibleMessageLength = 0; + bool inHtmlTag = false; + + for (wchar_t _char : _string) { + if (_char == L'<') inHtmlTag = true; + if (_char == L'>') inHtmlTag = false; + + if (!inHtmlTag) visibleMessageLength++; + } + + return visibleMessageLength; +} + +int getVisibleIndexToRaw(const wstring& _string, size_t target) { + int visibleMessageLength = 0; + bool inHtmlTag = false; + + for (size_t i = 0; i < _string.size(); i++) { + if (_string[i] == L'<') inHtmlTag = true; + if (_string[i] == L'>') inHtmlTag = false; + + if (!inHtmlTag) { + if (visibleMessageLength == target) return i; + + visibleMessageLength++; + } + } + return _string.size(); +} + void Gui::addMessage(const wstring& _string,int iPad,bool bIsDeathMessage) { @@ -1517,15 +1548,11 @@ void Gui::addMessage(const wstring& _string,int iPad,bool bIsDeathMessage) break; } - - while (string.length() > maximumChars) + while (getVisibleMessageLength(string) > maximumChars) { - unsigned int i = 1; - while (i < string.length() && (i + 1) <= maximumChars) - { - i++; - } - size_t iLast=string.find_last_of(L" ",i); + size_t cutOffset = getVisibleIndexToRaw(string, maximumChars); + + size_t iLast=string.find_last_of(L" ", cutOffset); switch(XGetLanguage()) { case XC_LANGUAGE_JAPANESE: @@ -1534,12 +1561,12 @@ void Gui::addMessage(const wstring& _string,int iPad,bool bIsDeathMessage) iLast = maximumChars; break; default: - iLast=string.find_last_of(L" ",i); + iLast=string.find_last_of(L" ", cutOffset); break; } // if a space was found, include the space on this line - if(iLast!=i) + if(iLast!=cutOffset) { iLast++; }