Fix obsolete warnings

This commit is contained in:
Nick 2022-12-12 18:30:26 -05:00
parent ed00dd0ae8
commit 107146f4a7
3 changed files with 8 additions and 6 deletions

View File

@ -160,7 +160,7 @@ namespace NewHorizons.Handlers
vesselObject.SetActive(true);
Instance.ModHelper.Events.Unity.FireOnNextUpdate(() => SetupWarpController(vesselWarpController));
Delay.FireOnNextUpdate(() => SetupWarpController(vesselWarpController));
return eyeSpawnPoint;
}
@ -188,7 +188,7 @@ namespace NewHorizons.Handlers
vesselWarpController._whiteHoleOneShot = vesselWarpController._whiteHole.transform.parent.Find("WhiteHoleAudio_OneShot").GetComponent<OWAudioSource>();
}
Instance.ModHelper.Events.Unity.FireOnNextUpdate(() => SetupWarpController(vesselWarpController, true));
Delay.FireOnNextUpdate(() => SetupWarpController(vesselWarpController, true));
return spawnPoint;
}

View File

@ -214,8 +214,8 @@ namespace NewHorizons
Logger.LogWarning("Couldn't find planets folder");
}
Instance.ModHelper.Events.Unity.FireOnNextUpdate(() => OnSceneLoaded(SceneManager.GetActiveScene(), LoadSceneMode.Single));
Instance.ModHelper.Events.Unity.FireOnNextUpdate(() => _firstLoad = false);
Delay.FireOnNextUpdate(() => OnSceneLoaded(SceneManager.GetActiveScene(), LoadSceneMode.Single));
Delay.FireOnNextUpdate(() => _firstLoad = false);
Instance.ModHelper.Menus.PauseMenu.OnInit += DebugReload.InitializePauseMenu;
MenuHandler.Init();
@ -401,7 +401,7 @@ namespace NewHorizons
var shouldWarpInFromShip = IsWarpingFromShip && _shipWarpController != null;
var shouldWarpInFromVessel = IsWarpingFromVessel && VesselWarpHandler.VesselSpawnPoint != null;
Instance.ModHelper.Events.Unity.RunWhen(() => IsSystemReady, () => OnSystemReady(shouldWarpInFromShip, shouldWarpInFromVessel));
Delay.RunWhen(() => IsSystemReady, () => OnSystemReady(shouldWarpInFromShip, shouldWarpInFromVessel));
IsWarpingFromShip = false;
IsWarpingFromVessel = false;
@ -465,7 +465,7 @@ namespace NewHorizons
else if (isEyeOfTheUniverse)
{
// There is no wake up in eye scene
Instance.ModHelper.Events.Unity.FireOnNextUpdate(() =>
Delay.FireOnNextUpdate(() =>
{
IsSystemReady = true;
OnSystemReady(false, false);

View File

@ -4,8 +4,10 @@ namespace NewHorizons.Utility
{
public static class Delay
{
#pragma warning disable CS0618 // Type or member is obsolete
public static void RunWhen(Func<bool> predicate, Action action) => Main.Instance.ModHelper.Events.Unity.RunWhen(predicate, action);
public static void FireInNUpdates(Action action, int n) => Main.Instance.ModHelper.Events.Unity.FireInNUpdates(action, n);
public static void FireOnNextUpdate(Action action) => Main.Instance.ModHelper.Events.Unity.FireOnNextUpdate(action);
#pragma warning restore CS0618 // Type or member is obsolete
}
}