Merge pull request #1280 from ss14Starlight/starlight-dev

Live update

Author: darkrell

.editorconfig

@@ -1,8 +1,7 @@
 name: Auto Assign Reviewers
 
 on:
-  pull_request:
-    types: [labeled, opened, synchronize]
+- pull_request_target
 
 jobs:
   assign:

.github/workflows/auto-assign.yml

@@ -24,6 +24,7 @@
 using Content.Client.UserInterface;
 using Content.Client.Viewport;
 using Content.Client.Voting;
+using Content.Shared._NullLink;
 using Content.Shared.Ame.Components;
 using Content.Shared.Gravity;
 using Content.Shared.Localizations;
@@ -79,6 +80,8 @@ public sealed class EntryPoint : GameClient
         [Dependency] private readonly TitleWindowManager _titleWindowManager = default!;
         [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
         [Dependency] private readonly ClientsidePlaytimeTrackingManager _clientsidePlaytimeManager = default!;
+       	[Dependency] private readonly INullLinkPlayerRolesManager _nullLinkPlayerRolesManager = default!; //NullLink
+       	[Dependency] private readonly ISharedNullLinkPlayerRolesReqManager _sharedNullLinkPlayer = default!; //NullLink
 
         public override void Init()
         {
@@ -189,6 +192,11 @@ public override void PostInit()
                 }
             };
 
+            // NullLink start
+            _nullLinkPlayerRolesManager.Initialize();
+            _sharedNullLinkPlayer.Initialize();
+            // NullLink end
+
             // Disable engine-default viewport since we use our own custom viewport control.
             _userInterfaceManager.MainViewport.Visible = false;
 

Content.Client/Entry/EntryPoint.cs

@@ -15,7 +15,7 @@ namespace Content.Client.Info
     public sealed class LinkBanner : BoxContainer
     {
         private readonly IConfigurationManager _cfg;
-        private readonly IClientPlayerRolesManager _clientPlayerManager;
+        private readonly INullLinkPlayerRolesManager _playerRoles;// NullLink
 
         private ValueList<(CVarDef<string> cVar, Button button)> _infoLinks;
 
@@ -29,7 +29,7 @@ public LinkBanner()
 
             var uriOpener = IoCManager.Resolve<IUriOpener>();
             _cfg = IoCManager.Resolve<IConfigurationManager>();
-            _clientPlayerManager = IoCManager.Resolve<IClientPlayerRolesManager>();
+            _playerRoles = IoCManager.Resolve<INullLinkPlayerRolesManager>(); // NullLink
             var rulesButton = new Button() {Text = Loc.GetString("server-info-rules-button")};
             rulesButton.OnPressed += args => new RulesAndInfoWindow().Open();
             buttons.AddChild(rulesButton);
@@ -40,13 +40,15 @@ public LinkBanner()
             AddInfoButton("server-info-forum-button", CCVars.InfoLinksForum);
             AddInfoButton("server-info-telegram-button", CCVars.InfoLinksTelegram);
 
+            // NullLink start
             var button = new Button { Text = Loc.GetString("server-info-connect-discord-button") };
             button.OnPressed += _ => {
-                var link = _clientPlayerManager.GetDiscordLink();
+                var link = _playerRoles.GetDiscordLink();
                 if(link != null) 
                     uriOpener.OpenUri(link);
             };
             buttons.AddChild(button);
+            // NullLink end
 
             var guidebookController = UserInterfaceManager.GetUIController<GuidebookUIController>();
             var guidebookButton = new Button() { Text = Loc.GetString("server-info-guidebook-button") };

Content.Client/Info/LinkBanner.cs

@@ -1,3 +1,4 @@
+using Content.Client._Starlight.Managers;
 using Content.Client.Administration.Managers;
 using Content.Client.Changelog;
 using Content.Client.Chat.Managers;
@@ -9,24 +10,25 @@
 using Content.Client.GhostKick;
 using Content.Client.Guidebook;
 using Content.Client.Launcher;
+using Content.Client.Lobby;
 using Content.Client.Mapping;
 using Content.Client.Parallax.Managers;
 using Content.Client.Players.PlayTimeTracking;
 using Content.Client.Playtime;
+using Content.Client.Players.RateLimiting;
 using Content.Client.Replay;
 using Content.Client.Screenshot;
 using Content.Client.Stylesheets;
 using Content.Client.Viewport;
 using Content.Client.Voting;
+using Content.Shared._NullLink;
 using Content.Shared.Administration.Logs;
-using Content.Client.Lobby;
-using Content.Client.Players.RateLimiting;
 using Content.Shared.Administration.Managers;
 using Content.Shared.Chat;
 using Content.Shared.Players.PlayTimeTracking;
 using Content.Shared.Players.RateLimiting;
 using Content.Shared.Starlight;
-using Content.Client._Starlight.Managers;
+using Content.Client._NullLink;
 
 namespace Content.Client.IoC
 {
@@ -66,6 +68,11 @@ public static void Register()
             collection.Register<SharedPlayerRateLimitManager, PlayerRateLimitManager>();
             collection.Register<TitleWindowManager>();
             collection.Register<ClientsidePlaytimeTrackingManager>();
+
+            // NullLink start
+            collection.Register<INullLinkPlayerRolesManager, NullLinkPlayerRolesManager>();  
+            collection.Register<ISharedNullLinkPlayerRolesReqManager, PlayerRolesReqManager>();
+            // NullLink end
         }
     }
 }

