ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-13 20:24:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix best match fullpath returning broken FullPath instead of nullopt.

Browse source
This commit is contained in:
Ottermandias 2024-05-28 00:11:31 +02:00
parent fe266dca31
commit f11cefcec1
2 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Penumbra/Mods/Groups/MultiModGroup.cs
View file

@ -4,6 +4,7 @@ using Newtonsoft.Json.Linq;
using OtterGui; using OtterGui;
using OtterGui.Classes; using OtterGui.Classes;
using Penumbra.Api.Enums; using Penumbra.Api.Enums;
using Penumbra.GameData;
using Penumbra.GameData.Data; using Penumbra.GameData.Data;
using Penumbra.Meta.Manipulations; using Penumbra.Meta.Manipulations;
using Penumbra.Mods.Settings; using Penumbra.Mods.Settings;
@ -40,9 +41,13 @@ public sealed class MultiModGroup(Mod mod) : IModGroup, ITexToolsGroup
=> OptionData.Count > 0; => OptionData.Count > 0;
public FullPath? FindBestMatch(Utf8GamePath gamePath) public FullPath? FindBestMatch(Utf8GamePath gamePath)
=> OptionData.OrderByDescending(o => o.Priority) {
.SelectWhere(o => (o.Files.TryGetValue(gamePath, out var file) || o.FileSwaps.TryGetValue(gamePath, out file), file)) foreach (var path in OptionData.OrderByDescending(o => o.Priority)
.FirstOrDefault(); .SelectWhere(o => (o.Files.TryGetValue(gamePath, out var file) || o.FileSwaps.TryGetValue(gamePath, out file), file)))
return path;
return null;
}
public IModOption? AddOption(string name, string description = "") public IModOption? AddOption(string name, string description = "")
{ {

10
Penumbra/Mods/Groups/SingleModGroup.cs
View file

@ -30,9 +30,13 @@ public sealed class SingleModGroup(Mod mod) : IModGroup, ITexToolsGroup
public readonly List<SingleSubMod> OptionData = []; public readonly List<SingleSubMod> OptionData = [];
public FullPath? FindBestMatch(Utf8GamePath gamePath) public FullPath? FindBestMatch(Utf8GamePath gamePath)
=> OptionData {
.SelectWhere(m => (m.Files.TryGetValue(gamePath, out var file) || m.FileSwaps.TryGetValue(gamePath, out file), file)) foreach (var path in OptionData
.FirstOrDefault(); .SelectWhere(m => (m.Files.TryGetValue(gamePath, out var file) || m.FileSwaps.TryGetValue(gamePath, out file), file)))
return path;
return null;
}
public IModOption AddOption(string name, string description = "") public IModOption AddOption(string name, string description = "")
{ {