diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs index 44ba743306..910c4c0437 100644 --- a/Content.Client/Entry/EntryPoint.cs +++ b/Content.Client/Entry/EntryPoint.cs @@ -1,3 +1,4 @@ +using Content.Client._Sunrise.ServersHub; using Content.Client.Administration.Managers; using Content.Client.Changelog; using Content.Client.Chat.Managers; @@ -71,6 +72,7 @@ namespace Content.Client.Entry [Dependency] private readonly IReplayLoadManager _replayLoad = default!; [Dependency] private readonly ILogManager _logManager = default!; [Dependency] private readonly ContentReplayPlaybackManager _replayMan = default!; + [Dependency] private readonly ServersHubManager _serversHubManager = default!; // Sunrise-Hub public override void Init() { @@ -133,6 +135,8 @@ namespace Content.Client.Entry _jobRequirements.Initialize(); _playbackMan.Initialize(); + _serversHubManager.Initialize(); // Sunrise-Hub + //AUTOSCALING default Setup! _configManager.SetCVar("interface.resolutionAutoScaleUpperCutoffX", 1080); _configManager.SetCVar("interface.resolutionAutoScaleUpperCutoffY", 720); diff --git a/Content.Client/IoC/ClientContentIoC.cs b/Content.Client/IoC/ClientContentIoC.cs index 905e802fb6..f60e259308 100644 --- a/Content.Client/IoC/ClientContentIoC.cs +++ b/Content.Client/IoC/ClientContentIoC.cs @@ -1,4 +1,5 @@ -using Content.Client.Administration.Managers; +using Content.Client._Sunrise.ServersHub; +using Content.Client.Administration.Managers; using Content.Client.Changelog; using Content.Client.Chat.Managers; using Content.Client.Clickable; @@ -50,6 +51,10 @@ namespace Content.Client.IoC collection.Register(); collection.Register(); collection.Register(); + + // Sunrise + + collection.Register(); // Sunrise-Hub } } } diff --git a/Content.Client/Launcher/LauncherConnectingGui.xaml b/Content.Client/Launcher/LauncherConnectingGui.xaml index 3734fa5b3a..70656df7ea 100644 --- a/Content.Client/Launcher/LauncherConnectingGui.xaml +++ b/Content.Client/Launcher/LauncherConnectingGui.xaml @@ -2,54 +2,66 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client" xmlns:parallax="clr-namespace:Content.Client.Parallax" - xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"> + xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls" + xmlns:serversHub="clr-namespace:Content.Client._Sunrise.ServersHub"> - - - -