tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up station events synchronization code.

Browse Source 
AAAAAAAAAAAAAAAAAAAAAAAAAAA
This commit is contained in:
Pieter-Jan Briers
2020-12-23 16:59:50 +01:00
parent a5151af4c1
commit 2e6ab15a2a
6 changed files with 83 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/StationEvents/IStationEventManager.cs
View File

@@ -6,7 +6,7 @@ namespace Content.Client.StationEvents
{ {
public interface IStationEventManager public interface IStationEventManager
{ {
public List<string>? StationEvents { get; } public IReadOnlyList<string> StationEvents { get; }
public void Initialize(); public void Initialize();
public event Action OnStationEventsReceived; public event Action OnStationEventsReceived;
public void RequestEvents(); public void RequestEvents();

39
Content.Client/StationEvents/StationEventManager.cs
View File

@@ -1,42 +1,43 @@
#nullable enable #nullable enable
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Content.Shared.StationEvents; using Content.Shared.Network.NetMessages;
using Robust.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Network;
namespace Content.Client.StationEvents namespace Content.Client.StationEvents
{ {
class StationEventManager : SharedStationEvent, IStationEventManager internal sealed class StationEventManager : IStationEventManager
{ {
private List<string>? _events; [Dependency] private readonly IClientNetManager _netManager = default!;
public List<string>? StationEvents
{ private readonly List<string> _events = new();
get public IReadOnlyList<string> StationEvents => _events;
{
if (_events == null)
RequestEvents();
return _events;
}
}
public event Action? OnStationEventsReceived; public event Action? OnStationEventsReceived;
public void Initialize() public void Initialize()
{ {
var netManager = IoCManager.Resolve<IClientNetManager>(); _netManager.RegisterNetMessage<MsgRequestStationEvents>(nameof(MsgRequestStationEvents));
netManager.RegisterNetMessage<MsgGetStationEvents>(nameof(MsgGetStationEvents), EventHandler); _netManager.RegisterNetMessage<MsgStationEvents>(nameof(MsgStationEvents), RxStationEvents);
netManager.Disconnect += (sender, msg) => _events = null; _netManager.Disconnect += OnNetManagerOnDisconnect;
} }
private void EventHandler(MsgGetStationEvents msg) private void OnNetManagerOnDisconnect(object? sender, NetDisconnectedArgs msg)
{ {
_events = msg.Events; _events.Clear();
}
private void RxStationEvents(MsgStationEvents msg)
{
_events.Clear();
_events.AddRange(msg.Events);
OnStationEventsReceived?.Invoke(); OnStationEventsReceived?.Invoke();
} }
public void RequestEvents() public void RequestEvents()
{ {
var netManager = IoCManager.Resolve<IClientNetManager>(); _netManager.ClientSendMessage(_netManager.CreateNetMessage<MsgRequestStationEvents>());
netManager.ClientSendMessage(netManager.CreateNetMessage<MsgGetStationEvents>());
} }
} }
} }

9
Content.Client/UserInterface/AdminMenu/AdminMenuWindow.cs
View File

@@ -468,10 +468,11 @@ namespace Content.Client.UserInterface.AdminMenu
Name = "Event", Name = "Event",
GetData = () => GetData = () =>
{ {
var events = IoCManager.Resolve<IStationEventManager>().StationEvents; var events = IoCManager.Resolve<IStationEventManager>().StationEvents.ToList();
if (events == null) if (events.Count == 0)
return new List<object> { "Not loaded" }; events.Add(Loc.GetString("Not loaded"));
events.Add("Random"); else
events.Add(Loc.GetString("Random"));
return events.ToList<object>(); return events.ToList<object>();
}, },
GetDisplayName = (obj) => (string) obj, GetDisplayName = (obj) => (string) obj,

35
Content.Server/GameObjects/EntitySystems/StationEvents/StationEventSystem.cs
View File

@@ -1,11 +1,13 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text; using System.Text;
using Content.Server.GameTicking; using Content.Server.GameTicking;
using Content.Server.Interfaces.GameTicking; using Content.Server.Interfaces.GameTicking;
using Content.Server.StationEvents; using Content.Server.StationEvents;
using Content.Shared; using Content.Shared;
using Content.Shared.GameTicking; using Content.Shared.GameTicking;
using Content.Shared.Network.NetMessages;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Server.Console; using Robust.Server.Console;
using Robust.Server.Interfaces.Player; using Robust.Server.Interfaces.Player;
@@ -17,7 +19,6 @@ using Robust.Shared.Interfaces.Reflection;
using Robust.Shared.Interfaces.Timing; using Robust.Shared.Interfaces.Timing;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Localization; using Robust.Shared.Localization;
using static Content.Shared.StationEvents.SharedStationEvent;
namespace Content.Server.GameObjects.EntitySystems.StationEvents namespace Content.Server.GameObjects.EntitySystems.StationEvents
{ {
@@ -29,6 +30,9 @@ namespace Content.Server.GameObjects.EntitySystems.StationEvents
[Dependency] private readonly IServerNetManager _netManager = default!; [Dependency] private readonly IServerNetManager _netManager = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IGameTicker _gameTicker = default!; [Dependency] private readonly IGameTicker _gameTicker = default!;
[Dependency] private readonly IConGroupController _conGroupController = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private readonly IRobustRandom _random = default!;
public StationEvent CurrentEvent { get; private set; } public StationEvent CurrentEvent { get; private set; }
public IReadOnlyCollection<StationEvent> StationEvents => _stationEvents; public IReadOnlyCollection<StationEvent> StationEvents => _stationEvents;
@@ -170,30 +174,27 @@ namespace Content.Server.GameObjects.EntitySystems.StationEvents
// Can't just check debug / release for a default given mappers need to use release mode // Can't just check debug / release for a default given mappers need to use release mode
// As such we'll always pause it by default. // As such we'll always pause it by default.
_configurationManager.OnValueChanged(CCVars.EventsEnabled, value => Enabled = value, true); _configurationManager.OnValueChanged(CCVars.EventsEnabled, value => Enabled = value, true);
_netManager.RegisterNetMessage<MsgGetStationEvents>(nameof(MsgGetStationEvents), GetEventReceived);
_netManager.RegisterNetMessage<MsgRequestStationEvents>(nameof(MsgRequestStationEvents), RxRequest);
_netManager.RegisterNetMessage<MsgStationEvents>(nameof(MsgStationEvents));
} }
private void GetEventReceived(MsgGetStationEvents msg) private void RxRequest(MsgRequestStationEvents msg)
{ {
var player = _playerManager.GetSessionByChannel(msg.MsgChannel); if (_playerManager.TryGetSessionByChannel(msg.MsgChannel, out var player))
SendEvents(player); SendEvents(player);
} }
private void SendEvents(IPlayerSession player) private void SendEvents(IPlayerSession player)
{ {
if (!IoCManager.Resolve<IConGroupController>().CanCommand(player, "events")) if (!_conGroupController.CanCommand(player, "events"))
return; return;
var newMsg = _netManager.CreateNetMessage<MsgGetStationEvents>(); var newMsg = _netManager.CreateNetMessage<MsgStationEvents>();
newMsg.Events = new List<string>(); newMsg.Events = StationEvents.Select(e => e.Name).ToArray();
foreach (var e in StationEvents)
{
newMsg.Events.Add(e.Name);
}
_netManager.ServerSendMessage(newMsg, player.ConnectedClient); _netManager.ServerSendMessage(newMsg, player.ConnectedClient);
} }
public override void Update(float frameTime) public override void Update(float frameTime)
{ {
base.Update(frameTime); base.Update(frameTime);
@@ -254,9 +255,8 @@ namespace Content.Server.GameObjects.EntitySystems.StationEvents
/// </summary> /// </summary>
private void ResetTimer() private void ResetTimer()
{ {
var robustRandom = IoCManager.Resolve<IRobustRandom>();
// 5 - 15 minutes. TG does 3-10 but that's pretty frequent // 5 - 15 minutes. TG does 3-10 but that's pretty frequent
_timeUntilNextEvent = robustRandom.Next(300, 900); _timeUntilNextEvent = _random.Next(300, 900);
} }
/// <summary> /// <summary>
@@ -277,8 +277,7 @@ namespace Content.Server.GameObjects.EntitySystems.StationEvents
sumOfWeights += (int) stationEvent.Weight; sumOfWeights += (int) stationEvent.Weight;
} }
var robustRandom = IoCManager.Resolve<IRobustRandom>(); sumOfWeights = _random.Next(sumOfWeights);
sumOfWeights = robustRandom.Next(sumOfWeights);
foreach (var stationEvent in availableEvents) foreach (var stationEvent in availableEvents)
{ {
@@ -301,12 +300,12 @@ namespace Content.Server.GameObjects.EntitySystems.StationEvents
private List<StationEvent> AvailableEvents(bool ignoreEarliestStart = false) private List<StationEvent> AvailableEvents(bool ignoreEarliestStart = false)
{ {
TimeSpan currentTime; TimeSpan currentTime;
var playerCount = IoCManager.Resolve<IPlayerManager>().PlayerCount; var playerCount = _playerManager.PlayerCount;
// playerCount does a lock so we'll just keep the variable here // playerCount does a lock so we'll just keep the variable here
if (!ignoreEarliestStart) if (!ignoreEarliestStart)
{ {
currentTime = IoCManager.Resolve<IGameTiming>().CurTime; currentTime = _gameTiming.CurTime;
} }
else else
{ {

29
Content.Shared/Network/NetMessages/MsgRequestStationEvents.cs Normal file
View File

@@ -0,0 +1,29 @@
using System.Collections.Generic;
using System.IO;
using Lidgren.Network;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.Interfaces.Serialization;
using Robust.Shared.IoC;
using Robust.Shared.Network;
namespace Content.Shared.Network.NetMessages
{
public class MsgRequestStationEvents : NetMessage
{
#region REQUIRED
public const MsgGroups GROUP = MsgGroups.Command;
public const string NAME = nameof(MsgRequestStationEvents);
public MsgRequestStationEvents(INetChannel channel) : base(NAME, GROUP) { }
#endregion
public override void ReadFromBuffer(NetIncomingMessage buffer)
{
}
public override void WriteToBuffer(NetOutgoingMessage buffer)
{
}
}
}

22
Content.Shared/StationEvents/SharedStationEvent.cs → Content.Shared/Network/NetMessages/MsgStationEvents.cs
View File

@@ -1,31 +1,30 @@
using System.Collections.Generic; using System.IO;
using System.IO;
using Lidgren.Network; using Lidgren.Network;
using Robust.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;
using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Interfaces.Serialization;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Network; using Robust.Shared.Network;
namespace Content.Shared.StationEvents namespace Content.Shared.Network.NetMessages
{ {
public class SharedStationEvent public class MsgStationEvents : NetMessage
{
public class MsgGetStationEvents : NetMessage
{ {
#region REQUIRED #region REQUIRED
public const MsgGroups GROUP = MsgGroups.Command; public const MsgGroups GROUP = MsgGroups.Command;
public const string NAME = nameof(MsgGetStationEvents); public const string NAME = nameof(MsgStationEvents);
public MsgGetStationEvents(INetChannel channel) : base(NAME, GROUP) { } public MsgStationEvents(INetChannel channel) : base(NAME, GROUP) { }
#endregion #endregion
public List<string> Events;
public string[] Events;
public override void ReadFromBuffer(NetIncomingMessage buffer) public override void ReadFromBuffer(NetIncomingMessage buffer)
{ {
var serializer = IoCManager.Resolve<IRobustSerializer>(); var serializer = IoCManager.Resolve<IRobustSerializer>();
var length = buffer.ReadVariableInt32(); var length = buffer.ReadVariableInt32();
using var stream = buffer.ReadAlignedMemory(length); using var stream = buffer.ReadAlignedMemory(length);
Events = serializer.Deserialize<List<string>>(stream); serializer.DeserializeDirect(stream, out Events);
} }
public override void WriteToBuffer(NetOutgoingMessage buffer) public override void WriteToBuffer(NetOutgoingMessage buffer)
@@ -33,12 +32,11 @@ namespace Content.Shared.StationEvents
var serializer = IoCManager.Resolve<IRobustSerializer>(); var serializer = IoCManager.Resolve<IRobustSerializer>();
using (var stream = new MemoryStream()) using (var stream = new MemoryStream())
{ {
serializer.Serialize(stream, Events); serializer.SerializeDirect(stream, Events);
buffer.WriteVariableInt32((int)stream.Length); buffer.WriteVariableInt32((int)stream.Length);
stream.TryGetBuffer(out var segment); stream.TryGetBuffer(out var segment);
buffer.Write(segment); buffer.Write(segment);
} }
} }
} }
}
} }