Skip to content
This repository was archived by the owner on Mar 8, 2026. It is now read-only.

Commit e7978b1

Browse files
committed
fix warnings
(from no IDE in particular)
1 parent 586ddc6 commit e7978b1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+98
-124
lines changed

Immersion/Trackers/Backseating.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@ private void UpdateBaseGameAlerts()
9595
CoroutineHost.StartCoroutine(ToggleHypothermiaAlerts(!enabled));
9696
}
9797

98-
private void ToggleSurvivalAlerts(bool enabled)
98+
private void ToggleSurvivalAlerts(bool enable)
9999
{
100-
SurvivalAlertPatches.EnableSurvivalAlerts = enabled;
100+
SurvivalAlertPatches.EnableSurvivalAlerts = enable;
101101
}
102-
private IEnumerator ToggleHypothermiaAlerts(bool enabled)
102+
private IEnumerator ToggleHypothermiaAlerts(bool enable)
103103
{
104104
yield return new WaitUntil(() => bodyTemp);
105105
PDANotification notif = bodyTemp.hypothermiaWarningNotification;
106-
notif.nextPlayTime = enabled ? 0 : float.PositiveInfinity;
106+
notif.nextPlayTime = enable ? 0 : float.PositiveInfinity;
107107
}
108108

109109
public void FixedUpdate()

