update branch main

.github/workflows/virustotal.yml

@@ -10,31 +10,131 @@ on:
       - 'export/release/**'
 
 jobs:
-  scan-windows:
+  scan-linux-x64:
     runs-on: ubuntu-latest
     if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
 
     steps:
-      - name: Download Windows Build
+      - name: Download Linux x64 Build
         uses: dawidd6/action-download-artifact@v3
         with:
           workflow: main.yml
-          name: windowsBuild
-          path: ./windows-build
+          name: linuxBuild64
+          path: ./linux-build
 
-      - name: Zip Windows Build
+      - name: Zip Linux Build
         run: |
-          cd ./windows-build
-          zip -r ../FNF-PlusEngine-Windows.zip *
+          cd ./linux-build
+          zip -r ../FNF-PlusEngine-Linux-x64.zip *
           cd ..
 
-      - name: VirusTotal Scan Windows
+      - name: VirusTotal Scan Linux x64
         uses: crazy-max/ghaction-virustotal@v4
         with:
           vt_api_key: ${{ secrets.VIRUSTOTAL_API_KEY }}
           files: |
-            ./FNF-PlusEngine-Windows.zip
+            ./FNF-PlusEngine-Linux-x64.zip
+
+  scan-windows-x86:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
+
+    steps:
+      - name: Download Windows x86 Build
+        uses: dawidd6/action-download-artifact@v3
+        with:
+          workflow: main.yml
+          name: windowsBuild32
+          path: ./windows-x86-build
+
+      - name: Zip Windows x86 Build
+        run: |
+          cd ./windows-x86-build
+          zip -r ../FNF-PlusEngine-Windows-x86.zip *
+          cd ..
+
+      - name: VirusTotal Scan Windows x86
+        uses: crazy-max/ghaction-virustotal@v4
+        with:
+          vt_api_key: ${{ secrets.VIRUSTOTAL_API_KEY }}
+          files: |
+            ./FNF-PlusEngine-Windows-x86.zip
+
+  scan-windows-x64:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
+
+    steps:
+      - name: Download Windows x64 Build
+        uses: dawidd6/action-download-artifact@v3
+        with:
+          workflow: main.yml
+          name: windowsBuild64
+          path: ./windows-x64-build
+
+      - name: Zip Windows x64 Build
+        run: |
+          cd ./windows-x64-build
+          zip -r ../FNF-PlusEngine-Windows-x64.zip *
+          cd ..
+
+      - name: VirusTotal Scan Windows x64
+        uses: crazy-max/ghaction-virustotal@v4
+        with:
+          vt_api_key: ${{ secrets.VIRUSTOTAL_API_KEY }}
+          files: |
+            ./FNF-PlusEngine-Windows-x64.zip
+
+  scan-mac-intel:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
+
+    steps:
+      - name: Download Mac Intel Build
+        uses: dawidd6/action-download-artifact@v3
+        with:
+          workflow: main.yml
+          name: macBuildIntel
+          path: ./mac-intel-build
+
+      - name: Zip Mac Intel Build
+        run: |
+          cd ./mac-intel-build
+          zip -r ../FNF-PlusEngine-Mac-Intel.zip *
+          cd ..
 
+      - name: VirusTotal Scan Mac Intel
+        uses: crazy-max/ghaction-virustotal@v4
+        with:
+          vt_api_key: ${{ secrets.VIRUSTOTAL_API_KEY }}
+          files: |
+            ./FNF-PlusEngine-Mac-Intel.zip
+
+  scan-mac-arm:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
+
+    steps:
+      - name: Download Mac ARM Build
+        uses: dawidd6/action-download-artifact@v3
+        with:
+          workflow: main.yml
+          name: macBuildARM
+          path: ./mac-arm-build
+
+      - name: Zip Mac ARM Build
+        run: |
+          cd ./mac-arm-build
+          zip -r ../FNF-PlusEngine-Mac-ARM.zip *
+          cd ..
+
+      - name: VirusTotal Scan Mac ARM
+        uses: crazy-max/ghaction-virustotal@v4
+        with:
+          vt_api_key: ${{ secrets.VIRUSTOTAL_API_KEY }}
+          files: |
+            ./FNF-PlusEngine-Mac-ARM.zip
+
   scan-android:
     runs-on: ubuntu-latest
     if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
@@ -52,10 +152,60 @@ jobs:
         run: |
           APK_FILE=$(find ./android-build -name "*.apk" | head -n 1)
           echo "apk_path=$APK_FILE" >> $GITHUB_OUTPUT
+          echo "Found APK: $APK_FILE"
 
       - name: VirusTotal Scan Android
         uses: crazy-max/ghaction-virustotal@v4
         with:
           vt_api_key: ${{ secrets.VIRUSTOTAL_API_KEY }}
           files: |
             ${{ steps.find-apk.outputs.apk_path }}
