mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-02-04 03:39:55 +00:00
Code Issues Projects Releases Wiki Activity

move everything over to UnityEvents

Browse Source
This commit is contained in:
JohnCorby 2022-01-29 01:24:15 -08:00
parent 37272f0a10
commit e42aec8bae
24 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
QSB/Animation/NPC/Patches/TravelerControllerPatches.cs
View File

@ -1,5 +1,6 @@
using HarmonyLib;
using QSB.Patches;
using QSB.Utility;
using System;
using System.Linq;
using UnityEngine;
@ -168,7 +169,7 @@ namespace QSB.Animation.NPC.Patches
manager._playAfterDelay = false;
manager._playAudioTime = Time.time + audioDelay;
QSBCore.UnityEvents.RunWhen(() => Time.time >= manager._playAudioTime, () =>
UnityEvents.RunWhen(() => Time.time >= manager._playAudioTime, () =>
{
if (!signal.IsOnlyAudibleToScope() || signal.GetOWAudioSource().isPlaying)
{

2
QSB/Animation/Player/AnimationSync.cs
View File

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

2
QSB/Animation/Player/Thrusters/ThrusterManager.cs
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
QSBCore.UnityEvents.FireOnNextUpdate(() => newVfx.SetActive(true));
UnityEvents.FireOnNextUpdate(() => newVfx.SetActive(true));
}
private static void ReplaceParticleSystems(GameObject root, PlayerInfo player)

2
QSB/ClientServerStateSync/ClientStateManager.cs
View File

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

2
QSB/ClientServerStateSync/ServerStateManager.cs
View File

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

2
QSB/ConversationSync/Patches/ConversationPatches.cs
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
QSBCore.UnityEvents.RunWhen(() => QSBPlayerManager.LocalPlayer.CurrentCharacterDialogueTreeId != -1,
UnityEvents.RunWhen(() => QSBPlayerManager.LocalPlayer.CurrentCharacterDialogueTreeId != -1,
() => ConversationManager.Instance.SendCharacterDialogue(QSBPlayerManager.LocalPlayer.CurrentCharacterDialogueTreeId, key));
}

4
QSB/Instruments/InstrumentsManager.cs
View File

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

6
QSB/Menus/MenuManager.cs
View File

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

2
QSB/MeteorSync/Messages/FragmentInitialStateMessage.cs
View File

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

2
QSB/MeteorSync/WorldObjects/QSBFragment.cs
View File

@ -16,7 +16,7 @@ namespace QSB.MeteorSync.WorldObjects
if (QSBCore.IsHost)
{
LeashLength = Random.Range(MeteorManager.WhiteHoleVolume._debrisDistMin, MeteorManager.WhiteHoleVolume._debrisDistMax);
// QSBCore.UnityEvents.FireOnNextUpdate(() =>
// UnityEvents.FireOnNextUpdate(() =>
// {
// AttachedObject._integrity = 0;
// AttachedObject.CallOnTakeDamage();

2
QSB/Player/Messages/PlayerKickMessage.cs
View File

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

2
QSB/Player/Messages/RequestStateResyncMessage.cs
View File

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

2
QSB/Player/TransformSync/PlayerTransformSync.cs
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
QSBCore.UnityEvents.FireOnNextUpdate(() =>
UnityEvents.FireOnNextUpdate(() =>
Player._ditheringAnimator._renderers = Player._ditheringAnimator
.GetComponentsInChildren<Renderer>(true)
.Select(x => x.gameObject.GetAddComponent<OWRenderer>())

6
QSB/QSBNetworkManager.cs
View File

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

2
QSB/QSBSceneManager.cs
View File

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

2
QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs
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
QSBCore.UnityEvents.FireOnNextUpdate(() =>
UnityEvents.FireOnNextUpdate(() =>
{
if (!IsEnabled)
{

6
QSB/RespawnSync/RespawnManager.cs
View File

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

4
QSB/TimeSync/TimeSyncUI.cs
View File

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

2
QSB/Tools/ProbeLauncherTool/ProbeLauncherCreator.cs
View File

@ -80,7 +80,7 @@ namespace QSB.Tools.ProbeLauncherTool
REMOTE_ProbeLauncher.transform.parent = player.CameraBody.transform;
REMOTE_ProbeLauncher.transform.localPosition = ProbeLauncherOffset;
//QSBCore.UnityEvents.FireInNUpdates(() => REMOTE_ProbeLauncher.SetActive(true), 5);
//UnityEvents.FireInNUpdates(() => REMOTE_ProbeLauncher.SetActive(true), 5);
REMOTE_ProbeLauncher.SetActive(true);
}
}

5
QSB/Tools/QSBTool.cs
View File

@ -1,4 +1,5 @@
using QSB.Player;
using QSB.Utility;
using UnityEngine;
namespace QSB.Tools
@ -14,7 +15,7 @@ namespace QSB.Tools
set
{
_toolGameObject = value;
QSBCore.UnityEvents.FireInNUpdates(
UnityEvents.FireInNUpdates(
() => DitheringAnimator = _toolGameObject.AddComponent<DitheringAnimator>(),
5);
}
@ -96,7 +97,7 @@ namespace QSB.Tools
{
_isDitheringOut = true;
DitheringAnimator.SetVisible(false, 5f);
QSBCore.UnityEvents.RunWhen(() => DitheringAnimator._visibleFraction == 0, FinishDitherOut);
UnityEvents.RunWhen(() => DitheringAnimator._visibleFraction == 0, FinishDitherOut);
}
Player.AudioController.PlayUnequipTool();

2
QSB/Tools/TranslatorTool/TranslatorCreator.cs
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;
QSBCore.UnityEvents.FireInNUpdates(() => REMOTE_NomaiTranslatorProp.SetActive(true), 5);
UnityEvents.FireInNUpdates(() => REMOTE_NomaiTranslatorProp.SetActive(true), 5);
}
}
}

3
QSB/TriggerSync/WorldObjects/QSBInflationTrigger.cs
View File

@ -1,5 +1,6 @@
using Cysharp.Threading.Tasks;
using QSB.Player;
using QSB.Utility;
using System.Threading;
using UnityEngine;
@ -55,7 +56,7 @@ namespace QSB.TriggerSync.WorldObjects
protected override void OnExit(PlayerInfo player)
{
// wait 1 frame for player to be removed
QSBCore.UnityEvents.FireOnNextUpdate(() =>
UnityEvents.FireOnNextUpdate(() =>
{
if (QSBCore.IsInMultiplayer && Occupants.Count == QSBPlayerManager.PlayerList.Count)
{

3
QSB/TriggerSync/WorldObjects/QSBTrigger.cs
View File

@ -2,6 +2,7 @@
using QSB.Messaging;
using QSB.Player;
using QSB.TriggerSync.Messages;
using QSB.Utility;
using QSB.WorldSync;
using System.Collections.Generic;
using System.Linq;
@ -34,7 +35,7 @@ namespace QSB.TriggerSync.WorldObjects
QSBPlayerManager.OnRemovePlayer += OnPlayerLeave;
QSBCore.UnityEvents.RunWhen(() => QSBWorldSync.AllObjectsReady, () =>
UnityEvents.RunWhen(() => QSBWorldSync.AllObjectsReady, () =>
{
if (AttachedObject._trackedObjects != null && AttachedObject._trackedObjects.Any(x => x.CompareTag(CompareTag)))
{

2
QSB/WorldSync/RequestInitialStatesMessage.cs
View File

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