This commit is contained in:
miku-666
2022-08-27 10:36:46 +02:00
7 changed files with 449 additions and 454 deletions

View File

@@ -1,252 +1,185 @@
6.5 [RELEASE]
- Audio Editor has been renamed to the Music Editor
- Music Editor now works with PSVita and PS4 files!
- Added a drag and drop feature for Binka files to the Music Editor to allow for efficient playlist building.
- You can now create a fresh Audio.pck file by using the "Create audio.pck" function, and this also includes PS4 and Vita!
- The categories in the Music Editor now sort themselves by category ID
- The categories in the Music Editor now have icons
- The Animation Editor now plays animations more accurately to how they will appear in game
- Added MipMap support to the Animation Editor, so you can now set whether it is MipMapped or not and what level it is.
- Added some text to display the common name of the animation that you're editing to help keep track of your animations.
- Fixed several incorrect internal names for the change tile list for the following tiles: Crafting Table (front), Crafting Table (side), Torch, Stem, Repeater, Powered Rail, All of the Stained Glass Panes, Allium, Chorus Plant, Double Tall Seagrass, Repeater (Item), Written Book, Flower Pot (Item), Dark Oak Door (Item), Jungle Door (Item)
- Added a few new internal names to the change tile list: Conduit (break particles), Chest (break particles), Ender Chest (Break Particles)
- Removed Barrier (Item) from the Change Tile list
- Clicking "Cancel" in the Change Tile dialog without choosing a tile will no longer overwrite the original tile's name with nothing.
- Clicking "Cancel" in the Change Tile dialog while using the "Create Animated Texture" function will no longer create a file with no name.
- Stained Glass tiles are now displayed as "<color> Stained Glass" instead of "<color> Glass" in the Change Tile list
6.4 [RELEASE]
- LOC Editor swapped to UTF-8
- fixed bug dealing with Drag-and-drop
- Added animation editor
- "Move Up" and "Move Down" functions finally work properly and with folders!
- Animation Editor can import Java block and item animations
- Animation Editor has a built-in Change Tile function where every single block and item that can be animated is listed (clock and compass are excluded since they have animations based on game data). When selected, it will automatically set your animation to that tile for you. If a required folder is missing, the function will create the folder for you and place the file inside. Happy animating! (:
- Removed the old "Create Animated Texture" function and replaced it with the new Animation Editor
- Moved the Audio Editor and Animation Editor into their own folders in the Utilities folder to keep things a little more organized in the solution.
- Added JSON Importer to Model Generator
6.4 [BETA]
- Rename/Clone functionality added
- Audio.pck editor
- Added a Drag and Drop feature to the main file tree
- Rename function now properly works with folders
- Fixed the Edit LOC button from appearing on folders and non files
- Added an "Edit Colors" button for .col files
- Improved Color Editor
- Fixed Add Display ID in the LOC Editor
- Added a Rename Display ID in the LOC Editor
6.3
- Fixed Unathorized server access
6.2
- smaller monitors now supported
6.1
- Added PSVita/PS4 PCK Support for PCK Center
6.0
- Moved to new domain
- Fixed Discord RPC Focusing
- Fixed offline server breaking PCK Studio
5.9
- Turned off developer mode
5.8
- Fixed Issue extracting Skins
5.7
- Added texture converter
- Added New Icon
5.6
- Fixed WiiU Skin Installer
- Added COL Editor
5.5
- Added support for PS4/PSVita Packs
5.4
- Fixed Generated model not showing up
- Fixed "view skin" button showing up for custom models
5.3
- Added localized changelogs
- Added 3D skin viewer
5.2
- Changed 'Minekampf' internal namespace to 'PckStudio'
- Added contingency server in event of domain downage
- Tweaked PCK File Processing
- Added discord server link and dialogue
- Added Discord RPC(RichPresenceClient)
5.1
- Removed unused code(exe slightly lighter)
[fixed updater may require redownload]
5.0
- Fixed PCKCenter 'Out of memory' exception
- Changed String-based versioning to Float-based
4.9
- Fixed error updating studio
[May require re-download]
4.8
- Fixed Error when starting PCK Center
4.7
- Revamped website structure
- new api for PCK Studio
[starting this update, only the update feature will be avaliable to older versions]
4.6
- Added Password Hash method
- Added 'Add Password' button
4.5
- Fixed bug opening template PCKs
- Fixed bug saving PCKs
3.7
- Project picked up and restored by PhoenixARC
3.6
- Added Installation options to PCK Center Collection open dialog
- Added Wii U Perma Installer
- Fixed more bugs
3.5b
- Fixed minor bedrock conversion bug
3.5a
- Model generator bugs fixed
3.5
- Revamped resizable Main and Model Generator forms
3.4
- Fully polished MOST of the model generator
- "Convert to bedrock" now only makes the mcpack
- Fixed a few things
3.3e
- Fixed Model Generator throwing error when creating new part
3.3d
- Fixed Model Generator crashing when minimized
- Fixed more bugs
Update 2.8b
- Fixed a few bugs from 2.8
Update 2.8
- Advanced PCK pck data stucture view
- Node rearrangement
- Armor management in Model Generator
- Fixed several display bugs
- Added auto LOC detection
- Added auto PCK skin structuring
- Folder management
- Better error handling
- Image size display
- Fixed cape typing
- Organized context menus
- Added more icons to context menu
Update 2.7
- Minor UI Fixes
Update 2.4
- Model Generator
- Few UI Improvements
Update 2.3
- Fully Fixed Cape Adding
- Few UI Improvements
Update 2.3 (Non-Feature Update)
=======
5.0
- Fixed PCKCenter 'Out of memory' exception
- Changed String-based versioning to Float-based
4.9
- Fixed error updating studio
[May require re-download]
4.8
- Fixed Error when starting PCK Center
4.7
- Revamped website structure
- new api for PCK Studio
[starting this update, only the update feature will be avaliable to older versions]
4.6
- Added Password Hash method
- Added 'Add Password' button
4.5
- Fixed bug opening template PCKs
- Fixed bug saving PCKs
3.7
- Project picked up and restored by PhoenixARC
3.6
- Added Installation options to PCK Center Collection open dialog
- Added Wii U Perma Installer
- Fixed more bugs
3.5b
- Fixed minor bedrock conversion bug
3.5a
- Model generator bugs fixed
3.5
- Revamped resizable Main and Model Generator forms
3.4
- Fully polished MOST of the model generator
- "Convert to bedrock" now only makes the mcpack
- Fixed a few things
3.3e
- Fixed Model Generator throwing error when creating new part
3.3d
- Fixed Model Generator crashing when minimized
- Fixed more bugs
Update 2.8b
- Fixed a few bugs from 2.8
Update 2.8
- Advanced PCK pck data stucture view
- Node rearrangement
- Armor management in Model Generator
- Fixed several display bugs
- Added auto LOC detection
- Added auto PCK skin structuring
- Folder management
- Better error handling
- Image size display
- Fixed cape typing
- Organized context menus
- Added more icons to context menu
Update 2.7
- Minor UI Fixes
Update 2.4
- Model Generator
- Few UI Improvements
Update 2.3
- Fully Fixed Cape Adding
- Few UI Improvements
Update 2.3 (Non-Feature Update)
- Rebranded Minekampf as PCK Studio
6.5
===
-Audio.pck Editor is now the Music Editor with plenty of new features
-The Animation Editor now plays animations more accurately
-Added MipMap support to the Animation Editor
-Added some text to display the common name of the animation that you're working with
-Fixed several incorrect internal names for the change tile list
-Removed Barrier (Item) from the Change Tile list
-Clicking "Cancel" in the Change Tile dialog will no longer overwrite the original tile's name with nothing.
-Stained Glass tiles are now displayed as "<color> Stained Glass" instead of "<color> Glass" in the Change Tile list
6.4
===
-Added the Animation and Audio.pck Editors
-Added Water Color support to the Color Editor
-LOC Editor now properly supports UTF-8
-"Move Up" and "Move Down" functions finally work properly and with folders
-Replaced the "Create Animated Texture" function with the new Animation Editor
-Added JSON Importer to Model Generator
-Rename/Clone functionality added
-Added a Drag and Drop feature to the main file tree
-Rename function now properly works with folders
-Fixed the Edit LOC button from appearing on folders and non files
-Fixed Add Display ID in the LOC Editor
-Added a Rename Display ID in the LOC Editor
6.3
===
-Fixed Unathorized server access
6.2
===
-smaller monitors now supported
6.1
===
-Added PSVita/PS4 PCK Support for PCK Center
6.0
===
-Moved to new domain
-Fixed Discord RPC Focusing
-Fixed offline server breaking PCK Studio
5.9
===
-Turned off developer mode
5.8
===
-Fixed Issue extracting Skins
5.7
===
-Added texture converter
-Added New Icon
5.6
===
-Fixed WiiU Skin Installer
-Added COL Editor
5.5
===
-Added support for PS4/PSVita Packs
5.4
===
-Fixed Generated model not showing up
-Fixed "view skin" button showing up for custom models
5.3
===
-Added localized changelogs
-Added 3D skin viewer
5.2
===
-Changed 'Minekampf' internal namespace to 'PckStudio'
-Added contingency server in event of domain downage
-Tweaked PCK File Processing
-Added discord server link and dialogue
-Added Discord RPC(RichPresenceClient)
5.1
===
-Removed unused code(exe slightly lighter)
5.0
===
-Fixed PCKCenter 'Out of memory' exception
-Changed String-based versioning to Float-based
4.9
===
-Fixed error updating studio [May require re-download]
4.8
===
-Fixed Error when starting PCK Center
4.7
===
-Revamped website structure
-new api for PCK Studio [starting this update, only the update feature will be avaliable to older versions]
4.6
===
-Added Password Hash method
-Added 'Add Password' button
4.5
===
-Fixed bug opening template PCKs
-Fixed bug saving PCKs
3.7
===
-Project picked up and restored by PhoenixARC
3.6
===
-Added Installation options to PCK Center Collection open dialog
-Added Wii U Perma Installer
-Fixed more bugs
3.5b
====
-Fixed minor bedrock conversion bug
3.5a
====
-Model generator bugs fixed
3.5
===
-Revamped resizable Main and Model Generator forms
3.4
===
-Fully polished MOST of the model generator
-"Convert to bedrock" now only makes the mcpack
-Fixed a few things
3.3e
====
-Fixed Model Generator throwing error when creating new part
3.3d
====
-Fixed Model Generator crashing when minimized
-Fixed more bugs
2.8b
====
-Fixed a few bugs from 2.8
2.8
===
-Advanced PCK pck data stucture view
-Node rearrangement
-Armor management in Model Generator
-Fixed several display bugs
-Added auto LOC detection
-Added auto PCK skin structuring
-Folder management
-Better error handling
-Image size display
-Fixed cape typing
-Organized context menus
-Added more icons to context menu
2.7
===
-Minor UI Fixes
2.4
===
-Model Generator
-Few UI Improvements
2.3
===
-Fully Fixed Cape Adding
-Few UI Improvements

View File

@@ -148,7 +148,7 @@ namespace PckStudio.Classes.FileTypes
{
if (LocKeys.ContainsKey(locKey))
return false;
Languages.ForEach( langauge => SetLocEntry(locKey, langauge, value) );
Languages.ForEach( language => SetLocEntry(locKey, language, value) );
return true;
}
@@ -181,4 +181,4 @@ namespace PckStudio.Classes.FileTypes
translation.Remove(language);
}
}
}
}

