mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-02-20 15:41:01 +00:00
Code Issues Projects Releases Wiki Activity

removed world object bools from qsbcore since they're duplicates

Browse Source
This commit is contained in:
JohnCorby 2021-12-02 02:39:47 -08:00
parent 436b3ed9a0
commit 914a05916d
45 changed files with 71 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
QSB/Anglerfish/Events/AnglerChangeStateEvent.cs
View File

@ -26,7 +26,7 @@ namespace QSB.Anglerfish.Events
public override void OnReceiveRemote(bool isHost, AnglerChangeStateMessage message)
{
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
return;
}

6
QSB/Anglerfish/Patches/AnglerPatches.cs
View File

@ -32,7 +32,7 @@ namespace QSB.Anglerfish.Patches
[HarmonyPatch(typeof(AnglerfishController), nameof(AnglerfishController.OnSectorOccupantsUpdated))]
public static bool OnSectorOccupantsUpdated(AnglerfishController __instance)
{
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
return true;
}
@ -77,7 +77,7 @@ namespace QSB.Anglerfish.Patches
[HarmonyPatch(typeof(AnglerfishController), nameof(AnglerfishController.UpdateState))]
public static bool UpdateState(AnglerfishController __instance)
{
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
return true;
}
@ -172,7 +172,7 @@ namespace QSB.Anglerfish.Patches
[HarmonyPatch(typeof(AnglerfishController), nameof(AnglerfishController.UpdateMovement))]
public static bool UpdateMovement(AnglerfishController __instance)
{
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
return true;
}

6
QSB/Anglerfish/TransformSync/AnglerTransformSync.cs
View File

