diff --git a/AmongUs.props b/AmongUs.props index 2575d6a..33c571f 100644 --- a/AmongUs.props +++ b/AmongUs.props @@ -2,7 +2,7 @@ - + diff --git a/MiraAPI/GameOptions/IModdedOption.cs b/MiraAPI/GameOptions/IModdedOption.cs index 544d64b..eff9652 100644 --- a/MiraAPI/GameOptions/IModdedOption.cs +++ b/MiraAPI/GameOptions/IModdedOption.cs @@ -12,7 +12,7 @@ internal interface IModdedOption string Title { get; } StringNames StringName { get; } IMiraPlugin? ParentMod { get; set; } - BaseGameSetting? Data { get; } + BaseGameSetting Data { get; } Type? AdvancedRole { get; set; } OptionBehaviour? OptionBehaviour { get; } Func Visible { get; set; } diff --git a/MiraAPI/GameOptions/OptionTypes/ModdedOption.cs b/MiraAPI/GameOptions/OptionTypes/ModdedOption.cs index e1c816e..d811f1d 100644 --- a/MiraAPI/GameOptions/OptionTypes/ModdedOption.cs +++ b/MiraAPI/GameOptions/OptionTypes/ModdedOption.cs @@ -35,7 +35,7 @@ public abstract class ModdedOption : IModdedOption /// /// Gets the BaseGameSetting data of the option. /// - public BaseGameSetting? Data { get; protected init; } + public BaseGameSetting Data { get; protected init; } /// /// Gets or sets the parent mod of the option. diff --git a/MiraAPI/Patches/Options/LobbyViewPanePatches.cs b/MiraAPI/Patches/Options/LobbyViewPanePatches.cs index 01c844b..cd97f3e 100644 --- a/MiraAPI/Patches/Options/LobbyViewPanePatches.cs +++ b/MiraAPI/Patches/Options/LobbyViewPanePatches.cs @@ -6,6 +6,7 @@ using MiraAPI.PluginLoading; using MiraAPI.Roles; using MiraAPI.Utilities; using MiraAPI.Utilities.Assets; +using Reactor.Utilities; using UnityEngine; using UnityEngine.Events; using UnityEngine.UI; @@ -128,11 +129,6 @@ public static class LobbyViewPanePatches foreach (var group in filteredGroups) { - if (group.Options.Count == 0) - { - continue; - } - var categoryHeaderMasked = Object.Instantiate( instance.categoryHeaderOrigin, instance.settingsContainer, @@ -176,11 +172,6 @@ public static class LobbyViewPanePatches var data = option.Data; - if (data == null) - { - continue; - } - if (data.Type == OptionTypes.Checkbox) { viewSettingsInfoPanel.SetInfoCheckbox( diff --git a/MiraAPI/Patches/Options/SettingPatches.cs b/MiraAPI/Patches/Options/SettingPatches.cs index 3c20bfe..5e80253 100644 --- a/MiraAPI/Patches/Options/SettingPatches.cs +++ b/MiraAPI/Patches/Options/SettingPatches.cs @@ -41,7 +41,7 @@ public static class SettingPatches MiraNumberSuffixes.Percent => value.ToString(__instance.FormatString, NumberFormatInfo.InvariantInfo) + "%", _ => DestroyableSingleton.Instance.GetString( StringNames.GameSecondsAbbrev, - (Il2CppSystem.Object[]) [value.ToString(__instance.FormatString, CultureInfo.InvariantCulture)]), + (Il2CppSystem.Object[])[value.ToString(__instance.FormatString, CultureInfo.InvariantCulture)]), }; }