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

Cleanup warnings in TileAtmosCollectionSerializer (#37798)

Browse Source 
Cleanup warning in TileAtmosCollectionSerializer
This commit is contained in:
Tayrtahn
2025-05-25 00:18:06 -04:00
committed by GitHub
parent d7acba43ec
commit 821b4b738a
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Server/Atmos/Serialization/TileAtmosCollectionSerializer.cs
View File

@@ -26,7 +26,7 @@ public sealed partial class TileAtmosCollectionSerializer : ITypeSerializer<Dict
ISerializationManager.InstantiationDelegate<Dictionary<Vector2i, TileAtmosphere>>? instanceProvider = null) ISerializationManager.InstantiationDelegate<Dictionary<Vector2i, TileAtmosphere>>? instanceProvider = null)
{ {
node.TryGetValue("version", out var versionNode); node.TryGetValue("version", out var versionNode);
var version = ((ValueDataNode?) versionNode)?.AsInt() ?? 1; var version = ((ValueDataNode?)versionNode)?.AsInt() ?? 1;
Dictionary<Vector2i, TileAtmosphere> tiles = new(); Dictionary<Vector2i, TileAtmosphere> tiles = new();
// Backwards compatability // Backwards compatability
@@ -48,7 +48,8 @@ public sealed partial class TileAtmosCollectionSerializer : ITypeSerializer<Dict
} }
catch (ArgumentOutOfRangeException) catch (ArgumentOutOfRangeException)
{ {
Logger.Error( var sawmill = dependencies.Resolve<ILogManager>().GetSawmill("szr");
sawmill.Error(
$"Error during atmos serialization! Tile at {indices} points to an unique mix ({mix}) out of range!"); $"Error during atmos serialization! Tile at {indices} points to an unique mix ({mix}) out of range!");
} }
} }
@@ -56,7 +57,7 @@ public sealed partial class TileAtmosCollectionSerializer : ITypeSerializer<Dict
} }
else else
{ {
var dataNode = (MappingDataNode) node["data"]; var dataNode = (MappingDataNode)node["data"];
var chunkSize = serializationManager.Read<int>(dataNode["chunkSize"], hookCtx, context); var chunkSize = serializationManager.Read<int>(dataNode["chunkSize"], hookCtx, context);
dataNode.TryGet("uniqueMixes", out var mixNode); dataNode.TryGet("uniqueMixes", out var mixNode);
@@ -64,7 +65,7 @@ public sealed partial class TileAtmosCollectionSerializer : ITypeSerializer<Dict
if (unique != null) if (unique != null)
{ {
var tileNode = (MappingDataNode) dataNode["tiles"]; var tileNode = (MappingDataNode)dataNode["tiles"];
foreach (var (chunkNode, valueNode) in tileNode) foreach (var (chunkNode, valueNode) in tileNode)
{ {
var chunkOrigin = serializationManager.Read<Vector2i>(tileNode.GetKeyNode(chunkNode), hookCtx, context); var chunkOrigin = serializationManager.Read<Vector2i>(tileNode.GetKeyNode(chunkNode), hookCtx, context);
@@ -76,7 +77,7 @@ public sealed partial class TileAtmosCollectionSerializer : ITypeSerializer<Dict
{ {
for (var y = 0; y < chunkSize; y++) for (var y = 0; y < chunkSize; y++)
{ {
var flag = data & (uint) (1 << (x + y * chunkSize)); var flag = data & (uint)(1 << (x + y * chunkSize));
if (flag == 0) if (flag == 0)
continue; continue;
@@ -91,7 +92,8 @@ public sealed partial class TileAtmosCollectionSerializer : ITypeSerializer<Dict
} }
catch (ArgumentOutOfRangeException) catch (ArgumentOutOfRangeException)
{ {
Logger.Error( var sawmill = dependencies.Resolve<ILogManager>().GetSawmill("szr");
sawmill.Error(
$"Error during atmos serialization! Tile at {indices} points to an unique mix ({mix}) out of range!"); $"Error during atmos serialization! Tile at {indices} points to an unique mix ({mix}) out of range!");
} }
} }
@@ -128,7 +130,7 @@ public sealed partial class TileAtmosCollectionSerializer : ITypeSerializer<Dict
var indices = SharedMapSystem.GetChunkRelative(gridIndices, chunkSize); var indices = SharedMapSystem.GetChunkRelative(gridIndices, chunkSize);
var mixFlag = tileChunk.Data.GetOrNew(mixIndex); var mixFlag = tileChunk.Data.GetOrNew(mixIndex);
mixFlag |= (uint) 1 << (indices.X + indices.Y * chunkSize); mixFlag |= (uint)1 << (indices.X + indices.Y * chunkSize);
tileChunk.Data[mixIndex] = mixFlag; tileChunk.Data[mixIndex] = mixFlag;
} }