+
+  scan-ios:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
+
+    steps:
+      - name: Download iOS Build
+        uses: dawidd6/action-download-artifact@v3
+        with:
+          workflow: main.yml
+          name: iOSBuild
+          path: ./ios-build
+
+      - name: Find iOS App
+        id: find-ios
+        run: |
+          IOS_FILE=$(find ./ios-build \( -name "*.app" \) | head -n 1)
+          if [ -z "$IOS_FILE" ]; then
+            IOS_FILE=$(find ./ios-build -type f -executable | head -n 1)
+          fi
+
+          if [ -z "$IOS_FILE" ]; then
+            IOS_FILE="./ios-build"
+          fi
+
+          echo "ios_path=$IOS_FILE" >> $GITHUB_OUTPUT
+          echo "iOS file to scan: $IOS_FILE"
+
+      - name: Prepare iOS Archive
+        run: |
+          IOS_PATH="${{ steps.find-ios.outputs.ios_path }}"
+
+          if [ -d "$IOS_PATH" ]; then
+            cd "$IOS_PATH"
+            zip -r ../../FNF-PlusEngine-iOS.zip *
+            cd ../..
+          elif [ -f "$IOS_PATH" ]; then
+            cp "$IOS_PATH" ./FNF-PlusEngine-iOS.zip
+          else
+            echo "No iOS build found for scanning"
+            exit 1
+          fi
+
+      - name: VirusTotal Scan iOS
+        uses: crazy-max/ghaction-virustotal@v4
+        with:
+          vt_api_key: ${{ secrets.VIRUSTOTAL_API_KEY }}
+          files: |
+            ./FNF-PlusEngine-iOS.zip

Project.xml

@@ -144,6 +144,9 @@
 	<haxedef name="HXCPP_CFLAGS" value="-std=c99 -Wno-error=deprecated-non-prototype -Wno-deprecated-declarations -Wno-unused-command-line-argument -Wno-macro-redefined" if="macos || ios" />
 	<haxeflag name="-D" value="no-deprecation-warnings"/>
 
+	<!-- Android deprecation flags :v -->
+	<haxedef name="HXCPP_CFLAGS" value="-Wno-error=deprecated-non-prototype" if="android" />
+
 	<!-- Enables a terminal log prompt on debug builds -->
 	<haxelib name="hxcpp-debug-server" if="debug"/>
 	<haxedef name="HXC_LIBVLC_LOGGING" if="VIDEOS_ALLOWED debug" />
@@ -202,7 +205,7 @@
 	<haxedef name="message.reporting" value="pretty" />
 
 	<!-- Do whatever you want I'm tired uninstall and install everytime -->
-	<certificate path="key.keystore" password="psychengine" alias="psychport" alias-password="psychengine" if="android" unless="debug" />
+	<certificate path="key.keystore" password="plusengine" alias="plusengine" alias-password="plusengine" if="android" unless="debug" />
 
 	<!-- Category Type for Apple Systems -->
 	<config:ios category_type="public.app-category.music-games" />
@@ -230,32 +233,45 @@
 		<assets path="assets/modchart/eyeShape.csv" rename="modchart/eyeShape.csv" embed="true" />
 		<haxedef name="FM_ENGINE" value="PSYCH"/>
     	<haxedef name="FM_ENGINE_VERSION" value="1.0"/>
-    	<haxeflag name="--macro" value="modchart.backend.macros.Macro.includeFiles()"/>
+    	<haxeflag name="--macro" value="funkin.modding.modchart.backend.macros.Macro.includeFiles()"/>
 		<haxeflag name="source/extraParams.hxml" unless="ios"/>
-		<haxeflag name="--macro" value="addMetadata('@:build(modchart.backend.macros.Macro.buildFlxCamera())', 'flixel.FlxCamera')" if="ios"/>
-		<haxeflag name="--macro" value="addMetadata('@:build(modchart.backend.macros.Macro.buildFlxDrawTrianglesItem())', 'flixel.graphics.tile.FlxDrawTrianglesItem')" if="ios"/>
-		<haxeflag name="--macro" value="addMetadata('@:build(modchart.backend.macros.Macro.addModchartStorage())', 'flixel.FlxBasic')" if="ios"/>
+		<haxeflag name="--macro" value="addMetadata('@:build(funkin.modding.modchart.backend.macros.Macro.buildFlxCamera())', 'flixel.FlxCamera')" if="ios"/>
+		<haxeflag name="--macro" value="addMetadata('@:build(funkin.modding.modchart.backend.macros.Macro.buildFlxDrawTrianglesItem())', 'flixel.graphics.tile.FlxDrawTrianglesItem')" if="ios"/>
+		<haxeflag name="--macro" value="addMetadata('@:build(funkin.modding.modchart.backend.macros.Macro.addModchartStorage())', 'flixel.FlxBasic')" if="ios"/>
 	</section>
 
 	<!-- _________________________________ Custom _______________________________ -->
 
 	<assets path='art/icons/iconOG.png' rename='icon.png' if="linux || mac" />
 
