diff --git a/CTZLauncher.sln b/CTZLauncher.sln
index aa6b21b..060da44 100644
--- a/CTZLauncher.sln
+++ b/CTZLauncher.sln
@@ -1,20 +1,29 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CTZLauncher", "CTZLauncher\CTZLauncher.csproj", "{EC25362D-5BA7-4CB3-BDA2-C575B9318086}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ CD_ROM|Any CPU = CD_ROM|Any CPU
Debug|Any CPU = Debug|Any CPU
+ DVD-5|Any CPU = DVD-5|Any CPU
Release|Any CPU = Release|Any CPU
+ SingleImage|Any CPU = SingleImage|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {EC25362D-5BA7-4CB3-BDA2-C575B9318086}.CD_ROM|Any CPU.ActiveCfg = Release|Any CPU
+ {EC25362D-5BA7-4CB3-BDA2-C575B9318086}.CD_ROM|Any CPU.Build.0 = Release|Any CPU
{EC25362D-5BA7-4CB3-BDA2-C575B9318086}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EC25362D-5BA7-4CB3-BDA2-C575B9318086}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EC25362D-5BA7-4CB3-BDA2-C575B9318086}.DVD-5|Any CPU.ActiveCfg = Debug|Any CPU
+ {EC25362D-5BA7-4CB3-BDA2-C575B9318086}.DVD-5|Any CPU.Build.0 = Debug|Any CPU
{EC25362D-5BA7-4CB3-BDA2-C575B9318086}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EC25362D-5BA7-4CB3-BDA2-C575B9318086}.Release|Any CPU.Build.0 = Release|Any CPU
+ {EC25362D-5BA7-4CB3-BDA2-C575B9318086}.SingleImage|Any CPU.ActiveCfg = Release|Any CPU
+ {EC25362D-5BA7-4CB3-BDA2-C575B9318086}.SingleImage|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/CTZLauncher/CTZLauncher.csproj b/CTZLauncher/CTZLauncher.csproj
index 8e2782b..9cb4105 100644
--- a/CTZLauncher/CTZLauncher.csproj
+++ b/CTZLauncher/CTZLauncher.csproj
@@ -14,6 +14,24 @@
{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
4
+ true
+ http://localhost:8000/CTZL/
+ true
+ Web
+ true
+ Foreground
+ 7
+ Days
+ false
+ false
+ true
+ true
+ publish.htm
+ 3
+ 1.0.0.%2a
+ false
+ true
+ true
AnyCPU
@@ -40,6 +58,24 @@
+
+ false
+
+
+ A065480634083D151778AF72BD70335EA2E3E9C0
+
+
+ CTZLauncher_TemporaryKey.pfx
+
+
+ true
+
+
+ LocalIntranet
+
+
+ Properties\app.manifest
+
@@ -120,6 +156,7 @@
Resources.Designer.cs
+
SettingsSingleFileGenerator
Settings.Designer.cs
@@ -135,6 +172,28 @@
+
+
+ False
+ Microsoft .NET Framework 4 %28x86 和 x64%29
+ true
+
+
+ False
+ .NET Framework 3.5 SP1 Client Profile
+ false
+
+
+ False
+ .NET Framework 3.5 SP1
+ false
+
+
+ False
+ Windows Installer 4.5
+ true
+
+
-
- 32
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 32
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CTZLauncher/MainWindow.xaml.cs b/CTZLauncher/MainWindow.xaml.cs
index f5b3d4a..06e41cb 100644
--- a/CTZLauncher/MainWindow.xaml.cs
+++ b/CTZLauncher/MainWindow.xaml.cs
@@ -27,7 +27,7 @@ namespace CTZLauncher
///
public partial class MainWindow : Window
{
- LauncherCore launcher = null;
+ LauncherCore launcher;
public MainWindow()
{
InitializeComponent();
@@ -35,33 +35,16 @@ namespace CTZLauncher
private void Window_Initialized(object sender, EventArgs e)
{
- if (Directory.Exists(".minecraft"))
- {
- launcher = LauncherCore.Create(".minecraft");
- launcher.GameLog += launcher_GameLog;
- }
- else
+ if (!Directory.Exists(".minecraft"))
{
Directory.CreateDirectory(".minecraft");
}
-
+ LauncherCore launcher = LauncherCore.Create(".minecraft");
}
private void Window_Loaded(object sender, RoutedEventArgs e)
{
- foreach (var item in SystemTools.FindJava())
- {
- javacombo.Items.Add(item);
- }
- if (!javacombo.Items.IsEmpty)
- javacombo.SelectedIndex = 0;
- foreach (var item in launcher.GetVersions())
- {
- gamecombo.Items.Add(item.Id);
- }
- if (!gamecombo.Items.IsEmpty)
- gamecombo.SelectedIndex = 0;
- maxmem.Text = "2048";
+
}
private void Window_MouseMove(object sender, MouseEventArgs e)
@@ -94,13 +77,6 @@ namespace CTZLauncher
}
}
- private void Button_Click(object sender, RoutedEventArgs e)
- {
- IAuthenticator auth = new YggdrasilLogin("jtb1@163.com", "jtb325325", false);
- AuthenticationInfo result = auth.Do();
- MessageBox.Show(result.UUID.ToString());
- }
-
private void Login_Click(object sender, RoutedEventArgs e)
{
Login.IsEnabled = false;
@@ -119,7 +95,7 @@ namespace CTZLauncher
}
else
{
- SelServer.Visibility = System.Windows.Visibility.Visible;
+ ServerWindow.Visibility = System.Windows.Visibility.Visible;
return;
}
}
@@ -150,10 +126,11 @@ namespace CTZLauncher
Console.WriteLine("StartGame");
LaunchOptions option = new LaunchOptions();
option.Mode = LaunchMode.MCLauncher;
- option.MaxMemory = int.Parse(maxmem.Text);
+ option.MaxMemory = 2048;
option.Authenticator = new OfflineAuthenticator(username.Text); // offline
- option.Version = launcher.GetVersion(gamecombo.Text);
- launcher.JavaPath = javacombo.Text;
+ option.Version = launcher.GetVersion("1.8");
+ launcher.JavaPath = SystemTools.FindJava().First();
+ launcher.GameLog += launcher_GameLog;
launcher.Launch(option);
}
diff --git a/CTZLauncher/Properties/app.manifest b/CTZLauncher/Properties/app.manifest
new file mode 100644
index 0000000..b50be99
--- /dev/null
+++ b/CTZLauncher/Properties/app.manifest
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file