mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-03-09 22:14:26 +00:00
Code Issues Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Mister_Nebula 2020-11-03 21:18:40 +00:00
parent a0992d71c7
commit 5e9e1a7241
38 changed files with 91 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
QSB/Animation/AnimationSync.cs
View File

@ -56,7 +56,7 @@ namespace QSB.Animation
mirror.Init(_anim, _bodyAnim);
}
PlayerRegistry.PlayerSyncObjects.Add(this);
QSBPlayerManager.PlayerSyncObjects.Add(this);
for (var i = 0; i < _anim.parameterCount; i++)
{

2
QSB/Animation/Events/AnimTriggerEvent.cs
View File

@ -22,7 +22,7 @@ namespace QSB.Animation.Events
public override void OnReceiveRemote(AnimTriggerMessage message)
{
var animationSync = PlayerRegistry.GetSyncObject<AnimationSync>(message.AboutId);
var animationSync = QSBPlayerManager.GetSyncObject<AnimationSync>(message.AboutId);
if (animationSync == null)
{
return;

4
QSB/Animation/PlayerSuitEvent.cs
View File

@ -30,13 +30,13 @@ namespace QSB.Animation
public override void OnReceiveRemote(ToggleMessage message)
{
var player = PlayerRegistry.GetPlayer(message.AboutId);
var player = QSBPlayerManager.GetPlayer(message.AboutId);
player?.UpdateState(State.Suit, message.ToggleValue);
}
public override void OnReceiveLocal(ToggleMessage message)
{
PlayerRegistry.LocalPlayer.UpdateState(State.Suit, message.ToggleValue);
QSBPlayerManager.LocalPlayer.UpdateState(State.Suit, message.ToggleValue);
}
}
}

16
QSB/ConversationSync/ConversationManager.cs
View File

@ -38,19 +38,19 @@ namespace QSB.ConversationSync
public uint GetPlayerTalkingToTree(CharacterDialogueTree tree)
{
var treeIndex = WorldRegistry.OldDialogueTrees.IndexOf(tree);
if (!PlayerRegistry.PlayerList.Any(x => x.CurrentDialogueID == treeIndex))
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 PlayerRegistry.PlayerList.First(x => x.CurrentDialogueID == treeIndex).PlayerId;
return QSBPlayerManager.PlayerList.First(x => x.CurrentDialogueID == treeIndex).PlayerId;
}
public void SendPlayerOption(string text)
{
GlobalMessenger<uint, string, ConversationType>
.FireEvent(EventNames.QSBConversation, PlayerRegistry.LocalPlayerId, text, ConversationType.Player);
.FireEvent(EventNames.QSBConversation, QSBPlayerManager.LocalPlayerId, text, ConversationType.Player);
}
public void SendCharacterDialogue(int id, string text)
@ -67,7 +67,7 @@ namespace QSB.ConversationSync
public void CloseBoxPlayer()
{
GlobalMessenger<uint, string, ConversationType>
.FireEvent(EventNames.QSBConversation, PlayerRegistry.LocalPlayerId, "", ConversationType.ClosePlayer);
.FireEvent(EventNames.QSBConversation, QSBPlayerManager.LocalPlayerId, "", ConversationType.ClosePlayer);
}
public void CloseBoxCharacter(int id)
@ -84,18 +84,18 @@ namespace QSB.ConversationSync
return;
}
GlobalMessenger<int, uint, bool>
.FireEvent(EventNames.QSBConversationStartEnd, charId, PlayerRegistry.LocalPlayerId, state);
.FireEvent(EventNames.QSBConversationStartEnd, charId, QSBPlayerManager.LocalPlayerId, state);
}
public void DisplayPlayerConversationBox(uint playerId, string text)
{
if (playerId == PlayerRegistry.LocalPlayerId)
if (playerId == QSBPlayerManager.LocalPlayerId)
{
DebugLog.ToConsole("Error - Cannot display conversation box for local player!", MessageType.Error);
return;
}
var player = PlayerRegistry.GetPlayer(playerId);
var player = QSBPlayerManager.GetPlayer(playerId);
// Destroy old box if it exists
var playerBox = player.CurrentDialogueBox;
@ -104,7 +104,7 @@ namespace QSB.ConversationSync
Destroy(playerBox);
}
PlayerRegistry.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)

