From ed74458ba71836c39d9acba6d82b25653b7d35c2 Mon Sep 17 00:00:00 2001 From: Az <56699741+AlchlcDvl@users.noreply.github.com> Date: Thu, 12 Nov 2026 12:35:21 -0500 Subject: [PATCH] make it an extension instead --- MiraAPI/Colors/PaletteManager.cs | 2 +- MiraAPI/GameOptions/ModdedOptionsManager.cs | 2 +- MiraAPI/Keybinds/KeybindManager.cs | 2 +- MiraAPI/LocalSettings/LocalSettingsManager.cs | 2 +- MiraAPI/PluginLoading/MiraPluginInfo.cs | 2 +- MiraAPI/PluginLoading/MiraPluginManager.cs | 8 +------- MiraAPI/Utilities/Extensions.cs | 12 ++++++++++++ 7 files changed, 18 insertions(+), 12 deletions(-) diff --git a/MiraAPI/Colors/PaletteManager.cs b/MiraAPI/Colors/PaletteManager.cs index c5cba43f..561d6ba7 100644 --- a/MiraAPI/Colors/PaletteManager.cs +++ b/MiraAPI/Colors/PaletteManager.cs @@ -83,7 +83,7 @@ public static class PaletteManager return true; foreach (var field in type.GetFields(MiraPluginManager.DeclaredStaticMembers) - .Where(f => !MiraPluginManager.IsAutoPropertyBackingField(f) && f.FieldType.IsAssignableTo(typeof(CustomColor)))) + .Where(f => !f.IsAutoPropertyBackingField() && f.FieldType.IsAssignableTo(typeof(CustomColor)))) { Error($"{field.Name} is a field, not a property. Use properties for colors."); } diff --git a/MiraAPI/GameOptions/ModdedOptionsManager.cs b/MiraAPI/GameOptions/ModdedOptionsManager.cs index 8071299f..07d21c28 100644 --- a/MiraAPI/GameOptions/ModdedOptionsManager.cs +++ b/MiraAPI/GameOptions/ModdedOptionsManager.cs @@ -138,7 +138,7 @@ public static class ModdedOptionsManager } foreach (var field in type.GetFields(MiraPluginManager.DeclaredInstanceMembers) - .Where(f => !MiraPluginManager.IsAutoPropertyBackingField(f) + .Where(f => !f.IsAutoPropertyBackingField() && (f.FieldType.IsAssignableTo(typeof(IModdedOption)) || f.FieldType.IsAssignableTo(typeof(IBaseModdedOptionList))))) { Error($"{field.Name} is a field, not a property. Use properties for options."); diff --git a/MiraAPI/Keybinds/KeybindManager.cs b/MiraAPI/Keybinds/KeybindManager.cs index cffe9b35..d541ee31 100644 --- a/MiraAPI/Keybinds/KeybindManager.cs +++ b/MiraAPI/Keybinds/KeybindManager.cs @@ -109,7 +109,7 @@ public static class KeybindManager return true; foreach (var field in type.GetFields(MiraPluginManager.DeclaredStaticMembers) - .Where(f => !MiraPluginManager.IsAutoPropertyBackingField(f) && f.FieldType.IsAssignableTo(typeof(MiraKeybind)))) + .Where(f => !f.IsAutoPropertyBackingField() && f.FieldType.IsAssignableTo(typeof(MiraKeybind)))) { Error($"{field.Name} is a field, not a property. Use properties for keybinds."); } diff --git a/MiraAPI/LocalSettings/LocalSettingsManager.cs b/MiraAPI/LocalSettings/LocalSettingsManager.cs index 646a2664..5f72c11d 100644 --- a/MiraAPI/LocalSettings/LocalSettingsManager.cs +++ b/MiraAPI/LocalSettings/LocalSettingsManager.cs @@ -92,7 +92,7 @@ public static class LocalSettingsManager } foreach (var field in type.GetFields(MiraPluginManager.DeclaredInstanceMembers) - .Where(f => !MiraPluginManager.IsAutoPropertyBackingField(f) + .Where(f => !f.IsAutoPropertyBackingField() && (f.FieldType.IsAssignableTo(typeof(ConfigEntryBase)) || f.FieldType.IsAssignableTo(typeof(LocalSettingsButton))))) { Error($"{field.Name} is a field, not a property. Use properties for local settings or buttons."); diff --git a/MiraAPI/PluginLoading/MiraPluginInfo.cs b/MiraAPI/PluginLoading/MiraPluginInfo.cs index a8914df5..c6eee6f8 100644 --- a/MiraAPI/PluginLoading/MiraPluginInfo.cs +++ b/MiraAPI/PluginLoading/MiraPluginInfo.cs @@ -119,7 +119,7 @@ public class MiraPluginInfo Modifiers = [.. InternalModifiers]; OptionGroups = [.. InternalOptionGroups]; Options = [.. InternalOptions]; - Roles = new ReadOnlyDictionary(InternalRoles); + Roles = new(InternalRoles); Buttons = [.. InternalButtons]; MeetingButtons = [.. InternalMeetingButtons]; TargetedMeetingButtons = [.. InternalTargetedMeetingButtons]; diff --git a/MiraAPI/PluginLoading/MiraPluginManager.cs b/MiraAPI/PluginLoading/MiraPluginManager.cs index 526b96f1..bebdb109 100644 --- a/MiraAPI/PluginLoading/MiraPluginManager.cs +++ b/MiraAPI/PluginLoading/MiraPluginManager.cs @@ -4,7 +4,6 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Reflection; -using System.Runtime.CompilerServices; using BepInEx; using BepInEx.Configuration; using BepInEx.Unity.IL2CPP; @@ -141,18 +140,13 @@ public sealed class MiraPluginManager _registeredPlugins.Add(pluginInfo.Metadata.GUID, info); info.SavePublicCollections(); + PresetManager.CreateDefaultPreset(info); PresetManager.LoadPresets(info); return info; } - internal static bool IsAutoPropertyBackingField(FieldInfo field) - { - return field.IsDefined(false) && - field.Name.Contains(">k__BackingField", StringComparison.Ordinal); - } - private static void ProcessAssemblyTypes(Assembly assembly, MiraPluginInfo info, BasePlugin basePlugin, IMiraPlugin plugin, List roles, bool isMira) { if (plugin.ForceRegisterEvents) diff --git a/MiraAPI/Utilities/Extensions.cs b/MiraAPI/Utilities/Extensions.cs index 29f8b623..acdd79e6 100644 --- a/MiraAPI/Utilities/Extensions.cs +++ b/MiraAPI/Utilities/Extensions.cs @@ -6,6 +6,7 @@ using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.Linq; using System.Reflection; +using System.Runtime.CompilerServices; using System.Text.RegularExpressions; using HarmonyLib; using MiraAPI.GameModes; @@ -916,4 +917,15 @@ public static class Extensions attribute = member.GetCustomAttribute(); return attribute != null; } + + /// + /// Checks if a field is auto-generated by the compiler. + /// + /// The to check. + /// true if the field was auto-generated; otherwise false. + public static bool IsAutoPropertyBackingField(this FieldInfo field) + { + return field.IsDefined(false) && + field.Name.Contains(">k__BackingField", StringComparison.Ordinal); + } }