StardewValley
/
SMAPI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #870 from atravita-mods/arraypooling 

Use array pooling and various optimizations to reduce allocations
This commit is contained in:
Jesse Plamondon-Willard 2022-10-08 18:03:14 -04:00 committed by GitHub
parent a7f03abe25 2e0bc5ddfe
commit 2e918823ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 170 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
src/SMAPI/Framework/Content/AssetDataForImage.cs
View File

@ -1,4 +1,5 @@
using System; using System;
using System.Buffers;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Graphics;
@ -32,60 +33,71 @@ namespace StardewModdingAPI.Framework.Content
/// <inheritdoc /> /// <inheritdoc />
public void PatchImage(IRawTextureData source, Rectangle? sourceArea = null, Rectangle? targetArea = null, PatchMode patchMode = PatchMode.Replace) public void PatchImage(IRawTextureData source, Rectangle? sourceArea = null, Rectangle? targetArea = null, PatchMode patchMode = PatchMode.Replace)
{ {
this.GetPatchBounds(ref sourceArea, ref targetArea, source.Width, source.Height);
// validate source data
if (source == null) if (source == null)
throw new ArgumentNullException(nameof(source), "Can't patch from null source data."); throw new ArgumentNullException(nameof(source), "Can't patch from null source data.");
// get the pixels for the source area // get normalized bounds
Color[] sourceData; this.GetPatchBounds(ref sourceArea, ref targetArea, source.Width, source.Height);
{ if (source.Data.Length < (sourceArea.Value.Bottom - 1) * source.Width + sourceArea.Value.Right)
throw new ArgumentException("Can't apply image patch because the source image is smaller than the source area.", nameof(source));
int areaX = sourceArea.Value.X; int areaX = sourceArea.Value.X;
int areaY = sourceArea.Value.Y; int areaY = sourceArea.Value.Y;
int areaWidth = sourceArea.Value.Width; int areaWidth = sourceArea.Value.Width;
int areaHeight = sourceArea.Value.Height; int areaHeight = sourceArea.Value.Height;
if (areaX == 0 && areaY == 0 && areaWidth == source.Width && areaHeight == source.Height) // shortcut: if the area width matches the source image, we can apply the image as-is without needing
sourceData = source.Data; // to copy the pixels into a smaller subset. It's fine if the source is taller than the area, since we'll
else // just ignore the extra data at the end of the pixel array.
if (areaWidth == source.Width)
{ {
sourceData = new Color[areaWidth * areaHeight]; this.PatchImageImpl(source.Data, source.Width, source.Height, sourceArea.Value, targetArea.Value, patchMode, areaY);
int i = 0; return;
for (int y = areaY, maxY = areaY + areaHeight - 1; y <= maxY; y++) }
{
for (int x = areaX, maxX = areaX + areaWidth - 1; x <= maxX; x++) // else copy the pixels within the smaller area & apply that
{ int pixelCount = areaWidth * areaHeight;
int targetIndex = (y * source.Width) + x; Color[] sourceData = ArrayPool<Color>.Shared.Rent(pixelCount);
sourceData[i++] = source.Data[targetIndex]; try
} {
} for (int y = areaY, maxY = areaY + areaHeight; y < maxY; y++)
} {
int sourceIndex = (y * source.Width) + areaX;
int targetIndex = (y - areaY) * areaWidth;
Array.Copy(source.Data, sourceIndex, sourceData, targetIndex, areaWidth);
} }
// apply
this.PatchImageImpl(sourceData, source.Width, source.Height, sourceArea.Value, targetArea.Value, patchMode); this.PatchImageImpl(sourceData, source.Width, source.Height, sourceArea.Value, targetArea.Value, patchMode);
} }
finally
{
ArrayPool<Color>.Shared.Return(sourceData);
}
}
/// <inheritdoc /> /// <inheritdoc />
public void PatchImage(Texture2D source, Rectangle? sourceArea = null, Rectangle? targetArea = null, PatchMode patchMode = PatchMode.Replace) public void PatchImage(Texture2D source, Rectangle? sourceArea = null, Rectangle? targetArea = null, PatchMode patchMode = PatchMode.Replace)
{ {
this.GetPatchBounds(ref sourceArea, ref targetArea, source.Width, source.Height);
// validate source texture
if (source == null) if (source == null)
throw new ArgumentNullException(nameof(source), "Can't patch from a null source texture."); throw new ArgumentNullException(nameof(source), "Can't patch from a null source texture.");
// get normalized bounds
this.GetPatchBounds(ref sourceArea, ref targetArea, source.Width, source.Height);
if (!source.Bounds.Contains(sourceArea.Value)) if (!source.Bounds.Contains(sourceArea.Value))
throw new ArgumentOutOfRangeException(nameof(sourceArea), "The source area is outside the bounds of the source texture."); throw new ArgumentOutOfRangeException(nameof(sourceArea), "The source area is outside the bounds of the source texture.");
// get source data // get source data & apply
int pixelCount = sourceArea.Value.Width * sourceArea.Value.Height; int pixelCount = sourceArea.Value.Width * sourceArea.Value.Height;
Color[] sourceData = GC.AllocateUninitializedArray<Color>(pixelCount); Color[] sourceData = ArrayPool<Color>.Shared.Rent(pixelCount);
try
{
source.GetData(0, sourceArea, sourceData, 0, pixelCount); source.GetData(0, sourceArea, sourceData, 0, pixelCount);
// apply
this.PatchImageImpl(sourceData, source.Width, source.Height, sourceArea.Value, targetArea.Value, patchMode); this.PatchImageImpl(sourceData, source.Width, source.Height, sourceArea.Value, targetArea.Value, patchMode);
} }
finally
{
ArrayPool<Color>.Shared.Return(sourceData);
}
}
/// <inheritdoc /> /// <inheritdoc />
public bool ExtendImage(int minWidth, int minHeight) public bool ExtendImage(int minWidth, int minHeight)
@ -117,15 +129,16 @@ namespace StardewModdingAPI.Framework.Content
/// <summary>Overwrite part of the image.</summary> /// <summary>Overwrite part of the image.</summary>
/// <param name="sourceData">The image data to patch into the content.</param> /// <param name="sourceData">The image data to patch into the content.</param>
/// <param name="sourceWidth">The pixel width of the source image.</param> /// <param name="sourceWidth">The pixel width of the original source image.</param>
/// <param name="sourceHeight">The pixel height of the source image.</param> /// <param name="sourceHeight">The pixel height of the original source image.</param>
/// <param name="sourceArea">The part of the <paramref name="sourceData"/> to copy (or <c>null</c> to take the whole texture). This must be within the bounds of the <paramref name="sourceData"/> texture.</param> /// <param name="sourceArea">The part of the <paramref name="sourceData"/> to copy (or <c>null</c> to take the whole texture). This must be within the bounds of the <paramref name="sourceData"/> texture.</param>
/// <param name="targetArea">The part of the content to patch (or <c>null</c> to patch the whole texture). The original content within this area will be erased. This must be within the bounds of the existing spritesheet.</param> /// <param name="targetArea">The part of the content to patch (or <c>null</c> to patch the whole texture). The original content within this area will be erased. This must be within the bounds of the existing spritesheet.</param>
/// <param name="patchMode">Indicates how an image should be patched.</param> /// <param name="patchMode">Indicates how an image should be patched.</param>
/// <param name="startRow">The row to start on, for the sourceData.</param>
/// <exception cref="ArgumentNullException">One of the arguments is null.</exception> /// <exception cref="ArgumentNullException">One of the arguments is null.</exception>
/// <exception cref="ArgumentOutOfRangeException">The <paramref name="targetArea"/> is outside the bounds of the spritesheet.</exception> /// <exception cref="ArgumentOutOfRangeException">The <paramref name="targetArea"/> is outside the bounds of the spritesheet.</exception>
/// <exception cref="InvalidOperationException">The content being read isn't an image.</exception> /// <exception cref="InvalidOperationException">The content being read isn't an image.</exception>
private void PatchImageImpl(Color[] sourceData, int sourceWidth, int sourceHeight, Rectangle sourceArea, Rectangle targetArea, PatchMode patchMode) private void PatchImageImpl(Color[] sourceData, int sourceWidth, int sourceHeight, Rectangle sourceArea, Rectangle targetArea, PatchMode patchMode, int startRow = 0)
{ {
// get texture // get texture
Texture2D target = this.Data; Texture2D target = this.Data;
@ -139,24 +152,69 @@ namespace StardewModdingAPI.Framework.Content
if (sourceArea.Size != targetArea.Size) if (sourceArea.Size != targetArea.Size)
throw new InvalidOperationException("The source and target areas must be the same size."); throw new InvalidOperationException("The source and target areas must be the same size.");
// merge data // shortcut: replace the entire area
if (patchMode == PatchMode.Overlay) if (patchMode == PatchMode.Replace)
{
target.SetData(0, targetArea, sourceData, startRow * sourceArea.Width, pixelCount);
return;
}
// skip transparent pixels at the start & end (e.g. large spritesheet with a few sprites replaced)
int startIndex = -1;
int endIndex = -1;
{
for (int i = startRow * sourceArea.Width; i < pixelCount; i++)
{
if (sourceData[i].A >= AssetDataForImage.MinOpacity)
{
startIndex = i;
break;
}
}
if (startIndex == -1)
return; // blank texture
for (int i = startRow * sourceArea.Width + pixelCount - 1; i >= startIndex; i--)
{
if (sourceData[i].A >= AssetDataForImage.MinOpacity)
{
endIndex = i;
break;
}
}
if (endIndex == -1)
return; // ???
}
// update target rectangle
int sourceOffset;
{
int topOffset = startIndex / sourceArea.Width;
int bottomOffset = endIndex / sourceArea.Width;
targetArea = new(targetArea.X, targetArea.Y + topOffset, targetArea.Width, bottomOffset - topOffset + 1);
pixelCount = targetArea.Width * targetArea.Height;
sourceOffset = topOffset * sourceArea.Width;
}
// apply
Color[] mergedData = ArrayPool<Color>.Shared.Rent(pixelCount);
try
{ {
// get target data
Color[] mergedData = GC.AllocateUninitializedArray<Color>(pixelCount);
target.GetData(0, targetArea, mergedData, 0, pixelCount); target.GetData(0, targetArea, mergedData, 0, pixelCount);
// merge pixels for (int i = startIndex; i <= endIndex; i++)
for (int i = 0; i < pixelCount; i++)
{ {
int targetIndex = i - sourceOffset;
Color above = sourceData[i]; Color above = sourceData[i];
Color below = mergedData[i]; Color below = mergedData[targetIndex];
// shortcut transparency // shortcut transparency
if (above.A < MinOpacity) if (above.A < AssetDataForImage.MinOpacity)
continue; continue;
if (below.A < MinOpacity) if (below.A < AssetDataForImage.MinOpacity || above.A == byte.MaxValue)
mergedData[i] = above; mergedData[targetIndex] = above;
// merge pixels // merge pixels
else else
@ -165,7 +223,7 @@ namespace StardewModdingAPI.Framework.Content
// premultiplied by the content pipeline. The formula is derived from // premultiplied by the content pipeline. The formula is derived from
// https://blogs.msdn.microsoft.com/shawnhar/2009/11/06/premultiplied-alpha/. // https://blogs.msdn.microsoft.com/shawnhar/2009/11/06/premultiplied-alpha/.
float alphaBelow = 1 - (above.A / 255f); float alphaBelow = 1 - (above.A / 255f);
mergedData[i] = new Color( mergedData[targetIndex] = new Color(
r: (int)(above.R + (below.R * alphaBelow)), r: (int)(above.R + (below.R * alphaBelow)),
g: (int)(above.G + (below.G * alphaBelow)), g: (int)(above.G + (below.G * alphaBelow)),
b: (int)(above.B + (below.B * alphaBelow)), b: (int)(above.B + (below.B * alphaBelow)),
@ -176,8 +234,10 @@ namespace StardewModdingAPI.Framework.Content
target.SetData(0, targetArea, mergedData, 0, pixelCount); target.SetData(0, targetArea, mergedData, 0, pixelCount);
} }
else finally
target.SetData(0, targetArea, sourceData, 0, pixelCount); {
ArrayPool<Color>.Shared.Return(mergedData);
}
} }
} }
} }

