LegacyConsole/PCK-Studio
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-06-08 05:53:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 3dSkinRenderer

Browse Source
This commit is contained in:
miku-666
2024-05-20 14:21:06 +02:00
parent f1db61f67a 5725e26ce6
commit 713a51409e
3 changed files with 624 additions and 735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
PCK-Studio/MainForm.Designer.cs generated
View File

@@ -65,7 +65,7 @@
this.modelsFileBINToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.behavioursFileBINToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.entityMaterialsFileBINToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.miscFunctionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
this.generateMipMapTextureToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.viewFileInfoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.correctSkinDecimalsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -76,6 +76,7 @@
this.version1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.version2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.version3114ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
this.extractToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.cloneFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.renameFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -201,7 +202,13 @@
this.importSkinsToolStripMenuItem,
this.exportToolStripMenuItem,
this.setFileTypeToolStripMenuItem,
this.miscFunctionsToolStripMenuItem,
this.toolStripSeparator5,
this.generateMipMapTextureToolStripMenuItem1,
this.viewFileInfoToolStripMenuItem,
this.correctSkinDecimalsToolStripMenuItem,
this.setSubPCKEndiannessToolStripMenuItem,
this.setModelContainerFormatToolStripMenuItem,
this.toolStripSeparator6,
this.extractToolStripMenuItem,
this.cloneFileToolStripMenuItem,
this.renameFileToolStripMenuItem,
@@ -405,16 +412,10 @@
this.entityMaterialsFileBINToolStripMenuItem.Name = "entityMaterialsFileBINToolStripMenuItem";
resources.ApplyResources(this.entityMaterialsFileBINToolStripMenuItem, "entityMaterialsFileBINToolStripMenuItem");
//
// miscFunctionsToolStripMenuItem
// toolStripSeparator5
//
this.miscFunctionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.generateMipMapTextureToolStripMenuItem1,
this.viewFileInfoToolStripMenuItem,
this.correctSkinDecimalsToolStripMenuItem,
this.setSubPCKEndiannessToolStripMenuItem,
this.setModelContainerFormatToolStripMenuItem});
this.miscFunctionsToolStripMenuItem.Name = "miscFunctionsToolStripMenuItem";
resources.ApplyResources(this.miscFunctionsToolStripMenuItem, "miscFunctionsToolStripMenuItem");
this.toolStripSeparator5.Name = "toolStripSeparator5";
resources.ApplyResources(this.toolStripSeparator5, "toolStripSeparator5");
//
// generateMipMapTextureToolStripMenuItem1
//
@@ -481,6 +482,11 @@
resources.ApplyResources(this.version3114ToolStripMenuItem, "version3114ToolStripMenuItem");
this.version3114ToolStripMenuItem.Click += new System.EventHandler(this.setModelVersion3ToolStripMenuItem_Click);
//
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
resources.ApplyResources(this.toolStripSeparator6, "toolStripSeparator6");
//
// extractToolStripMenuItem
//
resources.ApplyResources(this.extractToolStripMenuItem, "extractToolStripMenuItem");
@@ -1247,10 +1253,6 @@
private MetroFramework.Controls.MetroLabel labelVersion;
private System.Windows.Forms.RichTextBox ChangelogRichTextBox;
private System.Windows.Forms.ToolStripMenuItem colourscolToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem miscFunctionsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem generateMipMapTextureToolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem viewFileInfoToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem correctSkinDecimalsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem miscToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem CreateSkinsPCKToolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem editAllEntriesToolStripMenuItem;
@@ -1288,6 +1290,10 @@
private System.Windows.Forms.ToolStripMenuItem trelloBoardToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem recentlyOpenToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
private System.Windows.Forms.ToolStripMenuItem generateMipMapTextureToolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem viewFileInfoToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem correctSkinDecimalsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem setSubPCKEndiannessToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem bigEndianXbox360PS3WiiUToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem littleEndianPS4PSVitaSwitchToolStripMenuItem;
@@ -1295,6 +1301,7 @@
private System.Windows.Forms.ToolStripMenuItem version1ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem version2ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem version3114ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
}
}

18
PCK-Studio/MainForm.cs
View File

@@ -1479,10 +1479,16 @@ namespace PckStudio
return;
bool isTargetPckFile = targetNode.IsTagOfType<PckAsset>();
if (e.Data.GetData(dataFormat) is not TreeNode draggedNode)
TreeNode draggedNode = e.Data.GetData(dataFormat) as TreeNode;
if (draggedNode == null)
{
Debug.WriteLine("Dragged data was not of type TreeNode.");
Debug.WriteLine("Dragged node is null.");
return;
}
if (targetNode.Equals(draggedNode))
{
Debug.WriteLine("Dragged node was not moved.");
return;
}
@@ -2599,12 +2605,15 @@ namespace PckStudio
setModelContainerFormatToolStripMenuItem.Visible = false;
setSubPCKEndiannessToolStripMenuItem.Visible = false;
exportToolStripMenuItem.Visible = false;
toolStripSeparator5.Visible = false;
toolStripSeparator6.Visible = false;
if (treeViewMain.SelectedNode.TryGetTagData(out PckAsset asset))
{
replaceToolStripMenuItem.Visible = true;
cloneFileToolStripMenuItem.Visible = true;
setFileTypeToolStripMenuItem.Visible = true;
miscFunctionsToolStripMenuItem.Visible = true;
toolStripSeparator5.Visible = true;
toolStripSeparator6.Visible = true;
if (asset.Type == PckAssetType.SkinFile)
{
@@ -2623,7 +2632,6 @@ namespace PckStudio
replaceToolStripMenuItem.Visible = false;
cloneFileToolStripMenuItem.Visible = false;
setFileTypeToolStripMenuItem.Visible = false;
miscFunctionsToolStripMenuItem.Visible = false;
}
}
}

1304
PCK-Studio/MainForm.resx
View File

File diff suppressed because it is too large Load Diff