From 817230ca231e6fe2f1a9047da65b37736891e4e4 Mon Sep 17 00:00:00 2001 From: MayNL Date: Sat, 4 Jul 2026 23:31:42 -0400 Subject: [PATCH] Removed option to generate a pack with Skins.pck --- .../CreateTexturePackPrompt.Designer.cs | 11 ------ .../CreateTexturePackPrompt.cs | 1 - .../CreateTexturePackPrompt.resx | 35 +++---------------- PCK-Studio/MainForm.cs | 12 +++---- 4 files changed, 10 insertions(+), 49 deletions(-) diff --git a/PCK-Studio/Forms/Additional-Popups/CreateTexturePackPrompt.Designer.cs b/PCK-Studio/Forms/Additional-Popups/CreateTexturePackPrompt.Designer.cs index 9dbc2d42..2bd3cfc5 100644 --- a/PCK-Studio/Forms/Additional-Popups/CreateTexturePackPrompt.Designer.cs +++ b/PCK-Studio/Forms/Additional-Popups/CreateTexturePackPrompt.Designer.cs @@ -34,7 +34,6 @@ this.InputTextBox = new MetroFramework.Controls.MetroTextBox(); this.resolutionComboBox = new MetroFramework.Controls.MetroComboBox(); this.label1 = new MetroFramework.Controls.MetroLabel(); - this.createSkinsPckCheckBox = new MetroFramework.Controls.MetroCheckBox(); this.SuspendLayout(); // // TextLabel @@ -109,20 +108,11 @@ this.label1.Name = "label1"; this.label1.Theme = MetroFramework.MetroThemeStyle.Dark; // - // createSkinsPckCheckBox - // - resources.ApplyResources(this.createSkinsPckCheckBox, "createSkinsPckCheckBox"); - this.createSkinsPckCheckBox.Name = "createSkinsPckCheckBox"; - this.createSkinsPckCheckBox.Style = MetroFramework.MetroColorStyle.White; - this.createSkinsPckCheckBox.Theme = MetroFramework.MetroThemeStyle.Dark; - this.createSkinsPckCheckBox.UseSelectable = true; - // // CreateTexturePackPrompt // this.AcceptButton = this.OKButton; resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.createSkinsPckCheckBox); this.Controls.Add(this.label1); this.Controls.Add(this.resolutionComboBox); this.Controls.Add(this.InputTextBox); @@ -146,6 +136,5 @@ private MetroFramework.Controls.MetroTextBox InputTextBox; private MetroFramework.Controls.MetroComboBox resolutionComboBox; public MetroFramework.Controls.MetroLabel label1; - private MetroFramework.Controls.MetroCheckBox createSkinsPckCheckBox; } } \ No newline at end of file diff --git a/PCK-Studio/Forms/Additional-Popups/CreateTexturePackPrompt.cs b/PCK-Studio/Forms/Additional-Popups/CreateTexturePackPrompt.cs index 52f8fe9d..b94620b8 100644 --- a/PCK-Studio/Forms/Additional-Popups/CreateTexturePackPrompt.cs +++ b/PCK-Studio/Forms/Additional-Popups/CreateTexturePackPrompt.cs @@ -9,7 +9,6 @@ namespace PckStudio /// /// Text entered only access when DialogResult == DialogResult.OK /// - public bool CreateSkinsPck => createSkinsPckCheckBox.Checked; public string PackName => InputTextBox.Text; public string PackRes => resolutionComboBox.Text; diff --git a/PCK-Studio/Forms/Additional-Popups/CreateTexturePackPrompt.resx b/PCK-Studio/Forms/Additional-Popups/CreateTexturePackPrompt.resx index 5c08d9b8..aea4c7fc 100644 --- a/PCK-Studio/Forms/Additional-Popups/CreateTexturePackPrompt.resx +++ b/PCK-Studio/Forms/Additional-Popups/CreateTexturePackPrompt.resx @@ -147,7 +147,7 @@ $this - 5 + 4 166, 74 @@ -171,7 +171,7 @@ $this - 4 + 3 @@ -208,7 +208,7 @@ $this - 3 + 2 23 @@ -259,7 +259,7 @@ $this - 2 + 1 True @@ -289,33 +289,6 @@ $this - 1 - - - True - - - 19, 77 - - - 109, 15 - - - 8 - - - Create Skins.pck - - - createSkinsPckCheckBox - - - MetroFramework.Controls.MetroCheckBox, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - - - $this - - 0 diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs index c16be621..a32b0dc1 100644 --- a/PCK-Studio/MainForm.cs +++ b/PCK-Studio/MainForm.cs @@ -339,7 +339,7 @@ namespace PckStudio } } - private static PckFile InitializePack(int packId, int packVersion, string packName, bool createSkinsPCK) + private static PckFile InitializePack(int packId, int packVersion, string packName) { var pack = new PckFile(3); @@ -354,9 +354,9 @@ namespace PckStudio return pack; } - private static PckFile InitializeTexturePack(int packId, int packVersion, string packName, string res, bool createSkinsPCK) + private static PckFile InitializeTexturePack(int packId, int packVersion, string packName, string res) { - PckFile pack = InitializePack(packId, packVersion, packName, createSkinsPCK); + PckFile pack = InitializePack(packId, packVersion, packName); PckFile infoPCK = new PckFile(3); @@ -379,7 +379,7 @@ namespace PckStudio private static PckFile InitializeMashUpPack(int packId, int packVersion, string packName, string res) { - PckFile pack = InitializeTexturePack(packId, packVersion, packName, res, true); + PckFile pack = InitializeTexturePack(packId, packVersion, packName, res); PckAsset gameRuleAsset = pack.CreateNewAsset("GameRules.grf", PckAssetType.GameRulesFile); GameRuleFile grfFile = new GameRuleFile(); grfFile.AddRule("MapOptions", @@ -408,7 +408,7 @@ namespace PckStudio namePrompt.OKButtonText = "Ok"; if (namePrompt.ShowDialog(this) == DialogResult.OK) { - PckFile skinPck = InitializePack(new Random().Next(8000, GameConstants.MAX_PACK_ID), 0, namePrompt.NewText, true); + PckFile skinPck = InitializePack(new Random().Next(8000, GameConstants.MAX_PACK_ID), 0, namePrompt.NewText); PackInfo packInfo = PackInfo.Create(skinPck, OMI.ByteOrder.BigEndian, true); AddEditorPage("Unsaved skin pack", "Unsaved skin pack", packInfo); } @@ -419,7 +419,7 @@ namespace PckStudio var packPrompt = new CreateTexturePackPrompt(); if (packPrompt.ShowDialog() == DialogResult.OK) { - PckFile texturePackPck = InitializeTexturePack(new Random().Next(8000, GameConstants.MAX_PACK_ID), 0, packPrompt.PackName, packPrompt.PackRes, packPrompt.CreateSkinsPck); + PckFile texturePackPck = InitializeTexturePack(new Random().Next(8000, GameConstants.MAX_PACK_ID), 0, packPrompt.PackName, packPrompt.PackRes); PackInfo packInfo = PackInfo.Create(texturePackPck, OMI.ByteOrder.BigEndian, true); AddEditorPage("Unsaved texture pack", "Unsaved texture pack", packInfo); }