Solution Entities (#21916)
* Creates Content.Shared.Chemistry.Solutions Copies Solution class to new namespace Obsoletes old Solution class * Switches over to the Solutions.Solution Solution * Creates Content.Shared.Chemistry.Containers Copies relevant components/systems to the new namespace Obsoletes old versions * Switches over to the Containers.XYZ namespace * Creates SolutionSystem and obsoletes old SolutionContainerSystem methods * Start using SolutionSystem for Solution manipulation * EnumerateSolutions * Move TryGetMixableSolution * Move EnsureSolution to Server * Create Solution Entities * Stop using obsolete solution system methods * Fix prototype component tests * Add using ..Audio.Systems; back * Wrap solution container slots in ContainerSlots * Actually add the slot to the solution container map * Dirty SolutionContainerComponent when ensuring solutions * Revert namespace changes * Remerge SolutionSystem and SolutionContainerSystem * SolutionContainerManagerComponent refactor * Avoid wrapping necessary code in DebugTools.Assert as it is removed when compiling for release * Readd examine reagent sorting * Fix errors * Poke tests * Fix solution names not being applied * Fix WoolyComponent including statement * Fix merge skew * Fix compile errors * Make reactions use solntities * Reindent solution class namespace * Field attribute changes * AutoGenerateComponentState for SolutionContainerComponent * SolutionContainerComponent -> ContainedSolutionComponent * ref ReactionAttemptEvent * Denetwork preinit solutions * Misc 1 * Nullable TryGetSolution out vars * Cache associated solutions * Fix merge skew * Use explicit regions in SharedSolutionContainerSystem.Capabilities * Add debug assert * Use explicit regions in SharedSolutionContainerSystem.Relay + ref SolutionContainerChangedEvent * ContainedSolutionComponent.Name -> ContainedSolutionComponent.ContainerName * SolutionComponent doc comments * Implicit DataField names and property purge * ReagentEffect DataField names * Local variables for readability * Sort using statements + Entity<T> event handlers * Fix compile erros * Fix compile errors --------- Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
This commit is contained in:
TemporalOroboros
@@ -0,0 +1,148 @@
|
||||
using Content.Shared.Chemistry.Components;
|
||||
using Content.Shared.Chemistry.Components.SolutionManager;
|
||||
using Content.Shared.Chemistry.Reaction;
|
||||
using Content.Shared.FixedPoint;
|
||||
|
||||
namespace Content.Shared.Chemistry.EntitySystems;
|
||||
|
||||
#region Events
|
||||
|
||||
/// <summary>
|
||||
/// This event alerts system that the solution was changed
|
||||
/// </summary>
|
||||
[ByRefEvent]
|
||||
public record struct SolutionContainerChangedEvent
|
||||
{
|
||||
public readonly Solution Solution;
|
||||
public readonly string SolutionId;
|
||||
|
||||
public SolutionContainerChangedEvent(Solution solution, string solutionId)
|
||||
{
|
||||
SolutionId = solutionId;
|
||||
Solution = solution;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// An event raised when more reagents are added to a (managed) solution than it can hold.
|
||||
/// </summary>
|
||||
[ByRefEvent]
|
||||
public record struct SolutionContainerOverflowEvent(EntityUid SolutionEnt, Solution SolutionHolder, Solution Overflow)
|
||||
{
|
||||
/// <summary>The entity which contains the solution that has overflowed.</summary>
|
||||
public readonly EntityUid SolutionEnt = SolutionEnt;
|
||||
/// <summary>The solution that has overflowed.</summary>
|
||||
public readonly Solution SolutionHolder = SolutionHolder;
|
||||
/// <summary>The reagents that have overflowed the solution.</summary>
|
||||
public readonly Solution Overflow = Overflow;
|
||||
/// <summary>The volume by which the solution has overflowed.</summary>
|
||||
public readonly FixedPoint2 OverflowVol = Overflow.Volume;
|
||||
/// <summary>Whether some subscriber has taken care of the effects of the overflow.</summary>
|
||||
public bool Handled = false;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Ref event used to relay events raised on solution entities to their containers.
|
||||
/// </summary>
|
||||
/// <typeparam name="TEvent"></typeparam>
|
||||
/// <param name="Event">The event that is being relayed.</param>
|
||||
/// <param name="ContainerEnt">The container entity that the event is being relayed to.</param>
|
||||
/// <param name="Name">The name of the solution entity that the event is being relayed from.</param>
|
||||
[ByRefEvent]
|
||||
public record struct SolutionRelayEvent<TEvent>(TEvent Event, EntityUid ContainerEnt, string Name)
|
||||
{
|
||||
public readonly EntityUid ContainerEnt = ContainerEnt;
|
||||
public readonly string Name = Name;
|
||||
public TEvent Event = Event;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Ref event used to relay events raised on solution containers to their contained solutions.
|
||||
/// </summary>
|
||||
/// <typeparam name="TEvent"></typeparam>
|
||||
/// <param name="Event">The event that is being relayed.</param>
|
||||
/// <param name="SolutionEnt">The solution entity that the event is being relayed to.</param>
|
||||
/// <param name="Name">The name of the solution entity that the event is being relayed to.</param>
|
||||
[ByRefEvent]
|
||||
public record struct SolutionContainerRelayEvent<TEvent>(TEvent Event, Entity<SolutionComponent> SolutionEnt, string Name)
|
||||
{
|
||||
public readonly Entity<SolutionComponent> SolutionEnt = SolutionEnt;
|
||||
public readonly string Name = Name;
|
||||
public TEvent Event = Event;
|
||||
}
|
||||
|
||||
#endregion Events
|
||||
|
||||
public abstract partial class SharedSolutionContainerSystem
|
||||
{
|
||||
protected void InitializeRelays()
|
||||
{
|
||||
SubscribeLocalEvent<ContainedSolutionComponent, SolutionChangedEvent>(OnSolutionChanged);
|
||||
SubscribeLocalEvent<ContainedSolutionComponent, SolutionOverflowEvent>(OnSolutionOverflow);
|
||||
SubscribeLocalEvent<ContainedSolutionComponent, ReactionAttemptEvent>(RelaySolutionRefEvent);
|
||||
}
|
||||
|
||||
#region Event Handlers
|
||||
|
||||
protected virtual void OnSolutionChanged(Entity<ContainedSolutionComponent> entity, ref SolutionChangedEvent args)
|
||||
{
|
||||
var (solutionId, solutionComp) = args.Solution;
|
||||
var solution = solutionComp.Solution;
|
||||
|
||||
UpdateAppearance(entity.Comp.Container, (solutionId, solutionComp, entity.Comp));
|
||||
|
||||
var relayEvent = new SolutionContainerChangedEvent(solution, entity.Comp.ContainerName);
|
||||
RaiseLocalEvent(entity.Comp.Container, ref relayEvent);
|
||||
}
|
||||
|
||||
protected virtual void OnSolutionOverflow(Entity<ContainedSolutionComponent> entity, ref SolutionOverflowEvent args)
|
||||
{
|
||||
var solution = args.Solution.Comp.Solution;
|
||||
var overflow = solution.SplitSolution(args.Overflow);
|
||||
var relayEv = new SolutionContainerOverflowEvent(entity.Owner, solution, overflow)
|
||||
{
|
||||
Handled = args.Handled,
|
||||
};
|
||||
|
||||
RaiseLocalEvent(entity.Comp.Container, ref relayEv);
|
||||
args.Handled = relayEv.Handled;
|
||||
}
|
||||
|
||||
#region Relay Event Handlers
|
||||
|
||||
private void RelaySolutionValEvent<TEvent>(EntityUid uid, ContainedSolutionComponent comp, TEvent @event)
|
||||
{
|
||||
var relayEvent = new SolutionRelayEvent<TEvent>(@event, uid, comp.ContainerName);
|
||||
RaiseLocalEvent(comp.Container, ref relayEvent);
|
||||
}
|
||||
|
||||
private void RelaySolutionRefEvent<TEvent>(Entity<ContainedSolutionComponent> entity, ref TEvent @event)
|
||||
{
|
||||
var relayEvent = new SolutionRelayEvent<TEvent>(@event, entity.Owner, entity.Comp.ContainerName);
|
||||
RaiseLocalEvent(entity.Comp.Container, ref relayEvent);
|
||||
@event = relayEvent.Event;
|
||||
}
|
||||
|
||||
private void RelaySolutionContainerEvent<TEvent>(EntityUid uid, SolutionContainerManagerComponent comp, TEvent @event)
|
||||
{
|
||||
foreach (var (name, soln) in EnumerateSolutions((uid, comp)))
|
||||
{
|
||||
var relayEvent = new SolutionContainerRelayEvent<TEvent>(@event, soln, name!);
|
||||
RaiseLocalEvent(soln, ref relayEvent);
|
||||
}
|
||||
}
|
||||
|
||||
private void RelaySolutionContainerEvent<TEvent>(Entity<SolutionContainerManagerComponent> entity, ref TEvent @event)
|
||||
{
|
||||
foreach (var (name, soln) in EnumerateSolutions((entity.Owner, entity.Comp)))
|
||||
{
|
||||
var relayEvent = new SolutionContainerRelayEvent<TEvent>(@event, soln, name!);
|
||||
RaiseLocalEvent(soln, ref relayEvent);
|
||||
@event = relayEvent.Event;
|
||||
}
|
||||
}
|
||||
|
||||
#endregion Relay Event Handlers
|
||||
|
||||
#endregion Event Handlers
|
||||
}
|
||||
Reference in New Issue
Block a user