Updated files to use recommended patterns based on VS recommendations. Everything should work the same.

TheShadowEevee · TheShadowEevee · commit 7e2546fe2182 · 2021-02-06T16:41:59.000-06:00
diff --git a/Sharpii/HBC.cs b/Sharpii/HBC.cs
@@ -108,8 +108,8 @@ public static void SendDol(string[] args)
                         {
                             for (int n = i + 2; n < args.Length; n++)
                             {
-                                arguments = arguments + "\x0000";
-                                arguments = arguments + args[n];
+                                arguments += "\x0000";
+                                arguments += args[n];
                             }
                         }
                         break;
diff --git a/Sharpii/IOS.cs b/Sharpii/IOS.cs
@@ -229,8 +229,10 @@ public static void IOS(string[] args)
             //Main part (most of it was borrowed from PatchIOS)
             try
             {
-                WAD ios = new WAD();
-                ios.KeepOriginalFooter = true;
+                WAD ios = new WAD
+                {
+                    KeepOriginalFooter = true
+                };
 
                 if (BeQuiet.quiet > 2)
                     Console.Write("Loading File...");
@@ -312,7 +314,7 @@ public static void IOS(string[] args)
                     if (output != "")
                     {
                         if (output.Substring(output.Length - 4, 4).ToUpper() != ".WAD")
-                            output = output + ".wad";
+                            output += ".wad";
                     }
 
                     ios.Save(input);
diff --git a/Sharpii/NUSD.cs b/Sharpii/NUSD.cs
@@ -379,7 +379,7 @@ public static void NUS(string[] args)
             if (output == "")
             {
                 NoOut = true;
-                output = ios == "" ? id + "v" + version : ios.Substring(0, ios.Length - 4);
+                output = ios == "" ? id + "v" + version : ios[0..^4];
                 if (BeQuiet.quiet > 2)
                     Console.WriteLine("No output specified, using {0}", output);
             }
@@ -558,43 +558,37 @@ private static void WadIosNamingStuff(bool wad, string temp, string id, string v
                     if (File.Exists(realout.Substring(0, index + 1) + ios))
                         File.Delete(realout.Substring(0, index + 1) + ios);
                     File.Move(Path.Combine(temp, id.ToUpper() + "v" + version + ".wad"), realout.Substring(0, index + 1) + ios);
-                    OperationDone = true;
                 }
                 else if (ios == "" && NoOut == true && LowercaseWad == false)
                 {
                     if (File.Exists(realout + ".wad"))
                         File.Delete(realout + ".wad");
                     File.Move(Path.Combine(temp, id.ToUpper() + "v" + version + ".wad"), realout + ".wad");
-                    OperationDone = true;
                 }
                 else if (LowercaseWad == false && OperationDone == false)
                 {
                     if (File.Exists(realout))
                         File.Delete(realout);
                     File.Move(Path.Combine(temp, id.ToUpper() + "v" + version + ".wad"), realout);
-                    OperationDone = true;
                 }
                 else if (ios != "" && NoOut == true && LowercaseWad == true)
                 {
                     int index = realout.LastIndexOf("\\") > realout.LastIndexOf("/") ? realout.LastIndexOf("\\") : realout.LastIndexOf("/");
                     if (File.Exists(realout.Substring(0, index + 1) + ios))
                         File.Delete(realout.Substring(0, index + 1) + ios);
                     File.Move(Path.Combine(temp, id.ToLower() + "v" + version + ".wad"), realout.Substring(0, index + 1) + ios);
-                    OperationDone = true;
                 }
                 else if (ios == "" && NoOut == true && LowercaseWad == true)
                 {
                     if (File.Exists(realout + ".wad"))
                         File.Delete(realout + ".wad");
                     File.Move(Path.Combine(temp, id.ToLower() + "v" + version + ".wad"), realout + ".wad");
-                    OperationDone = true;
                 }
                 else if (LowercaseWad == true && OperationDone == false)
                 {
                     if (File.Exists(realout))
                         File.Delete(realout);
                     File.Move(Path.Combine(temp, id.ToLower() + "v" + version + ".wad"), realout);
-                    OperationDone = true;
                 }
                 DeleteADir.DeleteDirectory(temp);
             }