16
QSB/ConversationSync/ConversationPatches.cs
View File

@ -17,7 +17,7 @@ namespace QSB.ConversationSync
{
DebugLog.ToConsole($"Warning - Index for tree {__instance.name} was -1.", MessageType.Warning);
}
PlayerRegistry.LocalPlayer.CurrentDialogueID = index;
QSBPlayerManager.LocalPlayer.CurrentDialogueID = index;
ConversationManager.Instance.SendConvState(index, true);
}
@ -27,14 +27,14 @@ namespace QSB.ConversationSync
{
return false;
}
if (PlayerRegistry.LocalPlayer.CurrentDialogueID == -1)
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(PlayerRegistry.LocalPlayer.CurrentDialogueID, false);
ConversationManager.Instance.CloseBoxCharacter(PlayerRegistry.LocalPlayer.CurrentDialogueID);
PlayerRegistry.LocalPlayer.CurrentDialogueID = -1;
ConversationManager.Instance.SendConvState(QSBPlayerManager.LocalPlayer.CurrentDialogueID, false);
ConversationManager.Instance.CloseBoxCharacter(QSBPlayerManager.LocalPlayer.CurrentDialogueID);
QSBPlayerManager.LocalPlayer.CurrentDialogueID = -1;
ConversationManager.Instance.CloseBoxPlayer();
return true;
}
@ -57,8 +57,8 @@ namespace QSB.ConversationSync
{
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(() => PlayerRegistry.LocalPlayer.CurrentDialogueID != -1,
() => ConversationManager.Instance.SendCharacterDialogue(PlayerRegistry.LocalPlayer.CurrentDialogueID, key));
QSB.Helper.Events.Unity.RunWhen(() => QSBPlayerManager.LocalPlayer.CurrentDialogueID != -1,
() => ConversationManager.Instance.SendCharacterDialogue(QSBPlayerManager.LocalPlayer.CurrentDialogueID, key));
}
public static bool OnAnimatorIK(float ___headTrackingWeight,
@ -80,7 +80,7 @@ namespace QSB.ConversationSync
}
else
{
position = PlayerRegistry.GetPlayer(playerId).Camera.transform.position;
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);

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

@ -42,7 +42,7 @@ namespace QSB.ConversationSync.Events
UnityEngine.Object.Destroy(ConversationManager.Instance.BoxMappings[tree]);
break;
case ConversationType.ClosePlayer:
UnityEngine.Object.Destroy(PlayerRegistry.GetPlayer((uint)message.ObjectId).CurrentDialogueBox);
UnityEngine.Object.Destroy(QSBPlayerManager.GetPlayer((uint)message.ObjectId).CurrentDialogueBox);
break;
}
}

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

