LegacyConsoleArchive/PCK-Studio
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-09-23 06:22:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Imported Skin Files now add missing LOC entries

Browse Source
This commit is contained in:
MayNL
2026-06-22 17:59:57 -04:00
parent d4b5b6739f
commit 2133d9b6a3
1 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PCK-Studio/Controls/Editor/PckEditor.cs
+41 -24
View File
@@ -1321,6 +1321,11 @@ namespace PckStudio.Controls
int skipAttempts = 3;
int typeDuplication = 0;
PckAssetType lastSelectedAssetType = PckAssetType.SkinFile;
bool addSkin = false;
LOCFile locFile = null;
TryGetLocFile(out locFile);
foreach (var filepath in files)
{
if (filepath.EndsWith(".txt") && !singleFile)
@@ -1405,12 +1410,44 @@ namespace PckStudio.Controls
if (EditorValue.File.Contains(importedAsset.Filename, importedAsset.Type))
{
MessageBox.Show(this, $"'{assetPath}' of type {assetType} already exists.\nSkiping file.", "File already exists", MessageBoxButtons.OK, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button1);
Debug.WriteLine($"'{assetPath}' of type {assetType} already exists.\nSkiping file.");
Debug.WriteLine($"'{assetPath}' of type {assetType} already exists.\nSkipping file.");
skippedFiles++;
continue;
}
EditorValue.File.AddAsset(importedAsset);
if(importedAsset.Type == PckAssetType.SkinFile && locFile != null)
{
const string displayNameLabel = "DISPLAYNAME";
const string displayNameIDLabel = "DISPLAYNAMEID";
const string themeNameLabel = "THEMENAME";
const string themeNameIDLabel = "THEMENAMEID";
string displayName;
string skin_key;
string themeName;
string themeNameID;
importedAsset.TryGetParameter(displayNameLabel, out displayName);
if (!importedAsset.TryGetParameter(displayNameIDLabel, out skin_key))
{
// if failed, try LOC_KEY
importedAsset.TryGetParameter("LOC_KEY", out skin_key);
}
importedAsset.TryGetParameter(themeNameLabel, out themeName);
importedAsset.TryGetParameter(themeNameIDLabel, out themeNameID);
if (!locFile.HasLocEntry(skin_key) && !String.IsNullOrEmpty(displayName))
locFile.AddLocKey(skin_key, displayName);
if (!locFile.HasLocEntry(themeNameID) && !String.IsNullOrEmpty(themeName))
locFile.AddLocKey(themeNameID, themeName);
addSkin = true;
}
addedCount++;
}
@@ -1420,6 +1457,9 @@ namespace PckStudio.Controls
{
_wasModified = true;
BuildMainTreeView();
if(locFile != null && addSkin)
TrySetLocFile(locFile);
}
}
@@ -1438,29 +1478,6 @@ namespace PckStudio.Controls
return trailingNodes;
}
private void ImportFiles(string[] files)
{
int addedCount = 0;
foreach (var file in files)
{
using AddFilePrompt addFile = new AddFilePrompt(Path.GetFileName(file));
if (addFile.ShowDialog(this) != DialogResult.OK)
continue;
if (EditorValue.File.Contains(addFile.Filepath, addFile.Filetype))
{
MessageBox.Show(this, $"'{addFile.Filepath}' of type {addFile.Filetype} already exists.", "Import failed", MessageBoxButtons.OK, MessageBoxIcon.Warning);
continue;
}
EditorValue.File.CreateNewAsset(addFile.Filepath, addFile.Filetype, () => File.ReadAllBytes(file));
addedCount++;
BuildMainTreeView();
_wasModified = true;
}
Trace.TraceInformation("[{0}] Imported {1} file(s).", nameof(ImportFiles), addedCount);
}
private void createSkinToolStripMenuItem_Click(object sender, EventArgs e)
{
using (AddSkinPrompt addNewSkinDialog = new AddSkinPrompt(EditorValue.File.xmlVersion))