diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/ClientSettings.Designer.cs b/RBXLegacyLauncher/RBXLegacyLauncher/ClientSettings.Designer.cs new file mode 100644 index 0000000..9f93ebe --- /dev/null +++ b/RBXLegacyLauncher/RBXLegacyLauncher/ClientSettings.Designer.cs @@ -0,0 +1,260 @@ +/* + * Created by SharpDevelop. + * User: Owner + * Date: 9/5/2017 + * Time: 8:52 PM + * + * To change this template use Tools | Options | Coding | Edit Standard Headers. + */ +namespace RBXLegacyLauncher +{ + partial class ClientSettings + { + /// + /// Designer variable used to keep track of non-visual components. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Disposes resources used by the form. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing) { + if (components != null) { + components.Dispose(); + } + } + base.Dispose(disposing); + } + + /// + /// This method is required for Windows Forms designer support. + /// Do not change the method contents inside the source code editor. The Forms designer might + /// not be able to load this method if it was changed manually. + /// + private void InitializeComponent() + { + this.button1 = new System.Windows.Forms.Button(); + this.listBox1 = new System.Windows.Forms.ListBox(); + this.button2 = new System.Windows.Forms.Button(); + this.panel1 = new System.Windows.Forms.Panel(); + this.GameOptions = new System.Windows.Forms.Panel(); + this.vScrollBar1 = new System.Windows.Forms.VScrollBar(); + this.checkBox1 = new System.Windows.Forms.CheckBox(); + this.checkBox3 = new System.Windows.Forms.CheckBox(); + this.checkBox2 = new System.Windows.Forms.CheckBox(); + this.checkBox4 = new System.Windows.Forms.CheckBox(); + this.label1 = new System.Windows.Forms.Label(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.button3 = new System.Windows.Forms.Button(); + this.checkBox5 = new System.Windows.Forms.CheckBox(); + this.panel1.SuspendLayout(); + this.GameOptions.SuspendLayout(); + this.SuspendLayout(); + // + // button1 + // + this.button1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.button1.Location = new System.Drawing.Point(12, 12); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(203, 25); + this.button1.TabIndex = 0; + this.button1.Text = "Name"; + this.button1.TextAlign = System.Drawing.ContentAlignment.TopLeft; + this.button1.UseVisualStyleBackColor = false; + // + // listBox1 + // + this.listBox1.FormattingEnabled = true; + this.listBox1.Items.AddRange(new object[] { + "Game Options", + "Diagnostics", + "Physics", + "Authoring", + "Network", + "Task Scheduler", + "Rendering"}); + this.listBox1.Location = new System.Drawing.Point(13, 36); + this.listBox1.Name = "listBox1"; + this.listBox1.Size = new System.Drawing.Size(201, 199); + this.listBox1.TabIndex = 1; + // + // button2 + // + this.button2.BackColor = System.Drawing.SystemColors.ControlLight; + this.button2.Location = new System.Drawing.Point(12, 257); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(130, 24); + this.button2.TabIndex = 2; + this.button2.Text = "Reset All Settings"; + this.button2.UseVisualStyleBackColor = false; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.SystemColors.ControlLightLight; + this.panel1.Controls.Add(this.GameOptions); + this.panel1.Location = new System.Drawing.Point(221, 12); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(278, 223); + this.panel1.TabIndex = 3; + // + // GameOptions + // + this.GameOptions.Controls.Add(this.checkBox5); + this.GameOptions.Controls.Add(this.vScrollBar1); + this.GameOptions.Controls.Add(this.checkBox1); + this.GameOptions.Controls.Add(this.checkBox3); + this.GameOptions.Controls.Add(this.checkBox2); + this.GameOptions.Controls.Add(this.checkBox4); + this.GameOptions.Controls.Add(this.label1); + this.GameOptions.Controls.Add(this.textBox2); + this.GameOptions.Controls.Add(this.textBox1); + this.GameOptions.Controls.Add(this.label2); + this.GameOptions.Location = new System.Drawing.Point(1, 1); + this.GameOptions.Name = "GameOptions"; + this.GameOptions.Size = new System.Drawing.Size(278, 223); + this.GameOptions.TabIndex = 9; + // + // vScrollBar1 + // + this.vScrollBar1.Location = new System.Drawing.Point(258, 2); + this.vScrollBar1.Name = "vScrollBar1"; + this.vScrollBar1.Size = new System.Drawing.Size(17, 223); + this.vScrollBar1.TabIndex = 8; + // + // checkBox1 + // + this.checkBox1.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; + this.checkBox1.Location = new System.Drawing.Point(6, 4); + this.checkBox1.Name = "checkBox1"; + this.checkBox1.Size = new System.Drawing.Size(249, 24); + this.checkBox1.TabIndex = 0; + this.checkBox1.Text = "Remove Tools / Insert Buttons"; + this.checkBox1.UseVisualStyleBackColor = true; + // + // checkBox3 + // + this.checkBox3.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; + this.checkBox3.Checked = true; + this.checkBox3.CheckState = System.Windows.Forms.CheckState.Checked; + this.checkBox3.Location = new System.Drawing.Point(5, 111); + this.checkBox3.Name = "checkBox3"; + this.checkBox3.Size = new System.Drawing.Size(249, 24); + this.checkBox3.TabIndex = 7; + this.checkBox3.Text = "SoundEnabled"; + this.checkBox3.UseVisualStyleBackColor = true; + // + // checkBox2 + // + this.checkBox2.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; + this.checkBox2.Location = new System.Drawing.Point(6, 23); + this.checkBox2.Name = "checkBox2"; + this.checkBox2.Size = new System.Drawing.Size(249, 24); + this.checkBox2.TabIndex = 1; + this.checkBox2.Text = "Remove Report Abuse Button"; + this.checkBox2.UseVisualStyleBackColor = true; + this.checkBox2.CheckedChanged += new System.EventHandler(this.CheckBox2CheckedChanged); + // + // checkBox4 + // + this.checkBox4.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; + this.checkBox4.Location = new System.Drawing.Point(5, 93); + this.checkBox4.Name = "checkBox4"; + this.checkBox4.Size = new System.Drawing.Size(249, 24); + this.checkBox4.TabIndex = 6; + this.checkBox4.Text = "SoftwareSound"; + this.checkBox4.UseVisualStyleBackColor = true; + // + // label1 + // + this.label1.Location = new System.Drawing.Point(7, 51); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(64, 23); + this.label1.TabIndex = 2; + this.label1.Text = "ChatHistory"; + // + // textBox2 + // + this.textBox2.Location = new System.Drawing.Point(102, 71); + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(153, 20); + this.textBox2.TabIndex = 5; + this.textBox2.Text = "5"; + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(102, 48); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(153, 20); + this.textBox1.TabIndex = 3; + this.textBox1.Text = "100"; + // + // label2 + // + this.label2.Location = new System.Drawing.Point(7, 74); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(100, 23); + this.label2.TabIndex = 4; + this.label2.Text = "ChatScrollLength"; + // + // button3 + // + this.button3.BackColor = System.Drawing.SystemColors.ControlLight; + this.button3.Location = new System.Drawing.Point(435, 256); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(64, 24); + this.button3.TabIndex = 4; + this.button3.Text = "Close"; + this.button3.UseVisualStyleBackColor = false; + // + // checkBox5 + // + this.checkBox5.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; + this.checkBox5.Location = new System.Drawing.Point(5, 129); + this.checkBox5.Name = "checkBox5"; + this.checkBox5.Size = new System.Drawing.Size(249, 24); + this.checkBox5.TabIndex = 9; + this.checkBox5.Text = "FunnyPhysics"; + this.checkBox5.UseVisualStyleBackColor = true; + // + // ClientSettings + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(511, 292); + this.Controls.Add(this.button3); + this.Controls.Add(this.panel1); + this.Controls.Add(this.button2); + this.Controls.Add(this.listBox1); + this.Controls.Add(this.button1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + this.Name = "ClientSettings"; + this.ShowIcon = false; + this.Text = "Settings"; + this.panel1.ResumeLayout(false); + this.GameOptions.ResumeLayout(false); + this.GameOptions.PerformLayout(); + this.ResumeLayout(false); + } + private System.Windows.Forms.CheckBox checkBox5; + private System.Windows.Forms.Button button3; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.CheckBox checkBox4; + private System.Windows.Forms.CheckBox checkBox2; + private System.Windows.Forms.CheckBox checkBox3; + private System.Windows.Forms.CheckBox checkBox1; + private System.Windows.Forms.VScrollBar vScrollBar1; + private System.Windows.Forms.Panel GameOptions; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Button button2; + private System.Windows.Forms.ListBox listBox1; + private System.Windows.Forms.Button button1; + } +} diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/ClientSettings.cs b/RBXLegacyLauncher/RBXLegacyLauncher/ClientSettings.cs new file mode 100644 index 0000000..9fe1e12 --- /dev/null +++ b/RBXLegacyLauncher/RBXLegacyLauncher/ClientSettings.cs @@ -0,0 +1,37 @@ +/* + * Created by SharpDevelop. + * User: Owner + * Date: 9/5/2017 + * Time: 8:52 PM + * + * To change this template use Tools | Options | Coding | Edit Standard Headers. + */ +using System; +using System.Drawing; +using System.Windows.Forms; + +namespace RBXLegacyLauncher +{ + /// + /// Description of Form1. + /// + public partial class ClientSettings : Form + { + public ClientSettings() + { + // + // The InitializeComponent() call is required for Windows Forms designer support. + // + InitializeComponent(); + + // + // TODO: Add constructor code after the InitializeComponent() call. + // + } + + void CheckBox2CheckedChanged(object sender, EventArgs e) + { + + } + } +} diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/ClientSettings.resx b/RBXLegacyLauncher/RBXLegacyLauncher/ClientSettings.resx new file mode 100644 index 0000000..7080a7d --- /dev/null +++ b/RBXLegacyLauncher/RBXLegacyLauncher/ClientSettings.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/Form1.resx b/RBXLegacyLauncher/RBXLegacyLauncher/Form1.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/RBXLegacyLauncher/RBXLegacyLauncher/Form1.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.Designer.cs b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.Designer.cs index c9fab02..5bd926d 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.Designer.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.Designer.cs @@ -21,7 +21,6 @@ this.tabPage1 = new System.Windows.Forms.TabPage(); this.button11 = new System.Windows.Forms.Button(); this.label35 = new System.Windows.Forms.Label(); - this.textBox4 = new System.Windows.Forms.TextBox(); this.label42 = new System.Windows.Forms.Label(); this.button19 = new System.Windows.Forms.Button(); this.button10 = new System.Windows.Forms.Button(); @@ -39,6 +38,9 @@ this.label1 = new System.Windows.Forms.Label(); this.listBox1 = new System.Windows.Forms.ListBox(); this.tabPage3 = new System.Windows.Forms.TabPage(); + this.label30 = new System.Windows.Forms.Label(); + this.button6 = new System.Windows.Forms.Button(); + this.label19 = new System.Windows.Forms.Label(); this.textBox6 = new System.Windows.Forms.TextBox(); this.listBox2 = new System.Windows.Forms.ListBox(); this.label18 = new System.Windows.Forms.Label(); @@ -97,7 +99,7 @@ this.label27 = new System.Windows.Forms.Label(); this.label28 = new System.Windows.Forms.Label(); this.textBox5 = new System.Windows.Forms.TextBox(); - this.label19 = new System.Windows.Forms.Label(); + this.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); @@ -108,6 +110,7 @@ this.tabPage8.SuspendLayout(); this.tabPage4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); this.SuspendLayout(); // // pictureBox1 @@ -146,9 +149,9 @@ // // tabPage1 // + this.tabPage1.Controls.Add(this.numericUpDown1); this.tabPage1.Controls.Add(this.button11); this.tabPage1.Controls.Add(this.label35); - this.tabPage1.Controls.Add(this.textBox4); this.tabPage1.Controls.Add(this.label42); this.tabPage1.Controls.Add(this.button19); this.tabPage1.Controls.Add(this.button10); @@ -187,16 +190,6 @@ this.label35.Text = "Server Port"; this.label35.TextAlign = System.Drawing.ContentAlignment.TopCenter; // - // textBox4 - // - this.textBox4.Location = new System.Drawing.Point(214, 24); - this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(176, 20); - this.textBox4.TabIndex = 39; - this.textBox4.Text = "53640"; - this.textBox4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.textBox4.TextChanged += new System.EventHandler(this.TextBox4TextChanged); - // // label42 // this.label42.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; @@ -373,6 +366,8 @@ // // tabPage3 // + this.tabPage3.Controls.Add(this.label30); + this.tabPage3.Controls.Add(this.button6); this.tabPage3.Controls.Add(this.label19); this.tabPage3.Controls.Add(this.textBox6); this.tabPage3.Controls.Add(this.listBox2); @@ -386,6 +381,33 @@ this.tabPage3.ToolTipText = "Select a ROBLOX Client to load your game"; this.tabPage3.UseVisualStyleBackColor = true; // + // label30 + // + this.label30.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.label30.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.label30.Location = new System.Drawing.Point(6, 237); + this.label30.Name = "label30"; + this.label30.Size = new System.Drawing.Size(393, 2); + this.label30.TabIndex = 23; + // + // button6 + // + this.button6.Location = new System.Drawing.Point(6, 240); + this.button6.Name = "button6"; + this.button6.Size = new System.Drawing.Size(393, 38); + this.button6.TabIndex = 6; + this.button6.Text = "CONFIGURE CLIENT"; + this.button6.UseVisualStyleBackColor = true; + this.button6.Click += new System.EventHandler(this.Button6Click); + // + // label19 + // + this.label19.Location = new System.Drawing.Point(4, 5); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(127, 15); + this.label19.TabIndex = 5; + this.label19.Text = "CLIENTS"; + // // textBox6 // this.textBox6.BackColor = System.Drawing.SystemColors.ControlLightLight; @@ -394,7 +416,7 @@ this.textBox6.Name = "textBox6"; this.textBox6.ReadOnly = true; this.textBox6.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.textBox6.Size = new System.Drawing.Size(393, 111); + this.textBox6.Size = new System.Drawing.Size(393, 67); this.textBox6.TabIndex = 4; this.textBox6.Text = "textBox6"; // @@ -818,7 +840,7 @@ // button8 // this.button8.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); - this.button8.Location = new System.Drawing.Point(150, 107); + this.button8.Location = new System.Drawing.Point(151, 106); this.button8.Name = "button8"; this.button8.Size = new System.Drawing.Size(86, 24); this.button8.TabIndex = 35; @@ -871,7 +893,7 @@ // // button4 // - this.button4.Location = new System.Drawing.Point(59, 107); + this.button4.Location = new System.Drawing.Point(58, 106); this.button4.Name = "button4"; this.button4.Size = new System.Drawing.Size(85, 24); this.button4.TabIndex = 9; @@ -977,13 +999,23 @@ this.textBox5.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.textBox5.TextChanged += new System.EventHandler(this.TextBox5TextChanged); // - // label19 + // numericUpDown1 // - this.label19.Location = new System.Drawing.Point(4, 5); - this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(127, 15); - this.label19.TabIndex = 5; - this.label19.Text = "CLIENTS"; + this.numericUpDown1.Location = new System.Drawing.Point(214, 25); + this.numericUpDown1.Maximum = new decimal(new int[] { + 99999, + 0, + 0, + 0}); + this.numericUpDown1.Name = "numericUpDown1"; + this.numericUpDown1.Size = new System.Drawing.Size(175, 20); + this.numericUpDown1.TabIndex = 43; + this.numericUpDown1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.numericUpDown1.Value = new decimal(new int[] { + 53640, + 0, + 0, + 0}); // // MainForm // @@ -1031,9 +1063,13 @@ this.tabPage8.ResumeLayout(false); this.tabPage4.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); } + private System.Windows.Forms.NumericUpDown numericUpDown1; + private System.Windows.Forms.Button button6; + private System.Windows.Forms.Label label30; private System.Windows.Forms.Label label19; private System.Windows.Forms.Label label12; private System.Windows.Forms.Label label31; @@ -1074,7 +1110,6 @@ private System.Windows.Forms.TextBox textBox6; private System.Windows.Forms.Button button8; private System.Windows.Forms.TextBox textBox5; - private System.Windows.Forms.TextBox textBox4; private System.Windows.Forms.Label label35; private System.Windows.Forms.Label label28; private System.Windows.Forms.Label label27; diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs index ae930f5..642bc47 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs @@ -260,7 +260,7 @@ namespace RBXLegacyLauncher label26.Text = GlobalVars.SelectedClient; label28.Text = GlobalVars.Map; listBox1.SelectedItem = GlobalVars.Map; - textBox4.Text = GlobalVars.RobloxPort.ToString(); + numericUpDown1.Text = GlobalVars.RobloxPort.ToString(); label37.Text = GlobalVars.IP; label38.Text = GlobalVars.RobloxPort.ToString(); ConsolePrint("Configuration has been loaded.", 3); @@ -398,19 +398,19 @@ namespace RBXLegacyLauncher DialogResult result = MessageBox.Show("Your configuration has been saved successfully!","RBXLegacy Launcher - Configuration", MessageBoxButtons.OKCancel, MessageBoxIcon.Information); } - void TextBox4TextChanged(object sender, EventArgs e) + void numericUpDown1TextChanged(object sender, EventArgs e) { int parsedValue; - if (int.TryParse(textBox4.Text, out parsedValue)) + if (int.TryParse(numericUpDown1.Text, out parsedValue)) { - if (textBox4.Text.Equals("")) + if (numericUpDown1.Text.Equals("")) { //set it to the normal port, 53640. it wouldn't make any sense if we set it to 0. GlobalVars.RobloxPort = GlobalVars.DefaultRobloxPort; } else { - GlobalVars.RobloxPort = Convert.ToInt32(textBox4.Text); + GlobalVars.RobloxPort = Convert.ToInt32(numericUpDown1.Text); } } else @@ -472,7 +472,7 @@ namespace RBXLegacyLauncher try { GlobalVars.RobloxPort = Convert.ToInt32(listBox4.SelectedItem.ToString()); - textBox4.Text = GlobalVars.RobloxPort.ToString(); + numericUpDown1.Text = GlobalVars.RobloxPort.ToString(); label38.Text = GlobalVars.RobloxPort.ToString(); } catch (Exception) @@ -1012,5 +1012,11 @@ namespace RBXLegacyLauncher base.OnFormClosing(e); WriteConfigValues(); } + + void Button6Click(object sender, EventArgs e) + { + ClientSettings goptions = new ClientSettings(); + goptions.Show(); + } } } diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/RBXLegacyLauncher.csproj b/RBXLegacyLauncher/RBXLegacyLauncher/RBXLegacyLauncher.csproj index 56a95df..7366c54 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/RBXLegacyLauncher.csproj +++ b/RBXLegacyLauncher/RBXLegacyLauncher/RBXLegacyLauncher.csproj @@ -68,6 +68,10 @@ DocForm.cs + + + ClientSettings.cs + @@ -100,9 +104,15 @@ CharacterCustomization.cs + + ClientSettings.cs + DocForm.Designer.cs + + ClientSettings.cs + LoaderForm.cs diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/ServerPrefs.Designer.cs b/RBXLegacyLauncher/RBXLegacyLauncher/ServerPrefs.Designer.cs index f924327..a75ec87 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/ServerPrefs.Designer.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/ServerPrefs.Designer.cs @@ -36,7 +36,6 @@ this.checkBox11 = new System.Windows.Forms.CheckBox(); this.checkBox10 = new System.Windows.Forms.CheckBox(); this.label45 = new System.Windows.Forms.Label(); - this.textBox7 = new System.Windows.Forms.TextBox(); this.textBox3 = new System.Windows.Forms.TextBox(); this.label29 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); @@ -56,9 +55,11 @@ this.radioButton1 = new System.Windows.Forms.RadioButton(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.button1 = new System.Windows.Forms.Button(); + this.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.tabPage2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); this.SuspendLayout(); // // textBox1 @@ -88,6 +89,7 @@ // // tabPage1 // + this.tabPage1.Controls.Add(this.numericUpDown1); this.tabPage1.Controls.Add(this.checkBox12); this.tabPage1.Controls.Add(this.textBox11); this.tabPage1.Controls.Add(this.textBox12); @@ -105,7 +107,6 @@ this.tabPage1.Controls.Add(this.checkBox11); this.tabPage1.Controls.Add(this.checkBox10); this.tabPage1.Controls.Add(this.label45); - this.tabPage1.Controls.Add(this.textBox7); this.tabPage1.Controls.Add(this.textBox3); this.tabPage1.Controls.Add(this.label29); this.tabPage1.Controls.Add(this.label3); @@ -147,7 +148,7 @@ this.textBox11.Name = "textBox11"; this.textBox11.Size = new System.Drawing.Size(55, 20); this.textBox11.TabIndex = 65; - this.textBox11.Text = "0"; + this.textBox11.Text = "1"; this.textBox11.TextChanged += new System.EventHandler(this.TextBox11TextChanged); // // textBox12 @@ -156,7 +157,7 @@ this.textBox12.Name = "textBox12"; this.textBox12.Size = new System.Drawing.Size(54, 20); this.textBox12.TabIndex = 64; - this.textBox12.Text = "0"; + this.textBox12.Text = "1"; this.textBox12.TextChanged += new System.EventHandler(this.TextBox12TextChanged); // // textBox9 @@ -165,7 +166,7 @@ this.textBox9.Name = "textBox9"; this.textBox9.Size = new System.Drawing.Size(55, 20); this.textBox9.TabIndex = 63; - this.textBox9.Text = "0"; + this.textBox9.Text = "1"; this.textBox9.TextChanged += new System.EventHandler(this.TextBox9TextChanged); // // textBox10 @@ -174,7 +175,7 @@ this.textBox10.Name = "textBox10"; this.textBox10.Size = new System.Drawing.Size(54, 20); this.textBox10.TabIndex = 62; - this.textBox10.Text = "0"; + this.textBox10.Text = "1"; this.textBox10.TextChanged += new System.EventHandler(this.TextBox10TextChanged); // // textBox5 @@ -183,7 +184,7 @@ this.textBox5.Name = "textBox5"; this.textBox5.Size = new System.Drawing.Size(54, 20); this.textBox5.TabIndex = 61; - this.textBox5.Text = "0"; + this.textBox5.Text = "1"; this.textBox5.TextChanged += new System.EventHandler(this.TextBox5TextChanged); // // textBox8 @@ -192,7 +193,7 @@ this.textBox8.Name = "textBox8"; this.textBox8.Size = new System.Drawing.Size(54, 20); this.textBox8.TabIndex = 60; - this.textBox8.Text = "0"; + this.textBox8.Text = "1"; this.textBox8.TextChanged += new System.EventHandler(this.TextBox8TextChanged); // // textBox6 @@ -201,7 +202,7 @@ this.textBox6.Name = "textBox6"; this.textBox6.Size = new System.Drawing.Size(54, 20); this.textBox6.TabIndex = 59; - this.textBox6.Text = "0"; + this.textBox6.Text = "1"; this.textBox6.TextChanged += new System.EventHandler(this.TextBox6TextChanged); // // label6 @@ -221,7 +222,7 @@ this.textBox4.Name = "textBox4"; this.textBox4.Size = new System.Drawing.Size(54, 20); this.textBox4.TabIndex = 56; - this.textBox4.Text = "0"; + this.textBox4.Text = "1"; this.textBox4.TextChanged += new System.EventHandler(this.TextBox4TextChanged); // // label5 @@ -294,15 +295,6 @@ this.label45.Text = "Port"; this.label45.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // textBox7 - // - this.textBox7.Location = new System.Drawing.Point(240, 82); - this.textBox7.Name = "textBox7"; - this.textBox7.Size = new System.Drawing.Size(237, 20); - this.textBox7.TabIndex = 48; - this.textBox7.Text = "53640"; - this.textBox7.TextChanged += new System.EventHandler(this.TextBox7TextChanged); - // // textBox3 // this.textBox3.Location = new System.Drawing.Point(240, 123); @@ -502,6 +494,23 @@ this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.Button1Click); // + // numericUpDown1 + // + this.numericUpDown1.Location = new System.Drawing.Point(240, 80); + this.numericUpDown1.Maximum = new decimal(new int[] { + 99999, + 0, + 0, + 0}); + this.numericUpDown1.Name = "numericUpDown1"; + this.numericUpDown1.Size = new System.Drawing.Size(237, 20); + this.numericUpDown1.TabIndex = 67; + this.numericUpDown1.Value = new decimal(new int[] { + 53640, + 0, + 0, + 0}); + // // ServerPrefs // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -523,8 +532,10 @@ this.tabPage1.PerformLayout(); this.tabPage2.ResumeLayout(false); this.tabPage2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); this.ResumeLayout(false); } + private System.Windows.Forms.NumericUpDown numericUpDown1; private System.Windows.Forms.Button button1; private System.Windows.Forms.TextBox textBox12; private System.Windows.Forms.TextBox textBox11; @@ -542,7 +553,6 @@ private System.Windows.Forms.TextBox textBox2; private System.Windows.Forms.Label label29; private System.Windows.Forms.TextBox textBox3; - private System.Windows.Forms.TextBox textBox7; private System.Windows.Forms.Label label45; private System.Windows.Forms.CheckBox checkBox10; private System.Windows.Forms.CheckBox checkBox11; diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/ServerPrefs.cs b/RBXLegacyLauncher/RBXLegacyLauncher/ServerPrefs.cs index adeb259..0ee0c6e 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/ServerPrefs.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/ServerPrefs.cs @@ -59,11 +59,11 @@ namespace RBXLegacyLauncher { //We need at least a limit of 12 players. GlobalVars.ServerPort = GlobalVars.DefaultRobloxPort; - textBox7.Text = GlobalVars.ServerPort.ToString(); + numericUpDown1.Text = GlobalVars.ServerPort.ToString(); } else { - textBox7.Text = GlobalVars.ServerPort.ToString(); + numericUpDown1.Text = GlobalVars.ServerPort.ToString(); } if (GlobalVars.melee == true && GlobalVars.navigation == true @@ -196,11 +196,12 @@ namespace RBXLegacyLauncher { try { - ipAddress = wc.DownloadString("http://ipv4.icanhazip.com"); + Mono.Nat.INatDevice natd = e.Device; + ipAddress = natd.GetExternalIP().ToString(); } catch (Exception) { - ipAddress = "localhost" + Environment.NewLine; + ipAddress = "localhost"; } } @@ -306,19 +307,19 @@ namespace RBXLegacyLauncher GlobalVars.building = false; } - void TextBox7TextChanged(object sender, EventArgs e) + void numericUpDown1TextChanged(object sender, EventArgs e) { int parsedValue; - if (int.TryParse(textBox7.Text, out parsedValue)) + if (int.TryParse(numericUpDown1.Text, out parsedValue)) { - if (textBox7.Text.Equals("")) + if (numericUpDown1.Text.Equals("")) { //set it to the normal port, 53640. it wouldn't make any sense if we set it to 0. GlobalVars.ServerPort = GlobalVars.DefaultRobloxPort; } else { - GlobalVars.ServerPort = Convert.ToInt32(textBox7.Text); + GlobalVars.ServerPort = Convert.ToInt32(numericUpDown1.Text); } } else @@ -620,15 +621,15 @@ namespace RBXLegacyLauncher void TextBox5TextChanged(object sender, EventArgs e) { int parsedValue; - if (int.TryParse(textBox7.Text, out parsedValue)) + if (int.TryParse(numericUpDown1.Text, out parsedValue)) { - if (textBox7.Text.Equals("")) + if (numericUpDown1.Text.Equals("")) { GlobalVars.blacklist6 = 0; } else { - GlobalVars.blacklist6 = Convert.ToInt32(textBox7.Text); + GlobalVars.blacklist6 = Convert.ToInt32(numericUpDown1.Text); } } else