From a88c23ddfd6a9422c0f43a7f29e368df4ab0b168 Mon Sep 17 00:00:00 2001 From: Bitl Date: Fri, 15 May 2020 14:16:09 -0700 Subject: [PATCH] bugfixes --- NovetusLauncher/NovetusCMD/Program.cs | 4 +- NovetusLauncher/NovetusFuncs/ClientScript.cs | 4 +- NovetusLauncher/NovetusFuncs/LauncherFuncs.cs | 3 +- .../NovetusFuncs/NovetusFuncs.projitems | 1 + NovetusLauncher/NovetusFuncs/SecurityFuncs.cs | 29 +++--- NovetusLauncher/NovetusFuncs/URI.cs | 94 ++++++++++++++++++ .../CharacterCustomization.Designer.cs | 20 +--- .../NovetusLauncher/CharacterCustomization.cs | 4 +- .../CharacterCustomization.resx | 20 +++- .../NovetusLauncher/MainForm.Designer.cs | 1 - NovetusLauncher/NovetusLauncher/MainForm.cs | 6 +- .../NovetusLauncher/NovetusLauncher.csproj | 27 ++++- .../NovetusLauncher/Resources/BC_legacy.png | Bin 0 -> 2489 bytes .../NovetusLauncher/Resources/OBC_legacy.png | Bin 0 -> 2587 bytes .../NovetusLauncher/Resources/TBC_legacy.png | Bin 0 -> 2853 bytes .../SDK/ClientinfoCreator.Designer.cs | 15 +-- .../NovetusLauncher/SDK/ClientinfoCreator.cs | 8 ++ NovetusLauncher/NovetusURI/Form1.cs | 5 +- .../NovetusURI/Properties/AssemblyInfo.cs | 16 ++- NovetusLauncher/NovetusURI/URI/LoaderForm.cs | 3 +- 20 files changed, 192 insertions(+), 68 deletions(-) create mode 100644 NovetusLauncher/NovetusFuncs/URI.cs create mode 100644 NovetusLauncher/NovetusLauncher/Resources/BC_legacy.png create mode 100644 NovetusLauncher/NovetusLauncher/Resources/OBC_legacy.png create mode 100644 NovetusLauncher/NovetusLauncher/Resources/TBC_legacy.png 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 0000000000000000000000000000000000000000..dc2ec185dae7c1954d17c503361318a381b6a346 GIT binary patch literal 2489 zcmV;q2}bsbP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D2~J5wK~z{r?U#E{ zQ)e2+pK~IFT(||27;fcW?h*w-)Vf$AS`}KQ?z+}>badOX7TeW!TU)En^g_F}mu<&R zsk_~->)KXCuvRGw)PjOlF6E*Eg`ixL5ON{pPRQ9WA+@EK*|9tO$Ik3;=9`n8lk>jM zdB692z7zbP|Af-gQXD^i94AhkaDT6;sBj;@<;amESi5#@@|-zoI}?*)1uwnylIO~I zusp{*!j*XWvgNFbij(&pIrdSpnr81ySh?=u^3zqJt7MB?))W-l>gwvSFlWK6%9E$g zKl+I5cd(h98QFO?<>lp`DAUlM;~g=oPzD@)b9cs!o_cQti&1zz4r*-{jP^aNh6TrPK?|31G+z|oJ66%SkKeBVqNMuiJ8>LY@_ z>_g-QkApiqbY)j}A9d)^A^Q5Y>j$2EY!x_|g}AW5wD#7no`v4WsJ&Osg0aM9KFv|E8HaEBI+VwDbdWHez zoJ44_0AT@+B`TH56KR?|7O-vGHmqJ*(BjMIYuO3O(B&7yd;PP>Jor~6=VoAXOb?qN zn-@_WyB2o+5I#M74o;H+i6Ol3j;31ai!Z+DiS!EvxTZlM5LESjQH?OJ z0~WiJ48Y;dgHYXyU|lCRED?dSI#B*;GY*};1!i1@6qXuL46G1~#hyqY?fDbz*|P^4 zjRtJCcS!ZQ+9bpH1eULmA#>h57!4CjxqP5cCX-z#Eq&j~47Ab~zXdQ70d}Vo26-2D zKa>fs-2umx6Wy9XG`5bw^i4DPeLYC@jmjN2m|pOt0_8d0Mkf%Db;7K*;+QgsspF+{%04}9bLIPy6Yku(lU4P3RjDm%*$!6X9xravo%gXv=mO6YzJmu5YbOT7c7n8n0kRRBA-7-EFa13w~v0tnC zcqWy`JZ&p_Nb{HW3yiG@*}Y)J%FCZuS2M1BGb*rs`*t)pH|Kuc*FJ!HMuKuz&mtT6YG+Z{Rwa55Q^j zhStKuC*Sy>*}^H~NEbf!?$J+X*x`%{Y}&L5XU?42lQ!Eiui{T(NSq&u(7Th7y-`ZEqWl$S_U_;3 zF8L3+y$rLmvVxi}UOJU5aC)VM5%+RTkusV=O*zO_r+XwMMd6;@OsraEgjBQ_<-4yYn5}u&W;;hb;%+j|=;Q#W4B^5RsFEsjjbJ7RE2JdvgK~ zA3p3#^&{K@To=jGpY#@rU?|uDhmD-pPZ0MaBD7C#SEwy=|K)B8uDL6^~hiJs1(Eq2s-!{D12 z8|qyXJOg(HTtr7l8n%^V@3`#) zjg5_1w{BgBUZ=CRpZfS-t|XQUZ0>^Z7joz%JVf~#L7B;(YqCJCcHm?O;4htvftG$m z@NM|#jbOZ!`Wlq7$1vq2VJ$)M(|(D7U~i1Y|B9N`UN@W|^1Dz|Q{%}v%?u}OB5yZa zw{E?tRjXV3+FNAx&QNZnWDd@F%|-iw6*}_9!%VRtS2+D-e-7YZx?}fD2pd?c00000NkvXXu0mjf DtcbcW literal 0 HcmV?d00001 diff --git a/NovetusLauncher/NovetusLauncher/Resources/OBC_legacy.png b/NovetusLauncher/NovetusLauncher/Resources/OBC_legacy.png new file mode 100644 index 0000000000000000000000000000000000000000..dc2822bac513c8ff5ef2934c13382fb2f3a46fae GIT binary patch literal 2587 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 literal 0 HcmV?d00001 diff --git a/NovetusLauncher/NovetusLauncher/Resources/TBC_legacy.png b/NovetusLauncher/NovetusLauncher/Resources/TBC_legacy.png new file mode 100644 index 0000000000000000000000000000000000000000..33b8a69c3ff41075e6746cadb3623c30df76fbb7 GIT binary patch literal 2853 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 Df;49} literal 0 HcmV?d00001 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...";