Merge pull request #42 from EnhancedNetwork/dev

v1.1.6 Beta 2
This commit is contained in:
D1GQ authored and GitHub committed 2025-03-29 18:08:22 -05:00
commit ebd4acd62d
45 files changed
+1065 -266

No files matched your search

+3
View File
@@ -24,6 +24,9 @@ dotnet_diagnostic.CS8604.severity = silent
# CS8602: Dereference of a possibly null reference.
dotnet_diagnostic.CS8602.severity = none
# IDE0051: Remove unused private members
dotnet_diagnostic.IDE0051.severity = none
[*.{cs,vb}]
#### Naming styles ####
+1 -1
View File
@@ -17,7 +17,7 @@ internal class RemovePlayerCommand : BaseCommand
{
new StringArgument(this, "{identifier}"),
});
identifierArgument.GetArgSuggestions = BAUAntiCheat.GatherAllData;
identifierArgument.GetArgSuggestions = BetterAntiCheat.GatherAllData;
}
private readonly Lazy<BaseArgument[]> _arguments;
internal override BaseArgument[]? Arguments => _arguments.Value;
+1 -1
View File
@@ -89,7 +89,7 @@ class Logger
{
if (hostOnly && !GameState.IsHost) return;
if (DestroyableSingleton<HudManager>._instance) DestroyableSingleton<HudManager>.Instance.Notifier.AddDisconnectMessage(info);
if (HudManager.InstanceExists) HudManager.Instance.Notifier.AddDisconnectMessage(info);
Log(info, "InGame", hostOnly: hostOnly);
}
+20 -7
View File
@@ -1,15 +1,28 @@
using HarmonyLib;
using BetterAmongUs.Modules;
using HarmonyLib;
using TMPro;
using UnityEngine;
namespace BetterAmongUs.Helpers;
internal class BetterPlayerControl(IntPtr intPtr) : MonoBehaviour(intPtr)
[MonoExtension(typeof(PlayerControl))]
internal class ExtendedPlayerControl : MonoBehaviour, IMonoExtension
{
public MonoBehaviour? BaseMono { get; set; }
internal PlayerControl? _Player { get; set; }
internal TextMeshPro? InfoTextInfo { get; set; }
internal TextMeshPro? InfoTextTop { get; set; }
internal TextMeshPro? InfoTextBottom { get; set; }
private void Start()
{
MonoExtensionManager.RegisterExtension(this);
}
private void OnDestroy()
{
MonoExtensionManager.UnregisterExtension(this);
}
}
internal static class PlayerControlExtension
@@ -50,7 +63,7 @@ internal static class PlayerControlExtension
{
if (pc.BetterPlayerControl() == null)
{
BetterPlayerControl newExtendedPc = pc.gameObject.AddComponent<BetterPlayerControl>();
ExtendedPlayerControl newExtendedPc = pc.gameObject.AddComponent<ExtendedPlayerControl>();
newExtendedPc._Player = pc;
newExtendedPc.InfoTextInfo = InfoText_Info_TMP;
newExtendedPc.InfoTextTop = InfoText_T_TMP;
@@ -59,13 +72,13 @@ internal static class PlayerControlExtension
}
}
internal static BetterPlayerControl? BetterPlayerControl(this PlayerControl player)
internal static ExtendedPlayerControl? BetterPlayerControl(this PlayerControl player)
{
return player?.GetComponent<BetterPlayerControl>();
return MonoExtensionManager.Get<ExtendedPlayerControl>(player);
}
internal static BetterPlayerControl? BetterPlayerControl(this PlayerPhysics playerPhysics)
internal static ExtendedPlayerControl? BetterPlayerControl(this PlayerPhysics playerPhysics)
{
return playerPhysics?.GetComponent<BetterPlayerControl>();
return MonoExtensionManager.Get<ExtendedPlayerControl>(playerPhysics.myPlayer);
}
}
+18 -4
View File
@@ -8,8 +8,11 @@ using UnityEngine;
namespace BetterAmongUs.Helpers;
internal class ExtendedPlayerInfo : MonoBehaviour
[MonoExtension(typeof(NetworkedPlayerInfo))]
internal class ExtendedPlayerInfo : MonoBehaviour, IMonoExtension
{
public MonoBehaviour? BaseMono { get; set; }
private bool hasSet = false;
internal void SetInfo(NetworkedPlayerInfo data)
{
@@ -21,6 +24,17 @@ internal class ExtendedPlayerInfo : MonoBehaviour
}
private float timeAccumulator = 0f;
private void Start()
{
MonoExtensionManager.RegisterExtension(this);
}
private void OnDestroy()
{
MonoExtensionManager.UnregisterExtension(this);
}
internal void Update()
{
var time = Time.deltaTime;
@@ -137,19 +151,19 @@ internal static class PlayerControlDataExtension
// Get BetterData from PlayerControl
internal static ExtendedPlayerInfo? BetterData(this PlayerControl player)
{
return player?.Data?.GetComponent<ExtendedPlayerInfo>();
return MonoExtensionManager.Get<ExtendedPlayerInfo>(player.Data);
}
// Get BetterData from NetworkedPlayerInfo
internal static ExtendedPlayerInfo? BetterData(this NetworkedPlayerInfo data)
{
return data?.GetComponent<ExtendedPlayerInfo>();
return MonoExtensionManager.Get<ExtendedPlayerInfo>(data);
}
// Get BetterData from ClientData
internal static ExtendedPlayerInfo? BetterData(this ClientData data)
{
var player = Utils.PlayerFromClientId(data.Id);
return player?.Data?.GetComponent<ExtendedPlayerInfo>();
return MonoExtensionManager.Get<ExtendedPlayerInfo>(player.Data);
}
}
+3 -3
View File
@@ -286,9 +286,9 @@ static class PlayerControlHelper
PlayerControl.LocalPlayer.IsImpostorTeam() && player.IsImpostorTeam());
// Check if player is in the Anti-Cheat list
internal static bool IsCheater(this PlayerControl player) =>
player != null && (BAUAntiCheat.PlayerData.ContainsKey(player.GetHashPuid()) ||
BAUAntiCheat.SickoData.ContainsKey(player.GetHashPuid()) ||
BAUAntiCheat.AUMData.ContainsKey(player.GetHashPuid()));
player != null && (BetterAntiCheat.PlayerData.ContainsKey(player.GetHashPuid()) ||
BetterAntiCheat.SickoData.ContainsKey(player.GetHashPuid()) ||
BetterAntiCheat.AUMData.ContainsKey(player.GetHashPuid()));
// Check if player is the host
internal static bool IsHost(this PlayerControl player) => player?.Data != null && GameData.Instance?.GetHost() == player.Data;
+7 -6
View File
@@ -53,8 +53,12 @@ internal static class Utils
// Add msg to chat
internal static void AddChatPrivate(string text, string overrideName = "", bool setRight = false)
{
ChatController chat = HudManager.Instance.Chat;
NetworkedPlayerInfo data = PlayerControl.LocalPlayer.Data;
if (!GameState.IsInGame) return;
var chat = HudManager.Instance?.Chat;
if (chat == null) return;
var data = PlayerControl.LocalPlayer?.Data;
if (data == null) return;
ChatBubble pooledBubble = chat.GetPooledBubble();
string MsgName = $"<color=#ffffff><b>(<color=#00ff44>{Translator.GetString("SystemMessage")}</color>)</b>";
if (overrideName != "")
@@ -88,11 +92,8 @@ internal static class Utils
SoundManager.Instance.PlaySound(chat.messageSound, false, 1f, null).pitch = 0.5f + data.PlayerId / 15f;
ChatPatch.ChatControllerPatch.SetChatPoolTheme(pooledBubble);
}
catch (Exception ex)
catch
{
chat.chatBubblePool.Reclaim(pooledBubble);
Logger.Error(ex);
throw;
}
}
internal static bool SystemTypeIsSabotage(SystemTypes type) => type is SystemTypes.Reactor
+108
View File
@@ -0,0 +1,108 @@
using BepInEx.Unity.IL2CPP;
using HarmonyLib;
using System.Linq.Expressions;
using System.Reflection;
namespace BetterAmongUs.Items.Attributes;
[AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
internal abstract class MethodPatchAttribute : Attribute
{
private static readonly HashSet<Assembly> _registeredAssemblies = new();
private static readonly Dictionary<MethodInfo, MethodPatchAttribute> _methodPatchAttributes = [];
private static readonly HarmonyMethod _prefixHarmonyMethod = new(typeof(MethodPatchAttribute), nameof(PatchPrefix));
private static readonly HarmonyMethod _postfixHarmonyMethod = new(typeof(MethodPatchAttribute), nameof(PatchPostfix));
private static readonly HashSet<MethodInfo> _methodsToPatch = [];
protected MethodBase? PatchedMethod { get; private set; }
protected Delegate? DelegateMethod { get; private set; }
private bool runOriginal;
public static void Register(Assembly assembly, BasePlugin plugin)
{
if (_registeredAssemblies.Contains(assembly)) return;
_registeredAssemblies.Add(assembly);
foreach (var type in assembly.GetTypes())
{
foreach (var method in type.GetMethods(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic))
{
if (method.GetCustomAttribute<MethodPatchAttribute>(true) is MethodPatchAttribute attribute)
{
if (method?.DeclaringType != null && attribute.ShouldPatch(plugin, method.DeclaringType, method, method.GetParameters()))
{
attribute.PatchedMethod = method;
_methodPatchAttributes[method] = attribute;
_methodsToPatch.Add(method);
}
}
}
}
}
internal static void Finished()
{
foreach (var method in _methodsToPatch.OrderBy(method => method.Name))
{
var attribute = _methodPatchAttributes[method];
if (method is not MethodInfo methodInfo)
throw new InvalidOperationException("OriginalMethod is not a MethodInfo");
var paramTypes = methodInfo.GetParameters().Select(p => p.ParameterType).ToArray();
var delegateType = methodInfo.IsStatic
? Expression.GetDelegateType(paramTypes.Concat(new[] { methodInfo.ReturnType }).ToArray())
: Expression.GetDelegateType([methodInfo.DeclaringType!, .. paramTypes, .. new[] { methodInfo.ReturnType }]);
attribute.DelegateMethod = methodInfo.CreateDelegate(delegateType);
var patch = Main.Harmony.Patch(method, _prefixHarmonyMethod, _postfixHarmonyMethod);
}
}
private static bool PatchPrefix(object __instance, MethodBase __originalMethod, object[] __args)
{
if (_methodPatchAttributes.TryGetValue((MethodInfo)__originalMethod, out var attribute))
{
if (attribute.runOriginal)
{
attribute.runOriginal = false;
return true;
}
return attribute.RunPrefix(__instance, __args);
}
return true;
}
private static void PatchPostfix(object __instance, MethodBase __originalMethod, object[] __args)
{
if (_methodPatchAttributes.TryGetValue((MethodInfo)__originalMethod, out var attribute))
{
attribute.RunPostfix(__instance, __args);
}
}
internal object? InvokeOriginal(object? instance, object[] args)
{
if (DelegateMethod == null) return null;
var allArgs = PatchedMethod?.IsStatic == false
? new[] { instance }.Concat(args).ToArray()
: args;
runOriginal = true;
return DelegateMethod.DynamicInvoke(allArgs);
}
internal virtual bool ShouldPatch(BasePlugin plugin, Type declaringType, MethodBase method, ParameterInfo[] args) => true;
internal abstract bool RunPrefix(object instance, object[] args);
internal abstract void RunPostfix(object instance, object[] args);
internal static void Initialize()
{
IL2CPPChainloader.Instance.PluginLoad += (_, assembly, plugin) => Register(assembly, plugin);
IL2CPPChainloader.Instance.Finished += Finished;
}
}
+33
View File
@@ -0,0 +1,33 @@
using BepInEx.Unity.IL2CPP;
using System.Collections.Concurrent;
using System.Reflection;
internal abstract class RegisterAttribute : Attribute
{
private readonly static ConcurrentDictionary<Type, RegisterAttribute> RegisteredAttributes = new();
public abstract void Register(Assembly assembly, BasePlugin plugin);
public virtual void Finished() { }
public static void Initialize<T>() where T : RegisterAttribute
{
if (RegisteredAttributes.ContainsKey(typeof(T)))
return;
try
{
if (Activator.CreateInstance(typeof(T)) is not T instance)
throw new InvalidOperationException($"Failed to create instance of {typeof(T)}");
if (RegisteredAttributes.TryAdd(typeof(T), instance))
{
IL2CPPChainloader.Instance.PluginLoad += (_, assembly, plugin) => instance.Register(assembly, plugin);
IL2CPPChainloader.Instance.Finished += instance.Finished;
}
}
catch (Exception ex)
{
throw new InvalidOperationException($"Failed to initialize {typeof(T)}", ex);
}
}
}
+13
View File
@@ -0,0 +1,13 @@
using Hazel;
using InnerNet;
namespace BetterAmongUs.Items.Structs;
internal struct RPCData(InnerNetObject sender, SendOption sendOption, int targetId, RpcCalls callId, MessageReader reader)
{
public readonly InnerNetObject Sender = sender;
public readonly SendOption SendOption = sendOption;
public readonly int TargetId = targetId;
public readonly RpcCalls CalledRpc = callId;
public readonly MessageReader Reader = reader;
}
+20 -20
View File
@@ -367,51 +367,51 @@ class BetterDataManager
if (successful)
{
foreach (var data in BAUAntiCheat.PlayerData)
foreach (var data in BetterAntiCheat.PlayerData)
{
if (data.Value != identifier)
{
BAUAntiCheat.PlayerData.Remove(identifier);
BetterAntiCheat.PlayerData.Remove(identifier);
}
else
{
BAUAntiCheat.PlayerData.Remove(data.Key);
BetterAntiCheat.PlayerData.Remove(data.Key);
}
}
foreach (var data in BAUAntiCheat.SickoData)
foreach (var data in BetterAntiCheat.SickoData)
{
if (data.Value != identifier)
{
BAUAntiCheat.SickoData.Remove(identifier);
BetterAntiCheat.SickoData.Remove(identifier);
}
else
{
BAUAntiCheat.SickoData.Remove(data.Key);
BetterAntiCheat.SickoData.Remove(data.Key);
}
}
foreach (var data in BAUAntiCheat.AUMData)
foreach (var data in BetterAntiCheat.AUMData)
{
if (data.Value != identifier)
{
BAUAntiCheat.AUMData.Remove(identifier);
BetterAntiCheat.AUMData.Remove(identifier);
}
else
{
BAUAntiCheat.AUMData.Remove(data.Key);
BetterAntiCheat.AUMData.Remove(data.Key);
}
}
foreach (var data in BAUAntiCheat.KNData)
foreach (var data in BetterAntiCheat.KNData)
{
if (data.Value != identifier)
{
BAUAntiCheat.KNData.Remove(identifier);
BetterAntiCheat.KNData.Remove(identifier);
}
else
{
BAUAntiCheat.KNData.Remove(data.Key);
BetterAntiCheat.KNData.Remove(data.Key);
}
}
}
@@ -452,10 +452,10 @@ class BetterDataManager
}
// Clear in-memory data
BAUAntiCheat.PlayerData.Clear();
BAUAntiCheat.SickoData.Clear();
BAUAntiCheat.AUMData.Clear();
BAUAntiCheat.KNData.Clear();
BetterAntiCheat.PlayerData.Clear();
BetterAntiCheat.SickoData.Clear();
BetterAntiCheat.AUMData.Clear();
BetterAntiCheat.KNData.Clear();
Logger.LogCheat("Cleared cheat memory and data");
}
@@ -479,7 +479,7 @@ class BetterDataManager
{
foreach (var item in jsonData["cheatData"])
{
BAUAntiCheat.PlayerData[item.Value["HashPUID"]] = item.Value["FriendCode"];
BetterAntiCheat.PlayerData[item.Value["HashPUID"]] = item.Value["FriendCode"];
}
}
@@ -487,7 +487,7 @@ class BetterDataManager
{
foreach (var item in jsonData["sickoData"])
{
BAUAntiCheat.SickoData[item.Value["HashPUID"]] = item.Value["FriendCode"];
BetterAntiCheat.SickoData[item.Value["HashPUID"]] = item.Value["FriendCode"];
}
}
@@ -495,7 +495,7 @@ class BetterDataManager
{
foreach (var item in jsonData["aumData"])
{
BAUAntiCheat.AUMData[item.Value["HashPUID"]] = item.Value["FriendCode"];
BetterAntiCheat.AUMData[item.Value["HashPUID"]] = item.Value["FriendCode"];
}
}
@@ -503,7 +503,7 @@ class BetterDataManager
{
foreach (var item in jsonData["knData"])
{
BAUAntiCheat.KNData[item.Value["HashPUID"]] = item.Value["FriendCode"];
BetterAntiCheat.KNData[item.Value["HashPUID"]] = item.Value["FriendCode"];
}
}
}
+16 -5
View File
@@ -36,13 +36,24 @@ class BetterNotificationManager
BAUNotificationManagerObj.SetActive(true);
NameText.text = $"<color=#00ff44>{Translator.GetString("SystemNotification")}</color>";
TextArea.text = text;
SoundManager.Instance.PlaySound(DestroyableSingleton<HudManager>.Instance.TaskCompleteSound, false, 1f);
SoundManager.Instance.PlaySound(HudManager.Instance.TaskCompleteSound, false, 1f);
Notifying = true;
}
}
internal static void NotifyCheat(PlayerControl player, string reason, string newText = "", bool kickPlayer = true, bool forceBan = false)
{
if (player.IsLocalPlayer())
{
/*
FileChecker.SetHasUnauthorizedFileOrMod();
FileChecker.SetWarningMsg("Tampered client detected!");
Utils.DisconnectSelf("Tampered client detected!");
Utils.DisconnectAccountFromOnline();
*/
return;
}
if (player?.Data == null) return;
var Reason = reason;
@@ -66,9 +77,9 @@ class BetterNotificationManager
rawText = $"{playerDetectedLog}: <color=#0097b5>{player?.BetterData().RealName}</color> " + newText + $": <b><color=#fc0000>{reason}</color></b>";
}
if (!BAUAntiCheat.PlayerData.ContainsKey(Utils.GetHashPuid(player)))
if (!BetterAntiCheat.PlayerData.ContainsKey(Utils.GetHashPuid(player)))
{
BAUAntiCheat.PlayerData[Utils.GetHashPuid(player)] = player.Data.FriendCode;
BetterAntiCheat.PlayerData[Utils.GetHashPuid(player)] = player.Data.FriendCode;
BetterDataManager.SaveCheatData(Utils.GetHashPuid(player), player.Data.FriendCode, player?.BetterData().RealName ?? player.Data.PlayerName, "cheatData", Reason);
Notify(text, Time: 8f);
}
@@ -92,9 +103,9 @@ class BetterNotificationManager
{
if (!localCamera)
{
if (DestroyableSingleton<HudManager>.InstanceExists)
if (HudManager.InstanceExists)
{
localCamera = DestroyableSingleton<HudManager>.Instance.GetComponentInChildren<Camera>();
localCamera = HudManager.Instance.GetComponentInChildren<Camera>();
}
else
{
+18
View File
@@ -0,0 +1,18 @@
namespace BetterAmongUs.Managers;
internal class CustomLoadingBarManager
{
internal static AmongUsLoadingBar? LoadingBar => LoadingBarManager.Instance?.loadingBar;
internal static void ToggleLoadingBar(bool on)
{
LoadingBarManager.Instance.loadingBar.gameObject.SetActive(on);
}
internal static void SetLoadingPercent(float percent, string loadText)
{
var loadingBar = LoadingBarManager.Instance.loadingBar;
loadingBar.SetLoadingPercent(percent, StringNames.None);
loadingBar.loadingText.SetText(loadText);
}
}
+92 -6
View File
@@ -1,5 +1,6 @@
using BepInEx.Unity.IL2CPP.Utils;
using BetterAmongUs.Helpers;
using BetterAmongUs.Items.Structs;
using BetterAmongUs.Modules;
using BetterAmongUs.Modules.AntiCheat;
using HarmonyLib;
@@ -14,6 +15,90 @@ internal class NetworkManager
{
internal static InnerNetClient? InnerNetClient => AmongUsClient.Instance;
// Send non-immediate RPC to game server
internal static void SendToServer(MessageWriter writer)
{
try
{
StreamlineMessage(writer, writer.SendOption);
}
catch (Exception ex)
{
Logger.Error(ex);
}
finally
{
if (InnerNetClient?.connection != null)
{
SendErrors sendErrors = InnerNetClient.connection.Send(writer);
if (sendErrors != SendErrors.None && !GameState.IsFreePlay)
{
InnerNetClient.EnqueueDisconnect(DisconnectReasons.Error, "Failed to send message: " + sendErrors.ToString());
}
}
else
{
InnerNetClient?.EnqueueDisconnect(DisconnectReasons.Custom, "InnerNetClient.connection is null");
}
}
}
// Read non-immediate RPC
internal static void StreamlineMessage(MessageWriter writer, SendOption sendOption)
{
if (!InnerNetClient.InOnlineScene)
{
return;
}
MessageReader[] allReaders = writer.ToReaders();
foreach (MessageReader reader in allReaders)
{
if (reader.Tag == 5 || reader.Tag == 6)
{
ReadData(reader, sendOption);
reader.Recycle();
continue;
}
}
}
// Read data from non-immediate RPC
internal static void ReadData(MessageReader reader, SendOption sendOption)
{
var typeFlag = reader.Tag;
int GameId = reader.ReadInt32();
int ClientId = -1;
if (typeFlag == 6)
{
ClientId = reader.ReadPackedInt32();
}
MessageReader[] allDataReaders = reader.ToReadersNewBuffer();
foreach (MessageReader dataReader in allDataReaders)
{
if (dataReader.Tag == 2)
{
var data = ReadRpc(MessageReader.Get(dataReader), typeFlag, ClientId);
HandleInnerNetObject(data.Sender, (byte)data.CalledRpc, data.Reader);
continue;
}
}
}
// Read rpc data from non-immediate RPC
internal static RPCData ReadRpc(MessageReader reader, byte flag, int targetId)
{
var netId = reader.ReadPackedUInt32();
byte calledId = reader.ReadByte();
return new RPCData(AmongUsClient.Instance.FindObjectByNetId<InnerNetObject>(netId), (SendOption)flag, targetId, (RpcCalls)calledId, reader);
}
// Handle received rpcs from server
public static void HandleGameData(MessageReader parentReader)
{
try
@@ -32,6 +117,7 @@ internal class NetworkManager
}
}
// Handle rpc data
private static IEnumerator HandleGameDataInner(MessageReader reader, int msgNum)
{
int attemptCount = 0;
@@ -283,16 +369,16 @@ internal class NetworkManager
return false;
}
BAUAntiCheat.HandleCheatRPCBeforeCheck(player, callId, reader);
BetterAntiCheat.HandleCheatRPCBeforeCheck(player, callId, reader);
if (BAUAntiCheat.CheckCancelRPC(player, callId, reader) != true)
if (BetterAntiCheat.CheckCancelRPC(player, callId, reader) != true)
{
Logger.LogCheat($"RPC canceled by Anti-Cheat: {Enum.GetName((RpcCalls)callId)}{Enum.GetName((CustomRPC)callId)} - {callId}");
if (!player.IsLocalPlayer()) Logger.LogCheat($"RPC canceled by Anti-Cheat: {Enum.GetName((RpcCalls)callId)}{Enum.GetName((CustomRPC)callId)} - {callId}");
return false;
}
BAUAntiCheat.CheckRPC(player, callId, reader);
RPC.HandleRPC(player, callId, reader);
BetterAntiCheat.CheckRPC(player, callId, reader);
BetterAntiCheat.HandleRPC(player, callId, reader);
return true;
}
@@ -308,7 +394,7 @@ internal class NetworkManager
return false;
}
if (BAUAntiCheat.RpcUpdateSystemCheck(player, systemType, reader) != true) return false;
if (BetterAntiCheat.RpcUpdateSystemCheck(player, systemType, reader) != true) return false;
return true;
}
@@ -8,7 +8,7 @@ using InnerNet;
namespace BetterAmongUs.Modules.AntiCheat;
class BAUAntiCheat
class BetterAntiCheat
{
internal static Dictionary<string, string> PlayerData = []; // HashPuid, FriendCode
internal static Dictionary<string, string> SickoData = []; // HashPuid, FriendCode
@@ -132,7 +132,7 @@ class BAUAntiCheat
{
MessageReader reader = MessageReader.Get(oldReader);
if (player.IsLocalPlayer() || player == null || !IsEnabled) return;
if (!IsEnabled) return;
RPCHandler.HandleRPC(callId, player, reader, HandlerFlag.AntiCheatCheck);
}
@@ -142,8 +142,9 @@ class BAUAntiCheat
{
MessageReader reader = MessageReader.Get(oldReader);
if (player == null || player.IsLocalPlayer() || (player.IsHost() && player.BetterData().IsBetterUser) || reader == null || !IsEnabled || !Main.AntiCheat.Value
|| GameState.IsBetterHostLobby && !GameState.IsHost || !BetterGameSettings.DetectInvalidRPCs.GetBool()) return;
if (player == null || player?.Data == null || reader == null) return;
if (!IsEnabled || !Main.AntiCheat.Value || (GameState.IsBetterHostLobby && !GameState.IsHost) || !BetterGameSettings.DetectInvalidRPCs.GetBool()) return;
if (player.IsLocalPlayer() && player.IsHost()) return;
RPCHandler.HandleRPC(callId, player, reader, HandlerFlag.AntiCheat);
}
@@ -155,9 +156,9 @@ class BAUAntiCheat
{
MessageReader reader = MessageReader.Get(oldReader);
if (PlayerControl.LocalPlayer == null || player == null || player.IsLocalPlayer() || (player.IsHost() && player.BetterData().IsBetterUser) || reader == null) return true;
if (!IsEnabled || !Main.AntiCheat.Value || GameState.IsBetterHostLobby && !GameState.IsHost || !BetterGameSettings.DetectInvalidRPCs.GetBool()) return true;
if (player == null || player?.Data == null || reader == null) return true;
if (!IsEnabled || !Main.AntiCheat.Value || (GameState.IsBetterHostLobby && !GameState.IsHost) || !BetterGameSettings.DetectInvalidRPCs.GetBool()) return true;
if (player.IsLocalPlayer() && player.IsHost()) return true;
if (TrustedRPCs(callId) != true && !player.IsHost())
{
@@ -242,6 +243,16 @@ class BAUAntiCheat
}
}
// Handle RPC received from players
internal static void HandleRPC(PlayerControl player, byte callId, MessageReader oldReader)
{
if (player == null || player?.Data == null || player.IsLocalPlayer()) return;
MessageReader reader = MessageReader.Get(oldReader);
RPCHandler.HandleRPC(callId, player, reader, HandlerFlag.Handle);
}
// Check game states when sabotaging
internal static bool RpcUpdateSystemCheck(PlayerControl player, SystemTypes systemType, MessageReader oldReader)
{
+2 -3
View File
@@ -27,7 +27,7 @@ internal abstract class RPCHandler
.Select(t => (RPCHandler?)Activator.CreateInstance(t))
.ToArray();
internal InnerNetClient innerNetClient => DestroyableSingleton<InnerNetClient>.Instance;
internal InnerNetClient innerNetClient => AmongUsClient.Instance;
internal virtual byte CallId => byte.MaxValue;
internal virtual byte GameDataTag => byte.MaxValue;
internal virtual bool LocalHandling { get; set; }
@@ -62,9 +62,8 @@ internal abstract class RPCHandler
else if (handlerFlag == HandlerFlag.BetterHost) cancel = !handler.BetterHandle(sender, MessageReader.Get(reader));
if (!(cancel)) break;
}
catch (Exception ex)
catch
{
Logger.Error(ex);
}
}
else if (calledId == handler.GameDataTag && handlerFlag == HandlerFlag.HandleGameDataTag)
@@ -30,12 +30,12 @@ internal sealed class AUMChatHandler : RPCHandler
if (!Main.AntiCheat.Value || !BetterGameSettings.DetectCheatClients.GetBool()) return;
var flag = string.IsNullOrEmpty(nameString) && string.IsNullOrEmpty(msgString);
var flag2 = BAUAntiCheat.AUMData.ContainsKey(Utils.GetHashPuid(sender));
var flag2 = BetterAntiCheat.AUMData.ContainsKey(Utils.GetHashPuid(sender));
if (!flag && !flag2)
{
sender.ReportPlayer(ReportReasons.Cheating_Hacking);
BAUAntiCheat.AUMData[Utils.GetHashPuid(sender)] = sender.Data.FriendCode;
BetterAntiCheat.AUMData[Utils.GetHashPuid(sender)] = sender.Data.FriendCode;
BetterDataManager.SaveCheatData(Utils.GetHashPuid(sender), sender.Data.FriendCode, sender.Data.PlayerName, "aumData", "AUM Chat RPC");
BetterNotificationManager.NotifyCheat(sender, Translator.GetString("AntiCheat.Cheat.AUM"), Translator.GetString("AntiCheat.HasBeenDetectedWithCheat2"));
}
+2 -2
View File
@@ -20,12 +20,12 @@ internal sealed class AUMHandler : RPCHandler
if (aumid == sender.PlayerId)
{
var flag = BAUAntiCheat.AUMData.ContainsKey(Utils.GetHashPuid(sender));
var flag = BetterAntiCheat.AUMData.ContainsKey(Utils.GetHashPuid(sender));
if (!flag)
{
sender.ReportPlayer(ReportReasons.Cheating_Hacking);
BAUAntiCheat.AUMData[Utils.GetHashPuid(sender)] = sender.Data.FriendCode;
BetterAntiCheat.AUMData[Utils.GetHashPuid(sender)] = sender.Data.FriendCode;
BetterDataManager.SaveCheatData(Utils.GetHashPuid(sender), sender.Data.FriendCode, sender.Data.PlayerName, "aumData", "AUM RPC");
BetterNotificationManager.NotifyCheat(sender, Translator.GetString("AntiCheat.Cheat.AUM"), Translator.GetString("AntiCheat.HasBeenDetectedWithCheat2"));
}
@@ -16,12 +16,12 @@ internal sealed class KillNetworkChatHandler : RPCHandler
{
if (!Main.AntiCheat.Value || !BetterGameSettings.DetectCheatClients.GetBool()) return;
var flag = BAUAntiCheat.KNData.ContainsKey(Utils.GetHashPuid(sender));
var flag = BetterAntiCheat.KNData.ContainsKey(Utils.GetHashPuid(sender));
if (!flag)
{
sender.ReportPlayer(ReportReasons.Cheating_Hacking);
BAUAntiCheat.KNData[Utils.GetHashPuid(sender)] = sender.Data.FriendCode;
BetterAntiCheat.KNData[Utils.GetHashPuid(sender)] = sender.Data.FriendCode;
BetterDataManager.SaveCheatData(Utils.GetHashPuid(sender), sender.Data.FriendCode, sender.Data.PlayerName, "knData", "KN RPC");
BetterNotificationManager.NotifyCheat(sender, Translator.GetString("AntiCheat.Cheat.KNC"), Translator.GetString("AntiCheat.HasBeenDetectedWithCheat2"));
}
@@ -16,12 +16,12 @@ internal sealed class KillNetworkHandler : RPCHandler
{
if (Main.AntiCheat.Value && BetterGameSettings.DetectCheatClients.GetBool())
{
var flag = BAUAntiCheat.KNData.ContainsKey(Utils.GetHashPuid(sender));
var flag = BetterAntiCheat.KNData.ContainsKey(Utils.GetHashPuid(sender));
if (!flag)
{
sender.ReportPlayer(ReportReasons.Cheating_Hacking);
BAUAntiCheat.KNData[Utils.GetHashPuid(sender)] = sender.Data.FriendCode;
BetterAntiCheat.KNData[Utils.GetHashPuid(sender)] = sender.Data.FriendCode;
BetterDataManager.SaveCheatData(Utils.GetHashPuid(sender), sender.Data.FriendCode, sender.Data.PlayerName, "knData", "KN RPC");
BetterNotificationManager.NotifyCheat(sender, Translator.GetString("AntiCheat.Cheat.KN"), Translator.GetString("AntiCheat.HasBeenDetectedWithCheat2"));
}
@@ -16,12 +16,12 @@ internal sealed class SickoHandler : RPCHandler
{
if (Main.AntiCheat.Value && BetterGameSettings.DetectCheatClients.GetBool())
{
var flag = BAUAntiCheat.SickoData.ContainsKey(Utils.GetHashPuid(sender));
var flag = BetterAntiCheat.SickoData.ContainsKey(Utils.GetHashPuid(sender));
if (reader.BytesRemaining == 0 && !flag)
{
sender.ReportPlayer(ReportReasons.Cheating_Hacking);
BAUAntiCheat.SickoData[Utils.GetHashPuid(sender)] = sender.Data.FriendCode;
BetterAntiCheat.SickoData[Utils.GetHashPuid(sender)] = sender.Data.FriendCode;
BetterDataManager.SaveCheatData(Utils.GetHashPuid(sender), sender.Data.FriendCode, sender.Data.PlayerName, "sickoData", "Sicko Menu RPC");
BetterNotificationManager.NotifyCheat(sender, Translator.GetString("AntiCheat.Cheat.Sicko"), newText: Translator.GetString("AntiCheat.HasBeenDetectedWithCheat2"));
}
+112
View File
@@ -0,0 +1,112 @@
using BetterAmongUs.Helpers;
using System.Text;
using TMPro;
using UnityEngine;
using static BetterAmongUs.Patches.GamePlayManager;
namespace BetterAmongUs.Modules;
internal class BetterPingTracker : MonoBehaviour
{
internal static BetterPingTracker? Instance { get; private set; }
private AspectPosition? aspectPosition;
private TextMeshPro? text;
internal void SetUp(TextMeshPro pingText, AspectPosition pingAspectPosition)
{
if (Instance != null) return;
Instance = this;
text = pingText;
aspectPosition = pingAspectPosition;
}
private void Update()
{
aspectPosition.DistanceFromEdge = new Vector3(4f, 0.1f, -5);
aspectPosition.Alignment = AspectPosition.EdgeAlignments.RightTop;
text.outlineWidth = 0.3f;
PlayerControl Host = AmongUsClient.Instance.GetHost().Character;
StringBuilder sb = new();
if (!GameState.IsFreePlay)
{
sb.AppendFormat("{0}: <b>{1}</b>\n", Translator.GetString("Ping").ToUpper(), GetPingColor(AmongUsClient.Instance.Ping));
}
if (GameState.IsLobby && GameState.IsHost && GameState.IsVanillaServer && !GameState.IsLocalGame)
{
sb.AppendFormat("{0}: <b>{1}</b>\n", Translator.GetString("Timer").ToUpper(), GetTimeColor(GameStartManagerPatch.lobbyTimer));
}
sb.Append($"<color=#00dbdb><size=75%>BetterAmongUs {Main.GetVersionText(true)}</size></color>\n");
sb.Append("<size=68%><color=#8040bf>By</color> <color=#bc4345>The Enhanced Network</color></size>\n");
// sb.Append($"<size=50%><color=#b5b5b5>{Main.Github}</color></size>\n");
if (GameState.IsTOHEHostLobby) sb.Append($"<size=75%><color=#e197dc>TOHE Lobby</color></size>\n");
if (Main.ShowFPS.Value)
{
float FPSNum = 1.0f / Time.deltaTime;
sb.AppendFormat("<color=#0dff00><size=75%>FPS: <b>{0}</b></size></color>\n", (int)FPSNum);
}
// Add Host Info if not in lobby
if (GameState.IsInGamePlay && !GameState.IsFreePlay && Host != null)
{
sb.AppendFormat("<size=75%>{0}: {1}</size>\n", Translator.GetString("Host"), Host.GetPlayerNameAndColor());
}
text.text = sb.ToString();
}
private static string GetPingColor(int ping)
{
string color;
switch (ping)
{
case int n when n > 250:
color = "#ff0000";
break;
case int n when n > 100:
color = "#ffa200";
break;
case int n when n > 50:
color = "#ffff00";
break;
default:
color = "#00f04c";
break;
}
string newPing = $"<color={color}>{ping} ms</color>";
return newPing;
}
private static string GetTimeColor(float time)
{
float minutes = (int)time / 60 + 1f;
string color;
switch (minutes)
{
case float n when n <= 1:
color = "#ff0000";
break;
case float n when n <= 3.5f:
color = "#ffa200";
break;
case float n when n <= 5f:
color = "#ffff00";
break;
default:
color = "#00f04c";
break;
}
string newTime = $"<color={color}>{GameStartManagerPatch.lobbyTimerDisplay}</color>";
return newTime;
}
}
+39 -13
View File
@@ -14,16 +14,17 @@ class FileChecker
private static readonly ReadOnlyCollection<string> TrustedNamespaces = new(new List<string>
{
"System", "Unity", "Harmony", "BepInEx", "Microsoft", "Il2Cpp", "Hazel",
"MonoMod", "netstandard", "mscorlib", "AssetRipper", "Cpp2IL", "AsmResolver", "Iced",
"SemanticVersioning", "Mono.Cecil", "Assembly-CSharp", "StableNameDotNet",
"System", "Unity", "Harmony", "BepInEx", "Microsoft", "Il2Cpp", "Hazel", "AppleAuth", "QRCoder",
"MonoMod", "netstandard", "mscorlib", "AssetRipper", "Cpp2IL", "AsmResolver", "Iced", "CsvHelper",
"SemanticVersioning", "Mono.Cecil", "Assembly-CSharp", "StableNameDotNet", "AmongUsCaching",
"Disarm", "Gee.External.Capstone", "Rewired_Core", "AddressablesPlayAssetDelivery", "Newtonsoft.Json",
"Assembly-CSharp-firstpass", "Sentry", "BetterAmongUs", "MCI", "CrowdedMod", "Mini.RegionInstall", "Unlock", "Skin"
"Assembly-CSharp-firstpass", "Sentry", "Rewired_Windows",
"BetterAmongUs", "MCI", "CrowdedMod", "Mini.RegionInstall", "Unlock", "Skin"
});
private static readonly ReadOnlyCollection<string> UntrustedNamespaces = new(new List<string>
{
"Sicko", "Malum", "Menu", "Cheat", "Hack", "Exploit", "Bypass", "Crack", "Spoof"
"Sicko", "AmongUsMenu", "Malum", "GoatNetClient", "SM", "AUM", "GNC", "MM", "Cheat", "Menu", "Hack", "Exploit", "Bypass", "Crack", "Spoof"
});
private static readonly string[] TrustedPaths =
@@ -48,6 +49,12 @@ class FileChecker
if (enabled) return;
enabled = true;
AppDomain.CurrentDomain.AssemblyLoad += (sender, args) =>
{
CheckUnauthorizedAssemblies();
CheckUnauthorizedFiles();
};
fileWatcher = new FileSystemWatcher(Environment.CurrentDirectory)
{
NotifyFilter = NotifyFilters.FileName | NotifyFilters.LastWrite | NotifyFilters.DirectoryName,
@@ -60,7 +67,7 @@ class FileChecker
fileWatcher.EnableRaisingEvents = true;
CheckUnauthorizedFiles();
CheckUnauthorizedMods();
CheckUnauthorizedAssemblies();
}
private static void CheckUnauthorizedFiles()
@@ -83,31 +90,37 @@ class FileChecker
}
}
private static void CheckUnauthorizedMods()
{
if (hasUnauthorizedFileOrMod) return;
private static readonly HashSet<Assembly> _processedAssemblies = [];
private static void CheckUnauthorizedAssemblies()
{
foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
{
if (assembly.IsDynamic)
if (_processedAssemblies.Contains(assembly) || assembly.IsDynamic)
{
continue;
}
_processedAssemblies.Add(assembly);
if (!TrustedNamespaces.Any(ns => assembly.FullName.Contains(ns, StringComparison.OrdinalIgnoreCase)))
{
WarningMsg = "<#D20200>Unregistered Assembly Detected</color>\n<#9D9D9D><size=70%>Look in logs for further information!</size></color>";
Logger.Warning($"Unauthorized Assembly: {assembly.FullName} (Unregistered Namespace)");
hasUnauthorizedFileOrMod = true;
return;
continue;
}
if (UntrustedNamespaces.Any(ns => assembly.FullName.Contains(ns, StringComparison.OrdinalIgnoreCase)))
{
if (TrustedNamespaces.Any(ns => assembly.FullName.Contains(ns, StringComparison.OrdinalIgnoreCase)))
{
continue;
}
WarningMsg = "<#D20200>Untrusted Assembly Detected</color>\n<#9D9D9D><size=70%>Look in logs for further information!</size></color>";
Logger.Warning($"Unauthorized Assembly: {assembly.FullName} (Untrusted Namespace)");
hasUnauthorizedFileOrMod = true;
return;
continue;
}
if (!IsSafeLocation(assembly))
@@ -115,11 +128,24 @@ class FileChecker
WarningMsg = "<#D20200>Unregistered Assembly Location Detected</color>\n<#9D9D9D><size=70%>Look in logs for further information!</size></color>";
Logger.Warning($"Unauthorized Assembly: {assembly.FullName} (Unregistered Location: {assembly.Location})");
hasUnauthorizedFileOrMod = true;
return;
continue;
}
}
}
internal static void SetHasUnauthorizedFileOrMod()
{
hasUnauthorizedFileOrMod = true;
}
internal static void SetWarningMsg(string msg)
{
if (string.IsNullOrEmpty(WarningMsg))
{
WarningMsg = msg;
}
}
private static bool IsSafeLocation(Assembly assembly)
{
if (string.IsNullOrEmpty(assembly.Location))
+1 -1
View File
@@ -105,7 +105,7 @@ internal static class GameState
internal static bool IsShip => ShipStatus.Instance != null;
internal static bool IsHost => AmongUsClient.Instance != null && AmongUsClient.Instance.AmHost;
internal static bool IsPrivateOnlyLobby => (Main.PrivateOnlyLobby.Value || AmongUsClient.Instance.AmLocalHost) && IsHost;
internal static bool IsBetterHostLobby => PlayerControl.LocalPlayer.IsHost() || Main.AllPlayerControls.Any(pc => pc.IsHost() && pc.BetterData().IsBetterUser);
internal static bool IsBetterHostLobby => PlayerControl.LocalPlayer.IsHost() || Main.AllPlayerControls.Any(pc => pc.IsHost() && pc.BetterData().IsBetterUser && pc.BetterData().IsVerifiedBetterUser);
internal static bool IsTOHEHostLobby => Main.AllPlayerControls.Any(pc => pc.IsHost() && pc.BetterData().IsTOHEHost);
internal static bool IsCanMove => PlayerControl.LocalPlayer?.CanMove is true;
internal static bool IsDead => PlayerControl.LocalPlayer?.Data?.IsDead is true;
+134
View File
@@ -0,0 +1,134 @@
using Il2CppInterop.Runtime;
using System.Reflection;
using UnityEngine;
namespace BetterAmongUs.Modules;
[AttributeUsage(AttributeTargets.Class)]
internal class MonoExtensionAttribute : Attribute
{
internal Type MonoType { get; }
internal Il2CppSystem.Type MonoIl2CppType { get; }
internal MonoExtensionAttribute(Type monoType)
{
MonoType = monoType;
MonoIl2CppType = Il2CppType.From(monoType);
}
}
internal interface IMonoExtension
{
MonoBehaviour? BaseMono { get; set; }
}
internal static class MonoExtensionManager
{
private static readonly Dictionary<Type, List<ExtensionPair>> _extensionsByBaseType = [];
internal static T? Get<T>(MonoBehaviour mono) where T : class, IMonoExtension
{
if (_extensionsByBaseType.TryGetValue(mono.GetType(), out var extensions))
{
foreach (var pair in extensions)
{
if (pair.Base == mono && pair.Extension is T result)
{
return result;
}
}
}
return null;
}
internal static void CleanAll()
{
foreach (var kvp in _extensionsByBaseType.ToArray())
{
var extensions = kvp.Value;
for (int i = extensions.Count - 1; i >= 0; i--)
{
if (extensions[i].Base == null || extensions[i].Extension == null)
{
extensions.RemoveAt(i);
}
}
if (extensions.Count == 0)
{
_extensionsByBaseType.Remove(kvp.Key);
}
}
}
internal static bool RegisterExtension(IMonoExtension extension)
{
var monoAttribute = extension.GetType().GetCustomAttribute<MonoExtensionAttribute>();
if (monoAttribute == null || !monoAttribute.MonoType.IsAssignableTo(typeof(MonoBehaviour)))
{
if (extension is MonoBehaviour mono)
{
UnityEngine.Object.Destroy(mono);
}
return false;
}
var monoBehaviour = extension as MonoBehaviour;
if (monoBehaviour == null) return false;
var baseComponent = monoBehaviour.GetComponent(monoAttribute.MonoIl2CppType) as MonoBehaviour;
if (baseComponent == null)
{
UnityEngine.Object.Destroy(monoBehaviour);
return false;
}
var existingExtensions = monoBehaviour.GetComponents(Il2CppType.From(extension.GetType()));
if (existingExtensions.Length > 1)
{
UnityEngine.Object.Destroy(monoBehaviour);
return false;
}
if (!_extensionsByBaseType.TryGetValue(monoAttribute.MonoType, out var extensions))
{
extensions = [];
_extensionsByBaseType[monoAttribute.MonoType] = extensions;
}
extensions.Add(new ExtensionPair { Base = baseComponent, Extension = extension });
extension.BaseMono = baseComponent;
return true;
}
internal static void UnregisterExtension(IMonoExtension extension)
{
if (extension.BaseMono == null) return;
if (_extensionsByBaseType.TryGetValue(extension.BaseMono.GetType(), out var extensions))
{
for (int i = extensions.Count - 1; i >= 0; i--)
{
if (extensions[i].Extension == extension)
{
extensions.RemoveAt(i);
break;
}
}
if (extensions.Count == 0)
{
_extensionsByBaseType.Remove(extension.BaseMono.GetType());
}
}
}
private struct ExtensionPair
{
public MonoBehaviour? Base;
public IMonoExtension? Extension;
}
}
-10
View File
@@ -1,6 +1,5 @@
using BetterAmongUs.Helpers;
using BetterAmongUs.Managers;
using BetterAmongUs.Modules.AntiCheat;
using Hazel;
namespace BetterAmongUs.Modules;
@@ -145,15 +144,6 @@ internal static class RPC
}
catch { }
}
}
internal static void HandleRPC(PlayerControl player, byte callId, MessageReader oldReader)
{
if (player == null || player.IsLocalPlayer() || player.Data == null) return;
MessageReader reader = MessageReader.Get(oldReader);
RPCHandler.HandleRPC(callId, player, reader, HandlerFlag.Handle);
}
}
+2 -3
View File
@@ -108,7 +108,7 @@ internal static class Translator
string nameToFind = s;
if (Enum.TryParse(nameToFind, out StringNames text))
{
return DestroyableSingleton<TranslationController>.Instance.GetString(text);
return TranslationController.Instance.GetString(text);
}
else
{
@@ -151,8 +151,7 @@ internal static class Translator
}
return res;
}
internal static string GetString(StringNames stringName)
=> DestroyableSingleton<TranslationController>.Instance.GetString(stringName, new Il2CppReferenceArray<Il2CppSystem.Object>(0));
internal static string GetString(StringNames stringName) => TranslationController.Instance.GetString(stringName, new Il2CppReferenceArray<Il2CppSystem.Object>(0));
internal static SupportedLangs GetUserTrueLang()
{
try
+4 -5
View File
@@ -53,7 +53,7 @@ internal static class Zoom
HudManager.Instance.UICamera.orthographicSize *= size;
}
DestroyableSingleton<HudManager>.Instance?.ShadowQuad?.gameObject?.SetActive((reset || Camera.main.orthographicSize == 3.0f) && PlayerControl.LocalPlayer.IsAlive());
HudManager.Instance?.ShadowQuad?.gameObject?.SetActive((reset || Camera.main.orthographicSize == 3.0f) && PlayerControl.LocalPlayer.IsAlive());
if (resetButtons)
{
@@ -62,14 +62,13 @@ internal static class Zoom
}
}
internal static void OnFixedUpdate() =>
DestroyableSingleton<HudManager>.Instance?.ShadowQuad?.gameObject?.SetActive(Camera.main.orthographicSize == 3.0f && PlayerControl.LocalPlayer.IsAlive());
internal static void OnFixedUpdate() => HudManager.Instance?.ShadowQuad?.gameObject?.SetActive(Camera.main.orthographicSize == 3.0f && PlayerControl.LocalPlayer.IsAlive());
}
internal static class Flag
{
private static readonly List<string> oneTimeList = new();
private static readonly List<string> firstRunList = new();
private static readonly List<string> oneTimeList = [];
private static readonly List<string> firstRunList = [];
internal static void Run(Action action, string type, bool firstrun = false)
{
+3 -3
View File
@@ -6,11 +6,11 @@ namespace BetterAmongUs.Patches;
[HarmonyPatch(typeof(ChatNotification))]
internal class ChatNotificationPatch
{
[HarmonyPatch(nameof(ChatNotification.Update))]
[HarmonyPatch(nameof(ChatNotification.SetUp))]
[HarmonyPostfix]
internal static void Update_Postfix(ChatNotification __instance)
internal static void SetUp_Postfix(ChatNotification __instance)
{
__instance.GetComponent<AspectPosition>().DistanceFromEdge = new Vector3(-2.8f, 0.3f, -40f);
__instance.transform.localScale = new Vector3(0.45f, 0.42f);
__instance.transform.localScale = new Vector3(0.45f, 0.42f, 1f);
}
}
+3 -3
View File
@@ -98,11 +98,11 @@ class ChatPatch
if ((sourcePlayer.IsLocalPlayer() || sourcePlayer.BetterData().IsBetterUser))
sbTag.AppendFormat("<color=#0dff00>{1}{0}</color>+++", Translator.GetString("Player.BetterUser"), sourcePlayer.BetterData().IsVerifiedBetterUser || sourcePlayer.IsLocalPlayer() ? "✓ " : "");
if (!string.IsNullOrEmpty(hashPuid) && BAUAntiCheat.SickoData.ContainsKey(hashPuid) || !string.IsNullOrEmpty(friendCode) && BAUAntiCheat.SickoData.ContainsValue(friendCode))
if (!string.IsNullOrEmpty(hashPuid) && BetterAntiCheat.SickoData.ContainsKey(hashPuid) || !string.IsNullOrEmpty(friendCode) && BetterAntiCheat.SickoData.ContainsValue(friendCode))
sbTag.Append($"<color=#00f583>{Translator.GetString("Player.SickoUser")}</color>+++");
else if (!string.IsNullOrEmpty(hashPuid) && BAUAntiCheat.AUMData.ContainsKey(hashPuid) || !string.IsNullOrEmpty(friendCode) && BAUAntiCheat.AUMData.ContainsValue(friendCode))
else if (!string.IsNullOrEmpty(hashPuid) && BetterAntiCheat.AUMData.ContainsKey(hashPuid) || !string.IsNullOrEmpty(friendCode) && BetterAntiCheat.AUMData.ContainsValue(friendCode))
sbTag.Append($"<color=#4f0000>{Translator.GetString("Player.AUMUser")}</color>+++");
else if (!string.IsNullOrEmpty(hashPuid) && BAUAntiCheat.PlayerData.ContainsKey(hashPuid) || !string.IsNullOrEmpty(friendCode) && BAUAntiCheat.PlayerData.ContainsValue(friendCode))
else if (!string.IsNullOrEmpty(hashPuid) && BetterAntiCheat.PlayerData.ContainsKey(hashPuid) || !string.IsNullOrEmpty(friendCode) && BetterAntiCheat.PlayerData.ContainsValue(friendCode))
sbTag.Append($"<color=#fc0000>{Translator.GetString("Player.KnownCheater")}</color>+++");
}
+12 -2
View File
@@ -107,7 +107,15 @@ internal static class OptionsMenuBehaviourPatch
if (LobbyPlayerInfo == null || LobbyPlayerInfo.ToggleButton == null)
{
string title = Translator.GetString("BetterOption.LobbyInfo");
LobbyPlayerInfo = ClientOptionItem.Create(title, Main.LobbyPlayerInfo, __instance);
LobbyPlayerInfo = ClientOptionItem.Create(title, Main.LobbyPlayerInfo, __instance, LobbyPlayerInfoToggle);
static void LobbyPlayerInfoToggle()
{
if (GameState.IsInGame)
{
Utils.DirtyAllNames();
}
}
}
if (DisableLobbyTheme == null || DisableLobbyTheme.ToggleButton == null)
@@ -165,7 +173,9 @@ internal static class OptionsMenuBehaviourPatch
{
ConsoleManager.DetachConsole();
BetterNotificationManager.BAUNotificationManagerObj.DestroyObj();
Harmony.UnpatchAll();
Harmony.UnpatchAll();
ModManager.Instance.ModStamp.gameObject.SetActive(false);
SceneChanger.ChangeScene("MainMenu");
}
}
}
+157 -4
View File
@@ -1,10 +1,12 @@
using BetterAmongUs.Helpers;
using BepInEx.Unity.IL2CPP.Utils;
using BetterAmongUs.Helpers;
using BetterAmongUs.Items;
using BetterAmongUs.Managers;
using BetterAmongUs.Modules;
using HarmonyLib;
using Hazel;
using InnerNet;
using System.Collections;
using UnityEngine;
using UnityEngine.SceneManagement;
@@ -23,7 +25,7 @@ internal class ClientPatch
UserData.TrySetLocalData();
var varSupportedVersions = Main.SupportedAmongUsVersions;
Version currentVersion = new Version(Main.AmongUsVersion);
Version currentVersion = new Version(Main.AppVersion);
Version firstSupportedVersion = new Version(varSupportedVersions.First());
Version lastSupportedVersion = new Version(varSupportedVersions.Last());
@@ -36,7 +38,7 @@ internal class ClientPatch
}
Utils.ShowPopUp($"<size=200%>-= <color=#ff2200><b>Warning</b></color> =-</size>\n\n" +
$"<size=125%><color=#0dff00>Better Among Us {Main.GetVersionText()}</color>\nsupports <color=#4f92ff>Among Us {verText}</color>,\n" +
$"<color=#4f92ff>Among Us <b>{Main.AmongUsVersion}</b></color> is above the supported versions!\n" +
$"<color=#4f92ff>Among Us <b>{Main.AppVersion}</b></color> is above the supported versions!\n" +
$"<color=#ae1700>You may encounter minor to game breaking bugs.</color></size>");
}
else if (currentVersion < lastSupportedVersion)
@@ -48,7 +50,7 @@ internal class ClientPatch
}
Utils.ShowPopUp($"<size=200%>-= <color=#ff2200><b>Warning</b></color> =-</size>\n\n" +
$"<size=125%><color=#0dff00>Better Among Us {Main.GetVersionText()}</color>\nsupports <color=#4f92ff>Among Us {verText}</color>,\n" +
$"<color=#4f92ff>Among Us <b>{Main.AmongUsVersion}</b></color> is below the supported versions!\n" +
$"<color=#4f92ff>Among Us <b>{Main.AppVersion}</b></color> is below the supported versions!\n" +
$"<color=#ae1700>You may encounter minor to game breaking bugs.</color></size>");
}
}
@@ -126,10 +128,161 @@ internal class ClientPatch
}
}, 0.6f, shouldLog: false);
}
[HarmonyPatch(nameof(AmongUsClient.CoStartGame))]
[HarmonyPostfix]
internal static void CoStartGame_Postfix(AmongUsClient __instance)
{
if (Main.ChatInGameplay.Value)
{
ChatPatch.ClearChat();
}
__instance.StartCoroutine(CoLoading());
}
private static IEnumerator CoLoading()
{
CustomLoadingBarManager.ToggleLoadingBar(true);
if (GameState.IsHost)
{
yield return CoLoadingHost();
}
else
{
yield return CoLoadingClient();
}
CustomLoadingBarManager.SetLoadingPercent(100f, "Complete");
yield return new WaitForSeconds(0.25f);
CustomLoadingBarManager.ToggleLoadingBar(false);
}
private static IEnumerator CoLoadingHost()
{
var client = AmongUsClient.Instance.GetClient(AmongUsClient.Instance.ClientId);
var clients = AmongUsClient.Instance.allClients.ToArray();
while (Main.AllPlayerControls.Count > 0 && Main.AllPlayerControls.Any(pc => !pc.roleAssigned))
{
if (!GameState.IsInGame)
{
CustomLoadingBarManager.ToggleLoadingBar(false);
yield break;
}
string loadingText = "Initializing Game";
float progress = 0f;
if (AmongUsClient.Instance.GameState != InnerNetClient.GameStates.Started)
{
loadingText = "Starting Game Session";
progress = 0.1f;
}
else if (LobbyBehaviour.Instance)
{
loadingText = "Loading";
progress = 0.2f;
}
else if (!ShipStatus.Instance || AmongUsClient.Instance.ShipLoadingAsyncHandle.IsValid())
{
bool isShipLoading = AmongUsClient.Instance.ShipLoadingAsyncHandle.IsValid();
loadingText = isShipLoading ? "Loading Ship Async" : "Spawning Ship";
progress = isShipLoading ? 0.3f : 0.4f;
}
else if (Main.AllPlayerControls.Any(player => !player.roleAssigned))
{
int totalPlayers = Main.AllPlayerControls.Count;
int assignedPlayers = Main.AllPlayerControls.Count(pc => pc.roleAssigned);
float assignmentProgress = (float)assignedPlayers / Mathf.Max(1, totalPlayers);
loadingText = $"Assigning Roles ({assignedPlayers}/{totalPlayers})";
progress = 0.4f + (0.3f * assignmentProgress);
}
else if (!client.IsReady)
{
int readyClients = clients.Count(c => c?.Character != null && c.IsReady);
int totalClients = clients.Count(c => c?.Character != null);
loadingText = $"Waiting for Players ({readyClients}/{totalClients})";
progress = 0.8f + (0.2f * readyClients / Mathf.Max(1, totalClients));
}
int percent = Mathf.RoundToInt(progress * 100f);
CustomLoadingBarManager.SetLoadingPercent(percent, loadingText);
yield return null;
}
}
private static IEnumerator CoLoadingClient()
{
var client = AmongUsClient.Instance.GetClient(AmongUsClient.Instance.ClientId);
var clients = AmongUsClient.Instance.allClients.ToArray();
while (Main.AllPlayerControls.Count > 0 && Main.AllPlayerControls.Any(pc => !pc.roleAssigned))
{
if (!GameState.IsInGame)
{
CustomLoadingBarManager.ToggleLoadingBar(false);
yield break;
}
string loadingText = "Initializing Game";
float progress = 0;
if (AmongUsClient.Instance.GameState != InnerNetClient.GameStates.Started)
{
loadingText = "Starting Game Session";
progress = 0.1f;
}
else if (LobbyBehaviour.Instance)
{
loadingText = "Loading";
progress = 0.25f;
}
else if (!ShipStatus.Instance || AmongUsClient.Instance.ShipLoadingAsyncHandle.IsValid())
{
bool isShipLoading = AmongUsClient.Instance.ShipLoadingAsyncHandle.IsValid();
loadingText = isShipLoading ? "Loading Ship Async" : "Spawning Ship";
progress = isShipLoading ? 0.35f : 0.4f;
}
else if (!client.IsReady)
{
loadingText = "Finalizing Connection";
progress = 0.75f;
}
else
{
int readyClients = clients.Count(c => c?.Character != null && c.IsReady);
int totalClients = clients.Count(c => c?.Character != null);
loadingText = $"Waiting for Players ({readyClients}/{totalClients})";
progress = 0.85f + (0.15f * readyClients / Mathf.Max(1, totalClients));
}
int percent = Mathf.RoundToInt(progress * 100f);
CustomLoadingBarManager.SetLoadingPercent(percent, loadingText);
yield return null;
}
}
}
[HarmonyPatch(typeof(InnerNetClient))]
internal class InnerNetClientPatch
{
[HarmonyPatch(nameof(InnerNetClient.SendOrDisconnect))]
[HarmonyPrefix]
public static bool SendOrDisconnect_Prefix(InnerNetClient __instance, MessageWriter msg)
{
NetworkManager.SendToServer(msg);
return false;
}
[HarmonyPatch(nameof(InnerNetClient.HandleGameData))]
[HarmonyPrefix]
internal static bool HandleGameDataInner_Prefix([HarmonyArgument(0)] MessageReader oldReader)
+9 -9
View File
@@ -3,17 +3,17 @@ using HarmonyLib;
namespace BetterAmongUs.Patches;
[HarmonyPatch(typeof(PlayerBanData), nameof(PlayerBanData.BanMinutesLeft), MethodType.Getter)]
[HarmonyPatch(typeof(PlayerBanData))]
internal static class DisconnectPenaltyPatch
{
internal static bool Prefix(PlayerBanData __instance, ref int __result)
[HarmonyPatch(nameof(PlayerBanData.IsBanned), MethodType.Getter)]
[HarmonyPrefix]
internal static bool IsBanned_Prefix(PlayerBanData __instance, ref bool __result)
{
if (__instance.BanPoints != 0f)
{
__instance.BanPoints = 0f;
__result = 0;
return false;
}
return true;
Logger.InGame("TEST");
__instance.BanPoints = 0f;
__instance.banPoints = 0f;
__result = false;
return false;
}
}
+56 -2
View File
@@ -1,4 +1,7 @@
using HarmonyLib;
using BetterAmongUs.Helpers;
using HarmonyLib;
using InnerNet;
using TMPro;
using UnityEngine;
namespace BetterAmongUs.Patches;
@@ -54,11 +57,62 @@ internal class FindAGameManagerPatch
[HarmonyPatch(nameof(FindAGameManager.RefreshList))]
[HarmonyPostfix]
internal static void RefreshList_Postfix()
internal static void RefreshList_Postfix(FindAGameManager __instance)
{
Scroller?.ScrollRelative(new(0f, -100f));
}
[HarmonyPatch(nameof(FindAGameManager.HandleList))]
[HarmonyPostfix]
internal static void HandleList_Postfix(FindAGameManager __instance, HttpMatchmakerManager.FindGamesListFilteredResponse response)
{
__instance.ResetContainers();
GameListing[] games = response.Games.ToArray();
games = [.. games.OrderByDescending(game => game.PlayerCount).ThenBy(game => game.TrueHostName)];
int gameNum = 0;
int count = 0;
while (count < __instance.gameContainers.Length && count < games.Count())
{
if (games[count].Options != null)
{
__instance.gameContainers[gameNum].gameObject.SetActive(true);
__instance.gameContainers[gameNum].SetGameListing(games[count]);
__instance.gameContainers[gameNum].SetupGameInfo();
gameNum++;
}
count++;
}
foreach (var container in __instance.gameContainers)
{
Transform child = container.transform.Find("Container");
Transform tmproObject = child.Find("TrueHostName_TMP");
TMP_Text tmpro = tmproObject != null
? tmproObject.GetComponent<TextMeshPro>()
: CreateNewTextMeshPro(child);
tmpro.font = container.capacity.font;
tmpro.fontSize = 3f;
tmpro.text = FormatGameInfoText(container.gameListing);
}
}
private static TMP_Text CreateNewTextMeshPro(Transform parent)
{
var tmproObject = new GameObject("TrueHostName_TMP").transform;
tmproObject.SetParent(parent, true);
tmproObject.localPosition = new Vector3(7.77f, -2.18f, -1f);
return tmproObject.gameObject.AddComponent<TextMeshPro>();
}
private static string FormatGameInfoText(GameListing listing)
{
var hostStr = !string.IsNullOrEmpty(listing.TrueHostName) ? listing.TrueHostName : listing.HostName;
return @$"{hostStr}{Environment.NewLine}<size=65%>{Utils.GetPlatformName(listing.Platform)} ({GameCode.IntToGameName(listing.GameId)})";
}
private static SpriteRenderer CreateBlackSquareSprite()
{
var square = new GameObject("CutOffTop");
+2 -2
View File
@@ -172,9 +172,9 @@ class GamePlayManager
SummaryObj.name = "SummaryObj (TMP)";
SummaryObj.transform.SetSiblingIndex(0);
Camera localCamera;
if (DestroyableSingleton<HudManager>.InstanceExists)
if (HudManager.InstanceExists)
{
localCamera = DestroyableSingleton<HudManager>.Instance.GetComponentInChildren<Camera>();
localCamera = HudManager.Instance.GetComponentInChildren<Camera>();
}
else
{
+21
View File
@@ -0,0 +1,21 @@
using HarmonyLib;
namespace BetterAmongUs.Patches;
[HarmonyPatch(typeof(LoadingBarManager))]
internal class LoadingBarManagerPatch
{
[HarmonyPatch(nameof(LoadingBarManager.SetLoadingPercent))]
[HarmonyPrefix]
private static bool SetLoadingPercent_Prefix()
{
return false;
}
[HarmonyPatch(nameof(LoadingBarManager.ToggleLoadingBar))]
[HarmonyPrefix]
private static bool ToggleLoadingBart_Prefix()
{
return false;
}
}
-17
View File
@@ -1,17 +0,0 @@
using BetterAmongUs.Helpers;
using HarmonyLib;
using InnerNet;
namespace BetterAmongUs;
[HarmonyPatch(typeof(MatchMakerGameButton))]
class MatchMakerGameButtonPatch
{
[HarmonyPatch(nameof(MatchMakerGameButton.SetGame))]
[HarmonyPostfix]
private static void SetGame_Postfix(MatchMakerGameButton __instance)
{
__instance.NameText.text = $"<b><color=#f4f400>{__instance.myListing.HostName}</color></b>\n";
__instance.NameText.text += $"<size=65%><voffset=0.4m><color=#9c9c9c>{Utils.GetPlatformName(__instance.myListing.Platform)} - {GameCode.IntToGameName(__instance.myListing.GameId)}</color></voffset></size>";
}
}
+4 -4
View File
@@ -135,13 +135,13 @@ class MeetingHudPatch
// Put +++ at the end of each tag
if (!string.IsNullOrEmpty(hashPuid) && BAUAntiCheat.SickoData.ContainsKey(hashPuid) || !string.IsNullOrEmpty(friendCode) && BAUAntiCheat.SickoData.ContainsValue(friendCode))
if (!string.IsNullOrEmpty(hashPuid) && BetterAntiCheat.SickoData.ContainsKey(hashPuid) || !string.IsNullOrEmpty(friendCode) && BetterAntiCheat.SickoData.ContainsValue(friendCode))
sbTag.Append($"<color=#00f583>{Translator.GetString("Player.SickoUser")}</color>+++");
else if (!string.IsNullOrEmpty(hashPuid) && BAUAntiCheat.AUMData.ContainsKey(hashPuid) || !string.IsNullOrEmpty(friendCode) && BAUAntiCheat.AUMData.ContainsValue(friendCode))
else if (!string.IsNullOrEmpty(hashPuid) && BetterAntiCheat.AUMData.ContainsKey(hashPuid) || !string.IsNullOrEmpty(friendCode) && BetterAntiCheat.AUMData.ContainsValue(friendCode))
sbTag.Append($"<color=#4f0000>{Translator.GetString("Player.AUMUser")}</color>+++");
else if (!string.IsNullOrEmpty(hashPuid) && BAUAntiCheat.KNData.ContainsKey(hashPuid) || !string.IsNullOrEmpty(friendCode) && BAUAntiCheat.KNData.ContainsValue(friendCode))
else if (!string.IsNullOrEmpty(hashPuid) && BetterAntiCheat.KNData.ContainsKey(hashPuid) || !string.IsNullOrEmpty(friendCode) && BetterAntiCheat.KNData.ContainsValue(friendCode))
sbTag.Append($"<color=#4f0000>{Translator.GetString("Player.KNUser")}</color>+++");
else if (!string.IsNullOrEmpty(hashPuid) && BAUAntiCheat.PlayerData.ContainsKey(hashPuid) || !string.IsNullOrEmpty(friendCode) && BAUAntiCheat.PlayerData.ContainsValue(friendCode))
else if (!string.IsNullOrEmpty(hashPuid) && BetterAntiCheat.PlayerData.ContainsKey(hashPuid) || !string.IsNullOrEmpty(friendCode) && BetterAntiCheat.PlayerData.ContainsValue(friendCode))
sbTag.Append($"<color=#fc0000>{Translator.GetString("Player.KnownCheater")}</color>+++");
for (int i = 0; i < sbTag.ToString().Split("+++").Length; i++)
+1 -1
View File
@@ -21,7 +21,7 @@ internal class ModManagerPatch
if (__instance.ModStamp.gameObject.active == true)
__instance.ModStamp.GetComponent<SpriteRenderer>().sprite = Utils.LoadSprite("BetterAmongUs.Resources.Images.BetterAmongUs-Mod.png", 250f);
BAUAntiCheat.Update();
BetterAntiCheat.Update();
LateTask.Update(Time.deltaTime);
BetterNotificationManager.Update();
}
+5 -98
View File
@@ -1,9 +1,5 @@
using BetterAmongUs.Helpers;
using BetterAmongUs.Modules;
using BetterAmongUs.Modules;
using HarmonyLib;
using System.Text;
using UnityEngine;
using static BetterAmongUs.Patches.GamePlayManager;
namespace BetterAmongUs.Patches;
@@ -12,101 +8,12 @@ internal class PingTrackerPatch
{
[HarmonyPatch(nameof(PingTracker.Update))]
[HarmonyPrefix]
internal static bool Prefix(PingTracker __instance)
private static bool Prefix(PingTracker __instance)
{
try
{
PlayerControl Host = AmongUsClient.Instance.GetHost().Character;
if (GameState.IsFreePlay)
{
__instance.gameObject.SetActive(false);
}
StringBuilder sb = new();
sb.AppendFormat("{0}: <b>{1}</b>\n", Translator.GetString("Ping").ToUpper(), GetPingColor(AmongUsClient.Instance.Ping));
if (GameState.IsLobby && GameState.IsHost && GameState.IsVanillaServer && !GameState.IsLocalGame)
{
sb.AppendFormat("{0}: <b>{1}</b>\n", Translator.GetString("Timer").ToUpper(), GetTimeColor(GameStartManagerPatch.lobbyTimer));
}
sb.Append($"<color=#00dbdb><size=75%>BetterAmongUs {Main.GetVersionText(true)}</size></color>\n");
sb.Append("<size=68%><color=#8040bf>By</color> <color=#bc4345>The Enhanced Network</color></size>\n");
// sb.Append($"<size=50%><color=#b5b5b5>{Main.Github}</color></size>\n");
if (GameState.IsTOHEHostLobby) sb.Append($"<size=75%><color=#e197dc>TOHE Lobby</color></size>\n");
if (Main.ShowFPS.Value)
{
float FPSNum = 1.0f / Time.deltaTime;
sb.AppendFormat("<color=#0dff00><size=75%>FPS: <b>{0}</b></size></color>\n", (int)FPSNum);
}
// Add Host Info if not in lobby
if (GameState.IsInGamePlay && Host != null)
{
sb.AppendFormat("<size=75%>{0}: {1}</size>\n", Translator.GetString("Host"), Host.GetPlayerNameAndColor());
}
__instance.aspectPosition.DistanceFromEdge = new Vector3(4f, 0.1f, -5);
__instance.aspectPosition.Alignment = AspectPosition.EdgeAlignments.RightTop;
__instance.text.outlineWidth = 0.3f;
__instance.text.text = sb.ToString();
}
catch { }
var betterPingTracker = __instance.gameObject.AddComponent<BetterPingTracker>();
betterPingTracker.SetUp(__instance.text, __instance.aspectPosition);
__instance.enabled = false;
return false;
}
private static string GetPingColor(int ping)
{
string color;
switch (ping)
{
case int n when n > 250:
color = "#ff0000";
break;
case int n when n > 100:
color = "#ffa200";
break;
case int n when n > 50:
color = "#ffff00";
break;
default:
color = "#00f04c";
break;
}
string newPing = $"<color={color}>{ping} ms</color>";
return newPing;
}
private static string GetTimeColor(float time)
{
float minutes = (int)time / 60 + 1f;
string color;
switch (minutes)
{
case float n when n <= 1:
color = "#ff0000";
break;
case float n when n <= 3.5f:
color = "#ffa200";
break;
case float n when n <= 5f:
color = "#ffff00";
break;
default:
color = "#00f04c";
break;
}
string newTime = $"<color={color}>{GameStartManagerPatch.lobbyTimerDisplay}</color>";
return newTime;
}
}
+8 -8
View File
@@ -164,26 +164,26 @@ class PlayerControlPatch
private static void SetPlayerOutline(PlayerControl player, string hashPuid, string friendCode, StringBuilder sbTag)
{
var color = player.cosmetics.currentBodySprite.BodySprite.material.GetColor("_OutlineColor");
if ((!string.IsNullOrEmpty(hashPuid) && hashPuid.Length > 0 && BAUAntiCheat.SickoData.ContainsKey(hashPuid))
|| (!string.IsNullOrEmpty(friendCode) && friendCode.Length > 0 && BAUAntiCheat.SickoData.ContainsValue(friendCode)))
if ((!string.IsNullOrEmpty(hashPuid) && hashPuid.Length > 0 && BetterAntiCheat.SickoData.ContainsKey(hashPuid))
|| (!string.IsNullOrEmpty(friendCode) && friendCode.Length > 0 && BetterAntiCheat.SickoData.ContainsValue(friendCode)))
{
sbTag.Append($"<color=#00f583>{Translator.GetString("Player.SickoUser")}</color>+++");
player.SetOutlineByHex(true, "#00f583");
}
else if ((!string.IsNullOrEmpty(hashPuid) && hashPuid.Length > 0 && BAUAntiCheat.AUMData.ContainsKey(hashPuid))
|| (!string.IsNullOrEmpty(friendCode) && friendCode.Length > 0 && BAUAntiCheat.AUMData.ContainsValue(friendCode)))
else if ((!string.IsNullOrEmpty(hashPuid) && hashPuid.Length > 0 && BetterAntiCheat.AUMData.ContainsKey(hashPuid))
|| (!string.IsNullOrEmpty(friendCode) && friendCode.Length > 0 && BetterAntiCheat.AUMData.ContainsValue(friendCode)))
{
sbTag.Append($"<color=#4f0000>{Translator.GetString("Player.AUMUser")}</color>+++");
player.SetOutlineByHex(true, "#4f0000");
}
else if ((!string.IsNullOrEmpty(hashPuid) && hashPuid.Length > 0 && BAUAntiCheat.KNData.ContainsKey(hashPuid))
|| (!string.IsNullOrEmpty(friendCode) && friendCode.Length > 0 && BAUAntiCheat.KNData.ContainsValue(friendCode)))
else if ((!string.IsNullOrEmpty(hashPuid) && hashPuid.Length > 0 && BetterAntiCheat.KNData.ContainsKey(hashPuid))
|| (!string.IsNullOrEmpty(friendCode) && friendCode.Length > 0 && BetterAntiCheat.KNData.ContainsValue(friendCode)))
{
sbTag.Append($"<color=#8731e7>{Translator.GetString("Player.KNUser")}</color>+++");
player.SetOutlineByHex(true, "#8731e7");
}
else if ((!string.IsNullOrEmpty(hashPuid) && hashPuid.Length > 0 && BAUAntiCheat.PlayerData.ContainsKey(hashPuid))
|| (!string.IsNullOrEmpty(friendCode) && friendCode.Length > 0 && BAUAntiCheat.PlayerData.ContainsValue(friendCode)))
else if ((!string.IsNullOrEmpty(hashPuid) && hashPuid.Length > 0 && BetterAntiCheat.PlayerData.ContainsKey(hashPuid))
|| (!string.IsNullOrEmpty(friendCode) && friendCode.Length > 0 && BetterAntiCheat.PlayerData.ContainsValue(friendCode)))
{
sbTag.Append($"<color=#fc0000>{Translator.GetString("Player.KnownCheater")}</color>+++");
player.SetOutlineByHex(true, "#fc0000");
+2 -2
View File
@@ -108,7 +108,7 @@ class GameDataShowNotificationPatch
Logger.Log(ReasonText);
DestroyableSingleton<HudManager>.Instance.Notifier.AddDisconnectMessage(ReasonText);
HudManager.Instance.Notifier.AddDisconnectMessage(ReasonText);
}
else
{
@@ -144,7 +144,7 @@ class GameDataShowNotificationPatch
Logger.Log(ReasonText);
DestroyableSingleton<HudManager>.Instance.Notifier.AddDisconnectMessage(ReasonText);
HudManager.Instance.Notifier.AddDisconnectMessage(ReasonText);
}
}
+99
View File
@@ -0,0 +1,99 @@
using HarmonyLib;
using Il2CppInterop.Runtime.InteropTypes.Arrays;
using UnityEngine;
using UnityEngine.SceneManagement;
namespace BetterAmongUs.Patches;
[HarmonyPatch]
internal class ServerDropdownPatch
{
[HarmonyPatch(typeof(FindAGameManager))]
[HarmonyPatch(nameof(FindAGameManager.Start))]
[HarmonyPrefix]
internal static void Start_Prefix(FindAGameManager __instance)
{
var aspectPosition = __instance.serverDropdown.transform.parent.GetComponent<AspectPosition>();
if (aspectPosition != null)
{
aspectPosition.Alignment = AspectPosition.EdgeAlignments.Top;
aspectPosition.anchorPoint = Vector3.zero;
aspectPosition.DistanceFromEdge = new Vector3(-1.2f, 0.3f, 0f);
aspectPosition.AdjustPosition();
}
__instance.modeText.transform.localPosition -= new Vector3(0.4f, 0f, 0f);
}
[HarmonyPatch(typeof(ServerDropdown))]
[HarmonyPatch(nameof(ServerDropdown.FillServerOptions))]
[HarmonyPrefix]
internal static bool FillServerOptions_Prefix(ServerDropdown __instance)
{
__instance.background.size = new Vector2(5, 1);
int num = 0;
int column = 0;
int maxPerColumn = SceneManager.GetActiveScene().name == "FindAGame" ? 10 : 6;
const float columnWidth = 3.5f;
const float buttonSpacing = 0.5f;
// Get all available regions except current one
var regions = ServerManager.Instance.AvailableRegions.OrderBy(ServerManager.DefaultRegions.Contains).ToList();
// Calculate total columns needed
int totalColumns = Mathf.Max(1, Mathf.CeilToInt(regions.Count / (float)maxPerColumn));
int rowsInLastColumn = regions.Count % maxPerColumn;
int maxRows = (regions.Count > maxPerColumn) ? maxPerColumn : regions.Count;
foreach (IRegionInfo regionInfo in regions)
{
if (ServerManager.Instance.CurrentRegion.Name == regionInfo.Name)
{
__instance.defaultButtonSelected = __instance.firstOption;
__instance.firstOption.ChangeButtonText(TranslationController.Instance.GetStringWithDefault(regionInfo.TranslateName, regionInfo.Name, new Il2CppReferenceArray<Il2CppSystem.Object>(0)));
continue;
}
IRegionInfo region = regionInfo;
ServerListButton serverListButton = __instance.ButtonPool.Get<ServerListButton>();
// Calculate position based on column and row
float xPos = (column - (totalColumns - 1) / 2f) * columnWidth;
float yPos = __instance.y_posButton - buttonSpacing * (num % maxPerColumn);
serverListButton.transform.localPosition = new Vector3(xPos, yPos, -1f);
serverListButton.transform.localScale = Vector3.one;
serverListButton.Text.enableAutoSizing = true;
serverListButton.Text.text = TranslationController.Instance.GetStringWithDefault(
regionInfo.TranslateName,
regionInfo.Name,
new Il2CppReferenceArray<Il2CppSystem.Object>(0));
serverListButton.Text.ForceMeshUpdate(false, false);
serverListButton.Button.OnClick.RemoveAllListeners();
serverListButton.Button.OnClick.AddListener((Action)(() => __instance.ChooseOption(region)));
__instance.controllerSelectable.Add(serverListButton.Button);
// Move to next column if current column is full
num++;
if (num % maxPerColumn == 0)
{
column++;
}
}
// Calculate background dimensions
float backgroundHeight = 1.2f + buttonSpacing * (maxRows - 1);
float backgroundWidth = (totalColumns > 1) ?
(columnWidth * (totalColumns - 1) + __instance.background.size.x) :
__instance.background.size.x;
__instance.background.transform.localPosition = new Vector3(
0f,
__instance.initialYPos - (backgroundHeight - 1.2f) / 2f,
0f);
__instance.background.size = new Vector2(backgroundWidth, backgroundHeight);
return false;
}
}
+1 -1
View File
@@ -13,6 +13,6 @@ internal class VersionShowerPatch
{
string mark = Translator.GetString("BAUMark");
string bau = Translator.GetString("BAU");
__instance.text.text = $"<color=#0dff00>{mark}{bau}{mark} {Main.GetVersionText()}</color> <color=#ababab>~</color> {Utils.GetPlatformName(Main.PlatformData.Platform)} v{Main.AmongUsVersion}";
__instance.text.text = $"<color=#0dff00>{mark}{bau}{mark} {Main.GetVersionText()}</color> <color=#ababab>~</color> {Utils.GetPlatformName(Main.PlatformData.Platform)} v{Main.AmongUsVersion} ({Main.AppVersion})";
}
}
+7 -5
View File
@@ -28,12 +28,12 @@ internal enum ReleaseTypes : int
internal class Main : BasePlugin
{
internal static readonly ReleaseTypes ReleaseBuildType = ReleaseTypes.Beta;
internal const string BetaNum = "1";
internal const string BetaNum = "2";
internal const string HotfixNum = "0";
internal const bool IsHotFix = false;
internal const string PluginGuid = "com.ten.betteramongus";
internal const string PluginVersion = "1.1.6";
internal const string ReleaseDate = "3.25.2025"; // mm/dd/yyyy
internal const string ReleaseDate = "3.29.2025"; // mm/dd/yyyy
internal const string Github = "https://github.com/EnhancedNetwork/BetterAmongUs-Public";
internal const string Discord = "https://discord.gg/ten";
internal static UserData MyData = UserData.AllUsers.First();
@@ -78,10 +78,12 @@ internal class Main : BasePlugin
return text;
}
internal Harmony Harmony { get; } = new Harmony(PluginGuid);
internal static Harmony Harmony { get; } = new Harmony(PluginGuid);
internal static string BetterAmongUsVersion => PluginVersion;
internal static string AmongUsVersion => Application.version;
internal static string AppVersion => Application.version;
internal static string AmongUsVersion => ReferenceDataManager.Instance.Refdata.userFacingVersion;
internal static PlatformSpecificData PlatformData => Constants.GetPlatformData();
@@ -181,7 +183,7 @@ internal class Main : BasePlugin
string SupportedVersions = string.Empty;
foreach (string text in SupportedAmongUsVersions.ToArray())
SupportedVersions += $"{text} ";
BetterAmongUs.Logger.Log($"BetterAmongUs {BetterAmongUsVersion}-{ReleaseDate} - [{AmongUsVersion} --> {SupportedVersions.Substring(0, SupportedVersions.Length - 1)}] {Utils.GetPlatformName(PlatformData.Platform)}");
BetterAmongUs.Logger.Log($"BetterAmongUs {BetterAmongUsVersion}-{ReleaseDate} - [{AppVersion} --> {SupportedVersions.Substring(0, SupportedVersions.Length - 1)}] {Utils.GetPlatformName(PlatformData.Platform)}");
}
catch (Exception ex)
{