Skip to content

Commit 6ef15a6

Browse files
committed
Merge branch 'item_converter' into develop
2 parents 2f2d935 + f719280 commit 6ef15a6

File tree

7 files changed

+684
-228
lines changed

7 files changed

+684
-228
lines changed

xivModdingFramework/Models/DataContainers/TTModel.cs

Lines changed: 243 additions & 221 deletions
Large diffs are not rendered by default.

xivModdingFramework/Models/FileTypes/Mdl.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2173,7 +2173,7 @@ await Task.Run(async () =>
21732173
/// </summary>
21742174
/// <param name="ttModel">The ttModel to import</param>
21752175
/// <param name="ogMdl">The currently modified Mdl file.</param>
2176-
private async Task<byte[]> MakeNewMdlFile(TTModel ttModel, XivMdl ogMdl, Action<bool, string> loggingFunction = null)
2176+
internal async Task<byte[]> MakeNewMdlFile(TTModel ttModel, XivMdl ogMdl, Action<bool, string> loggingFunction = null)
21772177
{
21782178
if (loggingFunction == null)
21792179
{

xivModdingFramework/Models/Helpers/ModelModifiers.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1001,7 +1001,7 @@ public static void ApplyRacialDeform(TTModel model, XivRace targetRace, bool inv
10011001
if (missingDeforms.Any())
10021002
{
10031003
// Get the skeleton for this model so we can use it to analyze missing bones.
1004-
var dict = model.ResolveBoneHeirarchy(loggingFunction);
1004+
var dict = model.ResolveBoneHeirarchy(null, XivRace.All_Races, null, loggingFunction);
10051005

10061006

10071007
// For a bone to be missing in the deformation data completely, it has to have come from a different skeleton, which

xivModdingFramework/Mods/FileTypes/ItemMetadata.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class ItemMetadata
3737
/// <summary>
3838
/// The dependency root that this item meta data entry refers to.
3939
/// </summary>
40-
public readonly XivDependencyRoot Root;
40+
public XivDependencyRoot Root;
4141

4242
/// <summary>
4343
/// Returns if this metadata object actually contains any metadata or not.
@@ -134,8 +134,8 @@ public static async Task<ItemMetadata> GetMetadata(XivDependencyRoot root)
134134
var data = await _dat.GetType2Data(filePath, false);
135135

136136
// Run it through the binary deserializer and we're good.
137-
//return await Deserialize(data);
138-
return await CreateFromRaw(root);
137+
return await Deserialize(data);
138+
//return await CreateFromRaw(root);
139139
} else
140140
{
141141
// This is the fun part where we get to pull the Metadata from all the disparate files around the FFXIV File System.

0 commit comments

Comments
 (0)