diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 19ec69e6..2a78b578 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -15,7 +15,7 @@ jobs: uses: NuGet/setup-nuget@v1.0.6 - name: Restore NuGet Packages - run: nuget restore MinecraftUSkinEditor.sln + run: nuget restore PCK_Studio.sln - name: Build Solution - run: msbuild MinecraftUSkinEditor.sln + run: msbuild PCK_Studio.sln diff --git a/MinecraftUSkinEditor/Forms/Skins-And-Textures/addMeta.Designer.cs b/MinecraftUSkinEditor/Forms/Skins-And-Textures/addMeta.Designer.cs deleted file mode 100644 index 6faa1616..00000000 --- a/MinecraftUSkinEditor/Forms/Skins-And-Textures/addMeta.Designer.cs +++ /dev/null @@ -1,100 +0,0 @@ -namespace PckStudio -{ - partial class addMeta - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(addMeta)); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.textBox2 = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.button1 = new System.Windows.Forms.Button(); - this.SuspendLayout(); - // - // textBox1 - // - this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - resources.ApplyResources(this.textBox1, "textBox1"); - this.textBox1.Name = "textBox1"; - // - // textBox2 - // - this.textBox2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - resources.ApplyResources(this.textBox2, "textBox2"); - this.textBox2.Name = "textBox2"; - // - // label1 - // - resources.ApplyResources(this.label1, "label1"); - this.label1.ForeColor = System.Drawing.Color.White; - this.label1.Name = "label1"; - // - // label2 - // - resources.ApplyResources(this.label2, "label2"); - this.label2.ForeColor = System.Drawing.Color.White; - this.label2.Name = "label2"; - // - // button1 - // - resources.ApplyResources(this.button1, "button1"); - this.button1.ForeColor = System.Drawing.Color.White; - this.button1.Name = "button1"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click); - // - // addMeta - // - resources.ApplyResources(this, "$this"); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.button1); - this.Controls.Add(this.label2); - this.Controls.Add(this.label1); - this.Controls.Add(this.textBox2); - this.Controls.Add(this.textBox1); - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "addMeta"; - this.Resizable = false; - this.ShadowType = MetroFramework.Forms.MetroFormShadowType.DropShadow; - this.Style = MetroFramework.MetroColorStyle.Silver; - this.Theme = MetroFramework.MetroThemeStyle.Dark; - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.TextBox textBox2; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Button button1; - } -} \ No newline at end of file diff --git a/PckStudio.Installer/Bitmaps/Banner.png b/PCK-Studio.Installer/Bitmaps/Banner.png similarity index 100% rename from PckStudio.Installer/Bitmaps/Banner.png rename to PCK-Studio.Installer/Bitmaps/Banner.png diff --git a/PckStudio.Installer/Bitmaps/Dialog.png b/PCK-Studio.Installer/Bitmaps/Dialog.png similarity index 100% rename from PckStudio.Installer/Bitmaps/Dialog.png rename to PCK-Studio.Installer/Bitmaps/Dialog.png diff --git a/PckStudio.Installer/HeatGeneratedFileList.wxs b/PCK-Studio.Installer/HeatGeneratedFileList.wxs similarity index 100% rename from PckStudio.Installer/HeatGeneratedFileList.wxs rename to PCK-Studio.Installer/HeatGeneratedFileList.wxs diff --git a/PckStudio.Installer/Icon.ico b/PCK-Studio.Installer/Icon.ico similarity index 100% rename from PckStudio.Installer/Icon.ico rename to PCK-Studio.Installer/Icon.ico diff --git a/PckStudio.Installer/License.rtf b/PCK-Studio.Installer/License.rtf similarity index 100% rename from PckStudio.Installer/License.rtf rename to PCK-Studio.Installer/License.rtf diff --git a/PckStudio.Installer/License.rtf.bak b/PCK-Studio.Installer/License.rtf.bak similarity index 100% rename from PckStudio.Installer/License.rtf.bak rename to PCK-Studio.Installer/License.rtf.bak diff --git a/PckStudio.Installer/PckStudio.Installer.wixproj b/PCK-Studio.Installer/PckStudio.Installer.wixproj similarity index 100% rename from PckStudio.Installer/PckStudio.Installer.wixproj rename to PCK-Studio.Installer/PckStudio.Installer.wixproj diff --git a/PckStudio.Installer/PckStudio.Installer.wixproj.bak b/PCK-Studio.Installer/PckStudio.Installer.wixproj.bak similarity index 100% rename from PckStudio.Installer/PckStudio.Installer.wixproj.bak rename to PCK-Studio.Installer/PckStudio.Installer.wixproj.bak diff --git a/PckStudio.Installer/Product.wxs b/PCK-Studio.Installer/Product.wxs similarity index 100% rename from PckStudio.Installer/Product.wxs rename to PCK-Studio.Installer/Product.wxs diff --git a/MinecraftUSkinEditor/App.config b/PCK-Studio/App.config similarity index 100% rename from MinecraftUSkinEditor/App.config rename to PCK-Studio/App.config diff --git a/MinecraftUSkinEditor/Classes/API/PCKCenter/SaveLocalJSON.cs b/PCK-Studio/Classes/API/PCKCenter/SaveLocalJSON.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/API/PCKCenter/SaveLocalJSON.cs rename to PCK-Studio/Classes/API/PCKCenter/SaveLocalJSON.cs diff --git a/MinecraftUSkinEditor/Classes/API/PCKCenter/model/PCKCenterJSON.cs b/PCK-Studio/Classes/API/PCKCenter/model/PCKCenterJSON.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/API/PCKCenter/model/PCKCenterJSON.cs rename to PCK-Studio/Classes/API/PCKCenter/model/PCKCenterJSON.cs diff --git a/MinecraftUSkinEditor/Classes/FileTypes/Bink.cs b/PCK-Studio/Classes/FileTypes/Bink.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/FileTypes/Bink.cs rename to PCK-Studio/Classes/FileTypes/Bink.cs diff --git a/MinecraftUSkinEditor/Classes/FileTypes/COLFile.cs b/PCK-Studio/Classes/FileTypes/COLFile.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/FileTypes/COLFile.cs rename to PCK-Studio/Classes/FileTypes/COLFile.cs diff --git a/MinecraftUSkinEditor/Classes/FileTypes/CSM.cs b/PCK-Studio/Classes/FileTypes/CSM.cs similarity index 82% rename from MinecraftUSkinEditor/Classes/FileTypes/CSM.cs rename to PCK-Studio/Classes/FileTypes/CSM.cs index 7bdaa3fc..5c8e27ff 100644 --- a/MinecraftUSkinEditor/Classes/FileTypes/CSM.cs +++ b/PCK-Studio/Classes/FileTypes/CSM.cs @@ -65,9 +65,9 @@ namespace PckStudio.Classes //RenderBox System.Drawing.Image source = Textures[0].Source; - Object3D object3D = new Box(source, new System.Drawing.Rectangle(8, 0, 0x10, 8), new System.Drawing.Rectangle(0, 8, 0x20, 8), new Point3D(0f, 0f, 0f), Effects.None); - Object3D object3D2 = new Box(source, new System.Drawing.Rectangle(0x28, 0, 0x10, 8), new System.Drawing.Rectangle(0x20, 8, 0x20, 8), new Point3D(0f, 0f, 0f), Effects.None); - Object3D object3D3 = new Box(source, new System.Drawing.Rectangle(0x2C, 0x10, 8, 4), new System.Drawing.Rectangle(0x28, 0x14, 0x20, 0xC), new Point3D(0f, 4f, 0f), Effects.FlipHorizontally); + Object3D object3D = new Box(source, new Rectangle(8, 0, 0x10, 8), new Rectangle(0, 8, 0x20, 8), new Point3D(0f, 0f, 0f), Effects.None); + Object3D object3D2 = new Box(source, new Rectangle(0x28, 0, 0x10, 8), new Rectangle(0x20, 8, 0x20, 8), new Point3D(0f, 0f, 0f), Effects.None); + Object3D object3D3 = new Box(source, new Rectangle(0x2C, 0x10, 8, 4), new Rectangle(0x28, 0x14, 0x20, 0xC), new Point3D(0f, 4f, 0f), Effects.FlipHorizontally); //RenderGroup diff --git a/MinecraftUSkinEditor/Classes/FileTypes/GRFFile.cs b/PCK-Studio/Classes/FileTypes/GRFFile.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/FileTypes/GRFFile.cs rename to PCK-Studio/Classes/FileTypes/GRFFile.cs diff --git a/MinecraftUSkinEditor/Classes/FileTypes/LOCFile.cs b/PCK-Studio/Classes/FileTypes/LOCFile.cs similarity index 97% rename from MinecraftUSkinEditor/Classes/FileTypes/LOCFile.cs rename to PCK-Studio/Classes/FileTypes/LOCFile.cs index ef7c2c8e..16b0e448 100644 --- a/MinecraftUSkinEditor/Classes/FileTypes/LOCFile.cs +++ b/PCK-Studio/Classes/FileTypes/LOCFile.cs @@ -11,11 +11,10 @@ namespace PckStudio.Classes.FileTypes { public class InvalidLanguageException : Exception { - private string _language; - public string Language => _language; + public string Language { get; } public InvalidLanguageException(string message, string language) : base(message) { - _language = language; + Language = language; } } @@ -104,6 +103,7 @@ namespace PckStudio.Classes.FileTypes foreach (var locKeyValue in locKeyValuePairs) AddLocKey(locKeyValue.Item1, locKeyValue.Item2); } + private Dictionary GetTranslation(string locKey) { if (!LocKeys.ContainsKey(locKey)) diff --git a/MinecraftUSkinEditor/Classes/FileTypes/PCKAudioFile.cs b/PCK-Studio/Classes/FileTypes/PCKAudioFile.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/FileTypes/PCKAudioFile.cs rename to PCK-Studio/Classes/FileTypes/PCKAudioFile.cs diff --git a/MinecraftUSkinEditor/Classes/FileTypes/PCKFile.cs b/PCK-Studio/Classes/FileTypes/PCKFile.cs similarity index 93% rename from MinecraftUSkinEditor/Classes/FileTypes/PCKFile.cs rename to PCK-Studio/Classes/FileTypes/PCKFile.cs index aaa742ab..589c7074 100644 --- a/MinecraftUSkinEditor/Classes/FileTypes/PCKFile.cs +++ b/PCK-Studio/Classes/FileTypes/PCKFile.cs @@ -68,7 +68,7 @@ namespace PckStudio.Classes.FileTypes public int type { get; set; } public byte[] data => _data; public int size => _size; - public PCKProperties properties { get; set; } = new PCKProperties(); + public PCKProperties properties { get; } = new PCKProperties(); private byte[] _data = new byte[0]; private int _size = 0; @@ -109,8 +109,8 @@ namespace PckStudio.Classes.FileTypes var LUT = new List(); Files.ForEach(file => file.properties.ForEach(pair => { - if (!LUT.Contains(pair.Item1)) - LUT.Add(pair.Item1); + if (!LUT.Contains(pair.property)) + LUT.Add(pair.property); }) ); return LUT; @@ -127,19 +127,6 @@ namespace PckStudio.Classes.FileTypes return GetFile(filepath, type) is FileData; } - /// - /// Tries to get a file with and . - /// - /// Path to the file in the pck - /// Type of the file - /// - /// - public bool TryGetFile(string filepath, int type, out FileData file) - { - file = GetFile(filepath, type); - return file is FileData; - } - /// /// Gets the first file that Equals and /// @@ -150,5 +137,18 @@ namespace PckStudio.Classes.FileTypes { return Files.FirstOrDefault(file => file.filepath.Equals(filepath) && file.type.Equals(type)); } + + /// + /// Tries to get a file with and . + /// + /// Path to the file in the pck + /// Type of the file + /// If succeeded will be non-null, otherwise null + /// True if succeeded, otherwise false + public bool TryGetFile(string filepath, int type, out FileData file) + { + file = GetFile(filepath, type); + return file is FileData; + } } } \ No newline at end of file diff --git a/MinecraftUSkinEditor/Classes/FileTypes/PCKProperties.cs b/PCK-Studio/Classes/FileTypes/PCKProperties.cs similarity index 54% rename from MinecraftUSkinEditor/Classes/FileTypes/PCKProperties.cs rename to PCK-Studio/Classes/FileTypes/PCKProperties.cs index 7f8aa1b8..dd85fef5 100644 --- a/MinecraftUSkinEditor/Classes/FileTypes/PCKProperties.cs +++ b/PCK-Studio/Classes/FileTypes/PCKProperties.cs @@ -6,16 +6,26 @@ using System.Threading.Tasks; namespace PckStudio.Classes.FileTypes { - public class PCKProperties : List> // class because `using` is file scoped :| + public class PCKProperties : List<(string property, string value)> { public bool HasProperty(string property) { return GetProperty(property) != default; } - public ValueTuple GetProperty(string property) + public (string, string) GetProperty(string property) { - return this.FirstOrDefault(p => p.Item1.Equals(property)); + return this.FirstOrDefault(p => p.property.Equals(property)); + } + + public (string, string)[] GetProperties(string property) + { + return FindAll(p => p.property == property).ToArray(); + } + + public bool HasMoreThanOneOf(string property) + { + return GetProperties(property).Length > 1; } public void SetProperty(string property, string value) diff --git a/MinecraftUSkinEditor/Classes/IO/COL/COLFileReader.cs b/PCK-Studio/Classes/IO/COL/COLFileReader.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/IO/COL/COLFileReader.cs rename to PCK-Studio/Classes/IO/COL/COLFileReader.cs diff --git a/MinecraftUSkinEditor/Classes/IO/COL/COLFileWriter.cs b/PCK-Studio/Classes/IO/COL/COLFileWriter.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/IO/COL/COLFileWriter.cs rename to PCK-Studio/Classes/IO/COL/COLFileWriter.cs diff --git a/MinecraftUSkinEditor/Classes/IO/GRF/GRFFileReader.cs b/PCK-Studio/Classes/IO/GRF/GRFFileReader.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/IO/GRF/GRFFileReader.cs rename to PCK-Studio/Classes/IO/GRF/GRFFileReader.cs diff --git a/MinecraftUSkinEditor/Classes/IO/GRF/GRFFileWriter.cs b/PCK-Studio/Classes/IO/GRF/GRFFileWriter.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/IO/GRF/GRFFileWriter.cs rename to PCK-Studio/Classes/IO/GRF/GRFFileWriter.cs diff --git a/MinecraftUSkinEditor/Classes/IO/LOC/LOCFileReader.cs b/PCK-Studio/Classes/IO/LOC/LOCFileReader.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/IO/LOC/LOCFileReader.cs rename to PCK-Studio/Classes/IO/LOC/LOCFileReader.cs diff --git a/MinecraftUSkinEditor/Classes/IO/LOC/LOCFileWriter.cs b/PCK-Studio/Classes/IO/LOC/LOCFileWriter.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/IO/LOC/LOCFileWriter.cs rename to PCK-Studio/Classes/IO/LOC/LOCFileWriter.cs diff --git a/MinecraftUSkinEditor/Classes/IO/PCK/PCKAudioFileReader.cs b/PCK-Studio/Classes/IO/PCK/PCKAudioFileReader.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/IO/PCK/PCKAudioFileReader.cs rename to PCK-Studio/Classes/IO/PCK/PCKAudioFileReader.cs diff --git a/MinecraftUSkinEditor/Classes/IO/PCK/PCKAudioFileWriter.cs b/PCK-Studio/Classes/IO/PCK/PCKAudioFileWriter.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/IO/PCK/PCKAudioFileWriter.cs rename to PCK-Studio/Classes/IO/PCK/PCKAudioFileWriter.cs diff --git a/MinecraftUSkinEditor/Classes/IO/PCK/PCKFileReader.cs b/PCK-Studio/Classes/IO/PCK/PCKFileReader.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/IO/PCK/PCKFileReader.cs rename to PCK-Studio/Classes/IO/PCK/PCKFileReader.cs diff --git a/MinecraftUSkinEditor/Classes/IO/PCK/PCKFileWriter.cs b/PCK-Studio/Classes/IO/PCK/PCKFileWriter.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/IO/PCK/PCKFileWriter.cs rename to PCK-Studio/Classes/IO/PCK/PCKFileWriter.cs diff --git a/MinecraftUSkinEditor/Classes/IO/PCKCollectionsLocal.cs b/PCK-Studio/Classes/IO/PCKCollectionsLocal.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/IO/PCKCollectionsLocal.cs rename to PCK-Studio/Classes/IO/PCKCollectionsLocal.cs diff --git a/MinecraftUSkinEditor/Classes/IO/Sounds/SoundIO.cs b/PCK-Studio/Classes/IO/Sounds/SoundIO.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/IO/Sounds/SoundIO.cs rename to PCK-Studio/Classes/IO/Sounds/SoundIO.cs diff --git a/MinecraftUSkinEditor/Classes/IO/Sounds/Sounds.cs b/PCK-Studio/Classes/IO/Sounds/Sounds.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/IO/Sounds/Sounds.cs rename to PCK-Studio/Classes/IO/Sounds/Sounds.cs diff --git a/MinecraftUSkinEditor/Classes/IO/StreamDataReader.cs b/PCK-Studio/Classes/IO/StreamDataReader.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/IO/StreamDataReader.cs rename to PCK-Studio/Classes/IO/StreamDataReader.cs diff --git a/MinecraftUSkinEditor/Classes/IO/StreamDataWriter.cs b/PCK-Studio/Classes/IO/StreamDataWriter.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/IO/StreamDataWriter.cs rename to PCK-Studio/Classes/IO/StreamDataWriter.cs diff --git a/MinecraftUSkinEditor/Classes/Misc/RenderBase.cs b/PCK-Studio/Classes/Misc/RenderBase.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Misc/RenderBase.cs rename to PCK-Studio/Classes/Misc/RenderBase.cs diff --git a/MinecraftUSkinEditor/Classes/Misc/RichPresenceClient.cs b/PCK-Studio/Classes/Misc/RichPresenceClient.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Misc/RichPresenceClient.cs rename to PCK-Studio/Classes/Misc/RichPresenceClient.cs diff --git a/MinecraftUSkinEditor/Classes/Models/BackgroundTypes.cs b/PCK-Studio/Classes/Models/BackgroundTypes.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Models/BackgroundTypes.cs rename to PCK-Studio/Classes/Models/BackgroundTypes.cs diff --git a/MinecraftUSkinEditor/Classes/Models/Backgrounds.cs b/PCK-Studio/Classes/Models/Backgrounds.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Models/Backgrounds.cs rename to PCK-Studio/Classes/Models/Backgrounds.cs diff --git a/MinecraftUSkinEditor/Classes/Models/Box.cs b/PCK-Studio/Classes/Models/Box.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Models/Box.cs rename to PCK-Studio/Classes/Models/Box.cs diff --git a/MinecraftUSkinEditor/Classes/Models/DefaultModels/CharacterModel.cs b/PCK-Studio/Classes/Models/DefaultModels/CharacterModel.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Models/DefaultModels/CharacterModel.cs rename to PCK-Studio/Classes/Models/DefaultModels/CharacterModel.cs diff --git a/MinecraftUSkinEditor/Classes/Models/DefaultModels/ModelBase.cs b/PCK-Studio/Classes/Models/DefaultModels/ModelBase.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Models/DefaultModels/ModelBase.cs rename to PCK-Studio/Classes/Models/DefaultModels/ModelBase.cs diff --git a/MinecraftUSkinEditor/Classes/Models/DefaultModels/Texture.cs b/PCK-Studio/Classes/Models/DefaultModels/Texture.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Models/DefaultModels/Texture.cs rename to PCK-Studio/Classes/Models/DefaultModels/Texture.cs diff --git a/MinecraftUSkinEditor/Classes/Models/DefaultModels/TextureSelector.cs b/PCK-Studio/Classes/Models/DefaultModels/TextureSelector.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Models/DefaultModels/TextureSelector.cs rename to PCK-Studio/Classes/Models/DefaultModels/TextureSelector.cs diff --git a/MinecraftUSkinEditor/Classes/Models/Effects.cs b/PCK-Studio/Classes/Models/Effects.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Models/Effects.cs rename to PCK-Studio/Classes/Models/Effects.cs diff --git a/MinecraftUSkinEditor/Classes/Models/Matrix3D.cs b/PCK-Studio/Classes/Models/Matrix3D.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Models/Matrix3D.cs rename to PCK-Studio/Classes/Models/Matrix3D.cs diff --git a/MinecraftUSkinEditor/Classes/Models/ModelView.Designer.cs b/PCK-Studio/Classes/Models/ModelView.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Models/ModelView.Designer.cs rename to PCK-Studio/Classes/Models/ModelView.Designer.cs diff --git a/MinecraftUSkinEditor/Classes/Models/ModelView.cs b/PCK-Studio/Classes/Models/ModelView.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Models/ModelView.cs rename to PCK-Studio/Classes/Models/ModelView.cs diff --git a/MinecraftUSkinEditor/Classes/Models/Object3D.cs b/PCK-Studio/Classes/Models/Object3D.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Models/Object3D.cs rename to PCK-Studio/Classes/Models/Object3D.cs diff --git a/MinecraftUSkinEditor/Classes/Models/Object3DGroup.cs b/PCK-Studio/Classes/Models/Object3DGroup.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Models/Object3DGroup.cs rename to PCK-Studio/Classes/Models/Object3DGroup.cs diff --git a/MinecraftUSkinEditor/Classes/Models/Point3D.cs b/PCK-Studio/Classes/Models/Point3D.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Models/Point3D.cs rename to PCK-Studio/Classes/Models/Point3D.cs diff --git a/MinecraftUSkinEditor/Classes/Models/Positions.cs b/PCK-Studio/Classes/Models/Positions.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Models/Positions.cs rename to PCK-Studio/Classes/Models/Positions.cs diff --git a/MinecraftUSkinEditor/Classes/Models/ProjectionTypes.cs b/PCK-Studio/Classes/Models/ProjectionTypes.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Models/ProjectionTypes.cs rename to PCK-Studio/Classes/Models/ProjectionTypes.cs diff --git a/MinecraftUSkinEditor/Classes/Models/RotationOrders.cs b/PCK-Studio/Classes/Models/RotationOrders.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Models/RotationOrders.cs rename to PCK-Studio/Classes/Models/RotationOrders.cs diff --git a/MinecraftUSkinEditor/Classes/Models/Texel.cs b/PCK-Studio/Classes/Models/Texel.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Models/Texel.cs rename to PCK-Studio/Classes/Models/Texel.cs diff --git a/MinecraftUSkinEditor/Classes/Models/TexelComparer.cs b/PCK-Studio/Classes/Models/TexelComparer.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Models/TexelComparer.cs rename to PCK-Studio/Classes/Models/TexelComparer.cs diff --git a/MinecraftUSkinEditor/Classes/Models/TexturePlane.cs b/PCK-Studio/Classes/Models/TexturePlane.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Models/TexturePlane.cs rename to PCK-Studio/Classes/Models/TexturePlane.cs diff --git a/MinecraftUSkinEditor/Classes/Networking/Network.cs b/PCK-Studio/Classes/Networking/Network.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Networking/Network.cs rename to PCK-Studio/Classes/Networking/Network.cs diff --git a/MinecraftUSkinEditor/Classes/Networking/PCKCollections.cs b/PCK-Studio/Classes/Networking/PCKCollections.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Networking/PCKCollections.cs rename to PCK-Studio/Classes/Networking/PCKCollections.cs diff --git a/MinecraftUSkinEditor/Classes/Networking/Update.cs b/PCK-Studio/Classes/Networking/Update.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Networking/Update.cs rename to PCK-Studio/Classes/Networking/Update.cs diff --git a/MinecraftUSkinEditor/Classes/Texturing/TextureCodec.cs b/PCK-Studio/Classes/Texturing/TextureCodec.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Texturing/TextureCodec.cs rename to PCK-Studio/Classes/Texturing/TextureCodec.cs diff --git a/MinecraftUSkinEditor/Classes/Texturing/TextureUtils.cs b/PCK-Studio/Classes/Texturing/TextureUtils.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Texturing/TextureUtils.cs rename to PCK-Studio/Classes/Texturing/TextureUtils.cs diff --git a/MinecraftUSkinEditor/Classes/ToolboxItems/InterpolationPictureBox.cs b/PCK-Studio/Classes/ToolboxItems/InterpolationPictureBox.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/ToolboxItems/InterpolationPictureBox.cs rename to PCK-Studio/Classes/ToolboxItems/InterpolationPictureBox.cs diff --git a/MinecraftUSkinEditor/Classes/Utils/BedrockJSONtoCSM.cs b/PCK-Studio/Classes/Utils/BedrockJSONtoCSM.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Utils/BedrockJSONtoCSM.cs rename to PCK-Studio/Classes/Utils/BedrockJSONtoCSM.cs diff --git a/MinecraftUSkinEditor/Classes/Utils/CSMtoBedrockJSON.cs b/PCK-Studio/Classes/Utils/CSMtoBedrockJSON.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Utils/CSMtoBedrockJSON.cs rename to PCK-Studio/Classes/Utils/CSMtoBedrockJSON.cs diff --git a/MinecraftUSkinEditor/Classes/Utils/ListUtils.cs b/PCK-Studio/Classes/Utils/ListUtils.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Utils/ListUtils.cs rename to PCK-Studio/Classes/Utils/ListUtils.cs diff --git a/MinecraftUSkinEditor/Classes/Utils/RLE.cs b/PCK-Studio/Classes/Utils/RLE.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Utils/RLE.cs rename to PCK-Studio/Classes/Utils/RLE.cs diff --git a/MinecraftUSkinEditor/Classes/Utils/SkinANIM.cs b/PCK-Studio/Classes/Utils/SkinANIM.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Utils/SkinANIM.cs rename to PCK-Studio/Classes/Utils/SkinANIM.cs diff --git a/MinecraftUSkinEditor/Classes/Utils/grf/CRC32.cs b/PCK-Studio/Classes/Utils/grf/CRC32.cs similarity index 100% rename from MinecraftUSkinEditor/Classes/Utils/grf/CRC32.cs rename to PCK-Studio/Classes/Utils/grf/CRC32.cs diff --git a/PCK-Studio/Classes/Utils/grf/lzxDecoder.cs b/PCK-Studio/Classes/Utils/grf/lzxDecoder.cs new file mode 100644 index 00000000..272f99ce --- /dev/null +++ b/PCK-Studio/Classes/Utils/grf/lzxDecoder.cs @@ -0,0 +1,785 @@ +#region HEADER +/* This file was derived from libmspack + * (C) 2003-2004 Stuart Caie. + * (C) 2011 Ali Scissons. + * + * The LZX method was created by Jonathan Forbes and Tomi Poutanen, adapted + * by Microsoft Corporation. + * + * This source file is Dual licensed; meaning the end-user of this source file + * may redistribute/modify it under the LGPL 2.1 or MS-PL licenses. + */ +#region LGPL License +/* GNU LESSER GENERAL PUBLIC LICENSE version 2.1 + * LzxDecoder is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License (LGPL) version 2.1 + */ +#endregion +#region MS-PL License +/* + * MICROSOFT PUBLIC LICENSE + * This source code is subject to the terms of the Microsoft Public License (Ms-PL). + * + * Redistribution and use in source and binary forms, with or without modification, + * is permitted provided that redistributions of the source code retain the above + * copyright notices and this file header. + * + * Additional copyright notices should be appended to the list above. + * + * For details, see . + */ +#endregion +/* + * This derived work is recognized by Stuart Caie and is authorized to adapt + * any changes made to lzxd.c in his libmspack library and will still retain + * this dual licensing scheme. Big thanks to Stuart Caie! + * + * DETAILS + * This file is a pure C# port of the lzxd.c file from libmspack, with minor + * changes towards the decompression of XNB files. The original decompression + * software of LZX encoded data was written by Suart Caie in his + * libmspack/cabextract projects, which can be located at + * http://http://www.cabextract.org.uk/ + */ +#endregion + +using System; +using System.Diagnostics; + +namespace Microsoft.Xna.Framework.Content +{ + using System.IO; + + class LzxDecoder + { + public static uint[] position_base = null; + public static byte[] extra_bits = null; + + private LzxState m_state; + + public LzxDecoder(int window) + { + uint wndsize = (uint)(1 << window); + int posn_slots; + + // setup proper exception + if (window < 15 || window > 21) throw new UnsupportedWindowSizeRange(); + + // let's initialise our state + m_state = new LzxState(); + m_state.actual_size = 0; + m_state.window = new byte[wndsize]; + for (int i = 0; i < wndsize; i++) m_state.window[i] = 0xDC; + m_state.actual_size = wndsize; + m_state.window_size = wndsize; + m_state.window_posn = 0; + + /* initialize static tables */ + if (extra_bits == null) + { + extra_bits = new byte[52]; + for (int i = 0, j = 0; i <= 50; i += 2) + { + extra_bits[i] = extra_bits[i + 1] = (byte)j; + if ((i != 0) && (j < 17)) j++; + } + } + if (position_base == null) + { + position_base = new uint[51]; + for (int i = 0, j = 0; i <= 50; i++) + { + position_base[i] = (uint)j; + j += 1 << extra_bits[i]; + } + } + + /* calculate required position slots */ + if (window == 20) posn_slots = 42; + else if (window == 21) posn_slots = 50; + else posn_slots = window << 1; + + m_state.R0 = m_state.R1 = m_state.R2 = 1; + m_state.main_elements = (ushort)(LzxConstants.NUM_CHARS + (posn_slots << 3)); + m_state.header_read = 0; + m_state.frames_read = 0; + m_state.block_remaining = 0; + m_state.block_type = LzxConstants.BLOCKTYPE.INVALID; + m_state.intel_curpos = 0; + m_state.intel_started = 0; + + // yo dawg i herd u liek arrays so we put arrays in ur arrays so u can array while u array + m_state.PRETREE_table = new ushort[(1 << LzxConstants.PRETREE_TABLEBITS) + (LzxConstants.PRETREE_MAXSYMBOLS << 1)]; + m_state.PRETREE_len = new byte[LzxConstants.PRETREE_MAXSYMBOLS + LzxConstants.LENTABLE_SAFETY]; + m_state.MAINTREE_table = new ushort[(1 << LzxConstants.MAINTREE_TABLEBITS) + (LzxConstants.MAINTREE_MAXSYMBOLS << 1)]; + m_state.MAINTREE_len = new byte[LzxConstants.MAINTREE_MAXSYMBOLS + LzxConstants.LENTABLE_SAFETY]; + m_state.LENGTH_table = new ushort[(1 << LzxConstants.LENGTH_TABLEBITS) + (LzxConstants.LENGTH_MAXSYMBOLS << 1)]; + m_state.LENGTH_len = new byte[LzxConstants.LENGTH_MAXSYMBOLS + LzxConstants.LENTABLE_SAFETY]; + m_state.ALIGNED_table = new ushort[(1 << LzxConstants.ALIGNED_TABLEBITS) + (LzxConstants.ALIGNED_MAXSYMBOLS << 1)]; + m_state.ALIGNED_len = new byte[LzxConstants.ALIGNED_MAXSYMBOLS + LzxConstants.LENTABLE_SAFETY]; + /* initialise tables to 0 (because deltas will be applied to them) */ + for (int i = 0; i < LzxConstants.MAINTREE_MAXSYMBOLS; i++) m_state.MAINTREE_len[i] = 0; + for (int i = 0; i < LzxConstants.LENGTH_MAXSYMBOLS; i++) m_state.LENGTH_len[i] = 0; + } + + public int Decompress(Stream inData, int inLen, Stream outData, int outLen) + { + BitBuffer bitbuf = new BitBuffer(inData); + long startpos = inData.Position; + long endpos = inData.Position + inLen; + + byte[] window = m_state.window; + + uint window_posn = m_state.window_posn; + uint window_size = m_state.window_size; + uint R0 = m_state.R0; + uint R1 = m_state.R1; + uint R2 = m_state.R2; + uint i, j; + + int togo = outLen, this_run, main_element, match_length, match_offset, length_footer, extra, verbatim_bits; + int rundest, runsrc, copy_length, aligned_bits; + + bitbuf.InitBitStream(); + + /* read header if necessary */ + if (m_state.header_read == 0) + { + uint intel = bitbuf.ReadBits(1); + if (intel != 0) + { + // read the filesize + i = bitbuf.ReadBits(16); j = bitbuf.ReadBits(16); + m_state.intel_filesize = (int)((i << 16) | j); + } + m_state.header_read = 1; + } + + /* main decoding loop */ + while (togo > 0) + { + /* last block finished, new block expected */ + if (m_state.block_remaining == 0) + { + // TODO may screw something up here + if (m_state.block_type == LzxConstants.BLOCKTYPE.UNCOMPRESSED) + { + if ((m_state.block_length & 1) == 1) inData.ReadByte(); /* realign bitstream to word */ + bitbuf.InitBitStream(); + } + + m_state.block_type = (LzxConstants.BLOCKTYPE)bitbuf.ReadBits(3); ; + i = bitbuf.ReadBits(16); + j = bitbuf.ReadBits(8); + m_state.block_remaining = m_state.block_length = (uint)((i << 8) | j); + + switch (m_state.block_type) + { + case LzxConstants.BLOCKTYPE.ALIGNED: + for (i = 0, j = 0; i < 8; i++) { j = bitbuf.ReadBits(3); m_state.ALIGNED_len[i] = (byte)j; } + MakeDecodeTable(LzxConstants.ALIGNED_MAXSYMBOLS, LzxConstants.ALIGNED_TABLEBITS, + m_state.ALIGNED_len, m_state.ALIGNED_table); + /* rest of aligned header is same as verbatim */ + goto case LzxConstants.BLOCKTYPE.VERBATIM; + + case LzxConstants.BLOCKTYPE.VERBATIM: + ReadLengths(m_state.MAINTREE_len, 0, 256, bitbuf); + ReadLengths(m_state.MAINTREE_len, 256, m_state.main_elements, bitbuf); + MakeDecodeTable(LzxConstants.MAINTREE_MAXSYMBOLS, LzxConstants.MAINTREE_TABLEBITS, + m_state.MAINTREE_len, m_state.MAINTREE_table); + if (m_state.MAINTREE_len[0xE8] != 0) m_state.intel_started = 1; + + ReadLengths(m_state.LENGTH_len, 0, LzxConstants.NUM_SECONDARY_LENGTHS, bitbuf); + MakeDecodeTable(LzxConstants.LENGTH_MAXSYMBOLS, LzxConstants.LENGTH_TABLEBITS, + m_state.LENGTH_len, m_state.LENGTH_table); + break; + + case LzxConstants.BLOCKTYPE.UNCOMPRESSED: + m_state.intel_started = 1; /* because we can't assume otherwise */ + bitbuf.EnsureBits(16); /* get up to 16 pad bits into the buffer */ + if (bitbuf.GetBitsLeft() > 16) inData.Seek(-2, SeekOrigin.Current); /* and align the bitstream! */ + byte hi, mh, ml, lo; + lo = (byte)inData.ReadByte(); ml = (byte)inData.ReadByte(); mh = (byte)inData.ReadByte(); hi = (byte)inData.ReadByte(); + R0 = (uint)(lo | ml << 8 | mh << 16 | hi << 24); + lo = (byte)inData.ReadByte(); ml = (byte)inData.ReadByte(); mh = (byte)inData.ReadByte(); hi = (byte)inData.ReadByte(); + R1 = (uint)(lo | ml << 8 | mh << 16 | hi << 24); + lo = (byte)inData.ReadByte(); ml = (byte)inData.ReadByte(); mh = (byte)inData.ReadByte(); hi = (byte)inData.ReadByte(); + R2 = (uint)(lo | ml << 8 | mh << 16 | hi << 24); + break; + + default: + return -1; // TODO throw proper exception + } + } + + /* buffer exhaustion check */ + if (inData.Position > (startpos + inLen)) + { + /* it's possible to have a file where the next run is less than + * 16 bits in size. In this case, the READ_HUFFSYM() macro used + * in building the tables will exhaust the buffer, so we should + * allow for this, but not allow those accidentally read bits to + * be used (so we check that there are at least 16 bits + * remaining - in this boundary case they aren't really part of + * the compressed data) + */ + //Debug.WriteLine("WTF"); + + if (inData.Position > (startpos + inLen + 2) || bitbuf.GetBitsLeft() < 16) return -1; //TODO throw proper exception + } + + while ((this_run = (int)m_state.block_remaining) > 0 && togo > 0) + { + if (this_run > togo) this_run = togo; + togo -= this_run; + m_state.block_remaining -= (uint)this_run; + + /* apply 2^x-1 mask */ + window_posn &= window_size - 1; + /* runs can't straddle the window wraparound */ + if ((window_posn + this_run) > window_size) + return -1; //TODO throw proper exception + + switch (m_state.block_type) + { + case LzxConstants.BLOCKTYPE.VERBATIM: + while (this_run > 0) + { + main_element = (int)ReadHuffSym(m_state.MAINTREE_table, m_state.MAINTREE_len, + LzxConstants.MAINTREE_MAXSYMBOLS, LzxConstants.MAINTREE_TABLEBITS, + bitbuf); + if (main_element < LzxConstants.NUM_CHARS) + { + /* literal: 0 to NUM_CHARS-1 */ + window[window_posn++] = (byte)main_element; + this_run--; + } + else + { + /* match: NUM_CHARS + ((slot<<3) | length_header (3 bits)) */ + main_element -= LzxConstants.NUM_CHARS; + + match_length = main_element & LzxConstants.NUM_PRIMARY_LENGTHS; + if (match_length == LzxConstants.NUM_PRIMARY_LENGTHS) + { + length_footer = (int)ReadHuffSym(m_state.LENGTH_table, m_state.LENGTH_len, + LzxConstants.LENGTH_MAXSYMBOLS, LzxConstants.LENGTH_TABLEBITS, + bitbuf); + match_length += length_footer; + } + match_length += LzxConstants.MIN_MATCH; + + match_offset = main_element >> 3; + + if (match_offset > 2) + { + /* not repeated offset */ + if (match_offset != 3) + { + extra = extra_bits[match_offset]; + verbatim_bits = (int)bitbuf.ReadBits((byte)extra); + match_offset = (int)position_base[match_offset] - 2 + verbatim_bits; + } + else + { + match_offset = 1; + } + + /* update repeated offset LRU queue */ + R2 = R1; R1 = R0; R0 = (uint)match_offset; + } + else if (match_offset == 0) + { + match_offset = (int)R0; + } + else if (match_offset == 1) + { + match_offset = (int)R1; + R1 = R0; R0 = (uint)match_offset; + } + else /* match_offset == 2 */ + { + match_offset = (int)R2; + R2 = R0; R0 = (uint)match_offset; + } + + rundest = (int)window_posn; + this_run -= match_length; + + /* copy any wrapped around source data */ + if (window_posn >= match_offset) + { + /* no wrap */ + runsrc = rundest - match_offset; + } + else + { + runsrc = rundest + ((int)window_size - match_offset); + copy_length = match_offset - (int)window_posn; + if (copy_length < match_length) + { + match_length -= copy_length; + window_posn += (uint)copy_length; + while (copy_length-- > 0) window[rundest++] = window[runsrc++]; + runsrc = 0; + } + } + window_posn += (uint)match_length; + + /* copy match data - no worries about destination wraps */ + while (match_length-- > 0) window[rundest++] = window[runsrc++]; + } + } + break; + + case LzxConstants.BLOCKTYPE.ALIGNED: + while (this_run > 0) + { + main_element = (int)ReadHuffSym(m_state.MAINTREE_table, m_state.MAINTREE_len, + LzxConstants.MAINTREE_MAXSYMBOLS, LzxConstants.MAINTREE_TABLEBITS, + bitbuf); + + if (main_element < LzxConstants.NUM_CHARS) + { + /* literal 0 to NUM_CHARS-1 */ + window[window_posn++] = (byte)main_element; + this_run--; + } + else + { + /* match: NUM_CHARS + ((slot<<3) | length_header (3 bits)) */ + main_element -= LzxConstants.NUM_CHARS; + + match_length = main_element & LzxConstants.NUM_PRIMARY_LENGTHS; + if (match_length == LzxConstants.NUM_PRIMARY_LENGTHS) + { + length_footer = (int)ReadHuffSym(m_state.LENGTH_table, m_state.LENGTH_len, + LzxConstants.LENGTH_MAXSYMBOLS, LzxConstants.LENGTH_TABLEBITS, + bitbuf); + match_length += length_footer; + } + match_length += LzxConstants.MIN_MATCH; + + match_offset = main_element >> 3; + + if (match_offset > 2) + { + /* not repeated offset */ + extra = extra_bits[match_offset]; + match_offset = (int)position_base[match_offset] - 2; + if (extra > 3) + { + /* verbatim and aligned bits */ + extra -= 3; + verbatim_bits = (int)bitbuf.ReadBits((byte)extra); + match_offset += (verbatim_bits << 3); + aligned_bits = (int)ReadHuffSym(m_state.ALIGNED_table, m_state.ALIGNED_len, + LzxConstants.ALIGNED_MAXSYMBOLS, LzxConstants.ALIGNED_TABLEBITS, + bitbuf); + match_offset += aligned_bits; + } + else if (extra == 3) + { + /* aligned bits only */ + aligned_bits = (int)ReadHuffSym(m_state.ALIGNED_table, m_state.ALIGNED_len, + LzxConstants.ALIGNED_MAXSYMBOLS, LzxConstants.ALIGNED_TABLEBITS, + bitbuf); + match_offset += aligned_bits; + } + else if (extra > 0) /* extra==1, extra==2 */ + { + /* verbatim bits only */ + verbatim_bits = (int)bitbuf.ReadBits((byte)extra); + match_offset += verbatim_bits; + } + else /* extra == 0 */ + { + /* ??? */ + match_offset = 1; + } + + /* update repeated offset LRU queue */ + R2 = R1; R1 = R0; R0 = (uint)match_offset; + } + else if (match_offset == 0) + { + match_offset = (int)R0; + } + else if (match_offset == 1) + { + match_offset = (int)R1; + R1 = R0; R0 = (uint)match_offset; + } + else /* match_offset == 2 */ + { + match_offset = (int)R2; + R2 = R0; R0 = (uint)match_offset; + } + + rundest = (int)window_posn; + this_run -= match_length; + + /* copy any wrapped around source data */ + if (window_posn >= match_offset) + { + /* no wrap */ + runsrc = rundest - match_offset; + } + else + { + runsrc = rundest + ((int)window_size - match_offset); + copy_length = match_offset - (int)window_posn; + if (copy_length < match_length) + { + match_length -= copy_length; + window_posn += (uint)copy_length; + while (copy_length-- > 0) window[rundest++] = window[runsrc++]; + runsrc = 0; + } + } + window_posn += (uint)match_length; + + /* copy match data - no worries about destination wraps */ + while (match_length-- > 0) window[rundest++] = window[runsrc++]; + } + } + break; + + case LzxConstants.BLOCKTYPE.UNCOMPRESSED: + if ((inData.Position + this_run) > endpos) return -1; //TODO throw proper exception + byte[] temp_buffer = new byte[this_run]; + inData.Read(temp_buffer, 0, this_run); + temp_buffer.CopyTo(window, (int)window_posn); + window_posn += (uint)this_run; + break; + + default: + return -1; //TODO throw proper exception + } + } + } + + if (togo != 0) return -1; //TODO throw proper exception + int start_window_pos = (int)window_posn; + if (start_window_pos == 0) start_window_pos = (int)window_size; + start_window_pos -= outLen; + outData.Write(window, start_window_pos, outLen); + + m_state.window_posn = window_posn; + m_state.R0 = R0; + m_state.R1 = R1; + m_state.R2 = R2; + + // TODO finish intel E8 decoding + /* intel E8 decoding */ + if ((m_state.frames_read++ < 32768) && m_state.intel_filesize != 0) + { + if (outLen <= 6 || m_state.intel_started == 0) + { + m_state.intel_curpos += outLen; + } + else + { + int dataend = outLen - 10; + uint curpos = (uint)m_state.intel_curpos; + + m_state.intel_curpos = (int)curpos + outLen; + + while (outData.Position < dataend) + { + if (outData.ReadByte() != 0xE8) { curpos++; continue; } + } + } + return -1; + } + return 0; + } + + // READ_LENGTHS(table, first, last) + // if(lzx_read_lens(LENTABLE(table), first, last, bitsleft)) + // return ERROR (ILLEGAL_DATA) + // + + // TODO make returns throw exceptions + private int MakeDecodeTable(uint nsyms, uint nbits, byte[] length, ushort[] table) + { + ushort sym; + uint leaf; + byte bit_num = 1; + uint fill; + uint pos = 0; /* the current position in the decode table */ + uint table_mask = (uint)(1 << (int)nbits); + uint bit_mask = table_mask >> 1; /* don't do 0 length codes */ + uint next_symbol = bit_mask; /* base of allocation for long codes */ + + /* fill entries for codes short enough for a direct mapping */ + while (bit_num <= nbits) + { + for (sym = 0; sym < nsyms; sym++) + { + if (length[sym] == bit_num) + { + leaf = pos; + + if ((pos += bit_mask) > table_mask) return 1; /* table overrun */ + + /* fill all possible lookups of this symbol with the symbol itself */ + fill = bit_mask; + while (fill-- > 0) table[leaf++] = sym; + } + } + bit_mask >>= 1; + bit_num++; + } + + /* if there are any codes longer than nbits */ + if (pos != table_mask) + { + /* clear the remainder of the table */ + for (sym = (ushort)pos; sym < table_mask; sym++) table[sym] = 0; + + /* give ourselves room for codes to grow by up to 16 more bits */ + pos <<= 16; + table_mask <<= 16; + bit_mask = 1 << 15; + + while (bit_num <= 16) + { + for (sym = 0; sym < nsyms; sym++) + { + if (length[sym] == bit_num) + { + leaf = pos >> 16; + for (fill = 0; fill < bit_num - nbits; fill++) + { + /* if this path hasn't been taken yet, 'allocate' two entries */ + if (table[leaf] == 0) + { + table[(next_symbol << 1)] = 0; + table[(next_symbol << 1) + 1] = 0; + table[leaf] = (ushort)(next_symbol++); + } + /* follow the path and select either left or right for next bit */ + leaf = (uint)(table[leaf] << 1); + if (((pos >> (int)(15 - fill)) & 1) == 1) leaf++; + } + table[leaf] = sym; + + if ((pos += bit_mask) > table_mask) return 1; + } + } + bit_mask >>= 1; + bit_num++; + } + } + + /* full talbe? */ + if (pos == table_mask) return 0; + + /* either erroneous table, or all elements are 0 - let's find out. */ + for (sym = 0; sym < nsyms; sym++) if (length[sym] != 0) return 1; + return 0; + } + + // TODO throw exceptions instead of returns + private void ReadLengths(byte[] lens, uint first, uint last, BitBuffer bitbuf) + { + uint x, y; + int z; + + // hufftbl pointer here? + + for (x = 0; x < 20; x++) + { + y = bitbuf.ReadBits(4); + m_state.PRETREE_len[x] = (byte)y; + } + MakeDecodeTable(LzxConstants.PRETREE_MAXSYMBOLS, LzxConstants.PRETREE_TABLEBITS, + m_state.PRETREE_len, m_state.PRETREE_table); + + for (x = first; x < last;) + { + z = (int)ReadHuffSym(m_state.PRETREE_table, m_state.PRETREE_len, + LzxConstants.PRETREE_MAXSYMBOLS, LzxConstants.PRETREE_TABLEBITS, bitbuf); + if (z == 17) + { + y = bitbuf.ReadBits(4); y += 4; + while (y-- != 0) lens[x++] = 0; + } + else if (z == 18) + { + y = bitbuf.ReadBits(5); y += 20; + while (y-- != 0) lens[x++] = 0; + } + else if (z == 19) + { + y = bitbuf.ReadBits(1); y += 4; + z = (int)ReadHuffSym(m_state.PRETREE_table, m_state.PRETREE_len, + LzxConstants.PRETREE_MAXSYMBOLS, LzxConstants.PRETREE_TABLEBITS, bitbuf); + z = lens[x] - z; if (z < 0) z += 17; + while (y-- != 0) lens[x++] = (byte)z; + } + else + { + z = lens[x] - z; if (z < 0) z += 17; + lens[x++] = (byte)z; + } + } + } + + private uint ReadHuffSym(ushort[] table, byte[] lengths, uint nsyms, uint nbits, BitBuffer bitbuf) + { + uint i, j; + bitbuf.EnsureBits(16); + if ((i = table[bitbuf.PeekBits((byte)nbits)]) >= nsyms) + { + j = (uint)(1 << (int)((sizeof(uint) * 8) - nbits)); + do + { + j >>= 1; i <<= 1; i |= (bitbuf.GetBuffer() & j) != 0 ? (uint)1 : 0; + if (j == 0) return 0; // TODO throw proper exception + } while ((i = table[i]) >= nsyms); + } + j = lengths[i]; + bitbuf.RemoveBits((byte)j); + + return i; + } + + #region Our BitBuffer Class + private class BitBuffer + { + uint buffer; + byte bitsleft; + Stream byteStream; + + public BitBuffer(Stream stream) + { + byteStream = stream; + InitBitStream(); + } + + public void InitBitStream() + { + buffer = 0; + bitsleft = 0; + } + + public void EnsureBits(byte bits) + { + while (bitsleft < bits) + { + int lo = (byte)byteStream.ReadByte(); + int hi = (byte)byteStream.ReadByte(); + //int amount2shift = sizeof(uint)*8 - 16 - bitsleft; + buffer |= (uint)(((hi << 8) | lo) << (sizeof(uint) * 8 - 16 - bitsleft)); + bitsleft += 16; + } + } + + public uint PeekBits(byte bits) + { + return (buffer >> ((sizeof(uint) * 8) - bits)); + } + + public void RemoveBits(byte bits) + { + buffer <<= bits; + bitsleft -= bits; + } + + public uint ReadBits(byte bits) + { + uint ret = 0; + + if (bits > 0) + { + EnsureBits(bits); + ret = PeekBits(bits); + RemoveBits(bits); + } + + return ret; + } + + public uint GetBuffer() + { + return buffer; + } + + public byte GetBitsLeft() + { + return bitsleft; + } + } + #endregion + + struct LzxState + { + public uint R0, R1, R2; /* for the LRU offset system */ + public ushort main_elements; /* number of main tree elements */ + public int header_read; /* have we started decoding at all yet? */ + public LzxConstants.BLOCKTYPE block_type; /* type of this block */ + public uint block_length; /* uncompressed length of this block */ + public uint block_remaining; /* uncompressed bytes still left to decode */ + public uint frames_read; /* the number of CFDATA blocks processed */ + public int intel_filesize; /* magic header value used for transform */ + public int intel_curpos; /* current offset in transform space */ + public int intel_started; /* have we seen any translateable data yet? */ + + public ushort[] PRETREE_table; + public byte[] PRETREE_len; + public ushort[] MAINTREE_table; + public byte[] MAINTREE_len; + public ushort[] LENGTH_table; + public byte[] LENGTH_len; + public ushort[] ALIGNED_table; + public byte[] ALIGNED_len; + + // NEEDED MEMBERS + // CAB actualsize + // CAB window + // CAB window_size + // CAB window_posn + public uint actual_size; + public byte[] window; + public uint window_size; + public uint window_posn; + } + } + + /* CONSTANTS */ + struct LzxConstants + { + public const ushort MIN_MATCH = 2; + public const ushort MAX_MATCH = 257; + public const ushort NUM_CHARS = 256; + public enum BLOCKTYPE + { + INVALID = 0, + VERBATIM = 1, + ALIGNED = 2, + UNCOMPRESSED = 3 + } + public const ushort PRETREE_NUM_ELEMENTS = 20; + public const ushort ALIGNED_NUM_ELEMENTS = 8; + public const ushort NUM_PRIMARY_LENGTHS = 7; + public const ushort NUM_SECONDARY_LENGTHS = 249; + + public const ushort PRETREE_MAXSYMBOLS = PRETREE_NUM_ELEMENTS; + public const ushort PRETREE_TABLEBITS = 6; + public const ushort MAINTREE_MAXSYMBOLS = NUM_CHARS + 50 * 8; + public const ushort MAINTREE_TABLEBITS = 12; + public const ushort LENGTH_MAXSYMBOLS = NUM_SECONDARY_LENGTHS + 1; + public const ushort LENGTH_TABLEBITS = 12; + public const ushort ALIGNED_MAXSYMBOLS = ALIGNED_NUM_ELEMENTS; + public const ushort ALIGNED_TABLEBITS = 7; + + public const ushort LENTABLE_SAFETY = 64; + } + + /* EXCEPTIONS */ + class UnsupportedWindowSizeRange : Exception + { + } +} \ No newline at end of file diff --git a/PCK-Studio/Classes/Utils/grf/xmemdecompress.cs b/PCK-Studio/Classes/Utils/grf/xmemdecompress.cs new file mode 100644 index 00000000..764e3fc7 --- /dev/null +++ b/PCK-Studio/Classes/Utils/grf/xmemdecompress.cs @@ -0,0 +1,155 @@ +// MonoGame - Copyright (C) The MonoGame Team +// This file is subject to the terms and conditions defined in +// file 'LICENSE.txt', which is part of this source code package. + +using System; +using System.IO; +using Microsoft.Xna.Framework.Content; + +namespace MonoGame.Framework.Utilities +{ + internal class LzxDecoderStream : Stream + { + LzxDecoder dec; + MemoryStream decompressedStream; + + public LzxDecoderStream(Stream input, int decompressedSize, int compressedSize) + { + dec = new LzxDecoder(16); + + // TODO: Rewrite using block decompression like Lz4DecoderStream + Decompress(input, decompressedSize, compressedSize); + } + + // Decompress into MemoryStream + private void Decompress(Stream stream, int decompressedSize, int compressedSize) + { + //thanks to ShinAli (https://bitbucket.org/alisci01/xnbdecompressor) + // default window size for XNB encoded files is 64Kb (need 16 bits to represent it) + decompressedStream = new MemoryStream(decompressedSize); + long startPos = stream.Position; + long pos = startPos; + + while (pos - startPos < compressedSize) + { + // the compressed stream is seperated into blocks that will decompress + // into 32Kb or some other size if specified. + // normal, 32Kb output blocks will have a short indicating the size + // of the block before the block starts + // blocks that have a defined output will be preceded by a byte of value + // 0xFF (255), then a short indicating the output size and another + // for the block size + // all shorts for these cases are encoded in big endian order + int hi = stream.ReadByte(); + int lo = stream.ReadByte(); + int block_size = (hi << 8) | lo; + int frame_size = 0x8000; // frame size is 32Kb by default + // does this block define a frame size? + if (hi == 0xFF) + { + hi = lo; + lo = (byte)stream.ReadByte(); + frame_size = (hi << 8) | lo; + hi = (byte)stream.ReadByte(); + lo = (byte)stream.ReadByte(); + block_size = (hi << 8) | lo; + pos += 5; + } + else + pos += 2; + + // either says there is nothing to decode + if (block_size == 0 || frame_size == 0) + break; + + dec.Decompress(stream, block_size, decompressedStream, frame_size); + pos += block_size; + + // reset the position of the input just incase the bit buffer + // read in some unused bytes + stream.Seek(pos, SeekOrigin.Begin); + } + + Console.WriteLine(decompressedStream.Position); + Console.WriteLine(decompressedSize); + //if (decompressedStream.Position != decompressedSize) + //{ + // throw new Exception("Decompression failed."); + //} + + decompressedStream.Seek(0, SeekOrigin.Begin); + using (var fs = File.OpenWrite("xmem_test.grf")) + { + decompressedStream.CopyTo(fs); + } + decompressedStream.Seek(0, SeekOrigin.Begin); + } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (disposing) + { + decompressedStream.Dispose(); + } + dec = null; + decompressedStream = null; + } + + #region Stream internals + + public override int Read(byte[] buffer, int offset, int count) + { + return decompressedStream.Read(buffer, offset, count); + } + + public override bool CanRead + { + get { return true; } + } + + + public override bool CanSeek + { + get { return false; } + } + + public override bool CanWrite + { + get { return false; } + } + + public override void Flush() + { + } + + public override long Length + { + get { throw new NotSupportedException(); } + } + + public override long Position + { + get { throw new NotSupportedException(); } + set { throw new NotSupportedException(); } + } + + + public override long Seek(long offset, SeekOrigin origin) + { + throw new NotImplementedException(); + } + + public override void SetLength(long value) + { + throw new NotImplementedException(); + } + + public override void Write(byte[] buffer, int offset, int count) + { + throw new NotImplementedException(); + } + + #endregion + } +} \ No newline at end of file diff --git a/MinecraftUSkinEditor/CommunityKey.snk b/PCK-Studio/CommunityKey.snk similarity index 100% rename from MinecraftUSkinEditor/CommunityKey.snk rename to PCK-Studio/CommunityKey.snk diff --git a/MinecraftUSkinEditor/FodyWeavers.xml b/PCK-Studio/FodyWeavers.xml similarity index 100% rename from MinecraftUSkinEditor/FodyWeavers.xml rename to PCK-Studio/FodyWeavers.xml diff --git a/MinecraftUSkinEditor/FodyWeavers.xsd b/PCK-Studio/FodyWeavers.xsd similarity index 100% rename from MinecraftUSkinEditor/FodyWeavers.xsd rename to PCK-Studio/FodyWeavers.xsd diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/AddPCKPassword.Designer.cs b/PCK-Studio/Forms/Additional-Popups/AddPCKPassword.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/AddPCKPassword.Designer.cs rename to PCK-Studio/Forms/Additional-Popups/AddPCKPassword.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/AddPCKPassword.cs b/PCK-Studio/Forms/Additional-Popups/AddPCKPassword.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/AddPCKPassword.cs rename to PCK-Studio/Forms/Additional-Popups/AddPCKPassword.cs diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/AddPCKPassword.resx b/PCK-Studio/Forms/Additional-Popups/AddPCKPassword.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/AddPCKPassword.resx rename to PCK-Studio/Forms/Additional-Popups/AddPCKPassword.resx diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/Audio/addCategory.Designer.cs b/PCK-Studio/Forms/Additional-Popups/Audio/addCategory.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/Audio/addCategory.Designer.cs rename to PCK-Studio/Forms/Additional-Popups/Audio/addCategory.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/Audio/addCategory.cs b/PCK-Studio/Forms/Additional-Popups/Audio/addCategory.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/Audio/addCategory.cs rename to PCK-Studio/Forms/Additional-Popups/Audio/addCategory.cs diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/Audio/addCategory.resx b/PCK-Studio/Forms/Additional-Popups/Audio/addCategory.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/Audio/addCategory.resx rename to PCK-Studio/Forms/Additional-Popups/Audio/addCategory.resx diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/Audio/creditsEditor.Designer.cs b/PCK-Studio/Forms/Additional-Popups/Audio/creditsEditor.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/Audio/creditsEditor.Designer.cs rename to PCK-Studio/Forms/Additional-Popups/Audio/creditsEditor.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/Audio/creditsEditor.cs b/PCK-Studio/Forms/Additional-Popups/Audio/creditsEditor.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/Audio/creditsEditor.cs rename to PCK-Studio/Forms/Additional-Popups/Audio/creditsEditor.cs diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/Audio/creditsEditor.resx b/PCK-Studio/Forms/Additional-Popups/Audio/creditsEditor.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/Audio/creditsEditor.resx rename to PCK-Studio/Forms/Additional-Popups/Audio/creditsEditor.resx diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/Audio/pleaseWait.Designer.cs b/PCK-Studio/Forms/Additional-Popups/Audio/pleaseWait.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/Audio/pleaseWait.Designer.cs rename to PCK-Studio/Forms/Additional-Popups/Audio/pleaseWait.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/Audio/pleaseWait.cs b/PCK-Studio/Forms/Additional-Popups/Audio/pleaseWait.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/Audio/pleaseWait.cs rename to PCK-Studio/Forms/Additional-Popups/Audio/pleaseWait.cs diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/Audio/pleaseWait.resx b/PCK-Studio/Forms/Additional-Popups/Audio/pleaseWait.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/Audio/pleaseWait.resx rename to PCK-Studio/Forms/Additional-Popups/Audio/pleaseWait.resx diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/CreateTexturePack.Designer.cs b/PCK-Studio/Forms/Additional-Popups/CreateTexturePack.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/CreateTexturePack.Designer.cs rename to PCK-Studio/Forms/Additional-Popups/CreateTexturePack.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/CreateTexturePack.cs b/PCK-Studio/Forms/Additional-Popups/CreateTexturePack.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/CreateTexturePack.cs rename to PCK-Studio/Forms/Additional-Popups/CreateTexturePack.cs diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/CreateTexturePack.resx b/PCK-Studio/Forms/Additional-Popups/CreateTexturePack.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/CreateTexturePack.resx rename to PCK-Studio/Forms/Additional-Popups/CreateTexturePack.resx diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/Grf/AddParameter.Designer.cs b/PCK-Studio/Forms/Additional-Popups/Grf/AddParameter.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/Grf/AddParameter.Designer.cs rename to PCK-Studio/Forms/Additional-Popups/Grf/AddParameter.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/Grf/AddParameter.cs b/PCK-Studio/Forms/Additional-Popups/Grf/AddParameter.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/Grf/AddParameter.cs rename to PCK-Studio/Forms/Additional-Popups/Grf/AddParameter.cs diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/Grf/AddParameter.resx b/PCK-Studio/Forms/Additional-Popups/Grf/AddParameter.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/Grf/AddParameter.resx rename to PCK-Studio/Forms/Additional-Popups/Grf/AddParameter.resx diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/Job.Designer.cs b/PCK-Studio/Forms/Additional-Popups/Job.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/Job.Designer.cs rename to PCK-Studio/Forms/Additional-Popups/Job.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/Job.cs b/PCK-Studio/Forms/Additional-Popups/Job.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/Job.cs rename to PCK-Studio/Forms/Additional-Popups/Job.cs diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/Job.resx b/PCK-Studio/Forms/Additional-Popups/Job.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/Job.resx rename to PCK-Studio/Forms/Additional-Popups/Job.resx diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/Loc/AddLanguage.Designer.cs b/PCK-Studio/Forms/Additional-Popups/Loc/AddLanguage.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/Loc/AddLanguage.Designer.cs rename to PCK-Studio/Forms/Additional-Popups/Loc/AddLanguage.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/Loc/AddLanguage.cs b/PCK-Studio/Forms/Additional-Popups/Loc/AddLanguage.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/Loc/AddLanguage.cs rename to PCK-Studio/Forms/Additional-Popups/Loc/AddLanguage.cs diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/Loc/AddLanguage.resx b/PCK-Studio/Forms/Additional-Popups/Loc/AddLanguage.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/Loc/AddLanguage.resx rename to PCK-Studio/Forms/Additional-Popups/Loc/AddLanguage.resx diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/Promo.Designer.cs b/PCK-Studio/Forms/Additional-Popups/Promo.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/Promo.Designer.cs rename to PCK-Studio/Forms/Additional-Popups/Promo.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/Promo.cs b/PCK-Studio/Forms/Additional-Popups/Promo.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/Promo.cs rename to PCK-Studio/Forms/Additional-Popups/Promo.cs diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/Promo.resx b/PCK-Studio/Forms/Additional-Popups/Promo.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/Promo.resx rename to PCK-Studio/Forms/Additional-Popups/Promo.resx diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/RenamePrompt.Designer.cs b/PCK-Studio/Forms/Additional-Popups/RenamePrompt.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/RenamePrompt.Designer.cs rename to PCK-Studio/Forms/Additional-Popups/RenamePrompt.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/RenamePrompt.cs b/PCK-Studio/Forms/Additional-Popups/RenamePrompt.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/RenamePrompt.cs rename to PCK-Studio/Forms/Additional-Popups/RenamePrompt.cs diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/RenamePrompt.resx b/PCK-Studio/Forms/Additional-Popups/RenamePrompt.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/RenamePrompt.resx rename to PCK-Studio/Forms/Additional-Popups/RenamePrompt.resx diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/goodbye.Designer.cs b/PCK-Studio/Forms/Additional-Popups/goodbye.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/goodbye.Designer.cs rename to PCK-Studio/Forms/Additional-Popups/goodbye.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/goodbye.cs b/PCK-Studio/Forms/Additional-Popups/goodbye.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/goodbye.cs rename to PCK-Studio/Forms/Additional-Popups/goodbye.cs diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/goodbye.ja.resx b/PCK-Studio/Forms/Additional-Popups/goodbye.ja.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/goodbye.ja.resx rename to PCK-Studio/Forms/Additional-Popups/goodbye.ja.resx diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/goodbye.resx b/PCK-Studio/Forms/Additional-Popups/goodbye.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/goodbye.resx rename to PCK-Studio/Forms/Additional-Popups/goodbye.resx diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/meta.Designer.cs b/PCK-Studio/Forms/Additional-Popups/meta.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/meta.Designer.cs rename to PCK-Studio/Forms/Additional-Popups/meta.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/meta.cs b/PCK-Studio/Forms/Additional-Popups/meta.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/meta.cs rename to PCK-Studio/Forms/Additional-Popups/meta.cs diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/meta.ja.resx b/PCK-Studio/Forms/Additional-Popups/meta.ja.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/meta.ja.resx rename to PCK-Studio/Forms/Additional-Popups/meta.ja.resx diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/meta.resx b/PCK-Studio/Forms/Additional-Popups/meta.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/meta.resx rename to PCK-Studio/Forms/Additional-Popups/meta.resx diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/pckLocked.Designer.cs b/PCK-Studio/Forms/Additional-Popups/pckLocked.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/pckLocked.Designer.cs rename to PCK-Studio/Forms/Additional-Popups/pckLocked.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/pckLocked.cs b/PCK-Studio/Forms/Additional-Popups/pckLocked.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/pckLocked.cs rename to PCK-Studio/Forms/Additional-Popups/pckLocked.cs diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/pckLocked.ja.resx b/PCK-Studio/Forms/Additional-Popups/pckLocked.ja.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/pckLocked.ja.resx rename to PCK-Studio/Forms/Additional-Popups/pckLocked.ja.resx diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/pckLocked.resx b/PCK-Studio/Forms/Additional-Popups/pckLocked.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/pckLocked.resx rename to PCK-Studio/Forms/Additional-Popups/pckLocked.resx diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/programInfo.Designer.cs b/PCK-Studio/Forms/Additional-Popups/programInfo.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/programInfo.Designer.cs rename to PCK-Studio/Forms/Additional-Popups/programInfo.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/programInfo.cs b/PCK-Studio/Forms/Additional-Popups/programInfo.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/programInfo.cs rename to PCK-Studio/Forms/Additional-Popups/programInfo.cs diff --git a/MinecraftUSkinEditor/Forms/Additional-Popups/programInfo.resx b/PCK-Studio/Forms/Additional-Popups/programInfo.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Additional-Popups/programInfo.resx rename to PCK-Studio/Forms/Additional-Popups/programInfo.resx diff --git a/MinecraftUSkinEditor/Forms/Editor/AudioEditor.Designer.cs b/PCK-Studio/Forms/Editor/AudioEditor.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Editor/AudioEditor.Designer.cs rename to PCK-Studio/Forms/Editor/AudioEditor.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Editor/AudioEditor.cs b/PCK-Studio/Forms/Editor/AudioEditor.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Editor/AudioEditor.cs rename to PCK-Studio/Forms/Editor/AudioEditor.cs diff --git a/MinecraftUSkinEditor/Forms/Editor/AudioEditor.resx b/PCK-Studio/Forms/Editor/AudioEditor.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Editor/AudioEditor.resx rename to PCK-Studio/Forms/Editor/AudioEditor.resx diff --git a/MinecraftUSkinEditor/Forms/Editor/COLEditor.Designer.cs b/PCK-Studio/Forms/Editor/COLEditor.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Editor/COLEditor.Designer.cs rename to PCK-Studio/Forms/Editor/COLEditor.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Editor/COLEditor.cs b/PCK-Studio/Forms/Editor/COLEditor.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Editor/COLEditor.cs rename to PCK-Studio/Forms/Editor/COLEditor.cs diff --git a/MinecraftUSkinEditor/Forms/Editor/COLEditor.ja.resx b/PCK-Studio/Forms/Editor/COLEditor.ja.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Editor/COLEditor.ja.resx rename to PCK-Studio/Forms/Editor/COLEditor.ja.resx diff --git a/MinecraftUSkinEditor/Forms/Editor/COLEditor.resx b/PCK-Studio/Forms/Editor/COLEditor.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Editor/COLEditor.resx rename to PCK-Studio/Forms/Editor/COLEditor.resx diff --git a/MinecraftUSkinEditor/Forms/Editor/GRFEditor.Designer.cs b/PCK-Studio/Forms/Editor/GRFEditor.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Editor/GRFEditor.Designer.cs rename to PCK-Studio/Forms/Editor/GRFEditor.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Editor/GRFEditor.cs b/PCK-Studio/Forms/Editor/GRFEditor.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Editor/GRFEditor.cs rename to PCK-Studio/Forms/Editor/GRFEditor.cs diff --git a/MinecraftUSkinEditor/Forms/Editor/GRFEditor.resx b/PCK-Studio/Forms/Editor/GRFEditor.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Editor/GRFEditor.resx rename to PCK-Studio/Forms/Editor/GRFEditor.resx diff --git a/MinecraftUSkinEditor/Forms/Editor/LOCEditor.Designer.cs b/PCK-Studio/Forms/Editor/LOCEditor.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Editor/LOCEditor.Designer.cs rename to PCK-Studio/Forms/Editor/LOCEditor.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Editor/LOCEditor.cs b/PCK-Studio/Forms/Editor/LOCEditor.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Editor/LOCEditor.cs rename to PCK-Studio/Forms/Editor/LOCEditor.cs diff --git a/MinecraftUSkinEditor/Forms/Editor/LOCEditor.ja.resx b/PCK-Studio/Forms/Editor/LOCEditor.ja.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Editor/LOCEditor.ja.resx rename to PCK-Studio/Forms/Editor/LOCEditor.ja.resx diff --git a/MinecraftUSkinEditor/Forms/Editor/LOCEditor.resx b/PCK-Studio/Forms/Editor/LOCEditor.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Editor/LOCEditor.resx rename to PCK-Studio/Forms/Editor/LOCEditor.resx diff --git a/MinecraftUSkinEditor/Forms/Skins-And-Textures/AdvancedOptions.Designer.cs b/PCK-Studio/Forms/Skins-And-Textures/AdvancedOptions.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Skins-And-Textures/AdvancedOptions.Designer.cs rename to PCK-Studio/Forms/Skins-And-Textures/AdvancedOptions.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Skins-And-Textures/AdvancedOptions.cs b/PCK-Studio/Forms/Skins-And-Textures/AdvancedOptions.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Skins-And-Textures/AdvancedOptions.cs rename to PCK-Studio/Forms/Skins-And-Textures/AdvancedOptions.cs diff --git a/MinecraftUSkinEditor/Forms/Skins-And-Textures/AdvancedOptions.ja.resx b/PCK-Studio/Forms/Skins-And-Textures/AdvancedOptions.ja.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Skins-And-Textures/AdvancedOptions.ja.resx rename to PCK-Studio/Forms/Skins-And-Textures/AdvancedOptions.ja.resx diff --git a/MinecraftUSkinEditor/Forms/Skins-And-Textures/AdvancedOptions.resx b/PCK-Studio/Forms/Skins-And-Textures/AdvancedOptions.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Skins-And-Textures/AdvancedOptions.resx rename to PCK-Studio/Forms/Skins-And-Textures/AdvancedOptions.resx diff --git a/MinecraftUSkinEditor/Forms/Skins-And-Textures/SkinPreview.Designer.cs b/PCK-Studio/Forms/Skins-And-Textures/SkinPreview.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Skins-And-Textures/SkinPreview.Designer.cs rename to PCK-Studio/Forms/Skins-And-Textures/SkinPreview.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Skins-And-Textures/SkinPreview.cs b/PCK-Studio/Forms/Skins-And-Textures/SkinPreview.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Skins-And-Textures/SkinPreview.cs rename to PCK-Studio/Forms/Skins-And-Textures/SkinPreview.cs diff --git a/MinecraftUSkinEditor/Forms/Skins-And-Textures/SkinPreview.resx b/PCK-Studio/Forms/Skins-And-Textures/SkinPreview.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Skins-And-Textures/SkinPreview.resx rename to PCK-Studio/Forms/Skins-And-Textures/SkinPreview.resx diff --git a/PCK-Studio/Forms/Skins-And-Textures/addMeta.Designer.cs b/PCK-Studio/Forms/Skins-And-Textures/addMeta.Designer.cs new file mode 100644 index 00000000..5c4f5c19 --- /dev/null +++ b/PCK-Studio/Forms/Skins-And-Textures/addMeta.Designer.cs @@ -0,0 +1,104 @@ +namespace PckStudio +{ + partial class addMeta + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(addMeta)); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.button1 = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // textBox1 + // + this.textBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(13)))), ((int)(((byte)(13)))), ((int)(((byte)(13))))); + this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.textBox1.ForeColor = System.Drawing.SystemColors.Window; + resources.ApplyResources(this.textBox1, "textBox1"); + this.textBox1.Name = "textBox1"; + // + // textBox2 + // + this.textBox2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(13)))), ((int)(((byte)(13)))), ((int)(((byte)(13))))); + this.textBox2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.textBox2.ForeColor = System.Drawing.SystemColors.Window; + resources.ApplyResources(this.textBox2, "textBox2"); + this.textBox2.Name = "textBox2"; + // + // label1 + // + resources.ApplyResources(this.label1, "label1"); + this.label1.ForeColor = System.Drawing.Color.White; + this.label1.Name = "label1"; + // + // label2 + // + resources.ApplyResources(this.label2, "label2"); + this.label2.ForeColor = System.Drawing.Color.White; + this.label2.Name = "label2"; + // + // button1 + // + resources.ApplyResources(this.button1, "button1"); + this.button1.ForeColor = System.Drawing.Color.White; + this.button1.Name = "button1"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // addMeta + // + resources.ApplyResources(this, "$this"); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.button1); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Controls.Add(this.textBox2); + this.Controls.Add(this.textBox1); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "addMeta"; + this.Resizable = false; + this.ShadowType = MetroFramework.Forms.MetroFormShadowType.DropShadow; + this.Style = MetroFramework.MetroColorStyle.Black; + this.Theme = MetroFramework.MetroThemeStyle.Dark; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Button button1; + } +} \ No newline at end of file diff --git a/MinecraftUSkinEditor/Forms/Skins-And-Textures/addMeta.cs b/PCK-Studio/Forms/Skins-And-Textures/addMeta.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Skins-And-Textures/addMeta.cs rename to PCK-Studio/Forms/Skins-And-Textures/addMeta.cs diff --git a/MinecraftUSkinEditor/Forms/Skins-And-Textures/addMeta.ja.resx b/PCK-Studio/Forms/Skins-And-Textures/addMeta.ja.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Skins-And-Textures/addMeta.ja.resx rename to PCK-Studio/Forms/Skins-And-Textures/addMeta.ja.resx diff --git a/MinecraftUSkinEditor/Forms/Skins-And-Textures/addMeta.resx b/PCK-Studio/Forms/Skins-And-Textures/addMeta.resx similarity index 99% rename from MinecraftUSkinEditor/Forms/Skins-And-Textures/addMeta.resx rename to PCK-Studio/Forms/Skins-And-Textures/addMeta.resx index 9cc0a60a..23d787dd 100644 --- a/MinecraftUSkinEditor/Forms/Skins-And-Textures/addMeta.resx +++ b/PCK-Studio/Forms/Skins-And-Textures/addMeta.resx @@ -2472,6 +2472,12 @@ vbLH9tge22N7bI/tsT22x/bYHttjC+3/B71iqRn22EDpAAAAAElFTkSuQmCC + + NoControl + + + 264, 105 + CenterParent diff --git a/MinecraftUSkinEditor/Forms/Skins-And-Textures/addMetaAdvanced.ja.resx b/PCK-Studio/Forms/Skins-And-Textures/addMetaAdvanced.ja.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Skins-And-Textures/addMetaAdvanced.ja.resx rename to PCK-Studio/Forms/Skins-And-Textures/addMetaAdvanced.ja.resx diff --git a/MinecraftUSkinEditor/Forms/Skins-And-Textures/addMetaAdvanced.resx b/PCK-Studio/Forms/Skins-And-Textures/addMetaAdvanced.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Skins-And-Textures/addMetaAdvanced.resx rename to PCK-Studio/Forms/Skins-And-Textures/addMetaAdvanced.resx diff --git a/MinecraftUSkinEditor/Forms/Skins-And-Textures/addnewskin.Designer.cs b/PCK-Studio/Forms/Skins-And-Textures/addnewskin.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Skins-And-Textures/addnewskin.Designer.cs rename to PCK-Studio/Forms/Skins-And-Textures/addnewskin.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Skins-And-Textures/addnewskin.cs b/PCK-Studio/Forms/Skins-And-Textures/addnewskin.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Skins-And-Textures/addnewskin.cs rename to PCK-Studio/Forms/Skins-And-Textures/addnewskin.cs diff --git a/MinecraftUSkinEditor/Forms/Skins-And-Textures/addnewskin.ja.resx b/PCK-Studio/Forms/Skins-And-Textures/addnewskin.ja.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Skins-And-Textures/addnewskin.ja.resx rename to PCK-Studio/Forms/Skins-And-Textures/addnewskin.ja.resx diff --git a/MinecraftUSkinEditor/Forms/Skins-And-Textures/addnewskin.resx b/PCK-Studio/Forms/Skins-And-Textures/addnewskin.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Skins-And-Textures/addnewskin.resx rename to PCK-Studio/Forms/Skins-And-Textures/addnewskin.resx diff --git a/MinecraftUSkinEditor/Forms/Skins-And-Textures/generateModel.Designer.cs b/PCK-Studio/Forms/Skins-And-Textures/generateModel.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Skins-And-Textures/generateModel.Designer.cs rename to PCK-Studio/Forms/Skins-And-Textures/generateModel.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Skins-And-Textures/generateModel.cs b/PCK-Studio/Forms/Skins-And-Textures/generateModel.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Skins-And-Textures/generateModel.cs rename to PCK-Studio/Forms/Skins-And-Textures/generateModel.cs diff --git a/MinecraftUSkinEditor/Forms/Skins-And-Textures/generateModel.ja.resx b/PCK-Studio/Forms/Skins-And-Textures/generateModel.ja.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Skins-And-Textures/generateModel.ja.resx rename to PCK-Studio/Forms/Skins-And-Textures/generateModel.ja.resx diff --git a/MinecraftUSkinEditor/Forms/Skins-And-Textures/generateModel.resx b/PCK-Studio/Forms/Skins-And-Textures/generateModel.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Skins-And-Textures/generateModel.resx rename to PCK-Studio/Forms/Skins-And-Textures/generateModel.resx diff --git a/MinecraftUSkinEditor/Forms/Utilities/Animation/AnimationEditor.Designer.cs b/PCK-Studio/Forms/Utilities/Animation/AnimationEditor.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/Animation/AnimationEditor.Designer.cs rename to PCK-Studio/Forms/Utilities/Animation/AnimationEditor.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Utilities/Animation/AnimationEditor.cs b/PCK-Studio/Forms/Utilities/Animation/AnimationEditor.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/Animation/AnimationEditor.cs rename to PCK-Studio/Forms/Utilities/Animation/AnimationEditor.cs diff --git a/MinecraftUSkinEditor/Forms/Utilities/Animation/AnimationEditor.resx b/PCK-Studio/Forms/Utilities/Animation/AnimationEditor.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/Animation/AnimationEditor.resx rename to PCK-Studio/Forms/Utilities/Animation/AnimationEditor.resx diff --git a/MinecraftUSkinEditor/Forms/Utilities/Animation/ChangeTile.Designer.cs b/PCK-Studio/Forms/Utilities/Animation/ChangeTile.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/Animation/ChangeTile.Designer.cs rename to PCK-Studio/Forms/Utilities/Animation/ChangeTile.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Utilities/Animation/ChangeTile.cs b/PCK-Studio/Forms/Utilities/Animation/ChangeTile.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/Animation/ChangeTile.cs rename to PCK-Studio/Forms/Utilities/Animation/ChangeTile.cs diff --git a/MinecraftUSkinEditor/Forms/Utilities/Animation/ChangeTile.resx b/PCK-Studio/Forms/Utilities/Animation/ChangeTile.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/Animation/ChangeTile.resx rename to PCK-Studio/Forms/Utilities/Animation/ChangeTile.resx diff --git a/MinecraftUSkinEditor/Forms/Utilities/Animation/FrameEditor.Designer.cs b/PCK-Studio/Forms/Utilities/Animation/FrameEditor.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/Animation/FrameEditor.Designer.cs rename to PCK-Studio/Forms/Utilities/Animation/FrameEditor.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Utilities/Animation/FrameEditor.cs b/PCK-Studio/Forms/Utilities/Animation/FrameEditor.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/Animation/FrameEditor.cs rename to PCK-Studio/Forms/Utilities/Animation/FrameEditor.cs diff --git a/MinecraftUSkinEditor/Forms/Utilities/Animation/FrameEditor.resx b/PCK-Studio/Forms/Utilities/Animation/FrameEditor.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/Animation/FrameEditor.resx rename to PCK-Studio/Forms/Utilities/Animation/FrameEditor.resx diff --git a/MinecraftUSkinEditor/Forms/Utilities/Animation/SetBulkSpeed.Designer.cs b/PCK-Studio/Forms/Utilities/Animation/SetBulkSpeed.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/Animation/SetBulkSpeed.Designer.cs rename to PCK-Studio/Forms/Utilities/Animation/SetBulkSpeed.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Utilities/Animation/SetBulkSpeed.cs b/PCK-Studio/Forms/Utilities/Animation/SetBulkSpeed.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/Animation/SetBulkSpeed.cs rename to PCK-Studio/Forms/Utilities/Animation/SetBulkSpeed.cs diff --git a/MinecraftUSkinEditor/Forms/Utilities/Animation/SetBulkSpeed.resx b/PCK-Studio/Forms/Utilities/Animation/SetBulkSpeed.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/Animation/SetBulkSpeed.resx rename to PCK-Studio/Forms/Utilities/Animation/SetBulkSpeed.resx diff --git a/MinecraftUSkinEditor/Forms/Utilities/PCK Manager.Designer.cs b/PCK-Studio/Forms/Utilities/PCK Manager.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/PCK Manager.Designer.cs rename to PCK-Studio/Forms/Utilities/PCK Manager.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Utilities/PCK Manager.cs b/PCK-Studio/Forms/Utilities/PCK Manager.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/PCK Manager.cs rename to PCK-Studio/Forms/Utilities/PCK Manager.cs diff --git a/MinecraftUSkinEditor/Forms/Utilities/PCK Manager.ja.resx b/PCK-Studio/Forms/Utilities/PCK Manager.ja.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/PCK Manager.ja.resx rename to PCK-Studio/Forms/Utilities/PCK Manager.ja.resx diff --git a/MinecraftUSkinEditor/Forms/Utilities/PCK Manager.resx b/PCK-Studio/Forms/Utilities/PCK Manager.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/PCK Manager.resx rename to PCK-Studio/Forms/Utilities/PCK Manager.resx diff --git a/MinecraftUSkinEditor/Forms/Utilities/PckCenterBeta.Designer.cs b/PCK-Studio/Forms/Utilities/PckCenterBeta.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/PckCenterBeta.Designer.cs rename to PCK-Studio/Forms/Utilities/PckCenterBeta.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Utilities/PckCenterBeta.cs b/PCK-Studio/Forms/Utilities/PckCenterBeta.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/PckCenterBeta.cs rename to PCK-Studio/Forms/Utilities/PckCenterBeta.cs diff --git a/MinecraftUSkinEditor/Forms/Utilities/PckCenterBeta.resx b/PCK-Studio/Forms/Utilities/PckCenterBeta.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/PckCenterBeta.resx rename to PCK-Studio/Forms/Utilities/PckCenterBeta.resx diff --git a/MinecraftUSkinEditor/Forms/Utilities/Pref.Designer.cs b/PCK-Studio/Forms/Utilities/Pref.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/Pref.Designer.cs rename to PCK-Studio/Forms/Utilities/Pref.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Utilities/Pref.cs b/PCK-Studio/Forms/Utilities/Pref.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/Pref.cs rename to PCK-Studio/Forms/Utilities/Pref.cs diff --git a/MinecraftUSkinEditor/Forms/Utilities/Pref.ja.resx b/PCK-Studio/Forms/Utilities/Pref.ja.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/Pref.ja.resx rename to PCK-Studio/Forms/Utilities/Pref.ja.resx diff --git a/MinecraftUSkinEditor/Forms/Utilities/Pref.resx b/PCK-Studio/Forms/Utilities/Pref.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/Pref.resx rename to PCK-Studio/Forms/Utilities/Pref.resx diff --git a/MinecraftUSkinEditor/Forms/Utilities/Skins/ANIMEditor.Designer.cs b/PCK-Studio/Forms/Utilities/Skins/ANIMEditor.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/Skins/ANIMEditor.Designer.cs rename to PCK-Studio/Forms/Utilities/Skins/ANIMEditor.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Utilities/Skins/ANIMEditor.cs b/PCK-Studio/Forms/Utilities/Skins/ANIMEditor.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/Skins/ANIMEditor.cs rename to PCK-Studio/Forms/Utilities/Skins/ANIMEditor.cs diff --git a/MinecraftUSkinEditor/Forms/Utilities/Skins/ANIMEditor.resx b/PCK-Studio/Forms/Utilities/Skins/ANIMEditor.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/Skins/ANIMEditor.resx rename to PCK-Studio/Forms/Utilities/Skins/ANIMEditor.resx diff --git a/MinecraftUSkinEditor/Forms/Utilities/TextureConverterUtility.Designer.cs b/PCK-Studio/Forms/Utilities/TextureConverterUtility.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/TextureConverterUtility.Designer.cs rename to PCK-Studio/Forms/Utilities/TextureConverterUtility.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Utilities/TextureConverterUtility.cs b/PCK-Studio/Forms/Utilities/TextureConverterUtility.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/TextureConverterUtility.cs rename to PCK-Studio/Forms/Utilities/TextureConverterUtility.cs diff --git a/MinecraftUSkinEditor/Forms/Utilities/TextureConverterUtility.resx b/PCK-Studio/Forms/Utilities/TextureConverterUtility.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/TextureConverterUtility.resx rename to PCK-Studio/Forms/Utilities/TextureConverterUtility.resx diff --git a/MinecraftUSkinEditor/Forms/Utilities/installPS3.Designer.cs b/PCK-Studio/Forms/Utilities/installPS3.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/installPS3.Designer.cs rename to PCK-Studio/Forms/Utilities/installPS3.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Utilities/installPS3.cs b/PCK-Studio/Forms/Utilities/installPS3.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/installPS3.cs rename to PCK-Studio/Forms/Utilities/installPS3.cs diff --git a/MinecraftUSkinEditor/Forms/Utilities/installPS3.resx b/PCK-Studio/Forms/Utilities/installPS3.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/installPS3.resx rename to PCK-Studio/Forms/Utilities/installPS3.resx diff --git a/MinecraftUSkinEditor/Forms/Utilities/installVita.Designer.cs b/PCK-Studio/Forms/Utilities/installVita.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/installVita.Designer.cs rename to PCK-Studio/Forms/Utilities/installVita.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Utilities/installVita.cs b/PCK-Studio/Forms/Utilities/installVita.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/installVita.cs rename to PCK-Studio/Forms/Utilities/installVita.cs diff --git a/MinecraftUSkinEditor/Forms/Utilities/installVita.resx b/PCK-Studio/Forms/Utilities/installVita.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/installVita.resx rename to PCK-Studio/Forms/Utilities/installVita.resx diff --git a/MinecraftUSkinEditor/Forms/Utilities/installWiiU.Designer.cs b/PCK-Studio/Forms/Utilities/installWiiU.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/installWiiU.Designer.cs rename to PCK-Studio/Forms/Utilities/installWiiU.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Utilities/installWiiU.cs b/PCK-Studio/Forms/Utilities/installWiiU.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/installWiiU.cs rename to PCK-Studio/Forms/Utilities/installWiiU.cs diff --git a/MinecraftUSkinEditor/Forms/Utilities/installWiiU.ja.resx b/PCK-Studio/Forms/Utilities/installWiiU.ja.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/installWiiU.ja.resx rename to PCK-Studio/Forms/Utilities/installWiiU.ja.resx diff --git a/MinecraftUSkinEditor/Forms/Utilities/installWiiU.resx b/PCK-Studio/Forms/Utilities/installWiiU.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/installWiiU.resx rename to PCK-Studio/Forms/Utilities/installWiiU.resx diff --git a/MinecraftUSkinEditor/Forms/Utilities/pckCenter.Designer.cs b/PCK-Studio/Forms/Utilities/pckCenter.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/pckCenter.Designer.cs rename to PCK-Studio/Forms/Utilities/pckCenter.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Utilities/pckCenter.cs b/PCK-Studio/Forms/Utilities/pckCenter.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/pckCenter.cs rename to PCK-Studio/Forms/Utilities/pckCenter.cs diff --git a/MinecraftUSkinEditor/Forms/Utilities/pckCenter.ja.resx b/PCK-Studio/Forms/Utilities/pckCenter.ja.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/pckCenter.ja.resx rename to PCK-Studio/Forms/Utilities/pckCenter.ja.resx diff --git a/MinecraftUSkinEditor/Forms/Utilities/pckCenter.resx b/PCK-Studio/Forms/Utilities/pckCenter.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/pckCenter.resx rename to PCK-Studio/Forms/Utilities/pckCenter.resx diff --git a/MinecraftUSkinEditor/Forms/Utilities/pckCenterOpen.Designer.cs b/PCK-Studio/Forms/Utilities/pckCenterOpen.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/pckCenterOpen.Designer.cs rename to PCK-Studio/Forms/Utilities/pckCenterOpen.Designer.cs diff --git a/MinecraftUSkinEditor/Forms/Utilities/pckCenterOpen.cs b/PCK-Studio/Forms/Utilities/pckCenterOpen.cs similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/pckCenterOpen.cs rename to PCK-Studio/Forms/Utilities/pckCenterOpen.cs diff --git a/MinecraftUSkinEditor/Forms/Utilities/pckCenterOpen.ja.resx b/PCK-Studio/Forms/Utilities/pckCenterOpen.ja.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/pckCenterOpen.ja.resx rename to PCK-Studio/Forms/Utilities/pckCenterOpen.ja.resx diff --git a/MinecraftUSkinEditor/Forms/Utilities/pckCenterOpen.resx b/PCK-Studio/Forms/Utilities/pckCenterOpen.resx similarity index 100% rename from MinecraftUSkinEditor/Forms/Utilities/pckCenterOpen.resx rename to PCK-Studio/Forms/Utilities/pckCenterOpen.resx diff --git a/MinecraftUSkinEditor/MainForm.Designer.cs b/PCK-Studio/MainForm.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/MainForm.Designer.cs rename to PCK-Studio/MainForm.Designer.cs diff --git a/MinecraftUSkinEditor/MainForm.cs b/PCK-Studio/MainForm.cs similarity index 100% rename from MinecraftUSkinEditor/MainForm.cs rename to PCK-Studio/MainForm.cs diff --git a/MinecraftUSkinEditor/MainForm.ja.resx b/PCK-Studio/MainForm.ja.resx similarity index 100% rename from MinecraftUSkinEditor/MainForm.ja.resx rename to PCK-Studio/MainForm.ja.resx diff --git a/MinecraftUSkinEditor/MainForm.resx b/PCK-Studio/MainForm.resx similarity index 100% rename from MinecraftUSkinEditor/MainForm.resx rename to PCK-Studio/MainForm.resx diff --git a/MinecraftUSkinEditor/PckStudio.csproj b/PCK-Studio/PckStudio.csproj similarity index 99% rename from MinecraftUSkinEditor/PckStudio.csproj rename to PCK-Studio/PckStudio.csproj index 0188da44..af7b392b 100644 --- a/MinecraftUSkinEditor/PckStudio.csproj +++ b/PCK-Studio/PckStudio.csproj @@ -161,8 +161,8 @@ - - + + diff --git a/MinecraftUSkinEditor/Program.cs b/PCK-Studio/Program.cs similarity index 100% rename from MinecraftUSkinEditor/Program.cs rename to PCK-Studio/Program.cs diff --git a/MinecraftUSkinEditor/Properties/AssemblyInfo.cs b/PCK-Studio/Properties/AssemblyInfo.cs similarity index 100% rename from MinecraftUSkinEditor/Properties/AssemblyInfo.cs rename to PCK-Studio/Properties/AssemblyInfo.cs diff --git a/MinecraftUSkinEditor/Properties/Resources.Designer.cs b/PCK-Studio/Properties/Resources.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Properties/Resources.Designer.cs rename to PCK-Studio/Properties/Resources.Designer.cs diff --git a/MinecraftUSkinEditor/Properties/Resources.resx b/PCK-Studio/Properties/Resources.resx similarity index 100% rename from MinecraftUSkinEditor/Properties/Resources.resx rename to PCK-Studio/Properties/Resources.resx diff --git a/MinecraftUSkinEditor/Properties/Settings.Designer.cs b/PCK-Studio/Properties/Settings.Designer.cs similarity index 100% rename from MinecraftUSkinEditor/Properties/Settings.Designer.cs rename to PCK-Studio/Properties/Settings.Designer.cs diff --git a/MinecraftUSkinEditor/Properties/Settings.settings b/PCK-Studio/Properties/Settings.settings similarity index 100% rename from MinecraftUSkinEditor/Properties/Settings.settings rename to PCK-Studio/Properties/Settings.settings diff --git a/MinecraftUSkinEditor/Properties/app.manifest b/PCK-Studio/Properties/app.manifest similarity index 100% rename from MinecraftUSkinEditor/Properties/app.manifest rename to PCK-Studio/Properties/app.manifest diff --git a/MinecraftUSkinEditor/Resources/Del.png b/PCK-Studio/Resources/Del.png similarity index 100% rename from MinecraftUSkinEditor/Resources/Del.png rename to PCK-Studio/Resources/Del.png diff --git a/MinecraftUSkinEditor/Resources/ExportFile.png b/PCK-Studio/Resources/ExportFile.png similarity index 100% rename from MinecraftUSkinEditor/Resources/ExportFile.png rename to PCK-Studio/Resources/ExportFile.png diff --git a/MinecraftUSkinEditor/Resources/MROE.png b/PCK-Studio/Resources/MROE.png similarity index 100% rename from MinecraftUSkinEditor/Resources/MROE.png rename to PCK-Studio/Resources/MROE.png diff --git a/MinecraftUSkinEditor/Resources/More2.png b/PCK-Studio/Resources/More2.png similarity index 100% rename from MinecraftUSkinEditor/Resources/More2.png rename to PCK-Studio/Resources/More2.png diff --git a/MinecraftUSkinEditor/Resources/NoImageFound.png b/PCK-Studio/Resources/NoImageFound.png similarity index 100% rename from MinecraftUSkinEditor/Resources/NoImageFound.png rename to PCK-Studio/Resources/NoImageFound.png diff --git a/MinecraftUSkinEditor/Resources/PCK-Studio_Logo.ico b/PCK-Studio/Resources/PCK-Studio_Logo.ico similarity index 100% rename from MinecraftUSkinEditor/Resources/PCK-Studio_Logo.ico rename to PCK-Studio/Resources/PCK-Studio_Logo.ico diff --git a/MinecraftUSkinEditor/Resources/Replace.png b/PCK-Studio/Resources/Replace.png similarity index 100% rename from MinecraftUSkinEditor/Resources/Replace.png rename to PCK-Studio/Resources/Replace.png diff --git a/MinecraftUSkinEditor/Resources/SKIN_DEF_ALEX.bbmodel b/PCK-Studio/Resources/SKIN_DEF_ALEX.bbmodel similarity index 100% rename from MinecraftUSkinEditor/Resources/SKIN_DEF_ALEX.bbmodel rename to PCK-Studio/Resources/SKIN_DEF_ALEX.bbmodel diff --git a/MinecraftUSkinEditor/Resources/SKIN_DEF_STEVE.bbmodel b/PCK-Studio/Resources/SKIN_DEF_STEVE.bbmodel similarity index 100% rename from MinecraftUSkinEditor/Resources/SKIN_DEF_STEVE.bbmodel rename to PCK-Studio/Resources/SKIN_DEF_STEVE.bbmodel diff --git a/MinecraftUSkinEditor/Resources/Splash.png b/PCK-Studio/Resources/Splash.png similarity index 100% rename from MinecraftUSkinEditor/Resources/Splash.png rename to PCK-Studio/Resources/Splash.png diff --git a/MinecraftUSkinEditor/Resources/anim_editor/classic_template.png b/PCK-Studio/Resources/anim_editor/classic_template.png similarity index 100% rename from MinecraftUSkinEditor/Resources/anim_editor/classic_template.png rename to PCK-Studio/Resources/anim_editor/classic_template.png diff --git a/MinecraftUSkinEditor/Resources/anim_editor/slim_template.png b/PCK-Studio/Resources/anim_editor/slim_template.png similarity index 100% rename from MinecraftUSkinEditor/Resources/anim_editor/slim_template.png rename to PCK-Studio/Resources/anim_editor/slim_template.png diff --git a/MinecraftUSkinEditor/Resources/apps.zip b/PCK-Studio/Resources/apps.zip similarity index 100% rename from MinecraftUSkinEditor/Resources/apps.zip rename to PCK-Studio/Resources/apps.zip diff --git a/MinecraftUSkinEditor/Resources/bg.png b/PCK-Studio/Resources/bg.png similarity index 100% rename from MinecraftUSkinEditor/Resources/bg.png rename to PCK-Studio/Resources/bg.png diff --git a/MinecraftUSkinEditor/Resources/bg1.png b/PCK-Studio/Resources/bg1.png similarity index 100% rename from MinecraftUSkinEditor/Resources/bg1.png rename to PCK-Studio/Resources/bg1.png diff --git a/MinecraftUSkinEditor/Resources/bg2.png b/PCK-Studio/Resources/bg2.png similarity index 100% rename from MinecraftUSkinEditor/Resources/bg2.png rename to PCK-Studio/Resources/bg2.png diff --git a/MinecraftUSkinEditor/Resources/binka/binka_encode.exe b/PCK-Studio/Resources/binka/binka_encode.exe similarity index 100% rename from MinecraftUSkinEditor/Resources/binka/binka_encode.exe rename to PCK-Studio/Resources/binka/binka_encode.exe diff --git a/MinecraftUSkinEditor/Resources/binka/binkawin.asi b/PCK-Studio/Resources/binka/binkawin.asi similarity index 100% rename from MinecraftUSkinEditor/Resources/binka/binkawin.asi rename to PCK-Studio/Resources/binka/binkawin.asi diff --git a/MinecraftUSkinEditor/Resources/binka/mss32.dll b/PCK-Studio/Resources/binka/mss32.dll similarity index 100% rename from MinecraftUSkinEditor/Resources/binka/mss32.dll rename to PCK-Studio/Resources/binka/mss32.dll diff --git a/MinecraftUSkinEditor/Resources/changeTile.png b/PCK-Studio/Resources/changeTile.png similarity index 100% rename from MinecraftUSkinEditor/Resources/changeTile.png rename to PCK-Studio/Resources/changeTile.png diff --git a/MinecraftUSkinEditor/Resources/clock.png b/PCK-Studio/Resources/clock.png similarity index 100% rename from MinecraftUSkinEditor/Resources/clock.png rename to PCK-Studio/Resources/clock.png diff --git a/MinecraftUSkinEditor/Resources/discord.png b/PCK-Studio/Resources/discord.png similarity index 100% rename from MinecraftUSkinEditor/Resources/discord.png rename to PCK-Studio/Resources/discord.png diff --git a/MinecraftUSkinEditor/Resources/external-content.duckduckgo.png b/PCK-Studio/Resources/external-content.duckduckgo.png similarity index 100% rename from MinecraftUSkinEditor/Resources/external-content.duckduckgo.png rename to PCK-Studio/Resources/external-content.duckduckgo.png diff --git a/MinecraftUSkinEditor/Resources/favicon (5).ico b/PCK-Studio/Resources/favicon (5).ico similarity index 100% rename from MinecraftUSkinEditor/Resources/favicon (5).ico rename to PCK-Studio/Resources/favicon (5).ico diff --git a/MinecraftUSkinEditor/Resources/favicon (6).ico b/PCK-Studio/Resources/favicon (6).ico similarity index 100% rename from MinecraftUSkinEditor/Resources/favicon (6).ico rename to PCK-Studio/Resources/favicon (6).ico diff --git a/MinecraftUSkinEditor/Resources/iconImageList/ARROW.png b/PCK-Studio/Resources/iconImageList/ARROW.png similarity index 100% rename from MinecraftUSkinEditor/Resources/iconImageList/ARROW.png rename to PCK-Studio/Resources/iconImageList/ARROW.png diff --git a/MinecraftUSkinEditor/Resources/iconImageList/BINKA ICON.png b/PCK-Studio/Resources/iconImageList/BINKA ICON.png similarity index 100% rename from MinecraftUSkinEditor/Resources/iconImageList/BINKA ICON.png rename to PCK-Studio/Resources/iconImageList/BINKA ICON.png diff --git a/MinecraftUSkinEditor/Resources/iconImageList/IMAGE ICON.png b/PCK-Studio/Resources/iconImageList/IMAGE ICON.png similarity index 100% rename from MinecraftUSkinEditor/Resources/iconImageList/IMAGE ICON.png rename to PCK-Studio/Resources/iconImageList/IMAGE ICON.png diff --git a/MinecraftUSkinEditor/Resources/iconImageList/LOC ICON.png b/PCK-Studio/Resources/iconImageList/LOC ICON.png similarity index 100% rename from MinecraftUSkinEditor/Resources/iconImageList/LOC ICON.png rename to PCK-Studio/Resources/iconImageList/LOC ICON.png diff --git a/MinecraftUSkinEditor/Resources/iconImageList/PCK ICON.png b/PCK-Studio/Resources/iconImageList/PCK ICON.png similarity index 100% rename from MinecraftUSkinEditor/Resources/iconImageList/PCK ICON.png rename to PCK-Studio/Resources/iconImageList/PCK ICON.png diff --git a/MinecraftUSkinEditor/Resources/iconImageList/ZUnknown.png b/PCK-Studio/Resources/iconImageList/ZUnknown.png similarity index 100% rename from MinecraftUSkinEditor/Resources/iconImageList/ZUnknown.png rename to PCK-Studio/Resources/iconImageList/ZUnknown.png diff --git a/MinecraftUSkinEditor/Resources/iconImageList/ZZFolder.png b/PCK-Studio/Resources/iconImageList/ZZFolder.png similarity index 100% rename from MinecraftUSkinEditor/Resources/iconImageList/ZZFolder.png rename to PCK-Studio/Resources/iconImageList/ZZFolder.png diff --git a/MinecraftUSkinEditor/Resources/img.png b/PCK-Studio/Resources/img.png similarity index 100% rename from MinecraftUSkinEditor/Resources/img.png rename to PCK-Studio/Resources/img.png diff --git a/MinecraftUSkinEditor/Resources/items.png b/PCK-Studio/Resources/items.png similarity index 100% rename from MinecraftUSkinEditor/Resources/items.png rename to PCK-Studio/Resources/items.png diff --git a/MinecraftUSkinEditor/Resources/music.png b/PCK-Studio/Resources/music.png similarity index 100% rename from MinecraftUSkinEditor/Resources/music.png rename to PCK-Studio/Resources/music.png diff --git a/MinecraftUSkinEditor/Resources/pack.png b/PCK-Studio/Resources/pack.png similarity index 100% rename from MinecraftUSkinEditor/Resources/pack.png rename to PCK-Studio/Resources/pack.png diff --git a/MinecraftUSkinEditor/Resources/pckCenterHeader.png b/PCK-Studio/Resources/pckCenterHeader.png similarity index 100% rename from MinecraftUSkinEditor/Resources/pckCenterHeader.png rename to PCK-Studio/Resources/pckCenterHeader.png diff --git a/MinecraftUSkinEditor/Resources/pckClosed.bmp b/PCK-Studio/Resources/pckClosed.bmp similarity index 100% rename from MinecraftUSkinEditor/Resources/pckClosed.bmp rename to PCK-Studio/Resources/pckClosed.bmp diff --git a/MinecraftUSkinEditor/Resources/pckClosed.png b/PCK-Studio/Resources/pckClosed.png similarity index 100% rename from MinecraftUSkinEditor/Resources/pckClosed.png rename to PCK-Studio/Resources/pckClosed.png diff --git a/MinecraftUSkinEditor/Resources/pckDrop.png b/PCK-Studio/Resources/pckDrop.png similarity index 100% rename from MinecraftUSkinEditor/Resources/pckDrop.png rename to PCK-Studio/Resources/pckDrop.png diff --git a/MinecraftUSkinEditor/Resources/pckOpen.png b/PCK-Studio/Resources/pckOpen.png similarity index 100% rename from MinecraftUSkinEditor/Resources/pckOpen.png rename to PCK-Studio/Resources/pckOpen.png diff --git a/MinecraftUSkinEditor/Resources/power.png b/PCK-Studio/Resources/power.png similarity index 100% rename from MinecraftUSkinEditor/Resources/power.png rename to PCK-Studio/Resources/power.png diff --git a/MinecraftUSkinEditor/Resources/power3.png b/PCK-Studio/Resources/power3.png similarity index 100% rename from MinecraftUSkinEditor/Resources/power3.png rename to PCK-Studio/Resources/power3.png diff --git a/MinecraftUSkinEditor/Resources/ps3.png b/PCK-Studio/Resources/ps3.png similarity index 100% rename from MinecraftUSkinEditor/Resources/ps3.png rename to PCK-Studio/Resources/ps3.png diff --git a/MinecraftUSkinEditor/Resources/sdDownload.png b/PCK-Studio/Resources/sdDownload.png similarity index 100% rename from MinecraftUSkinEditor/Resources/sdDownload.png rename to PCK-Studio/Resources/sdDownload.png diff --git a/MinecraftUSkinEditor/Resources/terrain.png b/PCK-Studio/Resources/terrain.png similarity index 100% rename from MinecraftUSkinEditor/Resources/terrain.png rename to PCK-Studio/Resources/terrain.png diff --git a/MinecraftUSkinEditor/Resources/tileData.json b/PCK-Studio/Resources/tileData.json similarity index 100% rename from MinecraftUSkinEditor/Resources/tileData.json rename to PCK-Studio/Resources/tileData.json diff --git a/MinecraftUSkinEditor/Resources/turn-off (1)1.png b/PCK-Studio/Resources/turn-off (1)1.png similarity index 100% rename from MinecraftUSkinEditor/Resources/turn-off (1)1.png rename to PCK-Studio/Resources/turn-off (1)1.png diff --git a/MinecraftUSkinEditor/Resources/wii-u-games-tool.png b/PCK-Studio/Resources/wii-u-games-tool.png similarity index 100% rename from MinecraftUSkinEditor/Resources/wii-u-games-tool.png rename to PCK-Studio/Resources/wii-u-games-tool.png diff --git a/MinecraftUSkinEditor/Resources/wiiu.png b/PCK-Studio/Resources/wiiu.png similarity index 100% rename from MinecraftUSkinEditor/Resources/wiiu.png rename to PCK-Studio/Resources/wiiu.png diff --git a/MinecraftUSkinEditor/Resources/xbox.png b/PCK-Studio/Resources/xbox.png similarity index 100% rename from MinecraftUSkinEditor/Resources/xbox.png rename to PCK-Studio/Resources/xbox.png diff --git a/MinecraftUSkinEditor/Resources/youtube_PNG15.png b/PCK-Studio/Resources/youtube_PNG15.png similarity index 100% rename from MinecraftUSkinEditor/Resources/youtube_PNG15.png rename to PCK-Studio/Resources/youtube_PNG15.png diff --git a/MinecraftUSkinEditor.sln b/PCK_Studio.sln similarity index 95% rename from MinecraftUSkinEditor.sln rename to PCK_Studio.sln index 93663ebb..6519e941 100644 --- a/MinecraftUSkinEditor.sln +++ b/PCK_Studio.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.1.32414.318 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PckStudio", "MinecraftUSkinEditor\PckStudio.csproj", "{0ACAAEDE-93F5-4B5D-B8D7-A0C43359C0D6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PckStudio", "PCK-Studio\PckStudio.csproj", "{0ACAAEDE-93F5-4B5D-B8D7-A0C43359C0D6}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution