From d0138936beb0f27c923ed724b9b9cb725d003cba Mon Sep 17 00:00:00 2001 From: Atony <75191600+AtonyGit@users.noreply.github.com> Date: Sun, 4 Oct 2026 00:16:04 -0500 Subject: [PATCH] Clear helper warnings --- MiraAPI/Resources/Locale/en_US.xml | 2 + MiraAPI/Roles/ICustomRole.cs | 2 +- MiraAPI/Utilities/Helpers.cs | 93 +++++++++++++++++------------- 3 files changed, 56 insertions(+), 41 deletions(-) diff --git a/MiraAPI/Resources/Locale/en_US.xml b/MiraAPI/Resources/Locale/en_US.xml index c723f6c..028119a 100644 --- a/MiraAPI/Resources/Locale/en_US.xml +++ b/MiraAPI/Resources/Locale/en_US.xml @@ -45,10 +45,12 @@ Outlive the timer or eliminate the crew. Page Main Ability + Indirect Ability Interaction Ability Radius Ability Menu Ability Meeting Ability Selective Meeting Ability + Meeting Menu Ability Options diff --git a/MiraAPI/Roles/ICustomRole.cs b/MiraAPI/Roles/ICustomRole.cs index 08e3ee2..dc38423 100644 --- a/MiraAPI/Roles/ICustomRole.cs +++ b/MiraAPI/Roles/ICustomRole.cs @@ -76,7 +76,7 @@ public interface ICustomRole : IOptionable /// Gets the wiki description of the role. Used in the wiki and normally appends the options text as well. /// string RoleWikiDescription => MiraLocaleManager.Get(RoleWikiDescriptionLocale, RoleLongDescription) + - Helpers.GetModdedOptionsForType(GetType()); + Helpers.GetOptionsText(GetType()); /// /// Gets the role's wiki description id for localization. diff --git a/MiraAPI/Utilities/Helpers.cs b/MiraAPI/Utilities/Helpers.cs index e2221e7..3584588 100644 --- a/MiraAPI/Utilities/Helpers.cs +++ b/MiraAPI/Utilities/Helpers.cs @@ -43,8 +43,8 @@ public static class Helpers return string.Empty; } - ISummarizedOptions? summaryProvider = null; - IReadOnlySet? hiddenKeys = null; + ISummarizedOptions? summaryProvider; + IReadOnlySet? hiddenKeys; try { var optionGroups = @@ -60,8 +60,9 @@ public static class Helpers } var builder = new StringBuilder(); - builder.AppendLine(MiraApiPlugin.Culture, - $"\n \n{MiraLocaleManager.Get("Options")}"); + builder.AppendLine( + MiraApiPlugin.Culture, + $"\n \n{MiraLocaleManager.Get("Options")}"); var insertedSummary = false; foreach (var option in options) @@ -73,7 +74,7 @@ public static class Helpers ModdedToggleOption t => t.StringName, ModdedEnumOption e => e.StringName, ModdedNumberOption n => n.StringName, - _ => null + _ => null, }; if (key.HasValue && hiddenKeys.Contains(key.Value)) { @@ -102,8 +103,9 @@ public static class Helpers continue; } - builder.AppendLine(TranslationController.Instance.GetString(toggleOption.StringName) + ": " + - toggleOption.Value); + builder.AppendLine( + TranslationController.Instance.GetString(toggleOption.StringName) + ": " + + toggleOption.Value); break; /*case ModdedMultiSelectOption enumOption: if (!enumOption.Visible()) @@ -124,9 +126,11 @@ public static class Helpers continue; } - builder.AppendLine(TranslationController.Instance.GetString(enumOption.StringName) + ": " + - MiraLocaleManager.Get(enumOption.Values[enumOption.Value], - enumOption.Values[enumOption.Value])); + builder.AppendLine( + TranslationController.Instance.GetString(enumOption.StringName) + ": " + + MiraLocaleManager.Get( + enumOption.Values[enumOption.Value], + enumOption.Values[enumOption.Value])); break; case ModdedNumberOption numberOption: if (!numberOption.Visible()) @@ -142,15 +146,15 @@ public static class Helpers var optionStr = numberOption.Data.GetValueString(numberOption.Value); if (optionStr.Contains(".000")) { - optionStr = optionStr.Replace(".000", ""); + optionStr = optionStr.Replace(".000", string.Empty); } else if (optionStr.Contains(".00")) { - optionStr = optionStr.Replace(".00", ""); + optionStr = optionStr.Replace(".00", string.Empty); } else if (optionStr.Contains(".0")) { - optionStr = optionStr.Replace(".0", ""); + optionStr = optionStr.Replace(".0", string.Empty); } var title = TranslationController.Instance.GetString(numberOption.StringName); @@ -173,6 +177,7 @@ public static class Helpers return builder.ToString(); } + /// /// Get all living players. /// @@ -381,7 +386,7 @@ public static class Helpers var popper = HudManager.Instance.Notifier; var newMessage = Object.Instantiate(popper.notificationMessageOrigin, Vector3.zero, Quaternion.identity, popper.transform); newMessage.transform.localPosition = localPos; - newMessage.SetUp(text, spr ?? null, color, new System.Action(() => popper.OnMessageDestroy(newMessage))); + newMessage.SetUp(text, spr ?? null, color, new Action(() => popper.OnMessageDestroy(newMessage))); popper.lastMessageKey = -1; popper.ShiftMessages(); popper.AddMessageToQueue(newMessage); @@ -433,9 +438,12 @@ public static class Helpers { var results = new CppCollections.List(); Physics2D.OverlapCircle(source, radius, filter, results); - return [.. results.ToArray() - .Where(collider2D => collider2D.CompareTag("DeadBody")) - .Select(collider2D => collider2D.GetComponent())]; + return + [ + .. results.ToArray() + .Where(collider2D => collider2D.CompareTag("DeadBody")) + .Select(collider2D => collider2D.GetComponent()) + ]; } /// @@ -452,9 +460,12 @@ public static class Helpers { var results = new CppCollections.List(); Physics2D.OverlapCircle(source, radius, filter, results); - return [.. results.ToArray() - .Where(collider2D => colliderTag == null || collider2D.CompareTag(colliderTag)) - .Select(collider2D => collider2D.GetComponent())]; + return + [ + .. results.ToArray() + .Where(collider2D => colliderTag == null || collider2D.CompareTag(colliderTag)) + .Select(collider2D => collider2D.GetComponent()) + ]; } /// @@ -473,15 +484,18 @@ public static class Helpers return !ignoreColliders ? newList - : [.. from player in newList - let vector = player.GetTruePosition() - source - let magnitude = vector.magnitude - where !PhysicsHelpers.AnyNonTriggersBetween( - source, - vector.normalized, - magnitude, - Constants.ShipAndObjectsMask) - select player]; + : + [ + .. from player in newList + let vector = player.GetTruePosition() - source + let magnitude = vector.magnitude + where !PhysicsHelpers.AnyNonTriggersBetween( + source, + vector.normalized, + magnitude, + Constants.ShipAndObjectsMask) + select player + ]; } /// @@ -542,17 +556,16 @@ public static class Helpers Constants.ShipAndObjectsMask)) select playerControl); - outputList.Sort( - (a, b) => - { - var magnitude2 = (a.GetTruePosition() - source).magnitude; - var magnitude3 = (b.GetTruePosition() - source).magnitude; - return magnitude2 > magnitude3 - ? 1 - : magnitude2 < magnitude3 - ? -1 - : 0; - }); + outputList.Sort((a, b) => + { + var magnitude2 = (a.GetTruePosition() - source).magnitude; + var magnitude3 = (b.GetTruePosition() - source).magnitude; + return magnitude2 > magnitude3 + ? 1 + : magnitude2 < magnitude3 + ? -1 + : 0; + }); return outputList; }