added tjson

Project.xml

@@ -22,7 +22,6 @@
 	<set name="BUILD_DIR" value="export/release" unless="debug" />
 
 	<source path="source" />
-
 	<assets path="assets" />
 	<assets path="mods" if="FUTURE_POLYMOD" />
 
@@ -40,6 +39,7 @@
 	<haxelib name="funkin.vis" />
 	<haxelib name="grig.audio" />
 
+	<haxelib name="tjson" />
 	<haxelib name="hscript" if="SIMPLE_SCRIPT" />
 	<haxelib name="polymod" if="FUTURE_POLYMOD" />
 	<haxelib name="hxcpp-debug-server" if="desktop debug" />

TODO.md

@@ -19,6 +19,7 @@
 * [ ] Discord Rich Presence Support
 * [ ] Sustain Notes + New song
 * [ ] Improve Chart Editor
+* [ ] Improve Note Assets
 * [ ] Silly Visualizer Option
 * [ ] Gameplay Modifiers
 * [ ] Noteskins

haxelibs.json

@@ -32,6 +32,10 @@
       "name": "hscript",
       "type": "haxelib"
     },
+    {
+      "name": "tjson",
+      "type": "haxelib"
+    },
     {
       "name": "funkin.vis",
       "type": "git",

source/backend/Achievements.hx

@@ -36,7 +36,7 @@ class Achievements {
 					if (achievementName != "") {
 						achievements.push(achievementName);
 						try {
-							Json.parse(Paths.getText(Paths.json('achievements/$achievementName')));
+							TJSON.parse(Paths.getText(Paths.json('achievements/$achievementName')));
 							trace("Achievement '" + achievement + "' loaded");
 						} catch (e:Dynamic) {
 							trace('Error loading achievement: $e');
@@ -104,7 +104,7 @@ class Achievements {
 	public static function showAchievement(ach:String, ?onFinish:Void->Void) {
 		var sprGroup:FlxSpriteGroup = new FlxSpriteGroup();
 
-		var coolAchieve:AchievementData = cast Json.parse(File.getContent(Paths.json('achievements/$ach')));
+		var coolAchieve:AchievementData = cast TJSON.parse(File.getContent(Paths.json('achievements/$ach')));
 
 		var achBG:FlxSprite = new FlxSprite(60, 50).makeGraphic(420, 120, FlxColor.BLACK);
 		achBG.scrollFactor.set();

source/backend/Localization.hx

@@ -53,7 +53,7 @@ class Localization {
 			jsonContent = Paths.getText(path(DEFAULT_LANGUAGE));
 		}
 
-		return Json.parse(jsonContent);
+		return TJSON.parse(jsonContent);
 	}
 
 	public static function switchLanguage(newLanguage:String) {

source/import.hx

@@ -28,6 +28,7 @@ import lime.app.Application;
 
 import haxe.*;
 import haxe.io.Path;
+import tjson.TJSON;
 
 #if sys
 import sys.*;

source/modding/Hscript.hx

@@ -104,6 +104,7 @@ class Hscript extends FlxBasic {
 		#if sys
 		setVariable('Sys', Sys);
 		#end
+		setVariable('TJSON', TJSON);
 		setVariable('Type', Type);
 		setVariable('Xml', Xml);
 

source/states/AchievementsState.hx

@@ -101,7 +101,7 @@ class AchievementsState extends ExtendableState {
 
 	function initAchievementData() {
 		for (i in 0...Achievements.achievements.length) {
-			var coolAchieve:AchievementData = cast Json.parse(File.getContent(Paths.json('achievements/' + Achievements.achievements[i])));
+			var coolAchieve:AchievementData = cast TJSON.parse(File.getContent(Paths.json('achievements/' + Achievements.achievements[i])));
 			achievementArray.push(coolAchieve);
 
 			var stringToUse:String = coolAchieve.name;

source/states/CreditsState.hx

@@ -38,7 +38,7 @@ class CreditsState extends ExtendableState {
 	override function create() {
 		super.create();
 
-		credData = Json.parse(Paths.getTextFromFile('credits.json'));
+		credData = TJSON.parse(Paths.getTextFromFile('credits.json'));
 
 		camFollow = new FlxObject(80, 0, 0, 0);
 		camFollow.screenCenter(X);

source/states/SongSelectState.hx

@@ -43,7 +43,7 @@ class SongSelectState extends ExtendableState {
 		Paths.clearStoredMemory();
 		Paths.clearUnusedMemory();
 
-		songListData = Json.parse(Paths.getTextFromFile('songs.json'));
+		songListData = TJSON.parse(Paths.getTextFromFile('songs.json'));
 
 		var bg:FlxSprite = new GameSprite().loadGraphic(Paths.image('menu/backgrounds/selector_bg'));
 		add(bg);
@@ -52,6 +52,10 @@ class SongSelectState extends ExtendableState {
 		grid.velocity.set(40, 40);
 		add(grid);
 
+		var bgPanel:FlxSprite = new FlxSprite(0, FlxG.height / 2).makeGraphic(FlxG.width, 760, FlxColor.BLACK);
+		bgPanel.alpha = 0.8;
+		add(bgPanel);
+
 		coverGrp = new FlxTypedGroup<Cover>();
 		add(coverGrp);