Revert "fix legacy plugin output (#1577)"

This reverts commit f5a87bb.

Author: stakira

OpenUtau.Core/Classic/Ust.cs

@@ -333,10 +333,8 @@ public static List<UNote> WritePlugin(UProject project, UVoicePart part, UNote f
             using (var writer = new StreamWriter(filePath, false, Encoding.GetEncoding(encoding))) {
                 WriteHeader(project, part, writer);
                 var position = 0;
-                var note_count = 0;
                 if (prev != null) {
-                    writer.WriteLine("[#PREV]");
-                    note_count += 1;
+                    writer.WriteLine($"[#PREV]");
                     WriteNoteBody(project, track, part, prev, writer);
                     position = prev.End;
                 }
@@ -349,8 +347,7 @@ public static List<UNote> WritePlugin(UProject project, UVoicePart part, UNote f
                     }
                     if (note.position > position) {
                         //Insert R note if there is space between two notes
-                        writer.WriteLine($"[#{note_count:D4}]");
-                        note_count += 1;
+                        writer.WriteLine($"[#{sequence.Count:D4}]");
                         var spacer = UNote.Create();
                         spacer.position = position;
                         spacer.duration = note.position - position;
@@ -359,8 +356,7 @@ public static List<UNote> WritePlugin(UProject project, UVoicePart part, UNote f
                         sequence.Add(spacer);
                         WriteNoteBody(project, track, part, spacer, writer);
                     }
-                    writer.WriteLine($"[#{note_count:D4}]");
-                    note_count += 1;
+                    writer.WriteLine($"[#{sequence.Count:D4}]");
                     WriteNoteBody(project, track, part, note, writer, forPlugin: true);
                     position = note.End;
                     sequence.Add(note);

OpenUtau.Core/Classic/UstNote.cs

@@ -94,7 +94,6 @@ public void Write(StreamWriter writer, bool forPlugin = false) {
                     writer.WriteLine($"@alias={alias}");
                 }
             }
-            writer.WriteLine("Envelope=5,0,0,100,100,100,100,%,35");
             WritePitch(writer);
             WriteVibrato(writer);
         }

OpenUtau.Test/Classic/PluginRunnerTest.cs

@@ -118,14 +118,12 @@ private static Action<StreamWriter, string> DoNothingResponse() {
 Lyric=R
 NoteNum=60
 PreUtterance=
-Envelope=5,0,0,100,100,100,100,%,35
-[#0001]
+[#0000]
 Length=20
 Lyric=ka
 NoteNum=0
 PreUtterance=
-Envelope=5,0,0,100,100,100,100,%,35
-[#0002]
+[#0001]
 Length=30
 Lyric=r
 NoteNum=0
@@ -134,25 +132,21 @@ private static Action<StreamWriter, string> DoNothingResponse() {
 Intensity=50
 Modulation=60
 Flags=g30B0H0P86
-Envelope=5,0,0,100,100,100,100,%,35
-[#0003]
+[#0002]
 Length=40
 Lyric=ta
 NoteNum=0
 PreUtterance=
-Envelope=5,0,0,100,100,100,100,%,35
-[#0004]
+[#0003]
 Length=50
 Lyric=na
 NoteNum=0
 PreUtterance=
-Envelope=5,0,0,100,100,100,100,%,35
 [#NEXT]
 Length=60
 Lyric=ha
 NoteNum=0
 PreUtterance=
-Envelope=5,0,0,100,100,100,100,%,35
 ";
                     // Different line feed code for each OS
                     var eol = Environment.NewLine;