From cd220e852385b33f2d0e0cfbfaafa9c46174c3fc Mon Sep 17 00:00:00 2001 From: Bitl Date: Tue, 7 Jul 2020 12:13:27 -0700 Subject: [PATCH] Made boolean statements look nicer, merged QualityOptions into GraphicsOptions. --- Novetus/NovetusCMD/Program.cs | 18 +- Novetus/NovetusFuncs/FileFormat.cs | 8 +- Novetus/NovetusFuncs/LauncherFuncs.cs | 28 +- Novetus/NovetusFuncs/NetFuncs.cs | 6 +- Novetus/NovetusFuncs/ScriptFuncs.cs | 18 +- Novetus/NovetusFuncs/SecurityFuncs.cs | 6 +- Novetus/NovetusFuncs/Settings.cs | 76 +- .../CharacterCustomization.cs | 2 +- .../CharacterCustomization_legacy.cs | 2 +- .../Compact/LauncherFormCompact.Designer.cs | 803 +++++++++--------- .../Compact/LauncherFormCompact.cs | 78 +- .../Compact/LauncherFormCompact.resx | 22 +- .../Compact/LauncherFormCompactSettings.cs | 22 +- .../Extended/LauncherFormExtended.Designer.cs | 74 +- .../Extended/LauncherFormExtended.cs | 96 ++- Novetus/NovetusLauncher/Program.cs | 2 +- Novetus/NovetusLauncher/SDK/AssetLocalizer.cs | 2 +- .../NovetusLauncher/SDK/ClientinfoCreator.cs | 2 +- Novetus/NovetusURI/LoaderForm.cs | 8 +- 19 files changed, 661 insertions(+), 612 deletions(-) diff --git a/Novetus/NovetusCMD/Program.cs b/Novetus/NovetusCMD/Program.cs index 7666f02..bbbb2cc 100644 --- a/Novetus/NovetusCMD/Program.cs +++ b/Novetus/NovetusCMD/Program.cs @@ -18,7 +18,7 @@ namespace NovetusCMD { public static void InitUPnP() { - if (GlobalVars.UserConfiguration.UPnP == true) + if (GlobalVars.UserConfiguration.UPnP) { try { @@ -34,7 +34,7 @@ namespace NovetusCMD public static void StartUPnP(INatDevice device, Protocol protocol, int port) { - if (GlobalVars.UserConfiguration.UPnP == true) + if (GlobalVars.UserConfiguration.UPnP) { try { @@ -50,7 +50,7 @@ namespace NovetusCMD public static void StopUPnP(INatDevice device, Protocol protocol, int port) { - if (GlobalVars.UserConfiguration.UPnP == true) + if (GlobalVars.UserConfiguration.UPnP) { try { @@ -147,7 +147,7 @@ namespace NovetusCMD static void ProgramClose(object sender, EventArgs e) { WriteConfigValues(); - if (GlobalVars.IsWebServerOn == true) + if (GlobalVars.IsWebServerOn) { StopWebServer(); } @@ -350,7 +350,7 @@ namespace NovetusCMD } string mapfile = GlobalVars.UserConfiguration.MapPath; string rbxexe = ""; - if (GlobalVars.SelectedClientInfo.LegacyMode == true) + if (GlobalVars.SelectedClientInfo.LegacyMode) { rbxexe = GlobalPaths.ClientDir + @"\\" + GlobalVars.UserConfiguration.SelectedClient + @"\\RobloxApp.exe"; } @@ -442,10 +442,10 @@ namespace NovetusCMD URI, "Local URI Link:", URI2, - GlobalVars.IsWebServerOn == true ? "Web Server URL:" : "", - GlobalVars.IsWebServerOn == true ? "http://" + IP + ":" + GlobalVars.WebServer.Port.ToString() : "", - GlobalVars.IsWebServerOn == true ? "Local Web Server URL:" : "", - GlobalVars.IsWebServerOn == true ? GlobalVars.LocalWebServerURI : "" + GlobalVars.IsWebServerOn ? "Web Server URL:" : "", + GlobalVars.IsWebServerOn ? "http://" + IP + ":" + GlobalVars.WebServer.Port.ToString() : "", + GlobalVars.IsWebServerOn ? "Local Web Server URL:" : "", + GlobalVars.IsWebServerOn ? GlobalVars.LocalWebServerURI : "" ); File.WriteAllText(GlobalPaths.BasePath + "\\" + LocalVars.ServerInfoFileName, GlobalVars.RemoveEmptyLines(text)); diff --git a/Novetus/NovetusFuncs/FileFormat.cs b/Novetus/NovetusFuncs/FileFormat.cs index 8e28d51..6845d98 100644 --- a/Novetus/NovetusFuncs/FileFormat.cs +++ b/Novetus/NovetusFuncs/FileFormat.cs @@ -54,8 +54,8 @@ public class FileFormat MapPathSnip = ""; GraphicsMode = Settings.GraphicsOptions.Mode.OpenGL; ReShade = false; - QualityLevel = Settings.QualityOptions.Level.Ultra; - LauncherLayout = Settings.UIOptions.Style.Extended; + QualityLevel = Settings.GraphicsOptions.Level.Ultra; + LauncherStyle = Settings.UIOptions.Style.Extended; ReShadeFPSDisplay = false; ReShadePerformanceMode = false; AssetLocalizerSaveBackups = true; @@ -76,8 +76,8 @@ public class FileFormat public string MapPathSnip { get; set; } public Settings.GraphicsOptions.Mode GraphicsMode { get; set; } public bool ReShade { get; set; } - public Settings.QualityOptions.Level QualityLevel { get; set; } - public Settings.UIOptions.Style LauncherLayout { get; set; } + public Settings.GraphicsOptions.Level QualityLevel { get; set; } + public Settings.UIOptions.Style LauncherStyle { get; set; } public bool ReShadeFPSDisplay { get; set; } public bool ReShadePerformanceMode { get; set; } public bool AssetLocalizerSaveBackups { get; set; } diff --git a/Novetus/NovetusFuncs/LauncherFuncs.cs b/Novetus/NovetusFuncs/LauncherFuncs.cs index 548f4ca..5c9ce8f 100644 --- a/Novetus/NovetusFuncs/LauncherFuncs.cs +++ b/Novetus/NovetusFuncs/LauncherFuncs.cs @@ -51,7 +51,7 @@ public class LauncherFuncs try { GlobalVars.IsSnapshot = Convert.ToBoolean(issnapshot); - if (GlobalVars.IsSnapshot == true) + if (GlobalVars.IsSnapshot) { if (cmd) { @@ -125,8 +125,8 @@ public class LauncherFuncs ini.IniWriteValue(section, "MapPathSnip", GlobalVars.UserConfiguration.MapPathSnip.ToString()); ini.IniWriteValue(section, "GraphicsMode", Settings.GraphicsOptions.GetIntForMode(GlobalVars.UserConfiguration.GraphicsMode).ToString()); ini.IniWriteValue(section, "ReShade", GlobalVars.UserConfiguration.ReShade.ToString()); - ini.IniWriteValue(section, "QualityLevel", Settings.QualityOptions.GetIntForLevel(GlobalVars.UserConfiguration.QualityLevel).ToString()); - ini.IniWriteValue(section, "Style", Settings.UIOptions.GetIntForStyle(GlobalVars.UserConfiguration.LauncherLayout).ToString()); + ini.IniWriteValue(section, "QualityLevel", Settings.GraphicsOptions.GetIntForLevel(GlobalVars.UserConfiguration.QualityLevel).ToString()); + ini.IniWriteValue(section, "Style", Settings.UIOptions.GetIntForStyle(GlobalVars.UserConfiguration.LauncherStyle).ToString()); ini.IniWriteValue(section, "AssetLocalizerSaveBackups", GlobalVars.UserConfiguration.AssetLocalizerSaveBackups.ToString()); } else @@ -156,8 +156,8 @@ public class LauncherFuncs mapsnip = ini.IniReadValue(section, "MapPathSnip", GlobalVars.UserConfiguration.MapPathSnip.ToString()); graphics = ini.IniReadValue(section, "GraphicsMode", Settings.GraphicsOptions.GetIntForMode(GlobalVars.UserConfiguration.GraphicsMode).ToString()); reshade = ini.IniReadValue(section, "ReShade", GlobalVars.UserConfiguration.ReShade.ToString()); - qualitylevel = ini.IniReadValue(section, "QualityLevel", Settings.QualityOptions.GetIntForLevel(GlobalVars.UserConfiguration.QualityLevel).ToString()); - style = ini.IniReadValue(section, "Style", Settings.UIOptions.GetIntForStyle(GlobalVars.UserConfiguration.LauncherLayout).ToString()); + qualitylevel = ini.IniReadValue(section, "QualityLevel", Settings.GraphicsOptions.GetIntForLevel(GlobalVars.UserConfiguration.QualityLevel).ToString()); + style = ini.IniReadValue(section, "Style", Settings.UIOptions.GetIntForStyle(GlobalVars.UserConfiguration.LauncherStyle).ToString()); savebackups = ini.IniReadValue(section, "AssetLocalizerSaveBackups", GlobalVars.UserConfiguration.AssetLocalizerSaveBackups.ToString()); try @@ -205,8 +205,8 @@ public class LauncherFuncs GlobalVars.UserConfiguration.GraphicsMode = Settings.GraphicsOptions.GetModeForInt(Convert.ToInt32(graphics)); GlobalVars.UserConfiguration.ReShade = Convert.ToBoolean(reshade); - GlobalVars.UserConfiguration.QualityLevel = Settings.QualityOptions.GetLevelForInt(Convert.ToInt32(qualitylevel)); - GlobalVars.UserConfiguration.LauncherLayout = Settings.UIOptions.GetStyleForInt(Convert.ToInt32(style)); + GlobalVars.UserConfiguration.QualityLevel = Settings.GraphicsOptions.GetLevelForInt(Convert.ToInt32(qualitylevel)); + GlobalVars.UserConfiguration.LauncherStyle = Settings.UIOptions.GetStyleForInt(Convert.ToInt32(style)); GlobalVars.UserConfiguration.AssetLocalizerSaveBackups = Convert.ToBoolean(savebackups); } catch (Exception) @@ -550,8 +550,8 @@ public class LauncherFuncs GlobalVars.UserConfiguration.MapPathSnip = GlobalPaths.MapsDirBase + @"\\" + GlobalVars.ProgramInformation.DefaultMap; GlobalVars.UserConfiguration.GraphicsMode = Settings.GraphicsOptions.Mode.OpenGL; GlobalVars.UserConfiguration.ReShade = false; - GlobalVars.UserConfiguration.QualityLevel = Settings.QualityOptions.Level.Ultra; - GlobalVars.UserConfiguration.LauncherLayout = Settings.UIOptions.Style.Extended; + GlobalVars.UserConfiguration.QualityLevel = Settings.GraphicsOptions.Level.Ultra; + GlobalVars.UserConfiguration.LauncherStyle = Settings.UIOptions.Style.Extended; ResetCustomizationValues(); } @@ -810,7 +810,7 @@ public class LauncherFuncs switch (GlobalVars.UserConfiguration.QualityLevel) { - case Settings.QualityOptions.Level.VeryLow: + case Settings.GraphicsOptions.Level.VeryLow: MeshDetail = 50; ShadingQuality = 50; GFXQualityLevel = 1; @@ -820,7 +820,7 @@ public class LauncherFuncs Shadows_2008 = 2; Shadows_2007 = false; break; - case Settings.QualityOptions.Level.Low: + case Settings.GraphicsOptions.Level.Low: MeshDetail = 50; ShadingQuality = 50; GFXQualityLevel = 5; @@ -830,7 +830,7 @@ public class LauncherFuncs Shadows_2008 = 2; Shadows_2007 = false; break; - case Settings.QualityOptions.Level.Medium: + case Settings.GraphicsOptions.Level.Medium: MeshDetail = 50; ShadingQuality = 50; GFXQualityLevel = 10; @@ -839,13 +839,13 @@ public class LauncherFuncs Bevels = 2; Shadows_2007 = false; break; - case Settings.QualityOptions.Level.High: + case Settings.GraphicsOptions.Level.High: MeshDetail = 75; ShadingQuality = 75; GFXQualityLevel = 15; AASamples = 4; break; - case Settings.QualityOptions.Level.Ultra: + case Settings.GraphicsOptions.Level.Ultra: default: break; } diff --git a/Novetus/NovetusFuncs/NetFuncs.cs b/Novetus/NovetusFuncs/NetFuncs.cs index 693824f..4b0b956 100644 --- a/Novetus/NovetusFuncs/NetFuncs.cs +++ b/Novetus/NovetusFuncs/NetFuncs.cs @@ -9,7 +9,7 @@ public static class NetFuncs { public static void InitUPnP(EventHandler DeviceFound, EventHandler DeviceLost) { - if (GlobalVars.UserConfiguration.UPnP == true) + if (GlobalVars.UserConfiguration.UPnP) { NatUtility.DeviceFound += DeviceFound; NatUtility.DeviceLost += DeviceLost; @@ -19,7 +19,7 @@ public static class NetFuncs public static void StartUPnP(INatDevice device, Protocol protocol, int port) { - if (GlobalVars.UserConfiguration.UPnP == true) + if (GlobalVars.UserConfiguration.UPnP) { Mapping checker = device.GetSpecificMapping(protocol, port); int mapPublic = checker.PublicPort; @@ -36,7 +36,7 @@ public static class NetFuncs public static void StopUPnP(INatDevice device, Protocol protocol, int port) { - if (GlobalVars.UserConfiguration.UPnP == true) + if (GlobalVars.UserConfiguration.UPnP) { Mapping checker = device.GetSpecificMapping(protocol, port); int mapPublic = checker.PublicPort; diff --git a/Novetus/NovetusFuncs/ScriptFuncs.cs b/Novetus/NovetusFuncs/ScriptFuncs.cs index fec084a..53992b3 100644 --- a/Novetus/NovetusFuncs/ScriptFuncs.cs +++ b/Novetus/NovetusFuncs/ScriptFuncs.cs @@ -27,7 +27,7 @@ public class ScriptFuncs public static string GetScriptFuncForType(ScriptType type) { string rbxexe = ""; - if (GlobalVars.SelectedClientInfo.LegacyMode == true) + if (GlobalVars.SelectedClientInfo.LegacyMode) { rbxexe = GlobalPaths.ClientDir + @"\\" + GlobalVars.UserConfiguration.SelectedClient + @"\\RobloxApp.exe"; } @@ -45,10 +45,10 @@ public class ScriptFuncs { case ScriptType.Client: return "_G.CSConnect(" - + (GlobalVars.SelectedClientInfo.UsesID == true ? GlobalVars.UserConfiguration.UserID : 0) + ",'" + + (GlobalVars.SelectedClientInfo.UsesID ? GlobalVars.UserConfiguration.UserID : 0) + ",'" + GlobalVars.IP + "'," + GlobalVars.UserConfiguration.RobloxPort + ",'" - + (GlobalVars.SelectedClientInfo.UsesPlayerName == true ? GlobalVars.UserConfiguration.PlayerName : "Player") + "'," + + (GlobalVars.SelectedClientInfo.UsesPlayerName ? GlobalVars.UserConfiguration.PlayerName : "Player") + "'," + GlobalVars.loadtext + "," + md5s + ",'" + GlobalVars.UserConfiguration.PlayerTripcode + "')"; @@ -60,8 +60,8 @@ public class ScriptFuncs case ScriptType.Solo: case ScriptType.EasterEgg: return "_G.CSSolo(" - + (GlobalVars.SelectedClientInfo.UsesID == true ? GlobalVars.UserConfiguration.UserID : 0) + ",'" - + (GlobalVars.SelectedClientInfo.UsesPlayerName == true ? GlobalVars.UserConfiguration.PlayerName : "Player") + "'," + + (GlobalVars.SelectedClientInfo.UsesID ? GlobalVars.UserConfiguration.UserID : 0) + ",'" + + (GlobalVars.SelectedClientInfo.UsesPlayerName ? GlobalVars.UserConfiguration.PlayerName : "Player") + "'," + GlobalVars.sololoadtext + ")"; case ScriptType.Studio: return "_G.CSStudio()"; @@ -149,10 +149,10 @@ public class ScriptFuncs case ScriptType.Client: return LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); _G.CSConnect(" - + (GlobalVars.SelectedClientInfo.UsesID == true ? GlobalVars.UserConfiguration.UserID : 0) + ",'" + + (GlobalVars.SelectedClientInfo.UsesID ? GlobalVars.UserConfiguration.UserID : 0) + ",'" + GlobalVars.IP + "'," + GlobalVars.UserConfiguration.RobloxPort + ",'" - + (GlobalVars.SelectedClientInfo.UsesPlayerName == true ? GlobalVars.UserConfiguration.PlayerName : "Player") + "'," + + (GlobalVars.SelectedClientInfo.UsesPlayerName ? GlobalVars.UserConfiguration.PlayerName : "Player") + "'," + GlobalVars.loadtext + "," + md5s + ",'" + GlobalVars.UserConfiguration.PlayerTripcode + "')"; @@ -168,8 +168,8 @@ public class ScriptFuncs case ScriptType.EasterEgg: return LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); _G.CSSolo(" - + (GlobalVars.SelectedClientInfo.UsesID == true ? GlobalVars.UserConfiguration.UserID : 0) + ",'" - + (GlobalVars.SelectedClientInfo.UsesPlayerName == true ? GlobalVars.UserConfiguration.PlayerName : "Player") + "'," + + (GlobalVars.SelectedClientInfo.UsesID ? GlobalVars.UserConfiguration.UserID : 0) + ",'" + + (GlobalVars.SelectedClientInfo.UsesPlayerName ? GlobalVars.UserConfiguration.PlayerName : "Player") + "'," + GlobalVars.sololoadtext + ")"; case ScriptType.Studio: return LauncherFuncs.ChangeGameSettings() diff --git a/Novetus/NovetusFuncs/SecurityFuncs.cs b/Novetus/NovetusFuncs/SecurityFuncs.cs index 145cd5c..18b69ab 100644 --- a/Novetus/NovetusFuncs/SecurityFuncs.cs +++ b/Novetus/NovetusFuncs/SecurityFuncs.cs @@ -90,7 +90,7 @@ public class SecurityFuncs if (GlobalVars.AdminMode != true) { if (GlobalVars.SelectedClientInfo.AlreadyHasSecurity != true) { string rbxexe = ""; - if (GlobalVars.SelectedClientInfo.LegacyMode == true) { + if (GlobalVars.SelectedClientInfo.LegacyMode) { rbxexe = GlobalPaths.BasePath + "\\clients\\" + client + "\\RobloxApp.exe"; } else { rbxexe = GlobalPaths.BasePath + "\\clients\\" + client + "\\RobloxApp_client.exe"; @@ -171,8 +171,8 @@ public class SecurityFuncs private static void WorkerDoWork(Process exe, ScriptType type, int time, BackgroundWorker worker, string clientname, string mapname) { - if (exe.IsRunning() == true) { - while (exe.IsRunning() == true) { + if (exe.IsRunning()) { + while (exe.IsRunning()) { if (exe.IsRunning() != true) { worker.DoWork -= (obj, e) => WorkerDoWork(exe, type, time, worker, clientname, mapname); worker.CancelAsync(); diff --git a/Novetus/NovetusFuncs/Settings.cs b/Novetus/NovetusFuncs/Settings.cs index fd4e516..ec7aedb 100644 --- a/Novetus/NovetusFuncs/Settings.cs +++ b/Novetus/NovetusFuncs/Settings.cs @@ -1,10 +1,17 @@ #region Settings public class Settings { - #region Quality Options + #region Graphics Options - public class QualityOptions + public class GraphicsOptions { + public enum Mode + { + None = 0, + OpenGL = 1, + DirectX = 2 + } + public enum Level { VeryLow = 1, @@ -14,6 +21,32 @@ public class Settings Ultra = 5 } + public static Mode GetModeForInt(int level) + { + switch (level) + { + case 1: + return Mode.OpenGL; + case 2: + return Mode.DirectX; + default: + return Mode.None; + } + } + + public static int GetIntForMode(Mode level) + { + switch (level) + { + case Mode.OpenGL: + return 1; + case Mode.DirectX: + return 2; + default: + return 0; + } + } + public static Level GetLevelForInt(int level) { switch (level) @@ -52,45 +85,6 @@ public class Settings } #endregion - #region Graphics Options - - public class GraphicsOptions - { - public enum Mode - { - None = 0, - OpenGL = 1, - DirectX = 2 - } - - public static Mode GetModeForInt(int level) - { - switch (level) - { - case 1: - return Mode.OpenGL; - case 2: - return Mode.DirectX; - default: - return Mode.None; - } - } - - public static int GetIntForMode(Mode level) - { - switch (level) - { - case Mode.OpenGL: - return 1; - case Mode.DirectX: - return 2; - default: - return 0; - } - } - } - #endregion - #region UI Options public static class UIOptions { diff --git a/Novetus/NovetusLauncher/CharacterCustomization/CharacterCustomization.cs b/Novetus/NovetusLauncher/CharacterCustomization/CharacterCustomization.cs index 4a9e4d7..bd6a36b 100644 --- a/Novetus/NovetusLauncher/CharacterCustomization/CharacterCustomization.cs +++ b/Novetus/NovetusLauncher/CharacterCustomization/CharacterCustomization.cs @@ -545,7 +545,7 @@ namespace NovetusLauncher } } - if (GlobalVars.UserCustomization.ShowHatsInExtra == true) + if (GlobalVars.UserCustomization.ShowHatsInExtra) { if (Directory.Exists(GlobalPaths.hatdir)) { diff --git a/Novetus/NovetusLauncher/CharacterCustomization/CharacterCustomization_legacy.cs b/Novetus/NovetusLauncher/CharacterCustomization/CharacterCustomization_legacy.cs index 1faca70..f38d2fb 100644 --- a/Novetus/NovetusLauncher/CharacterCustomization/CharacterCustomization_legacy.cs +++ b/Novetus/NovetusLauncher/CharacterCustomization/CharacterCustomization_legacy.cs @@ -536,7 +536,7 @@ namespace NovetusLauncher } } - if (GlobalVars.UserCustomization.ShowHatsInExtra == true) + if (GlobalVars.UserCustomization.ShowHatsInExtra) { if (Directory.Exists(GlobalPaths.hatdir)) { diff --git a/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompact.Designer.cs b/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompact.Designer.cs index 10a9018..f4d0415 100644 --- a/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompact.Designer.cs +++ b/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompact.Designer.cs @@ -45,6 +45,46 @@ namespace NovetusLauncher { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LauncherFormCompact)); this.tabControl1 = new TabControlWithoutHeader(2); + this.button25 = new System.Windows.Forms.Button(); + this.button21 = new System.Windows.Forms.Button(); + this.textBox5 = new System.Windows.Forms.TextBox(); + this.label15 = new System.Windows.Forms.Label(); + this.label13 = new System.Windows.Forms.Label(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.button4 = new System.Windows.Forms.Button(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); + this.button8 = new System.Windows.Forms.Button(); + this.button3 = new System.Windows.Forms.Button(); + this.label25 = new System.Windows.Forms.Label(); + this.label26 = new System.Windows.Forms.Label(); + this.label27 = new System.Windows.Forms.Label(); + this.label28 = new System.Windows.Forms.Label(); + this.label11 = new System.Windows.Forms.Label(); + this.label12 = new System.Windows.Forms.Label(); + this.label16 = new System.Windows.Forms.Label(); + this.button20 = new System.Windows.Forms.Button(); + this.button27 = new System.Windows.Forms.Button(); + this.panel1 = new System.Windows.Forms.Panel(); + this.button33 = new System.Windows.Forms.Button(); + this.button32 = new System.Windows.Forms.Button(); + this.button31 = new System.Windows.Forms.Button(); + this.button30 = new System.Windows.Forms.Button(); + this.button29 = new System.Windows.Forms.Button(); + this.button28 = new System.Windows.Forms.Button(); + this.button34 = new System.Windows.Forms.Button(); + this.panel2 = new System.Windows.Forms.Panel(); + this.label24 = new System.Windows.Forms.Label(); + this.label23 = new System.Windows.Forms.Label(); + this.panel5 = new System.Windows.Forms.Panel(); + this.comboBox2 = new System.Windows.Forms.ComboBox(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.checkBox6 = new System.Windows.Forms.CheckBox(); + this.checkBox7 = new System.Windows.Forms.CheckBox(); + this.label22 = new System.Windows.Forms.Label(); + this.checkBox5 = new System.Windows.Forms.CheckBox(); + this.panel3 = new System.Windows.Forms.Panel(); + this.panel4 = new System.Windows.Forms.Panel(); + this.button35 = new System.Windows.Forms.Button(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); @@ -59,7 +99,6 @@ namespace NovetusLauncher this.label3 = new System.Windows.Forms.Label(); this.textBox1 = new System.Windows.Forms.TextBox(); this.tabPage2 = new System.Windows.Forms.TabPage(); - //this.checkBox8 = new System.Windows.Forms.CheckBox(); this.label19 = new System.Windows.Forms.Label(); this.textBox3 = new System.Windows.Forms.TextBox(); this.label17 = new System.Windows.Forms.Label(); @@ -101,7 +140,8 @@ namespace NovetusLauncher this.tabPage8 = new System.Windows.Forms.TabPage(); this.richTextBox2 = new System.Windows.Forms.RichTextBox(); this.tabPage5 = new System.Windows.Forms.TabPage(); - this.button36 = new System.Windows.Forms.Button(); + this.label5 = new System.Windows.Forms.Label(); + this.comboBox3 = new System.Windows.Forms.ComboBox(); this.checkBox2 = new System.Windows.Forms.CheckBox(); this.label18 = new System.Windows.Forms.Label(); this.button26 = new System.Windows.Forms.Button(); @@ -115,46 +155,7 @@ namespace NovetusLauncher this.richTextBox3 = new System.Windows.Forms.RichTextBox(); this.SettingsButton = new System.Windows.Forms.Button(); this.UAButton = new System.Windows.Forms.Button(); - this.button25 = new System.Windows.Forms.Button(); - this.button21 = new System.Windows.Forms.Button(); - this.textBox5 = new System.Windows.Forms.TextBox(); - this.label15 = new System.Windows.Forms.Label(); - this.label13 = new System.Windows.Forms.Label(); - this.textBox2 = new System.Windows.Forms.TextBox(); - this.button4 = new System.Windows.Forms.Button(); - this.pictureBox2 = new System.Windows.Forms.PictureBox(); - this.button8 = new System.Windows.Forms.Button(); - this.button3 = new System.Windows.Forms.Button(); - this.label25 = new System.Windows.Forms.Label(); - this.label26 = new System.Windows.Forms.Label(); - this.label27 = new System.Windows.Forms.Label(); - this.label28 = new System.Windows.Forms.Label(); - this.label11 = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); - this.label16 = new System.Windows.Forms.Label(); - this.button20 = new System.Windows.Forms.Button(); - this.button27 = new System.Windows.Forms.Button(); - this.panel1 = new System.Windows.Forms.Panel(); - this.button33 = new System.Windows.Forms.Button(); - this.button32 = new System.Windows.Forms.Button(); - this.button31 = new System.Windows.Forms.Button(); - this.button30 = new System.Windows.Forms.Button(); - this.button29 = new System.Windows.Forms.Button(); - this.button28 = new System.Windows.Forms.Button(); - this.button34 = new System.Windows.Forms.Button(); - this.panel2 = new System.Windows.Forms.Panel(); - this.label24 = new System.Windows.Forms.Label(); - this.label23 = new System.Windows.Forms.Label(); - this.panel5 = new System.Windows.Forms.Panel(); - this.comboBox2 = new System.Windows.Forms.ComboBox(); - this.comboBox1 = new System.Windows.Forms.ComboBox(); - this.checkBox6 = new System.Windows.Forms.CheckBox(); - this.checkBox7 = new System.Windows.Forms.CheckBox(); - this.label22 = new System.Windows.Forms.Label(); - this.checkBox5 = new System.Windows.Forms.CheckBox(); - this.panel3 = new System.Windows.Forms.Panel(); - this.panel4 = new System.Windows.Forms.Panel(); - this.button35 = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); @@ -167,9 +168,332 @@ namespace NovetusLauncher this.tabPage7.SuspendLayout(); this.tabPage8.SuspendLayout(); this.tabPage5.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.SuspendLayout(); // + // button25 + // + this.button25.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.button25.Location = new System.Drawing.Point(315, 31); + this.button25.Name = "button25"; + this.button25.Size = new System.Drawing.Size(63, 20); + this.button25.TabIndex = 56; + this.button25.Text = "Install Mod"; + this.button25.UseVisualStyleBackColor = true; + this.button25.Click += new System.EventHandler(this.button25_Click); + // + // button21 + // + this.button21.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.button21.Location = new System.Drawing.Point(380, 31); + this.button21.Name = "button21"; + this.button21.Size = new System.Drawing.Size(35, 20); + this.button21.TabIndex = 44; + this.button21.Text = "SDK"; + this.button21.UseVisualStyleBackColor = true; + this.button21.Click += new System.EventHandler(this.button34_Click); + // + // textBox5 + // + this.textBox5.Location = new System.Drawing.Point(95, 53); + this.textBox5.Multiline = true; + this.textBox5.Name = "textBox5"; + this.textBox5.Size = new System.Drawing.Size(71, 18); + this.textBox5.TabIndex = 20; + this.textBox5.Text = "0"; + this.textBox5.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.textBox5.TextChanged += new System.EventHandler(this.TextBox5TextChanged); + // + // label15 + // + this.label15.Location = new System.Drawing.Point(55, 34); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(40, 16); + this.label15.TabIndex = 12; + this.label15.Text = "Name:"; + // + // label13 + // + this.label13.Location = new System.Drawing.Point(55, 55); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(34, 13); + this.label13.TabIndex = 7; + this.label13.Text = "ID:"; + // + // textBox2 + // + this.textBox2.Location = new System.Drawing.Point(95, 31); + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(121, 20); + this.textBox2.TabIndex = 11; + this.textBox2.Text = "Player"; + this.textBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.textBox2.TextChanged += new System.EventHandler(this.TextBox2TextChanged); + // + // button4 + // + this.button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.button4.Location = new System.Drawing.Point(169, 52); + this.button4.Name = "button4"; + this.button4.Size = new System.Drawing.Size(48, 20); + this.button4.TabIndex = 9; + this.button4.Text = "Regen"; + this.button4.UseVisualStyleBackColor = true; + this.button4.Click += new System.EventHandler(this.Button4Click); + // + // pictureBox2 + // + this.pictureBox2.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pictureBox2.BackgroundImage"))); + this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.pictureBox2.Location = new System.Drawing.Point(6, 12); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(43, 41); + this.pictureBox2.TabIndex = 7; + this.pictureBox2.TabStop = false; + // + // button8 + // + this.button8.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.button8.Location = new System.Drawing.Point(223, 31); + this.button8.Name = "button8"; + this.button8.Size = new System.Drawing.Size(47, 20); + this.button8.TabIndex = 35; + this.button8.Text = "Avatar"; + this.button8.UseVisualStyleBackColor = true; + this.button8.Click += new System.EventHandler(this.Button8Click); + // + // button3 + // + this.button3.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.button3.Location = new System.Drawing.Point(271, 31); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(43, 20); + this.button3.TabIndex = 6; + this.button3.Text = "Studio"; + this.button3.UseVisualStyleBackColor = true; + this.button3.Click += new System.EventHandler(this.Button3Click_legacy); + // + // label25 + // + this.label25.Location = new System.Drawing.Point(55, 4); + this.label25.Name = "label25"; + this.label25.Size = new System.Drawing.Size(109, 14); + this.label25.TabIndex = 16; + this.label25.Text = "SELECTED CLIENT:"; + // + // label26 + // + this.label26.Location = new System.Drawing.Point(160, 4); + this.label26.Name = "label26"; + this.label26.Size = new System.Drawing.Size(245, 13); + this.label26.TabIndex = 17; + this.label26.Text = "2009E"; + // + // label27 + // + this.label27.Location = new System.Drawing.Point(55, 18); + this.label27.Name = "label27"; + this.label27.Size = new System.Drawing.Size(95, 12); + this.label27.TabIndex = 18; + this.label27.Text = "SELECTED MAP:"; + // + // label28 + // + this.label28.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label28.Location = new System.Drawing.Point(145, 18); + this.label28.Name = "label28"; + this.label28.Size = new System.Drawing.Size(260, 12); + this.label28.TabIndex = 19; + this.label28.Text = "Baseplate.rbxl"; + // + // label11 + // + this.label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label11.Location = new System.Drawing.Point(4, 51); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(47, 25); + this.label11.TabIndex = 50; + this.label11.Text = "v1.0"; + this.label11.TextAlign = System.Drawing.ContentAlignment.TopCenter; + // + // label12 + // + this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label12.Location = new System.Drawing.Point(223, 51); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(192, 21); + this.label12.TabIndex = 0; + this.label12.Text = "Novetus!"; + this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label16 + // + this.label16.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.label16.Location = new System.Drawing.Point(54, 6); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(2, 65); + this.label16.TabIndex = 51; + // + // button20 + // + this.button20.Location = new System.Drawing.Point(0, 0); + this.button20.Name = "button20"; + this.button20.Size = new System.Drawing.Size(75, 23); + this.button20.TabIndex = 0; + // + // button27 + // + this.button27.Location = new System.Drawing.Point(0, 0); + this.button27.Name = "button27"; + this.button27.Size = new System.Drawing.Size(75, 23); + this.button27.TabIndex = 0; + // + // panel1 + // + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(200, 100); + this.panel1.TabIndex = 0; + // + // button33 + // + this.button33.Location = new System.Drawing.Point(0, 0); + this.button33.Name = "button33"; + this.button33.Size = new System.Drawing.Size(75, 23); + this.button33.TabIndex = 0; + // + // button32 + // + this.button32.Location = new System.Drawing.Point(0, 0); + this.button32.Name = "button32"; + this.button32.Size = new System.Drawing.Size(75, 23); + this.button32.TabIndex = 0; + // + // button31 + // + this.button31.Location = new System.Drawing.Point(0, 0); + this.button31.Name = "button31"; + this.button31.Size = new System.Drawing.Size(75, 23); + this.button31.TabIndex = 0; + // + // button30 + // + this.button30.Location = new System.Drawing.Point(0, 0); + this.button30.Name = "button30"; + this.button30.Size = new System.Drawing.Size(75, 23); + this.button30.TabIndex = 0; + // + // button29 + // + this.button29.Location = new System.Drawing.Point(0, 0); + this.button29.Name = "button29"; + this.button29.Size = new System.Drawing.Size(75, 23); + this.button29.TabIndex = 0; + // + // button28 + // + this.button28.Location = new System.Drawing.Point(0, 0); + this.button28.Name = "button28"; + this.button28.Size = new System.Drawing.Size(75, 23); + this.button28.TabIndex = 0; + // + // button34 + // + this.button34.Location = new System.Drawing.Point(0, 0); + this.button34.Name = "button34"; + this.button34.Size = new System.Drawing.Size(75, 23); + this.button34.TabIndex = 0; + // + // panel2 + // + this.panel2.Location = new System.Drawing.Point(0, 0); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(200, 100); + this.panel2.TabIndex = 0; + // + // label24 + // + this.label24.Location = new System.Drawing.Point(0, 0); + this.label24.Name = "label24"; + this.label24.Size = new System.Drawing.Size(100, 23); + this.label24.TabIndex = 0; + // + // label23 + // + this.label23.Location = new System.Drawing.Point(0, 0); + this.label23.Name = "label23"; + this.label23.Size = new System.Drawing.Size(100, 23); + this.label23.TabIndex = 0; + // + // panel5 + // + this.panel5.Location = new System.Drawing.Point(0, 0); + this.panel5.Name = "panel5"; + this.panel5.Size = new System.Drawing.Size(200, 100); + this.panel5.TabIndex = 0; + // + // comboBox2 + // + this.comboBox2.Location = new System.Drawing.Point(0, 0); + this.comboBox2.Name = "comboBox2"; + this.comboBox2.Size = new System.Drawing.Size(121, 21); + this.comboBox2.TabIndex = 0; + // + // comboBox1 + // + this.comboBox1.Location = new System.Drawing.Point(0, 0); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(121, 21); + this.comboBox1.TabIndex = 0; + // + // checkBox6 + // + this.checkBox6.Location = new System.Drawing.Point(0, 0); + this.checkBox6.Name = "checkBox6"; + this.checkBox6.Size = new System.Drawing.Size(104, 24); + this.checkBox6.TabIndex = 0; + // + // checkBox7 + // + this.checkBox7.Location = new System.Drawing.Point(0, 0); + this.checkBox7.Name = "checkBox7"; + this.checkBox7.Size = new System.Drawing.Size(104, 24); + this.checkBox7.TabIndex = 0; + // + // label22 + // + this.label22.Location = new System.Drawing.Point(0, 0); + this.label22.Name = "label22"; + this.label22.Size = new System.Drawing.Size(100, 23); + this.label22.TabIndex = 0; + // + // checkBox5 + // + this.checkBox5.Location = new System.Drawing.Point(0, 0); + this.checkBox5.Name = "checkBox5"; + this.checkBox5.Size = new System.Drawing.Size(104, 24); + this.checkBox5.TabIndex = 0; + // + // panel3 + // + this.panel3.Location = new System.Drawing.Point(0, 0); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(200, 100); + this.panel3.TabIndex = 0; + // + // panel4 + // + this.panel4.Location = new System.Drawing.Point(0, 0); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(200, 100); + this.panel4.TabIndex = 0; + // + // button35 + // + this.button35.Location = new System.Drawing.Point(0, 0); + this.button35.Name = "button35"; + this.button35.Size = new System.Drawing.Size(75, 23); + this.button35.TabIndex = 0; + // // tabControl1 // this.tabControl1.Controls.Add(this.tabPage1); @@ -242,7 +566,7 @@ namespace NovetusLauncher // // label31 // - this.label31.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.label31.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.label31.Location = new System.Drawing.Point(267, 5); this.label31.Name = "label31"; @@ -327,7 +651,7 @@ namespace NovetusLauncher // // label3 // - this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.label3.Location = new System.Drawing.Point(16, 5); this.label3.Name = "label3"; @@ -348,7 +672,6 @@ namespace NovetusLauncher // // tabPage2 // - //this.tabPage2.Controls.Add(this.checkBox8); this.tabPage2.Controls.Add(this.label19); this.tabPage2.Controls.Add(this.textBox3); this.tabPage2.Controls.Add(this.label17); @@ -370,9 +693,6 @@ namespace NovetusLauncher this.tabPage2.ToolTipText = "Start a server for other players to play"; this.tabPage2.UseVisualStyleBackColor = true; // - // checkBox8 - // - // // label19 // this.label19.AutoSize = true; @@ -384,8 +704,8 @@ namespace NovetusLauncher // // textBox3 // - this.textBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) + this.textBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.textBox3.BackColor = System.Drawing.SystemColors.ControlLightLight; this.textBox3.Location = new System.Drawing.Point(6, 21); @@ -785,8 +1105,8 @@ namespace NovetusLauncher // // richTextBox1 // - this.richTextBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) + this.richTextBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.richTextBox1.BackColor = System.Drawing.SystemColors.ControlText; this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; @@ -811,8 +1131,8 @@ namespace NovetusLauncher // // richTextBox2 // - this.richTextBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) + this.richTextBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.richTextBox2.BackColor = System.Drawing.SystemColors.ControlLightLight; this.richTextBox2.BorderStyle = System.Windows.Forms.BorderStyle.None; @@ -825,7 +1145,8 @@ namespace NovetusLauncher // // tabPage5 // - this.tabPage5.Controls.Add(this.button36); + this.tabPage5.Controls.Add(this.label5); + this.tabPage5.Controls.Add(this.comboBox3); this.tabPage5.Controls.Add(this.checkBox2); this.tabPage5.Controls.Add(this.label18); this.tabPage5.Controls.Add(this.button26); @@ -846,16 +1167,27 @@ namespace NovetusLauncher this.tabPage5.Text = "OPTIONS"; this.tabPage5.UseVisualStyleBackColor = true; // - // button36 + // label5 // - this.button36.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button36.Location = new System.Drawing.Point(90, 28); - this.button36.Name = "button36"; - this.button36.Size = new System.Drawing.Size(75, 23); - this.button36.TabIndex = 61; - this.button36.Text = "Extended Style"; - this.button36.UseVisualStyleBackColor = true; - this.button36.Click += new System.EventHandler(this.button36_Click); + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(173, 32); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(33, 13); + this.label5.TabIndex = 62; + this.label5.Text = "Style:"; + // + // comboBox3 + // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBox3.FormattingEnabled = true; + this.comboBox3.Items.AddRange(new object[] { + "Extended", + "Compact"}); + this.comboBox3.Location = new System.Drawing.Point(212, 29); + this.comboBox3.Name = "comboBox3"; + this.comboBox3.Size = new System.Drawing.Size(89, 21); + this.comboBox3.TabIndex = 61; + this.comboBox3.SelectedIndexChanged += new System.EventHandler(this.comboBox3_SelectedIndexChanged); // // checkBox2 // @@ -882,7 +1214,7 @@ namespace NovetusLauncher // button26 // this.button26.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button26.Location = new System.Drawing.Point(176, 28); + this.button26.Location = new System.Drawing.Point(88, 28); this.button26.Name = "button26"; this.button26.Size = new System.Drawing.Size(77, 23); this.button26.TabIndex = 57; @@ -941,11 +1273,11 @@ namespace NovetusLauncher // this.checkBox1.Checked = true; this.checkBox1.CheckState = System.Windows.Forms.CheckState.Checked; - this.checkBox1.Location = new System.Drawing.Point(270, 32); + this.checkBox1.Location = new System.Drawing.Point(307, 27); this.checkBox1.Name = "checkBox1"; - this.checkBox1.Size = new System.Drawing.Size(124, 17); + this.checkBox1.Size = new System.Drawing.Size(87, 30); this.checkBox1.TabIndex = 5; - this.checkBox1.Text = "Minimize on Launch"; + this.checkBox1.Text = "Minimize on\r\nLaunch"; this.checkBox1.UseCompatibleTextRendering = true; this.checkBox1.UseVisualStyleBackColor = true; this.checkBox1.CheckedChanged += new System.EventHandler(this.CheckBox1CheckedChanged); @@ -995,331 +1327,7 @@ namespace NovetusLauncher this.UAButton.UseVisualStyleBackColor = true; this.UAButton.Click += new System.EventHandler(this.Button21Click); // - // button25 - // - this.button25.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button25.Location = new System.Drawing.Point(315, 31); - this.button25.Name = "button25"; - this.button25.Size = new System.Drawing.Size(63, 20); - this.button25.TabIndex = 56; - this.button25.Text = "Install Mod"; - this.button25.UseVisualStyleBackColor = true; - this.button25.Click += new System.EventHandler(this.button25_Click); - // - // button21 - // - this.button21.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button21.Location = new System.Drawing.Point(380, 31); - this.button21.Name = "button21"; - this.button21.Size = new System.Drawing.Size(35, 20); - this.button21.TabIndex = 44; - this.button21.Text = "SDK"; - this.button21.UseVisualStyleBackColor = true; - this.button21.Click += new System.EventHandler(this.button34_Click); - // - // textBox5 - // - this.textBox5.Location = new System.Drawing.Point(95, 53); - this.textBox5.Multiline = true; - this.textBox5.Name = "textBox5"; - this.textBox5.Size = new System.Drawing.Size(71, 18); - this.textBox5.TabIndex = 20; - this.textBox5.Text = "0"; - this.textBox5.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.textBox5.TextChanged += new System.EventHandler(this.TextBox5TextChanged); - // - // label15 - // - this.label15.Location = new System.Drawing.Point(55, 34); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(40, 16); - this.label15.TabIndex = 12; - this.label15.Text = "Name:"; - // - // label13 - // - this.label13.Location = new System.Drawing.Point(55, 55); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(34, 13); - this.label13.TabIndex = 7; - this.label13.Text = "ID:"; - // - // textBox2 - // - this.textBox2.Location = new System.Drawing.Point(95, 31); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(121, 20); - this.textBox2.TabIndex = 11; - this.textBox2.Text = "Player"; - this.textBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.textBox2.TextChanged += new System.EventHandler(this.TextBox2TextChanged); - // - // button4 - // - this.button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button4.Location = new System.Drawing.Point(169, 52); - this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(48, 20); - this.button4.TabIndex = 9; - this.button4.Text = "Regen"; - this.button4.UseVisualStyleBackColor = true; - this.button4.Click += new System.EventHandler(this.Button4Click); - // - // pictureBox2 - // - this.pictureBox2.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pictureBox2.BackgroundImage"))); - this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.pictureBox2.Location = new System.Drawing.Point(6, 12); - this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(43, 41); - this.pictureBox2.TabIndex = 7; - this.pictureBox2.TabStop = false; - // - // button8 - // - this.button8.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button8.Location = new System.Drawing.Point(223, 31); - this.button8.Name = "button8"; - this.button8.Size = new System.Drawing.Size(47, 20); - this.button8.TabIndex = 35; - this.button8.Text = "Avatar"; - this.button8.UseVisualStyleBackColor = true; - this.button8.Click += new System.EventHandler(this.Button8Click); - // - // button3 - // - this.button3.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button3.Location = new System.Drawing.Point(271, 31); - this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(43, 20); - this.button3.TabIndex = 6; - this.button3.Text = "Studio"; - this.button3.UseVisualStyleBackColor = true; - this.button3.Click += new System.EventHandler(this.Button3Click_legacy); - // - // label25 - // - this.label25.Location = new System.Drawing.Point(55, 4); - this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(109, 14); - this.label25.TabIndex = 16; - this.label25.Text = "SELECTED CLIENT:"; - // - // label26 - // - this.label26.Location = new System.Drawing.Point(160, 4); - this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(245, 13); - this.label26.TabIndex = 17; - this.label26.Text = "2009E"; - // - // label27 - // - this.label27.Location = new System.Drawing.Point(55, 18); - this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(95, 12); - this.label27.TabIndex = 18; - this.label27.Text = "SELECTED MAP:"; - // - // label28 - // - this.label28.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label28.Location = new System.Drawing.Point(145, 18); - this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(260, 12); - this.label28.TabIndex = 19; - this.label28.Text = "Baseplate.rbxl"; - // - // label11 - // - this.label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label11.Location = new System.Drawing.Point(4, 51); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(47, 25); - this.label11.TabIndex = 50; - this.label11.Text = "v1.0"; - this.label11.TextAlign = System.Drawing.ContentAlignment.TopCenter; - // - // label12 - // - this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label12.Location = new System.Drawing.Point(223, 51); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(192, 21); - this.label12.TabIndex = 0; - this.label12.Text = "Novetus!"; - this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // label16 - // - this.label16.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.label16.Location = new System.Drawing.Point(54, 6); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(2, 65); - this.label16.TabIndex = 51; - // - // button20 - // - this.button20.Location = new System.Drawing.Point(0, 0); - this.button20.Name = "button20"; - this.button20.Size = new System.Drawing.Size(75, 23); - this.button20.TabIndex = 0; - // - // button27 - // - this.button27.Location = new System.Drawing.Point(0, 0); - this.button27.Name = "button27"; - this.button27.Size = new System.Drawing.Size(75, 23); - this.button27.TabIndex = 0; - // - // panel1 - // - this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(200, 100); - this.panel1.TabIndex = 0; - // - // button33 - // - this.button33.Location = new System.Drawing.Point(0, 0); - this.button33.Name = "button33"; - this.button33.Size = new System.Drawing.Size(75, 23); - this.button33.TabIndex = 0; - // - // button32 - // - this.button32.Location = new System.Drawing.Point(0, 0); - this.button32.Name = "button32"; - this.button32.Size = new System.Drawing.Size(75, 23); - this.button32.TabIndex = 0; - // - // button31 - // - this.button31.Location = new System.Drawing.Point(0, 0); - this.button31.Name = "button31"; - this.button31.Size = new System.Drawing.Size(75, 23); - this.button31.TabIndex = 0; - // - // button30 - // - this.button30.Location = new System.Drawing.Point(0, 0); - this.button30.Name = "button30"; - this.button30.Size = new System.Drawing.Size(75, 23); - this.button30.TabIndex = 0; - // - // button29 - // - this.button29.Location = new System.Drawing.Point(0, 0); - this.button29.Name = "button29"; - this.button29.Size = new System.Drawing.Size(75, 23); - this.button29.TabIndex = 0; - // - // button28 - // - this.button28.Location = new System.Drawing.Point(0, 0); - this.button28.Name = "button28"; - this.button28.Size = new System.Drawing.Size(75, 23); - this.button28.TabIndex = 0; - // - // button34 - // - this.button34.Location = new System.Drawing.Point(0, 0); - this.button34.Name = "button34"; - this.button34.Size = new System.Drawing.Size(75, 23); - this.button34.TabIndex = 0; - // - // panel2 - // - this.panel2.Location = new System.Drawing.Point(0, 0); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(200, 100); - this.panel2.TabIndex = 0; - // - // label24 - // - this.label24.Location = new System.Drawing.Point(0, 0); - this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(100, 23); - this.label24.TabIndex = 0; - // - // label23 - // - this.label23.Location = new System.Drawing.Point(0, 0); - this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(100, 23); - this.label23.TabIndex = 0; - // - // panel5 - // - this.panel5.Location = new System.Drawing.Point(0, 0); - this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(200, 100); - this.panel5.TabIndex = 0; - // - // comboBox2 - // - this.comboBox2.Location = new System.Drawing.Point(0, 0); - this.comboBox2.Name = "comboBox2"; - this.comboBox2.Size = new System.Drawing.Size(121, 21); - this.comboBox2.TabIndex = 0; - // - // comboBox1 - // - this.comboBox1.Location = new System.Drawing.Point(0, 0); - this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(121, 21); - this.comboBox1.TabIndex = 0; - // - // checkBox6 - // - this.checkBox6.Location = new System.Drawing.Point(0, 0); - this.checkBox6.Name = "checkBox6"; - this.checkBox6.Size = new System.Drawing.Size(104, 24); - this.checkBox6.TabIndex = 0; - // - // checkBox7 - // - this.checkBox7.Location = new System.Drawing.Point(0, 0); - this.checkBox7.Name = "checkBox7"; - this.checkBox7.Size = new System.Drawing.Size(104, 24); - this.checkBox7.TabIndex = 0; - // - // label22 - // - this.label22.Location = new System.Drawing.Point(0, 0); - this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(100, 23); - this.label22.TabIndex = 0; - // - // checkBox5 - // - this.checkBox5.Location = new System.Drawing.Point(0, 0); - this.checkBox5.Name = "checkBox5"; - this.checkBox5.Size = new System.Drawing.Size(104, 24); - this.checkBox5.TabIndex = 0; - // - // panel3 - // - this.panel3.Location = new System.Drawing.Point(0, 0); - this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(200, 100); - this.panel3.TabIndex = 0; - // - // panel4 - // - this.panel4.Location = new System.Drawing.Point(0, 0); - this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(200, 100); - this.panel4.TabIndex = 0; - // - // button35 - // - this.button35.Location = new System.Drawing.Point(0, 0); - this.button35.Name = "button35"; - this.button35.Size = new System.Drawing.Size(75, 23); - this.button35.TabIndex = 0; - // - // MainForm_legacy + // LauncherFormCompact // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; @@ -1347,11 +1355,12 @@ namespace NovetusLauncher this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; - this.Name = "MainForm_legacy"; + this.Name = "LauncherFormCompact"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Novetus"; this.Closing += new System.ComponentModel.CancelEventHandler(this.MainFormClose); this.Load += new System.EventHandler(this.MainFormLoad); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.tabControl1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); this.tabPage1.PerformLayout(); @@ -1369,7 +1378,6 @@ namespace NovetusLauncher this.tabPage8.ResumeLayout(false); this.tabPage5.ResumeLayout(false); this.tabPage5.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -1485,7 +1493,8 @@ namespace NovetusLauncher private System.Windows.Forms.Label label31; private System.Windows.Forms.ComboBox comboBox2; private System.Windows.Forms.Label label3; - private System.Windows.Forms.Button button36; + private System.Windows.Forms.ComboBox comboBox3; + private System.Windows.Forms.Label label5; //private System.Windows.Forms.CheckBox checkBox8; } } diff --git a/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompact.cs b/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompact.cs index dfe79fc..7bea22e 100644 --- a/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompact.cs +++ b/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompact.cs @@ -43,7 +43,7 @@ namespace NovetusLauncher #region UPnP public void InitUPnP() { - if (GlobalVars.UserConfiguration.UPnP == true) + if (GlobalVars.UserConfiguration.UPnP) { try { @@ -59,7 +59,7 @@ namespace NovetusLauncher public void StartUPnP(INatDevice device, Protocol protocol, int port) { - if (GlobalVars.UserConfiguration.UPnP == true) + if (GlobalVars.UserConfiguration.UPnP) { try { @@ -75,7 +75,7 @@ namespace NovetusLauncher public void StopUPnP(INatDevice device, Protocol protocol, int port) { - if (GlobalVars.UserConfiguration.UPnP == true) + if (GlobalVars.UserConfiguration.UPnP) { try { @@ -253,10 +253,10 @@ namespace NovetusLauncher URI, "Local URI Link:", URI2, - GlobalVars.IsWebServerOn == true ? "Web Server URL:" : "", - GlobalVars.IsWebServerOn == true ? "http://" + IP + ":" + GlobalVars.WebServer.Port.ToString() : "", - GlobalVars.IsWebServerOn == true ? "Local Web Server URL:" : "", - GlobalVars.IsWebServerOn == true ? GlobalVars.LocalWebServerURI : "" + GlobalVars.IsWebServerOn ? "Web Server URL:" : "", + GlobalVars.IsWebServerOn ? "http://" + IP + ":" + GlobalVars.WebServer.Port.ToString() : "", + GlobalVars.IsWebServerOn ? "Local Web Server URL:" : "", + GlobalVars.IsWebServerOn ? GlobalVars.LocalWebServerURI : "" }; foreach (string str in text) @@ -322,7 +322,7 @@ namespace NovetusLauncher void Button1Click(object sender, EventArgs e) { - if (LocalVars.LocalPlayMode == true) + if (LocalVars.LocalPlayMode) { GeneratePlayerID(); GenerateTripcode(); @@ -334,7 +334,7 @@ namespace NovetusLauncher StartClient(); - if (GlobalVars.UserConfiguration.CloseOnLaunch == true) + if (GlobalVars.UserConfiguration.CloseOnLaunch) { Visible = false; } @@ -345,7 +345,7 @@ namespace NovetusLauncher WriteConfigValues(); StartServer(false); - if (GlobalVars.UserConfiguration.CloseOnLaunch == true) + if (GlobalVars.UserConfiguration.CloseOnLaunch) { Visible = false; } @@ -359,7 +359,7 @@ namespace NovetusLauncher WriteConfigValues(); StartStudio(false); - if (GlobalVars.UserConfiguration.CloseOnLaunch == true) + if (GlobalVars.UserConfiguration.CloseOnLaunch) { Visible = false; } @@ -370,7 +370,7 @@ namespace NovetusLauncher WriteConfigValues(); StartServer(true); - if (GlobalVars.UserConfiguration.CloseOnLaunch == true) + if (GlobalVars.UserConfiguration.CloseOnLaunch) { Visible = false; } @@ -381,7 +381,7 @@ namespace NovetusLauncher WriteConfigValues(); StartSolo(); - if (GlobalVars.UserConfiguration.CloseOnLaunch == true) + if (GlobalVars.UserConfiguration.CloseOnLaunch) { Visible = false; } @@ -395,7 +395,7 @@ namespace NovetusLauncher WriteConfigValues(); StartStudio(true); - if (GlobalVars.UserConfiguration.CloseOnLaunch == true) + if (GlobalVars.UserConfiguration.CloseOnLaunch) { Visible = false; } @@ -518,7 +518,18 @@ namespace NovetusLauncher label38.Text = GlobalVars.UserConfiguration.RobloxPort.ToString(); checkBox2.Checked = GlobalVars.UserConfiguration.DiscordPresence; - ConsolePrint("Config loaded.", 3); + switch (GlobalVars.UserConfiguration.LauncherStyle) + { + case Settings.UIOptions.Style.Compact: + comboBox3.SelectedIndex = 1; + break; + case Settings.UIOptions.Style.Extended: + default: + comboBox3.SelectedIndex = 0; + break; + } + + ConsolePrint("Config loaded.", 3); ReadClientValues(GlobalVars.UserConfiguration.SelectedClient); } @@ -859,9 +870,9 @@ namespace NovetusLauncher { if (GlobalVars.SelectedClientInfo.AlreadyHasSecurity != true) { - if (SecurityFuncs.checkClientMD5(GlobalVars.UserConfiguration.SelectedClient) == true) + if (SecurityFuncs.checkClientMD5(GlobalVars.UserConfiguration.SelectedClient)) { - if (SecurityFuncs.checkScriptMD5(GlobalVars.UserConfiguration.SelectedClient) == true) + if (SecurityFuncs.checkScriptMD5(GlobalVars.UserConfiguration.SelectedClient)) { OpenClient(rbxexe,args); } @@ -911,7 +922,7 @@ namespace NovetusLauncher void ClientExited(object sender, EventArgs e) { LauncherFuncs.UpdateRichPresence(LauncherState.InLauncher, ""); - if (GlobalVars.UserConfiguration.CloseOnLaunch == true) + if (GlobalVars.UserConfiguration.CloseOnLaunch) { Visible = true; } @@ -919,7 +930,7 @@ namespace NovetusLauncher void ServerExited(object sender, EventArgs e) { - if (GlobalVars.UserConfiguration.CloseOnLaunch == true) + if (GlobalVars.UserConfiguration.CloseOnLaunch) { Visible = true; } @@ -929,7 +940,7 @@ namespace NovetusLauncher { LauncherFuncs.UpdateRichPresence(LauncherState.InLauncher, ""); label12.Text = LocalVars.prevsplash; - if (GlobalVars.UserConfiguration.CloseOnLaunch == true) + if (GlobalVars.UserConfiguration.CloseOnLaunch) { Visible = true; } @@ -1158,7 +1169,7 @@ namespace NovetusLauncher LoadLauncher(); break; case string webserverstart when string.Compare(webserverstart, "webserver start", true, CultureInfo.InvariantCulture) == 0: - if (GlobalVars.IsWebServerOn == false) + if (!GlobalVars.IsWebServerOn) { StartWebServer(); } @@ -1168,7 +1179,7 @@ namespace NovetusLauncher } break; case string webserverstop when string.Compare(webserverstop, "webserver stop", true, CultureInfo.InvariantCulture) == 0: - if (GlobalVars.IsWebServerOn == true) + if (GlobalVars.IsWebServerOn) { StopWebServer(); } @@ -1474,7 +1485,7 @@ namespace NovetusLauncher WriteConfigValues(); StartEasterEgg(); - if (GlobalVars.UserConfiguration.CloseOnLaunch == true) + if (GlobalVars.UserConfiguration.CloseOnLaunch) { Visible = false; } @@ -1507,17 +1518,24 @@ namespace NovetusLauncher WriteConfigValues(); StartStudio(nomap); - if (GlobalVars.UserConfiguration.CloseOnLaunch == true) + if (GlobalVars.UserConfiguration.CloseOnLaunch) { Visible = false; } } - private void button36_Click(object sender, EventArgs e) + private void comboBox3_SelectedIndexChanged(object sender, EventArgs e) { - GlobalVars.UserConfiguration.LauncherLayout = Settings.UIOptions.Style.Extended; - WriteConfigValues(); - Application.Restart(); - } - } + switch (comboBox3.SelectedIndex) + { + case 1: + break; + default: + GlobalVars.UserConfiguration.LauncherStyle = Settings.UIOptions.Style.Extended; + WriteConfigValues(); + Application.Restart(); + break; + } + } + } } diff --git a/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompact.resx b/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompact.resx index 9aa1c53..2afb042 100644 --- a/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompact.resx +++ b/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompact.resx @@ -117,17 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - NOTE: -- If you have a problem where you can't see your character, REGENERATE YOUR PLAYER ID THEN REJOIN THE SERVER. -- If you tried to connect to the server and you get an error, REJOIN THE SERVER. -- To reset your character, type !!!reset into chat. -- Your tripcode will only be seen by you and the server host of any server you join. It is used to verify that you are a unique player. - - - - - @@ -19624,6 +19613,17 @@ aMoiAAAAAAAAAIymLAIAAAAAAADAaMoiAAAAAAAAAIymLAIAAAAAAADAaMoiAAAAAAAAAIymLAIAAAAA AADAaMoiAAAAAAAAAIymLAIAAAAAAADAaMoiAAAAAAAAAIymLAIAAAAAAADAaMoiAAAAAAAAAIxlc9X/ AxppXSXTqYivAAAAAElFTkSuQmCC + + + + NOTE: +- If you have a problem where you can't see your character, REGENERATE YOUR PLAYER ID THEN REJOIN THE SERVER. +- If you tried to connect to the server and you get an error, REJOIN THE SERVER. +- To reset your character, type !!!reset into chat. +- Your tripcode will only be seen by you and the server host of any server you join. It is used to verify that you are a unique player. + + + diff --git a/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompactSettings.cs b/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompactSettings.cs index 8669377..2685509 100644 --- a/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompactSettings.cs +++ b/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompactSettings.cs @@ -30,19 +30,19 @@ namespace NovetusLauncher switch (GlobalVars.UserConfiguration.QualityLevel) { - case Settings.QualityOptions.Level.VeryLow: + case Settings.GraphicsOptions.Level.VeryLow: comboBox2.SelectedIndex = 0; break; - case Settings.QualityOptions.Level.Low: + case Settings.GraphicsOptions.Level.Low: comboBox2.SelectedIndex = 1; break; - case Settings.QualityOptions.Level.Medium: + case Settings.GraphicsOptions.Level.Medium: comboBox2.SelectedIndex = 2; break; - case Settings.QualityOptions.Level.High: + case Settings.GraphicsOptions.Level.High: comboBox2.SelectedIndex = 3; break; - case Settings.QualityOptions.Level.Ultra: + case Settings.GraphicsOptions.Level.Ultra: default: comboBox2.SelectedIndex = 4; break; @@ -82,27 +82,27 @@ namespace NovetusLauncher switch (comboBox2.SelectedIndex) { case 0: - GlobalVars.UserConfiguration.QualityLevel = Settings.QualityOptions.Level.VeryLow; + GlobalVars.UserConfiguration.QualityLevel = Settings.GraphicsOptions.Level.VeryLow; break; case 1: - GlobalVars.UserConfiguration.QualityLevel = Settings.QualityOptions.Level.Low; + GlobalVars.UserConfiguration.QualityLevel = Settings.GraphicsOptions.Level.Low; break; case 2: - GlobalVars.UserConfiguration.QualityLevel = Settings.QualityOptions.Level.Medium; + GlobalVars.UserConfiguration.QualityLevel = Settings.GraphicsOptions.Level.Medium; break; case 3: - GlobalVars.UserConfiguration.QualityLevel = Settings.QualityOptions.Level.High; + GlobalVars.UserConfiguration.QualityLevel = Settings.GraphicsOptions.Level.High; break; case 4: default: - GlobalVars.UserConfiguration.QualityLevel = Settings.QualityOptions.Level.Ultra; + GlobalVars.UserConfiguration.QualityLevel = Settings.GraphicsOptions.Level.Ultra; break; } } private void NovetusSettings_Load(object sender, EventArgs e) { - if (GlobalVars.UserConfiguration.LauncherLayout == Settings.UIOptions.Style.Compact) + if (GlobalVars.UserConfiguration.LauncherStyle == Settings.UIOptions.Style.Compact) { ReadConfigValues(); } diff --git a/Novetus/NovetusLauncher/LauncherForm/Extended/LauncherFormExtended.Designer.cs b/Novetus/NovetusLauncher/LauncherForm/Extended/LauncherFormExtended.Designer.cs index 42dbd8d..66c5225 100644 --- a/Novetus/NovetusLauncher/LauncherForm/Extended/LauncherFormExtended.Designer.cs +++ b/Novetus/NovetusLauncher/LauncherForm/Extended/LauncherFormExtended.Designer.cs @@ -6,8 +6,6 @@ * * To change this template use Tools | Options | Coding | Edit Standard Headers. */ -//this.tabControl1 = new TabControlWithoutHeader(1); -//This ALWAYS gets lost whenever I compile. WTF VS? namespace NovetusLauncher { partial class LauncherFormExtended @@ -44,7 +42,7 @@ namespace NovetusLauncher private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LauncherFormExtended)); - this.tabControl1 = new TabControlWithoutHeader(1); + this.tabControl1 = new TabControlWithoutHeader(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.label24 = new System.Windows.Forms.Label(); this.label23 = new System.Windows.Forms.Label(); @@ -59,7 +57,6 @@ namespace NovetusLauncher this.button1 = new System.Windows.Forms.Button(); this.textBox1 = new System.Windows.Forms.TextBox(); this.tabPage2 = new System.Windows.Forms.TabPage(); - //this.checkBox8 = new System.Windows.Forms.CheckBox(); this.label19 = new System.Windows.Forms.Label(); this.textBox3 = new System.Windows.Forms.TextBox(); this.label17 = new System.Windows.Forms.Label(); @@ -102,7 +99,6 @@ namespace NovetusLauncher this.richTextBox2 = new System.Windows.Forms.RichTextBox(); this.tabPage5 = new System.Windows.Forms.TabPage(); this.panel5 = new System.Windows.Forms.Panel(); - this.button36 = new System.Windows.Forms.Button(); this.label3 = new System.Windows.Forms.Label(); this.comboBox2 = new System.Windows.Forms.ComboBox(); this.label31 = new System.Windows.Forms.Label(); @@ -155,6 +151,8 @@ namespace NovetusLauncher this.panel4 = new System.Windows.Forms.Panel(); this.button35 = new System.Windows.Forms.Button(); this.UAButton = new System.Windows.Forms.Button(); + this.comboBox3 = new System.Windows.Forms.ComboBox(); + this.label5 = new System.Windows.Forms.Label(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); @@ -350,7 +348,6 @@ namespace NovetusLauncher // // tabPage2 // - //this.tabPage2.Controls.Add(this.checkBox8); this.tabPage2.Controls.Add(this.label19); this.tabPage2.Controls.Add(this.textBox3); this.tabPage2.Controls.Add(this.label17); @@ -782,7 +779,7 @@ namespace NovetusLauncher // // richTextBox1 // - this.richTextBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.richTextBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.richTextBox1.BackColor = System.Drawing.SystemColors.ControlText; this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; @@ -807,7 +804,7 @@ namespace NovetusLauncher // // richTextBox2 // - this.richTextBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.richTextBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.richTextBox2.BackColor = System.Drawing.SystemColors.ControlLightLight; this.richTextBox2.BorderStyle = System.Windows.Forms.BorderStyle.None; @@ -835,7 +832,8 @@ namespace NovetusLauncher // // panel5 // - this.panel5.Controls.Add(this.button36); + this.panel5.Controls.Add(this.label5); + this.panel5.Controls.Add(this.comboBox3); this.panel5.Controls.Add(this.label3); this.panel5.Controls.Add(this.comboBox2); this.panel5.Controls.Add(this.label31); @@ -855,17 +853,6 @@ namespace NovetusLauncher this.panel5.Size = new System.Drawing.Size(200, 259); this.panel5.TabIndex = 68; // - // button36 - // - this.button36.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button36.Location = new System.Drawing.Point(99, 55); - this.button36.Name = "button36"; - this.button36.Size = new System.Drawing.Size(95, 21); - this.button36.TabIndex = 75; - this.button36.Text = "Compact Style"; - this.button36.UseVisualStyleBackColor = true; - this.button36.Click += new System.EventHandler(this.button36_Click); - // // label3 // this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 6F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -891,7 +878,7 @@ namespace NovetusLauncher "Ultra"}); this.comboBox2.Location = new System.Drawing.Point(90, 134); this.comboBox2.Name = "comboBox2"; - this.comboBox2.Size = new System.Drawing.Size(84, 21); + this.comboBox2.Size = new System.Drawing.Size(103, 21); this.comboBox2.TabIndex = 73; this.comboBox2.SelectedIndexChanged += new System.EventHandler(this.comboBox2_SelectedIndexChanged); // @@ -913,7 +900,7 @@ namespace NovetusLauncher "DirectX"}); this.comboBox1.Location = new System.Drawing.Point(90, 108); this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(84, 21); + this.comboBox1.Size = new System.Drawing.Size(103, 21); this.comboBox1.TabIndex = 68; this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); // @@ -999,11 +986,11 @@ namespace NovetusLauncher // button9 // this.button9.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button9.Location = new System.Drawing.Point(99, 79); + this.button9.Location = new System.Drawing.Point(154, 55); this.button9.Name = "button9"; - this.button9.Size = new System.Drawing.Size(95, 20); + this.button9.Size = new System.Drawing.Size(39, 21); this.button9.TabIndex = 37; - this.button9.Text = "Reset Config"; + this.button9.Text = "Reset"; this.button9.UseVisualStyleBackColor = true; this.button9.Click += new System.EventHandler(this.Button9Click); // @@ -1012,7 +999,7 @@ namespace NovetusLauncher this.button26.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.button26.Location = new System.Drawing.Point(3, 55); this.button26.Name = "button26"; - this.button26.Size = new System.Drawing.Size(94, 21); + this.button26.Size = new System.Drawing.Size(104, 21); this.button26.TabIndex = 57; this.button26.Text = "Clear Asset Cache"; this.button26.UseVisualStyleBackColor = true; @@ -1021,11 +1008,11 @@ namespace NovetusLauncher // button5 // this.button5.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button5.Location = new System.Drawing.Point(3, 79); + this.button5.Location = new System.Drawing.Point(113, 55); this.button5.Name = "button5"; - this.button5.Size = new System.Drawing.Size(90, 20); + this.button5.Size = new System.Drawing.Size(35, 21); this.button5.TabIndex = 10; - this.button5.Text = "Save Config"; + this.button5.Text = "Save"; this.button5.UseVisualStyleBackColor = true; this.button5.Click += new System.EventHandler(this.Button5Click); // @@ -1419,7 +1406,29 @@ namespace NovetusLauncher this.UAButton.Size = new System.Drawing.Size(75, 23); this.UAButton.TabIndex = 0; // - // MainForm + // comboBox3 + // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBox3.FormattingEnabled = true; + this.comboBox3.Location = new System.Drawing.Point(90, 82); + this.comboBox3.Items.AddRange(new object[] { + "Extended", + "Compact"}); + this.comboBox3.Name = "comboBox3"; + this.comboBox3.Size = new System.Drawing.Size(103, 21); + this.comboBox3.TabIndex = 75; + this.comboBox3.SelectedIndexChanged += new System.EventHandler(this.comboBox3_SelectedIndexChanged); + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(3, 85); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(78, 13); + this.label5.TabIndex = 76; + this.label5.Text = "Launcher Style"; + // + // LauncherFormExtended // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; @@ -1437,7 +1446,7 @@ namespace NovetusLauncher this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; - this.Name = "MainForm"; + this.Name = "LauncherFormExtended"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Novetus"; this.Closing += new System.ComponentModel.CancelEventHandler(this.MainFormClose); @@ -1580,7 +1589,8 @@ namespace NovetusLauncher private System.Windows.Forms.Label label31; private System.Windows.Forms.ComboBox comboBox2; private System.Windows.Forms.Label label3; - private System.Windows.Forms.Button button36; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.ComboBox comboBox3; //private System.Windows.Forms.CheckBox checkBox8; } } diff --git a/Novetus/NovetusLauncher/LauncherForm/Extended/LauncherFormExtended.cs b/Novetus/NovetusLauncher/LauncherForm/Extended/LauncherFormExtended.cs index 0ffbd1f..db76aa8 100644 --- a/Novetus/NovetusLauncher/LauncherForm/Extended/LauncherFormExtended.cs +++ b/Novetus/NovetusLauncher/LauncherForm/Extended/LauncherFormExtended.cs @@ -45,7 +45,7 @@ namespace NovetusLauncher #region UPnP public void InitUPnP() { - if (GlobalVars.UserConfiguration.UPnP == true) + if (GlobalVars.UserConfiguration.UPnP) { try { @@ -61,7 +61,7 @@ namespace NovetusLauncher public void StartUPnP(INatDevice device, Protocol protocol, int port) { - if (GlobalVars.UserConfiguration.UPnP == true) + if (GlobalVars.UserConfiguration.UPnP) { try { @@ -77,7 +77,7 @@ namespace NovetusLauncher public void StopUPnP(INatDevice device, Protocol protocol, int port) { - if (GlobalVars.UserConfiguration.UPnP == true) + if (GlobalVars.UserConfiguration.UPnP) { try { @@ -255,10 +255,10 @@ namespace NovetusLauncher URI, "Local URI Link:", URI2, - GlobalVars.IsWebServerOn == true ? "Web Server URL:" : "", - GlobalVars.IsWebServerOn == true ? "http://" + IP + ":" + GlobalVars.WebServer.Port.ToString() : "", - GlobalVars.IsWebServerOn == true ? "Local Web Server URL:" : "", - GlobalVars.IsWebServerOn == true ? GlobalVars.LocalWebServerURI : "" + GlobalVars.IsWebServerOn ? "Web Server URL:" : "", + GlobalVars.IsWebServerOn ? "http://" + IP + ":" + GlobalVars.WebServer.Port.ToString() : "", + GlobalVars.IsWebServerOn ? "Local Web Server URL:" : "", + GlobalVars.IsWebServerOn ? GlobalVars.LocalWebServerURI : "" }; foreach (string str in text) @@ -324,7 +324,7 @@ namespace NovetusLauncher void Button1Click(object sender, EventArgs e) { - if (LocalVars.LocalPlayMode == true) + if (LocalVars.LocalPlayMode) { GeneratePlayerID(); GenerateTripcode(); @@ -336,7 +336,7 @@ namespace NovetusLauncher StartClient(); - if (GlobalVars.UserConfiguration.CloseOnLaunch == true) + if (GlobalVars.UserConfiguration.CloseOnLaunch) { Visible = false; } @@ -347,7 +347,7 @@ namespace NovetusLauncher WriteConfigValues(); StartServer(false); - if (GlobalVars.UserConfiguration.CloseOnLaunch == true) + if (GlobalVars.UserConfiguration.CloseOnLaunch) { Visible = false; } @@ -361,7 +361,7 @@ namespace NovetusLauncher WriteConfigValues(); StartStudio(false); - if (GlobalVars.UserConfiguration.CloseOnLaunch == true) + if (GlobalVars.UserConfiguration.CloseOnLaunch) { Visible = false; } @@ -372,7 +372,7 @@ namespace NovetusLauncher WriteConfigValues(); StartServer(true); - if (GlobalVars.UserConfiguration.CloseOnLaunch == true) + if (GlobalVars.UserConfiguration.CloseOnLaunch) { Visible = false; } @@ -383,7 +383,7 @@ namespace NovetusLauncher WriteConfigValues(); StartSolo(); - if (GlobalVars.UserConfiguration.CloseOnLaunch == true) + if (GlobalVars.UserConfiguration.CloseOnLaunch) { Visible = false; } @@ -397,7 +397,7 @@ namespace NovetusLauncher WriteConfigValues(); StartStudio(true); - if (GlobalVars.UserConfiguration.CloseOnLaunch == true) + if (GlobalVars.UserConfiguration.CloseOnLaunch) { Visible = false; } @@ -536,24 +536,35 @@ namespace NovetusLauncher switch (GlobalVars.UserConfiguration.QualityLevel) { - case Settings.QualityOptions.Level.VeryLow: + case Settings.GraphicsOptions.Level.VeryLow: comboBox2.SelectedIndex = 0; break; - case Settings.QualityOptions.Level.Low: + case Settings.GraphicsOptions.Level.Low: comboBox2.SelectedIndex = 1; break; - case Settings.QualityOptions.Level.Medium: + case Settings.GraphicsOptions.Level.Medium: comboBox2.SelectedIndex = 2; break; - case Settings.QualityOptions.Level.High: + case Settings.GraphicsOptions.Level.High: comboBox2.SelectedIndex = 3; break; - case Settings.QualityOptions.Level.Ultra: + case Settings.GraphicsOptions.Level.Ultra: default: comboBox2.SelectedIndex = 4; break; } + switch (GlobalVars.UserConfiguration.LauncherStyle) + { + case Settings.UIOptions.Style.Compact: + comboBox3.SelectedIndex = 1; + break; + case Settings.UIOptions.Style.Extended: + default: + comboBox3.SelectedIndex = 0; + break; + } + ConsolePrint("Config loaded.", 3); ReadClientValues(GlobalVars.UserConfiguration.SelectedClient); } @@ -895,9 +906,9 @@ namespace NovetusLauncher { if (GlobalVars.SelectedClientInfo.AlreadyHasSecurity != true) { - if (SecurityFuncs.checkClientMD5(GlobalVars.UserConfiguration.SelectedClient) == true) + if (SecurityFuncs.checkClientMD5(GlobalVars.UserConfiguration.SelectedClient)) { - if (SecurityFuncs.checkScriptMD5(GlobalVars.UserConfiguration.SelectedClient) == true) + if (SecurityFuncs.checkScriptMD5(GlobalVars.UserConfiguration.SelectedClient)) { OpenClient(rbxexe,args); } @@ -947,7 +958,7 @@ namespace NovetusLauncher void ClientExited(object sender, EventArgs e) { LauncherFuncs.UpdateRichPresence(LauncherState.InLauncher, ""); - if (GlobalVars.UserConfiguration.CloseOnLaunch == true) + if (GlobalVars.UserConfiguration.CloseOnLaunch) { Visible = true; } @@ -955,7 +966,7 @@ namespace NovetusLauncher void ServerExited(object sender, EventArgs e) { - if (GlobalVars.UserConfiguration.CloseOnLaunch == true) + if (GlobalVars.UserConfiguration.CloseOnLaunch) { Visible = true; } @@ -965,7 +976,7 @@ namespace NovetusLauncher { LauncherFuncs.UpdateRichPresence(LauncherState.InLauncher, ""); label12.Text = LocalVars.prevsplash; - if (GlobalVars.UserConfiguration.CloseOnLaunch == true) + if (GlobalVars.UserConfiguration.CloseOnLaunch) { Visible = true; } @@ -1194,7 +1205,7 @@ namespace NovetusLauncher LoadLauncher(); break; case string webserverstart when string.Compare(webserverstart, "webserver start", true, CultureInfo.InvariantCulture) == 0: - if (GlobalVars.IsWebServerOn == false) + if (!GlobalVars.IsWebServerOn) { StartWebServer(); } @@ -1204,7 +1215,7 @@ namespace NovetusLauncher } break; case string webserverstop when string.Compare(webserverstop, "webserver stop", true, CultureInfo.InvariantCulture) == 0: - if (GlobalVars.IsWebServerOn == true) + if (GlobalVars.IsWebServerOn) { StopWebServer(); } @@ -1510,7 +1521,7 @@ namespace NovetusLauncher WriteConfigValues(); StartEasterEgg(); - if (GlobalVars.UserConfiguration.CloseOnLaunch == true) + if (GlobalVars.UserConfiguration.CloseOnLaunch) { Visible = false; } @@ -1554,29 +1565,36 @@ namespace NovetusLauncher switch (comboBox2.SelectedIndex) { case 0: - GlobalVars.UserConfiguration.QualityLevel = Settings.QualityOptions.Level.VeryLow; + GlobalVars.UserConfiguration.QualityLevel = Settings.GraphicsOptions.Level.VeryLow; break; case 1: - GlobalVars.UserConfiguration.QualityLevel = Settings.QualityOptions.Level.Low; + GlobalVars.UserConfiguration.QualityLevel = Settings.GraphicsOptions.Level.Low; break; case 2: - GlobalVars.UserConfiguration.QualityLevel = Settings.QualityOptions.Level.Medium; + GlobalVars.UserConfiguration.QualityLevel = Settings.GraphicsOptions.Level.Medium; break; case 3: - GlobalVars.UserConfiguration.QualityLevel = Settings.QualityOptions.Level.High; + GlobalVars.UserConfiguration.QualityLevel = Settings.GraphicsOptions.Level.High; break; case 4: default: - GlobalVars.UserConfiguration.QualityLevel = Settings.QualityOptions.Level.Ultra; + GlobalVars.UserConfiguration.QualityLevel = Settings.GraphicsOptions.Level.Ultra; break; } } - private void button36_Click(object sender, EventArgs e) - { - GlobalVars.UserConfiguration.LauncherLayout = Settings.UIOptions.Style.Compact; - WriteConfigValues(); - Application.Restart(); - } - } + private void comboBox3_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBox3.SelectedIndex) + { + case 1: + GlobalVars.UserConfiguration.LauncherStyle = Settings.UIOptions.Style.Compact; + WriteConfigValues(); + Application.Restart(); + break; + default: + break; + } + } + } } diff --git a/Novetus/NovetusLauncher/Program.cs b/Novetus/NovetusLauncher/Program.cs index 88e3ca9..51edc18 100644 --- a/Novetus/NovetusLauncher/Program.cs +++ b/Novetus/NovetusLauncher/Program.cs @@ -33,7 +33,7 @@ namespace NovetusLauncher LauncherFuncs.Config(GlobalPaths.ConfigDir + "\\" + GlobalVars.ConfigName, false); if (args.Length == 0) { - switch (GlobalVars.UserConfiguration.LauncherLayout) + switch (GlobalVars.UserConfiguration.LauncherStyle) { case Settings.UIOptions.Style.Compact: Application.Run(new LauncherFormCompact()); diff --git a/Novetus/NovetusLauncher/SDK/AssetLocalizer.cs b/Novetus/NovetusLauncher/SDK/AssetLocalizer.cs index b1cad05..742bc57 100644 --- a/Novetus/NovetusLauncher/SDK/AssetLocalizer.cs +++ b/Novetus/NovetusLauncher/SDK/AssetLocalizer.cs @@ -563,7 +563,7 @@ namespace NovetusLauncher { switch (e) { - case RunWorkerCompletedEventArgs can when can.Cancelled == true: + case RunWorkerCompletedEventArgs can when can.Cancelled: label2.Text = "Canceled!"; break; case RunWorkerCompletedEventArgs err when err.Error != null: diff --git a/Novetus/NovetusLauncher/SDK/ClientinfoCreator.cs b/Novetus/NovetusLauncher/SDK/ClientinfoCreator.cs index 24311a5..2efdaff 100644 --- a/Novetus/NovetusLauncher/SDK/ClientinfoCreator.cs +++ b/Novetus/NovetusLauncher/SDK/ClientinfoCreator.cs @@ -237,7 +237,7 @@ namespace NovetusLauncher if (GlobalVars.AdminMode != true) { bool bline8 = Convert.ToBoolean(locked); - if (bline8 == true) + if (bline8) { MessageBox.Show("This client is locked and therefore it cannot be loaded.","Novetus Launcher - Error when loading client", MessageBoxButtons.OK, MessageBoxIcon.Error); return; diff --git a/Novetus/NovetusURI/LoaderForm.cs b/Novetus/NovetusURI/LoaderForm.cs index 1ebb966..edb44a9 100644 --- a/Novetus/NovetusURI/LoaderForm.cs +++ b/Novetus/NovetusURI/LoaderForm.cs @@ -104,7 +104,7 @@ namespace NovetusURI luafile = GlobalPaths.ClientDir + @"\\" + GlobalVars.UserConfiguration.SelectedClient + @"\\content\\scripts\\" + GlobalVars.ScriptGenName + ".lua"; } string rbxexe = ""; - if (GlobalVars.SelectedClientInfo.LegacyMode == true) + if (GlobalVars.SelectedClientInfo.LegacyMode) { rbxexe = GlobalPaths.ClientDir + @"\\" + GlobalVars.UserConfiguration.SelectedClient + @"\\RobloxApp.exe"; } @@ -136,9 +136,9 @@ namespace NovetusURI { if (GlobalVars.SelectedClientInfo.AlreadyHasSecurity != true) { - if (SecurityFuncs.checkClientMD5(GlobalVars.UserConfiguration.SelectedClient) == true) + if (SecurityFuncs.checkClientMD5(GlobalVars.UserConfiguration.SelectedClient)) { - if (SecurityFuncs.checkScriptMD5(GlobalVars.UserConfiguration.SelectedClient) == true) + if (SecurityFuncs.checkScriptMD5(GlobalVars.UserConfiguration.SelectedClient)) { LaunchClient(rbxexe,args); } @@ -190,7 +190,7 @@ namespace NovetusURI private void CheckIfFinished(object state) { - if (LocalVars.ReadyToLaunch == false) + if (!LocalVars.ReadyToLaunch) { System.Threading.Timer timer = new System.Threading.Timer(new TimerCallback(CheckIfFinished), null, 1, 0); }