From 8c8369e312bf71e42d9fbf4734208cf7194b96ca Mon Sep 17 00:00:00 2001 From: Bitl Date: Fri, 3 Jul 2020 13:03:21 -0700 Subject: [PATCH] More stability fixes. The way the launcher loads values is a nightmare --- .../CharacterCustomization.Designer.cs | 3 ++ .../CharacterCustomization.cs | 54 ++++++++----------- .../CharacterCustomization_legacy.Designer.cs | 3 ++ .../CharacterCustomization_legacy.cs | 42 +++++++-------- 4 files changed, 48 insertions(+), 54 deletions(-) diff --git a/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization.Designer.cs b/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization.Designer.cs index 04288cf..bbfd332 100644 --- a/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization.Designer.cs +++ b/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization.Designer.cs @@ -1907,6 +1907,7 @@ namespace NovetusLauncher this.comboBox1.Items.AddRange(new object[] { "Roblox", "Finobe"}); + this.comboBox1.SelectedItem = "Roblox"; this.comboBox1.Location = new System.Drawing.Point(3, 221); this.comboBox1.Name = "comboBox1"; this.comboBox1.Size = new System.Drawing.Size(194, 21); @@ -1920,6 +1921,7 @@ namespace NovetusLauncher this.comboBox2.Items.AddRange(new object[] { "Roblox", "Finobe"}); + this.comboBox2.SelectedItem = "Roblox"; this.comboBox2.Location = new System.Drawing.Point(3, 221); this.comboBox2.Name = "comboBox2"; this.comboBox2.Size = new System.Drawing.Size(194, 21); @@ -1933,6 +1935,7 @@ namespace NovetusLauncher this.comboBox3.Items.AddRange(new object[] { "Roblox", "Finobe"}); + this.comboBox3.SelectedItem = "Roblox"; this.comboBox3.Location = new System.Drawing.Point(3, 221); this.comboBox3.Name = "comboBox3"; this.comboBox3.Size = new System.Drawing.Size(194, 21); diff --git a/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization.cs b/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization.cs index 89015f4..cfe28b4 100644 --- a/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization.cs +++ b/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization.cs @@ -142,56 +142,44 @@ namespace NovetusLauncher //clothing if (GlobalVars.Custom_T_Shirt_Offline.Contains("http://")) { - if (GlobalVars.Custom_T_Shirt_Offline.Contains("http://www.roblox.com/asset/?id=")) - { - comboBox3.SelectedItem = "Roblox"; - } - else if (GlobalVars.Custom_T_Shirt_Offline.Contains("http://finobe.com/asset/?id=")) + if (GlobalVars.Custom_T_Shirt_Offline.Contains("http://finobe.com/asset/?id=")) { + textBox12.Text = GlobalVars.Custom_T_Shirt_Offline.Replace("http://finobe.com/asset/?id=", ""); comboBox3.SelectedItem = "Finobe"; } - - textBox12.Text = GlobalVars.Custom_T_Shirt_Offline.Replace("http://www.roblox.com/asset/?id=", "").Replace("http://finobe.com/asset/?id=", ""); - } - else - { - comboBox3.SelectedItem = "Roblox"; + else if (GlobalVars.Custom_T_Shirt_Offline.Contains("http://www.roblox.com/asset/?id=")) + { + textBox12.Text = GlobalVars.Custom_T_Shirt_Offline.Replace("http://www.roblox.com/asset/?id=", ""); + comboBox3.SelectedItem = "Roblox"; + } } if (GlobalVars.Custom_Shirt_Offline.Contains("http://")) { - if (GlobalVars.Custom_Shirt_Offline.Contains("http://www.roblox.com/asset/?id=")) - { - comboBox2.SelectedItem = "Roblox"; - } - else if (GlobalVars.Custom_Shirt_Offline.Contains("http://finobe.com/asset/?id=")) + if (GlobalVars.Custom_Shirt_Offline.Contains("http://finobe.com/asset/?id=")) { + textBox11.Text = GlobalVars.Custom_Shirt_Offline.Replace("http://finobe.com/asset/?id=", ""); comboBox2.SelectedItem = "Finobe"; } - - textBox11.Text = GlobalVars.Custom_Shirt_Offline.Replace("http://www.roblox.com/asset/?id=", "").Replace("http://finobe.com/asset/?id=", ""); - } - else - { - comboBox2.SelectedItem = "Roblox"; + else if (GlobalVars.Custom_Shirt_Offline.Contains("http://www.roblox.com/asset/?id=")) + { + textBox11.Text = GlobalVars.Custom_Shirt_Offline.Replace("http://www.roblox.com/asset/?id=", ""); + comboBox2.SelectedItem = "Roblox"; + } } if (GlobalVars.Custom_Pants_Offline.Contains("http://")) { - if (GlobalVars.Custom_Pants_Offline.Contains("http://www.roblox.com/asset/?id=")) - { - comboBox1.SelectedItem = "Roblox"; - } - else if (GlobalVars.Custom_Pants_Offline.Contains("http://finobe.com/asset/?id=")) + if (GlobalVars.Custom_Pants_Offline.Contains("http://finobe.com/asset/?id=")) { + textBox13.Text = GlobalVars.Custom_Pants_Offline.Replace("http://finobe.com/asset/?id=", ""); comboBox1.SelectedItem = "Finobe"; } - - textBox13.Text = GlobalVars.Custom_Pants_Offline.Replace("http://www.roblox.com/asset/?id=", "").Replace("http://finobe.com/asset/?id=", ""); - } - else - { - comboBox1.SelectedItem = "Roblox"; + else if (GlobalVars.Custom_Pants_Offline.Contains("http://www.roblox.com/asset/?id=")) + { + textBox13.Text = GlobalVars.Custom_Pants_Offline.Replace("http://www.roblox.com/asset/?id=", ""); + comboBox1.SelectedItem = "Roblox"; + } } //discord diff --git a/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization_legacy.Designer.cs b/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization_legacy.Designer.cs index 2e2a2de..ec390ad 100644 --- a/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization_legacy.Designer.cs +++ b/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization_legacy.Designer.cs @@ -1684,6 +1684,7 @@ namespace NovetusLauncher this.comboBox3.Items.AddRange(new object[] { "Roblox", "Finobe"}); + this.comboBox3.SelectedItem = "Roblox"; this.comboBox3.Location = new System.Drawing.Point(6, 162); this.comboBox3.Name = "comboBox3"; this.comboBox3.Size = new System.Drawing.Size(194, 21); @@ -1697,6 +1698,7 @@ namespace NovetusLauncher this.comboBox1.Items.AddRange(new object[] { "Roblox", "Finobe"}); + this.comboBox1.SelectedItem = "Roblox"; this.comboBox1.Location = new System.Drawing.Point(6, 162); this.comboBox1.Name = "comboBox1"; this.comboBox1.Size = new System.Drawing.Size(194, 21); @@ -1710,6 +1712,7 @@ namespace NovetusLauncher this.comboBox2.Items.AddRange(new object[] { "Roblox", "Finobe"}); + this.comboBox2.SelectedItem = "Roblox"; this.comboBox2.Location = new System.Drawing.Point(6, 162); this.comboBox2.Name = "comboBox2"; this.comboBox2.Size = new System.Drawing.Size(194, 21); diff --git a/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization_legacy.cs b/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization_legacy.cs index 0967756..3ba1514 100644 --- a/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization_legacy.cs +++ b/NovetusLauncher/NovetusLauncher/CharacterCustomization/CharacterCustomization_legacy.cs @@ -140,44 +140,44 @@ namespace NovetusLauncher //clothing if (GlobalVars.Custom_T_Shirt_Offline.Contains("http://")) { - if (GlobalVars.Custom_T_Shirt_Offline.Contains("http://www.roblox.com/asset/?id=")) - { - comboBox2.SelectedItem = "Roblox"; - } - else if (GlobalVars.Custom_T_Shirt_Offline.Contains("http://finobe.com/asset/?id=")) + if (GlobalVars.Custom_T_Shirt_Offline.Contains("http://finobe.com/asset/?id=")) { + textBox11.Text = GlobalVars.Custom_T_Shirt_Offline.Replace("http://finobe.com/asset/?id=", ""); comboBox2.SelectedItem = "Finobe"; } - - textBox11.Text = GlobalVars.Custom_T_Shirt_Offline.Replace("http://www.roblox.com/asset/?id=", "").Replace("http://finobe.com/asset/?id=", ""); + else if (GlobalVars.Custom_T_Shirt_Offline.Contains("http://www.roblox.com/asset/?id=")) + { + textBox12.Text = GlobalVars.Custom_T_Shirt_Offline.Replace("http://www.roblox.com/asset/?id=", ""); + comboBox2.SelectedItem = "Roblox"; + } } if (GlobalVars.Custom_Shirt_Offline.Contains("http://")) { - if (GlobalVars.Custom_Shirt_Offline.Contains("http://www.roblox.com/asset/?id=")) - { - comboBox1.SelectedItem = "Roblox"; - } - else if (GlobalVars.Custom_Shirt_Offline.Contains("http://finobe.com/asset/?id=")) + if (GlobalVars.Custom_Shirt_Offline.Contains("http://finobe.com/asset/?id=")) { + textBox12.Text = GlobalVars.Custom_Shirt_Offline.Replace("http://finobe.com/asset/?id=", ""); comboBox1.SelectedItem = "Finobe"; } - - textBox12.Text = GlobalVars.Custom_Shirt_Offline.Replace("http://www.roblox.com/asset/?id=", "").Replace("http://finobe.com/asset/?id=", ""); + else if (GlobalVars.Custom_Shirt_Offline.Contains("http://www.roblox.com/asset/?id=")) + { + textBox12.Text = GlobalVars.Custom_Shirt_Offline.Replace("http://www.roblox.com/asset/?id=", ""); + comboBox1.SelectedItem = "Roblox"; + } } if (GlobalVars.Custom_Pants_Offline.Contains("http://")) { - if (GlobalVars.Custom_Pants_Offline.Contains("http://www.roblox.com/asset/?id=")) - { - comboBox3.SelectedItem = "Roblox"; - } - else if (GlobalVars.Custom_Pants_Offline.Contains("http://finobe.com/asset/?id=")) + if (GlobalVars.Custom_Pants_Offline.Contains("http://finobe.com/asset/?id=")) { + textBox13.Text = GlobalVars.Custom_Pants_Offline.Replace("http://finobe.com/asset/?id=", ""); comboBox3.SelectedItem = "Finobe"; } - - textBox13.Text = GlobalVars.Custom_Pants_Offline.Replace("http://www.roblox.com/asset/?id=", "").Replace("http://finobe.com/asset/?id=", ""); + else if (GlobalVars.Custom_Pants_Offline.Contains("http://www.roblox.com/asset/?id=")) + { + textBox13.Text = GlobalVars.Custom_Pants_Offline.Replace("http://www.roblox.com/asset/?id=", ""); + comboBox3.SelectedItem = "Roblox"; + } } //discord