@ -42,7 +42,7 @@ namespace QSB.ConversationSync.Events
if (message.State)
{
// Start talking
PlayerRegistry.GetPlayer(message.PlayerId).CurrentDialogueID = message.CharacterId;
QSBPlayerManager.GetPlayer(message.PlayerId).CurrentDialogueID = message.CharacterId;
animController.SetValue("_inConversation", true);
animController.SetValue("_playerInHeadZone", true);
if (animController.GetValue<bool>("_hasTalkAnimation"))
@ -54,7 +54,7 @@ namespace QSB.ConversationSync.Events
else
{
// Stop talking
PlayerRegistry.GetPlayer(message.PlayerId).CurrentDialogueID = -1;
QSBPlayerManager.GetPlayer(message.PlayerId).CurrentDialogueID = -1;
animController.SetValue("_inConversation", false);
animController.SetValue("_playerInHeadZone", false);
if (animController.GetValue<bool>("_hasTalkAnimation"))
@ -72,7 +72,7 @@ namespace QSB.ConversationSync.Events
if (message.State)
{
DebugLog.DebugWrite("start convo faceplayer for " + message.CharacterId);
qsbFacePlayer.StartConversation(PlayerRegistry.GetPlayer(message.PlayerId).Body.transform.position);
qsbFacePlayer.StartConversation(QSBPlayerManager.GetPlayer(message.PlayerId).Body.transform.position);
}
else
{

2
QSB/DeathSync/Events/PlayerDeathEvent.cs
View File

@ -22,7 +22,7 @@ namespace QSB.DeathSync.Events
public override void OnReceiveRemote(PlayerDeathMessage message)
{
var playerName = PlayerRegistry.GetPlayer(message.AboutId).Name;
var playerName = QSBPlayerManager.GetPlayer(message.AboutId).Name;
var deathMessage = Necronomicon.GetPhrase(message.DeathType);
DebugLog.ToAll(string.Format(deathMessage, playerName));
}

8
QSB/ElevatorSync/ElevatorDirection.cs
View File

@ -1,8 +0,0 @@
namespace QSB.ElevatorSync
{
public enum ElevatorDirection
{
Up,
Down
}
}

3
QSB/ElevatorSync/ElevatorPatches.cs
View File

@ -10,9 +10,8 @@ namespace QSB.ElevatorSync
public static void StartLift(Elevator __instance)
{
var isGoingUp = __instance.GetValue<bool>("_goingToTheEnd");
var direction = isGoingUp ? ElevatorDirection.Up : ElevatorDirection.Down;
var id = ElevatorManager.Instance.GetId(__instance);
GlobalMessenger<int, ElevatorDirection>.FireEvent(EventNames.QSBStartLift, id, direction);
GlobalMessenger<int, bool>.FireEvent(EventNames.QSBStartLift, id, isGoingUp);
}
public override void DoPatches()

16
QSB/ElevatorSync/Events/ElevatorEvent.cs
View File

@ -4,26 +4,26 @@ using QSB.WorldSync;
namespace QSB.ElevatorSync.Events
{
public class ElevatorEvent : QSBEvent<ElevatorMessage>
public class ElevatorEvent : QSBEvent<BoolWorldObjectMessage>
{
public override EventType Type => EventType.Elevator;
public override void SetupListener() => GlobalMessenger<int, ElevatorDirection>.AddListener(EventNames.QSBStartLift, Handler);
public override void SetupListener() => GlobalMessenger<int, bool>.AddListener(EventNames.QSBStartLift, Handler);
public override void CloseListener() => GlobalMessenger<int, ElevatorDirection>.RemoveListener(EventNames.QSBStartLift, Handler);
public override void CloseListener() => GlobalMessenger<int, bool>.RemoveListener(EventNames.QSBStartLift, Handler);
private void Handler(int id, ElevatorDirection direction) => SendEvent(CreateMessage(id, direction));
private void Handler(int id, bool direction) => SendEvent(CreateMessage(id, direction));
private ElevatorMessage CreateMessage(int id, ElevatorDirection direction) => new ElevatorMessage
private BoolWorldObjectMessage CreateMessage(int id, bool direction) => new BoolWorldObjectMessage
{
Direction = direction,
State = direction,
ObjectId = id
};
public override void OnReceiveRemote(ElevatorMessage message)
public override void OnReceiveRemote(BoolWorldObjectMessage message)
{
var elevator = WorldRegistry.GetObject<QSBElevator>(message.ObjectId);
elevator?.RemoteCall(message.Direction);
elevator?.RemoteCall(message.State);
}
}
}

22
QSB/ElevatorSync/Events/ElevatorMessage.cs
View File

@ -1,22 +0,0 @@
using QSB.WorldSync;
using UnityEngine.Networking;
namespace QSB.ElevatorSync.Events
{
public class ElevatorMessage : WorldObjectMessage
{
public ElevatorDirection Direction { get; set; }
public override void Deserialize(NetworkReader reader)
{
base.Deserialize(reader);
Direction = (ElevatorDirection)reader.ReadInt32();
}
public override void Serialize(NetworkWriter writer)
{
base.Serialize(writer);
writer.Write((int)Direction);
}
}
}

6
QSB/ElevatorSync/QSBElevator.cs
View File

@ -30,15 +30,15 @@ namespace QSB.ElevatorSync
_owAudioSourceLP = _elevator.GetValue<OWAudioSource>("_owAudioSourceLP");
}
public void RemoteCall(ElevatorDirection direction)
public void RemoteCall(bool direction)
{
SetDirection(direction);
RemoteStartLift();
}
private void SetDirection(ElevatorDirection direction)
private void SetDirection(bool direction)
{
var isGoingUp = direction == ElevatorDirection.Up;
var isGoingUp = direction;
var targetPos = isGoingUp ? _endLocalPos : _startLocalPos;
_elevator.SetValue("_goingToTheEnd", isGoingUp);
_elevator.SetValue("_targetLocalPos", targetPos);

4
QSB/Events/PlayerJoinEvent.cs
View File

@ -22,7 +22,7 @@ namespace QSB.Events
public override void OnReceiveRemote(PlayerJoinMessage message)
{
var player = PlayerRegistry.GetPlayer(message.AboutId);
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);
@ -30,7 +30,7 @@ namespace QSB.Events
public override void OnReceiveLocal(PlayerJoinMessage message)
{
var player = PlayerRegistry.GetPlayer(PlayerRegistry.LocalPlayerId);
var player = QSBPlayerManager.GetPlayer(QSBPlayerManager.LocalPlayerId);
player.Name = message.PlayerName;
var text = $"Connected to server as {player.Name}.";
DebugLog.ToAll(text, MessageType.Info);

6
QSB/Events/PlayerLeaveEvent.cs
View File

@ -23,10 +23,10 @@ namespace QSB.Events
public override void OnReceiveRemote(PlayerLeaveMessage message)
{
var playerName = PlayerRegistry.GetPlayer(message.AboutId).Name;
var playerName = QSBPlayerManager.GetPlayer(message.AboutId).Name;
DebugLog.ToAll($"{playerName} disconnected.", MessageType.Info);
PlayerRegistry.GetPlayer(message.AboutId).HudMarker?.Remove();
PlayerRegistry.RemovePlayer(message.AboutId);
QSBPlayerManager.GetPlayer(message.AboutId).HudMarker?.Remove();
QSBPlayerManager.RemovePlayer(message.AboutId);
message.NetIds.ToList().ForEach(netId => QSBNetworkManager.Instance.CleanupNetworkBehaviour(netId));
}
}

6
QSB/Events/PlayerReadyEvent.cs
View File

@ -25,18 +25,18 @@ namespace QSB.Events
public override void OnServerReceive(ToggleMessage message)
{
DebugLog.DebugWrite($"[S] Get ready event from {message.FromId}", MessageType.Success);
if (message.FromId == PlayerRegistry.LocalPlayerId)
if (message.FromId == QSBPlayerManager.LocalPlayerId)
{
return;
}
PlayerRegistry.GetPlayer(message.AboutId).IsReady = message.ToggleValue;
QSBPlayerManager.GetPlayer(message.AboutId).IsReady = message.ToggleValue;
PlayerState.LocalInstance.Send();
}
public override void OnReceiveRemote(ToggleMessage message)
{
DebugLog.DebugWrite($"Get ready event from {message.FromId}", MessageType.Success);
foreach (var item in PlayerRegistry.GetSyncObjects<TransformSync.TransformSync>()
foreach (var item in QSBPlayerManager.GetSyncObjects<TransformSync.TransformSync>()
.Where(x => x != null && x.IsReady && x.ReferenceSector != null && x.PlayerId == LocalPlayerId))
{
GlobalMessenger<uint, QSBSector>.FireEvent(EventNames.QSBSectorChange, item.netId.Value, item.ReferenceSector);

8
QSB/Events/PlayerState.cs
View File

@ -19,18 +19,18 @@ namespace QSB.Events
private void OnClientReceiveMessage(PlayerStateMessage message)
{
if (message.AboutId == PlayerRegistry.LocalPlayerId)
if (message.AboutId == QSBPlayerManager.LocalPlayerId)
{
return;
}
QSB.Helper.Events.Unity.RunWhen(
() => PlayerRegistry.GetSyncObject<TransformSync.TransformSync>(message.AboutId) != null,
() => PlayerRegistry.HandleFullStateMessage(message));
() => QSBPlayerManager.GetSyncObject<TransformSync.TransformSync>(message.AboutId) != null,
() => QSBPlayerManager.HandleFullStateMessage(message));
}
public void Send()
{
foreach (var player in PlayerRegistry.PlayerList)
foreach (var player in QSBPlayerManager.PlayerList)
{
var message = new PlayerStateMessage
{

2
QSB/Events/PlayerStatesRequestEvent.cs
View File

@ -24,7 +24,7 @@ namespace QSB.Events
{
DebugLog.DebugWrite($"[S] Get state request from {message.FromId}");
PlayerState.LocalInstance.Send();
foreach (var item in PlayerRegistry.GetSyncObjects<TransformSync.TransformSync>()
foreach (var item in QSBPlayerManager.GetSyncObjects<TransformSync.TransformSync>()
.Where(x => x != null && x.IsReady && x.ReferenceSector != null))
{
GlobalMessenger<uint, QSBSector>.FireEvent(EventNames.QSBSectorChange, item.netId.Value, item.ReferenceSector);

8
QSB/Events/QSBEvent.cs
View File

@ -11,7 +11,7 @@ namespace QSB.Events
public abstract class QSBEvent<T> : IQSBEvent where T : PlayerMessage, new()
{
public abstract EventType Type { get; }
public uint LocalPlayerId => PlayerRegistry.LocalPlayerId;
public uint LocalPlayerId => QSBPlayerManager.LocalPlayerId;
private readonly MessageHandler<T> _eventHandler;
protected QSBEvent()
@ -58,7 +58,7 @@ namespace QSB.Events
public void SendEvent(T message)
{
message.FromId = PlayerRegistry.LocalPlayerId;
message.FromId = QSBPlayerManager.LocalPlayerId;
QSB.Helper.Events.Unity.RunWhen(() => PlayerTransformSync.LocalInstance != null, () => Send(message));
}
@ -76,8 +76,8 @@ namespace QSB.Events
private void OnClientReceive(T message)
{
if (message.FromId == PlayerRegistry.LocalPlayerId ||
PlayerRegistry.IsBelongingToLocalPlayer(message.AboutId))
if (message.FromId == QSBPlayerManager.LocalPlayerId ||
QSBPlayerManager.IsBelongingToLocalPlayer(message.AboutId))
{
OnReceiveLocal(message);
return;

2
QSB/Instruments/Events/PlayInstrumentEvent.cs
View File

@ -23,7 +23,7 @@ namespace QSB.Instruments.Events
public override void OnReceiveRemote(PlayInstrumentMessage message)
{
PlayerRegistry.GetPlayer(message.AboutId).CurrentInstrument = message.Type;
QSBPlayerManager.GetPlayer(message.AboutId).CurrentInstrument = message.Type;
DebugLog.DebugWrite($"Player ID {message.AboutId} now playing instrument {Enum.GetName(typeof(InstrumentType), message.Type)}");
}
}

4
QSB/Instruments/InstrumentsManager.cs
View File

@ -35,7 +35,7 @@ namespace QSB.Instruments
{
if (Input.GetKeyDown(KeyCode.Keypad9))
{
if (!PlayerRegistry.LocalPlayer.PlayingInstrument)
if (!QSBPlayerManager.LocalPlayer.PlayingInstrument)
{
CameraManager.Instance.SwitchTo3rdPerson();
SwitchToInstrument(InstrumentType.RIEBECK);
@ -53,7 +53,7 @@ namespace QSB.Instruments
public void SwitchToInstrument(InstrumentType type)
{
PlayerRegistry.LocalPlayer.CurrentInstrument = type;
QSBPlayerManager.LocalPlayer.CurrentInstrument = type;
GlobalMessenger<InstrumentType>.FireEvent(EventNames.QSBPlayInstrument, type);
}
}

4
QSB/PlayerInfo.cs
View File

@ -67,8 +67,8 @@ namespace QSB
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(() => PlayerRegistry.GetSyncObject<AnimationSync>(PlayerId) != null,
() => PlayerRegistry.GetSyncObject<AnimationSync>(PlayerId).SetSuitState(FlagsHelper.IsSet(State, State.Suit)));
QSB.Helper.Events.Unity.RunWhen(() => QSBPlayerManager.GetSyncObject<AnimationSync>(PlayerId) != null,
() => QSBPlayerManager.GetSyncObject<AnimationSync>(PlayerId).SetSuitState(FlagsHelper.IsSet(State, State.Suit)));
}
public bool GetState(State state)

2
QSB/PlayerSyncObject.cs
View File

@ -7,6 +7,6 @@ namespace QSB
public uint AttachedNetId => GetComponent<NetworkIdentity>()?.netId.Value ?? uint.MaxValue;
public uint PlayerId => this.GetPlayerOfObject();
public uint PreviousPlayerId { get; set; }
public PlayerInfo Player => PlayerRegistry.GetPlayer(PlayerId);
public PlayerInfo Player => QSBPlayerManager.GetPlayer(PlayerId);
}
}

4
QSB/QSB.csproj
View File

@ -139,11 +139,9 @@
<Compile Include="ConversationSync\ConversationManager.cs" />
<Compile Include="ConversationSync\QSBFacePlayerWhenTalking.cs" />
<Compile Include="DeathSync\DeathPatches.cs" />
<Compile Include="ElevatorSync\ElevatorDirection.cs" />
<Compile Include="ElevatorSync\QSBElevator.cs" />
<Compile Include="ElevatorSync\Events\ElevatorEvent.cs" />
<Compile Include="ElevatorSync\ElevatorManager.cs" />
<Compile Include="ElevatorSync\Events\ElevatorMessage.cs" />
<Compile Include="ElevatorSync\ElevatorPatches.cs" />
<Compile Include="Events\EventNames.cs" />
<Compile Include="DeathSync\Events\PlayerDeathEvent.cs" />
@ -213,7 +211,7 @@
<Compile Include="State.cs" />
<Compile Include="DeathSync\PreventShipDestruction.cs" />
<Compile Include="DeathSync\RespawnOnDeath.cs" />
<Compile Include="PlayerRegistry.cs" />
<Compile Include="QSBPlayerManager.cs" />
<Compile Include="TransformSync\PlayerCameraSync.cs" />
<Compile Include="Utility\FlagsHelper.cs" />
<Compile Include="TransformSync\PlayerHUDMarker.cs" />

24
QSB/QSBNetworkManager.cs
View File

@ -172,13 +172,13 @@ namespace QSB
Destroy(GetComponent<RespawnOnDeath>());
Destroy(GetComponent<PreventShipDestruction>());
QSBEventManager.Reset();
PlayerRegistry.PlayerList.ForEach(player => player.HudMarker?.Remove());
QSBPlayerManager.PlayerList.ForEach(player => player.HudMarker?.Remove());
foreach (var player in PlayerRegistry.PlayerList)
foreach (var player in QSBPlayerManager.PlayerList)
{
PlayerRegistry.GetPlayerNetIds(player).ForEach(CleanupNetworkBehaviour);
QSBPlayerManager.GetPlayerNetIds(player).ForEach(CleanupNetworkBehaviour);
}
PlayerRegistry.RemoveAllPlayers();
QSBPlayerManager.RemoveAllPlayers();
WorldRegistry.RemoveObjects<QSBOrbSlot>();
WorldRegistry.RemoveObjects<QSBElevator>();
@ -205,7 +205,7 @@ namespace QSB
}
}
PlayerRegistry.GetPlayer(playerId).HudMarker?.Remove();
QSBPlayerManager.GetPlayer(playerId).HudMarker?.Remove();
CleanupConnection(connection);
}
@ -216,7 +216,7 @@ namespace QSB
Destroy(GetComponent<PreventShipDestruction>());
QSBEventManager.Reset();
DebugLog.ToConsole("[S] Server stopped!", MessageType.Info);
PlayerRegistry.PlayerList.ForEach(player => player.HudMarker?.Remove());
QSBPlayerManager.PlayerList.ForEach(player => player.HudMarker?.Remove());
NetworkServer.connections.ToList().ForEach(CleanupConnection);
WorldRegistry.RemoveObjects<QSBOrbSlot>();
@ -239,13 +239,13 @@ namespace QSB
DebugLog.ToConsole("Error when getting playerId in CleanupConnection: " + ex.Message, MessageType.Error);
return;
}
if (!PlayerRegistry.PlayerExists(playerId))
if (!QSBPlayerManager.PlayerExists(playerId))
{
return;
}
var playerName = PlayerRegistry.GetPlayer(playerId).Name;
var playerName = QSBPlayerManager.GetPlayer(playerId).Name;
DebugLog.ToConsole($"{playerName} disconnected.", MessageType.Info);
PlayerRegistry.RemovePlayer(playerId);
QSBPlayerManager.RemovePlayer(playerId);
var netIds = connection.clientOwnedObjects?.Select(x => x.Value).ToList();
netIds.ForEach(CleanupNetworkBehaviour);
@ -264,8 +264,8 @@ namespace QSB
if (transformSync != null)
{
DebugLog.DebugWrite($" * Removing TransformSync from syncobjects");
PlayerRegistry.PlayerSyncObjects.Remove(transformSync);
if (transformSync.SyncedTransform != null && netId != PlayerRegistry.LocalPlayerId && !networkBehaviour.hasAuthority)
QSBPlayerManager.PlayerSyncObjects.Remove(transformSync);
if (transformSync.SyncedTransform != null && netId != QSBPlayerManager.LocalPlayerId && !networkBehaviour.hasAuthority)
{
DebugLog.DebugWrite($" * Destroying {transformSync.SyncedTransform.gameObject.name}");
Destroy(transformSync.SyncedTransform.gameObject);
@ -277,7 +277,7 @@ namespace QSB
if (animationSync != null)
{
DebugLog.DebugWrite($" * Removing AnimationSync from syncobjects");
PlayerRegistry.PlayerSyncObjects.Remove(animationSync);
QSBPlayerManager.PlayerSyncObjects.Remove(animationSync);
}
if (!networkBehaviour.hasAuthority)

2
QSB/PlayerRegistry.cs → QSB/QSBPlayerManager.cs
View File

@ -9,7 +9,7 @@ using UnityEngine.Networking;
namespace QSB
{
public static class PlayerRegistry
public static class QSBPlayerManager
{
public static uint LocalPlayerId => PlayerTransformSync.LocalInstance.GetComponent<NetworkIdentity>()?.netId.Value ?? uint.MaxValue;
public static PlayerInfo LocalPlayer => GetPlayer(LocalPlayerId);

4
QSB/Tools/Events/PlayerFlashlightEvent.cs
View File

@ -30,14 +30,14 @@ namespace QSB.Tools.Events
public override void OnReceiveRemote(ToggleMessage message)
{
var player = PlayerRegistry.GetPlayer(message.AboutId);
var player = QSBPlayerManager.GetPlayer(message.AboutId);
player.UpdateState(State.Flashlight, message.ToggleValue);
player.FlashLight?.UpdateState(message.ToggleValue);
}
public override void OnReceiveLocal(ToggleMessage message)
{
PlayerRegistry.LocalPlayer.UpdateState(State.Flashlight, message.ToggleValue);
QSBPlayerManager.LocalPlayer.UpdateState(State.Flashlight, message.ToggleValue);
}
}
}

4
QSB/Tools/Events/PlayerProbeEvent.cs
View File

@ -30,14 +30,14 @@ namespace QSB.Tools.Events
public override void OnReceiveRemote(ToggleMessage message)
{
var player = PlayerRegistry.GetPlayer(message.AboutId);
var player = QSBPlayerManager.GetPlayer(message.AboutId);
player.UpdateState(State.ProbeActive, message.ToggleValue);
player.Probe?.SetState(message.ToggleValue);
}
public override void OnReceiveLocal(ToggleMessage message)
{
PlayerRegistry.LocalPlayer.UpdateState(State.ProbeActive, message.ToggleValue);
QSBPlayerManager.LocalPlayer.UpdateState(State.ProbeActive, message.ToggleValue);
}
}
}

4
QSB/Tools/Events/PlayerProbeLauncherEvent.cs
View File

@ -30,14 +30,14 @@ namespace QSB.Tools.Events
public override void OnReceiveRemote(ToggleMessage message)
{
var player = PlayerRegistry.GetPlayer(message.AboutId);
var player = QSBPlayerManager.GetPlayer(message.AboutId);
player.UpdateState(State.ProbeLauncher, message.ToggleValue);
player.ProbeLauncher?.ChangeEquipState(message.ToggleValue);
}
public override void OnReceiveLocal(ToggleMessage message)
{
PlayerRegistry.LocalPlayer.UpdateState(State.ProbeLauncher, message.ToggleValue);
QSBPlayerManager.LocalPlayer.UpdateState(State.ProbeLauncher, message.ToggleValue);
}
}
}

4
QSB/Tools/Events/PlayerSignalscopeEvent.cs
View File

@ -30,14 +30,14 @@ namespace QSB.Tools.Events
public override void OnReceiveRemote(ToggleMessage message)
{
var player = PlayerRegistry.GetPlayer(message.AboutId);
var player = QSBPlayerManager.GetPlayer(message.AboutId);
player.UpdateState(State.Signalscope, message.ToggleValue);
player.Signalscope?.ChangeEquipState(message.ToggleValue);
}
public override void OnReceiveLocal(ToggleMessage message)
{
PlayerRegistry.LocalPlayer.UpdateState(State.Signalscope, message.ToggleValue);
QSBPlayerManager.LocalPlayer.UpdateState(State.Signalscope, message.ToggleValue);
}
}
}

4
QSB/Tools/Events/PlayerTranslatorEvent.cs
View File

@ -30,14 +30,14 @@ namespace QSB.Tools.Events
public override void OnReceiveRemote(ToggleMessage message)
{
var player = PlayerRegistry.GetPlayer(message.AboutId);
var player = QSBPlayerManager.GetPlayer(message.AboutId);
player.UpdateState(State.Translator, message.ToggleValue);
player.Translator?.ChangeEquipState(message.ToggleValue);
}
public override void OnReceiveLocal(ToggleMessage message)
{
PlayerRegistry.LocalPlayer.UpdateState(State.Translator, message.ToggleValue);
QSBPlayerManager.LocalPlayer.UpdateState(State.Translator, message.ToggleValue);
}
}
}

2
QSB/TransformSync/PlayerCameraSync.cs
View File

@ -41,7 +41,7 @@ namespace QSB.TransformSync
public override bool IsReady => Locator.GetPlayerTransform() != null
&& Player != null
&& PlayerRegistry.PlayerExists(Player.PlayerId)
&& QSBPlayerManager.PlayerExists(Player.PlayerId)
&& netId.Value != uint.MaxValue
&& netId.Value != 0U;
}

2
QSB/TransformSync/PlayerProbeSync.cs
View File

@ -97,7 +97,7 @@ namespace QSB.TransformSync
public override bool IsReady => Locator.GetProbe() != null
&& Player != null
&& PlayerRegistry.PlayerExists(Player.PlayerId)
&& QSBPlayerManager.PlayerExists(Player.PlayerId)
&& Player.IsReady
&& netId.Value != uint.MaxValue
&& netId.Value != 0U;

2
QSB/TransformSync/PlayerSectorEvent.cs
View File

@ -42,7 +42,7 @@ namespace QSB.TransformSync
return;
}
var transformSync = PlayerRegistry.GetSyncObject<TransformSync>(message.AboutId);
var transformSync = QSBPlayerManager.GetSyncObject<TransformSync>(message.AboutId);
QSB.Helper.Events.Unity.RunWhen(() => transformSync?.SyncedTransform != null,
() => transformSync?.SetReferenceSector(sector));

