tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix chem guide data build fail (#23289)

Browse Source
This commit is contained in:
Nemanja
2023-12-31 12:11:29 -05:00
committed by GitHub
parent 3d80e39f3e
commit a425bc78c5
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Client/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs
View File

@@ -1,4 +1,5 @@
using System.Linq; using System.Linq;
using Content.Client.Chemistry.Containers.EntitySystems;
using Content.Shared.Atmos.Prototypes; using Content.Shared.Atmos.Prototypes;
using Content.Shared.Body.Part; using Content.Shared.Body.Part;
using Content.Shared.Chemistry; using Content.Shared.Chemistry;
@@ -15,6 +16,8 @@ namespace Content.Client.Chemistry.EntitySystems;
/// <inheritdoc/> /// <inheritdoc/>
public sealed class ChemistryGuideDataSystem : SharedChemistryGuideDataSystem public sealed class ChemistryGuideDataSystem : SharedChemistryGuideDataSystem
{ {
[Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
[ValidatePrototypeId<MixingCategoryPrototype>] [ValidatePrototypeId<MixingCategoryPrototype>]
private const string DefaultMixingCategory = "DummyMix"; private const string DefaultMixingCategory = "DummyMix";
[ValidatePrototypeId<MixingCategoryPrototype>] [ValidatePrototypeId<MixingCategoryPrototype>]
@@ -116,9 +119,10 @@ public sealed class ChemistryGuideDataSystem : SharedChemistryGuideDataSystem
usedNames.Add(entProto.Name); usedNames.Add(entProto.Name);
} }
if (extractableComponent.GrindableSolution is { } grindableSolutionId && if (extractableComponent.GrindableSolution is { } grindableSolutionId &&
entProto.TryGetComponent<SolutionContainerManagerComponent>(out var manager) && entProto.TryGetComponent<SolutionContainerManagerComponent>(out var manager) &&
manager.Solutions.TryGetValue(grindableSolutionId, out var grindableSolution)) _solutionContainer.TryGetSolution(manager, grindableSolutionId, out var grindableSolution))
{ {
var data = new ReagentEntitySourceData( var data = new ReagentEntitySourceData(
new() { DefaultGrindCategory }, new() { DefaultGrindCategory },

12
Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
View File

@@ -158,6 +158,18 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
return true; return true;
} }
/// <summary>
/// Version of TryGetSolution that doesn't take or return an entity.
/// Used for prototypes and with old code parity.
public bool TryGetSolution(SolutionContainerManagerComponent container, string name, [NotNullWhen(true)] out Solution? solution)
{
solution = null;
if (container.Solutions == null)
return false;
return container.Solutions.TryGetValue(name, out solution);
}
public IEnumerable<(string? Name, Entity<SolutionComponent> Solution)> EnumerateSolutions(Entity<SolutionContainerManagerComponent?> container, bool includeSelf = true) public IEnumerable<(string? Name, Entity<SolutionComponent> Solution)> EnumerateSolutions(Entity<SolutionContainerManagerComponent?> container, bool includeSelf = true)
{ {
if (includeSelf && TryComp(container, out SolutionComponent? solutionComp)) if (includeSelf && TryComp(container, out SolutionComponent? solutionComp))