Merge remote-tracking branch 'public/main'

source/funkin/game/Stage.hx

@@ -2,6 +2,7 @@ package funkin.game;
 
 import flixel.FlxState;
 import flixel.math.FlxPoint;
+import funkin.backend.scripting.DummyScript;
 import funkin.backend.scripting.Script;
 import funkin.backend.scripting.events.StageNodeEvent;
 import funkin.backend.scripting.events.StageXMLEvent;
@@ -18,6 +19,7 @@ class Stage extends FlxBasic implements IBeatReceiver {
 	public var stageScript:Script;
 	public var state:FlxState;
 	public var characterPoses:Map<String, StageCharPos> = [];
+	public var xmlImportedScripts:Map<String, Bool> = [];
 
 	private var spritesParentFolder = "";
 
@@ -45,6 +47,7 @@ class Stage extends FlxBasic implements IBeatReceiver {
 			stageScript.load();
 		}
 
+		var event = null;
 		if (stageXML != null) {
 			if (PlayState.instance != null) {
 				var parsed:Null<Float>;
@@ -68,8 +71,8 @@ class Stage extends FlxBasic implements IBeatReceiver {
 			}
 
 			if (PlayState.instance != null) {
-				var event = PlayState.instance.scripts.event("onStageXMLParsed", EventManager.get(StageXMLEvent).recycle(this, stageXML, elems));
-				elems = event.elems;
+				event = EventManager.get(StageXMLEvent).recycle(this, stageXML, elems);
+				elems = PlayState.instance.scripts.event("onStageXMLParsed", event).elems;
 			}
 
 			for(node in elems) {
@@ -86,7 +89,7 @@ class Stage extends FlxBasic implements IBeatReceiver {
 						state.add(spr);
 						spr;
 					case "box" | "solid":
-						if ( !node.has.name || !node.has.width || !node.has.height) continue;
+						if (!node.has.name || !node.has.width || !node.has.height) continue;
 
 						var spr = new FlxSprite(
 							(node.has.x) ? Std.parseFloat(node.att.x).getDefault(0) : 0,
@@ -134,6 +137,22 @@ class Stage extends FlxBasic implements IBeatReceiver {
 						);
 						PlayState.instance.add(PlayState.instance.comboGroup);
 						PlayState.instance.comboGroup;
+					case "use-extension" | "extension" | "ext":
+						if (!node.has.script || PlayState.instance == null) continue;
+
+						var folder = node.getAtt("folder").getDefault("data/scripts/");
+						if (!folder.endsWith("/")) folder += "/";
+
+						var path = Paths.script(folder + node.getAtt("script"));
+						var daScript = Script.create(path);
+						if (daScript is DummyScript) Logs.trace('Script at ${path} does not exist.', ERROR);
+						else {
+							xmlImportedScripts.set(path, node.getAtt("isShortLived") == "true");
+							PlayState.instance.scripts.add(daScript);
+							daScript.load();
+						}
+
+						null;
 					default: null;
 				}
 
@@ -173,8 +192,20 @@ class Stage extends FlxBasic implements IBeatReceiver {
 			});
 
 		if (PlayState.instance == null) return;
-		for(k=>e in stageSprites) {
+
+		for (k=>e in stageSprites)
 			stageScript.set(k, e);
+
+		// idk lemme check anyways just in case scripts did smth  - Nex
+		if (event != null) PlayState.instance.scripts.event("onPostStageCreation", event);
+
+		// shortlived scripts destroy when the stage finishes setting up  - Nex
+		for (p=>b in xmlImportedScripts) if (b) {
+			var script = PlayState.instance.scripts.getByPath(p);
+			if (script == null) continue;
+
+			PlayState.instance.scripts.remove(script);
+			script.destroy();
 		}
 	}
 

source/hscript/Config.hx

@@ -3,19 +3,23 @@ package hscript;
 class Config {
 	// Runs support for custom classes in these
 	public static final ALLOWED_CUSTOM_CLASSES = [
+		#if !DOCUMENTATION
 		"flixel",
 
 		"funkin",
+		#end
 	];
 
 	// Runs support for abstract support in these
 	public static final ALLOWED_ABSTRACT_AND_ENUM = [
+		#if !DOCUMENTATION
 		"flixel",
 		"openfl",
 
 		"haxe.xml",
 		"haxe.CallStack",
 		"funkin",
+		#end
 	];
 
 	// Incase any of your files fail