From b3f75f9ffee6674a9833c8037467b123aa73d593 Mon Sep 17 00:00:00 2001
From: wrexbe <81056464+wrexbe@users.noreply.github.com>
Date: Sun, 11 Sep 2022 21:30:11 -0700
Subject: [PATCH] More minor UI refactor changes (#11213)

---
 Content.Client/Changelog/ChangelogWindow.xaml.cs      |  4 ----
 Content.Client/Commands/ActionsCommands.cs            |  2 +-
 Content.Client/DragDrop/DragDropHelper.cs             |  1 -
 .../GameTicking/Managers/ClientGameTicker.cs          |  2 --
 .../Gravity/UI/GravityGeneratorWindow.xaml.cs         | 11 ++---------
 Content.Client/LateJoin/LateJoinGui.cs                |  2 +-
 Content.Client/MainMenu/UI/MainMenuControl.xaml       |  4 +++-
 .../NetworkConfiguratorConfigurationMenu.xaml         |  2 +-
 .../NetworkConfiguratorListMenu.xaml                  |  6 +++---
 Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml  |  9 ++++-----
 .../UserInterface/Controls/FancyWindow.xaml           |  2 +-
 .../UserInterface/Controls/FancyWindow.xaml.cs        |  1 -
 Content.Client/Viewport/ViewportManager.cs            |  2 +-
 Content.Server/Abilities/Mime/MimePowersComponent.cs  |  4 ++--
 .../Bible/Components/SummonableComponent.cs           |  4 ++--
 .../Polymorph/Systems/PolymorphableSystem.cs          |  2 +-
 .../Polymorph/Systems/PolymorphedEntitySystem.cs      |  4 ++--
 Content.Shared/Actions/ActionEvents.cs                |  2 +-
 .../Hands/Components/SharedHandsComponent.cs          |  2 +-
 .../Hands/EntitySystems/SharedHandsSystem.cs          | 11 ++++++-----
 SpaceStation14.sln.DotSettings                        |  2 ++
 21 files changed, 34 insertions(+), 45 deletions(-)

diff --git a/Content.Client/Changelog/ChangelogWindow.xaml.cs b/Content.Client/Changelog/ChangelogWindow.xaml.cs
index 8fbfb3fc5c..2134f8275a 100644
--- a/Content.Client/Changelog/ChangelogWindow.xaml.cs
+++ b/Content.Client/Changelog/ChangelogWindow.xaml.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Linq;
 using Content.Client.Resources;
 using Content.Client.Stylesheets;
@@ -11,9 +10,6 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Console;
-using Robust.Shared.IoC;
-using Robust.Shared.Localization;
-using Robust.Shared.Maths;
 using Robust.Shared.Utility;
 using static Content.Client.Changelog.ChangelogManager;
 using static Robust.Client.UserInterface.Controls.BoxContainer;
diff --git a/Content.Client/Commands/ActionsCommands.cs b/Content.Client/Commands/ActionsCommands.cs
index 840d175ca9..f8eb67d78a 100644
--- a/Content.Client/Commands/ActionsCommands.cs
+++ b/Content.Client/Commands/ActionsCommands.cs
@@ -1,4 +1,4 @@
-using Content.Client.Actions;
+using Content.Client.Actions;
 using Content.Client.Mapping;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
diff --git a/Content.Client/DragDrop/DragDropHelper.cs b/Content.Client/DragDrop/DragDropHelper.cs
index 28b6e853a7..8f4f2381c5 100644
--- a/Content.Client/DragDrop/DragDropHelper.cs
+++ b/Content.Client/DragDrop/DragDropHelper.cs
@@ -1,5 +1,4 @@
 using Robust.Client.Input;
-using Robust.Shared.IoC;
 using Robust.Shared.Map;
 
 namespace Content.Client.DragDrop
diff --git a/Content.Client/GameTicking/Managers/ClientGameTicker.cs b/Content.Client/GameTicking/Managers/ClientGameTicker.cs
index 27fc7261d7..f1e29a2ea1 100644
--- a/Content.Client/GameTicking/Managers/ClientGameTicker.cs
+++ b/Content.Client/GameTicking/Managers/ClientGameTicker.cs
@@ -2,7 +2,6 @@ using Content.Client.Audio;
 using Content.Client.Gameplay;
 using Content.Client.Lobby;
 using Content.Client.RoundEnd;
-using Content.Client.Viewport;
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
 using Content.Shared.GameWindow;
@@ -11,7 +10,6 @@ using Robust.Client.Graphics;
 using Robust.Client.State;
 using Robust.Shared.Audio;
 using Robust.Shared.Configuration;
-using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Utility;
 
diff --git a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs b/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs
index 5b04c4eaf4..99b41954a1 100644
--- a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs
+++ b/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs
@@ -1,16 +1,9 @@
-using System;
-using Content.Client.Message;
-using Content.Client.UserInterface.Controls;
-using Content.Shared.Gravity;
+using Content.Shared.Gravity;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Localization;
-using Robust.Shared.Maths;
+using FancyWindow = Content.Client.UserInterface.Controls.FancyWindow;
 
 namespace Content.Client.Gravity.UI
 {
diff --git a/Content.Client/LateJoin/LateJoinGui.cs b/Content.Client/LateJoin/LateJoinGui.cs
index ad6b8ac582..7e9b72acf4 100644
--- a/Content.Client/LateJoin/LateJoinGui.cs
+++ b/Content.Client/LateJoin/LateJoinGui.cs
@@ -1,7 +1,7 @@
 using Content.Client.CrewManifest;
 using Content.Client.GameTicking.Managers;
-using Content.Client.Players.PlayTimeTracking;
 using Content.Client.UserInterface.Controls;
+using Content.Client.Players.PlayTimeTracking;
 using Content.Shared.CCVar;
 using Content.Shared.Roles;
 using Robust.Client.Console;
diff --git a/Content.Client/MainMenu/UI/MainMenuControl.xaml b/Content.Client/MainMenu/UI/MainMenuControl.xaml
index fe14bff37d..671519adc9 100644
--- a/Content.Client/MainMenu/UI/MainMenuControl.xaml
+++ b/Content.Client/MainMenu/UI/MainMenuControl.xaml
@@ -37,7 +37,9 @@
                     Text="{Loc 'main-menu-quit-button'}"
                     TextAlign="Center"
                     StyleIdentifier="mainMenu" />
-            <clog:ChangelogButton />
+            <clog:ChangelogButton
+                Name="ChangelogButton"
+                Access="Public"/>
         </BoxContainer>
         <Label Name="VersionLabel" Text="v0.1" />
     </LayoutContainer>
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml
index ac6174c7dd..0f4efa56c8 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml
@@ -1,4 +1,4 @@
-<controls:FancyWindow xmlns="https://spacestation14.io"
+<controls:FancyWindow xmlns="https://spacestation14.io"
                 xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                 xmlns:networkConfigurator="clr-namespace:Content.Client.NetworkConfigurator"
                 Title="Network Configurator" MinSize="350 100">
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml b/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml
index 437d7055c9..8d46ecfb20 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml
@@ -1,13 +1,13 @@
-<controls:FancyWindow xmlns="https://spacestation14.io"
+<controls:FancyWindow xmlns="https://spacestation14.io"
                 xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                 xmlns:networkConfigurator="clr-namespace:Content.Client.NetworkConfigurator"
                 Title="Network Configurator" MinSize="220 400">
     <BoxContainer Orientation="Vertical" VerticalExpand="True">
         <networkConfigurator:NetworkConfiguratorDeviceList Name="DeviceList" />
         <BoxContainer Orientation="Horizontal" Margin="8 8 8 8">
-            <Label Name="DeviceCountLabel" Margin="16 0 0 0" MaxWidth="64"></Label>
+            <Label Name="DeviceCountLabel" Margin="16 0 0 0" MaxWidth="64" />
             <Control HorizontalExpand="True" />
-            <Button Name="ClearButton" Access="Public" Text="{Loc 'network-configurator-ui-clear-button'}"></Button>
+            <Button Name="ClearButton" Access="Public" Text="{Loc 'network-configurator-ui-clear-button'}" />
         </BoxContainer>
     </BoxContainer>
 </controls:FancyWindow>
diff --git a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml
index c0c0bba05f..9e57ba8325 100644
--- a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml
+++ b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml
@@ -1,7 +1,7 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
-                           xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-                           xmlns:ui="clr-namespace:Content.Client.Shuttles.UI"
-                           Title="{Loc 'shuttle-console-window-title'}">
+                      xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                      xmlns:ui="clr-namespace:Content.Client.Shuttles.UI"
+                      Title="{Loc 'shuttle-console-window-title'}">
     <GridContainer Columns="3"
                   HorizontalAlignment="Stretch"
                   Margin="5 5 5 5">
@@ -16,8 +16,7 @@
                     <Label Name="DockingPortsLabel" Text="{Loc 'shuttle-console-dock-label'}" HorizontalAlignment="Center"/>
                 </controls:StripeBack>
                 <BoxContainer Name="DockPorts"
-                              Orientation="Vertical">
-                </BoxContainer>
+                              Orientation="Vertical"/>
             </BoxContainer>
             <BoxContainer Orientation="Vertical">
                 <controls:StripeBack>
diff --git a/Content.Client/UserInterface/Controls/FancyWindow.xaml b/Content.Client/UserInterface/Controls/FancyWindow.xaml
index f7224eb9c2..d076a552bf 100644
--- a/Content.Client/UserInterface/Controls/FancyWindow.xaml
+++ b/Content.Client/UserInterface/Controls/FancyWindow.xaml
@@ -1,4 +1,4 @@
-
+
 <controls:FancyWindow xmlns="https://spacestation14.io"
                       xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                       MouseFilter="Stop"
diff --git a/Content.Client/UserInterface/Controls/FancyWindow.xaml.cs b/Content.Client/UserInterface/Controls/FancyWindow.xaml.cs
index 7028a63e98..ab150b4156 100644
--- a/Content.Client/UserInterface/Controls/FancyWindow.xaml.cs
+++ b/Content.Client/UserInterface/Controls/FancyWindow.xaml.cs
@@ -1,7 +1,6 @@
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Maths;
 
 namespace Content.Client.UserInterface.Controls
 {
diff --git a/Content.Client/Viewport/ViewportManager.cs b/Content.Client/Viewport/ViewportManager.cs
index 733528c0db..ef8132686b 100644
--- a/Content.Client/Viewport/ViewportManager.cs
+++ b/Content.Client/Viewport/ViewportManager.cs
@@ -1,4 +1,4 @@
-using Content.Client.UserInterface.Controls;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.CCVar;
 using Robust.Shared.Configuration;
 
diff --git a/Content.Server/Abilities/Mime/MimePowersComponent.cs b/Content.Server/Abilities/Mime/MimePowersComponent.cs
index 9f1c9a22dc..e185756b79 100644
--- a/Content.Server/Abilities/Mime/MimePowersComponent.cs
+++ b/Content.Server/Abilities/Mime/MimePowersComponent.cs
@@ -1,6 +1,6 @@
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Prototypes;
 using Content.Shared.Actions.ActionTypes;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Abilities.Mime
diff --git a/Content.Server/Bible/Components/SummonableComponent.cs b/Content.Server/Bible/Components/SummonableComponent.cs
index bfa13916c5..11ea7ab16b 100644
--- a/Content.Server/Bible/Components/SummonableComponent.cs
+++ b/Content.Server/Bible/Components/SummonableComponent.cs
@@ -1,6 +1,6 @@
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Prototypes;
 using Content.Shared.Actions.ActionTypes;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Bible.Components
diff --git a/Content.Server/Polymorph/Systems/PolymorphableSystem.cs b/Content.Server/Polymorph/Systems/PolymorphableSystem.cs
index 8cc4f863ec..3abfeaa103 100644
--- a/Content.Server/Polymorph/Systems/PolymorphableSystem.cs
+++ b/Content.Server/Polymorph/Systems/PolymorphableSystem.cs
@@ -184,7 +184,7 @@ namespace Content.Server.Polymorph.Systems
 
             var act = new InstantAction()
             {
-                Event = new PolymorphActionEvent()
+                Event = new PolymorphActionEvent
                 {
                     Prototype = polyproto,
                 },
diff --git a/Content.Server/Polymorph/Systems/PolymorphedEntitySystem.cs b/Content.Server/Polymorph/Systems/PolymorphedEntitySystem.cs
index b6ad72f5c9..1469314cee 100644
--- a/Content.Server/Polymorph/Systems/PolymorphedEntitySystem.cs
+++ b/Content.Server/Polymorph/Systems/PolymorphedEntitySystem.cs
@@ -46,7 +46,7 @@ namespace Content.Server.Polymorph.Systems
         {
             if (Deleted(uid))
                 return;
-        
+
             if (!TryComp<PolymorphedEntityComponent>(uid, out var component))
                 return;
 
@@ -118,7 +118,7 @@ namespace Content.Server.Polymorph.Systems
                 Description = Loc.GetString("polymorph-revert-action-description"),
                 UseDelay = TimeSpan.FromSeconds(component.Prototype.Delay),
            };
-    
+
             _actions.AddAction(uid, act, null);
         }
 
diff --git a/Content.Shared/Actions/ActionEvents.cs b/Content.Shared/Actions/ActionEvents.cs
index 716ca1ce2b..bd316e6ae2 100644
--- a/Content.Shared/Actions/ActionEvents.cs
+++ b/Content.Shared/Actions/ActionEvents.cs
@@ -9,7 +9,7 @@ namespace Content.Shared.Actions;
 
 /// <summary>
 ///     Event raised directed at items or clothing when they are equipped or held. In order for an item to grant actions some
-///     system can subscribe to this event and add actions to the <see cref="Actions"/> list. 
+///     system can subscribe to this event and add actions to the <see cref="Actions"/> list.
 /// </summary>
 /// <remarks>
 ///     Note that a system could also just manually add actions as a result of a <see cref="GotEquippedEvent"/> or <see
diff --git a/Content.Shared/Hands/Components/SharedHandsComponent.cs b/Content.Shared/Hands/Components/SharedHandsComponent.cs
index afcde19535..5d3a771002 100644
--- a/Content.Shared/Hands/Components/SharedHandsComponent.cs
+++ b/Content.Shared/Hands/Components/SharedHandsComponent.cs
@@ -45,7 +45,7 @@ public abstract class SharedHandsComponent : Component
 }
 
 [Serializable, NetSerializable]
-public sealed class Hand
+public sealed class Hand //TODO: This should definitely be a struct - Jezi
 {
     [ViewVariables]
     public string Name { get; }
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
index 824bc3eb1d..46f3dd3ff5 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
@@ -16,6 +16,8 @@ public abstract partial class SharedHandsSystem : EntitySystem
     [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
     [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
 
+    protected Action<SharedHandsComponent?>? OnHandSetActive;
+
     public override void Initialize()
     {
         base.Initialize();
@@ -29,7 +31,7 @@ public abstract partial class SharedHandsSystem : EntitySystem
         CommandBinds.Unregister<SharedHandsSystem>();
     }
 
-    public void AddHand(EntityUid uid, string handName, HandLocation handLocation, SharedHandsComponent? handsComp = null)
+    public virtual void AddHand(EntityUid uid, string handName, HandLocation handLocation, SharedHandsComponent? handsComp = null)
     {
         if (!Resolve(uid, ref handsComp, false))
             return;
@@ -51,7 +53,7 @@ public abstract partial class SharedHandsSystem : EntitySystem
         Dirty(handsComp);
     }
 
-    public void RemoveHand(EntityUid uid, string handName, SharedHandsComponent? handsComp = null)
+    public virtual void RemoveHand(EntityUid uid, string handName, SharedHandsComponent? handsComp = null)
     {
         if (!Resolve(uid, ref handsComp, false))
             return;
@@ -154,7 +156,6 @@ public abstract partial class SharedHandsSystem : EntitySystem
         Hand? hand = null;
         if (name != null && !handComp.Hands.TryGetValue(name, out hand))
             return false;
-
         return SetActiveHand(uid, hand, handComp);
     }
 
@@ -163,7 +164,7 @@ public abstract partial class SharedHandsSystem : EntitySystem
     /// </summary>
     /// <returns>True if the active hand was set to a NEW value. Setting it to the same value returns false and does
     /// not trigger interactions.</returns>
-    public virtual bool SetActiveHand(EntityUid uid, Hand? hand, SharedHandsComponent? handComp = null)
+    public bool SetActiveHand(EntityUid uid, Hand? hand, SharedHandsComponent? handComp = null)
     {
         if (!Resolve(uid, ref handComp))
             return false;
@@ -181,10 +182,10 @@ public abstract partial class SharedHandsSystem : EntitySystem
         }
 
         handComp.ActiveHand = hand;
+        OnHandSetActive?.Invoke(handComp);
 
         if (hand.HeldEntity != null)
             RaiseLocalEvent(hand.HeldEntity.Value, new HandSelectedEvent(uid), false);
-
         Dirty(handComp);
         return true;
     }
diff --git a/SpaceStation14.sln.DotSettings b/SpaceStation14.sln.DotSettings
index d4ee3bded9..d946e311d4 100644
--- a/SpaceStation14.sln.DotSettings
+++ b/SpaceStation14.sln.DotSettings
@@ -528,6 +528,7 @@ public sealed class $CLASS$ : Shared$CLASS$ {
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Grindable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=hardcode/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=hbox/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=hotbar/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=inhand/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Jitteriness/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Jittering/@EntryIndexedValue">True</s:Boolean>
@@ -539,6 +540,7 @@ public sealed class $CLASS$ : Shared$CLASS$ {
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Lacunarity/@EntryIndexedValue">True</s:Boolean>
     <s:Boolean x:Key="/Default/UserDictionary/Words/=Lerp/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=lerping/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=loadout/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=LOOC/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Magboots/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=metabolizable/@EntryIndexedValue">True</s:Boolean>