Implement server status content side.
This commit is contained in:
@@ -133,6 +133,7 @@
|
|||||||
<Compile Include="GameObjects\Components\Power\PoweredLightComponent.cs" />
|
<Compile Include="GameObjects\Components\Power\PoweredLightComponent.cs" />
|
||||||
<Compile Include="GameObjects\Components\Power\PowerDebugTool.cs" />
|
<Compile Include="GameObjects\Components\Power\PowerDebugTool.cs" />
|
||||||
<Compile Include="ServerNotifyManager.cs" />
|
<Compile Include="ServerNotifyManager.cs" />
|
||||||
|
<Compile Include="StatusShell.cs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\Content.Shared\Content.Shared.csproj">
|
<ProjectReference Include="..\Content.Shared\Content.Shared.csproj">
|
||||||
|
|||||||
@@ -39,6 +39,7 @@ using Content.Server.Interfaces;
|
|||||||
using Content.Server.Interfaces.GameTicking;
|
using Content.Server.Interfaces.GameTicking;
|
||||||
using Content.Shared.GameObjects.Components.Inventory;
|
using Content.Shared.GameObjects.Components.Inventory;
|
||||||
using Content.Shared.Interfaces;
|
using Content.Shared.Interfaces;
|
||||||
|
using SS14.Server.Interfaces.ServerStatus;
|
||||||
using SS14.Shared.Timing;
|
using SS14.Shared.Timing;
|
||||||
|
|
||||||
namespace Content.Server
|
namespace Content.Server
|
||||||
@@ -46,6 +47,7 @@ namespace Content.Server
|
|||||||
public class EntryPoint : GameServer
|
public class EntryPoint : GameServer
|
||||||
{
|
{
|
||||||
private IGameTicker _gameTicker;
|
private IGameTicker _gameTicker;
|
||||||
|
private StatusShell _statusShell;
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public override void Init()
|
public override void Init()
|
||||||
@@ -122,6 +124,10 @@ namespace Content.Server
|
|||||||
_gameTicker = IoCManager.Resolve<IGameTicker>();
|
_gameTicker = IoCManager.Resolve<IGameTicker>();
|
||||||
|
|
||||||
IoCManager.Resolve<IServerNotifyManager>().Initialize();
|
IoCManager.Resolve<IServerNotifyManager>().Initialize();
|
||||||
|
|
||||||
|
var playerManager = IoCManager.Resolve<IPlayerManager>();
|
||||||
|
|
||||||
|
_statusShell = new StatusShell();
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void PostInit()
|
public override void PostInit()
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ namespace Content.Server.GameTicking
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public Action<GameRunLevelChangedEventArgs> OnRunLevelChanged;
|
public event Action<GameRunLevelChangedEventArgs> OnRunLevelChanged;
|
||||||
|
|
||||||
private const string PlayerPrototypeName = "HumanMob_Content";
|
private const string PlayerPrototypeName = "HumanMob_Content";
|
||||||
private const string ObserverPrototypeName = "MobObserver";
|
private const string ObserverPrototypeName = "MobObserver";
|
||||||
@@ -414,8 +414,8 @@ namespace Content.Server.GameTicking
|
|||||||
public enum GameRunLevel
|
public enum GameRunLevel
|
||||||
{
|
{
|
||||||
PreRoundLobby = 0,
|
PreRoundLobby = 0,
|
||||||
InRound,
|
InRound = 1,
|
||||||
PostRound
|
PostRound = 2
|
||||||
}
|
}
|
||||||
|
|
||||||
public class GameRunLevelChangedEventArgs : EventArgs
|
public class GameRunLevelChangedEventArgs : EventArgs
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using System;
|
||||||
using Content.Server.GameTicking;
|
using Content.Server.GameTicking;
|
||||||
using SS14.Server.Interfaces.Player;
|
using SS14.Server.Interfaces.Player;
|
||||||
using SS14.Server.Player;
|
using SS14.Server.Player;
|
||||||
@@ -13,6 +14,8 @@ namespace Content.Server.Interfaces.GameTicking
|
|||||||
{
|
{
|
||||||
GameRunLevel RunLevel { get; }
|
GameRunLevel RunLevel { get; }
|
||||||
|
|
||||||
|
event Action<GameRunLevelChangedEventArgs> OnRunLevelChanged;
|
||||||
|
|
||||||
void Initialize();
|
void Initialize();
|
||||||
void Update(FrameEventArgs frameEventArgs);
|
void Update(FrameEventArgs frameEventArgs);
|
||||||
|
|
||||||
|
|||||||
60
Content.Server/StatusShell.cs
Normal file
60
Content.Server/StatusShell.cs
Normal file
@@ -0,0 +1,60 @@
|
|||||||
|
using System;
|
||||||
|
using Content.Server.GameTicking;
|
||||||
|
using Content.Server.Interfaces.GameTicking;
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
|
using SS14.Server.Interfaces;
|
||||||
|
using SS14.Server.Interfaces.Player;
|
||||||
|
using SS14.Server.Interfaces.ServerStatus;
|
||||||
|
using SS14.Shared.IoC;
|
||||||
|
|
||||||
|
namespace Content.Server
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Tiny helper class to handle status messages. Nothing too complicated.
|
||||||
|
/// </summary>
|
||||||
|
public class StatusShell
|
||||||
|
{
|
||||||
|
private readonly IPlayerManager _playerManager;
|
||||||
|
private readonly string _name;
|
||||||
|
private GameRunLevel _runLevel;
|
||||||
|
private DateTime _roundStartTime;
|
||||||
|
|
||||||
|
public StatusShell()
|
||||||
|
{
|
||||||
|
_playerManager = IoCManager.Resolve<IPlayerManager>();
|
||||||
|
var baseServer = IoCManager.Resolve<IBaseServer>();
|
||||||
|
var gameTicker = IoCManager.Resolve<IGameTicker>();
|
||||||
|
|
||||||
|
gameTicker.OnRunLevelChanged += _runLevelChanged;
|
||||||
|
|
||||||
|
_name = baseServer.ServerName;
|
||||||
|
IoCManager.Resolve<IStatusHost>().OnStatusRequest += _getResponse;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void _getResponse(JObject jObject)
|
||||||
|
{
|
||||||
|
lock (this)
|
||||||
|
{
|
||||||
|
jObject["name"] = _name;
|
||||||
|
jObject["players"] = _playerManager.PlayerCount;
|
||||||
|
jObject["run_level"] = (int) _runLevel;
|
||||||
|
if (_runLevel >= GameRunLevel.InRound)
|
||||||
|
{
|
||||||
|
jObject["round_start_time"] = _roundStartTime.ToString("o");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void _runLevelChanged(GameRunLevelChangedEventArgs eventArgs)
|
||||||
|
{
|
||||||
|
lock (this)
|
||||||
|
{
|
||||||
|
_runLevel = eventArgs.NewRunLevel;
|
||||||
|
if (eventArgs.NewRunLevel == GameRunLevel.InRound)
|
||||||
|
{
|
||||||
|
_roundStartTime = DateTime.UtcNow;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
2
engine
2
engine
Submodule engine updated: 861aabbe9b...21fd3e5d96
Reference in New Issue
Block a user