Content.Client/IoC/ClientContentIoC.cs

@@ -752,6 +752,7 @@ public void RefreshSpecies()
             _species.Clear();
 
             _species.AddRange(_prototypeManager.EnumeratePrototypes<SpeciesPrototype>().Where(o => o.RoundStart));
+            _species.Sort((a, b) => string.Compare(a.Name, b.Name, StringComparison.OrdinalIgnoreCase)); // Starlight
             var speciesIds = _species.Select(o => o.ID).ToList();
 
             for (var i = 0; i < _species.Count; i++)

Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs

@@ -24,14 +24,14 @@ protected override void Open()
         _menu = this.CreateWindowCenteredLeft<MechMenu>();
         _menu.SetEntity(Owner);
         _menu.OpenCenteredLeft();
-        
+
         _menu.UpdateMaintenanceButtons();
 
         _menu.OnRemoveButtonPressed += uid =>
         {
             SendMessage(new MechEquipmentRemoveMessage(EntMan.GetNetEntity(uid)));
         };
-        
+
         _menu.OnMaintenanceModeChanged += toggle =>
         {
             SendMessage(new MechMaintenanceUiMessage(toggle));
@@ -45,8 +45,8 @@ protected override void UpdateState(BoundUserInterfaceState state)
         if (state is not MechBoundUiState msg)
             return;
         UpdateEquipmentControls(msg);
-        _menu?.UpdateMechStats();
-        _menu?.UpdateEquipmentView();
+        _menu?.UpdateMechStats(msg.Equipment.Count); // Starlight-edit: Correct equipment update
+        _menu?.UpdateEquipmentView(msg.Equipment); // Starlight-edit: Correct equipment update
         _menu?.UpdateMaintenanceButtons();
     }
 

Content.Client/Mech/Ui/MechBoundUserInterface.cs

@@ -17,7 +17,7 @@ public sealed partial class MechMenu : FancyWindow
     private EntityUid _mech;
 
     public event Action<EntityUid>? OnRemoveButtonPressed;
-    
+
     public event Action<bool>? OnMaintenanceModeChanged;
 
     public MechMenu()
@@ -32,20 +32,20 @@ public void SetEntity(EntityUid uid)
         _mech = uid;
     }
 
