some changes lol

Improved moonchart format detection
Optimized some unnnecesary array instances on script calls
Added song backup vocals
Removed haxeui cuz meh i dont think ill ever take the time to actually use it lol

README.md

@@ -48,8 +48,6 @@ 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
 haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc
 ```

actions/libraries.json

@@ -25,20 +25,6 @@
             "type": "install",
             "version": null
         },
-        {
-            "name": "haxeui-openfl",
-            "type": "git",
-            "dir": null,
-            "ref": "master",
-            "url": "https://github.com/haxeui/haxeui-openfl"
-        },
-        {
-            "name": "haxeui-core",
-            "type": "git",
-            "dir": null,
-            "ref": "master",
-            "url": "https://github.com/haxeui/haxeui-core"
-        },
         {
             "name": "hxcpp-debug-server",
             "type": "install",

project.xml

@@ -77,8 +77,6 @@
 	<haxelib name="flixel"/>
 	<haxelib name="flixel-ui"/>
 	<haxelib name="flixel-addons"/>
-	<haxelib name="haxeui-core" unless="mac"/>
-	<haxelib name="haxeui-openfl" unless="mac"/>
 	<haxelib name="maru-hscript"/>
 	<haxelib name="moonchart"/>
 

source/FPS_Mem.hx

@@ -18,8 +18,6 @@ import memory.Memory;
 
 class FPS_Mem extends TextField
 {
-	private var times:Array<Float>;
-
 	public function new(X:Float = 10.0, Y:Float = 10.0, Color:Int = 0x000000) 
 	{
 		super();
@@ -31,7 +29,6 @@ class FPS_Mem extends TextField
 		defaultTextFormat = new TextFormat("_sans", 12, Color);
 
 		text = "FPS: ";
-		times = [];
 
 		addEventListener(Event.ENTER_FRAME, onEnter);
 		addEventListener(Event.ADDED_TO_STAGE, create);
@@ -45,6 +42,7 @@ class FPS_Mem extends TextField
     }
 
 	function onResize(_):Void {
+		lastTime = Timer.stamp();
         final _scale = Math.min(FlxG.stage.stageWidth / FlxG.width, FlxG.stage.stageHeight / FlxG.height);
         scaleX = _scale;
         scaleY = _scale;
@@ -60,28 +58,36 @@ class FPS_Mem extends TextField
 	}
 
 	var memPeak:Float = 0;
+	var lastTime:Float = 0;
+
+	var timeFrame:Float = 0;
+	var frames:Int = 0;
 
 	private function onEnter(_):Void
 	{
 		if (!visible)
 			return;
 
 		final now = Timer.stamp();
-		times.push(now);
+		timeFrame += (now - lastTime);
+		frames++;
 
-		while (times[0] < now - 1)
-			times.shift();
+		if (timeFrame >= (1 / 6))
+		{
+			final fps = Std.int(frames / timeFrame);
+			final bytes = #if (cpp && !mobile) Memory.getCurrentUsage(); #else System.totalMemory; #end
+			final memCur = formatBytes(bytes);
 
-		final fps:Int = times.length;
+			if (memCur > memPeak)
+				memPeak = memCur;
 
-		final bytes = #if (cpp && !mobile) Memory.getCurrentUsage(); #else System.totalMemory; #end
-		final memCur = formatBytes(bytes);
+			text = 'FPS: ${Math.min(fps, FlxG.updateFramerate)}\nRAM: $memCur mb/$memPeak mb';
 
-		if (memCur > memPeak)
-			memPeak = memCur;
+			frames = 0;
+			while (timeFrame > 0)
+				timeFrame = timeFrame - (1 / 6);
+		}
 
-		text =
-		'FPS: ${fps > FlxG.updateFramerate ? FlxG.updateFramerate : fps}\n' +
-		'RAM: $memCur mb/$memPeak mb';
+		lastTime = now;
 	}
 }

source/Main.hx

@@ -6,10 +6,6 @@ import openfl.events.UncaughtErrorEvent;
 import openfl.Lib;
 import openfl.display.Sprite;
 import openfl.events.Event;
-#if !mac
-import haxe.ui.Toolkit;
-import haxe.ui.locale.LocaleManager;
-#end
 
 class InitState extends FlxState
 {
@@ -89,14 +85,9 @@ class Main extends Sprite
 		if (hasEventListener(Event.ADDED_TO_STAGE))
 			removeEventListener(Event.ADDED_TO_STAGE, init);
 
-		#if !mac
-		// Init haxeui
-		Toolkit.theme = "dark";
-		Toolkit.init();
-		#end
-
-		// TODO: Only spanish and portuguese exist
-		//LocaleManager.instance.language;
+		moonchart.backend.FormatDetector.defaultFileFormatter = (title, diff) -> {
+			return [diff.trim().toLowerCase()];
+		}
 
 		setupGame();
 	}

source/funkin/objects/Character.hx

@@ -230,15 +230,23 @@ class Character extends FlxSpriteExt
 		__superUpdate(elapsed);
 	}
 
-	public function prepareCamPoint(?point:Null<FlxPoint>, ?bounds:Array<Float>)
+	public function getCamPoint(?point:Null<FlxPoint>):FlxPoint
 	{
-		point = getMidpoint(point);
-
+		point ??= FlxPoint.get();
+		point.set(width * 0.5, height * 0.5);
 		point.subtract(camOffsets.x * (flippedOffsets ? -1 : 1), camOffsets.y);
 		point.subtract(stageCamOffsets.x, stageCamOffsets.y);
-		
+
 		if (flippedOffsets)
 			point.add((width * (isPlayerJson ? 0.25 : -(0.25 / 2))), 0);
+
+		return point;
+	}
+
+	public function prepareCamPoint(?point:Null<FlxPoint>, ?bounds:Array<Float>)
+	{
+		point = getCamPoint(point);
+		point.add(x, y);
 
 		if (bounds != null) {
 			point.x = FlxMath.bound(point.x, bounds[0], bounds[2]);