Make the powered examine text fully client predicted (#30441)
* Make the powered examine text fully client predicted * switch to using the Entity<T> API for the examine event
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
using Content.Client.Power.Components;
|
using Content.Client.Power.Components;
|
||||||
using Content.Shared.Power.Components;
|
using Content.Shared.Power.Components;
|
||||||
using Content.Shared.Power.EntitySystems;
|
using Content.Shared.Power.EntitySystems;
|
||||||
|
using Content.Shared.Examine;
|
||||||
using Robust.Shared.GameStates;
|
using Robust.Shared.GameStates;
|
||||||
|
|
||||||
namespace Content.Client.Power.EntitySystems;
|
namespace Content.Client.Power.EntitySystems;
|
||||||
@@ -10,9 +11,15 @@ public sealed class PowerReceiverSystem : SharedPowerReceiverSystem
|
|||||||
public override void Initialize()
|
public override void Initialize()
|
||||||
{
|
{
|
||||||
base.Initialize();
|
base.Initialize();
|
||||||
|
SubscribeLocalEvent<ApcPowerReceiverComponent, ExaminedEvent>(OnExamined);
|
||||||
SubscribeLocalEvent<ApcPowerReceiverComponent, ComponentHandleState>(OnHandleState);
|
SubscribeLocalEvent<ApcPowerReceiverComponent, ComponentHandleState>(OnHandleState);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void OnExamined(Entity<ApcPowerReceiverComponent> ent, ref ExaminedEvent args)
|
||||||
|
{
|
||||||
|
args.PushMarkup(GetExamineText(ent.Comp.Powered));
|
||||||
|
}
|
||||||
|
|
||||||
private void OnHandleState(EntityUid uid, ApcPowerReceiverComponent component, ref ComponentHandleState args)
|
private void OnHandleState(EntityUid uid, ApcPowerReceiverComponent component, ref ComponentHandleState args)
|
||||||
{
|
{
|
||||||
if (args.Current is not ApcPowerReceiverComponentState state)
|
if (args.Current is not ApcPowerReceiverComponentState state)
|
||||||
|
|||||||
@@ -46,6 +46,11 @@ namespace Content.Server.Power.EntitySystems
|
|||||||
_provQuery = GetEntityQuery<ApcPowerProviderComponent>();
|
_provQuery = GetEntityQuery<ApcPowerProviderComponent>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void OnExamined(Entity<ApcPowerReceiverComponent> ent, ref ExaminedEvent args)
|
||||||
|
{
|
||||||
|
args.PushMarkup(GetExamineText(ent.Comp.Powered));
|
||||||
|
}
|
||||||
|
|
||||||
private void OnGetVerbs(EntityUid uid, ApcPowerReceiverComponent component, GetVerbsEvent<Verb> args)
|
private void OnGetVerbs(EntityUid uid, ApcPowerReceiverComponent component, GetVerbsEvent<Verb> args)
|
||||||
{
|
{
|
||||||
if (!_adminManager.HasAdminFlag(args.User, AdminFlags.Admin))
|
if (!_adminManager.HasAdminFlag(args.User, AdminFlags.Admin))
|
||||||
@@ -61,17 +66,6 @@ namespace Content.Server.Power.EntitySystems
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
///<summary>
|
|
||||||
///Adds some markup to the examine text of whatever object is using this component to tell you if it's powered or not, even if it doesn't have an icon state to do this for you.
|
|
||||||
///</summary>
|
|
||||||
private void OnExamined(EntityUid uid, ApcPowerReceiverComponent component, ExaminedEvent args)
|
|
||||||
{
|
|
||||||
args.PushMarkup(Loc.GetString("power-receiver-component-on-examine-main",
|
|
||||||
("stateText", Loc.GetString( component.Powered
|
|
||||||
? "power-receiver-component-on-examine-powered"
|
|
||||||
: "power-receiver-component-on-examine-unpowered"))));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnProviderShutdown(EntityUid uid, ApcPowerProviderComponent component, ComponentShutdown args)
|
private void OnProviderShutdown(EntityUid uid, ApcPowerProviderComponent component, ComponentShutdown args)
|
||||||
{
|
{
|
||||||
foreach (var receiver in component.LinkedReceivers)
|
foreach (var receiver in component.LinkedReceivers)
|
||||||
|
|||||||
@@ -1,6 +1,15 @@
|
|||||||
namespace Content.Shared.Power.EntitySystems;
|
using Content.Shared.Examine;
|
||||||
|
using Content.Shared.Power.Components;
|
||||||
|
|
||||||
|
namespace Content.Shared.Power.EntitySystems;
|
||||||
|
|
||||||
public abstract class SharedPowerReceiverSystem : EntitySystem
|
public abstract class SharedPowerReceiverSystem : EntitySystem
|
||||||
{
|
{
|
||||||
|
protected string GetExamineText(bool powered)
|
||||||
|
{
|
||||||
|
return Loc.GetString("power-receiver-component-on-examine-main",
|
||||||
|
("stateText", Loc.GetString(powered
|
||||||
|
? "power-receiver-component-on-examine-powered"
|
||||||
|
: "power-receiver-component-on-examine-unpowered")));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user