Merge branch 'main' of https://github.com/FNF-CNE-Devs/CodenameEngine-Dev

source/funkin/backend/scripting/GlobalScript.hx

@@ -9,7 +9,7 @@ import funkin.backend.assets.ModsFolder;
  * Class for THE Global Script, aka script that runs in the background at all times.
  */
 class GlobalScript {
-	public static var script:Script;
+	public static var scripts:ScriptPack;
 
 	public static function init() {
 		#if MOD_SUPPORT
@@ -43,19 +43,17 @@ class GlobalScript {
 		FlxG.signals.postUpdate.add(function() {
 			call("postUpdate", [FlxG.elapsed]);
 			if (FlxG.keys.justPressed.F5) {
-				if (script != null && !(script is DummyScript)) {
+				if (scripts.scripts.length > 0) {
 					Logs.trace('Reloading global script...', WARNING, YELLOW);
-					script.reload();
+					scripts.reload();
 					Logs.trace('Global script successfully reloaded.', WARNING, GREEN);
 				} else {
 					Logs.trace('Loading global script...', WARNING, YELLOW);
 					onModSwitch(#if MOD_SUPPORT ModsFolder.currentModFolder #else null #end);
-					if (script is DummyScript)
-						Logs.trace('Global script not found. Are you sure "data/global.hx" exists?', ERROR, RED);
-					else
-						Logs.trace('Global script successfully loaded.', WARNING, GREEN);
 				}
 			}
+			if (FlxG.keys.justPressed.F2)
+				NativeAPI.allocConsole();
 		});
 		FlxG.signals.preDraw.add(function() {
 			call("preDraw");
@@ -81,23 +79,25 @@ class GlobalScript {
 	}
 
 	public static function event<T:CancellableEvent>(name:String, event:T):T {
-		if (script == null) return event;
-		script.call(name, [event]);
+		if (scripts != null) scripts.call(name, [event]);
 		return event;
 	}
 
 	public static function call(name:String, ?args:Array<Dynamic>) {
-		if (script == null) return;
-		script.call(name, args);
+		if (scripts != null) scripts.call(name, args);
 	}
 	public static function onModSwitch(newMod:String) {
 		call("onDestroy");
-		if (script != null) {
-			script.destroy();
-			script = null;
+		scripts = FlxDestroyUtil.destroy(scripts);
+		scripts = new ScriptPack("GlobalScript");
+		for (i in funkin.backend.assets.ModsFolder.getLoadedMods()) {
+			var path = Paths.script('data/global/LIB_$i');
+			var script = Script.create(path);
+			if (script is DummyScript) continue;
+			script.fileName = '$i:global.hx';
+			scripts.add(script);
+			script.load();
 		}
-		script = Script.create(Paths.script('data/global'));
-		script.load();
 	}
 
 	public static function beatHit(curBeat:Int) {

source/funkin/backend/scripting/HScript.hx

@@ -29,7 +29,7 @@ class HScript extends Script {
 
 		interp = new Interp();
 
-		code = Assets.getText(path);
+		code = Assets.exists(path) ? Assets.getText(path) : null;
 		parser = initParser();
 		folderlessPath = Path.directory(path);
 		__importedPaths = [path];
@@ -45,6 +45,13 @@ class HScript extends Script {
 			this.trace(v);
 		}));
 
+		funkin.backend.scripting.GlobalScript.call("onScriptCreated", [this, "hscript"]);
+
+		if (code != null && code.trim() != "")
+			loadFromString(code);
+	}
+
+	public override function loadFromString(code:String) {
 		try {
 			if (code != null && code.trim() != "")
 				expr = parser.parseString(code, fileName);
@@ -53,6 +60,8 @@ class HScript extends Script {
 		} catch(e) {
 			_errorHandler(new Error(ECustom(e.toString()), 0, 0, fileName, 0));
 		}
+
+		return this;
 	}
 
 	private function importFailedCallback(cl:Array<String>):Bool {

source/funkin/backend/scripting/Script.hx

@@ -109,6 +109,7 @@ class Script extends FlxBasic implements IFlxDestroyable {
 	 */
 	public static var scriptExtensions:Array<String> = [
 		"hx", "hscript", "hsc", "hxs",
+		"pack", // combined file
 		"lua" /** ACTUALLY NOT SUPPORTED, ONLY FOR THE MESSAGE **/
 	];
 
@@ -138,6 +139,9 @@ class Script extends FlxBasic implements IFlxDestroyable {
 			return switch(Path.extension(path).toLowerCase()) {
 				case "hx" | "hscript" | "hsc" | "hxs":
 					new HScript(path);
+				case "pack":
+					var arr = Assets.getText(path).split("________PACKSEP________");
+					fromString(arr[1], arr[0]);
 				case "lua":
 					Logs.trace("Lua is not supported in this engine. Use HScript instead.", ERROR);
 					new DummyScript(path);
@@ -148,6 +152,23 @@ class Script extends FlxBasic implements IFlxDestroyable {
 		return new DummyScript(path);
 	}
 
+	/**
+	 * Creates a script from the string. The language is determined based on the path.
+	 * @param code code
+	 * @param path filename
+	 */
+	public static function fromString(code:String, path:String):Script {
+		return switch(Path.extension(path).toLowerCase()) {
+			case "hx" | "hscript" | "hsc" | "hxs":
+				new HScript(path).loadFromString(code);
+			case "lua":
+				Logs.trace("Lua is not supported in this engine. Use HScript instead.", ERROR);
+				new DummyScript(path).loadFromString(code);
+			default:
+				new DummyScript(path).loadFromString(code);
+		}
+	}
+
 	/**
 	 * Creates a new instance of the script class.
 	 * @param path
@@ -224,6 +245,14 @@ class Script extends FlxBasic implements IFlxDestroyable {
 		return result;
 	}
 
+	/**
+	 * Loads the code from a string, doesnt really work after the script has been loaded
+	 * @param code The code.
+	 */
+	public function loadFromString(code:String) {
+		return this;
+	}
+
 	/**
 	 * Sets a script's parent object so that its properties can be accessed easily. Ex: Passing `PlayState.instance` will allow `boyfriend` to be typed instead of `PlayState.instance.boyfriend`.
 	 * @param variable Parent variable.