This commit is contained in:
JohnCorby 2022-01-29 01:26:28 -08:00
parent 49ad82c326
commit c9321fff84
23 changed files with 32 additions and 32 deletions

View File

@ -169,7 +169,7 @@ namespace QSB.Animation.NPC.Patches
manager._playAfterDelay = false;
manager._playAudioTime = Time.time + audioDelay;
UnityEvents.RunWhen(() => Time.time >= manager._playAudioTime, () =>
DelayUtil.RunWhen(() => Time.time >= manager._playAudioTime, () =>
{
if (!signal.IsOnlyAudibleToScope() || signal.GetOWAudioSource().isPlaying)
{

View File

@ -119,7 +119,7 @@ namespace QSB.Animation.Player
ThrusterManager.CreateRemotePlayerVFX(Player);
var ikSync = body.gameObject.AddComponent<PlayerHeadRotationSync>();
UnityEvents.RunWhen(() => Player.CameraBody != null, () => ikSync.Init(Player.CameraBody.transform));
DelayUtil.RunWhen(() => Player.CameraBody != null, () => ikSync.Init(Player.CameraBody.transform));
}
private void InitAccelerationSync()

View File

@ -23,7 +23,7 @@ namespace QSB.Animation.Player.Thrusters
newVfx.transform.localScale = new Vector3(1, 1, 1);
// Deleted objects take 1 update to actually be deleted
UnityEvents.RunNextFrame(() => newVfx.SetActive(true));
DelayUtil.RunNextFrame(() => newVfx.SetActive(true));
}
private static void ReplaceParticleSystems(GameObject root, PlayerInfo player)

View File

@ -20,7 +20,7 @@ namespace QSB.ClientServerStateSync
private void Start()
{
QSBSceneManager.OnSceneLoaded += OnSceneLoaded;
UnityEvents.RunWhen(() => PlayerTransformSync.LocalInstance != null,
DelayUtil.RunWhen(() => PlayerTransformSync.LocalInstance != null,
() => new ClientStateMessage(ForceGetCurrentState()).Send());
}

View File

@ -32,7 +32,7 @@ namespace QSB.ClientServerStateSync
QSBSceneManager.OnSceneLoaded += OnSceneLoaded;
GlobalMessenger.AddListener("TriggerSupernova", OnTriggerSupernova);
UnityEvents.RunWhen(() => PlayerTransformSync.LocalInstance != null,
DelayUtil.RunWhen(() => PlayerTransformSync.LocalInstance != null,
() => new ServerStateMessage(ForceGetCurrentState()).Send());
}

View File

@ -91,7 +91,7 @@ namespace QSB.ConversationSync.Patches
{
var key = __instance._name + __instance._listPagesToDisplay[__instance._currentPage];
// Sending key so translation can be done on client side - should make different language-d clients compatible
UnityEvents.RunWhen(() => QSBPlayerManager.LocalPlayer.CurrentCharacterDialogueTreeId != -1,
DelayUtil.RunWhen(() => QSBPlayerManager.LocalPlayer.CurrentCharacterDialogueTreeId != -1,
() => ConversationManager.Instance.SendCharacterDialogue(QSBPlayerManager.LocalPlayer.CurrentCharacterDialogueTreeId, key));
}

View File

@ -27,13 +27,13 @@ namespace QSB.Instruments
//QSBInputManager.RiebeckTaunt += OnRiebeckTaunt;
//QSBInputManager.ExitTaunt += ReturnToPlayer;
UnityEvents.RunWhen(() => Locator.GetPlayerBody() != null, SetupInstruments);
DelayUtil.RunWhen(() => Locator.GetPlayerBody() != null, SetupInstruments);
}
public void InitRemote(Transform root)
{
_rootObj = root;
UnityEvents.RunWhen(() => Locator.GetPlayerBody() != null, SetupInstruments);
DelayUtil.RunWhen(() => Locator.GetPlayerBody() != null, SetupInstruments);
}
protected void OnDestroy()

View File

@ -262,7 +262,7 @@ namespace QSB.Menus
if (QSBCore.IsHost)
{
UnityEvents.RunWhen(PlayerData.IsLoaded, () => SetButtonActive(ResumeGameButton, PlayerData.LoadLoopCount() > 1));
DelayUtil.RunWhen(PlayerData.IsLoaded, () => SetButtonActive(ResumeGameButton, PlayerData.LoadLoopCount() > 1));
SetButtonActive(NewGameButton, true);
}
else
@ -274,7 +274,7 @@ namespace QSB.Menus
else
{
SetButtonActive(ClientButton, true);
UnityEvents.RunWhen(PlayerData.IsLoaded, () => SetButtonActive(ResumeGameButton, PlayerData.LoadLoopCount() > 1));
DelayUtil.RunWhen(PlayerData.IsLoaded, () => SetButtonActive(ResumeGameButton, PlayerData.LoadLoopCount() > 1));
SetButtonActive(NewGameButton, true);
}
@ -375,7 +375,7 @@ namespace QSB.Menus
return;
}
UnityEvents.RunWhen(() => PlayerTransformSync.LocalInstance,
DelayUtil.RunWhen(() => PlayerTransformSync.LocalInstance,
() => new RequestGameStateMessage().Send());
}

View File

@ -90,7 +90,7 @@ namespace QSB.MeteorSync.Messages
if (IsDetached && !WorldObject.IsDetached)
{
// the detach is delayed, so wait until that happens
UnityEvents.RunWhen(() => WorldObject.IsDetached, () =>
DelayUtil.RunWhen(() => WorldObject.IsDetached, () =>
{
var body = WorldObject.Body;

View File

@ -38,7 +38,7 @@ namespace QSB.Player.Messages
return;
}
UnityEvents.RunFramesLater(KickPlayer, 10);
DelayUtil.RunFramesLater(KickPlayer, 10);
}
private void KickPlayer()

View File

@ -31,7 +31,7 @@ namespace QSB.Player.Messages
public override void OnReceiveLocal()
{
UnityEvents.RunFramesLater(() =>
DelayUtil.RunFramesLater(() =>
{
if (_waitingForEvent)
{

View File

@ -154,7 +154,7 @@ namespace QSB.Player.TransformSync
REMOTE_Player_Body.AddComponent<PlayerMapMarker>().PlayerName = Player.Name;
Player._ditheringAnimator = REMOTE_Player_Body.AddComponent<DitheringAnimator>();
// get inactive renderers too
UnityEvents.RunNextFrame(() =>
DelayUtil.RunNextFrame(() =>
Player._ditheringAnimator._renderers = Player._ditheringAnimator
.GetComponentsInChildren<Renderer>(true)
.Select(x => x.gameObject.GetAddComponent<OWRenderer>())

View File

@ -106,7 +106,7 @@ namespace QSB
private void InitPlayerName()
{
UnityEvents.RunWhen(PlayerData.IsLoaded, () =>
DelayUtil.RunWhen(PlayerData.IsLoaded, () =>
{
try
{
@ -215,12 +215,12 @@ namespace QSB
QSBPatchManager.DoPatchType(specificType);
QSBPatchManager.DoPatchType(QSBPatchTypes.OnClientConnect);
UnityEvents.RunWhen(() => PlayerTransformSync.LocalInstance,
DelayUtil.RunWhen(() => PlayerTransformSync.LocalInstance,
() => new PlayerJoinMessage(PlayerName).Send());
if (!QSBCore.IsHost)
{
UnityEvents.RunWhen(() => PlayerTransformSync.LocalInstance,
DelayUtil.RunWhen(() => PlayerTransformSync.LocalInstance,
() => new RequestStateResyncMessage().Send());
}

View File

@ -28,7 +28,7 @@ namespace QSB
if (QSBCore.IsInMultiplayer && universe)
{
// So objects have time to be deleted, made, whatever
UnityEvents.RunNextFrame(() => QSBWorldSync.BuildWorldObjects(newScene).Forget());
DelayUtil.RunNextFrame(() => QSBWorldSync.BuildWorldObjects(newScene).Forget());
}
OnSceneLoaded?.SafeInvoke(oldScene, newScene, universe);

View File

@ -144,7 +144,7 @@ namespace QSB.QuantumSync.WorldObjects
private void OnDisable(Shape s) =>
// we wait a frame here in case the shapes get disabled as we switch from 1 visibility tracker to another
UnityEvents.RunNextFrame(() =>
DelayUtil.RunNextFrame(() =>
{
if (!IsEnabled)
{

View File

@ -26,7 +26,7 @@ namespace QSB.RespawnSync
{
Instance = this;
QSBSceneManager.OnSceneLoaded += (OWScene old, OWScene newScene, bool inUniverse)
=> UnityEvents.RunWhen(
=> DelayUtil.RunWhen(
() => Locator.GetMarkerManager() != null,
() => Init(newScene, inUniverse));
QSBNetworkManager.singleton.OnClientConnected += OnConnected;
@ -37,7 +37,7 @@ namespace QSB.RespawnSync
{
if (QSBSceneManager.IsInUniverse)
{
UnityEvents.RunWhen(
DelayUtil.RunWhen(
() => PlayerTransformSync.LocalInstance != null,
() => Init(QSBSceneManager.CurrentScene, true));
}
@ -114,7 +114,7 @@ namespace QSB.RespawnSync
public void TriggerRespawnMap()
{
QSBPatchManager.DoPatchType(QSBPatchTypes.RespawnTime);
UnityEvents.RunNextFrame(() => GlobalMessenger.FireEvent("TriggerObservatoryMap"));
DelayUtil.RunNextFrame(() => GlobalMessenger.FireEvent("TriggerObservatoryMap"));
}
public void Respawn()

View File

@ -47,10 +47,10 @@ namespace QSB.TimeSync
}
public static void Start(TimeSyncType type, Enum reason) =>
UnityEvents.RunWhen(() => Instance._isSetUp, () => Instance.StartTimeSync(type, reason));
DelayUtil.RunWhen(() => Instance._isSetUp, () => Instance.StartTimeSync(type, reason));
public static void Stop() =>
UnityEvents.RunWhen(() => Instance._isSetUp, () => Instance.EndTimeSync());
DelayUtil.RunWhen(() => Instance._isSetUp, () => Instance.EndTimeSync());
private void StartTimeSync(TimeSyncType type, Enum reason)
{

View File

@ -15,7 +15,7 @@ namespace QSB.Tools
set
{
_toolGameObject = value;
UnityEvents.RunFramesLater(
DelayUtil.RunFramesLater(
() => DitheringAnimator = _toolGameObject.AddComponent<DitheringAnimator>(),
5);
}
@ -97,7 +97,7 @@ namespace QSB.Tools
{
_isDitheringOut = true;
DitheringAnimator.SetVisible(false, 5f);
UnityEvents.RunWhen(() => DitheringAnimator._visibleFraction == 0, FinishDitherOut);
DelayUtil.RunWhen(() => DitheringAnimator._visibleFraction == 0, FinishDitherOut);
}
Player.AudioController.PlayUnequipTool();

View File

@ -70,7 +70,7 @@ namespace QSB.Tools.TranslatorTool
REMOTE_NomaiTranslatorProp.transform.parent = player.CameraBody.transform;
REMOTE_NomaiTranslatorProp.transform.localPosition = Vector3.zero;
REMOTE_NomaiTranslatorProp.transform.localScale = TranslatorScale;
UnityEvents.RunFramesLater(() => REMOTE_NomaiTranslatorProp.SetActive(true), 5);
DelayUtil.RunFramesLater(() => REMOTE_NomaiTranslatorProp.SetActive(true), 5);
}
}
}

View File

@ -56,7 +56,7 @@ namespace QSB.TriggerSync.WorldObjects
protected override void OnExit(PlayerInfo player)
{
// wait 1 frame for player to be removed
UnityEvents.RunNextFrame(() =>
DelayUtil.RunNextFrame(() =>
{
if (QSBCore.IsInMultiplayer && Occupants.Count == QSBPlayerManager.PlayerList.Count)
{

View File

@ -35,7 +35,7 @@ namespace QSB.TriggerSync.WorldObjects
QSBPlayerManager.OnRemovePlayer += OnPlayerLeave;
UnityEvents.RunWhen(() => QSBWorldSync.AllObjectsReady, () =>
DelayUtil.RunWhen(() => QSBWorldSync.AllObjectsReady, () =>
{
if (AttachedObject._trackedObjects != null && AttachedObject._trackedObjects.Any(x => x.CompareTag(CompareTag)))
{

View File

@ -3,7 +3,7 @@ using System;
namespace QSB.Utility
{
public static class UnityEvents
public static class DelayUtil
{
public static UniTask RunNextFrame(Action action) => UniTask.Create(async () =>
{

View File

@ -12,7 +12,7 @@ namespace QSB.WorldSync
{
public override void OnReceiveRemote()
{
UnityEvents.RunWhen(() => QSBWorldSync.AllObjectsReady,
DelayUtil.RunWhen(() => QSBWorldSync.AllObjectsReady,
() => SendInitialStates(From));
}