View File

@@ -24,7 +24,7 @@ namespace PckStudio.Classes.IO.LOC
WriteInt(stream, type);
WriteInt(stream, _locfile.Languages.Count);
if (type == 2) WriteLocKeys(stream);
WriteLanguages(stream);
WriteLanguages(stream, type);
WriteLanguageEntries(stream, type);
}
@@ -37,12 +37,27 @@ namespace PckStudio.Classes.IO.LOC
WriteString(stream, key);
}
private void WriteLanguages(Stream stream)
private void WriteLanguages(Stream stream, int type)
{
_locfile.Languages.ForEach(language =>
{
WriteString(stream, language);
WriteInt(stream, 0);
//Calculate the size of the language entry
int size = 0;
size += sizeof(int); // null long
size += sizeof(byte); // null byte
size += (sizeof(short) + Encoding.UTF8.GetByteCount(language)); // language name string
size += sizeof(int); // key count
foreach (var locKey in _locfile.LocKeys.Keys)
{
if (type == 0) size += (2 + Encoding.UTF8.GetByteCount(locKey)); // loc key string
size += (2 + Encoding.UTF8.GetByteCount(_locfile.LocKeys[locKey][language])); // loc key string
}
WriteInt(stream, size);
});
}

View File

@@ -42,6 +42,7 @@ namespace PckStudio.Forms.Editor
this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.creditsEditorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.deleteUnusedBINKAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.openDataFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.howToAddSongsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.whatIsEachCategoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -56,7 +57,7 @@ namespace PckStudio.Forms.Editor
this.playOverworldInCreative = new MetroFramework.Controls.MetroCheckBox();
this.compressionUpDown = new System.Windows.Forms.NumericUpDown();
this.metroLabel1 = new MetroFramework.Controls.MetroLabel();
this.openDataFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.bulkReplaceExistingTracksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.contextMenuStrip1.SuspendLayout();
this.menuStrip.SuspendLayout();
this.contextMenuStrip2.SuspendLayout();
@@ -80,66 +81,67 @@ namespace PckStudio.Forms.Editor
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.addCategoryStripMenuItem,
this.removeCategoryStripMenuItem});
this.contextMenuStrip1.Name = "contextMenuStrip1";
resources.ApplyResources(this.contextMenuStrip1, "contextMenuStrip1");
//
// addCategoryStripMenuItem
//
resources.ApplyResources(this.addCategoryStripMenuItem, "addCategoryStripMenuItem");
this.addCategoryStripMenuItem.Name = "addCategoryStripMenuItem";
this.addCategoryStripMenuItem.Click += new System.EventHandler(this.addCategoryStripMenuItem_Click);
//
// removeCategoryStripMenuItem
//
this.removeCategoryStripMenuItem.Image = global::PckStudio.Properties.Resources.Del;
this.removeCategoryStripMenuItem.Name = "removeCategoryStripMenuItem";
resources.ApplyResources(this.removeCategoryStripMenuItem, "removeCategoryStripMenuItem");
this.removeCategoryStripMenuItem.Click += new System.EventHandler(this.removeCategoryStripMenuItem_Click);
//
// catImages
//
this.catImages.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("catImages.ImageStream")));
this.catImages.TransparentColor = System.Drawing.Color.Transparent;
this.catImages.Images.SetKeyName(0, "0_overworld.png");
this.catImages.Images.SetKeyName(1, "1_nether.png");
this.catImages.Images.SetKeyName(2, "2_end.png");
this.catImages.Images.SetKeyName(3, "4_creative.png");
this.catImages.Images.SetKeyName(4, "3_menu.png");
this.catImages.Images.SetKeyName(5, "5_mg01.png");
this.catImages.Images.SetKeyName(6, "6_mg02.png");
this.catImages.Images.SetKeyName(7, "7_mg03.png");
this.catImages.Images.SetKeyName(8, "8_unused.png");
//
// menuStrip
//
resources.ApplyResources(this.menuStrip, "menuStrip");
this.menuStrip.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.contextMenuStrip1.Name = "contextMenuStrip1";
resources.ApplyResources(this.contextMenuStrip1, "contextMenuStrip1");
//
// addCategoryStripMenuItem
//
resources.ApplyResources(this.addCategoryStripMenuItem, "addCategoryStripMenuItem");
this.addCategoryStripMenuItem.Name = "addCategoryStripMenuItem";
this.addCategoryStripMenuItem.Click += new System.EventHandler(this.addCategoryStripMenuItem_Click);
//
// removeCategoryStripMenuItem
//
this.removeCategoryStripMenuItem.Image = global::PckStudio.Properties.Resources.Del;
this.removeCategoryStripMenuItem.Name = "removeCategoryStripMenuItem";
resources.ApplyResources(this.removeCategoryStripMenuItem, "removeCategoryStripMenuItem");
this.removeCategoryStripMenuItem.Click += new System.EventHandler(this.removeCategoryStripMenuItem_Click);
//
// catImages
//
this.catImages.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("catImages.ImageStream")));
this.catImages.TransparentColor = System.Drawing.Color.Transparent;
this.catImages.Images.SetKeyName(0, "0_overworld.png");
this.catImages.Images.SetKeyName(1, "1_nether.png");
this.catImages.Images.SetKeyName(2, "2_end.png");
this.catImages.Images.SetKeyName(3, "4_creative.png");
this.catImages.Images.SetKeyName(4, "3_menu.png");
this.catImages.Images.SetKeyName(5, "5_mg01.png");
this.catImages.Images.SetKeyName(6, "6_mg02.png");
this.catImages.Images.SetKeyName(7, "7_mg03.png");
this.catImages.Images.SetKeyName(8, "8_unused.png");
//
// menuStrip
//
resources.ApplyResources(this.menuStrip, "menuStrip");
this.menuStrip.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.fileToolStripMenuItem,
this.toolsToolStripMenuItem,
this.helpToolStripMenuItem});
this.menuStrip.Name = "menuStrip";
//
// fileToolStripMenuItem
//
this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.menuStrip.Name = "menuStrip";
//
// fileToolStripMenuItem
//
this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.saveToolStripMenuItem1});
this.fileToolStripMenuItem.ForeColor = System.Drawing.Color.White;
this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
resources.ApplyResources(this.fileToolStripMenuItem, "fileToolStripMenuItem");
//
// saveToolStripMenuItem1
//
resources.ApplyResources(this.saveToolStripMenuItem1, "saveToolStripMenuItem1");
this.saveToolStripMenuItem1.Name = "saveToolStripMenuItem1";
this.saveToolStripMenuItem1.Click += new System.EventHandler(this.saveToolStripMenuItem1_Click);
//
// toolsToolStripMenuItem
//
this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.fileToolStripMenuItem.ForeColor = System.Drawing.Color.White;
this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
resources.ApplyResources(this.fileToolStripMenuItem, "fileToolStripMenuItem");
//
// saveToolStripMenuItem1
//
resources.ApplyResources(this.saveToolStripMenuItem1, "saveToolStripMenuItem1");
this.saveToolStripMenuItem1.Name = "saveToolStripMenuItem1";
this.saveToolStripMenuItem1.Click += new System.EventHandler(this.saveToolStripMenuItem1_Click);
//
// toolsToolStripMenuItem
//
this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.creditsEditorToolStripMenuItem,
this.deleteUnusedBINKAsToolStripMenuItem,
this.openDataFolderToolStripMenuItem});
this.openDataFolderToolStripMenuItem,
this.bulkReplaceExistingTracksToolStripMenuItem});
this.toolsToolStripMenuItem.ForeColor = System.Drawing.Color.White;
this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
resources.ApplyResources(this.toolsToolStripMenuItem, "toolsToolStripMenuItem");
@@ -158,6 +160,13 @@ namespace PckStudio.Forms.Editor
resources.ApplyResources(this.deleteUnusedBINKAsToolStripMenuItem, "deleteUnusedBINKAsToolStripMenuItem");
this.deleteUnusedBINKAsToolStripMenuItem.Click += new System.EventHandler(this.deleteUnusedBINKAsToolStripMenuItem_Click);
//
// openDataFolderToolStripMenuItem
//
this.openDataFolderToolStripMenuItem.Image = global::PckStudio.Properties.Resources.ZZFolder;
this.openDataFolderToolStripMenuItem.Name = "openDataFolderToolStripMenuItem";
resources.ApplyResources(this.openDataFolderToolStripMenuItem, "openDataFolderToolStripMenuItem");
this.openDataFolderToolStripMenuItem.Click += new System.EventHandler(this.openDataFolderToolStripMenuItem_Click);
//
// helpToolStripMenuItem
//
this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -279,12 +288,11 @@ namespace PckStudio.Forms.Editor
this.metroLabel1.Name = "metroLabel1";
this.metroLabel1.Theme = MetroFramework.MetroThemeStyle.Dark;
//
// openDataFolderToolStripMenuItem
// bulkReplaceExistingTracksToolStripMenuItem
//
this.openDataFolderToolStripMenuItem.Image = global::PckStudio.Properties.Resources.ZZFolder;
this.openDataFolderToolStripMenuItem.Name = "openDataFolderToolStripMenuItem";
resources.ApplyResources(this.openDataFolderToolStripMenuItem, "openDataFolderToolStripMenuItem");
this.openDataFolderToolStripMenuItem.Click += new System.EventHandler(this.openDataFolderToolStripMenuItem_Click);
this.bulkReplaceExistingTracksToolStripMenuItem.Name = "bulkReplaceExistingTracksToolStripMenuItem";
resources.ApplyResources(this.bulkReplaceExistingTracksToolStripMenuItem, "bulkReplaceExistingTracksToolStripMenuItem");
this.bulkReplaceExistingTracksToolStripMenuItem.Click += new System.EventHandler(this.bulkReplaceExistingFilesToolStripMenuItem_Click);
//
// AudioEditor
//
@@ -339,5 +347,6 @@ namespace PckStudio.Forms.Editor
private System.Windows.Forms.ToolStripMenuItem bINKACompressionToolStripMenuItem;
private MetroFramework.Controls.MetroLabel metroLabel1;
private System.Windows.Forms.ToolStripMenuItem openDataFolderToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem bulkReplaceExistingTracksToolStripMenuItem;
}
}

