From 827d7782541d72062a9b530da74b281ab90fedd1 Mon Sep 17 00:00:00 2001 From: "xx.person66@gmail.com" Date: Sat, 16 Feb 2013 06:55:46 +0000 Subject: [PATCH] Updated to 1.7.2 - Fixed a bug that would prevent you from changing a wad type - Wad info now also displays the full, 16-character Title ID --- Sharpii/BNS.cs | 2 +- Sharpii/HBC.cs | 2 +- Sharpii/IOS.cs | 2 +- Sharpii/NUSD.cs | 2 +- Sharpii/Program.cs | 4 ++-- Sharpii/Properties/AssemblyInfo.cs | 6 +++--- Sharpii/README.txt | 8 ++++++-- Sharpii/Sharpii.csproj.user | 25 ---------------------- Sharpii/TPL.cs | 2 +- Sharpii/U8.cs | 2 +- Sharpii/WAD.cs | 33 +++++++++++++++++++----------- 11 files changed, 38 insertions(+), 50 deletions(-) delete mode 100644 Sharpii/Sharpii.csproj.user diff --git a/Sharpii/BNS.cs b/Sharpii/BNS.cs index 859ca7e..ee58575 100644 --- a/Sharpii/BNS.cs +++ b/Sharpii/BNS.cs @@ -1,5 +1,5 @@ /* This file is part of Sharpii. - * Copyright (C) 2011 Person66 + * Copyright (C) 2013 Person66 * * Sharpii is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/Sharpii/HBC.cs b/Sharpii/HBC.cs index 1f02aca..01f5f39 100644 --- a/Sharpii/HBC.cs +++ b/Sharpii/HBC.cs @@ -1,5 +1,5 @@ /* This file is part of Sharpii. - * Copyright (C) 2011 Person66 + * Copyright (C) 2013 Person66 * * Sharpii is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/Sharpii/IOS.cs b/Sharpii/IOS.cs index 4304352..3e67f7f 100644 --- a/Sharpii/IOS.cs +++ b/Sharpii/IOS.cs @@ -1,5 +1,5 @@ /* This file is part of Sharpii. - * Copyright (C) 2011 Person66 + * Copyright (C) 2013 Person66 * * Sharpii is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/Sharpii/NUSD.cs b/Sharpii/NUSD.cs index 80886df..981a5a3 100644 --- a/Sharpii/NUSD.cs +++ b/Sharpii/NUSD.cs @@ -1,5 +1,5 @@ /* This file is part of Sharpii. - * Copyright (C) 2011 Person66 + * Copyright (C) 2013 Person66 * * Sharpii is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/Sharpii/Program.cs b/Sharpii/Program.cs index 8882977..83f4c66 100644 --- a/Sharpii/Program.cs +++ b/Sharpii/Program.cs @@ -1,5 +1,5 @@ /* This file is part of Sharpii. - * Copyright (C) 2011 Person66 + * Copyright (C) 2013 Person66 * * Sharpii is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -321,5 +321,5 @@ namespace Sharpii } public class Version { - public static string version = "1.7.1"; + public static string version = "1.7.2"; } \ No newline at end of file diff --git a/Sharpii/Properties/AssemblyInfo.cs b/Sharpii/Properties/AssemblyInfo.cs index 97e3bdd..a1e5a29 100644 --- a/Sharpii/Properties/AssemblyInfo.cs +++ b/Sharpii/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("Sharpii")] -[assembly: AssemblyCopyright("2011 person66")] +[assembly: AssemblyCopyright("2013 person66")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 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.6")] -[assembly: AssemblyFileVersion("1.6")] +[assembly: AssemblyVersion("1.7.2")] +[assembly: AssemblyFileVersion("1.7.2")] diff --git a/Sharpii/README.txt b/Sharpii/README.txt index dddb052..7a04bdf 100644 --- a/Sharpii/README.txt +++ b/Sharpii/README.txt @@ -1,5 +1,5 @@ /------------------------------------------------------------------------------> - Sharpii 1.7.1 + Sharpii 1.7.2 <----------------------------------------------------------------> An app by person66 libWiiSharp.dll by leathl (mod by scooby74029) @@ -145,6 +145,10 @@ See "LICENSE.txt" for more information. /----CHANGELOG /------------------------------> +1.7.2 + - I am not dead! Yay! + - Fixed a bug that would prevent you from changing a wad type + - Wad info now also displays the full, 16-character Title ID 1.7.1 - Fixed a bug that prevented Sharpii from checking for SharpiiIP in the system variables @@ -157,7 +161,7 @@ See "LICENSE.txt" for more information. - SendWad now supports AHBPROT (use '-ahb') - IP can now be saved in an environmental variable (SharpiiIP) for both SendWad and SendDol (manually or with '-saveip') - - Pointless aster eggs are fun! + - Pointless easter eggs are fun! - Code cleanup/bug fixes 1.5 - Added the ability to send WADs to the HBC using SendWad diff --git a/Sharpii/Sharpii.csproj.user b/Sharpii/Sharpii.csproj.user deleted file mode 100644 index f3f09e3..0000000 --- a/Sharpii/Sharpii.csproj.user +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - publish\ - - - - - - en-US - false - - \ No newline at end of file diff --git a/Sharpii/TPL.cs b/Sharpii/TPL.cs index aa346ba..708f4c9 100644 --- a/Sharpii/TPL.cs +++ b/Sharpii/TPL.cs @@ -1,5 +1,5 @@ /* This file is part of Sharpii. - * Copyright (C) 2011 Person66 + * Copyright (C) 2013 Person66 * * Sharpii is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/Sharpii/U8.cs b/Sharpii/U8.cs index 20c32ef..3987ec5 100644 --- a/Sharpii/U8.cs +++ b/Sharpii/U8.cs @@ -1,5 +1,5 @@ /* This file is part of Sharpii. - * Copyright (C) 2011 Person66 + * Copyright (C) 2013 Person66 * * Sharpii is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/Sharpii/WAD.cs b/Sharpii/WAD.cs index 1ceb8ef..7131595 100644 --- a/Sharpii/WAD.cs +++ b/Sharpii/WAD.cs @@ -1,5 +1,5 @@ /* This file is part of Sharpii. - * Copyright (C) 2011 Person66 + * Copyright (C) 2013 Person66 * * Sharpii is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -153,6 +153,7 @@ namespace Sharpii Console.WriteLine(" Korean: {0}\n", wad.ChannelTitles[7]); } Console.WriteLine("Title ID: {0}", wad.UpperTitleID); + Console.WriteLine("Full Title ID: {0}", wad.TitleID.ToString("X16").Substring(0, 8) + "-" + wad.TitleID.ToString("X16").Substring(8)); Console.WriteLine("IOS: {0}", ((int)wad.StartupIOS).ToString()); Console.WriteLine("Region: {0}", wad.Region); Console.WriteLine("Version: {0}", wad.TitleVersion); @@ -184,6 +185,7 @@ namespace Sharpii txt.WriteLine(" Korean: {0}", wad.ChannelTitles[7]); } txt.WriteLine("Title ID: {0}", wad.UpperTitleID); + txt.WriteLine("Full Title ID: {0}", wad.TitleID.ToString("X16").Substring(0, 8) + "-" + wad.TitleID.ToString("X16").Substring(8)); txt.WriteLine("IOS: {0}", ((int)wad.StartupIOS).ToString()); txt.WriteLine("Region: {0}", wad.Region); txt.WriteLine("Version: {0}", wad.TitleVersion); @@ -262,8 +264,8 @@ namespace Sharpii Console.WriteLine("ERROR: No type set"); return; } - lwrid = args[i + 1]; - if (args[i + 1].ToUpper() != "CHANNEL" && args[i + 1].ToUpper() != "DLC" && args[i + 1].ToUpper() != "GAMECHANNEL" && args[i + 1].ToUpper() != "HIDDENCHANNELS" && args[i + 1].ToUpper() != "SYSTEMCHANNELS" && args[i + 1].ToUpper() != "SYSTEMTITLES") + lwrid = args[i + 1].ToUpper(); + if (lwrid != "CHANNEL" && lwrid != "DLC" && lwrid != "GAMECHANNEL" && lwrid != "HIDDENCHANNELS" && lwrid != "SYSTEMCHANNELS" && lwrid != "SYSTEMTITLES") { Console.WriteLine("ERROR: Unknown WAD type: {0}", args[i + 1]); return; @@ -467,10 +469,17 @@ namespace Sharpii Console.WriteLine("FakeSigning WAD"); wad.FakeSign = fake; - if (id != "") + if (id != "" || lwrid != "") { - if (Quiet.quiet > 2) - Console.WriteLine("Changing channel ID to: {0}", id); + if (id != "") + { + if (Quiet.quiet > 2) + Console.WriteLine("Changing channel ID to: {0}", id); + } + else + { + id = wad.UpperTitleID; + } if (lwrid != "") { @@ -484,15 +493,15 @@ namespace Sharpii if (lwrid == "CHANNEL") wad.ChangeTitleID(LowerTitleID.Channel, id); - if (lwrid == "DLC") + else if (lwrid == "DLC") wad.ChangeTitleID(LowerTitleID.DLC, id); - if (lwrid == "GAMECHANNEL") + else if (lwrid == "GAMECHANNEL") wad.ChangeTitleID(LowerTitleID.GameChannel, id); - if (lwrid == "HIDDENCHANNELS") + else if (lwrid == "HIDDENCHANNELS") wad.ChangeTitleID(LowerTitleID.HiddenChannels, id); - if (lwrid == "SYSTEMCHANNELS") + else if (lwrid == "SYSTEMCHANNELS") wad.ChangeTitleID(LowerTitleID.SystemChannels, id); - if (lwrid == "SYSTEMTITLES") + else if (lwrid == "SYSTEMTITLES") wad.ChangeTitleID(LowerTitleID.SystemTitles, id); } if (ios > -1) @@ -615,7 +624,7 @@ namespace Sharpii Console.WriteLine(""); Console.WriteLine(" Arguments for info:"); Console.WriteLine(""); - Console.WriteLine(" -o output Output info to text file"); + Console.WriteLine(" -o [output] Output info to text file"); Console.WriteLine(" -titles Display titles in all languages"); Console.WriteLine(""); Console.WriteLine(" Arguments for packing/editing:");