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

Rwork logging

Browse Source
This commit is contained in:
D1GQ committed 2026-08-29 13:01:24 -05:00
1 parent c8410a811a
commit 1f7c6d571d
38 files changed
+417 -375
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Attributes/RegisterInIl2Cpp.cs
+2 -3
View File
@@ -1,5 +1,4 @@
using BetterAmongUs.Modules;
using Il2CppInterop.Runtime.Injection;
using Il2CppInterop.Runtime.Injection;
using System.Reflection;
namespace BetterAmongUs.Attributes;
@@ -37,7 +36,7 @@ internal class RegisterInIl2Cpp(params Type[] interfaces) : Attribute
}
catch (Exception ex)
{
Logger_.Error($"Failed to register {type.Name}: {ex.Message}");
BAUPlugin.Logger.Error($"Failed to register {type.Name}: {ex.Message}");
}
}
}
src/BAUPlugin.Constants.cs
+2
View File
@@ -68,6 +68,8 @@ internal partial class BAUPlugin
// **Cheat**
""";
internal const char ENCRYPTED_LOG_PREFIX = '\u2063';
internal const char ENCRYPTED_LOG_POSTFIX = '\u2064';
internal const int MAX_CHAT_TEXT = 120;
internal const string BAU_CUSTOM_RPC_FLAG = "bau:rpc";
internal const string BAU_MODDED_PROTOCOL_FLAG = "bau:flags";
src/BAUPlugin.cs
+13 -10
View File
@@ -70,10 +70,15 @@ internal partial class BAUPlugin : BasePlugin
/// </summary>
internal static Vent[] AllVents => UnityEngine.Object.FindObjectsOfType<Vent>();
/// <summary>
/// Gets the BAU logger instance.
/// </summary>
internal static BAULogger Logger { get; private set; } = null!;
/// <summary>
/// Gets the BepInEx logger instance.
/// </summary>
internal static ManualLogSource? Logger;
private static ManualLogSource? _manualLogSource;
public override void Load()
{
@@ -100,7 +105,7 @@ internal partial class BAUPlugin : BasePlugin
}
catch (Exception ex)
{
Logger_.Error(ex);
Logger.Error(ex);
}
}
@@ -125,14 +130,10 @@ internal partial class BAUPlugin : BasePlugin
OutfitData.Initialize();
SceneManager.add_sceneLoaded((Action<Scene, LoadSceneMode>)OnSceneLoaded);
if (File.Exists(BetterDataManager.Files.logFilePath))
File.WriteAllText(BetterDataManager.Files.previousLogFilePath, File.ReadAllText(BetterDataManager.Files.logFilePath));
File.WriteAllText(BetterDataManager.Files.logFilePath, "");
Logger_.Log("Better Among Us successfully loaded!");
Logger.Log("Better Among Us successfully loaded!");
string SupportedVersions = string.Join(" ", ModInfo.SupportedAmongUsVersions);
Logger_.Log($"BetterAmongUs {ModInfo.VERSION_STRING}-{ModInfo.BuildDate} - [{AppVersion} --> {SupportedVersions}] {Utils.GetPlatformName(PlatformData.Platform)}");
Logger.Log($"BetterAmongUs {ModInfo.VERSION_STRING}-{ModInfo.BuildDate} - [{AppVersion} --> {SupportedVersions}] {Utils.GetPlatformName(PlatformData.Platform)}");
}
/// <summary>
@@ -164,13 +165,15 @@ internal partial class BAUPlugin : BasePlugin
/// </summary>
private static void SetupConsole()
{
Encryptor.Initialize();
ConsoleManager.CreateConsole();
ConsoleManager.ConfigPreventClose.Value = true;
if (ConsoleManager.ConfigConsoleEnabled.Value) ConsoleManager.DetachConsole();
ConsoleManager.ConfigConsoleEnabled.Value = false;
ConsoleManager.SetConsoleTitle("Among Us - BAU Console");
Logger = BepInEx.Logging.Logger.CreateLogSource(ModInfo.PLUGIN_GUID);
var customLogListener = new CustomLogListener();
_manualLogSource = BepInEx.Logging.Logger.CreateLogSource(ModInfo.PLUGIN_GUID);
Logger = new BAULogger(_manualLogSource);
var customLogListener = new CustomLogListener(Logger);
BepInEx.Logging.Logger.Listeners.Add(customLogListener);
ConsoleManager.SetConsoleColor(ConsoleColor.Green);
ConsoleManager.ConsoleStream.WriteLine($".--------------------------------------------------------------------------------.\r\n| ____ _ _ _ _ _ |\r\n| | __ ) ___| |_| |_ ___ _ __ / \\ _ __ ___ ___ _ __ __ _ | | | |___ |\r\n| | _ \\ / _ \\ __| __/ _ \\ '__| / _ \\ | '_ ` _ \\ / _ \\| '_ \\ / _` | | | | / __||\r\n| | |_) | __/ |_| || __/ | / ___ \\| | | | | | (_) | | | | (_| | | |_| \\__ \\|\r\n| |____/ \\___|\\__|\\__\\___|_| /_/ \\_\\_| |_| |_|\\___/|_| |_|\\__, | \\___/|___/|\r\n| |___/ |\r\n'--------------------------------------------------------------------------------'");
src/Commands/DumpCommand.cs
+26 -46
View File
@@ -22,56 +22,38 @@ internal sealed class DumpCommand : BaseCommand
return base.CanRunCommand(out reason);
}
private static string DecryptLog(string log)
{
string newLog = string.Empty;
string[] logArray = log.Split([Environment.NewLine], StringSplitOptions.None);
foreach (string text in logArray)
{
if (text.Contains("[PrivateLog]"))
{
newLog += text.Split(':')[0] + ":" + text.Split(':')[1].Replace("[PrivateLog]", "") + ": " + Encryptor.Decrypt(text.Split(':')[2][1..]) + "\n";
}
else
{
newLog += text + "\n";
}
}
return newLog;
}
internal override void Run()
{
string logFilePath = BetterDataManager.Files.logFilePath;
if (!File.Exists(logFilePath))
string bepInExLog = Path.Combine(Paths.BepInExRootPath, "LogOutput.log");
if (!File.Exists(bepInExLog))
{
CommandErrorText("Log file not found!");
CommandErrorText("BepInEx log file not found!");
return;
}
if (!BAUPlugin.ModInfo.Starlight)
{
string log = File.ReadAllText(logFilePath);
string newLog = DecryptLog(log);
string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
string logFolderPath = Path.Combine(desktopPath, "BetterLogDumps");
string logFolderPath = Path.Combine(desktopPath, "BAULogDumps");
if (!Directory.Exists(logFolderPath))
{
Directory.CreateDirectory(logFolderPath);
}
string logFileName = "log-" + BAUPlugin.ModInfo.VERSION_STRING + "-" + DateTime.Now.ToString("yyyy.MM.dd-HH.mm.ss") + "-bau" + ".log";
string logFile = Path.Combine(logFolderPath, logFileName);
File.WriteAllText(logFile, newLog);
string bepInExLog = Path.Combine(Paths.BepInExRootPath, "LogOutput.log");
if (File.Exists(bepInExLog))
string log;
using (FileStream fileStream = new(bepInExLog, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
using (StreamReader reader = new(fileStream))
{
string logFileBepInExeName = "log-" + BAUPlugin.ModInfo.VERSION_STRING + "-" + DateTime.Now.ToString("yyyy.MM.dd-HH.mm.ss") + "-bepinex" + ".log";
string logFileBepInExe = Path.Combine(logFolderPath, logFileBepInExeName);
File.Copy(bepInExLog, logFileBepInExe);
log = reader.ReadToEnd();
}
string decryptedLog = BAULogger.DecryptLogs(log);
string logFileName = "log-" + BAUPlugin.ModInfo.VERSION_STRING + "-" + DateTime.Now.ToString("yyyy.MM.dd-HH.mm.ss") + "-bepinex" + ".log";
string logFilePath_New = Path.Combine(logFolderPath, logFileName);
File.WriteAllText(logFilePath_New, decryptedLog);
System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo()
{
FileName = logFolderPath,
@@ -84,27 +66,25 @@ internal sealed class DumpCommand : BaseCommand
else
{
string dataPath = BetterDataManager.Folders.fileFolderPath;
string logFolderPath = Path.Combine(dataPath, "BetterLogDumps");
string logFolderPath = Path.Combine(dataPath, "BAULogDumps");
if (!Directory.Exists(logFolderPath))
{
Directory.CreateDirectory(logFolderPath);
}
string androidLogContent = File.ReadAllText(logFilePath);
string androidNewLog = DecryptLog(androidLogContent);
string androidLogFileName = "log-" + BAUPlugin.ModInfo.VERSION_STRING + "-" + DateTime.Now.ToString("yyyy.MM.dd-HH.mm.ss") + "-bau" + ".log";
string androidNewLogFilePath = Path.Combine(logFolderPath, androidLogFileName);
File.WriteAllText(androidNewLogFilePath, androidNewLog);
string bepInExLog = Path.Combine(Paths.BepInExRootPath, "LogOutput.log");
if (File.Exists(bepInExLog))
string log;
using (FileStream fileStream = new(bepInExLog, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
using (StreamReader reader = new(fileStream))
{
string logFileBepInExeName = "log-" + BAUPlugin.ModInfo.VERSION_STRING + "-" + DateTime.Now.ToString("yyyy.MM.dd-HH.mm.ss") + "-bepinex" + ".log";
string logFileBepInExe = Path.Combine(logFolderPath, logFileBepInExeName);
File.Copy(bepInExLog, logFileBepInExe);
log = reader.ReadToEnd();
}
string decryptedLog = BAULogger.DecryptLogs(log);
string logFileName = "log-" + BAUPlugin.ModInfo.VERSION_STRING + "-" + DateTime.Now.ToString("yyyy.MM.dd-HH.mm.ss") + "-bepinex" + ".log";
string logFilePath_New = Path.Combine(logFolderPath, logFileName);
File.WriteAllText(logFilePath_New, decryptedLog);
CommandResultText($"Dump logs at <color=#b1b1b1>'{logFolderPath}'</color>");
}
}
src/Data/BetterDataManager.cs
+12 -2
View File
@@ -65,12 +65,12 @@ internal static class BetterDataManager
/// <summary>
/// The log file path.
/// </summary>
internal static readonly string logFilePath = Path.Combine(Folders.fileFolderPath, "better-log.txt");
internal static readonly string logFilePath_Legacy = Path.Combine(Folders.fileFolderPath, "better-log.txt");
/// <summary>
/// The previous log file path.
/// </summary>
internal static readonly string previousLogFilePath = Path.Combine(Folders.fileFolderPath, "better-previous-log.txt");
internal static readonly string previousLogFilePath_Legacy = Path.Combine(Folders.fileFolderPath, "better-previous-log.txt");
/// <summary>
/// Legacy data file path (BetterData.json).
@@ -204,6 +204,16 @@ internal static class BetterDataManager
/// </summary>
private static void LoadLegacyData()
{
if (File.Exists(Files.logFilePath_Legacy))
{
File.Delete(Files.logFilePath_Legacy);
}
if (File.Exists(Files.previousLogFilePath_Legacy))
{
File.Delete(Files.previousLogFilePath_Legacy);
}
if (File.Exists(Files.settingsFilePath_Legacy))
{
if (File.Exists(Files.SettingsFilePath))
src/Data/Json/AbstractJsonFile.cs
+2 -2
View File
@@ -80,7 +80,7 @@ internal abstract class AbstractJsonFile
}
catch (Exception ex)
{
Logger_.Error(ex);
BAUPlugin.Logger.Error(ex);
return false;
}
}
@@ -101,7 +101,7 @@ internal abstract class AbstractJsonFile
}
catch (Exception ex)
{
Logger_.Error(ex);
BAUPlugin.Logger.Error(ex);
return false;
}
}
src/Data/Json/BetterGameSettingsFile.cs
+1 -1
View File
@@ -62,7 +62,7 @@ internal sealed class BetterGameSettingsFile : AbstractJsonFile
}
catch (Exception ex)
{
Logger_.Error($"Failed to convert JSON element for key {kvp.Key}: {ex.Message}");
BAUPlugin.Logger.Error($"Failed to convert JSON element for key {kvp.Key}: {ex.Message}");
}
}
}
src/Data/SharedSecretExchange.cs
+2 -2
View File
@@ -39,7 +39,7 @@ internal sealed class SharedSecretExchange
}
catch (Exception ex)
{
Logger_.Error("ECDH unavailable, using fallback handshake: " + ex.Message, logConsole: false);
BAUPlugin.Logger.Error("ECDH unavailable, using fallback handshake: " + ex.Message, logConsole: false);
cryptoDisabled = true;
dh = null;
publicKey = [];
@@ -129,7 +129,7 @@ internal sealed class SharedSecretExchange
}
catch (Exception ex)
{
Logger_.Error("Error generating shared secret: " + ex.Message, logConsole: false);
BAUPlugin.Logger.Error("Error generating shared secret: " + ex.Message, logConsole: false);
return [];
}
}
src/Managers/BetterNotificationManager.cs
+2 -2
View File
@@ -172,8 +172,8 @@ internal static class BetterNotificationManager
Notify(text, time: 8f);
}
Logger_.LogCheat($"{player.cosmetics.nameText.text} Info: {player.Data.PlayerName} - {player.Data.FriendCode} - {player.GetHashPuid()}");
Logger_.LogCheat(Utils.RemoveHtmlText(rawText));
BAUPlugin.Logger.LogCheat($"{player.cosmetics.nameText.text} Info: {player.Data.PlayerName} - {player.Data.FriendCode} - {player.GetHashPuid()}");
BAUPlugin.Logger.LogCheat(Utils.RemoveHtmlText(rawText));
if (GameState.IsHost && kickPlayer)
{
src/Managers/NetworkManager.cs
+3 -3
View File
@@ -41,7 +41,7 @@ internal static class NetworkManager
}
catch (Exception ex)
{
Logger_.Error(ex, "NetworkManager");
BAUPlugin.Logger.Error(ex, "NetworkManager");
}
finally
{
@@ -414,7 +414,7 @@ internal static class NetworkManager
/// </summary>
private static void HandleInvalidTag(MessageReader reader)
{
Logger_.Warning($"Bad tag {reader.Tag} at {reader.Offset}+{reader.Position}={reader.Length}: " + string.Join(" ", reader.Buffer.Take(128)), "NetworkManager");
BAUPlugin.Logger.Warning($"Bad tag {reader.Tag} at {reader.Offset}+{reader.Position}={reader.Length}: " + string.Join(" ", reader.Buffer.Take(128)), "NetworkManager");
reader.Recycle();
}
@@ -477,7 +477,7 @@ internal static class NetworkManager
if (BetterAntiCheat.CheckCancelRPC(player, callId, reader) == false)
{
if (!player.IsLocalPlayer()) Logger_.LogCheat($"RPC canceled by Anti-Cheat: {Enum.GetName((RpcCalls)callId)}{Enum.GetName((CustomRPC)callId)} - {callId}");
if (!player.IsLocalPlayer()) BAUPlugin.Logger.LogCheat($"RPC canceled by Anti-Cheat: {Enum.GetName((RpcCalls)callId)}{Enum.GetName((CustomRPC)callId)} - {callId}");
return false;
}
src/Modules/AntiCheat/BetterAntiCheat.cs
+4 -4
View File
@@ -164,7 +164,7 @@ internal static class BetterAntiCheat
{
if (BetterNotificationManager.NotifyCheat(player, TranslationStrings.AntiCheat_InvalidHostRPC.Format(Enum.GetName((RpcCalls)callId))))
{
Logger_.LogCheat($"{player.ExtendedData().RealName} {Enum.GetName((RpcCalls)callId)}: {!player.IsHost()}");
BAUPlugin.Logger.LogCheat($"{player.ExtendedData().RealName} {Enum.GetName((RpcCalls)callId)}: {!player.IsHost()}");
}
reader.Recycle();
@@ -183,7 +183,7 @@ internal static class BetterAntiCheat
{
if (BetterNotificationManager.NotifyCheat(player, TranslationStrings.AntiCheat_InvalidSetRPC.Format(Enum.GetName((RpcCalls)callId))))
{
Logger_.LogCheat($"{player.ExtendedData().RealName} {Enum.GetName((RpcCalls)callId)}: {GameState.IsInGamePlay}");
BAUPlugin.Logger.LogCheat($"{player.ExtendedData().RealName} {Enum.GetName((RpcCalls)callId)}: {GameState.IsInGamePlay}");
}
reader.Recycle();
@@ -223,7 +223,7 @@ internal static class BetterAntiCheat
{
if (BetterNotificationManager.NotifyCheat(player, TranslationStrings.AntiCheat_InvalidLobbyRPC.Format(Enum.GetName((RpcCalls)callId))))
{
Logger_.LogCheat($"{player.ExtendedData().RealName} {Enum.GetName((RpcCalls)callId)}: {GameState.IsInGame} && {GameState.IsLobby}");
BAUPlugin.Logger.LogCheat($"{player.ExtendedData().RealName} {Enum.GetName((RpcCalls)callId)}: {GameState.IsInGame} && {GameState.IsLobby}");
}
reader.Recycle();
@@ -237,7 +237,7 @@ internal static class BetterAntiCheat
}
catch (Exception ex)
{
Logger_.Error(ex);
BAUPlugin.Logger.Error(ex);
return true;
}
}
src/Modules/AntiCheat/RPCHandler.cs
+2 -2
View File
@@ -164,7 +164,7 @@ internal abstract class RPCHandler
}
catch (Exception ex)
{
Logger_.Error(ex);
BAUPlugin.Logger.Error(ex);
}
}
}
@@ -181,7 +181,7 @@ internal abstract class RPCHandler
{
string Name = Enum.GetName((RpcCalls)CallId) ?? Enum.GetName((CustomRPC)CallId) ?? $"Unregistered({CallId})";
Name = $"[{Enum.GetName(catchedHandlerFlag)}] > " + Name;
Logger_.LogCheat($"{catchedSender?.ExtendedData()?.RealName ?? player.ExtendedData()?.RealName ?? string.Empty} {Name}: {info}");
BAUPlugin.Logger.LogCheat($"{catchedSender?.ExtendedData()?.RealName ?? player.ExtendedData()?.RealName ?? string.Empty} {Name}: {info}");
}
/// <summary>
src/Modules/AntiCheat/RPCHandlers/Cheats/AUMChatHandler.cs
+1 -1
View File
@@ -34,7 +34,7 @@ internal sealed class AUMChatHandler : RPCHandler
betterData.AntiCheatInfo.AUMChats.Add(msgString);
}
Logger_.Log($"{sender.Data.PlayerName} -> {msgString}", "AUMChatLog");
BAUPlugin.Logger.Log($"{sender.Data.PlayerName} -> {msgString}", "AUMChatLog");
if (BAUModdedSupportFlags.HasFlag(BAUModdedSupportFlags.Disable_Anticheat))
return;
src/Modules/AntiCheat/RPCHandlers/CheckNameHandler.cs
+1 -1
View File
@@ -25,7 +25,7 @@ internal sealed class CheckNameHandler : RPCHandler
if (BetterNotificationManager.NotifyCheat(sender, GetFormatSetText()))
{
Utils.AddChatPrivate($"{sender.GetPlayerNameAndColor()} Has tried to change their name to '{name}' but has been undone!");
Logger_.LogCheat($"{sender.ExtendedData().RealName} Has tried to change their name to '{name}' but has been undone!");
BAUPlugin.Logger.LogCheat($"{sender.ExtendedData().RealName} Has tried to change their name to '{name}' but has been undone!");
LogRpcInfo($"{sender.DataIsCollected() == true} && {!GameState.IsLocalGame} && {GameState.IsVanillaServer}");
}
src/Modules/AntiCheat/RPCHandlers/SetNameHandler.cs
+1 -1
View File
@@ -23,7 +23,7 @@ internal sealed class SetNameHandler : RPCHandler
if (BetterNotificationManager.NotifyCheat(sender, GetFormatSetText()))
{
Utils.AddChatPrivate($"{sender.GetPlayerNameAndColor()} Has tried to change their name to '{name}' but has been undone!");
Logger_.LogCheat($"{sender.ExtendedData().RealName} Has tried to change their name to '{name}' but has been undone!");
BAUPlugin.Logger.LogCheat($"{sender.ExtendedData().RealName} Has tried to change their name to '{name}' but has been undone!");
LogRpcInfo($"Player attempted to change name multiple times: '{name}'");
}
src/Modules/BAULogger.cs
+214
View File
@@ -0,0 +1,214 @@
using BepInEx;
using BepInEx.Logging;
using BetterAmongUs.Utilities;
namespace BetterAmongUs.Modules;
/// <summary>
/// Provides logging for BetterAmongUs with various log levels and destinations.
/// </summary>
internal sealed class BAULogger(ManualLogSource manualLogSource)
{
private readonly ManualLogSource _manualLogSource = manualLogSource;
/// <summary>
/// Logs a message with specified parameters.
/// </summary>
/// <param name="info">The message to log.</param>
/// <param name="tag">The log tag/category.</param>
/// <param name="logConsole">Whether to output to console.</param>
/// <param name="color">The console color for the message.</param>
/// <param name="hostOnly">Whether to log only when the client is host.</param>
internal void Log(string info, string tag = "Log", bool logConsole = true, ConsoleColor color = ConsoleColor.White, bool hostOnly = false)
{
try
{
if (hostOnly && !GameState.IsHost)
return;
_manualLogSource.LogInfo($"[{tag}] {info}");
if (logConsole)
{
ConsoleManager.SetConsoleColor(color);
ConsoleManager.ConsoleStream.WriteLine($"{DateTime.Now:HH:mm} BetterAmongUs[{tag}]: {Utils.RemoveHtmlText(info)}");
}
}
catch { }
}
/// <summary>
/// Logs a header message with visual formatting.
/// </summary>
/// <param name="info">The header text.</param>
/// <param name="tag">The log tag/category.</param>
/// <param name="hostOnly">Whether to log only when the client is host.</param>
/// <param name="logConsole">Whether to output to console.</param>
internal void LogHeader(string info, string tag = "LogHeader", bool hostOnly = false, bool logConsole = true) => Log($" >-------------- {info} --------------<", tag, hostOnly: hostOnly, logConsole: logConsole);
/// <summary>
/// Logs cheat detection messages with green console color.
/// </summary>
/// <param name="info">The cheat detection message.</param>
/// <param name="tag">The log tag/category.</param>
/// <param name="hostOnly">Whether to log only when the client is host.</param>
/// <param name="logConsole">Whether to output to console.</param>
internal void LogCheat(string info, string tag = "AntiCheat", bool hostOnly = false, bool logConsole = true) => Log(info, tag, color: ConsoleColor.Green, hostOnly: hostOnly, logConsole: logConsole);
/// <summary>
/// Logs error messages with red console color.
/// </summary>
/// <param name="info">The error message.</param>
/// <param name="tag">The log tag/category.</param>
/// <param name="hostOnly">Whether to log only when the client is host.</param>
/// <param name="logConsole">Whether to output to console.</param>
internal void Error(string info, string tag = "Error", bool hostOnly = false, bool logConsole = true) => Log(info, tag, color: ConsoleColor.Red, hostOnly: hostOnly, logConsole: logConsole);
/// <summary>
/// Logs exception details with red console color.
/// </summary>
/// <param name="ex">The exception to log.</param>
/// <param name="tag">The log tag/category.</param>
/// <param name="hostOnly">Whether to log only when the client is host.</param>
/// <param name="logConsole">Whether to output to console.</param>
internal void Error(Exception ex, string tag = "Error", bool hostOnly = false, bool logConsole = true) => Log(ex.ToString(), tag, color: ConsoleColor.Red, hostOnly: hostOnly, logConsole: logConsole);
/// <summary>
/// Logs warning messages with yellow console color.
/// </summary>
/// <param name="info">The warning message.</param>
/// <param name="tag">The log tag/category.</param>
/// <param name="hostOnly">Whether to log only when the client is host.</param>
/// <param name="logConsole">Whether to output to console.</param>
internal void Warning(string info, string tag = "Warning", bool hostOnly = false, bool logConsole = true) => Log(info, tag, color: ConsoleColor.Yellow, hostOnly: hostOnly, logConsole: logConsole);
/// <summary>
/// Logs a test message for debugging purposes.
/// </summary>
internal void Test()
{
Log("------------------> TEST <------------------", "TEST");
InGame("TEST");
}
/// <summary>
/// Logs a message in-game via the disconnect message notifier.
/// </summary>
/// <param name="info">The message to display in-game.</param>
/// <param name="hostOnly">Whether to log only when the client is host.</param>
internal void InGame(string info, bool hostOnly = false)
{
if (hostOnly && !GameState.IsHost)
return;
if (HudManager.InstanceExists) HudManager.Instance.Notifier.AddDisconnectMessage(info);
Log(info, "InGame", hostOnly: hostOnly);
}
/// <summary>
/// Logs a private message with encryption for sensitive data.
/// </summary>
/// <param name="info">The sensitive message to log.</param>
/// <param name="tag">The log tag/category.</param>
/// <param name="hostOnly">Whether to log only when the client is host.</param>
internal void LogPrivate(string info, string tag = "Log", bool hostOnly = false)
{
try
{
if (hostOnly && !GameState.IsHost)
return;
string encrypted = Encryptor.Encrypt(info);
Log(BAUPlugin.Constants.ENCRYPTED_LOG_PREFIX + encrypted + BAUPlugin.Constants.ENCRYPTED_LOG_POSTFIX, tag, false);
}
catch { }
}
/// <summary>
/// Decrypts all encrypted sections within a log file text.
/// </summary>
/// <param name="logText">The raw log file content containing encrypted sections marked with prefix and postfix characters.</param>
/// <returns>The log text with all encrypted sections decrypted and markers removed.</returns>
internal static string DecryptLogs(string logText)
{
string newLog = string.Empty;
string[] logArray = logText.Split([Environment.NewLine], StringSplitOptions.None);
foreach (string text in logArray)
{
if (text.Contains(BAUPlugin.Constants.ENCRYPTED_LOG_PREFIX) &&
text.Contains(BAUPlugin.Constants.ENCRYPTED_LOG_POSTFIX))
{
int start = text.IndexOf(BAUPlugin.Constants.ENCRYPTED_LOG_PREFIX);
int end = text.IndexOf(BAUPlugin.Constants.ENCRYPTED_LOG_POSTFIX);
string before = text[..start];
string encrypted = text.Substring(start + 1, end - start - 1);
string after = text[(end + 1)..];
try
{
string decrypted = Encryptor.Decrypt(encrypted);
newLog += before + decrypted + after + "\n";
}
catch
{
newLog += text + "\n";
}
}
else
{
newLog += text + "\n";
}
}
return newLog;
}
}
/// <summary>
/// Custom log listener for BepInEx that forwards logs to the BetterAmongUs logging system.
/// </summary>
internal class CustomLogListener(BAULogger bauLogger) : ILogListener
{
private readonly BAULogger _bauLogger = bauLogger;
/// <summary>
/// Gets or sets the log levels to filter.
/// </summary>
public LogLevel LogLevelFilter { get; set; } = LogLevel.Info | LogLevel.Warning | LogLevel.Error;
/// <summary>
/// Handles log events from BepInEx.
/// </summary>
/// <param name="sender">The event sender.</param>
/// <param name="eventArgs">The log event arguments.</param>
public void LogEvent(object sender, LogEventArgs eventArgs)
{
if (eventArgs.Source.SourceName.ToLower().Contains("unity")
|| eventArgs.Source.SourceName.ToLower().Contains("betteramongus"))
return;
if (eventArgs.Level is LogLevel.None or LogLevel.Info)
{
_bauLogger.Log(eventArgs.Data.ToString(), "BepInEx." + eventArgs.Source.SourceName, logConsole: false);
}
else if (eventArgs.Level is LogLevel.Warning)
{
_bauLogger.Warning(eventArgs.Data.ToString(), "BepInEx." + eventArgs.Source.SourceName, logConsole: false);
}
else if (eventArgs.Level is LogLevel.Error or LogLevel.Fatal)
{
_bauLogger.Error(eventArgs.Data.ToString(), "BepInEx." + eventArgs.Source.SourceName, logConsole: false);
}
}
/// <summary>
/// Disposes the log listener.
/// </summary>
public void Dispose() { }
/// <summary>
/// Flushes the log listener.
/// </summary>
public void Flush() { }
}
src/Modules/Encryptor.cs
+77 -3
View File
@@ -1,5 +1,5 @@
using System.Security.Cryptography;
using System.Text;
using UnityEngine;
namespace BetterAmongUs.Modules;
@@ -8,16 +8,82 @@ namespace BetterAmongUs.Modules;
/// </summary>
internal static class Encryptor
{
private static readonly byte[] Key = Encoding.UTF8.GetBytes("0123456789ABCDEF0123456789ABCDEF");
private static readonly byte[] IV = Encoding.UTF8.GetBytes("ABCDEF0123456789");
private static byte[] Key = [];
private static byte[] IV = [];
/// <summary>
/// Initializes the encryption system by loading or generating AES keys.
/// </summary>
internal static void Initialize()
{
try
{
if (PlayerPrefs.HasKey("BAUEncryptionKey") && PlayerPrefs.HasKey("BAUEncryptionIV"))
{
string keyString = PlayerPrefs.GetString("BAUEncryptionKey");
string ivString = PlayerPrefs.GetString("BAUEncryptionIV");
if (string.IsNullOrEmpty(keyString) || string.IsNullOrEmpty(ivString))
{
throw new Exception("Keys are empty");
}
Key = Convert.FromBase64String(keyString);
IV = Convert.FromBase64String(ivString);
if (Key.Length != 32 || IV.Length != 16)
{
throw new Exception("Invalid key length");
}
}
else
{
GenerateAndSaveKeys();
}
}
catch
{
PlayerPrefs.DeleteKey("BAUEncryptionKey");
PlayerPrefs.DeleteKey("BAUEncryptionIV");
PlayerPrefs.Save();
GenerateAndSaveKeys();
}
}
/// <summary>
/// Generates a new 256-bit AES key and 128-bit initialization vector (IV),
/// then saves them to PlayerPrefs as Base64 strings.
/// </summary>
private static void GenerateAndSaveKeys()
{
using (Aes aes = Aes.Create())
{
aes.KeySize = 256;
aes.BlockSize = 128;
aes.GenerateKey();
aes.GenerateIV();
Key = aes.Key;
IV = aes.IV;
}
PlayerPrefs.SetString("BAUEncryptionKey", Convert.ToBase64String(Key));
PlayerPrefs.SetString("BAUEncryptionIV", Convert.ToBase64String(IV));
PlayerPrefs.Save();
}
/// <summary>
/// Encrypts a plain text string using AES encryption.
/// </summary>
/// <param name="input">The plain text string to encrypt.</param>
/// <returns>A base64-encoded string containing the encrypted data.</returns>
/// <exception cref="InvalidOperationException">Thrown if encryption is not initialized.</exception>
internal static string Encrypt(string input)
{
if (Key == null || Key.Length == 0 || IV == null || IV.Length == 0)
{
throw new InvalidOperationException("Encryption not initialized. Call InitializeEncryption() first.");
}
using Aes aes = Aes.Create();
aes.Key = Key;
aes.IV = IV;
@@ -36,8 +102,16 @@ internal static class Encryptor
/// </summary>
/// <param name="input">The base64-encoded encrypted string.</param>
/// <returns>The decrypted plain text string.</returns>
/// <exception cref="InvalidOperationException">Thrown if encryption is not initialized.</exception>
/// <exception cref="FormatException">Thrown if the input is not valid Base64.</exception>
/// <exception cref="CryptographicException">Thrown if decryption fails due to invalid key or corrupted data.</exception>
internal static string Decrypt(string input)
{
if (Key == null || Key.Length == 0 || IV == null || IV.Length == 0)
{
throw new InvalidOperationException("Encryption not initialized. Call InitializeEncryption() first.");
}
using Aes aes = Aes.Create();
aes.Key = Key;
aes.IV = IV;
src/Modules/Logger.cs
-240
View File
@@ -1,240 +0,0 @@
using BepInEx;
using BepInEx.Logging;
using BetterAmongUs.Data;
using BetterAmongUs.Utilities;
using System.Diagnostics;
using System.Runtime.CompilerServices;
namespace BetterAmongUs.Modules;
/// <summary>
/// Provides logging utilities for BetterAmongUs with various log levels and destinations.
/// </summary>
internal static class Logger_
{
/// <summary>
/// Logs a message with specified parameters.
/// </summary>
/// <param name="info">The message to log.</param>
/// <param name="tag">The log tag/category.</param>
/// <param name="logConsole">Whether to output to console.</param>
/// <param name="color">The console color for the message.</param>
/// <param name="hostOnly">Whether to log only when the client is host.</param>
internal static void Log(string info, string tag = "Log", bool logConsole = true, ConsoleColor color = ConsoleColor.White, bool hostOnly = false)
{
try
{
if (hostOnly && !GameState.IsHost)
return;
string mark = $"{DateTime.Now:HH:mm} [BetterLog][{tag}]";
string logFilePath = BetterDataManager.Files.logFilePath;
string newLine = $"{mark}: {Utils.RemoveHtmlText(info)}";
File.AppendAllText(logFilePath, newLine + Environment.NewLine);
BAUPlugin.Logger.LogInfo($"[{tag}] {info}");
if (logConsole)
{
ConsoleManager.SetConsoleColor(color);
ConsoleManager.ConsoleStream.WriteLine($"{DateTime.Now:HH:mm} BetterAmongUs[{tag}]: {Utils.RemoveHtmlText(info)}");
}
}
catch { }
}
/// <summary>
/// Logs method calls with detailed information about the caller.
/// </summary>
/// <param name="info">Additional information about the method call.</param>
/// <param name="runtimeType">The type containing the method (optional).</param>
/// <param name="hostOnly">Whether to log only when the client is host.</param>
/// <param name="callerFilePath">Automatically populated: path of the file containing the caller.</param>
/// <param name="callerLineNumber">Automatically populated: line number of the caller.</param>
/// <param name="callerMemberName">Automatically populated: name of the calling member.</param>
internal static void LogMethod(
string info = "",
Type? runtimeType = null,
bool hostOnly = false,
[CallerFilePath] string callerFilePath = "",
[CallerLineNumber] int callerLineNumber = 0,
[CallerMemberName] string callerMemberName = "")
{
var loggedMethodFrame = new StackFrame(1, true);
var loggedMethod = loggedMethodFrame.GetMethod();
string loggedMethodName = loggedMethod.Name;
string? loggedClassFullName = runtimeType?.FullName ?? loggedMethod.DeclaringType?.FullName;
string? loggedClassName = runtimeType?.Name ?? loggedMethod.DeclaringType?.Name;
string logMessage = string.IsNullOrEmpty(info)
? $"{loggedClassFullName}.{loggedMethodName} was called from {Path.GetFileName(callerFilePath)}({callerLineNumber}) in {callerMemberName}."
: $"{loggedClassFullName}.{loggedMethodName} was called from {Path.GetFileName(callerFilePath)}({callerLineNumber}) in {callerMemberName}. Info: {info}.";
Log(logMessage, "MethodLog", hostOnly);
}
/// <summary>
/// Logs private method calls with detailed information, using encrypted storage.
/// </summary>
/// <param name="info">Additional information about the method call.</param>
/// <param name="runtimeType">The type containing the method (optional).</param>
/// <param name="hostOnly">Whether to log only when the client is host.</param>
/// <param name="callerFilePath">Automatically populated: path of the file containing the caller.</param>
/// <param name="callerLineNumber">Automatically populated: line number of the caller.</param>
/// <param name="callerMemberName">Automatically populated: name of the calling member.</param>
internal static void LogMethodPrivate(
string info = "",
Type? runtimeType = null,
bool hostOnly = false,
[CallerFilePath] string callerFilePath = "",
[CallerLineNumber] int callerLineNumber = 0,
[CallerMemberName] string callerMemberName = "")
{
var loggedMethodFrame = new StackFrame(1, true);
var loggedMethod = loggedMethodFrame.GetMethod();
string loggedMethodName = loggedMethod.Name;
string? loggedClassFullName = runtimeType?.FullName ?? loggedMethod.DeclaringType?.FullName;
string? loggedClassName = runtimeType?.Name ?? loggedMethod.DeclaringType?.Name;
string logMessage = string.IsNullOrEmpty(info)
? $"{loggedClassFullName}.{loggedMethodName} was called from {Path.GetFileName(callerFilePath)}({callerLineNumber}) in {callerMemberName}."
: $"{loggedClassFullName}.{loggedMethodName} was called from {Path.GetFileName(callerFilePath)}({callerLineNumber}) in {callerMemberName}. Info: {info}.";
LogPrivate(logMessage, "MethodLog", hostOnly);
}
/// <summary>
/// Logs a header message with visual formatting.
/// </summary>
/// <param name="info">The header text.</param>
/// <param name="tag">The log tag/category.</param>
/// <param name="hostOnly">Whether to log only when the client is host.</param>
/// <param name="logConsole">Whether to output to console.</param>
internal static void LogHeader(string info, string tag = "LogHeader", bool hostOnly = false, bool logConsole = true) => Log($" >-------------- {info} --------------<", tag, hostOnly: hostOnly, logConsole: logConsole);
/// <summary>
/// Logs cheat detection messages with green console color.
/// </summary>
/// <param name="info">The cheat detection message.</param>
/// <param name="tag">The log tag/category.</param>
/// <param name="hostOnly">Whether to log only when the client is host.</param>
/// <param name="logConsole">Whether to output to console.</param>
internal static void LogCheat(string info, string tag = "AntiCheat", bool hostOnly = false, bool logConsole = true) => Log(info, tag, color: ConsoleColor.Green, hostOnly: hostOnly, logConsole: logConsole);
/// <summary>
/// Logs error messages with red console color.
/// </summary>
/// <param name="info">The error message.</param>
/// <param name="tag">The log tag/category.</param>
/// <param name="hostOnly">Whether to log only when the client is host.</param>
/// <param name="logConsole">Whether to output to console.</param>
internal static void Error(string info, string tag = "Error", bool hostOnly = false, bool logConsole = true) => Log(info, tag, color: ConsoleColor.Red, hostOnly: hostOnly, logConsole: logConsole);
/// <summary>
/// Logs exception details with red console color.
/// </summary>
/// <param name="ex">The exception to log.</param>
/// <param name="tag">The log tag/category.</param>
/// <param name="hostOnly">Whether to log only when the client is host.</param>
/// <param name="logConsole">Whether to output to console.</param>
internal static void Error(Exception ex, string tag = "Error", bool hostOnly = false, bool logConsole = true) => Log(ex.ToString(), tag, color: ConsoleColor.Red, hostOnly: hostOnly, logConsole: logConsole);
/// <summary>
/// Logs warning messages with yellow console color.
/// </summary>
/// <param name="info">The warning message.</param>
/// <param name="tag">The log tag/category.</param>
/// <param name="hostOnly">Whether to log only when the client is host.</param>
/// <param name="logConsole">Whether to output to console.</param>
internal static void Warning(string info, string tag = "Warning", bool hostOnly = false, bool logConsole = true) => Log(info, tag, color: ConsoleColor.Yellow, hostOnly: hostOnly, logConsole: logConsole);
/// <summary>
/// Logs a test message for debugging purposes.
/// </summary>
internal static void Test()
{
Log("------------------> TEST <------------------", "TEST");
InGame("TEST");
}
/// <summary>
/// Logs a message in-game via the disconnect message notifier.
/// </summary>
/// <param name="info">The message to display in-game.</param>
/// <param name="hostOnly">Whether to log only when the client is host.</param>
internal static void InGame(string info, bool hostOnly = false)
{
if (hostOnly && !GameState.IsHost)
return;
if (HudManager.InstanceExists) HudManager.Instance.Notifier.AddDisconnectMessage(info);
Log(info, "InGame", hostOnly: hostOnly);
}
/// <summary>
/// Logs a private message with encryption for sensitive data.
/// </summary>
/// <param name="info">The sensitive message to log.</param>
/// <param name="tag">The log tag/category.</param>
/// <param name="hostOnly">Whether to log only when the client is host.</param>
internal static void LogPrivate(string info, string tag = "Log", bool hostOnly = false)
{
try
{
if (hostOnly && !GameState.IsHost)
return;
string mark = $"{DateTime.Now:HH:mm} [BetterLog][PrivateLog][{tag}]";
string logFilePath = BetterDataManager.Files.logFilePath;
string newLine = $"{mark}: " + Encryptor.Encrypt($"{info}");
File.AppendAllText(logFilePath, newLine + Environment.NewLine);
}
catch { }
}
}
/// <summary>
/// Custom log listener for BepInEx that forwards logs to the BetterAmongUs logging system.
/// </summary>
internal class CustomLogListener : ILogListener
{
/// <summary>
/// Gets or sets the log levels to filter.
/// </summary>
public LogLevel LogLevelFilter { get; set; } = LogLevel.Info | LogLevel.Warning | LogLevel.Error;
/// <summary>
/// Handles log events from BepInEx.
/// </summary>
/// <param name="sender">The event sender.</param>
/// <param name="eventArgs">The log event arguments.</param>
public void LogEvent(object sender, LogEventArgs eventArgs)
{
if (eventArgs.Source.SourceName.ToLower().Contains("unity")
|| eventArgs.Source.SourceName.ToLower().Contains("betteramongus"))
return;
if (eventArgs.Level is LogLevel.None or LogLevel.Info)
{
Logger_.Log(eventArgs.Data.ToString(), "BepInEx." + eventArgs.Source.SourceName, logConsole: false);
}
else if (eventArgs.Level is LogLevel.Warning)
{
Logger_.Warning(eventArgs.Data.ToString(), "BepInEx." + eventArgs.Source.SourceName, logConsole: false);
}
else if (eventArgs.Level is LogLevel.Error or LogLevel.Fatal)
{
Logger_.Error(eventArgs.Data.ToString(), "BepInEx." + eventArgs.Source.SourceName, logConsole: false);
}
}
/// <summary>
/// Disposes the log listener.
/// </summary>
public void Dispose() { }
/// <summary>
/// Flushes the log listener.
/// </summary>
public void Flush() { }
}
src/Modules/Support/BAUSupportEvent.cs
+1 -1
View File
@@ -80,7 +80,7 @@ internal abstract class BAUSupportEvent(string attributeFlag)
}
catch (Exception ex)
{
Logger_.Error($"Invoking event '{_attributeFlag}' for {pluginInfo.GetType().Name}: {ex}");
BAUPlugin.Logger.Error($"Invoking event '{_attributeFlag}' for {pluginInfo.GetType().Name}: {ex}");
return default;
}
}
src/Modules/Translator.cs
+8 -8
View File
@@ -22,9 +22,9 @@ internal static class Translator
/// </summary>
internal static void Initialize()
{
Logger_.Log("Loading language files...", "Translator");
BAUPlugin.Logger.Log("Loading language files...", "Translator");
LoadLanguages();
Logger_.Log("Language files loaded successfully", "Translator");
BAUPlugin.Logger.Log("Language files loaded successfully", "Translator");
}
/// <summary>
@@ -41,7 +41,7 @@ internal static class Translator
if (jsonFileNames.Length == 0)
{
Logger_.Error("JSON translation files do not exist.", "Translator");
BAUPlugin.Logger.Error("JSON translation files do not exist.", "Translator");
return;
}
@@ -54,7 +54,7 @@ internal static class Translator
}
catch (Exception ex)
{
Logger_.Error($"Error loading languages: {ex}", "Translator");
BAUPlugin.Logger.Error($"Error loading languages: {ex}", "Translator");
}
}
@@ -89,7 +89,7 @@ internal static class Translator
if (jsonDictionary == null)
{
Logger_.Error($"Failed to deserialize JSON from {resourceName}", "Translator");
BAUPlugin.Logger.Error($"Failed to deserialize JSON from {resourceName}", "Translator");
return;
}
@@ -103,12 +103,12 @@ internal static class Translator
}
else
{
Logger_.Error($"Invalid JSON format in {resourceName}: Missing or invalid 'LanguageID' field.", "Translator");
BAUPlugin.Logger.Error($"Invalid JSON format in {resourceName}: Missing or invalid 'LanguageID' field.", "Translator");
}
}
catch (Exception ex)
{
Logger_.Error($"Error loading language file {resourceName}: {ex}", "Translator");
BAUPlugin.Logger.Error($"Error loading language file {resourceName}: {ex}", "Translator");
}
}
@@ -176,7 +176,7 @@ internal static class Translator
}
catch (Exception ex)
{
Logger_.Error($"Error retrieving string [{translationString}]: {ex}", "Translator");
BAUPlugin.Logger.Error($"Error retrieving string [{translationString}]: {ex}", "Translator");
return fallbackText;
}
}
src/MonoScripts/BetterPingTracker.cs
+1 -1
View File
@@ -39,7 +39,7 @@ internal sealed class BetterPingTracker : MonoBehaviour
if (pingText == null || pingAspectPosition == null)
{
Logger_.Error("BetterPingTracker.SetUp() called with null parameters!");
BAUPlugin.Logger.Error("BetterPingTracker.SetUp() called with null parameters!");
return;
}
src/MonoScripts/Extended/ExtendedPlayerInfo.cs
+2 -2
View File
@@ -29,7 +29,7 @@ internal sealed class ExtendedPlayerInfo : MonoBehaviour, IMonoExtension<Network
}
catch (Exception ex)
{
Logger_.Log("Handshake disabled: " + ex.Message);
BAUPlugin.Logger.Log("Handshake disabled: " + ex.Message);
HandshakeHandler = null;
}
}
@@ -65,7 +65,7 @@ internal sealed class ExtendedPlayerInfo : MonoBehaviour, IMonoExtension<Network
TranslationStrings.AntiCheat_UnauthorizedAction.LocalizedString
);
Logger_.LogCheat($"{BaseMono.Object.ExtendedData().RealName} {AntiCheatInfo.RPCSentPS} Sent.");
BAUPlugin.Logger.LogCheat($"{BaseMono.Object.ExtendedData().RealName} {AntiCheatInfo.RPCSentPS} Sent.");
}
}
src/Network/Configs/BAUUpdateData.cs
+1 -1
View File
@@ -50,7 +50,7 @@ internal sealed class BAUUpdateData
}
catch (Exception ex)
{
Logger_.Error($"Update check failed: {ex.Message}");
BAUPlugin.Logger.Error($"Update check failed: {ex.Message}");
return false;
}
}
src/Network/Configs/NewsData.cs
+1 -1
View File
@@ -80,7 +80,7 @@ internal sealed class NewsData()
}
catch (Exception ex)
{
Logger_.Error($"Failed to manually deserialize YAML: {ex.Message}");
BAUPlugin.Logger.Error($"Failed to manually deserialize YAML: {ex.Message}");
return null;
}
}
src/Network/GitHubFile.cs
+3 -3
View File
@@ -64,7 +64,7 @@ internal static class GitHubFile
}
else
{
Logger_.Error($"Error downloading file from URL '{url}': {www.error} (Response Code: {(int)www.responseCode})");
BAUPlugin.Logger.Error($"Error downloading file from URL '{url}': {www.error} (Response Code: {(int)www.responseCode})");
if (showProgress)
{
CustomLoadingBarManager.SetLoadingPercent(100f, "Download Failed!");
@@ -77,7 +77,7 @@ internal static class GitHubFile
byte[] bytes = www.downloadHandler.GetNativeData().ToArray();
File.WriteAllBytes(localFilePath, bytes);
Logger_.Log($"Saved file: {localFilePath}");
BAUPlugin.Logger.Log($"Saved file: {localFilePath}");
callback?.Invoke(localFilePath);
}
@@ -98,7 +98,7 @@ internal static class GitHubFile
if (www.result != UnityWebRequest.Result.Success)
{
Logger_.Error($"Error downloading {url}: {www.error}");
BAUPlugin.Logger.Error($"Error downloading {url}: {www.error}");
yield break;
}
src/Network/Loaders/BAUUpdateLoader.cs
+1 -1
View File
@@ -61,7 +61,7 @@ internal sealed class BAUUpdateLoader : MonoBehaviour
if (response != null)
{
UpdateInfo = response;
Logger_.Log($"Loaded update info");
BAUPlugin.Logger.Log($"Loaded update info");
}
BAUUpdateManager.Init();
src/Network/Loaders/NewsLoader.cs
+4 -4
View File
@@ -53,7 +53,7 @@ internal sealed class NewsLoader : MonoBehaviour
if (response == null || !response.ContainsKey("News"))
{
Logger_.Error("manifest.json deserialization failed or no 'News' key found.");
BAUPlugin.Logger.Error("manifest.json deserialization failed or no 'News' key found.");
yield break;
}
@@ -64,7 +64,7 @@ internal sealed class NewsLoader : MonoBehaviour
yield return CoLoadNewsTest();
Logger_.Log($"Loaded {ModNews.NewsDataToProcess.Count} news files");
BAUPlugin.Logger.Log($"Loaded {ModNews.NewsDataToProcess.Count} news files");
Destroy(this);
}
@@ -97,7 +97,7 @@ internal sealed class NewsLoader : MonoBehaviour
}
catch (Exception ex)
{
Logger_.Error($"Failed to deserialize yaml for '{fileName}': {ex.Message}");
BAUPlugin.Logger.Error($"Failed to deserialize yaml for '{fileName}': {ex.Message}");
yield break;
}
}
@@ -124,7 +124,7 @@ internal sealed class NewsLoader : MonoBehaviour
}
catch (Exception ex)
{
Logger_.Error($"Failed to deserialize yaml for '{yamlDirectory}': {ex.Message}");
BAUPlugin.Logger.Error($"Failed to deserialize yaml for '{yamlDirectory}': {ex.Message}");
yield break;
}
}
src/Patches/Client/ClientPatch.cs
+1 -1
View File
@@ -86,7 +86,7 @@ internal static class ClientPatch
// Hide custom loading bar when exiting game
CustomLoadingBarManager.ToggleLoadingBar(false);
Logger_.Log($"Client has left game for: {Enum.GetName(reason)}", "AmongUsClientPatch");
BAUPlugin.Logger.Log($"Client has left game for: {Enum.GetName(reason)}", "AmongUsClientPatch");
}
[HarmonyPatch(typeof(AmongUsClient), nameof(AmongUsClient.OnGameEnd))]
src/Patches/Gameplay/Anticheat/PlatformSpoofPatch.cs
+2 -2
View File
@@ -57,7 +57,7 @@ internal static class PlatformSpoofPatch
TranslationStrings.AntiCheat_Reason_PlatformSpoofer.LocalizedString,
TranslationStrings.AntiCheat_HasBeenDetectedWithCheat.LocalizedString
);
Logger_.LogCheat($"{player.ExtendedData().RealName} {TranslationStrings.AntiCheat_Reason_PlatformSpoofer}: {__instance.XboxPlatformId}");
BAUPlugin.Logger.LogCheat($"{player.ExtendedData().RealName} {TranslationStrings.AntiCheat_Reason_PlatformSpoofer}: {__instance.XboxPlatformId}");
}
}
@@ -72,7 +72,7 @@ internal static class PlatformSpoofPatch
TranslationStrings.AntiCheat_Reason_PlatformSpoofer.LocalizedString,
TranslationStrings.AntiCheat_HasBeenDetectedWithCheat.LocalizedString
);
Logger_.LogCheat($"{player.ExtendedData().RealName} {TranslationStrings.AntiCheat_Reason_PlatformSpoofer}: {__instance.PsnPlatformId}");
BAUPlugin.Logger.LogCheat($"{player.ExtendedData().RealName} {TranslationStrings.AntiCheat_Reason_PlatformSpoofer}: {__instance.PsnPlatformId}");
}
}
src/Patches/Gameplay/Anticheat/VoteBanSystemPatch.cs
+1 -1
View File
@@ -124,7 +124,7 @@ internal static class VoteBanSystemPatch
maxVotes = votes.Length; // Total possible votes
}
Logger_.InGame(
BAUPlugin.Logger.InGame(
$"{src.Character?.GetPlayerNameAndColor() ?? src.PlayerName} " +
$"voted to kick {client.Character?.GetPlayerNameAndColor() ?? client.PlayerName} " +
$"<#6F6F6F>(</color><#FFFFFF>{currentVotes}</color><#6F6F6F>/</color><#FFFFFF>{maxVotes}</color><#6F6F6F>)</color>"
src/Patches/Gameplay/LobbyPatch.cs
+1 -1
View File
@@ -160,6 +160,6 @@ internal static class LobbyPatch
[HarmonyPrefix]
private static void GameStartManager_FinallyBegin_Prefix(/*GameStartManager __instance*/)
{
Logger_.LogHeader($"Game Has Started - {Enum.GetName(typeof(MapNames), GameState.GetActiveMapId)}/{GameState.GetActiveMapId}", "GamePlayManager");
BAUPlugin.Logger.LogHeader($"Game Has Started - {Enum.GetName(typeof(MapNames), GameState.GetActiveMapId)}/{GameState.GetActiveMapId}", "GamePlayManager");
}
}
src/Patches/Gameplay/Player/PlayerControlPatch.cs
+8 -8
View File
@@ -88,7 +88,7 @@ internal static class PlayerControlPatch
return;
// Log kill event with player names and roles
Logger_.LogPrivate($"{__instance.Data.PlayerName} Has killed {target.Data.PlayerName} as {__instance.Data.RoleType.GetRoleName()}", "EventLog");
BAUPlugin.Logger.LogPrivate($"{__instance.Data.PlayerName} Has killed {target.Data.PlayerName} as {__instance.Data.RoleType.GetRoleName()}", "EventLog");
// Track kill count in player's BetterData
if (resultFlags.HasFlag(MurderResultFlags.Succeeded) || resultFlags.HasFlag(MurderResultFlags.DecisionByHost))
@@ -118,9 +118,9 @@ internal static class PlayerControlPatch
// Log shapeshift events (both shifting and unshifting)
if (__instance != targetPlayer)
Logger_.LogPrivate($"{__instance.Data.PlayerName} Has Shapeshifted into {targetPlayer.Data.PlayerName}, did animate: {animate}", "EventLog");
BAUPlugin.Logger.LogPrivate($"{__instance.Data.PlayerName} Has Shapeshifted into {targetPlayer.Data.PlayerName}, did animate: {animate}", "EventLog");
else
Logger_.LogPrivate($"{__instance.Data.PlayerName} Has Un-Shapeshifted, did animate: {animate}", "EventLog");
BAUPlugin.Logger.LogPrivate($"{__instance.Data.PlayerName} Has Un-Shapeshifted, did animate: {animate}", "EventLog");
}
private static IEnumerator CoSetColorEarly(PlayerControl __instance)
@@ -135,9 +135,9 @@ internal static class PlayerControlPatch
{
// Log Phantom role visibility changes
if (isActive)
Logger_.LogPrivate($"{__instance.Data.PlayerName} Has Vanished as Phantom, did animate: {shouldAnimate}", "EventLog");
BAUPlugin.Logger.LogPrivate($"{__instance.Data.PlayerName} Has Vanished as Phantom, did animate: {shouldAnimate}", "EventLog");
else
Logger_.LogPrivate($"{__instance.Data.PlayerName} Has Appeared as Phantom, did animate: {shouldAnimate}", "EventLog");
BAUPlugin.Logger.LogPrivate($"{__instance.Data.PlayerName} Has Appeared as Phantom, did animate: {shouldAnimate}", "EventLog");
}
[HarmonyPatch(typeof(PlayerControl), nameof(PlayerControl.SetName))]
@@ -163,7 +163,7 @@ internal static class PlayerControlPatch
private static void PlayerPhysics_BootFromVent_Postfix(PlayerPhysics __instance, int ventId)
{
// Log vent boot events (when engineer boots someone)
Logger_.LogPrivate($"{__instance.myPlayer.Data.PlayerName} Has been booted from vent: {ventId}, as {__instance.myPlayer.Data.RoleType.GetRoleName()}", "EventLog");
BAUPlugin.Logger.LogPrivate($"{__instance.myPlayer.Data.PlayerName} Has been booted from vent: {ventId}, as {__instance.myPlayer.Data.RoleType.GetRoleName()}", "EventLog");
}
[HarmonyPatch(typeof(PlayerPhysics), nameof(PlayerPhysics.CoEnterVent))]
@@ -171,7 +171,7 @@ internal static class PlayerControlPatch
private static void PlayerPhysics_CoEnterVent_Postfix(PlayerPhysics __instance, int id)
{
// Log vent entry events
Logger_.LogPrivate($"{__instance.myPlayer.Data.PlayerName} Has entered vent: {id}, as {__instance.myPlayer.Data.RoleType.GetRoleName()}", "EventLog");
BAUPlugin.Logger.LogPrivate($"{__instance.myPlayer.Data.PlayerName} Has entered vent: {id}, as {__instance.myPlayer.Data.RoleType.GetRoleName()}", "EventLog");
}
[HarmonyPatch(typeof(PlayerPhysics), nameof(PlayerPhysics.CoExitVent))]
@@ -179,6 +179,6 @@ internal static class PlayerControlPatch
private static void PlayerPhysics_CoExitVent_Postfix(PlayerPhysics __instance, int id)
{
// Log vent exit events
Logger_.LogPrivate($"{__instance.myPlayer.Data.PlayerName} Has exit vent: {id}, as {__instance.myPlayer.Data.RoleType.GetRoleName()}", "EventLog");
BAUPlugin.Logger.LogPrivate($"{__instance.myPlayer.Data.PlayerName} Has exit vent: {id}, as {__instance.myPlayer.Data.RoleType.GetRoleName()}", "EventLog");
}
}
src/Patches/Gameplay/Player/PlayerJoinAndLeftPatch.cs
+3 -3
View File
@@ -30,7 +30,7 @@ internal static class PlayerJoinAndLeftPatch
host?.SetColor(host.CurrentOutfit.ColorId);
}
Logger_.Log($"Successfully joined {GameCode.IntToGameName(AmongUsClient.Instance.GameId)}", "OnGameJoinedPatch");
BAUPlugin.Logger.Log($"Successfully joined {GameCode.IntToGameName(AmongUsClient.Instance.GameId)}", "OnGameJoinedPatch");
}
[HarmonyPatch(typeof(AmongUsClient), nameof(AmongUsClient.OnPlayerJoined))]
@@ -153,7 +153,7 @@ internal static class PlayerJoinAndLeftPatch
{
var ReasonText = $"<color=#ff0>{playerData.ExtendedData().RealName}</color> {forceReasonText}";
Logger_.Log(ReasonText);
BAUPlugin.Logger.Log(ReasonText);
HudManager.Instance.Notifier.AddDisconnectMessage(ReasonText);
}
@@ -190,7 +190,7 @@ internal static class PlayerJoinAndLeftPatch
break;
}
Logger_.Log(ReasonText);
BAUPlugin.Logger.Log(ReasonText);
// Add formatted disconnect message to game UI
HudManager.Instance.Notifier.AddDisconnectMessage(ReasonText);
src/Patches/Gameplay/UI/Chat/ChatPatch.cs
+1 -1
View File
@@ -217,7 +217,7 @@ internal static class ChatPatch
private static void ChatController_AddChat_Postfix(ChatController __instance, PlayerControl sourcePlayer, string chatText)
{
// Log chat publicly if player is alive, privately if dead
Logger_.LogPrivate($"{sourcePlayer.Data.PlayerName} -> {chatText}", "ChatLog");
BAUPlugin.Logger.LogPrivate($"{sourcePlayer.Data.PlayerName} -> {chatText}", "ChatLog");
}
[HarmonyPatch(typeof(ChatController), nameof(ChatController.SetChatBubbleName))]
src/Patches/Gameplay/UI/GameSummaryPatch.cs
+5 -5
View File
@@ -35,8 +35,8 @@ internal static class GameSummaryPatch
// Log game end info to console
private static void LogGameEnd()
{
Logger_.LogHeader($"Game Has Ended - {Enum.GetName(typeof(MapNames), GameState.GetActiveMapId)}/{GameState.GetActiveMapId}", "GamePlayManager");
Logger_.LogHeader("Game Summary Start", "GameSummary");
BAUPlugin.Logger.LogHeader($"Game Has Ended - {Enum.GetName(typeof(MapNames), GameState.GetActiveMapId)}/{GameState.GetActiveMapId}", "GamePlayManager");
BAUPlugin.Logger.LogHeader("Game Summary Start", "GameSummary");
}
// Creates the visual game summary on screen
@@ -52,14 +52,14 @@ internal static class GameSummaryPatch
// Get win condition info
var (winTeam, winTag, winColor) = GetWinInfo();
Logger_.Log($"{winTeam}: {winTag}", "GameSummary");
BAUPlugin.Logger.Log($"{winTeam}: {winTag}", "GameSummary");
// Build and display summary text
var summaryHeader = BuildSummaryHeader(winTeam, winTag, winColor);
var playerList = BuildPlayerList();
summaryText.text = $"{summaryHeader}\n\n<size=58%>{playerList}</size>";
Logger_.LogHeader("Game Summary End", "GameSummary");
BAUPlugin.Logger.LogHeader("Game Summary End", "GameSummary");
}
// Creates the text object for the summary
@@ -191,7 +191,7 @@ internal static class GameSummaryPatch
var playerLine = BuildPlayerLine(playerData);
stringBuilder.AppendLine($"- {playerLine}\n");
Logger_.Log(Utils.RemoveHtmlText(playerLine).Replace("\n", " "), "GameSummary");
BAUPlugin.Logger.Log(Utils.RemoveHtmlText(playerLine).Replace("\n", " "), "GameSummary");
}
return stringBuilder;
src/Patches/Gameplay/UI/MeetingHudPatch.cs
+2 -2
View File
@@ -54,7 +54,7 @@ internal static class MeetingHudPatch
MeetingHud.Instance.ProceedButton.DestroyTextTranslators();
}
Logger_.LogHeader("Meeting Has Started");
BAUPlugin.Logger.LogHeader("Meeting Has Started");
}
// Updates host icon with current host info
@@ -134,6 +134,6 @@ internal static class MeetingHudPatch
}
timeOpen = 0f;
Logger_.LogHeader("Meeting Has Ended");
BAUPlugin.Logger.LogHeader("Meeting Has Ended");
}
}
src/Patches/Unity/UnityWebRequestPatch.cs
+1 -1
View File
@@ -79,7 +79,7 @@ internal static class UnityWebRequestPatch
if (responseHeader != null)
{
Logger_.Log("Connected to a supported Better Among Us matchmaking server");
BAUPlugin.Logger.Log("Connected to a supported Better Among Us matchmaking server");
}
}));
}
src/Utilities/Utils.cs
+5 -5
View File
@@ -431,7 +431,7 @@ internal static class Utils
}
catch (Exception ex)
{
Logger_.Error(ex);
BAUPlugin.Logger.Error(ex);
return null;
}
}
@@ -461,7 +461,7 @@ internal static class Utils
}
catch (Exception ex)
{
Logger_.Error(ex);
BAUPlugin.Logger.Error(ex);
return null;
}
}
@@ -475,13 +475,13 @@ internal static class Utils
{
if (!File.Exists(filePath))
{
Logger_.Error($"File not found: {filePath}");
BAUPlugin.Logger.Error($"File not found: {filePath}");
return null;
}
if (Path.GetExtension(filePath).ToLower() != ".wav")
{
Logger_.Error("Only .wav files are supported.");
BAUPlugin.Logger.Error("Only .wav files are supported.");
return null;
}
@@ -497,7 +497,7 @@ internal static class Utils
}
catch (Exception ex)
{
Logger_.Error($"Failed to load WAV: {ex}");
BAUPlugin.Logger.Error($"Failed to load WAV: {ex}");
return null;
}
}