diff --git a/source/funkin/assets/AssetPaths.hx b/source/funkin/assets/AssetPaths.hx new file mode 100644 index 00000000..69ae06f9 --- /dev/null +++ b/source/funkin/assets/AssetPaths.hx @@ -0,0 +1,33 @@ +package funkin.assets; + +/** + Static class containing all of the paths for every different feature of the engine. +**/ +@:final +class AssetPaths { + /**ยจ + Path to the data folder. Used by Paths functions. + **/ + public static final data:AssetString = "assets/data/"; + public static final characters:AssetString = "assets/data/characters/"; + public static final config:AssetString = "assets/data/config/"; + public static final dialogueBoxes:AssetString = "assets/data/dialogue/boxes/"; + public static final dialogueCharacters:AssetString = "assets/data/dialogue/characters/"; + public static final globalChartScripts:AssetString = "assets/data/charts/"; + public static final splashes:AssetString = "assets/data/splashes/"; + public static final stages:AssetString = "assets/data/stages/"; + public static final titleIntroText:AssetString = "assets/data/titlescreen/introText.txt"; + public static final weeksData:AssetString = "assets/data/weeks/weeks.txt"; +} + +abstract AssetString(String) from String to String { + public inline function format(values:Array) { + var str = this; + var i = 0; + while(str.contains('{$i}')) { + str = str.replace('{$i}', values[i]); + i++; + } + return str; + } +} \ No newline at end of file diff --git a/source/funkin/mods/ModsFolder.hx b/source/funkin/mods/ModsFolder.hx index f2c54854..0db37ec8 100644 --- a/source/funkin/mods/ModsFolder.hx +++ b/source/funkin/mods/ModsFolder.hx @@ -110,6 +110,7 @@ class ModsFolder { return openLib; } + #if MOD_SUPPORT public static function loadLibraryFromFolder(libName:String, folder:String, force:Bool = false) { return prepareModLibrary(libName, new ModsFolderLibrary(folder, libName), force); } @@ -117,4 +118,5 @@ class ModsFolder { public static function loadLibraryFromZip(libName:String, zipPath:String, force:Bool = false) { return prepareModLibrary(libName, new ZipFolderLibrary(zipPath, libName), force); } + #end } \ No newline at end of file diff --git a/source/funkin/system/MainState.hx b/source/funkin/system/MainState.hx index 52adc17e..aca62278 100644 --- a/source/funkin/system/MainState.hx +++ b/source/funkin/system/MainState.hx @@ -1,6 +1,8 @@ package funkin.system; +#if MOD_SUPPORT import sys.FileSystem; +#end import funkin.mods.ModsFolder; import funkin.menus.TitleState; import funkin.menus.BetaWarningState; diff --git a/source/funkin/utils/native/HiddenProcess.hx b/source/funkin/utils/native/HiddenProcess.hx index cccac7f9..256ce27a 100644 --- a/source/funkin/utils/native/HiddenProcess.hx +++ b/source/funkin/utils/native/HiddenProcess.hx @@ -117,5 +117,5 @@ class HiddenProcess { } } #else -typedef HiddenProcess = sys.io.Process; +typedef HiddenProcess = Dynamic; #end