View File

@@ -457,5 +457,64 @@ namespace PckStudio.Forms.Editor
if (Owner.Owner is MainForm p) parent = p;
else Close();
}
private async void bulkReplaceExistingFilesToolStripMenuItem_Click(object sender, EventArgs e)
{
if (!parent.CreateDataFolder()) return;
OpenFileDialog ofn = new OpenFileDialog();
ofn.Multiselect = true;
ofn.Filter = "Supported audio files (*.binka,*.wav)|*.binka;*.wav";
ofn.Title = "Please choose WAV or BINKA files to replace existing track files";
ofn.ShowDialog();
ofn.Dispose();
if (string.IsNullOrEmpty(ofn.FileName)) return; // Return if name is null or if the user cancels
var totalSongList = new List<string>();
foreach (string song in audioFile.Categories.SelectMany(cat => cat.SongNames))
{
totalSongList.Add(song);
}
foreach (string file in ofn.FileNames)
{
string song_name = Path.GetFileNameWithoutExtension(file);
string file_ext = Path.GetExtension(file).ToLower();
string new_loc = Path.Combine(parent.GetDataPath(), Path.GetFileNameWithoutExtension(file) + ".binka");
if (!totalSongList.Contains(song_name) || file == new_loc) continue;
Console.WriteLine(file);
File.Delete(new_loc);
if (file_ext == ".wav") // Convert Wave to BINKA
{
Cursor.Current = Cursors.WaitCursor;
pleaseWait waitDiag = new pleaseWait();
waitDiag.Show(this);
int error_code = 0;
await Task.Run(() =>
{
var process = Process.Start(new ProcessStartInfo
{
FileName = Path.Combine(tempDir, "binka_encode.exe"),
Arguments = $"\"{file}\" \"{new_loc}\" -s -b" + compressionUpDown.Value.ToString(),
UseShellExecute = true,
CreateNoWindow = true,
WindowStyle = ProcessWindowStyle.Hidden
});
process.Start();
process.WaitForExit();
});
waitDiag.Close();
waitDiag.Dispose();
Cursor.Current = Cursors.Default;
if (error_code != 0) continue;
}
else if(file_ext == ".binka") File.Copy(file, Path.Combine(parent.GetDataPath(), Path.GetFileName(file)));
}
}
}
}

