Gittes-archive/new-horizons
2
0
Fork 0
mirror of https://github.com/Outer-Wilds-New-Horizons/new-horizons.git synced 2025-12-11 20:15:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix obsolete warnings

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NewHorizons/Handlers/VesselWarpHandler.cs
View File

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

8
NewHorizons/Main.cs
View File

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

2
NewHorizons/Utility/Delay.cs
View File

@ -4,8 +4,10 @@ namespace NewHorizons.Utility
{ {
public static class Delay 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 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 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); public static void FireOnNextUpdate(Action action) => Main.Instance.ModHelper.Events.Unity.FireOnNextUpdate(action);
#pragma warning restore CS0618 // Type or member is obsolete
} }
} }