CurrentSession available directly from TorchBase

SteamService is now properly injected for clients, and reports errors
Obsolete tags on the manager properties in TorchBase
This commit is contained in:
Westin Miller
2017-08-21 21:38:25 -07:00
parent 91ad78e6a2
commit a4b1b9bb96
5 changed files with 48 additions and 7 deletions

View File

@@ -19,9 +19,11 @@ using SpaceEngineers.Game;
using Torch.API;
using Torch.API.Managers;
using Torch.API.ModAPI;
using Torch.API.Session;
using Torch.Commands;
using Torch.Managers;
using Torch.Utils;
using Torch.Session;
using VRage.Collections;
using VRage.FileSystem;
using VRage.Game.ObjectBuilder;
@@ -57,15 +59,24 @@ namespace Torch
/// <inheritdoc />
public string[] RunArgs { get; set; }
/// <inheritdoc />
[Obsolete]
public IPluginManager Plugins { get; protected set; }
/// <inheritdoc />
[Obsolete]
public IMultiplayerManager Multiplayer { get; protected set; }
/// <inheritdoc />
[Obsolete]
public EntityManager Entities { get; protected set; }
/// <inheritdoc />
[Obsolete]
public INetworkManager Network { get; protected set; }
/// <inheritdoc />
[Obsolete]
public CommandManager Commands { get; protected set; }
/// <inheritdoc />
public ITorchSession CurrentSession => Managers?.GetManager<ITorchSessionManager>()?.CurrentSession;
/// <inheritdoc />
public event Action SessionLoading;
/// <inheritdoc />
@@ -107,6 +118,7 @@ namespace Torch
Network = new NetworkManager(this);
Commands = new CommandManager(this);
Managers.AddManager(new TorchSessionManager(this));
Managers.AddManager(new FilesystemManager(this));
Managers.AddManager(new UpdateManager(this));
Managers.AddManager(Network);
@@ -116,7 +128,6 @@ namespace Torch
Managers.AddManager(Entities);
Managers.AddManager(new ChatManager(this));
TorchAPI.Instance = this;
}