AmongUsMods/BetterAmongUs
1
0 Fork 0
mirror of https://github.com/D1GQ/BetterAmongUs.git synced 2026-10-20 01:46:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

more clean up

Browse Source
This commit is contained in:
D1GQ committed 2026-06-28 20:16:36 -05:00
1 parent fe724c6c72
commit 05ed2511ef
3 files changed
+44 -44
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/MonoScripts/MeetingInfoDisplay.cs
+12 -12
View File
@@ -22,8 +22,8 @@ internal sealed class MeetingInfoDisplay : PlayerInfoDisplay
private Vector3 _infoPos;
private Vector3 _TopPos;
private readonly SplitStringBuilder _ssTag = new(100, '-');
private readonly SplitStringBuilder _ssInfo = new(100, '-');
private readonly SplitStringBuilder _ssbTag = new(100, '-');
private readonly SplitStringBuilder _ssbInfo = new(100, '-');
private string _lastInfoText = "", _lastTopText = "";
private int _lastUpdateFrame;
private const int UPDATE_COOLDOWN = 5;
@@ -74,8 +74,8 @@ internal sealed class MeetingInfoDisplay : PlayerInfoDisplay
if (_pva == null)
return;
_ssTag.Clear();
_ssInfo.Clear();
_ssbTag.Clear();
_ssbInfo.Clear();
if (_player != null)
{
@@ -141,21 +141,21 @@ internal sealed class MeetingInfoDisplay : PlayerInfoDisplay
if (_player == null || _player.Data == null || _player.ExtendedData() == null)
return;
SetPlayerTags(_ssTag);
_ssInfo.Append(_player.GetRoleInfo(true));
SetPlayerTags(_ssbTag);
_ssbInfo.Append(_player.GetRoleInfo(true));
UpdateNameTextPosition(_ssInfo.ToString(), _ssInfo.ToString());
UpdateNameTextPosition(_ssbInfo.ToString(), _ssbInfo.ToString());
UpdateTextIfChanged(_infoText, _ssInfo.ToString(), ref _lastInfoText);
UpdateTextIfChanged(_topText, _ssTag.ToString(), ref _lastTopText);
UpdateTextIfChanged(_infoText, _ssbInfo.ToString(), ref _lastInfoText);
UpdateTextIfChanged(_topText, _ssbTag.ToString(), ref _lastTopText);
}
/// <summary>
/// Sets player tags based on data from BetterDataManager.
/// </summary>
/// <param name="ssTag">StringBuilder for tag text.</param>
/// <param name="ssbTag">StringBuilder for tag text.</param>
[HideFromIl2Cpp]
private void SetPlayerTags(SplitStringBuilder ssTag)
private void SetPlayerTags(SplitStringBuilder ssbTag)
{
if (_player == null)
return;
@@ -165,7 +165,7 @@ internal sealed class MeetingInfoDisplay : PlayerInfoDisplay
if (BetterDataManager.Files.BetterDataFile.TryGetCheatInfo(_player.Data, out var info))
{
ssTag.Append(info.title.ToColor(info.hexColor));
ssbTag.Append(info.title.ToColor(info.hexColor));
}
}
src/MonoScripts/PlayerInfoDisplay.cs
+27 -27
View File
@@ -28,9 +28,9 @@ internal class PlayerInfoDisplay : MonoBehaviour
protected TextMeshPro? _topText;
protected TextMeshPro? _bottomText;
private readonly SplitStringBuilder _ssTag = new(100, '-');
private readonly SplitStringBuilder _ssTagTop = new(100, '-');
private readonly SplitStringBuilder _ssTagBottom = new(100, '-');
private readonly SplitStringBuilder _ssbTag = new(100, '-');
private readonly SplitStringBuilder _ssbTagTop = new(100, '-');
private readonly SplitStringBuilder _ssbTagBottom = new(100, '-');
private string _lastTopText = "", _lastBottomText = "", _lastInfoText = "";
private int _lastUpdateFrame;
private const int UPDATE_COOLDOWN = 10;
@@ -130,9 +130,9 @@ internal class PlayerInfoDisplay : MonoBehaviour
return;
}
_ssTag.Clear();
_ssTagTop.Clear();
_ssTagBottom.Clear();
_ssbTag.Clear();
_ssbTagTop.Clear();
_ssbTagBottom.Clear();
UpdatePlayerInfo();
UpdatePlayerHighlight();
@@ -190,20 +190,20 @@ internal class PlayerInfoDisplay : MonoBehaviour
platform = TranslationStrings.Player_PlatformHidden.LocalizedString;
if (!_player.IsInShapeshift())
SetPlayerOutline(_ssTag);
SetPlayerOutline(_ssbTag);
if (GameState.IsInGame && GameState.IsLobby && !GameState.IsFreePlay)
{
SetLobbyInfo(ref newName, betterData, _ssTag);
SetLobbyInfo(ref newName, betterData, _ssbTag);
_ssTagTop.Append($"<color=#9e9e9e>{platform}</color>")
_ssbTagTop.Append($"<color=#9e9e9e>{platform}</color>")
.Append($"<color=#ffd829>Lv: {_player.Data.PlayerLevel + 1}</color>");
_ssTagBottom.Append($"<color={friendCodeColor}>{friendCode}</color>");
_ssbTagBottom.Append($"<color={friendCodeColor}>{friendCode}</color>");
}
else if ((GameState.IsInGame || GameState.IsFreePlay) && !GameState.IsHideNSeek)
{
SetInGameInfo(_ssTagTop);
SetInGameInfo(_ssbTagTop);
}
if (!BAUModdedSupportFlags.HasFlag(BAUModdedSupportFlags.Disable_NameOverride))
@@ -231,18 +231,18 @@ internal class PlayerInfoDisplay : MonoBehaviour
}
}
UpdateTextIfChanged(_topText, _ssTagTop, ref _lastTopText);
UpdateTextIfChanged(_bottomText, _ssTagBottom, ref _lastBottomText);
UpdateTextIfChanged(_infoText, _ssTag, ref _lastInfoText);
UpdateTextIfChanged(_topText, _ssbTagTop, ref _lastTopText);
UpdateTextIfChanged(_bottomText, _ssbTagBottom, ref _lastBottomText);
UpdateTextIfChanged(_infoText, _ssbTag, ref _lastInfoText);
}
/// <summary>
/// Updates text if changed, optimizing performance.
/// </summary>
/// <param name="textMesh">TextMeshPro component to update.</param>
/// <param name="ss">StringBuilder containing new text.</param>
/// <param name="ssb">StringBuilder containing new text.</param>
/// <param name="lastValue">Reference to last value for comparison.</param>
private static void UpdateTextIfChanged(TextMeshPro textMesh, SplitStringBuilder ss, ref string lastValue)
private static void UpdateTextIfChanged(TextMeshPro textMesh, SplitStringBuilder ssb, ref string lastValue)
{
if (BAUModdedSupportFlags.HasFlag(BAUModdedSupportFlags.Disable_PlayerInfo))
{
@@ -253,7 +253,7 @@ internal class PlayerInfoDisplay : MonoBehaviour
if (textMesh == null)
return;
string newText = ss.ToString();
string newText = ssb.ToString();
if (newText != lastValue)
{
textMesh.SetText(newText);
@@ -336,9 +336,9 @@ internal class PlayerInfoDisplay : MonoBehaviour
/// <summary>
/// Sets player outline based on data from BetterDataManager.
/// </summary>
/// <param name="ssTag">StringBuilder for tag text.</param>
/// <param name="ssbTag">StringBuilder for tag text.</param>
[HideFromIl2Cpp]
private void SetPlayerOutline(SplitStringBuilder? ssTag)
private void SetPlayerOutline(SplitStringBuilder? ssbTag)
{
if (_player == null)
return;
@@ -353,9 +353,9 @@ internal class PlayerInfoDisplay : MonoBehaviour
if (BetterDataManager.Files.BetterDataFile.TryGetCheatInfo(_player.Data, out var info))
{
if (ssTag.HasValue)
if (ssbTag.HasValue)
{
ssTag.Value.Append(info.title.ToColor(info.hexColor));
ssbTag.Value.Append(info.title.ToColor(info.hexColor));
}
_player.SetOutlineByHex(true, info.hexColor);
}
@@ -369,7 +369,7 @@ internal class PlayerInfoDisplay : MonoBehaviour
/// Sets lobby specific information.
/// </summary>
[HideFromIl2Cpp]
private void SetLobbyInfo(ref string newName, ExtendedPlayerInfo betterData, SplitStringBuilder ssTag)
private void SetLobbyInfo(ref string newName, ExtendedPlayerInfo betterData, SplitStringBuilder ssbTag)
{
if (betterData == null)
return;
@@ -381,20 +381,20 @@ internal class PlayerInfoDisplay : MonoBehaviour
{
string verificationSymbol = betterData.IsVerifiedBetterUser || _player.IsLocalPlayer() ? "✓ " : "";
ssTag.AppendFormat("<color=#0dff00>{1}{0}</color>",
ssbTag.AppendFormat("<color=#0dff00>{1}{0}</color>",
TranslationStrings.Player_BetterUser.LocalizedString, verificationSymbol);
}
ssTag.Append($"<color=#b554ff>ID: {_player.PlayerId}</color>");
ssbTag.Append($"<color=#b554ff>ID: {_player.PlayerId}</color>");
}
/// <summary>
/// Sets in-game specific information.
/// </summary>
/// <param name="ssTagTop">StringBuilder for top tag text.</param>
/// <param name="ssbTagTop">StringBuilder for top tag text.</param>
[HideFromIl2Cpp]
private void SetInGameInfo(SplitStringBuilder ssTagTop)
private void SetInGameInfo(SplitStringBuilder ssbTagTop)
{
ssTagTop.Append(_player.GetRoleInfo(true));
ssbTagTop.Append(_player.GetRoleInfo(true));
}
/// <summary>
src/Patches/Gameplay/UI/Chat/ChatPatch.cs
+5 -5
View File
@@ -233,7 +233,7 @@ internal static class ChatPatch
if (localPlayer == null)
return;
SplitStringBuilder ssTag = new(100, '-');
SplitStringBuilder ssbTag = new(100, '-');
string hashPuid = Utils.GetHashPuid(sourcePlayer);
string friendCode = playerInfo.FriendCode;
@@ -249,19 +249,19 @@ internal static class ChatPatch
// Show BAU user tag
if (sourcePlayer.IsLocalPlayer() || betterData.IsBetterUser)
{
ssTag.AppendFormat("<color=#0dff00>{1}{0}</color>", TranslationStrings.Player_BetterUser.LocalizedString, betterData.IsVerifiedBetterUser || sourcePlayer.IsLocalPlayer() ? "✓ " : "");
ssbTag.AppendFormat("<color=#0dff00>{1}{0}</color>", TranslationStrings.Player_BetterUser.LocalizedString, betterData.IsVerifiedBetterUser || sourcePlayer.IsLocalPlayer() ? "✓ " : "");
}
// Show mod-specific tags based on player data
if (BetterDataManager.Files.BetterDataFile.TryGetCheatInfo(sourcePlayer.Data, out var info))
{
ssTag.Append(info.title.ToColor(info.hexColor));
ssbTag.Append(info.title.ToColor(info.hexColor));
}
}
ssTag.Append(sourcePlayer.GetRoleInfo(false).Size(75f));
ssbTag.Append(sourcePlayer.GetRoleInfo(false).Size(75f));
string infoText = ssTag.ToString().Size(75f);
string infoText = ssbTag.ToString().Size(75f);
// Position tags before local player name, after other players' names
if (sourcePlayer.IsLocalPlayer())