Skip to content
This repository has been archived by the owner on Dec 17, 2021. It is now read-only.

Commit

Permalink
Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Frityet committed Mar 2, 2021
1 parent 420e74b commit 8d1b4a9
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 29 deletions.
20 changes: 0 additions & 20 deletions H3VRModInstaller.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30804.86
MinimumVisualStudioVersion = 15.0.26124.0
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "src", "src\src.csproj", "{AC11A672-4EFB-475F-AFFC-5FFD9B3F8F52}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModInstaller", "ModInstaller\ModInstaller.csproj", "{6DE815FF-A6FE-46F0-9F0F-A627B734A12C}"
EndProject
Global
Expand All @@ -20,24 +18,6 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{AC11A672-4EFB-475F-AFFC-5FFD9B3F8F52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AC11A672-4EFB-475F-AFFC-5FFD9B3F8F52}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AC11A672-4EFB-475F-AFFC-5FFD9B3F8F52}.Debug|x64.ActiveCfg = Debug|Any CPU
{AC11A672-4EFB-475F-AFFC-5FFD9B3F8F52}.Debug|x64.Build.0 = Debug|Any CPU
{AC11A672-4EFB-475F-AFFC-5FFD9B3F8F52}.Debug|x86.ActiveCfg = Debug|Any CPU
{AC11A672-4EFB-475F-AFFC-5FFD9B3F8F52}.Debug|x86.Build.0 = Debug|Any CPU
{AC11A672-4EFB-475F-AFFC-5FFD9B3F8F52}.OneFile|Any CPU.ActiveCfg = Debug|Any CPU
{AC11A672-4EFB-475F-AFFC-5FFD9B3F8F52}.OneFile|Any CPU.Build.0 = Debug|Any CPU
{AC11A672-4EFB-475F-AFFC-5FFD9B3F8F52}.OneFile|x64.ActiveCfg = Debug|Any CPU
{AC11A672-4EFB-475F-AFFC-5FFD9B3F8F52}.OneFile|x64.Build.0 = Debug|Any CPU
{AC11A672-4EFB-475F-AFFC-5FFD9B3F8F52}.OneFile|x86.ActiveCfg = Debug|Any CPU
{AC11A672-4EFB-475F-AFFC-5FFD9B3F8F52}.OneFile|x86.Build.0 = Debug|Any CPU
{AC11A672-4EFB-475F-AFFC-5FFD9B3F8F52}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AC11A672-4EFB-475F-AFFC-5FFD9B3F8F52}.Release|Any CPU.Build.0 = Release|Any CPU
{AC11A672-4EFB-475F-AFFC-5FFD9B3F8F52}.Release|x64.ActiveCfg = Release|Any CPU
{AC11A672-4EFB-475F-AFFC-5FFD9B3F8F52}.Release|x64.Build.0 = Release|Any CPU
{AC11A672-4EFB-475F-AFFC-5FFD9B3F8F52}.Release|x86.ActiveCfg = Release|Any CPU
{AC11A672-4EFB-475F-AFFC-5FFD9B3F8F52}.Release|x86.Build.0 = Release|Any CPU
{6DE815FF-A6FE-46F0-9F0F-A627B734A12C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6DE815FF-A6FE-46F0-9F0F-A627B734A12C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6DE815FF-A6FE-46F0-9F0F-A627B734A12C}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down
4 changes: 2 additions & 2 deletions ModInstaller/Backend/Net/Downloader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public static string DLprogress
/// <param name="autoredownload">Auto redownload?</param>
/// <param name="skipdl">Skips the download process, mostly used for debugging</param>
/// <returns>Boolean, true</returns>
public static bool DownloadMod(ModFile fileinfo, int modnum, bool autoredownload = false, bool skipdl = false)
public bool DownloadMod(ModFile fileinfo, int modnum, bool autoredownload = false, bool skipdl = false)
{
if (skipdl) //lol this can never be reached since 5.0 -- potatoes
{
Expand Down Expand Up @@ -145,7 +145,7 @@ public static void Dlprogress(object sender, DownloadProgressChangedEventArgs e)
/// <param name="mod">Mod to direct</param>
/// <param name="skipdl">Skips the download process</param>
/// <returns>Boolean, true</returns>
public static bool DownloadModDirector(string mod, bool skipdl = false)
public bool DownloadModDirector(string mod, bool skipdl = false)
{
if (!NetCheck.isOnline(ModInstallerCommon.Pingsite))
{
Expand Down
6 changes: 3 additions & 3 deletions ModInstaller/Form1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ namespace H3VRModInstaller
public partial class mainwindow : Form //AAA I FUCKING HATE THIS FILE IT GODDAMN HAUNTS MY DREAMS --potatoes
{ //just a note; this file has reached its peak. after v1.1 im going to rewrite the fuck out of this shit, i've had it. i no longer understand what the fuck is going on here. --potatoes
private static string publicdispcat = "n/a";

public string[] command;

public string[] impModID = new string[0];
Expand Down Expand Up @@ -302,12 +303,11 @@ private void Terminator_RunWorkerCompleted(object sender, RunWorkerCompletedEven
downloadedMod = InstalledModsList.SelectedItems[0].SubItems[4].Text;
}
catch
{
}
{ }
} //probably the stupidest bodge i've ever done lel --potatoes

UpdateModList();
// MessageBox.Show("Sucessfully " + command[0] + $"ed mod {downloadedMod}", "Sucess!", MessageBoxButtons.OK, MessageBoxIcon.Information);
MessageBox.Show("Sucessfully " + command[0] + $"ed mod {downloadedMod}", "Sucess!", MessageBoxButtons.OK, MessageBoxIcon.Information);
StatusReport.Text = "Ready!";
}

Expand Down
5 changes: 3 additions & 2 deletions ModInstaller/MainClass.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,14 @@ public static void doCommand(string inputstring)
///
public static void doCommand(string[] inputargs)
{
for (int repeat = 1; repeat < inputargs.Length; repeat++)
for (var repeat = 1; repeat < inputargs.Length; repeat++)
{
Console.WriteLine("doing {0} {1}", inputargs[0], inputargs[repeat]);
switch (inputargs[0])
{
case "dl":
Downloader.DownloadModDirector(inputargs[repeat]);
var dl = new Downloader();
dl.DownloadModDirector(inputargs[repeat]);
break;
//deletion
case "rm":
Expand Down
3 changes: 1 addition & 2 deletions ModInstaller/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ private static void Main()
Application.SetHighDpiMode(HighDpiMode.SystemAware);
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
mainwindow mainform = new mainwindow();
mainform.KeyPreview = true;
var mainform = new mainwindow {KeyPreview = true};
Application.Run(mainform);
//end initialization
}
Expand Down

0 comments on commit 8d1b4a9

Please sign in to comment.