diff --git a/.gitignore b/.gitignore
index 4ce6fdd..8ba549d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@ bld/
[Bb]in/
[Oo]bj/
[Ll]og/
+Build
# Visual Studio 2015/2017 cache/options directory
.vs/
diff --git a/DotNetCTFDumper.sln b/DotNetCTFDumper.sln
index e54f29b..cea16a0 100644
--- a/DotNetCTFDumper.sln
+++ b/DotNetCTFDumper.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.30517.126
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetCTFDumper", "DotNetCTFDumper\DotNetCTFDumper.csproj", "{86D99F9E-98FB-4E50-AB68-F5C115850C33}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExamplePlugin", "ExamplePlugin\ExamplePlugin.csproj", "{9A4499BF-534F-4397-AF0D-C663688A20E5}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -23,14 +21,6 @@ Global
{86D99F9E-98FB-4E50-AB68-F5C115850C33}.Release|Any CPU.Build.0 = Release|Any CPU
{86D99F9E-98FB-4E50-AB68-F5C115850C33}.Release|x64.ActiveCfg = Release|x64
{86D99F9E-98FB-4E50-AB68-F5C115850C33}.Release|x64.Build.0 = Release|x64
- {9A4499BF-534F-4397-AF0D-C663688A20E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {9A4499BF-534F-4397-AF0D-C663688A20E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {9A4499BF-534F-4397-AF0D-C663688A20E5}.Debug|x64.ActiveCfg = Debug|Any CPU
- {9A4499BF-534F-4397-AF0D-C663688A20E5}.Debug|x64.Build.0 = Debug|Any CPU
- {9A4499BF-534F-4397-AF0D-C663688A20E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {9A4499BF-534F-4397-AF0D-C663688A20E5}.Release|Any CPU.Build.0 = Release|Any CPU
- {9A4499BF-534F-4397-AF0D-C663688A20E5}.Release|x64.ActiveCfg = Release|Any CPU
- {9A4499BF-534F-4397-AF0D-C663688A20E5}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/DotNetCTFDumper/DotNetCTFDumper.csproj b/DotNetCTFDumper/DotNetCTFDumper.csproj
index b00f942..0523840 100644
--- a/DotNetCTFDumper/DotNetCTFDumper.csproj
+++ b/DotNetCTFDumper/DotNetCTFDumper.csproj
@@ -76,17 +76,10 @@
true
-
- C:\Users\ivani\Desktop\Be.HexEditor-1.6.0\sources\Be.Windows.Forms.HexBox\bin\Debug\Be.Windows.Forms.HexBox.dll
-
..\packages\Be.Windows.Forms.HexBox.1.6.1\lib\net40\Be.Windows.Forms.HexBox.dll
True
-
- ..\packages\DotNetZip.1.15.0\lib\net40\DotNetZip.dll
- True
-
..\packages\Joveler.Compression.ZLib.4.0.0\lib\net451\Joveler.Compression.ZLib.dll
True
@@ -286,5 +279,22 @@
-
+
+ md $(SolutionDir)\Build\
+md $(SolutionDir)\Build\x64\
+copy $(TargetPath) $(SolutionDir)Build\DotNetCTFDumper.exe
+copy $(SolutionDir)Dependencies\Decrypter-x64.dll $(SolutionDir)Build\Decrypter-x64.dll
+copy $(TargetDir)\x64\zlibwapi.dll $(SolutionDir)Build\x64\zlibwapi.dll
+copy $(TargetDir)DotNetCTFDumper.pdb $(SolutionDir)Build\DotNetCTFDumper.pdb
+copy $(TargetDir)Be.Windows.Forms.HexBox.dll $(SolutionDir)Build\Be.Windows.Forms.HexBox.dll
+copy $(TargetDir)Joveler.Compression.ZLib.dll $(SolutionDir)Build\Joveler.Compression.ZLib.dll
+copy $(TargetDir)Joveler.DynLoader.dll $(SolutionDir)Build\Joveler.DynLoader.dll
+copy $(TargetDir)System.Buffers.dll $(SolutionDir)Build\System.Buffers.dll
+copy $(TargetDir)System.Memory.dll $(SolutionDir)Build\System.Memory.dll
+copy $(TargetDir)System.Memory.dll $(SolutionDir)Build\System.Memory.dll
+copy $(TargetDir)System.Numerics.Vectors.dll $(SolutionDir)Build\System.Numerics.Vectors.dll
+copy $(TargetDir)System.Runtime.CompilerServices.Unsafe.dll $(SolutionDir)Build\System.Runtime.CompilerServices.Unsafe.dll
+
+
+
\ No newline at end of file
diff --git a/DotNetCTFDumper/GUI/MainForm.cs b/DotNetCTFDumper/GUI/MainForm.cs
index e240043..e66bf94 100644
--- a/DotNetCTFDumper/GUI/MainForm.cs
+++ b/DotNetCTFDumper/GUI/MainForm.cs
@@ -125,7 +125,12 @@ namespace DotNetCTFDumper.GUI
{
var worker = new BackgroundWorker();
worker.DoWork += (workSender, workE) => StartReading();
- worker.RunWorkerCompleted += (workSender, workE) => AfterLoad();
+ worker.RunWorkerCompleted += (workSender, workE) =>
+ {
+
+ AfterLoad();
+ };
+
worker.RunWorkerAsync();
}
@@ -221,10 +226,10 @@ namespace DotNetCTFDumper.GUI
{
listBox1.Items.Add($"Name: {nodeChunk.Name}");
- listBox1.Items.Add($"Id: {nodeChunk.Id}");
+ listBox1.Items.Add($"Id: {nodeChunk.Id} - 0x{nodeChunk.Id:X4}");
listBox1.Items.Add($"Flag: {nodeChunk.Flag}");
listBox1.Items.Add($"Size: {nodeChunk.Size.ToPrettySize()}");
- if (nodeChunk.DecompressedSize > -1)
+ if (nodeChunk.DecompressedSize > 0)
listBox1.Items.Add($"Decompressed Size: {nodeChunk.DecompressedSize.ToPrettySize()}");
}
@@ -251,6 +256,8 @@ namespace DotNetCTFDumper.GUI
public void AfterLoad()
{
+
+ Logger.Log("Loading GUI");
//GameData gameData = null;
var exe = Exe.Instance;
var gameData = exe.GameData;
diff --git a/DotNetCTFDumper/Settings.cs b/DotNetCTFDumper/Settings.cs
index e3da443..711cc35 100644
--- a/DotNetCTFDumper/Settings.cs
+++ b/DotNetCTFDumper/Settings.cs
@@ -31,6 +31,6 @@ namespace DotNetCTFDumper
public static bool DoMFA;
public static bool UseGUI;
- public static string DumperVersion = "CTFAN 0.1.5-a Debug";
+ public static string DumperVersion = "CTFAN 0.1.5-с Alpha";
}
}
\ No newline at end of file
diff --git a/ExamplePlugin/Class1.cs b/ExamplePlugin/Class1.cs
deleted file mode 100644
index 528a291..0000000
--- a/ExamplePlugin/Class1.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using DotNetCTFDumper.MMFParser.EXE;
-using DotNetCTFDumper.PluginAPI;
-
-namespace ExamplePlugin
-{
- public class ExamplePlugin:IPlugin
- {
- public object Activate(object input)
- {
- var data = (GameData) input;
- PluginAPI.Message(data.TargetFilename);
- return null;
- }
-
- }
-}
\ No newline at end of file
diff --git a/ExamplePlugin/ExamplePlugin.csproj b/ExamplePlugin/ExamplePlugin.csproj
deleted file mode 100644
index 09c77c0..0000000
--- a/ExamplePlugin/ExamplePlugin.csproj
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
- Debug
- AnyCPU
- {9A4499BF-534F-4397-AF0D-C663688A20E5}
- Library
- Properties
- ExamplePlugin
- ExamplePlugin
- v4.8
- 512
-
-
- AnyCPU
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- AnyCPU
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
-
- ..\DotNetCTFDumper\bin\x64\Debug\DotNetCTFDumper.exe
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ExamplePlugin/Properties/AssemblyInfo.cs b/ExamplePlugin/Properties/AssemblyInfo.cs
deleted file mode 100644
index abb31d5..0000000
--- a/ExamplePlugin/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-using DotNetCTFDumper.PluginAPI;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ExamplePlugin")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ExamplePlugin")]
-[assembly: AssemblyCopyright("Copyright © 2020")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: CTFDumperPlugin("PathLogger",PluginIOType.GameData)]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("9A4499BF-534F-4397-AF0D-C663688A20E5")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/template.mfa b/template.mfa
deleted file mode 100644
index b64826a..0000000
Binary files a/template.mfa and /dev/null differ