Mirrors/UWUVCI-AIO-WPF
2
0
Fork 0
mirror of https://github.com/stuff-by-3-random-dudes/UWUVCI-AIO-WPF synced 2024-11-22 19:13:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed run time errors

Browse source
This commit is contained in:
ZestyTS 2022-08-19 23:28:12 -07:00
parent cf5247cc85
commit 242dd03184
2 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
UWUVCI AIO WPF/Classes/Injection.cs
View file

@ -536,9 +536,7 @@ namespace UWUVCI_AIO_WPF
}
string gamePath = Path.Combine(baseRomPath, "content", "game.iso");
string nfsPath = Path.Combine(baseRomPath, "content", "nfs2iso2nfs.exe");
File.Move(Path.Combine(tempPath, "game.iso"), gamePath);
File.Copy(Path.Combine(toolsPath, "nfs2iso2nfs.exe"), nfsPath);
string extra = "";
if (mvm.Index == 2)
@ -552,7 +550,6 @@ namespace UWUVCI_AIO_WPF
nfs2iso2nfs.Depreciated.Main(new string[] { "-enc", "-homebrew", extra, "-iso", gamePath });
File.Delete(nfsPath);
File.Delete(gamePath);
mvm.Progress = 80;
@ -626,9 +623,7 @@ namespace UWUVCI_AIO_WPF
File.Delete(sFile);
}
string gamePath = Path.Combine(baseRomPath, "content", "game.iso");
string nfsPath = Path.Combine(baseRomPath, "content", "nfs2iso2nfs.exe");
File.Move(Path.Combine(tempPath, "game.iso"), gamePath);
File.Copy(Path.Combine(toolsPath, "nfs2iso2nfs.exe"), nfsPath);
string pass = "-passthrough ";
if (mvm.passtrough != true)
@ -636,12 +631,9 @@ namespace UWUVCI_AIO_WPF
pass = "";
}
nfs2iso2nfs.Depreciated.Main(new string[] { "-enc", "-homebrew", pass, "-iso", gamePath });
File.Delete(gamePath);
File.Delete(nfsPath);
mvm.Progress = 80;
}
private static void WII(string romPath, MainViewModel mvm)
@ -972,9 +964,7 @@ namespace UWUVCI_AIO_WPF
File.Delete(sFile);
}
string gamePath = Path.Combine(baseRomPath, "content", "game.iso");
string nfsPath = Path.Combine(baseRomPath, "content", "nfs2iso2nfs.exe");
File.Move(Path.Combine(tempPath, "game.iso"), gamePath);
File.Copy(Path.Combine(toolsPath, "nfs2iso2nfs.exe"), nfsPath);
string extra = "";
if (mvm.Index == 2)
@ -987,8 +977,6 @@ namespace UWUVCI_AIO_WPF
if (mvm.LR) { extra += "-lrpatch "; }
nfs2iso2nfs.Depreciated.Main(new string[] { "-enc", "-homebrew", extra, "-iso", gamePath });
File.Delete(nfsPath);
File.Delete(gamePath);
mvm.Progress = 80;
@ -1290,13 +1278,9 @@ namespace UWUVCI_AIO_WPF
File.Delete(sFile);
}
string gamePath = Path.Combine(baseRomPath, "content", "game.iso");
string nfsPath = Path.Combine(baseRomPath, "content", "nfs2iso2nfs.exe");
File.Move(Path.Combine(tempPath, "game.iso"), gamePath);
File.Copy(Path.Combine(toolsPath, "nfs2iso2nfs.exe"), nfsPath);
nfs2iso2nfs.Depreciated.Main(new string[] { "-enc", "-homebrew", "-passthrough", "-iso", gamePath });
File.Delete(nfsPath);
File.Delete(gamePath);
mvm.Progress = 80;
@ -1490,7 +1474,7 @@ namespace UWUVCI_AIO_WPF
mvvm.msg = "Injecting ROM...";
Console.WriteLine("Converting Game to NFS format...");
string olddir = Directory.GetCurrentDirectory();
tik.StartInfo.FileName = Path.Combine(toolsPath, "nfs2iso2nfs.exe");
if (!mvm.GC)
{
string extra = "";
@ -1504,11 +1488,12 @@ namespace UWUVCI_AIO_WPF
if (mvm.LR) { extra += "-lrpatch "; }
Console.WriteLine(extra);
Console.ReadLine();
tik.StartInfo.Arguments = $"-enc {extra}-iso \"{romPath}\"";
nfs2iso2nfs.Depreciated.Main(new string[] { "-enc", extra, "-iso", romPath});
}
else
{
tik.StartInfo.Arguments = $"-enc -homebrew -passthrough -iso \"{romPath}\"";
nfs2iso2nfs.Depreciated.Main(new string[] { "-enc", "-homebrew", "-passthrough", "-iso", romPath});
}
tik.Start();
tik.WaitForExit();