-	<icon path="art/icons/icon16.png" size='16'/>
-	<icon path="art/icons/icon32.png" size='32'/>
-	<icon path="art/icons/icon64.png" size='64'/>
-	<icon path="art/icons/iconOG.png" />
-	<icon path="art/icons/mobile/icon32.png" size='32' if="android" />
-	<icon path="art/icons/mobile/icon64.png" size='64' if="android" />
-	<icon path="art/icons/mobile/iconOG.png" if="android" />
-	<icon path="art/icons/iOS/bf-Default-iOS 29x29@2x.png" size='29' if="ios" />
-	<icon path="art/icons/iOS/bf-Default-iOS 40x40@2x.png" size='40' if="ios" />
-	<icon path="art/icons/iOS/bf-Default-iOS 57x57@1x.png" size='57' if="ios" />
-	<icon path="art/icons/iOS/bf-Default-iOS 58x58@2x.png" size='58' if="ios" />
-	<icon path="art/icons/iOS/bf-Default-iOS 60x60@3x.png" size='60' if="ios" />
-	<icon path="art/icons/iOS/bf-Default-iOS 80x80@2x.png" size='80' if="ios" />
-	<icon path="art/icons/iOS/bf-Default-iOS 87x87@3x.png" size='87' if="ios" />
-	<icon path="art/icons/iOS/bf-Default-iOS 114x114@2x.png" size='114' if="ios" />
-	<icon path="art/icons/iOS/bf-Default-iOS 120x120@2x.png" size='120' if="ios" />
-	<icon path="art/icons/iOS/bf-Default-iOS 180x180@3x.png" size='180' if="ios" />
+	<!-- Desktop and other platforms icons (excluding Android which uses adaptive icons) -->
+	<icon path="art/icons/icon16.png" size='16' unless="android"/>
+	<icon path="art/icons/icon32.png" size='32' unless="android"/>
+	<icon path="art/icons/icon64.png" size='64' unless="android"/>
+	<icon path="art/icons/iconOG.png" unless="android"/>
+
+	<section if="android">
+		<!-- Android Permissions -->
+		<config:android permission="android.permission.INTERNET" />
+		<config:android permission="android.permission.ACCESS_NETWORK_STATE" />
+		<config:android permission="android.permission.READ_EXTERNAL_STORAGE" />
+		<config:android permission="android.permission.WRITE_EXTERNAL_STORAGE" />
+		<config:android permission="android.permission.MANAGE_EXTERNAL_STORAGE" />
+		<config:android permission="android.permission.READ_MEDIA_IMAGES" />
+		<config:android permission="android.permission.READ_MEDIA_VIDEO" />
+		<config:android permission="android.permission.READ_MEDIA_AUDIO" />
+
+		<!-- Android SDK versions (updated to 35 for androidx.core compatibility) -->
+		<config:android target-sdk-version="35" />
+		<android target-sdk-version="35" />
+
+		<!-- Android templates for adaptive icons with Material Design 3 support -->
+		<template path="templates/android" />
+	</section>
+
+	<section if="ios">
+	    <icon path="art/icons/PlusEngine.appiconset/iOS-Default.png"/>
+		<icon path="art/icons/PlusEngine.appiconset/iOS-Dark.png"/>
+		<icon path="art/icons/PlusEngine.appiconset/iOS-Tinted.png"/>
+	</section>
 </project>

README.md

@@ -110,7 +110,6 @@ relax — progress doesn’t wait.
 
 **Happy coding.**
 
-
 ## Developer Credits:
 * Lenin Asto - Main Programmer for Plus Engine Fork
 

assets/base_game/shared/characters/bf (idle only).json

@@ -0,0 +1,23 @@
+{
+	"animations": [
+		{
+			"loop": false,
+			"offsets": [0, 0],
+			"anim": "idle",
+			"fps": 12,
+			"name": "idle",
+			"indices": []
+		}
+	],
+	"vocals_file": "",
+	"no_antialiasing": false,
+	"image": "characters/sakura",
+	"position": [-65, 208],
+	"healthicon": "bf",
+	"flip_x": true,
+	"healthbar_colors": [49, 176, 209],
+	"camera_position": [255, -140],
+	"sing_duration": 4,
+	"scale": 1.66,
+	"_editor_isPlayer": true
+}