View File

@@ -125,26 +125,6 @@
<value>127, 8</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="addCategoryStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMkMEa+wAAABSSURBVDhP5c0x
DsAgDENRxt7/wmkNSpRGf0CCCZAegxNMM7MlGMp3dIU6dxhKf/QMNxRogeQC8ivw5Vn7C0heJlFA+kL5
jWAohxRkde4wnGftBS90axNmphIGAAAAAElFTkSuQmCC
</value>
</data>
<data name="addCategoryStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>168, 22</value>
</data>
<data name="addCategoryStripMenuItem.Text" xml:space="preserve">
<value>Add Category</value>
</data>
<data name="removeCategoryStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>168, 22</value>
</data>
<data name="removeCategoryStripMenuItem.Text" xml:space="preserve">
<value>Remove Category</value>
</data>
<data name="contextMenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
<value>169, 48</value>
</data>
@@ -166,7 +146,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADk
MAAAAk1TRnQBSQFMAgEBCQEAAVgBAAFYAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
MAAAAk1TRnQBSQFMAgEBCQEAAWABAAFgAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABMAMAAQEBAAEgBgABMBIAAzgB/wM1Af8DNQH/AzMB/wMwAf8DLwH/Ay0B/wMtAf8DJAH/AzsB/wM4
Af8DNQH/Ay0B/wMnAf8DNgH/AzIB/8AAAzgB/wN/Af8DeQH/A3kB/wN5Af8DcQH/A3EB/wN5Af8DeQH/
A3EB/wNxAf8DcQH/A3kB/wN5Af8DfwH/AzIB/8AAAzIB/wN2Af8DsAH/A7AB/wOvAf8DrwH/A68B/wOo
@@ -404,12 +384,80 @@
<data name="&gt;&gt;treeView1.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="addCategoryStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMkMEa+wAAABSSURBVDhP5c0x
DsAgDENRxt7/wmkNSpRGf0CCCZAegxNMM7MlGMp3dIU6dxhKf/QMNxRogeQC8ivw5Vn7C0heJlFA+kL5
jWAohxRkde4wnGftBS90axNmphIGAAAAAElFTkSuQmCC
</value>
</data>
<data name="addCategoryStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>168, 22</value>
</data>
<data name="addCategoryStripMenuItem.Text" xml:space="preserve">
<value>Add Category</value>
</data>
<data name="removeCategoryStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>168, 22</value>
</data>
<data name="removeCategoryStripMenuItem.Text" xml:space="preserve">
<value>Remove Category</value>
</data>
<metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>19, 8</value>
</metadata>
<data name="menuStrip.AutoSize" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="fileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>37, 20</value>
</data>
<data name="fileToolStripMenuItem.Text" xml:space="preserve">
<value>File</value>
</data>
<data name="toolsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>46, 20</value>
</data>
<data name="toolsToolStripMenuItem.Text" xml:space="preserve">
<value>Tools</value>
</data>
<data name="howToAddSongsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>245, 22</value>
</data>
<data name="howToAddSongsToolStripMenuItem.Text" xml:space="preserve">
<value>How to add songs</value>
</data>
<data name="whatIsEachCategoryToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>245, 22</value>
</data>
<data name="whatIsEachCategoryToolStripMenuItem.Text" xml:space="preserve">
<value>What is each category?</value>
</data>
<data name="howToEditCreditsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>245, 22</value>
</data>
<data name="howToEditCreditsToolStripMenuItem.Text" xml:space="preserve">
<value>How to edit credits</value>
</data>
<data name="optimizeDataFolderToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>243, 22</value>
</data>
<data name="optimizeDataFolderToolStripMenuItem.Text" xml:space="preserve">
<value>How to optimize the Data folder</value>
</data>
<data name="bINKACompressionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>245, 22</value>
</data>
<data name="bINKACompressionToolStripMenuItem.Text" xml:space="preserve">
<value>BINKA Compression</value>
</data>
<data name="helpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>44, 20</value>
</data>
<data name="helpToolStripMenuItem.Text" xml:space="preserve">
<value>Help</value>
</data>
<data name="menuStrip.Location" type="System.Drawing.Point, System.Drawing">
<value>20, 60</value>
</data>
@@ -434,12 +482,6 @@
<data name="&gt;&gt;menuStrip.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="fileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>37, 20</value>
</data>
<data name="fileToolStripMenuItem.Text" xml:space="preserve">
<value>File</value>
</data>
<data name="saveToolStripMenuItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -451,64 +493,28 @@
</value>
</data>
<data name="saveToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
<value>98, 22</value>
<value>180, 22</value>
</data>
<data name="saveToolStripMenuItem1.Text" xml:space="preserve">
<value>Save</value>
</data>
<data name="toolsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>46, 20</value>
</data>
<data name="toolsToolStripMenuItem.Text" xml:space="preserve">
<value>Tools</value>
</data>
<data name="creditsEditorToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>192, 22</value>
<value>220, 22</value>
</data>
<data name="creditsEditorToolStripMenuItem.Text" xml:space="preserve">
<value>Credits Editor</value>
</data>
<data name="deleteUnusedBINKAsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>192, 22</value>
<value>220, 22</value>
</data>
<data name="deleteUnusedBINKAsToolStripMenuItem.Text" xml:space="preserve">
<value>Delete Unused BINKAs</value>
</data>
<data name="helpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>44, 20</value>
<data name="openDataFolderToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
</data>
<data name="helpToolStripMenuItem.Text" xml:space="preserve">
<value>Help</value>
</data>
<data name="howToAddSongsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>245, 22</value>
</data>
<data name="howToAddSongsToolStripMenuItem.Text" xml:space="preserve">
<value>How to add songs</value>
</data>
<data name="whatIsEachCategoryToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>245, 22</value>
</data>
<data name="whatIsEachCategoryToolStripMenuItem.Text" xml:space="preserve">
<value>What is each category?</value>
</data>
<data name="howToEditCreditsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>245, 22</value>
</data>
<data name="howToEditCreditsToolStripMenuItem.Text" xml:space="preserve">
<value>How to edit credits</value>
</data>
<data name="optimizeDataFolderToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>245, 22</value>
</data>
<data name="optimizeDataFolderToolStripMenuItem.Text" xml:space="preserve">
<value>How to Optimize the Data folder</value>
</data>
<data name="bINKACompressionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>245, 22</value>
</data>
<data name="bINKACompressionToolStripMenuItem.Text" xml:space="preserve">
<value>BINKA Compression</value>
<data name="openDataFolderToolStripMenuItem.Text" xml:space="preserve">
<value>Open Data Folder</value>
</data>
<data name="treeView2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
@@ -519,65 +525,6 @@
<data name="contextMenuStrip2.Size" type="System.Drawing.Size, System.Drawing">
<value>174, 70</value>
</data>
<data name="helpToolStripMenuItem.Text" xml:space="preserve">
<value>Help</value>
</data>
<data name="menuStrip.Location" type="System.Drawing.Point, System.Drawing">
<value>20, 60</value>
</data>
<data name="menuStrip.Size" type="System.Drawing.Size, System.Drawing">
<value>410, 24</value>
</data>
<data name="treeView2.Size" type="System.Drawing.Size, System.Drawing">
<value>279, 208</value>
</data>
<data name="menuStrip.Text" xml:space="preserve">
<value>menuStrip1</value>
</data>
<data name="&gt;&gt;menuStrip.Name" xml:space="preserve">
<value>menuStrip</value>
</data>
<data name="&gt;&gt;menuStrip.Type" xml:space="preserve">
<value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;menuStrip.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;treeView2.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<metadata name="contextMenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>282, 8</value>
</metadata>
<data name="addEntryMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMkMEa+wAAABSSURBVDhP5c0x
DsAgDENRxt7/wmkNSpRGf0CCCZAegxNMM7MlGMp3dIU6dxhKf/QMNxRogeQC8ivw5Vn7C0heJlFA+kL5
jWAohxRkde4wnGftBS90axNmphIGAAAAAElFTkSuQmCC
</value>
</data>
<data name="addEntryMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>173, 22</value>
</data>
<data name="addEntryMenuItem.Text" xml:space="preserve">
<value>Add Entry</value>
</data>
<data name="removeEntryMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>173, 22</value>
</data>
<data name="removeEntryMenuItem.Text" xml:space="preserve">
<value>Remove Entry</value>
</data>
<data name="verifyFileLocationToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>173, 22</value>
</data>
<data name="verifyFileLocationToolStripMenuItem.Text" xml:space="preserve">
<value>Verify File Location</value>
</data>
<data name="contextMenuStrip2.Size" type="System.Drawing.Size, System.Drawing">
<value>174, 70</value>
</data>
<data name="&gt;&gt;contextMenuStrip2.Name" xml:space="preserve">
<value>contextMenuStrip2</value>
</data>
@@ -605,6 +552,32 @@
<data name="&gt;&gt;treeView2.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<data name="addEntryMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMkMEa+wAAABSSURBVDhP5c0x
DsAgDENRxt7/wmkNSpRGf0CCCZAegxNMM7MlGMp3dIU6dxhKf/QMNxRogeQC8ivw5Vn7C0heJlFA+kL5
jWAohxRkde4wnGftBS90axNmphIGAAAAAElFTkSuQmCC
</value>
</data>
<data name="addEntryMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>173, 22</value>
</data>
<data name="addEntryMenuItem.Text" xml:space="preserve">
<value>Add Entry</value>
</data>
<data name="removeEntryMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>173, 22</value>
</data>
<data name="removeEntryMenuItem.Text" xml:space="preserve">
<value>Remove Entry</value>
</data>
<data name="verifyFileLocationToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>173, 22</value>
</data>
<data name="verifyFileLocationToolStripMenuItem.Text" xml:space="preserve">
<value>Verify File Location</value>
</data>
<data name="playOverworldInCreative.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@@ -680,11 +653,11 @@
<data name="&gt;&gt;metroLabel1.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="openDataFolderToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>192, 22</value>
<data name="bulkReplaceExistingTracksToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
</data>
<data name="openDataFolderToolStripMenuItem.Text" xml:space="preserve">
<value>Open Data Folder</value>
<data name="bulkReplaceExistingTracksToolStripMenuItem.Text" xml:space="preserve">
<value>Bulk Replace Existing Tracks</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
@@ -752,6 +725,12 @@
<data name="&gt;&gt;deleteUnusedBINKAsToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;openDataFolderToolStripMenuItem.Name" xml:space="preserve">
<value>openDataFolderToolStripMenuItem</value>
</data>
<data name="&gt;&gt;openDataFolderToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;helpToolStripMenuItem.Name" xml:space="preserve">
<value>helpToolStripMenuItem</value>
</data>
@@ -806,10 +785,10 @@
<data name="&gt;&gt;verifyFileLocationToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;openDataFolderToolStripMenuItem.Name" xml:space="preserve">
<value>openDataFolderToolStripMenuItem</value>
<data name="&gt;&gt;bulkReplaceExistingTracksToolStripMenuItem.Name" xml:space="preserve">
<value>bulkReplaceExistingTracksToolStripMenuItem</value>
</data>
<data name="&gt;&gt;openDataFolderToolStripMenuItem.Type" xml:space="preserve">
<data name="&gt;&gt;bulkReplaceExistingTracksToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">

View File

@@ -247,7 +247,7 @@ namespace PckStudio
default:
node.ImageIndex = 5;
node.SelectedImageIndex = 5;
throw new InvalidDataException(nameof(file.filetype));
//throw new InvalidDataException(nameof(file.filetype));
break;
}
});