wip implement moonchart

README.md

@@ -47,6 +47,7 @@ haxelib install flixel
 haxelib install flixel-addons
 haxelib install flixel-ui
 haxelib install hxvlc
+haxelib git moonchart https://github.com/MaybeMaru/moonchart
 haxelib git haxeui-openfl https://github.com/haxeui/haxeui-openfl
 haxelib git haxeui-core https://github.com/haxeui/haxeui-core
 haxelib git maru-hscript https://github.com/MaybeMaru/hscript-improved

actions/libraries.json

@@ -49,6 +49,13 @@
             "type": "install",
             "version": null
         },
+        {
+            "name": "moonchart",
+            "type": "git",
+            "dir": null,
+            "ref": "master",
+            "url": "https://github.com/MaybeMaru/moonchart"
+        },
         {
             "name": "maru-hscript",
             "type": "git",

project.xml

@@ -84,6 +84,7 @@
 	<haxelib name="haxeui-core" unless="mac"/>
 	<haxelib name="haxeui-openfl" unless="mac"/>
 	<haxelib name="maru-hscript"/>
+	<haxelib name="moonchart"/>
 
 	<section if="cpp">
 		<haxelib name="hxvlc" if="VIDEOS_ALLOWED"/>

source/funkin/objects/NotesGroup.hx

@@ -106,7 +106,8 @@ class NotesGroup extends Group
 		instance = this;
 		game = isPlayState ? PlayState.instance : null;
 		this.isPlayState = isPlayState;
-        SONG = Song.checkSong(song, null, false); //Double check null values
+        //SONG = Song.checkSong(song, null, false); //Double check null values
+		SONG = song;
 		curSong = SONG.song;
 
 		if (isPlayState) {

source/funkin/states/PlayState.hx

@@ -38,7 +38,7 @@ class PlayState extends MusicBeatState
 	private var targetCamPos:FlxPoint;
 	private static var prevCamFollow:FlxObject;
 
-	private var curSectionData:SectionJson;
+	private var curSectionData:Dynamic;
 
 	public var notesGroup:NotesGroup;
 	private var ratingGroup:RatingGroup;
@@ -140,7 +140,7 @@ class PlayState extends MusicBeatState
 		FlxG.cameras.setDefaultDrawTarget(camGame, true);
 		persistentUpdate = persistentDraw = true;
 
-		SONG = Song.checkSong(SONG, null, false);
+		//SONG = Song.checkSong(SONG, null, false);
 
 		#if discord_rpc
 		detailsText = isStoryMode ? 'Story Mode: ${storyWeek.toUpperCase()}' : 'Freeplay';
@@ -363,7 +363,8 @@ class PlayState extends MusicBeatState
 
 		Conductor.songPosition = -Conductor.crochet * 5;
 		Conductor.setPitch(Conductor.songPitch);
-		curSectionData = Song.checkSection(SONG.notes[0]);
+
+		curSectionData = SONG.notes[0];
 		cameraMovement();
 
 		if (skipCountdown) {

source/funkin/states/editors/ChartingState.hx

@@ -65,7 +65,7 @@ class ChartingState extends MusicBeatState
         camTop = new FlxCamera(); camTop.bgColor.alpha = 0;
         FlxG.cameras.add(camTop, false);
 
-        SONG = Song.checkSong(PlayState.SONG);
+        SONG = PlayState.SONG;
         notes = SONG.notes;
 
         Conductor.offset = Vector.fromArrayCopy(SONG.offsets);
@@ -737,17 +737,19 @@ class ChartingState extends MusicBeatState
 
     public function loadJson(song:String):Void {
         stop();
-		PlayState.SONG = Song.checkSong(Song.loadFromFile(PlayState.curDifficulty, song));
+		//PlayState.SONG = Song.checkSong(Song.loadFromFile(PlayState.curDifficulty, song));
+        PlayState.SONG = Song.loadFromFile(PlayState.curDifficulty, song);
 		FlxG.resetState();
 	}
 
     public function loadAutosave():Void {
-		PlayState.SONG = Song.checkSong(Song.parseJson('', autoSaveChart));
+		//PlayState.SONG = Song.checkSong(Song.parseJson('', autoSaveChart));
+        PlayState.SONG = Json.parse(autoSaveChart);//Song.parseJson('', autoSaveChart);
 		FlxG.resetState();
 	}
 
     public function autosaveSong():Void {
-		SONG = Song.checkSong(SONG);
+		//SONG = Song.checkSong(SONG);
 		autoSaveChart = getSongString();
 		SaveData.setSave('autoSaveChart', autoSaveChart);
 		SaveData.flushData();
@@ -767,18 +769,21 @@ class ChartingState extends MusicBeatState
 		}
     }
 
-    public function saveChart() {
-        SONG = Song.checkSong(SONG);
+    public inline function saveChart()
+    {
         saveJson(getSongString("\t"), PlayState.curDifficulty);
     }
 
     public function saveMeta()
     {
         var metaEvents:Array<SectionJson> = [];
         notes.fastForEach((section, i) -> {
-            metaEvents.push(section.sectionEvents.length <= 0 ? {} : {
-                sectionEvents: section.sectionEvents.copy()
-            });
+            if (section.sectionEvents.length > 0)
+            {
+                metaEvents.push(cast {
+                    sectionEvents: section.sectionEvents.copy()
+                });
+            }
         });
 
         if (metaEvents.length > 1) {
@@ -789,14 +794,12 @@ class ChartingState extends MusicBeatState
 				else 										break;
 			}
 		}
-        
-        final meta:SongMeta = {
+
+        saveJson({
             diffs: [PlayState.curDifficulty],
             offsets: SONG.offsets.copy(),
             events: metaEvents
-        }
-
-        saveJson(meta, "songMeta");
+        }, "songMeta");
     }
 
     override function getEvent(id:String, sender:Dynamic, data:Dynamic, ?params:Array<Dynamic>):Void

source/funkin/substates/NotesSubstate.hx

@@ -15,7 +15,8 @@ class NotesSubstate extends MusicBeatSubstate
         super(true, 0x98000000);
         this.position = position;
 
-        SONG = Song.checkSong(song);
+        //SONG = Song.checkSong(song);
+        SONG = song;
         notesGroup = new NotesGroup(SONG, false);
         notesGroup.skipStrumIntro = true;
         notesGroup.init(position - 50);

source/funkin/util/backend/SongZip.hx

@@ -2,8 +2,6 @@ package funkin.util.backend;
 
 import haxe.io.Path;
 import flixel.util.FlxArrayUtil;
-import funkin.util.song.formats.QuaFormat;
-import funkin.util.song.formats.OsuFormat;
 import funkin.states.editors.ModSetupState;
 
 enum ZipFormat {
@@ -78,7 +76,7 @@ class SongZip {
     }
 
     static final UNZIP_FORMAT:Map<String, UnZipType> = [
-        "osu" => {
+        /*"osu" => {
             getMap: function(chart) return cast new OsuFormat(chart),
             convert: function(map) return OsuFormat.convertSong("", map),
             title: "Title",
@@ -91,7 +89,7 @@ class SongZip {
             title: "Title",
             diff: "DifficultyName",
             audio: "AudioFile"
-        }
+        }*/
     ];
 
     static function unzipFormat(format:String, modPath:String, zipFiles:Array<String>) {