diff --git a/MiraAPI/GameOptions/IModdedOption.cs b/MiraAPI/GameOptions/IModdedOption.cs
index 315fe2ef..a40c9460 100644
--- a/MiraAPI/GameOptions/IModdedOption.cs
+++ b/MiraAPI/GameOptions/IModdedOption.cs
@@ -77,6 +77,11 @@ public interface IModdedOption
///
bool IncludeInPreset { get; set; }
+ ///
+ /// Gets or sets a value indicating whether the option should show a notification, toggled on by an overall option synchronization.
+ ///
+ public bool ShowNotification { get; set; }
+
///
/// Gets or sets the for the option, used for BepInEx configuration.
///
diff --git a/MiraAPI/GameOptions/ModdedOptionsManager.cs b/MiraAPI/GameOptions/ModdedOptionsManager.cs
index 3e11b3d1..0fb10bb3 100644
--- a/MiraAPI/GameOptions/ModdedOptionsManager.cs
+++ b/MiraAPI/GameOptions/ModdedOptionsManager.cs
@@ -365,11 +365,11 @@ public static class ModdedOptionsManager
while (chunks.Count > 0)
{
- Rpc.Instance.SendTo(PlayerControl.LocalPlayer, targetId, chunks.Dequeue());
+ Rpc.Instance.SendTo(PlayerControl.LocalPlayer, targetId, new MiraOptionNetData(false, chunks.Dequeue()));
}
}
- internal static void HandleSyncOptions(NetData[] data)
+ internal static void HandleSyncOptions(bool showNotifs, NetData[] data)
{
// necessary to disable then re-enable this setting
// we don't know how other plugins handle their configs
@@ -388,6 +388,7 @@ public static class ModdedOptionsManager
continue;
}
+ option.ShowNotification = showNotifs;
option.HandleNetData(netData.Data);
}
@@ -397,7 +398,7 @@ public static class ModdedOptionsManager
plugin.PluginConfig.SaveOnConfigSet = oldConfigSetting[plugin];
}
- if (LobbyInfoPane.Instance)
+ if (LobbyInfoPane.InstanceExists)
{
LobbyInfoPane.Instance.RefreshPane();
}
diff --git a/MiraAPI/GameOptions/OptionTypes/ModdedEnumOption.cs b/MiraAPI/GameOptions/OptionTypes/ModdedEnumOption.cs
index 7931d02a..2f209b58 100644
--- a/MiraAPI/GameOptions/OptionTypes/ModdedEnumOption.cs
+++ b/MiraAPI/GameOptions/OptionTypes/ModdedEnumOption.cs
@@ -93,13 +93,16 @@ public class ModdedEnumOption : ModdedOption
///
protected override void OnValueChanged(int newValue)
{
- ModdedOptionsManager.AddSettingsChangeMessage(
- HudManager.Instance.Notifier,
- StringName,
- Data.GetValueString(newValue),
- Configuration.PopUpTextColor,
- Configuration.PopUpIconTmp,
- false);
+ if (ShowNotification)
+ {
+ ModdedOptionsManager.AddSettingsChangeMessage(
+ HudManager.Instance.Notifier,
+ StringName,
+ Data.GetValueString(newValue),
+ Configuration.PopUpTextColor,
+ Configuration.PopUpIconTmp,
+ false);
+ }
if (!OptionBehaviour)
{
return;
@@ -196,13 +199,17 @@ public class ModdedEnumOption : ModdedOption
///
protected override void OnValueChanged(T newValue)
{
- ModdedOptionsManager.AddSettingsChangeMessage(
- HudManager.Instance.Notifier,
- StringName,
- Data.GetValueString(Convert.ToInt32(newValue, NumberFormatInfo.InvariantInfo)),
- Configuration.PopUpTextColor,
- Configuration.PopUpIconTmp,
- false);
+ if (ShowNotification)
+ {
+ ModdedOptionsManager.AddSettingsChangeMessage(
+ HudManager.Instance.Notifier,
+ StringName,
+ Data.GetValueString(Convert.ToInt32(newValue, NumberFormatInfo.InvariantInfo)),
+ Configuration.PopUpTextColor,
+ Configuration.PopUpIconTmp,
+ false);
+ }
+
if (!OptionBehaviour)
{
return;
diff --git a/MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs b/MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs
index f27ed135..3f3be883 100644
--- a/MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs
+++ b/MiraAPI/GameOptions/OptionTypes/ModdedNumberOption.cs
@@ -199,13 +199,16 @@ public class ModdedNumberOption : ModdedOption
protected override void OnValueChanged(float newValue)
{
Value = Mathf.Clamp(newValue, Min, Max);
- ModdedOptionsManager.AddSettingsChangeMessage(
- HudManager.Instance.Notifier,
- StringName,
- Data.GetValueString(newValue),
- Configuration.PopUpTextColor,
- Configuration.PopUpIconTmp,
- false);
+ if (ShowNotification)
+ {
+ ModdedOptionsManager.AddSettingsChangeMessage(
+ HudManager.Instance.Notifier,
+ StringName,
+ Data.GetValueString(newValue),
+ Configuration.PopUpTextColor,
+ Configuration.PopUpIconTmp,
+ false);
+ }
if (OptionBehaviour is NumberOption opt)
{
diff --git a/MiraAPI/GameOptions/OptionTypes/ModdedOption.cs b/MiraAPI/GameOptions/OptionTypes/ModdedOption.cs
index e2486ae0..88b73642 100644
--- a/MiraAPI/GameOptions/OptionTypes/ModdedOption.cs
+++ b/MiraAPI/GameOptions/OptionTypes/ModdedOption.cs
@@ -79,6 +79,9 @@ public abstract class ModdedOption : IModdedOption
///
public bool IncludeInPreset { get; set; }
+ ///
+ public bool ShowNotification { get; set; } = true;
+
///
public OptionBehaviour? OptionBehaviour { get; protected set; }
@@ -156,10 +159,11 @@ public abstract class ModdedOption : IModdedOption
entry.Value = _value;
}
- Rpc.Instance.Send(PlayerControl.LocalPlayer, [GetNetData()], true);
+ Rpc.Instance.Send(PlayerControl.LocalPlayer, new MiraOptionNetData(true, [GetNetData()]), true);
}
OnValueChanged(_value);
+ ShowNotification = true;
}
///
diff --git a/MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs b/MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs
index a0759c67..31f04d12 100644
--- a/MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs
+++ b/MiraAPI/GameOptions/OptionTypes/ModdedToggleOption.cs
@@ -99,13 +99,17 @@ public class ModdedToggleOption : ModdedOption
///
protected override void OnValueChanged(bool newValue)
{
- ModdedOptionsManager.AddSettingsChangeMessage(
- HudManager.Instance.Notifier,
- StringName,
- (newValue ? OnValue : OffValue).Translate(),
- Configuration.PopUpTextColor,
- Configuration.PopUpIconTmp,
- false);
+ if (ShowNotification)
+ {
+ ModdedOptionsManager.AddSettingsChangeMessage(
+ HudManager.Instance.Notifier,
+ StringName,
+ (newValue ? OnValue : OffValue).Translate(),
+ Configuration.PopUpTextColor,
+ Configuration.PopUpIconTmp,
+ false);
+ }
+
if (!OptionBehaviour)
{
return;
diff --git a/MiraAPI/Networking/SyncOptionsRpc.cs b/MiraAPI/Networking/SyncOptionsRpc.cs
index 6de19337..56e0cc9a 100644
--- a/MiraAPI/Networking/SyncOptionsRpc.cs
+++ b/MiraAPI/Networking/SyncOptionsRpc.cs
@@ -9,29 +9,32 @@ namespace MiraAPI.Networking;
[RegisterCustomRpc((uint)MiraRpc.SyncGameOptions)]
#pragma warning disable SA1515 // Single-line comment should be preceded by blank line (Justification: ReSharper suppression.)
// ReSharper disable once ClassNeverInstantiated.Global (Justification: Instantiated by Reactor.)
-internal sealed class SyncOptionsRpc(MiraApiPlugin plugin, uint id) : PlayerCustomRpc(plugin, id)
+internal sealed class SyncOptionsRpc(MiraApiPlugin plugin, uint id) : PlayerCustomRpc(plugin, id)
#pragma warning restore SA1515 // Single-line comment should be preceded by blank line
{
public override RpcLocalHandling LocalHandling => RpcLocalHandling.None;
- public override void Write(MessageWriter writer, NetData[]? data)
+ public override void Write(MessageWriter writer, MiraOptionNetData data)
{
- if (data == null)
+ /*if (data == null)
{
writer.WritePacked(0U);
return;
- }
+ }*/
- writer.WritePacked((uint)data.Length);
- foreach (var netData in data)
+ var info = data.Data;
+ writer.Write(data.ShouldShowNotifications);
+ writer.WritePacked((uint)info.Length);
+ foreach (var netData in info)
{
writer.WritePacked(netData.Id);
writer.WriteBytesAndSize(netData.Data);
}
}
- public override NetData[] Read(MessageReader reader)
+ public override MiraOptionNetData Read(MessageReader reader)
{
+ var shouldShowNotif = reader.ReadBoolean();
var length = reader.ReadPackedUInt32();
var data = new NetData[length];
for (var i = 0; i < length; i++)
@@ -41,16 +44,16 @@ internal sealed class SyncOptionsRpc(MiraApiPlugin plugin, uint id) : PlayerCust
data[i] = new NetData(dataId, bytes);
}
- return data;
+ return new MiraOptionNetData(shouldShowNotif, data);
}
- public override void Handle(PlayerControl playerControl, NetData[]? data)
+ public override void Handle(PlayerControl playerControl, MiraOptionNetData data)
{
if (AmongUsClient.Instance.HostId != playerControl.OwnerId)
{
return;
}
- ModdedOptionsManager.HandleSyncOptions(data ?? []);
+ ModdedOptionsManager.HandleSyncOptions(data.ShouldShowNotifications, data.Data ?? []);
}
}
diff --git a/MiraAPI/Networking/SyncRoleOptionsRpc.cs b/MiraAPI/Networking/SyncRoleOptionsRpc.cs
index fb0f2af5..f59a6416 100644
--- a/MiraAPI/Networking/SyncRoleOptionsRpc.cs
+++ b/MiraAPI/Networking/SyncRoleOptionsRpc.cs
@@ -5,32 +5,41 @@ using Reactor.Networking.Rpc;
namespace MiraAPI.Networking;
+internal readonly struct MiraOptionNetData(bool showNotif, NetData[] data)
+{
+ public bool ShouldShowNotifications { get; } = showNotif;
+ public NetData[] Data { get; } = data;
+}
+
[RegisterCustomRpc((uint)MiraRpc.SyncRoleOptions)]
#pragma warning disable SA1515 // Single-line comment should be preceded by blank line (Justification: ReSharper suppression.)
// ReSharper disable once ClassNeverInstantiated.Global (Justification: Instantiated by Reactor.)
-internal sealed class SyncRoleOptionsRpc(MiraApiPlugin plugin, uint id) : PlayerCustomRpc(plugin, id)
+internal sealed class SyncRoleOptionsRpc(MiraApiPlugin plugin, uint id) : PlayerCustomRpc(plugin, id)
#pragma warning restore SA1515 // Single-line comment should be preceded by blank line
{
public override RpcLocalHandling LocalHandling => RpcLocalHandling.None;
- public override void Write(MessageWriter writer, NetData[]? data)
+ public override void Write(MessageWriter writer, MiraOptionNetData data)
{
- if (data == null)
+ /*if (data == null)
{
writer.WritePacked(0U);
return;
- }
+ }*/
- writer.WritePacked((uint)data.Length);
- foreach (var netData in data)
+ var info = data.Data;
+ writer.Write(data.ShouldShowNotifications);
+ writer.WritePacked((uint)info.Length);
+ foreach (var netData in info)
{
writer.WritePacked(netData.Id);
writer.WriteBytesAndSize(netData.Data);
}
}
- public override NetData[] Read(MessageReader reader)
+ public override MiraOptionNetData Read(MessageReader reader)
{
+ var shouldShowNotif = reader.ReadBoolean();
var length = reader.ReadPackedUInt32();
var data = new NetData[length];
for (var i = 0; i < length; i++)
@@ -40,16 +49,16 @@ internal sealed class SyncRoleOptionsRpc(MiraApiPlugin plugin, uint id) : Player
data[i] = new NetData(dataId, bytes);
}
- return data;
+ return new MiraOptionNetData(shouldShowNotif, data);
}
- public override void Handle(PlayerControl playerControl, NetData[]? data)
+ public override void Handle(PlayerControl playerControl, MiraOptionNetData data)
{
if (AmongUsClient.Instance.HostId != playerControl.OwnerId)
{
return;
}
- CustomRoleManager.HandleSyncRoleOptions(data ?? []);
+ CustomRoleManager.HandleSyncRoleOptions(data.ShouldShowNotifications, data.Data ?? []);
}
}
diff --git a/MiraAPI/Patches/GameModes/GameManagerPatches.cs b/MiraAPI/Patches/GameModes/GameManagerPatches.cs
index 72b53d61..4bf6ef4b 100644
--- a/MiraAPI/Patches/GameModes/GameManagerPatches.cs
+++ b/MiraAPI/Patches/GameModes/GameManagerPatches.cs
@@ -1,5 +1,7 @@
using HarmonyLib;
using MiraAPI.GameModes;
+using MiraAPI.GameOptions;
+using MiraAPI.Roles;
namespace MiraAPI.Patches.GameModes;
@@ -55,4 +57,17 @@ internal static class GameStartManagerPatches
__instance.MinPlayers = 1;
}
}
+
+ [HarmonyPrefix, HarmonyPatch(nameof(GameStartManager.BeginGame))]
+ public static void Prefix(GameStartManager __instance)
+ {
+ if (!AmongUsClient.Instance.AmHost)
+ {
+ return;
+ }
+
+ ModdedOptionsManager.SyncAllOptions();
+ CustomRoleManager.SyncAllRoleSettings();
+ GameModeOption.RpcSyncGamemode(PlayerControl.LocalPlayer, GameModeOption.Value);
+ }
}
diff --git a/MiraAPI/Patches/HudManagerPatches.cs b/MiraAPI/Patches/HudManagerPatches.cs
index ad12c68d..75b0e5e7 100644
--- a/MiraAPI/Patches/HudManagerPatches.cs
+++ b/MiraAPI/Patches/HudManagerPatches.cs
@@ -29,7 +29,7 @@ public static class HudManagerPatches
public static IEnumerator CoResizeUI()
{
- while (!HudManager.Instance) yield return null;
+ while (!HudManager.InstanceExists) yield return null;
yield return new WaitForSeconds(0.01f);
ResizeUI(LocalSettingsTabSingleton.Instance.ButtonUIFactorSlider.Value);
diff --git a/MiraAPI/Patches/Options/RoleSettingMenuPatches.cs b/MiraAPI/Patches/Options/RoleSettingMenuPatches.cs
index c05018c7..a7bfb166 100644
--- a/MiraAPI/Patches/Options/RoleSettingMenuPatches.cs
+++ b/MiraAPI/Patches/Options/RoleSettingMenuPatches.cs
@@ -495,7 +495,7 @@ public static class RoleSettingMenuPatches
if (AmongUsClient.Instance.AmHost)
{
- Rpc.Instance.Send(PlayerControl.LocalPlayer, [role.GetNetData()], true);
+ Rpc.Instance.Send(PlayerControl.LocalPlayer, new MiraOptionNetData(true, [role.GetNetData()]), true);
}
GameOptionsManager.Instance.GameHostOptions = GameOptionsManager.Instance.CurrentGameOptions;
diff --git a/MiraAPI/Roles/CustomRoleManager.cs b/MiraAPI/Roles/CustomRoleManager.cs
index 0548eaa7..314f2589 100644
--- a/MiraAPI/Roles/CustomRoleManager.cs
+++ b/MiraAPI/Roles/CustomRoleManager.cs
@@ -280,11 +280,11 @@ public static class CustomRoleManager
while (data.Count > 0)
{
- Rpc.Instance.SendTo(PlayerControl.LocalPlayer, targetId, data.Dequeue());
+ Rpc.Instance.SendTo(PlayerControl.LocalPlayer, targetId, new MiraOptionNetData(false, data.Dequeue()));
}
}
- internal static void HandleSyncRoleOptions(NetData[] data)
+ internal static void HandleSyncRoleOptions(bool showNotifs, NetData[] data)
{
// necessary to disable then re-enable this setting
// we don't know how other plugins handle their configs
@@ -312,7 +312,10 @@ public static class CustomRoleManager
var num = BitConverter.ToInt32(netData.Data, 0);
var chance = BitConverter.ToInt32(netData.Data, 4);
- HudManager.Instance.Notifier.AddRoleSettingsChangeMessage(role.StringName, num, chance, role.TeamType, false);
+ if (showNotifs)
+ {
+ HudManager.Instance.Notifier.AddRoleSettingsChangeMessage(role.StringName, num, chance, role.TeamType, false);
+ }
try
{