AstralTransRocketries/TrueCraft
Archived
1
0
Fork 0
Code Issues 48 Pull Requests 1 Packages Projects Releases Wiki Activity

Fixed crash when phantom texture pack entry was selected, added vanilla texture bio

Browse Source
This commit is contained in:
William Moorehouse 2015-06-18 14:28:21 -04:00
parent 386d8f7328
commit c066e998d2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TrueCraft.Launcher/Views/OptionView.cs
View File

@ -149,7 +149,7 @@ namespace TrueCraft.Launcher.Views
void OfficialAssetsButton_Clicked(object sender, EventArgs e) void OfficialAssetsButton_Clicked(object sender, EventArgs e)
{ {
var result = MessageDialog.AskQuestion("Download Mojang assets", var result = MessageDialog.AskQuestion("Download Mojang assets",
"This will download the official Minecraft assets from Mojang.\n\n" + "This will download the official Minecraft assets from Mojang. " +
"By proceeding you agree to the Mojang asset guidelines:\n\n" + "By proceeding you agree to the Mojang asset guidelines:\n\n" +
"https://account.mojang.com/terms#brand\n\n" + "https://account.mojang.com/terms#brand\n\n" +
"Proceed?", "Proceed?",
@ -169,7 +169,7 @@ namespace TrueCraft.Launcher.Views
stream.Dispose(); stream.Dispose();
var jar = ZipFile.Read(ms); var jar = ZipFile.Read(ms);
var zip = new ZipFile(); var zip = new ZipFile();
zip.AddEntry("pack.txt", "Minecraft textures"); zip.AddEntry("pack.txt", "The default look of Minecraft");
CopyBetweenZips("pack.png", jar, zip); CopyBetweenZips("pack.png", jar, zip);
CopyBetweenZips("terrain.png", jar, zip); CopyBetweenZips("terrain.png", jar, zip);
// TODO: Items, windows, etc // TODO: Items, windows, etc
@ -177,8 +177,8 @@ namespace TrueCraft.Launcher.Views
Application.Invoke(() => Application.Invoke(() =>
{ {
OfficialAssetsProgress.Visible = false; OfficialAssetsProgress.Visible = false;
LoadTexturePacks();
var texturePack = TexturePack.FromArchive(Path.Combine(TexturePack.TexturePackPath, "Minecraft.zip")); var texturePack = TexturePack.FromArchive(Path.Combine(TexturePack.TexturePackPath, "Minecraft.zip"));
_texturePacks.Add(texturePack);
AddTexturePackRow(texturePack); AddTexturePackRow(texturePack);
}); });
ms.Dispose(); ms.Dispose();