Additional cleanup

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"
     },
     {

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));

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);

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)

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;

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;

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;

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
 
 /**

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

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
 

source/funkin/ui/options/OptionsState.hx

@@ -150,9 +150,9 @@ class OptionsMenu extends Page<OptionsMenuPageName>
     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);

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)