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

Refactor Resolve and IEntity in SolutionContainerSystem (#5083)

Browse Source 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Ygg01
2021-11-02 02:03:23 +01:00
committed by GitHub
parent a13e23528c
commit fc5fa67a56
30 changed files with 141 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.Capabilities.cs
View File

@@ -8,133 +8,124 @@ namespace Content.Server.Chemistry.EntitySystems
{
public partial class SolutionContainerSystem
{
public void Refill(EntityUid targetUid, Solution targetSolution, Solution addedSolution)
public void Refill(EntityUid targetUid, Solution targetSolution, Solution addedSolution,
RefillableSolutionComponent? refillableSolution = null)
{
if (!EntityManager.HasComponent<RefillableSolutionComponent>(targetUid))
if (!Resolve(targetUid, ref refillableSolution, false))
return;
TryAddSolution(targetUid, targetSolution, addedSolution);
}
public void Inject(EntityUid targetUid, Solution targetSolution, Solution addedSolution)
public void Inject(EntityUid targetUid, Solution targetSolution, Solution addedSolution,
InjectableSolutionComponent? injectableSolution = null)
{
if (!EntityManager.HasComponent<InjectableSolutionComponent>(targetUid))
if (!Resolve(targetUid, ref injectableSolution, false))
return;
TryAddSolution(targetUid, targetSolution, addedSolution);
}
public Solution Draw(EntityUid targetUid, Solution solution, ReagentUnit amount)
public Solution Draw(EntityUid targetUid, Solution solution, ReagentUnit amount,
DrawableSolutionComponent? drawableSolution = null)
{
if (!EntityManager.HasComponent<DrawableSolutionComponent>(targetUid))
{
if (!Resolve(targetUid, ref drawableSolution, false))
return new Solution();
}
return SplitSolution(targetUid, solution, amount);
}
public Solution Drain(EntityUid targetUid, Solution targetSolution, ReagentUnit amount)
public Solution Drain(EntityUid targetUid, Solution targetSolution, ReagentUnit amount,
DrainableSolutionComponent? drainableSolution = null)
{
if (!EntityManager.HasComponent<DrainableSolutionComponent>(targetUid))
{
if (!Resolve(targetUid, ref drainableSolution, false))
return new Solution();
}
return SplitSolution(targetUid, targetSolution, amount);
}
public bool TryGetInjectableSolution(EntityUid targetUid,
[NotNullWhen(true)] out Solution? solution)
[NotNullWhen(true)] out Solution? solution,
InjectableSolutionComponent? injectable = null,
SolutionContainerManagerComponent? manager = null
)
{
if (EntityManager.TryGetComponent(targetUid, out InjectableSolutionComponent? injectable) &&
EntityManager.TryGetComponent(targetUid, out SolutionContainerManagerComponent? manager) &&
manager.Solutions.TryGetValue(injectable.Solution, out solution))
if (!Resolve(targetUid, ref manager, ref injectable, false)
|| !manager.Solutions.TryGetValue(injectable.Solution, out solution))
{
return true;
solution = null;
return false;
}
solution = null;
return false;
return true;
}
public bool TryGetRefillableSolution(EntityUid targetUid,
[NotNullWhen(true)] out Solution? solution)
[NotNullWhen(true)] out Solution? solution,
SolutionContainerManagerComponent? solutionManager = null,
RefillableSolutionComponent? refillable = null)
{
if (EntityManager.TryGetComponent(targetUid, out RefillableSolutionComponent? refillable) &&
EntityManager.TryGetComponent(targetUid, out SolutionContainerManagerComponent? manager) &&
manager.Solutions.TryGetValue(refillable.Solution, out var refillableSolution))
if (!Resolve(targetUid, ref solutionManager, ref refillable, false)
|| !solutionManager.Solutions.TryGetValue(refillable.Solution, out var refillableSolution))
{
solution = refillableSolution;
return true;
solution = null;
return false;
}
solution = null;
return false;
solution = refillableSolution;
return true;
}
public bool TryGetDrainableSolution(EntityUid targetUid,
[NotNullWhen(true)] out Solution? solution)
public bool TryGetDrainableSolution(EntityUid uid,
[NotNullWhen(true)] out Solution? solution,
DrainableSolutionComponent? drainable = null,
SolutionContainerManagerComponent? manager = null)
{
if (EntityManager.TryGetComponent(targetUid,out DrainableSolutionComponent? drainable) &&
EntityManager.TryGetComponent(targetUid,out SolutionContainerManagerComponent? manager) &&
manager.Solutions.TryGetValue(drainable.Solution, out solution))
if (!Resolve(uid, ref drainable, ref manager, false)
|| !manager.Solutions.TryGetValue(drainable.Solution, out solution))
{
return true;
solution = null;
return false;
}
solution = null;
return false;
return true;
}
public bool TryGetDrawableSolution(IEntity owner,
[NotNullWhen(true)] out Solution? solution)
public bool TryGetDrawableSolution(EntityUid uid,
[NotNullWhen(true)] out Solution? solution,
DrawableSolutionComponent? drawable = null,
SolutionContainerManagerComponent? manager = null)
{
if (owner.TryGetComponent(out DrawableSolutionComponent? drawable) &&
owner.TryGetComponent(out SolutionContainerManagerComponent? manager) &&
manager.Solutions.TryGetValue(drawable.Solution, out solution))
if (!Resolve(uid, ref drawable, ref manager, false)
|| !manager.Solutions.TryGetValue(drawable.Solution, out solution))
{
return true;
solution = null;
return false;
}
solution = null;
return false;
}
public ReagentUnit DrainAvailable(IEntity? owner)
{
if (owner == null || !TryGetDrainableSolution(owner.Uid, out var solution))
return ReagentUnit.Zero;
return solution.CurrentVolume;
return true;
}
public ReagentUnit DrainAvailable(EntityUid uid)
{
if (!TryGetDrainableSolution(uid, out var solution))
return ReagentUnit.Zero;
return solution.CurrentVolume;
}
public bool HasFitsInDispenser(IEntity owner)
{
return !owner.Deleted && owner.HasComponent<FitsInDispenserComponent>();
return !TryGetDrainableSolution(uid, out var solution)
? ReagentUnit.Zero
: solution.CurrentVolume;
}
public bool TryGetFitsInDispenser(EntityUid owner,
[NotNullWhen(true)] out Solution? solution)
[NotNullWhen(true)] out Solution? solution,
FitsInDispenserComponent? dispenserFits = null,
SolutionContainerManagerComponent? solutionManager = null)
{
if (EntityManager.TryGetEntity(owner, out var ownerEntity) &&
ownerEntity.TryGetComponent(out FitsInDispenserComponent? dispenserFits) &&
ownerEntity.TryGetComponent(out SolutionContainerManagerComponent? manager) &&
manager.Solutions.TryGetValue(dispenserFits.Solution, out solution))
if (!Resolve(owner, ref dispenserFits, ref solutionManager, false)
|| !solutionManager.Solutions.TryGetValue(dispenserFits.Solution, out solution))
{
return true;
solution = null;
return false;
}
solution = null;
return false;
return true;
}
}
}

