mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-21 23:48:15 +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>
126 lines
6.0 KiB
C#
126 lines
6.0 KiB
C#
using Content.Server.Administration.Logs;
|
|
using Robust.Shared.Player;
|
|
using Content.Shared.Interaction;
|
|
using Content.Shared.Popups;
|
|
using Content.Shared.Doors.Components;
|
|
using Content.Shared.Doors.Systems;
|
|
using Content.Shared.Physics;
|
|
using Content.Shared.Access.Components;
|
|
using Content.Server.Doors.Systems;
|
|
using Content.Server.Power.EntitySystems;
|
|
using Content.Shared.Database;
|
|
using Content.Shared.Interaction.Events;
|
|
using Content.Shared.Examine;
|
|
using static Content.Server.Remotes.DoorRemoteComponent;
|
|
|
|
namespace Content.Server.Remotes
|
|
{
|
|
public sealed class DoorRemoteSystem : EntitySystem
|
|
{
|
|
[Dependency] private readonly IAdminLogManager _adminLogger = default!;
|
|
[Dependency] private readonly AirlockSystem _airlock = default!;
|
|
[Dependency] private readonly SharedPopupSystem _popupSystem = default!;
|
|
[Dependency] private readonly DoorSystem _doorSystem = default!;
|
|
[Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
|
|
[Dependency] private readonly ExamineSystemShared _examine = default!;
|
|
// I'm so sorry [Dependency] private readonly SharedAirlockSystem _sharedAirlockSystem = default!;
|
|
|
|
public override void Initialize()
|
|
{
|
|
SubscribeLocalEvent<DoorRemoteComponent, UseInHandEvent>(OnInHandActivation);
|
|
SubscribeLocalEvent<DoorRemoteComponent, BeforeRangedInteractEvent>(OnBeforeInteract);
|
|
}
|
|
|
|
public void OnInHandActivation(EntityUid user, DoorRemoteComponent component, UseInHandEvent args)
|
|
{
|
|
string switchMessageId;
|
|
switch (component.Mode)
|
|
{
|
|
case OperatingMode.OpenClose:
|
|
component.Mode = OperatingMode.ToggleBolts;
|
|
switchMessageId = "door-remote-switch-state-toggle-bolts";
|
|
break;
|
|
|
|
// Skip toggle bolts mode and move on from there (to emergency access)
|
|
case OperatingMode.ToggleBolts:
|
|
component.Mode = OperatingMode.ToggleEmergencyAccess;
|
|
switchMessageId = "door-remote-switch-state-toggle-emergency-access";
|
|
break;
|
|
|
|
// Skip ToggleEmergencyAccess mode and move on from there (to door toggle)
|
|
case OperatingMode.ToggleEmergencyAccess:
|
|
component.Mode = OperatingMode.OpenClose;
|
|
switchMessageId = "door-remote-switch-state-open-close";
|
|
break;
|
|
default:
|
|
throw new InvalidOperationException(
|
|
$"{nameof(DoorRemoteComponent)} had invalid mode {component.Mode}");
|
|
}
|
|
ShowPopupToUser(switchMessageId, args.User);
|
|
}
|
|
|
|
private void OnBeforeInteract(EntityUid uid, DoorRemoteComponent component, BeforeRangedInteractEvent args)
|
|
{
|
|
bool isAirlock = TryComp<AirlockComponent>(args.Target, out var airlockComp);
|
|
|
|
if (args.Handled
|
|
|| args.Target == null
|
|
|| !TryComp<DoorComponent>(args.Target, out var doorComp) // If it isn't a door we don't use it
|
|
// Only able to control doors if they are within your vision and within your max range.
|
|
// Not affected by mobs or machines anymore.
|
|
|| !_examine.InRangeUnOccluded(args.User, args.Target.Value, SharedInteractionSystem.MaxRaycastRange, null))
|
|
{
|
|
return;
|
|
}
|
|
|
|
args.Handled = true;
|
|
|
|
if (!this.IsPowered(args.Target.Value, EntityManager))
|
|
{
|
|
ShowPopupToUser("door-remote-no-power", args.User);
|
|
return;
|
|
}
|
|
|
|
if (TryComp<AccessReaderComponent>(args.Target, out var accessComponent)
|
|
&& !_doorSystem.HasAccess(args.Target.Value, args.Used, doorComp, accessComponent))
|
|
{
|
|
_doorSystem.Deny(args.Target.Value, doorComp, args.User);
|
|
ShowPopupToUser("door-remote-denied", args.User);
|
|
return;
|
|
}
|
|
|
|
switch (component.Mode)
|
|
{
|
|
case OperatingMode.OpenClose:
|
|
if (_doorSystem.TryToggleDoor(args.Target.Value, doorComp, args.Used))
|
|
_adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)}: {doorComp.State}");
|
|
break;
|
|
case OperatingMode.ToggleBolts:
|
|
if (TryComp<DoorBoltComponent>(args.Target, out var boltsComp))
|
|
{
|
|
if (!boltsComp.BoltWireCut)
|
|
{
|
|
_doorSystem.SetBoltsDown((args.Target.Value, boltsComp), !boltsComp.BoltsDown, args.Used);
|
|
_adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)} to {(boltsComp.BoltsDown ? "" : "un")}bolt it");
|
|
}
|
|
}
|
|
break;
|
|
case OperatingMode.ToggleEmergencyAccess:
|
|
if (airlockComp != null)
|
|
{
|
|
_airlock.ToggleEmergencyAccess(args.Target.Value, airlockComp);
|
|
_adminLogger.Add(LogType.Action, LogImpact.Medium,
|
|
$"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)} to set emergency access {(airlockComp.EmergencyAccess ? "on" : "off")}");
|
|
}
|
|
break;
|
|
default:
|
|
throw new InvalidOperationException(
|
|
$"{nameof(DoorRemoteComponent)} had invalid mode {component.Mode}");
|
|
}
|
|
}
|
|
|
|
private void ShowPopupToUser(string messageId, EntityUid user) =>
|
|
_popupSystem.PopupEntity(Loc.GetString(messageId), user, user);
|
|
}
|
|
}
|