diff --git a/Content.MapRenderer/CommandLineArguments.cs b/Content.MapRenderer/CommandLineArguments.cs index 2812cc5f9f..b0db9298f8 100644 --- a/Content.MapRenderer/CommandLineArguments.cs +++ b/Content.MapRenderer/CommandLineArguments.cs @@ -101,7 +101,7 @@ This option tells the map renderer that you supplied a list of map file names in } } -public class CommandLineArgumentException : Exception +public sealed class CommandLineArgumentException : Exception { public CommandLineArgumentException(string? message) : base(message) { diff --git a/Content.MapRenderer/Painters/EntityPainter.cs b/Content.MapRenderer/Painters/EntityPainter.cs index 3aae7a3846..79f2ed7679 100644 --- a/Content.MapRenderer/Painters/EntityPainter.cs +++ b/Content.MapRenderer/Painters/EntityPainter.cs @@ -105,10 +105,10 @@ public void Run(Image canvas, EntityData entity, SharedTransformSystem xformSyst return (targetX * rsi.Size.X, targetY * rsi.Size.Y, rsi.Size.X, rsi.Size.Y); } - var dir = entity.Sprite.GetLayerDirectionCount(layer) switch + var dir = entity.Sprite.GetLayerDirectionCount(layer) switch { 0 => 0, - _ => (int)layer.EffectiveDirection(worldRotation) + _ => (int) layer.EffectiveDirection(worldRotation) }; var (x, y, width, height) = GetRsiFrame(rsi, image, entity, layer, dir); @@ -133,8 +133,8 @@ public void Run(Image canvas, EntityData entity, SharedTransformSystem xformSyst .Resize(imgX, imgY) .Flip(FlipMode.Vertical)); - var pointX = (int) entity.X - (imgX / 2) + EyeManager.PixelsPerMeter / 2; - var pointY = (int) entity.Y - (imgY / 2) + EyeManager.PixelsPerMeter / 2; + var pointX = (int) entity.X - imgX / 2 + EyeManager.PixelsPerMeter / 2; + var pointY = (int) entity.Y - imgY / 2 + EyeManager.PixelsPerMeter / 2; canvas.Mutate(o => o.DrawImage(image, new Point(pointX, pointY), 1)); } } diff --git a/Content.MapRenderer/Painters/GridPainter.cs b/Content.MapRenderer/Painters/GridPainter.cs index 6b9dd128cc..625b44f8b5 100644 --- a/Content.MapRenderer/Painters/GridPainter.cs +++ b/Content.MapRenderer/Painters/GridPainter.cs @@ -134,7 +134,7 @@ private Dictionary> GetDecals() return decals; } - private (float x, float y) TransformLocalPosition(Vector2 position, MapGridComponent grid) + private static (float x, float y) TransformLocalPosition(Vector2 position, MapGridComponent grid) { var xOffset = (int) -grid.LocalAABB.Left; var yOffset = (int) -grid.LocalAABB.Bottom; diff --git a/Content.MapRenderer/Painters/MapPainter.cs b/Content.MapRenderer/Painters/MapPainter.cs index e6586474a9..49524ba73f 100644 --- a/Content.MapRenderer/Painters/MapPainter.cs +++ b/Content.MapRenderer/Painters/MapPainter.cs @@ -21,7 +21,7 @@ namespace Content.MapRenderer.Painters { public sealed class MapPainter { - public async IAsyncEnumerable> Paint(string map) + public static async IAsyncEnumerable> Paint(string map) { var stopwatch = new Stopwatch(); stopwatch.Start(); @@ -78,9 +78,9 @@ await server.WaitPost(() => var mapId = sMapManager.GetAllMapIds().Last(); grids = sMapManager.GetAllMapGrids(mapId).Select(o => (o.Owner, o)).ToArray(); - foreach (var grid in grids) + foreach (var (uid, _) in grids) { - var gridXform = xformQuery.GetComponent(grid.Uid); + var gridXform = xformQuery.GetComponent(uid); xformSystem.SetWorldRotation(gridXform, Angle.Zero); } }); @@ -88,19 +88,19 @@ await server.WaitPost(() => await PoolManager.RunTicksSync(pairTracker.Pair, 10); await Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync()); - foreach (var grid in grids) + foreach (var (uid, grid) in grids) { // Skip empty grids - if (grid.Grid.LocalAABB.IsEmpty()) + if (grid.LocalAABB.IsEmpty()) { - Console.WriteLine($"Warning: Grid {grid.Uid} was empty. Skipping image rendering."); + Console.WriteLine($"Warning: Grid {uid} was empty. Skipping image rendering."); continue; } - var tileXSize = grid.Grid.TileSize * TilePainter.TileImageSize; - var tileYSize = grid.Grid.TileSize * TilePainter.TileImageSize; + var tileXSize = grid.TileSize * TilePainter.TileImageSize; + var tileYSize = grid.TileSize * TilePainter.TileImageSize; - var bounds = grid.Grid.LocalAABB; + var bounds = grid.LocalAABB; var left = bounds.Left; var right = bounds.Right; @@ -114,16 +114,16 @@ await server.WaitPost(() => await server.WaitPost(() => { - tilePainter.Run(gridCanvas, grid.Uid, grid.Grid); - entityPainter.Run(gridCanvas, grid.Uid, grid.Grid); + tilePainter.Run(gridCanvas, uid, grid); + entityPainter.Run(gridCanvas, uid, grid); gridCanvas.Mutate(e => e.Flip(FlipMode.Vertical)); }); var renderedImage = new RenderedGridImage(gridCanvas) { - GridUid = grid.Uid, - Offset = xformSystem.GetWorldPosition(grid.Uid), + GridUid = uid, + Offset = xformSystem.GetWorldPosition(uid), }; yield return renderedImage; diff --git a/Content.MapRenderer/Program.cs b/Content.MapRenderer/Program.cs index 2fa47694ff..3735a08bf4 100644 --- a/Content.MapRenderer/Program.cs +++ b/Content.MapRenderer/Program.cs @@ -15,7 +15,7 @@ namespace Content.MapRenderer { - internal class Program + internal sealed class Program { private const string NoMapsChosenMessage = "No maps were chosen"; private static readonly Func ChosenMapIdNotIntMessage = id => $"The chosen id is not a valid integer: {id}"; @@ -166,7 +166,7 @@ private static async Task Run(CommandLineArguments arguments) Directory.CreateDirectory(directory); var fileName = Path.GetFileNameWithoutExtension(map); - var savePath = $"{directory}{Path.DirectorySeparatorChar}{fileName}-{i}.{arguments.Format.ToString()}"; + var savePath = $"{directory}{Path.DirectorySeparatorChar}{fileName}-{i}.{arguments.Format}"; Console.WriteLine($"Writing grid of size {grid.Width}x{grid.Height} to {savePath}"); diff --git a/Content.MapRenderer/RenderedGridImage.cs b/Content.MapRenderer/RenderedGridImage.cs index 759aee2e2f..c460853c37 100644 --- a/Content.MapRenderer/RenderedGridImage.cs +++ b/Content.MapRenderer/RenderedGridImage.cs @@ -6,7 +6,7 @@ namespace Content.MapRenderer; -public sealed class RenderedGridImage where T : unmanaged, IPixel +public sealed class RenderedGridImage where T : unmanaged, IPixel { public Image Image; public Vector2 Offset { get; set; } = Vector2.Zero;