Skip to content

Commit

Permalink
fix: many bugs and features
Browse files Browse the repository at this point in the history 
fix update and installation bug
install Mod in own directory
disable install/start/update button
options to open game directory
  • Loading branch information
@Narua2010
Narua2010 committed May 1, 2021
1 parent fcc2f9f commit ddebfb9
Show file tree
Hide file tree
Showing 4 changed files with 182 additions and 133 deletions.
3 changes: 2 additions & 1 deletion source/GuiVersion/AmongUsModUpdater.ModFunctions/ModFunctions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public static void startGame(string gamePath, bool checkInstallation, dynamic ma
BackgroundWorker workerStart = new BackgroundWorker();
workerStart.DoWork += new DoWorkEventHandler(backgroundWorkerStart_DoWork);
workerStart.RunWorkerCompleted += new RunWorkerCompletedEventHandler(backgroundWorkerStart_RunComplete);
workerStart.RunWorkerAsync(gamePath);
workerStart.RunWorkerAsync(_gamePath);
mainWindow.downloadProgress.Value = 0;
mainWindow.waitingInfoForStart.Visible = true;
}
Expand Down Expand Up @@ -120,6 +120,7 @@ public static void backgroundWorkerStart_DoWork(object sender, DoWorkEventArgs e
public static void backgroundWorkerStart_RunComplete(object sender, RunWorkerCompletedEventArgs ex)
{
_mainWindow.waitingInfoForStart.Visible = false;
_mainWindow.buttonHomeStart.Enabled = true;
}
}
}
77 changes: 50 additions & 27 deletions source/GuiVersion/AmongUsModUpdater.TheOtherRoles/TheOtherRoles.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,29 +54,38 @@ public static async void getTheOtherRoles(dynamic mainWindow)
mainWindow.buttonHomeUpdate.Visible = true;
}
}
public static async void installTheOtherRoles(dynamic mainWindow, string gamePath)
public static async void installTheOtherRoles(dynamic mainWindow, string rootPath)
{
Properties.Settings.Default.ReleaseId = currentReleaseId;
string _gamePath = gamePath + "\\The Other Roles";
Directory.CreateDirectory(_gamePath);
Properties.Settings.Default.GamePath = _gamePath;
mainWindow.buttonHomeInstall.Enabled = false;
if (deleteOldVersionInRoot(rootPath).Result)
{
string gamePath = rootPath + "\\The Other Roles";
Properties.Settings.Default.GamePath = gamePath;
Properties.Settings.Default.Save();
updateTheOtherRoles(mainWindow, rootPath);
}
}

