- Recovery
This commit is contained in:
@@ -6,13 +6,13 @@ using System.Drawing;
|
||||
using System.IO;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
using System.Linq;
|
||||
|
||||
namespace Mitria_Minecraft_Launcher
|
||||
{
|
||||
public partial class LauncherForm : Form
|
||||
{
|
||||
private LoadingScreen _loadingScreen;
|
||||
|
||||
public LauncherForm()
|
||||
{
|
||||
InitializeComponent();
|
||||
@@ -23,6 +23,14 @@ namespace Mitria_Minecraft_Launcher
|
||||
this.Text = ProductName + " v" + ProductVersion;
|
||||
LoadingScreenInitialize();
|
||||
this.textBox_MinecraftPlayerName.Text = Settings.UserLauncherConfig.MinecraftPlayerName;
|
||||
int index = 0;
|
||||
foreach (var server in Settings.ServerInformation.Servers)
|
||||
{
|
||||
comboBox_selectServer.Items.Add(server.ServerFullName);
|
||||
if (server.ServerName == Settings.UserLauncherConfig.LastServerName)
|
||||
index = comboBox_selectServer.Items.Count - 1;
|
||||
}
|
||||
comboBox_selectServer.SelectedIndex = index;
|
||||
}
|
||||
|
||||
private void LoadingScreenInitialize()
|
||||
@@ -157,26 +165,28 @@ namespace Mitria_Minecraft_Launcher
|
||||
|
||||
private void MinecraftRun()
|
||||
{
|
||||
CommonLibrary.XMLSystem.Save(System.IO.Path.GetFullPath(Settings.UserLauncherConfigPath), Settings.UserLauncherConfig);
|
||||
CommonLibrary.XMLSystem.Save(System.IO.Path.GetFullPath(CommonLibrary.Extensions.PathCombineW(Settings.UserLauncherConfig.GameDirectory, Settings.UserClientVersionPath)), Settings.UserClientVersion);
|
||||
string runtime = System.IO.Path.GetFullPath(Settings.RuntimeLocation + "\\bin\\javaw.exe");
|
||||
Settings.UserLauncherConfig.LastServerName = Settings.NowProfile.ServerName;
|
||||
Settings.SaveUserLauncherConfig();
|
||||
Settings.SaveUserClientVersion();
|
||||
|
||||
string runtime = System.IO.Path.GetFullPath(CommonLibrary.Extensions.PathCombineW(Settings.RuntimeLocation , Settings.NowProfile.ServerName, "\\bin\\javaw.exe"));
|
||||
if (!System.IO.File.Exists(runtime))
|
||||
{
|
||||
CommonLibrary.Log.FATAL("not found java");
|
||||
MessageBox.Show("the java could not be found.", "FATAL Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
Loading(false);
|
||||
Settings.UserLauncherConfig.RuntimeVersion = "0.0.0.0"; // 버전초기화
|
||||
Settings.NowProfile.RuntimeVersion = "0.0.0.0"; // 버전초기화
|
||||
return;
|
||||
}
|
||||
string excuteArgumentXml = Settings.UserLauncherConfig.GameDirectory + @"\Mitria\ExcuteArgument.xml";
|
||||
ExcuteArgument excuteArgument = CommonLibrary.XMLSystem.LoadFromPath<ExcuteArgument>(excuteArgumentXml);
|
||||
string excuteArgumentXml = CommonLibrary.Extensions.PathCombineW(Settings.UserLauncherConfig.GameDirectory, Settings.NowProfile.ServerName, @"\Mitria\ExcuteArgument.xml");
|
||||
ExcuteArgument excuteArgument = CommonLibrary.XmlSystem.LoadFromPath<ExcuteArgument>(excuteArgumentXml);
|
||||
|
||||
List<Parameter> launcherParameters = new List<Parameter>();
|
||||
launcherParameters.Add(new Parameter("GameDirectory", "\"" + Settings.UserLauncherConfig.GameDirectory + "\""));
|
||||
launcherParameters.Add(new Parameter("argument", Settings.UserLauncherConfig.Argument));
|
||||
launcherParameters.Add(new Parameter("GameDirectory", "\"" + CommonLibrary.Extensions.PathCombineW(Settings.UserLauncherConfig.GameDirectory, Settings.NowProfile.ServerName) + "\""));
|
||||
launcherParameters.Add(new Parameter("argument", Settings.NowProfile.Argument));
|
||||
launcherParameters.Add(new Parameter("userName", Settings.UserLauncherConfig.MinecraftPlayerName));
|
||||
launcherParameters.Add(new Parameter("uuid", Settings.UserLauncherConfig.MinecraftPlayerName + "uuid"));
|
||||
launcherParameters.Add(new Parameter("accessToken", Settings.UserLauncherConfig.MinecraftPlayerName + "accessToken"));
|
||||
launcherParameters.Add(new Parameter("uuid", "uuid"));
|
||||
launcherParameters.Add(new Parameter("accessToken", "accessToken"));
|
||||
|
||||
excuteArgument.Parameters.AddRange(launcherParameters);
|
||||
|
||||
@@ -189,7 +199,7 @@ namespace Mitria_Minecraft_Launcher
|
||||
CreateNoWindow = true,
|
||||
Arguments = argumentsCommand,
|
||||
UseShellExecute = Settings.UserLauncherConfig.ShellView,
|
||||
WorkingDirectory = Settings.UserLauncherConfig.GameDirectory
|
||||
WorkingDirectory = CommonLibrary.Extensions.PathCombineW(Settings.UserLauncherConfig.GameDirectory , Settings.NowProfile.ServerName),
|
||||
};
|
||||
|
||||
process.StartInfo = processStartInfo;
|
||||
@@ -221,6 +231,10 @@ namespace Mitria_Minecraft_Launcher
|
||||
|
||||
private void button_Report_Click(object sender, EventArgs e)
|
||||
{
|
||||
// 개발중..? 뭐 만들려고 했지...?
|
||||
|
||||
return;
|
||||
|
||||
}
|
||||
|
||||
private string ReportCheck(DateTime criteriaDateTime)
|
||||
@@ -262,5 +276,10 @@ namespace Mitria_Minecraft_Launcher
|
||||
}
|
||||
System.Diagnostics.Process.Start(Settings.UserLauncherConfig.GameDirectory);
|
||||
}
|
||||
|
||||
private void comboBox_selectServer_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
Settings.ChangeProfile(Settings.ServerInformation.Servers[comboBox_selectServer.SelectedIndex].ServerName);
|
||||
}
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user