variations loading via fnfc fix in progress

source/funkin/ui/debug/charting/handlers/ChartEditorImportExportHandler.hx

···
 import funkin.data.song.SongData.SongMetadata;
 import funkin.data.song.SongRegistry;
 import funkin.data.song.importer.ChartManifestData;
+import thx.semver.Version as SemverVersion;
 
 /**
  * Contains functions for importing, loading, saving, and exporting charts.
···
 
     ChartEditorAudioHandler.wipeInstrumentalData(state);
     ChartEditorAudioHandler.wipeVocalData(state);
-    state.stopExistingVocals();
 
-    var variations:Array<String> = state.availableVariations;
-    for (variation in variations)
+    for (variation in state.availableVariations)
     {
       if (variation == Constants.DEFAULT_VARIATION)
       {
···
    */
   public static function loadFromFNFC(state:ChartEditorState, bytes:Bytes):Null<Array<String>>
   {
-    var warnings:Array<String> = [];
+    var output:Array<String> = [];
 
-    var songMetadatas:Map<String, SongMetadata> = [];
-    var songChartDatas:Map<String, SongChartData> = [];
-
+    // Read the ZIP/.FNFC file, and create a map of entries.
     var fileEntries:Array<haxe.zip.Entry> = FileUtil.readZIPFromBytes(bytes);
     var mappedFileEntries:Map<String, haxe.zip.Entry> = FileUtil.mapZIPEntriesByName(fileEntries);
-
-    var manifestBytes:Null<Bytes> = mappedFileEntries.get('manifest.json')?.data;
-    if (manifestBytes == null) throw 'Could not locate manifest.';
-    var manifestString = manifestBytes.toString();
-    var manifest:Null<ChartManifestData> = ChartManifestData.deserialize(manifestString);
-    if (manifest == null) throw 'Could not read manifest.';
-
-    // Get the song ID.
-    var songId:String = manifest.songId;
+    var manifestString:String = mappedFileEntries.get('manifest.json')?.data?.toString() ?? throw 'Could not locate manifest.';
+    var manifest:ChartManifestData = ChartManifestData.deserialize(manifestString) ?? throw 'Could not read manifest.';
 
     var baseMetadataPath:String = manifest.getMetadataFileName();
-    var baseChartDataPath:String = manifest.getChartDataFileName();
-
-    var baseMetadataBytes:Null<Bytes> = mappedFileEntries.get(baseMetadataPath)?.data;
-    if (baseMetadataBytes == null) throw 'Could not locate metadata (default).';
-    var baseMetadataString:String = baseMetadataBytes.toString();
-    var baseMetadataVersion:Null<thx.semver.Version> = VersionUtil.getVersionFromJSON(baseMetadataString);
-    if (baseMetadataVersion == null) throw 'Could not read metadata version (default).';
+    var baseMetadataString:String = mappedFileEntries.get(baseMetadataPath)?.data?.toString() ?? throw 'Could not locate metadata (default).';
+    var baseMetadataVersion:SemverVersion = VersionUtil.getVersionFromJSON(baseMetadataString) ?? throw 'Could not read metadata version (default).';
+    var baseMetadata:SongMetadata = SongRegistry.instance.parseEntryMetadataRawWithMigration(baseMetadataString, baseMetadataPath,
+      baseMetadataVersion) ?? throw 'Could not read metadata (default).';
 
-    var baseMetadata:Null<SongMetadata> = SongRegistry.instance.parseEntryMetadataRawWithMigration(baseMetadataString, baseMetadataPath, baseMetadataVersion);
-    if (baseMetadata == null) throw 'Could not read metadata (default).';
+    var songMetadatas:Map<String, SongMetadata> = [];
     songMetadatas.set(Constants.DEFAULT_VARIATION, baseMetadata);
 
-    var baseChartDataBytes:Null<Bytes> = mappedFileEntries.get(baseChartDataPath)?.data;
-    if (baseChartDataBytes == null) throw 'Could not locate chart data (default).';
-    var baseChartDataString:String = baseChartDataBytes.toString();
-    var baseChartDataVersion:Null<thx.semver.Version> = VersionUtil.getVersionFromJSON(baseChartDataString);
-    if (baseChartDataVersion == null) throw 'Could not read chart data (default) version.';
+    var baseChartDataPath:String = manifest.getChartDataFileName();
+    var baseChartDataString:String = mappedFileEntries.get(baseChartDataPath)?.data?.toString() ?? throw 'Could not locate chart data (default).';
+    var baseChartDataVersion:SemverVersion = VersionUtil.getVersionFromJSON(baseChartDataString) ?? throw 'Could not read chart data version (default).';
+    var baseChartData:SongChartData = SongRegistry.instance.parseEntryChartDataRawWithMigration(baseChartDataString, baseChartDataPath,
+      baseChartDataVersion) ?? throw 'Could not read chart data (default).';
 
-    var baseChartData:Null<SongChartData> = SongRegistry.instance.parseEntryChartDataRawWithMigration(baseChartDataString, baseChartDataPath,
-      baseChartDataVersion);
-    if (baseChartData == null) throw 'Could not read chart data (default).';
+    var songChartDatas:Map<String, SongChartData> = [];
     songChartDatas.set(Constants.DEFAULT_VARIATION, baseChartData);
 
     var variationList:Array<String> = baseMetadata.playData.songVariations;
···
     for (variation in variationList)
     {
       var variMetadataPath:String = manifest.getMetadataFileName(variation);
-      var variChartDataPath:String = manifest.getChartDataFileName(variation);
-
-      var variMetadataBytes:Null<Bytes> = mappedFileEntries.get(variMetadataPath)?.data;
-      if (variMetadataBytes == null) throw 'Could not locate metadata ($variation).';
-      var variMetadataString:String = variMetadataBytes.toString();
-      var variMetadataVersion:Null<thx.semver.Version> = VersionUtil.getVersionFromJSON(variMetadataString);
-      if (variMetadataVersion == null) throw 'Could not read metadata ($variation) version.';
+      var variMetadataString:String = mappedFileEntries.get(variMetadataPath)?.data?.toString() ?? throw 'Could not locate metadata ($variation).';
+      var variMetadataVersion:SemverVersion = VersionUtil.getVersionFromJSON(variMetadataString) ?? throw 'Could not read metadata ($variation) version.';
+      var variMetadata:SongMetadata = SongRegistry.instance.parseEntryMetadataRawWithMigration(variMetadataString, variMetadataPath, variMetadataVersion,
+        variation) ?? throw 'Could not read metadata ($variation).';
 
-      var variMetadata:Null<SongMetadata> = SongRegistry.instance.parseEntryMetadataRawWithMigration(variMetadataString, variMetadataPath,
-        variMetadataVersion, variation);
-      if (variMetadata == null) throw 'Could not read metadata ($variation).';
       songMetadatas.set(variation, variMetadata);
 
-      var variChartDataBytes:Null<Bytes> = mappedFileEntries.get(variChartDataPath)?.data;
-      if (variChartDataBytes == null) throw 'Could not locate chart data ($variation).';
-      var variChartDataString:String = variChartDataBytes.toString();
-      var variChartDataVersion:Null<thx.semver.Version> = VersionUtil.getVersionFromJSON(variChartDataString);
-      if (variChartDataVersion == null) throw 'Could not read chart data version ($variation).';
+      var variChartDataPath:String = manifest.getChartDataFileName(variation);
+      var variChartDataString:String = mappedFileEntries.get(variChartDataPath)?.data?.toString() ?? throw 'Could not locate chart data ($variation).';
+      var variChartDataVersion:SemverVersion = VersionUtil.getVersionFromJSON(variChartDataString) ?? throw 'Could not read chart data version ($variation).';
+      var variChartData:SongChartData = SongRegistry.instance.parseEntryChartDataRawWithMigration(variChartDataString, variChartDataPath,
+        variChartDataVersion) ?? throw 'Could not read chart data ($variation).';
 
-      var variChartData:Null<SongChartData> = SongRegistry.instance.parseEntryChartDataRawWithMigration(variChartDataString, variChartDataPath,
-        variChartDataVersion);
-      if (variChartData == null) throw 'Could not read chart data ($variation).';
       songChartDatas.set(variation, variChartData);
     }
+    loadSong(state, songMetadatas, songChartDatas);
+
+    state.sortChartData();
 
     ChartEditorAudioHandler.wipeInstrumentalData(state);
     ChartEditorAudioHandler.wipeVocalData(state);
 
     // Load instrumentals
-    for (variation in [Constants.DEFAULT_VARIATION].concat(variationList))
+    for (variation in state.availableVariations)
     {
       var variMetadata:Null<SongMetadata> = songMetadatas.get(variation);
       if (variMetadata == null) continue;
 
       var instId:String = variMetadata?.playData?.characters?.instrumental ?? '';
-      var playerCharId:String = variMetadata?.playData?.characters?.player ?? Constants.DEFAULT_CHARACTER;
-      var opponentCharId:Null<String> = variMetadata?.playData?.characters?.opponent;
 
       var instFileName:String = manifest.getInstFileName(instId);
-      var instFileBytes:Null<Bytes> = mappedFileEntries.get(instFileName)?.data;
-      if (instFileBytes != null)
-      {
-        if (!ChartEditorAudioHandler.loadInstFromBytes(state, instFileBytes, instId))
-        {
-          throw 'Could not load instrumental ($instFileName).';
-        }
-      }
-      else
-      {
-        throw 'Could not find instrumental ($instFileName).';
-      }
+      var instFileBytes:Bytes = mappedFileEntries.get(instFileName)?.data ?? throw 'Could not locate instrumental ($instFileName).';
+      if (!ChartEditorAudioHandler.loadInstFromBytes(state, instFileBytes, instId)) throw 'Could not load instrumental ($instFileName).';
 
-      var playerVocalsFileName:String = manifest.getVocalsFileName(playerCharId);
+      var playerCharId:String = variMetadata?.playData?.characters?.player ?? Constants.DEFAULT_CHARACTER;
+      var playerVocalsFileName:String = manifest.getVocalsFileName(playerCharId, variation);
       var playerVocalsFileBytes:Null<Bytes> = mappedFileEntries.get(playerVocalsFileName)?.data;
       if (playerVocalsFileBytes != null)
       {
         if (!ChartEditorAudioHandler.loadVocalsFromBytes(state, playerVocalsFileBytes, playerCharId, instId))
         {
-          warnings.push('Could not parse vocals ($playerCharId).');
+          output.push('Could not parse vocals ($playerCharId).');
           // throw 'Could not parse vocals ($playerCharId).';
         }
       }
       else
       {
-        warnings.push('Could not find vocals ($playerVocalsFileName).');
+        output.push('Could not find vocals ($playerVocalsFileName).');
         // throw 'Could not find vocals ($playerVocalsFileName).';
       }
 
+      var opponentCharId:Null<String> = variMetadata?.playData?.characters?.opponent;
+
       if (opponentCharId != null)
       {
-        var opponentVocalsFileName:String = manifest.getVocalsFileName(opponentCharId);
+        var opponentVocalsFileName:String = manifest.getVocalsFileName(opponentCharId, variation);
         var opponentVocalsFileBytes:Null<Bytes> = mappedFileEntries.get(opponentVocalsFileName)?.data;
         if (opponentVocalsFileBytes != null)
         {
           if (!ChartEditorAudioHandler.loadVocalsFromBytes(state, opponentVocalsFileBytes, opponentCharId, instId))
           {
-            warnings.push('Could not parse vocals ($opponentCharId).');
+            output.push('Could not parse vocals ($opponentCharId).');
             // throw 'Could not parse vocals ($opponentCharId).';
           }
         }
         else
         {
-          warnings.push('Could not find vocals ($opponentVocalsFileName).');
+          output.push('Could not find vocals ($opponentVocalsFileName).');
           // throw 'Could not find vocals ($opponentVocalsFileName).';
         }
       }
···
     // Apply chart data.
     trace(songMetadatas);
     trace(songChartDatas);
-    loadSong(state, songMetadatas, songChartDatas);
 
     state.switchToCurrentInstrumental();
+    state.postLoadInstrumental();
+    state.refreshToolbox(ChartEditorState.CHART_EDITOR_TOOLBOX_METADATA_LAYOUT);
 
-    return warnings;
+    return output;
   }
 
   public static function getLatestBackupPath():Null<String>

source/funkin/util/assets/SoundUtil.hx

···
 import haxe.io.Bytes;
 import openfl.media.Sound as OpenFLSound;
 import funkin.audio.FunkinSound;
+import lime.media.AudioBuffer;
 
 class SoundUtil
 {
···
   {
     if (input == null) return null;
 
-    var openflSound:OpenFLSound = new OpenFLSound();
-    openflSound.loadCompressedDataFromByteArray(openfl.utils.ByteArray.fromBytes(input), input.length);
+    var openflSound:OpenFLSound = OpenFLSound.fromAudioBuffer(AudioBuffer.fromBytes(input));
     var output:FunkinSound = FunkinSound.load(openflSound, 1.0, false);
     return output;
   }