Skip to content

Commit 72006c0

Browse files
committed
Some code style tweaks
1 parent 00cd028 commit 72006c0

3 files changed

Lines changed: 18 additions & 9 deletions

File tree

MonkeyLoader.GamePacks.ResoniteModLoader/ModConfiguration.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,12 @@ internal ModConfiguration(ModConfigurationDefinition definition)
114114
/// <remarks>
115115
/// Saving too often may result in save calls being debounced, with only the latest save call being used after a delay.
116116
/// </remarks>
117+
#pragma warning disable IDE0060 // Remove unused parameter
118+
117119
public void Save(bool saveDefaultValues = false) => Config.Save();
118120

121+
#pragma warning restore IDE0060 // Remove unused parameter
122+
119123
/// <summary>
120124
/// Sets a configuration value for the given key, throwing a <see cref="KeyNotFoundException"/> if the key is not found
121125
/// or an <see cref="ArgumentException"/> if the value is not valid for it.
@@ -238,11 +242,9 @@ public class ModConfigurationDefinition : IModConfigurationDefinition
238242
internal bool AutoSave;
239243

240244
/// <inheritdoc/>
245+
// clone the collection because I don't trust giving public API users shallow copies one bit
241246
public ISet<ModConfigurationKey> ConfigurationItemDefinitions
242-
{
243-
// clone the collection because I don't trust giving public API users shallow copies one bit
244-
get => new HashSet<ModConfigurationKey>(ConfigurationItems);
245-
}
247+
=> new HashSet<ModConfigurationKey>(ConfigurationItems);
246248

247249
/// <inheritdoc/>
248250
public ResoniteModBase Owner { get; private set; }

MonkeyLoader.GamePacks.ResoniteModLoader/MonkeyLoader.GamePacks.ResoniteModLoader.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PackageId>MonkeyLoader.GamePacks.ResoniteModLoader</PackageId>
1313
<Title>ResoniteModLoader</Title>
1414
<Authors>Banane9, Nytra</Authors>
15-
<Version>3.0.3</Version>
15+
<Version>3.0.4</Version>
1616
<Description>This MonkeyLoader Game Pack for Resonite enables loading ResoniteModLoader mods as MonkeyLoader mods.</Description>
1717
<PackageReadmeFile>README.md</PackageReadmeFile>
1818
<PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>

MonkeyLoader.GamePacks.ResoniteModLoader/ResoniteMod.cs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using MonkeyLoader;
22
using MonkeyLoader.Logging;
3+
using MonkeyLoader.Patching;
34
using MonkeyLoader.Resonite;
45
using System;
56
using System.Collections;
@@ -149,15 +150,18 @@ public override bool Run()
149150
}
150151

151152
/// <summary>
152-
/// Get the Logger for the mod from a stack trace.
153+
/// Get the <see cref="Logger"/> for the nearest <see cref="RmlMod"/> from the <paramref name="stackTrace"/>.
153154
/// </summary>
154155
/// <param name="stackTrace">A stack trace captured by the callee</param>
155-
/// <returns>The executing mod's Logger, or ModLoader.Logger if none found</returns>
156+
/// <returns>
157+
/// The executing <see cref="RmlMod"/>'s <see cref="ResoniteModBase.Logger">Logger</see>,
158+
/// or <see cref="ModLoader"/>.<see cref="MonkeyBase{TMonkey}.Logger">Logger</see> if no mod is found.
159+
/// </returns>
156160
internal static Logger GetLoggerFromStackTrace(StackTrace stackTrace)
157161
{
158-
for (int i = 0; i < stackTrace.FrameCount; i++)
162+
for (var i = 0; i < stackTrace.FrameCount; i++)
159163
{
160-
Assembly? assembly = stackTrace.GetFrame(i)?.GetMethod()?.DeclaringType?.Assembly;
164+
var assembly = stackTrace.GetFrame(i)?.GetMethod()?.DeclaringType?.Assembly;
161165

162166
if (assembly != null)
163167
{
@@ -167,6 +171,7 @@ internal static Logger GetLoggerFromStackTrace(StackTrace stackTrace)
167171
}
168172
}
169173
}
174+
170175
return ModLoader.Logger;
171176
}
172177

@@ -178,7 +183,9 @@ internal static Logger GetLoggerFromStackTrace(StackTrace stackTrace)
178183
{
179184
ModConfigurationDefinitionBuilder builder = new(this);
180185
builder.ProcessAttributes();
186+
181187
DefineConfiguration(builder);
188+
182189
return builder.Build();
183190
}
184191

0 commit comments

Comments
 (0)