44
Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.cs
View File

@@ -65,7 +65,8 @@ namespace Content.Server.Chemistry.EntitySystems
private void OnExamineSolution(EntityUid uid, ExaminableSolutionComponent examinableComponent,
ExaminedEvent args)
{
if (!args.Examined.TryGetComponent(out SolutionContainerManagerComponent? solutionsManager)
SolutionContainerManagerComponent? solutionsManager = null;
if (!Resolve(args.Examined.Uid, ref solutionsManager)
|| !solutionsManager.Solutions.TryGetValue(examinableComponent.Solution, out var solutionHolder))
return;
@@ -96,15 +97,15 @@ namespace Content.Server.Chemistry.EntitySystems
("desc", Loc.GetString(proto.PhysicalDescription))));
}
private void UpdateAppearance(EntityUid uid, Solution solution)
private void UpdateAppearance(EntityUid uid, Solution solution,
SharedAppearanceComponent? appearanceComponent = null)
{
if (!EntityManager.TryGetEntity(uid, out var solutionEntity)
|| solutionEntity.Deleted
|| !solutionEntity.TryGetComponent<SharedAppearanceComponent>(out var appearance))
if (!EntityManager.EntityExists(uid)
|| !Resolve(uid, ref appearanceComponent, false))
return;
var filledVolumeFraction = solution.CurrentVolume.Float() / solution.MaxVolume.Float();
appearance.SetData(SolutionContainerVisuals.VisualState, new SolutionContainerVisualState(solution.Color, filledVolumeFraction));
appearanceComponent.SetData(SolutionContainerVisuals.VisualState, new SolutionContainerVisualState(solution.Color, filledVolumeFraction));
}
/// <summary>
@@ -143,9 +144,9 @@ namespace Content.Server.Chemistry.EntitySystems
UpdateChemicals(uid, solutionHolder);
}
public void RemoveAllSolution(EntityUid uid)
public void RemoveAllSolution(EntityUid uid, SolutionContainerManagerComponent? solutionContainerManager = null)
{
if (!EntityManager.TryGetComponent(uid, out SolutionContainerManagerComponent? solutionContainerManager))
if (!Resolve(uid, ref solutionContainerManager))
return;
foreach (var solution in solutionContainerManager.Solutions.Values)
@@ -210,19 +211,9 @@ namespace Content.Server.Chemistry.EntitySystems
return true;
}
public bool TryGetSolution(IEntity? target, string name,
[NotNullWhen(true)] out Solution? solution, SolutionContainerManagerComponent? solutionsMgr = null)
{
if (target == null || target.Deleted)
{
solution = null;
return false;
}
return TryGetSolution(target.Uid, name, out solution, solutionsMgr);
}
public bool TryGetSolution(EntityUid uid, string name, [NotNullWhen(true)] out Solution? solution, SolutionContainerManagerComponent? solutionsMgr = null)
public bool TryGetSolution(EntityUid uid, string name,
[NotNullWhen(true)] out Solution? solution,
SolutionContainerManagerComponent? solutionsMgr = null)
{
if (!Resolve(uid, ref solutionsMgr))
{
@@ -233,17 +224,6 @@ namespace Content.Server.Chemistry.EntitySystems
return solutionsMgr.Solutions.TryGetValue(name, out solution);
}
/// <summary>
/// Will ensure a solution is added to given entity even if it's missing solutionContainerManager
/// </summary>
/// <param name="owner">Entity to which to add solution</param>
/// <param name="name">name for the solution</param>
/// <returns>solution</returns>
public Solution EnsureSolution(IEntity owner, string name)
{
return EnsureSolution(owner.Uid, name);
}
/// <summary>
/// Will ensure a solution is added to given entity even if it's missing solutionContainerManager
/// </summary>

2
Content.Server/Chemistry/EntitySystems/VaporSystem.cs
View File

@@ -65,7 +65,7 @@ namespace Content.Server.Chemistry.EntitySystems
return false;
}
if (!_solutionContainerSystem.TryGetSolution(vapor.Owner, SharedVaporComponent.SolutionName,
if (!_solutionContainerSystem.TryGetSolution(vapor.Owner.Uid, SharedVaporComponent.SolutionName,
out var vaporSolution))
{
return false;