Skip to content

Commit 23b7588

Browse files
committed
Beta 2.3.2.3
2 parents c508155 + 13ec118 commit 23b7588

File tree

9 files changed

+269
-178
lines changed

9 files changed

+269
-178
lines changed

xivModdingFramework/Cache/XivCache.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1585,7 +1585,7 @@ public static Dictionary<XivItemType, Dictionary<int, Dictionary<XivItemType, Di
15851585

15861586
public static async Task<XivDependencyRoot> GetFirstRoot(string internalPath)
15871587
{
1588-
var roots = await XivDependencyGraph.GetDependencyRoots(internalPath);
1588+
var roots = await XivDependencyGraph.GetDependencyRoots(internalPath, true);
15891589
if(roots.Count > 0)
15901590
{
15911591
return roots[0];

xivModdingFramework/Cache/XivDependencyGraph.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1523,7 +1523,7 @@ public static XivDependencyRootInfo ExtractRootInfo(string internalFilePath)
15231523
/// </summary>
15241524
/// <param name="internalFilePath"></param>
15251525
/// <returns></returns>
1526-
public static async Task<List<XivDependencyRoot>> GetDependencyRoots(string internalFilePath)
1526+
public static async Task<List<XivDependencyRoot>> GetDependencyRoots(string internalFilePath, bool firstOnly = false)
15271527
{
15281528
var roots = new HashSet<XivDependencyRoot>();
15291529

@@ -1536,6 +1536,11 @@ public static async Task<List<XivDependencyRoot>> GetDependencyRoots(string inte
15361536
roots.Add(root);
15371537
}
15381538

1539+
if(firstOnly && roots.Count > 0)
1540+
{
1541+
return roots.ToList();
1542+
}
1543+
15391544
// Tex files require special handling, because they can be referenced by modded items
15401545
// outside of their own dependency chain potentially.
15411546
var match = _extensionRegex.Match(internalFilePath);
@@ -1805,6 +1810,7 @@ public static async Task CacheAllRealRoots()
18051810
types[XivItemType.equipment].Add(XivItemType.none);
18061811
types[XivItemType.accessory].Add(XivItemType.none);
18071812
types[XivItemType.outdoor].Add(XivItemType.none);
1813+
types[XivItemType.indoor].Add(XivItemType.none);
18081814

18091815
var tasks = new List<Task<List<XivDependencyRootInfo>>>();
18101816
foreach (var kv in types)

xivModdingFramework/Mods/DataContainers/ModList.cs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,6 @@ public class ModList : ICloneable
3131
/// </summary>
3232
public string version { get; set; }
3333

34-
/// <summary>
35-
/// The number of mods in the modlist
36-
/// </summary>
37-
public int modCount { get; set; }
38-
39-
/// <summary>
40-
/// The number of modpacks currently installed
41-
/// </summary>
42-
public int modPackCount { get; set; }
43-
44-
/// <summary>
45-
/// The number of empty spaces available that a mod can fill
46-
/// </summary>
47-
public int emptyCount { get; set; }
48-
4934
/// <summary>
5035
/// The list of ModPacks currently installed
5136
/// </summary>
@@ -65,8 +50,6 @@ public object Clone()
6550
// slightly less safe in the event any of the classes ever get extended.
6651
return JsonConvert.DeserializeObject<ModList>(JsonConvert.SerializeObject(this));
6752
}
68-
69-
7053
}
7154

7255
public class Mod

xivModdingFramework/Mods/FileTypes/TTMP.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,6 @@ await Task.Run(async () =>
644644
mod.modPack = modPack;
645645
modList.Mods.Add(mod);
646646

647-
modList.modCount += 1;
648647
}
649648
else
650649
{

0 commit comments

Comments
 (0)