2
QSB/TransformSync/PlayerTransformSync.cs
View File

@ -49,7 +49,7 @@ namespace QSB.TransformSync
public override bool IsReady => Locator.GetPlayerTransform() != null
&& Player != null
&& PlayerRegistry.PlayerExists(Player.PlayerId)
&& QSBPlayerManager.PlayerExists(Player.PlayerId)
&& Player.IsReady
&& netId.Value != uint.MaxValue
&& netId.Value != 0U;

2
QSB/TransformSync/SectorSync.cs
View File

@ -20,7 +20,7 @@ namespace QSB.TransformSync
{
return;
}
PlayerRegistry.GetSyncObjects<TransformSync>().Where(x => x.hasAuthority).ToList().ForEach(CheckTransformSyncSector);
QSBPlayerManager.GetSyncObjects<TransformSync>().Where(x => x.hasAuthority).ToList().ForEach(CheckTransformSyncSector);
_checkTimer = 0;
}

2
QSB/TransformSync/ShipTransformSync.cs
View File

@ -51,7 +51,7 @@ namespace QSB.TransformSync
public override bool IsReady => GetShipModel() != null
&& Player != null
&& PlayerRegistry.PlayerExists(Player.PlayerId)
&& QSBPlayerManager.PlayerExists(Player.PlayerId)
&& Player.IsReady
&& netId.Value != uint.MaxValue
&& netId.Value != 0U;

2
QSB/TransformSync/TransformSync.cs
View File

@ -22,7 +22,7 @@ namespace QSB.TransformSync
protected virtual void Awake()
{
DebugLog.DebugWrite($"Awake of {AttachedNetId} ({GetType().Name})");
PlayerRegistry.PlayerSyncObjects.Add(this);
QSBPlayerManager.PlayerSyncObjects.Add(this);
DontDestroyOnLoad(gameObject);
QSBSceneManager.OnSceneLoaded += OnSceneLoaded;
}