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

Update trivial components to use auto comp states (#20539)

Browse Source
This commit is contained in:
DrSmugleaf
2023-09-28 16:20:29 -07:00
committed by GitHub
parent 14cfe44ece
commit a44fa86b68
158 changed files with 806 additions and 2866 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
Content.Shared/Timing/UseDelayComponent.cs
View File

@@ -1,45 +1,28 @@
using System.Threading;
using Robust.Shared.GameStates;
using Robust.Shared.Serialization;
namespace Content.Shared.Timing
namespace Content.Shared.Timing;
/// <summary>
/// Timer that creates a cooldown each time an object is activated/used
/// </summary>
[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
public sealed partial class UseDelayComponent : Component
{
[AutoNetworkedField]
public TimeSpan LastUseTime;
[AutoNetworkedField]
public TimeSpan? DelayEndTime;
[DataField, AutoNetworkedField]
[ViewVariables(VVAccess.ReadWrite)]
public TimeSpan Delay = TimeSpan.FromSeconds(1);
/// <summary>
/// Timer that creates a cooldown each time an object is activated/used
/// Stores remaining delay pausing (and eventually, serialization).
/// </summary>
[RegisterComponent]
[NetworkedComponent]
public sealed partial class UseDelayComponent : Component
{
public TimeSpan LastUseTime;
[DataField]
public TimeSpan? RemainingDelay;
public TimeSpan? DelayEndTime;
[DataField("delay")]
[ViewVariables(VVAccess.ReadWrite)]
public TimeSpan Delay = TimeSpan.FromSeconds(1);
/// <summary>
/// Stores remaining delay pausing (and eventually, serialization).
/// </summary>
[DataField("remainingDelay")]
public TimeSpan? RemainingDelay;
public bool ActiveDelay => DelayEndTime != null;
}
[Serializable, NetSerializable]
public sealed class UseDelayComponentState : ComponentState
{
public readonly TimeSpan LastUseTime;
public readonly TimeSpan Delay;
public readonly TimeSpan? DelayEndTime;
public UseDelayComponentState(TimeSpan lastUseTime, TimeSpan delay, TimeSpan? delayEndTime)
{
LastUseTime = lastUseTime;
Delay = delay;
DelayEndTime = delayEndTime;
}
}
public bool ActiveDelay => DelayEndTime != null;
}

19
Content.Shared/Timing/UseDelaySystem.cs
View File

@@ -1,6 +1,4 @@
using System.Threading;
using Content.Shared.Cooldown;
using Robust.Shared.GameStates;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
@@ -16,8 +14,7 @@ public sealed class UseDelaySystem : EntitySystem
{
base.Initialize();
SubscribeLocalEvent<UseDelayComponent, ComponentGetState>(OnGetState);
SubscribeLocalEvent<UseDelayComponent, ComponentHandleState>(OnHandleState);
SubscribeLocalEvent<UseDelayComponent, AfterAutoHandleStateEvent>(OnHandleState);
SubscribeLocalEvent<UseDelayComponent, EntityPausedEvent>(OnPaused);
SubscribeLocalEvent<UseDelayComponent, EntityUnpausedEvent>(OnUnpaused);
@@ -45,26 +42,14 @@ public sealed class UseDelaySystem : EntitySystem
_activeDelays.Add(component);
}
private void OnHandleState(EntityUid uid, UseDelayComponent component, ref ComponentHandleState args)
private void OnHandleState(EntityUid uid, UseDelayComponent component, ref AfterAutoHandleStateEvent args)
{
if (args.Current is not UseDelayComponentState state)
return;
component.LastUseTime = state.LastUseTime;
component.Delay = state.Delay;
component.DelayEndTime = state.DelayEndTime;
if (component.DelayEndTime == null)
_activeDelays.Remove(component);
else
_activeDelays.Add(component);
}
private void OnGetState(EntityUid uid, UseDelayComponent component, ref ComponentGetState args)
{
args.State = new UseDelayComponentState(component.LastUseTime, component.Delay, component.DelayEndTime);
}
public override void Update(float frameTime)
{
base.Update(frameTime);