This commit is contained in:
Mister_Nebula 2021-08-09 11:49:58 +01:00
parent 3363c389c4
commit 460a974ee2
25 changed files with 29 additions and 64 deletions

View File

@ -6,7 +6,7 @@ using UnityEngine;
namespace QSB.ClientServerStateSync
{
class ClientStateManager : MonoBehaviour
internal class ClientStateManager : MonoBehaviour
{
public static ClientStateManager Instance { get; private set; }

View File

@ -7,7 +7,7 @@ using UnityEngine;
namespace QSB.ClientServerStateSync
{
class ServerStateManager : MonoBehaviour
internal class ServerStateManager : MonoBehaviour
{
public static ServerStateManager Instance { get; private set; }

View File

@ -5,7 +5,7 @@ using QSB.Utility;
namespace QSB.DeathSync.Events
{
class EndLoopEvent : QSBEvent<EnumMessage<EndLoopReason>>
internal class EndLoopEvent : QSBEvent<EnumMessage<EndLoopReason>>
{
public override EventType Type => EventType.EndLoop;

View File

@ -5,7 +5,7 @@ using QSB.Utility;
namespace QSB.DeathSync.Events
{
class StartLoopEvent : QSBEvent<PlayerMessage>
internal class StartLoopEvent : QSBEvent<PlayerMessage>
{
public override EventType Type => EventType.StartLoop;

View File

@ -3,7 +3,6 @@ using QSB.Messaging;
using QSB.Player;
using QSB.Player.TransformSync;
using QSB.Utility;
using QuantumUNET;
using QuantumUNET.Components;
namespace QSB.Events

View File

@ -2,6 +2,7 @@
using QSB.Animation.NPC.Events;
using QSB.Animation.Player.Events;
using QSB.CampfireSync.Events;
using QSB.ClientServerStateSync.Events;
using QSB.ConversationSync.Events;
using QSB.DeathSync.Events;
using QSB.ElevatorSync.Events;
@ -14,7 +15,6 @@ using QSB.Player.Events;
using QSB.ProbeSync.Events;
using QSB.QuantumSync.Events;
using QSB.RoastingSync.Events;
using QSB.ClientServerStateSync.Events;
using QSB.ShipSync.Events;
using QSB.ShipSync.Events.Component;
using QSB.ShipSync.Events.Hull;

View File

@ -1,17 +1,14 @@
using QSB.CampfireSync.WorldObjects;
using OWML.Utils;
using QSB.CampfireSync.WorldObjects;
using QSB.ClientServerStateSync;
using QSB.Events;
using QSB.Messaging;
using QSB.QuantumSync;
using QSB.TranslationSync.WorldObjects;
using QSB.TranslationSync;
using QSB.TranslationSync.WorldObjects;
using QSB.Utility;
using QSB.WorldSync;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using OWML.Utils;
namespace QSB.Player.Events
{

View File

@ -17,7 +17,6 @@ using QSB.Player.TransformSync;
using QSB.PoolSync;
using QSB.QuantumSync;
using QSB.SectorSync;
using QSB.ClientServerStateSync;
using QSB.ShipSync;
using QSB.StatueSync;
using QSB.TimeSync;

View File

@ -2,6 +2,7 @@
using OWML.Utils;
using QSB.Animation.Player;
using QSB.Animation.Player.Thrusters;
using QSB.ClientServerStateSync;
using QSB.DeathSync;
using QSB.Events;
using QSB.Instruments;
@ -11,7 +12,6 @@ using QSB.Player;
using QSB.Player.TransformSync;
using QSB.PoolSync;
using QSB.ProbeSync.TransformSync;
using QSB.ClientServerStateSync;
using QSB.ShipSync.TransformSync;
using QSB.TimeSync;
using QSB.Utility;

View File

@ -1,5 +1,5 @@
using QSB.Events;
using QSB.ClientServerStateSync;
using QSB.ClientServerStateSync;
using QSB.Events;
using UnityEngine;
namespace QSB.StatueSync.Events

View File

@ -1,5 +1,4 @@
using QSB.Player;
using QSB.Utility;
using System.Collections;
using UnityEngine;

View File

@ -1,6 +1,5 @@
using QSB.SectorSync;
using QSB.SectorSync.WorldObjects;
using QSB.Utility;
using QSB.WorldSync;
using QuantumUNET.Transport;

View File

@ -28,10 +28,7 @@ namespace QSB.Syncs.RigidbodySync
QSBSceneManager.OnSceneLoaded += OnSceneLoaded;
}
protected virtual void OnDestroy()
{
QSBSceneManager.OnSceneLoaded -= OnSceneLoaded;
}
protected virtual void OnDestroy() => QSBSceneManager.OnSceneLoaded -= OnSceneLoaded;
private void OnSceneLoaded(OWScene oldScene, OWScene newScene, bool isInUniverse)
=> _isInitialized = false;

View File

@ -1,7 +1,5 @@
using OWML.Utils;
using QSB.Player;
using System;
using System.Linq;
using UnityEngine;
using UnityEngine.UI;

View File

@ -1,16 +1,15 @@
using OWML.Common;
using OWML.Utils;
using QSB.ClientServerStateSync;
using QSB.DeathSync;
using QSB.Events;
using QSB.Inputs;
using QSB.Player;
using QSB.ClientServerStateSync;
using QSB.TimeSync.Events;
using QSB.Utility;
using QuantumUNET;
using System.Linq;
using UnityEngine;
using System;
using UnityEngine;
namespace QSB.TimeSync
{

View File

@ -5,7 +5,7 @@ using QSB.WorldSync.Events;
namespace QSB.Tools.ProbeLauncherTool.Events
{
class LaunchProbeEvent : QSBEvent<WorldObjectMessage>
internal class LaunchProbeEvent : QSBEvent<WorldObjectMessage>
{
public override EventType Type => EventType.LaunchProbe;

View File

@ -4,7 +4,7 @@ using QSB.Player;
namespace QSB.Tools.ProbeLauncherTool.Events
{
class PlayerLaunchProbeEvent : QSBEvent<PlayerMessage>
internal class PlayerLaunchProbeEvent : QSBEvent<PlayerMessage>
{
public override EventType Type => EventType.PlayerLaunchProbe;

View File

@ -1,11 +1,10 @@
using QSB.Events;
using QSB.Messaging;
using QSB.Player;
using QSB.Utility;
namespace QSB.Tools.ProbeLauncherTool.Events
{
class PlayerRetrieveProbeEvent : QSBEvent<BoolMessage>
internal class PlayerRetrieveProbeEvent : QSBEvent<BoolMessage>
{
public override EventType Type => EventType.PlayerRetrieveProbe;

View File

@ -1,12 +1,11 @@
using QSB.Events;
using QSB.TimeSync.Events;
using QSB.Tools.ProbeLauncherTool.WorldObjects;
using QSB.WorldSync;
using QSB.WorldSync.Events;
namespace QSB.Tools.ProbeLauncherTool.Events
{
class RetrieveProbeEvent : QSBEvent<BoolWorldObjectMessage>
internal class RetrieveProbeEvent : QSBEvent<BoolWorldObjectMessage>
{
public override EventType Type => EventType.RetrieveProbe;

View File

@ -2,13 +2,12 @@
using QSB.Patches;
using QSB.Player;
using QSB.Tools.ProbeLauncherTool.WorldObjects;
using QSB.Utility;
using QSB.WorldSync;
using UnityEngine;
namespace QSB.Tools.ProbeLauncherTool.Patches
{
class LauncherPatches : QSBPatch
internal class LauncherPatches : QSBPatch
{
public override QSBPatchTypes Type => QSBPatchTypes.OnClientConnect;
@ -74,14 +73,8 @@ namespace QSB.Tools.ProbeLauncherTool.Patches
// TODO : ehhhh idk about this. maybe copy each sound source so we have a 2d version (for local) and a 3d version (for remote)?
// this would probably be a whole qsb version on it's own
public static void ProbeLauncherEffects_PlayRetrievalClip(OWAudioSource ____owAudioSource)
{
____owAudioSource.GetAudioSource().spatialBlend = 1f;
}
public static void ProbeLauncherEffects_PlayRetrievalClip(OWAudioSource ____owAudioSource) => ____owAudioSource.GetAudioSource().spatialBlend = 1f;
public static void ProbeLauncherEffects_PlayLaunchClip(OWAudioSource ____owAudioSource)
{
____owAudioSource.GetAudioSource().spatialBlend = 1f;
}
public static void ProbeLauncherEffects_PlayLaunchClip(OWAudioSource ____owAudioSource) => ____owAudioSource.GetAudioSource().spatialBlend = 1f;
}
}

View File

@ -1,10 +1,9 @@
using QSB.Events;
using QSB.Utility;
using UnityEngine;
namespace QSB.Tools.ProbeLauncherTool
{
class ProbeLauncherListener : MonoBehaviour
internal class ProbeLauncherListener : MonoBehaviour
{
private PlayerProbeLauncher _attachedLauncher;
@ -14,9 +13,6 @@ namespace QSB.Tools.ProbeLauncherTool
_attachedLauncher.OnLaunchProbe += OnLaunchProbe;
}
private void OnLaunchProbe(SurveyorProbe probe)
{
QSBEventManager.FireEvent(EventNames.QSBPlayerLaunchProbe);
}
private void OnLaunchProbe(SurveyorProbe probe) => QSBEventManager.FireEvent(EventNames.QSBPlayerLaunchProbe);
}
}

View File

@ -3,7 +3,7 @@ using QSB.WorldSync;
namespace QSB.Tools.ProbeLauncherTool
{
class ProbeLauncherManager : WorldObjectManager
internal class ProbeLauncherManager : WorldObjectManager
{
protected override void RebuildWorldObjects(OWScene scene)
=> QSBWorldSync.Init<QSBProbeLauncher, ProbeLauncher>();

View File

@ -1,13 +1,11 @@
using OWML.Utils;
using QSB.Events;
using QSB.ProbeSync;
using QSB.Utility;
using QSB.WorldSync;
using UnityEngine;
namespace QSB.Tools.ProbeLauncherTool.WorldObjects
{
class QSBProbeLauncher : WorldObject<ProbeLauncher>
internal class QSBProbeLauncher : WorldObject<ProbeLauncher>
{
private float _probeRetrievalLength;
private GameObject _preLaunchProbeProxy;

View File

@ -1,9 +1,8 @@
using QSB.Player;
using QSB.ClientServerStateSync;
using QSB.Player;
using QSB.ProbeSync.TransformSync;
using QSB.ClientServerStateSync;
using QSB.Syncs.TransformSync;
using QSB.TimeSync;
using System.Linq;
using UnityEngine;
namespace QSB.Utility

View File

@ -24,15 +24,9 @@ namespace QSB.WorldSync
_managers.Remove(this);
}
public static void SetNotReady()
{
AllReady = false;
}
public static void SetNotReady() => AllReady = false;
private void OnSceneLoaded(OWScene oldScene, OWScene newScene, bool inUniverse)
{
AllReady = false;
}
private void OnSceneLoaded(OWScene oldScene, OWScene newScene, bool inUniverse) => AllReady = false;
public static void Rebuild(OWScene scene)
{