LegacyConsole/PCK-Studio
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-06-04 09:35:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Try{Set/Get}LocFile

Browse Source
This commit is contained in:
miku-666
2022-08-11 19:46:46 +02:00
parent 6d990de65c
commit d963f42539
1 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
MinecraftUSkinEditor/MainForm.cs
View File

@@ -1126,12 +1126,8 @@ namespace PckStudio
private bool TryGetLocFile(out LOCFile locFile)
{
PCKFile.FileData locdata = null;
if (currentPCK.HasFile("localisation.loc", 6))
locdata = currentPCK.GetFile("localisation.loc", 6);
else if (currentPCK.HasFile("languages.loc", 6))
locdata = currentPCK.GetFile("languages.loc", 6);
else
if (!currentPCK.TryGetFile("localisation.loc", 6, out PCKFile.FileData locdata) &&
!currentPCK.TryGetFile("languages.loc", 6, out locdata))
{
locFile = null;
return false;
@@ -1155,15 +1151,13 @@ namespace PckStudio
private bool TrySetLocFile(in LOCFile locFile)
{
PCKFile.FileData locdata = null;
if (currentPCK.HasFile("localisation.loc", 6))
locdata = currentPCK.GetFile("localisation.loc", 6);
else if (currentPCK.HasFile("languages.loc", 6))
locdata = currentPCK.GetFile("languages.loc", 6);
else
return false;
if (!currentPCK.TryGetFile("localisation.loc", 6, out PCKFile.FileData locdata) &&
!currentPCK.TryGetFile("languages.loc", 6, out locdata))
{
return false;
}
try
try
{
using (var stream = new MemoryStream())
{
@@ -1198,8 +1192,8 @@ namespace PckStudio
{
string[] txtProperties = File.ReadAllLines(propertyFile);
if ((txtProperties.Contains("DISPLAYNAMEID") && txtProperties.Contains("DISPLAYNAME")) ||
(txtProperties.Contains("THEMENAMEID") && txtProperties.Contains("THEMENAME")) &&
TryGetLocFile(out LOCFile locFile))
txtProperties.Contains("THEMENAMEID") && txtProperties.Contains("THEMENAME") &&
TryGetLocFile(out LOCFile locFile))
{
// do stuff
//l.AddLocKey(locThemeId, locTheme);
@@ -1244,12 +1238,9 @@ namespace PckStudio
TreeNode folerNode = CreateNode(folderNamePrompt.NewText);
folerNode.ImageIndex = 0;
folerNode.SelectedImageIndex = 0;
TreeNode node = treeViewMain.SelectedNode;
TreeNodeCollection nodeCollection = node != null &&
!(node.Tag is PCKFile.FileData)
? node.Nodes : treeViewMain.Nodes;
if (node.Tag is PCKFile.FileData && node.Parent != null)
nodeCollection = node.Parent.Nodes;
TreeNodeCollection nodeCollection = treeViewMain.SelectedNode is TreeNode node
? node.Tag is PCKFile.FileData && node.Parent is TreeNode parentNode ? parentNode.Nodes : node.Nodes
: treeViewMain.Nodes;
nodeCollection.Add(folerNode);
}
}