await SystemFunctions.copyFolder(gamePath, _gamePath);
public static async void updateTheOtherRoles(dynamic mainWindow, string rootPath)
{
mainWindow.buttonHomeUpdate.Enabled = false;
if (deleteOldFiles(rootPath).Result)
{
//Create Mod Folder
Properties.Settings.Default.ReleaseId = currentReleaseId;
Properties.Settings.Default.Save();
string gamePath = Properties.Settings.Default.GamePath;
Directory.CreateDirectory(gamePath);

Properties.Settings.Default.Save();
await SystemFunctions.copyFolder(rootPath, gamePath);

mainWindow.downloadProgress.Visible = true;
mainWindow.downloadProgress.Visible = true;

updateTheOtherRoles(mainWindow);
}

public static async void updateTheOtherRoles(dynamic mainWindow)
{
string zipPath = Properties.Settings.Default.GamePath + "\\" + releaseName + ".zip";
await ModFunctions.downloadNewVersion(downloadUrl, zipPath, mainWindow);
//Download Mod
string zipPath = Properties.Settings.Default.GamePath + "\\" + releaseName + ".zip";
await ModFunctions.downloadNewVersion(downloadUrl, zipPath, mainWindow);

if (deleteOldFiles().Result)
{
ZipFile.ExtractToDirectory(zipPath, Properties.Settings.Default.GamePath);

if (!Directory.Exists(Properties.Settings.Default.GamePath + "\\BepInex\\config"))
Expand Down Expand Up @@ -107,45 +116,59 @@ public static async void updateTheOtherRoles(dynamic mainWindow)
mainWindow.buttonHomeStart.Visible = true;
mainWindow.downloadProgress.Visible = false;

if (File.Exists(rootPath + "\\me.eisbison.theotherroles.cfg")) File.Delete(rootPath + "\\me.eisbison.theotherroles.cfg");
if (File.Exists(Properties.Settings.Default.GamePath + "\\me.eisbison.theotherroles.cfg")) File.Delete(Properties.Settings.Default.GamePath + "\\me.eisbison.theotherroles.cfg");
if (File.Exists(Properties.Settings.Default.GamePath + "\\" + releaseName + ".zip")) File.Delete(Properties.Settings.Default.GamePath + "\\" + releaseName + ".zip");

mainWindow.buttonHomeInstall.Enabled = true;
mainWindow.buttonHomeUpdate.Enabled = true;

DialogResult messageBoxResponse = MessageBoxFunctions.openMessageBoxWithResponse("The mod has been successfully updated. Would you like to start the game now?", "Update finished");

if (messageBoxResponse == DialogResult.Yes)
{
ModFunctions.startGame(Properties.Settings.Default.GamePath, checkInstallation(), mainWindow);
startTheOtherRoles(mainWindow);
}
}
}

public static void startTheOtherRoles(dynamic mainWindow)
{
mainWindow.buttonHomeStart.Enabled = false;
ModFunctions.startGame(Properties.Settings.Default.GamePath, checkInstallation(), mainWindow);
}
public static async Task<bool> deleteOldFiles()

public static async Task<bool> deleteOldFiles(string rootPath)
{
string path = Properties.Settings.Default.GamePath;
string gamePath = Properties.Settings.Default.GamePath;

if (File.Exists(path + "\\BepInex\\config\\me.eisbison.theotherroles.cfg"))
if (File.Exists(gamePath + "\\BepInex\\config\\me.eisbison.theotherroles.cfg"))
{
File.Copy(path + "\\BepInex\\config\\me.eisbison.theotherroles.cfg", path + "\\me.eisbison.theotherroles.cfg", true);
File.Copy(gamePath + "\\BepInex\\config\\me.eisbison.theotherroles.cfg", rootPath + "\\me.eisbison.theotherroles.cfg", true);
configControll = true;
}

if (Directory.Exists(path + "\\mono")) Directory.Delete(path + "\\mono", true);
if (Directory.Exists(path + "\\BepInex")) Directory.Delete(path + "\\BepInex", true);
if (File.Exists(path + "\\winhttp.dll")) File.Delete(path + "\\winhttp.dll");
if (File.Exists(path + "\\steam_appid.txt")) File.Delete(path + "\\steam_appid.txt");
if (File.Exists(path + "\\doorstop_config.ini")) File.Delete(path + "\\doorstop_config.ini");
if (Directory.Exists(gamePath)) Directory.Delete(gamePath, true);

return true;
}

public static async Task<bool> deleteOldVersionInRoot(string gamePath)
{
if(Directory.Exists(gamePath + "\\mono")) Directory.Delete(gamePath + "\\mono", true);
if (Directory.Exists(gamePath + "\\BepInex")) Directory.Delete(gamePath + "\\BepInex", true);
if (Directory.Exists(gamePath + "\\TheOtherHats")) Directory.Delete(gamePath + "\\TheOtherHats", true);
if (File.Exists(gamePath + "\\winhttp.dll")) File.Delete(gamePath + "\\winhttp.dll");
if (File.Exists(gamePath + "\\steam_appid.txt")) File.Delete(gamePath + "\\steam_appid.txt");
if (File.Exists(gamePath + "\\doorstop_config.ini")) File.Delete(gamePath + "\\doorstop_config.ini");

return true;
}
private static bool checkInstallation()
{
string path = Properties.Settings.Default.GamePath;

if (!Directory.Exists(path) && (!Directory.Exists(path + "\\mono") || !Directory.Exists(path + "\\BepInex") || !File.Exists(path + "\\winhttp.dll") || !File.Exists(path + "\\steam_appid.txt") || !File.Exists(path + "\\doorstop_config.ini"))) return false;
if (!Directory.Exists(path) && (!Directory.Exists(path + "\\mono") || !Directory.Exists(path + "\\BepInex") || !Directory.Exists(path + "\\TheOtherHats") || !File.Exists(path + "\\winhttp.dll") || !File.Exists(path + "\\steam_appid.txt") || !File.Exists(path + "\\doorstop_config.ini"))) return false;

return true;
}
Expand Down
Loading

0 comments on commit ddebfb9

Please sign in to comment.