LegacyConsole/PCK-Studio
2
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-05-24 22:04:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

GameModelImporter - Rename 'ModelTextureLocations' -> 'ModelMetaData'

Browse Source
This commit is contained in:
miku-666
2024-08-13 14:04:18 +02:00
parent ec828530ef
commit 36a4b89282
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PCK-Studio/Internal/GameModelImporter.cs
View File

@@ -34,7 +34,7 @@ namespace PckStudio.Internal
{
public static GameModelImporter Default { get; } = new GameModelImporter();
internal static ReadOnlyDictionary<string, JsonModelMetaData> ModelTextureLocations { get; } = JsonConvert.DeserializeObject<ReadOnlyDictionary<string, JsonModelMetaData>>(Resources.modelMetaData);
internal static ReadOnlyDictionary<string, JsonModelMetaData> ModelMetaData { get; } = JsonConvert.DeserializeObject<ReadOnlyDictionary<string, JsonModelMetaData>>(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;

4
PCK-Studio/MainForm.cs
View File

@@ -632,10 +632,10 @@ namespace PckStudio
IEnumerable<NamedTexture> 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<NamedTexture>();
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))