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

Validate that client prototypes are serializable (#18780)

Browse Source
This commit is contained in:
Leon Friedrich
2023-08-07 15:44:53 +12:00
committed by GitHub
parent 5c6013ab07
commit 5cc5a8c82e
5 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Client/Atmos/EntitySystems/AtmosPipeAppearanceSystem.cs
View File

@@ -28,19 +28,12 @@ public sealed class AtmosPipeAppearanceSystem : EntitySystem
if (!TryComp(uid, out SpriteComponent? sprite))
return;
if (!_resCache.TryGetResource(SpriteSpecifierSerializer.TextureRoot / component.RsiPath, out RSIResource? rsi))
{
Logger.Error($"{nameof(AtmosPipeAppearanceSystem)} could not load to load RSI {component.RsiPath}.");
return;
}
foreach (PipeConnectionLayer layerKey in Enum.GetValues(typeof(PipeConnectionLayer)))
{
sprite.LayerMapReserveBlank(layerKey);
var layer = sprite.LayerMapGet(layerKey);
sprite.LayerSetRSI(layer, rsi.RSI);
var layerState = component.State;
sprite.LayerSetState(layer, layerState);
sprite.LayerSetRSI(layer, component.Sprite.RsiPath);
sprite.LayerSetState(layer, component.Sprite.RsiState);
sprite.LayerSetDirOffset(layer, ToOffset(layerKey));
}
}

7
Content.Client/Chemistry/Visualizers/SolutionContainerVisualsComponent.cs
View File

@@ -32,7 +32,7 @@ namespace Content.Client.Chemistry.Visualizers
[DataField("metamorphic")]
public bool Metamorphic = false;
[DataField("metamorphicDefaultSprite")]
public SpriteSpecifier MetamorphicDefaultSprite = SpriteSpecifier.Invalid;
public SpriteSpecifier? MetamorphicDefaultSprite;
[DataField("metamorphicNameFull")]
public string MetamorphicNameFull = "transformable-container-component-glass";
@@ -41,9 +41,12 @@ namespace Content.Client.Chemistry.Visualizers
/// If not set, will work as default.
/// </summary>
[DataField("solutionName")]
public string SolutionName = "";
public string? SolutionName;
[DataField("initialName")]
public string InitialName = string.Empty;
[DataField("initialDescription")]
public string InitialDescription = string.Empty;
}
}

3
Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs
View File

@@ -76,7 +76,8 @@ public sealed class SolutionContainerVisualsSystem : VisualizerSystem<SolutionCo
{
if (hasOverlay)
args.Sprite.LayerSetVisible(overlayLayer, true);
args.Sprite.LayerSetSprite(baseLayer, component.MetamorphicDefaultSprite);
if (component.MetamorphicDefaultSprite != null)
args.Sprite.LayerSetSprite(baseLayer, component.MetamorphicDefaultSprite);
}
}
}