Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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 List<string>? StationEvents { get; }
public IReadOnlyList<string> StationEvents { get; }
public void Initialize();
public event Action OnStationEventsReceived;
public void RequestEvents();

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

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

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

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