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

Refactor actions to be entities with components (#19900)

Browse Source
This commit is contained in:
DrSmugleaf
2023-09-08 18:16:05 -07:00
committed by GitHub
parent e18f731b91
commit c71f97e3a2
210 changed files with 10693 additions and 11714 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Content.Server/Sericulture/SericultureSystem.cs
View File

@@ -1,14 +1,11 @@
using Content.Server.Actions;
using Content.Server.DoAfter;
using Content.Server.Popups;
using Content.Shared.Actions;
using Content.Shared.Actions.ActionTypes;
using Content.Server.Stack;
using Content.Shared.DoAfter;
using Content.Shared.Nutrition.Components;
using Content.Shared.Nutrition.EntitySystems;
using Robust.Shared.Prototypes;
using Content.Shared.Sericulture;
using Content.Server.Stack;
namespace Content.Server.Sericulture;
@@ -16,7 +13,6 @@ public sealed partial class SericultureSystem : EntitySystem
{
[Dependency] private readonly ActionsSystem _actionsSystem = default!;
[Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
[Dependency] private readonly IPrototypeManager _protoManager = default!;
[Dependency] private readonly HungerSystem _hungerSystem = default!;
[Dependency] private readonly PopupSystem _popupSystem = default!;
[Dependency] private readonly StackSystem _stackSystem = default!;
@@ -25,26 +21,20 @@ public sealed partial class SericultureSystem : EntitySystem
{
base.Initialize();
SubscribeLocalEvent<SericultureComponent, ComponentInit>(OnCompInit);
SubscribeLocalEvent<SericultureComponent, MapInitEvent>(OnCompMapInit);
SubscribeLocalEvent<SericultureComponent, ComponentShutdown>(OnCompRemove);
SubscribeLocalEvent<SericultureComponent, SericultureActionEvent>(OnSericultureStart);
SubscribeLocalEvent<SericultureComponent, SericultureDoAfterEvent>(OnSericultureDoAfter);
}
private void OnCompInit(EntityUid uid, SericultureComponent comp, ComponentInit args)
private void OnCompMapInit(EntityUid uid, SericultureComponent comp, MapInitEvent args)
{
if (!_protoManager.TryIndex<InstantActionPrototype>(comp.ActionProto, out var actionProto))
return;
_actionsSystem.AddAction(uid, new InstantAction(actionProto), uid);
_actionsSystem.AddAction(uid, ref comp.ActionEntity, comp.Action, uid);
}
private void OnCompRemove(EntityUid uid, SericultureComponent comp, ComponentShutdown args)
{
if (!_protoManager.TryIndex<InstantActionPrototype>(comp.ActionProto, out var actionProto))
return;
_actionsSystem.RemoveAction(uid, new InstantAction(actionProto));
_actionsSystem.RemoveAction(uid, comp.ActionEntity);
}
private void OnSericultureStart(EntityUid uid, SericultureComponent comp, SericultureActionEvent args)
@@ -96,6 +86,4 @@ public sealed partial class SericultureSystem : EntitySystem
return false;
}
public sealed partial class SericultureActionEvent : InstantActionEvent { }
}