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

Renamed messagetype to eventtype

Browse Source
This commit is contained in:
Mister_Nebula 2020-08-22 18:08:25 +01:00
parent 0c50650608
commit c1e55d84e9
24 changed files with 61 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
QSB/Animation/AnimTriggerEvent.cs
View File

@ -5,7 +5,7 @@ namespace QSB.Animation
{
public class AnimTriggerEvent : QSBEvent<AnimTriggerMessage>
{
public override MessageType Type => MessageType.PlayerJoin;
public override EventType Type => EventType.AnimTrigger;
public override void SetupListener()
{

2
QSB/Animation/PlayerSuitEvent.cs
View File

@ -5,7 +5,7 @@ namespace QSB.Animation
{
public class PlayerSuitEvent : QSBEvent<ToggleMessage>
{
public override MessageType Type => MessageType.SuitActiveChange;
public override EventType Type => EventType.SuitActiveChange;
public override void SetupListener()
{

2
QSB/DeathSync/PlayerDeathEvent.cs
View File

@ -6,7 +6,7 @@ namespace QSB.DeathSync
{
public class PlayerDeathEvent : QSBEvent<PlayerDeathMessage>
{
public override MessageType Type => MessageType.PlayerDeath;
public override EventType Type => EventType.PlayerDeath;
public override void SetupListener()
{

2
QSB/ElevatorSync/ElevatorEvent.cs
View File

@ -6,7 +6,7 @@ namespace QSB.ElevatorSync
{
public class ElevatorEvent : QSBEvent<ElevatorMessage>
{
public override MessageType Type => MessageType.Elevator;
public override EventType Type => EventType.Elevator;
public override void SetupListener()
{

9
QSB/Events/PlayerJoinEvent.cs
View File

@ -1,11 +1,12 @@
using QSB.Messaging;
using OWML.Common;
using QSB.Messaging;
using QSB.Utility;
namespace QSB.Events
{
public class PlayerJoinEvent : QSBEvent<PlayerJoinMessage>
{
public override MessageType Type => MessageType.PlayerJoin;
public override EventType Type => EventType.PlayerJoin;
public override void SetupListener()
{
@ -30,7 +31,7 @@ namespace QSB.Events
var player = PlayerRegistry.GetPlayer(message.AboutId);
player.Name = message.PlayerName;
var text = $"{player.Name} joined!";
DebugLog.ToAll(text, OWML.Common.MessageType.Info);
DebugLog.ToAll(text, MessageType.Info);
}
public override void OnReceiveLocal(PlayerJoinMessage message)
@ -38,7 +39,7 @@ namespace QSB.Events
var player = PlayerRegistry.GetPlayer(PlayerRegistry.LocalPlayerId);
player.Name = message.PlayerName;
var text = $"Connected to server as {player.Name}.";
DebugLog.ToAll(text, OWML.Common.MessageType.Info);
DebugLog.ToAll(text, MessageType.Info);
}
}
}

7
QSB/Events/PlayerLeaveEvent.cs
View File

@ -1,4 +1,5 @@
using QSB.Messaging;
using OWML.Common;
using QSB.Messaging;
using QSB.Utility;
using System.Linq;
@ -6,7 +7,7 @@ namespace QSB.Events
{
public class PlayerLeaveEvent : QSBEvent<PlayerLeaveMessage>
{
public override MessageType Type => MessageType.PlayerLeave;
public override EventType Type => EventType.PlayerLeave;
public override void SetupListener()
{
@ -29,7 +30,7 @@ namespace QSB.Events
public override void OnReceiveRemote(PlayerLeaveMessage message)
{
var playerName = PlayerRegistry.GetPlayer(message.AboutId).Name;
DebugLog.ToAll($"{playerName} disconnected.", OWML.Common.MessageType.Info);
DebugLog.ToAll($"{playerName} disconnected.", MessageType.Info);
PlayerRegistry.RemovePlayer(message.AboutId);
message.NetIds.ToList().ForEach(netId => QSBNetworkManager.Instance.CleanupNetworkBehaviour(netId));
}

2
QSB/Events/PlayerReadyEvent.cs
View File

@ -4,7 +4,7 @@ namespace QSB.Events
{
public class PlayerReadyEvent : QSBEvent<ToggleMessage>
{
public override MessageType Type => MessageType.PlayerReady;
public override EventType Type => EventType.PlayerReady;
public override void SetupListener()
{

2
QSB/Events/PlayerState.cs
View File

@ -11,7 +11,7 @@ namespace QSB.Events
private void Awake()
{
_messageHandler = new MessageHandler<PlayerStateMessage>(MessageType.FullState);
_messageHandler = new MessageHandler<PlayerStateMessage>(EventType.FullState);
_messageHandler.OnClientReceiveMessage += OnClientReceiveMessage;
LocalInstance = this;

2
QSB/Events/PlayerStatesRequestEvent.cs
View File

@ -6,7 +6,7 @@ namespace QSB.Events
{
public class PlayerStatesRequestEvent : QSBEvent<PlayerMessage>
{
public override MessageType Type => MessageType.FullStateRequest;
public override EventType Type => EventType.FullStateRequest;
public override void SetupListener()
{

2
QSB/Events/QSBEvent.cs
View File

@ -10,7 +10,7 @@ namespace QSB.Events
/// <typeparam name="T">The message type to use.</typeparam>
public abstract class QSBEvent<T> : IQSBEvent where T : PlayerMessage, new()
{
public abstract MessageType Type { get; }
public abstract EventType Type { get; }
public uint LocalPlayerId => PlayerRegistry.LocalPlayerId;
private readonly MessageHandler<T> _eventHandler;

2
QSB/GeyserSync/GeyserEvent.cs
View File

@ -6,7 +6,7 @@ namespace QSB.GeyserSync
{
public class GeyserEvent : QSBEvent<GeyserMessage>
{
public override MessageType Type => MessageType.Geyser;
public override EventType Type => EventType.Geyser;
public override void SetupListener()
{

2
QSB/Messaging/MessageType.cs → QSB/Messaging/EventType.cs
View File

@ -1,6 +1,6 @@
namespace QSB.Messaging
{
public enum MessageType
public enum EventType
{
Sector,
ServerTime,

27
QSB/Messaging/MessageHandler.cs
View File

@ -1,4 +1,7 @@
using System;
using OWML.Common;
using QSB.Utility;
using System;
using System.Linq;
using UnityEngine.Networking;
namespace QSB.Messaging
@ -9,11 +12,11 @@ namespace QSB.Messaging
public event Action<T> OnClientReceiveMessage;
public event Action<T> OnServerReceiveMessage;
private readonly MessageType _messageType;
private readonly EventType _eventType;
public MessageHandler(MessageType messageType)
public MessageHandler(EventType eventType)
{
_messageType = messageType + MsgType.Highest + 1;
_eventType = eventType + MsgType.Highest + 1;
if (QSBNetworkManager.Instance.IsReady)
{
Init();
@ -26,8 +29,16 @@ namespace QSB.Messaging
private void Init()
{
NetworkServer.RegisterHandler((short)_messageType, OnServerReceiveMessageHandler);
NetworkManager.singleton.client.RegisterHandler((short)_messageType, OnClientReceiveMessageHandler);
if (NetworkServer.handlers.Keys.Contains((short)_eventType))
{
DebugLog.LogState($"{_eventType} HANDLER", false);
DebugLog.ToConsole($"Error - NetworkServer already contains a handler for EventType {_eventType} : You probably used the wrong type in an event.",
MessageType.Error);
return;
}
NetworkServer.RegisterHandler((short)_eventType, OnServerReceiveMessageHandler);
NetworkManager.singleton.client.RegisterHandler((short)_eventType, OnClientReceiveMessageHandler);
DebugLog.LogState($"{_eventType} HANDLER", true);
}
public void SendToAll(T message)
@ -36,7 +47,7 @@ namespace QSB.Messaging
{
return;
}
NetworkServer.SendToAll((short)_messageType, message);
NetworkServer.SendToAll((short)_eventType, message);
}
public void SendToServer(T message)
@ -45,7 +56,7 @@ namespace QSB.Messaging
{
return;
}
NetworkManager.singleton.client.Send((short)_messageType, message);
NetworkManager.singleton.client.Send((short)_eventType, message);
}
private void OnClientReceiveMessageHandler(NetworkMessage netMsg)

7
QSB/PlayerRegistry.cs
View File

@ -1,4 +1,5 @@
using QSB.Messaging;
using OWML.Common;
using QSB.Messaging;
using QSB.TransformSync;
using QSB.Utility;
using System;
@ -26,7 +27,7 @@ namespace QSB
return player;
}
var stacktrace = new StackTrace();
DebugLog.ToConsole($"Creating player with id {id}, called from {stacktrace.GetFrame(1).GetMethod().DeclaringType}.{stacktrace.GetFrame(1).GetMethod().Name}", OWML.Common.MessageType.Info);
DebugLog.ToConsole($"Creating player with id {id}, called from {stacktrace.GetFrame(1).GetMethod().DeclaringType}.{stacktrace.GetFrame(1).GetMethod().Name}", MessageType.Info);
player = new PlayerInfo(id);
PlayerList.Add(player);
return player;
@ -35,7 +36,7 @@ namespace QSB
public static void RemovePlayer(uint id)
{
var stacktrace = new StackTrace();
DebugLog.ToConsole($"Removing player with id {id}, called from {stacktrace.GetFrame(1).GetMethod().DeclaringType.Name}.{stacktrace.GetFrame(1).GetMethod().Name}", OWML.Common.MessageType.Info);
DebugLog.ToConsole($"Removing player with id {id}, called from {stacktrace.GetFrame(1).GetMethod().DeclaringType.Name}.{stacktrace.GetFrame(1).GetMethod().Name}", MessageType.Info);
PlayerList.Remove(GetPlayer(id));
}

2
QSB/QSB.csproj
View File

@ -178,7 +178,7 @@
<Compile Include="Utility\DebugLog.cs" />
<Compile Include="Messaging\PlayerMessage.cs" />
<Compile Include="Messaging\MessageHandler.cs" />
<Compile Include="Messaging\MessageType.cs" />
<Compile Include="Messaging\EventType.cs" />
<Compile Include="PlayerInfo.cs" />
<Compile Include="State.cs" />
<Compile Include="DeathSync\PreventShipDestruction.cs" />

9
QSB/QSBNetworkManager.cs
View File

@ -1,4 +1,5 @@
using QSB.Animation;
using OWML.Common;
using QSB.Animation;
using QSB.DeathSync;
using QSB.Events;
using QSB.GeyserSync;
@ -111,7 +112,7 @@ namespace QSB
public override void OnStopClient() // Called on the client when closing connection
{
DebugLog.ToConsole("Disconnecting from server...", OWML.Common.MessageType.Info);
DebugLog.ToConsole("Disconnecting from server...", MessageType.Info);
Destroy(GetComponent<SectorSync>());
Destroy(GetComponent<RespawnOnDeath>());
Destroy(GetComponent<PreventShipDestruction>());
@ -142,7 +143,7 @@ namespace QSB
Destroy(GetComponent<RespawnOnDeath>());
Destroy(GetComponent<PreventShipDestruction>());
EventList.Reset();
DebugLog.ToConsole("Server stopped!", OWML.Common.MessageType.Info);
DebugLog.ToConsole("Server stopped!", MessageType.Info);
PlayerRegistry.PlayerList.ForEach(player => player.HudMarker?.Remove());
NetworkServer.connections.ToList().ForEach(CleanupConnection);
base.OnStopServer();
@ -156,7 +157,7 @@ namespace QSB
return;
}
var playerName = PlayerRegistry.GetPlayer(playerId).Name;
DebugLog.ToConsole($"{playerName} disconnected.", OWML.Common.MessageType.Info);
DebugLog.ToConsole($"{playerName} disconnected.", MessageType.Info);
PlayerRegistry.RemovePlayer(playerId);
if (playerId != PlayerRegistry.LocalPlayerId) // We don't want to delete the local player!

2
QSB/TimeSync/ServerTimeEvent.cs
View File

@ -5,7 +5,7 @@ namespace QSB.TimeSync
{
public class ServerTimeEvent : QSBEvent<ServerTimeMessage>
{
public override MessageType Type => MessageType.ServerTime;
public override EventType Type => EventType.ServerTime;
public override void SetupListener()
{

2
QSB/Tools/PlayerFlashlightEvent.cs
View File

@ -5,7 +5,7 @@ namespace QSB.Tools
{
public class PlayerFlashlightEvent : QSBEvent<ToggleMessage>
{
public override MessageType Type => MessageType.FlashlightActiveChange;
public override EventType Type => EventType.FlashlightActiveChange;
public override void SetupListener()
{

2
QSB/Tools/PlayerProbeEvent.cs
View File

@ -5,7 +5,7 @@ namespace QSB.Tools
{
public class PlayerProbeEvent : QSBEvent<ToggleMessage>
{
public override MessageType Type => MessageType.ProbeActiveChange;
public override EventType Type => EventType.ProbeActiveChange;
public override void SetupListener()
{

2
QSB/Tools/PlayerProbeLauncherEvent.cs
View File

@ -5,7 +5,7 @@ namespace QSB.Tools
{
public class PlayerProbeLauncherEvent : QSBEvent<ToggleMessage>
{
public override MessageType Type => MessageType.ProbeLauncherActiveChange;
public override EventType Type => EventType.ProbeLauncherActiveChange;
public override void SetupListener()
{

2
QSB/Tools/PlayerSignalscopeEvent.cs
View File

@ -5,7 +5,7 @@ namespace QSB.Tools
{
public class PlayerSignalscopeEvent : QSBEvent<ToggleMessage>
{
public override MessageType Type => MessageType.SignalscopeActiveChange;
public override EventType Type => EventType.SignalscopeActiveChange;
public override void SetupListener()
{

2
QSB/Tools/PlayerTranslatorEvent.cs
View File

@ -5,7 +5,7 @@ namespace QSB.Tools
{
public class PlayerTranslatorEvent : QSBEvent<ToggleMessage>
{
public override MessageType Type => MessageType.TranslatorActiveChange;
public override EventType Type => EventType.TranslatorActiveChange;
public override void SetupListener()
{

5
QSB/TransformSync/PlayerHUDMarker.cs
View File

@ -1,4 +1,5 @@
using QSB.Utility;
using OWML.Common;
using QSB.Utility;
using System;
using UnityEngine;
@ -57,7 +58,7 @@ namespace QSB.TransformSync
}
catch (Exception ex)
{
DebugLog.ToConsole($"Warning - Failed to remove PlayerHUDMarker for {_player.Name} ({_player.NetId}) : {ex}", OWML.Common.MessageType.Warning);
DebugLog.ToConsole($"Warning - Failed to remove PlayerHUDMarker for {_player.Name} ({_player.NetId}) : {ex}", MessageType.Warning);
}
}

7
QSB/TransformSync/PlayerSectorEvent.cs
View File

@ -1,4 +1,5 @@
using QSB.Events;
using OWML.Common;
using QSB.Events;
using QSB.Messaging;
using QSB.Utility;
using QSB.WorldSync;
@ -7,7 +8,7 @@ namespace QSB.TransformSync
{
public class PlayerSectorEvent : QSBEvent<WorldObjectMessage>
{
public override MessageType Type => MessageType.PlayerSectorChange;
public override EventType Type => EventType.PlayerSectorChange;
public override void SetupListener()
{
@ -37,7 +38,7 @@ namespace QSB.TransformSync
if (sector == null)
{
DebugLog.ToConsole($"Sector with order id {message.ObjectId} not found!", OWML.Common.MessageType.Warning);
DebugLog.ToConsole($"Sector with order id {message.ObjectId} not found!", MessageType.Warning);
return;
}