Moved the start function to Form

dpteam · Jun 2, 2019 · 586ae36 · 586ae36
1 parent 2978e05
commit 586ae36
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/LauncherForm.Designer.cs b/LauncherForm.Designer.cs
diff --git a/LauncherForm.cs b/LauncherForm.cs
@@ -1,10 +1,19 @@
 using System;
+using System.Reflection;
 using System.Windows.Forms;
 
 namespace SharpMCL
 {
     public partial class LauncherForm : Form
     {
+        const string InstanceName = "";
+        const string ClientPath = @"\Instances\" + InstanceName + @"\";
+        private string clientdir = System.IO.Path.GetDirectoryName(Assembly.GetEntryAssembly().Location) + ClientPath;
+        private string client = "DPT";
+        private string user = "USSRNAME";
+        private string uuid = Guid.NewGuid().ToString();
+        private string session = "0";
+
         public LauncherForm()
         {
             InitializeComponent();
@@ -14,5 +23,10 @@ private void Form1_Load(object sender, EventArgs e)
         {
 
         }
+
+        private void Button1_Click(object sender, EventArgs e)
+        {
+            Program.start(clientdir, client, user, uuid, session);
+        }
     }
 }
diff --git a/Program.cs b/Program.cs
@@ -23,19 +23,11 @@ static void Main(string[] args)
 			currentProcess.PriorityClass = ProcessPriorityClass.High;
 			Console.BackgroundColor = ConsoleColor.Black;
 			Console.ForegroundColor = ConsoleColor.White;
-            const string InstanceName = "";
-            const string ClientPath = @"\Instances\" + InstanceName + @"\";
-            string clientdir = System.IO.Path.GetDirectoryName(Assembly.GetEntryAssembly().Location) + ClientPath;
-            string client = "DPT";
-            string user = "USSRNAME";
-            string uuid = Guid.NewGuid().ToString();
-            string session = "0";
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
             try
             {
                 Application.Run(new LauncherForm());
-                //start(clientdir, client, user, uuid, session);
             }
 			catch (Exception ex)
 			{
@@ -49,7 +41,7 @@ static void Main(string[] args)
 			}
 		}
 
-		static void start(string clientdir, string client, string user, string uuid, string session)
+        public static void start(string clientdir, string client, string user, string uuid, string session)
 		{
 			string nfolder = clientdir + @"versions\" + client + @"\natives";
 			Directory.CreateDirectory(nfolder);