@ -9,7 +9,7 @@ namespace QSB.Anglerfish.TransformSync
{
public class AnglerTransformSync : UnsectoredRigidbodySync
{
public override bool IsReady => QSBCore.WorldObjectsAdded;
public override bool IsReady => WorldObjectManager.AllAdded;
public override bool UseInterpolation => false;
private QSBAngler _qsbAngler;
@ -47,7 +47,7 @@ namespace QSB.Anglerfish.TransformSync
{
base.DeserializeTransform(reader, initialState);
if (!QSBCore.WorldObjectsReady || HasAuthority)
if (!WorldObjectManager.AllReady || HasAuthority)
{
return;
}
@ -73,7 +73,7 @@ namespace QSB.Anglerfish.TransformSync
protected override void OnRenderObject()
{
if (!QSBCore.WorldObjectsReady
if (!WorldObjectManager.AllReady
|| !QSBCore.ShowLinesInDebug
|| !IsReady
|| ReferenceTransform == null

3
QSB/Animation/Player/Events/AnimationTriggerEvent.cs
View File

@ -1,5 +1,6 @@
using QSB.Events;
using QSB.Player;
using QSB.WorldSync;
namespace QSB.Animation.Player.Events
{
@ -20,7 +21,7 @@ namespace QSB.Animation.Player.Events
public override void OnReceiveRemote(bool server, AnimationTriggerMessage message)
{
var animationSync = QSBPlayerManager.GetSyncObject<AnimationSync>(message.AttachedNetId);
if (!QSBCore.WorldObjectsReady || animationSync == null)
if (!WorldObjectManager.AllReady || animationSync == null)
{
return;
}

3
QSB/Animation/Player/Events/ChangeAnimTypeEvent.cs
View File

@ -2,6 +2,7 @@
using QSB.Instruments;
using QSB.Messaging;
using QSB.Player;
using QSB.WorldSync;
namespace QSB.Animation.Player.Events
{
@ -20,7 +21,7 @@ namespace QSB.Animation.Player.Events
public override void OnReceiveRemote(bool server, EnumMessage<AnimationType> message)
{
if (!QSBCore.WorldObjectsReady || !QSBPlayerManager.GetPlayer(message.AboutId).IsReady)
if (!WorldObjectManager.AllReady || !QSBPlayerManager.GetPlayer(message.AboutId).IsReady)
{
return;
}

3
QSB/Animation/Player/Events/PlayerSuitEvent.cs
View File

@ -1,6 +1,7 @@
using QSB.Events;
using QSB.Messaging;
using QSB.Player;
using QSB.WorldSync;
namespace QSB.Animation.Player.Events
{
@ -32,7 +33,7 @@ namespace QSB.Animation.Player.Events
var player = QSBPlayerManager.GetPlayer(message.AboutId);
player.SuitedUp = message.ToggleValue;
if (!QSBCore.WorldObjectsReady || !player.IsReady)
if (!WorldObjectManager.AllReady || !player.IsReady)
{
return;
}

3
QSB/Animation/Player/Thrusters/RemoteThrusterFlameController.cs
View File

@ -1,4 +1,5 @@
using QSB.Player;
using QSB.WorldSync;
using UnityEngine;
namespace QSB.Animation.Player.Thrusters
@ -85,7 +86,7 @@ namespace QSB.Animation.Player.Thrusters
private void OnRenderObject()
{
if (!QSBCore.WorldObjectsReady || !QSBCore.ShowLinesInDebug)
if (!WorldObjectManager.AllReady || !QSBCore.ShowLinesInDebug)
{
return;
}

3
QSB/AuthoritySync/AuthorityQueueEvent.cs
View File

@ -1,4 +1,5 @@
using QSB.Events;
using QSB.WorldSync;
using QuantumUNET.Components;
namespace QSB.AuthoritySync
@ -26,7 +27,7 @@ namespace QSB.AuthoritySync
private static void OnReceive(AuthorityQueueMessage message)
{
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
return;
}

2
QSB/ConversationSync/Events/ConversationEvent.cs
View File

@ -22,7 +22,7 @@ namespace QSB.ConversationSync.Events
public override void OnReceiveRemote(bool server, ConversationMessage message)
{
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
return;
}

2
QSB/ConversationSync/Events/ConversationStartEndEvent.cs
View File

@ -29,7 +29,7 @@ namespace QSB.ConversationSync.Events
return;
}
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
return;
}

2
QSB/GeyserSync/Events/GeyserEvent.cs
View File

@ -21,7 +21,7 @@ namespace QSB.GeyserSync.Events
public override void OnReceiveRemote(bool isHost, BoolWorldObjectMessage message)
{
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
return;
}

2
QSB/JellyfishSync/Events/JellyfishRisingEvent.cs
View File

@ -23,7 +23,7 @@ namespace QSB.JellyfishSync.Events
public override void OnReceiveRemote(bool isHost, BoolWorldObjectMessage message)
{
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
return;
}

4
QSB/JellyfishSync/Patches/JellyfishPatches.cs
View File

@ -15,7 +15,7 @@ namespace QSB.JellyfishSync.Patches
[HarmonyPatch(typeof(JellyfishController), nameof(JellyfishController.OnSectorOccupantsUpdated))]
public static bool OnSectorOccupantsUpdated(JellyfishController __instance)
{
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
return true;
}
@ -42,7 +42,7 @@ namespace QSB.JellyfishSync.Patches
[HarmonyPatch(typeof(JellyfishController), nameof(JellyfishController.FixedUpdate))]
public static bool FixedUpdate(JellyfishController __instance)
{
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
return true;
}

8
QSB/JellyfishSync/TransformSync/JellyfishTransformSync.cs
View File

@ -11,7 +11,7 @@ namespace QSB.JellyfishSync.TransformSync
{
public class JellyfishTransformSync : UnsectoredRigidbodySync
{
public override bool IsReady => QSBCore.WorldObjectsAdded;
public override bool IsReady => WorldObjectManager.AllAdded;
public override bool UseInterpolation => false;
private QSBJellyfish _qsbJellyfish;
@ -47,7 +47,7 @@ namespace QSB.JellyfishSync.TransformSync
{
base.SerializeTransform(writer, initialState);
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
writer.Write(false);
return;
@ -63,7 +63,7 @@ namespace QSB.JellyfishSync.TransformSync
{
base.DeserializeTransform(reader, initialState);
if (!QSBCore.WorldObjectsReady || HasAuthority)
if (!WorldObjectManager.AllReady || HasAuthority)
{
reader.ReadBoolean();
return;
@ -142,7 +142,7 @@ namespace QSB.JellyfishSync.TransformSync
protected override void OnRenderObject()
{
if (!QSBCore.WorldObjectsReady
if (!WorldObjectManager.AllReady
|| !QSBCore.ShowLinesInDebug
|| !IsReady
|| ReferenceTransform == null

2
QSB/LogSync/Events/RevealFactEvent.cs
View File

@ -33,7 +33,7 @@ namespace QSB.LogSync.Events
QSBWorldSync.AddFactReveal(message.FactId, message.SaveGame, message.ShowNotification);
}
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
return;
}

2
QSB/MeteorSync/Events/FragmentDamageEvent.cs
View File

@ -23,7 +23,7 @@ namespace QSB.MeteorSync.Events
public override void OnReceiveRemote(bool isHost, FragmentDamageMessage message)
{
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
return;
}

2
QSB/MeteorSync/Events/FragmentResyncEvent.cs
View File

@ -48,7 +48,7 @@ namespace QSB.MeteorSync.Events
public override void OnReceiveRemote(bool isHost, FragmentResyncMessage msg)
{
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
return;
}

2
QSB/MeteorSync/Events/MeteorLaunchEvent.cs
View File

@ -24,7 +24,7 @@ namespace QSB.MeteorSync.Events
public override void OnReceiveRemote(bool isHost, MeteorLaunchMessage message)
{
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
return;
}

2
QSB/MeteorSync/Events/MeteorPreLaunchEvent.cs
View File

@ -22,7 +22,7 @@ namespace QSB.MeteorSync.Events
public override void OnReceiveRemote(bool isHost, WorldObjectMessage message)
{
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
return;
}

2
QSB/MeteorSync/Events/MeteorSpecialImpactEvent.cs
View File

@ -22,7 +22,7 @@ namespace QSB.MeteorSync.Events
public override void OnReceiveRemote(bool isHost, WorldObjectMessage message)
{
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
return;
}

2
QSB/MeteorSync/Patches/MeteorClientPatches.cs
View File

@ -148,7 +148,7 @@ namespace QSB.MeteorSync.Patches
{
return true;
}
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
return true;
}

4
QSB/MeteorSync/Patches/MeteorServerPatches.cs
View File

@ -15,7 +15,7 @@ namespace QSB.MeteorSync.Patches
[HarmonyPatch(typeof(MeteorLauncher), nameof(MeteorLauncher.FixedUpdate))]
public static bool FixedUpdate(MeteorLauncher __instance)
{
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
return true;
}
@ -202,7 +202,7 @@ namespace QSB.MeteorSync.Patches
{
return true;
}
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
return true;
}

2
QSB/OrbSync/TransformSync/NomaiOrbTransformSync.cs
View File

@ -74,7 +74,7 @@ namespace QSB.OrbSync.TransformSync
protected override Component InitRemoteTransform() => GetTransform();
protected override float DistanceLeeway => 1f;
public override bool IsReady => QSBCore.WorldObjectsReady;
public override bool IsReady => WorldObjectManager.AllReady;
public override bool UseInterpolation => false;
}
}

2
QSB/OrbSync/WorldObjects/QSBOrbSlot.cs
View File

@ -20,7 +20,7 @@ namespace QSB.OrbSync.WorldObjects
public void HandleEvent(bool state, int orbId)
{
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
return;
}

2
QSB/Player/TransformSync/PlayerTransformSync.cs
View File

@ -249,7 +249,7 @@ namespace QSB.Player.TransformSync
{
base.OnRenderObject();
if (!QSBCore.WorldObjectsReady
if (!WorldObjectManager.AllReady
|| !QSBCore.ShowLinesInDebug
|| !IsReady
|| ReferenceTransform == null)

2
QSB/QSBCore.cs
View File

@ -72,8 +72,6 @@ namespace QSB
public static AssetBundle InstrumentAssetBundle { get; private set; }
public static AssetBundle ConversationAssetBundle { get; private set; }
public static AssetBundle DebugAssetBundle { get; private set; }
public static bool WorldObjectsAdded => WorldObjectManager.AllAdded && IsInMultiplayer && PlayerTransformSync.LocalInstance != null;
public static bool WorldObjectsReady => WorldObjectManager.AllReady && IsInMultiplayer && PlayerTransformSync.LocalInstance != null;
public static bool IsHost => QNetworkServer.active;
public static bool IsInMultiplayer => QNetworkManager.singleton.isNetworkActive;
public static string QSBVersion => Helper.Manifest.Version;

3
QSB/QuantumSync/Events/MoonStateChangeEvent.cs
View File

@ -2,6 +2,7 @@
using QSB.Events;
using System.Linq;
using System.Reflection;
using QSB.WorldSync;
using UnityEngine;
namespace QSB.QuantumSync.Events
@ -23,7 +24,7 @@ namespace QSB.QuantumSync.Events
public override void OnReceiveRemote(bool server, MoonStateChangeMessage message)
{
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
return;
}

2
QSB/QuantumSync/Events/MultiStateChangeEvent.cs
View File

@ -33,7 +33,7 @@ namespace QSB.QuantumSync.Events
public override void OnReceiveRemote(bool server, MultiStateChangeMessage message)
{
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
return;
}

2
QSB/QuantumSync/Events/QuantumShuffleEvent.cs
View File

@ -20,7 +20,7 @@ namespace QSB.QuantumSync.Events
public override void OnReceiveRemote(bool server, QuantumShuffleMessage message)
{
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
return;
}

2
QSB/QuantumSync/Events/SocketStateChangeEvent.cs
View File

@ -24,7 +24,7 @@ namespace QSB.QuantumSync.Events
public override void OnReceiveRemote(bool server, SocketStateChangeMessage message)
{
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
return;
}

2
QSB/QuantumSync/QuantumManager.cs
View File

@ -67,7 +67,7 @@ namespace QSB.QuantumSync
public void OnRenderObject()
{
if (!QSBCore.WorldObjectsReady || !QSBCore.ShowLinesInDebug)
if (!WorldObjectManager.AllReady || !QSBCore.ShowLinesInDebug)
{
return;
}

4
QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs
View File

@ -136,7 +136,7 @@ namespace QSB.QuantumSync.WorldObjects
private void OnEnable(Shape s)
{
IsEnabled = true;
if (!QSBCore.WorldObjectsReady && !QSBCore.IsHost)
if (!WorldObjectManager.AllReady && !QSBCore.IsHost)
{
return;
}
@ -165,7 +165,7 @@ namespace QSB.QuantumSync.WorldObjects
}
IsEnabled = false;
if (!QSBCore.WorldObjectsReady && !QSBCore.IsHost)
if (!WorldObjectManager.AllReady && !QSBCore.IsHost)
{
return;
}

2
QSB/RoastingSync/Events/EnterExitRoastingEvent.cs
View File

@ -42,7 +42,7 @@ namespace QSB.RoastingSync.Events
public override void OnReceiveRemote(bool server, BoolWorldObjectMessage message)
{
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
return;
}

2
QSB/RoastingSync/Events/MarshmallowEventEvent.cs
View File

@ -24,7 +24,7 @@ namespace QSB.RoastingSync.Events
public override void OnReceiveRemote(bool server, EnumMessage<MarshmallowEventType> message)
{
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
return;
}

7
QSB/ShipSync/Patches/ShipPatches.cs
View File

@ -4,6 +4,7 @@ using QSB.Events;
using QSB.Patches;
using QSB.Utility;
using System;
using QSB.WorldSync;
using UnityEngine;
namespace QSB.ShipSync.Patches
@ -62,7 +63,7 @@ namespace QSB.ShipSync.Patches
public static bool InteractZone_UpdateInteractVolume(InteractZone __instance)
{
/* Angle for interaction with the ship hatch
*
*
* \ 80° / - If in ship
* \ /
* \ /
@ -70,10 +71,10 @@ namespace QSB.ShipSync.Patches
* / \
* / \
* / 280° \ - If not in ship
*
*
*/
if (!QSBCore.WorldObjectsReady || __instance != ShipManager.Instance.HatchInteractZone)
if (!WorldObjectManager.AllReady || __instance != ShipManager.Instance.HatchInteractZone)
{
return true;
}

2
QSB/Syncs/Sectored/BaseSectoredSync.cs
View File

@ -138,7 +138,7 @@ namespace QSB.Syncs.Sectored
public override void DeserializeTransform(QNetworkReader reader, bool initialState)
{
int sectorId;
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
sectorId = reader.ReadInt32();
if (initialState && sectorId != -1)

3
QSB/Syncs/Sectored/Rigidbodies/SectoredRigidbodySync.cs
View File

@ -1,5 +1,6 @@
using OWML.Common;
using QSB.Utility;
using QSB.WorldSync;
using QuantumUNET.Transport;
using UnityEngine;
@ -61,7 +62,7 @@ namespace QSB.Syncs.Sectored.Rigidbodies
{
base.DeserializeTransform(reader, initialState);
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
reader.ReadVector3();
DeserializeRotation(reader);

3
QSB/Syncs/Sectored/Transforms/SectoredTransformSync.cs
View File

@ -1,5 +1,6 @@
using OWML.Common;
using QSB.Utility;
using QSB.WorldSync;
using QuantumUNET.Transport;
using UnityEngine;
@ -31,7 +32,7 @@ namespace QSB.Syncs.Sectored.Transforms
{
base.DeserializeTransform(reader, initialState);
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
reader.ReadVector3();
DeserializeRotation(reader);

2
QSB/Syncs/SyncBase.cs
View File

@ -298,7 +298,7 @@ namespace QSB.Syncs
protected virtual void OnRenderObject()
{
if (!QSBCore.WorldObjectsReady
if (!WorldObjectManager.AllReady
|| !QSBCore.ShowLinesInDebug
|| !IsReady
|| ReferenceTransform == null)

3
QSB/Syncs/Unsectored/Rigidbodies/UnsectoredRigidbodySync.cs
View File

@ -1,4 +1,5 @@
using QSB.Utility;
using QSB.WorldSync;
using QuantumUNET.Transport;
using UnityEngine;
@ -55,7 +56,7 @@ namespace QSB.Syncs.Unsectored.Rigidbodies
public override void DeserializeTransform(QNetworkReader reader, bool initialState)
{
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
reader.ReadVector3();
DeserializeRotation(reader);

3
QSB/Syncs/Unsectored/Transforms/UnsectoredTransformSync.cs
View File

@ -1,5 +1,6 @@
using OWML.Common;
using QSB.Utility;
using QSB.WorldSync;
using QuantumUNET.Transport;
using UnityEngine;
@ -27,7 +28,7 @@ namespace QSB.Syncs.Unsectored.Transforms
public override void DeserializeTransform(QNetworkReader reader, bool initialState)
{
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
reader.ReadVector3();
DeserializeRotation(reader);

5
QSB/Tools/TranslatorTool/QSBTranslatorScanBeam.cs
View File

@ -1,4 +1,5 @@
using UnityEngine;
using QSB.WorldSync;
using UnityEngine;
namespace QSB.Tools.TranslatorTool
{
@ -76,7 +77,7 @@ namespace QSB.Tools.TranslatorTool
private void OnRenderObject()
{
if (!QSBCore.WorldObjectsReady || !QSBCore.ShowLinesInDebug)
if (!WorldObjectManager.AllReady || !QSBCore.ShowLinesInDebug)
{
return;
}

2
QSB/Tools/TranslatorTool/TranslationSync/Events/SetAsTranslatedEvent.cs
View File

@ -21,7 +21,7 @@ namespace QSB.Tools.TranslatorTool.TranslationSync.Events
public override void OnReceiveRemote(bool server, SetAsTranslatedMessage message)
{
if (!QSBCore.WorldObjectsReady)
if (!WorldObjectManager.AllReady)
{
return;
}

3
QSB/Utility/CustomRelativisticParticleSystem.cs
View File

@ -1,4 +1,5 @@
using QSB.Player;
using QSB.WorldSync;
using UnityEngine;
namespace QSB.Utility
@ -61,7 +62,7 @@ namespace QSB.Utility
private void FixedUpdate()
{
if (!QSBCore.WorldObjectsReady || !_isReady)
if (!WorldObjectManager.AllReady || !_isReady)
{
return;
}

4
QSB/Utility/DebugGUI.cs
View File

@ -85,7 +85,7 @@ namespace QSB.Utility
#region Column1 - Server data
WriteLine(1, $"FPS : {Mathf.Round(1f / Time.smoothDeltaTime)}");
WriteLine(1, $"HasWokenUp : {QSBCore.WorldObjectsReady}");
WriteLine(1, $"HasWokenUp : {WorldObjectManager.AllReady}");
if (WakeUpSync.LocalInstance != null)
{
WriteLine(1, $"Server State : {ServerStateManager.Instance.GetServerState()}");
@ -130,7 +130,7 @@ namespace QSB.Utility
WriteLine(2, $"Ready : {player.IsReady}");
WriteLine(2, $"Suited Up : {player.SuitedUp}");
if (player.IsReady && QSBCore.WorldObjectsReady)
if (player.IsReady && WorldObjectManager.AllReady)
{
var networkTransform = player.TransformSync;
var referenceSector = networkTransform.ReferenceSector;