mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-01-30 12:32:55 +00:00
Code Issues Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Mister_Nebula 2021-03-07 09:27:23 +00:00
parent f137bd37ae
commit 0453666141
12 changed files with 19 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
QSB/ItemSync/CustomNomaiRemoteCamera.cs
View File

@ -3,7 +3,7 @@ using UnityEngine;
namespace QSB.ItemSync namespace QSB.ItemSync
{ {
class CustomNomaiRemoteCamera : MonoBehaviour internal class CustomNomaiRemoteCamera : MonoBehaviour
{ {
private OWCamera _camera; private OWCamera _camera;
private AudioListener _audioListener; private AudioListener _audioListener;
@ -70,7 +70,7 @@ namespace QSB.ItemSync
enabled = false; enabled = false;
} }
public bool IsActive() public bool IsActive()
=> enabled; => enabled;
public void SetImageEffectFade(float fade) public void SetImageEffectFade(float fade)

14
QSB/ItemSync/CustomNomaiRemoteCameraPlatform.cs
View File

@ -8,7 +8,7 @@ using UnityEngine;
namespace QSB.ItemSync namespace QSB.ItemSync
{ {
class CustomNomaiRemoteCameraPlatform : NomaiShared internal class CustomNomaiRemoteCameraPlatform : NomaiShared
{ {
private static List<CustomNomaiRemoteCameraPlatform> s_platforms; private static List<CustomNomaiRemoteCameraPlatform> s_platforms;
private static MaterialPropertyBlock s_matPropBlock; private static MaterialPropertyBlock s_matPropBlock;
@ -594,7 +594,7 @@ namespace QSB.ItemSync
private void DisconnectCamera() private void DisconnectCamera()
{ {
DebugLog.DebugWrite($"{_oldPlatform.name} DisconnectCamera"); DebugLog.DebugWrite($"{_oldPlatform.name} DisconnectCamera");
var cameraState = this._cameraState; var cameraState = _cameraState;
if (cameraState != CameraState.Connected && cameraState != CameraState.Connecting_FadeOut) if (cameraState != CameraState.Connected && cameraState != CameraState.Connecting_FadeOut)
{ {
if (cameraState == CameraState.Connecting_FadeIn) if (cameraState == CameraState.Connecting_FadeIn)
@ -692,15 +692,9 @@ namespace QSB.ItemSync
return null; return null;
} }
public SharedStone GetSocketedStone() public SharedStone GetSocketedStone() => _sharedStone;
{
return _sharedStone;
}
public bool IsPlatformActive() public bool IsPlatformActive() => _platformActive;
{
return _platformActive;
}
public enum CameraState public enum CameraState
{ {

3
QSB/ItemSync/CustomNomaiRemoteCameraStreaming.cs
View File

@ -1,10 +1,9 @@
using OWML.Utils; using OWML.Utils;
using QSB.Utility;
using UnityEngine; using UnityEngine;
namespace QSB.ItemSync namespace QSB.ItemSync
{ {
class CustomNomaiRemoteCameraStreaming : SectoredMonoBehaviour internal class CustomNomaiRemoteCameraStreaming : SectoredMonoBehaviour
{ {
private OWTriggerVolume _owTriggerVolume; private OWTriggerVolume _owTriggerVolume;
public CustomNomaiRemoteCameraPlatform _remoteCameraPlatform public CustomNomaiRemoteCameraPlatform _remoteCameraPlatform

5
QSB/ItemSync/Patches/ItemPatches.cs
View File

@ -33,10 +33,7 @@ namespace QSB.ItemSync.Patches
} }
public static bool Platform_ReturnFalse() public static bool Platform_ReturnFalse() => false;
{
return false;
}
public static bool ItemTool_MoveItemToCarrySocket(OWItem item) public static bool ItemTool_MoveItemToCarrySocket(OWItem item)
{ {

3
QSB/QSBInputManager.cs
View File

@ -1,5 +1,4 @@
using System; using UnityEngine;
using UnityEngine;
namespace QSB namespace QSB
{ {

2
QSB/QuantumSync/WorldObjects/QSBSocketedQuantumObject.cs
View File

@ -59,7 +59,7 @@ namespace QSB.QuantumSync.WorldObjects
component.MoveToRelativeLocation(location, AttachedObject.transform); component.MoveToRelativeLocation(location, AttachedObject.transform);
} }
if ((QuantumManager.Instance.Shrine as SocketedQuantumObject) != AttachedObject) if (QuantumManager.Instance.Shrine != AttachedObject)
{ {
AttachedObject.transform.localRotation = message.LocalRotation; AttachedObject.transform.localRotation = message.LocalRotation;
} }

6
QSB/StatueSync/StatueManager.cs
View File

@ -10,12 +10,12 @@ namespace QSB.StatueSync
public bool HasStartedStatueLocally; public bool HasStartedStatueLocally;
private void Awake() private void Awake()
{ {
Instance = this; Instance = this;
QSBSceneManager.OnUniverseSceneLoaded += (OWScene scene) => QSBPlayerManager.ShowAllPlayers(); QSBSceneManager.OnUniverseSceneLoaded += (OWScene scene) => QSBPlayerManager.ShowAllPlayers();
} }
private void OnDestroy() private void OnDestroy()
=> QSBSceneManager.OnUniverseSceneLoaded -= (OWScene scene) => QSBPlayerManager.ShowAllPlayers(); => QSBSceneManager.OnUniverseSceneLoaded -= (OWScene scene) => QSBPlayerManager.ShowAllPlayers();
public void BeginSequence(Vector3 position, Quaternion rotation, float cameraDegrees) public void BeginSequence(Vector3 position, Quaternion rotation, float cameraDegrees)

2
QSB/Utility/GlobalMessenger4Args.cs
View File

@ -67,7 +67,7 @@ namespace QSB.Utility
} }
} }
private static IDictionary<string, EventData> _eventTable = new Dictionary<string, EventData>(ComparerLibrary.stringEqComparer); private static readonly IDictionary<string, EventData> _eventTable = new Dictionary<string, EventData>(ComparerLibrary.stringEqComparer);
private class EventData private class EventData
{ {

2
QSB/Utility/GlobalMessenger5Args.cs
View File

@ -67,7 +67,7 @@ namespace QSB.Utility
} }
} }
private static IDictionary<string, EventData> _eventTable = new Dictionary<string, EventData>(ComparerLibrary.stringEqComparer); private static readonly IDictionary<string, EventData> _eventTable = new Dictionary<string, EventData>(ComparerLibrary.stringEqComparer);
private class EventData private class EventData
{ {

2
QSB/Utility/GlobalMessenger6Args.cs
View File

@ -67,7 +67,7 @@ namespace QSB.Utility
} }
} }
private static IDictionary<string, EventData> _eventTable = new Dictionary<string, EventData>(ComparerLibrary.stringEqComparer); private static readonly IDictionary<string, EventData> _eventTable = new Dictionary<string, EventData>(ComparerLibrary.stringEqComparer);
private class EventData private class EventData
{ {

4
QSB/Utility/Popcron.Gizmos/GizmosInstance.cs
View File

@ -141,11 +141,9 @@ namespace Popcron
private void OnDisable() => Camera.onPostRender -= OnRendered; private void OnDisable() => Camera.onPostRender -= OnRendered;
private void Update() private void Update() =>
{
//always render something //always render something
Gizmos.Line(default, default); Gizmos.Line(default, default);
}
private void OnRendered(Camera camera) private void OnRendered(Camera camera)
{ {

4
QSB/WorldSync/QSBWorldSync.cs
View File

@ -24,7 +24,7 @@ namespace QSB.WorldSync
| BindingFlags.Public | BindingFlags.Public
| BindingFlags.NonPublic | BindingFlags.NonPublic
| BindingFlags.DeclaredOnly; | BindingFlags.DeclaredOnly;
private static Dictionary<MonoBehaviour, IWorldObject> WorldObjectsToUnityObjects = new Dictionary<MonoBehaviour, IWorldObject>(); private static readonly Dictionary<MonoBehaviour, IWorldObject> WorldObjectsToUnityObjects = new Dictionary<MonoBehaviour, IWorldObject>();
public static IEnumerable<TWorldObject> GetWorldObjects<TWorldObject>() public static IEnumerable<TWorldObject> GetWorldObjects<TWorldObject>()
=> WorldObjects.OfType<TWorldObject>(); => WorldObjects.OfType<TWorldObject>();
@ -41,7 +41,7 @@ namespace QSB.WorldSync
public static TWorldObject GetWorldFromUnity<TWorldObject, TUnityObject>(TUnityObject unityObject) public static TWorldObject GetWorldFromUnity<TWorldObject, TUnityObject>(TUnityObject unityObject)
where TWorldObject : WorldObject<TUnityObject> where TWorldObject : WorldObject<TUnityObject>
where TUnityObject : MonoBehaviour where TUnityObject : MonoBehaviour
=> WorldObjectsToUnityObjects[unityObject] as TWorldObject; => WorldObjectsToUnityObjects[unityObject] as TWorldObject;
public static int GetIdFromUnity<TWorldObject, TUnityObject>(TUnityObject unityObject) public static int GetIdFromUnity<TWorldObject, TUnityObject>(TUnityObject unityObject)