From 36a4b892822cd018917b96468b98893c69aebbcd Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Tue, 13 Aug 2024 14:04:18 +0200 Subject: [PATCH] GameModelImporter - Rename 'ModelTextureLocations' -> 'ModelMetaData' --- PCK-Studio/Internal/GameModelImporter.cs | 4 ++-- PCK-Studio/MainForm.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PCK-Studio/Internal/GameModelImporter.cs b/PCK-Studio/Internal/GameModelImporter.cs index 4007a9e6..3bd153b4 100644 --- a/PCK-Studio/Internal/GameModelImporter.cs +++ b/PCK-Studio/Internal/GameModelImporter.cs @@ -34,7 +34,7 @@ namespace PckStudio.Internal { public static GameModelImporter Default { get; } = new GameModelImporter(); - internal static ReadOnlyDictionary ModelTextureLocations { get; } = JsonConvert.DeserializeObject>(Resources.modelMetaData); + internal static ReadOnlyDictionary ModelMetaData { get; } = JsonConvert.DeserializeObject>(Resources.modelMetaData); private GameModelImporter() { @@ -72,7 +72,7 @@ namespace PckStudio.Internal outliners.Add(part.Name, outline); } - if (!ModelTextureLocations.TryGetValue(modelInfo.Model.Name, out JsonModelMetaData modelMetaData)) + if (!ModelMetaData.TryGetValue(modelInfo.Model.Name, out JsonModelMetaData modelMetaData)) { Trace.TraceError($"[{nameof(GameModelImporter)}:{nameof(ExportBlockBenchModel)}] Failed to get model meta data for '{modelInfo.Model.Name}'."); return; diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs index 20822e9e..f355b371 100644 --- a/PCK-Studio/MainForm.cs +++ b/PCK-Studio/MainForm.cs @@ -632,10 +632,10 @@ namespace PckStudio IEnumerable GetModelTextures(string modelName) { - if (!GameModelImporter.ModelTextureLocations.ContainsKey(modelName) || GameModelImporter.ModelTextureLocations[modelName]?.TextureLocations?.Length <= 0) + if (!GameModelImporter.ModelMetaData.ContainsKey(modelName) || GameModelImporter.ModelMetaData[modelName]?.TextureLocations?.Length <= 0) return Enumerable.Empty(); - return GameModelImporter.ModelTextureLocations[modelName].TextureLocations.Select(texturePath => + return GameModelImporter.ModelMetaData[modelName].TextureLocations.Select(texturePath => { if (currentPCK.TryGetAsset(texturePath + ".png", PckAssetType.TextureFile, out PckAsset modelTextureAsset) || currentPCK.TryGetAsset(texturePath + ".tga", PckAssetType.TextureFile, out modelTextureAsset))