diff --git a/Sharpii/Program.cs b/Sharpii/Program.cs
@@ -28,7 +28,7 @@ static void Main(string[] args)
         {
             if (args.Length < 1)
             {
-                help();
+                Help();
                 Environment.Exit(0);
             }
 
@@ -53,7 +53,7 @@ static void Main(string[] args)
 
             if (Function == "-H" || Function == "-HELP" || Function == "H" || Function == "HELP")
             {
-                help();
+                Help();
                 gotSomewhere = true;
             }
 
@@ -141,7 +141,7 @@ static void Main(string[] args)
             Environment.Exit(0);
         }
 
-        private static void help()
+        private static void Help()
         {
             Console.WriteLine("");
             Console.WriteLine("Sharpii {0} - A tool by person66, using libWiiSharp.dll by leathl", ProgramVersion.version);
diff --git a/Sharpii/TPL.cs b/Sharpii/TPL.cs
@@ -238,7 +238,7 @@ private static void To(string[] args)
                     Console.Write("Saving tpl file...");
 
                 if (output.Substring(output.Length - 4, 4).ToUpper() != ".TPL")
-                    output = output + ".tpl";
+                    output += ".tpl";
 
                 tplfile.Save(output);
 
diff --git a/Sharpii/WAD.cs b/Sharpii/WAD.cs
@@ -192,7 +192,7 @@ private static void Info(string[] args)
                         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("Full Title ID: {0}", wad.TitleID.ToString("X16").Substring(0, 8) + "-" + wad.TitleID.ToString("X16")[8..]);
                     Console.WriteLine("IOS: {0}", ((int)wad.StartupIOS).ToString());
                     Console.WriteLine("Region: {0}", wad.Region);
                     Console.WriteLine("Version: {0}", wad.TitleVersion);
@@ -204,7 +204,7 @@ private static void Info(string[] args)
                         Console.Write("Saving file...");
 
                     if (output.Substring(output.Length - 4, 4).ToUpper() != ".TXT")
-                        output = output + ".txt";
+                        output += ".txt";
                     
                     TextWriter txt = new StreamWriter(output);
                     txt.WriteLine("WAD Info:");
@@ -224,7 +224,7 @@ private static void Info(string[] args)
                         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("Full Title ID: {0}", wad.TitleID.ToString("X16").Substring(0, 8) + "-" + wad.TitleID.ToString("X16")[8..]);
                     txt.WriteLine("IOS: {0}", ((int)wad.StartupIOS).ToString());
                     txt.WriteLine("Region: {0}", wad.Region);
                     txt.WriteLine("Version: {0}", wad.TitleVersion);
@@ -723,7 +723,7 @@ private static void Editor(string[] args, bool edit)
                     Console.Write("Saving file...");
 
                 if (output.Substring(output.Length - 4, 4).ToUpper() != ".WAD")
-                    output = output + ".wad";
+                    output += ".wad";
 
                 wad.Save(output);
 

Original file line number	Diff line number	Diff line change
`@@ -108,8 +108,8 @@ public static void SendDol(string[] args)`
`108`	`108`	`{`
`109`	`109`	`for (int n = i + 2; n < args.Length; n++)`
`110`	`110`	`{`
`111`		`- arguments = arguments + "\x0000";`
`112`		`- arguments = arguments + args[n];`
	`111`	`+ arguments += "\x0000";`
	`112`	`+ arguments += args[n];`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -229,8 +229,10 @@ public static void IOS(string[] args)`
`229`	`229`	`//Main part (most of it was borrowed from PatchIOS)`
`230`	`230`	`try`
`231`	`231`	`{`
`232`		`- WAD ios = new WAD();`
`233`		`- ios.KeepOriginalFooter = true;`
	`232`	`+ WAD ios = new WAD`
	`233`	`+ {`
	`234`	`+ KeepOriginalFooter = true`
	`235`	`+ };`
`234`	`236`
`235`	`237`	`if (BeQuiet.quiet > 2)`
`236`	`238`	`Console.Write("Loading File...");`
`@@ -312,7 +314,7 @@ public static void IOS(string[] args)`
`312`	`314`	`if (output != "")`
`313`	`315`	`{`
`314`	`316`	`if (output.Substring(output.Length - 4, 4).ToUpper() != ".WAD")`
`315`		`- output = output + ".wad";`
	`317`	`+ output += ".wad";`
`316`	`318`	`}`
`317`	`319`
`318`	`320`	`ios.Save(input);`
Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,7 @@ public static void NUS(string[] args)`
`379`	`379`	`if (output == "")`
`380`	`380`	`{`
`381`	`381`	`NoOut = true;`
`382`		`- output = ios == "" ? id + "v" + version : ios.Substring(0, ios.Length - 4);`
	`382`	`+ output = ios == "" ? id + "v" + version : ios[0..^4];`
`383`	`383`	`if (BeQuiet.quiet > 2)`
`384`	`384`	`Console.WriteLine("No output specified, using {0}", output);`
`385`	`385`	`}`
`@@ -558,43 +558,37 @@ private static void WadIosNamingStuff(bool wad, string temp, string id, string v`
`558`	`558`	`if (File.Exists(realout.Substring(0, index + 1) + ios))`
`559`	`559`	`File.Delete(realout.Substring(0, index + 1) + ios);`
`560`	`560`	`File.Move(Path.Combine(temp, id.ToUpper() + "v" + version + ".wad"), realout.Substring(0, index + 1) + ios);`
`561`		`- OperationDone = true;`
`562`	`561`	`}`
`563`	`562`	`else if (ios == "" && NoOut == true && LowercaseWad == false)`
`564`	`563`	`{`
`565`	`564`	`if (File.Exists(realout + ".wad"))`
`566`	`565`	`File.Delete(realout + ".wad");`
`567`	`566`	`File.Move(Path.Combine(temp, id.ToUpper() + "v" + version + ".wad"), realout + ".wad");`
`568`		`- OperationDone = true;`
`569`	`567`	`}`
`570`	`568`	`else if (LowercaseWad == false && OperationDone == false)`
`571`	`569`	`{`
`572`	`570`	`if (File.Exists(realout))`
`573`	`571`	`File.Delete(realout);`
`574`	`572`	`File.Move(Path.Combine(temp, id.ToUpper() + "v" + version + ".wad"), realout);`
`575`		`- OperationDone = true;`
`576`	`573`	`}`
`577`	`574`	`else if (ios != "" && NoOut == true && LowercaseWad == true)`
`578`	`575`	`{`
`579`	`576`	`int index = realout.LastIndexOf("\\") > realout.LastIndexOf("/") ? realout.LastIndexOf("\\") : realout.LastIndexOf("/");`
`580`	`577`	`if (File.Exists(realout.Substring(0, index + 1) + ios))`
`581`	`578`	`File.Delete(realout.Substring(0, index + 1) + ios);`
`582`	`579`	`File.Move(Path.Combine(temp, id.ToLower() + "v" + version + ".wad"), realout.Substring(0, index + 1) + ios);`
`583`		`- OperationDone = true;`
`584`	`580`	`}`
`585`	`581`	`else if (ios == "" && NoOut == true && LowercaseWad == true)`
`586`	`582`	`{`
`587`	`583`	`if (File.Exists(realout + ".wad"))`
`588`	`584`	`File.Delete(realout + ".wad");`
`589`	`585`	`File.Move(Path.Combine(temp, id.ToLower() + "v" + version + ".wad"), realout + ".wad");`
`590`		`- OperationDone = true;`
`591`	`586`	`}`
`592`	`587`	`else if (LowercaseWad == true && OperationDone == false)`
`593`	`588`	`{`
`594`	`589`	`if (File.Exists(realout))`
`595`	`590`	`File.Delete(realout);`
`596`	`591`	`File.Move(Path.Combine(temp, id.ToLower() + "v" + version + ".wad"), realout);`
`597`		`- OperationDone = true;`
`598`	`592`	`}`
`599`	`593`	`DeleteADir.DeleteDirectory(temp);`
`600`	`594`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ static void Main(string[] args)`
`28`	`28`	`{`
`29`	`29`	`if (args.Length < 1)`
`30`	`30`	`{`
`31`		`- help();`
	`31`	`+ Help();`
`32`	`32`	`Environment.Exit(0);`
`33`	`33`	`}`
`34`	`34`
`@@ -53,7 +53,7 @@ static void Main(string[] args)`
`53`	`53`
`54`	`54`	`if (Function == "-H" \|\| Function == "-HELP" \|\| Function == "H" \|\| Function == "HELP")`
`55`	`55`	`{`
`56`		`- help();`
	`56`	`+ Help();`
`57`	`57`	`gotSomewhere = true;`
`58`	`58`	`}`
`59`	`59`
`@@ -141,7 +141,7 @@ static void Main(string[] args)`
`141`	`141`	`Environment.Exit(0);`
`142`	`142`	`}`
`143`	`143`
`144`		`- private static void help()`
	`144`	`+ private static void Help()`
`145`	`145`	`{`
`146`	`146`	`Console.WriteLine("");`
`147`	`147`	`Console.WriteLine("Sharpii {0} - A tool by person66, using libWiiSharp.dll by leathl", ProgramVersion.version);`