From 819588046492003fef0ae31ceed4acac45e6df2e Mon Sep 17 00:00:00 2001 From: XtraCube <72575280+XtraCube@users.noreply.github.com> Date: Tue, 20 Aug 2024 16:35:35 -0400 Subject: [PATCH] internalize --- .../Attributes/ModdedEnumOptionAttribute.cs | 3 +-- .../Attributes/ModdedNumberOptionAttribute.cs | 2 +- .../GameOptions/Attributes/ModdedOptionAttribute.cs | 4 ++-- .../Attributes/ModdedStringOptionAttribute.cs | 2 +- .../Attributes/ModdedToggleOptionAttribute.cs | 2 +- MiraAPI/GameOptions/ModdedOptionsManager.cs | 10 +++++----- MiraAPI/Hud/CustomButtonManager.cs | 4 ++-- MiraAPI/MiraApiPlugin.cs | 3 ++- MiraAPI/PluginLoading/MiraPluginManager.cs | 6 +++--- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/MiraAPI/GameOptions/Attributes/ModdedEnumOptionAttribute.cs b/MiraAPI/GameOptions/Attributes/ModdedEnumOptionAttribute.cs index 898f45c..7a0878f 100644 --- a/MiraAPI/GameOptions/Attributes/ModdedEnumOptionAttribute.cs +++ b/MiraAPI/GameOptions/Attributes/ModdedEnumOptionAttribute.cs @@ -7,8 +7,7 @@ namespace MiraAPI.GameOptions.Attributes; public class ModdedEnumOptionAttribute(string title, Type enumType, Type roleType = null) : ModdedOptionAttribute(title, roleType) { - - public override IModdedOption CreateOption(object value, PropertyInfo property) + internal override IModdedOption CreateOption(object value, PropertyInfo property) { var opt = new ModdedEnumOption(Title, (int)value, enumType, RoleType); return opt; diff --git a/MiraAPI/GameOptions/Attributes/ModdedNumberOptionAttribute.cs b/MiraAPI/GameOptions/Attributes/ModdedNumberOptionAttribute.cs index 2caf6c6..12aa255 100644 --- a/MiraAPI/GameOptions/Attributes/ModdedNumberOptionAttribute.cs +++ b/MiraAPI/GameOptions/Attributes/ModdedNumberOptionAttribute.cs @@ -14,7 +14,7 @@ public class ModdedNumberOptionAttribute( Type roleType = null) : ModdedOptionAttribute(title, roleType) { - public override IModdedOption CreateOption(object value, PropertyInfo property) + internal override IModdedOption CreateOption(object value, PropertyInfo property) { var toggleOpt = new ModdedNumberOption(Title, (float)value, min, max, increment, suffixType, zeroInfinity, RoleType); return toggleOpt; diff --git a/MiraAPI/GameOptions/Attributes/ModdedOptionAttribute.cs b/MiraAPI/GameOptions/Attributes/ModdedOptionAttribute.cs index 9ea511a..09e686e 100644 --- a/MiraAPI/GameOptions/Attributes/ModdedOptionAttribute.cs +++ b/MiraAPI/GameOptions/Attributes/ModdedOptionAttribute.cs @@ -15,6 +15,6 @@ public abstract class ModdedOptionAttribute(string title, Type roleType = null) public abstract void SetValue(object val); public abstract object GetValue(); - - public abstract IModdedOption CreateOption(object value, PropertyInfo property); + + internal abstract IModdedOption CreateOption(object value, PropertyInfo property); } \ No newline at end of file diff --git a/MiraAPI/GameOptions/Attributes/ModdedStringOptionAttribute.cs b/MiraAPI/GameOptions/Attributes/ModdedStringOptionAttribute.cs index 3148e29..1117bc7 100644 --- a/MiraAPI/GameOptions/Attributes/ModdedStringOptionAttribute.cs +++ b/MiraAPI/GameOptions/Attributes/ModdedStringOptionAttribute.cs @@ -7,7 +7,7 @@ namespace MiraAPI.GameOptions.Attributes; public class ModdedStringOptionAttribute(string title, string[] values, Type roleType = null) : ModdedOptionAttribute(title, roleType) { - public override IModdedOption CreateOption(object value, PropertyInfo property) + internal override IModdedOption CreateOption(object value, PropertyInfo property) { var opt = new ModdedStringOption(Title, (int)value, values, RoleType); return opt; diff --git a/MiraAPI/GameOptions/Attributes/ModdedToggleOptionAttribute.cs b/MiraAPI/GameOptions/Attributes/ModdedToggleOptionAttribute.cs index a03470a..6a0ede2 100644 --- a/MiraAPI/GameOptions/Attributes/ModdedToggleOptionAttribute.cs +++ b/MiraAPI/GameOptions/Attributes/ModdedToggleOptionAttribute.cs @@ -6,7 +6,7 @@ namespace MiraAPI.GameOptions.Attributes; public class ModdedToggleOptionAttribute(string title, Type roleType = null) : ModdedOptionAttribute(title, roleType) { - public override IModdedOption CreateOption(object value, PropertyInfo property) + internal override IModdedOption CreateOption(object value, PropertyInfo property) { var toggleOpt = new ModdedToggleOption(Title, (bool)value, RoleType); return toggleOpt; diff --git a/MiraAPI/GameOptions/ModdedOptionsManager.cs b/MiraAPI/GameOptions/ModdedOptionsManager.cs index 88228a7..9433202 100644 --- a/MiraAPI/GameOptions/ModdedOptionsManager.cs +++ b/MiraAPI/GameOptions/ModdedOptionsManager.cs @@ -23,7 +23,7 @@ public class ModdedOptionsManager public static uint NextId => _nextId++; private static uint _nextId = 1; - public static IModdedOption RegisterOption(Type type, ModdedOptionAttribute attribute, PropertyInfo property) + internal static IModdedOption RegisterOption(Type type, ModdedOptionAttribute attribute, PropertyInfo property) { if (OptionAttributes.ContainsKey(property)) return null; object newObj = Activator.CreateInstance(type); @@ -66,7 +66,7 @@ public class ModdedOptionsManager return result; } - public static void SyncAllOptions(int targetId=-1) + internal static void SyncAllOptions(int targetId=-1) { List data = []; int count = 0; @@ -88,9 +88,9 @@ public class ModdedOptionsManager Rpc.Instance.SendTo(PlayerControl.LocalPlayer, targetId, data.ToArray()); } } - - - public static void HandleSyncOptions(NetData[] data) + + + internal static void HandleSyncOptions(NetData[] data) { foreach (var netData in data) { diff --git a/MiraAPI/Hud/CustomButtonManager.cs b/MiraAPI/Hud/CustomButtonManager.cs index 14fbf3b..2b09d7b 100644 --- a/MiraAPI/Hud/CustomButtonManager.cs +++ b/MiraAPI/Hud/CustomButtonManager.cs @@ -7,8 +7,8 @@ namespace MiraAPI.Hud; public static class CustomButtonManager { public static readonly List CustomButtons = []; - - public static void RegisterButton(Type buttonType) + + internal static void RegisterButton(Type buttonType) { if (!typeof(CustomActionButton).IsAssignableFrom(buttonType)) { diff --git a/MiraAPI/MiraApiPlugin.cs b/MiraAPI/MiraApiPlugin.cs index 9faf789..dd41045 100644 --- a/MiraAPI/MiraApiPlugin.cs +++ b/MiraAPI/MiraApiPlugin.cs @@ -19,7 +19,8 @@ namespace MiraAPI; public partial class MiraApiPlugin : BasePlugin { public Harmony Harmony { get; } = new(Id); - public static MiraPluginManager PluginManager { get; private set; } + private static MiraPluginManager PluginManager { get; set; } + public static Color MiraColor = new Color32(238, 154, 112, 255); public override void Load() diff --git a/MiraAPI/PluginLoading/MiraPluginManager.cs b/MiraAPI/PluginLoading/MiraPluginManager.cs index 17235bd..e736610 100644 --- a/MiraAPI/PluginLoading/MiraPluginManager.cs +++ b/MiraAPI/PluginLoading/MiraPluginManager.cs @@ -13,7 +13,7 @@ using MiraAPI.Hud; namespace MiraAPI.PluginLoading; -public class MiraPluginManager +internal class MiraPluginManager { public readonly Dictionary RegisteredPlugins = []; @@ -24,7 +24,7 @@ public class MiraPluginManager private set => _instance = value; } - public void Initialize() + internal void Initialize() { Instance = this; IL2CPPChainloader.Instance.PluginLoad += (_, assembly, plugin) => @@ -127,7 +127,7 @@ public class MiraPluginManager } } } - + private static void RegisterButtonAttribute(Assembly assembly) { foreach (var type in assembly.GetTypes())