Clean up all files

Source/GrasscutterTools/DispatchServer/DispatchServerAPI.cs

@@ -7,12 +7,10 @@ namespace GrasscutterTools.DispatchServer
 {
     public static class DispatchServerAPI
     {
-
         public static async Task<ServerStatus> QueryServerStatus(string host)
         {
             var response = await HttpHelper.GetAsync<ServerStatusResponse>(host + "/status/server");
             return response?.Status;
         }
-
     }
 }

Source/GrasscutterTools/DispatchServer/Model/ServerStatus.cs

@@ -1,5 +1,4 @@
-
+using Newtonsoft.Json;
-using Newtonsoft.Json;
 
 namespace GrasscutterTools.DispatchServer.Model
 {

Source/GrasscutterTools/FormMain.cs

@@ -53,7 +53,6 @@ namespace GrasscutterTools
             SaveSettings();
         }
 
-
         private readonly string[] LanguageNames = new string[] { "简体中文", "English" };
         private readonly string[] Languages = new string[] { "zh-CN", "en-US" };
 
@@ -99,8 +98,8 @@ namespace GrasscutterTools
 
         #region - 主页 -
 
+        private FormGachaBannerEditor FormGachaBannerEditor;
 
-        FormGachaBannerEditor FormGachaBannerEditor;
         private void BtnOpenGachaBannerEditor_Click(object sender, EventArgs e)
         {
             if (FormGachaBannerEditor == null || FormGachaBannerEditor.IsDisposed)
@@ -115,7 +114,8 @@ namespace GrasscutterTools
             }
         }
 
-        FormTextMapBrowser FormTextMapBrowser;
+        private FormTextMapBrowser FormTextMapBrowser;
+
         private void BtnOpenTextMap_Click(object sender, EventArgs e)
         {
             if (FormTextMapBrowser == null || FormTextMapBrowser.IsDisposed)
@@ -139,6 +139,7 @@ namespace GrasscutterTools
         #endregion - 主页 -
 
         #region - 自定义 -
+
         private readonly string CustomCommandsFilePath = Path.Combine(Application.LocalUserAppDataPath, "CustomCommands.txt");
 
         private bool CustomCommandsChanged;
@@ -351,7 +352,6 @@ namespace GrasscutterTools
             NUDArtifactStars.Minimum = GameData.Artifacts.Ids[beginIndex] / 100 % 10;
             NUDArtifactStars.Maximum = GameData.Artifacts.Ids[endIndex] / 100 % 10;
 
-
             var parts = GameData.Artifacts.Names.Skip(beginIndex).Take(endIndex - beginIndex + 1).Distinct().ToArray();
             var i = CmbArtifactPart.SelectedIndex;
             CmbArtifactPart.Items.Clear();
@@ -362,7 +362,8 @@ namespace GrasscutterTools
             ArtifactInputChanged(sender, e);
         }
 
-        readonly string[] ArtifactPartLabels = new string[] { "空之杯", "死之羽", "理之冠", "生之花", "时之沙"};
+        private readonly string[] ArtifactPartLabels = new string[] { "空之杯", "死之羽", "理之冠", "生之花", "时之沙" };
+
         private void CmbArtifactPart_SelectedIndexChanged(object sender, EventArgs e)
         {
             if (CmbArtifactPart.SelectedIndex < 0)
@@ -523,8 +524,9 @@ namespace GrasscutterTools
 
         #region -- 物品记录 --
 
-        readonly string GiveItemCommandsRecordPath = Path.Combine(Application.LocalUserAppDataPath, "GiveItemCommands.txt");
+        private readonly string GiveItemCommandsRecordPath = Path.Combine(Application.LocalUserAppDataPath, "GiveItemCommands.txt");
-        List<GameCommand> GiveItemCommands;
+        private List<GameCommand> GiveItemCommands;
+
         private void InitGiveItemRecord()
         {
             if (File.Exists(GiveItemCommandsRecordPath))
@@ -574,7 +576,8 @@ namespace GrasscutterTools
                 ListGiveItemLogs.Items.RemoveAt(ListGiveItemLogs.SelectedIndex);
             }
         }
-        #endregion
+
+        #endregion -- 物品记录 --
 
         #endregion - 物品 -
 
@@ -672,8 +675,9 @@ namespace GrasscutterTools
 
         #region -- 生成记录 --
 
-        readonly string SpawnCommandsRecordPath = Path.Combine(Application.LocalUserAppDataPath, "SpawnCommands.txt");
+        private readonly string SpawnCommandsRecordPath = Path.Combine(Application.LocalUserAppDataPath, "SpawnCommands.txt");
-        List<GameCommand> SpawnCommands;
+        private List<GameCommand> SpawnCommands;
+
         private void InitSpawnRecord()
         {
             if (File.Exists(SpawnCommandsRecordPath))
@@ -686,6 +690,7 @@ namespace GrasscutterTools
                 SpawnCommands = new List<GameCommand>();
             }
         }
+
         private void SaveSpawnRecord()
         {
             File.WriteAllText(SpawnCommandsRecordPath, GetCommandsText(SpawnCommands));
@@ -723,7 +728,7 @@ namespace GrasscutterTools
             }
         }
 
-        #endregion
+        #endregion -- 生成记录 --
 
         #endregion - 生成 -
 
@@ -834,7 +839,7 @@ namespace GrasscutterTools
             }
         }
 
-        #endregion
+        #endregion - 关于 -
 
         #region - 命令 -
 
@@ -897,7 +902,7 @@ namespace GrasscutterTools
 
         #region - 命令记录 -
 
