Merge branch 'master' of https://github.com/evandixon/DS-ROM-Patcher.git

evandixon · Dec 10, 2016 · 64b1f13 · 64b1f13
2 parents 949d67f + ad400f2
commit 64b1f13
Show file tree

Hide file tree

Showing 23 changed files with 823 additions and 456 deletions.
diff --git a/DS ROM Patcher/DS-ROM-Patcher.vbproj b/DS ROM Patcher/DS-ROM-Patcher.vbproj
@@ -74,8 +74,8 @@
     <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DotNet3dsToolkit, Version=1.4.1.13, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DotNet3dsToolkit.1.4.1\lib\net46\DotNet3dsToolkit.dll</HintPath>
+    <Reference Include="DotNet3dsToolkit, Version=1.4.8.20, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DotNet3dsToolkit.1.4.8\lib\net46\DotNet3dsToolkit.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
@@ -86,8 +86,12 @@
       <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SkyEditor.Core, Version=4.0.7.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SkyEditor.Core.4.0.7\lib\portable45-net45+win8+wpa81\SkyEditor.Core.dll</HintPath>
+    <Reference Include="SkyEditor.Core, Version=4.0.8.10, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SkyEditor.Core.4.0.8\lib\portable45-net45+win8+wpa81\SkyEditor.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SkyEditor.Core.Windows, Version=4.0.8.10, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SkyEditor.Core.Windows.4.0.8\lib\net46\SkyEditor.Core.Windows.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -145,8 +149,13 @@
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="Analysis\FilePatchAnalysisResult.vb" />
+    <Compile Include="Forms\ThreeDSFormatSelector.Designer.vb">
+      <DependentUpon>ThreeDSFormatSelector.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Forms\ThreeDSFormatSelector.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Program.vb" />
-    <Compile Include="Utilities\WindowsIOProvider.vb" />
     <Compile Include="Language.Designer.vb">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -173,6 +182,7 @@
     </Compile>
     <Compile Include="NDSand3DSCore.vb" />
     <Compile Include="PatcherCore.vb" />
+    <Compile Include="DSFormat.vb" />
     <Compile Include="Utilities\ProcessHelper.vb" />
     <Compile Include="Utilities\xdelta.vb" />
   </ItemGroup>
@@ -186,6 +196,9 @@
     <EmbeddedResource Include="Forms\Form2.resx">
       <DependentUpon>Form2.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\ThreeDSFormatSelector.resx">
+      <DependentUpon>ThreeDSFormatSelector.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Language.resx">
       <CustomToolNamespace>My.Resources</CustomToolNamespace>
       <Generator>ResXFileCodeGenerator</Generator>

diff --git a/DS ROM Patcher/DSFormat.vb b/DS ROM Patcher/DSFormat.vb
@@ -0,0 +1,9 @@
+Public Enum DSFormat
+    Auto
+    NDS
+    Auto3DS
+    DecCCI
+    Key0CCI
+    DecCIA
+    HANS
+End Enum
diff --git a/DS ROM Patcher/FilePatcher.vb b/DS ROM Patcher/FilePatcher.vb
@@ -1,7 +1,6 @@
 Imports System.IO
-Imports DS_ROM_Patcher.Utilties
-Imports Newtonsoft.Json
 Imports SkyEditor.Core.Utilities
+Imports SkyEditor.Core.Windows.Providers
 
 Public Class FilePatcher
 
@@ -21,9 +20,9 @@ Public Class FilePatcher
         Json.SerializeToFile(filename, jsons, provider)
     End Sub
 
-    Public Shared Sub ImportCurrentPatcherPack(patcherZipFilename As String)
+    Public Shared Sub ImportCurrentPatcherPack(patcherZipFilename As String, modpackDirectory As string)
         'Open existing patchers
-        Dim patchersDir = Path.Combine(Environment.CurrentDirectory, "Tools", "Patchers")
+        Dim patchersDir = Path.Combine(modpackDirectory, "Tools", "Patchers")
         Dim patchersFile = Path.Combine(patchersDir, "patchers.json")
         Dim currentPatchers = DeserializePatcherList(patchersFile, patchersDir)
 
@@ -42,8 +41,8 @@ Public Class FilePatcher
         Directory.Delete(tempDirectory, True)
     End Sub
 
-    Public Shared Sub ExportCurrentPatcherPack(patcherZipFilename As String)
-        Dim patchersDir = Path.Combine(Environment.CurrentDirectory, "Tools", "Patchers")
+    Public Shared Sub ExportCurrentPatcherPack(patcherZipFilename As String, modpackDirectory As string)
+        Dim patchersDir = Path.Combine(modpackDirectory, "Tools", "Patchers")
         Zip.Zip(patchersDir, patcherZipFilename)
     End Sub