189a5c7847
- Completely rewrited the `ConstructionComponent` logic to be ECS, *without* looking too much at the original implementation.
- The original implementation was dirty and unmaintainable, whereas this new implementation is much cleaner, well-organized and maintainable. I've made sure to leave many comments around, explaining what everything does.
- Construction now has a framework for handling events other than `InteractUsing`.
- This means that you can now have CGL steps for things other than inserting items, using tools...
- Construction no longer uses `async` everywhere for `DoAfter`s. Instead it uses events.
- Construction event handling occurs in the `ConstructionSystem` update tick, instead of on event handlers.
- This ensures we can delete/modify entities without worrying about "collection modified while enumerating" exceptions.
- This also means the construction update tick is where all the fun happens, meaning it'll show up on our metrics and give us an idea of how expensive it is/how much tick time is spent in construction.
- `IGraphCondition` and `IGraphAction` have been refactored to take in `EntityUid`, `IEntityManager`, and to not be async.
- Removes nested steps, as they made maintainability significantly worse, and nothing used them yet.
- This fixes #4892 and fixes #4857
Please note, this leaves many things unchanged, as my idea is to split this into multiple PRs. Some unchanged things:
- Initial construction code is the same. In the future, it'll probably use dummy entities.
- Client-side guided steps are the same. In the future, the server will generate the guided steps and send them to clients as needed, caching these in both the server and client to save cycles and bandwidth.
- No new construction graph steps... Yet! 👀
33 lines
1.1 KiB
C#
33 lines
1.1 KiB
C#
using System.Threading.Tasks;
|
|
using Content.Shared.Construction;
|
|
using JetBrains.Annotations;
|
|
using Robust.Shared.GameObjects;
|
|
using Robust.Shared.Serialization.Manager.Attributes;
|
|
|
|
namespace Content.Server.Construction.Completions
|
|
{
|
|
[UsedImplicitly]
|
|
[DataDefinition]
|
|
public class ConditionalAction : IGraphAction
|
|
{
|
|
[DataField("passUser")] public bool PassUser { get; } = false;
|
|
|
|
[DataField("condition", required:true)] public IGraphCondition? Condition { get; } = null;
|
|
|
|
[DataField("action", required:true)] public IGraphAction? Action { get; } = null;
|
|
|
|
[DataField("else")] public IGraphAction? Else { get; } = null;
|
|
|
|
public void PerformAction(EntityUid uid, EntityUid? userUid, IEntityManager entityManager)
|
|
{
|
|
if (Condition == null || Action == null)
|
|
return;
|
|
|
|
if (Condition.Condition(PassUser && userUid != null ? userUid.Value : uid, entityManager))
|
|
Action.PerformAction(uid, userUid, entityManager);
|
|
else
|
|
Else?.PerformAction(uid, userUid, entityManager);
|
|
}
|
|
}
|
|
}
|