diff --git a/QSB/Animation/AnimControllerPatch.cs b/QSB/Animation/AnimControllerPatch.cs index 725702ae..00f411ff 100644 --- a/QSB/Animation/AnimControllerPatch.cs +++ b/QSB/Animation/AnimControllerPatch.cs @@ -3,24 +3,24 @@ using UnityEngine; namespace QSB.Animation { - public static class AnimControllerPatch - { - public static RuntimeAnimatorController SuitedAnimController { get; private set; } + public static class AnimControllerPatch + { + public static RuntimeAnimatorController SuitedAnimController { get; private set; } - public static void Init() - { - QSB.Helper.Events.Subscribe(OWML.Common.Events.BeforeStart); - QSB.Helper.Events.Event += OnEvent; - } + public static void Init() + { + QSB.Helper.Events.Subscribe(OWML.Common.Events.BeforeStart); + QSB.Helper.Events.Event += OnEvent; + } - private static void OnEvent(MonoBehaviour behaviour, OWML.Common.Events ev) - { - if (behaviour is PlayerAnimController playerAnimController && - ev == OWML.Common.Events.BeforeStart && - SuitedAnimController == null) - { - SuitedAnimController = playerAnimController.GetValue("_baseAnimController"); - } - } - } + private static void OnEvent(MonoBehaviour behaviour, OWML.Common.Events ev) + { + if (behaviour is PlayerAnimController playerAnimController && + ev == OWML.Common.Events.BeforeStart && + SuitedAnimController == null) + { + SuitedAnimController = playerAnimController.GetValue("_baseAnimController"); + } + } + } } \ No newline at end of file diff --git a/QSB/Animation/AnimFloatParam.cs b/QSB/Animation/AnimFloatParam.cs index 8b4f2e78..be3a71a0 100644 --- a/QSB/Animation/AnimFloatParam.cs +++ b/QSB/Animation/AnimFloatParam.cs @@ -2,17 +2,17 @@ namespace QSB.Animation { - public class AnimFloatParam - { - public float Current { get; private set; } - public float Target { get; set; } + public class AnimFloatParam + { + public float Current { get; private set; } + public float Target { get; set; } - private float _velocity; + private float _velocity; - public float Smooth(float smoothTime) - { - Current = Mathf.SmoothDamp(Current, Target, ref _velocity, smoothTime); - return Current; - } - } + public float Smooth(float smoothTime) + { + Current = Mathf.SmoothDamp(Current, Target, ref _velocity, smoothTime); + return Current; + } + } } \ No newline at end of file diff --git a/QSB/Animation/AnimationType.cs b/QSB/Animation/AnimationType.cs index 6b6e44ba..977bcda4 100644 --- a/QSB/Animation/AnimationType.cs +++ b/QSB/Animation/AnimationType.cs @@ -1,13 +1,13 @@ namespace QSB.Animation { - public enum AnimationType - { - Chert, - Esker, - Feldspar, - Gabbro, - PlayerSuited, - PlayerUnsuited, - Riebeck - } + public enum AnimationType + { + Chert, + Esker, + Feldspar, + Gabbro, + PlayerSuited, + PlayerUnsuited, + Riebeck + } } \ No newline at end of file diff --git a/QSB/Animation/AnimatorMirror.cs b/QSB/Animation/AnimatorMirror.cs index 3fb87fd0..d57ac95a 100644 --- a/QSB/Animation/AnimatorMirror.cs +++ b/QSB/Animation/AnimatorMirror.cs @@ -7,92 +7,92 @@ using UnityEngine; namespace QSB.Animation { - public class AnimatorMirror : MonoBehaviour - { - private const float SmoothTime = 0.05f; + public class AnimatorMirror : MonoBehaviour + { + private const float SmoothTime = 0.05f; - private Animator _from; - private Animator _to; + private Animator _from; + private Animator _to; - private readonly Dictionary _floatParams = new Dictionary(); + private readonly Dictionary _floatParams = new Dictionary(); - public void Init(Animator from, Animator to) - { - _from = from; - _to = to; - if (_from.runtimeAnimatorController == null) - { - DebugLog.DebugWrite($"Warning - \"From\" ({from.name}) controller is null.", MessageType.Warning); - _from.runtimeAnimatorController = _to.runtimeAnimatorController; - } - else if (_to.runtimeAnimatorController == null) - { - DebugLog.DebugWrite($"Warning - \"To\" ({to.name}) controller is null.", MessageType.Warning); - _to.runtimeAnimatorController = _from.runtimeAnimatorController; - } - foreach (var param in _from.parameters.Where(p => p.type == AnimatorControllerParameterType.Float)) - { - _floatParams.Add(param.name, new AnimFloatParam()); - } - } + public void Init(Animator from, Animator to) + { + _from = from; + _to = to; + if (_from.runtimeAnimatorController == null) + { + DebugLog.DebugWrite($"Warning - \"From\" ({from.name}) controller is null.", MessageType.Warning); + _from.runtimeAnimatorController = _to.runtimeAnimatorController; + } + else if (_to.runtimeAnimatorController == null) + { + DebugLog.DebugWrite($"Warning - \"To\" ({to.name}) controller is null.", MessageType.Warning); + _to.runtimeAnimatorController = _from.runtimeAnimatorController; + } + foreach (var param in _from.parameters.Where(p => p.type == AnimatorControllerParameterType.Float)) + { + _floatParams.Add(param.name, new AnimFloatParam()); + } + } - private PlayerInfo GetPlayer() - { - return QSBPlayerManager.GetSyncObjects().First(x => x.Mirror == this).Player; - } + private PlayerInfo GetPlayer() + { + return QSBPlayerManager.GetSyncObjects().First(x => x.Mirror == this).Player; + } - private void Update() - { - if (_to == null || _from == null) - { - return; - } - if (_to.runtimeAnimatorController != _from.runtimeAnimatorController) - { - _to.runtimeAnimatorController = _from.runtimeAnimatorController; - } - SyncParams(); - SmoothFloats(); - } + private void Update() + { + if (_to == null || _from == null) + { + return; + } + if (_to.runtimeAnimatorController != _from.runtimeAnimatorController) + { + _to.runtimeAnimatorController = _from.runtimeAnimatorController; + } + SyncParams(); + SmoothFloats(); + } - private void SyncParams() - { - foreach (var fromParam in _from.parameters) - { - switch (fromParam.type) - { - case AnimatorControllerParameterType.Float: - if (!_floatParams.ContainsKey(fromParam.name)) - { - DebugLog.ToConsole($"Warning - Tried to sync anim float that doesn't exist in dict : {fromParam.name}", MessageType.Warning); - RebuildFloatParams(); - break; - } - _floatParams[fromParam.name].Target = _from.GetFloat(fromParam.name); - break; - case AnimatorControllerParameterType.Bool: - _to.SetBool(fromParam.name, _from.GetBool(fromParam.name)); - break; - } - } - } + private void SyncParams() + { + foreach (var fromParam in _from.parameters) + { + switch (fromParam.type) + { + case AnimatorControllerParameterType.Float: + if (!_floatParams.ContainsKey(fromParam.name)) + { + DebugLog.ToConsole($"Warning - Tried to sync anim float that doesn't exist in dict : {fromParam.name}", MessageType.Warning); + RebuildFloatParams(); + break; + } + _floatParams[fromParam.name].Target = _from.GetFloat(fromParam.name); + break; + case AnimatorControllerParameterType.Bool: + _to.SetBool(fromParam.name, _from.GetBool(fromParam.name)); + break; + } + } + } - private void SmoothFloats() - { - foreach (var floatParam in _floatParams) - { - var current = floatParam.Value.Smooth(SmoothTime); - _to.SetFloat(floatParam.Key, current); - } - } + private void SmoothFloats() + { + foreach (var floatParam in _floatParams) + { + var current = floatParam.Value.Smooth(SmoothTime); + _to.SetFloat(floatParam.Key, current); + } + } - public void RebuildFloatParams() - { - _floatParams.Clear(); - foreach (var param in _from.parameters.Where(p => p.type == AnimatorControllerParameterType.Float)) - { - _floatParams.Add(param.name, new AnimFloatParam()); - } - } - } + public void RebuildFloatParams() + { + _floatParams.Clear(); + foreach (var param in _from.parameters.Where(p => p.type == AnimatorControllerParameterType.Float)) + { + _floatParams.Add(param.name, new AnimFloatParam()); + } + } + } } \ No newline at end of file diff --git a/QSB/Animation/CrouchSync.cs b/QSB/Animation/CrouchSync.cs index df5231e1..50caa747 100644 --- a/QSB/Animation/CrouchSync.cs +++ b/QSB/Animation/CrouchSync.cs @@ -1,7 +1,6 @@ using QSB.QuantumUNET; using System; using UnityEngine; -using UnityEngine.Networking; namespace QSB.Animation { diff --git a/QSB/Animation/Events/ChangeAnimTypeEvent.cs b/QSB/Animation/Events/ChangeAnimTypeEvent.cs index 415c90fc..76d96e68 100644 --- a/QSB/Animation/Events/ChangeAnimTypeEvent.cs +++ b/QSB/Animation/Events/ChangeAnimTypeEvent.cs @@ -5,26 +5,26 @@ using QSB.Player; namespace QSB.Animation.Events { - public class ChangeAnimTypeEvent : QSBEvent> - { - public override EventType Type => EventType.PlayInstrument; + public class ChangeAnimTypeEvent : QSBEvent> + { + public override EventType Type => EventType.PlayInstrument; - public override void SetupListener() => GlobalMessenger.AddListener(EventNames.QSBChangeAnimType, Handler); + public override void SetupListener() => GlobalMessenger.AddListener(EventNames.QSBChangeAnimType, Handler); - public override void CloseListener() => GlobalMessenger.RemoveListener(EventNames.QSBChangeAnimType, Handler); + public override void CloseListener() => GlobalMessenger.RemoveListener(EventNames.QSBChangeAnimType, Handler); - private void Handler(uint player, AnimationType type) => SendEvent(CreateMessage(player, type)); + private void Handler(uint player, AnimationType type) => SendEvent(CreateMessage(player, type)); - private EnumMessage CreateMessage(uint player, AnimationType type) => new EnumMessage - { - AboutId = player, - Value = type - }; + private EnumMessage CreateMessage(uint player, AnimationType type) => new EnumMessage + { + AboutId = player, + Value = type + }; - public override void OnReceiveRemote(EnumMessage message) - { - QSBPlayerManager.GetPlayer(message.AboutId).AnimationSync.SetAnimationType(message.Value); - QSBPlayerManager.GetSyncObject(message.AboutId).CheckInstrumentProps(message.Value); - } - } + public override void OnReceiveRemote(EnumMessage message) + { + QSBPlayerManager.GetPlayer(message.AboutId).AnimationSync.SetAnimationType(message.Value); + QSBPlayerManager.GetSyncObject(message.AboutId).CheckInstrumentProps(message.Value); + } + } } \ No newline at end of file diff --git a/QSB/Animation/Events/CrouchEvent.cs b/QSB/Animation/Events/CrouchEvent.cs index 1a4191f6..a38232cd 100644 --- a/QSB/Animation/Events/CrouchEvent.cs +++ b/QSB/Animation/Events/CrouchEvent.cs @@ -4,30 +4,30 @@ using QSB.Player; namespace QSB.Animation.Events { - public class CrouchEvent : QSBEvent - { - public override EventType Type => EventType.AnimTrigger; + public class CrouchEvent : QSBEvent + { + public override EventType Type => EventType.AnimTrigger; - public override void SetupListener() => GlobalMessenger.AddListener(EventNames.QSBCrouch, Handler); + public override void SetupListener() => GlobalMessenger.AddListener(EventNames.QSBCrouch, Handler); - public override void CloseListener() => GlobalMessenger.RemoveListener(EventNames.QSBCrouch, Handler); + public override void CloseListener() => GlobalMessenger.RemoveListener(EventNames.QSBCrouch, Handler); - private void Handler(float value) => SendEvent(CreateMessage(value)); + private void Handler(float value) => SendEvent(CreateMessage(value)); - private FloatMessage CreateMessage(float value) => new FloatMessage - { - AboutId = LocalPlayerId, - Value = value - }; + private FloatMessage CreateMessage(float value) => new FloatMessage + { + AboutId = LocalPlayerId, + Value = value + }; - public override void OnReceiveRemote(FloatMessage message) - { - var animationSync = QSBPlayerManager.GetSyncObject(message.AboutId); - if (animationSync == null) - { - return; - } - animationSync.HandleCrouch(message.Value); - } - } + public override void OnReceiveRemote(FloatMessage message) + { + var animationSync = QSBPlayerManager.GetSyncObject(message.AboutId); + if (animationSync == null) + { + return; + } + animationSync.HandleCrouch(message.Value); + } + } } \ No newline at end of file diff --git a/QSB/Animation/Events/PlayerSuitEvent.cs b/QSB/Animation/Events/PlayerSuitEvent.cs index b2924ab4..57e5de49 100644 --- a/QSB/Animation/Events/PlayerSuitEvent.cs +++ b/QSB/Animation/Events/PlayerSuitEvent.cs @@ -4,52 +4,52 @@ using QSB.Player; namespace QSB.Animation { - public class PlayerSuitEvent : QSBEvent - { - public override EventType Type => EventType.SuitActiveChange; + public class PlayerSuitEvent : QSBEvent + { + public override EventType Type => EventType.SuitActiveChange; - public override void SetupListener() - { - GlobalMessenger.AddListener(EventNames.SuitUp, HandleSuitUp); - GlobalMessenger.AddListener(EventNames.RemoveSuit, HandleSuitDown); - } + public override void SetupListener() + { + GlobalMessenger.AddListener(EventNames.SuitUp, HandleSuitUp); + GlobalMessenger.AddListener(EventNames.RemoveSuit, HandleSuitDown); + } - public override void CloseListener() - { - GlobalMessenger.RemoveListener(EventNames.SuitUp, HandleSuitUp); - GlobalMessenger.RemoveListener(EventNames.RemoveSuit, HandleSuitDown); - } + public override void CloseListener() + { + GlobalMessenger.RemoveListener(EventNames.SuitUp, HandleSuitUp); + GlobalMessenger.RemoveListener(EventNames.RemoveSuit, HandleSuitDown); + } - private void HandleSuitUp() => SendEvent(CreateMessage(true)); - private void HandleSuitDown() => SendEvent(CreateMessage(false)); + private void HandleSuitUp() => SendEvent(CreateMessage(true)); + private void HandleSuitDown() => SendEvent(CreateMessage(false)); - private ToggleMessage CreateMessage(bool value) => new ToggleMessage - { - AboutId = LocalPlayerId, - ToggleValue = value - }; + private ToggleMessage CreateMessage(bool value) => new ToggleMessage + { + AboutId = LocalPlayerId, + ToggleValue = value + }; - public override void OnReceiveRemote(ToggleMessage message) - { - var player = QSBPlayerManager.GetPlayer(message.AboutId); - player?.UpdateState(State.Suit, message.ToggleValue); + public override void OnReceiveRemote(ToggleMessage message) + { + var player = QSBPlayerManager.GetPlayer(message.AboutId); + player?.UpdateState(State.Suit, message.ToggleValue); - if (!player.IsReady) - { - return; - } + if (!player.IsReady) + { + return; + } - var animator = player.AnimationSync; - var type = message.ToggleValue ? AnimationType.PlayerSuited : AnimationType.PlayerUnsuited; - animator.SetAnimationType(type); - } + var animator = player.AnimationSync; + var type = message.ToggleValue ? AnimationType.PlayerSuited : AnimationType.PlayerUnsuited; + animator.SetAnimationType(type); + } - public override void OnReceiveLocal(ToggleMessage message) - { - QSBPlayerManager.LocalPlayer.UpdateState(State.Suit, message.ToggleValue); - var animator = QSBPlayerManager.LocalPlayer.AnimationSync; - var type = message.ToggleValue ? AnimationType.PlayerSuited : AnimationType.PlayerUnsuited; - animator.CurrentType = type; - } - } + public override void OnReceiveLocal(ToggleMessage message) + { + QSBPlayerManager.LocalPlayer.UpdateState(State.Suit, message.ToggleValue); + var animator = QSBPlayerManager.LocalPlayer.AnimationSync; + var type = message.ToggleValue ? AnimationType.PlayerSuited : AnimationType.PlayerUnsuited; + animator.CurrentType = type; + } + } } \ No newline at end of file diff --git a/QSB/Animation/Events/QSBAnimationMessage.cs b/QSB/Animation/Events/QSBAnimationMessage.cs index ab6523b5..85557fd9 100644 --- a/QSB/Animation/Events/QSBAnimationMessage.cs +++ b/QSB/Animation/Events/QSBAnimationMessage.cs @@ -2,34 +2,34 @@ namespace QSB.Animation.Events { - class QSBAnimationMessage : MessageBase - { - public NetworkInstanceId netId; - public int stateHash; - public float normalizedTime; - public byte[] parameters; + class QSBAnimationMessage : MessageBase + { + public NetworkInstanceId netId; + public int stateHash; + public float normalizedTime; + public byte[] parameters; - public override void Deserialize(NetworkReader reader) - { - netId = reader.ReadNetworkId(); - stateHash = (int)reader.ReadPackedUInt32(); - normalizedTime = reader.ReadSingle(); - parameters = reader.ReadBytesAndSize(); - } + public override void Deserialize(NetworkReader reader) + { + netId = reader.ReadNetworkId(); + stateHash = (int)reader.ReadPackedUInt32(); + normalizedTime = reader.ReadSingle(); + parameters = reader.ReadBytesAndSize(); + } - public override void Serialize(NetworkWriter writer) - { - writer.Write(netId); - writer.WritePackedUInt32((uint)stateHash); - writer.Write(normalizedTime); - if (parameters == null) - { - writer.WriteBytesAndSize(parameters, 0); - } - else - { - writer.WriteBytesAndSize(parameters, parameters.Length); - } - } - } + public override void Serialize(NetworkWriter writer) + { + writer.Write(netId); + writer.WritePackedUInt32((uint)stateHash); + writer.Write(normalizedTime); + if (parameters == null) + { + writer.WriteBytesAndSize(parameters, 0); + } + else + { + writer.WriteBytesAndSize(parameters, parameters.Length); + } + } + } } \ No newline at end of file diff --git a/QSB/Animation/Events/QSBAnimationParametersMessage.cs b/QSB/Animation/Events/QSBAnimationParametersMessage.cs index 4d34b97f..a0108288 100644 --- a/QSB/Animation/Events/QSBAnimationParametersMessage.cs +++ b/QSB/Animation/Events/QSBAnimationParametersMessage.cs @@ -2,28 +2,28 @@ namespace QSB.Animation.Events { - class QSBAnimationParametersMessage : MessageBase - { - public NetworkInstanceId netId; - public byte[] parameters; + class QSBAnimationParametersMessage : MessageBase + { + public NetworkInstanceId netId; + public byte[] parameters; - public override void Deserialize(NetworkReader reader) - { - netId = reader.ReadNetworkId(); - parameters = reader.ReadBytesAndSize(); - } + public override void Deserialize(NetworkReader reader) + { + netId = reader.ReadNetworkId(); + parameters = reader.ReadBytesAndSize(); + } - public override void Serialize(NetworkWriter writer) - { - writer.Write(netId); - if (parameters == null) - { - writer.WriteBytesAndSize(parameters, 0); - } - else - { - writer.WriteBytesAndSize(parameters, parameters.Length); - } - } - } + public override void Serialize(NetworkWriter writer) + { + writer.Write(netId); + if (parameters == null) + { + writer.WriteBytesAndSize(parameters, 0); + } + else + { + writer.WriteBytesAndSize(parameters, parameters.Length); + } + } + } } \ No newline at end of file diff --git a/QSB/Animation/Events/QSBAnimationTriggerMessage.cs b/QSB/Animation/Events/QSBAnimationTriggerMessage.cs index 1be48b7d..414e2f02 100644 --- a/QSB/Animation/Events/QSBAnimationTriggerMessage.cs +++ b/QSB/Animation/Events/QSBAnimationTriggerMessage.cs @@ -2,21 +2,21 @@ namespace QSB.Animation.Events { - class QSBAnimationTriggerMessage : MessageBase - { - public NetworkInstanceId netId; - public int hash; + class QSBAnimationTriggerMessage : MessageBase + { + public NetworkInstanceId netId; + public int hash; - public override void Deserialize(NetworkReader reader) - { - netId = reader.ReadNetworkId(); - hash = (int)reader.ReadPackedUInt32(); - } + public override void Deserialize(NetworkReader reader) + { + netId = reader.ReadNetworkId(); + hash = (int)reader.ReadPackedUInt32(); + } - public override void Serialize(NetworkWriter writer) - { - writer.Write(netId); - writer.WritePackedUInt32((uint)hash); - } - } + public override void Serialize(NetworkWriter writer) + { + writer.Write(netId); + writer.WritePackedUInt32((uint)hash); + } + } } \ No newline at end of file diff --git a/QSB/Animation/PlayerHeadRotationSync.cs b/QSB/Animation/PlayerHeadRotationSync.cs index 4905a7cf..9d29335e 100644 --- a/QSB/Animation/PlayerHeadRotationSync.cs +++ b/QSB/Animation/PlayerHeadRotationSync.cs @@ -2,23 +2,23 @@ namespace QSB.Animation { - public class PlayerHeadRotationSync : MonoBehaviour - { - private Animator _attachedAnimator; - private Transform _lookBase; + public class PlayerHeadRotationSync : MonoBehaviour + { + private Animator _attachedAnimator; + private Transform _lookBase; - public void Init(Transform lookBase) - { - _attachedAnimator = GetComponent(); - _lookBase = lookBase; - } + public void Init(Transform lookBase) + { + _attachedAnimator = GetComponent(); + _lookBase = lookBase; + } - void LateUpdate() - { - var bone = _attachedAnimator.GetBoneTransform(HumanBodyBones.Head); - // Get the camera's local rotation with respect to the player body - var lookLocalRotation = Quaternion.Inverse(_attachedAnimator.transform.rotation) * _lookBase.rotation; - bone.localRotation = Quaternion.Euler(0f, 0f, lookLocalRotation.eulerAngles.x); - } - } + void LateUpdate() + { + var bone = _attachedAnimator.GetBoneTransform(HumanBodyBones.Head); + // Get the camera's local rotation with respect to the player body + var lookLocalRotation = Quaternion.Inverse(_attachedAnimator.transform.rotation) * _lookBase.rotation; + bone.localRotation = Quaternion.Euler(0f, 0f, lookLocalRotation.eulerAngles.x); + } + } } \ No newline at end of file diff --git a/QSB/ConversationSync/ConversationManager.cs b/QSB/ConversationSync/ConversationManager.cs index b2f91027..05e2dafc 100644 --- a/QSB/ConversationSync/ConversationManager.cs +++ b/QSB/ConversationSync/ConversationManager.cs @@ -11,135 +11,135 @@ using UnityEngine.UI; namespace QSB.ConversationSync { - public class ConversationManager : MonoBehaviour - { - public static ConversationManager Instance { get; private set; } - public AssetBundle ConversationAssetBundle { get; private set; } - private GameObject BoxPrefab; - public Dictionary BoxMappings = new Dictionary(); + public class ConversationManager : MonoBehaviour + { + public static ConversationManager Instance { get; private set; } + public AssetBundle ConversationAssetBundle { get; private set; } + private GameObject BoxPrefab; + public Dictionary BoxMappings = new Dictionary(); - private void Start() - { - Instance = this; + private void Start() + { + Instance = this; - ConversationAssetBundle = QSB.Helper.Assets.LoadBundle("assets/conversation"); + ConversationAssetBundle = QSB.Helper.Assets.LoadBundle("assets/conversation"); - BoxPrefab = ConversationAssetBundle.LoadAsset("assets/dialoguebubble.prefab"); - // TODO : make dynamic so it can be different sizes! - var font = (Font)Resources.Load(@"fonts\english - latin\spacemono-bold"); - if (font == null) - { - DebugLog.ToConsole("Error - Font is null!", MessageType.Error); - } - BoxPrefab.GetComponent().font = font; - BoxPrefab.GetComponent().color = Color.white; - } + BoxPrefab = ConversationAssetBundle.LoadAsset("assets/dialoguebubble.prefab"); + // TODO : make dynamic so it can be different sizes! + var font = (Font)Resources.Load(@"fonts\english - latin\spacemono-bold"); + if (font == null) + { + DebugLog.ToConsole("Error - Font is null!", MessageType.Error); + } + BoxPrefab.GetComponent().font = font; + BoxPrefab.GetComponent().color = Color.white; + } - public uint GetPlayerTalkingToTree(CharacterDialogueTree tree) - { - var treeIndex = WorldRegistry.OldDialogueTrees.IndexOf(tree); - if (!QSBPlayerManager.PlayerList.Any(x => x.CurrentDialogueID == treeIndex)) - { - // No player talking to tree - return uint.MaxValue; - } - // .First() should be fine here as only one player should be talking to a character. - return QSBPlayerManager.PlayerList.First(x => x.CurrentDialogueID == treeIndex).PlayerId; - } + public uint GetPlayerTalkingToTree(CharacterDialogueTree tree) + { + var treeIndex = WorldRegistry.OldDialogueTrees.IndexOf(tree); + if (!QSBPlayerManager.PlayerList.Any(x => x.CurrentDialogueID == treeIndex)) + { + // No player talking to tree + return uint.MaxValue; + } + // .First() should be fine here as only one player should be talking to a character. + return QSBPlayerManager.PlayerList.First(x => x.CurrentDialogueID == treeIndex).PlayerId; + } - public void SendPlayerOption(string text) - { - GlobalMessenger - .FireEvent(EventNames.QSBConversation, QSBPlayerManager.LocalPlayerId, text, ConversationType.Player); - } + public void SendPlayerOption(string text) + { + GlobalMessenger + .FireEvent(EventNames.QSBConversation, QSBPlayerManager.LocalPlayerId, text, ConversationType.Player); + } - public void SendCharacterDialogue(int id, string text) - { - if (id == -1) - { - DebugLog.ToConsole("Warning - Tried to send conv. event with char id -1.", MessageType.Warning); - return; - } - GlobalMessenger - .FireEvent(EventNames.QSBConversation, (uint)id, text, ConversationType.Character); - } + public void SendCharacterDialogue(int id, string text) + { + if (id == -1) + { + DebugLog.ToConsole("Warning - Tried to send conv. event with char id -1.", MessageType.Warning); + return; + } + GlobalMessenger + .FireEvent(EventNames.QSBConversation, (uint)id, text, ConversationType.Character); + } - public void CloseBoxPlayer() - { - GlobalMessenger - .FireEvent(EventNames.QSBConversation, QSBPlayerManager.LocalPlayerId, "", ConversationType.ClosePlayer); - } + public void CloseBoxPlayer() + { + GlobalMessenger + .FireEvent(EventNames.QSBConversation, QSBPlayerManager.LocalPlayerId, "", ConversationType.ClosePlayer); + } - public void CloseBoxCharacter(int id) - { - GlobalMessenger - .FireEvent(EventNames.QSBConversation, (uint)id, "", ConversationType.CloseCharacter); - } + public void CloseBoxCharacter(int id) + { + GlobalMessenger + .FireEvent(EventNames.QSBConversation, (uint)id, "", ConversationType.CloseCharacter); + } - public void SendConvState(int charId, bool state) - { - if (charId == -1) - { - DebugLog.ToConsole("Warning - Tried to send conv. start/end event with char id -1.", MessageType.Warning); - return; - } - GlobalMessenger - .FireEvent(EventNames.QSBConversationStartEnd, charId, QSBPlayerManager.LocalPlayerId, state); - } + public void SendConvState(int charId, bool state) + { + if (charId == -1) + { + DebugLog.ToConsole("Warning - Tried to send conv. start/end event with char id -1.", MessageType.Warning); + return; + } + GlobalMessenger + .FireEvent(EventNames.QSBConversationStartEnd, charId, QSBPlayerManager.LocalPlayerId, state); + } - public void DisplayPlayerConversationBox(uint playerId, string text) - { - if (playerId == QSBPlayerManager.LocalPlayerId) - { - DebugLog.ToConsole("Error - Cannot display conversation box for local player!", MessageType.Error); - return; - } + public void DisplayPlayerConversationBox(uint playerId, string text) + { + if (playerId == QSBPlayerManager.LocalPlayerId) + { + DebugLog.ToConsole("Error - Cannot display conversation box for local player!", MessageType.Error); + return; + } - var player = QSBPlayerManager.GetPlayer(playerId); + var player = QSBPlayerManager.GetPlayer(playerId); - // Destroy old box if it exists - var playerBox = player.CurrentDialogueBox; - if (playerBox != null) - { - Destroy(playerBox); - } + // Destroy old box if it exists + var playerBox = player.CurrentDialogueBox; + if (playerBox != null) + { + Destroy(playerBox); + } - QSBPlayerManager.GetPlayer(playerId).CurrentDialogueBox = CreateBox(player.Body.transform, 25, text); - } + QSBPlayerManager.GetPlayer(playerId).CurrentDialogueBox = CreateBox(player.Body.transform, 25, text); + } - public void DisplayCharacterConversationBox(int index, string text) - { - if (WorldRegistry.OldDialogueTrees.ElementAtOrDefault(index) == null) - { - DebugLog.ToConsole($"Error - Tried to display character conversation box for id {index}! (Doesn't exist!)", MessageType.Error); - return; - } + public void DisplayCharacterConversationBox(int index, string text) + { + if (WorldRegistry.OldDialogueTrees.ElementAtOrDefault(index) == null) + { + DebugLog.ToConsole($"Error - Tried to display character conversation box for id {index}! (Doesn't exist!)", MessageType.Error); + return; + } - // Remove old box if it exists - var oldDialogueTree = WorldRegistry.OldDialogueTrees[index]; - if (BoxMappings.ContainsKey(oldDialogueTree)) - { - Destroy(BoxMappings[oldDialogueTree]); - BoxMappings.Remove(oldDialogueTree); - } + // Remove old box if it exists + var oldDialogueTree = WorldRegistry.OldDialogueTrees[index]; + if (BoxMappings.ContainsKey(oldDialogueTree)) + { + Destroy(BoxMappings[oldDialogueTree]); + BoxMappings.Remove(oldDialogueTree); + } - BoxMappings.Add(oldDialogueTree, CreateBox(oldDialogueTree.gameObject.transform, 2, text)); - } + BoxMappings.Add(oldDialogueTree, CreateBox(oldDialogueTree.gameObject.transform, 2, text)); + } - private GameObject CreateBox(Transform parent, float vertOffset, string text) - { - var newBox = Instantiate(BoxPrefab); - newBox.SetActive(false); - newBox.transform.parent = parent; - newBox.transform.localPosition = new Vector3(0, vertOffset, 0); - newBox.transform.rotation = parent.rotation; - var lookAt = newBox.AddComponent(); - lookAt.SetValue("_useLookAt", false); - lookAt.SetValue("_localFacingVector", Vector3.back); - lookAt.SetValue("_localRotationAxis", Vector3.up); - newBox.GetComponent().text = text; - newBox.SetActive(true); - return newBox; - } - } + private GameObject CreateBox(Transform parent, float vertOffset, string text) + { + var newBox = Instantiate(BoxPrefab); + newBox.SetActive(false); + newBox.transform.parent = parent; + newBox.transform.localPosition = new Vector3(0, vertOffset, 0); + newBox.transform.rotation = parent.rotation; + var lookAt = newBox.AddComponent(); + lookAt.SetValue("_useLookAt", false); + lookAt.SetValue("_localFacingVector", Vector3.back); + lookAt.SetValue("_localRotationAxis", Vector3.up); + newBox.GetComponent().text = text; + newBox.SetActive(true); + return newBox; + } + } } diff --git a/QSB/ConversationSync/ConversationPatches.cs b/QSB/ConversationSync/ConversationPatches.cs index 8b77d444..a22917f1 100644 --- a/QSB/ConversationSync/ConversationPatches.cs +++ b/QSB/ConversationSync/ConversationPatches.cs @@ -7,108 +7,108 @@ using UnityEngine; namespace QSB.ConversationSync { - public class ConversationPatches : QSBPatch - { - public override QSBPatchTypes Type => QSBPatchTypes.OnClientConnect; + public class ConversationPatches : QSBPatch + { + public override QSBPatchTypes Type => QSBPatchTypes.OnClientConnect; - public static void StartConversation(CharacterDialogueTree __instance) - { - var index = WorldRegistry.OldDialogueTrees.FindIndex(x => x == __instance); - if (index == -1) - { - DebugLog.ToConsole($"Warning - Index for tree {__instance.name} was -1.", MessageType.Warning); - } - QSBPlayerManager.LocalPlayer.CurrentDialogueID = index; - ConversationManager.Instance.SendConvState(index, true); - } + public static void StartConversation(CharacterDialogueTree __instance) + { + var index = WorldRegistry.OldDialogueTrees.FindIndex(x => x == __instance); + if (index == -1) + { + DebugLog.ToConsole($"Warning - Index for tree {__instance.name} was -1.", MessageType.Warning); + } + QSBPlayerManager.LocalPlayer.CurrentDialogueID = index; + ConversationManager.Instance.SendConvState(index, true); + } - public static bool EndConversation(CharacterDialogueTree __instance) - { - if (!__instance.enabled) - { - return false; - } - if (QSBPlayerManager.LocalPlayer.CurrentDialogueID == -1) - { - DebugLog.ToConsole($"Warning - Ending conversation with CurrentDialogueId of -1! Called from {__instance.name}", MessageType.Warning); - return false; - } - ConversationManager.Instance.SendConvState(QSBPlayerManager.LocalPlayer.CurrentDialogueID, false); - ConversationManager.Instance.CloseBoxCharacter(QSBPlayerManager.LocalPlayer.CurrentDialogueID); - QSBPlayerManager.LocalPlayer.CurrentDialogueID = -1; - ConversationManager.Instance.CloseBoxPlayer(); - return true; - } + public static bool EndConversation(CharacterDialogueTree __instance) + { + if (!__instance.enabled) + { + return false; + } + if (QSBPlayerManager.LocalPlayer.CurrentDialogueID == -1) + { + DebugLog.ToConsole($"Warning - Ending conversation with CurrentDialogueId of -1! Called from {__instance.name}", MessageType.Warning); + return false; + } + ConversationManager.Instance.SendConvState(QSBPlayerManager.LocalPlayer.CurrentDialogueID, false); + ConversationManager.Instance.CloseBoxCharacter(QSBPlayerManager.LocalPlayer.CurrentDialogueID); + QSBPlayerManager.LocalPlayer.CurrentDialogueID = -1; + ConversationManager.Instance.CloseBoxPlayer(); + return true; + } - public static bool InputDialogueOption(int optionIndex, DialogueBoxVer2 ____currentDialogueBox) - { - if (optionIndex < 0) - { - // in a page where there is no selectable options - ConversationManager.Instance.CloseBoxPlayer(); - return true; - } + public static bool InputDialogueOption(int optionIndex, DialogueBoxVer2 ____currentDialogueBox) + { + if (optionIndex < 0) + { + // in a page where there is no selectable options + ConversationManager.Instance.CloseBoxPlayer(); + return true; + } - var selectedOption = ____currentDialogueBox.OptionFromUIIndex(optionIndex); - ConversationManager.Instance.SendPlayerOption(selectedOption.Text); - return true; - } + var selectedOption = ____currentDialogueBox.OptionFromUIIndex(optionIndex); + ConversationManager.Instance.SendPlayerOption(selectedOption.Text); + return true; + } - public static void GetNextPage(string ____name, List ____listPagesToDisplay, int ____currentPage) - { - var key = ____name + ____listPagesToDisplay[____currentPage]; - // Sending key so translation can be done on client side - should make different language-d clients compatible - QSB.Helper.Events.Unity.RunWhen(() => QSBPlayerManager.LocalPlayer.CurrentDialogueID != -1, - () => ConversationManager.Instance.SendCharacterDialogue(QSBPlayerManager.LocalPlayer.CurrentDialogueID, key)); - } + public static void GetNextPage(string ____name, List ____listPagesToDisplay, int ____currentPage) + { + var key = ____name + ____listPagesToDisplay[____currentPage]; + // Sending key so translation can be done on client side - should make different language-d clients compatible + QSB.Helper.Events.Unity.RunWhen(() => QSBPlayerManager.LocalPlayer.CurrentDialogueID != -1, + () => ConversationManager.Instance.SendCharacterDialogue(QSBPlayerManager.LocalPlayer.CurrentDialogueID, key)); + } - public static bool OnAnimatorIK(float ___headTrackingWeight, - bool ___lookOnlyWhenTalking, - bool ____playerInHeadZone, - bool ____inConversation, - ref float ____currentLookWeight, - ref Vector3 ____currentLookTarget, - DampedSpring3D ___lookSpring, - Animator ____animator, - CharacterDialogueTree ____dialogueTree) - { - var playerId = ConversationManager.Instance.GetPlayerTalkingToTree(____dialogueTree); - Vector3 position; - if (playerId == uint.MaxValue) - { - // TODO : Find closest player and track to that camera. - position = Locator.GetActiveCamera().transform.position; - } - else - { - position = QSBPlayerManager.GetPlayer(playerId).Camera.transform.position; - } - float b = ___headTrackingWeight * Mathf.Min(1, (!___lookOnlyWhenTalking) ? ((!____playerInHeadZone) ? 0 : 1) : ((!____inConversation || !____playerInHeadZone) ? 0 : 1)); - ____currentLookWeight = Mathf.Lerp(____currentLookWeight, b, Time.deltaTime * 2f); - ____currentLookTarget = ___lookSpring.Update(____currentLookTarget, position, Time.deltaTime); - ____animator.SetLookAtPosition(____currentLookTarget); - ____animator.SetLookAtWeight(____currentLookWeight); - return false; - } + public static bool OnAnimatorIK(float ___headTrackingWeight, + bool ___lookOnlyWhenTalking, + bool ____playerInHeadZone, + bool ____inConversation, + ref float ____currentLookWeight, + ref Vector3 ____currentLookTarget, + DampedSpring3D ___lookSpring, + Animator ____animator, + CharacterDialogueTree ____dialogueTree) + { + var playerId = ConversationManager.Instance.GetPlayerTalkingToTree(____dialogueTree); + Vector3 position; + if (playerId == uint.MaxValue) + { + // TODO : Find closest player and track to that camera. + position = Locator.GetActiveCamera().transform.position; + } + else + { + position = QSBPlayerManager.GetPlayer(playerId).Camera.transform.position; + } + float b = ___headTrackingWeight * Mathf.Min(1, (!___lookOnlyWhenTalking) ? ((!____playerInHeadZone) ? 0 : 1) : ((!____inConversation || !____playerInHeadZone) ? 0 : 1)); + ____currentLookWeight = Mathf.Lerp(____currentLookWeight, b, Time.deltaTime * 2f); + ____currentLookTarget = ___lookSpring.Update(____currentLookTarget, position, Time.deltaTime); + ____animator.SetLookAtPosition(____currentLookTarget); + ____animator.SetLookAtWeight(____currentLookWeight); + return false; + } - public static bool OnZoneExit(CharacterDialogueTree ____dialogueTree) - { - var playerId = ConversationManager.Instance.GetPlayerTalkingToTree(____dialogueTree); - if (playerId == uint.MaxValue) - { - return true; - } - return false; - } + public static bool OnZoneExit(CharacterDialogueTree ____dialogueTree) + { + var playerId = ConversationManager.Instance.GetPlayerTalkingToTree(____dialogueTree); + if (playerId == uint.MaxValue) + { + return true; + } + return false; + } - public override void DoPatches() - { - QSB.Helper.HarmonyHelper.AddPostfix("GetNextPage", typeof(ConversationPatches), nameof(GetNextPage)); - QSB.Helper.HarmonyHelper.AddPrefix("InputDialogueOption", typeof(ConversationPatches), nameof(InputDialogueOption)); - QSB.Helper.HarmonyHelper.AddPostfix("StartConversation", typeof(ConversationPatches), nameof(StartConversation)); - QSB.Helper.HarmonyHelper.AddPrefix("EndConversation", typeof(ConversationPatches), nameof(EndConversation)); - QSB.Helper.HarmonyHelper.AddPrefix("OnAnimatorIK", typeof(ConversationPatches), nameof(OnAnimatorIK)); - QSB.Helper.HarmonyHelper.AddPrefix("OnZoneExit", typeof(ConversationPatches), nameof(OnZoneExit)); - } - } + public override void DoPatches() + { + QSB.Helper.HarmonyHelper.AddPostfix("GetNextPage", typeof(ConversationPatches), nameof(GetNextPage)); + QSB.Helper.HarmonyHelper.AddPrefix("InputDialogueOption", typeof(ConversationPatches), nameof(InputDialogueOption)); + QSB.Helper.HarmonyHelper.AddPostfix("StartConversation", typeof(ConversationPatches), nameof(StartConversation)); + QSB.Helper.HarmonyHelper.AddPrefix("EndConversation", typeof(ConversationPatches), nameof(EndConversation)); + QSB.Helper.HarmonyHelper.AddPrefix("OnAnimatorIK", typeof(ConversationPatches), nameof(OnAnimatorIK)); + QSB.Helper.HarmonyHelper.AddPrefix("OnZoneExit", typeof(ConversationPatches), nameof(OnZoneExit)); + } + } } diff --git a/QSB/ConversationSync/ConversationType.cs b/QSB/ConversationSync/ConversationType.cs index 5384727e..660c77e5 100644 --- a/QSB/ConversationSync/ConversationType.cs +++ b/QSB/ConversationSync/ConversationType.cs @@ -1,10 +1,10 @@ namespace QSB.ConversationSync { - public enum ConversationType - { - Character, - Player, - CloseCharacter, - ClosePlayer - } + public enum ConversationType + { + Character, + Player, + CloseCharacter, + ClosePlayer + } } diff --git a/QSB/ConversationSync/Events/ConversationEvent.cs b/QSB/ConversationSync/Events/ConversationEvent.cs index 119f0f2c..50294555 100644 --- a/QSB/ConversationSync/Events/ConversationEvent.cs +++ b/QSB/ConversationSync/Events/ConversationEvent.cs @@ -4,47 +4,47 @@ using QSB.WorldSync; namespace QSB.ConversationSync.Events { - public class ConversationEvent : QSBEvent - { - public override EventType Type => EventType.Conversation; + public class ConversationEvent : QSBEvent + { + public override EventType Type => EventType.Conversation; - public override void SetupListener() => GlobalMessenger.AddListener(EventNames.QSBConversation, Handler); + public override void SetupListener() => GlobalMessenger.AddListener(EventNames.QSBConversation, Handler); - public override void CloseListener() => GlobalMessenger.RemoveListener(EventNames.QSBConversation, Handler); + public override void CloseListener() => GlobalMessenger.RemoveListener(EventNames.QSBConversation, Handler); - private void Handler(uint id, string message, ConversationType type) => SendEvent(CreateMessage(id, message, type)); + private void Handler(uint id, string message, ConversationType type) => SendEvent(CreateMessage(id, message, type)); - private ConversationMessage CreateMessage(uint id, string message, ConversationType type) => new ConversationMessage - { - AboutId = LocalPlayerId, - ObjectId = (int)id, - Type = type, - Message = message - }; + private ConversationMessage CreateMessage(uint id, string message, ConversationType type) => new ConversationMessage + { + AboutId = LocalPlayerId, + ObjectId = (int)id, + Type = type, + Message = message + }; - public override void OnReceiveRemote(ConversationMessage message) - { - switch (message.Type) - { - case ConversationType.Character: - var translated = TextTranslation.Translate(message.Message).Trim(); - ConversationManager.Instance.DisplayCharacterConversationBox(message.ObjectId, translated); - break; - case ConversationType.Player: - ConversationManager.Instance.DisplayPlayerConversationBox((uint)message.ObjectId, message.Message); - break; - case ConversationType.CloseCharacter: - if (message.ObjectId == -1) - { - break; - } - var tree = WorldRegistry.OldDialogueTrees[message.ObjectId]; - UnityEngine.Object.Destroy(ConversationManager.Instance.BoxMappings[tree]); - break; - case ConversationType.ClosePlayer: - UnityEngine.Object.Destroy(QSBPlayerManager.GetPlayer((uint)message.ObjectId).CurrentDialogueBox); - break; - } - } - } + public override void OnReceiveRemote(ConversationMessage message) + { + switch (message.Type) + { + case ConversationType.Character: + var translated = TextTranslation.Translate(message.Message).Trim(); + ConversationManager.Instance.DisplayCharacterConversationBox(message.ObjectId, translated); + break; + case ConversationType.Player: + ConversationManager.Instance.DisplayPlayerConversationBox((uint)message.ObjectId, message.Message); + break; + case ConversationType.CloseCharacter: + if (message.ObjectId == -1) + { + break; + } + var tree = WorldRegistry.OldDialogueTrees[message.ObjectId]; + UnityEngine.Object.Destroy(ConversationManager.Instance.BoxMappings[tree]); + break; + case ConversationType.ClosePlayer: + UnityEngine.Object.Destroy(QSBPlayerManager.GetPlayer((uint)message.ObjectId).CurrentDialogueBox); + break; + } + } + } } diff --git a/QSB/ConversationSync/Events/ConversationMessage.cs b/QSB/ConversationSync/Events/ConversationMessage.cs index 5bf1ea0c..3064358f 100644 --- a/QSB/ConversationSync/Events/ConversationMessage.cs +++ b/QSB/ConversationSync/Events/ConversationMessage.cs @@ -3,26 +3,26 @@ using UnityEngine.Networking; namespace QSB.ConversationSync.Events { - public class ConversationMessage : PlayerMessage - { - public ConversationType Type { get; set; } - public int ObjectId { get; set; } - public string Message { get; set; } + public class ConversationMessage : PlayerMessage + { + public ConversationType Type { get; set; } + public int ObjectId { get; set; } + public string Message { get; set; } - public override void Deserialize(NetworkReader reader) - { - base.Deserialize(reader); - ObjectId = reader.ReadInt32(); - Type = (ConversationType)reader.ReadInt32(); - Message = reader.ReadString(); - } + public override void Deserialize(NetworkReader reader) + { + base.Deserialize(reader); + ObjectId = reader.ReadInt32(); + Type = (ConversationType)reader.ReadInt32(); + Message = reader.ReadString(); + } - public override void Serialize(NetworkWriter writer) - { - base.Serialize(writer); - writer.Write(ObjectId); - writer.Write((int)Type); - writer.Write(Message); - } - } + public override void Serialize(NetworkWriter writer) + { + base.Serialize(writer); + writer.Write(ObjectId); + writer.Write((int)Type); + writer.Write(Message); + } + } } diff --git a/QSB/ConversationSync/Events/ConversationStartEndEvent.cs b/QSB/ConversationSync/Events/ConversationStartEndEvent.cs index 5313451f..0c98039c 100644 --- a/QSB/ConversationSync/Events/ConversationStartEndEvent.cs +++ b/QSB/ConversationSync/Events/ConversationStartEndEvent.cs @@ -9,62 +9,62 @@ using UnityEngine; namespace QSB.ConversationSync.Events { - public class ConversationStartEndEvent : QSBEvent - { - public override EventsCore.EventType Type => EventsCore.EventType.ConversationStartEnd; + public class ConversationStartEndEvent : QSBEvent + { + public override EventsCore.EventType Type => EventsCore.EventType.ConversationStartEnd; - public override void SetupListener() => GlobalMessenger.AddListener(EventNames.QSBConversationStartEnd, Handler); + public override void SetupListener() => GlobalMessenger.AddListener(EventNames.QSBConversationStartEnd, Handler); - public override void CloseListener() => GlobalMessenger.RemoveListener(EventNames.QSBConversationStartEnd, Handler); + public override void CloseListener() => GlobalMessenger.RemoveListener(EventNames.QSBConversationStartEnd, Handler); - private void Handler(int charId, uint playerId, bool state) => SendEvent(CreateMessage(charId, playerId, state)); + private void Handler(int charId, uint playerId, bool state) => SendEvent(CreateMessage(charId, playerId, state)); - private ConversationStartEndMessage CreateMessage(int charId, uint playerId, bool state) => new ConversationStartEndMessage - { - AboutId = LocalPlayerId, - CharacterId = charId, - PlayerId = playerId, - State = state - }; + private ConversationStartEndMessage CreateMessage(int charId, uint playerId, bool state) => new ConversationStartEndMessage + { + AboutId = LocalPlayerId, + CharacterId = charId, + PlayerId = playerId, + State = state + }; - public override void OnReceiveRemote(ConversationStartEndMessage message) - { - if (message.CharacterId == -1) - { - DebugLog.ToConsole("Warning - Received conv. start/end event with char id -1.", MessageType.Warning); - return; - } - var dialogueTree = WorldRegistry.OldDialogueTrees[message.CharacterId]; - var animController = Resources.FindObjectsOfTypeAll().FirstOrDefault(x => x.GetValue("_dialogueTree") == dialogueTree); + public override void OnReceiveRemote(ConversationStartEndMessage message) + { + if (message.CharacterId == -1) + { + DebugLog.ToConsole("Warning - Received conv. start/end event with char id -1.", MessageType.Warning); + return; + } + var dialogueTree = WorldRegistry.OldDialogueTrees[message.CharacterId]; + var animController = Resources.FindObjectsOfTypeAll().FirstOrDefault(x => x.GetValue("_dialogueTree") == dialogueTree); - // Make character face player and talk - if (animController != default(CharacterAnimController)) - { - if (message.State) - { - // Start talking - QSBPlayerManager.GetPlayer(message.PlayerId).CurrentDialogueID = message.CharacterId; - animController.SetValue("_inConversation", true); - animController.SetValue("_playerInHeadZone", true); - if (animController.GetValue("_hasTalkAnimation")) - { - animController.GetValue("_animator").SetTrigger("Talking"); - } - dialogueTree.GetComponent().DisableInteraction(); - } - else - { - // Stop talking - QSBPlayerManager.GetPlayer(message.PlayerId).CurrentDialogueID = -1; - animController.SetValue("_inConversation", false); - animController.SetValue("_playerInHeadZone", false); - if (animController.GetValue("_hasTalkAnimation")) - { - animController.GetValue("_animator").SetTrigger("Idle"); - } - dialogueTree.GetComponent().EnableInteraction(); - } - } - } - } + // Make character face player and talk + if (animController != default(CharacterAnimController)) + { + if (message.State) + { + // Start talking + QSBPlayerManager.GetPlayer(message.PlayerId).CurrentDialogueID = message.CharacterId; + animController.SetValue("_inConversation", true); + animController.SetValue("_playerInHeadZone", true); + if (animController.GetValue("_hasTalkAnimation")) + { + animController.GetValue("_animator").SetTrigger("Talking"); + } + dialogueTree.GetComponent().DisableInteraction(); + } + else + { + // Stop talking + QSBPlayerManager.GetPlayer(message.PlayerId).CurrentDialogueID = -1; + animController.SetValue("_inConversation", false); + animController.SetValue("_playerInHeadZone", false); + if (animController.GetValue("_hasTalkAnimation")) + { + animController.GetValue("_animator").SetTrigger("Idle"); + } + dialogueTree.GetComponent().EnableInteraction(); + } + } + } + } } diff --git a/QSB/ConversationSync/Events/ConversationStartEndMessage.cs b/QSB/ConversationSync/Events/ConversationStartEndMessage.cs index f53657c1..2054ca48 100644 --- a/QSB/ConversationSync/Events/ConversationStartEndMessage.cs +++ b/QSB/ConversationSync/Events/ConversationStartEndMessage.cs @@ -3,26 +3,26 @@ using UnityEngine.Networking; namespace QSB.ConversationSync.Events { - public class ConversationStartEndMessage : PlayerMessage - { - public int CharacterId { get; set; } - public uint PlayerId { get; set; } - public bool State { get; set; } + public class ConversationStartEndMessage : PlayerMessage + { + public int CharacterId { get; set; } + public uint PlayerId { get; set; } + public bool State { get; set; } - public override void Deserialize(NetworkReader reader) - { - base.Deserialize(reader); - CharacterId = reader.ReadInt32(); - PlayerId = reader.ReadUInt32(); - State = reader.ReadBoolean(); - } + public override void Deserialize(NetworkReader reader) + { + base.Deserialize(reader); + CharacterId = reader.ReadInt32(); + PlayerId = reader.ReadUInt32(); + State = reader.ReadBoolean(); + } - public override void Serialize(NetworkWriter writer) - { - base.Serialize(writer); - writer.Write(CharacterId); - writer.Write(PlayerId); - writer.Write(State); - } - } + public override void Serialize(NetworkWriter writer) + { + base.Serialize(writer); + writer.Write(CharacterId); + writer.Write(PlayerId); + writer.Write(State); + } + } } diff --git a/QSB/DeathSync/DeathPatches.cs b/QSB/DeathSync/DeathPatches.cs index fd3d70ae..41e0e0f2 100644 --- a/QSB/DeathSync/DeathPatches.cs +++ b/QSB/DeathSync/DeathPatches.cs @@ -3,31 +3,31 @@ using System.Linq; namespace QSB.DeathSync { - public class DeathPatches : QSBPatch - { - public override QSBPatchTypes Type => QSBPatchTypes.OnModStart; + public class DeathPatches : QSBPatch + { + public override QSBPatchTypes Type => QSBPatchTypes.OnModStart; - public static bool PreFinishDeathSequence(DeathType deathType) - { - if (RespawnOnDeath.Instance.AllowedDeathTypes.Contains(deathType)) - { - // Allow real death - return true; - } + public static bool PreFinishDeathSequence(DeathType deathType) + { + if (RespawnOnDeath.Instance.AllowedDeathTypes.Contains(deathType)) + { + // Allow real death + return true; + } - RespawnOnDeath.Instance.ResetShip(); - RespawnOnDeath.Instance.ResetPlayer(); + RespawnOnDeath.Instance.ResetShip(); + RespawnOnDeath.Instance.ResetPlayer(); - // Prevent original death method from running. - return false; - } + // Prevent original death method from running. + return false; + } - public static void BroadcastDeath(DeathType deathType) => GlobalMessenger.FireEvent(EventNames.QSBPlayerDeath, deathType); + public static void BroadcastDeath(DeathType deathType) => GlobalMessenger.FireEvent(EventNames.QSBPlayerDeath, deathType); - public override void DoPatches() - { - QSB.Helper.HarmonyHelper.AddPrefix("KillPlayer", typeof(DeathPatches), nameof(PreFinishDeathSequence)); - QSB.Helper.HarmonyHelper.AddPostfix("KillPlayer", typeof(DeathPatches), nameof(BroadcastDeath)); - } - } + public override void DoPatches() + { + QSB.Helper.HarmonyHelper.AddPrefix("KillPlayer", typeof(DeathPatches), nameof(PreFinishDeathSequence)); + QSB.Helper.HarmonyHelper.AddPostfix("KillPlayer", typeof(DeathPatches), nameof(BroadcastDeath)); + } + } } \ No newline at end of file diff --git a/QSB/DeathSync/Events/PlayerDeathEvent.cs b/QSB/DeathSync/Events/PlayerDeathEvent.cs index 57cd35c1..6aea56ba 100644 --- a/QSB/DeathSync/Events/PlayerDeathEvent.cs +++ b/QSB/DeathSync/Events/PlayerDeathEvent.cs @@ -5,29 +5,29 @@ using QSB.Utility; namespace QSB.DeathSync.Events { - public class PlayerDeathEvent : QSBEvent> - { - public override EventType Type => EventType.PlayerDeath; + public class PlayerDeathEvent : QSBEvent> + { + public override EventType Type => EventType.PlayerDeath; - public override void SetupListener() => GlobalMessenger.AddListener(EventNames.QSBPlayerDeath, Handler); + public override void SetupListener() => GlobalMessenger.AddListener(EventNames.QSBPlayerDeath, Handler); - public override void CloseListener() => GlobalMessenger.RemoveListener(EventNames.QSBPlayerDeath, Handler); + public override void CloseListener() => GlobalMessenger.RemoveListener(EventNames.QSBPlayerDeath, Handler); - private void Handler(DeathType type) => SendEvent(CreateMessage(type)); + private void Handler(DeathType type) => SendEvent(CreateMessage(type)); - private EnumMessage CreateMessage(DeathType type) => new EnumMessage - { - AboutId = LocalPlayerId, - Value = type - }; + private EnumMessage CreateMessage(DeathType type) => new EnumMessage + { + AboutId = LocalPlayerId, + Value = type + }; - public override void OnReceiveRemote(EnumMessage message) - { - var playerName = QSBPlayerManager.GetPlayer(message.AboutId).Name; - var deathMessage = Necronomicon.GetPhrase(message.Value); - DebugLog.ToAll(string.Format(deathMessage, playerName)); - } + public override void OnReceiveRemote(EnumMessage message) + { + var playerName = QSBPlayerManager.GetPlayer(message.AboutId).Name; + var deathMessage = Necronomicon.GetPhrase(message.Value); + DebugLog.ToAll(string.Format(deathMessage, playerName)); + } - public override void OnReceiveLocal(EnumMessage message) => OnReceiveRemote(message); - } + public override void OnReceiveLocal(EnumMessage message) => OnReceiveRemote(message); + } } diff --git a/QSB/DeathSync/Necronomicon.cs b/QSB/DeathSync/Necronomicon.cs index e9dfda79..5aa9407e 100644 --- a/QSB/DeathSync/Necronomicon.cs +++ b/QSB/DeathSync/Necronomicon.cs @@ -4,102 +4,102 @@ using System.Linq; namespace QSB.DeathSync { - public static class Necronomicon - { + public static class Necronomicon + { - private static readonly Dictionary DeathDictionary = new Dictionary - { - { DeathType.Default, new[] - { - "{0} died" - } }, - { DeathType.Impact, new[] - { - "{0} forgot to use retro-rockets", - "{0} bonked into the ground too hard", - "{0} went splat" - } }, - { DeathType.Asphyxiation, new[] - { - "{0} forgot to breathe", - "{0} forgot how to breathe", - "{0} forgot to check their oxygen meter", - "{0} lacked oxygen", - "{0} didn't need air anyway" - } }, - { DeathType.Energy, new[] - { - "{0} was cooked", - "{0} failed the Hotshot achievement", - "{0} forgot to install an AC unit", - "{0} got too hot" - } }, - { DeathType.Supernova, new[] - { - "{0} ran out of time", - "{0} got vaporized", - "{0} lost track of time", - "{0} got front row seats to the supernova", - "{0} heard the End of Times music", - "{0} watched the sun go kaboom", - "{0} became cosmic marshmallow", - "{0} photosynthesized too much" - } }, - { DeathType.Digestion, new[] - { - "{0} was eaten", - "{0} found a fish", - "{0} encountered an evil creature", - "{0} followed the light, then was followed by it", - "{0} messed with the wrong species of fish" - } }, - { DeathType.BigBang, new[] - { - "{0} sacrificed themself for the universe", - "{0} knows the true meaning of sacrifice", - "{0} won at the cost of their life" - } }, - { DeathType.Crushed, new[] - { - "{0} went through the tunnel too slow", - "{0} didn't make it out in time", - "{0} was squished", - "{0} thought the Sunless City was safe", - "{0} was buried" - } }, - { DeathType.Meditation, new[] - { - "{0} took a deep breath and died", - "{0} fell asleep", - "{0} got killed by Gabbro's advice" - } }, - { DeathType.TimeLoop, new[] - { - "{0} ran out of time", - "{0} was caught by a statue", - "{0}'s memories were pilfered", - "{0}'s memories fell into a black hole", - "{0}'s universe was eaten by Grobletombus" - } }, - { DeathType.Lava, new[] - { - "{0} tried to swim in lava", - "{0} didn't know what the glowy orange liquid was", - "{0} slipped in lava", - "{0} became one with the glowing gooey rock" - } }, - { DeathType.BlackHole, new[] - { - "{0} should visit the Ash Twin Project again", - "{0} waited inside the Ash Twin Project", - "{0} chased their memories" - } } - }; + private static readonly Dictionary DeathDictionary = new Dictionary + { + { DeathType.Default, new[] + { + "{0} died" + } }, + { DeathType.Impact, new[] + { + "{0} forgot to use retro-rockets", + "{0} bonked into the ground too hard", + "{0} went splat" + } }, + { DeathType.Asphyxiation, new[] + { + "{0} forgot to breathe", + "{0} forgot how to breathe", + "{0} forgot to check their oxygen meter", + "{0} lacked oxygen", + "{0} didn't need air anyway" + } }, + { DeathType.Energy, new[] + { + "{0} was cooked", + "{0} failed the Hotshot achievement", + "{0} forgot to install an AC unit", + "{0} got too hot" + } }, + { DeathType.Supernova, new[] + { + "{0} ran out of time", + "{0} got vaporized", + "{0} lost track of time", + "{0} got front row seats to the supernova", + "{0} heard the End of Times music", + "{0} watched the sun go kaboom", + "{0} became cosmic marshmallow", + "{0} photosynthesized too much" + } }, + { DeathType.Digestion, new[] + { + "{0} was eaten", + "{0} found a fish", + "{0} encountered an evil creature", + "{0} followed the light, then was followed by it", + "{0} messed with the wrong species of fish" + } }, + { DeathType.BigBang, new[] + { + "{0} sacrificed themself for the universe", + "{0} knows the true meaning of sacrifice", + "{0} won at the cost of their life" + } }, + { DeathType.Crushed, new[] + { + "{0} went through the tunnel too slow", + "{0} didn't make it out in time", + "{0} was squished", + "{0} thought the Sunless City was safe", + "{0} was buried" + } }, + { DeathType.Meditation, new[] + { + "{0} took a deep breath and died", + "{0} fell asleep", + "{0} got killed by Gabbro's advice" + } }, + { DeathType.TimeLoop, new[] + { + "{0} ran out of time", + "{0} was caught by a statue", + "{0}'s memories were pilfered", + "{0}'s memories fell into a black hole", + "{0}'s universe was eaten by Grobletombus" + } }, + { DeathType.Lava, new[] + { + "{0} tried to swim in lava", + "{0} didn't know what the glowy orange liquid was", + "{0} slipped in lava", + "{0} became one with the glowing gooey rock" + } }, + { DeathType.BlackHole, new[] + { + "{0} should visit the Ash Twin Project again", + "{0} waited inside the Ash Twin Project", + "{0} chased their memories" + } } + }; - public static string GetPhrase(DeathType deathType) - { - return DeathDictionary[deathType].OrderBy(x => Guid.NewGuid()).First(); - } + public static string GetPhrase(DeathType deathType) + { + return DeathDictionary[deathType].OrderBy(x => Guid.NewGuid()).First(); + } - } + } } diff --git a/QSB/DeathSync/PreventShipDestruction.cs b/QSB/DeathSync/PreventShipDestruction.cs index 4ab33b41..01d190fc 100644 --- a/QSB/DeathSync/PreventShipDestruction.cs +++ b/QSB/DeathSync/PreventShipDestruction.cs @@ -6,38 +6,38 @@ using UnityEngine; namespace QSB.DeathSync { - public class PreventShipDestruction : MonoBehaviour - { - private void Awake() - { - QSB.Helper.HarmonyHelper.Transpile("Detach", typeof(Patch), nameof(Patch.ReturnNull)); - QSB.Helper.HarmonyHelper.Transpile("Detach", typeof(Patch), nameof(Patch.ReturnNull)); + public class PreventShipDestruction : MonoBehaviour + { + private void Awake() + { + QSB.Helper.HarmonyHelper.Transpile("Detach", typeof(Patch), nameof(Patch.ReturnNull)); + QSB.Helper.HarmonyHelper.Transpile("Detach", typeof(Patch), nameof(Patch.ReturnNull)); - QSB.Helper.HarmonyHelper.EmptyMethod("OnPressInteract"); + QSB.Helper.HarmonyHelper.EmptyMethod("OnPressInteract"); - QSB.Helper.Events.Subscribe(OWML.Common.Events.AfterAwake); - QSB.Helper.Events.Event += OnEvent; - } + QSB.Helper.Events.Subscribe(OWML.Common.Events.AfterAwake); + QSB.Helper.Events.Event += OnEvent; + } - private void OnEvent(MonoBehaviour behaviour, OWML.Common.Events ev) - { - if (behaviour is ShipDamageController shipDamageController && - ev == OWML.Common.Events.AfterAwake) - { - shipDamageController.SetValue("_exploded", true); - } - } + private void OnEvent(MonoBehaviour behaviour, OWML.Common.Events ev) + { + if (behaviour is ShipDamageController shipDamageController && + ev == OWML.Common.Events.AfterAwake) + { + shipDamageController.SetValue("_exploded", true); + } + } - private static class Patch - { - public static IEnumerable ReturnNull(IEnumerable instructions) - { - return new List - { - new CodeInstruction(OpCodes.Ldnull), - new CodeInstruction(OpCodes.Ret) - }; - } - } - } + private static class Patch + { + public static IEnumerable ReturnNull(IEnumerable instructions) + { + return new List + { + new CodeInstruction(OpCodes.Ldnull), + new CodeInstruction(OpCodes.Ret) + }; + } + } + } } diff --git a/QSB/DeathSync/RespawnOnDeath.cs b/QSB/DeathSync/RespawnOnDeath.cs index 30f3de78..a142a797 100644 --- a/QSB/DeathSync/RespawnOnDeath.cs +++ b/QSB/DeathSync/RespawnOnDeath.cs @@ -7,133 +7,133 @@ using UnityEngine; namespace QSB.DeathSync { - /// - /// Client-only-side component for managing respawning after death. - /// - public class RespawnOnDeath : MonoBehaviour - { - public static RespawnOnDeath Instance; + /// + /// Client-only-side component for managing respawning after death. + /// + public class RespawnOnDeath : MonoBehaviour + { + public static RespawnOnDeath Instance; - public readonly DeathType[] AllowedDeathTypes = { - DeathType.BigBang, - DeathType.Supernova, - DeathType.TimeLoop - }; + public readonly DeathType[] AllowedDeathTypes = { + DeathType.BigBang, + DeathType.Supernova, + DeathType.TimeLoop + }; - private SpawnPoint _shipSpawnPoint; - private SpawnPoint _playerSpawnPoint; - private OWRigidbody _shipBody; - private PlayerSpawner _playerSpawner; - private FluidDetector _fluidDetector; - private PlayerResources _playerResources; - private ShipComponent[] _shipComponents; - private HatchController _hatchController; - private ShipCockpitController _cockpitController; - private PlayerSpacesuit _spaceSuit; + private SpawnPoint _shipSpawnPoint; + private SpawnPoint _playerSpawnPoint; + private OWRigidbody _shipBody; + private PlayerSpawner _playerSpawner; + private FluidDetector _fluidDetector; + private PlayerResources _playerResources; + private ShipComponent[] _shipComponents; + private HatchController _hatchController; + private ShipCockpitController _cockpitController; + private PlayerSpacesuit _spaceSuit; - private void Awake() - { - Instance = this; + private void Awake() + { + Instance = this; - QSB.Helper.Events.Subscribe(OWML.Common.Events.AfterStart); - QSB.Helper.Events.Event += OnEvent; - } + QSB.Helper.Events.Subscribe(OWML.Common.Events.AfterStart); + QSB.Helper.Events.Event += OnEvent; + } - private void OnEvent(MonoBehaviour behaviour, OWML.Common.Events ev) - { - if (behaviour is PlayerResources && ev == OWML.Common.Events.AfterStart) - { - Init(); - } - } + private void OnEvent(MonoBehaviour behaviour, OWML.Common.Events ev) + { + if (behaviour is PlayerResources && ev == OWML.Common.Events.AfterStart) + { + Init(); + } + } - public void Init() - { - var playerTransform = Locator.GetPlayerTransform(); - _playerResources = playerTransform.GetComponent(); - _spaceSuit = playerTransform.GetComponentInChildren(true); - _playerSpawner = FindObjectOfType(); - _fluidDetector = Locator.GetPlayerCamera().GetComponentInChildren(); + public void Init() + { + var playerTransform = Locator.GetPlayerTransform(); + _playerResources = playerTransform.GetComponent(); + _spaceSuit = playerTransform.GetComponentInChildren(true); + _playerSpawner = FindObjectOfType(); + _fluidDetector = Locator.GetPlayerCamera().GetComponentInChildren(); - var shipTransform = Locator.GetShipTransform(); - if (shipTransform == null) - { - return; - } - _shipComponents = shipTransform.GetComponentsInChildren(); - _hatchController = shipTransform.GetComponentInChildren(); - _cockpitController = shipTransform.GetComponentInChildren(); - _shipBody = Locator.GetShipBody(); - _shipSpawnPoint = GetSpawnPoint(true); + var shipTransform = Locator.GetShipTransform(); + if (shipTransform == null) + { + return; + } + _shipComponents = shipTransform.GetComponentsInChildren(); + _hatchController = shipTransform.GetComponentInChildren(); + _cockpitController = shipTransform.GetComponentInChildren(); + _shipBody = Locator.GetShipBody(); + _shipSpawnPoint = GetSpawnPoint(true); - // Move debug spawn point to initial ship position. - _playerSpawnPoint = GetSpawnPoint(); - _shipSpawnPoint.transform.position = shipTransform.position; - _shipSpawnPoint.transform.rotation = shipTransform.rotation; - } + // Move debug spawn point to initial ship position. + _playerSpawnPoint = GetSpawnPoint(); + _shipSpawnPoint.transform.position = shipTransform.position; + _shipSpawnPoint.transform.rotation = shipTransform.rotation; + } - public void ResetShip() - { - if (_shipBody == null) - { - return; - } + public void ResetShip() + { + if (_shipBody == null) + { + return; + } - // Reset ship position. - if (_shipSpawnPoint == null) - { - DebugLog.ToConsole("_shipSpawnPoint is null!", MessageType.Warning); - return; - } - _shipBody.SetVelocity(_shipSpawnPoint.GetPointVelocity()); - _shipBody.WarpToPositionRotation(_shipSpawnPoint.transform.position, _shipSpawnPoint.transform.rotation); + // Reset ship position. + if (_shipSpawnPoint == null) + { + DebugLog.ToConsole("_shipSpawnPoint is null!", MessageType.Warning); + return; + } + _shipBody.SetVelocity(_shipSpawnPoint.GetPointVelocity()); + _shipBody.WarpToPositionRotation(_shipSpawnPoint.transform.position, _shipSpawnPoint.transform.rotation); - // Reset ship damage. - if (Locator.GetShipTransform()) - { - foreach (var shipComponent in _shipComponents) - { - shipComponent.SetDamaged(false); - } - } + // Reset ship damage. + if (Locator.GetShipTransform()) + { + foreach (var shipComponent in _shipComponents) + { + shipComponent.SetDamaged(false); + } + } - Invoke(nameof(ExitShip), 0.01f); - } + Invoke(nameof(ExitShip), 0.01f); + } - private void ExitShip() - { - _cockpitController.Invoke("ExitFlightConsole"); - _cockpitController.Invoke("CompleteExitFlightConsole"); - _hatchController.SetValue("_isPlayerInShip", false); - _hatchController.Invoke("OpenHatch"); - GlobalMessenger.FireEvent(EventNames.ExitShip); - } + private void ExitShip() + { + _cockpitController.Invoke("ExitFlightConsole"); + _cockpitController.Invoke("CompleteExitFlightConsole"); + _hatchController.SetValue("_isPlayerInShip", false); + _hatchController.Invoke("OpenHatch"); + GlobalMessenger.FireEvent(EventNames.ExitShip); + } - public void ResetPlayer() - { - // Reset player position. - var playerBody = Locator.GetPlayerBody(); - playerBody.WarpToPositionRotation(_playerSpawnPoint.transform.position, _playerSpawnPoint.transform.rotation); - playerBody.SetVelocity(_playerSpawnPoint.GetPointVelocity()); - _playerSpawnPoint.AddObjectToTriggerVolumes(Locator.GetPlayerDetector().gameObject); - _playerSpawnPoint.AddObjectToTriggerVolumes(_fluidDetector.gameObject); - _playerSpawnPoint.OnSpawnPlayer(); + public void ResetPlayer() + { + // Reset player position. + var playerBody = Locator.GetPlayerBody(); + playerBody.WarpToPositionRotation(_playerSpawnPoint.transform.position, _playerSpawnPoint.transform.rotation); + playerBody.SetVelocity(_playerSpawnPoint.GetPointVelocity()); + _playerSpawnPoint.AddObjectToTriggerVolumes(Locator.GetPlayerDetector().gameObject); + _playerSpawnPoint.AddObjectToTriggerVolumes(_fluidDetector.gameObject); + _playerSpawnPoint.OnSpawnPlayer(); - // Stop suffocation sound effect. - _playerResources.SetValue("_isSuffocating", false); + // Stop suffocation sound effect. + _playerResources.SetValue("_isSuffocating", false); - // Reset player health and resources. - _playerResources.DebugRefillResources(); + // Reset player health and resources. + _playerResources.DebugRefillResources(); - // Remove space suit. - _spaceSuit.RemoveSuit(true); - } + // Remove space suit. + _spaceSuit.RemoveSuit(true); + } - private SpawnPoint GetSpawnPoint(bool isShip = false) - { - return _playerSpawner - .GetValue("_spawnList") - .FirstOrDefault(spawnPoint => spawnPoint.GetSpawnLocation() == SpawnLocation.TimberHearth && spawnPoint.IsShipSpawn() == isShip); - } - } + private SpawnPoint GetSpawnPoint(bool isShip = false) + { + return _playerSpawner + .GetValue("_spawnList") + .FirstOrDefault(spawnPoint => spawnPoint.GetSpawnLocation() == SpawnLocation.TimberHearth && spawnPoint.IsShipSpawn() == isShip); + } + } } diff --git a/QSB/ElevatorSync/ElevatorManager.cs b/QSB/ElevatorSync/ElevatorManager.cs index 377d01cd..375a33cf 100644 --- a/QSB/ElevatorSync/ElevatorManager.cs +++ b/QSB/ElevatorSync/ElevatorManager.cs @@ -5,34 +5,34 @@ using UnityEngine; namespace QSB.ElevatorSync { - public class ElevatorManager : MonoBehaviour - { - public static ElevatorManager Instance { get; private set; } + public class ElevatorManager : MonoBehaviour + { + public static ElevatorManager Instance { get; private set; } - private List _elevators; + private List _elevators; - private void Awake() - { - Instance = this; - QSBSceneManager.OnSceneLoaded += OnSceneLoaded; - } + private void Awake() + { + Instance = this; + QSBSceneManager.OnSceneLoaded += OnSceneLoaded; + } - private void OnDestroy() - { - QSBSceneManager.OnSceneLoaded -= OnSceneLoaded; - } + private void OnDestroy() + { + QSBSceneManager.OnSceneLoaded -= OnSceneLoaded; + } - private void OnSceneLoaded(OWScene scene, bool isInUniverse) - { - _elevators = Resources.FindObjectsOfTypeAll().ToList(); - for (var id = 0; id < _elevators.Count; id++) - { - var qsbElevator = WorldRegistry.GetObject(id) ?? new QSBElevator(); - qsbElevator.Init(_elevators[id], id); - WorldRegistry.AddObject(qsbElevator); - } - } + private void OnSceneLoaded(OWScene scene, bool isInUniverse) + { + _elevators = Resources.FindObjectsOfTypeAll().ToList(); + for (var id = 0; id < _elevators.Count; id++) + { + var qsbElevator = WorldRegistry.GetObject(id) ?? new QSBElevator(); + qsbElevator.Init(_elevators[id], id); + WorldRegistry.AddObject(qsbElevator); + } + } - public int GetId(Elevator elevator) => _elevators.IndexOf(elevator); - } + public int GetId(Elevator elevator) => _elevators.IndexOf(elevator); + } } diff --git a/QSB/ElevatorSync/ElevatorPatches.cs b/QSB/ElevatorSync/ElevatorPatches.cs index 7c801280..7b1e8c62 100644 --- a/QSB/ElevatorSync/ElevatorPatches.cs +++ b/QSB/ElevatorSync/ElevatorPatches.cs @@ -3,20 +3,20 @@ using QSB.EventsCore; namespace QSB.ElevatorSync { - public class ElevatorPatches : QSBPatch - { - public override QSBPatchTypes Type => QSBPatchTypes.OnModStart; + public class ElevatorPatches : QSBPatch + { + public override QSBPatchTypes Type => QSBPatchTypes.OnModStart; - public static void StartLift(Elevator __instance) - { - var isGoingUp = __instance.GetValue("_goingToTheEnd"); - var id = ElevatorManager.Instance.GetId(__instance); - GlobalMessenger.FireEvent(EventNames.QSBStartLift, id, isGoingUp); - } + public static void StartLift(Elevator __instance) + { + var isGoingUp = __instance.GetValue("_goingToTheEnd"); + var id = ElevatorManager.Instance.GetId(__instance); + GlobalMessenger.FireEvent(EventNames.QSBStartLift, id, isGoingUp); + } - public override void DoPatches() - { - QSB.Helper.HarmonyHelper.AddPostfix("StartLift", typeof(ElevatorPatches), nameof(StartLift)); - } - } + public override void DoPatches() + { + QSB.Helper.HarmonyHelper.AddPostfix("StartLift", typeof(ElevatorPatches), nameof(StartLift)); + } + } } diff --git a/QSB/ElevatorSync/Events/ElevatorEvent.cs b/QSB/ElevatorSync/Events/ElevatorEvent.cs index 4a7060fc..4489ea41 100644 --- a/QSB/ElevatorSync/Events/ElevatorEvent.cs +++ b/QSB/ElevatorSync/Events/ElevatorEvent.cs @@ -4,26 +4,26 @@ using QSB.WorldSync.Events; namespace QSB.ElevatorSync.Events { - public class ElevatorEvent : QSBEvent - { - public override EventType Type => EventType.Elevator; + public class ElevatorEvent : QSBEvent + { + public override EventType Type => EventType.Elevator; - public override void SetupListener() => GlobalMessenger.AddListener(EventNames.QSBStartLift, Handler); + public override void SetupListener() => GlobalMessenger.AddListener(EventNames.QSBStartLift, Handler); - public override void CloseListener() => GlobalMessenger.RemoveListener(EventNames.QSBStartLift, Handler); + public override void CloseListener() => GlobalMessenger.RemoveListener(EventNames.QSBStartLift, Handler); - private void Handler(int id, bool isGoingUp) => SendEvent(CreateMessage(id, isGoingUp)); + private void Handler(int id, bool isGoingUp) => SendEvent(CreateMessage(id, isGoingUp)); - private BoolWorldObjectMessage CreateMessage(int id, bool isGoingUp) => new BoolWorldObjectMessage - { - State = isGoingUp, - ObjectId = id - }; + private BoolWorldObjectMessage CreateMessage(int id, bool isGoingUp) => new BoolWorldObjectMessage + { + State = isGoingUp, + ObjectId = id + }; - public override void OnReceiveRemote(BoolWorldObjectMessage message) - { - var elevator = WorldRegistry.GetObject(message.ObjectId); - elevator?.RemoteCall(message.State); - } - } + public override void OnReceiveRemote(BoolWorldObjectMessage message) + { + var elevator = WorldRegistry.GetObject(message.ObjectId); + elevator?.RemoteCall(message.State); + } + } } diff --git a/QSB/ElevatorSync/QSBElevator.cs b/QSB/ElevatorSync/QSBElevator.cs index c04d023d..8958e4b0 100644 --- a/QSB/ElevatorSync/QSBElevator.cs +++ b/QSB/ElevatorSync/QSBElevator.cs @@ -4,54 +4,54 @@ using UnityEngine; namespace QSB.ElevatorSync { - public class QSBElevator : WorldObject - { - private Elevator _elevator; - private Vector3 _startLocalPos; - private Vector3 _endLocalPos; + public class QSBElevator : WorldObject + { + private Elevator _elevator; + private Vector3 _startLocalPos; + private Vector3 _endLocalPos; - private SingleInteractionVolume _interactVolume; - private OWAudioSource _owAudioSourceOneShot; - private OWAudioSource _owAudioSourceLP; + private SingleInteractionVolume _interactVolume; + private OWAudioSource _owAudioSourceOneShot; + private OWAudioSource _owAudioSourceLP; - public void Init(Elevator elevator, int id) - { - _elevator = elevator; - ObjectId = id; - QSB.Helper.Events.Unity.RunWhen(() => _elevator.GetValue("_interactVolume") != null, InitValues); - } + public void Init(Elevator elevator, int id) + { + _elevator = elevator; + ObjectId = id; + QSB.Helper.Events.Unity.RunWhen(() => _elevator.GetValue("_interactVolume") != null, InitValues); + } - private void InitValues() - { - _startLocalPos = _elevator.GetValue("_startLocalPos"); - _endLocalPos = _elevator.GetValue("_endLocalPos"); - _interactVolume = _elevator.GetValue("_interactVolume"); - _owAudioSourceOneShot = _elevator.GetValue("_owAudioSourceOneShot"); - _owAudioSourceLP = _elevator.GetValue("_owAudioSourceLP"); - } + private void InitValues() + { + _startLocalPos = _elevator.GetValue("_startLocalPos"); + _endLocalPos = _elevator.GetValue("_endLocalPos"); + _interactVolume = _elevator.GetValue("_interactVolume"); + _owAudioSourceOneShot = _elevator.GetValue("_owAudioSourceOneShot"); + _owAudioSourceLP = _elevator.GetValue("_owAudioSourceLP"); + } - public void RemoteCall(bool isGoingUp) - { - SetDirection(isGoingUp); - RemoteStartLift(); - } + public void RemoteCall(bool isGoingUp) + { + SetDirection(isGoingUp); + RemoteStartLift(); + } - private void SetDirection(bool isGoingUp) - { - var targetPos = isGoingUp ? _endLocalPos : _startLocalPos; - _elevator.SetValue("_goingToTheEnd", isGoingUp); - _elevator.SetValue("_targetLocalPos", targetPos); - _interactVolume.transform.Rotate(0f, 180f, 0f); - } + private void SetDirection(bool isGoingUp) + { + var targetPos = isGoingUp ? _endLocalPos : _startLocalPos; + _elevator.SetValue("_goingToTheEnd", isGoingUp); + _elevator.SetValue("_targetLocalPos", targetPos); + _interactVolume.transform.Rotate(0f, 180f, 0f); + } - private void RemoteStartLift() - { - _elevator.enabled = true; - _elevator.SetValue("_initLocalPos", _elevator.transform.localPosition); - _elevator.SetValue("_initLiftTime", Time.time); - _owAudioSourceOneShot.PlayOneShot(AudioType.TH_LiftActivate); - _owAudioSourceLP.FadeIn(0.5f); - _interactVolume.DisableInteraction(); - } - } + private void RemoteStartLift() + { + _elevator.enabled = true; + _elevator.SetValue("_initLocalPos", _elevator.transform.localPosition); + _elevator.SetValue("_initLiftTime", Time.time); + _owAudioSourceOneShot.PlayOneShot(AudioType.TH_LiftActivate); + _owAudioSourceLP.FadeIn(0.5f); + _interactVolume.DisableInteraction(); + } + } } diff --git a/QSB/EventsCore/EventNames.cs b/QSB/EventsCore/EventNames.cs index 9012f9a9..a2cd8543 100644 --- a/QSB/EventsCore/EventNames.cs +++ b/QSB/EventsCore/EventNames.cs @@ -1,40 +1,40 @@ namespace QSB.EventsCore { - public static class EventNames - { - public static string TurnOnFlashlight = "TurnOnFlashlight"; - public static string TurnOffFlashlight = "TurnOffFlashlight"; - public static string LaunchProbe = "LaunchProbe"; - public static string RetrieveProbe = "RetrieveProbe"; - public static string ProbeLauncherEquipped = "ProbeLauncherEquipped"; - public static string ProbeLauncherUnequipped = "ProbeLauncherUnequipped"; - public static string EquipSignalscope = "EquipSignalscope"; - public static string UnequipSignalscope = "UnequipSignalscope"; - public static string SuitUp = "SuitUp"; - public static string RemoveSuit = "RemoveSuit"; - public static string EquipTranslator = "EquipTranslator"; - public static string UnequipTranslator = "UnequipTranslator"; - public static string ExitShip = "ExitShip"; - public static string RestartTimeLoop = "RestartTimeLoop"; - public static string WakeUp = "WakeUp"; + public static class EventNames + { + public static string TurnOnFlashlight = "TurnOnFlashlight"; + public static string TurnOffFlashlight = "TurnOffFlashlight"; + public static string LaunchProbe = "LaunchProbe"; + public static string RetrieveProbe = "RetrieveProbe"; + public static string ProbeLauncherEquipped = "ProbeLauncherEquipped"; + public static string ProbeLauncherUnequipped = "ProbeLauncherUnequipped"; + public static string EquipSignalscope = "EquipSignalscope"; + public static string UnequipSignalscope = "UnequipSignalscope"; + public static string SuitUp = "SuitUp"; + public static string RemoveSuit = "RemoveSuit"; + public static string EquipTranslator = "EquipTranslator"; + public static string UnequipTranslator = "UnequipTranslator"; + public static string ExitShip = "ExitShip"; + public static string RestartTimeLoop = "RestartTimeLoop"; + public static string WakeUp = "WakeUp"; - public static string QSBPlayerDeath = "QSBPlayerDeath"; - public static string QSBPlayerJoin = "QSBPlayerJoin"; - public static string QSBPlayerLeave = "QSBPlayerLeave"; - public static string QSBPlayerReady = "QSBPlayerReady"; - public static string QSBSectorChange = "QSBSectorChange"; - public static string QSBPlayerStatesRequest = "QSBPlayerStatesRequest"; - public static string QSBServerTime = "QSBServerTime"; - public static string QSBOnProbeAnchor = "QSBOnProbeAnchor"; - public static string QSBOnProbeWarp = "QSBOnProbeWarp"; - public static string QSBStartLift = "QSBStartLift"; - public static string QSBGeyserState = "QSBGeyserState"; - public static string QSBCrouch = "QSBAnimTrigger"; - public static string QSBOrbSlot = "QSBOrbSlot"; - public static string QSBOrbUser = "QSBOrbUser"; - public static string QSBConversation = "QSBConversation"; - public static string QSBConversationStartEnd = "QSBConversationStartEnd"; - public static string QSBChangeAnimType = "QSBPlayInstrument"; - public static string QSBServerSendPlayerStates = "QSBServerSendPlayerStates"; - } + public static string QSBPlayerDeath = "QSBPlayerDeath"; + public static string QSBPlayerJoin = "QSBPlayerJoin"; + public static string QSBPlayerLeave = "QSBPlayerLeave"; + public static string QSBPlayerReady = "QSBPlayerReady"; + public static string QSBSectorChange = "QSBSectorChange"; + public static string QSBPlayerStatesRequest = "QSBPlayerStatesRequest"; + public static string QSBServerTime = "QSBServerTime"; + public static string QSBOnProbeAnchor = "QSBOnProbeAnchor"; + public static string QSBOnProbeWarp = "QSBOnProbeWarp"; + public static string QSBStartLift = "QSBStartLift"; + public static string QSBGeyserState = "QSBGeyserState"; + public static string QSBCrouch = "QSBAnimTrigger"; + public static string QSBOrbSlot = "QSBOrbSlot"; + public static string QSBOrbUser = "QSBOrbUser"; + public static string QSBConversation = "QSBConversation"; + public static string QSBConversationStartEnd = "QSBConversationStartEnd"; + public static string QSBChangeAnimType = "QSBPlayInstrument"; + public static string QSBServerSendPlayerStates = "QSBServerSendPlayerStates"; + } } diff --git a/QSB/EventsCore/EventType.cs b/QSB/EventsCore/EventType.cs index 660f1e48..b082285c 100644 --- a/QSB/EventsCore/EventType.cs +++ b/QSB/EventsCore/EventType.cs @@ -1,29 +1,29 @@ namespace QSB.EventsCore { - public enum EventType - { - Sector, - ServerTime, - AnimTrigger, - PlayerState, - PlayerStatesRequest, - FlashlightActiveChange, - SignalscopeActiveChange, - TranslatorActiveChange, - ProbeLauncherActiveChange, - SuitActiveChange, - PlayerJoin, - PlayerLeave, - PlayerDeath, - PlayerSectorChange, - PlayerReady, - ProbeActiveChange, - Elevator, - Geyser, - OrbSlot, - OrbUser, - Conversation, - ConversationStartEnd, - PlayInstrument - } + public enum EventType + { + Sector, + ServerTime, + AnimTrigger, + PlayerState, + PlayerStatesRequest, + FlashlightActiveChange, + SignalscopeActiveChange, + TranslatorActiveChange, + ProbeLauncherActiveChange, + SuitActiveChange, + PlayerJoin, + PlayerLeave, + PlayerDeath, + PlayerSectorChange, + PlayerReady, + ProbeActiveChange, + Elevator, + Geyser, + OrbSlot, + OrbUser, + Conversation, + ConversationStartEnd, + PlayInstrument + } } diff --git a/QSB/EventsCore/IQSBEvent.cs b/QSB/EventsCore/IQSBEvent.cs index 438a7d31..4b8b8dc3 100644 --- a/QSB/EventsCore/IQSBEvent.cs +++ b/QSB/EventsCore/IQSBEvent.cs @@ -1,8 +1,8 @@ namespace QSB.EventsCore { - public interface IQSBEvent - { - void SetupListener(); - void CloseListener(); - } + public interface IQSBEvent + { + void SetupListener(); + void CloseListener(); + } } diff --git a/QSB/EventsCore/QSBEvent.cs b/QSB/EventsCore/QSBEvent.cs index 69abda07..6648f17a 100644 --- a/QSB/EventsCore/QSBEvent.cs +++ b/QSB/EventsCore/QSBEvent.cs @@ -2,7 +2,6 @@ using QSB.Player; using QSB.QuantumUNET; using QSB.TransformSync; -using UnityEngine.Networking; namespace QSB.EventsCore { diff --git a/QSB/EventsCore/QSBEventManager.cs b/QSB/EventsCore/QSBEventManager.cs index 0f20259b..0dafd0d7 100644 --- a/QSB/EventsCore/QSBEventManager.cs +++ b/QSB/EventsCore/QSBEventManager.cs @@ -14,54 +14,54 @@ using System.Collections.Generic; namespace QSB.EventsCore { - public static class QSBEventManager - { - public static bool Ready { get; private set; } + public static class QSBEventManager + { + public static bool Ready { get; private set; } - private static List _eventList = new List(); + private static List _eventList = new List(); - public static void Init() - { - _eventList = new List - { - new PlayerReadyEvent(), - new PlayerJoinEvent(), - new PlayerSuitEvent(), - new PlayerFlashlightEvent(), - new PlayerSignalscopeEvent(), - new PlayerTranslatorEvent(), - new PlayerProbeLauncherEvent(), - new PlayerProbeEvent(), - new PlayerSectorEvent(), - new PlayerLeaveEvent(), - new PlayerDeathEvent(), - new PlayerStatesRequestEvent(), - new ElevatorEvent(), - new GeyserEvent(), - new ServerTimeEvent(), - new CrouchEvent(), - new OrbSlotEvent(), - new OrbUserEvent(), - new ConversationEvent(), - new ConversationStartEndEvent(), - new ChangeAnimTypeEvent(), - new ServerSendPlayerStatesEvent() - }; + public static void Init() + { + _eventList = new List + { + new PlayerReadyEvent(), + new PlayerJoinEvent(), + new PlayerSuitEvent(), + new PlayerFlashlightEvent(), + new PlayerSignalscopeEvent(), + new PlayerTranslatorEvent(), + new PlayerProbeLauncherEvent(), + new PlayerProbeEvent(), + new PlayerSectorEvent(), + new PlayerLeaveEvent(), + new PlayerDeathEvent(), + new PlayerStatesRequestEvent(), + new ElevatorEvent(), + new GeyserEvent(), + new ServerTimeEvent(), + new CrouchEvent(), + new OrbSlotEvent(), + new OrbUserEvent(), + new ConversationEvent(), + new ConversationStartEndEvent(), + new ChangeAnimTypeEvent(), + new ServerSendPlayerStatesEvent() + }; - _eventList.ForEach(ev => ev.SetupListener()); + _eventList.ForEach(ev => ev.SetupListener()); - Ready = true; + Ready = true; - DebugLog.DebugWrite("Event Manager ready.", MessageType.Success); - } + DebugLog.DebugWrite("Event Manager ready.", MessageType.Success); + } - public static void Reset() - { - Ready = false; + public static void Reset() + { + Ready = false; - _eventList.ForEach(ev => ev.CloseListener()); + _eventList.ForEach(ev => ev.CloseListener()); - _eventList = new List(); - } - } + _eventList = new List(); + } + } } diff --git a/QSB/GeyserSync/Events/GeyserEvent.cs b/QSB/GeyserSync/Events/GeyserEvent.cs index 8cd7a7bd..0ac1134b 100644 --- a/QSB/GeyserSync/Events/GeyserEvent.cs +++ b/QSB/GeyserSync/Events/GeyserEvent.cs @@ -4,33 +4,33 @@ using QSB.WorldSync.Events; namespace QSB.GeyserSync.Events { - public class GeyserEvent : QSBEvent - { - public override EventType Type => EventType.Geyser; + public class GeyserEvent : QSBEvent + { + public override EventType Type => EventType.Geyser; - public override void SetupListener() - { - GlobalMessenger.AddListener(EventNames.QSBGeyserState, Handler); - } + public override void SetupListener() + { + GlobalMessenger.AddListener(EventNames.QSBGeyserState, Handler); + } - public override void CloseListener() - { - GlobalMessenger.RemoveListener(EventNames.QSBGeyserState, Handler); - } + public override void CloseListener() + { + GlobalMessenger.RemoveListener(EventNames.QSBGeyserState, Handler); + } - private void Handler(int id, bool state) => SendEvent(CreateMessage(id, state)); + private void Handler(int id, bool state) => SendEvent(CreateMessage(id, state)); - private BoolWorldObjectMessage CreateMessage(int id, bool state) => new BoolWorldObjectMessage - { - AboutId = LocalPlayerId, - ObjectId = id, - State = state - }; + private BoolWorldObjectMessage CreateMessage(int id, bool state) => new BoolWorldObjectMessage + { + AboutId = LocalPlayerId, + ObjectId = id, + State = state + }; - public override void OnReceiveRemote(BoolWorldObjectMessage message) - { - var geyser = WorldRegistry.GetObject(message.ObjectId); - geyser?.SetState(message.State); - } - } + public override void OnReceiveRemote(BoolWorldObjectMessage message) + { + var geyser = WorldRegistry.GetObject(message.ObjectId); + geyser?.SetState(message.State); + } + } } diff --git a/QSB/GeyserSync/GeyserManager.cs b/QSB/GeyserSync/GeyserManager.cs index 45f3d399..b90c06a0 100644 --- a/QSB/GeyserSync/GeyserManager.cs +++ b/QSB/GeyserSync/GeyserManager.cs @@ -4,41 +4,41 @@ using UnityEngine; namespace QSB.GeyserSync { - public class GeyserManager : MonoBehaviour - { - public static GeyserManager Instance { get; private set; } + public class GeyserManager : MonoBehaviour + { + public static GeyserManager Instance { get; private set; } - private void Awake() - { - Instance = this; - QSBSceneManager.OnSceneLoaded += OnSceneLoaded; - QSBPatchManager.OnPatchType += OnPatchType; - } + private void Awake() + { + Instance = this; + QSBSceneManager.OnSceneLoaded += OnSceneLoaded; + QSBPatchManager.OnPatchType += OnPatchType; + } - private void OnDestroy() - { - QSBSceneManager.OnSceneLoaded -= OnSceneLoaded; - QSBPatchManager.OnPatchType -= OnPatchType; - } + private void OnDestroy() + { + QSBSceneManager.OnSceneLoaded -= OnSceneLoaded; + QSBPatchManager.OnPatchType -= OnPatchType; + } - private void OnSceneLoaded(OWScene scene, bool isInUniverse) - { - var geyserControllers = Resources.FindObjectsOfTypeAll(); - for (var id = 0; id < geyserControllers.Length; id++) - { - var qsbGeyser = WorldRegistry.GetObject(id) ?? new QSBGeyser(); - qsbGeyser.Init(geyserControllers[id], id); - WorldRegistry.AddObject(qsbGeyser); - } - } + private void OnSceneLoaded(OWScene scene, bool isInUniverse) + { + var geyserControllers = Resources.FindObjectsOfTypeAll(); + for (var id = 0; id < geyserControllers.Length; id++) + { + var qsbGeyser = WorldRegistry.GetObject(id) ?? new QSBGeyser(); + qsbGeyser.Init(geyserControllers[id], id); + WorldRegistry.AddObject(qsbGeyser); + } + } - public void OnPatchType(QSBPatchTypes type) - { - if (type != QSBPatchTypes.OnNonServerClientConnect) - { - return; - } - QSB.Helper.HarmonyHelper.EmptyMethod("Update"); - } - } + public void OnPatchType(QSBPatchTypes type) + { + if (type != QSBPatchTypes.OnNonServerClientConnect) + { + return; + } + QSB.Helper.HarmonyHelper.EmptyMethod("Update"); + } + } } \ No newline at end of file diff --git a/QSB/GeyserSync/QSBGeyser.cs b/QSB/GeyserSync/QSBGeyser.cs index b03499bb..e4328ca3 100644 --- a/QSB/GeyserSync/QSBGeyser.cs +++ b/QSB/GeyserSync/QSBGeyser.cs @@ -1,7 +1,6 @@ using QSB.EventsCore; using QSB.QuantumUNET; using QSB.WorldSync; -using UnityEngine.Networking; namespace QSB.GeyserSync { diff --git a/QSB/Instruments/InstrumentsManager.cs b/QSB/Instruments/InstrumentsManager.cs index f0859c6c..46f879bd 100644 --- a/QSB/Instruments/InstrumentsManager.cs +++ b/QSB/Instruments/InstrumentsManager.cs @@ -8,121 +8,121 @@ using UnityEngine; namespace QSB.Instruments { - public class InstrumentsManager : PlayerSyncObject - { - private Transform rootObj; - private AnimationType _savedType; - private GameObject ChertDrum; + public class InstrumentsManager : PlayerSyncObject + { + private Transform rootObj; + private AnimationType _savedType; + private GameObject ChertDrum; - public void InitLocal(Transform root) - { - rootObj = root; - gameObject.AddComponent(); + public void InitLocal(Transform root) + { + rootObj = root; + gameObject.AddComponent(); - QSBInputManager.ChertTaunt += () => StartInstrument(AnimationType.Chert); - QSBInputManager.EskerTaunt += () => StartInstrument(AnimationType.Esker); - QSBInputManager.FeldsparTaunt += () => StartInstrument(AnimationType.Feldspar); - QSBInputManager.GabbroTaunt += () => StartInstrument(AnimationType.Gabbro); - QSBInputManager.RiebeckTaunt += () => StartInstrument(AnimationType.Riebeck); - QSBInputManager.ExitTaunt += () => ReturnToPlayer(); + QSBInputManager.ChertTaunt += () => StartInstrument(AnimationType.Chert); + QSBInputManager.EskerTaunt += () => StartInstrument(AnimationType.Esker); + QSBInputManager.FeldsparTaunt += () => StartInstrument(AnimationType.Feldspar); + QSBInputManager.GabbroTaunt += () => StartInstrument(AnimationType.Gabbro); + QSBInputManager.RiebeckTaunt += () => StartInstrument(AnimationType.Riebeck); + QSBInputManager.ExitTaunt += () => ReturnToPlayer(); - QSB.Helper.Events.Unity.RunWhen(() => Locator.GetPlayerBody() != null, SetupInstruments); + QSB.Helper.Events.Unity.RunWhen(() => Locator.GetPlayerBody() != null, SetupInstruments); - QSBPlayerManager.PlayerSyncObjects.Add(this); - } + QSBPlayerManager.PlayerSyncObjects.Add(this); + } - public void InitRemote(Transform root) - { - rootObj = root; - QSB.Helper.Events.Unity.RunWhen(() => Locator.GetPlayerBody() != null, SetupInstruments); + public void InitRemote(Transform root) + { + rootObj = root; + QSB.Helper.Events.Unity.RunWhen(() => Locator.GetPlayerBody() != null, SetupInstruments); - QSBPlayerManager.PlayerSyncObjects.Add(this); - } + QSBPlayerManager.PlayerSyncObjects.Add(this); + } - private void OnDestroy() - { - if (!IsLocalPlayer) - { - return; - } - DebugLog.DebugWrite($"OnDestroy {PlayerId}"); - QSBInputManager.ChertTaunt -= () => StartInstrument(AnimationType.Chert); - QSBInputManager.EskerTaunt -= () => StartInstrument(AnimationType.Esker); - QSBInputManager.FeldsparTaunt -= () => StartInstrument(AnimationType.Feldspar); - QSBInputManager.GabbroTaunt -= () => StartInstrument(AnimationType.Gabbro); - QSBInputManager.RiebeckTaunt -= () => StartInstrument(AnimationType.Riebeck); - QSBInputManager.ExitTaunt -= () => ReturnToPlayer(); - } + private void OnDestroy() + { + if (!IsLocalPlayer) + { + return; + } + DebugLog.DebugWrite($"OnDestroy {PlayerId}"); + QSBInputManager.ChertTaunt -= () => StartInstrument(AnimationType.Chert); + QSBInputManager.EskerTaunt -= () => StartInstrument(AnimationType.Esker); + QSBInputManager.FeldsparTaunt -= () => StartInstrument(AnimationType.Feldspar); + QSBInputManager.GabbroTaunt -= () => StartInstrument(AnimationType.Gabbro); + QSBInputManager.RiebeckTaunt -= () => StartInstrument(AnimationType.Riebeck); + QSBInputManager.ExitTaunt -= () => ReturnToPlayer(); + } - private void SetupInstruments() - { - var bundle = QSB.InstrumentAssetBundle; - ChertDrum = MakeChertDrum(bundle); - } + private void SetupInstruments() + { + var bundle = QSB.InstrumentAssetBundle; + ChertDrum = MakeChertDrum(bundle); + } - // EyeCompatibility : Need to find right object. - private GameObject MakeChertDrum(AssetBundle bundle) - { - var drum = new GameObject(); - var mf = drum.AddComponent(); - mf.sharedMesh = bundle.LoadAsset("assets/Chert/hourglasstwinsmeshescharacters2.asset") as Mesh; - var mr = drum.AddComponent(); - mr.sharedMaterial = GameObject.Find("NewDrum:polySurface2").GetComponent().material; - drum.transform.parent = rootObj; - drum.transform.rotation = rootObj.rotation; - drum.transform.localPosition = Vector3.zero; - drum.transform.localScale = new Vector3(16.0f, 16.5f, 16.0f); - drum.SetActive(false); + // EyeCompatibility : Need to find right object. + private GameObject MakeChertDrum(AssetBundle bundle) + { + var drum = new GameObject(); + var mf = drum.AddComponent(); + mf.sharedMesh = bundle.LoadAsset("assets/Chert/hourglasstwinsmeshescharacters2.asset") as Mesh; + var mr = drum.AddComponent(); + mr.sharedMaterial = GameObject.Find("NewDrum:polySurface2").GetComponent().material; + drum.transform.parent = rootObj; + drum.transform.rotation = rootObj.rotation; + drum.transform.localPosition = Vector3.zero; + drum.transform.localScale = new Vector3(16.0f, 16.5f, 16.0f); + drum.SetActive(false); - return drum; - } + return drum; + } - public void StartInstrument(AnimationType type) - { - if (!IsLocalPlayer) - { - DebugLog.DebugWrite("Error - Tried to start instrument on non-local player!", MessageType.Error); - return; - } - if (Player.PlayingInstrument || !Locator.GetPlayerController().IsGrounded()) - { - return; - } - _savedType = Player.AnimationSync.CurrentType; - CameraManager.Instance.SwitchTo3rdPerson(); - SwitchToType(type); - } + public void StartInstrument(AnimationType type) + { + if (!IsLocalPlayer) + { + DebugLog.DebugWrite("Error - Tried to start instrument on non-local player!", MessageType.Error); + return; + } + if (Player.PlayingInstrument || !Locator.GetPlayerController().IsGrounded()) + { + return; + } + _savedType = Player.AnimationSync.CurrentType; + CameraManager.Instance.SwitchTo3rdPerson(); + SwitchToType(type); + } - public void ReturnToPlayer() - { - if (!Player.PlayingInstrument) - { - return; - } - CameraManager.Instance.SwitchTo1stPerson(); - SwitchToType(_savedType); - } + public void ReturnToPlayer() + { + if (!Player.PlayingInstrument) + { + return; + } + CameraManager.Instance.SwitchTo1stPerson(); + SwitchToType(_savedType); + } - public void SwitchToType(AnimationType type) - { - DebugLog.DebugWrite($"switch to type {type} player {PlayerId}"); - GlobalMessenger.FireEvent(EventNames.QSBChangeAnimType, QSBPlayerManager.LocalPlayerId, type); - QSBPlayerManager.LocalPlayer.AnimationSync.SetAnimationType(type); - CheckInstrumentProps(type); - } + public void SwitchToType(AnimationType type) + { + DebugLog.DebugWrite($"switch to type {type} player {PlayerId}"); + GlobalMessenger.FireEvent(EventNames.QSBChangeAnimType, QSBPlayerManager.LocalPlayerId, type); + QSBPlayerManager.LocalPlayer.AnimationSync.SetAnimationType(type); + CheckInstrumentProps(type); + } - public void CheckInstrumentProps(AnimationType type) - { - switch (type) - { - case AnimationType.Chert: - ChertDrum.SetActive(true); - break; - case AnimationType.PlayerSuited: - case AnimationType.PlayerUnsuited: - ChertDrum.SetActive(false); - break; - } - } - } + public void CheckInstrumentProps(AnimationType type) + { + switch (type) + { + case AnimationType.Chert: + ChertDrum.SetActive(true); + break; + case AnimationType.PlayerSuited: + case AnimationType.PlayerUnsuited: + ChertDrum.SetActive(false); + break; + } + } + } } diff --git a/QSB/Instruments/QSBCamera/CameraController.cs b/QSB/Instruments/QSBCamera/CameraController.cs index 1dad97a0..dccd8e23 100644 --- a/QSB/Instruments/QSBCamera/CameraController.cs +++ b/QSB/Instruments/QSBCamera/CameraController.cs @@ -2,78 +2,78 @@ namespace QSB.Instruments.QSBCamera { - class CameraController : MonoBehaviour - { - private float _degreesX; - private float _degreesY; - private Quaternion _rotationX; - private Quaternion _rotationY; + class CameraController : MonoBehaviour + { + private float _degreesX; + private float _degreesY; + private Quaternion _rotationX; + private Quaternion _rotationY; - // How far along the ray to move the camera. Avoids clipping into the walls. - private const float PercentToMove = 0.80f; - // Maximum distance for camera clipping - private const float RayLength = 5f; + // How far along the ray to move the camera. Avoids clipping into the walls. + private const float PercentToMove = 0.80f; + // Maximum distance for camera clipping + private const float RayLength = 5f; - public GameObject CameraObject; + public GameObject CameraObject; - void FixedUpdate() - { - if (CameraManager.Instance.Mode != CameraMode.ThirdPerson) - { - return; - } - UpdatePosition(); - UpdateInput(); - UpdateRotation(); - } + void FixedUpdate() + { + if (CameraManager.Instance.Mode != CameraMode.ThirdPerson) + { + return; + } + UpdatePosition(); + UpdateInput(); + UpdateRotation(); + } - private void UpdatePosition() - { - var origin = transform.position; - var localDirection = CameraObject.transform.localPosition.normalized; - Vector3 localTargetPoint; - if (Physics.Raycast(origin, transform.TransformDirection(localDirection), out var outRay, RayLength, LayerMask.GetMask("Default"))) - { - // Raycast hit collider, get target from hitpoint. - localTargetPoint = transform.InverseTransformPoint(outRay.point) * PercentToMove; - } - else - { - // Raycast didn't hit collider, get target from camera direction - localTargetPoint = localDirection * RayLength * PercentToMove; - } - var targetDistance = Vector3.Distance(origin, transform.TransformPoint(localTargetPoint)); - var currentDistance = Vector3.Distance(origin, CameraObject.transform.position); - Vector3 movement; - if (targetDistance < currentDistance) - { - // Snap to target to avoid clipping - movement = localTargetPoint; - } - else - { - // Move camera out slowly - movement = Vector3.MoveTowards(CameraObject.transform.localPosition, localTargetPoint, Time.fixedDeltaTime * 2f); - } - CameraObject.transform.localPosition = movement; - } + private void UpdatePosition() + { + var origin = transform.position; + var localDirection = CameraObject.transform.localPosition.normalized; + Vector3 localTargetPoint; + if (Physics.Raycast(origin, transform.TransformDirection(localDirection), out var outRay, RayLength, LayerMask.GetMask("Default"))) + { + // Raycast hit collider, get target from hitpoint. + localTargetPoint = transform.InverseTransformPoint(outRay.point) * PercentToMove; + } + else + { + // Raycast didn't hit collider, get target from camera direction + localTargetPoint = localDirection * RayLength * PercentToMove; + } + var targetDistance = Vector3.Distance(origin, transform.TransformPoint(localTargetPoint)); + var currentDistance = Vector3.Distance(origin, CameraObject.transform.position); + Vector3 movement; + if (targetDistance < currentDistance) + { + // Snap to target to avoid clipping + movement = localTargetPoint; + } + else + { + // Move camera out slowly + movement = Vector3.MoveTowards(CameraObject.transform.localPosition, localTargetPoint, Time.fixedDeltaTime * 2f); + } + CameraObject.transform.localPosition = movement; + } - private void UpdateInput() - { - var input = OWInput.GetValue(InputLibrary.look, false, InputMode.All); - _degreesX += input.x * 180f * Time.fixedDeltaTime; - _degreesY += input.y * 180f * Time.fixedDeltaTime; - } + private void UpdateInput() + { + var input = OWInput.GetValue(InputLibrary.look, false, InputMode.All); + _degreesX += input.x * 180f * Time.fixedDeltaTime; + _degreesY += input.y * 180f * Time.fixedDeltaTime; + } - private void UpdateRotation() - { - _degreesX %= 360f; - _degreesY %= 360f; - _degreesY = Mathf.Clamp(_degreesY, -80f, 80f); - _rotationX = Quaternion.AngleAxis(_degreesX, Vector3.up); - _rotationY = Quaternion.AngleAxis(_degreesY, Vector3.left); - var localRotation = _rotationX * _rotationY * Quaternion.identity; - transform.localRotation = localRotation; - } - } + private void UpdateRotation() + { + _degreesX %= 360f; + _degreesY %= 360f; + _degreesY = Mathf.Clamp(_degreesY, -80f, 80f); + _rotationX = Quaternion.AngleAxis(_degreesX, Vector3.up); + _rotationY = Quaternion.AngleAxis(_degreesY, Vector3.left); + var localRotation = _rotationX * _rotationY * Quaternion.identity; + transform.localRotation = localRotation; + } + } } diff --git a/QSB/Instruments/QSBCamera/CameraManager.cs b/QSB/Instruments/QSBCamera/CameraManager.cs index 41c95668..fc7478ea 100644 --- a/QSB/Instruments/QSBCamera/CameraManager.cs +++ b/QSB/Instruments/QSBCamera/CameraManager.cs @@ -5,110 +5,110 @@ using UnityEngine.PostProcessing; namespace QSB.Instruments.QSBCamera { - public class CameraManager : MonoBehaviour - { - public static CameraManager Instance; - private GameObject CameraBase; - private GameObject CameraObj; - private Camera Camera; - private OWCamera OWCamera; - public bool IsSetUp { get; private set; } - public CameraMode Mode { get; private set; } + public class CameraManager : MonoBehaviour + { + public static CameraManager Instance; + private GameObject CameraBase; + private GameObject CameraObj; + private Camera Camera; + private OWCamera OWCamera; + public bool IsSetUp { get; private set; } + public CameraMode Mode { get; private set; } - public void Start() - { - Instance = this; - SetupCamera(); - } + public void Start() + { + Instance = this; + SetupCamera(); + } - private void SetupCamera() - { - CameraBase = new GameObject(); - CameraBase.SetActive(false); - CameraBase.AddComponent(); - CameraBase.transform.parent = Locator.GetPlayerTransform(); - CameraBase.transform.localPosition = Vector3.zero; - CameraBase.transform.localRotation = Quaternion.Euler(0, 0, 0); + private void SetupCamera() + { + CameraBase = new GameObject(); + CameraBase.SetActive(false); + CameraBase.AddComponent(); + CameraBase.transform.parent = Locator.GetPlayerTransform(); + CameraBase.transform.localPosition = Vector3.zero; + CameraBase.transform.localRotation = Quaternion.Euler(0, 0, 0); - CameraObj = new GameObject(); - CameraObj.transform.parent = CameraBase.transform; - CameraObj.transform.localPosition = new Vector3(0, 0, -5f); - CameraObj.transform.localRotation = Quaternion.Euler(0, 0, 0); - Camera = CameraObj.AddComponent(); - Camera.cullingMask = Locator.GetPlayerCamera().mainCamera.cullingMask & ~(1 << 27) | (1 << 22); - Camera.clearFlags = CameraClearFlags.Color; - Camera.backgroundColor = Color.black; - Camera.fieldOfView = 90f; - Camera.nearClipPlane = 0.1f; - Camera.farClipPlane = 40000f; - Camera.depth = 0f; - Camera.enabled = false; - OWCamera = CameraObj.AddComponent(); - OWCamera.renderSkybox = true; + CameraObj = new GameObject(); + CameraObj.transform.parent = CameraBase.transform; + CameraObj.transform.localPosition = new Vector3(0, 0, -5f); + CameraObj.transform.localRotation = Quaternion.Euler(0, 0, 0); + Camera = CameraObj.AddComponent(); + Camera.cullingMask = Locator.GetPlayerCamera().mainCamera.cullingMask & ~(1 << 27) | (1 << 22); + Camera.clearFlags = CameraClearFlags.Color; + Camera.backgroundColor = Color.black; + Camera.fieldOfView = 90f; + Camera.nearClipPlane = 0.1f; + Camera.farClipPlane = 40000f; + Camera.depth = 0f; + Camera.enabled = false; + OWCamera = CameraObj.AddComponent(); + OWCamera.renderSkybox = true; - CameraBase.AddComponent().CameraObject = CameraObj; + CameraBase.AddComponent().CameraObject = CameraObj; - var screenGrab = CameraObj.AddComponent(); - screenGrab._downsampleShader = Locator.GetPlayerCamera().gameObject.GetComponent()._downsampleShader; + var screenGrab = CameraObj.AddComponent(); + screenGrab._downsampleShader = Locator.GetPlayerCamera().gameObject.GetComponent()._downsampleShader; - var fogImage = CameraObj.AddComponent(); - fogImage.fogShader = Locator.GetPlayerCamera().gameObject.GetComponent().fogShader; + var fogImage = CameraObj.AddComponent(); + fogImage.fogShader = Locator.GetPlayerCamera().gameObject.GetComponent().fogShader; - CameraBase.SetActive(true); + CameraBase.SetActive(true); - IsSetUp = true; - } + IsSetUp = true; + } - public void SwitchTo3rdPerson() - { - if (!IsSetUp) - { - DebugLog.ToConsole("Warning - Camera not set up!", MessageType.Warning); - OWInput.ChangeInputMode(InputMode.None); - Mode = CameraMode.ThirdPerson; - return; - } - if (Mode == CameraMode.ThirdPerson) - { - DebugLog.ToConsole("Warning - Already in 3rd person!", MessageType.Warning); - return; - } - if (OWInput.GetInputMode() != InputMode.Character) - { - DebugLog.ToConsole("Warning - Cannot change to 3rd person while not in Character inputmode!", MessageType.Warning); - return; - } - OWInput.ChangeInputMode(InputMode.None); - GlobalMessenger.FireEvent("SwitchActiveCamera", OWCamera); - Locator.GetPlayerCamera().mainCamera.enabled = false; - if (CameraObj.GetComponent() == null) - { - var postProcessing = CameraObj.AddComponent(); - postProcessing.profile = Locator.GetPlayerCamera().gameObject.GetComponent().profile; - } - Camera.enabled = true; - Mode = CameraMode.ThirdPerson; - } + public void SwitchTo3rdPerson() + { + if (!IsSetUp) + { + DebugLog.ToConsole("Warning - Camera not set up!", MessageType.Warning); + OWInput.ChangeInputMode(InputMode.None); + Mode = CameraMode.ThirdPerson; + return; + } + if (Mode == CameraMode.ThirdPerson) + { + DebugLog.ToConsole("Warning - Already in 3rd person!", MessageType.Warning); + return; + } + if (OWInput.GetInputMode() != InputMode.Character) + { + DebugLog.ToConsole("Warning - Cannot change to 3rd person while not in Character inputmode!", MessageType.Warning); + return; + } + OWInput.ChangeInputMode(InputMode.None); + GlobalMessenger.FireEvent("SwitchActiveCamera", OWCamera); + Locator.GetPlayerCamera().mainCamera.enabled = false; + if (CameraObj.GetComponent() == null) + { + var postProcessing = CameraObj.AddComponent(); + postProcessing.profile = Locator.GetPlayerCamera().gameObject.GetComponent().profile; + } + Camera.enabled = true; + Mode = CameraMode.ThirdPerson; + } - public void SwitchTo1stPerson() - { - if (!IsSetUp) - { - DebugLog.ToConsole("Warning - Camera not set up!", MessageType.Warning); - OWInput.ChangeInputMode(InputMode.Character); - Mode = CameraMode.FirstPerson; - return; - } - if (Mode == CameraMode.FirstPerson) - { - DebugLog.ToConsole("Warning - Already in 1st person!", MessageType.Warning); - return; - } - OWInput.ChangeInputMode(InputMode.Character); - GlobalMessenger.FireEvent("SwitchActiveCamera", Locator.GetPlayerCamera()); - Locator.GetActiveCamera().mainCamera.enabled = true; - Camera.enabled = false; - Mode = CameraMode.FirstPerson; - } - } + public void SwitchTo1stPerson() + { + if (!IsSetUp) + { + DebugLog.ToConsole("Warning - Camera not set up!", MessageType.Warning); + OWInput.ChangeInputMode(InputMode.Character); + Mode = CameraMode.FirstPerson; + return; + } + if (Mode == CameraMode.FirstPerson) + { + DebugLog.ToConsole("Warning - Already in 1st person!", MessageType.Warning); + return; + } + OWInput.ChangeInputMode(InputMode.Character); + GlobalMessenger.FireEvent("SwitchActiveCamera", Locator.GetPlayerCamera()); + Locator.GetActiveCamera().mainCamera.enabled = true; + Camera.enabled = false; + Mode = CameraMode.FirstPerson; + } + } } diff --git a/QSB/Instruments/QSBCamera/CameraMode.cs b/QSB/Instruments/QSBCamera/CameraMode.cs index 738ca214..7102ec52 100644 --- a/QSB/Instruments/QSBCamera/CameraMode.cs +++ b/QSB/Instruments/QSBCamera/CameraMode.cs @@ -1,8 +1,8 @@ namespace QSB.Instruments.QSBCamera { - public enum CameraMode - { - FirstPerson, - ThirdPerson - } + public enum CameraMode + { + FirstPerson, + ThirdPerson + } } diff --git a/QSB/MessagesCore/EnumMessage.cs b/QSB/MessagesCore/EnumMessage.cs index 6138b2db..adb8d4bf 100644 --- a/QSB/MessagesCore/EnumMessage.cs +++ b/QSB/MessagesCore/EnumMessage.cs @@ -3,20 +3,20 @@ using UnityEngine.Networking; namespace QSB.MessagesCore { - public class EnumMessage : PlayerMessage - { - public T Value; + public class EnumMessage : PlayerMessage + { + public T Value; - public override void Deserialize(NetworkReader reader) - { - base.Deserialize(reader); - Value = (T)(object)reader.ReadInt32(); - } + public override void Deserialize(NetworkReader reader) + { + base.Deserialize(reader); + Value = (T)(object)reader.ReadInt32(); + } - public override void Serialize(NetworkWriter writer) - { - base.Serialize(writer); - writer.Write((int)(object)Value); - } - } + public override void Serialize(NetworkWriter writer) + { + base.Serialize(writer); + writer.Write((int)(object)Value); + } + } } diff --git a/QSB/MessagesCore/FloatMessage.cs b/QSB/MessagesCore/FloatMessage.cs index b0ce45a0..9cc74f21 100644 --- a/QSB/MessagesCore/FloatMessage.cs +++ b/QSB/MessagesCore/FloatMessage.cs @@ -3,20 +3,20 @@ using UnityEngine.Networking; namespace QSB.MessagesCore { - public class FloatMessage : PlayerMessage - { - public float Value; + public class FloatMessage : PlayerMessage + { + public float Value; - public override void Deserialize(NetworkReader reader) - { - base.Deserialize(reader); - Value = reader.ReadSingle(); - } + public override void Deserialize(NetworkReader reader) + { + base.Deserialize(reader); + Value = reader.ReadSingle(); + } - public override void Serialize(NetworkWriter writer) - { - base.Serialize(writer); - writer.Write(Value); - } - } + public override void Serialize(NetworkWriter writer) + { + base.Serialize(writer); + writer.Write(Value); + } + } } \ No newline at end of file diff --git a/QSB/MessagesCore/PlayerMessage.cs b/QSB/MessagesCore/PlayerMessage.cs index 054465e3..2a9f73d8 100644 --- a/QSB/MessagesCore/PlayerMessage.cs +++ b/QSB/MessagesCore/PlayerMessage.cs @@ -2,21 +2,21 @@ namespace QSB.Messaging { - public class PlayerMessage : MessageBase - { - public uint FromId { get; set; } - public uint AboutId { get; set; } + public class PlayerMessage : MessageBase + { + public uint FromId { get; set; } + public uint AboutId { get; set; } - public override void Deserialize(NetworkReader reader) - { - FromId = reader.ReadUInt32(); - AboutId = reader.ReadUInt32(); - } + public override void Deserialize(NetworkReader reader) + { + FromId = reader.ReadUInt32(); + AboutId = reader.ReadUInt32(); + } - public override void Serialize(NetworkWriter writer) - { - writer.Write(FromId); - writer.Write(AboutId); - } - } + public override void Serialize(NetworkWriter writer) + { + writer.Write(FromId); + writer.Write(AboutId); + } + } } diff --git a/QSB/MessagesCore/ToggleMessage.cs b/QSB/MessagesCore/ToggleMessage.cs index 328cafed..8e2f0292 100644 --- a/QSB/MessagesCore/ToggleMessage.cs +++ b/QSB/MessagesCore/ToggleMessage.cs @@ -2,20 +2,20 @@ namespace QSB.Messaging { - public class ToggleMessage : PlayerMessage - { - public bool ToggleValue { get; set; } + public class ToggleMessage : PlayerMessage + { + public bool ToggleValue { get; set; } - public override void Deserialize(NetworkReader reader) - { - base.Deserialize(reader); - ToggleValue = reader.ReadBoolean(); - } + public override void Deserialize(NetworkReader reader) + { + base.Deserialize(reader); + ToggleValue = reader.ReadBoolean(); + } - public override void Serialize(NetworkWriter writer) - { - base.Serialize(writer); - writer.Write(ToggleValue); - } - } + public override void Serialize(NetworkWriter writer) + { + base.Serialize(writer); + writer.Write(ToggleValue); + } + } } \ No newline at end of file diff --git a/QSB/OrbSync/Events/OrbUserEvent.cs b/QSB/OrbSync/Events/OrbUserEvent.cs index 8a4bcaf3..358b4596 100644 --- a/QSB/OrbSync/Events/OrbUserEvent.cs +++ b/QSB/OrbSync/Events/OrbUserEvent.cs @@ -1,12 +1,10 @@ using OWML.Common; using QSB.EventsCore; using QSB.QuantumUNET; -using QSB.TransformSync; using QSB.Utility; using QSB.WorldSync; using QSB.WorldSync.Events; using System.Linq; -using UnityEngine.Networking; namespace QSB.OrbSync.Events { diff --git a/QSB/OrbSync/OrbManager.cs b/QSB/OrbSync/OrbManager.cs index b7dbbcf2..81dfed6a 100644 --- a/QSB/OrbSync/OrbManager.cs +++ b/QSB/OrbSync/OrbManager.cs @@ -4,7 +4,6 @@ using QSB.Utility; using QSB.WorldSync; using System.Linq; using UnityEngine; -using UnityEngine.Networking; namespace QSB.OrbSync { diff --git a/QSB/OrbSync/QSBOrbSlot.cs b/QSB/OrbSync/QSBOrbSlot.cs index 9358557c..ff3af77a 100644 --- a/QSB/OrbSync/QSBOrbSlot.cs +++ b/QSB/OrbSync/QSBOrbSlot.cs @@ -3,36 +3,36 @@ using QSB.WorldSync; namespace QSB.OrbSync { - public class QSBOrbSlot : WorldObject - { - public NomaiInterfaceSlot InterfaceSlot { get; private set; } + public class QSBOrbSlot : WorldObject + { + public NomaiInterfaceSlot InterfaceSlot { get; private set; } - private bool _initialized; + private bool _initialized; - public void Init(NomaiInterfaceSlot slot, int id) - { - ObjectId = id; - InterfaceSlot = slot; - _initialized = true; - WorldRegistry.AddObject(this); - } + public void Init(NomaiInterfaceSlot slot, int id) + { + ObjectId = id; + InterfaceSlot = slot; + _initialized = true; + WorldRegistry.AddObject(this); + } - public void HandleEvent(bool state) - { - if (QSB.HasWokenUp) - { - GlobalMessenger.FireEvent(EventNames.QSBOrbSlot, ObjectId, state); - } - } + public void HandleEvent(bool state) + { + if (QSB.HasWokenUp) + { + GlobalMessenger.FireEvent(EventNames.QSBOrbSlot, ObjectId, state); + } + } - public void SetState(bool state) - { - if (!_initialized) - { - return; - } - var ev = state ? "OnSlotActivated" : "OnSlotDeactivated"; - WorldRegistry.RaiseEvent(InterfaceSlot, ev); - } - } + public void SetState(bool state) + { + if (!_initialized) + { + return; + } + var ev = state ? "OnSlotActivated" : "OnSlotDeactivated"; + WorldRegistry.RaiseEvent(InterfaceSlot, ev); + } + } } diff --git a/QSB/Patches/QSBPatch.cs b/QSB/Patches/QSBPatch.cs index bafc9edb..6bdeacd5 100644 --- a/QSB/Patches/QSBPatch.cs +++ b/QSB/Patches/QSBPatch.cs @@ -1,9 +1,9 @@ namespace QSB { - public abstract class QSBPatch - { - public abstract QSBPatchTypes Type { get; } + public abstract class QSBPatch + { + public abstract QSBPatchTypes Type { get; } - public abstract void DoPatches(); - } + public abstract void DoPatches(); + } } diff --git a/QSB/Patches/QSBPatchTypes.cs b/QSB/Patches/QSBPatchTypes.cs index 53ff573d..4b2e689e 100644 --- a/QSB/Patches/QSBPatchTypes.cs +++ b/QSB/Patches/QSBPatchTypes.cs @@ -1,9 +1,9 @@ namespace QSB { - public enum QSBPatchTypes - { - OnModStart, - OnClientConnect, - OnNonServerClientConnect - } + public enum QSBPatchTypes + { + OnModStart, + OnClientConnect, + OnNonServerClientConnect + } } diff --git a/QSB/Player/Events/PlayerJoinEvent.cs b/QSB/Player/Events/PlayerJoinEvent.cs index 07bb919c..ed1fa454 100644 --- a/QSB/Player/Events/PlayerJoinEvent.cs +++ b/QSB/Player/Events/PlayerJoinEvent.cs @@ -4,36 +4,36 @@ using QSB.Utility; namespace QSB.Player.Events { - public class PlayerJoinEvent : QSBEvent - { - public override EventType Type => EventType.PlayerJoin; + public class PlayerJoinEvent : QSBEvent + { + public override EventType Type => EventType.PlayerJoin; - public override void SetupListener() => GlobalMessenger.AddListener(EventNames.QSBPlayerJoin, Handler); + public override void SetupListener() => GlobalMessenger.AddListener(EventNames.QSBPlayerJoin, Handler); - public override void CloseListener() => GlobalMessenger.RemoveListener(EventNames.QSBPlayerJoin, Handler); + public override void CloseListener() => GlobalMessenger.RemoveListener(EventNames.QSBPlayerJoin, Handler); - private void Handler(string name) => SendEvent(CreateMessage(name)); + private void Handler(string name) => SendEvent(CreateMessage(name)); - private PlayerJoinMessage CreateMessage(string name) => new PlayerJoinMessage - { - AboutId = LocalPlayerId, - PlayerName = name - }; + private PlayerJoinMessage CreateMessage(string name) => new PlayerJoinMessage + { + AboutId = LocalPlayerId, + PlayerName = name + }; - public override void OnReceiveRemote(PlayerJoinMessage message) - { - var player = QSBPlayerManager.GetPlayer(message.AboutId); - player.Name = message.PlayerName; - DebugLog.ToHud($"{player.Name} joined!"); - DebugLog.DebugWrite($"{player.Name} joined as id {player.PlayerId}", MessageType.Info); - } + public override void OnReceiveRemote(PlayerJoinMessage message) + { + var player = QSBPlayerManager.GetPlayer(message.AboutId); + player.Name = message.PlayerName; + DebugLog.ToHud($"{player.Name} joined!"); + DebugLog.DebugWrite($"{player.Name} joined as id {player.PlayerId}", MessageType.Info); + } - public override void OnReceiveLocal(PlayerJoinMessage message) - { - var player = QSBPlayerManager.GetPlayer(QSBPlayerManager.LocalPlayerId); - player.Name = message.PlayerName; - var text = $"Connected to server as {player.Name}."; - DebugLog.ToAll(text, MessageType.Info); - } - } + public override void OnReceiveLocal(PlayerJoinMessage message) + { + var player = QSBPlayerManager.GetPlayer(QSBPlayerManager.LocalPlayerId); + player.Name = message.PlayerName; + var text = $"Connected to server as {player.Name}."; + DebugLog.ToAll(text, MessageType.Info); + } + } } diff --git a/QSB/Player/Events/PlayerJoinMessage.cs b/QSB/Player/Events/PlayerJoinMessage.cs index 97a1efa3..d313e050 100644 --- a/QSB/Player/Events/PlayerJoinMessage.cs +++ b/QSB/Player/Events/PlayerJoinMessage.cs @@ -3,20 +3,20 @@ using UnityEngine.Networking; namespace QSB.Player.Events { - public class PlayerJoinMessage : PlayerMessage - { - public string PlayerName { get; set; } + public class PlayerJoinMessage : PlayerMessage + { + public string PlayerName { get; set; } - public override void Deserialize(NetworkReader reader) - { - base.Deserialize(reader); - PlayerName = reader.ReadString(); - } + public override void Deserialize(NetworkReader reader) + { + base.Deserialize(reader); + PlayerName = reader.ReadString(); + } - public override void Serialize(NetworkWriter writer) - { - base.Serialize(writer); - writer.Write(PlayerName); - } - } + public override void Serialize(NetworkWriter writer) + { + base.Serialize(writer); + writer.Write(PlayerName); + } + } } \ No newline at end of file diff --git a/QSB/Player/Events/PlayerLeaveEvent.cs b/QSB/Player/Events/PlayerLeaveEvent.cs index bf7fca67..3141e614 100644 --- a/QSB/Player/Events/PlayerLeaveEvent.cs +++ b/QSB/Player/Events/PlayerLeaveEvent.cs @@ -5,29 +5,29 @@ using System.Linq; namespace QSB.Player.Events { - public class PlayerLeaveEvent : QSBEvent - { - public override EventType Type => EventType.PlayerLeave; + public class PlayerLeaveEvent : QSBEvent + { + public override EventType Type => EventType.PlayerLeave; - public override void SetupListener() => GlobalMessenger.AddListener(EventNames.QSBPlayerLeave, Handler); + public override void SetupListener() => GlobalMessenger.AddListener(EventNames.QSBPlayerLeave, Handler); - public override void CloseListener() => GlobalMessenger.RemoveListener(EventNames.QSBPlayerLeave, Handler); + public override void CloseListener() => GlobalMessenger.RemoveListener(EventNames.QSBPlayerLeave, Handler); - private void Handler(uint playerId, uint[] netIds) => SendEvent(CreateMessage(playerId, netIds)); + private void Handler(uint playerId, uint[] netIds) => SendEvent(CreateMessage(playerId, netIds)); - private PlayerLeaveMessage CreateMessage(uint playerId, uint[] netIds) => new PlayerLeaveMessage - { - AboutId = playerId, - NetIds = netIds - }; + private PlayerLeaveMessage CreateMessage(uint playerId, uint[] netIds) => new PlayerLeaveMessage + { + AboutId = playerId, + NetIds = netIds + }; - public override void OnReceiveRemote(PlayerLeaveMessage message) - { - var playerName = QSBPlayerManager.GetPlayer(message.AboutId).Name; - DebugLog.ToAll($"{playerName} disconnected.", MessageType.Info); - QSBPlayerManager.GetPlayer(message.AboutId).HudMarker?.Remove(); - QSBPlayerManager.RemovePlayer(message.AboutId); - message.NetIds.ToList().ForEach(netId => QSBNetworkManager.Instance.CleanupNetworkBehaviour(netId)); - } - } + public override void OnReceiveRemote(PlayerLeaveMessage message) + { + var playerName = QSBPlayerManager.GetPlayer(message.AboutId).Name; + DebugLog.ToAll($"{playerName} disconnected.", MessageType.Info); + QSBPlayerManager.GetPlayer(message.AboutId).HudMarker?.Remove(); + QSBPlayerManager.RemovePlayer(message.AboutId); + message.NetIds.ToList().ForEach(netId => QSBNetworkManager.Instance.CleanupNetworkBehaviour(netId)); + } + } } diff --git a/QSB/Player/Events/PlayerLeaveMessage.cs b/QSB/Player/Events/PlayerLeaveMessage.cs index 21670043..d4c559ab 100644 --- a/QSB/Player/Events/PlayerLeaveMessage.cs +++ b/QSB/Player/Events/PlayerLeaveMessage.cs @@ -5,20 +5,20 @@ using UnityEngine.Networking; namespace QSB.Player.Events { - public class PlayerLeaveMessage : PlayerMessage - { - public uint[] NetIds { get; set; } + public class PlayerLeaveMessage : PlayerMessage + { + public uint[] NetIds { get; set; } - public override void Deserialize(NetworkReader reader) - { - base.Deserialize(reader); - NetIds = reader.ReadString().Split(',').Select(x => Convert.ToUInt32(x)).ToArray(); - } + public override void Deserialize(NetworkReader reader) + { + base.Deserialize(reader); + NetIds = reader.ReadString().Split(',').Select(x => Convert.ToUInt32(x)).ToArray(); + } - public override void Serialize(NetworkWriter writer) - { - base.Serialize(writer); - writer.Write(string.Join(",", NetIds.Select(x => x.ToString()).ToArray())); - } - } + public override void Serialize(NetworkWriter writer) + { + base.Serialize(writer); + writer.Write(string.Join(",", NetIds.Select(x => x.ToString()).ToArray())); + } + } } \ No newline at end of file diff --git a/QSB/Player/Events/PlayerReadyEvent.cs b/QSB/Player/Events/PlayerReadyEvent.cs index 14a57b30..3bc188cf 100644 --- a/QSB/Player/Events/PlayerReadyEvent.cs +++ b/QSB/Player/Events/PlayerReadyEvent.cs @@ -7,46 +7,46 @@ using System.Linq; namespace QSB.Player.Events { - public class PlayerReadyEvent : QSBEvent - { - public override EventType Type => EventType.PlayerReady; + public class PlayerReadyEvent : QSBEvent + { + public override EventType Type => EventType.PlayerReady; - public override void SetupListener() => GlobalMessenger.AddListener(EventNames.QSBPlayerReady, Handler); + public override void SetupListener() => GlobalMessenger.AddListener(EventNames.QSBPlayerReady, Handler); - public override void CloseListener() => GlobalMessenger.RemoveListener(EventNames.QSBPlayerReady, Handler); + public override void CloseListener() => GlobalMessenger.RemoveListener(EventNames.QSBPlayerReady, Handler); - private void Handler(bool ready) => SendEvent(CreateMessage(ready)); + private void Handler(bool ready) => SendEvent(CreateMessage(ready)); - private ToggleMessage CreateMessage(bool ready) => new ToggleMessage - { - AboutId = LocalPlayerId, - ToggleValue = ready - }; + private ToggleMessage CreateMessage(bool ready) => new ToggleMessage + { + AboutId = LocalPlayerId, + ToggleValue = ready + }; - public override void OnServerReceive(ToggleMessage message) - { - DebugLog.DebugWrite($"[S] Get ready event from {message.FromId}", MessageType.Success); - if (message.FromId == QSBPlayerManager.LocalPlayerId) - { - return; - } - QSBPlayerManager.GetPlayer(message.AboutId).IsReady = message.ToggleValue; - GlobalMessenger.FireEvent(EventNames.QSBServerSendPlayerStates); - } + public override void OnServerReceive(ToggleMessage message) + { + DebugLog.DebugWrite($"[S] Get ready event from {message.FromId}", MessageType.Success); + if (message.FromId == QSBPlayerManager.LocalPlayerId) + { + return; + } + QSBPlayerManager.GetPlayer(message.AboutId).IsReady = message.ToggleValue; + GlobalMessenger.FireEvent(EventNames.QSBServerSendPlayerStates); + } - public override void OnReceiveRemote(ToggleMessage message) - { - DebugLog.DebugWrite($"Get ready event from {message.FromId}", MessageType.Success); - if (!QSBPlayerManager.PlayerExists(message.FromId)) - { - DebugLog.ToConsole("Error - Got ready event for non-existent player! Did we not send a PlayerStatesRequestEvent? Or was it not handled?", MessageType.Error); - return; - } - foreach (var item in QSBPlayerManager.GetSyncObjects() - .Where(x => x != null && x.IsReady && x.ReferenceSector != null && x.PlayerId == LocalPlayerId)) - { - GlobalMessenger.FireEvent(EventNames.QSBSectorChange, item.NetId.Value, item.ReferenceSector); - } - } - } + public override void OnReceiveRemote(ToggleMessage message) + { + DebugLog.DebugWrite($"Get ready event from {message.FromId}", MessageType.Success); + if (!QSBPlayerManager.PlayerExists(message.FromId)) + { + DebugLog.ToConsole("Error - Got ready event for non-existent player! Did we not send a PlayerStatesRequestEvent? Or was it not handled?", MessageType.Error); + return; + } + foreach (var item in QSBPlayerManager.GetSyncObjects() + .Where(x => x != null && x.IsReady && x.ReferenceSector != null && x.PlayerId == LocalPlayerId)) + { + GlobalMessenger.FireEvent(EventNames.QSBSectorChange, item.NetId.Value, item.ReferenceSector); + } + } + } } diff --git a/QSB/Player/Events/PlayerSectorEvent.cs b/QSB/Player/Events/PlayerSectorEvent.cs index 784dee43..4afa1910 100644 --- a/QSB/Player/Events/PlayerSectorEvent.cs +++ b/QSB/Player/Events/PlayerSectorEvent.cs @@ -7,47 +7,47 @@ using QSB.WorldSync.Events; namespace QSB.Player.Events { - public class PlayerSectorEvent : QSBEvent - { - public override EventType Type => EventType.PlayerSectorChange; + public class PlayerSectorEvent : QSBEvent + { + public override EventType Type => EventType.PlayerSectorChange; - public override void SetupListener() - { - GlobalMessenger.AddListener(EventNames.QSBSectorChange, Handler); - } + public override void SetupListener() + { + GlobalMessenger.AddListener(EventNames.QSBSectorChange, Handler); + } - public override void CloseListener() - { - GlobalMessenger.RemoveListener(EventNames.QSBSectorChange, Handler); - } + public override void CloseListener() + { + GlobalMessenger.RemoveListener(EventNames.QSBSectorChange, Handler); + } - private void Handler(uint netId, QSBSector sector) => SendEvent(CreateMessage(netId, sector)); + private void Handler(uint netId, QSBSector sector) => SendEvent(CreateMessage(netId, sector)); - private WorldObjectMessage CreateMessage(uint netId, QSBSector sector) => new WorldObjectMessage - { - AboutId = netId, - ObjectId = sector.ObjectId - }; + private WorldObjectMessage CreateMessage(uint netId, QSBSector sector) => new WorldObjectMessage + { + AboutId = netId, + ObjectId = sector.ObjectId + }; - public override void OnReceiveRemote(WorldObjectMessage message) - { - if (!QSBSceneManager.IsInUniverse) - { - return; - } - var sector = WorldRegistry.GetObject(message.ObjectId); + public override void OnReceiveRemote(WorldObjectMessage message) + { + if (!QSBSceneManager.IsInUniverse) + { + return; + } + var sector = WorldRegistry.GetObject(message.ObjectId); - if (sector == null) - { - DebugLog.ToConsole($"Sector with order id {message.ObjectId} not found!", MessageType.Warning); - return; - } + if (sector == null) + { + DebugLog.ToConsole($"Sector with order id {message.ObjectId} not found!", MessageType.Warning); + return; + } - var transformSync = QSBPlayerManager.GetSyncObject(message.AboutId); + var transformSync = QSBPlayerManager.GetSyncObject(message.AboutId); - QSB.Helper.Events.Unity.RunWhen(() => transformSync?.SyncedTransform != null, - () => transformSync?.SetReferenceSector(sector)); - } + QSB.Helper.Events.Unity.RunWhen(() => transformSync?.SyncedTransform != null, + () => transformSync?.SetReferenceSector(sector)); + } - } + } } diff --git a/QSB/Player/Events/PlayerStateMessage.cs b/QSB/Player/Events/PlayerStateMessage.cs index b881e4c1..a1dcef64 100644 --- a/QSB/Player/Events/PlayerStateMessage.cs +++ b/QSB/Player/Events/PlayerStateMessage.cs @@ -3,32 +3,32 @@ using UnityEngine.Networking; namespace QSB.Player.Events { - public class PlayerStateMessage : PlayerMessage - { - public string PlayerName { get; set; } - public bool PlayerReady { get; set; } - public State PlayerState { get; set; } - public Sector.Name SectorID { get; set; } - public string SectorName { get; set; } + public class PlayerStateMessage : PlayerMessage + { + public string PlayerName { get; set; } + public bool PlayerReady { get; set; } + public State PlayerState { get; set; } + public Sector.Name SectorID { get; set; } + public string SectorName { get; set; } - public override void Deserialize(NetworkReader reader) - { - base.Deserialize(reader); - PlayerName = reader.ReadString(); - PlayerReady = reader.ReadBoolean(); - PlayerState = (State)reader.ReadInt32(); - SectorID = (Sector.Name)reader.ReadInt32(); - SectorName = reader.ReadString(); - } + public override void Deserialize(NetworkReader reader) + { + base.Deserialize(reader); + PlayerName = reader.ReadString(); + PlayerReady = reader.ReadBoolean(); + PlayerState = (State)reader.ReadInt32(); + SectorID = (Sector.Name)reader.ReadInt32(); + SectorName = reader.ReadString(); + } - public override void Serialize(NetworkWriter writer) - { - base.Serialize(writer); - writer.Write(PlayerName); - writer.Write(PlayerReady); - writer.Write((int)PlayerState); - writer.Write((int)SectorID); - writer.Write(SectorName); - } - } + public override void Serialize(NetworkWriter writer) + { + base.Serialize(writer); + writer.Write(PlayerName); + writer.Write(PlayerReady); + writer.Write((int)PlayerState); + writer.Write((int)SectorID); + writer.Write(SectorName); + } + } } diff --git a/QSB/Player/Events/PlayerStatesRequestEvent.cs b/QSB/Player/Events/PlayerStatesRequestEvent.cs index 1af7a0a7..30cddccc 100644 --- a/QSB/Player/Events/PlayerStatesRequestEvent.cs +++ b/QSB/Player/Events/PlayerStatesRequestEvent.cs @@ -6,30 +6,30 @@ using System.Linq; namespace QSB.Player.Events { - public class PlayerStatesRequestEvent : QSBEvent - { - public override EventType Type => EventType.PlayerStatesRequest; + public class PlayerStatesRequestEvent : QSBEvent + { + public override EventType Type => EventType.PlayerStatesRequest; - public override void SetupListener() => GlobalMessenger.AddListener(EventNames.QSBPlayerStatesRequest, Handler); + public override void SetupListener() => GlobalMessenger.AddListener(EventNames.QSBPlayerStatesRequest, Handler); - public override void CloseListener() => GlobalMessenger.RemoveListener(EventNames.QSBPlayerStatesRequest, Handler); + public override void CloseListener() => GlobalMessenger.RemoveListener(EventNames.QSBPlayerStatesRequest, Handler); - private void Handler() => SendEvent(CreateMessage()); + private void Handler() => SendEvent(CreateMessage()); - private PlayerMessage CreateMessage() => new PlayerMessage - { - AboutId = LocalPlayerId - }; + private PlayerMessage CreateMessage() => new PlayerMessage + { + AboutId = LocalPlayerId + }; - public override void OnServerReceive(PlayerMessage message) - { - DebugLog.DebugWrite($"[S] Get state request from {message.FromId}"); - GlobalMessenger.FireEvent(EventNames.QSBServerSendPlayerStates); - foreach (var item in QSBPlayerManager.GetSyncObjects() - .Where(x => x != null && x.IsReady && x.ReferenceSector != null)) - { - GlobalMessenger.FireEvent(EventNames.QSBSectorChange, item.NetId.Value, item.ReferenceSector); - } - } - } + public override void OnServerReceive(PlayerMessage message) + { + DebugLog.DebugWrite($"[S] Get state request from {message.FromId}"); + GlobalMessenger.FireEvent(EventNames.QSBServerSendPlayerStates); + foreach (var item in QSBPlayerManager.GetSyncObjects() + .Where(x => x != null && x.IsReady && x.ReferenceSector != null)) + { + GlobalMessenger.FireEvent(EventNames.QSBSectorChange, item.NetId.Value, item.ReferenceSector); + } + } + } } diff --git a/QSB/Player/Events/ServerSendPlayerStatesEvent.cs b/QSB/Player/Events/ServerSendPlayerStatesEvent.cs index ac9230bd..53d0f082 100644 --- a/QSB/Player/Events/ServerSendPlayerStatesEvent.cs +++ b/QSB/Player/Events/ServerSendPlayerStatesEvent.cs @@ -4,37 +4,37 @@ using QSB.Utility; namespace QSB.Player.Events { - public class ServerSendPlayerStatesEvent : QSBEvent - { - public override EventType Type => EventType.PlayerState; + public class ServerSendPlayerStatesEvent : QSBEvent + { + public override EventType Type => EventType.PlayerState; - public override void SetupListener() => GlobalMessenger.AddListener(EventNames.QSBServerSendPlayerStates, Handler); + public override void SetupListener() => GlobalMessenger.AddListener(EventNames.QSBServerSendPlayerStates, Handler); - public override void CloseListener() => GlobalMessenger.RemoveListener(EventNames.QSBServerSendPlayerStates, Handler); + public override void CloseListener() => GlobalMessenger.RemoveListener(EventNames.QSBServerSendPlayerStates, Handler); - private void Handler() - { - foreach (var player in QSBPlayerManager.PlayerList) - { - DebugLog.DebugWrite($" - Sending playerstate of player ID {player.PlayerId}", MessageType.Info); - SendEvent(CreateMessage(player)); - } - } + private void Handler() + { + foreach (var player in QSBPlayerManager.PlayerList) + { + DebugLog.DebugWrite($" - Sending playerstate of player ID {player.PlayerId}", MessageType.Info); + SendEvent(CreateMessage(player)); + } + } - private PlayerStateMessage CreateMessage(PlayerInfo player) => new PlayerStateMessage - { - AboutId = player.PlayerId, - PlayerName = player.Name, - PlayerReady = player.IsReady, - PlayerState = player.State - }; + private PlayerStateMessage CreateMessage(PlayerInfo player) => new PlayerStateMessage + { + AboutId = player.PlayerId, + PlayerName = player.Name, + PlayerReady = player.IsReady, + PlayerState = player.State + }; - public override void OnReceiveRemote(PlayerStateMessage message) - { - DebugLog.DebugWrite($"Received playerstate of player ID {message.AboutId}", MessageType.Info); - QSB.Helper.Events.Unity.RunWhen( - () => QSBPlayerManager.GetSyncObject(message.AboutId) != null, - () => QSBPlayerManager.HandleFullStateMessage(message)); - } - } + public override void OnReceiveRemote(PlayerStateMessage message) + { + DebugLog.DebugWrite($"Received playerstate of player ID {message.AboutId}", MessageType.Info); + QSB.Helper.Events.Unity.RunWhen( + () => QSBPlayerManager.GetSyncObject(message.AboutId) != null, + () => QSBPlayerManager.HandleFullStateMessage(message)); + } + } } diff --git a/QSB/Player/PlayerHUDMarker.cs b/QSB/Player/PlayerHUDMarker.cs index afc3a167..61ea6f4f 100644 --- a/QSB/Player/PlayerHUDMarker.cs +++ b/QSB/Player/PlayerHUDMarker.cs @@ -2,58 +2,58 @@ namespace QSB.Player { - public class PlayerHUDMarker : HUDDistanceMarker - { - private PlayerInfo _player; - private bool _isReady; + public class PlayerHUDMarker : HUDDistanceMarker + { + private PlayerInfo _player; + private bool _isReady; - protected override void InitCanvasMarker() - { - _markerRadius = 2f; + protected override void InitCanvasMarker() + { + _markerRadius = 2f; - _markerTarget = new GameObject().transform; - _markerTarget.parent = transform; + _markerTarget = new GameObject().transform; + _markerTarget.parent = transform; - _markerTarget.localPosition = Vector3.up * 2; - } + _markerTarget.localPosition = Vector3.up * 2; + } - public void Init(PlayerInfo player) - { - _player = player; - _player.HudMarker = this; - _isReady = true; - } + public void Init(PlayerInfo player) + { + _player = player; + _player.HudMarker = this; + _isReady = true; + } - protected override void RefreshOwnVisibility() - { - if (_canvasMarker != null) - { - _canvasMarker.SetVisibility(true); - } - } + protected override void RefreshOwnVisibility() + { + if (_canvasMarker != null) + { + _canvasMarker.SetVisibility(true); + } + } - private void Update() - { - if (!_isReady || !_player.IsReady) - { - return; - } - _markerLabel = _player.Name.ToUpper(); - _isReady = false; + private void Update() + { + if (!_isReady || !_player.IsReady) + { + return; + } + _markerLabel = _player.Name.ToUpper(); + _isReady = false; - base.InitCanvasMarker(); - } + base.InitCanvasMarker(); + } - public void Remove() - { - // do N O T destroy the parent - it completely breaks the ENTIRE GAME - if (_canvasMarker?.gameObject != null) - { - _canvasMarker.DestroyMarker(); - } - Destroy(_markerTarget.gameObject); - Destroy(this); - } + public void Remove() + { + // do N O T destroy the parent - it completely breaks the ENTIRE GAME + if (_canvasMarker?.gameObject != null) + { + _canvasMarker.DestroyMarker(); + } + Destroy(_markerTarget.gameObject); + Destroy(this); + } - } + } } diff --git a/QSB/Player/PlayerInfo.cs b/QSB/Player/PlayerInfo.cs index 22c1bffb..d0cd0108 100644 --- a/QSB/Player/PlayerInfo.cs +++ b/QSB/Player/PlayerInfo.cs @@ -6,78 +6,78 @@ using UnityEngine; namespace QSB.Player { - public class PlayerInfo - { - public uint PlayerId { get; } - public string Name { get; set; } - public bool IsReady { get; set; } - public PlayerHUDMarker HudMarker { get; set; } - public State State { get; set; } + public class PlayerInfo + { + public uint PlayerId { get; } + public string Name { get; set; } + public bool IsReady { get; set; } + public PlayerHUDMarker HudMarker { get; set; } + public State State { get; set; } - // Body Objects - public GameObject Camera { get; set; } - public GameObject Body { get; set; } + // Body Objects + public GameObject Camera { get; set; } + public GameObject Body { get; set; } - // Tools - public GameObject ProbeBody { get; set; } - public QSBProbe Probe { get; set; } - public QSBFlashlight FlashLight => Camera?.GetComponentInChildren(); - public QSBTool Signalscope => GetToolByType(ToolType.Signalscope); - public QSBTool Translator => GetToolByType(ToolType.Translator); - public QSBTool ProbeLauncher => GetToolByType(ToolType.ProbeLauncher); + // Tools + public GameObject ProbeBody { get; set; } + public QSBProbe Probe { get; set; } + public QSBFlashlight FlashLight => Camera?.GetComponentInChildren(); + public QSBTool Signalscope => GetToolByType(ToolType.Signalscope); + public QSBTool Translator => GetToolByType(ToolType.Translator); + public QSBTool ProbeLauncher => GetToolByType(ToolType.ProbeLauncher); - // Conversation - public int CurrentDialogueID { get; set; } - public GameObject CurrentDialogueBox { get; set; } + // Conversation + public int CurrentDialogueID { get; set; } + public GameObject CurrentDialogueBox { get; set; } - // Animation - public AnimationSync AnimationSync => QSBPlayerManager.GetSyncObject(PlayerId); - public bool PlayingInstrument => AnimationSync.CurrentType != AnimationType.PlayerSuited - && AnimationSync.CurrentType != AnimationType.PlayerUnsuited; + // Animation + public AnimationSync AnimationSync => QSBPlayerManager.GetSyncObject(PlayerId); + public bool PlayingInstrument => AnimationSync.CurrentType != AnimationType.PlayerSuited + && AnimationSync.CurrentType != AnimationType.PlayerUnsuited; - public PlayerInfo(uint id) - { - PlayerId = id; - CurrentDialogueID = -1; - } + public PlayerInfo(uint id) + { + PlayerId = id; + CurrentDialogueID = -1; + } - public void UpdateState(State state, bool value) - { - var states = State; - if (value) - { - FlagsHelper.Set(ref states, state); - } - else - { - FlagsHelper.Unset(ref states, state); - } - State = states; - } + public void UpdateState(State state, bool value) + { + var states = State; + if (value) + { + FlagsHelper.Set(ref states, state); + } + else + { + FlagsHelper.Unset(ref states, state); + } + State = states; + } - public void UpdateStateObjects() - { - if (OWInput.GetInputMode() == InputMode.None) - { - return; - } - FlashLight?.UpdateState(FlagsHelper.IsSet(State, State.Flashlight)); - Translator?.ChangeEquipState(FlagsHelper.IsSet(State, State.Translator)); - ProbeLauncher?.ChangeEquipState(FlagsHelper.IsSet(State, State.ProbeLauncher)); - Signalscope?.ChangeEquipState(FlagsHelper.IsSet(State, State.Signalscope)); - QSB.Helper.Events.Unity.RunWhen(() => QSBPlayerManager.GetSyncObject(PlayerId) != null, - () => QSBPlayerManager.GetSyncObject(PlayerId).SetSuitState(FlagsHelper.IsSet(State, State.Suit))); - } + public void UpdateStateObjects() + { + if (OWInput.GetInputMode() == InputMode.None) + { + return; + } + FlashLight?.UpdateState(FlagsHelper.IsSet(State, State.Flashlight)); + Translator?.ChangeEquipState(FlagsHelper.IsSet(State, State.Translator)); + ProbeLauncher?.ChangeEquipState(FlagsHelper.IsSet(State, State.ProbeLauncher)); + Signalscope?.ChangeEquipState(FlagsHelper.IsSet(State, State.Signalscope)); + QSB.Helper.Events.Unity.RunWhen(() => QSBPlayerManager.GetSyncObject(PlayerId) != null, + () => QSBPlayerManager.GetSyncObject(PlayerId).SetSuitState(FlagsHelper.IsSet(State, State.Suit))); + } - public bool GetState(State state) - { - return FlagsHelper.IsSet(State, state); - } + public bool GetState(State state) + { + return FlagsHelper.IsSet(State, state); + } - private QSBTool GetToolByType(ToolType type) - { - return Camera?.GetComponentsInChildren() - .FirstOrDefault(x => x.Type == type); - } - } + private QSBTool GetToolByType(ToolType type) + { + return Camera?.GetComponentsInChildren() + .FirstOrDefault(x => x.Type == type); + } + } } \ No newline at end of file diff --git a/QSB/Player/PlayerSyncObject.cs b/QSB/Player/PlayerSyncObject.cs index 8fd840fb..4933c6b2 100644 --- a/QSB/Player/PlayerSyncObject.cs +++ b/QSB/Player/PlayerSyncObject.cs @@ -1,5 +1,4 @@ using QSB.QuantumUNET; -using UnityEngine.Networking; namespace QSB.Player { diff --git a/QSB/Player/QSBPlayerManager.cs b/QSB/Player/QSBPlayerManager.cs index aa359d02..6b2ee5da 100644 --- a/QSB/Player/QSBPlayerManager.cs +++ b/QSB/Player/QSBPlayerManager.cs @@ -5,7 +5,6 @@ using QSB.TransformSync; using QSB.Utility; using System.Collections.Generic; using System.Linq; -using UnityEngine.Networking; namespace QSB.Player { diff --git a/QSB/Player/State.cs b/QSB/Player/State.cs index d0217277..49b666ab 100644 --- a/QSB/Player/State.cs +++ b/QSB/Player/State.cs @@ -2,16 +2,16 @@ namespace QSB.Player { - [Flags] - public enum State - { - None = 0, - Flashlight = 1, - Suit = 2, - ProbeLauncher = 4, - Signalscope = 8, - Translator = 16, - ProbeActive = 32 - //Increment these in binary to add more states - } + [Flags] + public enum State + { + None = 0, + Flashlight = 1, + Suit = 2, + ProbeLauncher = 4, + Signalscope = 8, + Translator = 16, + ProbeActive = 32 + //Increment these in binary to add more states + } } \ No newline at end of file diff --git a/QSB/QSBNetworkManager.cs b/QSB/QSBNetworkManager.cs index 183b7cf8..7628d40e 100644 --- a/QSB/QSBNetworkManager.cs +++ b/QSB/QSBNetworkManager.cs @@ -80,7 +80,7 @@ namespace QSB _probePrefab = _assetBundle.LoadAsset("assets/networkprobe.prefab"); ident = _probePrefab.AddComponent(); ident.LocalPlayerAuthority = true; - ident.SetValue("m_AssetId",_probePrefab.GetComponent().assetId); + ident.SetValue("m_AssetId", _probePrefab.GetComponent().assetId); ident.SetValue("m_SceneId", _probePrefab.GetComponent().sceneId); _probePrefab.AddComponent(); spawnPrefabs.Add(_probePrefab); diff --git a/QSB/QuantumUNET/QSBCRCMessage.cs b/QSB/QuantumUNET/QSBCRCMessage.cs index a1936e92..229de0ba 100644 --- a/QSB/QuantumUNET/QSBCRCMessage.cs +++ b/QSB/QuantumUNET/QSBCRCMessage.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using UnityEngine.Networking; +using UnityEngine.Networking; namespace QSB.QuantumUNET { diff --git a/QSB/QuantumUNET/QSBCRCMessageEntry.cs b/QSB/QuantumUNET/QSBCRCMessageEntry.cs index 5a78c51a..54cdc56a 100644 --- a/QSB/QuantumUNET/QSBCRCMessageEntry.cs +++ b/QSB/QuantumUNET/QSBCRCMessageEntry.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace QSB.QuantumUNET +namespace QSB.QuantumUNET { struct QSBCRCMessageEntry { diff --git a/QSB/QuantumUNET/QSBChannelBuffer.cs b/QSB/QuantumUNET/QSBChannelBuffer.cs index 51f9dd4b..0c6d3d13 100644 --- a/QSB/QuantumUNET/QSBChannelBuffer.cs +++ b/QSB/QuantumUNET/QSBChannelBuffer.cs @@ -1,7 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; using UnityEngine; using UnityEngine.Networking; diff --git a/QSB/QuantumUNET/QSBChannelPacket.cs b/QSB/QuantumUNET/QSBChannelPacket.cs index 51b79d5d..abc9c279 100644 --- a/QSB/QuantumUNET/QSBChannelPacket.cs +++ b/QSB/QuantumUNET/QSBChannelPacket.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using UnityEngine; using UnityEngine.Networking; diff --git a/QSB/QuantumUNET/QSBClientAuthorityMessage.cs b/QSB/QuantumUNET/QSBClientAuthorityMessage.cs index 2c6c577f..50f8dc9c 100644 --- a/QSB/QuantumUNET/QSBClientAuthorityMessage.cs +++ b/QSB/QuantumUNET/QSBClientAuthorityMessage.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using UnityEngine.Networking; +using UnityEngine.Networking; namespace QSB.QuantumUNET { diff --git a/QSB/QuantumUNET/QSBClientScene.cs b/QSB/QuantumUNET/QSBClientScene.cs index 85c13a8f..10c0a033 100644 --- a/QSB/QuantumUNET/QSBClientScene.cs +++ b/QSB/QuantumUNET/QSBClientScene.cs @@ -1,9 +1,6 @@ using QSB.Animation; using QSB.Utility; -using System; using System.Collections.Generic; -using System.Linq; -using System.Text; using UnityEngine; using UnityEngine.Networking; using UnityEngine.Networking.NetworkSystem; diff --git a/QSB/QuantumUNET/QSBLocalClient.cs b/QSB/QuantumUNET/QSBLocalClient.cs index 55512ec7..cd2fb412 100644 --- a/QSB/QuantumUNET/QSBLocalClient.cs +++ b/QSB/QuantumUNET/QSBLocalClient.cs @@ -1,8 +1,4 @@ -using QSB.Utility; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Collections.Generic; using UnityEngine; using UnityEngine.Networking; diff --git a/QSB/QuantumUNET/QSBNetBuffer.cs b/QSB/QuantumUNET/QSBNetBuffer.cs index 96f01318..9b58625b 100644 --- a/QSB/QuantumUNET/QSBNetBuffer.cs +++ b/QSB/QuantumUNET/QSBNetBuffer.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using UnityEngine; namespace QSB.QuantumUNET diff --git a/QSB/QuantumUNET/QSBNetworkBehaviour.cs b/QSB/QuantumUNET/QSBNetworkBehaviour.cs index 78c08f0f..87b6603e 100644 --- a/QSB/QuantumUNET/QSBNetworkBehaviour.cs +++ b/QSB/QuantumUNET/QSBNetworkBehaviour.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.ComponentModel; using System.Net.Sockets; using UnityEngine; using UnityEngine.Networking; @@ -212,16 +211,16 @@ namespace QSB.QuantumUNET return result; } - internal static bool GetInvokerForHashCommand(int cmdHash, out Type invokeClass, out CmdDelegate invokeFunction) + internal static bool GetInvokerForHashCommand(int cmdHash, out Type invokeClass, out CmdDelegate invokeFunction) => GetInvokerForHash(cmdHash, UNetInvokeType.Command, out invokeClass, out invokeFunction); - internal static bool GetInvokerForHashClientRpc(int cmdHash, out Type invokeClass, out CmdDelegate invokeFunction) + internal static bool GetInvokerForHashClientRpc(int cmdHash, out Type invokeClass, out CmdDelegate invokeFunction) => GetInvokerForHash(cmdHash, UNetInvokeType.ClientRpc, out invokeClass, out invokeFunction); - internal static bool GetInvokerForHashSyncList(int cmdHash, out Type invokeClass, out CmdDelegate invokeFunction) + internal static bool GetInvokerForHashSyncList(int cmdHash, out Type invokeClass, out CmdDelegate invokeFunction) => GetInvokerForHash(cmdHash, UNetInvokeType.SyncList, out invokeClass, out invokeFunction); - internal static bool GetInvokerForHashSyncEvent(int cmdHash, out Type invokeClass, out CmdDelegate invokeFunction) + internal static bool GetInvokerForHashSyncEvent(int cmdHash, out Type invokeClass, out CmdDelegate invokeFunction) => GetInvokerForHash(cmdHash, UNetInvokeType.SyncEvent, out invokeClass, out invokeFunction); private static bool GetInvokerForHash(int cmdHash, UNetInvokeType invokeType, out Type invokeClass, out CmdDelegate invokeFunction) @@ -276,7 +275,7 @@ namespace QSB.QuantumUNET } } - internal bool ContainsCommandDelegate(int cmdHash) + internal bool ContainsCommandDelegate(int cmdHash) => s_CmdHandlerDelegates.ContainsKey(cmdHash); internal bool InvokeCommandDelegate(int cmdHash, NetworkReader reader) @@ -425,16 +424,16 @@ namespace QSB.QuantumUNET return result; } - internal static string GetCmdHashCmdName(int cmdHash) + internal static string GetCmdHashCmdName(int cmdHash) => GetCmdHashPrefixName(cmdHash, "InvokeCmd"); - internal static string GetCmdHashRpcName(int cmdHash) + internal static string GetCmdHashRpcName(int cmdHash) => GetCmdHashPrefixName(cmdHash, "InvokeRpc"); - internal static string GetCmdHashEventName(int cmdHash) + internal static string GetCmdHashEventName(int cmdHash) => GetCmdHashPrefixName(cmdHash, "InvokeSyncEvent"); - internal static string GetCmdHashListName(int cmdHash) + internal static string GetCmdHashListName(int cmdHash) => GetCmdHashPrefixName(cmdHash, "InvokeSyncList"); protected void SetSyncVarGameObject(GameObject newGameObject, ref GameObject gameObjectField, uint dirtyBit, ref NetworkInstanceId netIdField) diff --git a/QSB/QuantumUNET/QSBNetworkCRC.cs b/QSB/QuantumUNET/QSBNetworkCRC.cs index 4789a49b..d45f248b 100644 --- a/QSB/QuantumUNET/QSBNetworkCRC.cs +++ b/QSB/QuantumUNET/QSBNetworkCRC.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Reflection; -using System.Text; using UnityEngine; using UnityEngine.Networking; diff --git a/QSB/QuantumUNET/QSBNetworkClient.cs b/QSB/QuantumUNET/QSBNetworkClient.cs index 2ddd54f1..b9644ec0 100644 --- a/QSB/QuantumUNET/QSBNetworkClient.cs +++ b/QSB/QuantumUNET/QSBNetworkClient.cs @@ -1,10 +1,8 @@ using QSB.Utility; using System; using System.Collections.Generic; -using System.Linq; using System.Net; using System.Net.Sockets; -using System.Text; using UnityEngine; using UnityEngine.Networking; using UnityEngine.Networking.Match; diff --git a/QSB/QuantumUNET/QSBNetworkConnection.cs b/QSB/QuantumUNET/QSBNetworkConnection.cs index 2de09d46..b3c5969a 100644 --- a/QSB/QuantumUNET/QSBNetworkConnection.cs +++ b/QSB/QuantumUNET/QSBNetworkConnection.cs @@ -1,7 +1,5 @@ -using QSB.QuantumUNET; -using System; +using System; using System.Collections.Generic; -using System.Linq; using System.Text; using UnityEngine; using UnityEngine.Networking; diff --git a/QSB/QuantumUNET/QSBNetworkIdentity.cs b/QSB/QuantumUNET/QSBNetworkIdentity.cs index f1af937f..a9a1136b 100644 --- a/QSB/QuantumUNET/QSBNetworkIdentity.cs +++ b/QSB/QuantumUNET/QSBNetworkIdentity.cs @@ -1,10 +1,9 @@ -using System; +using QSB.Utility; +using System; using System.Collections.Generic; using System.Collections.ObjectModel; using UnityEngine; using UnityEngine.Networking; -using OWML.ModHelper.Events; -using QSB.Utility; namespace QSB.QuantumUNET { @@ -87,7 +86,7 @@ namespace QSB.QuantumUNET } } - + public ReadOnlyCollection Observers { diff --git a/QSB/QuantumUNET/QSBNetworkManagerHUD.cs b/QSB/QuantumUNET/QSBNetworkManagerHUD.cs index 3fda872e..a8fc64f8 100644 --- a/QSB/QuantumUNET/QSBNetworkManagerHUD.cs +++ b/QSB/QuantumUNET/QSBNetworkManagerHUD.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Collections.Generic; using UnityEngine; using UnityEngine.Networking.Match; diff --git a/QSB/QuantumUNET/QSBNetworkManagerUNET.cs b/QSB/QuantumUNET/QSBNetworkManagerUNET.cs index 2aebddc4..14fe264a 100644 --- a/QSB/QuantumUNET/QSBNetworkManagerUNET.cs +++ b/QSB/QuantumUNET/QSBNetworkManagerUNET.cs @@ -2,9 +2,7 @@ using QSB.Utility; using System; using System.Collections.Generic; -using System.Linq; using System.Net; -using System.Text; using UnityEngine; using UnityEngine.Networking; using UnityEngine.Networking.Match; diff --git a/QSB/QuantumUNET/QSBNetworkMessage.cs b/QSB/QuantumUNET/QSBNetworkMessage.cs index 2b7d6e50..214fa5e7 100644 --- a/QSB/QuantumUNET/QSBNetworkMessage.cs +++ b/QSB/QuantumUNET/QSBNetworkMessage.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using UnityEngine.Networking; namespace QSB.QuantumUNET diff --git a/QSB/QuantumUNET/QSBNetworkMessageDelegate.cs b/QSB/QuantumUNET/QSBNetworkMessageDelegate.cs index 8dc3b7fb..c52bcf40 100644 --- a/QSB/QuantumUNET/QSBNetworkMessageDelegate.cs +++ b/QSB/QuantumUNET/QSBNetworkMessageDelegate.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace QSB.QuantumUNET +namespace QSB.QuantumUNET { public delegate void QSBNetworkMessageDelegate(QSBNetworkMessage netMsg); } diff --git a/QSB/QuantumUNET/QSBNetworkMessageHandlers.cs b/QSB/QuantumUNET/QSBNetworkMessageHandlers.cs index 4727f151..96aa1c4e 100644 --- a/QSB/QuantumUNET/QSBNetworkMessageHandlers.cs +++ b/QSB/QuantumUNET/QSBNetworkMessageHandlers.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Collections.Generic; using UnityEngine; namespace QSB.QuantumUNET diff --git a/QSB/QuantumUNET/QSBNetworkMigrationManager.cs b/QSB/QuantumUNET/QSBNetworkMigrationManager.cs index 4414eb1b..36e1b941 100644 --- a/QSB/QuantumUNET/QSBNetworkMigrationManager.cs +++ b/QSB/QuantumUNET/QSBNetworkMigrationManager.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Collections.Generic; using UnityEngine; using UnityEngine.Networking; using UnityEngine.Networking.Match; diff --git a/QSB/QuantumUNET/QSBNetworkScene.cs b/QSB/QuantumUNET/QSBNetworkScene.cs index 16c2e2ec..6dd02f64 100644 --- a/QSB/QuantumUNET/QSBNetworkScene.cs +++ b/QSB/QuantumUNET/QSBNetworkScene.cs @@ -1,8 +1,5 @@ using QSB.Utility; -using System; using System.Collections.Generic; -using System.Linq; -using System.Text; using UnityEngine; using UnityEngine.Networking; diff --git a/QSB/QuantumUNET/QSBNetworkServer.cs b/QSB/QuantumUNET/QSBNetworkServer.cs index 64710599..d595ee93 100644 --- a/QSB/QuantumUNET/QSBNetworkServer.cs +++ b/QSB/QuantumUNET/QSBNetworkServer.cs @@ -4,8 +4,6 @@ using QSB.Utility; using System; using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Linq; -using System.Text; using UnityEngine; using UnityEngine.Networking; using UnityEngine.Networking.Match; diff --git a/QSB/QuantumUNET/QSBNetworkServerSimple.cs b/QSB/QuantumUNET/QSBNetworkServerSimple.cs index 2474817e..cccd2228 100644 --- a/QSB/QuantumUNET/QSBNetworkServerSimple.cs +++ b/QSB/QuantumUNET/QSBNetworkServerSimple.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Linq; -using System.Text; using UnityEngine; using UnityEngine.Networking; using UnityEngine.Networking.Types; diff --git a/QSB/QuantumUNET/QSBObjectDestroyMessage.cs b/QSB/QuantumUNET/QSBObjectDestroyMessage.cs index 31e2a70d..d2cacca6 100644 --- a/QSB/QuantumUNET/QSBObjectDestroyMessage.cs +++ b/QSB/QuantumUNET/QSBObjectDestroyMessage.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using UnityEngine.Networking; +using UnityEngine.Networking; namespace QSB.QuantumUNET { diff --git a/QSB/QuantumUNET/QSBObjectSpawnFinishedMessage.cs b/QSB/QuantumUNET/QSBObjectSpawnFinishedMessage.cs index bc4f6c16..8ee726cb 100644 --- a/QSB/QuantumUNET/QSBObjectSpawnFinishedMessage.cs +++ b/QSB/QuantumUNET/QSBObjectSpawnFinishedMessage.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using UnityEngine.Networking; +using UnityEngine.Networking; namespace QSB.QuantumUNET { diff --git a/QSB/QuantumUNET/QSBObjectSpawnMessage.cs b/QSB/QuantumUNET/QSBObjectSpawnMessage.cs index 2c64812d..598fac9e 100644 --- a/QSB/QuantumUNET/QSBObjectSpawnMessage.cs +++ b/QSB/QuantumUNET/QSBObjectSpawnMessage.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using UnityEngine; +using UnityEngine; using UnityEngine.Networking; namespace QSB.QuantumUNET diff --git a/QSB/QuantumUNET/QSBObjectSpawnSceneMessage.cs b/QSB/QuantumUNET/QSBObjectSpawnSceneMessage.cs index 06aa75e0..794a7996 100644 --- a/QSB/QuantumUNET/QSBObjectSpawnSceneMessage.cs +++ b/QSB/QuantumUNET/QSBObjectSpawnSceneMessage.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using UnityEngine; +using UnityEngine; using UnityEngine.Networking; namespace QSB.QuantumUNET diff --git a/QSB/QuantumUNET/QSBOwnerMessage.cs b/QSB/QuantumUNET/QSBOwnerMessage.cs index b3e734f1..043ace3f 100644 --- a/QSB/QuantumUNET/QSBOwnerMessage.cs +++ b/QSB/QuantumUNET/QSBOwnerMessage.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using UnityEngine.Networking; +using UnityEngine.Networking; namespace QSB.QuantumUNET { diff --git a/QSB/QuantumUNET/QSBRemovePlayerMessage.cs b/QSB/QuantumUNET/QSBRemovePlayerMessage.cs index e651721f..4f352b21 100644 --- a/QSB/QuantumUNET/QSBRemovePlayerMessage.cs +++ b/QSB/QuantumUNET/QSBRemovePlayerMessage.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using UnityEngine.Networking; +using UnityEngine.Networking; namespace QSB.QuantumUNET { diff --git a/QSB/QuantumUNET/QSBULocalConnectionToClient.cs b/QSB/QuantumUNET/QSBULocalConnectionToClient.cs index 080296df..1f018ba1 100644 --- a/QSB/QuantumUNET/QSBULocalConnectionToClient.cs +++ b/QSB/QuantumUNET/QSBULocalConnectionToClient.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using UnityEngine.Networking; +using UnityEngine.Networking; namespace QSB.QuantumUNET { diff --git a/QSB/QuantumUNET/QSBUtility.cs b/QSB/QuantumUNET/QSBUtility.cs index 03fa1362..2165abe7 100644 --- a/QSB/QuantumUNET/QSBUtility.cs +++ b/QSB/QuantumUNET/QSBUtility.cs @@ -1,7 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; using UnityEngine; using UnityEngine.Networking.Types; diff --git a/QSB/SectorSync/QSBSector.cs b/QSB/SectorSync/QSBSector.cs index 8634d445..1b39882e 100644 --- a/QSB/SectorSync/QSBSector.cs +++ b/QSB/SectorSync/QSBSector.cs @@ -3,18 +3,18 @@ using UnityEngine; namespace QSB.SectorSync { - public class QSBSector : WorldObject - { - public Sector Sector { get; private set; } - public Sector.Name Type => Sector.GetName(); - public string Name => Sector.name; - public Transform Transform => Sector.transform; - public Vector3 Position => Transform.position; + public class QSBSector : WorldObject + { + public Sector Sector { get; private set; } + public Sector.Name Type => Sector.GetName(); + public string Name => Sector.name; + public Transform Transform => Sector.transform; + public Vector3 Position => Transform.position; - public void Init(Sector sector, int id) - { - Sector = sector; - ObjectId = id; - } - } + public void Init(Sector sector, int id) + { + Sector = sector; + ObjectId = id; + } + } } diff --git a/QSB/SectorSync/QSBSectorManager.cs b/QSB/SectorSync/QSBSectorManager.cs index 504c8dba..771643b0 100644 --- a/QSB/SectorSync/QSBSectorManager.cs +++ b/QSB/SectorSync/QSBSectorManager.cs @@ -6,48 +6,48 @@ using UnityEngine; namespace QSB.SectorSync { - public class QSBSectorManager : MonoBehaviour - { - public static QSBSectorManager Instance { get; private set; } + public class QSBSectorManager : MonoBehaviour + { + public static QSBSectorManager Instance { get; private set; } - public bool IsReady { get; private set; } + public bool IsReady { get; private set; } - private readonly Sector.Name[] _sectorBlacklist = - { - Sector.Name.Ship - }; + private readonly Sector.Name[] _sectorBlacklist = + { + Sector.Name.Ship + }; - private void Awake() - { - Instance = this; - QSBSceneManager.OnUniverseSceneLoaded += (OWScene scene) => RebuildSectors(); - DebugLog.DebugWrite("Sector Manager ready.", MessageType.Success); - } - private void OnDestroy() - { - QSBSceneManager.OnUniverseSceneLoaded -= (OWScene scene) => RebuildSectors(); - } + private void Awake() + { + Instance = this; + QSBSceneManager.OnUniverseSceneLoaded += (OWScene scene) => RebuildSectors(); + DebugLog.DebugWrite("Sector Manager ready.", MessageType.Success); + } + private void OnDestroy() + { + QSBSceneManager.OnUniverseSceneLoaded -= (OWScene scene) => RebuildSectors(); + } - public void RebuildSectors() - { - DebugLog.DebugWrite("Rebuilding sectors...", MessageType.Warning); - WorldRegistry.RemoveObjects(); - var sectors = Resources.FindObjectsOfTypeAll().ToList(); - for (var id = 0; id < sectors.Count; id++) - { - var qsbSector = WorldRegistry.GetObject(id) ?? new QSBSector(); - qsbSector.Init(sectors[id], id); - WorldRegistry.AddObject(qsbSector); - } - IsReady = WorldRegistry.GetObjects().Any(); - } + public void RebuildSectors() + { + DebugLog.DebugWrite("Rebuilding sectors...", MessageType.Warning); + WorldRegistry.RemoveObjects(); + var sectors = Resources.FindObjectsOfTypeAll().ToList(); + for (var id = 0; id < sectors.Count; id++) + { + var qsbSector = WorldRegistry.GetObject(id) ?? new QSBSector(); + qsbSector.Init(sectors[id], id); + WorldRegistry.AddObject(qsbSector); + } + IsReady = WorldRegistry.GetObjects().Any(); + } - public QSBSector GetClosestSector(Transform trans) - { - return WorldRegistry.GetObjects() - .Where(sector => sector.Sector != null && !_sectorBlacklist.Contains(sector.Type)) - .OrderBy(sector => Vector3.Distance(sector.Position, trans.position)) - .First(); - } - } + public QSBSector GetClosestSector(Transform trans) + { + return WorldRegistry.GetObjects() + .Where(sector => sector.Sector != null && !_sectorBlacklist.Contains(sector.Type)) + .OrderBy(sector => Vector3.Distance(sector.Position, trans.position)) + .First(); + } + } } diff --git a/QSB/SectorSync/SectorSync.cs b/QSB/SectorSync/SectorSync.cs index 66950ee8..18f46889 100644 --- a/QSB/SectorSync/SectorSync.cs +++ b/QSB/SectorSync/SectorSync.cs @@ -5,45 +5,45 @@ using UnityEngine; namespace QSB.SectorSync { - public class SectorSync : MonoBehaviour - { - private const float CheckInterval = 0.5f; - private float _checkTimer = CheckInterval; + public class SectorSync : MonoBehaviour + { + private const float CheckInterval = 0.5f; + private float _checkTimer = CheckInterval; - private void Update() - { - if (!QSBSectorManager.Instance.IsReady) - { - return; - } - _checkTimer += Time.unscaledDeltaTime; - if (_checkTimer < CheckInterval) - { - return; - } - QSBPlayerManager.GetSyncObjects().Where(x => x.HasAuthority).ToList().ForEach(CheckTransformSyncSector); - _checkTimer = 0; - } + private void Update() + { + if (!QSBSectorManager.Instance.IsReady) + { + return; + } + _checkTimer += Time.unscaledDeltaTime; + if (_checkTimer < CheckInterval) + { + return; + } + QSBPlayerManager.GetSyncObjects().Where(x => x.HasAuthority).ToList().ForEach(CheckTransformSyncSector); + _checkTimer = 0; + } - private void CheckTransformSyncSector(TransformSync.TransformSync transformSync) - { - var syncedTransform = transformSync.SyncedTransform; - if (syncedTransform == null || syncedTransform.position == Vector3.zero) - { - return; - } - var closestSector = QSBSectorManager.Instance.GetClosestSector(syncedTransform); - if (closestSector == transformSync.ReferenceSector) - { - return; - } - transformSync.SetReferenceSector(closestSector); - SendSector(transformSync.NetId.Value, closestSector); - } + private void CheckTransformSyncSector(TransformSync.TransformSync transformSync) + { + var syncedTransform = transformSync.SyncedTransform; + if (syncedTransform == null || syncedTransform.position == Vector3.zero) + { + return; + } + var closestSector = QSBSectorManager.Instance.GetClosestSector(syncedTransform); + if (closestSector == transformSync.ReferenceSector) + { + return; + } + transformSync.SetReferenceSector(closestSector); + SendSector(transformSync.NetId.Value, closestSector); + } - private void SendSector(uint id, QSBSector sector) - { - GlobalMessenger.FireEvent(EventNames.QSBSectorChange, id, sector); - } - } + private void SendSector(uint id, QSBSector sector) + { + GlobalMessenger.FireEvent(EventNames.QSBSectorChange, id, sector); + } + } } diff --git a/QSB/TimeSync/Events/ServerTimeEvent.cs b/QSB/TimeSync/Events/ServerTimeEvent.cs index c3829b76..77d9364a 100644 --- a/QSB/TimeSync/Events/ServerTimeEvent.cs +++ b/QSB/TimeSync/Events/ServerTimeEvent.cs @@ -2,26 +2,26 @@ namespace QSB.TimeSync.Events { - public class ServerTimeEvent : QSBEvent - { - public override EventType Type => EventType.ServerTime; + public class ServerTimeEvent : QSBEvent + { + public override EventType Type => EventType.ServerTime; - public override void SetupListener() => GlobalMessenger.AddListener(EventNames.QSBServerTime, Handler); + public override void SetupListener() => GlobalMessenger.AddListener(EventNames.QSBServerTime, Handler); - public override void CloseListener() => GlobalMessenger.RemoveListener(EventNames.QSBServerTime, Handler); + public override void CloseListener() => GlobalMessenger.RemoveListener(EventNames.QSBServerTime, Handler); - private void Handler(float time, int count) => SendEvent(CreateMessage(time, count)); + private void Handler(float time, int count) => SendEvent(CreateMessage(time, count)); - private ServerTimeMessage CreateMessage(float time, int count) => new ServerTimeMessage - { - AboutId = LocalPlayerId, - ServerTime = time, - LoopCount = count - }; + private ServerTimeMessage CreateMessage(float time, int count) => new ServerTimeMessage + { + AboutId = LocalPlayerId, + ServerTime = time, + LoopCount = count + }; - public override void OnReceiveRemote(ServerTimeMessage message) - { - WakeUpSync.LocalInstance.OnClientReceiveMessage(message); - } - } + public override void OnReceiveRemote(ServerTimeMessage message) + { + WakeUpSync.LocalInstance.OnClientReceiveMessage(message); + } + } } diff --git a/QSB/TimeSync/Events/ServerTimeMessage.cs b/QSB/TimeSync/Events/ServerTimeMessage.cs index 9831ed72..8f31071a 100644 --- a/QSB/TimeSync/Events/ServerTimeMessage.cs +++ b/QSB/TimeSync/Events/ServerTimeMessage.cs @@ -3,23 +3,23 @@ using UnityEngine.Networking; namespace QSB.TimeSync.Events { - public class ServerTimeMessage : PlayerMessage - { - public float ServerTime { get; set; } - public int LoopCount { get; set; } + public class ServerTimeMessage : PlayerMessage + { + public float ServerTime { get; set; } + public int LoopCount { get; set; } - public override void Deserialize(NetworkReader reader) - { - base.Deserialize(reader); - ServerTime = reader.ReadSingle(); - LoopCount = reader.ReadInt16(); - } + public override void Deserialize(NetworkReader reader) + { + base.Deserialize(reader); + ServerTime = reader.ReadSingle(); + LoopCount = reader.ReadInt16(); + } - public override void Serialize(NetworkWriter writer) - { - base.Serialize(writer); - writer.Write(ServerTime); - writer.Write(LoopCount); - } - } + public override void Serialize(NetworkWriter writer) + { + base.Serialize(writer); + writer.Write(ServerTime); + writer.Write(LoopCount); + } + } } \ No newline at end of file diff --git a/QSB/TimeSync/PreserveTimeScale.cs b/QSB/TimeSync/PreserveTimeScale.cs index 23b58872..1b3dc1e7 100644 --- a/QSB/TimeSync/PreserveTimeScale.cs +++ b/QSB/TimeSync/PreserveTimeScale.cs @@ -1,6 +1,5 @@ using OWML.ModHelper.Events; using QSB.QuantumUNET; -using UnityEngine.Networking; namespace QSB.TimeSync { diff --git a/QSB/TimeSync/TimeSyncType.cs b/QSB/TimeSync/TimeSyncType.cs index 2fe1ca0c..6556cbec 100644 --- a/QSB/TimeSync/TimeSyncType.cs +++ b/QSB/TimeSync/TimeSyncType.cs @@ -1,9 +1,9 @@ namespace QSB.TimeSync { - public enum TimeSyncType - { - None, - Pausing, - Fastforwarding - } + public enum TimeSyncType + { + None, + Pausing, + Fastforwarding + } } diff --git a/QSB/TimeSync/WakeUpPatches.cs b/QSB/TimeSync/WakeUpPatches.cs index 8bd2bffa..65364a8e 100644 --- a/QSB/TimeSync/WakeUpPatches.cs +++ b/QSB/TimeSync/WakeUpPatches.cs @@ -2,22 +2,22 @@ namespace QSB.TimeSync { - public class WakeUpPatches : QSBPatch - { - public override QSBPatchTypes Type => QSBPatchTypes.OnNonServerClientConnect; + public class WakeUpPatches : QSBPatch + { + public override QSBPatchTypes Type => QSBPatchTypes.OnNonServerClientConnect; - public static bool OnStartOfTimeLoopPrefix(ref PlayerCameraEffectController __instance) - { - if (__instance.gameObject.CompareTag("MainCamera") && QSBSceneManager.CurrentScene != OWScene.EyeOfTheUniverse) - { - __instance.Invoke("WakeUp"); - } - return false; - } + public static bool OnStartOfTimeLoopPrefix(ref PlayerCameraEffectController __instance) + { + if (__instance.gameObject.CompareTag("MainCamera") && QSBSceneManager.CurrentScene != OWScene.EyeOfTheUniverse) + { + __instance.Invoke("WakeUp"); + } + return false; + } - public override void DoPatches() - { - QSB.Helper.HarmonyHelper.AddPrefix("OnStartOfTimeLoop", typeof(WakeUpPatches), nameof(OnStartOfTimeLoopPrefix)); - } - } + public override void DoPatches() + { + QSB.Helper.HarmonyHelper.AddPrefix("OnStartOfTimeLoop", typeof(WakeUpPatches), nameof(OnStartOfTimeLoopPrefix)); + } + } } diff --git a/QSB/TimeSync/WakeUpSync.cs b/QSB/TimeSync/WakeUpSync.cs index 74c4d58b..45723a6f 100644 --- a/QSB/TimeSync/WakeUpSync.cs +++ b/QSB/TimeSync/WakeUpSync.cs @@ -4,7 +4,6 @@ using QSB.QuantumUNET; using QSB.TimeSync.Events; using QSB.Utility; using UnityEngine; -using UnityEngine.Networking; namespace QSB.TimeSync { diff --git a/QSB/Tools/Events/PlayerFlashlightEvent.cs b/QSB/Tools/Events/PlayerFlashlightEvent.cs index 10a71aae..3cc770c8 100644 --- a/QSB/Tools/Events/PlayerFlashlightEvent.cs +++ b/QSB/Tools/Events/PlayerFlashlightEvent.cs @@ -4,41 +4,41 @@ using QSB.Player; namespace QSB.Tools.Events { - public class PlayerFlashlightEvent : QSBEvent - { - public override EventType Type => EventType.FlashlightActiveChange; + public class PlayerFlashlightEvent : QSBEvent + { + public override EventType Type => EventType.FlashlightActiveChange; - public override void SetupListener() - { - GlobalMessenger.AddListener(EventNames.TurnOnFlashlight, HandleTurnOn); - GlobalMessenger.AddListener(EventNames.TurnOffFlashlight, HandleTurnOff); - } + public override void SetupListener() + { + GlobalMessenger.AddListener(EventNames.TurnOnFlashlight, HandleTurnOn); + GlobalMessenger.AddListener(EventNames.TurnOffFlashlight, HandleTurnOff); + } - public override void CloseListener() - { - GlobalMessenger.RemoveListener(EventNames.TurnOnFlashlight, HandleTurnOn); - GlobalMessenger.RemoveListener(EventNames.TurnOffFlashlight, HandleTurnOff); - } + public override void CloseListener() + { + GlobalMessenger.RemoveListener(EventNames.TurnOnFlashlight, HandleTurnOn); + GlobalMessenger.RemoveListener(EventNames.TurnOffFlashlight, HandleTurnOff); + } - private void HandleTurnOn() => SendEvent(CreateMessage(true)); - private void HandleTurnOff() => SendEvent(CreateMessage(false)); + private void HandleTurnOn() => SendEvent(CreateMessage(true)); + private void HandleTurnOff() => SendEvent(CreateMessage(false)); - private ToggleMessage CreateMessage(bool value) => new ToggleMessage - { - AboutId = LocalPlayerId, - ToggleValue = value - }; + private ToggleMessage CreateMessage(bool value) => new ToggleMessage + { + AboutId = LocalPlayerId, + ToggleValue = value + }; - public override void OnReceiveRemote(ToggleMessage message) - { - var player = QSBPlayerManager.GetPlayer(message.AboutId); - player.UpdateState(State.Flashlight, message.ToggleValue); - player.FlashLight?.UpdateState(message.ToggleValue); - } + public override void OnReceiveRemote(ToggleMessage message) + { + var player = QSBPlayerManager.GetPlayer(message.AboutId); + player.UpdateState(State.Flashlight, message.ToggleValue); + player.FlashLight?.UpdateState(message.ToggleValue); + } - public override void OnReceiveLocal(ToggleMessage message) - { - QSBPlayerManager.LocalPlayer.UpdateState(State.Flashlight, message.ToggleValue); - } - } + public override void OnReceiveLocal(ToggleMessage message) + { + QSBPlayerManager.LocalPlayer.UpdateState(State.Flashlight, message.ToggleValue); + } + } } diff --git a/QSB/Tools/Events/PlayerProbeEvent.cs b/QSB/Tools/Events/PlayerProbeEvent.cs index de6fa343..63822356 100644 --- a/QSB/Tools/Events/PlayerProbeEvent.cs +++ b/QSB/Tools/Events/PlayerProbeEvent.cs @@ -4,41 +4,41 @@ using QSB.Player; namespace QSB.Tools.Events { - public class PlayerProbeEvent : QSBEvent - { - public override EventType Type => EventType.ProbeActiveChange; + public class PlayerProbeEvent : QSBEvent + { + public override EventType Type => EventType.ProbeActiveChange; - public override void SetupListener() - { - GlobalMessenger.AddListener(EventNames.LaunchProbe, HandleLaunch); - GlobalMessenger.AddListener(EventNames.RetrieveProbe, HandleRetrieve); - } + public override void SetupListener() + { + GlobalMessenger.AddListener(EventNames.LaunchProbe, HandleLaunch); + GlobalMessenger.AddListener(EventNames.RetrieveProbe, HandleRetrieve); + } - public override void CloseListener() - { - GlobalMessenger.RemoveListener(EventNames.LaunchProbe, HandleLaunch); - GlobalMessenger.RemoveListener(EventNames.RetrieveProbe, HandleRetrieve); - } + public override void CloseListener() + { + GlobalMessenger.RemoveListener(EventNames.LaunchProbe, HandleLaunch); + GlobalMessenger.RemoveListener(EventNames.RetrieveProbe, HandleRetrieve); + } - private void HandleLaunch(SurveyorProbe probe) => SendEvent(CreateMessage(true)); - private void HandleRetrieve(SurveyorProbe probe) => SendEvent(CreateMessage(false)); + private void HandleLaunch(SurveyorProbe probe) => SendEvent(CreateMessage(true)); + private void HandleRetrieve(SurveyorProbe probe) => SendEvent(CreateMessage(false)); - private ToggleMessage CreateMessage(bool value) => new ToggleMessage - { - AboutId = LocalPlayerId, - ToggleValue = value - }; + private ToggleMessage CreateMessage(bool value) => new ToggleMessage + { + AboutId = LocalPlayerId, + ToggleValue = value + }; - public override void OnReceiveRemote(ToggleMessage message) - { - var player = QSBPlayerManager.GetPlayer(message.AboutId); - player.UpdateState(State.ProbeActive, message.ToggleValue); - player.Probe?.SetState(message.ToggleValue); - } + public override void OnReceiveRemote(ToggleMessage message) + { + var player = QSBPlayerManager.GetPlayer(message.AboutId); + player.UpdateState(State.ProbeActive, message.ToggleValue); + player.Probe?.SetState(message.ToggleValue); + } - public override void OnReceiveLocal(ToggleMessage message) - { - QSBPlayerManager.LocalPlayer.UpdateState(State.ProbeActive, message.ToggleValue); - } - } + public override void OnReceiveLocal(ToggleMessage message) + { + QSBPlayerManager.LocalPlayer.UpdateState(State.ProbeActive, message.ToggleValue); + } + } } diff --git a/QSB/Tools/Events/PlayerProbeLauncherEvent.cs b/QSB/Tools/Events/PlayerProbeLauncherEvent.cs index 38e8651c..4973595d 100644 --- a/QSB/Tools/Events/PlayerProbeLauncherEvent.cs +++ b/QSB/Tools/Events/PlayerProbeLauncherEvent.cs @@ -4,41 +4,41 @@ using QSB.Player; namespace QSB.Tools.Events { - public class PlayerProbeLauncherEvent : QSBEvent - { - public override EventType Type => EventType.ProbeLauncherActiveChange; + public class PlayerProbeLauncherEvent : QSBEvent + { + public override EventType Type => EventType.ProbeLauncherActiveChange; - public override void SetupListener() - { - GlobalMessenger.AddListener(EventNames.ProbeLauncherEquipped, HandleEquip); - GlobalMessenger.AddListener(EventNames.ProbeLauncherUnequipped, HandleUnequip); - } + public override void SetupListener() + { + GlobalMessenger.AddListener(EventNames.ProbeLauncherEquipped, HandleEquip); + GlobalMessenger.AddListener(EventNames.ProbeLauncherUnequipped, HandleUnequip); + } - public override void CloseListener() - { - GlobalMessenger.RemoveListener(EventNames.ProbeLauncherEquipped, HandleEquip); - GlobalMessenger.RemoveListener(EventNames.ProbeLauncherUnequipped, HandleUnequip); - } + public override void CloseListener() + { + GlobalMessenger.RemoveListener(EventNames.ProbeLauncherEquipped, HandleEquip); + GlobalMessenger.RemoveListener(EventNames.ProbeLauncherUnequipped, HandleUnequip); + } - private void HandleEquip(ProbeLauncher var) => SendEvent(CreateMessage(true)); - private void HandleUnequip(ProbeLauncher var) => SendEvent(CreateMessage(false)); + private void HandleEquip(ProbeLauncher var) => SendEvent(CreateMessage(true)); + private void HandleUnequip(ProbeLauncher var) => SendEvent(CreateMessage(false)); - private ToggleMessage CreateMessage(bool value) => new ToggleMessage - { - AboutId = LocalPlayerId, - ToggleValue = value - }; + private ToggleMessage CreateMessage(bool value) => new ToggleMessage + { + AboutId = LocalPlayerId, + ToggleValue = value + }; - public override void OnReceiveRemote(ToggleMessage message) - { - var player = QSBPlayerManager.GetPlayer(message.AboutId); - player.UpdateState(State.ProbeLauncher, message.ToggleValue); - player.ProbeLauncher?.ChangeEquipState(message.ToggleValue); - } + public override void OnReceiveRemote(ToggleMessage message) + { + var player = QSBPlayerManager.GetPlayer(message.AboutId); + player.UpdateState(State.ProbeLauncher, message.ToggleValue); + player.ProbeLauncher?.ChangeEquipState(message.ToggleValue); + } - public override void OnReceiveLocal(ToggleMessage message) - { - QSBPlayerManager.LocalPlayer.UpdateState(State.ProbeLauncher, message.ToggleValue); - } - } + public override void OnReceiveLocal(ToggleMessage message) + { + QSBPlayerManager.LocalPlayer.UpdateState(State.ProbeLauncher, message.ToggleValue); + } + } } diff --git a/QSB/Tools/Events/PlayerSignalscopeEvent.cs b/QSB/Tools/Events/PlayerSignalscopeEvent.cs index 9a7f0bc1..f0c4461d 100644 --- a/QSB/Tools/Events/PlayerSignalscopeEvent.cs +++ b/QSB/Tools/Events/PlayerSignalscopeEvent.cs @@ -4,41 +4,41 @@ using QSB.Player; namespace QSB.Tools.Events { - public class PlayerSignalscopeEvent : QSBEvent - { - public override EventType Type => EventType.SignalscopeActiveChange; + public class PlayerSignalscopeEvent : QSBEvent + { + public override EventType Type => EventType.SignalscopeActiveChange; - public override void SetupListener() - { - GlobalMessenger.AddListener(EventNames.EquipSignalscope, HandleEquip); - GlobalMessenger.AddListener(EventNames.UnequipSignalscope, HandleUnequip); - } + public override void SetupListener() + { + GlobalMessenger.AddListener(EventNames.EquipSignalscope, HandleEquip); + GlobalMessenger.AddListener(EventNames.UnequipSignalscope, HandleUnequip); + } - public override void CloseListener() - { - GlobalMessenger.RemoveListener(EventNames.EquipSignalscope, HandleEquip); - GlobalMessenger.RemoveListener(EventNames.UnequipSignalscope, HandleUnequip); - } + public override void CloseListener() + { + GlobalMessenger.RemoveListener(EventNames.EquipSignalscope, HandleEquip); + GlobalMessenger.RemoveListener(EventNames.UnequipSignalscope, HandleUnequip); + } - private void HandleEquip(Signalscope var) => SendEvent(CreateMessage(true)); - private void HandleUnequip() => SendEvent(CreateMessage(false)); + private void HandleEquip(Signalscope var) => SendEvent(CreateMessage(true)); + private void HandleUnequip() => SendEvent(CreateMessage(false)); - private ToggleMessage CreateMessage(bool value) => new ToggleMessage - { - AboutId = LocalPlayerId, - ToggleValue = value - }; + private ToggleMessage CreateMessage(bool value) => new ToggleMessage + { + AboutId = LocalPlayerId, + ToggleValue = value + }; - public override void OnReceiveRemote(ToggleMessage message) - { - var player = QSBPlayerManager.GetPlayer(message.AboutId); - player.UpdateState(State.Signalscope, message.ToggleValue); - player.Signalscope?.ChangeEquipState(message.ToggleValue); - } + public override void OnReceiveRemote(ToggleMessage message) + { + var player = QSBPlayerManager.GetPlayer(message.AboutId); + player.UpdateState(State.Signalscope, message.ToggleValue); + player.Signalscope?.ChangeEquipState(message.ToggleValue); + } - public override void OnReceiveLocal(ToggleMessage message) - { - QSBPlayerManager.LocalPlayer.UpdateState(State.Signalscope, message.ToggleValue); - } - } + public override void OnReceiveLocal(ToggleMessage message) + { + QSBPlayerManager.LocalPlayer.UpdateState(State.Signalscope, message.ToggleValue); + } + } } diff --git a/QSB/Tools/Events/PlayerTranslatorEvent.cs b/QSB/Tools/Events/PlayerTranslatorEvent.cs index 9c3f05a3..741aeda3 100644 --- a/QSB/Tools/Events/PlayerTranslatorEvent.cs +++ b/QSB/Tools/Events/PlayerTranslatorEvent.cs @@ -4,41 +4,41 @@ using QSB.Player; namespace QSB.Tools.Events { - public class PlayerTranslatorEvent : QSBEvent - { - public override EventType Type => EventType.TranslatorActiveChange; + public class PlayerTranslatorEvent : QSBEvent + { + public override EventType Type => EventType.TranslatorActiveChange; - public override void SetupListener() - { - GlobalMessenger.AddListener(EventNames.EquipTranslator, HandleEquip); - GlobalMessenger.AddListener(EventNames.UnequipTranslator, HandleUnequip); - } + public override void SetupListener() + { + GlobalMessenger.AddListener(EventNames.EquipTranslator, HandleEquip); + GlobalMessenger.AddListener(EventNames.UnequipTranslator, HandleUnequip); + } - public override void CloseListener() - { - GlobalMessenger.RemoveListener(EventNames.EquipTranslator, HandleEquip); - GlobalMessenger.RemoveListener(EventNames.UnequipTranslator, HandleUnequip); - } + public override void CloseListener() + { + GlobalMessenger.RemoveListener(EventNames.EquipTranslator, HandleEquip); + GlobalMessenger.RemoveListener(EventNames.UnequipTranslator, HandleUnequip); + } - private void HandleEquip() => SendEvent(CreateMessage(true)); - private void HandleUnequip() => SendEvent(CreateMessage(false)); + private void HandleEquip() => SendEvent(CreateMessage(true)); + private void HandleUnequip() => SendEvent(CreateMessage(false)); - private ToggleMessage CreateMessage(bool value) => new ToggleMessage - { - AboutId = LocalPlayerId, - ToggleValue = value - }; + private ToggleMessage CreateMessage(bool value) => new ToggleMessage + { + AboutId = LocalPlayerId, + ToggleValue = value + }; - public override void OnReceiveRemote(ToggleMessage message) - { - var player = QSBPlayerManager.GetPlayer(message.AboutId); - player.UpdateState(State.Translator, message.ToggleValue); - player.Translator?.ChangeEquipState(message.ToggleValue); - } + public override void OnReceiveRemote(ToggleMessage message) + { + var player = QSBPlayerManager.GetPlayer(message.AboutId); + player.UpdateState(State.Translator, message.ToggleValue); + player.Translator?.ChangeEquipState(message.ToggleValue); + } - public override void OnReceiveLocal(ToggleMessage message) - { - QSBPlayerManager.LocalPlayer.UpdateState(State.Translator, message.ToggleValue); - } - } + public override void OnReceiveLocal(ToggleMessage message) + { + QSBPlayerManager.LocalPlayer.UpdateState(State.Translator, message.ToggleValue); + } + } } diff --git a/QSB/Tools/PlayerToolsManager.cs b/QSB/Tools/PlayerToolsManager.cs index e368fbab..09668787 100644 --- a/QSB/Tools/PlayerToolsManager.cs +++ b/QSB/Tools/PlayerToolsManager.cs @@ -6,191 +6,191 @@ using UnityEngine; namespace QSB.Tools { - public class PlayerToolsManager - { - private static Transform _toolStowTransform; - private static Transform _toolHoldTransform; - private static Material _playerToolsMaterial; - private static Material _lightbulbMaterial; + public class PlayerToolsManager + { + private static Transform _toolStowTransform; + private static Transform _toolHoldTransform; + private static Material _playerToolsMaterial; + private static Material _lightbulbMaterial; - private static readonly Vector3 FlashlightOffset = new Vector3(0.7196316f, -0.2697681f, 0.3769455f); - private static readonly Vector3 ProbeLauncherOffset = new Vector3(0.5745087f, -0.26f, 0.4453125f); - private static readonly Vector3 SignalscopeScale = new Vector3(1.5f, 1.5f, 1.5f); - private static readonly Vector3 TranslatorScale = new Vector3(0.75f, 0.75f, 0.75f); + private static readonly Vector3 FlashlightOffset = new Vector3(0.7196316f, -0.2697681f, 0.3769455f); + private static readonly Vector3 ProbeLauncherOffset = new Vector3(0.5745087f, -0.26f, 0.4453125f); + private static readonly Vector3 SignalscopeScale = new Vector3(1.5f, 1.5f, 1.5f); + private static readonly Vector3 TranslatorScale = new Vector3(0.75f, 0.75f, 0.75f); - public static void Init(Transform camera) - { - CreateStowTransforms(camera); + public static void Init(Transform camera) + { + CreateStowTransforms(camera); - if (QSBSceneManager.CurrentScene == OWScene.SolarSystem) - { - _playerToolsMaterial = GameObject.Find("PlayerSuit_Jetpack").GetComponent().materials[0]; - _lightbulbMaterial = GameObject.Find("Props_HEA_Lantern (10)/Lantern_Lamp").GetComponent().materials[0]; - } - else if (QSBSceneManager.CurrentScene == OWScene.EyeOfTheUniverse) - { - // EyeCompatibility : Get these materials another way. - _playerToolsMaterial = null; - _lightbulbMaterial = null; - } + if (QSBSceneManager.CurrentScene == OWScene.SolarSystem) + { + _playerToolsMaterial = GameObject.Find("PlayerSuit_Jetpack").GetComponent().materials[0]; + _lightbulbMaterial = GameObject.Find("Props_HEA_Lantern (10)/Lantern_Lamp").GetComponent().materials[0]; + } + else if (QSBSceneManager.CurrentScene == OWScene.EyeOfTheUniverse) + { + // EyeCompatibility : Get these materials another way. + _playerToolsMaterial = null; + _lightbulbMaterial = null; + } - CreateFlashlight(camera); - CreateSignalscope(camera); - CreateProbeLauncher(camera); - CreateTranslator(camera); - } + CreateFlashlight(camera); + CreateSignalscope(camera); + CreateProbeLauncher(camera); + CreateTranslator(camera); + } - public static void CreateProbe(Transform body, PlayerInfo player) - { - var newProbe = body.gameObject.AddComponent(); - player.Probe = newProbe; - } + public static void CreateProbe(Transform body, PlayerInfo player) + { + var newProbe = body.gameObject.AddComponent(); + player.Probe = newProbe; + } - private static void CreateStowTransforms(Transform cameraBody) - { - var stow = new GameObject("ToolStowTransform"); - _toolStowTransform = stow.transform; - stow.transform.parent = cameraBody; - stow.transform.localPosition = Vector3.zero; - stow.transform.localRotation = Quaternion.Euler(45f, 0f, 0f); + private static void CreateStowTransforms(Transform cameraBody) + { + var stow = new GameObject("ToolStowTransform"); + _toolStowTransform = stow.transform; + stow.transform.parent = cameraBody; + stow.transform.localPosition = Vector3.zero; + stow.transform.localRotation = Quaternion.Euler(45f, 0f, 0f); - var hold = new GameObject("ToolHoldTransform"); - _toolHoldTransform = hold.transform; - hold.transform.parent = cameraBody; - hold.transform.localPosition = Vector3.zero; - hold.transform.localRotation = Quaternion.Euler(0f, 0f, 0f); - } + var hold = new GameObject("ToolHoldTransform"); + _toolHoldTransform = hold.transform; + hold.transform.parent = cameraBody; + hold.transform.localPosition = Vector3.zero; + hold.transform.localRotation = Quaternion.Euler(0f, 0f, 0f); + } - private static GameObject CreateFlashlight(Transform cameraBody) - { - var flashlightRoot = Object.Instantiate(GameObject.Find("FlashlightRoot")); - flashlightRoot.SetActive(false); - var oldComponent = flashlightRoot.GetComponent(); - var component = flashlightRoot.AddComponent(); + private static GameObject CreateFlashlight(Transform cameraBody) + { + var flashlightRoot = Object.Instantiate(GameObject.Find("FlashlightRoot")); + flashlightRoot.SetActive(false); + var oldComponent = flashlightRoot.GetComponent(); + var component = flashlightRoot.AddComponent(); - component.Init(oldComponent); - oldComponent.enabled = false; + component.Init(oldComponent); + oldComponent.enabled = false; - flashlightRoot.transform.parent = cameraBody; - flashlightRoot.transform.localPosition = FlashlightOffset; - flashlightRoot.SetActive(true); + flashlightRoot.transform.parent = cameraBody; + flashlightRoot.transform.localPosition = FlashlightOffset; + flashlightRoot.SetActive(true); - return flashlightRoot; - } + return flashlightRoot; + } - private static GameObject CreateSignalscope(Transform cameraBody) - { - var signalscopeRoot = Object.Instantiate(GameObject.Find("Signalscope")); - signalscopeRoot.SetActive(false); + private static GameObject CreateSignalscope(Transform cameraBody) + { + var signalscopeRoot = Object.Instantiate(GameObject.Find("Signalscope")); + signalscopeRoot.SetActive(false); - Object.Destroy(signalscopeRoot.GetComponent()); - Object.Destroy(signalscopeRoot.transform.Find("Props_HEA_Signalscope") - .Find("Props_HEA_Signalscope_Prepass").gameObject); + Object.Destroy(signalscopeRoot.GetComponent()); + Object.Destroy(signalscopeRoot.transform.Find("Props_HEA_Signalscope") + .Find("Props_HEA_Signalscope_Prepass").gameObject); - var oldSignalscope = signalscopeRoot.GetComponent(); - var tool = signalscopeRoot.AddComponent(); - tool.MoveSpring = oldSignalscope.GetValue("_moveSpring"); - tool.StowTransform = _toolStowTransform; - tool.HoldTransform = _toolHoldTransform; - tool.ArrivalDegrees = 5f; - tool.Type = ToolType.Signalscope; - tool.ToolGameObject = signalscopeRoot.transform.Find("Props_HEA_Signalscope").gameObject; - oldSignalscope.enabled = false; + var oldSignalscope = signalscopeRoot.GetComponent(); + var tool = signalscopeRoot.AddComponent(); + tool.MoveSpring = oldSignalscope.GetValue("_moveSpring"); + tool.StowTransform = _toolStowTransform; + tool.HoldTransform = _toolHoldTransform; + tool.ArrivalDegrees = 5f; + tool.Type = ToolType.Signalscope; + tool.ToolGameObject = signalscopeRoot.transform.Find("Props_HEA_Signalscope").gameObject; + oldSignalscope.enabled = false; - GetRenderer(signalscopeRoot, "Props_HEA_Signalscope").material = _playerToolsMaterial; + GetRenderer(signalscopeRoot, "Props_HEA_Signalscope").material = _playerToolsMaterial; - signalscopeRoot.transform.parent = cameraBody; - signalscopeRoot.transform.localPosition = Vector3.zero; - signalscopeRoot.transform.localScale = SignalscopeScale; - signalscopeRoot.SetActive(true); + signalscopeRoot.transform.parent = cameraBody; + signalscopeRoot.transform.localPosition = Vector3.zero; + signalscopeRoot.transform.localScale = SignalscopeScale; + signalscopeRoot.SetActive(true); - return signalscopeRoot; - } + return signalscopeRoot; + } - private static GameObject CreateTranslator(Transform cameraBody) - { - var original = GameObject.Find("NomaiTranslatorProp"); + private static GameObject CreateTranslator(Transform cameraBody) + { + var original = GameObject.Find("NomaiTranslatorProp"); - var translatorRoot = original.InstantiateInactive(); + var translatorRoot = original.InstantiateInactive(); - var group = translatorRoot.transform.Find("TranslatorGroup"); - var model = group.Find("Props_HEA_Translator"); + var group = translatorRoot.transform.Find("TranslatorGroup"); + var model = group.Find("Props_HEA_Translator"); - Object.Destroy(translatorRoot.GetComponent()); - Object.Destroy(group.Find("Canvas").gameObject); - Object.Destroy(group.Find("Lighting").gameObject); - Object.Destroy(group.Find("TranslatorBeams").gameObject); - Object.Destroy(model.Find("Props_HEA_Translator_Pivot_RotatingPart") - .Find("Props_HEA_Translator_RotatingPart") - .Find("Props_HEA_Translator_RotatingPart_Prepass").gameObject); - Object.Destroy(model.Find("Props_HEA_Translator_Prepass").gameObject); + Object.Destroy(translatorRoot.GetComponent()); + Object.Destroy(group.Find("Canvas").gameObject); + Object.Destroy(group.Find("Lighting").gameObject); + Object.Destroy(group.Find("TranslatorBeams").gameObject); + Object.Destroy(model.Find("Props_HEA_Translator_Pivot_RotatingPart") + .Find("Props_HEA_Translator_RotatingPart") + .Find("Props_HEA_Translator_RotatingPart_Prepass").gameObject); + Object.Destroy(model.Find("Props_HEA_Translator_Prepass").gameObject); - var oldTranslator = translatorRoot.GetComponent(); - var tool = translatorRoot.AddComponent(); - tool.MoveSpring = oldTranslator.GetValue("_moveSpring"); - tool.StowTransform = _toolStowTransform; - tool.HoldTransform = _toolHoldTransform; - tool.ArrivalDegrees = 5f; - tool.Type = ToolType.Translator; - tool.ToolGameObject = group.gameObject; - Object.Destroy(oldTranslator); + var oldTranslator = translatorRoot.GetComponent(); + var tool = translatorRoot.AddComponent(); + tool.MoveSpring = oldTranslator.GetValue("_moveSpring"); + tool.StowTransform = _toolStowTransform; + tool.HoldTransform = _toolHoldTransform; + tool.ArrivalDegrees = 5f; + tool.Type = ToolType.Translator; + tool.ToolGameObject = group.gameObject; + Object.Destroy(oldTranslator); - GetRenderer(translatorRoot, "Props_HEA_Translator_Geo").material = _playerToolsMaterial; - GetRenderer(translatorRoot, "Props_HEA_Translator_RotatingPart").material = _playerToolsMaterial; - GetRenderer(translatorRoot, "Props_HEA_Translator_Button_L").material = _lightbulbMaterial; - GetRenderer(translatorRoot, "Props_HEA_Translator_Button_R").material = _lightbulbMaterial; + GetRenderer(translatorRoot, "Props_HEA_Translator_Geo").material = _playerToolsMaterial; + GetRenderer(translatorRoot, "Props_HEA_Translator_RotatingPart").material = _playerToolsMaterial; + GetRenderer(translatorRoot, "Props_HEA_Translator_Button_L").material = _lightbulbMaterial; + GetRenderer(translatorRoot, "Props_HEA_Translator_Button_R").material = _lightbulbMaterial; - translatorRoot.transform.parent = cameraBody; - translatorRoot.transform.localPosition = Vector3.zero; - translatorRoot.transform.localScale = TranslatorScale; - QSB.Helper.Events.Unity.FireOnNextUpdate(() => translatorRoot.SetActive(true)); + translatorRoot.transform.parent = cameraBody; + translatorRoot.transform.localPosition = Vector3.zero; + translatorRoot.transform.localScale = TranslatorScale; + QSB.Helper.Events.Unity.FireOnNextUpdate(() => translatorRoot.SetActive(true)); - return translatorRoot; - } + return translatorRoot; + } - private static GameObject CreateProbeLauncher(Transform cameraBody) - { - var launcherRoot = new GameObject("ProbeLauncher"); - var modelOrig = GameObject.Find("PlayerCamera/ProbeLauncher/Props_HEA_ProbeLauncher"); - var model = Object.Instantiate(modelOrig); - model.transform.parent = launcherRoot.transform; + private static GameObject CreateProbeLauncher(Transform cameraBody) + { + var launcherRoot = new GameObject("ProbeLauncher"); + var modelOrig = GameObject.Find("PlayerCamera/ProbeLauncher/Props_HEA_ProbeLauncher"); + var model = Object.Instantiate(modelOrig); + model.transform.parent = launcherRoot.transform; - Object.Destroy(model.transform.Find("Props_HEA_ProbeLauncher_Prepass").gameObject); - Object.Destroy(model.transform.Find("Props_HEA_Probe_Prelaunch").Find("Props_HEA_Probe_Prelaunch_Prepass").gameObject); + Object.Destroy(model.transform.Find("Props_HEA_ProbeLauncher_Prepass").gameObject); + Object.Destroy(model.transform.Find("Props_HEA_Probe_Prelaunch").Find("Props_HEA_Probe_Prelaunch_Prepass").gameObject); - var tool = launcherRoot.AddComponent(); - var spring = new DampedSpringQuat - { - velocity = Vector4.zero, - settings = new DampedSpringSettings - { - springConstant = 50f, - dampingCoefficient = 8.485282f, - mass = 1 - } - }; - tool.MoveSpring = spring; - tool.StowTransform = _toolStowTransform; - tool.HoldTransform = _toolHoldTransform; - tool.ArrivalDegrees = 5f; - tool.Type = ToolType.ProbeLauncher; - tool.ToolGameObject = model; + var tool = launcherRoot.AddComponent(); + var spring = new DampedSpringQuat + { + velocity = Vector4.zero, + settings = new DampedSpringSettings + { + springConstant = 50f, + dampingCoefficient = 8.485282f, + mass = 1 + } + }; + tool.MoveSpring = spring; + tool.StowTransform = _toolStowTransform; + tool.HoldTransform = _toolHoldTransform; + tool.ArrivalDegrees = 5f; + tool.Type = ToolType.ProbeLauncher; + tool.ToolGameObject = model; - GetRenderer(launcherRoot, "Props_HEA_Probe_Prelaunch").materials[0] = _playerToolsMaterial; - GetRenderer(launcherRoot, "Props_HEA_Probe_Prelaunch").materials[1] = _lightbulbMaterial; - GetRenderer(launcherRoot, "PressureGauge_Arrow").material = _playerToolsMaterial; - GetRenderer(launcherRoot, "ProbeLauncherChassis").material = _playerToolsMaterial; + GetRenderer(launcherRoot, "Props_HEA_Probe_Prelaunch").materials[0] = _playerToolsMaterial; + GetRenderer(launcherRoot, "Props_HEA_Probe_Prelaunch").materials[1] = _lightbulbMaterial; + GetRenderer(launcherRoot, "PressureGauge_Arrow").material = _playerToolsMaterial; + GetRenderer(launcherRoot, "ProbeLauncherChassis").material = _playerToolsMaterial; - launcherRoot.transform.parent = cameraBody; - launcherRoot.transform.localPosition = ProbeLauncherOffset; - launcherRoot.SetActive(true); + launcherRoot.transform.parent = cameraBody; + launcherRoot.transform.localPosition = ProbeLauncherOffset; + launcherRoot.SetActive(true); - return launcherRoot; - } + return launcherRoot; + } - private static MeshRenderer GetRenderer(GameObject root, string gameObjectName) - { - return root.GetComponentsInChildren(true).First(x => x.name == gameObjectName); - } - } + private static MeshRenderer GetRenderer(GameObject root, string gameObjectName) + { + return root.GetComponentsInChildren(true).First(x => x.name == gameObjectName); + } + } } \ No newline at end of file diff --git a/QSB/Tools/ProbePatches.cs b/QSB/Tools/ProbePatches.cs index 0564aa51..e26196aa 100644 --- a/QSB/Tools/ProbePatches.cs +++ b/QSB/Tools/ProbePatches.cs @@ -2,28 +2,28 @@ namespace QSB.Tools { - public class ProbePatches : QSBPatch - { - public override QSBPatchTypes Type => QSBPatchTypes.OnModStart; + public class ProbePatches : QSBPatch + { + public override QSBPatchTypes Type => QSBPatchTypes.OnModStart; - private static void ProbeAnchor() - { - GlobalMessenger.FireEvent(EventNames.QSBOnProbeAnchor); - } + private static void ProbeAnchor() + { + GlobalMessenger.FireEvent(EventNames.QSBOnProbeAnchor); + } - private static bool ProbeWarp(ref bool ____isRetrieving) - { - if (!____isRetrieving) - { - GlobalMessenger.FireEvent(EventNames.QSBOnProbeWarp); - } - return true; - } + private static bool ProbeWarp(ref bool ____isRetrieving) + { + if (!____isRetrieving) + { + GlobalMessenger.FireEvent(EventNames.QSBOnProbeWarp); + } + return true; + } - public override void DoPatches() - { - QSB.Helper.HarmonyHelper.AddPostfix("OnAnchor", typeof(ProbePatches), nameof(ProbeAnchor)); - QSB.Helper.HarmonyHelper.AddPrefix("Retrieve", typeof(ProbePatches), nameof(ProbeWarp)); - } - } + public override void DoPatches() + { + QSB.Helper.HarmonyHelper.AddPostfix("OnAnchor", typeof(ProbePatches), nameof(ProbeAnchor)); + QSB.Helper.HarmonyHelper.AddPrefix("Retrieve", typeof(ProbePatches), nameof(ProbeWarp)); + } + } } diff --git a/QSB/Tools/QSBFlashlight.cs b/QSB/Tools/QSBFlashlight.cs index bf9a32d5..2c186057 100644 --- a/QSB/Tools/QSBFlashlight.cs +++ b/QSB/Tools/QSBFlashlight.cs @@ -3,82 +3,82 @@ using UnityEngine; namespace QSB.Tools { - public class QSBFlashlight : MonoBehaviour - { - private OWLight2[] _lights; - private Transform _root; - private Transform _basePivot; - private Transform _wobblePivot; + public class QSBFlashlight : MonoBehaviour + { + private OWLight2[] _lights; + private Transform _root; + private Transform _basePivot; + private Transform _wobblePivot; - private bool _flashlightOn; - private Vector3 _baseForward; - private Quaternion _baseRotation; + private bool _flashlightOn; + private Vector3 _baseForward; + private Quaternion _baseRotation; - private void Start() - { - _baseForward = _basePivot.forward; - _baseRotation = _basePivot.rotation; - } + private void Start() + { + _baseForward = _basePivot.forward; + _baseRotation = _basePivot.rotation; + } - public void Init(Flashlight oldComponent) - { - _lights = oldComponent.GetValue("_lights"); - _root = oldComponent.GetValue("_root"); - _basePivot = oldComponent.GetValue("_basePivot"); - _wobblePivot = oldComponent.GetValue("_wobblePivot"); - } + public void Init(Flashlight oldComponent) + { + _lights = oldComponent.GetValue("_lights"); + _root = oldComponent.GetValue("_root"); + _basePivot = oldComponent.GetValue("_basePivot"); + _wobblePivot = oldComponent.GetValue("_wobblePivot"); + } - public void UpdateState(bool value) - { - if (value) - { - TurnOn(); - } - else - { - TurnOff(); - } - } + public void UpdateState(bool value) + { + if (value) + { + TurnOn(); + } + else + { + TurnOff(); + } + } - private void TurnOn() - { - if (_flashlightOn) - { - return; - } - foreach (var light in _lights) - { - light.GetLight().enabled = true; - } - _flashlightOn = true; - var rotation = _root.rotation; - _basePivot.rotation = rotation; - _baseRotation = rotation; - _baseForward = _basePivot.forward; - } + private void TurnOn() + { + if (_flashlightOn) + { + return; + } + foreach (var light in _lights) + { + light.GetLight().enabled = true; + } + _flashlightOn = true; + var rotation = _root.rotation; + _basePivot.rotation = rotation; + _baseRotation = rotation; + _baseForward = _basePivot.forward; + } - private void TurnOff() - { - if (!_flashlightOn) - { - return; - } - foreach (var light in _lights) - { - light.GetLight().enabled = false; - } - _flashlightOn = false; - } + private void TurnOff() + { + if (!_flashlightOn) + { + return; + } + foreach (var light in _lights) + { + light.GetLight().enabled = false; + } + _flashlightOn = false; + } - private void FixedUpdate() - { - // This really isn't needed... but it makes it look that extra bit nicer. - var lhs = Quaternion.FromToRotation(_basePivot.up, _root.up) * Quaternion.FromToRotation(_baseForward, _root.forward); - var b = lhs * _baseRotation; - _baseRotation = Quaternion.Slerp(_baseRotation, b, 6f * Time.deltaTime); - _basePivot.rotation = _baseRotation; - _baseForward = _basePivot.forward; - _wobblePivot.localRotation = OWUtilities.GetWobbleRotation(0.3f, 0.15f) * Quaternion.identity; - } - } + private void FixedUpdate() + { + // This really isn't needed... but it makes it look that extra bit nicer. + var lhs = Quaternion.FromToRotation(_basePivot.up, _root.up) * Quaternion.FromToRotation(_baseForward, _root.forward); + var b = lhs * _baseRotation; + _baseRotation = Quaternion.Slerp(_baseRotation, b, 6f * Time.deltaTime); + _basePivot.rotation = _baseRotation; + _baseForward = _basePivot.forward; + _wobblePivot.localRotation = OWUtilities.GetWobbleRotation(0.3f, 0.15f) * Quaternion.identity; + } + } } diff --git a/QSB/Tools/QSBProbe.cs b/QSB/Tools/QSBProbe.cs index fece6783..aa876086 100644 --- a/QSB/Tools/QSBProbe.cs +++ b/QSB/Tools/QSBProbe.cs @@ -3,29 +3,29 @@ using UnityEngine; namespace QSB.Tools { - public class QSBProbe : MonoBehaviour - { - public void SetState(bool state) - { - if (state) - { - Activate(); - } - else - { - Deactivate(); - } - } + public class QSBProbe : MonoBehaviour + { + public void SetState(bool state) + { + if (state) + { + Activate(); + } + else + { + Deactivate(); + } + } - private void Activate() - { - gameObject.SetActive(true); - gameObject.Show(); - } + private void Activate() + { + gameObject.SetActive(true); + gameObject.Show(); + } - private void Deactivate() - { - gameObject.Hide(); - } - } + private void Deactivate() + { + gameObject.Hide(); + } + } } diff --git a/QSB/Tools/QSBTool.cs b/QSB/Tools/QSBTool.cs index 40a26e3d..237c13f3 100644 --- a/QSB/Tools/QSBTool.cs +++ b/QSB/Tools/QSBTool.cs @@ -2,55 +2,55 @@ namespace QSB.Tools { - public class QSBTool : PlayerTool - { - public ToolType Type { get; set; } - public GameObject ToolGameObject { get; set; } + public class QSBTool : PlayerTool + { + public ToolType Type { get; set; } + public GameObject ToolGameObject { get; set; } - public DampedSpringQuat MoveSpring - { - get => _moveSpring; - set => _moveSpring = value; - } + public DampedSpringQuat MoveSpring + { + get => _moveSpring; + set => _moveSpring = value; + } - public Transform StowTransform - { - get => _stowTransform; - set => _stowTransform = value; - } + public Transform StowTransform + { + get => _stowTransform; + set => _stowTransform = value; + } - public Transform HoldTransform - { - get => _holdTransform; - set => _holdTransform = value; - } + public Transform HoldTransform + { + get => _holdTransform; + set => _holdTransform = value; + } - public float ArrivalDegrees - { - get => _arrivalDegrees; - set => _arrivalDegrees = value; - } + public float ArrivalDegrees + { + get => _arrivalDegrees; + set => _arrivalDegrees = value; + } - private void OnEnable() - { - ToolGameObject?.SetActive(true); - } + private void OnEnable() + { + ToolGameObject?.SetActive(true); + } - private void OnDisable() - { - ToolGameObject?.SetActive(false); - } + private void OnDisable() + { + ToolGameObject?.SetActive(false); + } - public void ChangeEquipState(bool equipState) - { - if (equipState) - { - EquipTool(); - } - else - { - UnequipTool(); - } - } - } + public void ChangeEquipState(bool equipState) + { + if (equipState) + { + EquipTool(); + } + else + { + UnequipTool(); + } + } + } } \ No newline at end of file diff --git a/QSB/Tools/ToolType.cs b/QSB/Tools/ToolType.cs index 1021097d..a1e2a7ef 100644 --- a/QSB/Tools/ToolType.cs +++ b/QSB/Tools/ToolType.cs @@ -1,9 +1,9 @@ namespace QSB.Tools { - public enum ToolType - { - Signalscope, - ProbeLauncher, - Translator - } + public enum ToolType + { + Signalscope, + ProbeLauncher, + Translator + } } \ No newline at end of file diff --git a/QSB/TransformSync/NomaiOrbTransformSync.cs b/QSB/TransformSync/NomaiOrbTransformSync.cs index 3b58490e..bcde3f8c 100644 --- a/QSB/TransformSync/NomaiOrbTransformSync.cs +++ b/QSB/TransformSync/NomaiOrbTransformSync.cs @@ -2,7 +2,6 @@ using QSB.Utility; using QSB.WorldSync; using UnityEngine; -using UnityEngine.Networking; namespace QSB.TransformSync { diff --git a/QSB/Utility/DebugActions.cs b/QSB/Utility/DebugActions.cs index c8162251..96f85616 100644 --- a/QSB/Utility/DebugActions.cs +++ b/QSB/Utility/DebugActions.cs @@ -2,44 +2,44 @@ namespace QSB.Utility { - public class DebugActions : MonoBehaviour - { - private void GoToVessel() - { - var spawnPoint = GameObject.Find("Spawn_Vessel").GetComponent(); + public class DebugActions : MonoBehaviour + { + private void GoToVessel() + { + var spawnPoint = GameObject.Find("Spawn_Vessel").GetComponent(); - var playerBody = Locator.GetPlayerBody(); - playerBody.WarpToPositionRotation(spawnPoint.transform.position, spawnPoint.transform.rotation); - playerBody.SetVelocity(spawnPoint.GetPointVelocity()); - } + var playerBody = Locator.GetPlayerBody(); + playerBody.WarpToPositionRotation(spawnPoint.transform.position, spawnPoint.transform.rotation); + playerBody.SetVelocity(spawnPoint.GetPointVelocity()); + } - private void InsertWarpCore() - { - var warpCore = GameObject.Find("Prefab_NOM_WarpCoreVessel").GetComponent(); - var socket = GameObject.Find("Interactibles_VesselBridge").GetComponentInChildren(); - socket.PlaceIntoSocket(warpCore); + private void InsertWarpCore() + { + var warpCore = GameObject.Find("Prefab_NOM_WarpCoreVessel").GetComponent(); + var socket = GameObject.Find("Interactibles_VesselBridge").GetComponentInChildren(); + socket.PlaceIntoSocket(warpCore); - GetComponent().SetPillarRaised(true, true); - } + GetComponent().SetPillarRaised(true, true); + } - private void Update() - { - if (!QSB.DebugMode) - { - return; - } - if (Input.GetKeyDown(KeyCode.Keypad1)) - { - GoToVessel(); - } - if (Input.GetKeyDown(KeyCode.Keypad2)) - { - InsertWarpCore(); - } - if (Input.GetKeyDown(KeyCode.Keypad3)) - { - LoadManager.LoadSceneAsync(OWScene.EyeOfTheUniverse, true, LoadManager.FadeType.ToWhite, 1f, true); - } - } - } + private void Update() + { + if (!QSB.DebugMode) + { + return; + } + if (Input.GetKeyDown(KeyCode.Keypad1)) + { + GoToVessel(); + } + if (Input.GetKeyDown(KeyCode.Keypad2)) + { + InsertWarpCore(); + } + if (Input.GetKeyDown(KeyCode.Keypad3)) + { + LoadManager.LoadSceneAsync(OWScene.EyeOfTheUniverse, true, LoadManager.FadeType.ToWhite, 1f, true); + } + } + } } \ No newline at end of file diff --git a/QSB/Utility/DebugLog.cs b/QSB/Utility/DebugLog.cs index 141e5601..a4987067 100644 --- a/QSB/Utility/DebugLog.cs +++ b/QSB/Utility/DebugLog.cs @@ -5,48 +5,48 @@ using System.Linq; namespace QSB.Utility { - public static class DebugLog - { - public static void ToConsole(string message, MessageType type = MessageType.Message) - { - // make custom method name in owml log. - // i wrote the owml code for this so this is fine?? shut up i dont want to change owml - var console = (ModSocketOutput)QSB.Helper.Console; - var method = console.GetType() - .GetMethods(System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance) - .Last(x => x.Name == "WriteLine"); - var callingType = GetCallingType(new StackTrace()); - method.Invoke(console, new object[] { type, message, callingType }); - } + public static class DebugLog + { + public static void ToConsole(string message, MessageType type = MessageType.Message) + { + // make custom method name in owml log. + // i wrote the owml code for this so this is fine?? shut up i dont want to change owml + var console = (ModSocketOutput)QSB.Helper.Console; + var method = console.GetType() + .GetMethods(System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance) + .Last(x => x.Name == "WriteLine"); + var callingType = GetCallingType(new StackTrace()); + method.Invoke(console, new object[] { type, message, callingType }); + } - public static void ToHud(string message) - { - if (Locator.GetPlayerBody() == null) - { - return; - } - var data = new NotificationData(NotificationTarget.Player, message.ToUpper()); - NotificationManager.SharedInstance.PostNotification(data); - } + public static void ToHud(string message) + { + if (Locator.GetPlayerBody() == null) + { + return; + } + var data = new NotificationData(NotificationTarget.Player, message.ToUpper()); + NotificationManager.SharedInstance.PostNotification(data); + } - public static void ToAll(string message, MessageType type = MessageType.Message) - { - ToConsole(message, type); - ToHud(message); - } + public static void ToAll(string message, MessageType type = MessageType.Message) + { + ToConsole(message, type); + ToHud(message); + } - public static void DebugWrite(string message, MessageType type = MessageType.Message) - { - if (QSB.DebugMode) - { - ToConsole(message, type); - } - } + public static void DebugWrite(string message, MessageType type = MessageType.Message) + { + if (QSB.DebugMode) + { + ToConsole(message, type); + } + } - private static string GetCallingType(StackTrace frame) - { - var stackFrame = frame.GetFrames().First(x => x.GetMethod().DeclaringType.Name != "DebugLog"); - return stackFrame.GetMethod().DeclaringType.Name; - } - } + private static string GetCallingType(StackTrace frame) + { + var stackFrame = frame.GetFrames().First(x => x.GetMethod().DeclaringType.Name != "DebugLog"); + return stackFrame.GetMethod().DeclaringType.Name; + } + } } diff --git a/QSB/Utility/FlagsHelper.cs b/QSB/Utility/FlagsHelper.cs index 2854cf0b..c68b8e92 100644 --- a/QSB/Utility/FlagsHelper.cs +++ b/QSB/Utility/FlagsHelper.cs @@ -1,31 +1,31 @@ namespace QSB.Utility { - // Stolen from here : https://stackoverflow.com/questions/3261451/using-a-bitmask-in-c-sharp + // Stolen from here : https://stackoverflow.com/questions/3261451/using-a-bitmask-in-c-sharp - public static class FlagsHelper - { - public static bool IsSet(T flags, T flag) where T : struct - { - var flagsValue = (int)(object)flags; - var flagValue = (int)(object)flag; + public static class FlagsHelper + { + public static bool IsSet(T flags, T flag) where T : struct + { + var flagsValue = (int)(object)flags; + var flagValue = (int)(object)flag; - return (flagsValue & flagValue) != 0; - } + return (flagsValue & flagValue) != 0; + } - public static void Set(ref T flags, T flag) where T : struct - { - var flagsValue = (int)(object)flags; - var flagValue = (int)(object)flag; + public static void Set(ref T flags, T flag) where T : struct + { + var flagsValue = (int)(object)flags; + var flagValue = (int)(object)flag; - flags = (T)(object)(flagsValue | flagValue); - } + flags = (T)(object)(flagsValue | flagValue); + } - public static void Unset(ref T flags, T flag) where T : struct - { - var flagsValue = (int)(object)flags; - var flagValue = (int)(object)flag; + public static void Unset(ref T flags, T flag) where T : struct + { + var flagsValue = (int)(object)flags; + var flagValue = (int)(object)flag; - flags = (T)(object)(flagsValue & ~flagValue); - } - } + flags = (T)(object)(flagsValue & ~flagValue); + } + } } diff --git a/QSB/Utility/GOExtensions.cs b/QSB/Utility/GOExtensions.cs index 9d1e53e5..e734ac45 100644 --- a/QSB/Utility/GOExtensions.cs +++ b/QSB/Utility/GOExtensions.cs @@ -2,32 +2,32 @@ namespace QSB.Utility { - public static class GOExtensions - { - public static void Show(this GameObject gameObject) => SetVisibility(gameObject, true); + public static class GOExtensions + { + public static void Show(this GameObject gameObject) => SetVisibility(gameObject, true); - public static void Hide(this GameObject gameObject) => SetVisibility(gameObject, false); + public static void Hide(this GameObject gameObject) => SetVisibility(gameObject, false); - private static void SetVisibility(GameObject gameObject, bool isVisible) - { - var renderers = gameObject.GetComponentsInChildren(); - foreach (var renderer in renderers) - { - renderer.enabled = isVisible; - } - } + private static void SetVisibility(GameObject gameObject, bool isVisible) + { + var renderers = gameObject.GetComponentsInChildren(); + foreach (var renderer in renderers) + { + renderer.enabled = isVisible; + } + } - public static GameObject InstantiateInactive(this GameObject original) - { - original.SetActive(false); - var copy = Object.Instantiate(original); - original.SetActive(true); - return copy; - } + public static GameObject InstantiateInactive(this GameObject original) + { + original.SetActive(false); + var copy = Object.Instantiate(original); + original.SetActive(true); + return copy; + } - public static Transform InstantiateInactive(this Transform original) - { - return original.gameObject.InstantiateInactive().transform; - } - } + public static Transform InstantiateInactive(this Transform original) + { + return original.gameObject.InstantiateInactive().transform; + } + } } diff --git a/QSB/Utility/ListExtensions.cs b/QSB/Utility/ListExtensions.cs index c0ae8fdd..b0117404 100644 --- a/QSB/Utility/ListExtensions.cs +++ b/QSB/Utility/ListExtensions.cs @@ -3,18 +3,18 @@ using System.Collections.Generic; namespace QSB.Utility { - public static class ListExtensions - { - public static IEnumerable DistinctBy(this IEnumerable source, Func keySelector) - { - var seenKeys = new HashSet(); - foreach (var element in source) - { - if (seenKeys.Add(keySelector(element))) - { - yield return element; - } - } - } - } + public static class ListExtensions + { + public static IEnumerable DistinctBy(this IEnumerable source, Func keySelector) + { + var seenKeys = new HashSet(); + foreach (var element in source) + { + if (seenKeys.Add(keySelector(element))) + { + yield return element; + } + } + } + } } diff --git a/QSB/Utility/QuaternionHelper.cs b/QSB/Utility/QuaternionHelper.cs index 8be8a0de..363f5f9c 100644 --- a/QSB/Utility/QuaternionHelper.cs +++ b/QSB/Utility/QuaternionHelper.cs @@ -2,32 +2,32 @@ namespace QSB.Utility { - public static class QuaternionHelper - { - // Stolen from here: https://gist.github.com/maxattack/4c7b4de00f5c1b95a33b - public static Quaternion SmoothDamp(Quaternion rot, Quaternion target, ref Quaternion deriv, float time) - { - // account for double-cover - var dot = Quaternion.Dot(rot, target); - var multi = dot > 0f ? 1f : -1f; - target.x *= multi; - target.y *= multi; - target.z *= multi; - target.w *= multi; - // smooth damp (nlerp approx) - var result = new Vector4( - Mathf.SmoothDamp(rot.x, target.x, ref deriv.x, time), - Mathf.SmoothDamp(rot.y, target.y, ref deriv.y, time), - Mathf.SmoothDamp(rot.z, target.z, ref deriv.z, time), - Mathf.SmoothDamp(rot.w, target.w, ref deriv.w, time) - ).normalized; - // compute deriv - var dtInv = 1f / Time.deltaTime; - deriv.x = (result.x - rot.x) * dtInv; - deriv.y = (result.y - rot.y) * dtInv; - deriv.z = (result.z - rot.z) * dtInv; - deriv.w = (result.w - rot.w) * dtInv; - return new Quaternion(result.x, result.y, result.z, result.w); - } - } + public static class QuaternionHelper + { + // Stolen from here: https://gist.github.com/maxattack/4c7b4de00f5c1b95a33b + public static Quaternion SmoothDamp(Quaternion rot, Quaternion target, ref Quaternion deriv, float time) + { + // account for double-cover + var dot = Quaternion.Dot(rot, target); + var multi = dot > 0f ? 1f : -1f; + target.x *= multi; + target.y *= multi; + target.z *= multi; + target.w *= multi; + // smooth damp (nlerp approx) + var result = new Vector4( + Mathf.SmoothDamp(rot.x, target.x, ref deriv.x, time), + Mathf.SmoothDamp(rot.y, target.y, ref deriv.y, time), + Mathf.SmoothDamp(rot.z, target.z, ref deriv.z, time), + Mathf.SmoothDamp(rot.w, target.w, ref deriv.w, time) + ).normalized; + // compute deriv + var dtInv = 1f / Time.deltaTime; + deriv.x = (result.x - rot.x) * dtInv; + deriv.y = (result.y - rot.y) * dtInv; + deriv.z = (result.z - rot.z) * dtInv; + deriv.w = (result.w - rot.w) * dtInv; + return new Quaternion(result.x, result.y, result.z, result.w); + } + } } diff --git a/QSB/Utility/UnetExtensions.cs b/QSB/Utility/UnetExtensions.cs index 88927e34..1e93f1fc 100644 --- a/QSB/Utility/UnetExtensions.cs +++ b/QSB/Utility/UnetExtensions.cs @@ -1,7 +1,6 @@ using QSB.Player; using QSB.QuantumUNET; using QSB.TransformSync; -using UnityEngine.Networking; namespace QSB.Utility { diff --git a/QSB/WorldSync/Events/BoolWorldObjectMessage.cs b/QSB/WorldSync/Events/BoolWorldObjectMessage.cs index 533a2b1b..fa02052a 100644 --- a/QSB/WorldSync/Events/BoolWorldObjectMessage.cs +++ b/QSB/WorldSync/Events/BoolWorldObjectMessage.cs @@ -2,20 +2,20 @@ namespace QSB.WorldSync.Events { - public class BoolWorldObjectMessage : WorldObjectMessage - { - public bool State { get; set; } + public class BoolWorldObjectMessage : WorldObjectMessage + { + public bool State { get; set; } - public override void Deserialize(NetworkReader reader) - { - base.Deserialize(reader); - State = reader.ReadBoolean(); - } + public override void Deserialize(NetworkReader reader) + { + base.Deserialize(reader); + State = reader.ReadBoolean(); + } - public override void Serialize(NetworkWriter writer) - { - base.Serialize(writer); - writer.Write(State); - } - } + public override void Serialize(NetworkWriter writer) + { + base.Serialize(writer); + writer.Write(State); + } + } } diff --git a/QSB/WorldSync/Events/WorldObjectMessage.cs b/QSB/WorldSync/Events/WorldObjectMessage.cs index 0a7631d8..e8644217 100644 --- a/QSB/WorldSync/Events/WorldObjectMessage.cs +++ b/QSB/WorldSync/Events/WorldObjectMessage.cs @@ -3,20 +3,20 @@ using UnityEngine.Networking; namespace QSB.WorldSync.Events { - public class WorldObjectMessage : PlayerMessage - { - public int ObjectId { get; set; } + public class WorldObjectMessage : PlayerMessage + { + public int ObjectId { get; set; } - public override void Deserialize(NetworkReader reader) - { - base.Deserialize(reader); - ObjectId = reader.ReadInt32(); - } + public override void Deserialize(NetworkReader reader) + { + base.Deserialize(reader); + ObjectId = reader.ReadInt32(); + } - public override void Serialize(NetworkWriter writer) - { - base.Serialize(writer); - writer.Write(ObjectId); - } - } + public override void Serialize(NetworkWriter writer) + { + base.Serialize(writer); + writer.Write(ObjectId); + } + } } \ No newline at end of file diff --git a/QSB/WorldSync/WorldObject.cs b/QSB/WorldSync/WorldObject.cs index 89ec54b0..b8f423bd 100644 --- a/QSB/WorldSync/WorldObject.cs +++ b/QSB/WorldSync/WorldObject.cs @@ -1,7 +1,7 @@ namespace QSB.WorldSync { - public class WorldObject - { - public int ObjectId { get; protected set; } - } + public class WorldObject + { + public int ObjectId { get; protected set; } + } }