2
UWUVCI AIO WPF/UI/Frames/SettingsFrame.xaml.cs
View file

@ -71,7 +71,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames
private void Button_Click_5(object sender, RoutedEventArgs e)
{
Custom_Message cm = new Custom_Message("Credits", "UWUVCI AIO - NicoAICP, Morilli, ZestyTS\nBeta Testers/Contributors - wowjinxy, Danis, Adolfobenjaminv\n\nBuildPcePkg & BuildTurboCDPcePkg - JohnnyGo\nCdecrypt - crediar\nCNUSPACKER - NicoAICP, Morilli\nINICreator - NicoAICP\nN64Converter - Morilli\npng2tga - Easy2Convert\ninject_gba_c (psb) - Morilli\nRetroInject_C - Morilli\ntga_verify - Morilli\nWiiUDownloader - Morilli, ZestyTS\nwiiurpxtool - 0CHB0\nGoomba - FluBBa\nDarkFilter Removal N64 - MelonSpeedruns, ZestyTS\nNintendont SD Card Menu - TeconMoon\nwit - Wiimm\nGetExtTypePatcher - Fix94\nnfs2iso2nfs - sabykos, piratesephiroth, Fix94 and many more\nWii-VMC - wanikoko\nIcon/TV Bootimages - Flump, ZestyTS\nNKit - Nanook\nImage Creation Base - Phacox\nWiiGameLanguage Patcher - ReturnerS\nChangeAspectRatio - andot\nvWii Title Forwarder - Fix94");
Custom_Message cm = new Custom_Message("Credits", "UWUVCI AIO - NicoAICP, Morilli, ZestyTS\nBeta Testers/Contributors - wowjinxy, Danis, Adolfobenjaminv\n\nBuildPcePkg & BuildTurboCDPcePkg - JohnnyGo\nCdecrypt - crediar\nCNUSPACKER - NicoAICP, Morilli\nINICreator - NicoAICP\nN64Converter - Morilli\npng2tga - Easy2Convert\ninject_gba_c (psb) - Morilli\nRetroInject_C - Morilli\ntga_verify - Morilli\nWiiUDownloader - Morilli, ZestyTS\nwiiurpxtool - 0CHB0\nGoomba - FluBBa\nDarkFilter Removal N64 - MelonSpeedruns, ZestyTS\nNintendont SD Card Menu - TeconMoon\nwit - Wiimm\nGetExtTypePatcher - Fix94\nnfs2iso2nfs - sabykos, piratesephiroth, Fix94, ZestyTS, and many more\nWii-VMC - wanikoko\nIcon/TV Bootimages - Flump, ZestyTS\nNKit - Nanook\nImage Creation Base - Phacox\nWiiGameLanguage Patcher - ReturnerS\nChangeAspectRatio - andot\nvWii Title Forwarder - Fix94");
try
{
cm.Owner = (FindResource("mvm") as MainViewModel).mw;