-    public void UpdateMechStats()
+    public void UpdateMechStats(int EquipmentCount) // Starlight-edit: Correct equipment update
     {
         if (!_ent.TryGetComponent<MechComponent>(_mech, out var mechComp))
             return;
 
         var integrityPercent = mechComp.Integrity / mechComp.MaxIntegrity;
         IntegrityDisplayBar.Value = integrityPercent.Float();
-        IntegrityDisplay.Text = Loc.GetString("mech-integrity-display", ("amount", (integrityPercent*100).Int()));
+        IntegrityDisplay.Text = Loc.GetString("mech-integrity-display", ("amount", (integrityPercent * 100).Int()));
 
         if (mechComp.MaxEnergy != 0f)
         {
             var energyPercent = mechComp.Energy / mechComp.MaxEnergy;
             EnergyDisplayBar.Value = energyPercent.Float();
-            EnergyDisplay.Text = Loc.GetString("mech-energy-display", ("amount", (energyPercent*100).Int()));
+            EnergyDisplay.Text = Loc.GetString("mech-energy-display", ("amount", (energyPercent * 100).Int()));
         }
         else
         {
@@ -54,18 +54,17 @@ public void UpdateMechStats()
         }
 
         ActiveSlotDisplay.Text = Loc.GetString("mech-slot-display",
-            ("amount", mechComp.MaxEquipmentAmount - mechComp.EquipmentContainer.ContainedEntities.Count));
+            ("amount", mechComp.MaxEquipmentAmount - EquipmentCount)); // Starlight-edit: Correct equipment update
     }
 
-    public void UpdateEquipmentView()
+    public void UpdateEquipmentView(List<NetEntity> Equipment) // Starlight-edit: Correct equipment update
     {
-        if (!_ent.TryGetComponent<MechComponent>(_mech, out var mechComp))
-            return;
-
         ActiveEquipmentContainer.Children.Clear();
         PassiveEquipmentContainer.Children.Clear();
-        foreach (var ent in mechComp.EquipmentContainer.ContainedEntities)
+        foreach (var netEntity in Equipment) // Starlight-edit: Correct equipment update
         {
+            var ent = _ent.GetEntity(netEntity); // Starlight-edit: Correct equipment update
+
             if (!_ent.TryGetComponent<MetaDataComponent>(ent, out var metaData))
                 continue;
 
@@ -85,20 +84,22 @@ public void UpdateEquipmentView()
             }
         }
     }
-    
+
     public void UpdateMaintenanceButtons()
     {
         if (!_ent.TryGetComponent<MechComponent>(_mech, out var mechComp))
             return;
 
         MaintenanceOffButton.Disabled = !mechComp.MaintenanceMode;
-        MaintenanceOffButton.OnPressed += _ => {
+        MaintenanceOffButton.OnPressed += _ =>
+        {
             MaintenanceOffButton.Disabled = true;
             MaintenanceOnButton.Disabled = false;
             OnMaintenanceModeChanged?.Invoke(false);
         };
         MaintenanceOnButton.Disabled = mechComp.MaintenanceMode;
-        MaintenanceOnButton.OnPressed += _ => {
+        MaintenanceOnButton.OnPressed += _ =>
+        {
             MaintenanceOffButton.Disabled = false;
             MaintenanceOnButton.Disabled = true;
             OnMaintenanceModeChanged?.Invoke(true);

Content.Client/Mech/Ui/MechMenu.xaml.cs

@@ -37,5 +37,10 @@ void IParallaxTextureSource.Unload(IDependencyCollection dependencies)
         var cache = dependencies.Resolve<GeneratedParallaxCache>();
         cache.Unload(Identifier);
     }
+	/// <summary>
+	/// Controls the speed of the parallax effect for this texture.
+	/// </summary>
+	[DataField("slowness")]
+	public float Slowness { get; private set; }
 }
 

Content.Client/Parallax/Data/GeneratedParallaxTextureSource.cs

@@ -22,6 +22,7 @@ public sealed class EscapeUIController : UIController, IOnStateEntered<GameplayS
 {
     [Dependency] private readonly IClientConsoleHost _console = default!;
     [Dependency] private readonly IClientPlayerRolesManager _player = default!;
+    [Dependency] private readonly INullLinkPlayerRolesManager _playerRoles = default!; // NullLink
     [Dependency] private readonly IUriOpener _uri = default!;
     [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] private readonly ChangelogUIController _changelog = default!;
@@ -66,11 +67,13 @@ public void OnStateEntered(GameplayState state)
         _escapeWindow.OnClose += DeactivateButton;
         _escapeWindow.OnOpen += ActivateButton;
 
+        // NullLink start
         _escapeWindow.DiscordButton.OnPressed += _ =>
         {
-            if(_player.GetDiscordLink() is string link)
+            if(_playerRoles.GetDiscordLink() is string link)
                 _uri.OpenUri(link);
         };
+        // NullLink end
 
         _escapeWindow.ChangelogButton.OnPressed += _ =>
         {