Compare commits

..
Author SHA1 Message Date
Az c51ad7e0de consolidate patches 2026-11-17 00:25:35 -05:00
Az 13dce32ae3 fix translation value oops 2026-11-17 00:04:46 -05:00
Az 314e108d0e hail mary fix for s showing up uninvited 2026-11-17 00:04:10 -05:00
Az 16c6b53a8c leverage localisations 2026-11-16 20:04:45 -05:00
Az 2b904d8e8c use defined helper
so there's a single possible point of failure
2026-11-16 17:00:09 -05:00
Az dd0499b5fa fix dubious suffixes(?) 2026-11-16 16:46:36 -05:00
Az bab8243f0b cleanup 2026-11-16 02:13:42 -05:00
Az 3fe399c04d safer type loading 2026-11-16 01:26:19 -05:00
Az 49529b09ee Merge branch 'dev' of https://github.com/All-Of-Us-Mods/MiraAPI into dev 2026-11-16 01:18:23 -05:00
Az 16999684eb skip abstract types correctly 2026-11-16 01:17:52 -05:00
16 changed files with 61 additions and 91 deletions

No files matched your search

+1 -6
View File
@@ -17,12 +17,7 @@ public static class GameOverManager
internal static bool RegisterGameOver(Type type, in MiraPluginManager.RegistrationContext _)
{
if (!typeof(CustomGameOver).IsAssignableFrom(type))
{
return false;
}
if (type.IsAbstract)
if (type.IsAbstract || !typeof(CustomGameOver).IsAssignableFrom(type))
{
return false;
}
+1 -1
View File
@@ -21,7 +21,7 @@ public static class CustomGameModeManager
internal static bool RegisterGameMode(Type type, in MiraPluginManager.RegistrationContext context)
{
if (!typeof(AbstractGameMode).IsAssignableFrom(type))
if (type.IsAbstract || !typeof(AbstractGameMode).IsAssignableFrom(type))
{
return false;
}
@@ -58,8 +58,7 @@ public class ModdedEnumOptionAttribute(string? title, Type enumType, string idPr
/// <inheritdoc />
public override void SetValue(object value)
{
var opt = HolderOption as ModdedEnumOption;
opt?.SetValue((int)value);
(HolderOption as ModdedEnumOption)?.SetValue((int)value);
}
/// <inheritdoc />
+1 -1
View File
@@ -73,7 +73,7 @@ public static class ModdedOptionsManager
internal static bool RegisterGroup(Type type, in MiraPluginManager.RegistrationContext context)
{
if (!type.IsAssignableTo(typeof(AbstractOptionGroup)))
if (type.IsAbstract || !type.IsAssignableTo(typeof(AbstractOptionGroup)))
{
return false;
}
+1 -1
View File
@@ -33,7 +33,7 @@ public static class CustomButtonManager
internal static bool RegisterButton(Type type, in MiraPluginManager.RegistrationContext context)
{
if (!type.IsAssignableTo(typeof(CustomActionButton)) || Activator.CreateInstance(type) is not CustomActionButton button)
if (type.IsAbstract || !type.IsAssignableTo(typeof(CustomActionButton)) || Activator.CreateInstance(type) is not CustomActionButton button)
{
return false;
}
@@ -19,7 +19,7 @@ public static class LocalSettingsManager
internal static bool RegisterLocalTabs(Type type, in MiraPluginManager.RegistrationContext context)
{
if (!type.IsAssignableTo(typeof(LocalSettingsTab)))
if (type.IsAbstract || !type.IsAssignableTo(typeof(LocalSettingsTab)))
{
return false;
}
@@ -25,7 +25,7 @@ public static class MeetingButtonManager
internal static bool RegisterTargetedMeetingButton(Type type, in MiraPluginManager.RegistrationContext context)
{
if (!typeof(TargetedMeetingButton).IsAssignableFrom(type))
if (type.IsAbstract || !typeof(TargetedMeetingButton).IsAssignableFrom(type))
{
return false;
}
@@ -40,7 +40,7 @@ public static class MeetingButtonManager
internal static bool RegisterMeetingButton(Type type, in MiraPluginManager.RegistrationContext context)
{
if (!typeof(MeetingActionButton).IsAssignableFrom(type))
if (type.IsAbstract || !typeof(MeetingActionButton).IsAssignableFrom(type))
{
return false;
}
-6
View File
@@ -71,7 +71,6 @@ public partial class MiraApiPlugin : BasePlugin, IMiraPlugin
internal static ConfigEntry<SortingGroups> WikiSortingGroup { get; private set; }
internal static ConfigEntry<SortingMethod> WikiSortingMethod { get; private set; }
internal static ConfigEntry<SortingFilter> WikiSortingFilter { get; private set; }
internal static ConfigEntry<string> DistanceSuffix { get; private set; }
/// <inheritdoc />
public override void Load()
@@ -91,11 +90,6 @@ public partial class MiraApiPlugin : BasePlugin, IMiraPlugin
"WikiSortingFilter",
SortingFilter.AllRoles,
"Determines what roles / modifiers are displayed at once.");
DistanceSuffix = Config.Bind(
"Display",
"Distance",
"unit(s)",
"Dictates the unit of distance used in numeric option displays representing a distance.");
Harmony.PatchAll();
RoleOptionsCollectionPatch.PatchRoleMethods(Harmony);
+1 -1
View File
@@ -69,7 +69,7 @@ public static class ModifierManager
internal static bool RegisterModifier(Type type, in MiraPluginManager.RegistrationContext context)
{
if (!typeof(BaseModifier).IsAssignableFrom(type))
if (type.IsAbstract || !typeof(BaseModifier).IsAssignableFrom(type))
{
return false;
}
@@ -1,5 +1,4 @@
using System;
using AmongUs.GameOptions;
using AmongUs.GameOptions;
using HarmonyLib;
using MiraAPI.Events;
using MiraAPI.Events.Vanilla.Gameplay;
@@ -225,6 +225,7 @@ public static class OptionsPatches
}
__instance.TitleText.text = TranslationController.Instance.GetString(__instance.Title).Translate();
__instance.ValueText.text = Helpers.FormatValue(__instance.Value, (MiraNumberSuffixes)__instance.SuffixType, __instance.FormatString);
return false;
}
}
+30 -30
View File
@@ -1,5 +1,4 @@
using System.Globalization;
using System.Linq;
using System.Linq;
using HarmonyLib;
using MiraAPI.GameOptions;
using MiraAPI.GameOptions.OptionTypes;
@@ -28,53 +27,54 @@ public static class SettingPatches
ref string __result,
[HarmonyArgument(0)] float value)
{
string result;
var suffix = (MiraNumberSuffixes)__instance.SuffixType;
return SetResult(ref __result, value, (MiraNumberSuffixes)__instance.SuffixType, __instance.FormatString, __instance.ZeroIsInfinity, __instance);
}
/// <summary>
/// Prefix for the <see cref="IntGameSetting.GetValueString"/> method. Adds support for custom number suffixes.
/// </summary>
/// <param name="__instance">The <see cref="IntGameSetting"/> instance.</param>
/// <param name="__result">The result of the <see cref="IntGameSetting.GetValueString"/> method.</param>
/// <param name="value">The <see langword="float"/> value.</param>
/// <returns><see langword="false"/> to skip original method.</returns>
[HarmonyPrefix]
[HarmonyPatch(typeof(IntGameSetting), nameof(IntGameSetting.GetValueString))]
public static bool ValueStringPatch(
IntGameSetting __instance,
ref string __result,
[HarmonyArgument(0)] float value)
{
return SetResult(ref __result, value, (MiraNumberSuffixes)__instance.SuffixType, __instance.FormatString, __instance.ZeroIsInfinity, __instance);
}
private static bool SetResult(ref string __result, float value, MiraNumberSuffixes suffix, string formatString, bool zeroIsInfinity, BaseGameSetting setting)
{
var custom = ModdedOptionsManager.ModdedOptions.Values.FirstOrDefault(opt => opt.Data == setting);
var custom =
ModdedOptionsManager.ModdedOptions.Values.FirstOrDefault(opt =>
opt.OptionBehaviour != null && opt.OptionBehaviour.Data == __instance);
if (custom is ModdedNumberOption moddedNumberOption)
{
if (moddedNumberOption.NegativeWordValue != "#" && (int)value == -1)
{
result = $"<b>{moddedNumberOption.NegativeWordValue}</b>";
__result = $"<b>{moddedNumberOption.NegativeWordValue}</b>";
}
else if (moddedNumberOption.ZeroWordValue != "#" && Mathf.Abs(value) < 0.0001f)
{
result = $"<b>{moddedNumberOption.ZeroWordValue}</b>";
__result = $"<b>{moddedNumberOption.ZeroWordValue}</b>";
}
else
{
var part = value.ToString(__instance.FormatString, NumberFormatInfo.InvariantInfo);
result = suffix switch
{
MiraNumberSuffixes.None => part,
MiraNumberSuffixes.Multiplier => part + "x",
MiraNumberSuffixes.Percent => part + "%",
MiraNumberSuffixes.Distance => part + MiraApiPlugin.DistanceSuffix.Value,
_ => TranslationController.Instance.GetString(StringNames.GameSecondsAbbrev, part),
};
__result = Helpers.FormatValue(value, suffix, formatString);
}
}
else if (__instance.ZeroIsInfinity && Mathf.Abs(value) < 0.0001f)
else if (zeroIsInfinity && Mathf.Abs(value) < 0.0001f)
{
result = "<b>∞</b>";
__result = "<b>∞</b>";
}
else
{
var part = value.ToString(__instance.FormatString, NumberFormatInfo.InvariantInfo);
result = suffix switch
{
MiraNumberSuffixes.None => part,
MiraNumberSuffixes.Multiplier => part + "x",
MiraNumberSuffixes.Percent => part + "%",
MiraNumberSuffixes.Distance => part + MiraApiPlugin.DistanceSuffix.Value,
_ => TranslationController.Instance.GetString(StringNames.GameSecondsAbbrev, part),
};
__result = Helpers.FormatValue(value, suffix, formatString);
}
__result = result;
return false;
}
}
+12 -23
View File
@@ -5,8 +5,8 @@ using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Reflection;
using BepInEx;
using BepInEx.Configuration;
using BepInEx.Unity.IL2CPP;
using HarmonyLib;
using MiraAPI.Colors;
using MiraAPI.Events;
using MiraAPI.GameEnd;
@@ -45,11 +45,9 @@ public sealed class MiraPluginManager
internal MiraPluginInfo[] RegisteredPlugins { get; private set; } = [];
internal MiraPluginInfo[] RegisteredPluginsWithOptions { get; private set; } = [];
internal MiraPluginInfo[] PluginsWithOptionsOrGameModes { get; private set; } = [];
internal Dictionary<MiraPluginInfo, List<Type>> QueuedRoleRegistrations { get; } = [];
internal static MiraPluginManager Instance { get; } = new();
internal static ConfigFile MiraApiConfig { get; private set; } = null!;
internal static MiraPluginInfo MiraApiPluginInfo { get; private set; } = null!;
private static readonly (string LogContext, TypeRegistrationHandler Handler)[] RegistrationHandlers =
[
@@ -94,27 +92,15 @@ public sealed class MiraPluginManager
if (IL2CPPChainloader.Instance.Plugins.TryGetValue(MiraApiPlugin.Id, out var newPlugin))
{
var registrationTimer = Stopwatch.StartNew();
var info = RegisterPlugin(typeof(MiraPluginManager).Assembly, apiPlugin, newPlugin, miraApiPlugin);
MiraApiConfig = info.PluginConfig;
MiraApiPluginInfo = info;
registrationTimer.Stop();
Info($"Registered Mira API as mod in {registrationTimer.ElapsedMilliseconds}ms.");
RegisterPlugin(typeof(MiraPluginManager).Assembly, apiPlugin, newPlugin, miraApiPlugin);
}
IL2CPPChainloader.Instance.PluginLoad += (pluginInfo, assembly, plugin) =>
{
if (plugin is not IMiraPlugin miraPlugin || pluginInfo.Metadata.GUID == MiraApiPlugin.Id)
if (plugin is IMiraPlugin miraPlugin && pluginInfo.Metadata.GUID != MiraApiPlugin.Id)
{
return;
RegisterPlugin(assembly, miraPlugin, pluginInfo, plugin);
}
var registrationTimer = Stopwatch.StartNew();
RegisterPlugin(assembly, miraPlugin, pluginInfo, plugin);
registrationTimer.Stop();
Info($"Registered mod {pluginInfo.Metadata.Name} with Mira API in {registrationTimer.ElapsedMilliseconds}ms.");
};
IL2CPPChainloader.Instance.Finished += () =>
@@ -141,8 +127,9 @@ public sealed class MiraPluginManager
PluginsWithOptionsOrGameModes = [.. RegisteredPlugins.Where(m => m.MiraPlugin.DisplayOnOptionsMenu || m.GameModes.Count > 0)];
}
private MiraPluginInfo RegisterPlugin(Assembly assembly, IMiraPlugin plugin, PluginInfo pluginInfo, BasePlugin basePlugin)
private void RegisterPlugin(Assembly assembly, IMiraPlugin plugin, PluginInfo pluginInfo, BasePlugin basePlugin)
{
var registrationTimer = Stopwatch.StartNew();
var info = new MiraPluginInfo(plugin, pluginInfo, assembly);
var roles = new List<Type>();
@@ -164,7 +151,9 @@ public sealed class MiraPluginManager
PresetManager.CreateDefaultPreset(info);
PresetManager.LoadPresets(info);
return info;
registrationTimer.Stop();
Info($"Registered mod {pluginInfo.Metadata.Name} in {registrationTimer.ElapsedMilliseconds}ms.");
}
private static void ProcessAssemblyTypes(Assembly assembly, MiraPluginInfo info, BasePlugin basePlugin, IMiraPlugin plugin, List<Type> roles)
@@ -176,9 +165,9 @@ public sealed class MiraPluginManager
var context = new RegistrationContext(info, plugin, basePlugin, roles);
foreach (var type in assembly.GetTypes())
foreach (var type in AccessTools.GetTypesFromAssembly(assembly))
{
if (type.IsDefined<MiraIgnoreAttribute>())
if (type.IsDefined<MiraIgnoreAttribute>() || type.IsDefined<HarmonyAttribute>())
continue;
foreach (var (logContext, handler) in RegistrationHandlers)
+1
View File
@@ -77,4 +77,5 @@ Outlive the timer or eliminate the crew.</string>
<string name="Inactive">Inactive</string>
<string name="Activated">Activated</string>
<string name="Deactivated">Deactivated</string>
<string name="MiraApi.AbbreviatedDistance">unit(s)</string>
</resources>
+2 -2
View File
@@ -121,7 +121,7 @@ public static class CustomRoleManager
internal static bool RegisterRole(Type type, in MiraPluginManager.RegistrationContext context)
{
if (!(typeof(RoleBehaviour).IsAssignableFrom(type) && typeof(ICustomRole).IsAssignableFrom(type)))
if (type.IsAbstract || !(typeof(RoleBehaviour).IsAssignableFrom(type) && typeof(ICustomRole).IsAssignableFrom(type)))
{
return false;
}
@@ -203,7 +203,7 @@ public static class CustomRoleManager
}
var useTaskHint = customRole.Configuration.RoleHintType is RoleHintType.TaskHint;
var overridesTaskText = customRole.GetType().GetMethod("SpawnTaskHeader")?.DeclaringType == customRole.GetType();
var overridesTaskText = roleType.GetMethod("SpawnTaskHeader")?.DeclaringType == roleType;
if (useTaskHint && !overridesTaskText)
{
+5 -13
View File
@@ -35,7 +35,7 @@ public static class Helpers
"Major Code Smell",
"S3011:Reflection should not be used to increase accessibility of classes, methods, or fields",
Justification = "Dynamic singleton initialization requires reflection to bypass the private field access modifier because the type is only known at runtime.")]
private const BindingFlags StaticInstanceFlags = BindingFlags.Static | BindingFlags.NonPublic;
private const BindingFlags StaticInstanceFlags = BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.DeclaredOnly;
internal const float MatchInfoGuideBaseScale = 1.3f;
private static NumberOption? _advancedSettingsRowPrefab;
@@ -574,11 +574,10 @@ public static class Helpers
{
return suffix switch
{
MiraNumberSuffixes.None => string.Empty,
MiraNumberSuffixes.Multiplier => "x",
MiraNumberSuffixes.Seconds => "s",
MiraNumberSuffixes.Percent => "%",
MiraNumberSuffixes.Distance => MiraApiPlugin.DistanceSuffix.Value,
MiraNumberSuffixes.Multiplier => "x",
MiraNumberSuffixes.Distance => MiraLocaleManager.Get("MiraApi.AbbreviatedDistance"),
MiraNumberSuffixes.Seconds => TranslationController.Instance.GetString(StringNames.AbbreviatedSecond, string.Empty),
_ => string.Empty,
};
}
@@ -614,14 +613,7 @@ public static class Helpers
public static string FormatValue(float value, MiraNumberSuffixes suffix = MiraNumberSuffixes.None, string formatString = "0.0")
{
var part = value.ToString(formatString, NumberFormatInfo.InvariantInfo);
return suffix switch
{
MiraNumberSuffixes.None => part,
MiraNumberSuffixes.Percent => part + "%",
MiraNumberSuffixes.Multiplier => part + "x",
MiraNumberSuffixes.Distance => part + MiraApiPlugin.DistanceSuffix.Value,
_ => TranslationController.Instance.GetString(StringNames.GameSecondsAbbrev, part),
};
return part + GetSuffix(suffix);
}
/// <summary>