[F] RSL不再是static的，解决多实例冲突问题

Author: Starrah

generator/chu/C2sGenerator.cs

@@ -16,7 +16,7 @@ public class C2sGenerator : IGenerator<ChuChart>
         return (text, alerts);
     }
 
-    private static string Serialize(ChuChart chart, List<Alert> alerts)
+    private string Serialize(ChuChart chart, List<Alert> alerts)
     {
         chart.Sort();
 
@@ -68,7 +68,7 @@ private static string Serialize(ChuChart chart, List<Alert> alerts)
         return sb.ToString();
     }
 
-    private static List<string> allowedAirColors = ["DEF", "I"]; // TODO 搞清楚UGC里的'I'颜色，在C2S里，对应的字符串是什么
+    private static readonly List<string> allowedAirColors = ["DEF", "I"]; // TODO 搞清楚UGC里的'I'颜色，在C2S里，对应的字符串是什么
     private static string AirColorTag(ChuNote n)
     {
         if (allowedAirColors.Contains(n.Tag)) return n.Tag;

generator/chu/SusGenerator.cs

@@ -6,7 +6,7 @@ namespace MuConvert.chu;
 
 public class SusGenerator : IGenerator<ChuChart>
 {
-    private static int RSL = 480 * 4;
+    private int RSL = 480 * 4;
 
     public (string, List<Alert>) Generate(ChuChart chart)
     {
@@ -15,7 +15,7 @@ public class SusGenerator : IGenerator<ChuChart>
         return (text, alerts);
     }
 
-    private static string Serialize(ChuChart sus)
+    private string Serialize(ChuChart sus)
     {
         sus.Sort();
 

generator/chu/UgcGenerator.cs

@@ -7,7 +7,7 @@ namespace MuConvert.chu;
 
 public class UgcGenerator : IGenerator<ChuChart>
 {
-    private static int RSL = 480 * 4;
+    private int RSL = 480 * 4;
 
     public (string, List<Alert>) Generate(ChuChart chart)
     {
@@ -16,7 +16,7 @@ public class UgcGenerator : IGenerator<ChuChart>
         return (text, alerts);
     }
 
-    private static string Serialize(ChuChart ugc, List<Alert> alerts)
+    private string Serialize(ChuChart ugc, List<Alert> alerts)
     {
         ugc.Sort();
 

parser/chu/C2sParser.cs

@@ -13,7 +13,7 @@ namespace MuConvert.chu;
  */
 public class C2sParser: BaseChuParser
 {
-    private static int RSL = 384;
+    private int RSL = 384;
     private static readonly HashSet<string> HeadTags = new(StringComparer.OrdinalIgnoreCase)
         { "VERSION", "MUSIC", "SEQUENCEID", "DIFFICULT", "LEVEL", "CREATOR", "BPM_DEF", "MET_DEF", "RESOLUTION", "CLK_DEF", "PROGJUDGE_BPM", "PROGJUDGE_AER", "TUTORIAL" };
     private static readonly HashSet<string> TimingTags = new(StringComparer.OrdinalIgnoreCase)
@@ -59,7 +59,7 @@ public override (ChuChart, List<Alert>) Parse(string text)
         return (chart, alerts);
     }
 
-    private static void ParseHeader(string[] p, ChuChart chart)
+    private void ParseHeader(string[] p, ChuChart chart)
     {
         var tag = p[0].ToUpperInvariant();
         switch (tag)
@@ -71,7 +71,7 @@ private static void ParseHeader(string[] p, ChuChart chart)
         }
     }
 
-    private static void ParseTiming(string[] p, ChuChart chart)
+    private void ParseTiming(string[] p, ChuChart chart)
     {
         var tag = p[0].ToUpperInvariant();
         switch (tag)

parser/chu/SusParser.cs

@@ -13,7 +13,7 @@ namespace MuConvert.chu;
  */
 public class SusParser: BaseChuParser
 {
-    private static int RSL = 480 * 4;
+    private int RSL = 480 * 4;
 
     private static readonly Dictionary<int, string> TypeMap = new()
     {
@@ -71,7 +71,7 @@ private static bool IsHeaderLine(string content)
                || content.StartsWith("REQUEST ");
     }
 
-    private static void ParseHeaderLine(string content, ChuChart chart, List<Alert> alerts, int lineNum)
+    private void ParseHeaderLine(string content, ChuChart chart, List<Alert> alerts, int lineNum)
     {
         if (content.StartsWith("TITLE "))
         {
@@ -103,7 +103,7 @@ private static void ParseHeaderLine(string content, ChuChart chart, List<Alert>
         }
     }
 
-    private static void ParseNoteLine(string content, ChuChart chart, List<Alert> alerts, int lineNum)
+    private void ParseNoteLine(string content, ChuChart chart, List<Alert> alerts, int lineNum)
     {
         var colonIdx = content.IndexOf(':');
         if (colonIdx < 0)

parser/chu/UgcParser.cs

@@ -14,7 +14,7 @@ namespace MuConvert.chu;
  */
 public class UgcParser: BaseChuParser
 {
-    private static int RSL = 480 * 4;
+    private int RSL = 480 * 4;
     private int Version = 8;
 
     public override (ChuChart, List<Alert>) Parse(string text)
@@ -332,7 +332,7 @@ private int ParseNoteLine(string[] lines, int idx, ChuChart chart, List<Alert> a
         return idx;
     }
 
-    private static void ParseTapNote(string code, ChuNote note, List<Alert> alerts, int lineNum, ChuChart chart, bool isCHR)
+    private void ParseTapNote(string code, ChuNote note, List<Alert> alerts, int lineNum, ChuChart chart, bool isCHR)
     {
         note.Type = "TAP";
         ParseCellWidth(code, 1, note, alerts, lineNum, chart);
@@ -488,7 +488,7 @@ private static bool TryParseFollowerLine(string line, out string marker, out int
         return true;
     }
 
-    private static void ParseCellWidth(string code, int startIdx, ChuNote note, List<Alert> alerts, int lineNum, ChuChart chart)
+    private void ParseCellWidth(string code, int startIdx, ChuNote note, List<Alert> alerts, int lineNum, ChuChart chart)
     {
         if (code.Length > startIdx)
         {
@@ -579,7 +579,7 @@ private int ParseAirCrushNote(string[] lines, int idx, string code, ChuNote note
     }
 
     // ReSharper disable once UnusedParameter.Local
-    private static string FormatNoteRef(ChuNote note, string code)
+    private string FormatNoteRef(ChuNote note, string code)
     {
         var (m, o) = Utils.BarAndTick(note.Time, RSL);
         return $"#{m}'{o}:{code}";