use .Instance instead of DestroyableSingleton<>.Instance

This commit is contained in:
XtraCube committed 2024-09-13 20:35:35 -04:00
1 parent 91b7901528
commit 4d36c13c5b
11 files changed
+26 -26

No files matched your search

@@ -86,7 +86,7 @@ public class ModdedEnumOption : ModdedOption<int>
/// <inheritdoc />
protected override void OnValueChanged(int newValue)
{
DestroyableSingleton<HudManager>.Instance.Notifier.AddSettingsChangeMessage(StringName, Data?.GetValueString(newValue), false);
HudManager.Instance.Notifier.AddSettingsChangeMessage(StringName, Data?.GetValueString(newValue), false);
if (!OptionBehaviour)
{
return;
@@ -134,7 +134,7 @@ public class ModdedNumberOption : ModdedOption<float>
protected override void OnValueChanged(float newValue)
{
Value = Mathf.Clamp(newValue, Min, Max);
DestroyableSingleton<HudManager>.Instance.Notifier.AddSettingsChangeMessage(
HudManager.Instance.Notifier.AddSettingsChangeMessage(
StringName,
Data?.GetValueString(Value),
false);
@@ -69,7 +69,7 @@ public class ModdedToggleOption : ModdedOption<bool>
/// <inheritdoc />
protected override void OnValueChanged(bool newValue)
{
DestroyableSingleton<HudManager>.Instance.Notifier.AddSettingsChangeMessage(StringName, newValue ? "On" : "Off", false);
HudManager.Instance.Notifier.AddSettingsChangeMessage(StringName, newValue ? "On" : "Off", false);
if (!OptionBehaviour)
{
return;
+5 -5
View File
@@ -87,7 +87,7 @@ public static class CustomMurderRpc
if (flag && PlayerControl.LocalPlayer.Data.PlayerId == target.protectedByGuardianId)
{
StatsManager.Instance.IncrementStat(StringNames.StatsGuardianAngelCrewmatesProtected);
DestroyableSingleton<AchievementManager>.Instance.OnProtectACrewmate();
AchievementManager.Instance.OnProtectACrewmate();
}
if (source.AmOwner || flag)
@@ -115,7 +115,7 @@ public static class CustomMurderRpc
return;
}
DestroyableSingleton<DebugAnalytics>.Instance.Analytics.Kill(target.Data, source.Data);
DebugAnalytics.Instance.Analytics.Kill(target.Data, source.Data);
if (source.AmOwner)
{
StatsManager.Instance.IncrementStat(
@@ -139,7 +139,7 @@ public static class CustomMurderRpc
}
}
DestroyableSingleton<UnityTelemetry>.Instance.WriteMurder();
UnityTelemetry.Instance.WriteMurder();
target.gameObject.layer = LayerMask.NameToLayer("Ghost");
if (target.AmOwner)
{
@@ -159,14 +159,14 @@ public static class CustomMurderRpc
if (showKillAnim)
{
DestroyableSingleton<HudManager>.Instance.KillOverlay.ShowKillAnimation(source.Data, data);
HudManager.Instance.KillOverlay.ShowKillAnimation(source.Data, data);
}
target.cosmetics.SetNameMask(false);
target.RpcSetScanner(false);
}
DestroyableSingleton<AchievementManager>.Instance.OnMurder(
AchievementManager.Instance.OnMurder(
source.AmOwner,
target.AmOwner,
source.CurrentOutfitType == PlayerOutfitType.Shapeshifted,
@@ -27,12 +27,12 @@ public static class NotificationPopperPatch
? Palette.CrewmateSettingChangeText.ToTextColor()
: Palette.ImpostorRed.ToTextColor();
var item = DestroyableSingleton<TranslationController>.Instance.GetString(
var item = TranslationController.Instance.GetString(
StringNames.LobbyChangeSettingNotificationRole,
string.Concat(
"<font=\"Barlow-Black SDF\" material=\"Barlow-Black Outline\">",
text,
DestroyableSingleton<TranslationController>.Instance.GetString(key, Array.Empty<Object>()),
TranslationController.Instance.GetString(key, Array.Empty<Object>()),
"</color></font>"
),
"<font=\"Barlow-Black SDF\" material=\"Barlow-Black Outline\">" + roleCount + "</font>",
+4 -4
View File
@@ -17,7 +17,7 @@ public static class OptionsPatches
}
__instance.TitleText.text =
DestroyableSingleton<TranslationController>.Instance.GetString(__instance.Title, Array.Empty<Object>());
TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
return false;
}
@@ -39,7 +39,7 @@ public static class OptionsPatches
}
__instance.TitleText.text =
DestroyableSingleton<TranslationController>.Instance.GetString(__instance.Title, Array.Empty<Object>());
TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
return false;
}
@@ -61,8 +61,8 @@ public static class OptionsPatches
}
__instance.TitleText.text =
DestroyableSingleton<TranslationController>.Instance.GetString(__instance.Title, Array.Empty<Object>());
__instance.ValueText.text = DestroyableSingleton<TranslationController>.Instance.GetString(
TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>());
__instance.ValueText.text = TranslationController.Instance.GetString(
__instance.Values[__instance.Value],
Array.Empty<Object>());
@@ -178,7 +178,7 @@ public static class RoleSettingMenuPatches
}
roleSetting.UpdateValuesAndText(GameOptionsManager.Instance.CurrentGameOptions.RoleOptions);
DestroyableSingleton<HudManager>.Instance.Notifier.AddRoleSettingsChangeMessage(
HudManager.Instance.Notifier.AddRoleSettingsChangeMessage(
roleSetting.Role.StringName,
roleSetting.RoleMaxCount,
roleSetting.RoleChance,
@@ -254,7 +254,7 @@ public static class RoleSettingMenuPatches
}
__instance.roleDescriptionText.text = customRole.RoleLongDescription;
__instance.roleTitleText.text = DestroyableSingleton<TranslationController>.Instance.GetString(
__instance.roleTitleText.text = TranslationController.Instance.GetString(
role.StringName,
new Il2CppReferenceArray<Il2CppSystem.Object>(0));
__instance.roleScreenshot.sprite = Sprite.Create(
+1 -1
View File
@@ -39,7 +39,7 @@ public static class SettingPatches
MiraNumberSuffixes.None => value.ToString(__instance.FormatString, NumberFormatInfo.InvariantInfo),
MiraNumberSuffixes.Multiplier => value.ToString(__instance.FormatString, NumberFormatInfo.InvariantInfo) + "x",
MiraNumberSuffixes.Percent => value.ToString(__instance.FormatString, NumberFormatInfo.InvariantInfo) + "%",
_ => DestroyableSingleton<TranslationController>.Instance.GetString(
_ => TranslationController.Instance.GetString(
StringNames.GameSecondsAbbrev,
(Il2CppSystem.Object[])[value.ToString(__instance.FormatString, CultureInfo.InvariantCulture)]),
};
+1 -1
View File
@@ -25,7 +25,7 @@ public class SabotageButtonPatch
return false;
}
DestroyableSingleton<HudManager>.Instance.ToggleMapVisible(
HudManager.Instance.ToggleMapVisible(
new MapOptions
{
Mode = MapOptions.Modes.Sabotage,
+7 -7
View File
@@ -190,26 +190,26 @@ public static class TaskAdderPatch
case TaskTypes.DivertPower:
{
var targetSystem = taskAddButton.MyTask.Cast<DivertPowerTask>().TargetSystem;
taskAddButton.Text.text = DestroyableSingleton<TranslationController>.Instance.GetString(
taskAddButton.Text.text = TranslationController.Instance.GetString(
StringNames.DivertPowerTo,
DestroyableSingleton<TranslationController>.Instance.GetString(targetSystem));
TranslationController.Instance.GetString(targetSystem));
break;
}
case TaskTypes.FixWeatherNode:
{
var nodeId = ((WeatherNodeTask)taskAddButton.MyTask).NodeId;
taskAddButton.Text.text =
DestroyableSingleton<TranslationController>.Instance.GetString(
TranslationController.Instance.GetString(
StringNames.FixWeatherNode,
Array.Empty<Il2CppSystem.Object>()) + " " +
DestroyableSingleton<TranslationController>.Instance.GetString(
TranslationController.Instance.GetString(
WeatherSwitchGame.ControlNames[nodeId],
Array.Empty<Il2CppSystem.Object>());
break;
}
default:
taskAddButton.Text.text =
DestroyableSingleton<TranslationController>.Instance.GetString(taskAddButton.MyTask.TaskType);
TranslationController.Instance.GetString(taskAddButton.MyTask.TaskType);
break;
}
@@ -238,9 +238,9 @@ public static class TaskAdderPatch
if (taskFolder.FolderName == "Roles")
{
for (var m = 0; m < DestroyableSingleton<RoleManager>.Instance.AllRoles.Length; m++)
for (var m = 0; m < RoleManager.Instance.AllRoles.Length; m++)
{
var roleBehaviour = DestroyableSingleton<RoleManager>.Instance.AllRoles[m];
var roleBehaviour = RoleManager.Instance.AllRoles[m];
if (roleBehaviour.Role == RoleTypes.ImpostorGhost || roleBehaviour.Role == RoleTypes.CrewmateGhost ||
CustomRoleManager.CustomRoles.ContainsKey((ushort)roleBehaviour.Role))
{
+1 -1
View File
@@ -224,7 +224,7 @@ public static class CustomRoleManager
var num = BitConverter.ToInt32(netData.Data, 0);
var chance = BitConverter.ToInt32(netData.Data, 4);
DestroyableSingleton<HudManager>.Instance.Notifier.AddRoleSettingsChangeMessage(role.StringName, num, chance, role.TeamType, false);
HudManager.Instance.Notifier.AddRoleSettingsChangeMessage(role.StringName, num, chance, role.TeamType, false);
try
{