From 4b328335c6ef868ff17874dd3b603dc1adfb27ad Mon Sep 17 00:00:00 2001
From: Joalor64 <rhgarcon@gmail.com>
Date: Thu, 16 Jan 2025 08:49:41 -0500
Subject: [PATCH] added tjson

---
 Project.xml                        | 2 +-
 TODO.md                            | 1 +
 haxelibs.json                      | 4 ++++
 source/backend/Achievements.hx     | 4 ++--
 source/backend/Localization.hx     | 2 +-
 source/import.hx                   | 1 +
 source/modding/Hscript.hx          | 1 +
 source/states/AchievementsState.hx | 2 +-
 source/states/CreditsState.hx      | 2 +-
 source/states/SongSelectState.hx   | 6 +++++-
 10 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/Project.xml b/Project.xml
index b2678ef..395d808 100644
--- a/Project.xml
+++ b/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" />
diff --git a/TODO.md b/TODO.md
index 1102762..06923f7 100644
--- a/TODO.md
+++ b/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
\ No newline at end of file
diff --git a/haxelibs.json b/haxelibs.json
index ead3ebc..44c23ea 100644
--- a/haxelibs.json
+++ b/haxelibs.json
@@ -32,6 +32,10 @@
       "name": "hscript",
       "type": "haxelib"
     },
+    {
+      "name": "tjson",
+      "type": "haxelib"
+    },
     {
       "name": "funkin.vis",
       "type": "git",
diff --git a/source/backend/Achievements.hx b/source/backend/Achievements.hx
index 94ec062..c0d1cb5 100644
--- a/source/backend/Achievements.hx
+++ b/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();
diff --git a/source/backend/Localization.hx b/source/backend/Localization.hx
index 0e1c7dd..d88ea79 100644
--- a/source/backend/Localization.hx
+++ b/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) {
diff --git a/source/import.hx b/source/import.hx
index 92d2c1e..fa182b7 100644
--- a/source/import.hx
+++ b/source/import.hx
@@ -28,6 +28,7 @@ import lime.app.Application;
 
 import haxe.*;
 import haxe.io.Path;
+import tjson.TJSON;
 
 #if sys
 import sys.*;
diff --git a/source/modding/Hscript.hx b/source/modding/Hscript.hx
index 2d900e6..dac639e 100644
--- a/source/modding/Hscript.hx
+++ b/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);
 
diff --git a/source/states/AchievementsState.hx b/source/states/AchievementsState.hx
index 84c40d0..9cf1a8a 100644
--- a/source/states/AchievementsState.hx
+++ b/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;
diff --git a/source/states/CreditsState.hx b/source/states/CreditsState.hx
index 78e6706..59137f7 100644
--- a/source/states/CreditsState.hx
+++ b/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);
diff --git a/source/states/SongSelectState.hx b/source/states/SongSelectState.hx
index 0158813..948af7a 100644
--- a/source/states/SongSelectState.hx
+++ b/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);