diff --git a/NovetusLauncher/NovetusCMD/Program.cs b/NovetusLauncher/NovetusCMD/Program.cs index 8356a53..afefde2 100644 --- a/NovetusLauncher/NovetusCMD/Program.cs +++ b/NovetusLauncher/NovetusCMD/Program.cs @@ -447,13 +447,13 @@ namespace NovetusCMD SecurityFuncs.Base64Encode(GlobalVars.RobloxPort.ToString()), SecurityFuncs.Base64Encode(GlobalVars.SelectedClient) }; - string URI = "novetus://" + SecurityFuncs.Base64Encode(string.Join("|", lines1)); + string URI = "novetus://" + SecurityFuncs.Base64Encode(string.Join("|", lines1, true)); string[] lines2 = { SecurityFuncs.Base64Encode("localhost"), SecurityFuncs.Base64Encode(GlobalVars.RobloxPort.ToString()), SecurityFuncs.Base64Encode(GlobalVars.SelectedClient) }; - string URI2 = "novetus://" + SecurityFuncs.Base64Encode(string.Join("|", lines2)); + string URI2 = "novetus://" + SecurityFuncs.Base64Encode(string.Join("|", lines2, true)); string text = GlobalVars.MultiLine( "Process ID: " + (LocalVars.ProcessID == 0 ? "N/A" : LocalVars.ProcessID.ToString()), diff --git a/NovetusLauncher/NovetusFuncs/ClientScript.cs b/NovetusLauncher/NovetusFuncs/ClientScript.cs index 790c1e0..0da9def 100644 --- a/NovetusLauncher/NovetusFuncs/ClientScript.cs +++ b/NovetusLauncher/NovetusFuncs/ClientScript.cs @@ -24,8 +24,8 @@ public class ClientScript return result; } - catch (Exception) - { + catch (Exception) when (!Env.Debugging) + { return "%donothing%"; } } diff --git a/NovetusLauncher/NovetusFuncs/LauncherFuncs.cs b/NovetusLauncher/NovetusFuncs/LauncherFuncs.cs index ceb3411..7bb310b 100644 --- a/NovetusLauncher/NovetusFuncs/LauncherFuncs.cs +++ b/NovetusLauncher/NovetusFuncs/LauncherFuncs.cs @@ -154,6 +154,7 @@ public class LauncherFuncs if (string.IsNullOrWhiteSpace(Decryptline12)) { + GenerateTripcode(); ini.IniWriteValue(section, "PlayerTripcode", SecurityFuncs.Base64Encode(GlobalVars.PlayerTripcode.ToString())); Decryptline12 = ini.IniReadValue(section, "PlayerTripcode"); } @@ -241,7 +242,7 @@ public class LauncherFuncs bool bline11 = Convert.ToBoolean(Decryptline11); GlobalVars.DisabledHelp = bline11; - if (string.IsNullOrWhiteSpace(Decryptline12)) + if (string.IsNullOrWhiteSpace(SecurityFuncs.Base64Decode(Decryptline12))) { GenerateTripcode(); Config(GlobalVars.ConfigDir + "\\" + GlobalVars.ConfigName, true); diff --git a/NovetusLauncher/NovetusFuncs/NovetusFuncs.projitems b/NovetusLauncher/NovetusFuncs/NovetusFuncs.projitems index 846caf7..5e92956 100644 --- a/NovetusLauncher/NovetusFuncs/NovetusFuncs.projitems +++ b/NovetusLauncher/NovetusFuncs/NovetusFuncs.projitems @@ -28,6 +28,7 @@ + \ No newline at end of file diff --git a/NovetusLauncher/NovetusFuncs/SecurityFuncs.cs b/NovetusLauncher/NovetusFuncs/SecurityFuncs.cs index d098fb3..44e6f0b 100644 --- a/NovetusLauncher/NovetusFuncs/SecurityFuncs.cs +++ b/NovetusLauncher/NovetusFuncs/SecurityFuncs.cs @@ -59,7 +59,8 @@ public class SecurityFuncs { try { - return base64EncodedData.Decrypt(); + string decode = base64EncodedData.Decrypt(); + return decode; } catch(Exception) { @@ -68,9 +69,17 @@ public class SecurityFuncs } } - public static string Base64Encode(string plainText) + public static string Base64Encode(string plainText, bool oldVer = false) { - return plainText.Crypt(); + if (oldVer) + { + var plainTextBytes = System.Text.Encoding.UTF8.GetBytes(plainText); + return System.Convert.ToBase64String(plainTextBytes); + } + else + { + return plainText.Crypt(); + } } public static bool IsBase64String(string s) @@ -79,16 +88,6 @@ public class SecurityFuncs return (s.Length % 4 == 0) && Regex.IsMatch(s, @"^[a-zA-Z0-9\+/]*={0,3}$", RegexOptions.None); } - public static void RegisterURLProtocol(string protocolName, string applicationPath, string description) - { - RegistryKey subKey = Registry.ClassesRoot.CreateSubKey(protocolName); - subKey.SetValue((string)null, (object)description); - subKey.SetValue("URL Protocol", (object)string.Empty); - Registry.ClassesRoot.CreateSubKey(protocolName + "\\Shell"); - Registry.ClassesRoot.CreateSubKey(protocolName + "\\Shell\\open"); - Registry.ClassesRoot.CreateSubKey(protocolName + "\\Shell\\open\\command").SetValue((string)null, (object)("\"" + applicationPath + "\" \"%1\"")); - } - public static long UnixTimeNow() { var timeSpan = (DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0)); @@ -221,8 +220,8 @@ public class SecurityFuncs string[] a3 = a2.Split('<'); ipAddress = a3[0]; } - catch (Exception) - { + catch (Exception) when (!Env.Debugging) + { ipAddress = "localhost"; } diff --git a/NovetusLauncher/NovetusFuncs/URI.cs b/NovetusLauncher/NovetusFuncs/URI.cs new file mode 100644 index 0000000..ea0a2f8 --- /dev/null +++ b/NovetusLauncher/NovetusFuncs/URI.cs @@ -0,0 +1,94 @@ +using Microsoft.Win32; +using System; +using System.Windows.Forms; + +//code based off https://stackoverflow.com/questions/35626050/registering-custom-url-handler-in-c-sharp-on-windows-8 + +namespace NovetusFuncs +{ + public class URIReg + { + private static string _Protocol = ""; + private static string _ProtocolHandler = ""; + + private static readonly string _launch = string.Format( + "{0}{1}{0} {0}%1{0}", (char)34, Application.ExecutablePath); + + private static readonly Version _win8Version = new Version(6, 2, 9200, 0); + + private static readonly bool _isWin8 = + Environment.OSVersion.Platform == PlatformID.Win32NT && + Environment.OSVersion.Version >= _win8Version; + + public URIReg(string protocol, string protocolhandle) + { + _Protocol = protocol; + _ProtocolHandler = protocolhandle; + } + + public void Register() + { + if (_isWin8) RegisterWin8(); + else RegisterWin7(); + } + + private static void RegisterWin7() + { + var regKey = Registry.ClassesRoot.CreateSubKey(_Protocol); + + regKey.CreateSubKey("DefaultIcon") + .SetValue(null, string.Format("{0}{1},1{0}", (char)34, + Application.ExecutablePath)); + + regKey.SetValue(null, "URL:" + _Protocol + " Protocol"); + regKey.SetValue("URL Protocol", ""); + + regKey = regKey.CreateSubKey(@"shell\open\command"); + regKey.SetValue(null, _launch); + } + + private static void RegisterWin8() + { + RegisterWin7(); + + var regKey = Registry.LocalMachine.CreateSubKey(@"SOFTWARE\Classes") + .CreateSubKey(_ProtocolHandler); + + regKey.SetValue(null, _Protocol); + + regKey.CreateSubKey("DefaultIcon") + .SetValue(null, string.Format("{0}{1},1{0}", (char)34, + Application.ExecutablePath)); + + regKey.CreateSubKey(@"shell\open\command").SetValue(null, _launch); + + Registry.LocalMachine.CreateSubKey(string.Format( + @"SOFTWARE\{0}\{1}\Capabilities\ApplicationDescription\URLAssociations", + Application.CompanyName, Application.ProductName)) + .SetValue(_Protocol, _ProtocolHandler); + + Registry.LocalMachine.CreateSubKey(@"SOFTWARE\RegisteredApplications") + .SetValue(Application.ProductName, string.Format( + @"SOFTWARE\{0}\Capabilities", Application.ProductName)); + } + + public void Unregister() + { + if (!_isWin8) + { + Registry.ClassesRoot.DeleteSubKeyTree(_Protocol, false); + return; + } + + // extra work required. + Registry.LocalMachine.CreateSubKey(@"SOFTWARE\Classes") + .DeleteSubKeyTree(_ProtocolHandler, false); + + Registry.LocalMachine.DeleteSubKeyTree(string.Format(@"SOFTWARE\{0}\{1}", + Application.CompanyName, Application.ProductName)); + + Registry.LocalMachine.CreateSubKey(@"SOFTWARE\RegisteredApplications") + .DeleteValue(Application.ProductName); + } + } +} diff --git a/NovetusLauncher/NovetusLauncher/CharacterCustomization.Designer.cs b/NovetusLauncher/NovetusLauncher/CharacterCustomization.Designer.cs index f57dfb3..dc4d5e9 100644 --- a/NovetusLauncher/NovetusLauncher/CharacterCustomization.Designer.cs +++ b/NovetusLauncher/NovetusLauncher/CharacterCustomization.Designer.cs @@ -2060,15 +2060,6 @@ namespace NovetusLauncher ((System.ComponentModel.ISupportInitialize)(this.pictureBox10)).BeginInit(); this.SuspendLayout(); // - // imageList1 - // - this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream"))); - this.imageList1.TransparentColor = System.Drawing.Color.Transparent; - this.imageList1.Images.SetKeyName(0, "BC.png"); - this.imageList1.Images.SetKeyName(1, "TBC.png"); - this.imageList1.Images.SetKeyName(2, "OBC.png"); - this.imageList1.ImageSize = new System.Drawing.Size(32,32); - // // tabControl1 // this.tabControl1.Controls.Add(this.tabPage1); @@ -3437,8 +3428,7 @@ namespace NovetusLauncher // button54 // this.button54.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.button54.ImageKey = "OBC.png"; - this.button54.ImageList = this.imageList1; + this.button54.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("OBC_legacy"))); this.button54.Location = new System.Drawing.Point(231, 31); this.button54.Name = "button54"; this.button54.Size = new System.Drawing.Size(52, 62); @@ -3451,8 +3441,7 @@ namespace NovetusLauncher // button53 // this.button53.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.button53.ImageKey = "TBC.png"; - this.button53.ImageList = this.imageList1; + this.button53.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("TBC_legacy"))); this.button53.Location = new System.Drawing.Point(174, 31); this.button53.Name = "button53"; this.button53.Size = new System.Drawing.Size(52, 62); @@ -3465,8 +3454,7 @@ namespace NovetusLauncher // button52 // this.button52.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.button52.ImageKey = "BC.png"; - this.button52.ImageList = this.imageList1; + this.button52.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("BC_legacy"))); this.button52.Location = new System.Drawing.Point(116, 31); this.button52.Name = "button52"; this.button52.Size = new System.Drawing.Size(52, 62); @@ -3670,7 +3658,7 @@ namespace NovetusLauncher private System.Windows.Forms.Button button80; private System.Windows.Forms.Button button79; private System.Windows.Forms.Panel panel2; - private System.Windows.Forms.ImageList imageList1; + public System.Windows.Forms.ImageList imageList1; private System.Windows.Forms.Button button83; private System.Windows.Forms.Button button82; private System.Windows.Forms.Button button81; diff --git a/NovetusLauncher/NovetusLauncher/CharacterCustomization.cs b/NovetusLauncher/NovetusLauncher/CharacterCustomization.cs index be1bd7b..5dd4676 100644 --- a/NovetusLauncher/NovetusLauncher/CharacterCustomization.cs +++ b/NovetusLauncher/NovetusLauncher/CharacterCustomization.cs @@ -40,10 +40,10 @@ namespace NovetusLauncher } else { - Size = new Size(477, 272); - panel2.Visible = false; + Size = new Size(493, 311); } + // // TODO: Add constructor code after the InitializeComponent() call. // diff --git a/NovetusLauncher/NovetusLauncher/CharacterCustomization.resx b/NovetusLauncher/NovetusLauncher/CharacterCustomization.resx index 2eb2392..acd01ce 100644 --- a/NovetusLauncher/NovetusLauncher/CharacterCustomization.resx +++ b/NovetusLauncher/NovetusLauncher/CharacterCustomization.resx @@ -117,15 +117,16 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + 17, 17 - + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACe - OAAAAk1TRnQBSQFMAgEBAwEAAWABAAFgAQABQAEAAUABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + OAAAAk1TRnQBSQFMAgEBAwEAAWABAAFkAQABQAEAAUABAAT/AQkBEAj/AUIBTQE2AQQGAAE2AQQCAAEo BAABAQIAAUADAAEBAQABCAYAAUAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -366,10 +367,9 @@ AQABPAEDAf8B4AYAAX8B/wHABAABHwH/CAAD/wHwAQABPgEDAf8B8AEAAQEB/gMAAv8B4AQAAT8B/wgA A/8B+AEAAX4BAwH/AfgBAAEDAfwBBwH/Ac8C/wHwBAABPwH/CAAD/wH7AQAB/wEDAf8B/AEAAQcB/AEP BP8B+AEAAQcCAAF/Af8IAAb/AQcB/wH8AQABDwH4AQ8E/wH8AQABHwHAAQEC/wgACf8BAAEfAfwBHwX/ - AQABfwH4AQcC/wgACf8BgAF/Af4BPwv/CAAY/wgAGP8IABj/CAAL + AQABfwH4AQcC/wgACf8BgAF/Af4BPwv/CAAY/wgAGP8IABj/HgAL - AAABAAYAAAAAAAEAIADtggAAZgAAAICAAAABACAAKAgBAFODAABAQAAAAQAgAChCAAB7iwEAMDAAAAEA @@ -2595,4 +2595,14 @@ 4wAA//8AAP//AAA= + + + Resources\BC_legacy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Resources\OBC_legacy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Resources\TBC_legacy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/NovetusLauncher/NovetusLauncher/MainForm.Designer.cs b/NovetusLauncher/NovetusLauncher/MainForm.Designer.cs index 602ba63..184e453 100644 --- a/NovetusLauncher/NovetusLauncher/MainForm.Designer.cs +++ b/NovetusLauncher/NovetusLauncher/MainForm.Designer.cs @@ -157,7 +157,6 @@ namespace NovetusLauncher this.panel3 = new System.Windows.Forms.Panel(); this.panel4 = new System.Windows.Forms.Panel(); this.button35 = new System.Windows.Forms.Button(); - this.SettingsButton = new System.Windows.Forms.Button(); this.UAButton = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.panel1.SuspendLayout(); diff --git a/NovetusLauncher/NovetusLauncher/MainForm.cs b/NovetusLauncher/NovetusLauncher/MainForm.cs index 7256ab5..8c4dae7 100644 --- a/NovetusLauncher/NovetusLauncher/MainForm.cs +++ b/NovetusLauncher/NovetusLauncher/MainForm.cs @@ -238,13 +238,13 @@ namespace NovetusLauncher SecurityFuncs.Base64Encode(GlobalVars.RobloxPort.ToString()), SecurityFuncs.Base64Encode(GlobalVars.SelectedClient) }; - string URI = "novetus://" + SecurityFuncs.Base64Encode(string.Join("|", lines1)); + string URI = "novetus://" + SecurityFuncs.Base64Encode(string.Join("|", lines1), true); string[] lines2 = { SecurityFuncs.Base64Encode("localhost"), SecurityFuncs.Base64Encode(GlobalVars.RobloxPort.ToString()), SecurityFuncs.Base64Encode(GlobalVars.SelectedClient) }; - string URI2 = "novetus://" + SecurityFuncs.Base64Encode(string.Join("|", lines2)); + string URI2 = "novetus://" + SecurityFuncs.Base64Encode(string.Join("|", lines2), true); string[] text = { "Client: " + GlobalVars.SelectedClient, "IP: " + IP, @@ -602,7 +602,7 @@ namespace NovetusLauncher LauncherFuncs.Config(GlobalVars.ConfigDir + "\\" + GlobalVars.ConfigName, true); ConsolePrint("Config Saved.", 3); } - + void WriteCustomizationValues() { LauncherFuncs.Customization(GlobalVars.ConfigDir + "\\" + GlobalVars.ConfigNameCustomization, true); diff --git a/NovetusLauncher/NovetusLauncher/NovetusLauncher.csproj b/NovetusLauncher/NovetusLauncher/NovetusLauncher.csproj index 781ba1e..7995c5d 100644 --- a/NovetusLauncher/NovetusLauncher/NovetusLauncher.csproj +++ b/NovetusLauncher/NovetusLauncher/NovetusLauncher.csproj @@ -11,7 +11,8 @@ Properties - Resources\NovetusIcon.ico + + False False False @@ -256,6 +257,30 @@ true + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NovetusLauncher/NovetusLauncher/Resources/BC_legacy.png b/NovetusLauncher/NovetusLauncher/Resources/BC_legacy.png new file mode 100644 index 0000000..dc2ec18 Binary files /dev/null and b/NovetusLauncher/NovetusLauncher/Resources/BC_legacy.png differ diff --git a/NovetusLauncher/NovetusLauncher/Resources/OBC_legacy.png b/NovetusLauncher/NovetusLauncher/Resources/OBC_legacy.png new file mode 100644 index 0000000..dc2822b Binary files /dev/null and b/NovetusLauncher/NovetusLauncher/Resources/OBC_legacy.png differ diff --git a/NovetusLauncher/NovetusLauncher/Resources/TBC_legacy.png b/NovetusLauncher/NovetusLauncher/Resources/TBC_legacy.png new file mode 100644 index 0000000..33b8a69 Binary files /dev/null and b/NovetusLauncher/NovetusLauncher/Resources/TBC_legacy.png differ diff --git a/NovetusLauncher/NovetusLauncher/SDK/ClientinfoCreator.Designer.cs b/NovetusLauncher/NovetusLauncher/SDK/ClientinfoCreator.Designer.cs index a6dd92d..96cf306 100644 --- a/NovetusLauncher/NovetusLauncher/SDK/ClientinfoCreator.Designer.cs +++ b/NovetusLauncher/NovetusLauncher/SDK/ClientinfoCreator.Designer.cs @@ -211,6 +211,7 @@ namespace NovetusLauncher // // textBox2 // + this.textBox2.BackColor = System.Drawing.SystemColors.Control; this.textBox2.Location = new System.Drawing.Point(309, 68); this.textBox2.Name = "textBox2"; this.textBox2.ReadOnly = true; @@ -302,28 +303,28 @@ namespace NovetusLauncher // newToolStripMenuItem // this.newToolStripMenuItem.Name = "newToolStripMenuItem"; - this.newToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.newToolStripMenuItem.Size = new System.Drawing.Size(157, 22); this.newToolStripMenuItem.Text = "New"; this.newToolStripMenuItem.Click += new System.EventHandler(this.NewToolStripMenuItemClick); // // loadToolStripMenuItem // this.loadToolStripMenuItem.Name = "loadToolStripMenuItem"; - this.loadToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadToolStripMenuItem.Size = new System.Drawing.Size(157, 22); this.loadToolStripMenuItem.Text = "Load"; this.loadToolStripMenuItem.Click += new System.EventHandler(this.LoadToolStripMenuItemClick); // // saveToolStripMenuItem // this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - this.saveToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.saveToolStripMenuItem.Size = new System.Drawing.Size(157, 22); this.saveToolStripMenuItem.Text = "Save"; this.saveToolStripMenuItem.Click += new System.EventHandler(this.SaveToolStripMenuItemClick); // // saveAsTextFileToolStripMenuItem // this.saveAsTextFileToolStripMenuItem.Name = "saveAsTextFileToolStripMenuItem"; - this.saveAsTextFileToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.saveAsTextFileToolStripMenuItem.Size = new System.Drawing.Size(157, 22); this.saveAsTextFileToolStripMenuItem.Text = "Save as Text File"; this.saveAsTextFileToolStripMenuItem.Click += new System.EventHandler(this.saveAsTextFileToolStripMenuItem_Click); // @@ -346,7 +347,7 @@ namespace NovetusLauncher this.studioToolStripMenuItem, this.no3dToolStripMenuItem}); this.tagsToolStripMenuItem.Name = "tagsToolStripMenuItem"; - this.tagsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.tagsToolStripMenuItem.Size = new System.Drawing.Size(157, 22); this.tagsToolStripMenuItem.Text = "Add Tags"; // // clientToolStripMenuItem @@ -394,7 +395,7 @@ namespace NovetusLauncher this.debuggingToolStripMenuItem, this.argsToolStripMenuItem}); this.variablesToolStripMenuItem.Name = "variablesToolStripMenuItem"; - this.variablesToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.variablesToolStripMenuItem.Size = new System.Drawing.Size(157, 22); this.variablesToolStripMenuItem.Text = "Add Variables"; // // generalToolStripMenuItem @@ -946,7 +947,7 @@ namespace NovetusLauncher // documentationToolStripMenuItem1 // this.documentationToolStripMenuItem1.Name = "documentationToolStripMenuItem1"; - this.documentationToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); + this.documentationToolStripMenuItem1.Size = new System.Drawing.Size(157, 22); this.documentationToolStripMenuItem1.Text = "Documentation"; this.documentationToolStripMenuItem1.Click += new System.EventHandler(this.documentationToolStripMenuItem_Click); // diff --git a/NovetusLauncher/NovetusLauncher/SDK/ClientinfoCreator.cs b/NovetusLauncher/NovetusLauncher/SDK/ClientinfoCreator.cs index 5eb70a6..3aff4b2 100644 --- a/NovetusLauncher/NovetusLauncher/SDK/ClientinfoCreator.cs +++ b/NovetusLauncher/NovetusLauncher/SDK/ClientinfoCreator.cs @@ -146,6 +146,7 @@ namespace NovetusLauncher if (!string.IsNullOrWhiteSpace(ClientMD5)) { textBox2.Text = ClientMD5.ToUpper(CultureInfo.InvariantCulture); + textBox2.BackColor = System.Drawing.Color.Lime; SelectedClientMD5 = textBox2.Text.ToUpper(CultureInfo.InvariantCulture); } else @@ -158,6 +159,7 @@ namespace NovetusLauncher if (!string.IsNullOrWhiteSpace(ClientScriptMD5)) { textBox3.Text = ClientScriptMD5.ToUpper(CultureInfo.InvariantCulture); + textBox3.BackColor = System.Drawing.Color.Lime; SelectedClientScriptMD5 = textBox3.Text.ToUpper(CultureInfo.InvariantCulture); } else @@ -230,6 +232,8 @@ namespace NovetusLauncher textBox1.Text = SelectedClientDesc; textBox4.Text = CustomArgs; textBox5.Text = Warning; + textBox2.BackColor = System.Drawing.SystemColors.Control; + textBox3.BackColor = System.Drawing.SystemColors.Control; } void LoadToolStripMenuItemClick(object sender, EventArgs e) @@ -335,6 +339,8 @@ namespace NovetusLauncher textBox5.Text = Warning; } } + textBox2.BackColor = System.Drawing.SystemColors.Control; + textBox3.BackColor = System.Drawing.SystemColors.Control; } void SaveToolStripMenuItemClick(object sender, EventArgs e) @@ -367,6 +373,8 @@ namespace NovetusLauncher } label9.Text = "v2"; + textBox2.BackColor = System.Drawing.SystemColors.Control; + textBox3.BackColor = System.Drawing.SystemColors.Control; } void TextBox4TextChanged(object sender, EventArgs e) diff --git a/NovetusLauncher/NovetusURI/Form1.cs b/NovetusLauncher/NovetusURI/Form1.cs index ef3d0bd..cc01fec 100644 --- a/NovetusLauncher/NovetusURI/Form1.cs +++ b/NovetusLauncher/NovetusURI/Form1.cs @@ -1,5 +1,6 @@ using System; using System.Windows.Forms; +using NovetusFuncs; namespace NovetusURI { @@ -16,8 +17,8 @@ namespace NovetusURI { try { - string loadstring = GlobalVars.BasePath + "/" + AppDomain.CurrentDomain.FriendlyName; - SecurityFuncs.RegisterURLProtocol("Novetus", loadstring, "Novetus URI"); + URIReg novURI = new URIReg("novetus","url.novetus"); + novURI.Register(); MessageBox.Show("URI successfully installed and registered!", "Novetus - Install URI", MessageBoxButtons.OK, MessageBoxIcon.Information); } diff --git a/NovetusLauncher/NovetusURI/Properties/AssemblyInfo.cs b/NovetusLauncher/NovetusURI/Properties/AssemblyInfo.cs index 672529f..7f542a1 100644 --- a/NovetusLauncher/NovetusURI/Properties/AssemblyInfo.cs +++ b/NovetusLauncher/NovetusURI/Properties/AssemblyInfo.cs @@ -5,12 +5,12 @@ using System.Runtime.InteropServices; // 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("NovetusURI")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyTitle("Novetus URI")] +[assembly: AssemblyDescription("URI registration utility for Novetus")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("NovetusURI")] -[assembly: AssemblyCopyright("Copyright © 2020")] +[assembly: AssemblyCompany("Bitl")] +[assembly: AssemblyProduct("Novetus")] +[assembly: AssemblyCopyright("(c) Bitl 2018-2020. All rights to ROBLOX go to the ROBLOX Corporation.")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -19,9 +19,6 @@ using System.Runtime.InteropServices; // 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("2070eaa6-7606-4006-a628-5705c24a3644")] - // Version information for an assembly consists of the following four values: // // Major Version @@ -32,5 +29,4 @@ using System.Runtime.InteropServices; // 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")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.0.*")] diff --git a/NovetusLauncher/NovetusURI/URI/LoaderForm.cs b/NovetusLauncher/NovetusURI/URI/LoaderForm.cs index 8498f0a..8773313 100644 --- a/NovetusLauncher/NovetusURI/URI/LoaderForm.cs +++ b/NovetusLauncher/NovetusURI/URI/LoaderForm.cs @@ -114,7 +114,7 @@ namespace NovetusURI void StartGame() { string ExtractedArg = GlobalVars.SharedArgs.Replace("novetus://", "").Replace("novetus", "").Replace(":", "").Replace("/", "").Replace("?", ""); - string ConvertedArg = SecurityFuncs.Base64Decode(ExtractedArg); + string ConvertedArg = SecurityFuncs.Base64DecodeOld(ExtractedArg); string[] SplitArg = ConvertedArg.Split('|'); string ip = SecurityFuncs.Base64Decode(SplitArg[0]); string port = SecurityFuncs.Base64Decode(SplitArg[1]); @@ -225,6 +225,7 @@ namespace NovetusURI } else { + Visible = true; if (GlobalVars.DiscordPresence) { label1.Text = "Starting Discord Rich Presence...";