From 8de74c361cbb7794adb2c323bcb2bf6493a899a1 Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Thu, 1 May 2025 19:55:44 -0400 Subject: [PATCH] Additional cleanup --- hmm.json | 8 +++++--- project.hxp | 8 ++++---- source/Main.hx | 2 +- source/funkin/InitState.hx | 4 ++-- source/funkin/{api/mobile => mobile/util}/AdMobUtil.hx | 2 +- .../{api/mobile => mobile/util}/InAppPurchasesUtil.hx | 2 +- source/funkin/modding/PolymodHandler.hx | 4 ++-- source/funkin/play/PauseSubState.hx | 2 +- source/funkin/play/PlayState.hx | 2 +- source/funkin/play/ResultState.hx | 2 +- source/funkin/ui/options/OptionsState.hx | 4 ++-- source/funkin/util/macro/EnvironmentConfigMacro.hx | 6 ++++++ 12 files changed, 27 insertions(+), 19 deletions(-) rename source/funkin/{api/mobile => mobile/util}/AdMobUtil.hx (99%) rename source/funkin/{api/mobile => mobile/util}/InAppPurchasesUtil.hx (99%) diff --git a/hmm.json b/hmm.json index f482c6950..9fdd5ff50 100644 --- a/hmm.json +++ b/hmm.json @@ -115,8 +115,10 @@ }, { "name": "hxvlc", - "type": "haxelib", - "version": "2.1.2" + "type": "git", + "dir": null, + "ref": "d71ee67870308ef821179bd7d7796064f695c645", + "url": "https://github.com/MAJigsaw77/hxvlc" }, { "name": "json2object", @@ -143,7 +145,7 @@ "name": "lime", "type": "git", "dir": null, - "ref": "8849a49f07cff83d36896a03294b5fc6bcb1c9f6", + "ref": "b79ac7bc76714bff64eaa01b5fb9349dd47c88b8", "url": "https://github.com/FunkinCrew/lime-mobile" }, { diff --git a/project.hxp b/project.hxp index 959533c00..8bdfbac36 100644 --- a/project.hxp +++ b/project.hxp @@ -686,11 +686,11 @@ class Project extends HXProject { // Should be true only on mobile builds. FEATURE_TOUCH_CONTROLS.apply(this, isMobile()); - // Should be true only on mobile builds. - FEATURE_MOBILE_ADVERTISEMENTS.apply(this, isMobile()); + // Should be true only on mobile release builds. Remember you can add the flag manually for testing. + FEATURE_MOBILE_ADVERTISEMENTS.apply(this, (isMobile() && isRelease())); - // Should be true only on android builds for now. - FEATURE_MOBILE_IAP.apply(this, isAndroid()); + // Should be true only on android release builds for now. Remember you can add the flag manually for testing. + FEATURE_MOBILE_IAP.apply(this, (isAndroid() && isRelease())); // Should be true only on debug mobile builds. TESTING_ADS.apply(this, (isTest() || isDebug()) && FEATURE_MOBILE_ADVERTISEMENTS.isEnabled(this)); diff --git a/source/Main.hx b/source/Main.hx index f6f53956d..b4762c8ff 100644 --- a/source/Main.hx +++ b/source/Main.hx @@ -134,7 +134,7 @@ class Main extends Sprite game._customSoundTray = funkin.ui.options.FunkinSoundTray; #if FEATURE_MOBILE_ADVERTISEMENTS - funkin.api.mobile.AdMobUtil.init(); + funkin.mobile.util.AdMobUtil.init(); #end addChild(game); diff --git a/source/funkin/InitState.hx b/source/funkin/InitState.hx index b56bec8c1..34bf83eb6 100644 --- a/source/funkin/InitState.hx +++ b/source/funkin/InitState.hx @@ -98,12 +98,12 @@ class InitState extends FlxState #if FEATURE_MOBILE_ADVERTISEMENTS // Setup Admob - funkin.api.mobile.AdMobUtil.init(); + funkin.mobile.util.AdMobUtil.init(); #end #if FEATURE_MOBILE_IAP // Setup In-App purchases - funkin.api.mobile.InAppPurchasesUtil.init(); + funkin.mobile.util.InAppPurchasesUtil.init(); #end // This ain't a pixel art game! (most of the time) diff --git a/source/funkin/api/mobile/AdMobUtil.hx b/source/funkin/mobile/util/AdMobUtil.hx similarity index 99% rename from source/funkin/api/mobile/AdMobUtil.hx rename to source/funkin/mobile/util/AdMobUtil.hx index 228ece26f..007c53aed 100644 --- a/source/funkin/api/mobile/AdMobUtil.hx +++ b/source/funkin/mobile/util/AdMobUtil.hx @@ -1,4 +1,4 @@ -package funkin.api.mobile; +package funkin.mobile.util; #if FEATURE_MOBILE_ADVERTISEMENTS import extension.admob.Admob; diff --git a/source/funkin/api/mobile/InAppPurchasesUtil.hx b/source/funkin/mobile/util/InAppPurchasesUtil.hx similarity index 99% rename from source/funkin/api/mobile/InAppPurchasesUtil.hx rename to source/funkin/mobile/util/InAppPurchasesUtil.hx index 25fe60030..7510daba5 100644 --- a/source/funkin/api/mobile/InAppPurchasesUtil.hx +++ b/source/funkin/mobile/util/InAppPurchasesUtil.hx @@ -1,4 +1,4 @@ -package funkin.api.mobile; +package funkin.mobile.util; #if FEATURE_MOBILE_IAP import extension.iapcore.android.IAPAndroid; diff --git a/source/funkin/modding/PolymodHandler.hx b/source/funkin/modding/PolymodHandler.hx index 0ac823767..648705d02 100644 --- a/source/funkin/modding/PolymodHandler.hx +++ b/source/funkin/modding/PolymodHandler.hx @@ -289,7 +289,7 @@ class PolymodHandler Polymod.blacklistImport('android.jni.JNICache'); // Disable access to in-app purchases - Polymod.blacklistImport('funkin.api.mobile.InAppPurchasesUtil'); + Polymod.blacklistImport('funkin.mobile.util.InAppPurchasesUtil'); for (cls in ClassMacro.listClassesInPackage('extension.iapcore')) { if (cls == null) continue; @@ -298,7 +298,7 @@ class PolymodHandler } // Disable access to Google AdMob - Polymod.blacklistImport('funkin.api.mobile.AdMobUtil'); + Polymod.blacklistImport('funkin.mobile.util.AdMobUtil'); for (cls in ClassMacro.listClassesInPackage('extension.admob')) { if (cls == null) continue; diff --git a/source/funkin/play/PauseSubState.hx b/source/funkin/play/PauseSubState.hx index f667b02dc..c02adeeca 100644 --- a/source/funkin/play/PauseSubState.hx +++ b/source/funkin/play/PauseSubState.hx @@ -22,7 +22,7 @@ import funkin.ui.transition.stickers.StickerSubState; import funkin.util.SwipeUtil; import funkin.util.TouchUtil; #if FEATURE_MOBILE_ADVERTISEMENTS -import funkin.api.mobile.AdMobUtil; +import funkin.mobile.util.AdMobUtil; #end /** diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx index 3c7c60b91..6c96eee69 100644 --- a/source/funkin/play/PlayState.hx +++ b/source/funkin/play/PlayState.hx @@ -62,7 +62,7 @@ import funkin.util.TouchUtil; import funkin.mobile.ui.FunkinHitbox; import funkin.mobile.ui.FunkinHitbox.FunkinHitboxControlSchemes; #if FEATURE_MOBILE_ADVERTISEMENTS -import funkin.api.mobile.AdMobUtil; +import funkin.mobile.util.AdMobUtil; #end #end #if FEATURE_DISCORD_RPC diff --git a/source/funkin/play/ResultState.hx b/source/funkin/play/ResultState.hx index de377802e..935e10a5d 100644 --- a/source/funkin/play/ResultState.hx +++ b/source/funkin/play/ResultState.hx @@ -40,7 +40,7 @@ import funkin.api.newgrounds.Medals; #if mobile import funkin.util.TouchUtil; #if FEATURE_MOBILE_ADVERTISEMENTS -import funkin.api.mobile.AdMobUtil; +import funkin.mobile.util.AdMobUtil; #end #end diff --git a/source/funkin/ui/options/OptionsState.hx b/source/funkin/ui/options/OptionsState.hx index f9264f128..7f725c061 100644 --- a/source/funkin/ui/options/OptionsState.hx +++ b/source/funkin/ui/options/OptionsState.hx @@ -150,9 +150,9 @@ class OptionsMenu extends Page createItem("CLEAR SAVE DATA", function() { promptClearSaveData(); }); - #if android + #if FEATURE_MOBILE_IAP createItem("Launch purchase flow", function() { - funkin.api.mobile.InAppPurchasesUtil.purchase('test_product_0'); + funkin.mobile.util.InAppPurchasesUtil.purchase('test_product_0'); }); #end createItem("EXIT", exit); diff --git a/source/funkin/util/macro/EnvironmentConfigMacro.hx b/source/funkin/util/macro/EnvironmentConfigMacro.hx index f5bb678ba..247f3df45 100644 --- a/source/funkin/util/macro/EnvironmentConfigMacro.hx +++ b/source/funkin/util/macro/EnvironmentConfigMacro.hx @@ -40,6 +40,12 @@ class EnvironmentConfigMacro var fields = Context.getBuildFields(); var pos = Context.currentPos(); + if (!sys.FileSystem.exists(file)) + { + trace('Failed to parse environment file: ${file}'); + return fields; + } + var envFile:String = File.getContent(file); if (envFile == null)