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

use constructors for everything

Browse Source
This commit is contained in:
JohnCorby 2021-12-22 17:13:54 -08:00
parent 774e04d735
commit 6d7fc8ecbf
8 changed files with 59 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
QSB/AuthoritySync/AuthQueueMessage.cs
View File

@ -7,9 +7,16 @@ namespace QSB.AuthoritySync
{
public class AuthQueueMessage : QSBEnumMessage<AuthQueueAction>
{
public QNetworkInstanceId NetId;
private QNetworkInstanceId NetId;
public AuthQueueMessage() => To = 0;
public AuthQueueMessage(QNetworkInstanceId netId, AuthQueueAction action)
{
To = 0;
NetId = netId;
Value = action;
}
public AuthQueueMessage() { }
public override void Deserialize(QNetworkReader reader)
{

6
QSB/AuthoritySync/AuthorityManager.cs
View File

@ -89,11 +89,7 @@ namespace QSB.AuthoritySync
#region any client
public static void FireAuthQueue(this QNetworkIdentity identity, AuthQueueAction action) =>
new AuthQueueMessage
{
NetId = identity.NetId,
Value = action
}.Send();
new AuthQueueMessage(identity.NetId, action).Send();
#endregion
}

9
QSB/Messaging/QSBMessage.cs
View File

@ -1,5 +1,4 @@
using System;
using QSB.Player;
using QuantumUNET.Messages;
using QuantumUNET.Transport;
@ -8,7 +7,7 @@ namespace QSB.Messaging
public abstract class QSBMessage : QMessageBase
{
/// set automatically when sending a message
public uint From;
internal uint From;
/// <summary>
/// (default) uint.MaxValue = send to everyone <br/>
/// 0 = send to host
@ -38,7 +37,7 @@ namespace QSB.Messaging
public abstract class QSBBoolMessage : QSBMessage
{
public bool Value;
protected bool Value;
public override void Serialize(QNetworkWriter writer)
{
@ -55,7 +54,7 @@ namespace QSB.Messaging
public abstract class QSBFloatMessage : QSBMessage
{
public float Value;
protected float Value;
public override void Serialize(QNetworkWriter writer)
{
@ -72,7 +71,7 @@ namespace QSB.Messaging
public abstract class QSBEnumMessage<E> : QSBMessage where E : Enum
{
public E Value;
protected E Value;
public override void Serialize(QNetworkWriter writer)
{

10
QSB/Messaging/QSBWorldObjectMessage.cs
View File

@ -6,8 +6,8 @@ namespace QSB.Messaging
{
public abstract class QSBWorldObjectMessage<T> : QSBMessage where T : IWorldObject
{
public int ObjectId;
public T WorldObject { get; private set; }
internal int ObjectId;
protected T WorldObject { get; private set; }
public override void Serialize(QNetworkWriter writer)
{
@ -39,7 +39,7 @@ namespace QSB.Messaging
public abstract class QSBBoolWorldObjectMessage<T> : QSBWorldObjectMessage<T> where T : IWorldObject
{
public bool Value;
protected bool Value;
public override void Serialize(QNetworkWriter writer)
{
@ -56,7 +56,7 @@ namespace QSB.Messaging
public abstract class QSBFloatWorldObjectMessage<T> : QSBWorldObjectMessage<T> where T : IWorldObject
{
public float Value;
protected float Value;
public override void Serialize(QNetworkWriter writer)
{
@ -75,7 +75,7 @@ namespace QSB.Messaging
where T : IWorldObject
where E : Enum
{
public E Value;
protected E Value;
public override void Serialize(QNetworkWriter writer)
{

39
QSB/Player/Events/PlayerJoinMessage.cs
View File

@ -8,11 +8,11 @@ namespace QSB.Player.Events
{
public class PlayerJoinMessage : QSBMessage
{
public string PlayerName;
public string QSBVersion;
public string GameVersion;
public GamePlatform Platform;
public bool DlcInstalled;
private string PlayerName;
private string QSBVersion;
private string GameVersion;
private GamePlatform Platform;
private bool DlcInstalled;
public PlayerJoinMessage(string name)
{
@ -52,11 +52,7 @@ namespace QSB.Player.Events
if (QSBCore.IsHost)
{
DebugLog.ToConsole($"Error - Client {PlayerName} connecting with wrong QSB version. (Client:{QSBVersion}, Server:{QSBCore.QSBVersion})", MessageType.Error);
new PlayerKickMessage
{
PlayerId = From,
Value = KickReason.QSBVersionNotMatching
}.Send();
new PlayerKickMessage(From, KickReason.QSBVersionNotMatching).Send();
}
return;
@ -67,11 +63,7 @@ namespace QSB.Player.Events
if (QSBCore.IsHost)
{
DebugLog.ToConsole($"Error - Client {PlayerName} connecting with wrong game version. (Client:{GameVersion}, Server:{QSBCore.GameVersion})", MessageType.Error);
new PlayerKickMessage
{
PlayerId = From,
Value = KickReason.GameVersionNotMatching
}.Send();
new PlayerKickMessage(From, KickReason.GameVersionNotMatching).Send();
}
return;
@ -82,11 +74,7 @@ namespace QSB.Player.Events
if (QSBCore.IsHost)
{
DebugLog.ToConsole($"Error - Client {PlayerName} connecting with wrong game platform. (Client:{Platform}, Server:{QSBCore.Platform})", MessageType.Error);
new PlayerKickMessage
{
PlayerId = From,
Value = KickReason.DLCNotMatching
}.Send();
new PlayerKickMessage(From, KickReason.DLCNotMatching).Send();
}
}
@ -95,11 +83,7 @@ namespace QSB.Player.Events
if (QSBCore.IsHost)
{
DebugLog.ToConsole($"Error - Client {PlayerName} connecting with wrong DLC installation state. (Client:{DlcInstalled}, Server:{QSBCore.DLCInstalled})", MessageType.Error);
new PlayerKickMessage
{
PlayerId = From,
Value = KickReason.GamePlatformNotMatching
}.Send();
new PlayerKickMessage(From, KickReason.GamePlatformNotMatching).Send();
}
}
@ -118,10 +102,7 @@ namespace QSB.Player.Events
if (QSBSceneManager.IsInUniverse)
{
player.IsReady = true;
new PlayerReadyMessage
{
Value = true
}.Send();
new PlayerReadyMessage(true).Send();
}
}
}

23
QSB/Player/Events/PlayerKickMessage.cs
View File

@ -3,13 +3,34 @@ using QSB.Messaging;
using QSB.Utility;
using QuantumUNET;
using System.Linq;
using QuantumUNET.Transport;
namespace QSB.Player.Events
{
// sent by the server only
internal class PlayerKickMessage : QSBEnumMessage<KickReason>
{
public uint PlayerId;
private uint PlayerId;
public PlayerKickMessage(uint playerId, KickReason reason)
{
PlayerId = playerId;
Value = reason;
}
public PlayerKickMessage() { }
public override void Serialize(QNetworkWriter writer)
{
base.Serialize(writer);
writer.Write(PlayerId);
}
public override void Deserialize(QNetworkReader reader)
{
base.Deserialize(reader);
PlayerId = reader.ReadUInt32();
}
public override void OnReceiveLocal()
{

6
QSB/Player/Events/PlayerReadyMessage.cs
View File

@ -7,6 +7,10 @@ namespace QSB.Player.Events
{
public class PlayerReadyMessage : QSBBoolMessage
{
public PlayerReadyMessage(bool ready) => Value = ready;
public PlayerReadyMessage() { }
public override void OnReceiveRemote()
{
if (QSBCore.IsHost)
@ -40,4 +44,4 @@ namespace QSB.Player.Events
QSBPlayerManager.GetPlayer(From).IsReady = Value;
}
}
}
}

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

@ -67,19 +67,13 @@ namespace QSB.Player.TransformSync
if (isInUniverse && !_isInitialized)
{
Player.IsReady = false;
new PlayerReadyMessage
{
Value = false
}.Send();
new PlayerReadyMessage(false).Send();
}
if (!isInUniverse)
{
Player.IsReady = false;
new PlayerReadyMessage
{
Value = false
}.Send();
new PlayerReadyMessage(false).Send();
}
base.OnSceneLoaded(oldScene, newScene, isInUniverse);
@ -90,10 +84,7 @@ namespace QSB.Player.TransformSync
base.Init();
Player.IsReady = true;
new PlayerReadyMessage
{
Value = true
}.Send();
new PlayerReadyMessage(true).Send();
}
protected override void OnDestroy()