Immersion/Trackers/JukeboxTrackUnlocked.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ namespace Immersion.Trackers;
55
[HarmonyPatch]
66
public sealed class JukeboxTrackUnlocked : Tracker
77
{
8-
internal static HashSet<string> _allowlist = new(StringComparer.InvariantCultureIgnoreCase)
8+
internal static readonly HashSet<string> _allowlist = new(StringComparer.InvariantCultureIgnoreCase)
99
{
1010
"truckersfm"
1111
};
1212

1313
internal void NotifyUnlocked(Jukebox.UnlockableTrack track)
1414
{
15-
if (!Jukebox.unlockableMusic.TryGetValue(track, out string name)) return;
16-
if (!_allowlist.Contains(name)) return;
15+
if (!Jukebox.unlockableMusic.TryGetValue(track, out string trackId)) return;
16+
if (!_allowlist.Contains(trackId)) return;
1717

18-
React(Priority.Low, Format.FormatPlayer($"{{player}} has unlocked a new jukebox track: {Jukebox.GetInfo(name).label}"));
18+
React(Priority.Low, Format.FormatPlayer($"{{player}} has unlocked a new jukebox track: {Jukebox.GetInfo(trackId).label}"));
1919
}
2020

2121
[HarmonyPatch(typeof(Jukebox), nameof(Jukebox.OnUnlock))]

Immersion/Trackers/NewScans.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ public void OnScanned(PDAScanner.Entry entry)
1616

1717
internal void NotifyScanned(TechType techType)
1818
{
19-
string name = Language.main.TryGet(techType, out string nameMaybe) ? nameMaybe : Format.ToTitleCase(techType);
20-
string message = Format.FormatPlayer($"{{player}} has discovered a new creature: {name}.");
19+
string techName = Language.main.TryGet(techType, out string nameMaybe) ? nameMaybe : Format.ToTitleCase(techType);
20+
string message = Format.FormatPlayer($"{{player}} has discovered a new creature: {techName}.");
2121

2222
string encyKey = PDAScanner.GetEntryData(techType).encyclopedia;
2323
if (!PDAEncyclopedia.GetEntryData(encyKey, out PDAEncyclopedia.EntryData data)) return;

Immersion/Trackers/StoryGoals.Descriptions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ namespace Immersion.Trackers;
44

55
partial class StoryGoals
66
{
7-
private record class Description(string Message, bool IsImportant = false)
7+
private record Description(string Message, bool IsImportant = false)
88
{
99
public Priority Priority => IsImportant ? Priority.High : Priority.Low;
1010
public static implicit operator Description(string Message) => new(Message);
1111
}
12-
private static Dictionary<string, Description> StoryGoalDescriptions = new(StoryGoal.KeyComparer)
12+
private static readonly Dictionary<string, Description> StoryGoalDescriptions = new(StoryGoal.KeyComparer)
1313
{
1414
// sorted roughly in story order
1515

Immersion/Trackers/Tracker.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ protected internal enum Priority
1919
public static bool ForceLowPriority
2020
{
2121
get => PlayerPrefsExtra.GetBool(forceLowPrioPrefsKey, false);
22-
set => PlayerPrefsExtra.SetBool(forceLowPrioPrefsKey, false);
22+
set => PlayerPrefsExtra.SetBool(forceLowPrioPrefsKey, value);
2323
}
2424
private string startEnabledPrefsKey => $"{GetType().FullName}_Enabled";
2525
internal bool startEnabled

SCHIZO/Commands/Attributes/CommandAttribute.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
using System;
2+
using JetBrains.Annotations;
23

34
namespace SCHIZO.Commands.Attributes;
45

56
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
7+
[MeansImplicitUse]
68
public class CommandAttribute : Attribute
79
{
810
public required string Name { get; set; }

SCHIZO/Commands/Base/MethodCommand.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ internal class MethodCommand : Command, IParameters
1414
private readonly MethodInfo _method;
1515
private readonly object? _instance;
1616
private readonly bool _lastTakeAll;
17-
public IReadOnlyList<Parameter> Parameters { get; protected set; } = [];
17+
public IReadOnlyList<Parameter> Parameters { get; protected set; }
1818

1919
public MethodCommand(MethodInfo method, object? instance = null)
2020
{
2121
if (method.IsStatic && instance is { })
2222
throw new ArgumentException("Static method does not need instance");
23-
else if (!method.IsStatic && instance is null)
23+
if (!method.IsStatic && instance is null)
2424
throw new ArgumentException("Non-static method needs instance");
25-
else if (method.Name.IndexOf('>') >= 0) // mangled (delegate, lambda, inner function, etc...)
25+
if (method.Name.IndexOf('>') >= 0) // mangled (delegate, lambda, inner function, etc...)
2626
throw new ArgumentException($"Use {nameof(DelegateCommand)} instead of {nameof(MethodCommand)} for delegate methods (lambda, inner function, etc.)");
2727
_method = method;
2828
_instance = instance;
@@ -105,7 +105,7 @@ internal static ArgParseResult TryParseNamedArgs(Dictionary<string, object?>? ar
105105
return new(consumed == args.Count, parsed == parameters.Count, parsedArgs);
106106
}
107107

108-
internal static ArgParseResult TryParsePositionalArgs(IReadOnlyList<string> args, IReadOnlyList<Parameter> parameters, bool lastTakeAll = false)
108+
internal static ArgParseResult TryParsePositionalArgs(IReadOnlyList<string>? args, IReadOnlyList<Parameter> parameters, bool lastTakeAll = false)
109109
{
110110
if (args is null)
111111
return new(true, parameters.All(p => p.IsOptional), []);

SCHIZO/Commands/Base/NautilusCommandWrapper.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public static NautilusCommandWrapper Register(Command command)
3434
}
3535
NautilusCommandWrapper wrapper = new(command);
3636
wrapper.RegisterWithNautilus();
37+
_registered[command.Name] = wrapper;
3738
return wrapper;
3839
}
3940

SCHIZO/Commands/DevCommands.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public static object PrintField(string typeName, string memberName)
9999
Type type = ReflectionCache.GetType(typeName);
100100
if (type is null) return $"Could not find type '{typeName}'";
101101
MemberInfo[] member = type.GetMember(memberName, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static);
102-
if (member is null) return $"Could not find '{memberName}' in type '{typeName}' (must be static)";
102+
if (member.Length == 0) return $"Could not find '{memberName}' in type '{typeName}' (must be static)";
103103
return ReflectionHelpers.GetStaticMemberValue<object>(member.Single());
104104
}
105105

@@ -111,7 +111,7 @@ public static object SetField(string typeName, string memberName, string valueSt
111111
{
112112
Type type = ReflectionCache.GetType(typeName);
113113
if (type is null) return $"Could not find type '{typeName}'";
114-
MemberInfo member = type.GetMember(memberName, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static).Single();
114+
MemberInfo member = type.GetMember(memberName, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static).SingleOrDefault();
115115
if (member is null) return $"Could not find '{memberName}' in type '{typeName}' (must be static)";
116116
Type memberType = member switch
117117
{

SCHIZO/Commands/Input/Conversion.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public static bool TryParseOrConvert<T>(object? val, [MaybeNullWhen(false)] out
1818
return false;
1919
}
2020

21-
public static bool TryParseOrConvert(object? val, Type type, [MaybeNullWhen(false)] out object? value)
21+
public static bool TryParseOrConvert(object? val, Type type, out object? value)
2222
{
2323
value = default;
2424
if (type.IsEnum)
@@ -27,7 +27,7 @@ public static bool TryParseOrConvert(object? val, Type type, [MaybeNullWhen(fals
2727
}
2828
if (val is null)
2929
return false;
30-
if (type.IsAssignableFrom(val.GetType()))
30+
if (type.IsInstanceOfType(val))
3131
{
3232
value = val;
3333
return true;
@@ -64,7 +64,7 @@ public static bool TryParseEnum<TEnum>(object? val, [MaybeNullWhen(false)] out T
6464
return false;
6565
}
6666

67-
public static bool TryParseEnum(object? val, Type type, [MaybeNullWhen(false)] out object? value)
67+
public static bool TryParseEnum(object? val, Type type, out object? value)
6868
{
6969
value = default;
7070
if (val is null)

0 commit comments

Comments
 (0)