-        List<GameCommand> GetCommands(string commandsText)
+        private List<GameCommand> GetCommands(string commandsText)
         {
             var lines = commandsText.Split('\n');
             List<GameCommand> commands = new List<GameCommand>(lines.Length / 2);
@@ -906,7 +911,7 @@ namespace GrasscutterTools
             return commands;
         }
 
-        string GetCommandsText(List<GameCommand> commands)
+        private string GetCommandsText(List<GameCommand> commands)
         {
             StringBuilder builder = new StringBuilder();
             foreach (var cmd in commands)
@@ -917,7 +922,7 @@ namespace GrasscutterTools
             return builder.ToString();
         }
 
-        #endregion
+        #endregion - 命令记录 -
 
         #region - 远程 -
 
@@ -1080,7 +1085,6 @@ namespace GrasscutterTools
             MessageBox.Show(Resources.OpenCommandHelp, Resources.Help, MessageBoxButtons.OK, MessageBoxIcon.Information);
         }
 
-        #endregion
+        #endregion - 远程 -
-
     }
 }

Source/GrasscutterTools/FormTextMapBrowser.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
@@ -150,7 +149,8 @@ namespace GrasscutterTools
                     .Select(kv => new { Hash = kv.Key, Id = kv.Value, Text = data.TextMap[kv.Key] })
                     .Concat(
                         data.TextMap.Where(kv => r.Match(kv.Key).Success || r.Match(kv.Value).Success)
-                            .Select(kv => new {
+                            .Select(kv => new
+                            {
                                 Hash = kv.Key,
                                 Id = data.ManualTextMap.TryGetValue(kv.Key, out string id) ? id : "",
                                 Text = kv.Value
@@ -179,6 +179,5 @@ namespace GrasscutterTools
             if (e.KeyCode == Keys.Enter)
                 BtnSearch_Click(sender, e);
         }
-
     }
 }

Source/GrasscutterTools/Game/Gacha/BannerType.cs

@@ -1,10 +1,4 @@
-using System;
+namespace GrasscutterTools.Game.Gacha
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace GrasscutterTools.Game.Gacha
 {
     public enum BannerType
     {

Source/GrasscutterTools/Game/Gacha/GachaBanner.cs

@@ -117,6 +117,5 @@ namespace GrasscutterTools.Game.Gacha
         /// </summary>
         [JsonProperty("hardPity", DefaultValueHandling = DefaultValueHandling.Ignore), DefaultValue(90)]
         public int HardPity { get; set; } = 90;
-
     }
 }

Source/GrasscutterTools/Game/GameData.cs

@@ -52,6 +52,5 @@ namespace GrasscutterTools.Game
         public static ItemMap Ornaments { get; private set; }
 
         public static ItemMap GachaBannerPrefabs { get; private set; }
-
     }
 }

Source/GrasscutterTools/Game/ItemMap.cs

@@ -41,7 +41,6 @@ namespace GrasscutterTools.Game
         //List<int> IdList;
         //List<string> NameList;
 
-
         public int Count => Ids.Length;
 
         //public string this[int id] => IdMap[id];

Source/GrasscutterTools/Game/SetStatsCommand.cs

@@ -1,5 +1,4 @@
-using System.Collections.Generic;
+using System.Text;
-using System.Text;
 
 using GrasscutterTools.Properties;
 

Source/GrasscutterTools/Game/TextMapData.cs

@@ -1,9 +1,6 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 using Newtonsoft.Json;
 
@@ -22,7 +19,7 @@ namespace GrasscutterTools.Game
         public string[] TextMapFilePaths;
         public string[] TextMapFiles;
 
-        void LoadManualTextMap(string manualTextMapPath)
+        private void LoadManualTextMap(string manualTextMapPath)
         {
             using (var fs = File.OpenRead(manualTextMapPath))
             using (var sr = new StreamReader(fs))
@@ -41,7 +38,7 @@ namespace GrasscutterTools.Game
             }
         }
 
-        void LoadTextMaps(string textMapDirPath)
+        private void LoadTextMaps(string textMapDirPath)
         {
             TextMapFilePaths = Directory.GetFiles(textMapDirPath, "TextMap*.json");
             if (TextMapFilePaths.Length == 0)
@@ -65,6 +62,5 @@ namespace GrasscutterTools.Game
                 }
             }
         }
-
     }
 }

Source/GrasscutterTools/MultiLanguage.cs

@@ -3,9 +3,8 @@ using System.Windows.Forms;
 
 namespace GrasscutterTools
 {
-    static class MultiLanguage
+    internal static class MultiLanguage
     {
-
         public static string DefaultLanguage = "zh-CN";
 
         public static void SetDefaultLanguage(string lang)
@@ -16,7 +15,6 @@ namespace GrasscutterTools
             Properties.Settings.Default.Save();
         }
 
-
         /// <summary>
         /// 加载语言
         /// </summary>

Source/GrasscutterTools/OpenCommand/OpenCommandAPI.cs

@@ -95,7 +95,6 @@ namespace GrasscutterTools.OpenCommand
             public object Data { get; set; }
         }
 
-
         internal class InvokeException : Exception
         {
             public InvokeException(string message) : base(message)

Source/GrasscutterTools/Program.cs

@@ -1,18 +1,15 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace GrasscutterTools
 {
-    static class Program
+    internal static class Program
     {
         /// <summary>
         /// 应用程序的主入口点。
         /// </summary>
         [STAThread]
-        static void Main()
+        private static void Main()
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);

Source/GrasscutterTools/Utils/HttpHelper.cs

@@ -10,7 +10,7 @@ namespace GrasscutterTools.Utils
 {
     public static class HttpHelper
     {
-        static readonly HttpClient httpClient = new HttpClient();
+        private static readonly HttpClient httpClient = new HttpClient();
 
         static HttpHelper()
         {