Libraries update

Raltyro · Raltyro · commit 8fc068e71802 · 2026-03-29T09:06:15.000+07:00
diff --git a/building/libs.xml b/building/libs.xml
@@ -20,7 +20,7 @@
 		<!-- Other Libraries -->
 		<git name="hxdiscord_rpc" url="https://github.com/CodenameCrew/cne-hxdiscord_rpc" skipDeps="true"/>
 		<lib name="funkin-modchart" version="1.2.4" skipDeps="true"/>
-		<lib name="hxvlc" version="2.2.5" skipDeps="true"/>
+		<lib name="hxvlc" skipDeps="true"/>
 		<lib name="hxcpp-debug-server"/>
 		<lib name="format"/>
 		<lib name="markdown"/>
diff --git a/project.xml b/project.xml
@@ -186,8 +186,13 @@
 	<haxedef name="SOFTCODED_CLASSES" if="SOFTCODED_CLASSES"/>
 	<haxedef name="USE_ADAPTED_ASSETS" if="USE_ADAPTED_ASSETS"/>
 
-	<!-- EXPERMENTAL FEATURES -->
-	<haxedef name="EXPERIMENTAL_FLXGRAPHIC_DESTROY_FIX" />
+	<!-- Backward Compatibilities -->
+	<haxedef name="FLX_HEALTH" />
+
+	<haxedef name="FLX_NO_FOCUS_LOST_SCREEN"/>
+	<haxedef name="FLX_NO_DEBUG" unless="debug"/>
+
+	<haxedef name="DISCORD_DISABLE_IO_THREAD" if="DISCORD_RPC"/>
 
 	<!-- <haxedef name="no-deprecation-warnings"/> -->
 
@@ -207,19 +212,17 @@
 
 	<haxeflag name="--macro" value="funkin.backend.system.macros.BuildInfo.printBuildInfo()"/>
 
+	<!-- EXPERMENTAL FEATURES -->
+	<haxedef name="EXPERIMENTAL_FLXGRAPHIC_DESTROY_FIX" />
 	<haxedef name="openfl_dpi_aware"/>
 	<haxedef name="openfl_pool_events"/>
 	<haxedef name="openfl-enable-handle-error"/>
 	<haxedef name="openfl_no_custom_render_event"/>
 
-	<haxedef name="DISCORD_DISABLE_IO_THREAD" if="DISCORD_RPC"/>
-
-	<haxedef name="FLX_NO_FOCUS_LOST_SCREEN"/>
-	<haxedef name="FLX_NO_DEBUG" unless="debug"/>
-
 	<haxedef name="HXCPP_M32" if="32bit"/>
 	<haxedef name="HXCPP_DEBUG_LINK" if="debug"/>
-	<haxedef name="HXCPP_CPP20"/>
+	<!--C++20 seems doesn't seem to do anything but causes compile warnings-->
+	<!--<haxedef name="HXCPP_CPP20"/>-->
 	<!--<haxedef name="HXCPP_CLANG"/>-->
 	<!--<haxedef name="HXCPP_MSVC"/>-->
 	<!-- This seems to causes more harm, but to be fair, its mostly because of text rendering -->
diff --git a/source/funkin/backend/system/Flags.hx b/source/funkin/backend/system/Flags.hx
@@ -314,11 +314,11 @@ class Flags {
 		if (SUSTAINS_AS_ONE_NOTE == null) SUSTAINS_AS_ONE_NOTE = MOD_API_VERSION >= 2;
 		if (DEFAULT_GLSL_VERSION == null) {
 			if (MOD_API_VERSION < 2) {
-				DEFAULT_GLSL_VERSION = "120";
+				DEFAULT_GLSL_VERSION = #if (android || mac || web) "100" #else "120" #end;
 				Logs.warn("Blend Mode Extensions won't work in MOD_API_VERSION below than 2");
 			}
 			else {
-				DEFAULT_GLSL_VERSION = openfl.display.Shader.getDefaultGLVersion();
+				DEFAULT_GLSL_VERSION = openfl.utils.GLSLSourceAssembler.getDefaultVersion();
 			}
 		}
 	}
diff --git a/source/funkin/backend/system/FunkinGame.hx b/source/funkin/backend/system/FunkinGame.hx
@@ -8,13 +8,12 @@ class FunkinGame extends FlxGame {
 		super.switchState();
 		// draw once to put all images in gpu then put the last update time to now to prevent lag spikes or whatever
 		draw();
-		_total = ticks = getTicks();
+		ticks = getTicks();
 		skipNextTickUpdate = true;
 	}
 
