diff --git a/Sharpii/BNS.cs b/Sharpii/BNS.cs index 14a6f86..36c4049 100644 --- a/Sharpii/BNS.cs +++ b/Sharpii/BNS.cs @@ -58,7 +58,7 @@ namespace Sharpii { Console.WriteLine("ERROR: Unable to open file: {0}", input); Console.WriteLine("Either the file doesn't exist, or Sharpii doesn't have permission to open it."); - Console.WriteLine("Error: SHARPII_NET_CORE_BNS_FILE_ERR_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_BNS_FILE_ERR"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E81); @@ -101,7 +101,7 @@ namespace Sharpii Console.WriteLine("An unknown error occured, please try again"); Console.WriteLine(""); Console.WriteLine("ERROR DETAILS: {0}", ex.Message); - Console.WriteLine("Error: SHARPII_NET_CORE_BNS_UNKNOWN_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_BNS_UNKNOWN"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E82); @@ -126,7 +126,7 @@ namespace Sharpii { Console.WriteLine("ERROR: Unable to open file: {0}", input); Console.WriteLine("Either the file doesn't exist, or Sharpii doesn't have permission to open it."); - Console.WriteLine("Error: SHARPII_NET_CORE_BNS_FILE_ERR_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_BNS_FILE_ERR"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E81); @@ -202,7 +202,7 @@ namespace Sharpii Console.WriteLine("An unknown error occured, please try again"); Console.WriteLine(""); Console.WriteLine("ERROR DETAILS: {0}", ex.Message); - Console.WriteLine("Error: SHARPII_NET_CORE_BNS_UNKNOWN_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_BNS_UNKNOWN"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E82); diff --git a/Sharpii/ERR.cs b/Sharpii/ERR.cs index af81198..16eb4dc 100644 --- a/Sharpii/ERR.cs +++ b/Sharpii/ERR.cs @@ -29,7 +29,7 @@ namespace Sharpii { try { - if (args[1] == "SHARPII_NET_CORE_BNS_FILE_ERR_01") + if (args[1] == "SHARPII_NET_CORE_BNS_FILE_ERR") { Console.WriteLine(""); Console.WriteLine("Either the file doesn't exist, or Sharpii doesn't have permission to open it."); @@ -39,7 +39,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_HBC_FILE_ERR_01") + if (args[1] == "SHARPII_NET_CORE_HBC_FILE_ERR") { Console.WriteLine(""); Console.WriteLine("Either the file doesn't exist, or Sharpii doesn't have permission to open it."); @@ -50,7 +50,7 @@ namespace Sharpii ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_IOS_FILE_ERR_01") + if (args[1] == "SHARPII_NET_CORE_IOS_FILE_ERR") { Console.WriteLine(""); Console.WriteLine("Either the file doesn't exist, or Sharpii doesn't have permission to open it."); @@ -61,7 +61,7 @@ namespace Sharpii ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_NUSD_FILE_ERR_01") + if (args[1] == "SHARPII_NET_CORE_NUSD_FILE_ERR") { Console.WriteLine(""); Console.WriteLine("Either the file doesn't exist, or Sharpii doesn't have permission to open it."); @@ -72,7 +72,7 @@ namespace Sharpii ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_TPL_FILE_ERR_01") + if (args[1] == "SHARPII_NET_CORE_TPL_FILE_ERR") { Console.WriteLine(""); Console.WriteLine("Either the file doesn't exist, or Sharpii doesn't have permission to open it."); @@ -83,7 +83,7 @@ namespace Sharpii ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_U8_FILE_ERR_01") + if (args[1] == "SHARPII_NET_CORE_U8_FILE_ERR") { Console.WriteLine(""); Console.WriteLine("Either the file doesn't exist, or Sharpii doesn't have permission to open it."); @@ -93,7 +93,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_WAD_FILE_ERR_01") + if (args[1] == "SHARPII_NET_CORE_WAD_FILE_ERR") { Console.WriteLine(""); Console.WriteLine("Either the file doesn't exist, or Sharpii doesn't have permission to open it."); @@ -103,7 +103,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_BNS_UNKNOWN_01") + if (args[1] == "SHARPII_NET_CORE_BNS_UNKNOWN") { Console.WriteLine(""); Console.WriteLine("An untracked error has occured."); @@ -113,7 +113,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_HBC_UNKNOWN_01") + if (args[1] == "SHARPII_NET_CORE_HBC_UNKNOWN") { Console.WriteLine(""); Console.WriteLine("An untracked error has occured."); @@ -123,7 +123,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_IOS_UNKNOWN_01") + if (args[1] == "SHARPII_NET_CORE_IOS_UNKNOWN") { Console.WriteLine(""); Console.WriteLine("An untracked error has occured."); @@ -133,7 +133,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_NUSD_UNKNOWN_01") + if (args[1] == "SHARPII_NET_CORE_NUSD_UNKNOWN") { Console.WriteLine(""); Console.WriteLine("An untracked error has occured."); @@ -143,7 +143,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_MAIN_UNKNOWN_01") + if (args[1] == "SHARPII_NET_CORE_MAIN_UNKNOWN") { Console.WriteLine(""); Console.WriteLine("An untracked error has occured."); @@ -153,7 +153,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_TPL_UNKNOWN_01") + if (args[1] == "SHARPII_NET_CORE_TPL_UNKNOWN") { Console.WriteLine(""); Console.WriteLine("An untracked error has occured."); @@ -163,7 +163,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_U8_UNKNOWN_01") + if (args[1] == "SHARPII_NET_CORE_U8_UNKNOWN") { Console.WriteLine(""); Console.WriteLine("An untracked error has occured."); @@ -173,7 +173,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_WAD_UNKNOWN_01") + if (args[1] == "SHARPII_NET_CORE_WAD_UNKNOWN") { Console.WriteLine(""); Console.WriteLine("An untracked error has occured."); @@ -183,7 +183,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_HBC_NO_IP_01") + if (args[1] == "SHARPII_NET_CORE_HBC_NO_IP") { Console.WriteLine(""); Console.WriteLine("No IP address was listed for the Wii."); @@ -193,7 +193,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_HBC_NO_DOL_01") + if (args[1] == "SHARPII_NET_CORE_HBC_NO_DOL") { Console.WriteLine(""); Console.WriteLine("You used the -DOL flag, but no DOL file was provided."); @@ -203,7 +203,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_HBC_MISSING_DLL_WADINSTALLER_01") + if (args[1] == "SHARPII_NET_CORE_HBC_MISSING_DLL_WADINSTALLER") { Console.WriteLine(""); Console.WriteLine("The WadInstaller.dll couldn't be found."); @@ -213,7 +213,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_HBC_NO_IOS_01") + if (args[1] == "SHARPII_NET_CORE_HBC_NO_IOS") { Console.WriteLine(""); Console.WriteLine("You used the -IOS flag, but no IOS was provided."); @@ -223,7 +223,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_HBC_INVALID_IOS_01") + if (args[1] == "SHARPII_NET_CORE_HBC_INVALID_IOS") { Console.WriteLine(""); Console.WriteLine("You used the -IOS flag, but an invalid IOS was provided."); @@ -233,7 +233,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_HBC_NO_WAD_01") + if (args[1] == "SHARPII_NET_CORE_HBC_NO_WAD") { Console.WriteLine(""); Console.WriteLine("You used the -WAD flag, but no WAD was provided."); @@ -243,7 +243,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_IOS_NO_SLOT_01") + if (args[1] == "SHARPII_NET_CORE_IOS_NO_SLOT") { Console.WriteLine(""); Console.WriteLine("You used the -SLOT flag, but no slot was provided."); @@ -253,7 +253,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_IOS_INVALID_SLOT_01") + if (args[1] == "SHARPII_NET_CORE_IOS_INVALID_SLOT") { Console.WriteLine(""); Console.WriteLine("You used the -SLOT flag, but an invalid slot was provided."); @@ -263,7 +263,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_IOS_NO_VERSION_01") + if (args[1] == "SHARPII_NET_CORE_IOS_NO_VERSION") { Console.WriteLine(""); Console.WriteLine("You used the -V flag, but no version was provided."); @@ -273,7 +273,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_IOS_INVALID_VERSION_01") + if (args[1] == "SHARPII_NET_CORE_IOS_INVALID_VERSION") { Console.WriteLine(""); Console.WriteLine("You used the -V flag, but no version was provided."); @@ -283,7 +283,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_IOS_NO_OUTPUT_01") + if (args[1] == "SHARPII_NET_CORE_IOS_NO_OUTPUT") { Console.WriteLine(""); Console.WriteLine("You used the -O flag, but no output was provided."); @@ -293,7 +293,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_NUSD_NO_VERSION_01") + if (args[1] == "SHARPII_NET_CORE_NUSD_NO_VERSION") { Console.WriteLine(""); Console.WriteLine("You used the -V flag, but no version was provided."); @@ -303,7 +303,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_NUSD_INVALID_VERSION_01") + if (args[1] == "SHARPII_NET_CORE_NUSD_INVALID_VERSION") { Console.WriteLine(""); Console.WriteLine("You used the -V flag, but an invalid version was provided."); @@ -313,7 +313,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_NUSD_NO_OUTPUT_01") + if (args[1] == "SHARPII_NET_CORE_NUSD_NO_OUTPUT") { Console.WriteLine(""); Console.WriteLine("You used the -O flag, but no output was provided."); @@ -323,7 +323,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_NUSD_NO_ID_01") + if (args[1] == "SHARPII_NET_CORE_NUSD_NO_ID") { Console.WriteLine(""); Console.WriteLine("You used the -ID flag, but no id was provided."); @@ -333,7 +333,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_NUSD_NO_IOS_01") + if (args[1] == "SHARPII_NET_CORE_NUSD_NO_IOS") { Console.WriteLine(""); Console.WriteLine("You used the -IOS flag, but no ios was provided."); @@ -343,7 +343,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_MAIN_MISSING_DLL_LIBWIISHARP_01") + if (args[1] == "SHARPII_NET_CORE_MAIN_MISSING_DLL_LIBWIISHARP") { Console.WriteLine(""); Console.WriteLine("The libWiiSharp.dll couldn't be found."); @@ -353,7 +353,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_MAIN_INVALID_ARG_01") + if (args[1] == "SHARPII_NET_CORE_MAIN_INVALID_ARG") { Console.WriteLine(""); Console.WriteLine("An invalid argument was provided."); @@ -363,7 +363,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_TPL_INVALID_ARG_01") + if (args[1] == "SHARPII_NET_CORE_TPL_INVALID_ARG") { Console.WriteLine(""); Console.WriteLine("An invalid argument was provided."); @@ -373,7 +373,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_U8_INVALID_ARG_01") + if (args[1] == "SHARPII_NET_CORE_U8_INVALID_ARG") { Console.WriteLine(""); Console.WriteLine("An invalid argument was provided."); @@ -383,7 +383,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_WAD_INVALID_ARG_01") + if (args[1] == "SHARPII_NET_CORE_WAD_INVALID_ARG") { Console.WriteLine(""); Console.WriteLine("An invalid argument was provided."); @@ -393,7 +393,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_TPL_NO_FORMAT_01") + if (args[1] == "SHARPII_NET_CORE_TPL_NO_FORMAT") { Console.WriteLine(""); Console.WriteLine("You used the -FORMAT flag, but no format was provided."); @@ -403,7 +403,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_NUSD_UNKNOWN_FORMAT_01") + if (args[1] == "SHARPII_NET_CORE_NUSD_UNKNOWN_FORMAT") { Console.WriteLine(""); Console.WriteLine("You used the -FORMAT flag, but an invalid format was provided."); @@ -413,7 +413,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_U8_NON_U8_01") + if (args[1] == "SHARPII_NET_CORE_U8_NON_U8") { Console.WriteLine(""); Console.WriteLine("The provided file is not a U8 archive."); @@ -423,7 +423,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_U8_FOLDER_ERR_01") + if (args[1] == "SHARPII_NET_CORE_U8_FOLDER_ERR") { Console.WriteLine(""); Console.WriteLine("Either the folder doesn't exist, or Sharpii doesn't have permission to open it."); @@ -433,7 +433,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_WAD_FOLDER_ERR_01") + if (args[1] == "SHARPII_NET_CORE_WAD_FOLDER_ERR") { Console.WriteLine(""); Console.WriteLine("Either the folder doesn't exist, or Sharpii doesn't have permission to open it."); @@ -443,7 +443,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_U8_NO_TITLE_01") + if (args[1] == "SHARPII_NET_CORE_U8_NO_TITLE") { Console.WriteLine(""); Console.WriteLine("You used the -IMET flag, but no title was provided."); @@ -453,7 +453,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_U8_TWO_HEADERS_01") + if (args[1] == "SHARPII_NET_CORE_U8_TWO_HEADERS") { Console.WriteLine(""); Console.WriteLine("You used the -IMET and -IMD5 flags, but you can't use two headers."); @@ -463,7 +463,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_WAD_NO_OUTPUT_01") + if (args[1] == "SHARPII_NET_CORE_WAD_NO_OUTPUT") { Console.WriteLine(""); Console.WriteLine("You used the -OUTPUT flag, but no output was provided."); @@ -473,7 +473,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_WAD_NO_ID_01") + if (args[1] == "SHARPII_NET_CORE_WAD_NO_ID") { Console.WriteLine(""); Console.WriteLine("You used the -ID flag, but no id was provided."); @@ -483,7 +483,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_WAD_SHORT_ID_01") + if (args[1] == "SHARPII_NET_CORE_WAD_SHORT_ID") { Console.WriteLine(""); Console.WriteLine("You used the -ID flag, but the provided id was too short to be correct."); @@ -493,7 +493,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_WAD_NO_TYPE_01") + if (args[1] == "SHARPII_NET_CORE_WAD_NO_TYPE") { Console.WriteLine(""); Console.WriteLine("You used the -TYPE or -IOS flag, but no type was provided."); @@ -503,7 +503,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_WAD_UNKNOWN_TYPE_01") + if (args[1] == "SHARPII_NET_CORE_WAD_UNKNOWN_TYPE") { Console.WriteLine(""); Console.WriteLine("You used the -TYPE flag, but an unknown type was provided."); @@ -513,7 +513,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_WAD_INVALID_SLOT_01") + if (args[1] == "SHARPII_NET_CORE_WAD_INVALID_SLOT") { Console.WriteLine(""); Console.WriteLine("You used the -IOS flag, but an invalid slot was provided."); @@ -523,7 +523,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_WAD_NO_TITLE_01") + if (args[1] == "SHARPII_NET_CORE_WAD_NO_TITLE") { Console.WriteLine(""); Console.WriteLine("You used the -TITLE flag, but no title was provided."); @@ -533,7 +533,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_WAD_NO_SOUND_01") + if (args[1] == "SHARPII_NET_CORE_WAD_NO_SOUND") { Console.WriteLine(""); Console.WriteLine("You used the -SOUND flag, but no wad file to provide sound was provided."); @@ -543,7 +543,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_WAD_NO_BANNER_01") + if (args[1] == "SHARPII_NET_CORE_WAD_NO_BANNER") { Console.WriteLine(""); Console.WriteLine("You used the BANNER flag, but no wad file to provide a banner was provided."); @@ -553,7 +553,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_WAD_NO_DOL_01") + if (args[1] == "SHARPII_NET_CORE_WAD_NO_DOL") { Console.WriteLine(""); Console.WriteLine("You used the -DOL flag, but no wad or dol file was provided."); @@ -563,7 +563,7 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_NUSD_BAD_ID_01") + if (args[1] == "SHARPII_NET_CORE_NUSD_BAD_ID") { Console.WriteLine(""); Console.WriteLine("You used the -ID flag, but an invalid id was provided."); @@ -573,11 +573,31 @@ namespace Sharpii Console.WriteLine(""); ErrCodeFound = 1; } - if (args[1] == "SHARPII_NET_CORE_NUSD_MISSING_FILES_01") + if (args[1] == "SHARPII_NET_CORE_NUSD_MISSING_FILES") { Console.WriteLine(""); Console.WriteLine("You need to have all the required .app files, a tmd file, a tik file, and a cert file to pack a wad."); - Console.WriteLine("Ensure all files are present"); + Console.WriteLine("Ensure all files are present."); + Console.WriteLine("If that doesn't help, open an issue on GitHub!"); + Console.WriteLine("https://github.com/TheShadowEevee/Sharpii-NetCore/issues"); + Console.WriteLine(""); + ErrCodeFound = 1; + } + if (args[1] == "SHARPII_NET_CORE_NUSD_REMOTE_404") + { + Console.WriteLine(""); + Console.WriteLine("The remote server returned a 404 error. Check your Title ID."); + Console.WriteLine("If you have a CETK file, please place it in the same directory as Sharpii saves the NUS Files to."); + Console.WriteLine("If that doesn't help, open an issue on GitHub!"); + Console.WriteLine("https://github.com/TheShadowEevee/Sharpii-NetCore/issues"); + Console.WriteLine(""); + ErrCodeFound = 1; + } + if (args[1] == "SHARPII_NET_CORE_NUSD_WEBREQUEST_FAIL") + { + Console.WriteLine(""); + Console.WriteLine("A WebRequest Error occurred. This usually means that Sharpii can not properly download and save the file."); + Console.WriteLine("Please ensure you have the proper permissions to use the current folder or files."); Console.WriteLine("If that doesn't help, open an issue on GitHub!"); Console.WriteLine("https://github.com/TheShadowEevee/Sharpii-NetCore/issues"); Console.WriteLine(""); @@ -604,7 +624,7 @@ namespace Sharpii Console.WriteLine(""); Console.WriteLine(" ./Sharpii ERRORS [Error Text]"); Console.WriteLine(""); - Console.WriteLine(" Ex. \"Sharpii ERRORS SHARPII_NET_CORE_BNS_FILE_ERR_01\""); + Console.WriteLine(" Ex. \"Sharpii ERRORS SHARPII_NET_CORE_BNS_FILE_ERR\""); Console.WriteLine(""); Console.WriteLine(" Error Format:"); Console.WriteLine(" SHARPII_NET_CORE_[Subsection]_[Description]_[ID NO]"); diff --git a/Sharpii/EXT.cs b/Sharpii/EXT.cs index eac230a..43c3d58 100644 --- a/Sharpii/EXT.cs +++ b/Sharpii/EXT.cs @@ -39,7 +39,7 @@ namespace Sharpii if (args[1] == "16001") { Console.WriteLine(""); - Console.WriteLine("File Access Issue/Missing File. (SHARPII_NET_CORE_xxx_FILE_ERR_01)"); + Console.WriteLine("File Access Issue/Missing File. (SHARPII_NET_CORE_xxx_FILE_ERR)"); Console.WriteLine("Either the file doesn't exist, or Sharpii doesn't have permission to open it."); Console.WriteLine("Check the file's permissions and that it's in the right place."); Console.WriteLine("If that doesn't help, open an issue on GitHub!"); @@ -51,7 +51,7 @@ namespace Sharpii if (args[1] == "16002") { Console.WriteLine(""); - Console.WriteLine("Unknown Error/Untracked Error. (SHARPII_NET_CORE_xxx_UNKNOWN_01)"); + Console.WriteLine("Unknown Error/Untracked Error. (SHARPII_NET_CORE_xxx_UNKNOWN)"); Console.WriteLine("An untracked error has occured."); Console.WriteLine("Use the error text to self-diagnose."); Console.WriteLine("If that doesn't help, open an issue on GitHub!"); @@ -63,7 +63,7 @@ namespace Sharpii if (args[1] == "16003") { Console.WriteLine(""); - Console.WriteLine("No IP was provided for remote Wii access. (SHARPII_NET_CORE_HBC_NO_IP_01)"); + Console.WriteLine("No IP was provided for remote Wii access. (SHARPII_NET_CORE_HBC_NO_IP)"); Console.WriteLine("No IP address was listed for the Wii."); Console.WriteLine("Furthermore, no IP address is saved from previous uses."); Console.WriteLine("If this doesn't help, open an issue on GitHub!"); @@ -73,7 +73,7 @@ namespace Sharpii } if (args[1] == "16004") { - Console.WriteLine("DOL Flag was used, but no file provided. (SHARPII_NET_CORE_xxx_NO_DOL_01)"); + Console.WriteLine("DOL Flag was used, but no file provided. (SHARPII_NET_CORE_xxx_NO_DOL)"); Console.WriteLine("You used the -DOL flag, but no DOL file was provided."); Console.WriteLine("Provide the proper DOL file."); Console.WriteLine("If that doesn't help, open an issue on GitHub!"); @@ -84,7 +84,7 @@ namespace Sharpii if (args[1] == "16005") { Console.WriteLine(""); - Console.WriteLine("A Critical DLL (WadInstaller.dll) couldn't be found. (SHARPII_NET_CORE_HBC_MISSING_DLL_WADINSTALLER_01)"); + Console.WriteLine("A Critical DLL (WadInstaller.dll) couldn't be found. (SHARPII_NET_CORE_HBC_MISSING_DLL_WADINSTALLER)"); Console.WriteLine("The WadInstaller.dll couldn't be found."); Console.WriteLine("This error SHOULD NOT APPEAR in this Sharpii port."); Console.WriteLine("Open an issue on GitHub!"); @@ -95,7 +95,7 @@ namespace Sharpii if (args[1] == "16006") { Console.WriteLine(""); - Console.WriteLine("IOS Flag was used, but no IOS provided. (SHARPII_NET_CORE_xxx_NO_IOS_01)"); + Console.WriteLine("IOS Flag was used, but no IOS provided. (SHARPII_NET_CORE_xxx_NO_IOS)"); Console.WriteLine("You used the -IOS flag, but no IOS was provided."); Console.WriteLine("Provide a proper IOS."); Console.WriteLine("If that doesn't help, open an issue on GitHub!"); @@ -106,7 +106,7 @@ namespace Sharpii if (args[1] == "16007") { Console.WriteLine(""); - Console.WriteLine("IOS Flag was used, but an invalid IOS provided. (SHARPII_NET_CORE_xxx_INVALID_IOS_01)"); + Console.WriteLine("IOS Flag was used, but an invalid IOS provided. (SHARPII_NET_CORE_xxx_INVALID_IOS)"); Console.WriteLine("You used the -IOS flag, but an invalid IOS was provided."); Console.WriteLine("Provide a proper IOS."); Console.WriteLine("If that doesn't help, open an issue on GitHub!"); @@ -117,7 +117,7 @@ namespace Sharpii if (args[1] == "16008") { Console.WriteLine(""); - Console.WriteLine("WAD Flag was used, but no wad provided. (SHARPII_NET_CORE_HBC_NO_WAD_01)"); + Console.WriteLine("WAD Flag was used, but no wad provided. (SHARPII_NET_CORE_HBC_NO_WAD)"); Console.WriteLine("You used the -WAD flag, but no WAD was provided."); Console.WriteLine("Provide a proper WAD."); Console.WriteLine("If that doesn't help, open an issue on GitHub!"); @@ -128,7 +128,7 @@ namespace Sharpii if (args[1] == "16009") { Console.WriteLine(""); - Console.WriteLine("Slot Flag was used, but no slot provided. (SHARPII_NET_CORE_IOS_NO_SLOT_01)"); + Console.WriteLine("Slot Flag was used, but no slot provided. (SHARPII_NET_CORE_IOS_NO_SLOT)"); Console.WriteLine("You used the -SLOT flag, but no slot was provided."); Console.WriteLine("Provide a proper slot."); Console.WriteLine("If that doesn't help, open an issue on GitHub!"); @@ -139,7 +139,7 @@ namespace Sharpii if (args[1] == "16010") { Console.WriteLine(""); - Console.WriteLine("Slot Flag was used, but an invalid slot provided. (SHARPII_NET_CORE_xxx_INVALID_SLOT_01)"); + Console.WriteLine("Slot Flag was used, but an invalid slot provided. (SHARPII_NET_CORE_xxx_INVALID_SLOT)"); Console.WriteLine("You used the -SLOT flag, but an invalid slot was provided."); Console.WriteLine("Provide a proper slot."); Console.WriteLine("If that doesn't help, open an issue on GitHub!"); @@ -150,7 +150,7 @@ namespace Sharpii if (args[1] == "16011") { Console.WriteLine(""); - Console.WriteLine("V Flag was used, but no version provided. (SHARPII_NET_CORE_xxx_NO_VERSION_01)"); + Console.WriteLine("V Flag was used, but no version provided. (SHARPII_NET_CORE_xxx_NO_VERSION)"); Console.WriteLine("You used the -V flag, but no version was provided."); Console.WriteLine("Provide a proper version."); Console.WriteLine("If that doesn't help, open an issue on GitHub!"); @@ -161,7 +161,7 @@ namespace Sharpii if (args[1] == "16012") { Console.WriteLine(""); - Console.WriteLine("V Flag was used, but an invalid version provided. (SHARPII_NET_CORE_xxx_INVALID_VERSION_01)"); + Console.WriteLine("V Flag was used, but an invalid version provided. (SHARPII_NET_CORE_xxx_INVALID_VERSION)"); Console.WriteLine("You used the -V flag, but no version was provided."); Console.WriteLine("Provide a proper version."); Console.WriteLine("If that doesn't help, open an issue on GitHub!"); @@ -172,7 +172,7 @@ namespace Sharpii if (args[1] == "16013") { Console.WriteLine(""); - Console.WriteLine("O Flag was used, but no output provided. (SHARPII_NET_CORE_xxx_NO_OUTPUT_01)"); + Console.WriteLine("O Flag was used, but no output provided. (SHARPII_NET_CORE_xxx_NO_OUTPUT)"); Console.WriteLine("You used the -O flag, but no output was provided."); Console.WriteLine("Provide a proper output."); Console.WriteLine("If that doesn't help, open an issue on GitHub!"); @@ -183,7 +183,7 @@ namespace Sharpii if (args[1] == "16014") { Console.WriteLine(""); - Console.WriteLine("ID Flag was used, but no id provided. (SHARPII_NET_CORE_xxx_NO_ID_01)"); + Console.WriteLine("ID Flag was used, but no id provided. (SHARPII_NET_CORE_xxx_NO_ID)"); Console.WriteLine("You used the -ID flag, but no id was provided."); Console.WriteLine("Provide a proper id."); Console.WriteLine("If that doesn't help, open an issue on GitHub!"); @@ -194,7 +194,7 @@ namespace Sharpii if (args[1] == "16015") { Console.WriteLine(""); - Console.WriteLine("A Critical DLL (libWiiSharp.dll) couldn't be found. (SHARPII_NET_CORE_MAIN_MISSING_DLL_LIBWIISHARP_01)"); + Console.WriteLine("A Critical DLL (libWiiSharp.dll) couldn't be found. (SHARPII_NET_CORE_MAIN_MISSING_DLL_LIBWIISHARP)"); Console.WriteLine("The libWiiSharp.dll couldn't be found."); Console.WriteLine("This error SHOULD NOT APPEAR in this Sharpii port."); Console.WriteLine("Open an issue on GitHub!"); @@ -205,7 +205,7 @@ namespace Sharpii if (args[1] == "16016") { Console.WriteLine(""); - Console.WriteLine("An invalid argument was passed when starting Sharpii. (SHARPII_NET_CORE_xxx_INVALID_ARG_01)"); + Console.WriteLine("An invalid argument was passed when starting Sharpii. (SHARPII_NET_CORE_xxx_INVALID_ARG)"); Console.WriteLine("An invalid argument was provided."); Console.WriteLine("Check the options you are using to start Sharpii."); Console.WriteLine("If that doesn't help, open an issue on GitHub!"); @@ -216,7 +216,7 @@ namespace Sharpii if (args[1] == "16017") { Console.WriteLine(""); - Console.WriteLine("FORMAT Flag was used, but no format provided. (SHARPII_NET_CORE_TPL_NO_FORMAT_01)"); + Console.WriteLine("FORMAT Flag was used, but no format provided. (SHARPII_NET_CORE_TPL_NO_FORMAT)"); Console.WriteLine("You used the -FORMAT flag, but no format was provided."); Console.WriteLine("Provide a proper format."); Console.WriteLine("If that doesn't help, open an issue on GitHub!"); @@ -227,7 +227,7 @@ namespace Sharpii if (args[1] == "16018") { Console.WriteLine(""); - Console.WriteLine("FORMAT Flag was used, but invalid format provided. (SHARPII_NET_CORE_TPL_INVALID_FORMAT_01)"); + Console.WriteLine("FORMAT Flag was used, but invalid format provided. (SHARPII_NET_CORE_TPL_INVALID_FORMAT)"); Console.WriteLine("You used the -FORMAT flag, but an invalid format was provided."); Console.WriteLine("Provide a proper format."); Console.WriteLine("If that doesn't help, open an issue on GitHub!"); @@ -238,7 +238,7 @@ namespace Sharpii if (args[1] == "16019") { Console.WriteLine(""); - Console.WriteLine("A non U8 archive file was provided. (SHARPII_NET_CORE_U8_NON_U8_01)"); + Console.WriteLine("A non U8 archive file was provided. (SHARPII_NET_CORE_U8_NON_U8)"); Console.WriteLine("The provided file is not a U8 archive."); Console.WriteLine("Provide a U8 archive."); Console.WriteLine("If that doesn't help, open an issue on GitHub!"); @@ -249,7 +249,7 @@ namespace Sharpii if (args[1] == "16020") { Console.WriteLine(""); - Console.WriteLine("Folder Access Issue/Missing Folder. (SHARPII_NET_CORE_xxx_FOLDER_ERR_01)"); + Console.WriteLine("Folder Access Issue/Missing Folder. (SHARPII_NET_CORE_xxx_FOLDER_ERR)"); Console.WriteLine("Either the folder doesn't exist, or Sharpii doesn't have permission to open it."); Console.WriteLine("Check the folders's permissions and that it's in the right place."); Console.WriteLine("If that doesn't help, open an issue on GitHub!"); @@ -260,7 +260,7 @@ namespace Sharpii if (args[1] == "16021") { Console.WriteLine(""); - Console.WriteLine("IMET Flag was used, but no title provided. (SHARPII_NET_CORE_xxx_NO_TITLE_01"); + Console.WriteLine("IMET Flag was used, but no title provided. (SHARPII_NET_CORE_xxx_NO_TITLE"); Console.WriteLine("You used the -IMET flag, but no title was provided."); Console.WriteLine("Provide a proper title."); Console.WriteLine("If that doesn't help, open an issue on GitHub!"); @@ -282,7 +282,7 @@ namespace Sharpii if (args[1] == "16023") { Console.WriteLine(""); - Console.WriteLine("ID Flag was used, but short ID provided. (SHARPII_NET_CORE_WAD_SHORT_ID_01)"); + Console.WriteLine("ID Flag was used, but short ID provided. (SHARPII_NET_CORE_WAD_SHORT_ID)"); Console.WriteLine("You used the -ID flag, but the provided id was too short to be correct."); Console.WriteLine("Provide a proper id."); Console.WriteLine("If that doesn't help, open an issue on GitHub!"); @@ -293,7 +293,7 @@ namespace Sharpii if (args[1] == "16024") { Console.WriteLine(""); - Console.WriteLine("TYPE or IOS Flag used, but no type provided. (SHARPII_NET_CORE_WAD_NO_TYPE_01)"); + Console.WriteLine("TYPE or IOS Flag used, but no type provided. (SHARPII_NET_CORE_WAD_NO_TYPE)"); Console.WriteLine("You used the -TYPE or -IOS flag, but no type was provided."); Console.WriteLine("Provide a proper type."); Console.WriteLine("If that doesn't help, open an issue on GitHub!"); @@ -304,7 +304,7 @@ namespace Sharpii if (args[1] == "16025") { Console.WriteLine(""); - Console.WriteLine("TYPE or IOS Flag used, but provided type unknown. (SHARPII_NET_CORE_WAD_UNKNOWN_TYPE_01)"); + Console.WriteLine("TYPE or IOS Flag used, but provided type unknown. (SHARPII_NET_CORE_WAD_UNKNOWN_TYPE)"); Console.WriteLine("You used the -TYPE flag, but an unknown type was provided."); Console.WriteLine("Provide a proper type."); Console.WriteLine("If that doesn't help, open an issue on GitHub!"); @@ -337,7 +337,7 @@ namespace Sharpii if (args[1] == "16028") { Console.WriteLine(""); - Console.WriteLine("ID Flag was used, but invalid id provided. (SHARPII_NET_CORE_xxx_BAD_ID_01)"); + Console.WriteLine("ID Flag was used, but invalid id provided. (SHARPII_NET_CORE_xxx_BAD_ID)"); Console.WriteLine("You used the -ID flag, but an invalid id was provided."); Console.WriteLine("Provide a proper id."); Console.WriteLine("If that doesn't help, open an issue on GitHub!"); @@ -348,7 +348,7 @@ namespace Sharpii if (args[1] == "16029") { Console.WriteLine(""); - Console.WriteLine("Not all files needed to pack a wad are present. (SHARPII_NET_CORE_NUSD_MISSING_FILES_01)"); + Console.WriteLine("Not all files needed to pack a wad are present. (SHARPII_NET_CORE_NUSD_MISSING_FILES)"); Console.WriteLine("You need to have all the required .app files, a tmd file, a tik file, and a cert file to pack a wad."); Console.WriteLine("Ensure all files are present"); Console.WriteLine("If that doesn't help, open an issue on GitHub!"); diff --git a/Sharpii/Exit Codes.txt b/Sharpii/Exit Codes.txt index aec2faa..52853e2 100644 --- a/Sharpii/Exit Codes.txt +++ b/Sharpii/Exit Codes.txt @@ -8,110 +8,110 @@ Exit Code: 0 No errors reported/Likely successful exit Exit Code: 16001/3 -File Access Issue/Missing File. (SHARPII_NET_CORE_xxx_FILE_ERR_01) +File Access Issue/Missing File. (SHARPII_NET_CORE_xxx_FILE_ERR) Either the file doesn't exist, or Sharpii doesn't have permission to open it. Check the file's permissions and that it's in the right place. Exit Code: 16002/4 -Unknown Error/Untracked Error. (SHARPII_NET_CORE_xxx_UNKNOWN_01) +Unknown Error/Untracked Error. (SHARPII_NET_CORE_xxx_UNKNOWN) An untracked error has occured. Use the error text to self-diagnose. Exit Code: 16003/5 -No IP was provided for remote Wii access. (SHARPII_NET_CORE_HBC_NO_IP_01) +No IP was provided for remote Wii access. (SHARPII_NET_CORE_HBC_NO_IP) No IP address was listed for the Wii. Furthermore, no IP address is saved from previous uses. If this doesn't help, open an issue on GitHub! Exit Code: 16004/6 -DOL Flag was used, but no file provided. (SHARPII_NET_CORE_xxx_NO_DOL_01) +DOL Flag was used, but no file provided. (SHARPII_NET_CORE_xxx_NO_DOL) You used the -DOL flag, but no DOL file was provided. Provide the proper DOL file. Exit Code: 16005/7 -A Critical DLL (WadInstaller.dll) couldn't be found. (SHARPII_NET_CORE_HBC_MISSING_DLL_WADINSTALLER_01) +A Critical DLL (WadInstaller.dll) couldn't be found. (SHARPII_NET_CORE_HBC_MISSING_DLL_WADINSTALLER) The WadInstaller.dll couldn't be found. This error SHOULD NOT APPEAR in this Sharpii port. Open an issue on GitHub! Exit Code: 16006/8 -IOS Flag was used, but no IOS provided. (SHARPII_NET_CORE_xxx_NO_IOS_01) +IOS Flag was used, but no IOS provided. (SHARPII_NET_CORE_xxx_NO_IOS) You used the -IOS flag, but no IOS was provided. Provide a proper IOS. Exit Code: 16007/9 -IOS Flag was used, but an invalid IOS provided. (SHARPII_NET_CORE_xxx_INVALID_IOS_01) +IOS Flag was used, but an invalid IOS provided. (SHARPII_NET_CORE_xxx_INVALID_IOS) You used the -IOS flag, but an invalid IOS was provided. Provide a proper IOS. Exit Code: 16008/10 -WAD Flag was used, but no wad provided. (SHARPII_NET_CORE_HBC_NO_WAD_01) +WAD Flag was used, but no wad provided. (SHARPII_NET_CORE_HBC_NO_WAD) You used the -WAD flag, but no WAD was provided. Provide a proper WAD. Exit Code: 16009/11 -Slot Flag was used, but no slot provided. (SHARPII_NET_CORE_IOS_NO_SLOT_01) +Slot Flag was used, but no slot provided. (SHARPII_NET_CORE_IOS_NO_SLOT) You used the -SLOT flag, but no slot was provided. Provide a proper slot. Exit Code: 16010/12 -Slot Flag was used, but an invalid slot provided. (SHARPII_NET_CORE_xxx_INVALID_SLOT_01) +Slot Flag was used, but an invalid slot provided. (SHARPII_NET_CORE_xxx_INVALID_SLOT) You used the -SLOT flag, but an invalid slot was provided. Provide a proper slot. Exit Code: 16011/13 -V Flag was used, but no version provided. (SHARPII_NET_CORE_xxx_NO_VERSION_01) +V Flag was used, but no version provided. (SHARPII_NET_CORE_xxx_NO_VERSION) You used the -V flag, but no version was provided. Provide a proper version. Exit Code: 16012/14 -V Flag was used, but an invalid version provided. (SHARPII_NET_CORE_xxx_INVALID_VERSION_01) +V Flag was used, but an invalid version provided. (SHARPII_NET_CORE_xxx_INVALID_VERSION) You used the -V flag, but no version was provided. Provide a proper version. Exit Code: 16013/15 -O Flag was used, but no output provided. (SHARPII_NET_CORE_xxx_NO_OUTPUT_01) +O Flag was used, but no output provided. (SHARPII_NET_CORE_xxx_NO_OUTPUT) You used the -O flag, but no output was provided. Provide a proper output. Exit Code: 16014/16 -ID Flag was used, but no id provided. (SHARPII_NET_CORE_xxx_NO_ID_01) +ID Flag was used, but no id provided. (SHARPII_NET_CORE_xxx_NO_ID) You used the -ID flag, but no id was provided. Provide a proper id. Exit Code: 16015/17 -A Critical DLL (libWiiSharp.dll) couldn't be found. (SHARPII_NET_CORE_MAIN_MISSING_DLL_LIBWIISHARP_01) +A Critical DLL (libWiiSharp.dll) couldn't be found. (SHARPII_NET_CORE_MAIN_MISSING_DLL_LIBWIISHARP) The libWiiSharp.dll couldn't be found. This error SHOULD NOT APPEAR in this Sharpii port. Open an issue on GitHub! Exit Code: 16016/18 -An invalid argument was passed when starting Sharpii. (SHARPII_NET_CORE_xxx_INVALID_ARG_01) +An invalid argument was passed when starting Sharpii. (SHARPII_NET_CORE_xxx_INVALID_ARG) An invalid argument was provided. Check the options you are using to start Sharpii. Exit Code: 16017/19 -FORMAT Flag was used, but no format provided. (SHARPII_NET_CORE_TPL_NO_FORMAT_01) +FORMAT Flag was used, but no format provided. (SHARPII_NET_CORE_TPL_NO_FORMAT) You used the -FORMAT flag, but no format was provided. Provide a proper format. Exit Code: 16018/20 -FORMAT Flag was used, but invalid format provided. (SHARPII_NET_CORE_TPL_INVALID_FORMAT_01) +FORMAT Flag was used, but invalid format provided. (SHARPII_NET_CORE_TPL_INVALID_FORMAT) You used the -FORMAT flag, but an invalid format was provided. Provide a proper format. Exit Code: 16019/21 -A non U8 archive file was provided. (SHARPII_NET_CORE_U8_NON_U8_01) +A non U8 archive file was provided. (SHARPII_NET_CORE_U8_NON_U8) The provided file is not a U8 archive. Provide a U8 archive. Exit Code: 16020/22 -Folder Access Issue/Missing Folder. (SHARPII_NET_CORE_xxx_FOLDER_ERR_01) +Folder Access Issue/Missing Folder. (SHARPII_NET_CORE_xxx_FOLDER_ERR) Either the folder doesn't exist, or Sharpii doesn't have permission to open it. Check the folders's permissions and that it's in the right place. Exit Code: 16021/23 -IMET Flag was used, but no title provided. (SHARPII_NET_CORE_xxx_NO_TITLE_01 +IMET Flag was used, but no title provided. (SHARPII_NET_CORE_xxx_NO_TITLE You used the -IMET flag, but no title was provided. Provide a proper title. @@ -121,17 +121,17 @@ You used the -IMET and -IMD5 flags, but you can't use two headers. Provide only one flag. Exit Code: 16023/25 -ID Flag was used, but short ID provided. (SHARPII_NET_CORE_WAD_SHORT_ID_01) +ID Flag was used, but short ID provided. (SHARPII_NET_CORE_WAD_SHORT_ID) You used the -ID flag, but the provided id was too short to be correct. Provide a proper id. Exit Code: 16024/26 -TYPE or IOS Flag used, but no type provided. (SHARPII_NET_CORE_WAD_NO_TYPE_01) +TYPE or IOS Flag used, but no type provided. (SHARPII_NET_CORE_WAD_NO_TYPE) You used the -TYPE or -IOS flag, but no type was provided. Provide a proper type. Exit Code: 16025/27 -TYPE or IOS Flag used, but provided type unknown. (SHARPII_NET_CORE_WAD_UNKNOWN_TYPE_01) +TYPE or IOS Flag used, but provided type unknown. (SHARPII_NET_CORE_WAD_UNKNOWN_TYPE) You used the -TYPE flag, but an unknown type was provided. Provide a proper type. @@ -146,12 +146,12 @@ You used the BANNER flag, but no wad file to provide a banner was provided. Provide a proper wad. Exit Code: 16028/30 -ID Flag was used, but invalid id provided. (SHARPII_NET_CORE_xxx_BAD_ID_01) +ID Flag was used, but invalid id provided. (SHARPII_NET_CORE_xxx_BAD_ID) You used the -ID flag, but an invalid id was provided. Provide a proper id. Exit Code: 16029/31 -Not all files needed to pack a wad are present. (SHARPII_NET_CORE_NUSD_MISSING_FILES_01) +Not all files needed to pack a wad are present. (SHARPII_NET_CORE_NUSD_MISSING_FILES) You need to have all the required .app files, a tmd file, a tik file, and a cert file to pack a wad. Ensure all files are present. @@ -161,6 +161,6 @@ The remote server returned a 404 error. Check your Title ID. If you have a CETK file, please place it in the same directory as Sharpii saves the NUS Files to. Exit Code: 16031/33 -A WebRequest error has occured and stopped a NUS download. (SHARPII_NET_CORE_NUSD_WEBREQUEST_FAIL) +A WebRequest Error has occured and stopped a NUS download. (SHARPII_NET_CORE_NUSD_WEBREQUEST_FAIL) A WebRequest Error occurred. This usually means that Sharpii can not properly download and save the file. Please ensure you have the proper permissions to use the current folder or files. \ No newline at end of file diff --git a/Sharpii/HBC.cs b/Sharpii/HBC.cs index 28cb4d5..b0d3e8b 100644 --- a/Sharpii/HBC.cs +++ b/Sharpii/HBC.cs @@ -18,7 +18,6 @@ using System; using System.IO; -using System.Net; using libWiiSharp; namespace Sharpii @@ -54,7 +53,7 @@ namespace Sharpii if (i + 1 >= args.Length) { Console.WriteLine("ERROR: No ip set"); - Console.WriteLine("Error: SHARPII_NET_CORE_HBC_NO_IP_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_HBC_NO_IP"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E83); @@ -75,7 +74,7 @@ namespace Sharpii if (i + 1 >= args.Length) { Console.WriteLine("ERROR: No dol set"); - Console.WriteLine("Error: SHARPII_NET_CORE_HBC_NO_DOL_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_HBC_NO_DOL"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E84); @@ -92,7 +91,7 @@ namespace Sharpii { Console.WriteLine("ERROR: Unable to open file: {0}", input); Console.WriteLine("Either the file doesn't exist, or Sharpii doesn't have permission to open it."); - Console.WriteLine("Error: SHARPII_NET_CORE_HBC_FILE_ERR_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_HBC_FILE_ERR"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E81); @@ -139,7 +138,7 @@ namespace Sharpii if (String.IsNullOrEmpty(ip)) { Console.WriteLine("ERROR: No IP set"); - Console.WriteLine("Error: SHARPII_NET_CORE_HBC_NO_IP_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_HBC_NO_IP"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E82); @@ -191,7 +190,7 @@ namespace Sharpii Console.WriteLine("An unknown error occured, please try again"); Console.WriteLine(""); Console.WriteLine("ERROR DETAILS: {0}", ex.Message); - Console.WriteLine("Error: SHARPII_NET_CORE_HBC_UNKNOWN_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_HBC_UNKNOWN"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E81); @@ -225,7 +224,7 @@ namespace Sharpii Console.WriteLine("ERROR: WadInstaller.dll not found"); Console.WriteLine("This should not appear on the .Net Core port."); Console.WriteLine("If you see this, report how you got here on https://github.com/TheShadowEevee/Sharpii-NetCore/issues."); - Console.WriteLine("Error: SHARPII_NET_CORE_HBC_MISSING_DLL_WADINSTALLER_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_HBC_MISSING_DLL_WADINSTALLER"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E85); @@ -258,7 +257,7 @@ namespace Sharpii if (i + 1 >= args.Length) { Console.WriteLine("ERROR: No ios set"); - Console.WriteLine("Error: SHARPII_NET_CORE_HBC_NO_IOS_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_HBC_NO_IOS"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E86); @@ -273,7 +272,7 @@ namespace Sharpii if (!(Convert.ToInt32(ios) >= 3 && Convert.ToInt32(ios) <= 255)) { Console.WriteLine("ERROR: Invalid IOS number"); - Console.WriteLine("Error: SHARPII_NET_CORE_HBC_INVALID_IOS_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_HBC_INVALID_IOS"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E87); @@ -292,7 +291,7 @@ namespace Sharpii if (i + 1 >= args.Length) { Console.WriteLine("ERROR: No ip set"); - Console.WriteLine("Error: SHARPII_NET_CORE_HBC_NO_IP_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_HBC_NO_IP"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E83); @@ -313,7 +312,7 @@ namespace Sharpii if (i + 1 >= args.Length) { Console.WriteLine("ERROR: No WAD set"); - Console.WriteLine("Error: SHARPII_NET_CORE_HBC_NO_WAD_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_HBC_NO_WAD"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E88); @@ -329,7 +328,7 @@ namespace Sharpii if (File.Exists(input) == false) { Console.WriteLine("ERROR: Unable to open file: {0}", input); - Console.WriteLine("Error: SHARPII_NET_CORE_BNS_FILE_ERR_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_BNS_FILE_ERR"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E81); @@ -371,7 +370,7 @@ namespace Sharpii if (String.IsNullOrEmpty(ip)) { Console.WriteLine("ERROR: No IP set"); - Console.WriteLine("Error: SHARPII_NET_CORE_HBC_NO_IP_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_HBC_NO_IP"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E83); @@ -415,7 +414,7 @@ namespace Sharpii Console.WriteLine("An unknown error occured, please try again"); Console.WriteLine(""); Console.WriteLine("ERROR DETAILS: {0}", ex.Message); - Console.WriteLine("Error: SHARPII_NET_CORE_HBC_UNKNOWN_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_HBC_UNKNOWN"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E82); diff --git a/Sharpii/IOS.cs b/Sharpii/IOS.cs index 7466d3a..0cfa60f 100644 --- a/Sharpii/IOS.cs +++ b/Sharpii/IOS.cs @@ -45,7 +45,7 @@ namespace Sharpii { Console.WriteLine("ERROR: Unable to open file: {0}", input); Console.WriteLine("Either the file doesn't exist, or Sharpii doesn't have permission to open it."); - Console.WriteLine("Error: SHARPII_NET_CORE_IOS_FILE_ERR_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_IOS_FILE_ERR"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E81); @@ -78,7 +78,7 @@ namespace Sharpii if (i + 1 >= args.Length) { Console.WriteLine("ERROR: No slot set"); - Console.WriteLine("Error: SHARPII_NET_CORE_IOS_NO_SLOT_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_IOS_NO_SLOT"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E89); @@ -92,7 +92,7 @@ namespace Sharpii if (!int.TryParse(args[i + 1], out slot)) { Console.WriteLine("Invalid slot {0}...", args[i + 1]); - Console.WriteLine("Error: SHARPII_NET_CORE_IOS_INVALID_SLOT_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_IOS_INVALID_SLOT"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E8A); @@ -106,7 +106,7 @@ namespace Sharpii if (slot < 3 || slot > 255) { Console.WriteLine("Invalid slot {0}...", slot); - Console.WriteLine("Error: SHARPII_NET_CORE_IOS_INVALID_SLOT_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_IOS_INVALID_SLOT"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E8A); @@ -122,7 +122,7 @@ namespace Sharpii if (i + 1 >= args.Length) { Console.WriteLine("ERROR: No slot set"); - Console.WriteLine("Error: SHARPII_NET_CORE_IOS_NO_SLOT_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_IOS_NO_SLOT"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E89); @@ -136,7 +136,7 @@ namespace Sharpii if (!int.TryParse(args[i + 1], out slot)) { Console.WriteLine("Invalid slot {0}...", args[i + 1]); - Console.WriteLine("Error: SHARPII_NET_CORE_IOS_INVALID_SLOT_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_IOS_INVALID_SLOT"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E8A); @@ -150,7 +150,7 @@ namespace Sharpii if (slot < 3 || slot > 255) { Console.WriteLine("Invalid slot {0}...", slot); - Console.WriteLine("Error: SHARPII_NET_CORE_IOS_INVALID_SLOT_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_IOS_INVALID_SLOT"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E8A); @@ -166,7 +166,7 @@ namespace Sharpii if (i + 1 >= args.Length) { Console.WriteLine("ERROR: No version set"); - Console.WriteLine("Error: SHARPII_NET_CORE_IOS_NO_VERSION_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_IOS_NO_VERSION"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E8B); @@ -180,7 +180,7 @@ namespace Sharpii if (!int.TryParse(args[i + 1], out version)) { Console.WriteLine("Invalid version {0}...", args[i + 1]); - Console.WriteLine("Error: SHARPII_NET_CORE_IOS_INVALID_VERSION_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_IOS_INVALID_VERSION"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E8C); @@ -194,7 +194,7 @@ namespace Sharpii if (version < 0 || version > 65535) { Console.WriteLine("Invalid version {0}...", version); - Console.WriteLine("Error: SHARPII_NET_CORE_IOS_INVALID_VERSION_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_IOS_INVALID_VERSION"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E8C); @@ -210,7 +210,7 @@ namespace Sharpii if (i + 1 >= args.Length) { Console.WriteLine("ERROR: No output set"); - Console.WriteLine("Error: SHARPII_NET_CORE_IOS_NO_OUTPUT_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_IOS_NO_OUTPUT"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E8D); @@ -330,7 +330,7 @@ namespace Sharpii Console.WriteLine("An unknown error occured, please try again"); Console.WriteLine(""); Console.WriteLine("ERROR DETAILS: {0}", ex.Message); - Console.WriteLine("Error: SHARPII_NET_CORE_IOS_UNKNOWN_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_IOS_UNKNOWN"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E82); diff --git a/Sharpii/NUSD.cs b/Sharpii/NUSD.cs index 25c3286..cf8dd9c 100644 --- a/Sharpii/NUSD.cs +++ b/Sharpii/NUSD.cs @@ -89,7 +89,7 @@ namespace Sharpii if (i + 1 >= args.Length) { Console.WriteLine("ERROR: No version set"); - Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_NO_VERSION_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_NO_VERSION"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E8B); @@ -106,7 +106,7 @@ namespace Sharpii if (!int.TryParse(version, out intver)) { Console.WriteLine("Invalid version {0}...", args[i + 1]); - Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_INVALID_VERSION_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_INVALID_VERSION"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E8C); @@ -120,7 +120,7 @@ namespace Sharpii if (intver < 0 || intver > 65535) { Console.WriteLine("Invalid version {0}...", version); - Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_INVALID_VERSION_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_INVALID_VERSION"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E8C); @@ -136,7 +136,7 @@ namespace Sharpii if (i + 1 >= args.Length) { Console.WriteLine("ERROR: No version set"); - Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_NO_VERSION_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_NO_VERSION"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E8B); @@ -153,7 +153,7 @@ namespace Sharpii if (!int.TryParse(version, out intver)) { Console.WriteLine("Invalid version {0}...", args[i + 1]); - Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_INVALID_VERSION_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_INVALID_VERSION"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E8C); @@ -167,7 +167,7 @@ namespace Sharpii if (intver < 0 || intver > 65535) { Console.WriteLine("Invalid version {0}...", version); - Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_INVALID_VERSION_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_INVALID_VERSION"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E8C); @@ -183,7 +183,7 @@ namespace Sharpii if (i + 1 >= args.Length) { Console.WriteLine("ERROR: No output set"); - Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_NO_OUTPUT_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_NO_OUTPUT"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E8D); @@ -200,7 +200,7 @@ namespace Sharpii if (i + 1 >= args.Length) { Console.WriteLine("ERROR: No ID specified"); - Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_NO_ID_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_NO_ID"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E8E); @@ -218,7 +218,7 @@ namespace Sharpii if (i + 1 >= args.Length) { Console.WriteLine("ERROR: No IOS specified"); - Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_NO_IOS_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_NO_IOS"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E86); @@ -235,7 +235,7 @@ namespace Sharpii if (i + 1 >= args.Length) { Console.WriteLine("ERROR: No ID specified"); - Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_NO_ID_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_NO_ID"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E8E); @@ -252,7 +252,7 @@ namespace Sharpii if (i + 1 >= args.Length) { Console.WriteLine("ERROR: No ID specified"); - Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_NO_ID_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_NO_ID"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E8E); @@ -272,7 +272,7 @@ namespace Sharpii if (id == "") { Console.WriteLine("ERROR: No ID specified"); - Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_NO_ID_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_NO_ID"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E8E); @@ -308,7 +308,7 @@ namespace Sharpii Console.WriteLine(""); Console.WriteLine("The ID needs to be 16 Characters."); Console.WriteLine(""); - Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_BAD_ID_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_BAD_ID"); Console.WriteLine(""); if (OperatingSystem.Windows()) { @@ -342,7 +342,7 @@ namespace Sharpii Console.WriteLine("An unknown error occured, please try again"); Console.WriteLine(""); Console.WriteLine("ERROR DETAILS: {0}", ex.Message); - Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_UNKNOWN_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_UNKNOWN"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E82); @@ -451,7 +451,7 @@ namespace Sharpii Console.WriteLine(""); Console.WriteLine("The ID needs to be 16 Characters."); Console.WriteLine(""); - Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_BAD_ID_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_BAD_ID"); Console.WriteLine(""); if (OperatingSystem.Windows()) { @@ -483,7 +483,7 @@ namespace Sharpii Console.WriteLine("An unknown error occured, please try again"); Console.WriteLine(""); Console.WriteLine("ERROR DETAILS: {0}", ex.Message); - Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_UNKNOWN_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_UNKNOWN"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E82); @@ -518,7 +518,7 @@ namespace Sharpii { Console.WriteLine("ERROR: Can't find WAD {0}", id.ToLower()); Console.WriteLine("Try running with out the -WAD or -ALL tag. If it still doesn't work, open an issue on Github."); - Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_FILE_ERR_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_FILE_ERR"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E81); @@ -541,7 +541,7 @@ namespace Sharpii Console.WriteLine("ERROR: Can't find WAD"); Console.WriteLine("Try running with out the -WAD or -ALL tag. If it still doesn't work, open an issue on Github."); Console.WriteLine("Exact Error: {0}", ex.Message); - Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_FILE_ERR_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_FILE_ERR"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E81); diff --git a/Sharpii/Program.cs b/Sharpii/Program.cs index bf71e2a..01a7b88 100644 --- a/Sharpii/Program.cs +++ b/Sharpii/Program.cs @@ -122,7 +122,7 @@ namespace Sharpii { //If the user gets here, they entered something wrong Console.WriteLine("ERROR: The argument {0} is invalid", args[0]); - Console.WriteLine("Error: SHARPII_NET_CORE_MAIN_INVALID_ARG_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_MAIN_INVALID_ARG"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E90); diff --git a/Sharpii/TPL.cs b/Sharpii/TPL.cs index 333a3be..09e617b 100644 --- a/Sharpii/TPL.cs +++ b/Sharpii/TPL.cs @@ -48,7 +48,7 @@ namespace Sharpii //If tuser gets here, they entered something wrong Console.WriteLine("ERROR: The argument {0} is invalid", args[1]); - Console.WriteLine("Error: SHARPII_NET_CORE_TPL_INVALID_ARG_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_TPL_INVALID_ARG"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E90); @@ -71,7 +71,7 @@ namespace Sharpii { Console.WriteLine("ERROR: Unable to open file: {0}", input); Console.WriteLine("Either the file doesn't exist, or Sharpii doesn't have permission to open it."); - Console.WriteLine("Error: SHARPII_NET_CORE_TPL_FILE_ERR_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_TPL_FILE_ERR"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E81); @@ -112,7 +112,7 @@ namespace Sharpii Console.WriteLine("An unknown error occured, please try again"); Console.WriteLine(""); Console.WriteLine("ERROR DETAILS: {0}", ex.Message); - Console.WriteLine("Error: SHARPII_NET_CORE_TPL_UNKNOWN_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_TPL_UNKNOWN"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E81); @@ -137,7 +137,7 @@ namespace Sharpii { Console.WriteLine("ERROR: Unable to open file: {0}", input); Console.WriteLine("Either the file doesn't exist, or Sharpii doesn't have permission to open it."); - Console.WriteLine("Error: SHARPII_NET_CORE_TPL_FILE_ERR_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_TPL_FILE_ERR"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E81); @@ -158,7 +158,7 @@ namespace Sharpii if (i + 1 >= args.Length) { Console.WriteLine("ERROR: No format set"); - Console.WriteLine("Error: SHARPII_NET_CORE_TPL_NO_FORMAT_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_TPL_NO_FORMAT"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E91); @@ -175,7 +175,7 @@ namespace Sharpii if (i + 1 >= args.Length) { Console.WriteLine("ERROR: No format set"); - Console.WriteLine("Error: SHARPII_NET_CORE_TPL_NO_FORMAT_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_TPL_NO_FORMAT"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E91); @@ -195,7 +195,7 @@ namespace Sharpii if (tplFormat != "I4" & tplFormat != "I8" & tplFormat != "IA4" & tplFormat != "IA8" & tplFormat != "RGB565" & tplFormat != "RGB5A3" & tplFormat != "RGBA8") { Console.WriteLine("ERROR: Unknown format type: {0}", tplFormat); - Console.WriteLine("Error: SHARPII_NET_CORE_TPL_UNKNOWN_FORMAT_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_TPL_UNKNOWN_FORMAT"); Environment.Exit(0x00003E92); return; } @@ -253,7 +253,7 @@ namespace Sharpii Console.WriteLine("An unknown error occured, please try again"); Console.WriteLine(""); Console.WriteLine("ERROR DETAILS: {0}", ex.Message); - Console.WriteLine("Error: SHARPII_NET_CORE_TPL_UNKNOWN_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_TPL_UNKNOWN"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E82); diff --git a/Sharpii/U8.cs b/Sharpii/U8.cs index 99a3c5c..53a16d6 100644 --- a/Sharpii/U8.cs +++ b/Sharpii/U8.cs @@ -48,7 +48,7 @@ namespace Sharpii //If tuser gets here, they entered something wrong Console.WriteLine("ERROR: The argument {0} is invalid", args[1]); - Console.WriteLine("Error: SHARPII_NET_CORE_U8_INVALID_ARG_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_U8_INVALID_ARG"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E90); @@ -71,14 +71,14 @@ namespace Sharpii { Console.WriteLine("ERROR: Unable to open file: {0}", input); Console.WriteLine("Either the file doesn't exist, or Sharpii doesn't have permission to open it."); - Console.WriteLine("Error: SHARPII_NET_CORE_U8_FILE_ERR_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_U8_FILE_ERR"); return; } //Check if file is U8 if (libWiiSharp.U8.IsU8(input) != true) { Console.WriteLine("ERROR: File {0} is not a U8 archive", input); - Console.WriteLine("Error: SHARPII_NET_CORE_U8_NON_U8_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_U8_NON_U8"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E93); @@ -120,7 +120,7 @@ namespace Sharpii Console.WriteLine("An unknown error occured, please try again"); Console.WriteLine(""); Console.WriteLine("ERROR DETAILS: {0}", ex.Message); - Console.WriteLine("Error: SHARPII_NET_CORE_U8_UNKNOWN_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_U8_UNKNOWN"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E82); @@ -147,7 +147,7 @@ namespace Sharpii { Console.WriteLine("ERROR: Unable to open Folder: {0}", input); Console.WriteLine("Either the folder doesn't exist, or Sharpii doesn't have permission to open it."); - Console.WriteLine("Error: SHARPII_NET_CORE_U8_FOLDER_ERR_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_U8_FOLDER_ERR"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E94); @@ -173,7 +173,7 @@ namespace Sharpii if (i + 1 >= args.Length) { Console.WriteLine("ERROR: No title set"); - Console.WriteLine("Error: SHARPII_NET_CORE_U8_NO_TITLE_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_U8_NO_TITLE"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E95); @@ -192,7 +192,7 @@ namespace Sharpii if (imd5 == true && imet != "") { Console.WriteLine("ERROR: Cannot use IMET and IMD5 at the same time."); - Console.WriteLine("Error: SHARPII_NET_CORE_U8_TWO_HEADERS_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_U8_TWO_HEADERS"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E96); @@ -252,7 +252,7 @@ namespace Sharpii Console.WriteLine("An unknown error occured, please try again"); Console.WriteLine(""); Console.WriteLine("ERROR DETAILS: {0}", ex.Message); - Console.WriteLine("Error: SHARPII_NET_CORE_U8_UNKNOWN_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_U8_UNKNOWN"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E82); diff --git a/Sharpii/WAD.cs b/Sharpii/WAD.cs index fcaa703..4f3b2b1 100644 --- a/Sharpii/WAD.cs +++ b/Sharpii/WAD.cs @@ -81,7 +81,7 @@ namespace Sharpii //If tuser gets here, they entered something wrong Console.WriteLine("ERROR: The argument {0} is invalid", args[1]); - Console.WriteLine("Error: SHARPII_NET_CORE_WAD_INVALID_ARG_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_WAD_INVALID_ARG"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E90); @@ -105,7 +105,7 @@ namespace Sharpii { Console.WriteLine("ERROR: Unable to open file: {0}", input); Console.WriteLine("Either the file doesn't exist, or Sharpii doesn't have permission to open it."); - Console.WriteLine("Error: SHARPII_NET_CORE_WAD_FILE_ERR_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_WAD_FILE_ERR"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E81); @@ -125,7 +125,7 @@ namespace Sharpii if (i + 1 >= args.Length) { Console.WriteLine("ERROR: No output set"); - Console.WriteLine("Error: SHARPII_NET_CORE_WAD_NO_OUTPUT_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_WAD_NO_OUTPUT"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E8D); @@ -142,7 +142,7 @@ namespace Sharpii if (i + 1 >= args.Length) { Console.WriteLine("ERROR: No output set"); - Console.WriteLine("Error: SHARPII_NET_CORE_WAD_NO_OUTPUT_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_WAD_NO_OUTPUT"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E8D); @@ -243,7 +243,7 @@ namespace Sharpii Console.WriteLine("An unknown error occured, please try again"); Console.WriteLine(""); Console.WriteLine("ERROR DETAILS: {0}", ex.Message); - Console.WriteLine("Error: SHARPII_NET_CORE_WAD_UNKNOWN_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_WAD_UNKNOWN"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E82); @@ -277,7 +277,7 @@ namespace Sharpii { Console.WriteLine("ERROR: Unable to open file: {0}", input); Console.WriteLine("Either the file doesn't exist, or Sharpii doesn't have permission to open it."); - Console.WriteLine("Error: SHARPII_NET_CORE_WAD_FILE_ERR_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_WAD_FILE_ERR"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E81); @@ -293,7 +293,7 @@ namespace Sharpii { Console.WriteLine("ERROR: Unable to open folder: {0}", input); Console.WriteLine("Either the folder doesn't exist, or Sharpii doesn't have permission to open it."); - Console.WriteLine("Error: SHARPII_NET_CORE_WAD_FOLDER_ERR_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_WAD_FOLDER_ERR"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E94); @@ -316,7 +316,7 @@ namespace Sharpii if (i + 1 >= args.Length) { Console.WriteLine("ERROR: No ID set"); - Console.WriteLine("Error: SHARPII_NET_CORE_WAD_NO_ID_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_WAD_NO_ID"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E8E); @@ -331,7 +331,7 @@ namespace Sharpii if (id.Length < 4) { Console.WriteLine("ERROR: ID too short"); - Console.WriteLine("Error: SHARPII_NET_CORE_WAD_SHORT_ID_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_WAD_SHORT_ID"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E97); @@ -348,7 +348,7 @@ namespace Sharpii if (i + 1 >= args.Length) { Console.WriteLine("ERROR: No type set"); - Console.WriteLine("Error: SHARPII_NET_CORE_WAD_NO_TYPE_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_WAD_NO_TYPE"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E98); @@ -363,7 +363,7 @@ namespace Sharpii if (lwrid != "CHANNEL" && lwrid != "DLC" && lwrid != "GAMECHANNEL" && lwrid != "HIDDENCHANNELS" && lwrid != "SYSTEMCHANNELS" && lwrid != "SYSTEMTITLES") { Console.WriteLine("ERROR: Unknown WAD type: {0}", args[i + 1]); - Console.WriteLine("Error: SHARPII_NET_CORE_WAD_UNKNOWN_TYPE_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_WAD_UNKNOWN_TYPE"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E99); @@ -379,7 +379,7 @@ namespace Sharpii if (i + 1 >= args.Length) { Console.WriteLine("ERROR: No type set"); - Console.WriteLine("Error: SHARPII_NET_CORE_WAD_NO_TYPE_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_WAD_NO_TYPE"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E98); @@ -393,7 +393,7 @@ namespace Sharpii if (!int.TryParse(args[i + 1], out ios)) { Console.WriteLine("Invalid slot {0}...", args[i + 1]); - Console.WriteLine("Error: SHARPII_NET_CORE_WAD_INVALID_SLOT_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_WAD_INVALID_SLOT"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E8A); @@ -407,7 +407,7 @@ namespace Sharpii if (ios < 0 || ios > 255) { Console.WriteLine("Invalid slot {0}...", ios); - Console.WriteLine("Error: SHARPII_NET_CORE_WAD_INVALID_SLOT_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_WAD_INVALID_SLOT"); Environment.Exit(0x00003E8A); return; } @@ -416,7 +416,7 @@ namespace Sharpii if (i + 1 >= args.Length) { Console.WriteLine("ERROR: No title set"); - Console.WriteLine("Error: SHARPII_NET_CORE_WAD_NO_TITLE_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_WAD_NO_TITLE"); Environment.Exit(0x00003E95); return; } @@ -426,7 +426,7 @@ namespace Sharpii if (i + 1 >= args.Length) { Console.WriteLine("ERROR: No sound set"); - Console.WriteLine("Error: SHARPII_NET_CORE_WAD_NO_SOUND_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_WAD_NO_SOUND"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E9A); @@ -442,7 +442,7 @@ namespace Sharpii { Console.WriteLine("ERROR: Unable to find sound wad"); Console.WriteLine("Either the file doesn't exist, or Sharpii doesn't have permission to open it."); - Console.WriteLine("Error: SHARPII_NET_CORE_WAD_FILE_ERR_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_WAD_FILE_ERR"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E81); @@ -458,7 +458,7 @@ namespace Sharpii if (i + 1 >= args.Length) { Console.WriteLine("ERROR: No banner set"); - Console.WriteLine("Error: SHARPII_NET_CORE_WAD_NO_BANNER_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_WAD_NO_BANNER"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E9B); @@ -474,7 +474,7 @@ namespace Sharpii { Console.WriteLine("ERROR: Unable to find banner wad"); Console.WriteLine("Either the file doesn't exist, or Sharpii doesn't have permission to open it."); - Console.WriteLine("Error: SHARPII_NET_CORE_WAD_FILE_ERR_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_WAD_FILE_ERR"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E81); @@ -490,7 +490,7 @@ namespace Sharpii if (i + 1 >= args.Length) { Console.WriteLine("ERROR: No sound set"); - Console.WriteLine("Error: SHARPII_NET_CORE_WAD_NO_SOUND_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_WAD_NO_SOUND"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E9A); @@ -506,7 +506,7 @@ namespace Sharpii { Console.WriteLine("ERROR: Unable to find icon wad"); Console.WriteLine("Either the file doesn't exist, or Sharpii doesn't have permission to open it."); - Console.WriteLine("Error: SHARPII_NET_CORE_WAD_FILE_ERR_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_WAD_FILE_ERR"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E81); @@ -522,7 +522,7 @@ namespace Sharpii if (i + 1 >= args.Length) { Console.WriteLine("ERROR: No dol set"); - Console.WriteLine("Error: SHARPII_NET_CORE_WAD_NO_DOL_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_WAD_NO_DOL"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E84); @@ -538,7 +538,7 @@ namespace Sharpii { Console.WriteLine("ERROR: Unable to find dol wad/file"); Console.WriteLine("Either the file doesn't exist, or Sharpii doesn't have permission to open it."); - Console.WriteLine("Error: SHARPII_NET_CORE_WAD_FILE_ERR_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_WAD_FILE_ERR"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E81); @@ -739,7 +739,7 @@ namespace Sharpii { Console.WriteLine("You need to have all the required .app files, a tmd file, a tik file, and a cert file to do this."); Console.WriteLine(""); - Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_MISSING_FILES_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_NUSD_MISSING_FILES"); ExceptionListRan = 1; if (OperatingSystem.Windows()) { @@ -755,7 +755,7 @@ namespace Sharpii Console.WriteLine("An unknown error occured, please try again"); Console.WriteLine(""); Console.WriteLine("ERROR DETAILS: {0}", ex.Message); - Console.WriteLine("Error: SHARPII_NET_CORE_WAD_UNKNOWN_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_WAD_UNKNOWN"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E82); @@ -780,7 +780,7 @@ namespace Sharpii { Console.WriteLine("ERROR: Unable to open file: {0}", input); Console.WriteLine("Either the file doesn't exist, or Sharpii doesn't have permission to open it."); - Console.WriteLine("Error: SHARPII_NET_CORE_WAD_FILE_ERR_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_WAD_FILE_ERR"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E81); @@ -832,7 +832,7 @@ namespace Sharpii Console.WriteLine("An unknown error occured, please try again"); Console.WriteLine(""); Console.WriteLine("ERROR DETAILS: {0}", ex.Message); - Console.WriteLine("Error: SHARPII_NET_CORE_WAD_UNKNOWN_01"); + Console.WriteLine("Error: SHARPII_NET_CORE_WAD_UNKNOWN"); if (OperatingSystem.Windows()) { Environment.Exit(0x00003E82);