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

Fix ordering of meta entries.

Browse source
This commit is contained in:
Ottermandias 2024-08-28 15:49:07 +02:00
parent 233a999650
commit a3c22f2826
6 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Penumbra/UI/AdvancedWindow/Meta/EqdpMetaDrawer.cs
View file

@ -61,7 +61,7 @@ public sealed class EqdpMetaDrawer(ModMetaEditor editor, MetaFileManager metaFil
}
protected override IEnumerable<(EqdpIdentifier, EqdpEntryInternal)> Enumerate()
=> Editor.Eqdp.OrderBy(kvp => kvp.Key.SetId)
=> Editor.Eqdp.OrderBy(kvp => kvp.Key.SetId.Id)
.ThenBy(kvp => kvp.Key.GenderRace)
.ThenBy(kvp => kvp.Key.Slot)
.Select(kvp => (kvp.Key, kvp.Value));

2
Penumbra/UI/AdvancedWindow/Meta/EqpMetaDrawer.cs
View file

@ -60,7 +60,7 @@ public sealed class EqpMetaDrawer(ModMetaEditor editor, MetaFileManager metaFile
protected override IEnumerable<(EqpIdentifier, EqpEntryInternal)> Enumerate()
=> Editor.Eqp
.OrderBy(kvp => kvp.Key.SetId)
.OrderBy(kvp => kvp.Key.SetId.Id)
.ThenBy(kvp => kvp.Key.Slot)
.Select(kvp => (kvp.Key, kvp.Value));

2
Penumbra/UI/AdvancedWindow/Meta/EstMetaDrawer.cs
View file

@ -59,7 +59,7 @@ public sealed class EstMetaDrawer(ModMetaEditor editor, MetaFileManager metaFile
protected override IEnumerable<(EstIdentifier, EstEntry)> Enumerate()
=> Editor.Est
.OrderBy(kvp => kvp.Key.SetId)
.OrderBy(kvp => kvp.Key.SetId.Id)
.ThenBy(kvp => kvp.Key.GenderRace)
.ThenBy(kvp => kvp.Key.Slot)
.Select(kvp => (kvp.Key, kvp.Value));

2
Penumbra/UI/AdvancedWindow/Meta/GlobalEqpMetaDrawer.cs
View file

@ -49,7 +49,7 @@ public sealed class GlobalEqpMetaDrawer(ModMetaEditor editor, MetaFileManager me
protected override IEnumerable<(GlobalEqpManipulation, byte)> Enumerate()
=> Editor.GlobalEqp
.OrderBy(identifier => identifier.Type)
.ThenBy(identifier => identifier.Condition)
.ThenBy(identifier => identifier.Condition.Id)
.Select(identifier => (identifier, (byte)0));
private static void DrawIdentifierInput(ref GlobalEqpManipulation identifier)

2
Penumbra/UI/AdvancedWindow/Meta/GmpMetaDrawer.cs
View file

@ -58,7 +58,7 @@ public sealed class GmpMetaDrawer(ModMetaEditor editor, MetaFileManager metaFile
protected override IEnumerable<(GmpIdentifier, GmpEntry)> Enumerate()
=> Editor.Gmp
.OrderBy(kvp => kvp.Key.SetId)
.OrderBy(kvp => kvp.Key.SetId.Id)
.Select(kvp => (kvp.Key, kvp.Value));
private static bool DrawIdentifierInput(ref GmpIdentifier identifier)

6
Penumbra/UI/AdvancedWindow/Meta/ImcMetaDrawer.cs
View file

@ -142,11 +142,11 @@ public sealed class ImcMetaDrawer(ModMetaEditor editor, MetaFileManager metaFile
protected override IEnumerable<(ImcIdentifier, ImcEntry)> Enumerate()
=> Editor.Imc
.OrderBy(kvp => kvp.Key.ObjectType)
.ThenBy(kvp => kvp.Key.PrimaryId)
.ThenBy(kvp => kvp.Key.PrimaryId.Id)
.ThenBy(kvp => kvp.Key.EquipSlot)
.ThenBy(kvp => kvp.Key.BodySlot)
.ThenBy(kvp => kvp.Key.SecondaryId)
.ThenBy(kvp => kvp.Key.Variant)
.ThenBy(kvp => kvp.Key.SecondaryId.Id)
.ThenBy(kvp => kvp.Key.Variant.Id)
.Select(kvp => (kvp.Key, kvp.Value));
public static bool DrawObjectType(ref ImcIdentifier identifier, float width = 110)