Fixed forwarder support! + other updates

CatmanFan · Mar 10, 2024 · ff6bf34 · ff6bf34
1 parent 4c70c84
commit ff6bf34
Show file tree

Hide file tree

Showing 24 changed files with 553 additions and 181 deletions.
diff --git a/FriishProduce/App.config b/FriishProduce/App.config
@@ -46,6 +46,12 @@
             <setting name="DoNotShow_Welcome" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="Default_Forwarders_FilesStorage" serializeAs="String">
+                <value>SD</value>
+            </setting>
+            <setting name="Default_Forwarders_Mode" serializeAs="String">
+                <value>Wii</value>
+            </setting>
         </FriishProduce.Properties.Settings>
     </userSettings>
   <runtime>

diff --git a/FriishProduce/FriishProduce.csproj b/FriishProduce/FriishProduce.csproj
@@ -315,9 +315,11 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <None Include="Resources\forwarder_comex.wad" />
-    <None Include="Resources\forwarder_v12.dol" />
-    <None Include="Resources\forwarder_v14.dol" />
+    <None Include="Resources\forwarder\base_comex.wad" />
+    <None Include="Resources\forwarder\base_waninkoko.wad" />
+    <None Include="Resources\forwarder\forwarder_v12.dol" />
+    <None Include="Resources\forwarder\forwarder_v14.dol" />
+    <None Include="Resources\forwarder\vwii.app" />
     <None Include="Resources\icons\consoles\nintendo nes.ico" />
   </ItemGroup>
   <ItemGroup>
@@ -335,10 +337,8 @@
     <None Include="Resources\icons\tick.png" />
     <None Include="Resources\icons\cross.png" />
     <None Include="Resources\icons\locale.png" />
-    <None Include="Resources\nandloader_vwii.app" />
     <None Include="Resources\subforms\screen_smd.png" />
     <None Include="Resources\savebanner_flash.png" />
-    <None Include="Resources\forwarder_waninkoko.wad" />
     <None Include="Resources\x.png" />
     <None Include="Resources\subforms\screen_nes.png" />
     <None Include="Resources\bg.png" />

diff --git a/FriishProduce/InjectorForm.cs b/FriishProduce/InjectorForm.cs
@@ -123,7 +123,7 @@ public void RefreshForm()
                 case Console.Flash:
                     CustomManual.Enabled = false;
                     InjectorsList.Items.Clear();
-                    InjectorsList.Items.Add(Language.Get("ByDefault"));
+                    InjectorsList.Items.Add(" ");
                     break;
 
                 case Console.GBA:
@@ -501,7 +501,7 @@ public bool LoadImage(Bitmap src)
                         break;
 
                     case Console.NES:
-                        if (src.Width == 256 && (src.Height == 224 || src.Height == 240) && CO.Settings != null && CO.Settings["use_Img"] == "1")
+                        if (InjectorsList.SelectedIndex == 0 && src.Width == 256 && (src.Height == 224 || src.Height == 240) && CO.Settings != null && CO.Settings["use_tImg"] == "1")
                         {
                             var CO_NES = CO as Options_VC_NES;
 
@@ -646,7 +646,9 @@ public bool CreateInject()
         {
             try
             {
-                Creator.Out = Parent.SaveWAD.FileName;
+                Parent.CleanTemp();
+
+                Creator.Out = Path.Combine(Paths.Out, GetName()) + ".wad";
                 if (PatchFile != null) ROM.Patch(PatchFile);
 
                 OutWAD = new WAD();
@@ -692,7 +694,14 @@ public bool CreateInject()
                     Tag = null;
 
                     if (Properties.Settings.Default.AutoOpenFolder)
-                        System.Diagnostics.Process.Start("explorer.exe", $"/select, \"{Creator.Out}\"");
+                    {
+                        string args = string.Format("/e, /select, \"{0}\"", Creator.Out);
+
+                        System.Diagnostics.ProcessStartInfo info = new System.Diagnostics.ProcessStartInfo();
+                        info.FileName = "explorer";
+                        info.Arguments = args;
+                        System.Diagnostics.Process.Start(info);
+                    }
                     else
                         MessageBox.Show(string.Format(Language.Get("Message.003"), Creator.Out), MessageBoxButtons.OK, Ookii.Dialogs.WinForms.TaskDialogIcon.Information);
 
@@ -718,17 +727,19 @@ public bool CreateInject()
 
         public void ForwarderCreator()
         {
-            Forwarder.ROM = ROM.Bytes;
-            Forwarder.ID = Creator.TitleID;
-            Forwarder.Emulator = InjectorsList.SelectedItem.ToString();
-            Forwarder.Storage = CO.Settings.ElementAt(0).Value == "SD" ? Forwarder.Storages.SD : Forwarder.Storages.USB;
+            Forwarder f = new Forwarder()
+            {
+                ROM = ROM.Bytes,
+                ROMExtension = Path.GetExtension(ROM.Path),
+                ID = Creator.TitleID,
+                Emulator = InjectorsList.SelectedItem.ToString(),
+                Storage = CO.Settings.ElementAt(0).Value.ToLower().Contains("usb") ? Forwarder.Storages.USB : Forwarder.Storages.SD
+            };
 
             // Actually inject everything
             // *******
-            Forwarder.CreateZIP(Path.Combine(Path.GetDirectoryName(Creator.Out), Path.GetFileNameWithoutExtension(Creator.Out) + $" ({(Forwarder.Storage == 0 ? "SD" : "USB")}).zip"));
-            OutWAD = Forwarder.CreateWAD(OutWAD, Forwarder.ID, CO.Settings.ElementAt(1).Value == "vWii");
-
-            Forwarder.Dispose();
+            f.CreateZIP(Path.Combine(Path.GetDirectoryName(Creator.Out), Path.GetFileNameWithoutExtension(Creator.Out) + $" ({CO.Settings.ElementAt(0).Value}).zip"));
+            OutWAD = f.CreateWAD(OutWAD, CO.Settings.ElementAt(1).Value.ToLower() == "vwii");
         }
 
         public void WiiVCInject()

diff --git a/FriishProduce/MainForm.Designer.cs b/FriishProduce/MainForm.Designer.cs
diff --git a/FriishProduce/MainForm.cs b/FriishProduce/MainForm.cs
@@ -138,7 +138,7 @@ public MainForm()
 
             // Automatically set defined initial directory for save file dialog
             // ********
-            SaveWAD.InitialDirectory = Paths.Out;
+            // SaveWAD.InitialDirectory = Paths.Out;
 
             // Updater.GetLatest();
         }
@@ -284,12 +284,8 @@ private void BrowseROMDialog(Console c, InjectorForm currentForm)
 
         private void ExportWAD_Click(object sender, EventArgs e)
         {
-            CleanTemp();
             var currentForm = tabControl.SelectedForm as InjectorForm;
-
-            SaveWAD.FileName = currentForm.GetName();
-            if (SaveWAD.ShowDialog() == DialogResult.OK)
-                currentForm.CreateInject();
+            currentForm.CreateInject();
         }
 
         private void OpenImage_Click(object sender, EventArgs e)
@@ -351,5 +347,29 @@ private void LanguageXMLEditor_Click(object sender, EventArgs e)
             x.ShowDialog();
             RefreshForm();
         }
+
+        private void OpenExports(object sender, EventArgs e)
+        {
+            System.Diagnostics.ProcessStartInfo info = new System.Diagnostics.ProcessStartInfo();
+            info.FileName = Paths.Out;
+            info.UseShellExecute = true;
+            info.Verb = "open";
+            System.Diagnostics.Process.Start(info);
+        }
+
+        private void CleanExports(object sender, EventArgs e)
+        {
+            if (MessageBox.Show("Are you sure?", MessageBoxButtons.YesNo, TaskDialogIcon.Warning) == DialogResult.Yes)
+            {
+                try
+                {
+                    foreach (var item in Directory.GetFiles(Paths.Out, "*.*", SearchOption.AllDirectories))
+                        if (!Path.GetFileName(item).ToLower().Contains("readme.md")) File.Delete(item);
+                    foreach (var item in Directory.GetDirectories(Paths.Out))
+                        Directory.Delete(item, true);
+                }
+                catch { }
+            }
+        }
     }
 }