From 7f5ff7629f98ab760ba700b417c8c647adf9a037 Mon Sep 17 00:00:00 2001
From: NeeEoo <NeeEoo@users.noreply.github.com>
Date: Tue, 11 Apr 2023 02:18:59 +0200
Subject: [PATCH] Some better hscript error reporting when using source folder

---
 source/funkin/mods/ModsAssetLibrary.hx    | 4 ++--
 source/funkin/mods/ModsFolder.hx          | 6 +++---
 source/funkin/scripting/GlobalScript.hx   | 2 +-
 source/funkin/scripting/HScript.hx        | 2 +-
 source/funkin/system/AssetsLibraryList.hx | 2 +-
 source/funkin/system/Paths.hx             | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/source/funkin/mods/ModsAssetLibrary.hx b/source/funkin/mods/ModsAssetLibrary.hx
index 5a01f780..8b344067 100644
--- a/source/funkin/mods/ModsAssetLibrary.hx
+++ b/source/funkin/mods/ModsAssetLibrary.hx
@@ -24,7 +24,7 @@ using StringTools;
 interface ModsAssetLibrary {
 	public var prefix:String;
 	public var libName:String;
-	
+
 	#if MOD_SUPPORT
 	public var _parsedAsset:String;
 
@@ -35,7 +35,7 @@ interface ModsAssetLibrary {
 	private function __parseAsset(asset:String):Bool;
 
 	public function getFiles(folder:String):Array<String>;
-	
+
 	public function getFolders(folder:String):Array<String>;
 	#end
 }
\ No newline at end of file
diff --git a/source/funkin/mods/ModsFolder.hx b/source/funkin/mods/ModsFolder.hx
index b9da810e..f2c54854 100644
--- a/source/funkin/mods/ModsFolder.hx
+++ b/source/funkin/mods/ModsFolder.hx
@@ -27,7 +27,7 @@ class ModsFolder {
 	 * INTERNAL - Only use when editing source mods!!
 	 */
 	@:dox(hide) public static var onModSwitch:FlxTypedSignal<String->Void> = new FlxTypedSignal<String->Void>();
-	
+
 	/**
 	 * Current mod folder. Will affect `Paths`.
 	 */
@@ -49,12 +49,12 @@ class ModsFolder {
 	 * Initialises `mods` folder by adding callbacks and such.
 	 */
 	public static function init() {
-		
+
 	}
 
 	/**
 	 * Switches mod - unloads all the other mods, then load this one.
-	 * @param libName 
+	 * @param libName
 	 */
 	public static function switchMod(mod:String) {
 		Options.lastLoadedMod = currentModFolder = mod;
diff --git a/source/funkin/scripting/GlobalScript.hx b/source/funkin/scripting/GlobalScript.hx
index 8b9455d2..d1d7ff10 100644
--- a/source/funkin/scripting/GlobalScript.hx
+++ b/source/funkin/scripting/GlobalScript.hx
@@ -18,7 +18,7 @@ class GlobalScript {
 
 		Conductor.onBeatHit.add(beatHit);
 		Conductor.onStepHit.add(stepHit);
-		
+
 		FlxG.signals.focusGained.add(function() {
 			call("focusGained");
 		});
diff --git a/source/funkin/scripting/HScript.hx b/source/funkin/scripting/HScript.hx
index 739691fa..24f9cb0f 100644
--- a/source/funkin/scripting/HScript.hx
+++ b/source/funkin/scripting/HScript.hx
@@ -66,7 +66,7 @@ class HScript extends Script {
 				var expr:Expr = null;
 				try {
 					if (code != null && code.trim() != "")
-						expr = parser.parseString(code);
+						expr = parser.parseString(code, cl.join("/") + "." + hxExt);
 				} catch(e:Error) {
 					_errorHandler(e);
 				} catch(e) {
diff --git a/source/funkin/system/AssetsLibraryList.hx b/source/funkin/system/AssetsLibraryList.hx
index 8c9b5f0b..61c6cde8 100644
--- a/source/funkin/system/AssetsLibraryList.hx
+++ b/source/funkin/system/AssetsLibraryList.hx
@@ -144,7 +144,7 @@ class AssetsLibraryList extends AssetLibrary {
 			if (!__defaultLibraries.contains(l))
 				l.unload();
 	}
-	
+
 	public function reset() {
 		unloadLibraries();
 
diff --git a/source/funkin/system/Paths.hx b/source/funkin/system/Paths.hx
index c4204bc8..d6283f26 100644
--- a/source/funkin/system/Paths.hx
+++ b/source/funkin/system/Paths.hx
@@ -253,14 +253,14 @@ class Paths
 			@:privateAccess
 			if (lib.__proxy != null) library = lib.__proxy;
 		}
-		
+
 		var content:Array<String> = [];
 		#if MOD_SUPPORT
 		if (library is funkin.mods.ModsAssetLibrary) {
 			// easy task, can immediately scan for files!
 			var lib = cast(library, funkin.mods.ModsAssetLibrary);
 			content = lib.getFiles(libThing.symbolName);
-			if (addPath) 
+			if (addPath)
 				for(i in 0...content.length)
 					content[i] = '$folderPath${content[i]}';
 		} else #end {