found a good fix actually lol

JoaTH-Team · Nov 12, 2024 · 8857ebf · 8857ebf
1 parent a1c0dd2
commit 8857ebf
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 8 deletions.
diff --git a/source/states/ScriptedState.hx b/source/states/ScriptedState.hx
@@ -19,11 +19,22 @@ class ScriptedState extends ExtendableState {
 		Paths.clearUnusedMemory();
 
 		try {
-			if (FileSystem.exists(Paths.script('classes/$path')))
-				path = Paths.script('classes/$path');
+			var folders:Array<String> = [Paths.file('classes/')];
+			#if FUTURE_POLYMOD
+			for (mod in ModHandler.getModIDs())
+				folders.push('mods/' + mod + '/classes/');
+			#end
 
-			script = new Hscript(path, false);
-			script.execute(path, false);
+			var foundPath:String = null;
+			for (folder in folders) {
+				if (FileSystem.exists(folder + path)) {
+					foundPath = folder + path + '.hxs';
+					break;
+				}
+			}
+
+			script = new Hscript(foundPath, false);
+			script.execute(foundPath, false);
 
 			scriptSet('this', this);
 			scriptSet('add', add);

diff --git a/source/substates/ScriptedSubState.hx b/source/substates/ScriptedSubState.hx
@@ -13,11 +13,22 @@ class ScriptedSubState extends ExtendableSubState {
 		instance = this;
 
 		try {
-			if (FileSystem.exists(Paths.script('classes/$path')))
-				path = Paths.script('classes/$path');
+			var folders:Array<String> = [Paths.file('classes/')];
+			#if FUTURE_POLYMOD
+			for (mod in ModHandler.getModIDs())
+				folders.push('mods/' + mod + '/classes/');
+			#end
 
-			script = new Hscript(path, false);
-			script.execute(path, false);
+			var foundPath:String = null;
+			for (folder in folders) {
+				if (FileSystem.exists(folder + path)) {
+					foundPath = folder + path + '.hxs';
+					break;
+				}
+			}
+
+			script = new Hscript(foundPath, false);
+			script.execute(foundPath, false);
 
 			scriptSet('this', this);
 			scriptSet('add', add);