53
src/SMAPI/Framework/ContentManagers/ModContentManager.cs
View File

@ -1,9 +1,11 @@
using System; using System;
using System.Buffers;
using System.Diagnostics; using System.Diagnostics;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Runtime.CompilerServices;
using BmFont; using BmFont;
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Content; using Microsoft.Xna.Framework.Content;
@ -111,7 +113,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
if (this.Coordinator.TryParseManagedAssetKey(assetName.Name, out string? contentManagerID, out IAssetName? relativePath)) if (this.Coordinator.TryParseManagedAssetKey(assetName.Name, out string? contentManagerID, out IAssetName? relativePath))
{ {
if (contentManagerID != this.Name) if (contentManagerID != this.Name)
throw this.GetLoadError(assetName, ContentLoadErrorType.AccessDenied, "can't load a different mod's managed asset key through this mod content manager."); this.ThrowLoadError(assetName, ContentLoadErrorType.AccessDenied, "can't load a different mod's managed asset key through this mod content manager.");
assetName = relativePath; assetName = relativePath;
} }
} }
@ -123,7 +125,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
// get file // get file
FileInfo file = this.GetModFile<T>(assetName.Name); FileInfo file = this.GetModFile<T>(assetName.Name);
if (!file.Exists) if (!file.Exists)
throw this.GetLoadError(assetName, ContentLoadErrorType.AssetDoesNotExist, "the specified path doesn't exist."); this.ThrowLoadError(assetName, ContentLoadErrorType.AssetDoesNotExist, "the specified path doesn't exist.");
// load content // load content
asset = file.Extension.ToLower() switch asset = file.Extension.ToLower() switch
@ -141,7 +143,8 @@ namespace StardewModdingAPI.Framework.ContentManagers
if (ex is SContentLoadException) if (ex is SContentLoadException)
throw; throw;
throw this.GetLoadError(assetName, ContentLoadErrorType.Other, "an unexpected error occurred.", ex); this.ThrowLoadError(assetName, ContentLoadErrorType.Other, "an unexpected error occurred.", ex);
return default;
} }
// track & return asset // track & return asset
@ -189,7 +192,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
private T LoadDataFile<T>(IAssetName assetName, FileInfo file) private T LoadDataFile<T>(IAssetName assetName, FileInfo file)
{ {
if (!this.JsonHelper.ReadJsonFileIfExists(file.FullName, out T? asset)) if (!this.JsonHelper.ReadJsonFileIfExists(file.FullName, out T? asset))
throw this.GetLoadError(assetName, ContentLoadErrorType.InvalidData, "the JSON file is invalid."); // should never happen since we check for file existence before calling this method this.ThrowLoadError(assetName, ContentLoadErrorType.InvalidData, "the JSON file is invalid."); // should never happen since we check for file existence before calling this method
return asset; return asset;
} }
@ -238,7 +241,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
{ {
using FileStream stream = File.OpenRead(file.FullName); using FileStream stream = File.OpenRead(file.FullName);
Texture2D texture = Texture2D.FromStream(Game1.graphics.GraphicsDevice, stream); Texture2D texture = Texture2D.FromStream(Game1.graphics.GraphicsDevice, stream);
texture = this.PremultiplyTransparency(texture); this.PremultiplyTransparency(texture);
return (T)(object)texture; return (T)(object)texture;
} }
} }
@ -301,7 +304,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
private T LoadXnbFile<T>(IAssetName assetName) private T LoadXnbFile<T>(IAssetName assetName)
{ {
if (typeof(IRawTextureData).IsAssignableFrom(typeof(T))) if (typeof(IRawTextureData).IsAssignableFrom(typeof(T)))
throw this.GetLoadError(assetName, ContentLoadErrorType.Other, $"can't read XNB file as type {typeof(IRawTextureData)}; that type can only be read from a PNG file."); this.ThrowLoadError(assetName, ContentLoadErrorType.Other, $"can't read XNB file as type {typeof(IRawTextureData)}; that type can only be read from a PNG file.");
// the underlying content manager adds a .xnb extension implicitly, so // the underlying content manager adds a .xnb extension implicitly, so
// we need to strip it here to avoid trying to load a '.xnb.xnb' file. // we need to strip it here to avoid trying to load a '.xnb.xnb' file.
@ -326,7 +329,8 @@ namespace StardewModdingAPI.Framework.ContentManagers
/// <param name="file">The file to load.</param> /// <param name="file">The file to load.</param>
private T HandleUnknownFileType<T>(IAssetName assetName, FileInfo file) private T HandleUnknownFileType<T>(IAssetName assetName, FileInfo file)
{ {
throw this.GetLoadError(assetName, ContentLoadErrorType.InvalidName, $"unknown file extension '{file.Extension}'; must be one of '.fnt', '.json', '.png', '.tbin', '.tmx', or '.xnb'."); this.ThrowLoadError(assetName, ContentLoadErrorType.InvalidName, $"unknown file extension '{file.Extension}'; must be one of '.fnt', '.json', '.png', '.tbin', '.tmx', or '.xnb'.");
return default;
} }
/// <summary>Assert that the asset type is compatible with one of the allowed types.</summary> /// <summary>Assert that the asset type is compatible with one of the allowed types.</summary>
@ -338,18 +342,21 @@ namespace StardewModdingAPI.Framework.ContentManagers
private void AssertValidType<TAsset>(IAssetName assetName, FileInfo file, params Type[] validTypes) private void AssertValidType<TAsset>(IAssetName assetName, FileInfo file, params Type[] validTypes)
{ {
if (!validTypes.Any(validType => validType.IsAssignableFrom(typeof(TAsset)))) if (!validTypes.Any(validType => validType.IsAssignableFrom(typeof(TAsset))))
throw this.GetLoadError(assetName, ContentLoadErrorType.InvalidData, $"can't read file with extension '{file.Extension}' as type '{typeof(TAsset)}'; must be type '{string.Join("' or '", validTypes.Select(p => p.FullName))}'."); this.ThrowLoadError(assetName, ContentLoadErrorType.InvalidData, $"can't read file with extension '{file.Extension}' as type '{typeof(TAsset)}'; must be type '{string.Join("' or '", validTypes.Select(p => p.FullName))}'.");
} }
/// <summary>Get an error which indicates that an asset couldn't be loaded.</summary> /// <summary>Throw an error which indicates that an asset couldn't be loaded.</summary>
/// <param name="errorType">Why loading an asset through the content pipeline failed.</param> /// <param name="errorType">Why loading an asset through the content pipeline failed.</param>
/// <param name="assetName">The asset name that failed to load.</param> /// <param name="assetName">The asset name that failed to load.</param>
/// <param name="reasonPhrase">The reason the file couldn't be loaded.</param> /// <param name="reasonPhrase">The reason the file couldn't be loaded.</param>
/// <param name="exception">The underlying exception, if applicable.</param> /// <param name="exception">The underlying exception, if applicable.</param>
/// <exception cref="SContentLoadException" />
[DoesNotReturn]
[DebuggerStepThrough, DebuggerHidden] [DebuggerStepThrough, DebuggerHidden]
private SContentLoadException GetLoadError(IAssetName assetName, ContentLoadErrorType errorType, string reasonPhrase, Exception? exception = null) [MethodImpl(MethodImplOptions.NoInlining)]
private void ThrowLoadError(IAssetName assetName, ContentLoadErrorType errorType, string reasonPhrase, Exception? exception = null)
{ {
return new(errorType, $"Failed loading asset '{assetName}' from {this.Name}: {reasonPhrase}", exception); throw new SContentLoadException(errorType, $"Failed loading asset '{assetName}' from {this.Name}: {reasonPhrase}", exception);
} }
/// <summary>Get a file from the mod folder.</summary> /// <summary>Get a file from the mod folder.</summary>
@ -381,15 +388,18 @@ namespace StardewModdingAPI.Framework.ContentManagers
/// <param name="texture">The texture to premultiply.</param> /// <param name="texture">The texture to premultiply.</param>
/// <returns>Returns a premultiplied texture.</returns> /// <returns>Returns a premultiplied texture.</returns>
/// <remarks>Based on <a href="https://gamedev.stackexchange.com/a/26037">code by David Gouveia</a>.</remarks> /// <remarks>Based on <a href="https://gamedev.stackexchange.com/a/26037">code by David Gouveia</a>.</remarks>
private Texture2D PremultiplyTransparency(Texture2D texture) private void PremultiplyTransparency(Texture2D texture)
{ {
// premultiply pixels int count = texture.Width * texture.Height;
Color[] data = GC.AllocateUninitializedArray<Color>(texture.Width * texture.Height); Color[] data = ArrayPool<Color>.Shared.Rent(count);
texture.GetData(data); try
{
texture.GetData(data, 0, count);
bool changed = false; bool changed = false;
for (int i = 0; i < data.Length; i++) for (int i = 0; i < count; i++)
{ {
Color pixel = data[i]; ref Color pixel = ref data[i];
if (pixel.A is (byte.MinValue or byte.MaxValue)) if (pixel.A is (byte.MinValue or byte.MaxValue))
continue; // no need to change fully transparent/opaque pixels continue; // no need to change fully transparent/opaque pixels
@ -398,9 +408,12 @@ namespace StardewModdingAPI.Framework.ContentManagers
} }
if (changed) if (changed)
texture.SetData(data); texture.SetData(data, 0, count);
}
return texture; finally
{
ArrayPool<Color>.Shared.Return(data);
}
} }
/// <summary>Fix custom map tilesheet paths so they can be found by the content manager.</summary> /// <summary>Fix custom map tilesheet paths so they can be found by the content manager.</summary>

10
src/SMAPI/Framework/Logging/LogOnceCacheKey.cs Normal file
View File

@ -0,0 +1,10 @@
using System.Diagnostics.CodeAnalysis;
namespace StardewModdingAPI.Framework.Logging
{
/// <summary>The cache key for the <see cref="Monitor.LogOnceCache"/>.</summary>
/// <param name="Message">The log message.</param>
/// <param name="Level">The log level.</param>
[SuppressMessage("ReSharper", "NotAccessedPositionalProperty.Local", Justification = "This is only used as a lookup key.")]
internal readonly record struct LogOnceCacheKey(string Message, LogLevel Level);
}

2
src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
View File

@ -221,7 +221,7 @@ namespace StardewModdingAPI.Framework.ModLoading
/// </remarks> /// </remarks>
public static Assembly? ResolveAssembly(string name) public static Assembly? ResolveAssembly(string name)
{ {
string shortName = name.Split(new[] { ',' }, 2).First(); // get simple name (without version and culture) string shortName = name.Split(',', 2).First(); // get simple name (without version and culture)
return AppDomain.CurrentDomain return AppDomain.CurrentDomain
.GetAssemblies() .GetAssemblies()
.FirstOrDefault(p => p.GetName().Name == shortName); .FirstOrDefault(p => p.GetName().Name == shortName);

11
src/SMAPI/Framework/Monitor.cs
View File

@ -25,10 +25,13 @@ namespace StardewModdingAPI.Framework
private readonly LogFileManager LogFile; private readonly LogFileManager LogFile;
/// <summary>The maximum length of the <see cref="LogLevel"/> values.</summary> /// <summary>The maximum length of the <see cref="LogLevel"/> values.</summary>
private static readonly int MaxLevelLength = (from level in Enum.GetValues(typeof(LogLevel)).Cast<LogLevel>() select level.ToString().Length).Max(); private static readonly int MaxLevelLength = Enum.GetValues<LogLevel>().Max(level => level.ToString().Length);
/// <summary>The cached representation for each level when added to a log header.</summary>
private static readonly Dictionary<ConsoleLogLevel, string> LogStrings = Enum.GetValues<ConsoleLogLevel>().ToDictionary(level => level, level => level.ToString().ToUpper().PadRight(Monitor.MaxLevelLength));
/// <summary>A cache of messages that should only be logged once.</summary> /// <summary>A cache of messages that should only be logged once.</summary>
private readonly HashSet<string> LogOnceCache = new(); private readonly HashSet<LogOnceCacheKey> LogOnceCache = new();
/// <summary>Get the screen ID that should be logged to distinguish between players in split-screen mode, if any.</summary> /// <summary>Get the screen ID that should be logged to distinguish between players in split-screen mode, if any.</summary>
private readonly Func<int?> GetScreenIdForLog; private readonly Func<int?> GetScreenIdForLog;
@ -84,7 +87,7 @@ namespace StardewModdingAPI.Framework
/// <inheritdoc /> /// <inheritdoc />
public void LogOnce(string message, LogLevel level = LogLevel.Trace) public void LogOnce(string message, LogLevel level = LogLevel.Trace)
{ {
if (this.LogOnceCache.Add($"{message}|{level}")) if (this.LogOnceCache.Add(new LogOnceCacheKey(message, level)))
this.LogImpl(this.Source, message, (ConsoleLogLevel)level); this.LogImpl(this.Source, message, (ConsoleLogLevel)level);
} }
@ -147,7 +150,7 @@ namespace StardewModdingAPI.Framework
/// <param name="level">The log level.</param> /// <param name="level">The log level.</param>
private string GenerateMessagePrefix(string source, ConsoleLogLevel level) private string GenerateMessagePrefix(string source, ConsoleLogLevel level)
{ {
string levelStr = level.ToString().ToUpper().PadRight(Monitor.MaxLevelLength); string levelStr = Monitor.LogStrings[level];
int? playerIndex = this.GetScreenIdForLog(); int? playerIndex = this.GetScreenIdForLog();
return $"[{DateTime.Now:HH:mm:ss} {levelStr}{(playerIndex != null ? $" screen_{playerIndex}" : "")} {source}]"; return $"[{DateTime.Now:HH:mm:ss} {levelStr}{(playerIndex != null ? $" screen_{playerIndex}" : "")} {source}]";