Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Random spontaneous cleanup PR (#25131)

Browse Source 
* Use new Subs.CVar helper

Removes manual config OnValueChanged calls, removes need to remember to manually unsubscribe.

This both reduces boilerplate and fixes many issues where subscriptions weren't removed on entity system shutdown.

* Fix a bunch of warnings

* More warning fixes

* Use new DateTime serializer to get rid of ISerializationHooks in changelog code.

* Get rid of some more ISerializationHooks for enums

* And a little more

* Apply suggestions from code review

Co-authored-by: 0x6273 <0x40@keemail.me>

---------

Co-authored-by: 0x6273 <0x40@keemail.me>
This commit is contained in:
Pieter-Jan Briers
2024-02-13 22:48:39 +01:00
committed by GitHub
parent d0c174388c
commit 68ce53ae17
210 changed files with 481 additions and 930 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Client/UserInterface/Controls/SplitBar.xaml.cs
View File

@@ -7,6 +7,7 @@ using Robust.Client.UserInterface.XAML;
namespace Content.Client.UserInterface.Controls
{
[GenerateTypedNameReferences]
[Virtual]
public partial class SplitBar : BoxContainer
{
public Vector2 MinBarSize = new(24, 0);

8
Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
View File

@@ -169,7 +169,7 @@ public sealed class AHelpUIController: UIController, IOnSystemChanged<BwoinkSyst
return;
UIHelper?.Dispose();
var ownerUserId = _playerManager.LocalPlayer!.UserId;
var ownerUserId = _playerManager.LocalUser!.Value;
UIHelper = isAdmin ? new AdminAHelpUIHandler(ownerUserId) : new UserAHelpUIHandler(ownerUserId);
UIHelper.DiscordRelayChanged(_discordRelayActive);
@@ -182,15 +182,15 @@ public sealed class AHelpUIController: UIController, IOnSystemChanged<BwoinkSyst
public void Open()
{
var localPlayer = _playerManager.LocalPlayer;
if (localPlayer == null)
var localUser = _playerManager.LocalUser;
if (localUser == null)
{
return;
}
EnsureUIHelper();
if (UIHelper!.IsOpen)
return;
UIHelper!.Open(localPlayer.UserId, _discordRelayActive);
UIHelper!.Open(localUser.Value, _discordRelayActive);
}
public void Open(NetUserId userId)

4
Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
View File

@@ -587,7 +587,7 @@ public sealed class ChatUIController : UIController
CreateSpeechBubble(entity, msg);
}
var player = _player.LocalPlayer?.ControlledEntity;
var player = _player.LocalEntity;
var predicate = static (EntityUid uid, (EntityUid compOwner, EntityUid? attachedEntity) data)
=> uid == data.compOwner || uid == data.attachedEntity;
var playerPos = player != null
@@ -644,7 +644,7 @@ public sealed class ChatUIController : UIController
private bool TryGetRadioChannel(string text, out RadioChannelPrototype? radioChannel)
{
radioChannel = null;
return _player.LocalPlayer?.ControlledEntity is EntityUid { Valid: true } uid
return _player.LocalEntity is EntityUid { Valid: true } uid
&& _chatSys != null
&& _chatSys.TryProccessRadioMessage(uid, text, out _, out radioChannel, quiet: true);
}

6
Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
View File

@@ -33,7 +33,7 @@ public partial class ChatBox : UIWidget
_entManager = IoCManager.Resolve<IEntityManager>();
ChatInput.Input.OnTextEntered += OnTextEntered;
ChatInput.Input.OnKeyBindDown += OnKeyBindDown;
ChatInput.Input.OnKeyBindDown += OnInputKeyBindDown;
ChatInput.Input.OnTextChanged += OnTextChanged;
ChatInput.ChannelSelector.OnChannelSelect += OnChannelSelect;
ChatInput.FilterButton.Popup.OnChannelFilter += OnChannelFilter;
@@ -142,7 +142,7 @@ public partial class ChatBox : UIWidget
ChatInput.ChannelSelector.Select(toSelect);
}
private void OnKeyBindDown(GUIBoundKeyEventArgs args)
private void OnInputKeyBindDown(GUIBoundKeyEventArgs args)
{
if (args.Function == EngineKeyFunctions.TextReleaseFocus)
{
@@ -182,7 +182,7 @@ public partial class ChatBox : UIWidget
if (!disposing) return;
_controller.UnregisterChat(this);
ChatInput.Input.OnTextEntered -= OnTextEntered;
ChatInput.Input.OnKeyBindDown -= OnKeyBindDown;
ChatInput.Input.OnKeyBindDown -= OnInputKeyBindDown;
ChatInput.Input.OnTextChanged -= OnTextChanged;
ChatInput.ChannelSelector.OnChannelSelect -= OnChannelSelect;
}

4
Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs
View File

@@ -48,7 +48,7 @@ public sealed class DamageOverlayUiController : UIController
private void OnMobStateChanged(MobStateChangedEvent args)
{
if (args.Target != _playerManager.LocalPlayer?.ControlledEntity)
if (args.Target != _playerManager.LocalEntity)
return;
UpdateOverlays(args.Target, args.Component);
@@ -57,7 +57,7 @@ public sealed class DamageOverlayUiController : UIController
private void OnThresholdCheck(ref MobThresholdChecked args)
{
if (args.Target != _playerManager.LocalPlayer?.ControlledEntity)
if (args.Target != _playerManager.LocalEntity)
return;
UpdateOverlays(args.Target, args.MobState, args.Damageable, args.Threshold);
}

2
Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs
View File

@@ -56,7 +56,7 @@ public sealed class DamageOverlay : Overlay
protected override void Draw(in OverlayDrawArgs args)
{
if (!_entityManager.TryGetComponent(_playerManager.LocalPlayer?.ControlledEntity, out EyeComponent? eyeComp))
if (!_entityManager.TryGetComponent(_playerManager.LocalEntity, out EyeComponent? eyeComp))
return;
if (args.Viewport.Eye != eyeComp.Eye)

8
Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleEui.cs
View File

@@ -43,8 +43,8 @@ public sealed class MakeGhostRoleEui : BaseEui
private void OnMake(NetEntity entity, string name, string description, string rules, bool makeSentient)
{
var player = _playerManager.LocalPlayer;
if (player == null)
var session = _playerManager.LocalSession;
if (session == null)
{
return;
}
@@ -56,12 +56,12 @@ public sealed class MakeGhostRoleEui : BaseEui
$"\"{CommandParsing.Escape(description)}\" " +
$"\"{CommandParsing.Escape(rules)}\"";
_consoleHost.ExecuteCommand(player.Session, makeGhostRoleCommand);
_consoleHost.ExecuteCommand(session, makeGhostRoleCommand);
if (makeSentient)
{
var makeSentientCommand = $"makesentient \"{CommandParsing.Escape(entity.ToString())}\"";
_consoleHost.ExecuteCommand(player.Session, makeSentientCommand);
_consoleHost.ExecuteCommand(session, makeSentientCommand);
}
_window.Close();

2
Content.Client/UserInterface/Systems/Viewport/ViewportUIController.cs
View File

@@ -80,7 +80,7 @@ public sealed class ViewportUIController : UIController
// verify that the current eye is not "null". Fuck IEyeManager.
var ent = _playerMan.LocalPlayer?.ControlledEntity;
var ent = _playerMan.LocalEntity;
if (_eyeManager.CurrentEye.Position != default || ent == null)
return;