diff --git a/ARCHBLOXLauncher1.csproj.user b/ARCHBLOXLauncher1.csproj.user index 3494964..7ac85d8 100644 --- a/ARCHBLOXLauncher1.csproj.user +++ b/ARCHBLOXLauncher1.csproj.user @@ -1,7 +1,7 @@  - <_LastSelectedProfileId>C:\Users\Thomas\source\repos\ARCHBLOXLauncher1\Properties\PublishProfiles\x64.pubxml + <_LastSelectedProfileId>C:\Users\Thomas\source\repos\ARCHBLOXLauncher1\Properties\PublishProfiles\x86.pubxml diff --git a/Form1.Designer.cs b/Form1.Designer.cs index ac30234..1d1f531 100644 --- a/Form1.Designer.cs +++ b/Form1.Designer.cs @@ -37,11 +37,7 @@ this.label4 = new System.Windows.Forms.Label(); this.serverport = new System.Windows.Forms.TextBox(); this.label7 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.userid = new System.Windows.Forms.TextBox(); - this.username = new System.Windows.Forms.TextBox(); this.button2 = new System.Windows.Forms.Button(); - this.label6 = new System.Windows.Forms.Label(); this.HostBox = new System.Windows.Forms.GroupBox(); this.label2 = new System.Windows.Forms.Label(); this.textBox1 = new System.Windows.Forms.TextBox(); @@ -91,14 +87,10 @@ this.JoinBox.Controls.Add(this.label4); this.JoinBox.Controls.Add(this.serverport); this.JoinBox.Controls.Add(this.label7); - this.JoinBox.Controls.Add(this.label5); - this.JoinBox.Controls.Add(this.userid); - this.JoinBox.Controls.Add(this.username); this.JoinBox.Controls.Add(this.button2); - this.JoinBox.Controls.Add(this.label6); - this.JoinBox.Location = new System.Drawing.Point(400, 49); + this.JoinBox.Location = new System.Drawing.Point(400, 58); this.JoinBox.Name = "JoinBox"; - this.JoinBox.Size = new System.Drawing.Size(286, 192); + this.JoinBox.Size = new System.Drawing.Size(286, 150); this.JoinBox.TabIndex = 26; this.JoinBox.TabStop = false; // @@ -143,37 +135,6 @@ this.label7.TabIndex = 25; this.label7.Text = "Server Port"; // - // label5 - // - this.label5.AutoSize = true; - this.label5.BackColor = System.Drawing.Color.Transparent; - this.label5.Location = new System.Drawing.Point(6, 110); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(60, 15); - this.label5.TabIndex = 20; - this.label5.Text = "Username"; - // - // userid - // - this.userid.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.userid.Location = new System.Drawing.Point(200, 131); - this.userid.MaxLength = 8; - this.userid.Name = "userid"; - this.userid.PlaceholderText = "UserID"; - this.userid.Size = new System.Drawing.Size(80, 23); - this.userid.TabIndex = 22; - this.userid.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; - // - // username - // - this.username.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.username.Location = new System.Drawing.Point(6, 131); - this.username.MaxLength = 20; - this.username.Name = "username"; - this.username.PlaceholderText = "Username"; - this.username.Size = new System.Drawing.Size(188, 23); - this.username.TabIndex = 21; - // // button2 // this.button2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); @@ -181,7 +142,7 @@ this.button2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Popup; this.button2.ForeColor = System.Drawing.SystemColors.ButtonHighlight; - this.button2.Location = new System.Drawing.Point(6, 160); + this.button2.Location = new System.Drawing.Point(6, 117); this.button2.Name = "button2"; this.button2.Size = new System.Drawing.Size(274, 23); this.button2.TabIndex = 24; @@ -189,16 +150,6 @@ this.button2.UseVisualStyleBackColor = false; this.button2.Click += new System.EventHandler(this.button2_Click); // - // label6 - // - this.label6.AutoSize = true; - this.label6.BackColor = System.Drawing.Color.Transparent; - this.label6.Location = new System.Drawing.Point(241, 110); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(41, 15); - this.label6.TabIndex = 23; - this.label6.Text = "UserID"; - // // HostBox // this.HostBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(49)))), ((int)(((byte)(107)))), ((int)(((byte)(223))))); @@ -208,7 +159,7 @@ this.HostBox.Controls.Add(this.button3); this.HostBox.Controls.Add(this.textBox2); this.HostBox.Controls.Add(this.button1); - this.HostBox.Location = new System.Drawing.Point(400, 49); + this.HostBox.Location = new System.Drawing.Point(400, 58); this.HostBox.Name = "HostBox"; this.HostBox.Size = new System.Drawing.Size(288, 140); this.HostBox.TabIndex = 27; @@ -432,11 +383,7 @@ private System.Windows.Forms.Label label4; private System.Windows.Forms.TextBox serverport; private System.Windows.Forms.Label label7; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.TextBox userid; - private System.Windows.Forms.TextBox username; private System.Windows.Forms.Button button2; - private System.Windows.Forms.Label label6; private System.Windows.Forms.GroupBox HostBox; private System.Windows.Forms.Label label2; private System.Windows.Forms.TextBox textBox1; diff --git a/Form1.cs b/Form1.cs index 0861328..ef1865f 100644 --- a/Form1.cs +++ b/Form1.cs @@ -295,7 +295,7 @@ namespace ARCHBLOXLauncher1 var pProcess = new Process(); ingame = true; pProcess.StartInfo.FileName = filePath; - pProcess.StartInfo.Arguments = "-a \"http://www.morblox.us/\" -j \"http://www.morblox.us/game/join.php?port=" + serverport.Text + "&app=" + userid.Text + "&ip=" + serverip.Text + "&username=" + username.Text + "&id=" + userid.Text + "&membership=None\" -t \"1\""; + pProcess.StartInfo.Arguments = "-a \"http://www.morblox.us/\" -j \"http://www.morblox.us/game/join.ashx?port=" + serverport.Text + "&ip=" + serverip.Text + "\" -t \"1\""; pProcess.StartInfo.UseShellExecute = false; pProcess.StartInfo.RedirectStandardOutput = true; pProcess.StartInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Normal; @@ -314,7 +314,7 @@ namespace ARCHBLOXLauncher1 SmallImageKey = "archblox", } }); ; - MessageBox.Show("Joining IP " + serverip.Text + ":" + serverport.Text + " as " + username.Text + " (id: " + userid.Text + ")", "ARCHBLOX"); + MessageBox.Show("Joining " + serverip.Text + ":" + serverport.Text, "ARCHBLOX"); } } diff --git a/Properties/PublishProfiles/x64.pubxml.user b/Properties/PublishProfiles/x64.pubxml.user index 58f218f..e120d50 100644 --- a/Properties/PublishProfiles/x64.pubxml.user +++ b/Properties/PublishProfiles/x64.pubxml.user @@ -4,6 +4,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - True|2022-07-11T21:42:57.8030421Z;True|2022-07-12T07:24:22.2110673+10:00;True|2022-07-12T07:12:22.1327523+10:00;True|2022-07-12T01:02:07.4142780+10:00;True|2022-07-12T01:01:55.1054218+10:00;True|2022-07-12T00:57:05.7704097+10:00;True|2022-07-11T19:45:06.3965836+10:00;True|2022-07-11T03:03:05.5235378+10:00;True|2022-07-11T01:29:52.2575986+10:00;True|2022-07-11T01:29:03.7081553+10:00;True|2022-07-11T01:07:30.8355486+10:00;True|2022-07-11T00:18:27.1107980+10:00;True|2022-07-10T21:59:11.0753271+10:00;True|2022-07-10T19:15:49.4105023+10:00;True|2022-07-10T19:13:41.3098116+10:00;True|2022-07-10T19:12:41.5715908+10:00; + True|2022-07-12T10:31:31.4891674Z;True|2022-07-12T07:42:57.8030421+10:00;True|2022-07-12T07:24:22.2110673+10:00;True|2022-07-12T07:12:22.1327523+10:00;True|2022-07-12T01:02:07.4142780+10:00;True|2022-07-12T01:01:55.1054218+10:00;True|2022-07-12T00:57:05.7704097+10:00;True|2022-07-11T19:45:06.3965836+10:00;True|2022-07-11T03:03:05.5235378+10:00;True|2022-07-11T01:29:52.2575986+10:00;True|2022-07-11T01:29:03.7081553+10:00;True|2022-07-11T01:07:30.8355486+10:00;True|2022-07-11T00:18:27.1107980+10:00;True|2022-07-10T21:59:11.0753271+10:00;True|2022-07-10T19:15:49.4105023+10:00;True|2022-07-10T19:13:41.3098116+10:00;True|2022-07-10T19:12:41.5715908+10:00; \ No newline at end of file diff --git a/Properties/PublishProfiles/x86.pubxml.user b/Properties/PublishProfiles/x86.pubxml.user index 7a6dea1..05e8706 100644 --- a/Properties/PublishProfiles/x86.pubxml.user +++ b/Properties/PublishProfiles/x86.pubxml.user @@ -4,6 +4,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - True|2022-07-11T21:43:08.7666080Z;True|2022-07-12T07:24:17.3722228+10:00;True|2022-07-12T07:12:29.3685122+10:00;True|2022-07-12T01:01:59.7182995+10:00;True|2022-07-12T00:56:51.3800489+10:00;True|2022-07-11T19:45:17.8917634+10:00;True|2022-07-11T03:02:35.7176035+10:00;True|2022-07-11T01:29:59.8179775+10:00;True|2022-07-11T01:28:57.8645143+10:00;True|2022-07-11T01:07:39.1190996+10:00;True|2022-07-11T00:18:18.9541704+10:00;True|2022-07-10T21:59:16.0892178+10:00;True|2022-07-10T19:13:19.3369745+10:00;True|2022-07-10T19:13:01.5256770+10:00; + True|2022-07-12T10:31:25.7325840Z;True|2022-07-12T07:43:08.7666080+10:00;True|2022-07-12T07:24:17.3722228+10:00;True|2022-07-12T07:12:29.3685122+10:00;True|2022-07-12T01:01:59.7182995+10:00;True|2022-07-12T00:56:51.3800489+10:00;True|2022-07-11T19:45:17.8917634+10:00;True|2022-07-11T03:02:35.7176035+10:00;True|2022-07-11T01:29:59.8179775+10:00;True|2022-07-11T01:28:57.8645143+10:00;True|2022-07-11T01:07:39.1190996+10:00;True|2022-07-11T00:18:18.9541704+10:00;True|2022-07-10T21:59:16.0892178+10:00;True|2022-07-10T19:13:19.3369745+10:00;True|2022-07-10T19:13:01.5256770+10:00; \ No newline at end of file diff --git a/bin/Release/netcoreapp3.1/ARCHBLOXLauncher1.dll b/bin/Release/netcoreapp3.1/ARCHBLOXLauncher1.dll index c00c44c..6860026 100644 Binary files a/bin/Release/netcoreapp3.1/ARCHBLOXLauncher1.dll and b/bin/Release/netcoreapp3.1/ARCHBLOXLauncher1.dll differ diff --git a/bin/Release/netcoreapp3.1/ARCHBLOXLauncher1.pdb b/bin/Release/netcoreapp3.1/ARCHBLOXLauncher1.pdb index 9d413cd..427269a 100644 Binary files a/bin/Release/netcoreapp3.1/ARCHBLOXLauncher1.pdb and b/bin/Release/netcoreapp3.1/ARCHBLOXLauncher1.pdb differ diff --git a/bin/Release/netcoreapp3.1/win-x64/ARCHBLOXLauncher1.dll b/bin/Release/netcoreapp3.1/win-x64/ARCHBLOXLauncher1.dll index 67c9621..36500ec 100644 Binary files a/bin/Release/netcoreapp3.1/win-x64/ARCHBLOXLauncher1.dll and b/bin/Release/netcoreapp3.1/win-x64/ARCHBLOXLauncher1.dll differ diff --git a/bin/Release/netcoreapp3.1/win-x64/ARCHBLOXLauncher1.pdb b/bin/Release/netcoreapp3.1/win-x64/ARCHBLOXLauncher1.pdb index d79470c..f5cde87 100644 Binary files a/bin/Release/netcoreapp3.1/win-x64/ARCHBLOXLauncher1.pdb and b/bin/Release/netcoreapp3.1/win-x64/ARCHBLOXLauncher1.pdb differ diff --git a/bin/Release/netcoreapp3.1/win-x86/ARCHBLOXLauncher1.dll b/bin/Release/netcoreapp3.1/win-x86/ARCHBLOXLauncher1.dll index 2b6805d..1b85978 100644 Binary files a/bin/Release/netcoreapp3.1/win-x86/ARCHBLOXLauncher1.dll and b/bin/Release/netcoreapp3.1/win-x86/ARCHBLOXLauncher1.dll differ diff --git a/bin/Release/netcoreapp3.1/win-x86/ARCHBLOXLauncher1.pdb b/bin/Release/netcoreapp3.1/win-x86/ARCHBLOXLauncher1.pdb index fec9f29..b25ed7a 100644 Binary files a/bin/Release/netcoreapp3.1/win-x86/ARCHBLOXLauncher1.pdb and b/bin/Release/netcoreapp3.1/win-x86/ARCHBLOXLauncher1.pdb differ diff --git a/obj/Release/netcoreapp3.1/ARCHBLOXLauncher1.csproj.GenerateResource.cache b/obj/Release/netcoreapp3.1/ARCHBLOXLauncher1.csproj.GenerateResource.cache index 07a02df..89c8c37 100644 Binary files a/obj/Release/netcoreapp3.1/ARCHBLOXLauncher1.csproj.GenerateResource.cache and b/obj/Release/netcoreapp3.1/ARCHBLOXLauncher1.csproj.GenerateResource.cache differ diff --git a/obj/Release/netcoreapp3.1/ARCHBLOXLauncher1.dll b/obj/Release/netcoreapp3.1/ARCHBLOXLauncher1.dll index c00c44c..6860026 100644 Binary files a/obj/Release/netcoreapp3.1/ARCHBLOXLauncher1.dll and b/obj/Release/netcoreapp3.1/ARCHBLOXLauncher1.dll differ diff --git a/obj/Release/netcoreapp3.1/ARCHBLOXLauncher1.pdb b/obj/Release/netcoreapp3.1/ARCHBLOXLauncher1.pdb index 9d413cd..427269a 100644 Binary files a/obj/Release/netcoreapp3.1/ARCHBLOXLauncher1.pdb and b/obj/Release/netcoreapp3.1/ARCHBLOXLauncher1.pdb differ diff --git a/obj/Release/netcoreapp3.1/win-x64/ARCHBLOXLauncher1.csproj.GenerateResource.cache b/obj/Release/netcoreapp3.1/win-x64/ARCHBLOXLauncher1.csproj.GenerateResource.cache index 07a02df..89c8c37 100644 Binary files a/obj/Release/netcoreapp3.1/win-x64/ARCHBLOXLauncher1.csproj.GenerateResource.cache and b/obj/Release/netcoreapp3.1/win-x64/ARCHBLOXLauncher1.csproj.GenerateResource.cache differ diff --git a/obj/Release/netcoreapp3.1/win-x64/ARCHBLOXLauncher1.dll b/obj/Release/netcoreapp3.1/win-x64/ARCHBLOXLauncher1.dll index 67c9621..36500ec 100644 Binary files a/obj/Release/netcoreapp3.1/win-x64/ARCHBLOXLauncher1.dll and b/obj/Release/netcoreapp3.1/win-x64/ARCHBLOXLauncher1.dll differ diff --git a/obj/Release/netcoreapp3.1/win-x64/ARCHBLOXLauncher1.pdb b/obj/Release/netcoreapp3.1/win-x64/ARCHBLOXLauncher1.pdb index d79470c..f5cde87 100644 Binary files a/obj/Release/netcoreapp3.1/win-x64/ARCHBLOXLauncher1.pdb and b/obj/Release/netcoreapp3.1/win-x64/ARCHBLOXLauncher1.pdb differ diff --git a/obj/Release/netcoreapp3.1/win-x86/ARCHBLOXLauncher1.csproj.GenerateResource.cache b/obj/Release/netcoreapp3.1/win-x86/ARCHBLOXLauncher1.csproj.GenerateResource.cache index 79e7713..66025d0 100644 Binary files a/obj/Release/netcoreapp3.1/win-x86/ARCHBLOXLauncher1.csproj.GenerateResource.cache and b/obj/Release/netcoreapp3.1/win-x86/ARCHBLOXLauncher1.csproj.GenerateResource.cache differ diff --git a/obj/Release/netcoreapp3.1/win-x86/ARCHBLOXLauncher1.dll b/obj/Release/netcoreapp3.1/win-x86/ARCHBLOXLauncher1.dll index 2b6805d..1b85978 100644 Binary files a/obj/Release/netcoreapp3.1/win-x86/ARCHBLOXLauncher1.dll and b/obj/Release/netcoreapp3.1/win-x86/ARCHBLOXLauncher1.dll differ diff --git a/obj/Release/netcoreapp3.1/win-x86/ARCHBLOXLauncher1.pdb b/obj/Release/netcoreapp3.1/win-x86/ARCHBLOXLauncher1.pdb index fec9f29..b25ed7a 100644 Binary files a/obj/Release/netcoreapp3.1/win-x86/ARCHBLOXLauncher1.pdb and b/obj/Release/netcoreapp3.1/win-x86/ARCHBLOXLauncher1.pdb differ