6685146a1e
* Added warning to tryGetSolution, moved SolutionContainer code to shared - Added an optional warning (false by default) to print an error if a solution is missing when using tryGetSolution methods - Moved ensuring solution containers to shared, left the old method stubs for compatability and marked them as obsolete. * Update SharedSolutionContainerSystem.cs * Update SharedSolutionContainerSystem.cs * Update SolutionContainerSystem.cs * Update SharedSolutionContainerSystem.cs * Fixing ensuring chem solutions always returning false on client - ensuring chem solutions will only return false on the client if it is waiting for a server solutionEntity to be synced * Added concentration helpers * fix whitespace
46 lines
2.3 KiB
C#
46 lines
2.3 KiB
C#
using Content.Shared.Chemistry.Components;
|
|
using Content.Shared.Chemistry.Components.SolutionManager;
|
|
using Content.Shared.Chemistry.EntitySystems;
|
|
using Content.Shared.FixedPoint;
|
|
using Robust.Shared.Containers;
|
|
using Robust.Shared.Map;
|
|
using Robust.Shared.Utility;
|
|
using System.Numerics;
|
|
|
|
namespace Content.Server.Chemistry.Containers.EntitySystems;
|
|
|
|
[Obsolete("This is being depreciated. Use SharedSolutionContainerSystem instead!")]
|
|
public sealed partial class SolutionContainerSystem : SharedSolutionContainerSystem
|
|
{
|
|
[Obsolete("This is being depreciated. Use the ensure methods in SharedSolutionContainerSystem instead!")]
|
|
public Solution EnsureSolution(Entity<MetaDataComponent?> entity, string name)
|
|
=> EnsureSolution(entity, name, out _);
|
|
|
|
[Obsolete("This is being depreciated. Use the ensure methods in SharedSolutionContainerSystem instead!")]
|
|
public Solution EnsureSolution(Entity<MetaDataComponent?> entity, string name, out bool existed)
|
|
=> EnsureSolution(entity, name, FixedPoint2.Zero, out existed);
|
|
|
|
[Obsolete("This is being depreciated. Use the ensure methods in SharedSolutionContainerSystem instead!")]
|
|
public Solution EnsureSolution(Entity<MetaDataComponent?> entity, string name, FixedPoint2 maxVol, out bool existed)
|
|
=> EnsureSolution(entity, name, maxVol, null, out existed);
|
|
|
|
[Obsolete("This is being depreciated. Use the ensure methods in SharedSolutionContainerSystem instead!")]
|
|
public Solution EnsureSolution(Entity<MetaDataComponent?> entity, string name, FixedPoint2 maxVol, Solution? prototype, out bool existed)
|
|
{
|
|
EnsureSolution(entity, name, maxVol, prototype, out existed, out var solution);
|
|
return solution!;//solution is only ever null on the client, so we can suppress this
|
|
}
|
|
|
|
[Obsolete("This is being depreciated. Use the ensure methods in SharedSolutionContainerSystem instead!")]
|
|
public Entity<SolutionComponent> EnsureSolutionEntity(
|
|
Entity<SolutionContainerManagerComponent?> entity,
|
|
string name,
|
|
FixedPoint2 maxVol,
|
|
Solution? prototype,
|
|
out bool existed)
|
|
{
|
|
EnsureSolutionEntity(entity, name, out existed, out var solEnt, maxVol, prototype);
|
|
return solEnt!.Value;//solEnt is only ever null on the client, so we can suppress this
|
|
}
|
|
}
|