From 2b13a5d291ec250cd757df42111eeb65aee7de8e Mon Sep 17 00:00:00 2001 From: Bitl Date: Sun, 27 Oct 2019 09:03:36 -0700 Subject: [PATCH] cleaning code for final 1.0 release --- NovetusLauncher/.vs/NovetusLauncher/v14/.suo | Bin 149504 -> 156160 bytes ...le_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs | 0 ...le_5937a670-0e60-4077-877b-f7221da3dda1.cs | 0 ...le_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs | 0 NovetusLauncher/NovetusFuncs/AddonLoader.cs | 21 +- NovetusLauncher/NovetusFuncs/ClientScript.cs | 12 +- NovetusLauncher/NovetusFuncs/GlobalVars.cs | 27 ++- NovetusLauncher/NovetusFuncs/SecurityFuncs.cs | 4 - .../NovetusFuncs/TreeNodeHelper.cs | 6 +- .../NovetusLauncher/CharacterCustomization.cs | 199 +++++++++--------- .../NovetusLauncher/ClientinfoCreator.cs | 10 +- NovetusLauncher/NovetusLauncher/MainForm.cs | 14 +- ...le_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs | 0 ...le_5937a670-0e60-4077-877b-f7221da3dda1.cs | 0 ...le_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs | 0 15 files changed, 157 insertions(+), 136 deletions(-) create mode 100644 NovetusLauncher/NovetusCMD/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs create mode 100644 NovetusLauncher/NovetusCMD/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs create mode 100644 NovetusLauncher/NovetusCMD/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs create mode 100644 NovetusLauncher/NovetusLauncher/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs create mode 100644 NovetusLauncher/NovetusLauncher/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs create mode 100644 NovetusLauncher/NovetusLauncher/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs diff --git a/NovetusLauncher/.vs/NovetusLauncher/v14/.suo b/NovetusLauncher/.vs/NovetusLauncher/v14/.suo index d9313f4a1e4ac2c5ebe0a09415de2d7c7b60225b..35973164e7597bb71c4f26ac5ca0a335da91f3a7 100644 GIT binary patch delta 6629 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 lo1M?9s-aJwN 0) { TreeNode child = SearchTreeView(p_sSearchTerm, node.Nodes); - if (child != null) - return child; + if (child != null) + { + return child; + } } } diff --git a/NovetusLauncher/NovetusLauncher/CharacterCustomization.cs b/NovetusLauncher/NovetusLauncher/CharacterCustomization.cs index 54e4b00..e6cba0f 100644 --- a/NovetusLauncher/NovetusLauncher/CharacterCustomization.cs +++ b/NovetusLauncher/NovetusLauncher/CharacterCustomization.cs @@ -23,13 +23,7 @@ namespace NovetusLauncher { private string SelectedPart = "Head"; private string[,] ColorArray; - private string hatdir = GlobalVars.CustomPlayerDir + "\\hats"; - private string facedir = GlobalVars.CustomPlayerDir + "\\faces"; - private string headdir = GlobalVars.CustomPlayerDir + "\\heads"; - private string tshirtdir = GlobalVars.CustomPlayerDir + "\\tshirts"; - private string shirtdir = GlobalVars.CustomPlayerDir + "\\shirts"; - private string pantsdir = GlobalVars.CustomPlayerDir + "\\pants"; - private string extradir = GlobalVars.CustomPlayerDir + "\\custom"; + public CharacterCustomization() { @@ -134,12 +128,12 @@ namespace NovetusLauncher try { - Image icon1 = LauncherFuncs.LoadImage(extradir + "\\icons\\" + GlobalVars.PlayerName + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.extradir + "\\icons\\" + GlobalVars.PlayerName + ".png"); pictureBox10.Image = icon1; } catch (Exception) { - Image icon1 = LauncherFuncs.LoadImage(extradir + "\\NoExtra.png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.extradir + "\\NoExtra.png"); pictureBox10.Image = icon1; } } @@ -153,9 +147,9 @@ namespace NovetusLauncher listBox8.Items.Clear(); listBox9.Items.Clear(); - if (Directory.Exists(hatdir)) + if (Directory.Exists(GlobalVars.hatdir)) { - DirectoryInfo dinfo = new DirectoryInfo(hatdir); + DirectoryInfo dinfo = new DirectoryInfo(GlobalVars.hatdir); FileInfo[] Files = dinfo.GetFiles("*.rbxm"); foreach( FileInfo file in Files ) { @@ -174,11 +168,11 @@ namespace NovetusLauncher listBox1.Enabled = true; listBox2.Enabled = true; listBox3.Enabled = true; - Image icon1 = LauncherFuncs.LoadImage(hatdir + @"\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + ".png"); pictureBox1.Image = icon1; - Image icon2 = LauncherFuncs.LoadImage(hatdir + @"\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + ".png"); + Image icon2 = LauncherFuncs.LoadImage(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + ".png"); pictureBox2.Image = icon2; - Image icon3 = LauncherFuncs.LoadImage(hatdir + @"\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + ".png"); + Image icon3 = LauncherFuncs.LoadImage(GlobalVars.hatdir + @"\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + ".png"); pictureBox3.Image = icon3; } } @@ -194,9 +188,9 @@ namespace NovetusLauncher listBox8.Items.Clear(); listBox9.Items.Clear(); - if (Directory.Exists(facedir)) + if (Directory.Exists(GlobalVars.facedir)) { - DirectoryInfo dinfo = new DirectoryInfo(facedir); + DirectoryInfo dinfo = new DirectoryInfo(GlobalVars.facedir); FileInfo[] Files = dinfo.GetFiles("*.rbxm"); foreach( FileInfo file in Files ) { @@ -209,7 +203,7 @@ namespace NovetusLauncher } listBox4.SelectedItem = GlobalVars.Custom_Face_Offline; listBox4.Enabled = true; - Image icon1 = LauncherFuncs.LoadImage(facedir + @"\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.facedir + @"\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + ".png"); pictureBox4.Image = icon1; } } @@ -225,9 +219,9 @@ namespace NovetusLauncher listBox8.Items.Clear(); listBox9.Items.Clear(); - if (Directory.Exists(tshirtdir)) + if (Directory.Exists(GlobalVars.tshirtdir)) { - DirectoryInfo dinfo = new DirectoryInfo(tshirtdir); + DirectoryInfo dinfo = new DirectoryInfo(GlobalVars.tshirtdir); FileInfo[] Files = dinfo.GetFiles("*.rbxm"); foreach( FileInfo file in Files ) { @@ -240,7 +234,7 @@ namespace NovetusLauncher } listBox5.SelectedItem = GlobalVars.Custom_T_Shirt_Offline; listBox5.Enabled = true; - Image icon1 = LauncherFuncs.LoadImage(tshirtdir + @"\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.tshirtdir + @"\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + ".png"); pictureBox5.Image = icon1; } } @@ -256,9 +250,9 @@ namespace NovetusLauncher listBox8.Items.Clear(); listBox9.Items.Clear(); - if (Directory.Exists(shirtdir)) + if (Directory.Exists(GlobalVars.shirtdir)) { - DirectoryInfo dinfo = new DirectoryInfo(shirtdir); + DirectoryInfo dinfo = new DirectoryInfo(GlobalVars.shirtdir); FileInfo[] Files = dinfo.GetFiles("*.rbxm"); foreach( FileInfo file in Files ) { @@ -271,7 +265,7 @@ namespace NovetusLauncher } listBox6.SelectedItem = GlobalVars.Custom_Shirt_Offline; listBox6.Enabled = true; - Image icon1 = LauncherFuncs.LoadImage(shirtdir + @"\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.shirtdir + @"\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + ".png"); pictureBox6.Image = icon1; } } @@ -287,9 +281,9 @@ namespace NovetusLauncher listBox8.Items.Clear(); listBox9.Items.Clear(); - if (Directory.Exists(pantsdir)) + if (Directory.Exists(GlobalVars.pantsdir)) { - DirectoryInfo dinfo = new DirectoryInfo(pantsdir); + DirectoryInfo dinfo = new DirectoryInfo(GlobalVars.pantsdir); FileInfo[] Files = dinfo.GetFiles("*.rbxm"); foreach( FileInfo file in Files ) { @@ -302,7 +296,7 @@ namespace NovetusLauncher } listBox7.SelectedItem = GlobalVars.Custom_Pants_Offline; listBox7.Enabled = true; - Image icon1 = LauncherFuncs.LoadImage(pantsdir + @"\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.pantsdir + @"\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + ".png"); pictureBox7.Image = icon1; } } @@ -318,9 +312,9 @@ namespace NovetusLauncher listBox7.Items.Clear(); listBox9.Items.Clear(); - if (Directory.Exists(headdir)) + if (Directory.Exists(GlobalVars.headdir)) { - DirectoryInfo dinfo = new DirectoryInfo(headdir); + DirectoryInfo dinfo = new DirectoryInfo(GlobalVars.headdir); FileInfo[] Files = dinfo.GetFiles("*.rbxm"); foreach( FileInfo file in Files ) { @@ -333,7 +327,7 @@ namespace NovetusLauncher } listBox8.SelectedItem = GlobalVars.Custom_Head_Offline; listBox8.Enabled = true; - Image icon1 = LauncherFuncs.LoadImage(headdir + @"\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.headdir + @"\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + ".png"); pictureBox8.Image = icon1; } } @@ -349,9 +343,9 @@ namespace NovetusLauncher listBox7.Items.Clear(); listBox8.Items.Clear(); - if (Directory.Exists(extradir)) + if (Directory.Exists(GlobalVars.extradir)) { - DirectoryInfo dinfo = new DirectoryInfo(extradir); + DirectoryInfo dinfo = new DirectoryInfo(GlobalVars.extradir); FileInfo[] Files = dinfo.GetFiles("*.rbxm"); foreach( FileInfo file in Files ) { @@ -366,9 +360,9 @@ namespace NovetusLauncher if (GlobalVars.Custom_Extra_ShowHats == true) { - if (Directory.Exists(hatdir)) + if (Directory.Exists(GlobalVars.hatdir)) { - DirectoryInfo dinfo = new DirectoryInfo(hatdir); + DirectoryInfo dinfo = new DirectoryInfo(GlobalVars.hatdir); FileInfo[] Files = dinfo.GetFiles("*.rbxm"); foreach( FileInfo file in Files ) { @@ -391,14 +385,14 @@ namespace NovetusLauncher listBox9.Enabled = true; try { - Image icon1 = LauncherFuncs.LoadImage(extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; } catch(Exception) { - if (Directory.Exists(hatdir)) + if (Directory.Exists(GlobalVars.hatdir)) { - Image icon1 = LauncherFuncs.LoadImage(hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; } } @@ -419,72 +413,72 @@ namespace NovetusLauncher void ListBox1SelectedIndexChanged(object sender, EventArgs e) { - if (Directory.Exists(hatdir)) + if (Directory.Exists(GlobalVars.hatdir)) { GlobalVars.Custom_Hat1ID_Offline = listBox1.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(hatdir + "\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + ".png"); pictureBox1.Image = icon1; } } void ListBox2SelectedIndexChanged(object sender, EventArgs e) { - if (Directory.Exists(hatdir)) + if (Directory.Exists(GlobalVars.hatdir)) { GlobalVars.Custom_Hat2ID_Offline = listBox2.SelectedItem.ToString(); - Image icon2 = LauncherFuncs.LoadImage(hatdir + "\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + ".png"); + Image icon2 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + ".png"); pictureBox2.Image = icon2; } } void ListBox3SelectedIndexChanged(object sender, EventArgs e) { - if (Directory.Exists(hatdir)) + if (Directory.Exists(GlobalVars.hatdir)) { GlobalVars.Custom_Hat3ID_Offline = listBox3.SelectedItem.ToString(); - Image icon3 = LauncherFuncs.LoadImage(hatdir + "\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + ".png"); + Image icon3 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + ".png"); pictureBox3.Image = icon3; } } void Button41Click(object sender, EventArgs e) { - if (Directory.Exists(hatdir)) + if (Directory.Exists(GlobalVars.hatdir)) { Random random = new Random(); int randomHat1 = random.Next(listBox1.Items.Count); listBox1.SelectedItem = listBox1.Items[randomHat1]; GlobalVars.Custom_Hat1ID_Offline = listBox1.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(hatdir + "\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + ".png"); pictureBox1.Image = icon1; int randomHat2 = random.Next(listBox2.Items.Count); listBox2.SelectedItem = listBox1.Items[randomHat2]; GlobalVars.Custom_Hat2ID_Offline = listBox2.SelectedItem.ToString(); - Image icon2 = LauncherFuncs.LoadImage(hatdir + "\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + ".png"); + Image icon2 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + ".png"); pictureBox2.Image = icon2; int randomHat3 = random.Next(listBox3.Items.Count); listBox3.SelectedItem = listBox1.Items[randomHat3]; GlobalVars.Custom_Hat3ID_Offline = listBox3.SelectedItem.ToString(); - Image icon3 = LauncherFuncs.LoadImage(hatdir + "\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + ".png"); + Image icon3 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + ".png"); pictureBox3.Image = icon3; } } void Button42Click(object sender, EventArgs e) { - if (Directory.Exists(hatdir)) + if (Directory.Exists(GlobalVars.hatdir)) { listBox1.SelectedItem = "NoHat.rbxm"; GlobalVars.Custom_Hat1ID_Offline = listBox1.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(hatdir + "\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + ".png"); pictureBox1.Image = icon1; listBox2.SelectedItem = "NoHat.rbxm"; GlobalVars.Custom_Hat2ID_Offline = listBox2.SelectedItem.ToString(); - Image icon2 = LauncherFuncs.LoadImage(hatdir + "\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + ".png"); + Image icon2 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + ".png"); pictureBox2.Image = icon2; listBox3.SelectedItem = "NoHat.rbxm"; GlobalVars.Custom_Hat3ID_Offline = listBox3.SelectedItem.ToString(); - Image icon3 = LauncherFuncs.LoadImage(hatdir + "\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + ".png"); + Image icon3 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + ".png"); pictureBox3.Image = icon3; } } @@ -493,34 +487,34 @@ namespace NovetusLauncher void ListBox4SelectedIndexChanged(object sender, EventArgs e) { - if (Directory.Exists(facedir)) + if (Directory.Exists(GlobalVars.facedir)) { GlobalVars.Custom_Face_Offline = listBox4.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(facedir + "\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.facedir + "\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + ".png"); pictureBox4.Image = icon1; } } void Button45Click(object sender, EventArgs e) { - if (Directory.Exists(facedir)) + if (Directory.Exists(GlobalVars.facedir)) { Random random = new Random(); int randomFace1 = random.Next(listBox4.Items.Count); listBox4.SelectedItem = listBox4.Items[randomFace1]; GlobalVars.Custom_Face_Offline = listBox4.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(facedir + "\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.facedir + "\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + ".png"); pictureBox4.Image = icon1; } } void Button44Click(object sender, EventArgs e) { - if (Directory.Exists(facedir)) + if (Directory.Exists(GlobalVars.facedir)) { listBox4.SelectedItem = "DefaultFace.rbxm"; GlobalVars.Custom_Face_Offline = listBox4.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(facedir + "\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.facedir + "\\" + GlobalVars.Custom_Face_Offline.Replace(".rbxm", "") + ".png"); pictureBox4.Image = icon1; } } @@ -529,34 +523,34 @@ namespace NovetusLauncher void ListBox5SelectedIndexChanged(object sender, EventArgs e) { - if (Directory.Exists(tshirtdir)) + if (Directory.Exists(GlobalVars.tshirtdir)) { GlobalVars.Custom_T_Shirt_Offline = listBox5.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(tshirtdir + "\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.tshirtdir + "\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + ".png"); pictureBox5.Image = icon1; } } void Button47Click(object sender, EventArgs e) { - if (Directory.Exists(tshirtdir)) + if (Directory.Exists(GlobalVars.tshirtdir)) { Random random = new Random(); int randomTShirt1 = random.Next(listBox5.Items.Count); listBox5.SelectedItem = listBox5.Items[randomTShirt1]; GlobalVars.Custom_T_Shirt_Offline = listBox5.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(tshirtdir + "\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.tshirtdir + "\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + ".png"); pictureBox5.Image = icon1; } } void Button46Click(object sender, EventArgs e) { - if (Directory.Exists(tshirtdir)) + if (Directory.Exists(GlobalVars.tshirtdir)) { listBox5.SelectedItem = "NoTShirt.rbxm"; GlobalVars.Custom_T_Shirt_Offline = listBox5.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(tshirtdir + "\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.tshirtdir + "\\" + GlobalVars.Custom_T_Shirt_Offline.Replace(".rbxm", "") + ".png"); pictureBox5.Image = icon1; } } @@ -565,34 +559,34 @@ namespace NovetusLauncher void ListBox6SelectedIndexChanged(object sender, EventArgs e) { - if (Directory.Exists(shirtdir)) + if (Directory.Exists(GlobalVars.shirtdir)) { GlobalVars.Custom_Shirt_Offline = listBox6.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(shirtdir + "\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.shirtdir + "\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + ".png"); pictureBox6.Image = icon1; } } void Button49Click(object sender, EventArgs e) { - if (Directory.Exists(shirtdir)) + if (Directory.Exists(GlobalVars.shirtdir)) { Random random = new Random(); int randomShirt1 = random.Next(listBox6.Items.Count); listBox6.SelectedItem = listBox6.Items[randomShirt1]; GlobalVars.Custom_Shirt_Offline = listBox6.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(shirtdir + "\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.shirtdir + "\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + ".png"); pictureBox6.Image = icon1; } } void Button48Click(object sender, EventArgs e) { - if (Directory.Exists(shirtdir)) + if (Directory.Exists(GlobalVars.shirtdir)) { listBox6.SelectedItem = "NoShirt.rbxm"; GlobalVars.Custom_Shirt_Offline = listBox6.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(shirtdir + "\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.shirtdir + "\\" + GlobalVars.Custom_Shirt_Offline.Replace(".rbxm", "") + ".png"); pictureBox6.Image = icon1; } } @@ -601,34 +595,34 @@ namespace NovetusLauncher void ListBox7SelectedIndexChanged(object sender, EventArgs e) { - if (Directory.Exists(pantsdir)) + if (Directory.Exists(GlobalVars.pantsdir)) { GlobalVars.Custom_Pants_Offline = listBox7.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(pantsdir + "\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.pantsdir + "\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + ".png"); pictureBox7.Image = icon1; } } void Button51Click(object sender, EventArgs e) { - if (Directory.Exists(pantsdir)) + if (Directory.Exists(GlobalVars.pantsdir)) { Random random = new Random(); int randomPants1 = random.Next(listBox7.Items.Count); listBox7.SelectedItem = listBox7.Items[randomPants1]; GlobalVars.Custom_Pants_Offline = listBox7.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(pantsdir + "\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.pantsdir + "\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + ".png"); pictureBox7.Image = icon1; } } void Button50Click(object sender, EventArgs e) { - if (Directory.Exists(pantsdir)) + if (Directory.Exists(GlobalVars.pantsdir)) { listBox7.SelectedItem = "NoPants.rbxm"; GlobalVars.Custom_Pants_Offline = listBox7.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(pantsdir + "\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.pantsdir + "\\" + GlobalVars.Custom_Pants_Offline.Replace(".rbxm", "") + ".png"); pictureBox7.Image = icon1; } } @@ -637,34 +631,34 @@ namespace NovetusLauncher void ListBox8SelectedIndexChanged(object sender, EventArgs e) { - if (Directory.Exists(headdir)) + if (Directory.Exists(GlobalVars.headdir)) { GlobalVars.Custom_Head_Offline = listBox8.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(headdir + "\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.headdir + "\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + ".png"); pictureBox8.Image = icon1; } } void Button57Click(object sender, EventArgs e) { - if (Directory.Exists(headdir)) + if (Directory.Exists(GlobalVars.headdir)) { Random random = new Random(); int randomHead1 = random.Next(listBox8.Items.Count); listBox8.SelectedItem = listBox8.Items[randomHead1]; GlobalVars.Custom_Head_Offline = listBox8.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(headdir + "\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.headdir + "\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + ".png"); pictureBox8.Image = icon1; } } void Button56Click(object sender, EventArgs e) { - if (Directory.Exists(headdir)) + if (Directory.Exists(GlobalVars.headdir)) { listBox8.SelectedItem = "DefaultHead.rbxm"; GlobalVars.Custom_Head_Offline = listBox8.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(headdir + "\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.headdir + "\\" + GlobalVars.Custom_Head_Offline.Replace(".rbxm", "") + ".png"); pictureBox8.Image = icon1; } } @@ -1110,21 +1104,21 @@ namespace NovetusLauncher void ListBox9SelectedIndexChanged(object sender, EventArgs e) { - if (Directory.Exists(extradir)) + if (Directory.Exists(GlobalVars.extradir)) { try { GlobalVars.Custom_Extra = listBox9.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; GlobalVars.Custom_Extra_SelectionIsHat = false; } catch(Exception) { - if (Directory.Exists(hatdir)) + if (Directory.Exists(GlobalVars.hatdir)) { GlobalVars.Custom_Extra = listBox9.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; GlobalVars.Custom_Extra_SelectionIsHat = true; } @@ -1134,7 +1128,7 @@ namespace NovetusLauncher void Button59Click(object sender, EventArgs e) { - if (Directory.Exists(extradir)) + if (Directory.Exists(GlobalVars.extradir)) { Random random = new Random(); int randomItem1 = random.Next(listBox9.Items.Count); @@ -1142,16 +1136,16 @@ namespace NovetusLauncher try { GlobalVars.Custom_Extra = listBox9.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; GlobalVars.Custom_Extra_SelectionIsHat = false; } catch(Exception) { - if (Directory.Exists(hatdir)) + if (Directory.Exists(GlobalVars.hatdir)) { GlobalVars.Custom_Extra = listBox9.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; GlobalVars.Custom_Extra_SelectionIsHat = true; } @@ -1161,22 +1155,22 @@ namespace NovetusLauncher void Button58Click(object sender, EventArgs e) { - if (Directory.Exists(extradir)) + if (Directory.Exists(GlobalVars.extradir)) { listBox9.SelectedItem = "NoExtra.rbxm"; try { GlobalVars.Custom_Extra = listBox9.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; GlobalVars.Custom_Extra_SelectionIsHat = false; } catch(Exception) { - if (Directory.Exists(hatdir)) + if (Directory.Exists(GlobalVars.hatdir)) { GlobalVars.Custom_Extra = listBox9.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; GlobalVars.Custom_Extra_SelectionIsHat = true; } @@ -1190,9 +1184,9 @@ namespace NovetusLauncher { GlobalVars.Custom_Extra_ShowHats = true; - if (Directory.Exists(hatdir)) + if (Directory.Exists(GlobalVars.hatdir)) { - DirectoryInfo dinfo = new DirectoryInfo(hatdir); + DirectoryInfo dinfo = new DirectoryInfo(GlobalVars.hatdir); FileInfo[] Files = dinfo.GetFiles("*.rbxm"); foreach( FileInfo file in Files ) { @@ -1215,9 +1209,9 @@ namespace NovetusLauncher GlobalVars.Custom_Extra_ShowHats = false; listBox9.Items.Clear(); - if (Directory.Exists(extradir)) + if (Directory.Exists(GlobalVars.extradir)) { - DirectoryInfo dinfo = new DirectoryInfo(extradir); + DirectoryInfo dinfo = new DirectoryInfo(GlobalVars.extradir); FileInfo[] Files = dinfo.GetFiles("*.rbxm"); foreach( FileInfo file in Files ) { @@ -1234,16 +1228,16 @@ namespace NovetusLauncher try { GlobalVars.Custom_Extra = listBox9.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.extradir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; GlobalVars.Custom_Extra_SelectionIsHat = false; } catch(Exception) { - if (Directory.Exists(hatdir)) + if (Directory.Exists(GlobalVars.hatdir)) { GlobalVars.Custom_Extra = listBox9.SelectedItem.ToString(); - Image icon1 = LauncherFuncs.LoadImage(hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.hatdir + "\\" + GlobalVars.Custom_Extra.Replace(".rbxm", "") + ".png"); pictureBox9.Image = icon1; GlobalVars.Custom_Extra_SelectionIsHat = true; } @@ -1269,12 +1263,12 @@ namespace NovetusLauncher try { - Image icon1 = LauncherFuncs.LoadImage(extradir + "\\icons\\" + GlobalVars.PlayerName + ".png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.extradir + "\\icons\\" + GlobalVars.PlayerName + ".png"); pictureBox10.Image = icon1; } catch (Exception) { - Image icon1 = LauncherFuncs.LoadImage(extradir + "\\NoExtra.png"); + Image icon1 = LauncherFuncs.LoadImage(GlobalVars.extradir + "\\NoExtra.png"); pictureBox10.Image = icon1; } } @@ -1305,7 +1299,8 @@ namespace NovetusLauncher localWebServer_FaceDir + GlobalVars.Custom_Face_Offline + ";" + localWebServer_TShirtDir + GlobalVars.Custom_T_Shirt_Offline + ";" + localWebServer_ShirtDir + GlobalVars.Custom_Shirt_Offline + ";" + - localWebServer_PantsDir + GlobalVars.Custom_Pants_Offline; + localWebServer_PantsDir + GlobalVars.Custom_Pants_Offline + ";" + + localWebServer_ExtraDir + GlobalVars.Custom_Extra; textBox1.Text = charapp; GlobalVars.CharacterID = charapp; } diff --git a/NovetusLauncher/NovetusLauncher/ClientinfoCreator.cs b/NovetusLauncher/NovetusLauncher/ClientinfoCreator.cs index debde38..276d92b 100644 --- a/NovetusLauncher/NovetusLauncher/ClientinfoCreator.cs +++ b/NovetusLauncher/NovetusLauncher/ClientinfoCreator.cs @@ -9,7 +9,7 @@ using System; using System.Windows.Forms; using System.IO; - +using System.Globalization; namespace NovetusLauncher { @@ -109,14 +109,14 @@ namespace NovetusLauncher void TextBox2TextChanged(object sender, EventArgs e) { - textBox2.Text = textBox2.Text.ToUpper(); - SelectedClientMD5 = textBox2.Text.ToUpper(); + textBox2.Text = textBox2.Text.ToUpper(CultureInfo.InstalledUICulture); + SelectedClientMD5 = textBox2.Text.ToUpper(CultureInfo.InstalledUICulture); } void TextBox3TextChanged(object sender, EventArgs e) { - textBox3.Text = textBox3.Text.ToUpper(); - SelectedClientScriptMD5 = textBox3.Text.ToUpper(); + textBox3.Text = textBox3.Text.ToUpper(CultureInfo.InstalledUICulture); + SelectedClientScriptMD5 = textBox3.Text.ToUpper(CultureInfo.InstalledUICulture); } void Button4Click(object sender, EventArgs e) diff --git a/NovetusLauncher/NovetusLauncher/MainForm.cs b/NovetusLauncher/NovetusLauncher/MainForm.cs index 1bd2184..72c61bf 100644 --- a/NovetusLauncher/NovetusLauncher/MainForm.cs +++ b/NovetusLauncher/NovetusLauncher/MainForm.cs @@ -1477,26 +1477,26 @@ namespace NovetusLauncher private void button25_Click(object sender, EventArgs e) { AddonLoader addon = new AddonLoader(); - addon.fileListDisplay = 10; + addon.setFileListDisplay(10); try { addon.LoadAddon(); - if (!string.IsNullOrWhiteSpace(addon.installOutcome)) + if (!string.IsNullOrWhiteSpace(addon.getInstallOutcome())) { - ConsolePrint("AddonLoader - " + addon.installOutcome, 3); + ConsolePrint("AddonLoader - " + addon.getInstallOutcome(), 3); } } catch (Exception) { - if (!string.IsNullOrWhiteSpace(addon.installOutcome)) + if (!string.IsNullOrWhiteSpace(addon.getInstallOutcome())) { - ConsolePrint("AddonLoader - " + addon.installOutcome, 2); + ConsolePrint("AddonLoader - " + addon.getInstallOutcome(), 2); } } - if (!string.IsNullOrWhiteSpace(addon.installOutcome)) + if (!string.IsNullOrWhiteSpace(addon.getInstallOutcome())) { - MessageBox.Show(addon.installOutcome); + MessageBox.Show(addon.getInstallOutcome()); } } } diff --git a/NovetusLauncher/NovetusLauncher/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs b/NovetusLauncher/NovetusLauncher/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs new file mode 100644 index 0000000..e69de29 diff --git a/NovetusLauncher/NovetusLauncher/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs b/NovetusLauncher/NovetusLauncher/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs new file mode 100644 index 0000000..e69de29 diff --git a/NovetusLauncher/NovetusLauncher/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs b/NovetusLauncher/NovetusLauncher/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs new file mode 100644 index 0000000..e69de29