diff --git a/source/funkin/mobile/util/AdMobUtil.hx b/source/funkin/mobile/util/AdMobUtil.hx index cbdf4c2ab..a1ae1b8ee 100644 --- a/source/funkin/mobile/util/AdMobUtil.hx +++ b/source/funkin/mobile/util/AdMobUtil.hx @@ -134,7 +134,8 @@ class AdMobUtil } #end - Admob.showBanner([AdMobUtil.ADMOB_PUBLISHER, AdMobUtil.ADMOB_BANNER_AD_UNIT_ID].join('/'), size, align); + if (AdMobUtil.ADMOB_PUBLISHER != null && AdMobUtil.BANNER_AD_UNIT_ID != null) + Admob.showBanner([AdMobUtil.ADMOB_PUBLISHER, AdMobUtil.BANNER_AD_UNIT_ID].join('/'), size, align); } /** @@ -186,7 +187,10 @@ class AdMobUtil Admob.onEvent.add(interstitialEvent); - Admob.loadInterstitial([AdMobUtil.ADMOB_PUBLISHER, AdMobUtil.ADMOB_INTERSTITIAL_AD_UNIT_ID].join('/')); + if (AdMobUtil.ADMOB_PUBLISHER != null && AdMobUtil.INTERSTITIAL_AD_UNIT_ID != null) + { + Admob.loadInterstitial([AdMobUtil.ADMOB_PUBLISHER, AdMobUtil.ADMOB_INTERSTITIAL_AD_UNIT_ID].join('/')); + } } /** diff --git a/source/funkin/ui/credits/CreditsDataMacro.hx b/source/funkin/ui/credits/CreditsDataMacro.hx index c49e34d2f..48b11bcb4 100644 --- a/source/funkin/ui/credits/CreditsDataMacro.hx +++ b/source/funkin/ui/credits/CreditsDataMacro.hx @@ -40,7 +40,13 @@ class CreditsDataMacro #if macro static function fetchJSON():Null { - return sys.io.File.getContent(#if ios '../../../../../' + #end CreditsDataHandler.CREDITS_DATA_PATH); + var creditsPath:String = CreditsDataHandler.CREDITS_DATA_PATH; + + #if ios + if (!sys.FileSystem.exists(creditsPath)) creditsPath = "../../../../../" + creditsPath; + #end + + return sys.io.File.getContent(creditsPath); } /** diff --git a/source/funkin/util/macro/EnvironmentMacro.hx b/source/funkin/util/macro/EnvironmentMacro.hx index 12fcf44a2..87ffb1c30 100644 --- a/source/funkin/util/macro/EnvironmentMacro.hx +++ b/source/funkin/util/macro/EnvironmentMacro.hx @@ -23,7 +23,7 @@ class EnvironmentMacro */ public static macro function build():Array { - final envFile:Map = parseEnvFile(#if ios '../../../../../.env' #else '.env' #end); + final envFile:Map = parseEnvFile('.env'); final buildFields:Array = Context.getBuildFields(); @@ -95,6 +95,10 @@ class EnvironmentMacro { final env:Map = []; + #if ios + if (!FileSystem.exists(envPath)) envPath = "../../../../../" + envPath; + #end + if (FileSystem.exists(envPath)) { final envContent:Null = File.getContent(envPath); diff --git a/source/funkin/util/macro/HaxelibVersions.hx b/source/funkin/util/macro/HaxelibVersions.hx index 76f987bfa..876800b4e 100644 --- a/source/funkin/util/macro/HaxelibVersions.hx +++ b/source/funkin/util/macro/HaxelibVersions.hx @@ -23,7 +23,14 @@ class HaxelibVersions { var result:Array = []; - var hmmData:Dynamic = haxe.Json.parse(sys.io.File.getContent(#if ios '../../../../../' + #end 'hmm.json')); + var hmmFile:String = "hmm.json"; + + #if ios + if (!sys.FileSystem.exists(hmmFile)) hmmFile = "../../../../../" + hmmFile; + #end + + var hmmData:Dynamic = haxe.Json.parse(sys.io.File.getContent(hmmFile)); + var dependencies:Array = cast hmmData.dependencies; for (library in dependencies) { diff --git a/source/funkin/util/macro/RegistryMacro.hx b/source/funkin/util/macro/RegistryMacro.hx index a357d2b75..89afd91dd 100644 --- a/source/funkin/util/macro/RegistryMacro.hx +++ b/source/funkin/util/macro/RegistryMacro.hx @@ -38,11 +38,7 @@ typedef RegistryTypeParams = */ class RegistryMacro { - #if ios - static final DATA_FILE_BASE_PATH:String = "../../../../../assets/preload/data"; - #else static final DATA_FILE_BASE_PATH:String = "assets/preload/data"; - #end /** * Builds the registry class. @@ -147,7 +143,13 @@ class RegistryMacro var newJsonParser:String = 'new json2object.JsonParser<${dataType.module}.${dataType.name}>()'; var dataFilePath:String = getRegistryDataFilePath(cls, fields); - var baseGameEntryIds:Array = listBaseGameEntryIds('${DATA_FILE_BASE_PATH}/${dataFilePath}/'); + + #if ios + var dataPath:String = DATA_FILE_BASE_PATH; + if (!sys.FileSystem.exists(dataPath)) dataPath = "../../../../../" + dataPath; + #end + + var baseGameEntryIds:Array = listBaseGameEntryIds('${dataPath}/${dataFilePath}/'); return (macro class TempClass {