diff --git a/ARCHBLOXLauncher_XP/ARCHBLOXLauncher_XP.csproj b/ARCHBLOXLauncher_XP/ARCHBLOXLauncher_XP.csproj index d2da8c8..1629c06 100644 --- a/ARCHBLOXLauncher_XP/ARCHBLOXLauncher_XP.csproj +++ b/ARCHBLOXLauncher_XP/ARCHBLOXLauncher_XP.csproj @@ -1,36 +1,22 @@  - - + Debug - AnyCPU - {8DF23FBD-B288-40AF-B820-67F6BE8F7D94} + x86 + 8.0.30703 + 2.0 + {11134DDF-A25D-4EF8-89A6-1A1BF2310F07} WinExe + Properties ARCHBLOXLauncher_XP ARCHBLOXLauncher_XP v4.0 + + 512 - true - false - C:\Users\Thomas\OneDrive\Documents\ARCHBLOXLauncherLegacy\ - true - Disk - false - Foreground - 7 - Days - false - false - true - true - 2 - 1.0.0.%2a - false - true - true - - AnyCPU + + x86 true full false @@ -39,27 +25,15 @@ prompt 4 - - AnyCPU + + x86 pdbonly true - ..\..\..\..\OneDrive\Documents\ARCHBLOXLauncherLegacy\ + bin\Release\ TRACE prompt 4 - - 75BD841DDF4341CEB3C0CB2CF037AB995CBA742B - - - ARCHBLOXLauncher_XP_TemporaryKey.pfx - - - true - - - true - @@ -74,21 +48,21 @@ + + Form + + + Form2.cs + + Form Form1.cs - - Form - - - Form2.cs - - Form1.cs @@ -105,7 +79,7 @@ Resources.resx True - + SettingsSingleFileGenerator Settings.Designer.cs @@ -115,28 +89,33 @@ Settings.settings True + - + + {50A7E9B0-70EF-11D1-B75A-00A0C90564FE} + 1 + 0 + 0 + tlbimp + False + True + - - - - - - - - - - - - - - False - .NET Framework 3.5 SP1 - false - + + + + + + + \ No newline at end of file diff --git a/ARCHBLOXLauncher_XP/ARCHBLOXLauncher_XP.sln b/ARCHBLOXLauncher_XP/ARCHBLOXLauncher_XP.sln new file mode 100644 index 0000000..3469395 --- /dev/null +++ b/ARCHBLOXLauncher_XP/ARCHBLOXLauncher_XP.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual C# Express 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ARCHBLOXLauncher_XP", "ARCHBLOXLauncher_XP\ARCHBLOXLauncher_XP.csproj", "{11134DDF-A25D-4EF8-89A6-1A1BF2310F07}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x86 = Debug|x86 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {11134DDF-A25D-4EF8-89A6-1A1BF2310F07}.Debug|x86.ActiveCfg = Debug|x86 + {11134DDF-A25D-4EF8-89A6-1A1BF2310F07}.Debug|x86.Build.0 = Debug|x86 + {11134DDF-A25D-4EF8-89A6-1A1BF2310F07}.Release|x86.ActiveCfg = Release|x86 + {11134DDF-A25D-4EF8-89A6-1A1BF2310F07}.Release|x86.Build.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/ARCHBLOXLauncher_XP/Extensions.cs b/ARCHBLOXLauncher_XP/Extensions.cs index 3baaffc..1f10983 100644 --- a/ARCHBLOXLauncher_XP/Extensions.cs +++ b/ARCHBLOXLauncher_XP/Extensions.cs @@ -1,4 +1,5 @@ using System; +using System.IO; namespace ARCHBLOXLauncher_XP { @@ -10,5 +11,23 @@ namespace ARCHBLOXLauncher_XP { return System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName; } + + public static void UnZip(string zipFile, string folderPath) + { + if (!File.Exists(zipFile)) + throw new FileNotFoundException(); + + if (!Directory.Exists(folderPath)) + Directory.CreateDirectory(folderPath); + + Shell32.Shell objShell = new Shell32.Shell(); + Shell32.Folder destinationFolder = objShell.NameSpace(folderPath); + Shell32.Folder sourceFile = objShell.NameSpace(zipFile); + + foreach (var file in sourceFile.Items()) + { + destinationFolder.CopyHere(file, 4 | 16); + } + } } } \ No newline at end of file diff --git a/ARCHBLOXLauncher_XP/Form1.cs b/ARCHBLOXLauncher_XP/Form1.cs index 3bbc042..514f311 100644 --- a/ARCHBLOXLauncher_XP/Form1.cs +++ b/ARCHBLOXLauncher_XP/Form1.cs @@ -1,6 +1,4 @@ using System; -using System.ComponentModel; -using System.Drawing; using System.Text; using System.Diagnostics; using System.Windows.Forms; @@ -14,7 +12,7 @@ namespace ARCHBLOXLauncher_XP bool rbxl = false; bool exitafterarg = false; private static WebClient wc = new WebClient(); - static byte[] raw = wc.DownloadData("https://archblox.com/client/version.txt"); + static byte[] raw = wc.DownloadData("http://archblox.com/client/version.txt"); static string webData = Encoding.UTF8.GetString(raw); static string version_string = webData; static string folderPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"Archblx\", @"Versions\"); diff --git a/ARCHBLOXLauncher_XP/Form2.cs b/ARCHBLOXLauncher_XP/Form2.cs index 5d39a20..410e686 100644 --- a/ARCHBLOXLauncher_XP/Form2.cs +++ b/ARCHBLOXLauncher_XP/Form2.cs @@ -30,7 +30,7 @@ namespace ARCHBLOXLauncher_XP InitializeComponent(); // setup other variables try { - wc.DownloadData("https://archblox.com/client/version.txt"); + wc.DownloadData("http://archblox.com/client/version.txt"); } catch { @@ -38,12 +38,12 @@ namespace ARCHBLOXLauncher_XP label1.Text = "Cancelled install."; return; } - byte[] raw = wc.DownloadData("https://archblox.com/client/version.txt"); + byte[] raw = wc.DownloadData("http://archblox.com/client/version.txt"); string webData = Encoding.UTF8.GetString(raw); string version_string = webData; string folderPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"Archblx\", @"Versions\"); string clientPath = Path.Combine(folderPath, version_string + @"\"); - string filePath = Path.Combine(clientPath, Path.GetFileName(@"https://archblox.com/client/" + version_string + ".zip")); + string filePath = Path.Combine(clientPath, Path.GetFileName(@"http://archblox.com/client/" + version_string + ".zip")); // setup file paths etc { if (Directory.Exists(folderPath)) @@ -85,7 +85,7 @@ namespace ARCHBLOXLauncher_XP { // continue with install Directory.CreateDirectory(clientPath); - wc.DownloadFileAsync(new Uri(@"https://archblox.com/client/" + version_string + ".zip"), filePath); + wc.DownloadFileAsync(new Uri(@"http://archblox.com/client/" + version_string + ".zip"), filePath); progressBar1.Style = ProgressBarStyle.Blocks; handle.WaitOne(); } @@ -96,13 +96,13 @@ namespace ARCHBLOXLauncher_XP { // the download has completed, extract zip, setup URI. IsCompleted = true; - byte[] raw = wc.DownloadData("https://archblox.com/client/version.txt"); + byte[] raw = wc.DownloadData("http://archblox.com/client/version.txt"); string webData = Encoding.UTF8.GetString(raw); string version_string = webData; string folderPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"Archblx\", @"Versions\"); string clientPath = Path.Combine(folderPath, version_string + @"\"); - string filePath = Path.Combine(clientPath, Path.GetFileName(@"https://archblox.com/client/" + version_string + ".zip")); - // ZipFile(filePath, clientPath); + string filePath = Path.Combine(clientPath, Path.GetFileName(@"http://archblox.com/client/" + version_string + ".zip")); + Extensions.UnZip(filePath, clientPath); File.Delete(filePath); label1.Text = "Installing URi..."; try diff --git a/ARCHBLOXLauncher_XP/Properties/AssemblyInfo.cs b/ARCHBLOXLauncher_XP/Properties/AssemblyInfo.cs index d572e5a..6b66868 100644 --- a/ARCHBLOXLauncher_XP/Properties/AssemblyInfo.cs +++ b/ARCHBLOXLauncher_XP/Properties/AssemblyInfo.cs @@ -2,34 +2,34 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("ARCHBLOXLauncher_XP")] +[assembly: AssemblyTitle("WindowsFormsApplication1")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ARCHBLOXLauncher_XP")] +[assembly: AssemblyProduct("WindowsFormsApplication1")] [assembly: AssemblyCopyright("Copyright © 2022")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("8df23fbd-b288-40af-b820-67f6be8f7d94")] +[assembly: Guid("17e4483b-21d9-4182-9390-3738ffe7e059")] // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // -// You can specify all the values or you can default the Build and Revision Numbers +// You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] diff --git a/ARCHBLOXLauncher_XP/Properties/Resources.Designer.cs b/ARCHBLOXLauncher_XP/Properties/Resources.Designer.cs index eb9d889..e14f262 100644 --- a/ARCHBLOXLauncher_XP/Properties/Resources.Designer.cs +++ b/ARCHBLOXLauncher_XP/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Runtime Version:4.0.30319.1 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace ARCHBLOXLauncher_XP.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -60,9 +60,6 @@ namespace ARCHBLOXLauncher_XP.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// internal static System.Drawing.Bitmap archblox { get { object obj = ResourceManager.GetObject("archblox", resourceCulture); @@ -70,9 +67,6 @@ namespace ARCHBLOXLauncher_XP.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// internal static System.Drawing.Bitmap archbloxlowres { get { object obj = ResourceManager.GetObject("archbloxlowres", resourceCulture); @@ -80,9 +74,6 @@ namespace ARCHBLOXLauncher_XP.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// internal static System.Drawing.Bitmap buttonblue200 { get { object obj = ResourceManager.GetObject("buttonblue200", resourceCulture); @@ -90,9 +81,6 @@ namespace ARCHBLOXLauncher_XP.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// internal static System.Drawing.Bitmap buttongreen200 { get { object obj = ResourceManager.GetObject("buttongreen200", resourceCulture); @@ -100,9 +88,13 @@ namespace ARCHBLOXLauncher_XP.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// + internal static byte[] Thumbs { + get { + object obj = ResourceManager.GetObject("Thumbs", resourceCulture); + return ((byte[])(obj)); + } + } + internal static System.Drawing.Bitmap unknown { get { object obj = ResourceManager.GetObject("unknown", resourceCulture); diff --git a/ARCHBLOXLauncher_XP/Properties/Resources.resx b/ARCHBLOXLauncher_XP/Properties/Resources.resx index 06f52d8..6bfbc42 100644 --- a/ARCHBLOXLauncher_XP/Properties/Resources.resx +++ b/ARCHBLOXLauncher_XP/Properties/Resources.resx @@ -118,19 +118,22 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\buttongreen200.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\buttonblue200.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\unknown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\archblox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\archbloxlowres.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\archblox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\buttonblue200.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\buttongreen200.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Thumbs.db;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\unknown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/ARCHBLOXLauncher_XP/Properties/Settings.Designer.cs b/ARCHBLOXLauncher_XP/Properties/Settings.Designer.cs index cbc4232..6c9d14c 100644 --- a/ARCHBLOXLauncher_XP/Properties/Settings.Designer.cs +++ b/ARCHBLOXLauncher_XP/Properties/Settings.Designer.cs @@ -1,27 +1,24 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Runtime Version:4.0.30319.1 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ - -namespace ARCHBLOXLauncher_XP.Properties -{ +namespace ARCHBLOXLauncher_XP.Properties { + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { + + public static Settings Default { + get { return defaultInstance; } } diff --git a/ARCHBLOXLauncher_XP/Resources/Thumbs.db b/ARCHBLOXLauncher_XP/Resources/Thumbs.db new file mode 100644 index 0000000..1ee1d70 Binary files /dev/null and b/ARCHBLOXLauncher_XP/Resources/Thumbs.db differ diff --git a/ARCHBLOXLauncher_XP/app.config b/ARCHBLOXLauncher_XP/app.config new file mode 100644 index 0000000..e365603 --- /dev/null +++ b/ARCHBLOXLauncher_XP/app.config @@ -0,0 +1,3 @@ + + + diff --git a/ARCHBLOXLauncher_XP/archblox.ico b/ARCHBLOXLauncher_XP/archblox.ico new file mode 100644 index 0000000..613dd2d Binary files /dev/null and b/ARCHBLOXLauncher_XP/archblox.ico differ