-	public override function onEnterFrame(t) {
-		if (skipNextTickUpdate != (skipNextTickUpdate = false))
-			_total = ticks = getTicks();
-		super.onEnterFrame(t);
+	override function __enterFrame(deltaTime:Float) {
+		if (skipNextTickUpdate != (skipNextTickUpdate = false)) ticks = getTicks();
+		super.__enterFrame(deltaTime);
 	}
 }
diff --git a/source/funkin/backend/system/Main.hx b/source/funkin/backend/system/Main.hx
@@ -97,16 +97,10 @@ class Main extends Sprite
 	// DEPRECATED
 	@:dox(hide) public static function execAsync(func:Void->Void) ThreadUtil.execAsync(func);
 
-	private static function getTimer():Int {
-		return time = Lib.getTimer();
-	}
-
 	public static function loadGameSettings() {
 		WindowUtils.init();
 		SaveWarning.init();
 		MemoryUtil.init();
-		@:privateAccess
-		FlxG.game.getTimer = getTimer;
 		FunkinCache.init();
 		Paths.assetsTree = new AssetsLibraryList();
 
diff --git a/source/funkin/backend/system/OptimizedBitmapData.hx b/source/funkin/backend/system/OptimizedBitmapData.hx
@@ -1,38 +1,14 @@
 package funkin.backend.system;
 
 import lime.graphics.Image;
-import lime.graphics.cairo.CairoImageSurface;
 import openfl.display.BitmapData;
-import openfl.geom.Rectangle;
-import openfl.utils.BitmapDataUtil;
 
-@:deprecated("Use openfl.utils.BitmapDataUtil.toHardware instead.")
+@:deprecated("Use openfl.display.BitmapData.toHardware instead.")
 class OptimizedBitmapData extends BitmapData {
 	@SuppressWarnings("checkstyle:Dynamic")
 	@:noCompletion private override function __fromImage(image:#if lime Image #else Dynamic #end):Void
 	{
-		#if lime
-		if (image != null && image.buffer != null)
-		{
-			this.image = image;
-
-			width = image.width;
-			height = image.height;
-			rect = new Rectangle(0, 0, image.width, image.height);
-
-			__textureWidth = width;
-			__textureHeight = height;
-
-			#if sys
-			image.format = BGRA32;
-			image.premultiplied = true;
-			#end
-
-			__isValid = true;
-			readable = true;
-
-			BitmapDataUtil.toHardware(this);
-		}
-		#end
+		super.__fromImage(image);
+		toHardware();
 	}
 }
diff --git a/source/funkin/backend/system/framerate/AssetTreeInfo.hx b/source/funkin/backend/system/framerate/AssetTreeInfo.hx
@@ -14,7 +14,7 @@ class AssetTreeInfo extends FramerateCategory {
 		super("Asset Libraries Tree Info");
 	}
 
-	public override function __enterFrame(t:Int) {
+	public override function __enterFrame(t:Float) {
 		if (alpha <= 0.05) return;
 
 		if ((lastUpdateTime += FlxG.rawElapsed) < 1)
diff --git a/source/funkin/backend/system/framerate/ConductorInfo.hx b/source/funkin/backend/system/framerate/ConductorInfo.hx
@@ -5,7 +5,7 @@ class ConductorInfo extends FramerateCategory {
 		super("Conductor Info");
 	}
 
-	public override function __enterFrame(t:Int) {
+	public override function __enterFrame(t:Float) {
 		if (alpha <= 0.05) return;
 		_text = 'Current Song Position: ${Math.floor(Conductor.songPosition * 1000) / 1000}';
 		_text += '\n - ${Conductor.curBeat} beats';
diff --git a/source/funkin/backend/system/framerate/FlixelInfo.hx b/source/funkin/backend/system/framerate/FlixelInfo.hx
@@ -7,7 +7,7 @@ class FlixelInfo extends FramerateCategory {
 		super("Flixel Info");
 	}
 
-	public override function __enterFrame(t:Int) {
+	public override function __enterFrame(t:Float) {
 		if (alpha <= 0.05) return;
 
 
diff --git a/source/funkin/backend/system/framerate/Framerate.hx b/source/funkin/backend/system/framerate/Framerate.hx
@@ -100,7 +100,7 @@ class Framerate extends Sprite {
 
 
 	var debugAlpha:Float = 0;
-	public override function __enterFrame(t:Int) {
+	public override function __enterFrame(t:Float) {
 		alpha = CoolUtil.fpsLerp(alpha, debugMode > 0 ? 1 : 0, 0.5);
 		debugAlpha = CoolUtil.fpsLerp(debugAlpha, debugMode > 1 ? 1 : 0, 0.5);
 
diff --git a/source/funkin/backend/system/framerate/FramerateCategory.hx b/source/funkin/backend/system/framerate/FramerateCategory.hx
@@ -42,7 +42,7 @@ class FramerateCategory extends Sprite {
 
 	public function reload() {}
 
-	public override function __enterFrame(t:Int) {
+	public override function __enterFrame(t:Float) {
 		if (alpha <= 0.05) return;
 		super.__enterFrame(t);
 
diff --git a/source/funkin/backend/system/framerate/FramerateCounter.hx b/source/funkin/backend/system/framerate/FramerateCounter.hx
@@ -38,7 +38,7 @@ class FramerateCounter extends Sprite {
 		lastUpdateTime = 0;
 	}
 
-	public override function __enterFrame(t:Int) {
+	public override function __enterFrame(t:Float) {
 		if (alpha <= 0.05) return;
 
 		super.__enterFrame(t);
diff --git a/source/funkin/backend/system/framerate/MemoryCounter.hx b/source/funkin/backend/system/framerate/MemoryCounter.hx
@@ -32,7 +32,7 @@ class MemoryCounter extends Sprite {
 
 	public function reload() {}
 
-	public override function __enterFrame(t:Int) {
+	public override function __enterFrame(t:Float) {
 		if (alpha <= 0.05) return;
 		super.__enterFrame(t);
 
diff --git a/source/funkin/backend/system/framerate/StatsInfo.hx b/source/funkin/backend/system/framerate/StatsInfo.hx
@@ -9,7 +9,7 @@ class StatsInfo extends FramerateCategory {
 		super("Asset Libraries Tree Info");
 	}
 
-	public override function __enterFrame(t:Int) {
+	public override function __enterFrame(t:Float) {
 		if (alpha <= 0.05) return;
 		_text = "totalDC: " + Context3DStats.totalDrawCalls();
 		_text += "\nstageDC: " + Context3DStats.contextDrawCalls(DrawCallContext.STAGE);
diff --git a/source/funkin/backend/system/framerate/SystemInfo.hx b/source/funkin/backend/system/framerate/SystemInfo.hx
@@ -169,7 +169,7 @@ class SystemInfo extends FramerateCategory {
 		super("System Info");
 	}
 
-	public override function __enterFrame(t:Int) {
+	public override function __enterFrame(t:Float) {
 		if (alpha <= 0.05) return;
 
 		_text = __formattedSysText;
diff --git a/source/funkin/editors/SaveSubstate.hx b/source/funkin/editors/SaveSubstate.hx
@@ -2,6 +2,9 @@ package funkin.editors;
 
 import haxe.io.Path;
 import lime.ui.FileDialog;
+#if lime_funkin
+import lime.ui.FileDialogFilter;
+#end
 
 class SaveSubstate extends MusicBeatSubstate {
 	public var saveOptions:Map<String, Bool>;
@@ -26,13 +29,21 @@ class SaveSubstate extends MusicBeatSubstate {
 	public override function create() {
 		super.create();
 
+		#if lime_funkin
+		FileDialog.saveFile(FlxG.stage.window, "Save File", (fileName:String, activeFilter:FileDialogFilter) -> {
+			CoolUtil.safeSaveFile(fileName, data);
+			close();
+		}, [new FileDialogFilter("Specified File Extension", options.saveExt.getDefault(Path.extension(options.defaultSaveFile)))],
+			options.defaultSaveFile);
+		#else
 		var fileDialog = new FileDialog();
 		fileDialog.onCancel.add(function() close());
 		fileDialog.onSelect.add(function(str) {
 			CoolUtil.safeSaveFile(str, data);
 			close();
 		});
 		fileDialog.browse(SAVE, options.saveExt.getDefault(Path.extension(options.defaultSaveFile)), options.defaultSaveFile);
+		#end
 	}
 
 	public override function update(elapsed:Float) {
diff --git a/source/funkin/editors/ui/UIFileExplorer.hx b/source/funkin/editors/ui/UIFileExplorer.hx
@@ -2,6 +2,9 @@ package funkin.editors.ui;
 
 import haxe.io.Bytes;
 import lime.ui.FileDialog;
+#if lime_funkin
+import lime.ui.FileDialogFilter;
+#end
 
 class UIFileExplorer extends UISliceSprite {
 	public var uploadButton:UIButton;
@@ -24,10 +27,16 @@ class UIFileExplorer extends UISliceSprite {
 
 		if (onFile != null) this.onFile = onFile;
 
-		uploadButton = new UIButton(x + 8, y+ 8, null, function () {
+		uploadButton = new UIButton(x + 8, y + 8, null, function () {
+			#if lime_funkin
+			FileDialog.openFile(FlxG.stage.window, "Open File", (fileNames:Array<String>, activeFilter:FileDialogFilter) -> {
+				loadFile(fileNames[0]);
+			}, this.fileType != null ? [new FileDialogFilter("Specified File Extension", this.fileType)] : null);
+			#else
 			var fileDialog = new FileDialog();
 			fileDialog.onSelect.add(loadFile);
 			fileDialog.browse(OPEN, this.fileType);
+			#end
 		}, bWidth - 16, bHeight - 16);
 		members.push(uploadButton);
 

Original file line number	Diff line number	Diff line change
`@@ -314,11 +314,11 @@ class Flags {`
`314`	`314`	`if (SUSTAINS_AS_ONE_NOTE == null) SUSTAINS_AS_ONE_NOTE = MOD_API_VERSION >= 2;`
`315`	`315`	`if (DEFAULT_GLSL_VERSION == null) {`
`316`	`316`	`if (MOD_API_VERSION < 2) {`
`317`		`- DEFAULT_GLSL_VERSION = "120";`
	`317`	`+ DEFAULT_GLSL_VERSION = #if (android \|\| mac \|\| web) "100" #else "120" #end;`
`318`	`318`	`Logs.warn("Blend Mode Extensions won't work in MOD_API_VERSION below than 2");`
`319`	`319`	`}`
`320`	`320`	`else {`
`321`		`- DEFAULT_GLSL_VERSION = openfl.display.Shader.getDefaultGLVersion();`
	`321`	`+ DEFAULT_GLSL_VERSION = openfl.utils.GLSLSourceAssembler.getDefaultVersion();`
`322`	`322`	`}`
`323`	`323`	`}`
`324`	`324`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,13 +8,12 @@ class FunkinGame extends FlxGame {`
`8`	`8`	`super.switchState();`
`9`	`9`	`// draw once to put all images in gpu then put the last update time to now to prevent lag spikes or whatever`
`10`	`10`	`draw();`
`11`		`- _total = ticks = getTicks();`
	`11`	`+ ticks = getTicks();`
`12`	`12`	`skipNextTickUpdate = true;`
`13`	`13`	`}`
`14`	`14`
`15`		`- public override function onEnterFrame(t) {`
`16`		`- if (skipNextTickUpdate != (skipNextTickUpdate = false))`
`17`		`- _total = ticks = getTicks();`
`18`		`- super.onEnterFrame(t);`
	`15`	`+ override function __enterFrame(deltaTime:Float) {`
	`16`	`+ if (skipNextTickUpdate != (skipNextTickUpdate = false)) ticks = getTicks();`
	`17`	`+ super.__enterFrame(deltaTime);`
`19`	`18`	`}`
`20`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class AssetTreeInfo extends FramerateCategory {`
`14`	`14`	`super("Asset Libraries Tree Info");`
`15`	`15`	`}`
`16`	`16`
`17`		`- public override function __enterFrame(t:Int) {`
	`17`	`+ public override function __enterFrame(t:Float) {`
`18`	`18`	`if (alpha <= 0.05) return;`
`19`	`19`
`20`	`20`	`if ((lastUpdateTime += FlxG.rawElapsed) < 1)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ class ConductorInfo extends FramerateCategory {`
`5`	`5`	`super("Conductor Info");`
`6`	`6`	`}`
`7`	`7`
`8`		`- public override function __enterFrame(t:Int) {`
	`8`	`+ public override function __enterFrame(t:Float) {`
`9`	`9`	`if (alpha <= 0.05) return;`
`10`	`10`	`_text = 'Current Song Position: ${Math.floor(Conductor.songPosition * 1000) / 1000}';`
`11`	`11`	`_text += '\n - ${Conductor.curBeat} beats';`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ class FlixelInfo extends FramerateCategory {`
`7`	`7`	`super("Flixel Info");`
`8`	`8`	`}`
`9`	`9`
`10`		`- public override function __enterFrame(t:Int) {`
	`10`	`+ public override function __enterFrame(t:Float) {`
`11`	`11`	`if (alpha <= 0.05) return;`
`12`	`12`
`13`	`13`