Skip to content
This repository has been archived by the owner on Sep 14, 2018. It is now read-only.

Commit

Permalink
1.5.2 Update
Browse files Browse the repository at this point in the history
* FIxed some issues
* Refined the interface
* Now downloads the Minecraft.jar fine
* Fixed some small bugs with Profiles management
  • Loading branch information
DrHacknik committed Apr 18, 2017
1 parent 1d1804c commit 811961b
Show file tree
Hide file tree
Showing 18 changed files with 117 additions and 9 deletions.
Binary file added Common/Builds/2017_4_18_458pm.zip
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="Portable_Minecraft_Launcher.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
</startup>
<userSettings>
<Portable_Minecraft_Launcher.Properties.Settings>
<setting name="dev_agree" serializeAs="String">
<value />
</setting>
<setting name="dev_debug" serializeAs="String">
<value />
</setting>
<setting name="dev_download_res" serializeAs="String">
<value />
</setting>
<setting name="dev_def_prof" serializeAs="String">
<value />
</setting>
<setting name="dev_def_prof_st" serializeAs="String">
<value>0</value>
</setting>
<setting name="dev_def_prof_st_java" serializeAs="String">
<value>0</value>
</setting>
</Portable_Minecraft_Launcher.Properties.Settings>
</userSettings>
</configuration>
6 changes: 6 additions & 0 deletions Common/Builds/2017_4_18_458pm/start_mc_jre.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@echo off

set /p profile=<profile.txt
set appdata=%CD%\data\profiles\%profile%
set COMMONPROGRAMFILES(X86)=%CD%\bin\commonfiles
start "" "%CD%\bin\commonfiles\java\bin\javaw.exe" -jar "%CD%\bin\Minecraft.jar
6 changes: 6 additions & 0 deletions Common/Builds/2017_4_18_458pm/start_mc_sys.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@echo off

set /p profile=<profile.txt
set appdata=%CD%\data\profiles\%profile%
set COMMONPROGRAMFILES(X86)=%CD%\bin\commonfiles
start "" "%CD%\bin\minecraft.jar
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.5")]
[assembly: AssemblyFileVersion("1.5")]
[assembly: AssemblyVersion("1.5.2")]
[assembly: AssemblyFileVersion("1.5.2")]
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="Portable_Minecraft_Launcher.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
</startup>
<userSettings>
<Portable_Minecraft_Launcher.Properties.Settings>
<setting name="dev_agree" serializeAs="String">
<value />
</setting>
<setting name="dev_debug" serializeAs="String">
<value />
</setting>
<setting name="dev_download_res" serializeAs="String">
<value />
</setting>
<setting name="dev_def_prof" serializeAs="String">
<value />
</setting>
<setting name="dev_def_prof_st" serializeAs="String">
<value>0</value>
</setting>
<setting name="dev_def_prof_st_java" serializeAs="String">
<value>0</value>
</setting>
</Portable_Minecraft_Launcher.Properties.Settings>
</userSettings>
</configuration>
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
<requestedExecutionLevel level="asInvoker" uiAccess="false"/>
</requestedPrivileges>
</security>
</trustInfo>
</assembly>

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ private void client_DownloadProgressChanged(object sender, DownloadProgressChang
private void client_DownloadFileCompleted(object sender, AsyncCompletedEventArgs e)
{
lbl_status.Text = "Download Completed";
lbl_status.Enabled = true;

dev_tmr.Stop();
try
{
Expand All @@ -70,24 +70,41 @@ private void client_DownloadFileCompleted(object sender, AsyncCompletedEventArgs
catch
{
}
Properties.Settings.Default.dev_download_res = "1";
Properties.Settings.Default.Save();
this.Close();
dev_tmr2.Start();
}

private void dev_tmr2_Tick(object sender, EventArgs e)
{
dev_tmr2.Stop();
lbl_status.Text = "Download In Progress (MC)";
//Prepare to Dowmnload Minecraft
prog_down.Value = 0;
WebClient get_mc = new WebClient();
get_mc.DownloadProgressChanged += new DownloadProgressChangedEventHandler(client_DownloadProgressChanged);
get_mc.DownloadFileCompleted += new AsyncCompletedEventHandler(client_DownloadFileCompleted);
get_mc.DownloadProgressChanged += new DownloadProgressChangedEventHandler(getmc_DownloadProgressChanged);
get_mc.DownloadFileCompleted += new AsyncCompletedEventHandler(getmc_DownloadFileCompleted);

//Starts the download
get_mc.DownloadFileAsync(new Uri("https://s3.amazonaws.com/Minecraft.Download/launcher/Minecraft.jar"), cd + "\\bin\\minecraft.jar");
}

lbl_status.Text = "Download In Progress (MC)";
private void getmc_DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
{
double bytesIn = double.Parse(e.BytesReceived.ToString());
double totalBytes = double.Parse(e.TotalBytesToReceive.ToString());
double percentage = bytesIn / totalBytes * 100;

prog_down.Value = int.Parse(Math.Truncate(percentage).ToString());
}

private void getmc_DownloadFileCompleted(object sender, AsyncCompletedEventArgs e)
{
lbl_status.Text = "Download Completed";
lbl_status.Enabled = true;
dev_tmr2.Stop();

Properties.Settings.Default.dev_download_res = "1";
Properties.Settings.Default.Save();
this.Close();
}

private void tmr_chck_Tick(object sender, EventArgs e)
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,4 @@ C:\Users\Luke\Documents\GitHub\IronAxe\Common\Resources\VisualStudio\Portable Mi
C:\Users\Luke\Documents\GitHub\IronAxe\Common\Resources\VisualStudio\Portable Minecraft Launcher\obj\x86\Release\Portable Minecraft Launcher.csproj.GenerateResource.Cache
C:\Users\Luke\Documents\GitHub\IronAxe\Common\Resources\VisualStudio\Portable Minecraft Launcher\obj\x86\Release\IronAxe Minecraft Launcher.exe
C:\Users\Luke\Documents\GitHub\IronAxe\Common\Resources\VisualStudio\Portable Minecraft Launcher\obj\x86\Release\IronAxe Minecraft Launcher.pdb
C:\Users\Luke\Documents\GitHub\IronAxe\Common\Resources\VisualStudio\Portable Minecraft Launcher\obj\x86\Release\Portable Minecraft Launcher.csprojResolveAssemblyReference.cache
Binary file not shown.
Binary file not shown.

0 comments on commit 811961b

Please sign in to comment.