mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-17 13:37:47 +03:00
## Mirror of PR #26159: [Obsolete `Logger` cleanup for `EntitySystem`s part 2](https://github.com/space-wizards/space-station-14/pull/26159) from <img src="https://avatars.githubusercontent.com/u/10567778?v=4" alt="space-wizards" width="22"/> [space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14) ###### `7d275a4b5e4188db424cc417c609dced3f9aca89` PR opened by <img src="https://avatars.githubusercontent.com/u/27449516?v=4" width="16"/><a href="https://github.com/LordCarve"> LordCarve</a> at 2024-03-15 20:15:41 UTC --- PR changed 14 files with 36 additions and 25 deletions. The PR had the following labels: - Status: Needs Review --- <details open="true"><summary><h1>Original Body</h1></summary> > <!-- Please read these guidelines before opening your PR: https://docs.spacestation14.io/en/getting-started/pr-guideline --> > <!-- The text between the arrows are comments - they will not be visible on your PR. --> > > ## About the PR > <!-- What did you change in this PR? --> > Part 2 of 2, continuation of #25941 > Gets rid of the remaining obsolete `Logger` method calls from all `EntitySystem`s and uses the expected `Log` to get at the proper sawmill. > > In particular: > 1. Make the `ExamineSystemShared`'s `InRangeUnObstructed` non-`static` (so finally able to use instance-based `Log` rather than `Logger`) and inject dependency to all systems that were using it as `static`. > 2. Adjust 4 more `EntitySystem`s to use `Log` rather than `Logger` that were missed in the previous PR. > > Tested that the game runs and the affected systems direct logs to the correct sawmill. > > ## Why / Balance > <!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. --> > Using Logger directly for logging is marked obsolete. Brings some order to logs (i.e. all `EntitySystem` logs start with a preceding `system.`). > > ## Technical details > <!-- If this is a code change, summarize at high level how your new code works. This makes it easier to review. --> > I'm pretty sure `ExamineSystemShared`'s `InRangeUnObstructed` not being `static` is the intended way since it being `static` dodges the IoC entirely. It even has dirty hacks such as getting the occluder system inside to make it happen. I didn't fix any of that as it's beyond the scope of this PR, but it's another thing that needs improving. > > These are the changes to the log sawmills: > `ExamineSystemShared.cs`: BEFORE: `root` -> NEW: `system.examine` > `AtmosphereSystem.Monstermos.cs`: BEFORE: `root` -> NEW: `system.atmosphere` > `TypingIndicatorSystem.cs`: BEFORE: `root` -> NEW: `system.typing_indicator` > `PiratesRuleSystem.cs` BEFORE: `pirates` -> NEW: `system.pirates_rule` > `TabletopSystem.Session.cs` BEFORE: `root` -> NEW: `system.tabletop` > > ## Media > <!-- > PRs which make ingame changes (adding clothing, items, new features, etc) are required to have media attached that showcase the changes. > Small fixes/refactors are exempt. > Any media may be used in SS14 progress reports, with clear credit given. > > If you're unsure whether your PR will require media, ask a maintainer. > > Check the box below to confirm that you have in fact seen this (put an X in the brackets, like [X]): > --> > > - [X] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase > > ## Breaking changes > <!-- > List any breaking changes, including namespace, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be pasted in #codebase-changes. > --> > Some logs now fall under a different sawmill (more precise). Any software that analyzes logs and makes assumptions on which sawmill do these logs fall to will need to be adjusted. </details> --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: SimpleStation14 <Unknown> Co-authored-by: VMSolidus <evilexecutive@gmail.com>
65 lines
2.3 KiB
C#
65 lines
2.3 KiB
C#
using Content.Shared.ActionBlocker;
|
|
using Content.Shared.Chat.TypingIndicator;
|
|
using Robust.Shared.Player;
|
|
|
|
namespace Content.Server.Chat.TypingIndicator;
|
|
|
|
// Server-side typing system
|
|
// It receives networked typing events from clients
|
|
// And sync typing indicator using appearance component
|
|
public sealed class TypingIndicatorSystem : SharedTypingIndicatorSystem
|
|
{
|
|
[Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
|
|
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
|
|
|
|
public override void Initialize()
|
|
{
|
|
base.Initialize();
|
|
SubscribeLocalEvent<PlayerAttachedEvent>(OnPlayerAttached);
|
|
SubscribeLocalEvent<TypingIndicatorComponent, PlayerDetachedEvent>(OnPlayerDetached);
|
|
SubscribeNetworkEvent<TypingChangedEvent>(OnClientTypingChanged);
|
|
}
|
|
|
|
private void OnPlayerAttached(PlayerAttachedEvent ev)
|
|
{
|
|
// when player poses entity we want to make sure that there is typing indicator
|
|
EnsureComp<TypingIndicatorComponent>(ev.Entity);
|
|
// we also need appearance component to sync visual state
|
|
EnsureComp<AppearanceComponent>(ev.Entity);
|
|
}
|
|
|
|
private void OnPlayerDetached(EntityUid uid, TypingIndicatorComponent component, PlayerDetachedEvent args)
|
|
{
|
|
// player left entity body - hide typing indicator
|
|
SetTypingIndicatorEnabled(uid, false);
|
|
}
|
|
|
|
private void OnClientTypingChanged(TypingChangedEvent ev, EntitySessionEventArgs args)
|
|
{
|
|
var uid = args.SenderSession.AttachedEntity;
|
|
if (!Exists(uid))
|
|
{
|
|
Log.Warning($"Client {args.SenderSession} sent TypingChangedEvent without an attached entity.");
|
|
return;
|
|
}
|
|
|
|
// check if this entity can speak or emote
|
|
if (!_actionBlocker.CanEmote(uid.Value) && !_actionBlocker.CanSpeak(uid.Value))
|
|
{
|
|
// nah, make sure that typing indicator is disabled
|
|
SetTypingIndicatorEnabled(uid.Value, false);
|
|
return;
|
|
}
|
|
|
|
SetTypingIndicatorEnabled(uid.Value, ev.IsTyping);
|
|
}
|
|
|
|
private void SetTypingIndicatorEnabled(EntityUid uid, bool isEnabled, AppearanceComponent? appearance = null)
|
|
{
|
|
if (!Resolve(uid, ref appearance, false))
|
|
return;
|
|
|
|
_appearance.SetData(uid, TypingIndicatorVisuals.IsTyping, isEnabled, appearance);
|
|
}
|
|
}
|