diff --git a/.gitignore b/.gitignore index 5e8bc61..ecf2875 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,9 @@ *.gpk *.ogg +GPK_RePack/bin/ +GPK_RePack/obj/ + ################# ## Eclipse ################# @@ -188,7 +191,6 @@ $RECYCLE.BIN/ # Mac crap .DS_Store - ############# ## Python ############# @@ -220,3 +222,4 @@ pip-log.txt #Mr Developer .mr.developer.cfg *.log + diff --git a/GPK_RePack.sln b/GPK_RePack.sln index bb56a30..7a135ef 100644 --- a/GPK_RePack.sln +++ b/GPK_RePack.sln @@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GPK_RePack", "GPK_RePack\GPK_RePack.csproj", "{242D4D28-DE0E-4238-85A4-9B1AE6AD6410}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{A2551F8E-23C9-44DF-BBE3-B3AC95D9E226}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/GPK_RePack.sln.DotSettings.user b/GPK_RePack.sln.DotSettings.user deleted file mode 100644 index 3448fb8..0000000 --- a/GPK_RePack.sln.DotSettings.user +++ /dev/null @@ -1,10 +0,0 @@ - - False - - - - - - - - False \ No newline at end of file diff --git a/GPK_RePack.v11.suo b/GPK_RePack.v11.suo deleted file mode 100644 index 455d694..0000000 Binary files a/GPK_RePack.v11.suo and /dev/null differ diff --git a/GPK_RePack/.gitignore b/GPK_RePack/.gitignore deleted file mode 100644 index 4d4af3a..0000000 --- a/GPK_RePack/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -[Bb]in/* -[Oo]bj/* \ No newline at end of file diff --git a/GPK_RePack/Forms/GUI.Designer.cs b/GPK_RePack/Forms/GUI.Designer.cs index ea9502d..95f91ef 100644 --- a/GPK_RePack/Forms/GUI.Designer.cs +++ b/GPK_RePack/Forms/GUI.Designer.cs @@ -52,6 +52,7 @@ private void InitializeComponent() this.customToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tESTBigBytePropExportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.bigBytePropImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.addNameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.boxInfo = new System.Windows.Forms.TextBox(); @@ -86,7 +87,6 @@ private void InitializeComponent() this.lblFiller = new System.Windows.Forms.ToolStripStatusLabel(); this.lblStatus = new System.Windows.Forms.ToolStripStatusLabel(); this.ProgressBar = new System.Windows.Forms.ToolStripProgressBar(); - this.addNameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); @@ -105,12 +105,15 @@ private void InitializeComponent() // // treeMain // + this.treeMain.AllowDrop = true; this.treeMain.Dock = System.Windows.Forms.DockStyle.Fill; this.treeMain.Location = new System.Drawing.Point(0, 0); this.treeMain.Name = "treeMain"; this.treeMain.Size = new System.Drawing.Size(306, 485); this.treeMain.TabIndex = 1; this.treeMain.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeMain_AfterSelect); + this.treeMain.DragDrop += new System.Windows.Forms.DragEventHandler(this.treeMain_DragDrop); + this.treeMain.DragEnter += new System.Windows.Forms.DragEventHandler(this.treeMain_DragEnter); this.treeMain.KeyDown += new System.Windows.Forms.KeyEventHandler(this.GUI_KeyDown); // // menuStrip1 @@ -261,6 +264,13 @@ private void InitializeComponent() this.bigBytePropImportToolStripMenuItem.Text = "Big ByteProp Import"; this.bigBytePropImportToolStripMenuItem.Click += new System.EventHandler(this.BigBytePropImport_Click); // + // addNameToolStripMenuItem + // + this.addNameToolStripMenuItem.Name = "addNameToolStripMenuItem"; + this.addNameToolStripMenuItem.Size = new System.Drawing.Size(181, 22); + this.addNameToolStripMenuItem.Text = "Add Name"; + this.addNameToolStripMenuItem.Click += new System.EventHandler(this.addNameToolStripMenuItem_Click); + // // tabControl1 // this.tabControl1.Controls.Add(this.tabPage1); @@ -617,13 +627,6 @@ private void InitializeComponent() this.ProgressBar.Name = "ProgressBar"; this.ProgressBar.Size = new System.Drawing.Size(100, 16); // - // addNameToolStripMenuItem - // - this.addNameToolStripMenuItem.Name = "addNameToolStripMenuItem"; - this.addNameToolStripMenuItem.Size = new System.Drawing.Size(181, 22); - this.addNameToolStripMenuItem.Text = "Add Name"; - this.addNameToolStripMenuItem.Click += new System.EventHandler(this.addNameToolStripMenuItem_Click); - // // GUI // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -636,9 +639,10 @@ private void InitializeComponent() this.KeyPreview = true; this.MainMenuStrip = this.menuStrip1; this.Name = "GUI"; - this.Text = "Terahelper 0.9 - by GoneUp"; + this.Text = "Terahelper 0.9.1 - by GoneUp"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.GUI_FormClosing); this.Load += new System.EventHandler(this.GUI_Load); + this.DragDrop += new System.Windows.Forms.DragEventHandler(this.treeMain_DragDrop); this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); this.tabControl1.ResumeLayout(false); diff --git a/GPK_RePack/Forms/GUI.cs b/GPK_RePack/Forms/GUI.cs index a6ec51e..242154a 100644 --- a/GPK_RePack/Forms/GUI.cs +++ b/GPK_RePack/Forms/GUI.cs @@ -158,7 +158,16 @@ private void GUI_FormClosing(object sender, FormClosingEventArgs e) #region load/save private void openToolStripMenuItem_Click(object sender, EventArgs e) { - String[] files = MiscFuncs.GenerateOpenDialog(); + String[] files; + if (sender is String[]) + { + files = (String[]) sender; + } + else + { + files = MiscFuncs.GenerateOpenDialog(); + } + if (files.Length == 0) return; DateTime start = DateTime.Now; @@ -327,6 +336,23 @@ private void DisplayStatus(List list, string tag, DateTime start) lblStatus.Text = "Ready"; } } + + private void treeMain_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(DataFormats.FileDrop)) e.Effect = DragDropEffects.Copy; + } + + private void treeMain_DragDrop(object sender, DragEventArgs e) + { + string[] files = (string[]) e.Data.GetData(DataFormats.FileDrop); + foreach (string file in files) + { + logger.Debug("Drop input: " + file); + } + + openToolStripMenuItem_Click(files, null); + } + #endregion #region diplaygpk @@ -1349,6 +1375,8 @@ private GpkArrayProperty checkArrayRow() #endregion + + diff --git a/GPK_RePack/Forms/GUI.resx b/GPK_RePack/Forms/GUI.resx index 073209b..4eb43cd 100644 --- a/GPK_RePack/Forms/GUI.resx +++ b/GPK_RePack/Forms/GUI.resx @@ -161,6 +161,24 @@ Have Fun & Always Backup True + + True + + + True + + + True + + + True + + + True + + + True + 132, 17 diff --git a/GPK_RePack/GPK_RePack.csproj b/GPK_RePack/GPK_RePack.csproj index 619171c..89e0de4 100644 --- a/GPK_RePack/GPK_RePack.csproj +++ b/GPK_RePack/GPK_RePack.csproj @@ -34,6 +34,9 @@ 4 false + + app.manifest + ..\packages\CSharpImageLibrary.3.1.6.0\lib\net45\CSharpImageLibrary.exe @@ -148,6 +151,9 @@ Resources.resx True + + Designer + PublicSettingsSingleFileGenerator diff --git a/GPK_RePack/GPK_RePack.csproj.user b/GPK_RePack/GPK_RePack.csproj.user deleted file mode 100644 index c5e9521..0000000 --- a/GPK_RePack/GPK_RePack.csproj.user +++ /dev/null @@ -1,14 +0,0 @@ - - - - ProjectFiles - - - - - - - - - - \ No newline at end of file diff --git a/GPK_RePack/IO/Reader.cs b/GPK_RePack/IO/Reader.cs index a562063..4072bda 100644 --- a/GPK_RePack/IO/Reader.cs +++ b/GPK_RePack/IO/Reader.cs @@ -36,6 +36,8 @@ public GpkPackage ReadGpk(string path) logger = LogManager.GetLogger("[Reader:" + package.Filename + "]"); logger.Info("Reading Start"); + + using (BinaryReader reader = new BinaryReader(new FileStream(path, FileMode.Open, FileAccess.Read))) { package.OrginalSize = reader.BaseStream.Length; @@ -46,6 +48,8 @@ public GpkPackage ReadGpk(string path) ReadExports(reader, package); ReadExportData(reader, package); + logger.Info(String.Format("Remaining {0}b", reader.BaseStream.Length - reader.BaseStream.Position)); + reader.Close(); reader.Dispose(); } @@ -263,7 +267,8 @@ private void ReadExportData(BinaryReader reader, GpkPackage package) { logger.Debug("Reading ExportsData...."); - + long maxValue = 0; + GpkExport maxExp = null; foreach (GpkExport export in package.ExportList.Values) { try @@ -348,6 +353,12 @@ private void ReadExportData(BinaryReader reader, GpkPackage package) logger.Debug(String.Format("totalRead {0} GetDataSize {1} shouldBe {2}", totalRead, oursize, shouldBe)); } + if (reader.BaseStream.Position > maxValue) + { + maxValue = reader.BaseStream.Position; + maxExp = export; + } + } catch (Exception ex) { @@ -356,6 +367,9 @@ private void ReadExportData(BinaryReader reader, GpkPackage package) //data stat.progress++; } + + logger.Debug("MAX VALUE " + maxValue); + logger.Debug("MAX EXPORT " + maxExp.ObjectName); } public static void ParsePayload(GpkPackage package, GpkExport export) diff --git a/GPK_RePack/bin/Debug/GPK_RePack.exe.config b/GPK_RePack/bin/Debug/GPK_RePack.exe.config deleted file mode 100644 index 8e15646..0000000 --- a/GPK_RePack/bin/Debug/GPK_RePack.exe.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/GPK_RePack/bin/Debug/GPK_RePack.vshost.exe.config b/GPK_RePack/bin/Debug/GPK_RePack.vshost.exe.config deleted file mode 100644 index 8e15646..0000000 --- a/GPK_RePack/bin/Debug/GPK_RePack.vshost.exe.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/GPK_RePack/bin/Debug/GPK_RePack.vshost.exe.manifest b/GPK_RePack/bin/Debug/GPK_RePack.vshost.exe.manifest deleted file mode 100644 index 061c9ca..0000000 --- a/GPK_RePack/bin/Debug/GPK_RePack.vshost.exe.manifest +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/GPK_RePack/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/GPK_RePack/obj/Debug/DesignTimeResolveAssemblyReferences.cache deleted file mode 100644 index 26cf1f9..0000000 Binary files a/GPK_RePack/obj/Debug/DesignTimeResolveAssemblyReferences.cache and /dev/null differ diff --git a/GPK_RePack/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/GPK_RePack/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 84d3e88..0000000 Binary files a/GPK_RePack/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null differ diff --git a/GPK_RePack/obj/Debug/GPK_RePack.Forms.Options.resources b/GPK_RePack/obj/Debug/GPK_RePack.Forms.Options.resources deleted file mode 100644 index 6c05a97..0000000 Binary files a/GPK_RePack/obj/Debug/GPK_RePack.Forms.Options.resources and /dev/null differ diff --git a/GPK_RePack/obj/Debug/GPK_RePack.Properties.Resources.resources b/GPK_RePack/obj/Debug/GPK_RePack.Properties.Resources.resources deleted file mode 100644 index 199eecd..0000000 Binary files a/GPK_RePack/obj/Debug/GPK_RePack.Properties.Resources.resources and /dev/null differ diff --git a/GPK_RePack/obj/Debug/GPK_RePack.csproj.FileListAbsolute.txt b/GPK_RePack/obj/Debug/GPK_RePack.csproj.FileListAbsolute.txt deleted file mode 100644 index 42395e8..0000000 --- a/GPK_RePack/obj/Debug/GPK_RePack.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,11 +0,0 @@ -C:\Users\Henry\AppData\Local\Temporary Projects\GPK_RePack\bin\Debug\GPK_RePack.exe.config -I:\Henry\Projekte\Tera\GPK_RePack\GPK_RePack\bin\Debug\GPK_RePack.exe.config -I:\Henry\Projekte\Tera\GPK_RePack\build\Terahelper.exe -I:\Henry\Projekte\Tera\GPK_RePack\build\Terahelper.pdb -I:\Henry\Projekte\Tera\GPK_RePack\GPK_RePack\obj\Debug\GPK_RePack.Forms.Options.resources -I:\Henry\Projekte\Tera\GPK_RePack\GPK_RePack\obj\Debug\GPK_RePack.Properties.Resources.resources -I:\Henry\Projekte\Tera\GPK_RePack\GPK_RePack\obj\Debug\GPK_RePack.csproj.GenerateResource.Cache -I:\Henry\Projekte\Tera\GPK_RePack\GPK_RePack\obj\Debug\Terahelper.exe -I:\Henry\Projekte\Tera\GPK_RePack\GPK_RePack\obj\Debug\Terahelper.pdb -I:\Henry\Projekte\Tera\GPK_RePack\GPK_RePack\obj\Debug\GPK_RePack.Forms.GUI.resources -I:\Henry\Projekte\Tera\GPK_RePack\GPK_RePack\obj\Debug\GPK_RePack.csprojResolveAssemblyReference.cache diff --git a/GPK_RePack/obj/Debug/GPK_RePack.csproj.GenerateResource.Cache b/GPK_RePack/obj/Debug/GPK_RePack.csproj.GenerateResource.Cache deleted file mode 100644 index e01f379..0000000 Binary files a/GPK_RePack/obj/Debug/GPK_RePack.csproj.GenerateResource.Cache and /dev/null differ diff --git a/GPK_RePack/obj/Debug/GPK_RePack.csprojResolveAssemblyReference.cache b/GPK_RePack/obj/Debug/GPK_RePack.csprojResolveAssemblyReference.cache deleted file mode 100644 index 489bad4..0000000 Binary files a/GPK_RePack/obj/Debug/GPK_RePack.csprojResolveAssemblyReference.cache and /dev/null differ diff --git a/GPK_RePack/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs b/GPK_RePack/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs deleted file mode 100644 index e69de29..0000000 diff --git a/GPK_RePack/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs b/GPK_RePack/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs deleted file mode 100644 index e69de29..0000000 diff --git a/GPK_RePack/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs b/GPK_RePack/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs deleted file mode 100644 index e69de29..0000000 diff --git a/GPK_RePack/obj/Debug/Terahelper.exe b/GPK_RePack/obj/Debug/Terahelper.exe deleted file mode 100644 index 32a46a7..0000000 Binary files a/GPK_RePack/obj/Debug/Terahelper.exe and /dev/null differ diff --git a/GPK_RePack/obj/Debug/Terahelper.pdb b/GPK_RePack/obj/Debug/Terahelper.pdb deleted file mode 100644 index bf15288..0000000 Binary files a/GPK_RePack/obj/Debug/Terahelper.pdb and /dev/null differ diff --git a/GPK_RePack/obj/Release/DesignTimeResolveAssemblyReferences.cache b/GPK_RePack/obj/Release/DesignTimeResolveAssemblyReferences.cache deleted file mode 100644 index 8570008..0000000 Binary files a/GPK_RePack/obj/Release/DesignTimeResolveAssemblyReferences.cache and /dev/null differ diff --git a/GPK_RePack/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/GPK_RePack/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 05141a6..0000000 Binary files a/GPK_RePack/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null differ diff --git a/GPK_RePack/obj/Release/GPK_RePack.Properties.Resources.resources b/GPK_RePack/obj/Release/GPK_RePack.Properties.Resources.resources deleted file mode 100644 index 199eecd..0000000 Binary files a/GPK_RePack/obj/Release/GPK_RePack.Properties.Resources.resources and /dev/null differ diff --git a/GPK_RePack/obj/Release/GPK_RePack.csproj.FileListAbsolute.txt b/GPK_RePack/obj/Release/GPK_RePack.csproj.FileListAbsolute.txt deleted file mode 100644 index abce6f5..0000000 --- a/GPK_RePack/obj/Release/GPK_RePack.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,9 +0,0 @@ -I:\Henry\Projekte\Tera\GPK_RePack\build\Terahelper.exe -I:\Henry\Projekte\Tera\GPK_RePack\build\Terahelper.pdb -I:\Henry\Projekte\Tera\GPK_RePack\GPK_RePack\obj\Release\GPK_RePack.Forms.GUI.resources -I:\Henry\Projekte\Tera\GPK_RePack\GPK_RePack\obj\Release\GPK_RePack.Forms.Options.resources -I:\Henry\Projekte\Tera\GPK_RePack\GPK_RePack\obj\Release\GPK_RePack.Properties.Resources.resources -I:\Henry\Projekte\Tera\GPK_RePack\GPK_RePack\obj\Release\GPK_RePack.csproj.GenerateResource.Cache -I:\Henry\Projekte\Tera\GPK_RePack\GPK_RePack\obj\Release\Terahelper.exe -I:\Henry\Projekte\Tera\GPK_RePack\GPK_RePack\obj\Release\Terahelper.pdb -I:\Henry\Projekte\Tera\GPK_RePack\GPK_RePack\obj\Release\GPK_RePack.csprojResolveAssemblyReference.cache diff --git a/GPK_RePack/obj/Release/GPK_RePack.csproj.GenerateResource.Cache b/GPK_RePack/obj/Release/GPK_RePack.csproj.GenerateResource.Cache deleted file mode 100644 index 9f0d056..0000000 Binary files a/GPK_RePack/obj/Release/GPK_RePack.csproj.GenerateResource.Cache and /dev/null differ diff --git a/GPK_RePack/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs b/GPK_RePack/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs deleted file mode 100644 index e69de29..0000000 diff --git a/GPK_RePack/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs b/GPK_RePack/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs deleted file mode 100644 index e69de29..0000000 diff --git a/GPK_RePack/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs b/GPK_RePack/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs deleted file mode 100644 index e69de29..0000000 diff --git a/GPK_RePack/obj/Release/Terahelper.exe b/GPK_RePack/obj/Release/Terahelper.exe deleted file mode 100644 index ab4229f..0000000 Binary files a/GPK_RePack/obj/Release/Terahelper.exe and /dev/null differ diff --git a/GPK_RePack/obj/Release/Terahelper.pdb b/GPK_RePack/obj/Release/Terahelper.pdb deleted file mode 100644 index 8d7264f..0000000 Binary files a/GPK_RePack/obj/Release/Terahelper.pdb and /dev/null differ diff --git a/build/PCFemale_Voice03.gpk b/build/PCFemale_Voice03.gpk deleted file mode 100644 index 02b7b7a..0000000 Binary files a/build/PCFemale_Voice03.gpk and /dev/null differ diff --git a/build/PCFemale_Voice03_JP.gpk b/build/PCFemale_Voice03_JP.gpk deleted file mode 100644 index f339d2b..0000000 Binary files a/build/PCFemale_Voice03_JP.gpk and /dev/null differ diff --git a/build/Terahelper.exe b/build/Terahelper.exe deleted file mode 100644 index ab4229f..0000000 Binary files a/build/Terahelper.exe and /dev/null differ diff --git a/build/Terahelper.exe.config b/build/Terahelper.exe.config deleted file mode 100644 index 1c93d1a..0000000 --- a/build/Terahelper.exe.config +++ /dev/null @@ -1,54 +0,0 @@ - - - - -
- - - - - - - - - dataprops - - - info - - - False - - - class - - - - - - - - - False - - - False - - - False - - - False - - - - - - - - - - - - - diff --git a/build/Terahelper.log b/build/Terahelper.log deleted file mode 100644 index be43b0b..0000000 --- a/build/Terahelper.log +++ /dev/null @@ -1,2 +0,0 @@ -2016-06-22 02:45:31.8395|INFO|GUI|Startup -2016-06-22 02:45:34.3756|INFO|GUI|Shutdown diff --git a/build/Terahelper.pdb b/build/Terahelper.pdb deleted file mode 100644 index 8d7264f..0000000 Binary files a/build/Terahelper.pdb and /dev/null differ diff --git a/build/Terahelper.vshost.exe b/build/Terahelper.vshost.exe deleted file mode 100644 index 8c84517..0000000 Binary files a/build/Terahelper.vshost.exe and /dev/null differ diff --git a/build/Terahelper.vshost.exe.config b/build/Terahelper.vshost.exe.config deleted file mode 100644 index 1c93d1a..0000000 --- a/build/Terahelper.vshost.exe.config +++ /dev/null @@ -1,54 +0,0 @@ - - - - -
- - - - - - - - - dataprops - - - info - - - False - - - class - - - - - - - - - False - - - False - - - False - - - False - - - - - - - - - - - - -