]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Cleanup warnings in `TileAtmosCollectionSerializer` (#37798)
authorTayrtahn <tayrtahn@gmail.com>
Sun, 25 May 2025 04:18:06 +0000 (00:18 -0400)
committerGitHub <noreply@github.com>
Sun, 25 May 2025 04:18:06 +0000 (14:18 +1000)
Cleanup warning in TileAtmosCollectionSerializer

Content.Server/Atmos/Serialization/TileAtmosCollectionSerializer.cs

index 900c3cb60c4ee5c289be43edf2c8e3a1230ade87..c7f2c9379a09f89a9f9ab1e4e631122213d316e4 100644 (file)
@@ -26,7 +26,7 @@ public sealed partial class TileAtmosCollectionSerializer : ITypeSerializer<Dict
         ISerializationManager.InstantiationDelegate<Dictionary<Vector2i, TileAtmosphere>>? instanceProvider = null)
     {
         node.TryGetValue("version", out var versionNode);
-        var version = ((ValueDataNode?) versionNode)?.AsInt() ?? 1;
+        var version = ((ValueDataNode?)versionNode)?.AsInt() ?? 1;
         Dictionary<Vector2i, TileAtmosphere> tiles = new();
 
         // Backwards compatability
@@ -48,7 +48,8 @@ public sealed partial class TileAtmosCollectionSerializer : ITypeSerializer<Dict
                     }
                     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!");
                     }
                 }
@@ -56,7 +57,7 @@ public sealed partial class TileAtmosCollectionSerializer : ITypeSerializer<Dict
         }
         else
         {
-            var dataNode = (MappingDataNode) node["data"];
+            var dataNode = (MappingDataNode)node["data"];
             var chunkSize = serializationManager.Read<int>(dataNode["chunkSize"], hookCtx, context);
 
             dataNode.TryGet("uniqueMixes", out var mixNode);
@@ -64,7 +65,7 @@ public sealed partial class TileAtmosCollectionSerializer : ITypeSerializer<Dict
 
             if (unique != null)
             {
-                var tileNode = (MappingDataNode) dataNode["tiles"];
+                var tileNode = (MappingDataNode)dataNode["tiles"];
                 foreach (var (chunkNode, valueNode) in tileNode)
                 {
                     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++)
                             {
-                                var flag = data & (uint) (1 << (x + y * chunkSize));
+                                var flag = data & (uint)(1 << (x + y * chunkSize));
 
                                 if (flag == 0)
                                     continue;
@@ -91,7 +92,8 @@ public sealed partial class TileAtmosCollectionSerializer : ITypeSerializer<Dict
                                 }
                                 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!");
                                 }
                             }
@@ -128,7 +130,7 @@ public sealed partial class TileAtmosCollectionSerializer : ITypeSerializer<Dict
             var indices = SharedMapSystem.GetChunkRelative(gridIndices, chunkSize);
 
             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;
         }