diff --git a/NovetusLauncher/.vs/NovetusLauncher/v14/.suo b/NovetusLauncher/.vs/NovetusLauncher/v14/.suo index af22122..ae52f82 100644 Binary files a/NovetusLauncher/.vs/NovetusLauncher/v14/.suo and b/NovetusLauncher/.vs/NovetusLauncher/v14/.suo differ diff --git a/NovetusLauncher/NovetusFuncs/AddonLoader.cs b/NovetusLauncher/NovetusFuncs/AddonLoader.cs index 5678fac..8acccc3 100644 --- a/NovetusLauncher/NovetusFuncs/AddonLoader.cs +++ b/NovetusLauncher/NovetusFuncs/AddonLoader.cs @@ -3,6 +3,7 @@ using System.IO; using System.Windows.Forms; using System.IO.Compression; using System.Linq; +using System.Text; public class AddonLoader { @@ -42,7 +43,7 @@ public class AddonLoader try { int filecount = 0; - string filelist = ""; + StringBuilder filelistbuilder = new StringBuilder(); using (Stream str = openFileDialog1.OpenFile()) { @@ -54,12 +55,16 @@ public class AddonLoader foreach (ZipArchiveEntry entry in entries) { - filelist += entry.FullName + Environment.NewLine; + filelistbuilder.Append(entry.FullName); + filelistbuilder.Append(Environment.NewLine); } + archive.ExtractToDirectory(GlobalVars.BasePath, true); } } + string filelist = filelistbuilder.ToString(); + if (filecount > fileListDisplay) { installOutcome = "Addon " + openFileDialog1.SafeFileName + " installed! " + filecount + " files copied!" + Environment.NewLine + "Files added/modified:" + Environment.NewLine + Environment.NewLine + filelist + Environment.NewLine + "and " + (filecount - fileListDisplay) + " more files!"; diff --git a/NovetusLauncher/NovetusFuncs/ClientScript.cs b/NovetusLauncher/NovetusFuncs/ClientScript.cs index c12877b..01c4539 100644 --- a/NovetusLauncher/NovetusFuncs/ClientScript.cs +++ b/NovetusLauncher/NovetusFuncs/ClientScript.cs @@ -6,11 +6,12 @@ * * To change this template use Tools | Options | Coding | Edit Standard Headers. */ - + using System; using System.IO; using System.Reflection; using System.Linq; +using System.Globalization; public class ClientScript { diff --git a/NovetusLauncher/NovetusLauncher/ClientinfoCreator.cs b/NovetusLauncher/NovetusLauncher/ClientinfoCreator.cs index 276d92b..451d037 100644 --- a/NovetusLauncher/NovetusLauncher/ClientinfoCreator.cs +++ b/NovetusLauncher/NovetusLauncher/ClientinfoCreator.cs @@ -109,14 +109,14 @@ namespace NovetusLauncher void TextBox2TextChanged(object sender, EventArgs e) { - textBox2.Text = textBox2.Text.ToUpper(CultureInfo.InstalledUICulture); - SelectedClientMD5 = textBox2.Text.ToUpper(CultureInfo.InstalledUICulture); + textBox2.Text = textBox2.Text.ToUpper(CultureInfo.InvariantCulture); + SelectedClientMD5 = textBox2.Text.ToUpper(CultureInfo.InvariantCulture); } void TextBox3TextChanged(object sender, EventArgs e) { - textBox3.Text = textBox3.Text.ToUpper(CultureInfo.InstalledUICulture); - SelectedClientScriptMD5 = textBox3.Text.ToUpper(CultureInfo.InstalledUICulture); + textBox3.Text = textBox3.Text.ToUpper(CultureInfo.InvariantCulture); + SelectedClientScriptMD5 = textBox3.Text.ToUpper(CultureInfo.InvariantCulture); } void Button4Click(object sender, EventArgs e) @@ -145,8 +145,8 @@ namespace NovetusLauncher if (!string.IsNullOrWhiteSpace(ClientMD5)) { - textBox2.Text = ClientMD5.ToUpper(); - SelectedClientMD5 = textBox2.Text.ToUpper(); + textBox2.Text = ClientMD5.ToUpper(CultureInfo.InvariantCulture); + SelectedClientMD5 = textBox2.Text.ToUpper(CultureInfo.InvariantCulture); } else { @@ -157,8 +157,8 @@ namespace NovetusLauncher if (!string.IsNullOrWhiteSpace(ClientScriptMD5)) { - textBox3.Text = ClientScriptMD5.ToUpper(); - SelectedClientScriptMD5 = textBox3.Text.ToUpper(); + textBox3.Text = ClientScriptMD5.ToUpper(CultureInfo.InvariantCulture); + SelectedClientScriptMD5 = textBox3.Text.ToUpper(CultureInfo.InvariantCulture); } else { @@ -224,8 +224,8 @@ namespace NovetusLauncher checkBox4.Checked = Locked; checkBox6.Checked = FixScriptMapMode; checkBox7.Checked = AlreadyHasSecurity; - textBox3.Text = SelectedClientScriptMD5.ToUpper(); - textBox2.Text = SelectedClientMD5.ToUpper(); + textBox3.Text = SelectedClientScriptMD5.ToUpper(CultureInfo.InvariantCulture); + textBox2.Text = SelectedClientMD5.ToUpper(CultureInfo.InvariantCulture); textBox1.Text = SelectedClientDesc; textBox4.Text = CustomArgs; textBox5.Text = Warning; @@ -315,8 +315,8 @@ namespace NovetusLauncher checkBox3.Checked = LegacyMode; checkBox6.Checked = FixScriptMapMode; checkBox7.Checked = AlreadyHasSecurity; - textBox3.Text = SelectedClientScriptMD5.ToUpper(); - textBox2.Text = SelectedClientMD5.ToUpper(); + textBox3.Text = SelectedClientScriptMD5.ToUpper(CultureInfo.InvariantCulture); + textBox2.Text = SelectedClientMD5.ToUpper(CultureInfo.InvariantCulture); textBox1.Text = SelectedClientDesc; textBox4.Text = CustomArgs; textBox5.Text = Warning; diff --git a/NovetusLauncher/NovetusLauncher/MainForm.cs b/NovetusLauncher/NovetusLauncher/MainForm.cs index 72c61bf..cfce7ca 100644 --- a/NovetusLauncher/NovetusLauncher/MainForm.cs +++ b/NovetusLauncher/NovetusLauncher/MainForm.cs @@ -15,7 +15,7 @@ using System.Diagnostics; using System.ComponentModel; using System.Reflection; using Mono.Nat; - +using System.Globalization; namespace NovetusLauncher { @@ -1078,110 +1078,110 @@ namespace NovetusLauncher void ConsoleProcessCommands(string command) { - if (string.Compare(command,"server",true) == 0) + if (string.Compare(command,"server",true, CultureInfo.InvariantCulture) == 0) { StartServer(false); } - else if (string.Compare(command,"server no3d",true) == 0) + else if (string.Compare(command,"server no3d",true, CultureInfo.InvariantCulture) == 0) { StartServer(true); } - else if (string.Compare(command,"no3d",true) == 0) + else if (string.Compare(command,"no3d",true, CultureInfo.InvariantCulture) == 0) { StartServer(true); } - else if (string.Compare(command,"client",true) == 0) + else if (string.Compare(command,"client",true, CultureInfo.InvariantCulture) == 0) { StartClient(); } - else if (string.Compare(command,"client solo",true) == 0) + else if (string.Compare(command,"client solo",true, CultureInfo.InvariantCulture) == 0) { StartSolo(); } - else if (string.Compare(command,"solo",true) == 0) + else if (string.Compare(command,"solo",true, CultureInfo.InvariantCulture) == 0) { StartSolo(); } - else if (string.Compare(command,"studio",true) == 0) - { + else if (string.Compare(command,"studio",true, CultureInfo.InvariantCulture) == 0) + { StartStudio(); } - else if (string.Compare(command,"config save",true) == 0) + else if (string.Compare(command,"config save",true, CultureInfo.InvariantCulture) == 0) { WriteConfigValues(); } - else if (string.Compare(command,"config load",true) == 0) - { + else if (string.Compare(command,"config load",true, CultureInfo.InvariantCulture) == 0) + { ReadConfigValues(); } - else if (string.Compare(command,"config reset",true) == 0) - { + else if (string.Compare(command,"config reset",true, CultureInfo.InvariantCulture) == 0) + { ResetConfigValues(); } - else if (string.Compare(command,"help",true) == 0) - { + else if (string.Compare(command,"help",true, CultureInfo.InvariantCulture) == 0) + { ConsoleHelp(0); } - else if (string.Compare(command,"help config",true) == 0) - { + else if (string.Compare(command,"help config",true, CultureInfo.InvariantCulture) == 0) + { ConsoleHelp(1); } - else if (string.Compare(command,"config",true) == 0) - { + else if (string.Compare(command,"config",true, CultureInfo.InvariantCulture) == 0) + { ConsoleHelp(1); } - else if (string.Compare(command,"help sdk",true) == 0) - { + else if (string.Compare(command,"help sdk",true, CultureInfo.InvariantCulture) == 0) + { ConsoleHelp(2); } - else if (string.Compare(command,"sdk",true) == 0) - { + else if (string.Compare(command,"sdk",true, CultureInfo.InvariantCulture) == 0) + { ConsoleHelp(2); } - else if (string.Compare(command,"sdk clientinfo",true) == 0) - { + else if (string.Compare(command,"sdk clientinfo",true, CultureInfo.InvariantCulture) == 0) + { LoadClientSDK(); } - else if (string.Compare(command,"sdk itemmaker",true) == 0) - { + else if (string.Compare(command,"sdk itemmaker",true, CultureInfo.InvariantCulture) == 0) + { LoadItemSDK(); } - else if (string.Compare(command,"clientinfo",true) == 0) - { + else if (string.Compare(command,"clientinfo",true, CultureInfo.InvariantCulture) == 0) + { LoadClientSDK(); } - else if (string.Compare(command,"itemmaker",true) == 0) - { + else if (string.Compare(command,"itemmaker",true, CultureInfo.InvariantCulture) == 0) + { LoadItemSDK(); } - else if (string.Compare(command,"sdk clientsdk",true) == 0) - { + else if (string.Compare(command,"sdk clientsdk",true, CultureInfo.InvariantCulture) == 0) + { LoadClientSDK(); } - else if (string.Compare(command,"sdk itemsdk",true) == 0) - { + else if (string.Compare(command,"sdk itemsdk",true, CultureInfo.InvariantCulture) == 0) + { LoadItemSDK(); } - else if (string.Compare(command,"clientsdk",true) == 0) - { + else if (string.Compare(command,"clientsdk",true, CultureInfo.InvariantCulture) == 0) + { LoadClientSDK(); } - else if (string.Compare(command,"itemsdk",true) == 0) - { + else if (string.Compare(command,"itemsdk",true, CultureInfo.InvariantCulture) == 0) + { LoadItemSDK(); } - else if (string.Compare(command,"charcustom",true) == 0) - { + else if (string.Compare(command,"charcustom",true, CultureInfo.InvariantCulture) == 0) + { CharacterCustomization cc = new CharacterCustomization(); cc.Show(); ConsolePrint("Avatar Customization Loaded.", 4); } - else if (string.Compare(command,"webserver",true) == 0) - { + else if (string.Compare(command,"webserver",true, CultureInfo.InvariantCulture) == 0) + { ConsoleHelp(3); } - else if (string.Compare(command,"webserver start",true) == 0) - { + else if (string.Compare(command,"webserver start",true, CultureInfo.InvariantCulture) == 0) + { if (GlobalVars.IsWebServerOn == false) { StartWebServer(); @@ -1191,8 +1191,8 @@ namespace NovetusLauncher ConsolePrint("WebServer: There is already a web server open.", 2); } } - else if (string.Compare(command,"webserver stop",true) == 0) - { + else if (string.Compare(command,"webserver stop",true, CultureInfo.InvariantCulture) == 0) + { if (GlobalVars.IsWebServerOn == true) { StopWebServer(); @@ -1202,8 +1202,8 @@ namespace NovetusLauncher ConsolePrint("WebServer: There is no web server open.", 2); } } - else if (string.Compare(command,"webserver restart",true) == 0) - { + else if (string.Compare(command,"webserver restart",true, CultureInfo.InvariantCulture) == 0) + { try { ConsolePrint("WebServer: Restarting...", 4); @@ -1215,8 +1215,8 @@ namespace NovetusLauncher ConsolePrint("WebServer: Cannot restart web server. (" + ex.Message + ")", 2); } } - else if (string.Compare(command,"start",true) == 0) - { + else if (string.Compare(command,"start",true, CultureInfo.InvariantCulture) == 0) + { if (GlobalVars.IsWebServerOn == false) { StartWebServer(); @@ -1226,8 +1226,8 @@ namespace NovetusLauncher ConsolePrint("WebServer: There is already a web server open.", 2); } } - else if (string.Compare(command,"stop",true) == 0) - { + else if (string.Compare(command,"stop",true, CultureInfo.InvariantCulture) == 0) + { if (GlobalVars.IsWebServerOn == true) { StopWebServer(); @@ -1237,8 +1237,8 @@ namespace NovetusLauncher ConsolePrint("WebServer: There is no web server open.", 2); } } - else if (string.Compare(command,"restart",true) == 0) - { + else if (string.Compare(command,"restart",true, CultureInfo.InvariantCulture) == 0) + { try { ConsolePrint("WebServer: Restarting...", 4); @@ -1250,8 +1250,8 @@ namespace NovetusLauncher ConsolePrint("WebServer: Cannot restart web server. (" + ex.Message + ")", 2); } } - else if (string.Compare(command,GlobalVars.important,true) == 0) - { + else if (string.Compare(command,GlobalVars.important,true, CultureInfo.InvariantCulture) == 0) + { GlobalVars.AdminMode = true; ConsolePrint("ADMIN MODE ENABLED.", 4); ConsolePrint("YOU ARE GOD.", 2);