Fix Joy-Con Detection

Reviewed-on: MeloNX/MeloNX#34

.gitea/workflows/updateApp.yml

@@ -0,0 +1,49 @@
+name: Update apps.json on new release
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  update:
+    runs-on: debian-trixie
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get install -y jq
+
+    - name: Extract release data
+      id: release
+      run: |
+        echo "VERSION=${GITEA_REF_NAME}" >> $GITHUB_OUTPUT
+        echo "DESCRIPTION=$(echo '${GITEA_EVENT_RELEASE_BODY}' | jq -Rs .)" >> $GITHUB_OUTPUT
+        echo "DATE=$(date '+%Y-%m-%d')" >> $GITHUB_OUTPUT
+        IPA_URL=$(echo '${GITEA_EVENT_RELEASE_ASSETS}' | jq -r '.[0].browser_download_url')
+        echo "DOWNLOAD_URL=$IPA_URL" >> $GITHUB_OUTPUT
+
+    - name: Update apps.json
+      run: |
+        jq --arg version "${{ steps.release.outputs.VERSION }}" \
+           --arg buildVersion "1" \
+           --arg date "${{ steps.release.outputs.DATE }}" \
+           --arg localizedDescription "${{ steps.release.outputs.DESCRIPTION }}" \
+           --arg downloadURL "${{ steps.release.outputs.DOWNLOAD_URL }}" \
+           '.apps[0].versions |= [{"version": $version, "buildVersion": $buildVersion, "date": $date, "localizedDescription": $localizedDescription, "downloadURL": $downloadURL, "minOSVersion": "15.0"}]' \
+           apps.json > tmp.json && mv tmp.json apps.json
+
+    - name: Commit and push
+      run: |
+        git config user.name "gitea-actions"
+        git config user.email "gitea-actions@localhost"
+        git add apps.json
+        git commit -m "Update apps.json for release ${{ steps.release.outputs.VERSION }}"
+        git push
+      env:
+        GIT_AUTHOR_NAME: gitea-actions
+        GIT_AUTHOR_EMAIL: gitea-actions@localhost
+        GIT_COMMITTER_NAME: gitea-actions
+        GIT_COMMITTER_EMAIL: gitea-actions@localhost

LICENSE.txt

@@ -1,3 +1,12 @@
+Currently licensed under the GNU AFFERO GENERAL PUBLIC LICENSE version 3, or any later version, at your choice.
+You may obtain a copy of the license at <https://gnu.org/>
+
+Copyright (c) Rhajune Park and contributors, 2025
+
+For copyright infringement claims, please contact abuse@pythonplayer123.dev for expedited processing 
+
+Previously licensed under the MeloNX License.
+
 MeloNX License
 
 Copyright (c) MeloNX Team and Contributors

README.md

@@ -6,11 +6,6 @@
 
 <h1 align="center">MeloNX</h1>
 
-## Documentation
-
-If you are planning to contribute or just want to learn more about this project please read through our [documentation](docs/README.md).
-
-
 <p align="center">
     MeloNX enables Nintendo Switch game emulation on iOS using the Ryujinx iOS code base.
 </p>
@@ -28,11 +23,10 @@ MeloNX works on iPhone XS/XR and later and iPad 8th Gen and later. Check out the
 
 ## FAQ
 - MeloNX is made for iOS 17+, on iOS 15 - 16 MeloNX can be installed but may have issues or not work at all.
-- MeloNX needs Xcode or a Paid Apple Developer Account. SideStore support may come soon (SideStore Side Issue)
-- MeloNX needs JIT
+- MeloNX cannot be Sideloaded normally and requires the use of the following Installation Guide(s).
+- MeloNX requires JIT
 - Recommended Device: iPhone 15 Pro or newer.
-- Low-End Recommended Device**: iPhone 13 Pro. 
-- Lowest Supported Device: iPhone XR
+- Low-End Recommended Device: iPhone 13 Pro. 
 
 
 ## How to install
@@ -54,14 +48,67 @@ MeloNX works on iPhone XS/XR and later and iPad 8th Gen and later. Check out the
 
 4. **Enable JIT**  
    - Use your preferred method to enable Just-In-Time (JIT) compilation.  
+   - We reccomend using [StikDebug](https://apps.apple.com/us/app/stikdebug/id6744045754)
 
 5. **Add Necessary Files**  
 
 If having Issues installing firmware (Make sure your Keys are installed first)
-   - If needed, install firmware and keys from **Ryujinx Desktop**.  
+   - If needed, install firmware and keys from **Ryujinx Desktop** (or forks).  
    - Copy the **bis** and **system** folders  
    
-### Xcode
+### Free Developer Account (Experimental)
+
+1. **Sideload MeloNX**  
+   - Use [SideStore](https://sidestore.io/) or [AltStore](https://altstore.io/) (**NOT** AltStore PAL).  
+
+2. **Sideload the Entitlement App**  
+   - Install [this app](https://github.com/hugeBlack/GetMoreRam/releases/download/nightly/Entitlement.ipa) using [SideStore](https://sidestore.io/) or [AltStore](https://altstore.io/) (**NOT** AltStore PAL).  
+
+3. **Sign In to Your Account**  
+   - Open **Settings** in the entitlement app and sign in with your Apple ID.  
+
+4. **Refresh App IDs**  
+   - Navigate to the **App IDs** page.  
+   - Tap **Refresh** to update the list.  
+
+5. **Enable Increased Memory Limit**  
+   - Select **MeloNX** (should be like "com.stossy11.MeloNX" or some variation) from the list.  
+   - Tap **Add Increased Memory Limit**.  
+
+6. **Reinstall MeloNX**  
+   - Delete the existing installation.  
+   - Sideload the app again using SideStore or AltStore.  
+
+7. **Verify Increased Memory Limit**  
+   - Open MeloNX and check if the **Increased Memory Limit** is enabled.  
+
+8. **Add Necessary Files**  
+
+If having Issues installing firmware (Make sure your keys are installed first)
+   - If needed, install firmware and keys from **Ryujinx Desktop** (or forks).  
+   - Copy the **bis** and **system** folders  
+   
+9. **Enable JIT**  
+   - Use your preferred method to enable Just-In-Time (JIT) compilation. 
+   - We recommend using [StikDebug](https://apps.apple.com/us/app/stikdebug/id6744045754)
+   
+
+### TrollStore
+As Said in FAQ:
+> MeloNX is made for iOS 17+, on iOS 15 - 16 MeloNX can be installed but may have issues or not work at all.
+
+1. **Install MeloNX with TrollStore**
+
+2. **Add Necessary Files** 
+
+3. **Enable TrollStore JIT**
+   - MeloNX includes automatic JIT using the TrollStore URL Scheme
+   - Open MeloNX Settings
+   - Scroll down and enable the "TrollStore JIT" toggle
+   - Profit
+
+
+### Free Developer Account (Xcode)
 
 **NOTE: These Xcode builds are nightly and may have unfinished features.**
 
@@ -70,8 +117,8 @@ If having Issues installing firmware (Make sure your Keys are installed first)
 
 2. **Add Necessary Files**  
 
-If having Issues installing firmware (Make sure your Keys are installed first)
-   - If needed, install firmware and keys from **Ryujinx Desktop**.  
+If having Issues installing firmware (Make sure your keys are installed first)
+   - If needed, install firmware and keys from **Ryujinx Desktop** (or forks).  
    - Copy the **bis** and **system** folders  
    
 ## Features
@@ -99,8 +146,7 @@ If having Issues installing firmware (Make sure your Keys are installed first)
 - **Input**
 
   We currently have support for keyboard, touch input, JoyCon input support, and nearly all controllers.
-  Motion controls are natively supported in most cases; for dual-JoyCon motion support, DS4Windows or BetterJoy are currently required.
-  In all scenarios, you can set up everything inside the input configuration menu.
+  Motion controls are natively supported in most cases.
   
 - **DLC & Modifications**
 

distribution/ios/compile.sh

@@ -3,11 +3,13 @@
 # Define the destination directory (hardcoded)
 DESTINATION_DIR="src/MeloNX/Dependencies/Dynamic\ Libraries/Ryujinx.Headless.SDL2.dylib"
 
+dotnet clean
+
 # Restore the project 
 dotnet restore
 
 # Build the project with the specified version 
-dotnet build -c Release
+# dotnet build -c Release
 
 # Publish the project with the specified runtime and settings 
 dotnet publish -c Release -r ios-arm64 -p:ExtraDefineConstants=DISABLE_UPDATER src/Ryujinx.Headless.SDL2 --self-contained true

distribution/ios/get_dotnet.sh

@@ -1,8 +1,7 @@
 #!/bin/bash
 
-XCCONFIG_FILE="${SRCROOT}/MeloNX.xcconfig"
+# XCCONFIG_FILE="${SRCROOT}/MeloNX.xcconfig"
 
-# Define the common paths to search for dotnet, including user-specific directories
 SEARCH_PATHS=(
     "/usr/local/share/dotnet"
     "/usr/local/bin"
@@ -14,10 +13,10 @@ SEARCH_PATHS=(
     "$HOME/Developer"
 )
 
-# Initialize DOTNET_PATH as empty
+
+
 DOTNET_PATH=""
 
-# Search in the defined paths
 for path in "${SEARCH_PATHS[@]}"; do
     if [ -d "$path" ]; then
         DOTNET_PATH=$(find "$path" -name dotnet -type f -print -quit 2>/dev/null)
@@ -27,18 +26,8 @@ for path in "${SEARCH_PATHS[@]}"; do
     fi
 done
 
-# Check if the path was found
 if [ -z "$DOTNET_PATH" ]; then
-    echo "Error: dotnet path not found."
     exit 1
 fi
 
-echo "dotnet path: $DOTNET_PATH"
-
-# Escape the path for sed
-ESCAPED_PATH=$(echo "$DOTNET_PATH" | sed 's/\//\\\//g')
-
-# Update the xcconfig file
-sed -i '' "s/^DOTNET = .*/DOTNET = $ESCAPED_PATH/g" "$XCCONFIG_FILE"
-
-echo "Updated MeloNX.xcconfig with DOTNET path: $DOTNET_PATH"
+echo "$DOTNET_PATH"

distribution/ios/xc-compile.sh

@@ -0,0 +1,21 @@
+dotnet_output=$(./distribution/ios/get_dotnet.sh)
+exit_code=$?
+
+if [ $exit_code -eq 0 ]; then
+    dotnet="$dotnet_output"
+else
+    echo "error: .NET not found, Please follow the compilation instructions on the gitea." >&2
+    exit 1
+fi
+
+$dotnet publish -c Release -r ios-arm64 -p:ExtraDefineConstants=DISABLE_UPDATER src/Ryujinx.Headless.SDL2 --self-contained true
+
+if [ $? -ne 0 ]; then
+    echo "warning: Compiling MeloNX failed! Running dotnet clean + restore then Retrying..."
+    
+    $dotnet clean
+    
+    $dotnet restore
+    
+    $dotnet publish -c Release -r ios-arm64 -p:ExtraDefineConstants=DISABLE_UPDATER src/Ryujinx.Headless.SDL2 --self-contained true
+fi

source.json

@@ -0,0 +1,49 @@
+{
+  "name": "MeloNX",
+  "subtitle": "A source for the MeloNX Application",
+  "description": "Welcome to the MeloNX source! The latest download for MeloNX.",
+  "iconURL": "https://git.743378673.xyz/CycloKid/assets/media/branch/main/Melo/AppIcons/MeloNX.png",
+  "headerURL": "https://cdn.discordapp.com/attachments/1320760161836466257/1331670540447912090/melon-x-not-melo-nx-amiright-guys.png?ex=67f556d6&is=67f40556&hm=71be8f109a14f1c47d8f4965aa017bccb5617962b7a9f5cdfb936a5a8135dad7&",
+  "website": "https://MeloNX.org",
+  "tintColor": "#AE34EB",
+  "featuredApps": [
+    "com.stossy11.MeloNX"
+  ],
+  "apps": [
+      {
+          "name": "MeloNX",
+          "bundleIdentifier": "com.stossy11.MeloNX",
+          "developerName": "Stossy11",
+          "subtitle": "An NX Emulator.",
+          "localizedDescription": "MeloNX is an iOS Nintendo Switch emulator based on Ryujinx, written primarily in C#. Designed to bring accurate performance and a user-friendly interface to iOS, MeloNX makes Switch games accessible on Apple devices. Developed from the ground up, MeloNX is open-source and available on a custom Gitea server under the MeloNX license (Based on MIT) (requires increased memory limit)",
+          "iconURL": "https://git.743378673.xyz/CycloKid/assets/media/branch/main/Melo/AppIcons/MeloNX.png",
+          "tintColor": "#AE34EB",
+          "category": "games",
+          "screenshots": [
+              "https://git.743378673.xyz/stossy11/screenshots/raw/branch/main/IMG_0380.PNG",
+              "https://git.743378673.xyz/stossy11/screenshots/raw/branch/main/IMG_0381.PNG"
+          ],
+          "versions": [
+            {
+              "version": "1.7.0",
+              "buildVersion": "1",
+              "date": "2025-04-08",
+              "localizedDescription": "First AltStore release!",
+              "downloadURL": "https://git.743378673.xyz/MeloNX/MeloNX/releases/download/1.7.0/MeloNX.ipa",
+              "size": 79821,
+              "minOSVersion": "15.0"
+            }
+          ],
+          "appPermissions": {
+            "entitlements": [
+              "get-task-allow",
+              "com.apple.developer.kernel.increased-memory-limit"
+            ], 
+            "privacy": {
+                "NSPhotoLibraryAddUsageDescription": "MeloNX needs access to your Photo Library in order to save screenshots."
+            }
+          }
+      }
+  ],
+  "news": []
+}

src/ARMeilleure/Translation/Translator.cs

@@ -75,7 +75,7 @@ namespace ARMeilleure.Translation
             FunctionTable = new AddressTable<ulong>(for64Bits ? _levels64Bit : _levels32Bit);
             Stubs = new TranslatorStubs(FunctionTable);
 
-            FunctionTable.Fill = (ulong)Stubs.SlowDispatchStub;
+            FunctionTable.Fill = (ulong)Stubs.DispatchStub;
         }
 
         public IPtcLoadState LoadDiskCache(string titleIdText, string displayVersion, bool enabled)

src/MeloNX/MeloNX.xcconfig

@@ -8,6 +8,4 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-VERSION = 1.5.0
-
-DOTNET = /usr/local/share/dotnet/dotnet
+VERSION = 1.7.0

src/MeloNX/MeloNX.xcodeproj/project.pbxproj

@@ -24,7 +24,7 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
-		4E0DED342D05695D00FEF007 /* SwiftUIJoystick in Frameworks */ = {isa = PBXBuildFile; productRef = 4E0DED332D05695D00FEF007 /* SwiftUIJoystick */; };
+		4549A31C2DD8795900EC8D88 /* CocoaAsyncSocket in Frameworks */ = {isa = PBXBuildFile; productRef = 4549A31B2DD8795900EC8D88 /* CocoaAsyncSocket */; };
 		4E12B23C2D797CFA00FB2271 /* MeloNX.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 4E12B23B2D797CFA00FB2271 /* MeloNX.xcconfig */; };
 		4E8A80772D5FDD2D0041B48F /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E80AA622CD7122800029585 /* GameController.framework */; };
 		4EA5AE822D16807500AD0B9F /* SwiftSVG in Frameworks */ = {isa = PBXBuildFile; productRef = 4EA5AE812D16807500AD0B9F /* SwiftSVG */; };
@@ -32,6 +32,13 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
+		4E59B0A32DEA5CA9004BFF2A /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 4E80A9852CD6F54500029585 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = BD43C6212D1B248D003BBC42;
+			remoteInfo = com.Stossy11.MeloNX.RyujinxAg;
+		};
 		4E80A99E2CD6F54700029585 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 4E80A9852CD6F54500029585 /* Project object */;
@@ -109,7 +116,11 @@
 				"Dependencies/Dynamic Libraries/Ryujinx.Headless.SDL2.dylib" = (
 					CodeSignOnCopy,
 				);
-				"Dependencies/Dynamic Libraries/RyujinxKeyboard.framework" = (
+				"Dependencies/Dynamic Libraries/RyujinxHelper.framework" = (
+					CodeSignOnCopy,
+					RemoveHeadersOnCopy,
+				);
+				"Dependencies/Dynamic Libraries/StosJIT.framework" = (
 					CodeSignOnCopy,
 					RemoveHeadersOnCopy,
 				);
@@ -122,10 +133,6 @@
 				"Dependencies/Dynamic Libraries/libavutil.dylib" = (
 					CodeSignOnCopy,
 				);
-				Dependencies/XCFrameworks/MoltenVK.xcframework = (
-					CodeSignOnCopy,
-					RemoveHeadersOnCopy,
-				);
 				Dependencies/XCFrameworks/SDL2.xcframework = (
 					CodeSignOnCopy,
 					RemoveHeadersOnCopy,
@@ -170,7 +177,8 @@
 				"Dependencies/Dynamic Libraries/libavutil.dylib",
 				"Dependencies/Dynamic Libraries/libMoltenVK.dylib",
 				"Dependencies/Dynamic Libraries/Ryujinx.Headless.SDL2.dylib",
-				"Dependencies/Dynamic Libraries/RyujinxKeyboard.framework",
+				"Dependencies/Dynamic Libraries/RyujinxHelper.framework",
+				"Dependencies/Dynamic Libraries/StosJIT.framework",
 				Dependencies/XCFrameworks/libavcodec.xcframework,
 				Dependencies/XCFrameworks/libavfilter.xcframework,
 				Dependencies/XCFrameworks/libavformat.xcframework,
@@ -179,7 +187,6 @@
 				Dependencies/XCFrameworks/libswresample.xcframework,
 				Dependencies/XCFrameworks/libswscale.xcframework,
 				Dependencies/XCFrameworks/libteakra.xcframework,
-				Dependencies/XCFrameworks/MoltenVK.xcframework,
 				Dependencies/XCFrameworks/SDL2.xcframework,
 			);
 		};
@@ -196,8 +203,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4E0DED342D05695D00FEF007 /* SwiftUIJoystick in Frameworks */,
 				CA8F9C322D3F5AB200D7E586 /* GameController.framework in Frameworks */,
+				4549A31C2DD8795900EC8D88 /* CocoaAsyncSocket in Frameworks */,
 				4EA5AE822D16807500AD0B9F /* SwiftSVG in Frameworks */,
 				4E8A80772D5FDD2D0041B48F /* GameController.framework in Frameworks */,
 			);
@@ -257,12 +264,12 @@
 /* Begin PBXLegacyTarget section */
 		BD43C61D2D1B23AB003BBC42 /* Ryujinx */ = {
 			isa = PBXLegacyTarget;
-			buildArgumentsString = "publish -c Release -r ios-arm64 -p:ExtraDefineConstants=DISABLE_UPDATER src/Ryujinx.Headless.SDL2 --self-contained true";
+			buildArgumentsString = "./distribution/ios/xc-compile.sh";
 			buildConfigurationList = BD43C61E2D1B23AB003BBC42 /* Build configuration list for PBXLegacyTarget "Ryujinx" */;
 			buildPhases = (
 			);
-			buildToolPath = "$(DOTNET)";
-			buildWorkingDirectory = "$(SRCROOT)/../..";
+			buildToolPath = /bin/sh;
+			buildWorkingDirectory = "$(SRCROOT)/../../";
 			dependencies = (
 			);
 			name = Ryujinx;
@@ -287,14 +294,15 @@
 			buildRules = (
 			);
 			dependencies = (
+				4E59B0A42DEA5CA9004BFF2A /* PBXTargetDependency */,
 			);
 			fileSystemSynchronizedGroups = (
 				4E80A98F2CD6F54500029585 /* MeloNX */,
 			);
 			name = MeloNX;
 			packageProductDependencies = (
-				4E0DED332D05695D00FEF007 /* SwiftUIJoystick */,
 				4EA5AE812D16807500AD0B9F /* SwiftSVG */,
+				4549A31B2DD8795900EC8D88 /* CocoaAsyncSocket */,
 			);
 			productName = MeloNX;
 			productReference = 4E80A98D2CD6F54500029585 /* MeloNX.app */;
@@ -354,7 +362,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1620;
-				LastUpgradeCheck = 1610;
+				LastUpgradeCheck = 1620;
 				TargetAttributes = {
 					4E80A98C2CD6F54500029585 = {
 						CreatedOnToolsVersion = 16.1;
@@ -385,8 +393,8 @@
 			mainGroup = 4E80A9842CD6F54500029585;
 			minimizedProjectReferenceProxies = 1;
 			packageReferences = (
-				4E0DED322D05695D00FEF007 /* XCRemoteSwiftPackageReference "SwiftUIJoystick" */,
 				4EA5AE802D16807500AD0B9F /* XCRemoteSwiftPackageReference "SwiftSVG" */,
+				4549A31A2DD8795900EC8D88 /* XCRemoteSwiftPackageReference "CocoaAsyncSocket" */,
 			);
 			preferredProjectObjectVersion = 56;
 			productRefGroup = 4E80A98E2CD6F54500029585 /* Products */;
@@ -445,7 +453,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cd ../..\nmv src/Ryujinx.Headless.SDL2/bin/Release/net8.0/ios-arm64/native/Ryujinx.Headless.SDL2.dylib src/MeloNX/MeloNX/Dependencies/Dynamic\\ Libraries/Ryujinx.Headless.SDL2.dylib\n";
+			shellScript = "cd ../..\nmv src/Ryujinx.Headless.SDL2/bin/Release/net8.0/ios-arm64/publish/Ryujinx.Headless.SDL2.dylib src/MeloNX/MeloNX/Dependencies/Dynamic\\ Libraries/Ryujinx.Headless.SDL2.dylib\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -474,6 +482,11 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
+		4E59B0A42DEA5CA9004BFF2A /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = BD43C6212D1B248D003BBC42 /* com.Stossy11.MeloNX.RyujinxAg */;
+			targetProxy = 4E59B0A32DEA5CA9004BFF2A /* PBXContainerItemProxy */;
+		};
 		4E80A99F2CD6F54700029585 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 4E80A98C2CD6F54500029585 /* MeloNX */;
@@ -557,6 +570,7 @@
 				ONLY_ACTIVE_ARCH = NO;
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
+				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_ENFORCE_EXCLUSIVE_ACCESS = "debug-only";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 			};
@@ -623,6 +637,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_DISABLE_SAFETY_CHECKS = YES;
+				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_ENFORCE_EXCLUSIVE_ACCESS = "debug-only";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -693,8 +708,73 @@
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 				);
-				GCC_OPTIMIZATION_LEVEL = fast;
+				GCC_OPTIMIZATION_LEVEL = z;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = MeloNX/Info.plist;
 				INFOPLIST_KEY_GCSupportsControllerUserInteraction = YES;
@@ -705,10 +785,10 @@
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
-				INFOPLIST_KEY_UIRequiresFullScreen = YES;
+				INFOPLIST_KEY_UIRequiresFullScreen = NO;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
 				INFOPLIST_KEY_UISupportsDocumentBrowser = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -808,10 +888,132 @@
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 				);
 				MARKETING_VERSION = "$(VERSION)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.stossy11.MeloNX;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "MeloNX/App/Core/Headers/Ryujinx-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -884,8 +1086,73 @@
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 				);
-				GCC_OPTIMIZATION_LEVEL = fast;
+				GCC_OPTIMIZATION_LEVEL = z;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = MeloNX/Info.plist;
 				INFOPLIST_KEY_GCSupportsControllerUserInteraction = YES;
@@ -896,10 +1163,10 @@
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
-				INFOPLIST_KEY_UIRequiresFullScreen = YES;
+				INFOPLIST_KEY_UIRequiresFullScreen = NO;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
 				INFOPLIST_KEY_UISupportsDocumentBrowser = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -999,10 +1266,132 @@
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 				);
 				MARKETING_VERSION = "$(VERSION)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.stossy11.MeloNX;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "MeloNX/App/Core/Headers/Ryujinx-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -1198,12 +1587,12 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		4E0DED322D05695D00FEF007 /* XCRemoteSwiftPackageReference "SwiftUIJoystick" */ = {
+		4549A31A2DD8795900EC8D88 /* XCRemoteSwiftPackageReference "CocoaAsyncSocket" */ = {
 			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/michael94ellis/SwiftUIJoystick";
+			repositoryURL = "https://github.com/robbiehanson/CocoaAsyncSocket";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 1.5.0;
+				minimumVersion = 7.6.5;
 			};
 		};
 		4EA5AE802D16807500AD0B9F /* XCRemoteSwiftPackageReference "SwiftSVG" */ = {
@@ -1217,10 +1606,10 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		4E0DED332D05695D00FEF007 /* SwiftUIJoystick */ = {
+		4549A31B2DD8795900EC8D88 /* CocoaAsyncSocket */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 4E0DED322D05695D00FEF007 /* XCRemoteSwiftPackageReference "SwiftUIJoystick" */;
-			productName = SwiftUIJoystick;
+			package = 4549A31A2DD8795900EC8D88 /* XCRemoteSwiftPackageReference "CocoaAsyncSocket" */;
+			productName = CocoaAsyncSocket;
 		};
 		4EA5AE812D16807500AD0B9F /* SwiftSVG */ = {
 			isa = XCSwiftPackageProductDependency;

src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,6 +1,15 @@
 {
-  "originHash" : "d611b071fbe94fdc9900a07a218340eab4ce2c3c7168bf6542f2830c0400a72b",
+  "originHash" : "b4a593815773c4e9eedb98cabe88f41620776314bffb6c39d5a41cb743e4d390",
   "pins" : [
+    {
+      "identity" : "cocoaasyncsocket",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/robbiehanson/CocoaAsyncSocket",
+      "state" : {
+        "revision" : "dbdc00669c1ced63b27c3c5f052ee4d28f10150c",
+        "version" : "7.6.5"
+      }
+    },
     {
       "identity" : "swiftsvg",
       "kind" : "remoteSourceControl",
@@ -9,15 +18,6 @@
         "branch" : "master",
         "revision" : "88b9ee086b29019e35f6f49c8e30e5552eb8fa9d"
       }
-    },
-    {
-      "identity" : "swiftuijoystick",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/michael94ellis/SwiftUIJoystick",
-      "state" : {
-        "revision" : "5bd303cdafb369a70a45c902538b42dd3c5f4d65",
-        "version" : "1.5.0"
-      }
     }
   ],
   "version" : 3

src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/brandon.xcuserdatad/IDEFindNavigatorScopes.plist

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<array/>
-</plist>

src/MeloNX/MeloNX.xcodeproj/xcshareddata/xcschemes/MeloNX.xcscheme

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1610"
-   version = "1.7">
+   LastUpgradeVersion = "1620"
+   version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES"
@@ -62,10 +62,13 @@
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugXPCServices = "NO"
       debugServiceExtension = "internal"
       enableGPUValidationMode = "1"
-      showGraphicsOverview = "Yes"
-      allowLocationSimulation = "YES">
+      allowLocationSimulation = "YES"
+      queueDebuggingEnabled = "No"
+      consoleMode = "0"
+      structuredConsoleMode = "2">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
          <BuildableReference
@@ -105,8 +108,17 @@
             ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
             <ActionContent
                title = "Run Script"
-               scriptText = "REPO_DIR=&quot;$(cd &quot;${SRCROOT}/../../&quot; &amp;&amp; pwd)&quot;&#10;SCRIPT_PATH=&quot;$REPO_DIR/distribution/ios/set_current_version.sh&quot;&#10;&#10;sh &quot;${SCRIPT_PATH}&quot;&#10;"
+               scriptText = "REPO_DIR=&quot;$(cd &quot;${SRCROOT}/../../&quot; &amp;&amp; pwd)&quot;&#10;SCRIPT_PATH=&quot;$REPO_DIR/distribution/ios/set_current_version.sh&quot;&#10;&#10;echo &quot;hi&quot;&#10;&#10;sh &quot;${SCRIPT_PATH}&quot;&#10;"
                shellToInvoke = "/bin/bash">
+               <EnvironmentBuildable>
+                  <BuildableReference
+                     BuildableIdentifier = "primary"
+                     BlueprintIdentifier = "4E80A98C2CD6F54500029585"
+                     BuildableName = "MeloNX.app"
+                     BlueprintName = "MeloNX"
+                     ReferencedContainer = "container:MeloNX.xcodeproj">
+                  </BuildableReference>
+               </EnvironmentBuildable>
             </ActionContent>
          </ExecutionAction>
       </PreActions>

src/MeloNX/MeloNX.xcodeproj/xcshareddata/xcschemes/Ryujinx.xcscheme

@@ -11,7 +11,7 @@
             ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
             <ActionContent
                title = "Run Script"
-               scriptText = "REPO_DIR=&quot;$(cd &quot;${SRCROOT}/../../&quot; &amp;&amp; pwd)&quot;&#10;SCRIPT_PATH=&quot;$REPO_DIR/distribution/ios/get_dotnet.sh&quot;&#10;&#10;sh &quot;${SCRIPT_PATH}&quot;&#10;"
+               scriptText = "REPO_DIR=&quot;$(cd &quot;${SRCROOT}/../../&quot; &amp;&amp; pwd)&quot;&#10;SCRIPT_PATH=&quot;$REPO_DIR/distribution/ios/get_dotnet.sh&quot;&#10;&#10;echo &quot;Xcode is located at: $DEVELOPER_DIR&quot;&#10;&#10;sh &quot;${SCRIPT_PATH}&quot;&#10;"
                shellToInvoke = "/bin/bash">
                <EnvironmentBuildable>
                   <BuildableReference

src/MeloNX/MeloNX/App/Core/Entitlements/EntitlementChecker.swift

@@ -17,11 +17,20 @@ func SecTaskCopyValueForEntitlement(
     _ error: NSErrorPointer
 ) -> CFTypeRef?
 
+@_silgen_name("SecTaskCopyTeamIdentifier")
+func SecTaskCopyTeamIdentifier(
+    _ task: SecTaskRef,
+    _ error: NSErrorPointer
+) -> NSString?
+
 @_silgen_name("SecTaskCreateFromSelf")
 func SecTaskCreateFromSelf(
     _ allocator: CFAllocator?
 ) -> SecTaskRef?
 
+@_silgen_name("CFRelease")
+func CFRelease(_ cf: CFTypeRef)
+
 @_silgen_name("SecTaskCopyValuesForEntitlements")
 func SecTaskCopyValuesForEntitlements(
     _ task: SecTaskRef,
@@ -29,30 +38,43 @@ func SecTaskCopyValuesForEntitlements(
     _ error: UnsafeMutablePointer<Unmanaged<CFError>?>?
 ) -> CFDictionary?
 
+func releaseSecTask(_ task: SecTaskRef) {
+    let cf = unsafeBitCast(task, to: CFTypeRef.self)
+    CFRelease(cf)
+}
+
 func checkAppEntitlements(_ ents: [String]) -> [String: Any] {
     guard let task = SecTaskCreateFromSelf(nil) else {
-        print("Failed to create SecTask")
         return [:]
     }
+    defer {
+        releaseSecTask(task)
+    }
 
     guard let entitlements = SecTaskCopyValuesForEntitlements(task, ents as CFArray, nil) else {
-        print("Failed to get entitlements")
         return [:]
     }
 
-    return (entitlements as? [String: Any]) ?? [:]
+    return (entitlements as NSDictionary) as? [String: Any] ?? [:]
 }
 
 func checkAppEntitlement(_ ent: String) -> Bool {
     guard let task = SecTaskCreateFromSelf(nil) else {
-        print("Failed to create SecTask")
+        return false
+    }
+    defer {
+        releaseSecTask(task)
+    }
+
+    guard let entitlement = SecTaskCopyValueForEntitlement(task, ent as NSString, nil) else {
         return false
     }
 
-    guard let entitlements = SecTaskCopyValueForEntitlement(task, ent as NSString, nil) else {
-        print("Failed to get entitlements")
-        return false
+    if let number = entitlement as? NSNumber {
+        return number.boolValue
+    } else if let bool = entitlement as? Bool {
+        return bool
     }
 
-    return entitlements.boolValue != nil && entitlements.boolValue
+    return false
 }

src/MeloNX/MeloNX/App/Core/Headers/Ryujinx-Header.h

@@ -14,6 +14,7 @@
 
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_syswm.h>
+#include <StosJIT/StosJIT-Swift.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -50,6 +51,8 @@ char* installed_firmware_version();
 
 void set_native_window(void *layerPtr);
 
+void pause_emulation(bool shouldPause);
+
 void stop_emulation();
 
 void initialize();

src/MeloNX/MeloNX/App/Core/JIT/IsJITEnabled.swift

@@ -20,6 +20,14 @@ func isJITEnabled() -> Bool {
     return csops(pid: getpid(), ops: 0, useraddr: &flags, usersize: Int32(MemoryLayout.size(ofValue: flags))) == 0 && (flags & Int(CS_DEBUGGED)) != 0 ? allocateTest() : false
 }
 
+func checkDebugged() -> Bool {
+    var flags: Int = 0
+    if checkAppEntitlement("dynamic-codesigning") {
+        return true
+    }
+    return csops(pid: getpid(), ops: 0, useraddr: &flags, usersize: Int32(MemoryLayout.size(ofValue: flags))) == 0 && (flags & Int(CS_DEBUGGED)) != 0
+}
+
 func checkMemoryPermissions(at address: UnsafeRawPointer) -> Bool {
     var region: vm_address_t = vm_address_t(UInt(bitPattern: address))
     var regionSize: vm_size_t = 0
@@ -34,7 +42,7 @@ func checkMemoryPermissions(at address: UnsafeRawPointer) -> Bool {
     }
     
     if result != KERN_SUCCESS {
-        print("Failed to reach \(address)")
+        // print("Failed to reach \(address)")
         return false
     }
     
@@ -54,6 +62,7 @@ func allocateTest() -> Bool {
     
     memcpy(jitMemory, code, code.count)
     
+    
     if mprotect(jitMemory, pageSize, PROT_READ | PROT_EXEC) != 0 {
         return false
     }

src/MeloNX/MeloNX/App/Core/JIT/JitStreamerEB/EnableJIT.swift

@@ -6,39 +6,122 @@
 //
 
 import Foundation
+import Network
+import UIKit
 
 func enableJITEB() {
-    guard let bundleID = Bundle.main.bundleIdentifier else {
+    if UserDefaults.standard.bool(forKey: "waitForVPN") {
+        waitForVPNConnection { connected in
+            if connected {
+                enableJITEBRequest()
+            }
+        }
+    } else {
+        enableJITEBRequest()
+    }
+}
+
+func enableJITEBRequest() {
+    let pid = Int(getpid())
+    // print(pid)
+    
+    let address = URL(string: "http://[fd00::]:9172/attach/\(pid)")!
+    var request = URLRequest(url: address)
+    request.httpMethod = "POST"
+    request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+    
+    let task = URLSession.shared.dataTask(with: request) { data, response, error in
+        if let error = error {
+            presentAlert(title: "Request Error", message: error.localizedDescription)
             return
         }
         
-    let address = URL(string: "http://[fd00::]:9172/launch_app/\(bundleID)")!
-    
-    let task = URLSession.shared.dataTask(with: address) { data, response, error in
-        if error != nil {
-            return
-        }
-        
-        
-        guard let httpResponse = response as? HTTPURLResponse else {
-            return
-        }
         DispatchQueue.main.async {
-            showLaunchAppAlert(jsonData: data!, in: UIApplication.shared.windows.last!.rootViewController!)
+            if let data = data, let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene {
+                showLaunchAppAlert(jsonData: data, in: windowScene.windows.last!.rootViewController!)
+            } else {
+                fatalError("Unable to get Window")
+            }
         }
-        
-        return
     }
     
     task.resume()
 }
 
+func waitForVPNConnection(timeout: TimeInterval = 30, interval: TimeInterval = 1, _ completion: @escaping (Bool) -> Void) {
+    let startTime = Date()
+    let timer = DispatchSource.makeTimerSource(queue: DispatchQueue.global(qos: .background))
+    
+    timer.schedule(deadline: .now(), repeating: interval)
+    
+    timer.setEventHandler {
+        pingSite { connected in
+            if connected {
+                timer.cancel()
+                DispatchQueue.main.async {
+                    completion(true)
+                }
+            } else if Date().timeIntervalSince(startTime) > timeout {
+                timer.cancel()
+                DispatchQueue.main.async {
+                    completion(false)
+                }
+            }
+        }
+    }
+    
+    timer.resume()
+}
+
+func pingSite(host: String = "http://[fd00::]:9172/hello", completion: @escaping (Bool) -> Void) {
+    guard let url = URL(string: host) else {
+        completion(false)
+        return
+    }
+    
+    let config = URLSessionConfiguration.default
+    config.timeoutIntervalForRequest = 2.0
+    config.timeoutIntervalForResource = 2.0
+    
+    let session = URLSession(configuration: config)
+    
+    var request = URLRequest(url: url)
+    request.httpMethod = "GET"
+    
+    let task = session.dataTask(with: request) { _, response, error in
+        if let error = error {
+            // print("Ping failed: \(error.localizedDescription)")
+            completion(false)
+        } else if let httpResponse = response as? HTTPURLResponse, httpResponse.statusCode == 200 {
+            completion(true)
+        } else {
+            let httpResponse = response as? HTTPURLResponse
+            completion(false)
+        }
+    }
+    
+    task.resume()
+}
+
+
+func presentAlert(title: String, message: String, completion: (() -> Void)? = nil) {
+    if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
+       let lastWindow = windowScene.windows.last {
+        let alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
+        alert.addAction(UIAlertAction(title: "OK", style: .default) { _ in
+            completion?()
+        })
+        
+        DispatchQueue.main.async {
+            lastWindow.rootViewController?.present(alert, animated: true)
+        }
+    }
+}
+
+
 struct LaunchApp: Codable {
-    let ok: Bool
-    let error: String?
-    let launching: Bool
-    let position: Int?
-    let mounting: Bool
+    let success: Bool
+    let message: String
 }
 
 func showLaunchAppAlert(jsonData: Data, in viewController: UIViewController) {
@@ -47,28 +130,23 @@ func showLaunchAppAlert(jsonData: Data, in viewController: UIViewController) {
         
         var message = ""
         
-        if let error = result.error {
-            message = "Error: \(error)"
-        } else if result.mounting {
-            message = "App is mounting..."
-        } else if result.launching {
-            message = "App is launching..."
-        } else {
-            message = "App launch status unknown."
-        }
+        if !result.success {
+            message += "\n\(result.message)"
             
-        if let position = result.position {
-            message += "\nPosition: \(position)"
-        }
             
-        let alert = UIAlertController(title: "Launch Status", message: message, preferredStyle: .alert)
+            let alert = UIAlertController(title: "JIT Error", message: message, preferredStyle: .alert)
             alert.addAction(UIAlertAction(title: "OK", style: .default))
             
             DispatchQueue.main.async {
                 viewController.present(alert, animated: true)
             }
+        } else {
+            // print("Hopefully JIT is enabled now...")
+            Ryujinx.shared.ryuIsJITEnabled()
+        }
         
     } catch {
+        // print(String(data: jsonData, encoding: .utf8))
         let alert = UIAlertController(title: "Decoding Error", message: error.localizedDescription, preferredStyle: .alert)
         alert.addAction(UIAlertAction(title: "OK", style: .default))
         

src/MeloNX/MeloNX/App/Core/JIT/StikJIT/StikEnableJIT.swift

@@ -0,0 +1,63 @@
+//
+//  EnableJIT.swift
+//  MeloNX
+//
+//  Created by Stossy11 on 10/02/2025.
+//
+
+import Foundation
+import Network
+import UIKit
+
+
+
+func stikJITorStikDebug() -> Int {
+    let teamid = SecTaskCopyTeamIdentifier(SecTaskCreateFromSelf(nil)!, nil)
+    
+    if checkifappinstalled("com.stik.sj") {
+        return 1 // StikDebug
+    }
+    
+    if checkifappinstalled("com.stik.sj.\(String(teamid ?? ""))") {
+        return 2 // StikJIT
+    }
+    
+    return 0 // Not Found
+}
+
+
+func checkifappinstalled(_ id: String) -> Bool {
+    
+    guard let handle = dlopen("/System/Library/PrivateFrameworks/SpringBoardServices.framework/SpringBoardServices", RTLD_LAZY) else {
+        if let error = dlerror() {
+            print(String(cString: error))
+        }
+        return false
+        // fatalError("Failed to open dylib")
+    }
+    
+    typealias SBSLaunchApplicationWithIdentifierFunc = @convention(c) (CFString, Bool) -> Int32
+    guard let sym = dlsym(handle, "SBSLaunchApplicationWithIdentifier") else {
+        if let error = dlerror() {
+            print(String(cString: error))
+        }
+        dlclose(handle)
+        return false
+    }
+    
+    let bundleID: CFString = id as CFString
+    let suspended: Bool = false
+    
+
+    let SBSLaunchApplicationWithIdentifier = unsafeBitCast(sym, to: SBSLaunchApplicationWithIdentifierFunc.self)
+    let result = SBSLaunchApplicationWithIdentifier(bundleID, suspended)
+
+    return result == 9
+}
+
+func enableJITStik() {
+    let urlScheme = "stikjit://enable-jit?bundle-id=\(Bundle.main.bundleIdentifier ?? "wow")"
+    if let launchURL = URL(string: urlScheme), !isJITEnabled() {
+        UIApplication.shared.open(launchURL, options: [:], completionHandler: nil)
+    }
+}

src/MeloNX/MeloNX/App/Core/Ryujinx/Controller/BaseController.swift

@@ -0,0 +1,14 @@
+//
+//  BaseController.swift
+//  MeloNX
+//
+//  Created by MediaMoots on 5/17/2025.
+//
+
+//──────────────────────────────────────────────────────────────────────── MARK:- Base Controller Protocol
+
+/// Base Controller with motion related functions
+protocol BaseController: AnyObject {
+    func tryRegisterMotion(slot: UInt8)
+    func tryGetMotionProvider() -> DSUMotionProvider?
+}

src/MeloNX/MeloNX/App/Core/Ryujinx/Controller/Motion/DSUMotionProviders.swift

@@ -0,0 +1,178 @@
+//
+//  DSUMotionProviders.swift
+//
+//  Multi-source Cemuhook-compatible DSU server.
+//  Created by MediaMoots on 5/17/2025.
+//
+//
+
+import CoreMotion
+import GameController           // GCController
+
+//──────────────────────────────────────────────────────────────────────── MARK:- Providers
+
+/// iPhone / iPad IMU
+final class DeviceMotionProvider: DSUMotionProvider {
+
+    // ───── DSUMotionProvider conformance
+    let slot: UInt8
+    let mac:  [UInt8] = [0xAB,0x12,0xCD,0x34,0xEF,0x56]
+    let connectionType: UInt8 = 2
+    let batteryLevel:   UInt8 = 5
+    let motionRate:     Double = 60.0          // 60 Hz
+
+    // ───── Internals
+    private let mm = CMMotionManager()
+    
+    // Thread Safety
+    private let dataLock = NSLock()
+    private var _latest: CMDeviceMotion?
+    private var latest: CMDeviceMotion? {
+        get { dataLock.lock(); defer { dataLock.unlock() }; return _latest }
+        set { dataLock.lock(); _latest = newValue; dataLock.unlock() }
+    }
+
+    private var orientation: UIDeviceOrientation =
+        UIDevice.current.orientation == .unknown ? .landscapeLeft : UIDevice.current.orientation
+
+    init(slot: UInt8) {
+        precondition(slot < 8, "DSU only supports slots 0…7")
+        self.slot = slot
+
+        // ── start Core Motion
+        mm.deviceMotionUpdateInterval = 1.0 / motionRate
+        mm.startDeviceMotionUpdates(to: .main) { [weak self] m, _ in
+            guard let self = self, let m = m else { return }
+            self.latest = m
+            if let sample = self.nextSample() {
+                DSUServer.shared.pushSample(sample, from: self)
+            }
+        }
+
+        // ── track orientation changes (ignore flat)
+        UIDevice.current.beginGeneratingDeviceOrientationNotifications()
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(orientationDidChange),
+            name: UIDevice.orientationDidChangeNotification,
+            object: nil
+        )
+    }
+
+    @objc private func orientationDidChange() {
+        let o = UIDevice.current.orientation
+        if o.isFlat { return }          // ignore face-up / face-down
+        orientation = o
+    }
+
+    func nextSample() -> DSUMotionSample? {
+        guard let m = latest else { return nil }
+
+        // Raw values
+        let gx = Float(m.rotationRate.x)
+        let gy = Float(m.rotationRate.y)
+        let gz = Float(m.rotationRate.z)
+        let ax = Float(m.gravity.x + m.userAcceleration.x)
+        let ay = Float(m.gravity.y + m.userAcceleration.y)
+        let az = Float(m.gravity.z + m.userAcceleration.z)
+
+        // Rotate axes to match Cemuhook's "landscape-left as neutral" convention
+        let a: SIMD3<Float>
+        let g: SIMD3<Float>
+
+        switch orientation {
+        case .portrait:
+            a = SIMD3(  ax,  az, -ay)
+            g = SIMD3(  gx, -gz,  gy)
+        case .landscapeRight:
+            a = SIMD3(  ay,  az,  ax)
+            g = SIMD3(  gy, -gz, -gx)
+        case .portraitUpsideDown:
+            a = SIMD3( -ax,  az,  ay)
+            g = SIMD3( -gx, -gz, -gy)
+        case .landscapeLeft, .unknown, .faceUp, .faceDown:
+            a = SIMD3( -ay,  az, -ax)
+            g = SIMD3( -gy, -gz,  gx)
+        @unknown default:
+            return nil
+        }
+
+        // Convert gyro rad/s → °/s here so the server doesn't have to.
+        let gDeg = g * (180 / .pi)
+
+        return DSUMotionSample(timestampUS: currentUS(),
+                               accel: a,
+                               gyroDeg: gDeg)
+    }
+}
+
+// Any Switch Pro / DualSense controller that exposes `GCMotion`
+final class ControllerMotionProvider: DSUMotionProvider {
+
+    // DSUMotionProvider
+    let slot: UInt8
+    let mac:  [UInt8] = [0xAB,0x12,0xCD,0x34,0xEF,0x56]
+    let connectionType: UInt8 = 2
+    var batteryLevel: UInt8 {
+        UInt8((pad.battery?.batteryLevel ?? 0.3) * 5).clamped(to: 0...5)
+    }
+
+    private let pad: GCController
+    
+    // Thread Safety
+    private let dataLock = NSLock()
+    private var _latest: GCMotion?
+    private var latest: GCMotion? {
+        get { dataLock.lock(); defer { dataLock.unlock() }; return _latest }
+        set { dataLock.lock(); _latest = newValue; dataLock.unlock() }
+    }
+
+    init(controller: GCController, slot: UInt8) {
+        self.pad  = controller
+        self.slot = slot
+        pad.motion?.sensorsActive = true
+        pad.motion?.valueChangedHandler = { [weak self] motion in
+            guard let self = self else { return }
+            self.latest = motion
+            if let sample = self.nextSample() {
+                DSUServer.shared.pushSample(sample, from: self)
+            }
+        }
+    }
+
+    func nextSample() -> DSUMotionSample? {
+        guard let m = latest else { return nil }
+
+        // Extract and convert acceleration to SIMD3<Float>
+        let a = SIMD3<Float>(
+            Float(m.acceleration.x),
+            Float(m.acceleration.z),
+            -Float(m.acceleration.y)
+        )
+
+        // Extract, transform, and convert rotation rate to SIMD3<Float> (in radians/s)
+        let g = SIMD3<Float>(
+            Float(m.rotationRate.x),
+            -Float(m.rotationRate.z),
+            Float(m.rotationRate.y)
+        )
+
+        // Convert gyro rotation rate from rad/s to degrees/s
+        let gDeg = g *  (180 / .pi)
+
+        return DSUMotionSample(
+            timestampUS: currentUS(),
+            accel: a,
+            gyroDeg: gDeg
+        )
+    }
+}
+
+//──────────────────────────────────────────────────────────────────────── MARK:- Helper funcs / ext
+
+private func uint64US(_ time: TimeInterval) -> UInt64 { UInt64(time * 1_000_000) }
+private func currentUS() -> UInt64 { uint64US(CACurrentMediaTime()) }
+
+private extension Comparable {
+    func clamped(to r: ClosedRange<Self>) -> Self { min(max(self, r.lowerBound), r.upperBound) }
+}

src/MeloNX/MeloNX/App/Core/Ryujinx/Controller/Motion/DSUServer.swift

@@ -0,0 +1,217 @@
+//
+//  DSUServer.swift
+//
+//  Multi-source Cemuhook-compatible DSU server.
+//  Created by MediaMoots on 5/17/2025.
+//
+//
+
+import Foundation
+import CocoaAsyncSocket         // GCDAsyncUdpSocket
+import zlib                     // CRC-32
+
+//──────────────────────────────────────────────────────────────────────── MARK:- DSU Motion protocol
+
+/// One motion source == one DSU *slot* (0-7).
+protocol DSUMotionProvider: AnyObject {
+    var slot: UInt8                { get }        // unique, 0-7
+    var mac:  [UInt8]              { get }        // 6-byte ID
+    var connectionType: UInt8      { get }        // 0 = USB, 2 = BT
+    var batteryLevel:   UInt8      { get }        // 0-5 (Cemuhook)
+    
+    func nextSample() -> DSUMotionSample?
+}
+
+/// Raw motion payload returned by providers.
+struct DSUMotionSample {
+    var timestampUS: UInt64        // µs
+    var accel: SIMD3<Float>        // G's
+    var gyroDeg: SIMD3<Float>      // °/s
+}
+
+//──────────────────────────────────────────────────────────────────────── MARK:- Server constants
+
+private enum C {
+    static let port: UInt16                 = 26_760
+    static let protocolVersion: UInt16      = 1_001
+    static let headerMagic                  = "DSUS"
+}
+
+//──────────────────────────────────────────────────────────────────────── MARK:- Server core
+
+final class DSUServer: NSObject {
+
+    // Singleton for convenience
+    static let shared = DSUServer()
+    private override init() {
+        serverID = UInt32.random(in: .min ... .max)
+        super.init()
+        configureSocket()
+    }
+
+    // MARK: Public API ─────────────────────────────────────────────
+    func register(_ provider: DSUMotionProvider)  { providers[provider.slot] = provider }
+    func unregister(slot: UInt8)                  { providers.removeValue(forKey: slot) }
+
+    ///  🔸 providers push fresh samples here.
+    func pushSample(_ sample: DSUMotionSample, from provider: DSUMotionProvider) {
+        guard let addr = lastClientAddress else { return }      // no subscriber → drop
+        sendPadData(sample: sample, from: provider, to: addr)
+    }
+
+    // MARK: Private
+    private let serverID:           UInt32
+    private var socket:             GCDAsyncUdpSocket?
+    private var lastClientAddress:  Data?
+
+    private var providers = [UInt8 : DSUMotionProvider]()    // slot→provider
+    private var packetNumber = [UInt8 : UInt32]()            // per-slot counter
+
+    // ───────── UDP setup
+    private func configureSocket() {
+        socket = GCDAsyncUdpSocket(delegate: self, delegateQueue: .main)
+        do {
+            try socket?.bind(toPort: C.port)
+            try socket?.beginReceiving()
+            //print("🟢 DSU server listening on UDP \(C.port)")
+        } catch {
+            //print("❌ DSU socket error:", error)
+        }
+    }
+}
+
+//──────────────────────────────────────────────────────────────────────── MARK:- UDP delegate
+
+extension DSUServer: GCDAsyncUdpSocketDelegate {
+
+    func udpSocket(_ sock: GCDAsyncUdpSocket,
+                   didReceive data: Data,
+                   fromAddress addr: Data,
+                   withFilterContext ctx: Any?) {
+
+        lastClientAddress = addr
+
+        // Light validation
+        guard data.count >= 20,
+              String(decoding: data[0..<4], as: UTF8.self) == C.headerMagic,
+              data.readUInt16LE(at: 4) == C.protocolVersion
+        else { return }
+
+        let type = data.readUInt32LE(at: 16)
+        switch type {
+        case 0x100001: sendPortInfo(to: addr)   // client asks for port list
+        case 0x100002: break                    // subscription acknowledged
+        default:       break
+        }
+    }
+
+    func udpSocketDidClose(_ sock: GCDAsyncUdpSocket, withError err: Error?) {
+        //print("UDP closed:", err?.localizedDescription ?? "nil")
+        lastClientAddress = nil
+    }
+}
+
+//──────────────────────────────────────────────────────────────────────── MARK:- Packet helpers
+
+private extension DSUServer {
+
+    // ── Header (16 bytes)
+    func appendHeader(into d: inout Data, payloadSize: UInt16) {
+        d.append(C.headerMagic.data(using: .utf8)!)   // "DSUS"
+        d.append(C.protocolVersion.leData)            // Protocol Version
+        d.append(payloadSize.leData)                  // Payload Size
+        d.append(Data(repeating: 0, count: 4))        // CRC-stub
+        d.append(serverID.leData)                     // Server ID
+    }
+    func patchCRC32(of packet: inout Data) {
+        let crc = packet.withUnsafeBytes { ptr in
+            crc32(0, ptr.baseAddress, uInt(packet.count))
+        }.littleEndian
+        let crcLE = UInt32(crc).littleEndian
+        let crcData = withUnsafeBytes(of: crcLE) { Data($0) }
+        packet.replaceSubrange(8..<12, with: crcData)
+    }
+
+    // ── 0x100001  DSUSPortInfo
+    func sendPortInfo(to addr: Data) {
+        for p in providers.values {
+            var pkt = Data()
+            appendHeader(into: &pkt, payloadSize: 12)
+            pkt.append(UInt32(0x100001).leData)
+
+            pkt.append(p.slot)
+            pkt.append(UInt8(2))              // connected
+            pkt.append(UInt8(2))              // full gyro
+            pkt.append(p.connectionType)
+            pkt.append(p.mac, count: 6)
+            pkt.append(p.batteryLevel)
+            pkt.append(UInt8(0))              // padding
+
+            patchCRC32(of: &pkt)
+            socket?.send(pkt, toAddress: addr, withTimeout: -1, tag: 0)
+        }
+    }
+
+    // ── 0x100002  DSUSPadDataRsp
+    func sendPadData(sample s: DSUMotionSample,
+                     from p: DSUMotionProvider,
+                     to addr: Data) {
+
+        var pkt = Data()
+        appendHeader(into: &pkt, payloadSize: 84)
+        pkt.append(UInt32(0x100002).leData)
+
+        pkt.append(p.slot)
+        pkt.append(UInt8(2))              // connected
+        pkt.append(UInt8(2))              // full gyro
+        pkt.append(p.connectionType)
+        pkt.append(p.mac, count: 6)
+        pkt.append(p.batteryLevel)
+        pkt.append(UInt8(1))              // is connected
+
+        let num = packetNumber[p.slot, default: 0]
+        pkt.append(num.leData)
+        packetNumber[p.slot] = num &+ 1
+
+        pkt.append(UInt16(0).leData)      // buttons
+        pkt.append(contentsOf: [0,0])     // HOME / Touch
+        pkt.append(contentsOf: [128,128,128,128])    // sticks
+        pkt.append(Data(repeating: 0, count: 12))    // d-pad / face / trig
+        pkt.append(Data(repeating: 0, count: 12))    // touch 1 & 2
+        pkt.append(s.timestampUS.leData)
+
+        pkt.append(s.accel.x.leData)
+        pkt.append(s.accel.y.leData)
+        pkt.append(s.accel.z.leData)
+
+        pkt.append(s.gyroDeg.x.leData)
+        pkt.append(s.gyroDeg.y.leData)
+        pkt.append(s.gyroDeg.z.leData)
+
+        patchCRC32(of: &pkt)
+        socket?.send(pkt, toAddress: addr, withTimeout: -1, tag: 0)
+    }
+}
+
+//──────────────────────────────────────────────────────────────────────── MARK:- Helper funcs / ext
+
+private extension FixedWidthInteger {
+    var leData: Data {
+        var v = self.littleEndian
+        return Data(bytes: &v, count: MemoryLayout<Self>.size)
+    }
+}
+private extension Float {
+    var leData: Data {
+        var v = self
+        return Data(bytes: &v, count: MemoryLayout<Self>.size)
+    }
+}
+private extension Data {
+    func readUInt16LE(at offset: Int) -> UInt16 {
+        self[offset..<offset+2].withUnsafeBytes { $0.load(as: UInt16.self) }.littleEndian
+    }
+    func readUInt32LE(at offset: Int) -> UInt32 {
+        self[offset..<offset+4].withUnsafeBytes { $0.load(as: UInt32.self) }.littleEndian
+    }
+}

src/MeloNX/MeloNX/App/Core/Ryujinx/Controller/NativeController.swift

@@ -8,18 +8,37 @@
 import CoreHaptics
 import GameController
 
-class NativeController: Hashable {
+class NativeController: Hashable, BaseController {
     private var instanceID: SDL_JoystickID = -1
     private var controller: OpaquePointer?
     private var nativeController: GCController
+    private var controllerMotionProvider: ControllerMotionProvider?
+    private var deviceMotionProvider: DeviceMotionProvider?
+    
     private let controllerHaptics: CHHapticEngine?
+    private let rumbleController: RumbleController?
 
     public var controllername: String { "GC - \(nativeController.vendorName ?? "Unknown")" }
 
     init(_ controller: GCController) {
         nativeController = controller
         controllerHaptics = nativeController.haptics?.createEngine(withLocality: .default)
-        try? controllerHaptics?.start()
+        
+        // Make sure the haptic engine exists before attempting to start it or initialize the controller.
+        if let hapticsEngine = controllerHaptics {
+            do {
+                try hapticsEngine.start()
+                rumbleController = RumbleController(engine: hapticsEngine, rumbleMultiplier: 2.5)
+                
+                // print("CHHapticEngine started and RumbleController initialized.")
+            } catch {
+                // print("Error starting CHHapticEngine: \(error.localizedDescription)")
+                rumbleController = nil
+            }
+        } else {
+            // print("CHHapticEngine is nil. Cannot initialize RumbleController.")
+            rumbleController = nil
+        }
         setupHandheldController()
     }
 
@@ -27,6 +46,31 @@ class NativeController: Hashable {
         cleanup()
     }
     
+    internal func tryRegisterMotion(slot: UInt8) {
+        // Setup Motion
+        let dsuServer = DSUServer.shared
+        
+        if nativeController.vendorName?.lowercased() == "Joy-Con (l/R)".lowercased() {
+            deviceMotionProvider = DeviceMotionProvider(slot: slot)
+            if let provider = deviceMotionProvider {
+                dsuServer.register(provider)
+            }
+        } else {
+            controllerMotionProvider = ControllerMotionProvider(controller: nativeController, slot: slot)
+            if let provider = controllerMotionProvider {
+                dsuServer.register(provider)
+            }
+        }
+    }
+    
+    internal func tryGetMotionProvider() -> DSUMotionProvider? {
+        if nativeController.vendorName == "Joy-Con (l/R)" {
+            return deviceMotionProvider
+        } else {
+            return controllerMotionProvider
+        }
+    }
+
     private func setupHandheldController() {
         if SDL_WasInit(Uint32(SDL_INIT_GAMECONTROLLER)) == 0 {
             SDL_InitSubSystem(Uint32(SDL_INIT_GAMECONTROLLER))
@@ -49,41 +93,39 @@ class NativeController: Hashable {
                     // Update joystick state here
                 },
                 SetPlayerIndex: { userdata, playerIndex in
-                    print("Player index set to \(playerIndex)")
+                    // print("Player index set to \(playerIndex)")
                 },
                 Rumble: { userdata, lowFreq, highFreq in
-                    print("Rumble with \(lowFreq), \(highFreq)")
+                    // print("Rumble with \(lowFreq), \(highFreq)")
                     guard let userdata else { return 0 }
                     let _self = Unmanaged<NativeController>.fromOpaque(userdata).takeUnretainedValue()
-                    VirtualController.rumble(lowFreq: Float(lowFreq), highFreq: Float(highFreq), engine: _self.controllerHaptics)
+                    _self.rumbleController?.rumble(lowFreq: Float(lowFreq), highFreq: Float(highFreq))
                     return 0
                 },
                 RumbleTriggers: { userdata, leftRumble, rightRumble in
-                    print("Trigger rumble with \(leftRumble), \(rightRumble)")
+                    // print("Trigger rumble with \(leftRumble), \(rightRumble)")
                     return 0
                 },
                 SetLED: { userdata, red, green, blue in
-                    print("Set LED to RGB(\(red), \(green), \(blue))")
+                    // print("Set LED to RGB(\(red), \(green), \(blue))")
                     return 0
                 },
                 SendEffect: { userdata, data, size in
-                    print("Effect sent with size \(size)")
+                    // print("Effect sent with size \(size)")
                     return 0
                 }
             )
 
         instanceID = SDL_JoystickAttachVirtualEx(&joystickDesc)// SDL_JoystickAttachVirtual(SDL_JoystickType(SDL_JOYSTICK_TYPE_GAMECONTROLLER.rawValue), 6, 15, 1)
         if instanceID < 0 {
-            print("Failed to create virtual joystick: \(String(cString: SDL_GetError()))")
+            // print("Failed to create virtual joystick: \(String(cString: SDL_GetError()))")
             return
         }
 
-        // Open a game controller for the virtual joystick
-        let joystick = SDL_JoystickFromInstanceID(instanceID)
         controller = SDL_GameControllerOpen(Int32(instanceID))
 
         if controller == nil {
-            print("Failed to create virtual controller: \(String(cString: SDL_GetError()))")
+            // print("Failed to create virtual controller: \(String(cString: SDL_GetError()))")
             return
         }
 
@@ -91,10 +133,10 @@ class NativeController: Hashable {
             guard let gamepad = nativeController.extendedGamepad
             else { return }
             
-            setupButtonChangeListener(gamepad.buttonA, for: .A)
-            setupButtonChangeListener(gamepad.buttonB, for: .B)
-            setupButtonChangeListener(gamepad.buttonX, for: .X)
-            setupButtonChangeListener(gamepad.buttonY, for: .Y)
+            setupButtonChangeListener(gamepad.buttonA, for: UserDefaults.standard.bool(forKey: "swapBandA") ? .B : .A)
+            setupButtonChangeListener(gamepad.buttonB, for: UserDefaults.standard.bool(forKey: "swapBandA") ? .A : .B)
+            setupButtonChangeListener(gamepad.buttonX, for: UserDefaults.standard.bool(forKey: "swapBandA") ? .Y : .X)
+            setupButtonChangeListener(gamepad.buttonY, for: UserDefaults.standard.bool(forKey: "swapBandA") ? .X : .Y)
 
             setupButtonChangeListener(gamepad.dpad.up, for: .dPadUp)
             setupButtonChangeListener(gamepad.dpad.down, for: .dPadDown)
@@ -141,49 +183,13 @@ class NativeController: Hashable {
 
     func setupTriggerChangeListener(_ button: GCControllerButtonInput, for key: ThumbstickType) {
         button.valueChangedHandler = { [unowned self] _, value, pressed in
-//            print("Value: \(value), Is pressed: \(pressed)")
+//            // print("Value: \(value), Is pressed: \(pressed)")
             let axis: SDL_GameControllerAxis = (key == .left) ? SDL_CONTROLLER_AXIS_TRIGGERLEFT : SDL_CONTROLLER_AXIS_TRIGGERRIGHT
             let scaledValue = Sint16(value * 32767.0)
             updateAxisValue(value: scaledValue, forAxis: axis)
         }
     }
 
-    static func rumble(lowFreq: Float, highFreq: Float) {
-        do {
-            // Low-frequency haptic pattern
-            let lowFreqPattern = try CHHapticPattern(events: [
-                CHHapticEvent(eventType: .hapticTransient, parameters: [
-                    CHHapticEventParameter(parameterID: .hapticIntensity, value: lowFreq),
-                    CHHapticEventParameter(parameterID: .hapticSharpness, value: 0.5)
-                ], relativeTime: 0, duration: 0.2)
-            ], parameters: [])
-
-            // High-frequency haptic pattern
-            let highFreqPattern = try CHHapticPattern(events: [
-                CHHapticEvent(eventType: .hapticTransient, parameters: [
-                    CHHapticEventParameter(parameterID: .hapticIntensity, value: highFreq),
-                    CHHapticEventParameter(parameterID: .hapticSharpness, value: 1.0)
-                ], relativeTime: 0.2, duration: 0.2)
-            ], parameters: [])
-
-            // Create and start the haptic engine
-            let engine = try CHHapticEngine()
-            try engine.start()
-
-            // Create and play the low-frequency player
-            let lowFreqPlayer = try engine.makePlayer(with: lowFreqPattern)
-            try lowFreqPlayer.start(atTime: 0)
-
-            // Create and play the high-frequency player after a short delay
-            let highFreqPlayer = try engine.makePlayer(with: highFreqPattern)
-            try highFreqPlayer.start(atTime: 0.2)
-
-        } catch {
-            print("Error creating haptic patterns: \(error)")
-        }
-    }
-
-
     func updateAxisValue(value: Sint16, forAxis axis: SDL_GameControllerAxis) {
         guard controller != nil else { return }
         let joystick = SDL_JoystickFromInstanceID(instanceID)
@@ -208,7 +214,7 @@ class NativeController: Hashable {
     func setButtonState(_ state: Uint8, for button: VirtualControllerButton) {
         guard controller != nil else { return }
 
-//        print("Button: \(button.rawValue) {state: \(state)}")
+//        // print("Button: \(button.rawValue) {state: \(state)}")
         if (button == .leftTrigger || button == .rightTrigger) && (state == 1 || state == 0) {
             let axis: SDL_GameControllerAxis = (button == .leftTrigger) ? SDL_CONTROLLER_AXIS_TRIGGERLEFT : SDL_CONTROLLER_AXIS_TRIGGERRIGHT
             let value: Int = (state == 1) ? 32767 : 0

src/MeloNX/MeloNX/App/Core/Ryujinx/Controller/Rumble/RumbleController.swift

@@ -0,0 +1,132 @@
+//
+//  RumbleController.swift
+//  MeloNX
+//
+//  Created by MediaMoots on 2025/5/24.
+//
+
+import CoreHaptics
+import Foundation
+
+class RumbleController {
+    
+    private var engine: CHHapticEngine?
+    private var lowHapticPlayer: CHHapticPatternPlayer?
+    private var highHapticPlayer: CHHapticPatternPlayer?
+    private var rumbleMultiplier: Float = 1.0
+    
+    // The duration of each continuous haptic event.
+    // We'll restart the players before this duration expires.
+    private let hapticEventDuration: TimeInterval = 20
+    
+    // Timer to schedule player restarts
+    private var playerRestartTimer: Timer?
+    
+    // Interval before the haptic event duration runs out to restart
+    private let restartGracePeriod: TimeInterval = 1.0
+
+    init (engine: CHHapticEngine?, rumbleMultiplier: Float) {
+        self.engine = engine
+        self.rumbleMultiplier = rumbleMultiplier
+        
+        createPlayers()
+        setupPlayerRestartTimer()
+    }
+    
+    // Deinitializer to clean up the timer and stop players when the controller is deallocated
+    deinit {
+        playerRestartTimer?.invalidate() // Stop the timer
+        playerRestartTimer = nil
+        
+        // Optionally stop the haptic players immediately
+        try? lowHapticPlayer?.stop(atTime: CHHapticTimeImmediate)
+        try? highHapticPlayer?.stop(atTime: CHHapticTimeImmediate)
+        
+        // print("RumbleController deinitialized.")
+    }
+
+    // MARK: - Private Methods for Player Management
+    private func createPlayers() {
+        // Ensure the engine is available before proceeding
+        guard let engine = self.engine else {
+            // print("CHHapticEngine is nil. Cannot initialize RumbleController.")
+            return
+        }
+        
+        do {
+            let baseIntensity = CHHapticEventParameter(parameterID: .hapticIntensity, value: 1.0)
+            
+            let lowSharpness = CHHapticEventParameter(parameterID: .hapticSharpness, value: 0.0)
+            let highSharpness = CHHapticEventParameter(parameterID: .hapticSharpness, value: 1)
+            
+            // Create continuous haptic events with the defined duration
+            let lowContinuousEvent = CHHapticEvent(eventType: .hapticContinuous, parameters: [baseIntensity, lowSharpness], relativeTime: 0, duration: hapticEventDuration)
+            let highContinuousEvent = CHHapticEvent(eventType: .hapticContinuous, parameters: [baseIntensity, highSharpness], relativeTime: 0, duration: hapticEventDuration)
+            
+            // Create patterns from the continuous haptic events.
+            let lowPattern = try CHHapticPattern(events: [lowContinuousEvent], parameters: [])
+            let highPattern = try CHHapticPattern(events: [highContinuousEvent], parameters: [])
+            
+            // Make players from the patterns
+            lowHapticPlayer = try engine.makePlayer(with: lowPattern)
+            highHapticPlayer = try engine.makePlayer(with: highPattern)
+            
+            rumble(lowFreq: 0, highFreq: 0)
+            
+            // Start players initially
+            try lowHapticPlayer?.start(atTime: 0)
+            try highHapticPlayer?.start(atTime: 0)
+        } catch {
+            // print("Error initializing RumbleController or setting up haptic player: \(error.localizedDescription)")
+            
+            // Clean up if setup fails
+            lowHapticPlayer = nil
+            highHapticPlayer = nil
+            playerRestartTimer?.invalidate()
+            playerRestartTimer = nil
+        }
+    }
+
+    private func setupPlayerRestartTimer() {
+        // Invalidate any existing timer to prevent multiple timers if init is called multiple times
+        playerRestartTimer?.invalidate()
+        
+        // Calculate the interval for restarting: 1 second before the haptic event duration ends
+        let restartInterval = hapticEventDuration - restartGracePeriod
+        
+        guard restartInterval > 0 else {
+            // print("Warning: hapticEventDuration (\(hapticEventDuration)s) is too short for scheduled restart with grace period (\(restartGracePeriod)s). Timer will not be set.")
+            return
+        }
+
+        // Schedule a repeating timer that calls restartPlayers()
+        playerRestartTimer = Timer.scheduledTimer(withTimeInterval: restartInterval, repeats: true) { [weak self] _ in
+            self?.createPlayers()
+        }
+        // Ensure the timer is added to the current run loop in its default mode
+        RunLoop.current.add(playerRestartTimer!, forMode: .default)
+        
+        // print("Haptic Players restart timer scheduled to fire every \(restartInterval) seconds.")
+    }
+    
+    // MARK: - Public Rumble Control
+
+    public func rumble(lowFreq: Float, highFreq: Float) {
+       
+        // Normalize SDL values (0-65535) to CoreHaptics range (0.0-1.0)
+        let normalizedLow = min(1.0, max(0.0, lowFreq * rumbleMultiplier / 65535.0))
+        let normalizedHigh = min(1.0, max(0.0, highFreq * rumbleMultiplier / 65535.0))
+        
+        // Create dynamic parameters to control intensity
+        let lowIntensityParameter = CHHapticDynamicParameter(parameterID: .hapticIntensityControl, value: normalizedLow, relativeTime: 0)
+        let highIntensityParameter = CHHapticDynamicParameter(parameterID: .hapticIntensityControl, value: normalizedHigh, relativeTime: 0)
+
+        // Send parameters to the players
+        do {
+            try lowHapticPlayer?.sendParameters([lowIntensityParameter], atTime: 0)
+            try highHapticPlayer?.sendParameters([highIntensityParameter], atTime: 0)
+        } catch {
+            // print("Error sending haptic parameters: \(error.localizedDescription)")
+        }
+    }
+}

src/MeloNX/MeloNX/App/Core/Ryujinx/Controller/VirtualController.swift

@@ -9,16 +9,49 @@ import Foundation
 import CoreHaptics
 import UIKit
 
-class VirtualController {
+class VirtualController : BaseController {
     private var instanceID: SDL_JoystickID = -1
     private var controller: OpaquePointer?
+    private let hapticEngine: CHHapticEngine?
+    private let rumbleController: RumbleController?
+    private var deviceMotionProvider: DeviceMotionProvider?
     
     public let controllername = "MeloNX Touch Controller"
     
     init() {
+        // Setup Haptics
+        hapticEngine = try? CHHapticEngine()
+        if let hapticsEngine = hapticEngine {
+            do {
+                try hapticsEngine.start()
+                rumbleController = RumbleController(engine: hapticsEngine, rumbleMultiplier: 2.0)
+                
+                // print("CHHapticEngine started and RumbleController initialized.")
+            } catch {
+                // print("Error starting CHHapticEngine: \(error.localizedDescription)")
+                rumbleController = nil
+            }
+        } else {
+            // print("CHHapticEngine is nil. Cannot initialize RumbleController.")
+            rumbleController = nil
+        }
         setupVirtualController()
     }
     
+    internal func tryRegisterMotion(slot: UInt8) {
+        // Setup Motion
+        let dsuServer = DSUServer.shared
+        
+        deviceMotionProvider = DeviceMotionProvider(slot: slot)
+        if let provider = deviceMotionProvider {
+            dsuServer.register(provider)
+        }
+    }
+    
+    internal func tryGetMotionProvider() -> DSUMotionProvider? {
+        return deviceMotionProvider
+    }
+    
     private func setupVirtualController() {
         if SDL_WasInit(Uint32(SDL_INIT_GAMECONTROLLER)) == 0 {
             SDL_InitSubSystem(Uint32(SDL_INIT_GAMECONTROLLER))
@@ -36,96 +69,50 @@ class VirtualController {
                 button_mask: 0,
                 axis_mask: 0,
                 name: controllername.withCString { $0 },
-                userdata: nil,
+                userdata: Unmanaged.passUnretained(self).toOpaque(),
                 Update: { userdata in
                     // Update joystick state here
                 },
                 SetPlayerIndex: { userdata, playerIndex in
-                    print("Player index set to \(playerIndex)")
+                    // print("Player index set to \(playerIndex)")
                 },
                 Rumble: { userdata, lowFreq, highFreq in
-                    print("Rumble with \(lowFreq), \(highFreq)")
+                    // print("Rumble with \(lowFreq), \(highFreq)")
                     if UIDevice.current.userInterfaceIdiom == .phone {
-                        VirtualController.rumble(lowFreq: Float(lowFreq), highFreq: Float(highFreq))
+                        guard let userdata else { return 0 }
+                        let _self = Unmanaged<VirtualController>.fromOpaque(userdata).takeUnretainedValue()
+                        _self.rumbleController?.rumble(lowFreq: Float(lowFreq), highFreq: Float(highFreq))
                     }
                     return 0
                 },
                 RumbleTriggers: { userdata, leftRumble, rightRumble in
-                    print("Trigger rumble with \(leftRumble), \(rightRumble)")
+                    // print("Trigger rumble with \(leftRumble), \(rightRumble)")
                     return 0
                 },
                 SetLED: { userdata, red, green, blue in
-                    print("Set LED to RGB(\(red), \(green), \(blue))")
+                    // print("Set LED to RGB(\(red), \(green), \(blue))")
                     return 0
                 },
                 SendEffect: { userdata, data, size in
-                    print("Effect sent with size \(size)")
+                    // print("Effect sent with size \(size)")
                     return 0
                 }
             )
         
         instanceID = SDL_JoystickAttachVirtualEx(&joystickDesc)// SDL_JoystickAttachVirtual(SDL_JoystickType(SDL_JOYSTICK_TYPE_GAMECONTROLLER.rawValue), 6, 15, 1)
         if instanceID < 0 {
-            print("Failed to create virtual joystick: \(String(cString: SDL_GetError()))")
+            // print("Failed to create virtual joystick: \(String(cString: SDL_GetError()))")
             return
         }
         
-        // Open a game controller for the virtual joystick
-        let joystick = SDL_JoystickFromInstanceID(instanceID)
         controller = SDL_GameControllerOpen(Int32(instanceID))
         
         if controller == nil {
-            print("Failed to create virtual controller: \(String(cString: SDL_GetError()))")
+            // print("Failed to create virtual controller: \(String(cString: SDL_GetError()))")
             return
         }
     }
     
-    static func rumble(lowFreq: Float, highFreq: Float, engine: CHHapticEngine? = nil) {
-        do {
-            let lowFreqPattern = try CHHapticPattern(events: [
-                CHHapticEvent(eventType: .hapticTransient, parameters: [
-                    CHHapticEventParameter(parameterID: .hapticIntensity, value: lowFreq),
-                    CHHapticEventParameter(parameterID: .hapticSharpness, value: 0.5)
-                ], relativeTime: 0, duration: 0.2)
-            ], parameters: [])
-
-            
-            let highFreqPattern = try CHHapticPattern(events: [
-                CHHapticEvent(eventType: .hapticTransient, parameters: [
-                    CHHapticEventParameter(parameterID: .hapticIntensity, value: highFreq),
-                    CHHapticEventParameter(parameterID: .hapticSharpness, value: 1.0)
-                ], relativeTime: 0.2, duration: 0.2)
-            ], parameters: [])
-
-            var engine = engine
-
-            if engine == nil {
-                if hapticEngine == nil {
-                    hapticEngine = try CHHapticEngine()
-                    try hapticEngine?.start()
-                }
-
-                engine = hapticEngine
-            }
-
-            guard let engine else {
-                return print("Error creating haptic patterns: hapticEngine is nil")
-            }
-
-            let lowFreqPlayer = try engine.makePlayer(with: lowFreqPattern)
-            try lowFreqPlayer.start(atTime: 0)
-            
-            let highFreqPlayer = try engine.makePlayer(with: highFreqPattern)
-            try highFreqPlayer.start(atTime: 0)
-
-        } catch {
-            print("Error creating haptic patterns: \(error)")
-        }
-    }
-
-    private static var hapticEngine: CHHapticEngine?
-
-    
     func updateAxisValue(value: Sint16, forAxis axis: SDL_GameControllerAxis) {
         guard controller != nil else { return }
         let joystick = SDL_JoystickFromInstanceID(instanceID)
@@ -133,10 +120,8 @@ class VirtualController {
     }
     
     func thumbstickMoved(_ stick: ThumbstickType, x: Double, y: Double) {
-        let scaleFactor = 32767.0 / 160
-
-        let scaledX = Int16(min(32767.0, max(-32768.0, x * scaleFactor)))
-        let scaledY = Int16(min(32767.0, max(-32768.0, y * scaleFactor)))
+        let scaledX = Int16(min(32767.0, max(-32768.0, x * 32767.0)))
+        let scaledY = Int16(min(32767.0, max(-32768.0, y * 32767.0)))
         
         if stick == .right {
             updateAxisValue(value: scaledX, forAxis: SDL_GameControllerAxis(SDL_CONTROLLER_AXIS_RIGHTX.rawValue))
@@ -150,7 +135,7 @@ class VirtualController {
     func setButtonState(_ state: Uint8, for button: VirtualControllerButton) {
         guard controller != nil else { return }
         
-        print("Button: \(button.rawValue) {state: \(state)}")
+        // // print("Button: \(button.rawValue) {state: \(state)}")
         if (button == .leftTrigger || button == .rightTrigger) && (state == 1 || state == 0) {
             let axis: SDL_GameControllerAxis = (button == .leftTrigger) ? SDL_CONTROLLER_AXIS_TRIGGERLEFT : SDL_CONTROLLER_AXIS_TRIGGERRIGHT
             let value: Int = (state == 1) ? 32767 : 0
@@ -174,10 +159,10 @@ class VirtualController {
 }
 
 enum VirtualControllerButton: Int {
-    case B
     case A
-    case Y
+    case B
     case X
+    case Y
     case back
     case guide
     case start
@@ -191,6 +176,24 @@ enum VirtualControllerButton: Int {
     case dPadRight
     case leftTrigger
     case rightTrigger
+    
+    var isTrigger: Bool {
+        switch self {
+        case .leftTrigger, .rightTrigger, .leftShoulder, .rightShoulder:
+            return true
+        default:
+            return false
+        }
+    }
+    
+    var isSmall: Bool {
+        switch self {
+        case .back, .start, .guide:
+            return true
+        default:
+            return false
+        }
+    }
 }
 
 enum ThumbstickType: Int {

src/MeloNX/MeloNX/App/Core/Ryujinx/Display/MemoryDisplay/MemoryUsageMonitor.swift

@@ -13,7 +13,7 @@ class MemoryUsageMonitor: ObservableObject {
     private var timer: Timer?
     
     init() {
-        timer = Timer.scheduledTimer(withTimeInterval: 1.0, repeats: true) { [weak self] _ in
+        timer = Timer.scheduledTimer(withTimeInterval: 0.2, repeats: true) { [weak self] _ in
             self?.updateMemoryUsage()
         }
     }
@@ -32,11 +32,12 @@ class MemoryUsageMonitor: ObservableObject {
         }
         
         if result == KERN_SUCCESS {
+            memoryUsage = 0
             memoryUsage = taskInfo.phys_footprint
         }
         else {
-            print("Error with task_info(): " +
-                (String(cString: mach_error_string(result), encoding: String.Encoding.ascii) ?? "unknown error"))
+            // print("Error with task_info(): " +
+                // (String(cString: mach_error_string(result), encoding: String.Encoding.ascii) ?? "unknown error"))
         }
     }
     
@@ -46,7 +47,6 @@ class MemoryUsageMonitor: ObservableObject {
         formatter.countStyle = .memory
         return formatter.string(fromByteCount: Int64(bytes))
     }
-
 }
 
 

src/MeloNX/MeloNX/App/Core/Ryujinx/Display/PerformanceDisplay/PerformanceOverlay.swift

@@ -1,22 +0,0 @@
-//
-//  Untitled.swift
-//  MeloNX
-//
-//  Created by Stossy11 on 21/12/2024.
-//
-
-import SwiftUI
-
-struct PerformanceOverlayView: View  {
-    @StateObject private var memorymonitor = MemoryUsageMonitor()
-    
-    @StateObject private var fpsmonitor = FPSMonitor()
-    
-    var body: some View {
-        VStack {
-            Text("\(fpsmonitor.formatFPS())")
-            Text(memorymonitor.formatMemorySize(memorymonitor.memoryUsage))
-        }
-    }
-}
-

src/MeloNX/MeloNX/App/Core/Ryujinx/MetalHUD/MTLHUD.swift

@@ -6,26 +6,28 @@
 //
 
 import Foundation
+import SwiftUI
 
+class MTLHud: ObservableObject {
+    @Published var canMetalHud: Bool = false
     
-class MTLHud {
-    
-    var canMetalHud: Bool {
-        return openMetalDylib()
+    @AppStorage("MTL_HUD_ENABLED") var metalHudEnabled: Bool = false {
+        didSet {
+            if metalHudEnabled {
+                enable()
+            } else {
+                disable()
+            }
+        }
     }
     
-    var isEnabled: Bool {
-        if let getenv = getenv("MTL_HUD_ENABLED") {
-            return String(cString: getenv).contains("1")
-        }
-        return false
-    }
     
     static let shared = MTLHud()
     
     private init() {
-        openMetalDylib()
-        if UserDefaults.standard.bool(forKey: "MTL_HUD_ENABLED") {
+        canMetalHud = openMetalDylib() // i'm fixing the warnings just because you said i suck at coding Autumn (propenchiefer, https://youtu.be/tc65SNOTMz4 7:23)
+        
+        if metalHudEnabled {
             enable()
         } else {
             disable()
@@ -35,16 +37,9 @@ class MTLHud {
     func openMetalDylib() -> Bool {
         let path = "/usr/lib/libMTLHud.dylib"
 
-        // Load the dynamic library
         if dlopen(path, RTLD_NOW) != nil {
-            // Library loaded successfully
-            print("Library loaded from \(path)")
             return true
         } else {
-            // Handle error
-            if let error = String(validatingUTF8: dlerror()) {
-                print("Error loading library: \(error)")
-            }
             return false
         }
     }

src/MeloNX/MeloNX/App/Core/Ryujinx/Ryujinx.swift

@@ -10,6 +10,94 @@ import SwiftUI
 import GameController
 import MetalKit
 import Metal
+import Darwin
+
+class LogCapture {
+    static let shared = LogCapture()
+
+    private var stdoutPipe: Pipe?
+    private var stderrPipe: Pipe?
+    private let originalStdout: Int32
+    private let originalStderr: Int32
+
+    var capturedLogs: [String] = [] {
+        didSet {
+            DispatchQueue.main.async {
+                NotificationCenter.default.post(name: .newLogCaptured, object: nil)
+            }
+        }
+    }
+
+    private init() {
+        originalStdout = dup(STDOUT_FILENO)
+        originalStderr = dup(STDERR_FILENO)
+        startCapturing()
+    }
+
+    func startCapturing() {
+        stdoutPipe = Pipe()
+        stderrPipe = Pipe()
+
+        redirectOutput(to: stdoutPipe!, fileDescriptor: STDOUT_FILENO)
+        redirectOutput(to: stderrPipe!, fileDescriptor: STDERR_FILENO)
+
+        setupReadabilityHandler(for: stdoutPipe!, isStdout: true)
+        setupReadabilityHandler(for: stderrPipe!, isStdout: false)
+    }
+
+    func stopCapturing() {
+        dup2(originalStdout, STDOUT_FILENO)
+        dup2(originalStderr, STDERR_FILENO)
+
+        stdoutPipe?.fileHandleForReading.readabilityHandler = nil
+        stderrPipe?.fileHandleForReading.readabilityHandler = nil
+    }
+
+    private func redirectOutput(to pipe: Pipe, fileDescriptor: Int32) {
+        dup2(pipe.fileHandleForWriting.fileDescriptor, fileDescriptor)
+    }
+
+    private func setupReadabilityHandler(for pipe: Pipe, isStdout: Bool) {
+        pipe.fileHandleForReading.readabilityHandler = { [weak self] fileHandle in
+            let data = fileHandle.availableData
+            let originalFD = isStdout ? self?.originalStdout : self?.originalStderr
+            write(originalFD ?? STDOUT_FILENO, (data as NSData).bytes, data.count)
+
+            if let logString = String(data: data, encoding: .utf8),
+               let cleanedLog = self?.cleanLog(logString), !cleanedLog.isEmpty {
+                self?.capturedLogs.append(cleanedLog)
+            }
+        }
+    }
+
+    private func cleanLog(_ raw: String) -> String? {
+        let lines = raw.split(separator: "\n")
+        let filteredLines = lines.filter { line in
+            !line.contains("SwiftUI") &&
+            !line.contains("ForEach") &&
+            !line.contains("VStack") &&
+            !line.contains("Invalid frame dimension (negative or non-finite).")
+        }
+
+        let cleaned = filteredLines.map { line -> String in
+            if let tabRange = line.range(of: "\t") {
+                return line[tabRange.upperBound...].trimmingCharacters(in: .whitespacesAndNewlines)
+            }
+            return line.trimmingCharacters(in: .whitespacesAndNewlines)
+        }.joined(separator: "\n")
+
+        return cleaned.isEmpty ? nil : cleaned.replacingOccurrences(of: "\n\n", with: "\n")
+    }
+
+    deinit {
+        stopCapturing()
+    }
+}
+
+
+extension Notification.Name {
+    static let newLogCaptured = Notification.Name("newLogCaptured")
+}
 
 struct Controller: Identifiable, Hashable {
     var id: String
@@ -30,61 +118,107 @@ struct iOSNav<Content: View>: View {
     }
 }
 
+func threadEntry(_ arg: () -> Void) -> UnsafeMutableRawPointer? {
+    arg()
+    return nil
+}
 
-class Ryujinx {
-    private var isRunning = false
+
+class Ryujinx : ObservableObject {
+    @Published var isRunning = false
     
     let virtualController = VirtualController()
     
     @Published var controllerMap: [Controller] = []
     @Published var metalLayer: CAMetalLayer? = nil
+    @Published var isPortrait = false
     @Published var firmwareversion = "0"
     @Published var emulationUIView: MeloMTKView? = nil
-    @Published var config: Ryujinx.Configuration? = nil
+    @Published var config: Ryujinx.Arguments? = nil
     @Published var games: [Game] = []
     
     @Published var defMLContentSize: CGFloat?
     
+    var thread: pthread_t? = nil
+    
+    @Published var jitenabled = false
+    
     var shouldMetal: Bool {
         metalLayer == nil
     }
     
     static let shared = Ryujinx()
 
-    private init() {
+    func addGames() {
         self.games = loadGames()
     }
     
-    public struct Configuration : Codable, Equatable {
+    func runloop(_ cool: @escaping () -> Void) {
+        if UserDefaults.standard.bool(forKey: "runOnMainThread") {
+            RunLoop.main.perform {
+                cool()
+            }
+        } else {
+            // Box the closure
+            let boxed = Unmanaged.passRetained(ClosureBox(cool)).toOpaque()
+
+            var thread: pthread_t?
+            let result = pthread_create(&thread, nil, { arg in
+                let unmanaged = Unmanaged<ClosureBox>.fromOpaque(arg)
+                let box = unmanaged.takeRetainedValue()
+                box.closure()
+                return nil
+            }, boxed)
+
+            if result == 0 {
+                pthread_detach(thread!)
+            } else {
+                print("Failed to create thread: \(result)")
+                Unmanaged<ClosureBox>.fromOpaque(boxed).release()
+            }
+        }
+    }
+
+    private class ClosureBox {
+        let closure: () -> Void
+        init(_ closure: @escaping () -> Void) {
+            self.closure = closure
+        }
+    }
+    
+    public class Arguments : Observable, Codable, Equatable {
         var gamepath: String
         var inputids: [String]
-        var resscale: Float
-        var debuglogs: Bool
-        var tracelogs: Bool
-        var nintendoinput: Bool
-        var enableInternet: Bool
-        var listinputids: Bool
-        var aspectRatio: AspectRatio
-        var memoryManagerMode: String
-        var disableShaderCache: Bool
-        var hypervisor: Bool
-        var disableDockedMode: Bool
-        var enableTextureRecompression: Bool
-        var additionalArgs: [String]
-        var maxAnisotropy: Float
-        var macroHLE: Bool
-        var ignoreMissingServices: Bool
-        var expandRam: Bool
-        var dfsIntegrityChecks: Bool
-        var disablePTC: Bool
-        var disablevsync: Bool
-        var language: SystemLanguage
-        var regioncode: SystemRegionCode
-        var handHeldController: Bool
+        var inputDSUServers: [String]
+        var resscale: Float = 1.0
+        var debuglogs: Bool = false
+        var tracelogs: Bool = false
+        var nintendoinput: Bool = true
+        var enableInternet: Bool = false
+        var listinputids: Bool = false
+        var aspectRatio: AspectRatio = .fixed16x9
+        var memoryManagerMode: String = "HostMappedUnsafe"
+        var disableShaderCache: Bool = false
+        var hypervisor: Bool = false
+        var disableDockedMode: Bool = false
+        var enableTextureRecompression: Bool = true
+        var additionalArgs: [String] = []
+        var maxAnisotropy: Float = 1.0
+        var macroHLE: Bool = true
+        var ignoreMissingServices: Bool = false
+        var expandRam: Bool = false
+        var dfsIntegrityChecks: Bool = false
+        var disablePTC: Bool = false
+        var disablevsync: Bool = false
+        var language: SystemLanguage = .americanEnglish
+        var regioncode: SystemRegionCode = .usa
+        var handHeldController: Bool = true
+        var backendMultithreading: Bool = true
         
         
-        init(gamepath: String,
+        init(gamepath: String = "",
              inputids: [String] = [],
+             inputDSUServers: [String] = [],
              debuglogs: Bool = false,
              tracelogs: Bool = false,
              listinputids: Bool = false,
@@ -107,10 +241,12 @@ class Ryujinx {
              disablevsync: Bool = false,
              language: SystemLanguage = .americanEnglish,
              regioncode: SystemRegionCode = .usa,
-             handHeldController: Bool = false
+             handHeldController: Bool = false,
+             backendMultithreading: Bool = true
         ) {
             self.gamepath = gamepath
             self.inputids = inputids
+            self.inputDSUServers = inputDSUServers
             self.debuglogs = debuglogs
             self.tracelogs = tracelogs
             self.listinputids = listinputids
@@ -134,18 +270,73 @@ class Ryujinx {
             self.language = language
             self.regioncode = regioncode
             self.handHeldController = handHeldController
+            self.backendMultithreading = backendMultithreading
+        }
+        
+        
+        static func == (lhs: Arguments, rhs: Arguments) -> Bool {
+            return lhs.resscale == rhs.resscale &&
+                   lhs.debuglogs == rhs.debuglogs &&
+                   lhs.tracelogs == rhs.tracelogs &&
+                   lhs.nintendoinput == rhs.nintendoinput &&
+                   lhs.enableInternet == rhs.enableInternet &&
+                   lhs.listinputids == rhs.listinputids &&
+                   lhs.aspectRatio == rhs.aspectRatio &&
+                   lhs.memoryManagerMode == rhs.memoryManagerMode &&
+                   lhs.disableShaderCache == rhs.disableShaderCache &&
+                   lhs.hypervisor == rhs.hypervisor &&
+                   lhs.disableDockedMode == rhs.disableDockedMode &&
+                   lhs.enableTextureRecompression == rhs.enableTextureRecompression &&
+                   lhs.additionalArgs == rhs.additionalArgs &&
+                   lhs.maxAnisotropy == rhs.maxAnisotropy &&
+                   lhs.macroHLE == rhs.macroHLE &&
+                   lhs.ignoreMissingServices == rhs.ignoreMissingServices &&
+                   lhs.expandRam == rhs.expandRam &&
+                   lhs.dfsIntegrityChecks == rhs.dfsIntegrityChecks &&
+                   lhs.disablePTC == rhs.disablePTC &&
+                   lhs.disablevsync == rhs.disablevsync &&
+                   lhs.language == rhs.language &&
+                   lhs.regioncode == rhs.regioncode &&
+                   lhs.handHeldController == rhs.handHeldController
         }
     }
 
     
-    func start(with config: Configuration) throws {
+    func start(with config: Arguments) throws {
         guard !isRunning else {
             throw RyujinxError.alreadyRunning
         }
         
         self.config = config
         
-        RunLoop.current.perform { [self] in
+        
+        if UserDefaults.standard.bool(forKey: "lockInApp") {
+            let cool = Thread {
+                while true {
+                    if UserDefaults.standard.bool(forKey: "lockInApp") {
+                        if let workspaceClass = NSClassFromString("LSApplicationWorkspace") as? NSObject.Type,
+                           let workspace = workspaceClass.perform(NSSelectorFromString("defaultWorkspace"))?.takeUnretainedValue() {
+                            
+                            let selector = NSSelectorFromString("openApplicationWithBundleID:")
+                            
+                            if workspace.responds(to: selector) {
+                                workspace.perform(selector, with: Bundle.main.bundleIdentifier ?? "")
+                            } else {
+                                print("Selector not found or not responding.")
+                            }
+                        } else {
+                            print("Could not get LSApplicationWorkspace class.")
+                        }
+                    }
+                }
+            }
+            
+            cool.qualityOfService = .userInteractive
+            cool.start()
+        }
+        
+        
+        runloop { [self] in
             
             isRunning = true
             
@@ -175,9 +366,92 @@ class Ryujinx {
                 }
             } catch {
                 self.isRunning = false
-                Self.log("Emulation failed to start: \(error)")
+                Thread.sleep(forTimeInterval: 0.3)
+                let logs = LogCapture.shared.capturedLogs
+                let parsedLogs = extractExceptionInfo(logs)
+                if let parsedLogs {
+                    DispatchQueue.main.async {
+                        let result = Array(logs.suffix(from: parsedLogs.lineIndex))
+                        
+                        LogCapture.shared.capturedLogs = Array(LogCapture.shared.capturedLogs.prefix(upTo: parsedLogs.lineIndex))
+                        let dateFormatter = DateFormatter()
+                        dateFormatter.dateFormat = "yyyy-MM-dd_HH-mm-ss"
+                        let currentDate = Date()
+                        let dateString = dateFormatter.string(from: currentDate)
+                        let path = URL.documentsDirectory.appendingPathComponent("StackTrace").appendingPathComponent("StackTrace-\(dateString).txt").path
+                        
+                        self.saveArrayAsTextFile(strings: result, filePath: path)
+                        
+                        
+                        presentAlert(title: "MeloNX Crashed!", message: parsedLogs.exceptionType + ": " + parsedLogs.message) {
+    
+                            assert(true, parsedLogs.exceptionType)
                         }
                     }
+                } else {
+                    DispatchQueue.main.async {
+                        presentAlert(title: "MeloNX Crashed!", message:  "Unknown Error") {
+                            assert(true, "Exception was not detected")
+                        }
+                    }
+                }
+            }
+        }
+    }
+    
+    func saveArrayAsTextFile(strings: [String], filePath: String) {
+        let text = strings.joined(separator: "\n")
+        
+        let path = URL.documentsDirectory.appendingPathComponent("StackTrace").path
+        
+        do {
+            try FileManager.default.createDirectory(atPath: path, withIntermediateDirectories: false)
+        } catch {
+            
+        }
+        
+        do {
+            try text.write(to: URL(fileURLWithPath: filePath), atomically: true, encoding: .utf8)
+            print("File saved successfully.")
+        } catch {
+            print("Error saving file: \(error)")
+        }
+    }
+    
+    struct ExceptionInfo {
+        let exceptionType: String
+        let message: String
+        let lineIndex: Int
+    }
+
+    func extractExceptionInfo(_ logs: [String]) -> ExceptionInfo? {
+        for i in (0..<logs.count).reversed() {
+            let line = logs[i]
+            let pattern = "([\\w\\.]+Exception): ([^\\s]+(?:\\s+[^\\s]+)*)"
+            
+            guard let regex = try? NSRegularExpression(pattern: pattern, options: []),
+                  let match = regex.firstMatch(in: line, options: [], range: NSRange(location: 0, length: line.count)) else {
+                continue
+            }
+            
+            // Extract exception type and message if pattern matches
+            if let exceptionTypeRange = Range(match.range(at: 1), in: line),
+               let messageRange = Range(match.range(at: 2), in: line) {
+                
+                let exceptionType = String(line[exceptionTypeRange])
+                
+                var message = String(line[messageRange])
+                if let atIndex = message.range(of: "\\s+at\\s+", options: .regularExpression) {
+                    message = String(message[..<atIndex.lowerBound])
+                }
+                
+                message = message.trimmingCharacters(in: .whitespacesAndNewlines)
+                
+                return ExceptionInfo(exceptionType: exceptionType, message: message, lineIndex: i)
+            }
+        }
+        
+        return nil
     }
 
     
@@ -188,14 +462,12 @@ class Ryujinx {
 
         isRunning = false
         
+        UserDefaults.standard.set(false, forKey: "lockInApp")
+        
         self.emulationUIView = nil
         self.metalLayer = nil
         
-        stop_emulation()
-    }
         
-    var running: Bool {
-        return isRunning
     }
 
     
@@ -209,7 +481,7 @@ class Ryujinx {
             do {
                 try fileManager.createDirectory(at: romsDirectory, withIntermediateDirectories: true, attributes: nil)
             } catch {
-                print("Failed to create roms directory: \(error)")
+                // print("Failed to create roms directory: \(error)")
             }
         }
         var games: [Game] = []
@@ -234,19 +506,18 @@ class Ryujinx {
                     
                     games.append(game)
                 } catch {
-                    print(error)
+                    // print(error)
                 }
             }
 
             return games
         } catch {
-            print("Error loading games from roms folder: \(error)")
+            // print("Error loading games from roms folder: \(error)")
             return games
         }
-        
     }
 
-    private func buildCommandLineArgs(from config: Configuration) -> [String] {
+    private func buildCommandLineArgs(from config: Arguments) -> [String] {
         var args: [String] = []
         
         // Add the game path
@@ -264,12 +535,39 @@ class Ryujinx {
         // We don't need this. Ryujinx should handle it fine :3
         // this also causes crashes in some games :3
         
+        var model = ""
+        
+        var systemInfo = utsname()
+        uname(&systemInfo)
+        let machineMirror = Mirror(reflecting: systemInfo.machine)
+        model = machineMirror.children.reduce("") { identifier, element in
+            guard let value = element.value as? Int8, value != 0 else { return identifier }
+            return identifier + String(UnicodeScalar(UInt8(value)))
+        }
+        
+        args.append(contentsOf: ["--device-model", model])
+        
+        args.append(contentsOf: ["--device-display-name", UIDevice.modelName])
+        
+        if checkAppEntitlement("com.apple.developer.kernel.increased-memory-limit") {
+            args.append("--has-memory-entitlement")
+        }
+        
         args.append(contentsOf: ["--system-language", config.language.rawValue])
         
         args.append(contentsOf: ["--system-region", config.regioncode.rawValue])
         
         args.append(contentsOf: ["--aspect-ratio", config.aspectRatio.rawValue])
         
+        // args.append(contentsOf: ["--system-timezone", TimeZone.current.identifier])
+        
+        args.append(contentsOf: ["--system-time-offset", String(TimeZone.current.secondsFromGMT())])
+        
+        if !config.backendMultithreading {
+            args.append(contentsOf: ["--backend-multithreading", "Off"])
+        }
+
+        
         if config.nintendoinput {
             args.append("--correct-controller")
         }
@@ -347,6 +645,17 @@ class Ryujinx {
             }
         }
         
+        // Append the input dsu servers (limit to 8 (used to be 4) just in case)
+        if !config.inputDSUServers.isEmpty {
+            config.inputDSUServers.prefix(8).enumerated().forEach { index, inputDSUServer in
+                if config.handHeldController {
+                    args.append(contentsOf: ["\(index == 0 ? "--input-dsu-server-handheld" : "--input-dsu-server-\(index + 1)")", inputDSUServer])
+                } else {
+                    args.append(contentsOf: ["--input-dsu-server-\(index + 1)", inputDSUServer])
+                }
+            }
+        }
+        
         args.append(contentsOf: config.additionalArgs)
 
         return args
@@ -360,7 +669,6 @@ class Ryujinx {
     }
     
     func fetchFirmwareVersion() -> String {
-        do {
         let firmwareVersionPointer = installed_firmware_version()
         if let pointer = firmwareVersionPointer {
             let firmwareVersion = String(cString: pointer)
@@ -370,16 +678,12 @@ class Ryujinx {
             return firmwareVersion
         }
 
-        } catch {
-            print(error)
-        }
-
         return "0"
     }
     
     func installFirmware(firmwarePath: String) {
         guard let cString = firmwarePath.cString(using: .utf8) else {
-            print("Invalid firmware path")
+            // print("Invalid firmware path")
             return
         }
 
@@ -395,12 +699,12 @@ class Ryujinx {
         guard let titleIdCString = titleId.cString(using: .utf8),
             let pathCString = path.cString(using: .utf8)
         else {
-            print("Invalid path")
+            // print("Invalid path")
             return []
         }
 
         let listPointer = get_dlc_nca_list(titleIdCString, pathCString)
-        print("DLC parcing success: \(listPointer.success)")
+        // print("DLC parcing success: \(listPointer.success)")
         guard listPointer.success else { return [] }
 
         let list = Array(UnsafeBufferPointer(start: listPointer.items, count: Int(listPointer.size)))
@@ -452,7 +756,7 @@ class Ryujinx {
                 let guid = generateGamepadId(joystickIndex: i)
                 let name = String(cString: SDL_GameControllerName(controller))
                 
-                print("Controller \(i): \(name), GUID: \(guid ?? "")")
+                // print("Controller \(i): \(name), GUID: \(guid ?? "")")
                 
                 guard let guid else {
                     SDL_GameControllerClose(controller)
@@ -483,84 +787,163 @@ class Ryujinx {
         do {
             if fileManager.fileExists(atPath: registeredFolder) {
                 try fileManager.removeItem(atPath: registeredFolder)
-                print("Folder removed successfully.")
+                // print("Folder removed successfully.")
                 let version = fetchFirmwareVersion()
                 
                 if version.isEmpty {
                     self.firmwareversion = "0"
                 } else {
-                    print("Firmware eeeeee \(version)")
+                    // print("Firmware eeeeee \(version)")
                 }
                 
             } else {
-                print("Folder does not exist.")
+                // print("Folder does not exist.")
             }
         } catch {
-            print("Error removing folder: \(error)")
+            // print("Error removing folder: \(error)")
         }
     }
     
 
-    func repeatuntilfindLayer() {
-        Task { @MainActor in
-            while self.metalLayer == nil {
-                let layer = self.getMetalLayer(nil)
-                
-                if layer != nil {
-                    self.metalLayer = layer
-                    break
-                }
-                
-                Thread.sleep(forTimeInterval: 0.1)
-            }
-        }
-    }
-
-
-    @MainActor
-    func getMetalLayer(_ window: OpaquePointer?) -> CAMetalLayer? {
-        var window = window
-        if window == nil {
-            window = SDL_GetWindowFromID(1)
-        }
-
-        var windowInfo = SDL_SysWMinfo()
-        SDL_GetWindowWMInfo(window, &windowInfo)
-
-        
-        guard let uiWindow = windowInfo.info.uikit.window,
-              let rootView = uiWindow.takeUnretainedValue().rootViewController?.view else {
-            print("Unable to get root view")
-            return nil
-        }
-
-        func findMetalLayer(in view: UIView) -> CAMetalLayer? {
-            if let metalLayer = view.layer as? CAMetalLayer {
-                return metalLayer
-            }
-            
-            for subview in view.subviews {
-                if let metalLayer = findMetalLayer(in: subview) {
-                    return metalLayer
-                }
-            }
-            
-            return nil
-        }
-
-        if let existingLayer = findMetalLayer(in: rootView) {
-            print("Found Metal Layer")
-            return existingLayer
-        }
-        print("found nothing")
-        return nil
-    }
-
-
 
     static func log(_ message: String) {
-        print("[Ryujinx] \(message)")
+        // print("[Ryujinx] \(message)")
+    }
+    
+    public func updateOrientation() -> Bool {
+        if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
+           let window = windowScene.windows.first {
+            return (window.bounds.size.height > window.bounds.size.width)
+        }
+        return false
+    }
+    
+    func ryuIsJITEnabled() {
+        jitenabled = isJITEnabled()
     }
 }
 
 
+public extension UIDevice {
+    static let modelName: String = {
+        var systemInfo = utsname()
+        uname(&systemInfo)
+        let machineMirror = Mirror(reflecting: systemInfo.machine)
+        let identifier = machineMirror.children.reduce("") { identifier, element in
+            guard let value = element.value as? Int8, value != 0 else { return identifier }
+            return identifier + String(UnicodeScalar(UInt8(value)))
+        }
+
+        func mapToDevice(identifier: String) -> String { // swiftlint:disable:this cyclomatic_complexity
+            #if os(iOS)
+            switch identifier {
+            case "iPod5,1":                                       return "iPod touch (5th generation)"
+            case "iPod7,1":                                       return "iPod touch (6th generation)"
+            case "iPod9,1":                                       return "iPod touch (7th generation)"
+            case "iPhone3,1", "iPhone3,2", "iPhone3,3":           return "iPhone 4"
+            case "iPhone4,1":                                     return "iPhone 4s"
+            case "iPhone5,1", "iPhone5,2":                        return "iPhone 5"
+            case "iPhone5,3", "iPhone5,4":                        return "iPhone 5c"
+            case "iPhone6,1", "iPhone6,2":                        return "iPhone 5s"
+            case "iPhone7,2":                                     return "iPhone 6"
+            case "iPhone7,1":                                     return "iPhone 6 Plus"
+            case "iPhone8,1":                                     return "iPhone 6s"
+            case "iPhone8,2":                                     return "iPhone 6s Plus"
+            case "iPhone9,1", "iPhone9,3":                        return "iPhone 7"
+            case "iPhone9,2", "iPhone9,4":                        return "iPhone 7 Plus"
+            case "iPhone10,1", "iPhone10,4":                      return "iPhone 8"
+            case "iPhone10,2", "iPhone10,5":                      return "iPhone 8 Plus"
+            case "iPhone10,3", "iPhone10,6":                      return "iPhone X"
+            case "iPhone11,2":                                    return "iPhone XS"
+            case "iPhone11,4", "iPhone11,6":                      return "iPhone XS Max"
+            case "iPhone11,8":                                    return "iPhone XR"
+            case "iPhone12,1":                                    return "iPhone 11"
+            case "iPhone12,3":                                    return "iPhone 11 Pro"
+            case "iPhone12,5":                                    return "iPhone 11 Pro Max"
+            case "iPhone13,1":                                    return "iPhone 12 mini"
+            case "iPhone13,2":                                    return "iPhone 12"
+            case "iPhone13,3":                                    return "iPhone 12 Pro"
+            case "iPhone13,4":                                    return "iPhone 12 Pro Max"
+            case "iPhone14,4":                                    return "iPhone 13 mini"
+            case "iPhone14,5":                                    return "iPhone 13"
+            case "iPhone14,2":                                    return "iPhone 13 Pro"
+            case "iPhone14,3":                                    return "iPhone 13 Pro Max"
+            case "iPhone14,7":                                    return "iPhone 14"
+            case "iPhone14,8":                                    return "iPhone 14 Plus"
+            case "iPhone15,2":                                    return "iPhone 14 Pro"
+            case "iPhone15,3":                                    return "iPhone 14 Pro Max"
+            case "iPhone15,4":                                    return "iPhone 15"
+            case "iPhone15,5":                                    return "iPhone 15 Plus"
+            case "iPhone16,1":                                    return "iPhone 15 Pro"
+            case "iPhone16,2":                                    return "iPhone 15 Pro Max"
+            case "iPhone17,3":                                    return "iPhone 16"
+            case "iPhone17,4":                                    return "iPhone 16 Plus"
+            case "iPhone17,1":                                    return "iPhone 16 Pro"
+            case "iPhone17,2":                                    return "iPhone 16 Pro Max"
+            case "iPhone17,5":                                    return "iPhone 16e"
+            case "iPhone8,4":                                     return "iPhone SE"
+            case "iPhone12,8":                                    return "iPhone SE (2nd generation)"
+            case "iPhone14,6":                                    return "iPhone SE (3rd generation)"
+            case "iPad2,1", "iPad2,2", "iPad2,3", "iPad2,4":      return "iPad 2"
+            case "iPad3,1", "iPad3,2", "iPad3,3":                 return "iPad (3rd generation)"
+            case "iPad3,4", "iPad3,5", "iPad3,6":                 return "iPad (4th generation)"
+            case "iPad6,11", "iPad6,12":                          return "iPad (5th generation)"
+            case "iPad7,5", "iPad7,6":                            return "iPad (6th generation)"
+            case "iPad7,11", "iPad7,12":                          return "iPad (7th generation)"
+            case "iPad11,6", "iPad11,7":                          return "iPad (8th generation)"
+            case "iPad12,1", "iPad12,2":                          return "iPad (9th generation)"
+            case "iPad13,18", "iPad13,19":                        return "iPad (10th generation)"
+            case "iPad4,1", "iPad4,2", "iPad4,3":                 return "iPad Air"
+            case "iPad5,3", "iPad5,4":                            return "iPad Air 2"
+            case "iPad11,3", "iPad11,4":                          return "iPad Air (3rd generation)"
+            case "iPad13,1", "iPad13,2":                          return "iPad Air (4th generation)"
+            case "iPad13,16", "iPad13,17":                        return "iPad Air (5th generation)"
+            case "iPad14,8", "iPad14,9":                          return "iPad Air (11-inch) (M2)"
+            case "iPad14,10", "iPad14,11":                        return "iPad Air (13-inch) (M2)"
+            case "iPad2,5", "iPad2,6", "iPad2,7":                 return "iPad mini"
+            case "iPad4,4", "iPad4,5", "iPad4,6":                 return "iPad mini 2"
+            case "iPad4,7", "iPad4,8", "iPad4,9":                 return "iPad mini 3"
+            case "iPad5,1", "iPad5,2":                            return "iPad mini 4"
+            case "iPad11,1", "iPad11,2":                          return "iPad mini (5th generation)"
+            case "iPad14,1", "iPad14,2":                          return "iPad mini (6th generation)"
+            case "iPad16,1", "iPad16,2":                          return "iPad mini (A17 Pro)"
+            case "iPad6,3", "iPad6,4":                            return "iPad Pro (9.7-inch)"
+            case "iPad7,3", "iPad7,4":                            return "iPad Pro (10.5-inch)"
+            case "iPad8,1", "iPad8,2", "iPad8,3", "iPad8,4":      return "iPad Pro (11-inch) (1st generation)"
+            case "iPad8,9", "iPad8,10":                           return "iPad Pro (11-inch) (2nd generation)"
+            case "iPad13,4", "iPad13,5", "iPad13,6", "iPad13,7":  return "iPad Pro (11-inch) (3rd generation)"
+            case "iPad14,3", "iPad14,4":                          return "iPad Pro (11-inch) (4th generation)"
+            case "iPad16,3", "iPad16,4":                          return "iPad Pro (11-inch) (M4)"
+            case "iPad6,7", "iPad6,8":                            return "iPad Pro (12.9-inch) (1st generation)"
+            case "iPad7,1", "iPad7,2":                            return "iPad Pro (12.9-inch) (2nd generation)"
+            case "iPad8,5", "iPad8,6", "iPad8,7", "iPad8,8":      return "iPad Pro (12.9-inch) (3rd generation)"
+            case "iPad8,11", "iPad8,12":                          return "iPad Pro (12.9-inch) (4th generation)"
+            case "iPad13,8", "iPad13,9", "iPad13,10", "iPad13,11":return "iPad Pro (12.9-inch) (5th generation)"
+            case "iPad14,5", "iPad14,6":                          return "iPad Pro (12.9-inch) (6th generation)"
+            case "iPad16,5", "iPad16,6":                          return "iPad Pro (13-inch) (M4)"
+            case "AppleTV5,3":                                    return "Apple TV"
+            case "AppleTV6,2":                                    return "Apple TV 4K"
+            case "AudioAccessory1,1":                             return "HomePod"
+            case "AudioAccessory5,1":                             return "HomePod mini"
+            case "i386", "x86_64", "arm64":                       return "Simulator \(mapToDevice(identifier: ProcessInfo().environment["SIMULATOR_MODEL_IDENTIFIER"] ?? "iOS"))"
+            default:                                              return identifier
+            }
+            #elseif os(tvOS)
+            switch identifier {
+            case "AppleTV5,3": return "Apple TV 4"
+            case "AppleTV6,2", "AppleTV11,1", "AppleTV14,1": return "Apple TV 4K"
+            case "i386", "x86_64": return "Simulator \(mapToDevice(identifier: ProcessInfo().environment["SIMULATOR_MODEL_IDENTIFIER"] ?? "tvOS"))"
+            default: return identifier
+            }
+            #elseif os(visionOS)
+            switch identifier {
+            case "RealityDevice14,1": return "Apple Vision Pro"
+            default: return identifier
+            }
+            #endif
+        }
+
+        return mapToDevice(identifier: identifier)
+    }()
+
+}

src/MeloNX/MeloNX/App/Intents/LaunchGameIntent.swift

@@ -32,10 +32,10 @@ struct LaunchGameIntentDef: AppIntent {
         
         let ryujinx = Ryujinx.shared.games
         
-        let name = findClosestGameName(input: gameName, games: ryujinx.flatMap(\.titleName))
+        let name = findClosestGameName(input: gameName, games: ryujinx.compactMap(\.titleName))
         
         let urlString = "melonx://game?name=\(name ?? gameName)"
-        print(urlString)
+        // print(urlString)
         if let url = URL(string: urlString) {
             UIApplication.shared.open(url, options: [:], completionHandler: nil)
         }

src/MeloNX/MeloNX/App/Models/Game.swift

@@ -57,28 +57,21 @@ public struct Game: Identifiable, Equatable, Hashable {
             
             gameTemp.icon = UIImage(data: imageData)
         } else {
-            print("Invalid image size.")
+            // print("Invalid image size.")
         }
         return gameTemp
     }
     
     func createImage(from gameInfo: GameInfo) -> UIImage? {
-        // Access the struct
         let gameInfoValue = gameInfo
 
-        // Get the image data
         let imageSize = Int(gameInfoValue.ImageSize)
         guard imageSize > 0, imageSize <= 1024 * 1024 else {
-            print("Invalid image size.")
+            // print("Invalid image size.")
             return nil
         }
 
-        // Convert the ImageData byte array to Swift's Data
         let imageData = Data(bytes: gameInfoValue.ImageData, count: imageSize)
-
-        // Create a UIImage (or NSImage on macOS)
-        print(imageData)
-        
         return UIImage(data: imageData)
     }
 }

src/MeloNX/MeloNX/App/Models/LatestVersionResponse.swift

@@ -0,0 +1,38 @@
+//
+//  LatestVersionResponse.swift
+//  MeloNX
+//
+//  Created by Bella on 12/03/2025.
+//
+
+
+struct LatestVersionResponse: Codable {
+    let version_number: String
+    let version_number_stripped: String
+    let changelog: String
+    let download_link: String
+    
+    #if DEBUG
+    static let example1 = LatestVersionResponse(
+        version_number: "1.0.0",
+        version_number_stripped: "100",
+        changelog: """
+            - Rewrite Display Code (SDL isn't used for display anymore)
+            - Add New Onboarding / Setup
+            - Better Performance
+            - Remove "SDL Window" option in settings
+            - Fix JIT Cache Regions
+            - Fix how JIT is detected in Settings
+            - Fix ABYX being swapped on controller.
+            - Settings are now a config.json file
+            - Fix Performance Overlay not showing when Virtual Controller is hidden
+            - Add displaying logs when Loading or in-game
+            - Fix Launching games from outside of the roms folder
+            - Add Waiting for JIT popup
+            - Fix spesific Games
+            - Added Back Herobrine ("You were supposed to be the hero, Bryan")
+        """,
+        download_link: "https://example.com"
+    )
+    #endif
+}

src/MeloNX/MeloNX/App/Models/ToggleButtonsState.swift

@@ -0,0 +1,27 @@
+//
+//  ToggleButtonsState.swift
+//  MeloNX
+//
+//  Created by Stossy11 on 12/04/2025.
+//
+
+
+struct ToggleButtonsState: Codable, Equatable {
+    var toggle1: Bool
+    var toggle2: Bool
+    var toggle3: Bool
+    var toggle4: Bool
+    
+    init() {
+        self = .default
+    }
+    
+    init(toggle1: Bool, toggle2: Bool, toggle3: Bool, toggle4: Bool) {
+        self.toggle1 = toggle1
+        self.toggle2 = toggle2
+        self.toggle3 = toggle3
+        self.toggle4 = toggle4
+    }
+
+    static let `default` = ToggleButtonsState(toggle1: false, toggle2: false, toggle3: false, toggle4: false)
+}

src/MeloNX/MeloNX/App/Views/Extensions/AppCodableStorage.swift

@@ -0,0 +1,47 @@
+//
+//  AppCodableStorage.swift
+//  MeloNX
+//
+//  Created by Stossy11 on 12/04/2025.
+//
+
+import SwiftUI
+
+@propertyWrapper
+struct AppCodableStorage<Value: Codable & Equatable>: DynamicProperty {
+    @State private var value: Value
+
+    private let key: String
+    private let defaultValue: Value
+    private let storage: UserDefaults
+
+    init(wrappedValue defaultValue: Value, _ key: String, store: UserDefaults = .standard) {
+        self._value = State(initialValue: {
+            if let data = store.data(forKey: key),
+               let decoded = try? JSONDecoder().decode(Value.self, from: data) {
+                return decoded
+            }
+            return defaultValue
+        }())
+        self.key = key
+        self.defaultValue = defaultValue
+        self.storage = store
+    }
+
+    var wrappedValue: Value {
+        get { value }
+        nonmutating set {
+            value = newValue
+            if let data = try? JSONEncoder().encode(newValue) {
+                storage.set(data, forKey: key)
+            }
+        }
+    }
+
+    var projectedValue: Binding<Value> {
+        Binding(
+            get: { self.wrappedValue },
+            set: { newValue in self.wrappedValue = newValue }
+        )
+    }
+}

src/MeloNX/MeloNX/App/Views/Main/ContentView.swift

@@ -1,390 +0,0 @@
-//
-//  ContentView.swift
-//  MeloNX
-//
-//  Created by Stossy11 on 3/11/2024.
-//
-
-import SwiftUI
-// import SDL2
-import GameController
-import Darwin
-import UIKit
-import MetalKit
-// import SDL
-
-struct MoltenVKSettings: Codable, Hashable {
-    let string: String
-    var value: String
-}
-
-struct ContentView: View {
-    // Games
-    @State private var game: Game?
-    
-    // Controllers
-    @State private var controllersList: [Controller] = []
-    @State private var currentControllers: [Controller] = []
-    @State var onscreencontroller: Controller = Controller(id: "", name: "")
-    @State var nativeControllers: [GCController: NativeController] = [:]
-    @State private var isVirtualControllerActive: Bool = false
-    @AppStorage("isVirtualController") var isVCA: Bool = true
-    
-    // Settings and Configuration
-    @State private var config: Ryujinx.Configuration
-    @State var settings: [MoltenVKSettings]
-    @AppStorage("useTrollStore") var useTrollStore: Bool = false
-    
-    // JIT
-    @AppStorage("jitStreamerEB") var jitStreamerEB: Bool = false
-    
-    // Other Configuration
-    @State var isMK8: Bool = false
-    @AppStorage("quit") var quit: Bool = false
-    @State var quits: Bool = false
-    @AppStorage("MVK_CONFIG_PREFILL_METAL_COMMAND_BUFFERS") var mVKPreFillBuffer: Bool = true
-    @AppStorage("MVK_CONFIG_SYNCHRONOUS_QUEUE_SUBMITS") var syncqsubmits: Bool = true
-    @AppStorage("ignoreJIT") var ignoreJIT: Bool = false
-    
-    // Loading Animation
-    @AppStorage("showlogsloading") var showlogsloading: Bool = true
-    @State private var clumpOffset: CGFloat = -100
-    private let clumpWidth: CGFloat = 100
-    private let animationDuration: Double = 1.0
-    @State private var isAnimating = false
-    @State var isLoading = true
-    @State var jitNotEnabled = false
-
-    // MARK: - Initialization
-    init() {
-        var defaultConfig = loadSettings()
-        if defaultConfig == nil {
-            saveSettings(config: .init(gamepath: ""))
-            
-            defaultConfig = loadSettings()
-        }
-        
-        
-        _config = State(initialValue: defaultConfig!)
-        
-        let defaultSettings: [MoltenVKSettings] = [ // Default MoltenVK Settings.
-            MoltenVKSettings(string: "MVK_USE_METAL_PRIVATE_API", value: "1"),
-            MoltenVKSettings(string: "MVK_CONFIG_USE_METAL_PRIVATE_API", value: "1"),
-            MoltenVKSettings(string: "MVK_DEBUG", value: "0"),
-            MoltenVKSettings(string: "MVK_CONFIG_LOG_LEVEL", value: "0"),
-            MoltenVKSettings(string: "MVK_CONFIG_SYNCHRONOUS_QUEUE_SUBMITS", value: "1"),
-            // MoltenVKSettings(string: "MVK_CONFIG_PREFILL_METAL_COMMAND_BUFFERS", value: "0"),
-            // Uses more ram but makes performance higher, may add an option in settings to change or enable / disable this value (default 64)
-            MoltenVKSettings(string: "MVK_CONFIG_MAX_ACTIVE_METAL_COMMAND_BUFFERS_PER_QUEUE", value: "512"),
-        ]
-        
-        _settings = State(initialValue: defaultSettings)
-        
-        initializeSDL()
-    }
-    
-    // MARK: - Body
-    var body: some View {
-        if game != nil, !jitNotEnabled {
-            // This is when the game starts to stop the animation
-            ZStack {
-                if #available(iOS 16, *) {
-                    EmulationView(startgame: $game)
-                        .persistentSystemOverlays(.hidden)
-                } else {
-                    EmulationView(startgame: $game)
-                }
-                
-                if isLoading {
-                    ZStack {
-                        Color.black
-                            .opacity(0.8)
-                        emulationView
-                            .ignoresSafeArea(.all)
-                    }
-                    .edgesIgnoringSafeArea(.all)
-                    .ignoresSafeArea(.all)
-                }
-            }
-        } else if game != nil, ignoreJIT {
-            ZStack {
-                if #available(iOS 16, *) {
-                    EmulationView(startgame: $game)
-                        .persistentSystemOverlays(.hidden)
-                } else {
-                    EmulationView(startgame: $game)
-                }
-                
-                if isLoading {
-                    ZStack {
-                        Color.black
-                            .opacity(0.8)
-                        emulationView
-                            .ignoresSafeArea(.all)
-                    }
-                    .edgesIgnoringSafeArea(.all)
-                    .ignoresSafeArea(.all)
-                }
-            }
-        } else if game != nil {
-            Text("")
-                .sheet(isPresented: $jitNotEnabled) {
-                    JITPopover() {
-                        jitNotEnabled = false
-                    }
-                    .interactiveDismissDisabled()
-                }
-        } else {
-            // This is the main menu view that includes the Settings and the Game Selector
-            mainMenuView
-                .onAppear() {
-                    quits = false
-                    
-                    loadSettings()
-                    
-                    isLoading = true
-
-                    initControllerObservers() // This initializes the Controller Observers that refreshes the controller list when a new controller connecvts.
-                }
-                .onOpenURL() { url in
-                    if let components = URLComponents(url: url, resolvingAgainstBaseURL: true),
-                       components.host == "game" {
-                        if let text = components.queryItems?.first(where: { $0.name == "id" })?.value {
-
-                            game = Ryujinx.shared.games.first(where: { $0.titleId == text })
-                        } else if let text = components.queryItems?.first(where: { $0.name == "name" })?.value {
-                            game = Ryujinx.shared.games.first(where: { $0.titleName == text })
-                        }
-                    }
-                }
-        }
-        
-    }
-    
-    
-    private func initControllerObservers() {
-        NotificationCenter.default.addObserver(
-            forName: .GCControllerDidConnect,
-            object: nil,
-            queue: .main) { notification in
-                if let controller = notification.object as? GCController {
-                    print("Controller connected: \(controller.productCategory)")
-                    nativeControllers[controller] = .init(controller)
-                    refreshControllersList()
-                }
-        }
-        
-        
-        NotificationCenter.default.addObserver(
-            forName: .GCControllerDidDisconnect,
-            object: nil,
-            queue: .main) { notification in
-                if let controller = notification.object as? GCController {
-                    print("Controller disconnected: \(controller.productCategory)")
-                    nativeControllers[controller]?.cleanup()
-                    nativeControllers[controller] = nil
-                    refreshControllersList()
-                }
-        }
-    }
-        
-    // MARK: - View Components
-    private var emulationView: some View {
-        GeometryReader { screenGeometry in
-            ZStack {
-                HStack(spacing: screenGeometry.size.width * 0.04) {
-                    if let icon = game?.icon {
-                        Image(uiImage: icon)
-                            .resizable()
-                            .frame(
-                                width: min(screenGeometry.size.width * 0.25, 250),
-                                height: min(screenGeometry.size.width * 0.25, 250)
-                            )
-                            .clipShape(RoundedRectangle(cornerRadius: 16))
-                            .shadow(color: .black.opacity(0.5), radius: 10, x: 0, y: 5)
-                    }
-                    
-                    VStack(alignment: .leading, spacing: screenGeometry.size.height * 0.015) {
-                        Text("Loading \(game?.titleName ?? "Game")")
-                            .font(.system(size: min(screenGeometry.size.width * 0.04, 32)))
-                            .foregroundColor(.white)
-                        
-                        GeometryReader { geometry in
-                            let containerWidth = min(screenGeometry.size.width * 0.35, 350)
-                            
-                            ZStack(alignment: .leading) {
-                                Rectangle()
-                                    .cornerRadius(10)
-                                    .frame(width: containerWidth, height: min(screenGeometry.size.height * 0.015, 12))
-                                    .foregroundColor(.gray.opacity(0.3))
-                                    .shadow(color: .black.opacity(0.2), radius: 4, x: 0, y: 2)
-                                
-                                Rectangle()
-                                    .cornerRadius(10)
-                                    .frame(width: clumpWidth, height: min(screenGeometry.size.height * 0.015, 12))
-                                    .foregroundColor(.blue)
-                                    .shadow(color: .blue.opacity(0.5), radius: 4, x: 0, y: 2)
-                                    .offset(x: isAnimating ? containerWidth : -clumpWidth)
-                                    .animation(
-                                        Animation.linear(duration: 1.0)
-                                            .repeatForever(autoreverses: false),
-                                        value: isAnimating
-                                    )
-                            }
-                            .clipShape(RoundedRectangle(cornerRadius: 16))
-                            .onAppear {
-                                isAnimating = true
-                                
-                                setupEmulation()
-                                
-                                
-                                Timer.scheduledTimer(withTimeInterval: 0.5, repeats: true) { timer in
-                                    if get_current_fps() != 0 {
-                                        withAnimation {
-                                            isLoading = false
-                                            
-                                            isAnimating = false
-                                        }
-                                        
-                                        
-                                        
-                                        timer.invalidate()
-                                    }
-                                }
-                            }
-                        }
-                        .frame(height: min(screenGeometry.size.height * 0.015, 12))
-                        .frame(width: min(screenGeometry.size.width * 0.35, 350))
-                    }
-                }
-                .padding(.horizontal, screenGeometry.size.width * 0.06)
-                .padding(.vertical, screenGeometry.size.height * 0.05)
-                .position(
-                    x: screenGeometry.size.width / 2,
-                    y: screenGeometry.size.height * 0.5
-                )
-            }
-            
-            if showlogsloading {
-                LogFileView(isfps: true)
-                    .frame(alignment: .topLeading)
-            }
-        }
-    }
-
-    private var mainMenuView: some View {
-        MainTabView(startemu: $game, config: $config, MVKconfig: $settings, controllersList: $controllersList, currentControllers: $currentControllers, onscreencontroller: $onscreencontroller)
-            .onAppear() {
-                Timer.scheduledTimer(withTimeInterval: 1, repeats: false) { timer in
-                    refreshControllersList()
-                }
-                
-                Air.play(AnyView(
-                    VStack {
-                        Image(systemName: "gamecontroller")
-                            .font(.system(size: 300))
-                            .foregroundColor(.gray)
-                            .padding(.bottom, 10)
-                        
-                        Text("Select Game")
-                            .font(.system(size: 150))
-                            .bold()
-                    }
-                ))
-                
-                jitNotEnabled = !isJITEnabled()
-                if jitNotEnabled {
-                    useTrollStore ? askForJIT() : jitStreamerEB ? enableJITEB() : print("no JIT")
-                }
-            }
-    }
-    
-    // MARK: - Helper Methods
-    var SdlInitFlags: uint = SDL_INIT_EVENTS | SDL_INIT_GAMECONTROLLER | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_VIDEO; // Initialises SDL2 for Events, Game Controller, Joystick, Audio and Video.
-    private func initializeSDL() {
-        setMoltenVKSettings()
-        SDL_SetMainReady() // Sets SDL Ready
-        SDL_iPhoneSetEventPump(SDL_TRUE) // Set iOS Event Pump to true
-        SDL_Init(SdlInitFlags) // Initialises SDL2
-        initialize()
-    }
-    
-    private func setupEmulation() {
-        isVCA = (currentControllers.first(where: { $0 == onscreencontroller }) != nil)
-        
-        DispatchQueue.main.async {
-            start(displayid: 1)
-        }
-    }
-    
-    private func refreshControllersList() {
-        controllersList = Ryujinx.shared.getConnectedControllers()
-        
-        if let onscreen = controllersList.first(where: { $0.name == Ryujinx.shared.virtualController.controllername }) {
-            self.onscreencontroller = onscreen
-        }
-        
-        controllersList.removeAll(where: { $0.id == "0" || (!$0.name.starts(with: "GC - ") && $0 != onscreencontroller) })
-        controllersList.mutableForEach { $0.name = $0.name.replacingOccurrences(of: "GC - ", with: "") }
-
-        currentControllers = []
-        
-        if controllersList.count == 1 {
-            let controller = controllersList[0]
-            currentControllers.append(controller)
-        } else if (controllersList.count - 1) >= 1 {
-            for controller in controllersList {
-                if controller.id != onscreencontroller.id && !currentControllers.contains(where: { $0.id == controller.id }) {
-                    currentControllers.append(controller)
-                }
-            }
-        }
-    }
-    
-
-    
-    private func start(displayid: UInt32) {
-        guard let game else { return }
-        
-        config.gamepath = game.fileURL.path
-        config.inputids = Array(Set(currentControllers.map(\.id)))
-        
-        if mVKPreFillBuffer {
-            let setting = MoltenVKSettings(string: "MVK_CONFIG_PREFILL_METAL_COMMAND_BUFFERS", value: "2")
-            setenv(setting.string, setting.value, 1)
-        }
-        
-        if syncqsubmits {
-            let setting = MoltenVKSettings(string: "MVK_CONFIG_SYNCHRONOUS_QUEUE_SUBMITS", value: "2")
-            setenv(setting.string, setting.value, 1)
-        }
-        
-        if config.inputids.isEmpty {
-            config.inputids.append("0")
-        }
-        
-        
-        do {
-            try Ryujinx.shared.start(with: config)
-        } catch {
-            print("Error: \(error.localizedDescription)")
-        }
-    }
-    
-    
-
-    // Sets MoltenVK Environment Variables
-    private func setMoltenVKSettings() {
-        settings.forEach { setting in
-            setenv(setting.string, setting.value, 1)
-        }
-    }
-}
-
-extension Array {
-    @inlinable public mutating func mutableForEach(_ body: (inout Element) throws -> Void) rethrows {
-        for index in self.indices {
-            try body(&self[index])
-        }
-    }
-}

src/MeloNX/MeloNX/App/Views/Main/ControllerView/ControllerView.swift

@@ -1,290 +0,0 @@
-//
-//  ControllerView.swift
-//  Pomelo-V2
-//
-//  Created by Stossy11 on 16/7/2024.
-//
-
-import SwiftUI
-import GameController
-import SwiftUIJoystick
-import CoreMotion
-
-struct ControllerView: View {
-    var body: some View {
-        GeometryReader { geometry in
-            if geometry.size.height > geometry.size.width && UIDevice.current.userInterfaceIdiom != .pad {
-                VStack {
-                    
-                    Spacer()
-                    VStack {
-                        HStack {
-                            VStack {
-                                ShoulderButtonsViewLeft()
-                                ZStack {
-                                    Joystick()
-                                    DPadView()
-                                }
-                            }
-                            Spacer()
-                            VStack {
-                                ShoulderButtonsViewRight()
-                                ZStack {
-                                    Joystick(iscool: true) // hope this works
-                                    ABXYView()
-                                }
-                            }
-                        }
-                        
-                        HStack {
-                            ButtonView(button: .start) // Adding the + button
-                                .padding(.horizontal, 40)
-                            ButtonView(button: .back) // Adding the - button
-                                .padding(.horizontal, 40)
-                        }
-                    }
-                }
-                
-            } else {
-                // could be landscape
-                VStack {
-                    
-                    Spacer()
-                    VStack {
-                        HStack {
-                            
-                            // gotta fuckin add + and - now
-                            VStack {
-                                ShoulderButtonsViewLeft()
-                                ZStack {
-                                    Joystick()
-                                    DPadView()
-                                }
-                            }
-                            HStack {
-                                // Spacer()
-                                VStack {
-                                    // Spacer()
-                                    ButtonView(button: .back) // Adding the - button
-                                }
-                                Spacer()
-                                VStack {
-                                    // Spacer()
-                                    ButtonView(button: .start) // Adding the + button
-                                }
-                                // Spacer()
-                            }
-                            VStack {
-                                ShoulderButtonsViewRight()
-                                ZStack {
-                                    Joystick(iscool: true) // hope this work s
-                                    ABXYView()
-                                }
-                            }
-                        }
-                        
-                    }
-                    // .padding(.bottom, geometry.size.height / 11) // also extremally broken (
-                }
-            }
-        }
-        .padding()
-    }
-}
-
-struct ShoulderButtonsViewLeft: View {
-    @State var width: CGFloat = 160
-    @State var height: CGFloat = 20
-    @AppStorage("On-ScreenControllerScale") var controllerScale: Double = 1.0
-    
-    var body: some View {
-        HStack {
-            ButtonView(button: .leftTrigger)
-                .padding(.horizontal)
-            ButtonView(button: .leftShoulder)
-                .padding(.horizontal)
-        }
-        .frame(width: width, height: height)
-        .onAppear() {
-            if UIDevice.current.systemName.contains("iPadOS") {
-                width *= 1.2
-                height *= 1.2
-            }
-            
-            width *= CGFloat(controllerScale)
-            height *= CGFloat(controllerScale)
-        }
-    }
-}
-
-struct ShoulderButtonsViewRight: View {
-    @State var width: CGFloat = 160
-    @State var height: CGFloat = 20
-    @AppStorage("On-ScreenControllerScale") var controllerScale: Double = 1.0
-    
-    var body: some View {
-        HStack {
-            ButtonView(button: .rightShoulder)
-                .padding(.horizontal)
-            ButtonView(button: .rightTrigger)
-                .padding(.horizontal)
-        }
-        .frame(width: width, height: height)
-        .onAppear() {
-            if UIDevice.current.systemName.contains("iPadOS") {
-                width *= 1.2
-                height *= 1.2
-            }
-            
-            width *= CGFloat(controllerScale)
-            height *= CGFloat(controllerScale)
-        }
-    }
-}
-
-struct DPadView: View {
-    @State var size: CGFloat = 145
-    @AppStorage("On-ScreenControllerScale") var controllerScale: Double = 1.0
-    var body: some View {
-        VStack {
-            ButtonView(button: .dPadUp)
-            HStack {
-                ButtonView(button: .dPadLeft)
-                Spacer(minLength: 20)
-                ButtonView(button: .dPadRight)
-            }
-            ButtonView(button: .dPadDown)
-                .padding(.horizontal)
-        }
-        .frame(width: size, height: size)
-        .onAppear() {
-            if UIDevice.current.systemName.contains("iPadOS") {
-                size *= 1.2
-            }
-            
-            size *= CGFloat(controllerScale)
-        }
-    }
-}
-
-struct ABXYView: View {
-    @State var size: CGFloat = 145
-    @AppStorage("On-ScreenControllerScale") var controllerScale: Double = 1.0
-    
-    var body: some View {
-        VStack {
-            ButtonView(button: .X)
-            HStack {
-                ButtonView(button: .Y)
-                Spacer(minLength: 20)
-                ButtonView(button: .A)
-            }
-            ButtonView(button: .B)
-                .padding(.horizontal)
-        }
-        .frame(width: size, height: size)
-        .onAppear() {
-            if UIDevice.current.systemName.contains("iPadOS") {
-                size *= 1.2
-            }
-            
-            size *= CGFloat(controllerScale)
-        }
-    }
-}
-
-struct ButtonView: View {
-    var button: VirtualControllerButton
-    @State var width: CGFloat = 45
-    @State var height: CGFloat = 45
-    @State var isPressed = false
-    @AppStorage("onscreenhandheld") var onscreenjoy: Bool = false
-    @Environment(\.colorScheme) var colorScheme
-    @Environment(\.presentationMode) var presentationMode
-    @AppStorage("On-ScreenControllerScale") var controllerScale: Double = 1.0
-    
-
-    
-    var body: some View {
-        Image(systemName: buttonText)
-            .resizable()
-            .frame(width: width, height: height)
-            .foregroundColor(colorScheme == .dark ? Color.gray : Color.gray)
-            .opacity(isPressed ? 0.4 : 0.7)
-            .gesture(
-                DragGesture(minimumDistance: 0)
-                    .onChanged { _ in
-                        if !self.isPressed {
-                            self.isPressed = true
-                            Ryujinx.shared.virtualController.setButtonState(1, for: button)
-                            Haptics.shared.play(.heavy)
-                        }
-                    }
-                    .onEnded { _ in
-                        self.isPressed = false
-                        Ryujinx.shared.virtualController.setButtonState(0, for: button)
-                    }
-                )
-            .onAppear() {
-                if button == .leftTrigger || button == .rightTrigger || button == .leftShoulder || button == .rightShoulder {
-                    width = 65
-                }
-            
-                
-                if button == .back || button == .start || button == .guide {
-                    width = 35
-                    height = 35
-                }
-                
-                if UIDevice.current.systemName.contains("iPadOS") {
-                    width *= 1.2
-                    height *= 1.2
-                }
-                
-                width *= CGFloat(controllerScale)
-                height *= CGFloat(controllerScale)
-            }
-    }
-    
-
-    
-    private var buttonText: String {
-        switch button {
-        case .A:
-            return "a.circle.fill"
-        case .B:
-            return "b.circle.fill"
-        case .X:
-            return "x.circle.fill"
-        case .Y:
-            return "y.circle.fill"
-        case .dPadUp:
-            return "arrowtriangle.up.circle.fill"
-        case .dPadDown:
-            return "arrowtriangle.down.circle.fill"
-        case .dPadLeft:
-            return "arrowtriangle.left.circle.fill"
-        case .dPadRight:
-            return "arrowtriangle.right.circle.fill"
-        case .leftTrigger:
-            return"zl.rectangle.roundedtop.fill"
-        case .rightTrigger:
-            return "zr.rectangle.roundedtop.fill"
-        case .leftShoulder:
-            return "l.rectangle.roundedbottom.fill"
-        case .rightShoulder:
-            return "r.rectangle.roundedbottom.fill"
-        case .start:
-            return "plus.circle.fill" // System symbol for +
-        case .back:
-            return "minus.circle.fill" // System symbol for -
-        case .guide:
-            return "house.circle.fill"
-        // This should be all the cases
-        default:
-            return ""
-        }
-    }
-}
-
-

src/MeloNX/MeloNX/App/Views/Main/ControllerView/Joystick/JoystickView.swift

@@ -1,56 +0,0 @@
-//
-//  JoystickView.swift
-//  Pomelo
-//
-//  Created by Stossy11 on 30/9/2024.
-//  Copyright © 2024 Stossy11. All rights reserved.
-//
-
-import SwiftUI
-import SwiftUIJoystick
-
-public struct Joystick: View {
-    @State var iscool: Bool? = nil
-    
-    @ObservedObject public var joystickMonitor = JoystickMonitor()
-    @AppStorage("On-ScreenControllerScale") var controllerScale: Double = 1.0
-    var dragDiameter: CGFloat {
-        var selfs = CGFloat(160)
-        selfs *= controllerScale
-        if UIDevice.current.systemName.contains("iPadOS") {
-            return selfs * 1.2
-        }
-        
-        return selfs
-    }
-    private let shape: JoystickShape = .circle
-    
-    public var body: some View {
-        VStack{
-            JoystickBuilder(
-                monitor: self.joystickMonitor,
-                width: self.dragDiameter,
-                shape: .circle,
-                background: {
-                    Text("")
-                        .hidden()
-                },
-                foreground: {
-                    Circle().fill(Color.gray)
-                        .opacity(0.7)
-                },
-                locksInPlace: false)
-            .onChange(of: self.joystickMonitor.xyPoint) { newValue in
-                let scaledX = Float(newValue.x)
-                let scaledY = Float(newValue.y) // my dumbass broke this by having -y instead of y :/
-                print("Joystick Position: (\(scaledX), \(scaledY))")
-                
-                if iscool != nil {
-                    Ryujinx.shared.virtualController.thumbstickMoved(.right, x: newValue.x, y: newValue.y)
-                } else {
-                    Ryujinx.shared.virtualController.thumbstickMoved(.left, x: newValue.x, y: newValue.y)
-                }
-            }
-        }
-    }
-}

src/MeloNX/MeloNX/App/Views/Main/Elements/FileImporter.swift

@@ -0,0 +1,125 @@
+//
+//  FileImporter.swift
+//  MeloNX
+//
+//  Created by Stossy11 on 17/04/2025.
+//
+
+
+import SwiftUI
+import UniformTypeIdentifiers
+
+class FileImporterManager: ObservableObject {
+    static let shared = FileImporterManager()
+    
+    private init() {}
+    
+    func importFiles(types: [UTType], allowMultiple: Bool = false, completion: @escaping (Result<[URL], Error>) -> Void) {
+        let id = "\(Unmanaged.passUnretained(completion as AnyObject).toOpaque())"
+        
+        DispatchQueue.main.async {
+            NotificationCenter.default.post(
+                name: .importFiles,
+                object: nil,
+                userInfo: [
+                    "id": id,
+                    "types": types,
+                    "allowMultiple": allowMultiple,
+                    "completion": completion
+                ]
+            )
+        }
+    }
+}
+
+extension Notification.Name {
+    static let importFiles = Notification.Name("importFiles")
+}
+
+struct FileImporterView: ViewModifier {
+    @State private var isImporterPresented: [String: Bool] = [:]
+    @State private var activeImporters: [String: ImporterConfig] = [:]
+    
+    struct ImporterConfig {
+        let types: [UTType]
+        let allowMultiple: Bool
+        let completion: (Result<[URL], Error>) -> Void
+    }
+    
+    func body(content: Content) -> some View {
+        content
+            .background(
+                ForEach(Array(activeImporters.keys), id: \.self) { id in
+                    if let config = activeImporters[id] {
+                        FileImporterWrapper(
+                            isPresented: Binding(
+                                get: { isImporterPresented[id] ?? false },
+                                set: { isImporterPresented[id] = $0 }
+                            ),
+                            id: id,
+                            config: config,
+                            onCompletion: { success in
+                                if success {
+                                    DispatchQueue.main.async {
+                                        activeImporters.removeValue(forKey: id)
+                                    }
+                                }
+                            }
+                        )
+                    }
+                }
+            )
+            .onReceive(NotificationCenter.default.publisher(for: .importFiles)) { notification in
+                guard let userInfo = notification.userInfo,
+                      let id = userInfo["id"] as? String,
+                      let types = userInfo["types"] as? [UTType],
+                      let allowMultiple = userInfo["allowMultiple"] as? Bool,
+                      let completion = userInfo["completion"] as? ((Result<[URL], Error>) -> Void) else {
+                    return
+                }
+                
+                let config = ImporterConfig(
+                    types: types,
+                    allowMultiple: allowMultiple,
+                    completion: completion
+                )
+                
+                activeImporters[id] = config
+                
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+                    isImporterPresented[id] = true
+                }
+            }
+    }
+}
+
+struct FileImporterWrapper: View {
+    @Binding var isPresented: Bool
+    let id: String
+    let config: FileImporterView.ImporterConfig
+    let onCompletion: (Bool) -> Void
+    
+    var body: some View {
+        Text("wow")
+            .hidden()
+            .fileImporter(
+                isPresented: $isPresented,
+                allowedContentTypes: config.types,
+                allowsMultipleSelection: config.allowMultiple
+            ) { result in
+                switch result {
+                case .success(let urls):
+                    config.completion(.success(urls))
+                case .failure(let error):
+                    config.completion(.failure(error))
+                }
+                onCompletion(true)
+            }
+    }
+}
+
+extension View {
+    func withFileImporter() -> some View {
+        self.modifier(FileImporterView())
+    }
+}

src/MeloNX/MeloNX/App/Views/Main/Emulation/AirPlay/Air.swift

@@ -58,7 +58,7 @@ public class Air {
     }
     
     @objc func didConnect(sender: NSNotification) {
-        print("AirKit - Connect")
+        // print("AirKit - Connect")
         self.connected = true
         guard let screen: UIScreen = sender.object as? UIScreen else { return }
         add(screen: screen) { success in
@@ -69,35 +69,35 @@ public class Air {
     
     func add(screen: UIScreen, completion: @escaping (Bool) -> ()) {
         
-        print("AirKit - Add Screen")
+        // print("AirKit - Add Screen")
         
         airScreen = screen
         
         airWindow = UIWindow(frame: airScreen!.bounds)
         
         guard let viewController: UIViewController = hostingController else {
-            print("AirKit - Add - Failed: Hosting Controller Not Found")
+            // print("AirKit - Add - Failed: Hosting Controller Not Found")
             completion(false)
             return
         }
         
         findWindowScene(for: airScreen!) { windowScene in
             guard let airWindowScene: UIWindowScene = windowScene else {
-                print("AirKit - Add - Failed: Window Scene Not Found")
+                // print("AirKit - Add - Failed: Window Scene Not Found")
                 completion(false)
                 return
             }
             self.airWindow?.rootViewController = viewController
             self.airWindow?.windowScene = airWindowScene
             self.airWindow?.isHidden = false
-            print("AirKit - Add Screen - Done")
+            // print("AirKit - Add Screen - Done")
             completion(true)
         }
         
     }
     
     func findWindowScene(for screen: UIScreen, shouldRecurse: Bool = true, completion: @escaping (UIWindowScene?) -> ())  {
-        print("AirKit - Find Window Scene")
+        // print("AirKit - Find Window Scene")
         var matchingWindowScene: UIWindowScene? = nil
         let scenes = UIApplication.shared.connectedScenes
         for scene in scenes {
@@ -120,23 +120,23 @@ public class Air {
     }
     
     @objc func didDisconnect() {
-        print("AirKit - Disconnect")
+        // print("AirKit - Disconnect")
         remove()
         connected = false
     }
     
     func remove() {
-        print("AirKit - Remove")
+        // print("AirKit - Remove")
         airWindow = nil
         airScreen = nil
     }
     
     @objc func didBecomeActive() {
-        print("AirKit - App Active")
+        // print("AirKit - App Active")
     }
     
     @objc func willResignActive() {
-        print("AirKit - App Inactive")
+        // print("AirKit - App Inactive")
         
     }
     

src/MeloNX/MeloNX/App/Views/Main/Emulation/AirPlay/AirPlay.swift

@@ -4,7 +4,7 @@ import SwiftUI
 public extension View {
     
     func airPlay() -> some View {
-        print("AirKit - airPlay")
+        // print("AirKit - airPlay")
         Air.play(AnyView(self))
         return self
     }

src/MeloNX/MeloNX/App/Views/Main/Emulation/ControllerView/ControllerView.swift

@@ -0,0 +1,440 @@
+//
+//  ControllerView.swift
+//  Pomelo-V2
+//
+//  Created by Stossy11 on 16/7/2024.
+//
+
+import SwiftUI
+import GameController
+import CoreMotion
+
+struct ControllerView: View {
+    // MARK: - Properties
+    @AppStorage("On-ScreenControllerScale") private var controllerScale: Double = 1.0
+    @AppStorage("stick-button") private var stickButton = false
+    @State private var isPortrait = true
+    @State var hideDpad = false
+    @State var hideABXY = false
+    @Environment(\.verticalSizeClass) var verticalSizeClass
+
+    
+    // MARK: - Body
+    var body: some View {
+        Group {
+            let isPad =  UIDevice.current.userInterfaceIdiom == .pad
+            
+            if isPortrait && !isPad {
+                portraitLayout
+            } else {
+                landscapeLayout
+            }
+        }
+        .padding()
+        .onChange(of: verticalSizeClass) { _ in
+            updateOrientation()
+        }
+        .onAppear(perform: updateOrientation)
+    }
+    
+    // MARK: - Layouts
+    private var portraitLayout: some View {
+        VStack {
+            Spacer()
+            VStack(spacing: 20) {
+                HStack(spacing: 30) {
+                    VStack(spacing: 15) {
+                        ShoulderButtonsViewLeft()
+                            .padding(.vertical)
+                        ZStack {
+                            JoystickController(showBackground: $hideDpad)
+                            DPadView()
+                                .opacity(hideDpad ? 0 : 1)
+                                .allowsHitTesting(!hideDpad)
+                                .animation(.easeInOut(duration: 0.2), value: hideDpad)
+                        }
+                    }
+                    
+                    VStack(spacing: 15) {
+                        ShoulderButtonsViewRight()
+                            .padding(.vertical)
+                        ZStack {
+                            JoystickController(iscool: true, showBackground: $hideABXY)
+                            ABXYView()
+                                .opacity(hideABXY ? 0 : 1)
+                                .allowsHitTesting(!hideABXY)
+                                .animation(.easeInOut(duration: 0.2), value: hideABXY)
+                        }
+                    }
+                }
+                
+                HStack(spacing: 60) {
+                    HStack {
+                        ButtonView(button: .leftStick)
+                            .padding()
+                        ButtonView(button: .back)
+                    }
+                    
+                    HStack {
+                        ButtonView(button: .start)
+                        ButtonView(button: .rightStick)
+                            .padding()
+                    }
+                }
+            }
+        }
+    }
+    
+    private var landscapeLayout: some View {
+        VStack {
+            Spacer()
+            
+            HStack {
+                VStack(spacing: 20) {
+                    ShoulderButtonsViewLeft()
+                        .padding(.vertical)
+                    ZStack {
+                        JoystickController(showBackground: $hideDpad)
+                        DPadView()
+                            .opacity(hideDpad ? 0 : 1)
+                            .allowsHitTesting(!hideDpad)
+                            .animation(.easeInOut(duration: 0.2), value: hideDpad)
+                    }
+                }
+                
+                Spacer()
+                
+                centerButtons
+                
+                Spacer()
+                
+                VStack(spacing: 20) {
+                    ShoulderButtonsViewRight()
+                        .padding(.vertical)
+                    ZStack {
+                        JoystickController(iscool: true, showBackground: $hideABXY)
+                        ABXYView()
+                            .opacity(hideABXY ? 0 : 1)
+                            .allowsHitTesting(!hideABXY)
+                            .animation(.easeInOut(duration: 0.2), value: hideABXY)
+                    }
+                }
+            }
+        }
+    }
+    
+    private var centerButtons: some View {
+        Group {
+            if stickButton {
+                VStack {
+                    HStack(spacing: 50) {
+                        ButtonView(button: .leftStick)
+                            .padding()
+                        Spacer()
+                        ButtonView(button: .rightStick)
+                            .padding()
+                    }
+                    .padding(.top, 30)
+                    
+                    HStack(spacing: 50) {
+                        ButtonView(button: .back)
+                        Spacer()
+                        ButtonView(button: .start)
+                    }
+                }
+                .padding(.bottom, 20)
+            } else {
+                HStack(spacing: 50) {
+                    ButtonView(button: .back)
+                    Spacer()
+                    ButtonView(button: .start)
+                }
+                .padding(.bottom, 20)
+            }
+        }
+    }
+    
+    // MARK: - Methods
+    
+    private func updateOrientation() {
+        if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
+           let window = windowScene.windows.first {
+            isPortrait = window.bounds.size.height > window.bounds.size.width
+        }
+    }
+}
+
+
+struct ShoulderButtonsViewLeft: View {
+    @State private var width: CGFloat = 160
+    @State private var height: CGFloat = 20
+    @AppStorage("On-ScreenControllerScale") var controllerScale: Double = 1.0
+    
+    var body: some View {
+        HStack(spacing: 20) {
+            ButtonView(button: .leftTrigger)
+            ButtonView(button: .leftShoulder)
+        }
+        .frame(width: width, height: height)
+        .onAppear {
+            if UIDevice.current.systemName.contains("iPadOS") {
+                width *= 1.2
+                height *= 1.2
+            }
+            
+            width *= CGFloat(controllerScale)
+            height *= CGFloat(controllerScale)
+        }
+    }
+}
+
+struct ShoulderButtonsViewRight: View {
+    @State private var width: CGFloat = 160
+    @State private var height: CGFloat = 20
+    @AppStorage("On-ScreenControllerScale") var controllerScale: Double = 1.0
+    
+    var body: some View {
+        HStack(spacing: 20) {
+            ButtonView(button: .rightShoulder)
+            ButtonView(button: .rightTrigger)
+        }
+        .frame(width: width, height: height)
+        .onAppear {
+            if UIDevice.current.systemName.contains("iPadOS") {
+                width *= 1.2
+                height *= 1.2
+            }
+            
+            width *= CGFloat(controllerScale)
+            height *= CGFloat(controllerScale)
+        }
+    }
+}
+
+struct DPadView: View {
+    @State private var size: CGFloat = 145
+    @AppStorage("On-ScreenControllerScale") var controllerScale: Double = 1.0
+    
+    var body: some View {
+        VStack(spacing: 7) {
+            ButtonView(button: .dPadUp)
+            HStack(spacing: 22) {
+                ButtonView(button: .dPadLeft)
+                Spacer(minLength: 22)
+                ButtonView(button: .dPadRight)
+            }
+            ButtonView(button: .dPadDown)
+        }
+        .frame(width: size, height: size)
+        .onAppear {
+            if UIDevice.current.systemName.contains("iPadOS") {
+                size *= 1.2
+            }
+            
+            size *= CGFloat(controllerScale)
+        }
+    }
+}
+
+struct ABXYView: View {
+    @State private var size: CGFloat = 145
+    @AppStorage("On-ScreenControllerScale") var controllerScale: Double = 1.0
+    
+    var body: some View {
+        VStack(spacing: 7) {
+            ButtonView(button: .X)
+            HStack(spacing: 22) {
+                ButtonView(button: .Y)
+                Spacer(minLength: 22)
+                ButtonView(button: .A)
+            }
+            ButtonView(button: .B)
+        }
+        .frame(width: size, height: size)
+        .onAppear {
+            if UIDevice.current.systemName.contains("iPadOS") {
+                size *= 1.2
+            }
+            
+            size *= CGFloat(controllerScale)
+        }
+    }
+}
+
+
+struct ButtonView: View {
+    var button: VirtualControllerButton
+    
+    @AppStorage("onscreenhandheld") var onscreenjoy: Bool = false
+    @AppStorage("On-ScreenControllerScale") var controllerScale: Double = 1.0
+    @Environment(\.presentationMode) var presentationMode
+    
+    @AppCodableStorage("toggleButtons") var toggleButtons = ToggleButtonsState()
+    @State private var istoggle = false
+    
+    @State private var isPressed = false
+    @State private var toggleState = false
+    
+    @State private var size: CGSize = .zero
+    
+    var body: some View {
+        Circle()
+            .foregroundStyle(.clear.opacity(0))
+            .overlay {
+                Image(systemName: buttonConfig.iconName)
+                    .resizable()
+                    .scaledToFit()
+                    .frame(width: size.width, height: size.height)
+                    .foregroundStyle(.white)
+                    .opacity(isPressed ? 0.6 : 0.8)
+                    .allowsHitTesting(false)
+            }
+            .frame(width: size.width, height: size.height)
+            .background(
+                buttonBackground
+            )
+            .gesture(
+                DragGesture(minimumDistance: 0)
+                    .onChanged { _ in handleButtonPress() }
+                    .onEnded { _ in handleButtonRelease() }
+            )
+            .onAppear {
+                istoggle = (toggleButtons.toggle1 && button == .A) || (toggleButtons.toggle2 && button == .B) || (toggleButtons.toggle3 && button == .X) || (toggleButtons.toggle4 && button == .Y)
+                size = calculateButtonSize()
+            }
+            .onChange(of: controllerScale) { _ in
+                size = calculateButtonSize()
+            }
+    }
+    
+    private var buttonBackground: some View {
+        Group {
+            if !button.isTrigger && button != .leftStick && button != .rightStick {
+                Circle()
+                    .fill(Color.gray.opacity(0.4))
+                    .frame(width: size.width * 1.25, height: size.height * 1.25)
+            } else if button == .leftStick || button == .rightStick {
+                Image(systemName: buttonConfig.iconName)
+                    .resizable()
+                    .scaledToFit()
+                    .frame(width: size.width * 1.25, height: size.height * 1.25)
+                    .foregroundColor(Color.gray.opacity(0.4))
+            } else if button.isTrigger {
+                Image(systemName: convertTriggerIconToButton(buttonConfig.iconName))
+                    .resizable()
+                    .scaledToFit()
+                    .frame(width: size.width * 1.25, height: size.height * 1.25)
+                    .foregroundColor(Color.gray.opacity(0.4))
+            }
+        }
+    }
+    
+    private func convertTriggerIconToButton(_ iconName: String) -> String {
+        if iconName.hasPrefix("zl") || iconName.hasPrefix("zr") {
+            var converted = String(iconName.dropFirst(3))
+            converted = converted.replacingOccurrences(of: "rectangle", with: "button")
+            converted = converted.replacingOccurrences(of: ".fill", with: ".horizontal.fill")
+            return converted
+        } else {
+            var converted = String(iconName.dropFirst(2))
+            converted = converted.replacingOccurrences(of: "rectangle", with: "button")
+            converted = converted.replacingOccurrences(of: ".fill", with: ".horizontal.fill")
+            return converted
+        }
+    }
+    
+    private func handleButtonPress() {
+        guard !isPressed || istoggle else { return }
+
+        if istoggle {
+            toggleState.toggle()
+            isPressed = toggleState
+            let value = toggleState ? 1 : 0
+            Ryujinx.shared.virtualController.setButtonState(Uint8(value), for: button)
+            Haptics.shared.play(.medium)
+        } else {
+            isPressed = true
+            Ryujinx.shared.virtualController.setButtonState(1, for: button)
+            Haptics.shared.play(.medium)
+        }
+    }
+    
+    private func handleButtonRelease() {
+        if istoggle { return }
+
+        guard isPressed else { return }
+
+        isPressed = false
+        DispatchQueue.global(qos: .background).asyncAfter(deadline: .now() + 0.05) {
+            Ryujinx.shared.virtualController.setButtonState(0, for: button)
+        }
+    }
+    
+    private func calculateButtonSize() -> CGSize {
+        let baseWidth: CGFloat
+        let baseHeight: CGFloat
+        
+        if button.isTrigger {
+            baseWidth = 70
+            baseHeight = 40
+        } else if button.isSmall {
+            baseWidth = 35
+            baseHeight = 35
+        } else {
+            baseWidth = 45
+            baseHeight = 45
+        }
+        
+        let deviceMultiplier = UIDevice.current.userInterfaceIdiom == .pad ? 1.2 : 1.0
+        let scaleMultiplier = CGFloat(controllerScale)
+        
+        return CGSize(
+            width: baseWidth * deviceMultiplier * scaleMultiplier,
+            height: baseHeight * deviceMultiplier * scaleMultiplier
+        )
+    }
+    
+    // Centralized button configuration
+    private var buttonConfig: ButtonConfiguration {
+        switch button {
+        case .A:
+            return ButtonConfiguration(iconName: "a.circle.fill")
+        case .B:
+            return ButtonConfiguration(iconName: "b.circle.fill")
+        case .X:
+            return ButtonConfiguration(iconName: "x.circle.fill")
+        case .Y:
+            return ButtonConfiguration(iconName: "y.circle.fill")
+        case .leftStick:
+            return ButtonConfiguration(iconName: "l.joystick.press.down.fill")
+        case .rightStick:
+            return ButtonConfiguration(iconName: "r.joystick.press.down.fill")
+        case .dPadUp:
+            return ButtonConfiguration(iconName: "arrowtriangle.up.circle.fill")
+        case .dPadDown:
+            return ButtonConfiguration(iconName: "arrowtriangle.down.circle.fill")
+        case .dPadLeft:
+            return ButtonConfiguration(iconName: "arrowtriangle.left.circle.fill")
+        case .dPadRight:
+            return ButtonConfiguration(iconName: "arrowtriangle.right.circle.fill")
+        case .leftTrigger:
+            return ButtonConfiguration(iconName: "zl.rectangle.roundedtop.fill")
+        case .rightTrigger:
+            return ButtonConfiguration(iconName: "zr.rectangle.roundedtop.fill")
+        case .leftShoulder:
+            return ButtonConfiguration(iconName: "l.rectangle.roundedbottom.fill")
+        case .rightShoulder:
+            return ButtonConfiguration(iconName: "r.rectangle.roundedbottom.fill")
+        case .start:
+            return ButtonConfiguration(iconName: "plus.circle.fill")
+        case .back:
+            return ButtonConfiguration(iconName: "minus.circle.fill")
+        case .guide:
+            return ButtonConfiguration(iconName: "house.circle.fill")
+        }
+    }
+    
+    struct ButtonConfiguration {
+        let iconName: String
+    }
+}

src/MeloNX/MeloNX/App/Views/Main/Emulation/ControllerView/Haptics/Haptics.swift

@@ -15,7 +15,6 @@ class Haptics {
     private init() { }
 
     func play(_ feedbackStyle: UIImpactFeedbackGenerator.FeedbackStyle) {
-        print("haptics")
         UIImpactFeedbackGenerator(style: feedbackStyle).impactOccurred()
     }
     

src/MeloNX/MeloNX/App/Views/Main/Emulation/ControllerView/Joystick/Joystick.swift

@@ -0,0 +1,93 @@
+//
+//  Joystick.swift
+//  MeloNX
+//
+//  Created by Stossy11 on 21/03/2025.
+//
+
+
+import SwiftUI
+
+struct Joystick: View {
+    @AppStorage("On-ScreenControllerScale") var controllerScale: Double = 1.0
+    
+    @Binding var position: CGPoint
+    @State var joystickSize: CGFloat
+    var boundarySize: CGFloat
+    
+    @State private var offset: CGSize = .zero
+    @Binding var showBackground: Bool
+    
+    let sensitivity: CGFloat = 1.5
+    
+
+    var dragGesture: some Gesture {
+        DragGesture()
+            .onChanged { value in
+                withAnimation(.easeIn) {
+                    showBackground = true
+                }
+                
+                let translation = value.translation
+                let distance = sqrt(translation.width * translation.width + translation.height * translation.height)
+                let maxRadius = (boundarySize - joystickSize) / 2
+                let extendedRadius = maxRadius + (joystickSize / 2)
+                
+                if distance <= extendedRadius {
+                    offset = translation
+                } else {
+                    let angle = atan2(translation.height, translation.width)
+                    offset = CGSize(width: cos(angle) * extendedRadius, height: sin(angle) * extendedRadius)
+                }
+                
+                position = CGPoint(
+                    x: max(-1, min(1, (offset.width / extendedRadius) * sensitivity)),
+                    y: max(-1, min(1, (offset.height / extendedRadius) * sensitivity))
+                )
+            }
+            .onEnded { _ in
+                offset = .zero
+                position = .zero
+                withAnimation(.easeOut) {
+                    showBackground = false
+                }
+            }
+    }
+    
+    var body: some View {
+        ZStack {
+            Circle()
+                .fill(Color.clear.opacity(0))
+                .frame(width: boundarySize, height: boundarySize)
+                .scaleEffect(controllerScale)
+            
+            if showBackground {
+                Circle()
+                    .fill(Color.gray.opacity(0.4))
+                    .frame(width: boundarySize, height: boundarySize)
+                    .animation(.easeInOut(duration: 0.1), value: showBackground)
+                    .scaleEffect(controllerScale)
+            }
+            
+            Circle()
+                .fill(Color.white.opacity(0.5))
+                .frame(width: joystickSize, height: joystickSize)
+                .background(
+                    Circle()
+                        .fill(Color.gray.opacity(0.3))
+                        .frame(width: joystickSize * 1.25, height: joystickSize * 1.25)
+                )
+                .offset(offset)
+                .gesture(dragGesture)
+                .scaleEffect(controllerScale)
+        }
+        .frame(width: boundarySize, height: boundarySize)
+        .onChange(of: showBackground) { newValue in
+            if newValue {
+                joystickSize *= 1.4
+            } else {
+                joystickSize = (boundarySize * 0.2)
+            }
+        }
+    }
+}

src/MeloNX/MeloNX/App/Views/Main/Emulation/ControllerView/Joystick/JoystickView.swift

@@ -0,0 +1,40 @@
+//
+//  JoystickView.swift
+//  Pomelo
+//
+//  Created by Stossy11 on 30/9/2024.
+//  Copyright © 2024 Stossy11. All rights reserved.
+//
+
+import SwiftUI
+
+struct JoystickController: View {
+    @State var iscool: Bool? = nil
+    @Environment(\.colorScheme) var colorScheme
+    @Binding var showBackground: Bool
+    @AppStorage("On-ScreenControllerScale") var controllerScale: Double = 1.0
+    @State var position: CGPoint = CGPoint(x: 0, y: 0)
+    var dragDiameter: CGFloat {
+        var selfs = CGFloat(160)
+        // selfs *= controllerScale
+        if UIDevice.current.systemName.contains("iPadOS") {
+            return selfs * 1.2
+        }
+        
+        return selfs
+    }
+    
+    public var body: some View {
+        VStack {
+            Joystick(position: $position, joystickSize: dragDiameter * 0.2, boundarySize: dragDiameter, showBackground: $showBackground)
+                .onChange(of: position) { newValue in
+                    
+                    if iscool != nil {
+                        Ryujinx.shared.virtualController.thumbstickMoved(.right, x: newValue.x, y: newValue.y)
+                    } else {
+                        Ryujinx.shared.virtualController.thumbstickMoved(.left, x: newValue.x, y: newValue.y)
+                    }
+                }
+        }
+    }
+}

src/MeloNX/MeloNX/App/Views/Main/Emulation/EmulationView/EmulationView.swift

@@ -14,11 +14,18 @@ struct EmulationView: View {
     @AppStorage("showScreenShotButton") var ssb: Bool = false
     @AppStorage("showlogsgame") var showlogsgame: Bool = false
     
+    @AppStorage("On-ScreenControllerOpacity") var controllerOpacity: Double = 1.0
+    
+    @AppStorage("disableTouch") var blackScreen = false
+    
     @State var isPresentedThree: Bool = false
     @State var isAirplaying = Air.shared.connected
     @Binding var startgame: Game?
     
     @Environment(\.scenePhase) var scenePhase
+    @State private var isInBackground = false
+    @AppStorage("location-enabled") var locationenabled: Bool = false
+    
     var body: some View {
         ZStack {
             if isAirplaying {
@@ -26,8 +33,13 @@ struct EmulationView: View {
                     .ignoresSafeArea()
                     .edgesIgnoringSafeArea(.all)
                     .onAppear {
-                        Air.play(AnyView(MetalView().ignoresSafeArea()))
+                        Air.play(AnyView(MetalView().ignoresSafeArea().edgesIgnoringSafeArea(.all)))
                     }
+                
+                Color.black
+                    .ignoresSafeArea()
+                    .edgesIgnoringSafeArea(.all)
+                    .allowsHitTesting(false)
             } else {
                 MetalView() // The Emulation View
                     .ignoresSafeArea()
@@ -38,6 +50,8 @@ struct EmulationView: View {
             
             if isVCA {
                 ControllerView() // Virtual Controller
+                    .opacity(controllerOpacity)
+                    .allowsHitTesting(true)
             }
             
             Group {
@@ -62,37 +76,50 @@ struct EmulationView: View {
                         Spacer()
                     }
                     
-                    Spacer()
                     
                     if ssb {
                         HStack {
                             
-                            Button {
-                                if let screenshot = Ryujinx.shared.emulationUIView?.screenshot() {
-                                    UIImageWriteToSavedPhotosAlbum(screenshot, nil, nil, nil)
+                            Image(systemName: "arrow.left.circle")
+                                .resizable()
+                                .frame(width: 50, height: 50)
+                                .onTapGesture {
+                                    startgame = nil
+                                    stop_emulation()
+                                    try? Ryujinx.shared.stop()
                                 }
-                            } label: {
-                                Image(systemName: "square.and.arrow.up")
-                            }
-                            .frame(width: UIDevice.current.systemName.contains("iPadOS") ? 60 * 1.2 : 45, height: UIDevice.current.systemName.contains("iPadOS") ? 60 * 1.2 : 45)
                                 .padding()
                             
                             Spacer()
     
-                            
-                            
                         }
                     }
                     
+                    Spacer()
+                    
                 }
             }
         }
         .onAppear {
+            LocationManager.sharedInstance.startUpdatingLocation()
             Air.shared.connectionCallbacks.append { cool in
                 DispatchQueue.main.async {
                     isAirplaying = cool
-                    print(cool)
-                }
+                    // print(cool)
+                }
+            }
+        }
+        .onChange(of: scenePhase) { newPhase in
+            // Detect when the app enters the background
+            if newPhase == .background {
+                pause_emulation(true)
+                isInBackground = true
+            } else if newPhase == .active {
+                pause_emulation(false)
+                isInBackground = false
+            } else if newPhase == .inactive {
+                pause_emulation(true)
+                isInBackground = true
             }
         }
     }

src/MeloNX/MeloNX/App/Views/Main/Emulation/EmulationView/PerformanceDisplay/PerformanceOverlay.swift

@@ -0,0 +1,70 @@
+//
+//  Untitled.swift
+//  MeloNX
+//
+//  Created by Stossy11 on 21/12/2024.
+//
+
+import SwiftUI
+
+struct PerformanceOverlayView: View  {
+    @StateObject private var memorymonitor = MemoryUsageMonitor()
+    
+    @StateObject private var fpsmonitor = FPSMonitor()
+    
+    var body: some View {
+        VStack {
+            Text("\(fpsmonitor.formatFPS())")
+                .foregroundStyle(.white)
+                .stroke(color: .black, width: 2)
+            Text(memorymonitor.formatMemorySize(memorymonitor.memoryUsage))
+                .foregroundStyle(.white)
+                .stroke(color: .black, width: 2)
+        }
+    }
+}
+
+extension View {
+    func stroke(color: Color, width: CGFloat = 1) -> some View {
+        modifier(StrokeModifier(strokeSize: width, strokeColor: color))
+    }
+}
+
+struct StrokeModifier: ViewModifier {
+    private let id = UUID()
+    var strokeSize: CGFloat = 1
+    var strokeColor: Color = .blue
+    
+    func body(content: Content) -> some View {
+        if strokeSize > 0 {
+            appliedStrokeBackground(content: content)
+        } else {
+            content
+        }
+    }
+    
+    private func appliedStrokeBackground(content: Content) -> some View {
+        content
+            .padding(strokeSize*2)
+            .background(
+                Rectangle()
+                    .foregroundColor(strokeColor)
+                    .mask(alignment: .center) {
+                        mask(content: content)
+                    }
+            )
+    }
+    
+    func mask(content: Content) -> some View {
+        Canvas { context, size in
+            context.addFilter(.alphaThreshold(min: 0.01))
+            if let resolvedView = context.resolveSymbol(id: id) {
+                context.draw(resolvedView, at: .init(x: size.width/2, y: size.height/2))
+            }
+        } symbols: {
+            content
+                .tag(id)
+                .blur(radius: strokeSize)
+        }
+    }
+}

src/MeloNX/MeloNX/App/Views/Main/Emulation/MetalView/MeloMTKView.swift

@@ -87,8 +87,11 @@ class MeloMTKView: MTKView {
     override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
         super.touchesBegan(touches, with: event)
         
+        let disabled = UserDefaults.standard.bool(forKey: "disableTouch")
+        
         setAspectRatio(Ryujinx.shared.config?.aspectRatio ?? .fixed16x9)
         
+        if !disabled {
             for touch in touches {
                 let location = touch.location(in: self)
                 if scaleToTargetResolution(location) == nil {
@@ -100,16 +103,20 @@ class MeloMTKView: MTKView {
                 let index = activeTouches.firstIndex(of: touch)!
                 
                 let scaledLocation = scaleToTargetResolution(location)!
-            print("Touch began at: \(scaledLocation) and \(self.aspectRatio)")
+                // // print("Touch began at: \(scaledLocation) and \(self.aspectRatio)")
                 touch_began(Float(scaledLocation.x), Float(scaledLocation.y), Int32(index))
             }
         }
+    }
 
     override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?) {
         super.touchesEnded(touches, with: event)
         
+        let disabled = UserDefaults.standard.bool(forKey: "disableTouch")
+        
         setAspectRatio(Ryujinx.shared.config?.aspectRatio ?? .fixed16x9)
         
+        if !disabled {
             for touch in touches {
                 if ignoredTouches.contains(touch) {
                     ignoredTouches.remove(touch)
@@ -119,17 +126,21 @@ class MeloMTKView: MTKView {
                 if let index = activeTouches.firstIndex(of: touch) {
                     activeTouches.remove(at: index)
                     
-                print("Touch ended for index \(index)")
+                    // // print("Touch ended for index \(index)")
                     touch_ended(Int32(index))
                 }
             }
         }
+    }
 
     override func touchesMoved(_ touches: Set<UITouch>, with event: UIEvent?) {
         super.touchesMoved(touches, with: event)
         
+        let disabled = UserDefaults.standard.bool(forKey: "disableTouch")
+        
         setAspectRatio(Ryujinx.shared.config?.aspectRatio ?? .fixed16x9)
         
+        if !disabled {
             for touch in touches {
                 if ignoredTouches.contains(touch) {
                     continue
@@ -139,16 +150,17 @@ class MeloMTKView: MTKView {
                 guard let scaledLocation = scaleToTargetResolution(location) else {
                     if let index = activeTouches.firstIndex(of: touch) {
                         activeTouches.remove(at: index)
-                    print("Touch left active area, removed index \(index)")
+                        // // print("Touch left active area, removed index \(index)")
                         touch_ended(Int32(index))
                     }
                     continue
                 }
                 
                 if let index = activeTouches.firstIndex(of: touch) {
-                print("Touch moved to: \(scaledLocation)")
+                    // // print("Touch moved to: \(scaledLocation)")
                     touch_moved(Float(scaledLocation.x), Float(scaledLocation.y), Int32(index))
                 }
             }
         }
     }
+}

src/MeloNX/MeloNX/App/Views/Main/Emulation/MetalView/MetalView.swift

@@ -15,7 +15,7 @@ struct MetalView: UIViewRepresentable {
     func makeUIView(context: Context) -> UIView {
         
         if Ryujinx.shared.emulationUIView == nil {
-            var view = MeloMTKView()
+            let view = MeloMTKView()
             
             guard let metalLayer = view.layer as? CAMetalLayer else {
                 fatalError("[Swift] Error: MTKView's layer is not a CAMetalLayer")
@@ -34,13 +34,19 @@ struct MetalView: UIViewRepresentable {
             return view
         }
         
-        let uiview = UIView()
+        if Double(UIDevice.current.systemVersion)! < 17.0 {
             
-        uiview.layer.addSublayer(Ryujinx.shared.metalLayer!)
+            let uiview = MTKView()
+            let layer = Ryujinx.shared.metalLayer!
             
-        uiview.contentScaleFactor = Ryujinx.shared.metalLayer!.contentsScale
+            layer.frame = uiview.bounds
+            
+            uiview.layer.addSublayer(layer)
             
             return uiview
+        } else {
+            return Ryujinx.shared.emulationUIView!
+        }
     }
     
     func updateUIView(_ uiView: UIView, context: Context) {

src/MeloNX/MeloNX/App/Views/Main/Emulation/MetalView/TouchView.swift

@@ -10,7 +10,7 @@ import MetalKit
 
 struct TouchView: UIViewRepresentable {
     func makeUIView(context: Context) -> UIView {
-        var view = MeloMTKView()
+        let view = MeloMTKView()
         return view
     }
     

src/MeloNX/MeloNX/App/Views/Main/GamesList/GameListView.swift

@@ -1,504 +0,0 @@
-//
-//  GameListView.swift
-//  MeloNX
-//
-//  Created by Stossy11 on 3/11/2024.
-//
-
-import SwiftUI
-import UniformTypeIdentifiers
-
-extension UTType {
-    static let nsp = UTType(exportedAs: "com.nintendo.switch-package")
-    static let xci = UTType(exportedAs: "com.nintendo.switch-cartridge")
-}
-
-struct GameLibraryView: View {
-    @Binding var startemu: Game?
-    // @State var importDLCs = false
-    @State private var searchText = ""
-    @State private var isSearching = false
-    @AppStorage("recentGames") private var recentGamesData: Data = Data()
-    @State private var recentGames: [Game] = []
-    @Environment(\.colorScheme) var colorScheme
-    @State var firmwareInstaller = false
-    @State var firmwareversion = "0"
-    @State var isImporting: Bool = false
-    @State var startgame = false
-    @State var isSelectingGameFile = false
-    @State var isViewingGameInfo: Bool = false
-    @State var isSelectingGameUpdate: Bool = false
-    @State var isSelectingGameDLC: Bool = false
-    @State var gameInfo: Game?
-    var games: Binding<[Game]> {
-        Binding(
-            get: { Ryujinx.shared.games },
-            set: { Ryujinx.shared.games = $0 }
-        )
-    }
-    
-    var filteredGames: [Game] {
-        if searchText.isEmpty {
-            return Ryujinx.shared.games.filter { game in
-                !realRecentGames.contains(where: { $0.fileURL == game.fileURL })
-            }
-        }
-        return Ryujinx.shared.games.filter {
-            $0.titleName.localizedCaseInsensitiveContains(searchText) ||
-            $0.developer.localizedCaseInsensitiveContains(searchText)
-        }
-    }
-
-    var realRecentGames: [Game] {
-        let games = Ryujinx.shared.games
-        return recentGames.compactMap { recentGame in
-            games.first(where: { $0.fileURL == recentGame.fileURL })
-        }
-    }
-
-    var body: some View {
-        iOSNav {
-            List {
-                if Ryujinx.shared.games.isEmpty {
-                    VStack(spacing: 16) {
-                        Image(systemName: "gamecontroller.fill")
-                            .font(.system(size: 64))
-                            .foregroundColor(.secondary.opacity(0.7))
-                            .padding(.top, 60)
-                        Text("No Games Found")
-                            .font(.title2.bold())
-                            .foregroundColor(.primary)
-                        Text("Add ROM, Keys and Firmware to get started")
-                            .font(.subheadline)
-                            .foregroundColor(.secondary)
-                    }
-                    .frame(maxWidth: .infinity)
-                    .padding(.top, 40)
-                } else {
-                    if !isSearching && !realRecentGames.isEmpty {
-                        Section {
-                            ForEach(realRecentGames) { game in
-                                GameListRow(game: game, startemu: $startemu, games: games, isViewingGameInfo: $isViewingGameInfo, isSelectingGameUpdate: $isSelectingGameUpdate, isSelectingGameDLC: $isSelectingGameDLC, gameInfo: $gameInfo)
-                                    .swipeActions(edge: .trailing, allowsFullSwipe: true) {
-                                        Button(role: .destructive) {
-                                            removeFromRecentGames(game)
-                                        } label: {
-                                            Label("Delete", systemImage: "trash")
-                                        }
-                                    }
-                            }
-                        } header: {
-                            Text("Recent")
-                        }
-
-                        Section {
-                            ForEach(filteredGames) { game in
-                                GameListRow(game: game, startemu: $startemu, games: games, isViewingGameInfo: $isViewingGameInfo, isSelectingGameUpdate: $isSelectingGameUpdate, isSelectingGameDLC: $isSelectingGameDLC, gameInfo: $gameInfo)
-                            }
-                        } header: {
-                            Text("Others")
-                        }
-                    } else {
-                        ForEach(filteredGames) { game in
-                            GameListRow(game: game, startemu: $startemu, games: games, isViewingGameInfo: $isViewingGameInfo, isSelectingGameUpdate: $isSelectingGameUpdate, isSelectingGameDLC: $isSelectingGameDLC, gameInfo: $gameInfo)
-                        }
-                    }
-                }
-            }
-            .navigationTitle("Games")
-            .navigationBarTitleDisplayMode(.large)
-            .onAppear {
-                loadRecentGames()
-                    
-                let firmware = Ryujinx.shared.fetchFirmwareVersion()
-                firmwareversion = (firmware == "" ? "0" : firmware)
-            }
-            .fileImporter(isPresented: $firmwareInstaller, allowedContentTypes: [.item]) { result in
-                switch result {
-                case .success(let url):
-                    do {
-                        let fun = url.startAccessingSecurityScopedResource()
-                        let path = url.path
-                            
-                        Ryujinx.shared.installFirmware(firmwarePath: path)
-                            
-                        firmwareversion = (Ryujinx.shared.fetchFirmwareVersion() == "" ? "0" : Ryujinx.shared.fetchFirmwareVersion())
-                        if fun {
-                            url.stopAccessingSecurityScopedResource()
-                        }
-                    }
-                case .failure(let error):
-                    print(error)
-                }
-            }
-            .toolbar {
-                ToolbarItem(placement: .topBarTrailing) {
-                    Button {
-                        isSelectingGameFile = true
-                        
-                        isImporting = true
-                    } label: {
-                        Image(systemName: "plus")
-                    }
-                }
-
-                ToolbarItem(placement: .topBarLeading) {
-                    Menu {
-                        Text("Firmware Version: \(firmwareversion)")
-                            .tint(.white)
-                        
-                        if firmwareversion == "0" {
-                            Button {
-                                DispatchQueue.main.async {
-                                    firmwareInstaller.toggle()
-                                }
-                            } label: {
-                                Text("Install Firmware")
-                            }
-                            
-                        } else {
-                            Menu("Firmware") {
-                                Button {
-                                    Ryujinx.shared.removeFirmware()
-                                    let firmware = Ryujinx.shared.fetchFirmwareVersion()
-                                    firmwareversion = (firmware == "" ? "0" : firmware)
-                                } label: {
-                                    Text("Remove Firmware")
-                                }
-                                
-                                Button {
-                                    let game = Game(containerFolder: URL(string: "none")!, fileType: .item, fileURL: URL(string: "MiiMaker")!, titleName: "Mii Maker", titleId: "0", developer: "Nintendo", version: firmwareversion)
-                                    
-                                    self.startemu = game
-                                } label: {
-                                    Text("Mii Maker")
-                                }
-                            }
-                        }
-                        
-                        Button {
-                            isSelectingGameFile = false
-                            
-                            isImporting = true
-                        } label: {
-                            Text("Open Game")
-                        }
-                        
-                        Button {
-                            let documentsUrl = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
-                            var sharedurl = documentsUrl.absoluteString.replacingOccurrences(of: "file://", with: "shareddocuments://")
-                            if ProcessInfo.processInfo.isiOSAppOnMac {
-                                sharedurl = documentsUrl.absoluteString
-                            }
-                            print(sharedurl)
-                            let furl = URL(string: sharedurl)!
-                            if UIApplication.shared.canOpenURL(furl) {
-                                UIApplication.shared.open(furl, options: [:])
-                            }
-                        } label: {
-                            Text("Show MeloNX Folder")
-                        }
-                    } label: {
-                        Image(systemName: "ellipsis.circle")
-                            .foregroundColor(.blue)
-                    }
-                }
-            }
-            .onChange(of: startemu) { game in
-                guard let game else { return }
-                addToRecentGames(game)
-            }
-        }
-        .searchable(text: $searchText)
-        .animation(.easeInOut, value: searchText)
-        .onChange(of: searchText) { _ in
-            isSearching = !searchText.isEmpty
-        }
-        .fileImporter(isPresented: $isImporting, allowedContentTypes: [.folder, .nsp, .xci, .zip, .item]) { result in
-            if isSelectingGameFile {
-                switch result {
-                case .success(let url):
-                    guard url.startAccessingSecurityScopedResource() else {
-                        print("Failed to access security-scoped resource")
-                        return
-                    }
-                    defer { url.stopAccessingSecurityScopedResource() }
-                    
-                    do {
-                        let fileManager = FileManager.default
-                        let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask).first!
-                        let romsDirectory = documentsDirectory.appendingPathComponent("roms")
-                        
-                        if !fileManager.fileExists(atPath: romsDirectory.path) {
-                            try fileManager.createDirectory(at: romsDirectory, withIntermediateDirectories: true, attributes: nil)
-                        }
-                        
-                        let destinationURL = romsDirectory.appendingPathComponent(url.lastPathComponent)
-                        try fileManager.copyItem(at: url, to: destinationURL)
-                        
-                        Ryujinx.shared.games = Ryujinx.shared.loadGames()
-                    } catch {
-                        print("Error copying game file: \(error)")
-                    }
-                case .failure(let err):
-                    print("File import failed: \(err.localizedDescription)")
-                }
-                
-            } else {
-                
-                switch result {
-                case .success(let url):
-                    guard url.startAccessingSecurityScopedResource() else {
-                        print("Failed to access security-scoped resource")
-                        return
-                    }
-                    
-                    do {
-                        let handle = try FileHandle(forReadingFrom: url)
-                        let fileExtension = (url.pathExtension as NSString).utf8String
-                        let extensionPtr = UnsafeMutablePointer<CChar>(mutating: fileExtension)
-                        
-                        var gameInfo = get_game_info(handle.fileDescriptor, extensionPtr)
-                        
-                        let game = Game.convertGameInfoToGame(gameInfo: gameInfo, url: url)
-                        
-                        DispatchQueue.main.async {
-                            startemu = game
-                        }
-                    } catch {
-                        print(error)
-                    }
-                    
-                case .failure(let err):
-                    print("File import failed: \(err.localizedDescription)")
-                }
-            }
-        }
-        .sheet(isPresented: $isSelectingGameUpdate) {
-            UpdateManagerSheet(game: $gameInfo)
-        }
-        .sheet(isPresented: $isSelectingGameDLC) {
-            DLCManagerSheet(game: $gameInfo)
-        }
-        .sheet(isPresented: Binding(
-            get: { isViewingGameInfo && gameInfo != nil },
-            set: { newValue in
-                if !newValue {
-                    isViewingGameInfo = false
-                    gameInfo = nil
-                }
-            }
-        )) {
-            if let game = gameInfo {
-                GameInfoSheet(game: game)
-            }
-        }
-    }
-    
-    private func addToRecentGames(_ game: Game) {
-        recentGames.removeAll { $0.titleId == game.titleId }
-
-        recentGames.insert(game, at: 0)
-        
-        if recentGames.count > 5 {
-            recentGames = Array(recentGames.prefix(5))
-        }
-        
-        saveRecentGames()
-    }
-
-    private func removeFromRecentGames(_ game: Game) {
-        recentGames.removeAll { $0.titleId == game.titleId }
-        saveRecentGames()
-    }
-
-    private func saveRecentGames() {
-        do {
-            let encoder = JSONEncoder()
-            let data = try encoder.encode(recentGames)
-            recentGamesData = data
-        } catch {
-            print("Error saving recent games: \(error)")
-        }
-    }
-    
-    private func loadRecentGames() {
-        do {
-            let decoder = JSONDecoder()
-            recentGames = try decoder.decode([Game].self, from: recentGamesData)
-        } catch {
-            print("Error loading recent games: \(error)")
-            recentGames = []
-        }
-    }
-
-    // MARK: - Delete Game Function
-    func deleteGame(game: Game) {
-        let fileManager = FileManager.default
-        do {
-            try fileManager.removeItem(at: game.fileURL)
-            Ryujinx.shared.games.removeAll { $0.id == game.id }
-            Ryujinx.shared.games = Ryujinx.shared.loadGames()
-        } catch {
-            print("Error deleting game: \(error)")
-        }
-    }
-}
-
-// MARK: - Game Model
-extension Game: Codable {
-    enum CodingKeys: String, CodingKey {
-        case titleName, titleId, developer, version, fileURL
-    }
-    
-    public init(from decoder: Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        titleName = try container.decode(String.self, forKey: .titleName)
-        titleId = try container.decode(String.self, forKey: .titleId)
-        developer = try container.decode(String.self, forKey: .developer)
-        version = try container.decode(String.self, forKey: .version)
-        fileURL = try container.decode(URL.self, forKey: .fileURL)
-        
-        // Initialize other properties
-        self.containerFolder = fileURL.deletingLastPathComponent()
-        self.fileType = .item
-    }
-    
-    public func encode(to encoder: Encoder) throws {
-        var container = encoder.container(keyedBy: CodingKeys.self)
-        try container.encode(titleName, forKey: .titleName)
-        try container.encode(titleId, forKey: .titleId)
-        try container.encode(developer, forKey: .developer)
-        try container.encode(version, forKey: .version)
-        try container.encode(fileURL, forKey: .fileURL)
-    }
-}
-
-// MARK: - Game List Item
-struct GameListRow: View {
-    let game: Game
-    @Binding var startemu: Game?
-    @Binding var games: [Game] // Add this binding
-    @Binding var isViewingGameInfo: Bool
-    @Binding var isSelectingGameUpdate: Bool
-    @Binding var isSelectingGameDLC: Bool
-    @Binding var gameInfo: Game?
-    @State var gametoDelete: Game?
-    @State var showGameDeleteConfirmation: Bool = false
-    @Environment(\.colorScheme) var colorScheme
-    
-    @AppStorage("portal") var gamepo = false
-    
-    var body: some View {
-        Button(action: {
-            startemu = game
-        }) {
-            HStack(spacing: 16) {
-                // Game Icon
-                if let icon = game.icon {
-                    Image(uiImage: icon)
-                        .resizable()
-                        .aspectRatio(contentMode: .fill)
-                        .frame(width: 45, height: 45)
-                        .cornerRadius(8)
-                } else {
-                    ZStack {
-                        RoundedRectangle(cornerRadius: 8)
-                            .fill(colorScheme == .dark ?
-                                Color(.systemGray5) : Color(.systemGray6))
-                            .frame(width: 45, height: 45)
-                        
-                        Image(systemName: "gamecontroller.fill")
-                            .font(.system(size: 20))
-                            .foregroundColor(.gray)
-                    }
-                }
-                
-                // Game Info
-                VStack(alignment: .leading, spacing: 2) {
-                    Text(game.titleName)
-                        .font(.body)
-                        .foregroundColor(.primary)
-                    
-                    Text(game.developer)
-                        .font(.subheadline)
-                        .foregroundColor(.secondary)
-                }
-                
-                Spacer()
-                
-                Image(systemName: "play.circle.fill")
-                    .font(.title2)
-                    .foregroundColor(.accentColor)
-                    .opacity(0.8)
-            }
-        }
-        .contextMenu {
-            Section {
-                Button {
-                    startemu = game
-                } label: {
-                    Label("Play Now", systemImage: "play.fill")
-                }
-
-                Button {
-                    gameInfo = game
-                    isViewingGameInfo.toggle()
-                    
-                    if game.titleName.lowercased() == "portal" {
-                        gamepo = true
-                    } else if game.titleName.lowercased() == "portal 2" {
-                        gamepo = true
-                    }
-                } label: {
-                    Label("Game Info", systemImage: "info.circle")
-                }
-            }
-
-            Section {
-                Button {
-                    gameInfo = game
-                    isSelectingGameUpdate.toggle()
-                } label: {
-                    Label("Game Update Manager", systemImage: "chevron.up.circle")
-                }
-
-                Button {
-                    gameInfo = game
-                    isSelectingGameDLC.toggle()
-                } label: {
-                    Label("Game DLC Manager", systemImage: "plus.viewfinder")
-                }
-            }
-
-            Section {
-                Button(role: .destructive) {
-                    gametoDelete = game
-                    showGameDeleteConfirmation.toggle()
-                } label: {
-                    Label("Delete", systemImage: "trash")
-                }
-            }
-        }
-        .confirmationDialog("Are you sure you want to delete this game?", isPresented: $showGameDeleteConfirmation) {
-            Button("Delete", role: .destructive) {
-                if let game = gametoDelete {
-                    deleteGame(game: game)
-                }
-            }
-            Button("Cancel", role: .cancel) {}
-        } message: {
-            Text("Are you sure you want to delete \(gametoDelete?.titleName ?? "this game")?")
-        }
-    }
-    
-    private func deleteGame(game: Game) {
-        let fileManager = FileManager.default
-        do {
-            try fileManager.removeItem(at: game.fileURL)
-            games.removeAll { $0.id == game.id }
-        } catch {
-            print("Error deleting game: \(error)")
-        }
-    }
-}

src/MeloNX/MeloNX/App/Views/Main/Logging/Logs.swift

@@ -1,117 +0,0 @@
-//
-//  LogEntry.swift
-//  MeloNX
-//
-//  Created by Stossy11 on 09/02/2025.
-//
-
-import SwiftUI
-
-struct LogFileView: View {
-    @State private var logs: [String] = []
-    @State private var showingLogs = false
-    
-    public var isfps: Bool
-    
-    private let fileManager = FileManager.default
-    private let maxDisplayLines = 10
-    
-    private var dateFormatter: DateFormatter {
-        let formatter = DateFormatter()
-        formatter.dateFormat = "yyyy-MM-dd_HH-mm-ss"
-        return formatter
-    }
-    
-    var body: some View {
-        VStack(alignment: .leading, spacing: 4) {
-            ForEach(logs.suffix(maxDisplayLines), id: \.self) { log in
-                Text(log)
-                    .font(.caption)
-                    .foregroundColor(.white)
-                    .padding(4)
-                    .background(Color.black.opacity(0.7))
-                    .cornerRadius(4)
-                    .transition(.opacity)
-            }
-        }
-        .onAppear {
-            startLogFileWatching()
-        }
-        .onChange(of: logs) { newLogs in
-            print("Logs updated: \(newLogs.count) entries")
-        }
-    }
-    
-    private func getLatestLogFile() -> URL? {
-        let logsDirectory = URL.documentsDirectory.appendingPathComponent("Logs")
-        let currentDate = Date()
-        
-        do {
-            try fileManager.createDirectory(at: logsDirectory, withIntermediateDirectories: true)
-            
-            let logFiles = try fileManager.contentsOfDirectory(at: logsDirectory, includingPropertiesForKeys: [.creationDateKey])
-                .filter {
-                    let filename = $0.lastPathComponent
-                    guard filename.hasPrefix("MeloNX_") && filename.hasSuffix(".log") else {
-                        return false
-                    }
-                    
-                    let dateString = filename.replacingOccurrences(of: "MeloNX_", with: "").replacingOccurrences(of: ".log", with: "")
-                    guard let logDate = dateFormatter.date(from: dateString) else {
-                        return false
-                    }
-                    
-                    return Calendar.current.isDate(logDate, inSameDayAs: currentDate)
-                }
-            
-            let sortedLogFiles = logFiles.sorted {
-                $0.lastPathComponent > $1.lastPathComponent
-            }
-            
-            return sortedLogFiles.first
-        } catch {
-            print("Error finding log files: \(error)")
-            return nil
-        }
-    }
-    
-    private func readLatestLogFile() {
-        guard let logFileURL = getLatestLogFile() else {
-            print("no logs?")
-            return
-        }
-        print(logFileURL)
-        
-        do {
-            let logContents = try String(contentsOf: logFileURL)
-            let allLines = logContents.components(separatedBy: .newlines)
-            
-            DispatchQueue.global(qos: .userInteractive).async {
-                self.logs = Array(allLines)
-            }
-        } catch {
-            print("Error reading log file: \(error)")
-        }
-    }
-    
-    private func startLogFileWatching() {
-        showingLogs = true
-        self.readLatestLogFile()
-        Timer.scheduledTimer(withTimeInterval: 0.05, repeats: true) { timer in
-            if showingLogs {
-                self.readLatestLogFile()
-            }
-            
-            if isfps {
-                if get_current_fps() != 0 {
-                    stopLogFileWatching()
-                    timer.invalidate()
-                }
-            }
-        }
-    }
-    
-    private func stopLogFileWatching() {
-        showingLogs = false
-    }
-}

src/MeloNX/MeloNX/App/Views/Main/SettingsView/SettingsView.swift

@@ -1,765 +0,0 @@
-//
-//  SettingsView.swift
-//  MeloNX
-//
-//  Created by Stossy11 on 25/11/2024.
-//
-
-import SwiftUI
-import SwiftSVG
-
-struct SettingsView: View {
-    @Binding var config: Ryujinx.Configuration
-    @Binding var MoltenVKSettings: [MoltenVKSettings]
-    
-    @Binding var controllersList: [Controller]
-    @Binding var currentControllers: [Controller]
-    
-    @Binding var onscreencontroller: Controller
-    @AppStorage("useTrollStore") var useTrollStore: Bool = false
-    
-    @AppStorage("jitStreamerEB") var jitStreamerEB: Bool = false
-    
-    @AppStorage("ignoreJIT") var ignoreJIT: Bool = false
-    
-    var memoryManagerModes = [
-        ("HostMapped", "Host (fast)"),
-        ("HostMappedUnsafe", "Host Unchecked (fast, unstable / unsafe)"),
-        ("SoftwarePageTable", "Software (slow)"),
-    ]
-    
-    @AppStorage("RyuDemoControls") var ryuDemo: Bool = false
-    @AppStorage("MTL_HUD_ENABLED") var metalHUDEnabled: Bool = false
-    
-    @AppStorage("showScreenShotButton") var ssb: Bool = false
-    
-    @AppStorage("MVK_CONFIG_PREFILL_METAL_COMMAND_BUFFERS") var mVKPreFillBuffer: Bool = false
-    @AppStorage("MVK_CONFIG_SYNCHRONOUS_QUEUE_SUBMITS") var syncqsubmits: Bool = false
-    
-    @AppStorage("performacehud") var performacehud: Bool = false
-    
-    @AppStorage("oldWindowCode") var windowCode: Bool = false
-    
-    @AppStorage("On-ScreenControllerScale") var controllerScale: Double = 1.0
-    
-    @AppStorage("hasbeenfinished") var finishedStorage: Bool = false
-    
-    @AppStorage("showlogsloading") var showlogsloading: Bool = true
-    
-    @AppStorage("showlogsgame") var showlogsgame: Bool = false
-    
-    @State private var showResolutionInfo = false
-    @State private var showAnisotropicInfo = false
-    @State private var showControllerInfo = false
-    @State private var searchText = ""
-    @AppStorage("portal") var gamepo = false
-    
-    var filteredMemoryModes: [(String, String)] {
-        guard !searchText.isEmpty else { return memoryManagerModes }
-        return memoryManagerModes.filter { $0.1.localizedCaseInsensitiveContains(searchText) }
-    }
-    
-    
-    var body: some View {
-        iOSNav {
-            List {
-                
-                
-                // Graphics & Performance
-                Section {
-                    Picker(selection: $config.aspectRatio) {
-                        ForEach(AspectRatio.allCases, id: \.self) { ratio in
-                            Text(ratio.displayName).tag(ratio)
-                        }
-                    } label: {
-                        labelWithIcon("Aspect Ratio", iconName: "rectangle.expand.vertical")
-                    }
-                    .tint(.blue)
-                    
-                    Toggle(isOn: $config.disableShaderCache) {
-                        labelWithIcon("Shader Cache", iconName: "memorychip")
-                    }
-                    .tint(.blue)
-                    
-                    Toggle(isOn: $config.disablevsync) {
-                        labelWithIcon("Disable VSync", iconName: "arrow.triangle.2.circlepath")
-                    }
-                    .tint(.blue)
-                    
-                    
-                    Toggle(isOn: $config.enableTextureRecompression) {
-                        labelWithIcon("Texture Recompression", iconName: "rectangle.compress.vertical")
-                    }
-                    .tint(.blue)
-                    
-                    Toggle(isOn: $config.disableDockedMode) {
-                        labelWithIcon("Docked Mode", iconName: "dock.rectangle")
-                    }
-                    .tint(.blue)
-                    
-                    Toggle(isOn: $config.macroHLE) {
-                        labelWithIcon("Macro HLE", iconName: "gearshape")
-                    }.tint(.blue)
-                        
-                    
-                    VStack(alignment: .leading, spacing: 10) {
-                        HStack {
-                            labelWithIcon("Resolution Scale", iconName: "magnifyingglass")
-                                .font(.headline)
-                            Spacer()
-                            Button {
-                                showResolutionInfo.toggle()
-                            } label: {
-                                Image(systemName: "info.circle")
-                                    .symbolRenderingMode(.hierarchical)
-                                    .foregroundStyle(.secondary)
-                            }
-                            .buttonStyle(.plain)
-                            .help("Learn more about Resolution Scale")
-                            .alert(isPresented: $showResolutionInfo) {
-                                Alert(
-                                    title: Text("Resolution Scale"),
-                                    message: Text("Adjust the internal rendering resolution. Higher values improve visuals but may reduce performance."),
-                                    dismissButton: .default(Text("OK"))
-                                )
-                            }
-                        }
-                        
-                        Slider(value: $config.resscale, in: 0.1...3.0, step: 0.05) {
-                            Text("Resolution Scale")
-                        } minimumValueLabel: {
-                            Text("0.1x")
-                                .font(.footnote)
-                                .foregroundColor(.secondary)
-                        } maximumValueLabel: {
-                            Text("3.0x")
-                                .font(.footnote)
-                                .foregroundColor(.secondary)
-                        }
-                        Text("\(config.resscale, specifier: "%.2f")x")
-                            .font(.subheadline)
-                            .foregroundColor(.secondary)
-                    }
-                    .padding(.vertical, 8)
-                    
-                    VStack(alignment: .leading, spacing: 10) {
-                        HStack {
-                            labelWithIcon("Max Anisotropic Scale", iconName: "magnifyingglass")
-                                .font(.headline)
-                            Spacer()
-                            Button {
-                                showAnisotropicInfo.toggle()
-                            } label: {
-                                Image(systemName: "info.circle")
-                                    .symbolRenderingMode(.hierarchical)
-                                    .foregroundStyle(.secondary)
-                            }
-                            .buttonStyle(.plain)
-                            .help("Learn more about Max Anisotropic Scale")
-                            .alert(isPresented: $showAnisotropicInfo) {
-                                Alert(
-                                    title: Text("Max Anisotripic Scale"),
-                                    message: Text("Adjust the internal Anisotropic resolution. Higher values improve visuals but may reduce performance. Default at 0 lets game decide."),
-                                    dismissButton: .default(Text("OK"))
-                                )
-                            }
-                        }
-
-                        Slider(value: $config.maxAnisotropy, in: 0...16.0, step: 0.1) {
-                            Text("Resolution Scale")
-                        } minimumValueLabel: {
-                            Text("0x")
-                                .font(.footnote)
-                                .foregroundColor(.secondary)
-                        } maximumValueLabel: {
-                            Text("16.0x")
-                                .font(.footnote)
-                                .foregroundColor(.secondary)
-                        }
-                        Text("\(config.maxAnisotropy, specifier: "%.2f")x")
-                            .font(.subheadline)
-                            .foregroundColor(.secondary)
-                    }
-                    .padding(.vertical, 8)
-
-                    Toggle(isOn: $performacehud) {
-                        labelWithIcon("Performance Overlay", iconName: "speedometer")
-                    }
-                    .tint(.blue)
-                } header: {
-                    Text("Graphics & Performance")
-                        .font(.title3.weight(.semibold))
-                        .textCase(nil)
-                        .headerProminence(.increased)
-                } footer: {
-                    Text("Fine-tune graphics and performance to suit your device and preferences.")
-                }
-                
-                // Input Selector
-                Section {
-                    if !controllersList.filter({ !currentControllers.contains($0) }).isEmpty {
-                        DisclosureGroup("Unselected Controllers") {
-                            ForEach(controllersList.filter { !currentControllers.contains($0) }) { controller in
-                                var customBinding: Binding<Bool> {
-                                    Binding(
-                                        get: { currentControllers.contains(controller) },
-                                        set: { bool in
-                                            if !bool {
-                                                currentControllers.removeAll(where: { $0.id == controller.id })
-                                            } else {
-                                                currentControllers.append(controller)
-                                            }
-                                        }
-                                    )
-                                }
-                                
-                                Toggle(isOn: customBinding) {
-                                    Text(controller.name)
-                                        .font(.body)
-                                }
-                                .tint(.blue)
-                            }
-                        }
-                    }
-                    
-                    
-                    
-                    ForEach(currentControllers) { controller in
-                        
-                        var customBinding: Binding<Bool> {
-                            Binding(
-                                get: { currentControllers.contains(controller) },
-                                set: { bool in
-                                    if !bool {
-                                        currentControllers.removeAll(where: { $0.id == controller.id })
-                                    } else {
-                                        currentControllers.append(controller)
-                                    }
-                                    // toggleController(controller)
-                                }
-                            )
-                        }
-                        
-                        
-                        if customBinding.wrappedValue {
-                            DisclosureGroup {
-                                Toggle(isOn: customBinding) {
-                                    Text(controller.name)
-                                        .font(.body)
-                                }
-                                .tint(.blue)
-                                .onDrag({ NSItemProvider() })
-                            } label: {
-                                
-                                if let controller = currentControllers.firstIndex(where: { $0.id == controller.id } )  {
-                                    Text("Player \(controller + 1)")
-                                        .onAppear() {
-                                            // print(currentControllers.firstIndex(where: { $0.id == controller.id }) ?? 0)
-                                            print(currentControllers.count)
-                                            
-                                            if currentControllers.count > 2 {
-                                                print(currentControllers[1])
-                                                print(currentControllers[2])
-                                            }
-                                        }
-                                }
-                            }
-                            
-                        }
-                    }
-                    .onMove { from, to in
-                        currentControllers.move(fromOffsets: from, toOffset: to)
-                    }
-                } header: {
-                    Text("Input Selector")
-                        .font(.title3.weight(.semibold))
-                        .textCase(nil)
-                        .headerProminence(.increased)
-                } footer: {
-                    Text("Select input devices and on-screen controls to play with. ")
-                }
-                
-                // Input Settings
-                Section {
-                    Toggle(isOn: $config.handHeldController) {
-                        labelWithIcon("Player 1 to Handheld Input", iconName: "formfitting.gamecontroller")
-                    }.tint(.blue)
-                        
-                    
-                    Toggle(isOn: $ryuDemo) {
-                        labelWithIcon("On-Screen Controller (Demo)", iconName: "hand.draw")
-                    }
-                    .tint(.blue)
-                    .disabled(true)
-                    
-                    VStack(alignment: .leading, spacing: 10) {
-                        HStack {
-                            labelWithIcon("On-Screen Controller Scale", iconName: "magnifyingglass")
-                                .font(.headline)
-                            Spacer()
-                            Button {
-                                showControllerInfo.toggle()
-                            } label: {
-                                Image(systemName: "info.circle")
-                                    .symbolRenderingMode(.hierarchical)
-                                    .foregroundStyle(.secondary)
-                            }
-                            .buttonStyle(.plain)
-                            .help("Learn more about On-Screen Controller Scale")
-                            .alert(isPresented: $showControllerInfo) {
-                                Alert(
-                                    title: Text("On-Screen Controller Scale"),
-                                    message: Text("Adjust the On-Screen Controller size."),
-                                    dismissButton: .default(Text("OK"))
-                                )
-                            }
-                        }
-                        
-                        Slider(value: $controllerScale, in: 0.1...3.0, step: 0.05) {
-                            Text("Resolution Scale")
-                        } minimumValueLabel: {
-                            Text("0.1x")
-                                .font(.footnote)
-                                .foregroundColor(.secondary)
-                        } maximumValueLabel: {
-                            Text("3.0x")
-                                .font(.footnote)
-                                .foregroundColor(.secondary)
-                        }
-                        Text("\(controllerScale, specifier: "%.2f")x")
-                            .font(.subheadline)
-                            .foregroundColor(.secondary)
-                    }
-                    .padding(.vertical, 8)
-                } header: {
-                    Text("Input Settings")
-                        .font(.title3.weight(.semibold))
-                        .textCase(nil)
-                        .headerProminence(.increased)
-                } footer: {
-                    Text("Configure input devices and on-screen controls for easier navigation and play.")
-                }
-                
-                // Language and Region Settings
-                Section {
-                    Picker(selection: $config.language) {
-                        ForEach(SystemLanguage.allCases, id: \.self) { ratio in
-                            Text(ratio.displayName).tag(ratio)
-                        }
-                    } label: {
-                        labelWithIcon("Language", iconName: "character.bubble")
-                    }
-                    
-                    Picker(selection: $config.regioncode) {
-                        ForEach(SystemRegionCode.allCases, id: \.self) { ratio in
-                            Text(ratio.displayName).tag(ratio)
-                        }
-                    } label: {
-                        labelWithIcon("Region", iconName: "globe")
-                    }
-                    
-                    
-                    // globe
-                } header: {
-                    Text("Language and Region Settings")
-                        .font(.title3.weight(.semibold))
-                        .textCase(nil)
-                        .headerProminence(.increased)
-                } footer: {
-                    Text("Configure the System Language and the Region.")
-                }
-                
-                // CPU Mode
-                Section {
-                    if filteredMemoryModes.isEmpty {
-                        Text("No matches for \"\(searchText)\"")
-                            .foregroundColor(.secondary)
-                    } else {
-                        Picker(selection: $config.memoryManagerMode) {
-                            ForEach(filteredMemoryModes, id: \.0) { key, displayName in
-                                Text(displayName).tag(key)
-                            }
-                        } label: {
-                            labelWithIcon("Memory Manager Mode", iconName: "gearshape")
-                        }
-                    }
-                    
-                    Toggle(isOn: $config.disablePTC) {
-                        labelWithIcon("Disable PTC", iconName: "cpu")
-                    }.tint(.blue)
-                    
-                    if let gpuInfo = getGPUInfo(), gpuInfo.hasPrefix("Apple M") {
-                        if #available (iOS 16.4, *) {
-                            Toggle(isOn: .constant(false)) {
-                                labelWithIcon("Hypervisor", iconName: "bolt")
-                            }
-                            .tint(.blue)
-                            .disabled(true)
-                            .onAppear() {
-                                print("CPU Info: \(gpuInfo)")
-                            }
-                        } else if checkAppEntitlement("com.apple.private.hypervisor") {
-                            Toggle(isOn: $config.hypervisor) {
-                                labelWithIcon("Hypervisor", iconName: "bolt")
-                            }
-                            .tint(.blue)
-                            .onAppear() {
-                                print("CPU Info: \(gpuInfo)")
-                            }
-                        }
-                    }
-                } header: {
-                    Text("CPU")
-                        .font(.title3.weight(.semibold))
-                        .textCase(nil)
-                        .headerProminence(.increased)
-                } footer: {
-                    Text("Select how memory is managed. 'Host (fast)' is best for most users.")
-                }
-
-            
-            Section {
-                
-                
-                Toggle(isOn: $config.expandRam) {
-                    labelWithIcon("Expand Guest Ram (6GB)", iconName: "exclamationmark.bubble")
-                }
-                .tint(.red)
-
-                Toggle(isOn: $config.ignoreMissingServices) {
-                    labelWithIcon("Ignore Missing Services", iconName: "waveform.path")
-                }
-                .tint(.red)
-            } header: {
-                Text("Hacks")
-                    .font(.title3.weight(.semibold))
-                    .textCase(nil)
-                    .headerProminence(.increased)
-            }
-
-                // Other Settings
-                Section {
-                    
-                    Toggle(isOn: $ssb) {
-                        labelWithIcon("Screenshot Button", iconName: "square.and.arrow.up")
-                    }
-                    .tint(.blue)
-                    
-                    if #available(iOS 17.0.1, *) {
-                        Toggle(isOn: $jitStreamerEB) {
-                            labelWithIcon("JitStreamer EB", iconName: "bolt.heart")
-                        }
-                        .tint(.blue)
-                        .contextMenu {
-                            Button {
-                                if let mainWindow = UIApplication.shared.windows.last {
-                                    let alertController = UIAlertController(title: "About JitStreamer EB", message: "JitStreamer EB is an Amazing Application to Enable JIT on the go, made by one of the best iOS developers of all time jkcoxson <3", preferredStyle: .alert)
-                                    
-                                    let learnMoreButton = UIAlertAction(title: "Learn More", style: .default) {_ in
-                                        UIApplication.shared.open(URL(string: "https://jkcoxson.com/jitstreamer")!)
-                                    }
-                                    alertController.addAction(learnMoreButton)
-                                    
-                                    let doneButton = UIAlertAction(title: "Done", style: .cancel, handler: nil)
-                                    alertController.addAction(doneButton)
-                                    
-                                    mainWindow.rootViewController?.present(alertController, animated: true)
-                                }
-                            } label: {
-                                Text("About")
-                            }
-                        }
-                    } else {
-                        Toggle(isOn: $useTrollStore) {
-                            labelWithIcon("TrollStore JIT", iconName: "troll.svg")
-                        }
-                        .tint(.blue)
-                    }
-                    
-                    Toggle(isOn: $syncqsubmits) {
-                        labelWithIcon("MVK: Synchronous Queue Submits", iconName: "line.diagonal")
-                    }.tint(.blue)
-                        .contextMenu() {
-                            Button {
-                                if let mainWindow = UIApplication.shared.windows.last {
-                                    let alertController = UIAlertController(title: "About MVK: Synchronous Queue Submits", message: "Enable this option if Mario Kart 8 is crashing at Grand Prix mode.", preferredStyle: .alert)
-                                    
-                                    let doneButton = UIAlertAction(title: "OK", style: .cancel, handler: nil)
-                                    alertController.addAction(doneButton)
-                                    
-                                    mainWindow.rootViewController?.present(alertController, animated: true)
-                                }
-                            } label: {
-                                Text("About")
-                            }
-                        }
-                    
-                    DisclosureGroup {
-                        Toggle(isOn: $showlogsloading) {
-                            labelWithIcon("Show logs while loading", iconName: "text.alignleft")
-                        }.tint(.blue)
-                        
-                        Toggle(isOn: $showlogsgame) {
-                            labelWithIcon("Show logs in-game", iconName: "text.line.magnify")
-                        }.tint(.blue)
-                        
-                        Toggle(isOn: $config.debuglogs) {
-                            labelWithIcon("Debug Logs", iconName: "exclamationmark.bubble")
-                        }
-                        .tint(.blue)
-                        
-                        Toggle(isOn: $config.tracelogs) {
-                            labelWithIcon("Trace Logs", iconName: "waveform.path")
-                        }
-                        .tint(.blue)
-                    } label: {
-                        Text("Logs")
-                    }
-                    
-                } header: {
-                    Text("Miscellaneous Options")
-                        .font(.title3.weight(.semibold))
-                        .textCase(nil)
-                        .headerProminence(.increased)
-                } footer: {
-                    Text("Enable trace and debug logs for advanced troubleshooting (Note: This degrades performance),\nEnable Screenshot Button for better screenshots\nand Enable TrollStore for automatic TrollStore JIT.")
-                }
-                
-                // Info
-                Section {
-                    let totalMemory = ProcessInfo.processInfo.physicalMemory
-                    let model = getDeviceModel()
-                    let deviceType = model.hasPrefix("iPad") ? "iPadOS" :
-                    model.hasPrefix("iPhone") ? "iOS" :
-                    "macOS"
-                    
-                    let iconName = model.hasPrefix("iPad") ? "ipad.landscape" :
-                    model.hasPrefix("iPhone") ? "iphone" :
-                    "macwindow"
-                    
-                    labelWithIcon("JIT Acquisition: \(isJITEnabled() ? "Acquired" : "Not Acquired" )", iconName: "bolt.fill")
-                    
-                    labelWithIcon("Increased Memory Limit Entitlement: \(checkAppEntitlement("com.apple.developer.kernel.increased-memory-limit") ? "Enabled" : "Disabled")", iconName: "memorychip")
-                    
-                    labelWithIcon("Device: \(getDeviceModel())", iconName: iconName)
-                    
-                    if ProcessInfo.processInfo.isiOSAppOnMac {
-                        labelWithIcon("Memory: \(String(format: "%.0f GB", Double(totalMemory) / (1024 * 1024 * 1024)))", iconName: "memorychip.fill")
-                    } else {
-                        labelWithIcon("Device Memory: \(String(format: "%.0f GB", Double(totalMemory) / (1024 * 1024 * 1024)))", iconName: "memorychip.fill")
-                    }
-                    
-                    labelWithIcon("\(deviceType) \(UIDevice.current.systemVersion)", iconName: "applelogo")
-                    
-                } header: {
-                    Text("Information")
-                        .font(.title3.weight(.semibold))
-                        .textCase(nil)
-                        .headerProminence(.increased)
-                } footer: {
-                    Text("Shows info about Memory, Entitlement and JIT.")
-                }
-                
-                // Advanced
-                Section {
-                    DisclosureGroup {
-                        
-                        Toggle(isOn: $mVKPreFillBuffer) {
-                            labelWithIcon("MVK: Pre-Fill Metal Command Buffers", iconName: "gearshape")
-                        }.tint(.blue)
-                        
-                        Toggle(isOn: $config.dfsIntegrityChecks) {
-                            labelWithIcon("Disable FS Integrity Checks", iconName: "checkmark.shield")
-                        }.tint(.blue)
-                        
-                        HStack {
-                            labelWithIcon("Page Size", iconName: "textformat.size")
-                            Spacer()
-                            Text("\(String(Int(getpagesize())))")
-                                .foregroundColor(.secondary)
-                            
-                        }
-                        
-                        Toggle(isOn: $ignoreJIT) {
-                            labelWithIcon("Ignore JIT Popup", iconName: "cpu")
-                        }.tint(.blue)
-                        
-                        TextField("Additional Arguments", text: Binding(
-                            get: {
-                                config.additionalArgs.joined(separator: " ")
-                            },
-                            set: { newValue in
-                                config.additionalArgs = newValue
-                                    .split(separator: ",")
-                                    .map { $0.trimmingCharacters(in: .whitespaces) }
-                            }
-                        ))
-                        .textInputAutocapitalization(.none)
-                        .disableAutocorrection(true)
-                        
-                            
-                        
-                        Button {
-                            finishedStorage = false
-                            
-                        } label: {
-                            Text("Show Setup")
-                                .font(.body)
-                        }
-                        
-                        
-                    } label: {
-                        Text("Advanced Options")
-                    }
-                } header: {
-                    Text("Advanced")
-                        .font(.title3.weight(.semibold))
-                        .textCase(nil)
-                        .headerProminence(.increased)
-                } footer: {
-                    Text("For advanced users. See page size or add custom arguments for experimental features. (Please don't touch this if you don't know what you're doing). \n \n\(gamepo ? "the cake is a lie" : "")")
-                }
-                
-            }
-            .searchable(text: $searchText, placement: .navigationBarDrawer(displayMode: .always))
-            .navigationTitle("Settings")
-            .navigationBarTitleDisplayMode(.inline)
-            .listStyle(.insetGrouped)
-            .onAppear {
-                if let configs = loadSettings() {
-                    self.config = configs
-                } else {
-                    saveSettings()
-                }
-            }
-            .onChange(of: config) { _ in
-                saveSettings()
-            }
-        }
-        .navigationViewStyle(.stack)
-    }
-    
-    private func toggleController(_ controller: Controller) {
-        if currentControllers.contains(where: { $0.id == controller.id }) {
-            currentControllers.removeAll(where: { $0.id == controller.id })
-        } else {
-            currentControllers.append(controller)
-        }
-    }
-    
-    func saveSettings() {
-        MeloNX.saveSettings(config: config)
-    }
-    
-    func getDeviceModel() -> String {
-        var systemInfo = utsname()
-        uname(&systemInfo)
-        let machineMirror = Mirror(reflecting: systemInfo.machine)
-        let identifier = machineMirror.children.reduce("") { identifier, element in
-            guard let value = element.value as? Int8, value != 0 else { return identifier }
-            return identifier + String(UnicodeScalar(UInt8(value)))
-        }
-        return identifier
-    }
-    
-    
-    func getGPUInfo() -> String? {
-        let device = MTLCreateSystemDefaultDevice()
-        
-        let gpu = device?.name
-        print("GPU: " + (gpu ?? ""))
-        return gpu
-    }
-
-    
-    @ViewBuilder
-    private func labelWithIcon(_ text: String, iconName: String, flipimage: Bool? = nil) -> some View {
-        HStack(spacing: 8) {
-            if iconName.hasSuffix(".svg"){
-                if let flipimage, flipimage {
-                    SVGView(svgName: iconName, color: .blue)
-                        .symbolRenderingMode(.hierarchical)
-                        .frame(width: 20, height: 20)
-                        .rotation3DEffect(.degrees(180), axis: (x: 0, y: 1, z: 0))
-                } else {
-                    SVGView(svgName: iconName, color: .blue)
-                        .symbolRenderingMode(.hierarchical)
-                        .frame(width: 20, height: 20)
-                }
-            } else if !iconName.isEmpty {
-                Image(systemName: iconName)
-                    .symbolRenderingMode(.hierarchical)
-                    .foregroundStyle(.blue)
-            }
-            Text(text)
-        }
-        .font(.body)
-    }
-}
-
-
-struct SVGView: UIViewRepresentable {
-    var svgName: String
-    var color: Color = Color.black
-    
-    func makeUIView(context: Context) -> UIView {
-        var svgName = svgName
-        let hammock = UIView()
-        
-        if svgName.hasSuffix(".svg") {
-            svgName.removeLast(4)
-        }
-        
-        
-        
-        _ = UIView(svgNamed: svgName) { svgLayer in
-            svgLayer.fillColor = UIColor(color).cgColor // Apply the provided color
-            svgLayer.resizeToFit(hammock.frame)
-            hammock.layer.addSublayer(svgLayer)
-        }
-        
-        return hammock
-    }
-    
-    func updateUIView(_ uiView: UIView, context: Context) {
-        // Update the SVG view's fill color when the color changes
-        if let svgLayer = uiView.layer.sublayers?.first as? CAShapeLayer {
-            svgLayer.fillColor = UIColor(color).cgColor
-        }
-    }
-}
-
-func saveSettings(config: Ryujinx.Configuration) {
-    do {
-        let encoder = JSONEncoder()
-        encoder.outputFormatting = .prettyPrinted
-        let data = try encoder.encode(config)
-        
-        let fileURL = URL.documentsDirectory.appendingPathComponent("config.json")
-        
-        try data.write(to: fileURL)
-        print("Settings saved to: \(fileURL.path)")
-    } catch {
-        print("Failed to save settings: \(error)")
-    }
-}
-
-func loadSettings() -> Ryujinx.Configuration? {
-    do {
-        let fileURL = URL.documentsDirectory.appendingPathComponent("config.json")
-        
-        guard FileManager.default.fileExists(atPath: fileURL.path) else {
-            print("Config file does not exist at: \(fileURL.path)")
-            return nil
-        }
-        
-        let data = try Data(contentsOf: fileURL)
-        
-        let decoder = JSONDecoder()
-        let configs = try decoder.decode(Ryujinx.Configuration.self, from: data)
-        return configs
-    } catch {
-        print("Failed to load settings: \(error)")
-        return nil
-    }
-}

src/MeloNX/MeloNX/App/Views/Main/UI/ContentView.swift

@@ -0,0 +1,581 @@
+//
+//  ContentView.swift
+//  MeloNX
+//
+//  Created by Stossy11 on 3/11/2024.
+//
+
+import SwiftUI
+import GameController
+import Darwin
+import UIKit
+import MetalKit
+import CoreLocation
+
+struct MoltenVKSettings: Codable, Hashable {
+    let string: String
+    var value: String
+}
+
+struct ContentView: View {
+    // MARK: - Properties
+    
+    // Games
+    @State private var game: Game?
+    
+    // Controllers
+    @State private var controllersList: [Controller] = []
+    @State private var currentControllers: [Controller] = []
+    @State var onscreencontroller: Controller = Controller(id: "", name: "")
+    @State var nativeControllers: [GCController: NativeController] = [:]
+    @State private var isVirtualControllerActive: Bool = false
+    @AppStorage("isVirtualController") var isVCA: Bool = true
+    
+    // Settings and Configuration
+    private var config: Ryujinx.Arguments {
+        settingsManager.config
+    }
+    
+    @StateObject private var settingsManager = SettingsManager.shared
+    
+    @State var settings: [MoltenVKSettings]
+    
+    // JIT
+    @AppStorage("useTrollStore") var useTrollStore: Bool = false
+    @AppStorage("jitStreamerEB") var jitStreamerEB: Bool = false
+    @AppStorage("stikJIT") var stikJIT: Bool = false
+    
+    // Other Configuration
+    @State var isMK8: Bool = false
+    @AppStorage("quit") var quit: Bool = false
+    @State var quits: Bool = false
+    @AppStorage("MVK_CONFIG_PREFILL_METAL_COMMAND_BUFFERS") var mVKPreFillBuffer: Bool = true
+    @AppStorage("MVK_CONFIG_SYNCHRONOUS_QUEUE_SUBMITS") var syncqsubmits: Bool = false
+    @AppStorage("ignoreJIT") var ignoreJIT: Bool = false
+    
+    // Loading Animation
+    @AppStorage("showlogsloading") var showlogsloading: Bool = true
+    @State private var clumpOffset: CGFloat = -100
+    private let clumpWidth: CGFloat = 100
+    private let animationDuration: Double = 1.0
+    @State private var isAnimating = false
+    @State var isLoading = true
+    
+    
+    // MARK: - CORE
+    @StateObject var ryujinx = Ryujinx.shared
+    
+    // MARK: - SDL
+    var sdlInitFlags: UInt32 = SDL_INIT_EVENTS | SDL_INIT_GAMECONTROLLER | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_VIDEO
+
+    // MARK: - Initialization
+    init() {
+        let defaultSettings: [MoltenVKSettings] = [
+            MoltenVKSettings(string: "MVK_USE_METAL_PRIVATE_API", value: "1"),
+            MoltenVKSettings(string: "MVK_CONFIG_USE_METAL_PRIVATE_API", value: "1"),
+            MoltenVKSettings(string: "MVK_DEBUG", value: "0"),
+            MoltenVKSettings(string: "MVK_CONFIG_SYNCHRONOUS_QUEUE_SUBMITS", value: "0"),
+            MoltenVKSettings(string: "MVK_CONFIG_PREFILL_METAL_COMMAND_BUFFERS", value: "0"),
+            MoltenVKSettings(string: "MVK_CONFIG_MAX_ACTIVE_METAL_COMMAND_BUFFERS_PER_QUEUE", value: "512"),
+        ]
+        
+        _settings = State(initialValue: defaultSettings)
+        
+        // print(SDL_CONTROLLER_BUTTON_LEFTSTICK.rawValue)
+        
+        initializeSDL()
+    }
+    
+    // MARK: - Body
+    var body: some View {
+        if game != nil && (ryujinx.jitenabled || ignoreJIT) {
+            gameView
+        } else if game != nil && !ryujinx.jitenabled {
+            jitErrorView
+        } else {
+            mainMenuView
+        }
+    }
+    
+    // MARK: - View Components
+    
+    private var gameView: some View {
+        ZStack {
+            if #available(iOS 16, *) {
+                EmulationView(startgame: $game)
+                    .persistentSystemOverlays(.hidden)
+            } else {
+                EmulationView(startgame: $game)
+            }
+            
+            if isLoading {
+                ZStack {
+                    Color.black.opacity(0.8)
+                    emulationView.ignoresSafeArea(.all)
+                }
+                .edgesIgnoringSafeArea(.all)
+                .ignoresSafeArea(.all)
+            }
+        }
+    }
+    
+    private var jitErrorView: some View {
+        Text("")
+            .fullScreenCover(isPresented:Binding(
+                get: { !ryujinx.jitenabled },
+                set: { newValue in
+                    ryujinx.jitenabled = newValue
+                    
+                    ryujinx.ryuIsJITEnabled()
+                })
+            ) {
+                JITPopover() {
+                    ryujinx.jitenabled = false
+                }
+                // .interactiveDismissDisabled()
+            }
+    }
+    
+    private var mainMenuView: some View {
+        MainTabView(
+            startemu: $game,
+            MVKconfig: $settings,
+            controllersList: $controllersList,
+            currentControllers: $currentControllers,
+            onscreencontroller: $onscreencontroller
+        )
+        .onAppear {
+            quits = false
+            let _ = loadSettings()
+            isLoading = true
+            
+            Timer.scheduledTimer(withTimeInterval: 1, repeats: false) { _ in
+                refreshControllersList()
+            }
+            
+            
+            UserDefaults.standard.set(false, forKey: "lockInApp")
+            
+            // print(MTLHud.shared.isEnabled)
+            
+            initControllerObservers()
+            
+            Air.play(AnyView(
+                ControllerListView(game: $game)
+            ))
+            
+            refreshControllersList()
+            
+            
+            ryujinx.addGames()
+            
+            checkJitStatus()
+        }
+        .onOpenURL { url in
+            handleDeepLink(url)
+        }
+    }
+    
+    private var emulationView: some View {
+        GeometryReader { screenGeometry in
+            ZStack {
+                gameLoadingContent(screenGeometry: screenGeometry)
+                
+                HStack{
+                    
+                    VStack {
+                        if showlogsloading {
+                            LogFileView(isfps: true)
+                                .frame(alignment: .topLeading)
+                        }
+                        
+                        Spacer()
+                    }
+                    
+                    Spacer()
+                }
+            }
+        }
+    }
+    
+    // MARK: - Helper Methods
+    
+    private func gameLoadingContent(screenGeometry: GeometryProxy) -> some View {
+        HStack(spacing: screenGeometry.size.width * 0.04) {
+            if let icon = game?.icon {
+                Image(uiImage: icon)
+                    .resizable()
+                    .frame(
+                        width: min(screenGeometry.size.width * 0.25, 250),
+                        height: min(screenGeometry.size.width * 0.25, 250)
+                    )
+                    .clipShape(RoundedRectangle(cornerRadius: 16))
+                    .shadow(color: .black.opacity(0.5), radius: 10, x: 0, y: 5)
+            }
+            
+            VStack(alignment: .leading, spacing: screenGeometry.size.height * 0.015) {
+                Text("Loading \(game?.titleName ?? "Game")")
+                    .font(.system(size: min(screenGeometry.size.width * 0.04, 32)))
+                    .foregroundColor(.white)
+                
+                loadingProgressBar(screenGeometry: screenGeometry)
+            }
+        }
+        .padding(.horizontal, screenGeometry.size.width * 0.06)
+        .padding(.vertical, screenGeometry.size.height * 0.05)
+        .position(
+            x: screenGeometry.size.width / 2,
+            y: screenGeometry.size.height * 0.5
+        )
+    }
+    
+    private func loadingProgressBar(screenGeometry: GeometryProxy) -> some View {
+        GeometryReader { geometry in
+            let containerWidth = min(screenGeometry.size.width * 0.35, 350)
+            
+            ZStack(alignment: .leading) {
+                Rectangle()
+                    .cornerRadius(10)
+                    .frame(width: containerWidth, height: min(screenGeometry.size.height * 0.015, 12))
+                    .foregroundColor(.gray.opacity(0.3))
+                    .shadow(color: .black.opacity(0.2), radius: 4, x: 0, y: 2)
+                
+                Rectangle()
+                    .cornerRadius(10)
+                    .frame(width: clumpWidth, height: min(screenGeometry.size.height * 0.015, 12))
+                    .foregroundColor(.blue)
+                    .shadow(color: .blue.opacity(0.5), radius: 4, x: 0, y: 2)
+                    .offset(x: isAnimating ? containerWidth : -clumpWidth)
+                    .animation(
+                        Animation.linear(duration: 1.0)
+                            .repeatForever(autoreverses: false),
+                        value: isAnimating
+                    )
+            }
+            .clipShape(RoundedRectangle(cornerRadius: 16))
+            .onAppear {
+                isAnimating = true
+                setupEmulation()
+                
+                Timer.scheduledTimer(withTimeInterval: 0.5, repeats: true) { timer in
+                    if get_current_fps() != 0 {
+                        withAnimation {
+                            isLoading = false
+                            isAnimating = false
+                        }
+                        timer.invalidate()
+                    }
+                }
+            }
+        }
+        .frame(height: min(screenGeometry.size.height * 0.015, 12))
+        .frame(width: min(screenGeometry.size.width * 0.35, 350))
+    }
+    
+    private func initializeSDL() {
+        setMoltenVKSettings()
+        SDL_SetMainReady()
+        SDL_iPhoneSetEventPump(SDL_TRUE)
+        SDL_Init(sdlInitFlags)
+        initialize()
+    }
+    
+    private func initControllerObservers() {
+        NotificationCenter.default.addObserver(
+            forName: .GCControllerDidConnect,
+            object: nil,
+            queue: .main
+        ) { notification in
+            if let controller = notification.object as? GCController {
+                // print("Controller connected: \(controller.productCategory)")
+                nativeControllers[controller] = .init(controller)
+                refreshControllersList()
+            }
+        }
+        
+        NotificationCenter.default.addObserver(
+            forName: .GCControllerDidDisconnect,
+            object: nil,
+            queue: .main
+        ) { notification in
+            if let controller = notification.object as? GCController {
+                // print("Controller disconnected: \(controller.productCategory)")
+                nativeControllers[controller]?.cleanup()
+                nativeControllers[controller] = nil
+                refreshControllersList()
+            }
+        }
+    }
+    
+    private func setupEmulation() {
+        isVCA = (currentControllers.first(where: { $0 == onscreencontroller }) != nil)
+        
+        DispatchQueue.main.async {
+            start(displayid: 1)
+        }
+    }
+    
+    private func refreshControllersList() {
+        controllersList = ryujinx.getConnectedControllers()
+        
+        if let onscreen = controllersList.first(where: { $0.name == ryujinx.virtualController.controllername }) {
+            self.onscreencontroller = onscreen
+        }
+        
+        controllersList.removeAll(where: { $0.id == "0" || (!$0.name.starts(with: "GC - ") && $0 != onscreencontroller) })
+        controllersList.mutableForEach { $0.name = $0.name.replacingOccurrences(of: "GC - ", with: "") }
+
+        currentControllers = []
+        
+        if controllersList.count == 1 {
+            currentControllers.append(controllersList[0])
+        } else if (controllersList.count - 1) >= 1 {
+            for controller in controllersList {
+                if controller.id != onscreencontroller.id && !currentControllers.contains(where: { $0.id == controller.id }) {
+                    currentControllers.append(controller)
+                }
+            }
+        }
+    }
+    
+    private func registerMotionForMatchingControllers() {
+        // Loop through currentControllers with index
+        for (index, controller) in currentControllers.enumerated() {
+            let slot = UInt8(index)
+            
+            // Check native controllers
+            for (_, nativeController) in nativeControllers where nativeController.controllername == String("GC - \(controller.name)") && nativeController.tryGetMotionProvider() == nil {
+                nativeController.tryRegisterMotion(slot: slot)
+                continue
+            }
+            
+            // Check virtual controller if active
+            if Ryujinx.shared.virtualController.controllername == controller.name && Ryujinx.shared.virtualController.tryGetMotionProvider() == nil {
+                Ryujinx.shared.virtualController.tryRegisterMotion(slot: slot)
+                continue
+            }
+        }
+    }
+    
+    private func start(displayid: UInt32) {
+        guard let game else { return }
+        
+        config.gamepath = game.fileURL.path
+        config.inputids = Array(Set(currentControllers.map(\.id)))
+        
+        configureEnvironmentVariables()
+        
+        registerMotionForMatchingControllers()
+        
+        if config.inputids.isEmpty {
+            config.inputids.append("0")
+        }
+        
+        // Local DSU loopback to ryujinx per input id
+        for _ in config.inputids {
+            config.inputDSUServers.append("127.0.0.1:26760")
+        }
+        
+        do {
+            try ryujinx.start(with: config)
+        } catch {
+            // print("Error: \(error.localizedDescription)")
+        }
+    }
+    
+    private func configureEnvironmentVariables() {
+        if mVKPreFillBuffer {
+            mVKPreFillBuffer = false
+            // setenv("MVK_CONFIG_PREFILL_METAL_COMMAND_BUFFERS", "2", 1)
+        }
+        
+        if syncqsubmits {
+            setenv("MVK_CONFIG_SYNCHRONOUS_QUEUE_SUBMITS", "1", 1)
+        }
+    }
+    
+    private func setMoltenVKSettings() {
+        settings.forEach { setting in
+            setenv(setting.string, setting.value, 1)
+        }
+    }
+    
+    private func checkJitStatus() {
+        ryujinx.ryuIsJITEnabled()
+        if jitStreamerEB {
+            jitStreamerEB = false // byee jitstreamer eb
+        }
+        
+        
+        if !ryujinx.jitenabled {
+            if useTrollStore {
+                askForJIT()
+            } else if stikJIT {
+                enableJITStik()
+            } else if jitStreamerEB {
+                enableJITEB()
+            } else {
+                if !allocateTest(), checkDebugged() {
+                    loop_heartbeat()
+                    sleep(5)
+                    let cool = String(cString: attach(getpid())!)
+                    print(cool)
+                }
+            }
+        }
+    }
+    
+    private func handleDeepLink(_ url: URL) {
+        if let components = URLComponents(url: url, resolvingAgainstBaseURL: true),
+           components.host == "game" {
+            
+            refreshControllersList()
+            
+            if let text = components.queryItems?.first(where: { $0.name == "id" })?.value {
+                game = ryujinx.games.first(where: { $0.titleId == text })
+            } else if let text = components.queryItems?.first(where: { $0.name == "name" })?.value {
+                game = ryujinx.games.first(where: { $0.titleName == text })
+            }
+        }
+    }
+}
+
+extension Array {
+    @inlinable public mutating func mutableForEach(_ body: (inout Element) throws -> Void) rethrows {
+        for index in self.indices {
+            try body(&self[index])
+        }
+    }
+}
+
+class LocationManager: NSObject, CLLocationManagerDelegate {
+    
+    private var locationManager: CLLocationManager
+    
+    static let sharedInstance = LocationManager()
+    
+    private override init() {
+        locationManager = CLLocationManager()
+        super.init()
+        locationManager.delegate = self
+        locationManager.desiredAccuracy = kCLLocationAccuracyBest
+        locationManager.pausesLocationUpdatesAutomatically = false
+    }
+    
+    func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
+        // print("wow")
+    }
+    
+    func locationManager(_ manager: CLLocationManager, didFailWithError error: Error) {
+        print("Location manager failed with: \(error)")
+    }
+    
+    func locationManagerDidChangeAuthorization(_ manager: CLLocationManager) {
+        if manager.authorizationStatus == .denied {
+            print("Location services are disabled in settings.")
+        } else {
+            startUpdatingLocation()
+        }
+    }
+    
+    func stop() {
+        if UserDefaults.standard.bool(forKey: "location-enabled") {
+            locationManager.stopUpdatingLocation()
+        }
+    }
+    
+    func startUpdatingLocation() {
+        if UserDefaults.standard.bool(forKey: "location-enabled") {
+            locationManager.requestAlwaysAuthorization()
+            locationManager.allowsBackgroundLocationUpdates = true
+            locationManager.startUpdatingLocation()
+        }
+    }
+}
+
+struct ControllerListView: View {
+    @State private var selectedIndex = 0
+    @Binding var game: Game?
+    @ObservedObject private var ryujinx = Ryujinx.shared
+
+    var body: some View {
+        List(ryujinx.games.indices, id: \.self) { index in
+            let game = ryujinx.games[index]
+
+            HStack(spacing: 16) {
+                // Game Icon
+                Group {
+                    if let icon = game.icon {
+                        Image(uiImage: icon)
+                            .resizable()
+                            .aspectRatio(contentMode: .fill)
+                    } else {
+                        ZStack {
+                            RoundedRectangle(cornerRadius: 10)
+                            Image(systemName: "gamecontroller.fill")
+                                .font(.system(size: 24))
+                                .foregroundColor(.gray)
+                        }
+                    }
+                }
+                .frame(width: 55, height: 55)
+                .cornerRadius(10)
+
+                // Game Info
+                VStack(alignment: .leading, spacing: 4) {
+                    Text(game.titleName)
+                        .font(.system(size: 16, weight: .medium))
+                        .foregroundColor(.primary)
+
+                    HStack(spacing: 4) {
+                        Text(game.developer)
+
+                        if !game.version.isEmpty && game.version != "0" {
+                            Text("•")
+                            Text("v\(game.version)")
+                        }
+                    }
+                    .font(.system(size: 14))
+                    .foregroundColor(.secondary)
+                }
+
+                Spacer()
+            }
+            .background(selectedIndex == index ? Color.blue.opacity(0.3) : .clear)
+        }
+        .onAppear(perform: setupControllerObservers)
+    }
+
+    private func setupControllerObservers() {
+        let dpadHandler: GCControllerDirectionPadValueChangedHandler = { _, _, yValue in
+            if yValue == 1.0 {
+                selectedIndex = max(0, selectedIndex - 1)
+            } else if yValue == -1.0 {
+                selectedIndex = min(ryujinx.games.count - 1, selectedIndex + 1)
+            }
+        }
+
+        for controller in GCController.controllers() {
+            print("Controller connected: \(controller.vendorName ?? "Unknown")")
+            controller.playerIndex = .index1
+
+            controller.microGamepad?.dpad.valueChangedHandler = dpadHandler
+            controller.extendedGamepad?.dpad.valueChangedHandler = dpadHandler
+
+            controller.extendedGamepad?.buttonA.pressedChangedHandler = { _, _, pressed in
+                if pressed {
+                    print("A button pressed")
+                    game = ryujinx.games[selectedIndex]
+                }
+            }
+        }
+
+        NotificationCenter.default.addObserver(
+            forName: .GCControllerDidConnect,
+            object: nil,
+            queue: .main
+        ) { _ in
+            setupControllerObservers()
+        }
+    }
+}

src/MeloNX/MeloNX/App/Views/Main/UI/GamesList/GameCompatibility/GameCompatibilityCache.swift

@@ -0,0 +1,44 @@
+//
+//  GameRequirementsCache.swift
+//  MeloNX
+//
+//  Created by Stossy11 on 21/03/2025.
+//
+
+
+import Foundation
+
+class GameCompatibiliryCache {
+    static let shared = GameCompatibiliryCache()
+    private let cacheKey = "gameRequirementsCache"
+    private let timestampKey = "gameRequirementsCacheTimestamp"
+    
+    private let cacheDuration: TimeInterval = Double.random(in: 3...5) * 24 * 60 * 60 // Randomly pick 3-5 days
+    
+    func getCachedData() -> [GameRequirements]? {
+        guard let cachedData = UserDefaults.standard.data(forKey: cacheKey),
+              let timestamp = UserDefaults.standard.object(forKey: timestampKey) as? Date else {
+            return nil
+        }
+
+        let timeElapsed = Date().timeIntervalSince(timestamp)
+        if timeElapsed > cacheDuration {
+            clearCache()
+            return nil
+        }
+
+        return try? JSONDecoder().decode([GameRequirements].self, from: cachedData)
+    }
+
+    func setCachedData(_ data: [GameRequirements]) {
+        if let encodedData = try? JSONEncoder().encode(data) {
+            UserDefaults.standard.set(encodedData, forKey: cacheKey)
+            UserDefaults.standard.set(Date(), forKey: timestampKey)
+        }
+    }
+
+    func clearCache() {
+        UserDefaults.standard.removeObject(forKey: cacheKey)
+        UserDefaults.standard.removeObject(forKey: timestampKey)
+    }
+}

src/MeloNX/MeloNX/App/Views/Main/UI/GamesList/GameInfoSheet.swift

@@ -10,7 +10,7 @@ import SwiftUI
 struct GameInfoSheet: View {
     let game: Game
     
-    @Environment(\.dismiss) var dismiss
+    @Environment(\.presentationMode) var presentationMode
     
     var body: some View {
         iOSNav {
@@ -44,7 +44,7 @@ struct GameInfoSheet: View {
                                 .multilineTextAlignment(.center)
                             Text(game.developer)
                                 .font(.caption)
-                                .foregroundStyle(.secondary)
+                                .foregroundColor(.secondary)
                         }
                         .padding(.vertical, 3)
                     }
@@ -56,7 +56,7 @@ struct GameInfoSheet: View {
                         Text("**Version**")
                         Spacer()
                         Text(game.version)
-                            .foregroundStyle(Color.secondary)
+                            .foregroundColor(Color.secondary)
                     }
                     HStack {
                         Text("**Title ID**")
@@ -69,36 +69,36 @@ struct GameInfoSheet: View {
                             }
                         Spacer()
                         Text(game.titleId)
-                            .foregroundStyle(Color.secondary)
+                            .foregroundColor(Color.secondary)
                     }
                     HStack {
                         Text("**Game Size**")
                         Spacer()
                         Text("\(fetchFileSize(for: game.fileURL) ?? 0) bytes")
-                            .foregroundStyle(Color.secondary)
+                            .foregroundColor(Color.secondary)
                     }
                     HStack {
                         Text("**File Type**")
                         Spacer()
                         Text(getFileType(game.fileURL))
-                            .foregroundStyle(Color.secondary)
+                            .foregroundColor(Color.secondary)
                     }
                     VStack(alignment: .leading, spacing: 4) {
                         Text("**Game URL**")
                         Text(trimGameURL(game.fileURL))
-                            .foregroundStyle(Color.secondary)
+                            .foregroundColor(Color.secondary)
                     }
                 } header: {
                     Text("Information")
                 }
-                .headerProminence(.increased)
+                // .headerProminence(.increased)
             }
             .navigationTitle(game.titleName)
             .navigationBarTitleDisplayMode(.inline)
             .toolbar {
-                ToolbarItem(placement: .navigationBarTrailing) {
-                    Button("Done") {
-                        dismiss()
+                ToolbarItem(placement: .cancellationAction) {
+                    Button("Dismiss") {
+                        presentationMode.wrappedValue.dismiss()
                     }
                 }
             }
@@ -113,7 +113,7 @@ struct GameInfoSheet: View {
                 return size
             }
         } catch {
-            print("Error getting file size: \(error)")
+            // print("Error getting file size: \(error)")
         }
         return nil
     }

src/MeloNX/MeloNX/App/Views/Main/UI/JIT/JITPopover.swift

@@ -9,7 +9,7 @@ import SwiftUI
 
 struct JITPopover: View {
     var onJITEnabled: () -> Void
-    @Environment(\.dismiss) var dismiss
+    @Environment(\.presentationMode) var presentationMode
     
     @State var isJIT: Bool = false
     var body: some View {
@@ -35,8 +35,10 @@ struct JITPopover: View {
                 
                 
                 if isJIT {
-                    dismiss()
+                    presentationMode.wrappedValue.dismiss()
                     onJITEnabled()
+                    
+                    Ryujinx.shared.ryuIsJITEnabled()
                 }
             }
         }

src/MeloNX/MeloNX/App/Views/Main/UI/Logging/Logs.swift

@@ -0,0 +1,66 @@
+//
+//  LogEntry.swift
+//  MeloNX
+//
+//  Created by Stossy11 on 09/02/2025.
+//
+
+import SwiftUI
+import Combine
+
+struct LogFileView: View {
+    @StateObject var logsModel = LogViewModel()
+    @State private var showingLogs = false
+    
+    public var isfps: Bool
+    
+    private let fileManager = FileManager.default
+    private let maxDisplayLines = 4
+    
+    var body: some View {
+        VStack(alignment: .leading, spacing: 4) {
+            ForEach(logsModel.logs.suffix(maxDisplayLines), id: \.self) { log in
+                Text(log)
+                    .font(.caption)
+                    .foregroundColor(.white)
+                    .padding(4)
+                    .background(Color.black.opacity(0.7))
+                    .cornerRadius(4)
+                    .transition(.opacity)
+            }
+        }
+        .padding()
+    }
+    
+    private func stopLogFileWatching() {
+        showingLogs = false
+    }
+}
+
+
+class LogViewModel: ObservableObject {
+    @Published var logs: [String] = []
+    private var cancellables = Set<AnyCancellable>()
+    
+    init() {
+        _ = LogCapture.shared
+        
+        NotificationCenter.default.publisher(for: .newLogCaptured)
+            .receive(on: RunLoop.main)
+            .sink { [weak self] _ in
+                self?.updateLogs()
+            }
+            .store(in: &cancellables)
+        
+        updateLogs()
+    }
+    
+    func updateLogs() {
+        logs = LogCapture.shared.capturedLogs
+    }
+    
+    func clearLogs() {
+        LogCapture.shared.capturedLogs = []
+        updateLogs()
+    }
+}

src/MeloNX/MeloNX/App/Views/Main/UI/TabView/TabView.swift

@@ -11,7 +11,6 @@ import UniformTypeIdentifiers
 
 struct MainTabView: View {
     @Binding var startemu: Game?
-    @Binding var config: Ryujinx.Configuration
     @Binding var MVKconfig: [MoltenVKSettings]
     @Binding var controllersList: [Controller]
     @Binding var currentControllers: [Controller]
@@ -25,7 +24,8 @@ struct MainTabView: View {
                     Label("Games", systemImage: "gamecontroller.fill")
                 }
             
-            SettingsView(config: $config, MoltenVKSettings: $MVKconfig, controllersList: $controllersList, currentControllers: $currentControllers, onscreencontroller: $onscreencontroller)
+            // SettingsView(config: $config, MoltenVKSettings: $MVKconfig, controllersList: $controllersList, currentControllers: $currentControllers, onscreencontroller: $onscreencontroller)
+            SettingsViewNew(MoltenVKSettings: $MVKconfig, controllersList: $controllersList, currentControllers: $currentControllers, onscreencontroller: $onscreencontroller)
                 .tabItem {
                     Label("Settings", systemImage: "gear")
                 }

src/MeloNX/MeloNX/App/Views/Main/UI/Updates/App/MeloNXUpdateSheet.swift

@@ -0,0 +1,74 @@
+//
+//  MeloNXUpdateSheet.swift
+//  MeloNX
+//
+//  Created by Stossy11 and Bella on 12/03/2025.
+//
+
+import SwiftUI
+
+struct MeloNXUpdateSheet: View {
+    let updateInfo: LatestVersionResponse
+    @Binding var isPresented: Bool
+    
+    var body: some View {
+        iOSNav {
+            VStack {
+                Text("Version \(updateInfo.version_number) is available. You are currently on Version \(Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "Unknown").")
+                
+                VStack {
+                    Text("Changelog:")
+                        .frame(maxWidth: .infinity, alignment: .leading)
+                        .font(.headline)
+                    
+                    ScrollView {
+                        Text(updateInfo.changelog)
+                            .padding()
+                    }
+                    .frame(maxHeight: 400)
+                    .background(Color(.secondarySystemBackground))
+                    .clipShape(RoundedRectangle(cornerRadius: 10))
+                }
+                .padding(.top, 15)
+                
+                
+                Spacer()
+                if #available(iOS 15.0, *) {
+                    Button(action: {
+                        if let url = URL(string: updateInfo.download_link) {
+                            UIApplication.shared.open(url)
+                        }
+                    }) {
+                        Text("Download Now")
+                            .font(.title3)
+                            .bold()
+                            .frame(width: 300, height: 40)
+                    }
+                    .buttonStyle(.borderedProminent)
+                    .frame(alignment: .bottom)
+                } else {
+                    Button(action: {
+                        if let url = URL(string: updateInfo.download_link) {
+                            UIApplication.shared.open(url)
+                        }
+                    }) {
+                        Text("Download Now")
+                            .font(.title3)
+                            .bold()
+                            .frame(width: 300, height: 40)
+                    }
+                    .frame(alignment: .bottom)
+                }
+            }
+            .padding(.horizontal)
+            .navigationTitle("Version \(updateInfo.version_number) Available!")
+            .toolbar {
+                Button(action: {
+                    isPresented = false
+                }) {
+                    Text("Close")
+                }
+            }
+        }
+    }
+}

src/MeloNX/MeloNX/App/Views/Main/UI/Updates/Games/GameDLCManagerSheet.swift

@@ -0,0 +1,337 @@
+//
+//  GameDLCManagerSheet.swift
+//  MeloNX
+//
+//  Created by XITRIX on 16/02/2025.
+//
+
+import SwiftUI
+import UniformTypeIdentifiers
+
+// MARK: - Models
+struct DownloadableContentNca: Codable, Hashable {
+    var fullPath: String
+    var titleId: UInt
+    var enabled: Bool
+
+    enum CodingKeys: String, CodingKey {
+        case fullPath = "path"
+        case titleId = "title_id"
+        case enabled = "is_enabled"
+    }
+}
+
+struct DownloadableContentContainer: Codable, Hashable, Identifiable {
+    var id: String { containerPath }
+    var containerPath: String
+    var downloadableContentNcaList: [DownloadableContentNca]
+    
+    var filename: String {
+        (containerPath as NSString).lastPathComponent
+    }
+    
+    var isEnabled: Bool {
+        downloadableContentNcaList.first?.enabled == true
+    }
+
+    enum CodingKeys: String, CodingKey {
+        case containerPath = "path"
+        case downloadableContentNcaList = "dlc_nca_list"
+    }
+}
+
+// MARK: - View
+struct DLCManagerSheet: View {
+    // MARK: - Properties
+    @Binding var game: Game!
+    @State private var isSelectingGameDLC = false
+    @State private var dlcs: [DownloadableContentContainer] = []
+    @Environment(\.presentationMode) var presentationMode
+    
+    // MARK: - Body
+    var body: some View {
+        iOSNav {
+            List {
+                if dlcs.isEmpty {
+                    emptyStateView
+                } else {
+                    ForEach(dlcs) { dlc in
+                        dlcRow(dlc)
+                    }
+                    .onDelete(perform: removeDLCs)
+                }
+            }
+            .navigationTitle("\(game.titleName) DLCs")
+            .navigationBarTitleDisplayMode(.inline)
+            .toolbar {
+                ToolbarItem(placement: .navigationBarLeading) {
+                    Button("Done") {
+                        presentationMode.wrappedValue.dismiss()
+                    }
+                }
+                
+                ToolbarItem(placement: .navigationBarTrailing) {
+                    Button {
+                        isSelectingGameDLC = true
+                    } label: {
+                        Label("Add DLC", systemImage: "plus")
+                    }
+                }
+            }
+            .onAppear {
+                loadData()
+            }
+        }
+        .fileImporter(
+            isPresented: $isSelectingGameDLC,
+            allowedContentTypes: [.item],
+            allowsMultipleSelection: true,
+            onCompletion: handleFileImport
+        )
+    }
+    
+    // MARK: - Views
+    private var emptyStateView: some View {
+        Group {
+            if #available(iOS 17, *) {
+                ContentUnavailableView(
+                    "No DLCs Found",
+                    systemImage: "puzzlepiece.extension",
+                    description: Text("Tap the + button to add game DLCs.")
+                )
+            } else {
+                VStack(spacing: 20) {
+                    Spacer()
+                    
+                    Image(systemName: "puzzlepiece.extension")
+                        .font(.system(size: 64))
+                        .foregroundColor(.secondary)
+                    
+                    Text("No DLCs Found")
+                        .font(.title2)
+                        .fontWeight(.semibold)
+                    
+                    Text("Tap the + button to add game DLCs.")
+                        .font(.subheadline)
+                        .foregroundColor(.secondary)
+                        .multilineTextAlignment(.center)
+                        .padding(.horizontal)
+                    
+                    Spacer()
+                }
+                .frame(maxWidth: .infinity)
+                .listRowInsets(EdgeInsets())
+            }
+        }
+    }
+    
+    
+    private func dlcRow(_ dlc: DownloadableContentContainer) -> some View {
+        Group {
+            if #available(iOS 15.0, *) {
+                Button {
+                    toggleDLC(dlc)
+                } label: {
+                    HStack {
+                        Text(dlc.filename)
+                            .foregroundColor(.primary)
+                        Spacer()
+                        Image(systemName: dlc.isEnabled ? "checkmark.circle.fill" : "circle")
+                            .foregroundColor(dlc.isEnabled ? .primary : .secondary)
+                            .imageScale(.large)
+                    }
+                    .contentShape(Rectangle())
+                }
+                .buttonStyle(.plain)
+                .swipeActions(edge: .trailing) {
+                    Button(role: .destructive) {
+                        if let index = dlcs.firstIndex(where: { $0.id == dlc.id }) {
+                            removeDLC(at: IndexSet(integer: index))
+                        }
+                    } label: {
+                        Label("Delete", systemImage: "trash")
+                    }
+                }
+            } else {
+                Button {
+                    toggleDLC(dlc)
+                } label: {
+                    HStack {
+                        Text(dlc.filename)
+                            .foregroundColor(.primary)
+                        Spacer()
+                        Image(systemName: dlc.isEnabled ? "checkmark.circle.fill" : "circle")
+                            .foregroundColor(dlc.isEnabled ? .primary : .secondary)
+                            .imageScale(.large)
+                    }
+                    .contentShape(Rectangle())
+                }
+                .buttonStyle(.plain)
+                .contextMenu {
+                    Button {
+                        if let index = dlcs.firstIndex(where: { $0.id == dlc.id }) {
+                            removeDLC(at: IndexSet(integer: index))
+                        }
+                    } label: {
+                        Label("Delete", systemImage: "trash")
+                            .foregroundColor(.red)
+                    }
+                }
+            }
+        }
+    }
+    
+    // MARK: - Functions
+    private func loadData() {
+        dlcs = Self.loadDlc(game)
+    }
+    
+    private func toggleDLC(_ dlc: DownloadableContentContainer) {
+        guard let index = dlcs.firstIndex(where: { $0.id == dlc.id }) else { return }
+        
+        let toggle = !dlcs[index].isEnabled
+        dlcs[index].downloadableContentNcaList = dlcs[index].downloadableContentNcaList.map { nca in
+            var mutableNca = nca
+            mutableNca.enabled = toggle
+            return mutableNca
+        }
+        
+        Self.saveDlcs(game, dlc: dlcs)
+    }
+    
+    private func removeDLCs(at offsets: IndexSet) {
+        offsets.forEach { removeDLC(at: IndexSet(integer: $0)) }
+    }
+    
+    private func removeDLC(at indexSet: IndexSet) {
+        guard let index = indexSet.first else { return }
+        
+        let dlcToRemove = dlcs[index]
+        let path = URL.documentsDirectory.appendingPathComponent(dlcToRemove.containerPath)
+        
+        do {
+            try FileManager.default.removeItem(at: path)
+            dlcs.remove(at: index)
+            Self.saveDlcs(game, dlc: dlcs)
+        } catch {
+            print("Failed to remove DLC: \(error)")
+        }
+    }
+    
+    private func handleFileImport(result: Result<[URL], Error>) {
+        switch result {
+        case .success(let urls):
+            for url in urls {
+                importDLC(from: url)
+            }
+        case .failure(let error):
+            print("File import failed: \(error.localizedDescription)")
+        }
+    }
+    
+    private func importDLC(from url: URL) {
+        guard url.startAccessingSecurityScopedResource() else {
+            print("Failed to access security-scoped resource")
+            return
+        }
+        defer { url.stopAccessingSecurityScopedResource() }
+        
+        do {
+            let fileManager = FileManager.default
+            let dlcDirectory = URL.documentsDirectory.appendingPathComponent("dlc")
+            let gameDlcDirectory = dlcDirectory.appendingPathComponent(game.titleId)
+            
+            try fileManager.createDirectory(at: gameDlcDirectory, withIntermediateDirectories: true)
+            
+            // Copy the DLC file
+            let destinationURL = gameDlcDirectory.appendingPathComponent(url.lastPathComponent)
+            try? fileManager.removeItem(at: destinationURL)
+            try fileManager.copyItem(at: url, to: destinationURL)
+            
+            // Fetch DLC metadata from Ryujinx
+            let dlcContent = Ryujinx.shared.getDlcNcaList(titleId: game.titleId, path: destinationURL.path)
+            guard !dlcContent.isEmpty else {
+                print("No valid DLC content found")
+                return
+            }
+            
+            let newDlcContainer = DownloadableContentContainer(
+                containerPath: Self.relativeDlcDirectoryPath(for: game, dlcPath: destinationURL),
+                downloadableContentNcaList: dlcContent
+            )
+            
+            dlcs.append(newDlcContainer)
+            Self.saveDlcs(game, dlc: dlcs)
+            
+        } catch {
+            print("Error importing DLC: \(error)")
+        }
+    }
+    
+}
+
+// MARK: - Helper Methods
+private extension DLCManagerSheet {
+    static func loadDlc(_ game: Game) -> [DownloadableContentContainer] {
+        let jsonURL = dlcJsonPath(for: game)
+        
+        do {
+            try FileManager.default.createDirectory(at: jsonURL.deletingLastPathComponent(), withIntermediateDirectories: true)
+            
+            guard FileManager.default.fileExists(atPath: jsonURL.path),
+                  let data = try? Data(contentsOf: jsonURL),
+                  var result = try? JSONDecoder().decode([DownloadableContentContainer].self, from: data)
+            else { return [] }
+            
+            result = result.filter { container in
+                let path = URL.documentsDirectory.appendingPathComponent(container.containerPath)
+                return FileManager.default.fileExists(atPath: path.path)
+            }
+            
+            return result
+        } catch {
+            // print("Error loading DLCs: \(error)")
+            return []
+        }
+    }
+    
+    static func saveDlcs(_ game: Game, dlc: [DownloadableContentContainer]) {
+        do {
+            let data = try JSONEncoder().encode(dlc)
+            try data.write(to: dlcJsonPath(for: game))
+        } catch {
+            print("Error saving DLCs: \(error)")
+        }
+    }
+    
+    static func relativeDlcDirectoryPath(for game: Game, dlcPath: URL) -> String {
+        "dlc/\(game.titleId)/\(dlcPath.lastPathComponent)"
+    }
+    
+    static func dlcJsonPath(for game: Game) -> URL {
+        URL.documentsDirectory
+            .appendingPathComponent("games")
+            .appendingPathComponent(game.titleId)
+            .appendingPathComponent("dlc.json")
+    }
+}
+
+// MARK: - Array Extension
+extension Array where Element: AnyObject {
+    mutating func mutableForEach(_ body: (inout Element) -> Void) {
+        for index in indices {
+            var element = self[index]
+            body(&element)
+            self[index] = element
+        }
+    }
+}
+
+// MARK: - URL Extension
+extension URL {
+    @available(iOS, introduced: 14.0, deprecated: 16.0, message: "Use URL.documentsDirectory on iOS 16 and above")
+    static var documentsDirectory: URL {
+        let documentDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
+        return documentDirectory
+    }
+}

src/MeloNX/MeloNX/App/Views/Main/UI/Updates/Games/GameUpdateManagerSheet.swift

@@ -0,0 +1,334 @@
+//
+//  GameUpdateManagerSheet.swift
+//  MeloNX
+//
+//  Created by Stossy11 on 16/02/2025.
+//
+
+import SwiftUI
+import UniformTypeIdentifiers
+
+struct UpdateManagerSheet: View {
+    // MARK: - Properties
+    @State private var updates: [UpdateItem] = []
+    @Binding var game: Game?
+    @State private var isSelectingGameUpdate = false
+    @State private var jsonURL: URL? = nil
+    @Environment(\.presentationMode) var presentationMode
+    
+    // MARK: - Models
+    class UpdateItem: Identifiable, ObservableObject {
+        let id = UUID()
+        let url: URL
+        let filename: String
+        let path: String
+
+        @Published var isSelected: Bool = false
+
+        init(url: URL, filename: String, path: String, isSelected: Bool = false) {
+            self.url = url
+            self.filename = filename
+            self.path = path
+            self.isSelected = isSelected
+        }
+    }
+    
+    // MARK: - Body
+    var body: some View {
+        iOSNav {
+            List {
+                if updates.isEmpty {
+                    emptyStateView
+                } else {
+                    ForEach(updates) { update in
+                        updateRow(update)
+                    }
+                    .onDelete(perform: removeUpdates)
+                }
+            }
+            .navigationTitle("\(game?.titleName ?? "Game") Updates")
+            .navigationBarTitleDisplayMode(.inline)
+            .toolbar {
+                ToolbarItem(placement: .navigationBarLeading) {
+                    Button("Done") {
+                        presentationMode.wrappedValue.dismiss()
+                    }
+                }
+                
+                ToolbarItem(placement: .navigationBarTrailing) {
+                    Button {
+                        isSelectingGameUpdate = true
+                    } label: {
+                        Label("Add Update", systemImage: "plus")
+                    }
+                }
+            }
+            .onAppear {
+                loadData()
+            }
+        }
+        .fileImporter(isPresented: $isSelectingGameUpdate, allowedContentTypes: [.item], onCompletion: handleFileImport)
+    }
+    
+    // MARK: - Views
+    private var emptyStateView: some View {
+        Group {
+            if #available(iOS 17, *) {
+                ContentUnavailableView(
+                    "No Updates Found",
+                    systemImage: "arrow.down.circle",
+                    description: Text("Tap the + button to add game updates.")
+                )
+            } else {
+                VStack(spacing: 20) {
+                    Spacer()
+                    
+                    Image(systemName: "arrow.down.circle")
+                        .font(.system(size: 64))
+                        .foregroundColor(.secondary)
+                    
+                    Text("No Updates Found")
+                        .font(.title2)
+                        .fontWeight(.semibold)
+                    
+                    Text("Tap the + button to add game updates.")
+                        .font(.subheadline)
+                        .foregroundColor(.secondary)
+                        .multilineTextAlignment(.center)
+                        .padding(.horizontal)
+                    
+                    Spacer()
+                }
+                .frame(maxWidth: .infinity)
+                .listRowInsets(EdgeInsets())
+            }
+        }
+    }
+    
+    private func updateRow(_ update: UpdateItem) -> some View {
+        Group {
+            if #available(iOS 15, *) {
+                updateRowNew(update)
+            } else {
+                updateRowOld(update)
+            }
+        }
+    }
+    
+    @available(iOS 15, *)
+    private func updateRowNew(_ update: UpdateItem) -> some View {
+        Button {
+            toggleSelection(update)
+        } label: {
+            HStack {
+                Text(update.filename)
+                    .foregroundColor(.primary)
+                Spacer()
+                Image(systemName: update.isSelected ? "checkmark.circle.fill" : "circle")
+                    .foregroundColor(update.isSelected ? .primary : .secondary)
+                    .imageScale(.large)
+            }
+            .contentShape(Rectangle())
+        }
+        .buttonStyle(.plain)
+        .swipeActions(edge: .trailing) {
+            Button(role: .destructive) {
+                if let index = updates.firstIndex(where: { $0.path == update.path }) {
+                    removeUpdate(at: IndexSet(integer: index))
+                }
+            } label: {
+                Label("Delete", systemImage: "trash")
+            }
+        }
+    }
+    
+    private func updateRowOld(_ update: UpdateItem) -> some View {
+        Button {
+            toggleSelection(update)
+        } label: {
+            HStack {
+                Text(update.filename)
+                    .foregroundColor(.primary)
+                Spacer()
+                Image(systemName: update.isSelected ? "checkmark.circle.fill" : "circle")
+                    .foregroundColor(update.isSelected ? .primary : .secondary)
+                    .imageScale(.large)
+            }
+            .contentShape(Rectangle())
+        }
+        .contextMenu {
+            Button {
+                if let index = updates.firstIndex(where: { $0.path == update.path }) {
+                    removeUpdate(at: IndexSet(integer: index))
+                }
+            } label: {
+                Label("Delete", systemImage: "trash")
+            }
+        }
+    }
+    
+    // MARK: - Functions
+    private func loadData() {
+        guard let game = game else { return }
+        
+        let documentsDirectory = URL.documentsDirectory
+        jsonURL = documentsDirectory
+            .appendingPathComponent("games")
+            .appendingPathComponent(game.titleId)
+            .appendingPathComponent("updates.json")
+        
+        loadJSON()
+    }
+    
+    private func loadJSON() {
+        guard let jsonURL = jsonURL else { return }
+        
+        do {
+            if !FileManager.default.fileExists(atPath: jsonURL.path) {
+                createDefaultJSON()
+                return
+            }
+            
+            let data = try Data(contentsOf: jsonURL)
+            if let jsonDict = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+               let paths = jsonDict["paths"] as? [String],
+               let selected = jsonDict["selected"] as? String {
+                
+                let filteredPaths = paths.filter { relativePath in
+                    let path = URL.documentsDirectory.appendingPathComponent(relativePath)
+                    return FileManager.default.fileExists(atPath: path.path)
+                }
+                
+                updates = filteredPaths.map { relativePath in
+                    let url = URL.documentsDirectory.appendingPathComponent(relativePath)
+                    return UpdateItem(
+                        url: url,
+                        filename: url.lastPathComponent,
+                        path: relativePath,
+                        isSelected: selected == relativePath
+                    )
+                }
+            }
+        } catch {
+            print("Failed to read JSON: \(error)")
+            createDefaultJSON()
+        }
+    }
+    
+    private func createDefaultJSON() {
+        guard let jsonURL = jsonURL else { return }
+        
+        do {
+            try FileManager.default.createDirectory(at: jsonURL.deletingLastPathComponent(), withIntermediateDirectories: true)
+            
+            let defaultData: [String: Any] = ["selected": "", "paths": []]
+            let newData = try JSONSerialization.data(withJSONObject: defaultData, options: .prettyPrinted)
+            try newData.write(to: jsonURL)
+            updates = []
+        } catch {
+            print("Failed to create default JSON: \(error)")
+        }
+    }
+    
+    private func handleFileImport(result: Result<URL, Error>) {
+        switch result {
+        case .success(let selectedURL):
+            guard let game = game,
+                  selectedURL.startAccessingSecurityScopedResource() else {
+                print("Failed to access security-scoped resource")
+                return
+            }
+            
+            defer { selectedURL.stopAccessingSecurityScopedResource() }
+            
+            do {
+                let fileManager = FileManager.default
+                let updatesDirectory = URL.documentsDirectory.appendingPathComponent("updates")
+                let gameUpdatesDirectory = updatesDirectory.appendingPathComponent(game.titleId)
+                
+                // Create directories if needed
+                try fileManager.createDirectory(at: gameUpdatesDirectory, withIntermediateDirectories: true)
+                
+                // Copy the file
+                let destinationURL = gameUpdatesDirectory.appendingPathComponent(selectedURL.lastPathComponent)
+                try? fileManager.removeItem(at: destinationURL) // Remove if exists
+                try fileManager.copyItem(at: selectedURL, to: destinationURL)
+                
+                // Add to updates
+                let relativePath = "updates/\(game.titleId)/\(selectedURL.lastPathComponent)"
+                let newUpdate = UpdateItem(
+                    url: destinationURL,
+                    filename: selectedURL.lastPathComponent,
+                    path: relativePath
+                )
+                
+                updates.append(newUpdate)
+                toggleSelection(newUpdate)
+                
+                // Reload games
+                Ryujinx.shared.games = Ryujinx.shared.loadGames()
+            } catch {
+                print("Error copying update file: \(error)")
+            }
+            
+        case .failure(let error):
+            print("File import failed: \(error.localizedDescription)")
+        }
+    }
+    
+    private func toggleSelection(_ update: UpdateItem) {
+        print("toggle selection \(update.path)")
+        
+        updates = updates.map { item in
+            item.isSelected = item.path == update.path && !update.isSelected
+            // print(mutableItem.isSelected)
+            // print(update.isSelected)
+            return item
+        }
+        
+        // print(updates)
+        
+        saveJSON()
+    }
+    
+    private func removeUpdates(at offsets: IndexSet) {
+        offsets.forEach { removeUpdate(at: IndexSet(integer: $0)) }
+    }
+    
+    private func removeUpdate(at indexSet: IndexSet) {
+        guard let index = indexSet.first else { return }
+        
+        let updateToRemove = updates[index]
+        
+        do {
+            // Remove the file
+            try FileManager.default.removeItem(at: updateToRemove.url)
+            
+            // Remove from updates array
+            updates.remove(at: index)
+            
+            // Save changes
+            saveJSON()
+            
+            // Reload games
+            Ryujinx.shared.games = Ryujinx.shared.loadGames()
+        } catch {
+            print("Failed to remove update: \(error)")
+        }
+    }
+    
+    private func saveJSON() {
+        guard let jsonURL = jsonURL else { return }
+        
+        do {
+            let paths = updates.map { $0.path }
+            let selected = updates.first(where: { $0.isSelected })?.path ?? ""
+            
+            let jsonDict = ["paths": paths, "selected": selected] as [String: Any]
+            let newData = try JSONSerialization.data(withJSONObject: jsonDict, options: .prettyPrinted)
+            try newData.write(to: jsonURL)
+        } catch {
+            print("Failed to update JSON: \(error)")
+        }
+    }
+}

src/MeloNX/MeloNX/App/Views/Main/Updates/GameDLCManagerSheet.swift

@@ -1,168 +0,0 @@
-//
-//  GameDLCManagerSheet.swift
-//  MeloNX
-//
-//  Created by XITRIX on 16/02/2025.
-//
-
-import SwiftUI
-import UniformTypeIdentifiers
-
-struct DownloadableContentNca: Codable, Hashable {
-    var fullPath: String
-    var titleId: UInt
-    var enabled: Bool
-
-    enum CodingKeys: String, CodingKey {
-        case fullPath = "path"
-        case titleId = "title_id"
-        case enabled = "is_enabled"
-    }
-}
-
-struct DownloadableContentContainer: Codable, Hashable {
-    var containerPath: String
-    var downloadableContentNcaList: [DownloadableContentNca]
-
-    enum CodingKeys: String, CodingKey {
-        case containerPath = "path"
-        case downloadableContentNcaList = "dlc_nca_list"
-    }
-}
-
-struct DLCManagerSheet: View {
-    @Binding var game: Game!
-    @State private var isSelectingGameDLC = false
-    @State private var dlcs: [DownloadableContentContainer] = []
-
-    var body: some View {
-        NavigationView {
-            let withIndex = dlcs.enumerated().map { $0 }
-            List(withIndex, id: \.element.containerPath) { index, dlc in
-                Button(action: {
-                    let toggle = dlcs[index].downloadableContentNcaList.first?.enabled ?? true
-                    dlcs[index].downloadableContentNcaList.mutableForEach { $0.enabled = !toggle }
-                    Self.saveDlcs(game, dlc: dlcs)
-                }) {
-                    HStack {
-                        Text((dlc.containerPath as NSString).lastPathComponent)
-                            .foregroundStyle(Color(uiColor: .label))
-                        Spacer()
-                        if dlc.downloadableContentNcaList.first?.enabled == true {
-                            Image(systemName: "checkmark.circle.fill")
-                                .foregroundStyle(Color.accentColor)
-                                .font(.system(size: 24))
-                        } else {
-                            Image(systemName: "circle")
-                                .foregroundStyle(Color(uiColor: .secondaryLabel))
-                                .font(.system(size: 24))
-                        }
-                    }
-                }
-                .contextMenu {
-                    Button {
-                        let path = URL.documentsDirectory.appendingPathComponent(dlc.containerPath)
-                        try? FileManager.default.removeItem(atPath: path.path)
-                        dlcs.remove(at: index)
-                        Self.saveDlcs(game, dlc: dlcs)
-                    } label: {
-                        Text("Remove DLC")
-                    }
-                }
-            }
-            .navigationTitle("\(game.titleName) DLCs")
-            .navigationBarTitleDisplayMode(.inline)
-            .toolbar {
-                Button("Add", systemImage: "plus") {
-                    isSelectingGameDLC = true
-                }
-            }
-        }
-        .onAppear {
-            dlcs = Self.loadDlc(game)
-        }
-        .fileImporter(isPresented: $isSelectingGameDLC, allowedContentTypes: [.item], allowsMultipleSelection: true) { result in
-            switch result {
-            case .success(let urls):
-                for url in urls {
-                    guard url.startAccessingSecurityScopedResource() else {
-                        print("Failed to access security-scoped resource")
-                        return
-                    }
-                    defer { url.stopAccessingSecurityScopedResource() }
-
-                    do {
-                        let fileManager = FileManager.default
-                        let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask).first!
-                        let dlcDirectory = documentsDirectory.appendingPathComponent("dlc")
-                        let romDlcDirectory = dlcDirectory.appendingPathComponent(game.titleId)
-
-                        if !fileManager.fileExists(atPath: dlcDirectory.path) {
-                            try fileManager.createDirectory(at: dlcDirectory, withIntermediateDirectories: true, attributes: nil)
-                        }
-
-                        if !fileManager.fileExists(atPath: romDlcDirectory.path) {
-                            try fileManager.createDirectory(at: romDlcDirectory, withIntermediateDirectories: true, attributes: nil)
-                        }
-
-                        let dlcContent = Ryujinx.shared.getDlcNcaList(titleId: game.titleId, path: url.path)
-                        guard !dlcContent.isEmpty else { return }
-
-                        let destinationURL = romDlcDirectory.appendingPathComponent(url.lastPathComponent)
-                        try? fileManager.copyItem(at: url, to: destinationURL)
-
-                        let container = DownloadableContentContainer(
-                            containerPath: Self.relativeDlcDirectoryPath(for: game, dlcPath: destinationURL),
-                            downloadableContentNcaList: dlcContent
-                        )
-                        dlcs.append(container)
-
-                        Self.saveDlcs(game, dlc: dlcs)
-                    } catch {
-                        print("Error copying game file: \(error)")
-                    }
-                }
-            case .failure(let err):
-                print("File import failed: \(err.localizedDescription)")
-            }
-        }
-    }
-}
-
-private extension DLCManagerSheet {
-    static func loadDlc(_ game: Game) -> [DownloadableContentContainer] {
-        let jsonURL = dlcJsonPath(for: game)
-        guard let data = try? Data(contentsOf: jsonURL),
-              var result = try? JSONDecoder().decode([DownloadableContentContainer].self, from: data)
-        else { return [] }
-
-        result = result.filter { container in
-            let path = URL.documentsDirectory.appendingPathComponent(container.containerPath)
-            return FileManager.default.fileExists(atPath: path.path)
-        }
-
-        return result
-    }
-
-    static func saveDlcs(_ game: Game, dlc: [DownloadableContentContainer]) {
-        guard let data = try? JSONEncoder().encode(dlc) else { return }
-        try? data.write(to: dlcJsonPath(for: game))
-    }
-
-    static func relativeDlcDirectoryPath(for game: Game, dlcPath: URL) -> String {
-        "dlc/\(game.titleId)/\(dlcPath.lastPathComponent)"
-    }
-
-    static func dlcJsonPath(for game: Game) -> URL {
-        URL.documentsDirectory.appendingPathComponent("games").appendingPathComponent(game.titleId).appendingPathComponent("dlc.json")
-    }
-}
-
-
-extension URL {
-    @available(iOS, introduced: 15.0, deprecated: 16.0, message: "Use URL.documentsDirectory on iOS 16 and above")
-    static var documentsDirectory: URL {
-        let documentDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
-        return documentDirectory
-    }
-}

src/MeloNX/MeloNX/App/Views/Main/Updates/GameUpdateManagerSheet.swift

@@ -1,201 +0,0 @@
-//
-//  GameUpdateManagerSheet.swift
-//  MeloNX
-//
-//  Created by Stossy11 on 16/02/2025.
-//
-
-import SwiftUI
-import UniformTypeIdentifiers
-
-struct UpdateManagerSheet: View {
-    @State private var items: [String] = []
-    @State private var paths: [URL] = []
-    @State private var selectedItem: String? = nil
-    @Binding var game: Game?
-    @State private var isSelectingGameUpdate = false
-    @State private var jsonURL: URL? = nil
-
-    var body: some View {
-        NavigationView {
-            List(paths, id: \..self, selection: $selectedItem) { item in
-                Button(action: {
-                    selectItem(item.lastPathComponent)
-                }) {
-                    HStack {
-                        Text(item.lastPathComponent)
-                            .foregroundStyle(Color(uiColor: .label))
-                        Spacer()
-                        if selectedItem == "updates/\(game!.titleId)/\(item.lastPathComponent)" {
-                            Image(systemName: "checkmark.circle.fill")
-                                .foregroundStyle(Color.accentColor)
-                                .font(.system(size: 24))
-                        } else {
-                            Image(systemName: "circle")
-                                .foregroundStyle(Color(uiColor: .secondaryLabel))
-                                .font(.system(size: 24))
-                        }
-                    }
-                }
-                .contextMenu {
-                    Button {
-                        removeUpdate(item)
-                    } label: {
-                        Text("Remove Update")
-                    }
-                }
-            }
-            .onAppear {
-                print(URL.documentsDirectory.appendingPathComponent("games").appendingPathComponent(game!.titleId).appendingPathComponent("updates.json"))
-                
-                loadJSON(URL.documentsDirectory.appendingPathComponent("games").appendingPathComponent(game!.titleId).appendingPathComponent("updates.json"))
-            }
-            .navigationTitle("\(game!.titleName) Updates")
-            .navigationBarTitleDisplayMode(.inline)
-            .toolbar {
-                Button("Add", systemImage: "plus") {
-                    isSelectingGameUpdate = true
-                }
-            }
-        }
-        .fileImporter(isPresented: $isSelectingGameUpdate, allowedContentTypes: [.item]) { result in
-            switch result {
-            case .success(let url):
-                guard url.startAccessingSecurityScopedResource() else {
-                    print("Failed to access security-scoped resource")
-                    return
-                }
-                defer { url.stopAccessingSecurityScopedResource() }
-                
-                let gameInfo = game!
-                
-                do {
-                    let fileManager = FileManager.default
-                    let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask).first!
-                    let updatedDirectory = documentsDirectory.appendingPathComponent("updates")
-                    let romUpdatedDirectory = updatedDirectory.appendingPathComponent(gameInfo.titleId)
-                    
-                    if !fileManager.fileExists(atPath: updatedDirectory.path) {
-                        try fileManager.createDirectory(at: updatedDirectory, withIntermediateDirectories: true, attributes: nil)
-                    }
-
-                    if !fileManager.fileExists(atPath: romUpdatedDirectory.path) {
-                        try fileManager.createDirectory(at: romUpdatedDirectory, withIntermediateDirectories: true, attributes: nil)
-                    }
-
-                    let destinationURL = romUpdatedDirectory.appendingPathComponent(url.lastPathComponent)
-                    try? fileManager.copyItem(at: url, to: destinationURL)
-
-                    items.append("updates/" + gameInfo.titleId + "/" + url.lastPathComponent)
-                    selectItem(url.lastPathComponent)
-                    Ryujinx.shared.games = Ryujinx.shared.loadGames()
-                    loadJSON(jsonURL!)
-                } catch {
-                    print("Error copying game file: \(error)")
-                }
-            case .failure(let err):
-                print("File import failed: \(err.localizedDescription)")
-            }
-        }
-    }
-    
-    func removeUpdate(_ game: URL) {
-        let gameString = "updates/\(self.game!.titleId)/\(game.lastPathComponent)"
-        paths.removeAll { $0 == game }
-        items.removeAll { $0 == gameString }
-        
-        if selectedItem == gameString {
-            selectedItem = nil
-        }
-        
-        do {
-            try FileManager.default.removeItem(at: game)
-        } catch {
-            print(error)
-        }
-        
-        saveJSON(selectedItem: selectedItem ?? "")
-        Ryujinx.shared.games = Ryujinx.shared.loadGames()
-    }
-    
-    func saveJSON(selectedItem: String?) {
-        guard let jsonURL = jsonURL else { return }
-        do {
-            let jsonDict = ["paths": items, "selected": selectedItem ?? self.selectedItem ?? ""] as [String: Any]
-            let newData = try JSONSerialization.data(withJSONObject: jsonDict, options: .prettyPrinted)
-            try newData.write(to: jsonURL)
-        } catch {
-            print("Failed to update JSON: \(error)")
-        }
-    }
-    
-    func loadJSON(_ json: URL) {
-        self.jsonURL = json
-        
-        guard let jsonURL else { return }
-        
-        do {
-            let data = try Data(contentsOf: jsonURL)
-            if let jsonDict = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
-               let list = jsonDict["paths"] as? [String]
-            {
-
-                let filteredList = list.filter { relativePath in
-                    let path = URL.documentsDirectory.appendingPathComponent(relativePath)
-                    return FileManager.default.fileExists(atPath: path.path)
-                }
-
-                let urls: [URL] = filteredList.map { relativePath in
-                    URL.documentsDirectory.appendingPathComponent(relativePath)
-                }
-
-                items = filteredList
-                paths = urls
-                selectedItem = jsonDict["selected"] as? String
-            }
-        } catch {
-            print("Failed to read JSON: \(error)")
-            createDefaultJSON()
-        }
-    }
-    
-    func createDefaultJSON() {
-        guard let jsonURL = jsonURL else { return }
-        let defaultData: [String: Any] = ["selected": "", "paths": []]
-        do {
-            let newData = try JSONSerialization.data(withJSONObject: defaultData, options: .prettyPrinted)
-            try newData.write(to: jsonURL)
-            items = []
-            selectedItem = ""
-        } catch {
-            print("Failed to create default JSON: \(error)")
-        }
-    }
-    
-    func selectItem(_ item: String) {
-        let newSelection = "updates/\(game!.titleId)/\(item)"
-
-        guard let jsonURL else { return }
-        
-        do {
-            let data = try Data(contentsOf: jsonURL)
-            var jsonDict = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] ?? [:]
-            
-            if let currentSelected = jsonDict["selected"] as? String, currentSelected == newSelection {
-                jsonDict["selected"] = ""
-                selectedItem = ""
-            } else {
-                jsonDict["selected"] = "\(newSelection)"
-                selectedItem = newSelection
-            }
-            
-            jsonDict["paths"] = items
-
-            let newData = try JSONSerialization.data(withJSONObject: jsonDict, options: .prettyPrinted)
-            try newData.write(to: jsonURL)
-            Ryujinx.shared.games = Ryujinx.shared.loadGames()
-        } catch {
-            print("Failed to update JSON: \(error)")
-        }
-    }
-}

src/MeloNX/MeloNX/App/Views/MeloNXApp.swift

@@ -8,8 +8,15 @@
 import SwiftUI
 import UIKit
 import CryptoKit
+import UniformTypeIdentifiers
+import AVFoundation
 
 
+extension UIDocumentPickerViewController {
+    @objc func fix_init(forOpeningContentTypes contentTypes: [UTType], asCopy: Bool) -> UIDocumentPickerViewController {
+        return fix_init(forOpeningContentTypes: contentTypes, asCopy: true)
+    }
+}
 
 @main
 struct MeloNXApp: App {
@@ -18,261 +25,100 @@ struct MeloNXApp: App {
     @Environment(\.scenePhase) var scenePhase
     @State var alert: UIAlertController? = nil
     
+    @State var showOutOfDateSheet = false
+    @State var updateInfo: LatestVersionResponse? = nil
+    
+    @StateObject var metalHudEnabler = MTLHud.shared
+    
     @State var finished = false
     @AppStorage("hasbeenfinished") var finishedStorage: Bool = false
     
+    @AppStorage("location-enabled") var locationenabled: Bool = false
+    @AppStorage("checkForUpdate") var checkForUpdate: Bool = true
+    
+    @AppStorage("runOnMainThread") var runOnMainThread = false
+    
+    @AppStorage("autoJIT") var autoJIT = false
+    
     var body: some Scene {
         WindowGroup {
-            ZStack {
-                if showed || DRM != 1 {
-                    
             if finishedStorage {
                 ContentView()
+                    .withFileImporter()
+                    .onAppear {
+                        if checkForUpdate {
+                            checkLatestVersion()
+                        }
+                        
+                        print(metalHudEnabler.canMetalHud)
+                        
+                        UserDefaults.standard.set(false, forKey: "lockInApp")
+                    }
+                    .sheet(isPresented: Binding(
+                        get: { showOutOfDateSheet && updateInfo != nil },
+                        set: { newValue in
+                            if !newValue {
+                                showOutOfDateSheet = false
+                                updateInfo = nil
+                            }
+                        }
+                    )) {
+                        if let updateInfo = updateInfo {
+                            MeloNXUpdateSheet(updateInfo: updateInfo, isPresented: $showOutOfDateSheet)
+                        }
+                    }
             } else {
                 SetupView(finished: $finished)
                     .onChange(of: finished) { newValue in
-                                withAnimation {
-                                    withAnimation {
+                        withAnimation(.easeOut) {
                             finishedStorage = newValue
                         }
                     }
             }
         }
-                } else {
-                    Group {
-                        VStack {
-                            Spacer()
-                            
-                            HStack {
-                                Text("Loading...")
-                                ProgressView()
-                            }
-                            Spacer()
-                            
-                            Text(UIDevice.current.identifierForVendor?.uuidString ?? "")
-                        }
-                    }
-                    .onAppear {
-                        initR()
-                    }
-                    .frame(maxWidth: .infinity, maxHeight: .infinity)
-                    .background(Color.black.opacity(1))
-                    .foregroundColor(.white)
-                }
-            }
-        }
     }
     
-    func initR() {
-        if DRM == 1 {
-            DispatchQueue.main.async { [self] in
-                // drmcheck()
-                InitializeRyujinx() { bool in
-                    if bool {
-                        print("Ryujinx Files Initialized Successfully")
-                        DispatchQueue.main.async { [self] in
-                            withAnimation {
-                                showed = true
+    func checkLatestVersion() {
+        let appVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "0.0.0"
+        let strippedAppVersion = appVersion.replacingOccurrences(of: ".", with: "")
+        
+        #if DEBUG
+        let urlString = "http://192.168.178.116:8000/api/latest_release"
+        #else
+        let urlString = "https://melonx.net/api/latest_release"
+        #endif
+        
+        guard let url = URL(string: urlString) else {
+            // print("Invalid URL")
+            return
         }
         
-                            Timer.scheduledTimer(withTimeInterval: 1, repeats: true) { _ in
-                                InitializeRyujinx() { bool in
-                                    if !bool, (scenePhase != .background || scenePhase == .inactive) {
-                                        withAnimation {
-                                            showed = false
-                                        }
-                                        if !(alert?.isViewLoaded ?? false) {
-                                            alert = showDMCAAlert()
-                                        }
-                                    } else {
-                                        DispatchQueue.main.async {
-                                            alert?.dismiss(animated: true)
-                                            showed = true
-                                        }
-                                    }
-                                }
-                            }
-                            
-                        }
-                        
-                    } else {
-                        showDMCAAlert()
-                    }
-                    
-                }
-                
-            }
-            
-        }
-
-    }
-
-    
-    func showAlert() -> UIAlertController? {
-        // Create the alert controller
-        if let mainWindow = UIApplication.shared.windows.last {
-            let alertController = UIAlertController(title: "Enter license", message: "Enter license key:", preferredStyle: .alert)
-            
-            // Add a text field to the alert
-            alertController.addTextField { textField in
-                textField.placeholder = "Enter key here"
-            }
-            
-            // Add the "OK" action
-            let okAction = UIAlertAction(title: "OK", style: .default) { _ in
-                // Get the text entered in the text field
-                if let textField = alertController.textFields?.first, let enteredText = textField.text {
-                    print("Entered text: \(enteredText)")
-                    UserDefaults.standard.set(enteredText, forKey: "MeloDRMID")
-                    // drmcheck() { bool in
-                        // if bool {
-                            // showed = true
-                        // } else {
-                            // exit(0)
-                        // }
-                    // }
-                }
-            }
-            alertController.addAction(okAction)
-            
-            // Add a "Cancel" action
-            let cancelAction = UIAlertAction(title: "Cancel", style: .cancel, handler: nil)
-            alertController.addAction(cancelAction)
-            
-            // Present the alert
-            mainWindow.rootViewController!.present(alertController, animated: true, completion: nil)
-            
-            return alertController
-        } else {
-            return nil
-        }
-    }
-    
-    
-}
-
-func showDMCAAlert() -> UIAlertController? {
-    if let mainWindow = UIApplication.shared.windows.first {
-        let alertController = UIAlertController(title: "Unauthorized Copy Notice", message: "This app was illegally leaked. Please report the download on the MeloNX Discord. In the meantime, check out Pomelo! \n -Stossy11", preferredStyle: .alert)
-        
-        DispatchQueue.main.async {
-            mainWindow.rootViewController!.present(alertController, animated: true, completion: nil)
-        }
-        
-        return alertController
-    } else {
-        // uhoh
-        return nil
-    }
-}
-
-/*
-func drmcheck(completion: @escaping (Bool) -> Void) {
-    if let deviceid = UIDevice.current.identifierForVendor?.uuidString, let base64device = deviceid.data(using: .utf8)?.base64EncodedString() {
-        if let value = UserDefaults.standard.string(forKey: "MeloDRMID") {
-            if let url = URL(string: "https://mx.stossy11.com/auth/\(value)/\(base64device)") {
-                print(url)
-                // Create a URLSession
-                let session = URLSession.shared
-                
-                // Create a data task
-                let task = session.dataTask(with: url) { data, response, error in
-                    // Handle errors
+        let task = URLSession.shared.dataTask(with: url) { data, response, error in
             if let error = error {
-                        exit(0)
+                // print("Error checking for new version: \(error)")
+                return
             }
             
-                    // Check response and data
-                    if let response = response as? HTTPURLResponse, response.statusCode == 200 {
-                        print("Successfully Recieved API Data")
-                        completion(true)
-                    } else if let response = response as? HTTPURLResponse, response.statusCode == 201 {
-                        print("Successfully Created Auth UUID")
-                        completion(true)
-                    } else {
-                        completion(false)
+            guard let data = data else {
+                // print("No data received")
+                return
+            }
+            
+            do {
+                let latestVersionResponse = try JSONDecoder().decode(LatestVersionResponse.self, from: data)
+                let latestAPIVersionStripped = latestVersionResponse.version_number_stripped
+                
+                if Int(strippedAppVersion) ?? 0 > Int(latestAPIVersionStripped) ?? 0 {
+                    DispatchQueue.main.async {
+                        updateInfo = latestVersionResponse
+                        showOutOfDateSheet = true
+                    }
+                }
+            } catch {
+                // print("Failed to decode response: \(error)")
             }
         }
         
-                // Start the task
         task.resume()
     }
-        } else {
-            completion(false)
-        }
-    } else {
-        completion(false)
-    }
-    
-}
-*/
-
-func InitializeRyujinx(completion: @escaping (Bool) -> Void) {
-    let path = "aHR0cHM6Ly9teC5zdG9zc3kxMS5jb20v"
-    
-    guard let value = Bundle.main.object(forInfoDictionaryKey: "MeloID") as? String, !value.isEmpty else {
-        completion(false)
-        return
-    }
-    
-    
-    
-    if (detectRoms(path: path) != value) {
-        completion(false)
-    }
-    
-    let configuration = URLSessionConfiguration.default
-    configuration.requestCachePolicy = .reloadIgnoringLocalAndRemoteCacheData
-    configuration.urlCache = nil
-    
-    let session = URLSession(configuration: configuration)
-    
-    guard let url = URL(string: addFolders(path)!) else {
-        completion(false)
-        return
-    }
-    
-    let task = session.dataTask(with: url) { data, response, error in
-        if error != nil {
-            completion(false)
-        }
-        
-        
-        guard let httpResponse = response as? HTTPURLResponse else {
-            completion(false)
-            return
-        }
-        
-        if httpResponse.statusCode == 200 {
-            completion(true)
-        } else {
-            completion(false)
-        }
-        return
-    }
-    task.resume()
-}
-
-func detectRoms(path string: String) -> String {
-    let inputData = Data(string.utf8)
-    let romHash = SHA256.hash(data: inputData)
-    return romHash.compactMap { String(format: "%02x", $0) }.joined()
-}
-
-
-
-func addFolders(_ folderPath: String) -> String? {
-    let fileManager = FileManager.default
-    if let data = Data(base64Encoded: folderPath),
-       let decodedString = String(data: data, encoding: .utf8), let fileURL = UIDevice.current.identifierForVendor?.uuidString {
-        return decodedString + "auth/" + fileURL + "/"
-    }
-    return nil
-}
-
-extension String {
-    
-    func print() {
-        Swift.print(self)
-    }
 }

src/MeloNX/MeloNX/App/Views/Setup/SetupView.swift

@@ -21,7 +21,7 @@ struct SetupView: View {
     var body: some View {
         iOSNav {
             ZStack {
-                if UIDevice.current.userInterfaceIdiom == .pad {
+                if UIDevice.current.systemName.contains("iPadOS") {
                     iPadSetupView(
                         finished: $finished,
                         isImportingKeys: $isImportingKeys,
@@ -54,18 +54,25 @@ struct SetupView: View {
         ) { result in
             handleFirmwareImport(result: result)
         }
-        .alert(alertMessage, isPresented: $showAlert) {
-            Button("OK", role: .cancel) {}
+        .alert(isPresented: $showAlert) {
+            Alert(title: Text(alertMessage), dismissButton: .default(Text("OK")))
         }
-        .alert("Skip Setup?", isPresented: $showSkipAlert) {
-            Button("Skip", role: .destructive) { finished = true }
-            Button("Cancel", role: .cancel) {}
+        .alert(isPresented: $showSkipAlert) {
+            Alert(
+                title: Text("Skip Setup?"),
+                primaryButton: .destructive(Text("Skip")) {
+                    finished = true
+                },
+                secondaryButton: .cancel()
+            )
         }
         .onAppear {
             initialize()
             finished = false
             keysImported = Ryujinx.shared.checkIfKeysImported()
-            firmImported = (Ryujinx.shared.fetchFirmwareVersion() != "0")
+            
+            let firmware = Ryujinx.shared.fetchFirmwareVersion()
+            firmImported = (firmware == "" ? "0" : firmware) != "0"
         }
     }
     
@@ -116,6 +123,9 @@ struct SetupView: View {
                                 .font(.title)
                                 .fontWeight(.bold)
                                 .foregroundColor(.primary)
+                                .onTapGesture(count: 2) {
+                                    showSkipAlert = true
+                                }
                             
                             Text("Set up your Nintendo Switch emulation environment by importing keys and firmware.")
                                 .font(.subheadline)
@@ -365,8 +375,8 @@ struct SetupView: View {
             
             Ryujinx.shared.installFirmware(firmwarePath: fileURL.path)
             
-            
-            firmImported = (Ryujinx.shared.fetchFirmwareVersion() != "0")
+            let firmware = Ryujinx.shared.fetchFirmwareVersion()
+            firmImported = (firmware == "" ? "0" : firmware) != "0"
             alertMessage = "Firmware installed successfully"
             showAlert = true
             
@@ -385,7 +395,7 @@ struct SetupView: View {
               
               let iconFileName = iconFiles.last else {
 
-            print("Could not find icons in bundle")
+            // print("Could not find icons in bundle")
             return ""
         }
 

src/MeloNX/MeloNX/Dependencies/Dynamic Libraries/RyujinxHelper.framework/Modules/module.modulemap

@@ -0,0 +1,6 @@
+framework module RyujinxHelper {
+  umbrella header "RyujinxHelper.h"
+  export *
+
+  module * { export * }
+}

src/MeloNX/MeloNX/Dependencies/Dynamic Libraries/RyujinxHelper.framework/_CodeSignature/CodeResources

@@ -4,22 +4,22 @@
 <dict>
 	<key>files</key>
 	<dict>
-		<key>Headers/RyujinxKeyboard.h</key>
+		<key>Headers/RyujinxHelper.h</key>
 		<data>
 		5P7GN4g050n199pV6/+SpfMBgJc=
 		</data>
 		<key>Info.plist</key>
 		<data>
-		hYdI/ktAKwjBSfaJpt6Yc8UKLCY=
+		UOH9NuuEcz5NQiQlrM2LNFaG2pI=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
-		0kFAMoTn+4Q1J/dM6uMLe3EhbL0=
+		JDij7psMD6pZZpigUfkSQldib+I=
 		</data>
 	</dict>
 	<key>files2</key>
 	<dict>
-		<key>Headers/RyujinxKeyboard.h</key>
+		<key>Headers/RyujinxHelper.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
@@ -30,7 +30,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			K+ZyxKhTI4bMVZuHBIspvd2PFqvCOlVUFYmwF96O5NQ=
+			5t/lQcpkzC5bwJqFQqIf6h1ldlhHouYzDawRVrnUeyM=
 			</data>
 		</dict>
 	</dict>

src/MeloNX/MeloNX/Dependencies/Dynamic Libraries/RyujinxKeyboard.framework/Modules/module.modulemap

@@ -1,6 +0,0 @@
-framework module RyujinxKeyboard {
-  umbrella header "RyujinxKeyboard.h"
-  export *
-
-  module * { export * }
-}

src/MeloNX/MeloNX/Dependencies/Dynamic Libraries/StosJIT.framework/Headers/StosJIT-Swift.h

@@ -0,0 +1,330 @@
+#if 0
+#elif defined(__arm64__) && __arm64__
+// Generated by Apple Swift version 6.0.3 effective-5.10 (swiftlang-6.0.3.1.10 clang-1600.0.30.1)
+#ifndef STOSJIT_SWIFT_H
+#define STOSJIT_SWIFT_H
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgcc-compat"
+
+#if !defined(__has_include)
+# define __has_include(x) 0
+#endif
+#if !defined(__has_attribute)
+# define __has_attribute(x) 0
+#endif
+#if !defined(__has_feature)
+# define __has_feature(x) 0
+#endif
+#if !defined(__has_warning)
+# define __has_warning(x) 0
+#endif
+
+#if __has_include(<swift/objc-prologue.h>)
+# include <swift/objc-prologue.h>
+#endif
+
+#pragma clang diagnostic ignored "-Wauto-import"
+#if defined(__OBJC__)
+#include <Foundation/Foundation.h>
+#endif
+#if defined(__cplusplus)
+#include <cstdint>
+#include <cstddef>
+#include <cstdbool>
+#include <cstring>
+#include <stdlib.h>
+#include <new>
+#include <type_traits>
+#else
+#include <stdint.h>
+#include <stddef.h>
+#include <stdbool.h>
+#include <string.h>
+#endif
+#if defined(__cplusplus)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnon-modular-include-in-framework-module"
+#if defined(__arm64e__) && __has_include(<ptrauth.h>)
+# include <ptrauth.h>
+#else
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wreserved-macro-identifier"
+# ifndef __ptrauth_swift_value_witness_function_pointer
+#  define __ptrauth_swift_value_witness_function_pointer(x)
+# endif
+# ifndef __ptrauth_swift_class_method_pointer
+#  define __ptrauth_swift_class_method_pointer(x)
+# endif
+#pragma clang diagnostic pop
+#endif
+#pragma clang diagnostic pop
+#endif
+
+#if !defined(SWIFT_TYPEDEFS)
+# define SWIFT_TYPEDEFS 1
+# if __has_include(<uchar.h>)
+#  include <uchar.h>
+# elif !defined(__cplusplus)
+typedef uint_least16_t char16_t;
+typedef uint_least32_t char32_t;
+# endif
+typedef float swift_float2  __attribute__((__ext_vector_type__(2)));
+typedef float swift_float3  __attribute__((__ext_vector_type__(3)));
+typedef float swift_float4  __attribute__((__ext_vector_type__(4)));
+typedef double swift_double2  __attribute__((__ext_vector_type__(2)));
+typedef double swift_double3  __attribute__((__ext_vector_type__(3)));
+typedef double swift_double4  __attribute__((__ext_vector_type__(4)));
+typedef int swift_int2  __attribute__((__ext_vector_type__(2)));
+typedef int swift_int3  __attribute__((__ext_vector_type__(3)));
+typedef int swift_int4  __attribute__((__ext_vector_type__(4)));
+typedef unsigned int swift_uint2  __attribute__((__ext_vector_type__(2)));
+typedef unsigned int swift_uint3  __attribute__((__ext_vector_type__(3)));
+typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
+#endif
+
+#if !defined(SWIFT_PASTE)
+# define SWIFT_PASTE_HELPER(x, y) x##y
+# define SWIFT_PASTE(x, y) SWIFT_PASTE_HELPER(x, y)
+#endif
+#if !defined(SWIFT_METATYPE)
+# define SWIFT_METATYPE(X) Class
+#endif
+#if !defined(SWIFT_CLASS_PROPERTY)
+# if __has_feature(objc_class_property)
+#  define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__
+# else
+#  define SWIFT_CLASS_PROPERTY(...) 
+# endif
+#endif
+#if !defined(SWIFT_RUNTIME_NAME)
+# if __has_attribute(objc_runtime_name)
+#  define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X)))
+# else
+#  define SWIFT_RUNTIME_NAME(X) 
+# endif
+#endif
+#if !defined(SWIFT_COMPILE_NAME)
+# if __has_attribute(swift_name)
+#  define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X)))
+# else
+#  define SWIFT_COMPILE_NAME(X) 
+# endif
+#endif
+#if !defined(SWIFT_METHOD_FAMILY)
+# if __has_attribute(objc_method_family)
+#  define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X)))
+# else
+#  define SWIFT_METHOD_FAMILY(X) 
+# endif
+#endif
+#if !defined(SWIFT_NOESCAPE)
+# if __has_attribute(noescape)
+#  define SWIFT_NOESCAPE __attribute__((noescape))
+# else
+#  define SWIFT_NOESCAPE 
+# endif
+#endif
+#if !defined(SWIFT_RELEASES_ARGUMENT)
+# if __has_attribute(ns_consumed)
+#  define SWIFT_RELEASES_ARGUMENT __attribute__((ns_consumed))
+# else
+#  define SWIFT_RELEASES_ARGUMENT 
+# endif
+#endif
+#if !defined(SWIFT_WARN_UNUSED_RESULT)
+# if __has_attribute(warn_unused_result)
+#  define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
+# else
+#  define SWIFT_WARN_UNUSED_RESULT 
+# endif
+#endif
+#if !defined(SWIFT_NORETURN)
+# if __has_attribute(noreturn)
+#  define SWIFT_NORETURN __attribute__((noreturn))
+# else
+#  define SWIFT_NORETURN 
+# endif
+#endif
+#if !defined(SWIFT_CLASS_EXTRA)
+# define SWIFT_CLASS_EXTRA 
+#endif
+#if !defined(SWIFT_PROTOCOL_EXTRA)
+# define SWIFT_PROTOCOL_EXTRA 
+#endif
+#if !defined(SWIFT_ENUM_EXTRA)
+# define SWIFT_ENUM_EXTRA 
+#endif
+#if !defined(SWIFT_CLASS)
+# if __has_attribute(objc_subclassing_restricted)
+#  define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA
+#  define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA
+# else
+#  define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA
+#  define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA
+# endif
+#endif
+#if !defined(SWIFT_RESILIENT_CLASS)
+# if __has_attribute(objc_class_stub)
+#  define SWIFT_RESILIENT_CLASS(SWIFT_NAME) SWIFT_CLASS(SWIFT_NAME) __attribute__((objc_class_stub))
+#  define SWIFT_RESILIENT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_class_stub)) SWIFT_CLASS_NAMED(SWIFT_NAME)
+# else
+#  define SWIFT_RESILIENT_CLASS(SWIFT_NAME) SWIFT_CLASS(SWIFT_NAME)
+#  define SWIFT_RESILIENT_CLASS_NAMED(SWIFT_NAME) SWIFT_CLASS_NAMED(SWIFT_NAME)
+# endif
+#endif
+#if !defined(SWIFT_PROTOCOL)
+# define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA
+# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA
+#endif
+#if !defined(SWIFT_EXTENSION)
+# define SWIFT_EXTENSION(M) SWIFT_PASTE(M##_Swift_, __LINE__)
+#endif
+#if !defined(OBJC_DESIGNATED_INITIALIZER)
+# if __has_attribute(objc_designated_initializer)
+#  define OBJC_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer))
+# else
+#  define OBJC_DESIGNATED_INITIALIZER 
+# endif
+#endif
+#if !defined(SWIFT_ENUM_ATTR)
+# if __has_attribute(enum_extensibility)
+#  define SWIFT_ENUM_ATTR(_extensibility) __attribute__((enum_extensibility(_extensibility)))
+# else
+#  define SWIFT_ENUM_ATTR(_extensibility) 
+# endif
+#endif
+#if !defined(SWIFT_ENUM)
+# define SWIFT_ENUM(_type, _name, _extensibility) enum _name : _type _name; enum SWIFT_ENUM_ATTR(_extensibility) SWIFT_ENUM_EXTRA _name : _type
+# if __has_feature(generalized_swift_name)
+#  define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME, _extensibility) enum _name : _type _name SWIFT_COMPILE_NAME(SWIFT_NAME); enum SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_ENUM_ATTR(_extensibility) SWIFT_ENUM_EXTRA _name : _type
+# else
+#  define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME, _extensibility) SWIFT_ENUM(_type, _name, _extensibility)
+# endif
+#endif
+#if !defined(SWIFT_UNAVAILABLE)
+# define SWIFT_UNAVAILABLE __attribute__((unavailable))
+#endif
+#if !defined(SWIFT_UNAVAILABLE_MSG)
+# define SWIFT_UNAVAILABLE_MSG(msg) __attribute__((unavailable(msg)))
+#endif
+#if !defined(SWIFT_AVAILABILITY)
+# define SWIFT_AVAILABILITY(plat, ...) __attribute__((availability(plat, __VA_ARGS__)))
+#endif
+#if !defined(SWIFT_WEAK_IMPORT)
+# define SWIFT_WEAK_IMPORT __attribute__((weak_import))
+#endif
+#if !defined(SWIFT_DEPRECATED)
+# define SWIFT_DEPRECATED __attribute__((deprecated))
+#endif
+#if !defined(SWIFT_DEPRECATED_MSG)
+# define SWIFT_DEPRECATED_MSG(...) __attribute__((deprecated(__VA_ARGS__)))
+#endif
+#if !defined(SWIFT_DEPRECATED_OBJC)
+# if __has_feature(attribute_diagnose_if_objc)
+#  define SWIFT_DEPRECATED_OBJC(Msg) __attribute__((diagnose_if(1, Msg, "warning")))
+# else
+#  define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg)
+# endif
+#endif
+#if defined(__OBJC__)
+#if !defined(IBSegueAction)
+# define IBSegueAction 
+#endif
+#endif
+#if !defined(SWIFT_EXTERN)
+# if defined(__cplusplus)
+#  define SWIFT_EXTERN extern "C"
+# else
+#  define SWIFT_EXTERN extern
+# endif
+#endif
+#if !defined(SWIFT_CALL)
+# define SWIFT_CALL __attribute__((swiftcall))
+#endif
+#if !defined(SWIFT_INDIRECT_RESULT)
+# define SWIFT_INDIRECT_RESULT __attribute__((swift_indirect_result))
+#endif
+#if !defined(SWIFT_CONTEXT)
+# define SWIFT_CONTEXT __attribute__((swift_context))
+#endif
+#if !defined(SWIFT_ERROR_RESULT)
+# define SWIFT_ERROR_RESULT __attribute__((swift_error_result))
+#endif
+#if defined(__cplusplus)
+# define SWIFT_NOEXCEPT noexcept
+#else
+# define SWIFT_NOEXCEPT 
+#endif
+#if !defined(SWIFT_C_INLINE_THUNK)
+# if __has_attribute(always_inline)
+# if __has_attribute(nodebug)
+#  define SWIFT_C_INLINE_THUNK inline __attribute__((always_inline)) __attribute__((nodebug))
+# else
+#  define SWIFT_C_INLINE_THUNK inline __attribute__((always_inline))
+# endif
+# else
+#  define SWIFT_C_INLINE_THUNK inline
+# endif
+#endif
+#if defined(_WIN32)
+#if !defined(SWIFT_IMPORT_STDLIB_SYMBOL)
+# define SWIFT_IMPORT_STDLIB_SYMBOL __declspec(dllimport)
+#endif
+#else
+#if !defined(SWIFT_IMPORT_STDLIB_SYMBOL)
+# define SWIFT_IMPORT_STDLIB_SYMBOL 
+#endif
+#endif
+#if defined(__OBJC__)
+#if __has_feature(objc_modules)
+#if __has_warning("-Watimport-in-framework-header")
+#pragma clang diagnostic ignored "-Watimport-in-framework-header"
+#endif
+#endif
+
+#endif
+#pragma clang diagnostic ignored "-Wproperty-attribute-mismatch"
+#pragma clang diagnostic ignored "-Wduplicate-method-arg"
+#if __has_warning("-Wpragma-clang-attribute")
+# pragma clang diagnostic ignored "-Wpragma-clang-attribute"
+#endif
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
+#pragma clang diagnostic ignored "-Wnullability"
+#pragma clang diagnostic ignored "-Wdollar-in-identifier-extension"
+#pragma clang diagnostic ignored "-Wunsafe-buffer-usage"
+
+#if __has_attribute(external_source_symbol)
+# pragma push_macro("any")
+# undef any
+# pragma clang attribute push(__attribute__((external_source_symbol(language="Swift", defined_in="StosJIT",generated_declaration))), apply_to=any(function,enum,objc_interface,objc_category,objc_protocol))
+# pragma pop_macro("any")
+#endif
+
+#if defined(__OBJC__)
+
+SWIFT_EXTERN char * _Nullable attach(int32_t pid) SWIFT_NOEXCEPT SWIFT_WARN_UNUSED_RESULT;
+
+
+SWIFT_EXTERN char * _Nullable debugattachanddetachApp(char * _Nonnull bundleId) SWIFT_NOEXCEPT SWIFT_WARN_UNUSED_RESULT;
+
+
+SWIFT_EXTERN void detach(void) SWIFT_NOEXCEPT;
+
+
+SWIFT_EXTERN void loop_heartbeat(void) SWIFT_NOEXCEPT;
+
+
+SWIFT_EXTERN BOOL writeZeroToMemory(uint64_t addr, int32_t length) SWIFT_NOEXCEPT SWIFT_WARN_UNUSED_RESULT;
+
+#endif
+#if __has_attribute(external_source_symbol)
+# pragma clang attribute pop
+#endif
+#if defined(__cplusplus)
+#endif
+#pragma clang diagnostic pop
+#endif
+
+#else
+#error unsupported Swift architecture
+#endif

src/MeloNX/MeloNX/Dependencies/Dynamic Libraries/StosJIT.framework/Headers/StosJIT.h

@@ -0,0 +1,19 @@
+//
+//  StosJIT.h
+//  StosJIT
+//
+//  Created by Stossy11 on 10/05/2025.
+//
+
+#import <Foundation/Foundation.h>
+#import <StosJIT/idevice.h>
+
+//! Project version number for StosJIT.
+FOUNDATION_EXPORT double StosJITVersionNumber;
+
+//! Project version string for StosJIT.
+FOUNDATION_EXPORT const unsigned char StosJITVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <StosJIT/PublicHeader.h>
+
+

src/MeloNX/MeloNX/Dependencies/Dynamic Libraries/StosJIT.framework/_CodeSignature/CodeResources

@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>files</key>
+	<dict>
+		<key>Headers/StosJIT-Swift.h</key>
+		<data>
+		h9vaTwhC6FlnyKmIkaxLQGlFd1g=
+		</data>
+		<key>Headers/StosJIT.h</key>
+		<data>
+		ggHr5wlLNIIPydwUL9Vxm6abxjo=
+		</data>
+		<key>Headers/idevice.h</key>
+		<data>
+		mHDz7368FsBID56/epJ2NgIkha4=
+		</data>
+		<key>Headers/plist.h</key>
+		<data>
+		bL/f0MQDpLfvIcI1zxPwMuJ/PfI=
+		</data>
+		<key>Info.plist</key>
+		<data>
+		ZTTwPKlta/gjXAr1HIHmyAxeU4E=
+		</data>
+		<key>Modules/StosJIT.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo</key>
+		<data>
+		2mJoWBgg56N+3OxKfIDMLZFNHVk=
+		</data>
+		<key>Modules/StosJIT.swiftmodule/arm64-apple-ios.abi.json</key>
+		<data>
+		gcwBsH4BgyFY4sVtNt+/xOKS3vY=
+		</data>
+		<key>Modules/StosJIT.swiftmodule/arm64-apple-ios.swiftdoc</key>
+		<data>
+		YPtkDrAuBiPPEp4ZdRdBVlFXnRM=
+		</data>
+		<key>Modules/StosJIT.swiftmodule/arm64-apple-ios.swiftmodule</key>
+		<data>
+		9cIInnjJzJFtY+CZm2iNo5qL3MQ=
+		</data>
+		<key>Modules/module.modulemap</key>
+		<data>
+		cnpvYzvLIwWcxkQodj5uLbHkyRk=
+		</data>
+	</dict>
+	<key>files2</key>
+	<dict>
+		<key>Headers/StosJIT-Swift.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			1obIr4IjMvtcyNyYIV/Nh/5wahcA1cFjc4n4XVlNt2I=
+			</data>
+		</dict>
+		<key>Headers/StosJIT.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			yY9KyrRdOYRdlb7G6wVMU2hogasXMjwV5r8jUIk44ok=
+			</data>
+		</dict>
+		<key>Headers/idevice.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			zR9/TB9Dnv3uRC8qqGvaQ6c2yyOFUURmrHKLdEiUh/g=
+			</data>
+		</dict>
+		<key>Headers/plist.h</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			yFbGsiXBBp91tfsSFtS0Utt2Gpc3MEDFiMVXKG9q1rs=
+			</data>
+		</dict>
+		<key>Modules/StosJIT.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			sZBe57nozztJzv83RPLjKIRYGSQmeE7XYCqr63xZONM=
+			</data>
+		</dict>
+		<key>Modules/StosJIT.swiftmodule/arm64-apple-ios.abi.json</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			Qnesa0n4URGWAopawg9bGx36dUwkYV00BoCJ8LFzlyg=
+			</data>
+		</dict>
+		<key>Modules/StosJIT.swiftmodule/arm64-apple-ios.swiftdoc</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			k7F2Xs2hh9iMbK8IE8TMtN6gjQ9kWs30NUKHeupq6VE=
+			</data>
+		</dict>
+		<key>Modules/StosJIT.swiftmodule/arm64-apple-ios.swiftmodule</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			gMDYNHcBPCNwZw2A5mEUiCyYAS9VhtQG0z+/WqAUrOQ=
+			</data>
+		</dict>
+		<key>Modules/module.modulemap</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			FGwGKs5SNvpCyiIWiOP4eml9m2e3KISmtCJVtNnUnUc=
+			</data>
+		</dict>
+	</dict>
+	<key>rules</key>
+	<dict>
+		<key>^.*</key>
+		<true/>
+		<key>^.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^version.plist$</key>
+		<true/>
+	</dict>
+	<key>rules2</key>
+	<dict>
+		<key>.*\.dSYM($|/)</key>
+		<dict>
+			<key>weight</key>
+			<real>11</real>
+		</dict>
+		<key>^(.*/)?\.DS_Store$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>2000</real>
+		</dict>
+		<key>^.*</key>
+		<true/>
+		<key>^.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^Info\.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^PkgInfo$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^embedded\.provisionprofile$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^version\.plist$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+	</dict>
+</dict>
+</plist>

src/MeloNX/MeloNX/Dependencies/XCFrameworks/MoltenVK.xcframework/Info.plist

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>AvailableLibraries</key>
-	<array>
-		<dict>
-			<key>BinaryPath</key>
-			<string>MoltenVK.framework/MoltenVK</string>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
-			<key>LibraryPath</key>
-			<string>MoltenVK.framework</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-		</dict>
-	</array>
-	<key>CFBundlePackageType</key>
-	<string>XFWK</string>
-	<key>XCFrameworkFormatVersion</key>
-	<string>1.0</string>
-</dict>
-</plist>

src/MeloNX/MeloNX/Info.plist

@@ -38,8 +38,9 @@
 	</array>
 	<key>UIBackgroundModes</key>
 	<array>
-		<string>audio</string>
+		<string>location</string>
 		<string>processing</string>
+		<string>audio</string>
 	</array>
 	<key>UIFileSharingEnabled</key>
 	<true/>

src/Ryujinx.Common/Logging/LogClass.cs

@@ -72,5 +72,6 @@ namespace Ryujinx.Common.Logging
         TamperMachine,
         UI,
         Vic,
+        Memory,
     }
 }

src/Ryujinx.Cpu/LightningJit/Cache/NoWxCache.cs

@@ -4,13 +4,14 @@ using Ryujinx.Memory;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 
 namespace Ryujinx.Cpu.LightningJit.Cache
 {
     class NoWxCache : IDisposable
     {
         private const int CodeAlignment = 4; // Bytes.
-        private const int SharedCacheSize = 2047 * 1024 * 1024;
+        private const int SharedCacheSize = 512 * 1024 * 1024;
         private const int LocalCacheSize = 128 * 1024 * 1024;
 
         // How many calls to the same function we allow until we pad the shared cache to force the function to become available there
@@ -21,12 +22,14 @@ namespace Ryujinx.Cpu.LightningJit.Cache
         {
             private readonly ReservedRegion _region;
             private readonly CacheMemoryAllocator _cacheAllocator;
+            public readonly IJitMemoryAllocator Allocator;
 
-            public CacheMemoryAllocator Allocator => _cacheAllocator;
+            public CacheMemoryAllocator CacheAllocator => _cacheAllocator;
             public IntPtr Pointer => _region.Block.Pointer;
 
             public MemoryCache(IJitMemoryAllocator allocator, ulong size)
             {
+                Allocator = allocator;
                 _region = new(allocator, size);
                 _cacheAllocator = new((int)size);
             }
@@ -101,9 +104,9 @@ namespace Ryujinx.Cpu.LightningJit.Cache
 
         private readonly IStackWalker _stackWalker;
         private readonly Translator _translator;
-        private readonly MemoryCache _sharedCache;
-        private readonly MemoryCache _localCache;
-        private readonly PageAlignedRangeList _pendingMap;
+        private readonly List<MemoryCache> _sharedCaches;
+        private readonly List<MemoryCache> _localCaches;
+        private readonly Dictionary<ulong, PageAlignedRangeList> _pendingMaps;
         private readonly object _lock;
 
         class ThreadLocalCacheEntry
@@ -111,13 +114,15 @@ namespace Ryujinx.Cpu.LightningJit.Cache
             public readonly int Offset;
             public readonly int Size;
             public readonly IntPtr FuncPtr;
+            public readonly int CacheIndex;
             private int _useCount;
 
-            public ThreadLocalCacheEntry(int offset, int size, IntPtr funcPtr)
+            public ThreadLocalCacheEntry(int offset, int size, IntPtr funcPtr, int cacheIndex)
             {
                 Offset = offset;
                 Size = size;
                 FuncPtr = funcPtr;
+                CacheIndex = cacheIndex;
                 _useCount = 0;
             }
 
@@ -134,12 +139,87 @@ namespace Ryujinx.Cpu.LightningJit.Cache
         {
             _stackWalker = stackWalker;
             _translator = translator;
-            _sharedCache = new(allocator, SharedCacheSize);
-            _localCache = new(allocator, LocalCacheSize);
-            _pendingMap = new(_sharedCache.ReprotectAsRx, RegisterFunction);
+            _sharedCaches = new List<MemoryCache> { new(allocator, SharedCacheSize) };
+            _localCaches = new List<MemoryCache> { new(allocator, LocalCacheSize) };
+            _pendingMaps = new Dictionary<ulong, PageAlignedRangeList>();
             _lock = new();
         }
 
+        private PageAlignedRangeList GetPendingMapForCache(int cacheIndex)
+        {
+            ulong cacheKey = (ulong)cacheIndex;
+            if (!_pendingMaps.TryGetValue(cacheKey, out var pendingMap))
+            {
+                pendingMap = new PageAlignedRangeList(
+                    (offset, size) => _sharedCaches[cacheIndex].ReprotectAsRx(offset, size),
+                    (address, func) => RegisterFunction(address, func));
+                _pendingMaps[cacheKey] = pendingMap;
+            }
+            return pendingMap;
+        }
+
+        private bool HasInAnyPendingMap(ulong guestAddress)
+        {
+            foreach (var pendingMap in _pendingMaps.Values)
+            {
+                if (pendingMap.Has(guestAddress))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        private int AllocateInSharedCache(int codeLength)
+        {
+            for (int i = 0; i < _sharedCaches.Count; i++)
+            {
+                try
+                {
+                    return (i << 28) | _sharedCaches[i].Allocate(codeLength);
+                }
+                catch (OutOfMemoryException)
+                {
+                    // Try next cache
+                }
+            }
+
+            // All existing caches are full, create a new one
+            lock (_lock)
+            {
+                var allocator = _sharedCaches[0].Allocator;
+                _sharedCaches.Add(new(allocator, SharedCacheSize));
+                return (_sharedCaches.Count - 1) << 28 | _sharedCaches[_sharedCaches.Count - 1].Allocate(codeLength);
+            }
+        }
+
+        private int AllocateInLocalCache(int codeLength)
+        {
+            for (int i = 0; i < _localCaches.Count; i++)
+            {
+                try
+                {
+                    return (i << 28) | _localCaches[i].Allocate(codeLength);
+                }
+                catch (OutOfMemoryException)
+                {
+                    
+                }
+            }
+
+            lock (_lock)
+            {
+                var allocator = _localCaches[0].Allocator;
+                _localCaches.Add(new(allocator, LocalCacheSize));
+                return (_localCaches.Count - 1) << 28 | _localCaches[_localCaches.Count - 1].Allocate(codeLength);
+            }
+        }
+
+        private static (int cacheIndex, int offset) SplitCacheOffset(int combinedOffset)
+        {
+            return (combinedOffset >> 28, combinedOffset & 0xFFFFFFF);
+        }
+
         public unsafe IntPtr Map(IntPtr framePointer, ReadOnlySpan<byte> code, ulong guestAddress, ulong guestSize)
         {
             if (TryGetThreadLocalFunction(guestAddress, out IntPtr funcPtr))
@@ -149,16 +229,18 @@ namespace Ryujinx.Cpu.LightningJit.Cache
 
             lock (_lock)
             {
-                if (!_pendingMap.Has(guestAddress) && !_translator.Functions.ContainsKey(guestAddress))
+                if (!HasInAnyPendingMap(guestAddress) && !_translator.Functions.ContainsKey(guestAddress))
                 {
-                    int funcOffset = _sharedCache.Allocate(code.Length);
+                    int combinedOffset = AllocateInSharedCache(code.Length);
+                    var (cacheIndex, funcOffset) = SplitCacheOffset(combinedOffset);
                     
-                    funcPtr = _sharedCache.Pointer + funcOffset;
+                    MemoryCache cache = _sharedCaches[cacheIndex];
+                    funcPtr = cache.Pointer + funcOffset;
                     code.CopyTo(new Span<byte>((void*)funcPtr, code.Length));
 
                     TranslatedFunction function = new(funcPtr, guestSize);
                     
-                    _pendingMap.Add(funcOffset, code.Length, guestAddress, function);
+                    GetPendingMapForCache(cacheIndex).Add(funcOffset, code.Length, guestAddress, function);
                 }
 
                 ClearThreadLocalCache(framePointer);
@@ -171,18 +253,56 @@ namespace Ryujinx.Cpu.LightningJit.Cache
         {
             lock (_lock)
             {
-                // Ensure we will get an aligned offset from the allocator.
-                _pendingMap.Pad(_sharedCache.Allocator);
+                int cacheIndex;
+                int funcOffset;
+                IntPtr mappedFuncPtr = IntPtr.Zero;
+                
+                for (cacheIndex = 0; cacheIndex < _sharedCaches.Count; cacheIndex++)
+                {
+                    try
+                    {
+                        var pendingMap = GetPendingMapForCache(cacheIndex);
+                        
+                        pendingMap.Pad(_sharedCaches[cacheIndex].CacheAllocator);
 
                         int sizeAligned = BitUtils.AlignUp(code.Length, (int)MemoryBlock.GetPageSize());
-                int funcOffset = _sharedCache.Allocate(sizeAligned);
+                        funcOffset = _sharedCaches[cacheIndex].Allocate(sizeAligned);
                         
                         Debug.Assert((funcOffset & ((int)MemoryBlock.GetPageSize() - 1)) == 0);
 
-                IntPtr funcPtr = _sharedCache.Pointer + funcOffset;
+                        IntPtr funcPtr1 = _sharedCaches[cacheIndex].Pointer + funcOffset;
+                        code.CopyTo(new Span<byte>((void*)funcPtr1, code.Length));
+
+                        _sharedCaches[cacheIndex].ReprotectAsRx(funcOffset, sizeAligned);
+
+                        return funcPtr1;
+                    }
+                    catch (OutOfMemoryException)
+                    {
+                        // Try next cache
+                    }
+                }
+
+                // All existing caches are full, create a new one
+                var allocator = _sharedCaches[0].Allocator;
+                var newCache = new MemoryCache(allocator, SharedCacheSize);
+                _sharedCaches.Add(newCache);
+                cacheIndex = _sharedCaches.Count - 1;
+                
+                var newPendingMap = GetPendingMapForCache(cacheIndex);
+                
+                // Ensure we will get an aligned offset from the allocator.
+                newPendingMap.Pad(newCache.CacheAllocator);
+
+                int newSizeAligned = BitUtils.AlignUp(code.Length, (int)MemoryBlock.GetPageSize());
+                funcOffset = newCache.Allocate(newSizeAligned);
+                
+                Debug.Assert((funcOffset & ((int)MemoryBlock.GetPageSize() - 1)) == 0);
+
+                IntPtr funcPtr = newCache.Pointer + funcOffset;
                 code.CopyTo(new Span<byte>((void*)funcPtr, code.Length));
 
-                _sharedCache.ReprotectAsRx(funcOffset, sizeAligned);
+                newCache.ReprotectAsRx(funcOffset, newSizeAligned);
 
                 return funcPtr;
             }
@@ -200,7 +320,15 @@ namespace Ryujinx.Cpu.LightningJit.Cache
 
                     lock (_lock)
                     {
-                        _pendingMap.Pad(_sharedCache.Allocator);
+                        foreach (var pendingMap in _pendingMaps.Values)
+                        {
+                            // Get the cache index from the pendingMap key
+                            if (_pendingMaps.FirstOrDefault(x => x.Value == pendingMap).Key is ulong cacheIndex)
+                            {
+                                // Use the correct shared cache for padding based on the cache index
+                                pendingMap.Pad(_sharedCaches[(int)cacheIndex].CacheAllocator);
+                            }
+                        }
                     }
                 }
 
@@ -224,12 +352,36 @@ namespace Ryujinx.Cpu.LightningJit.Cache
                 return;
             }
 
-            IEnumerable<ulong> callStack = _stackWalker.GetCallStack(
+            IntPtr[] cachePointers = new IntPtr[_localCaches.Count];
+            int[] cacheSizes = new int[_localCaches.Count];
+
+            for (int i = 0; i < _localCaches.Count; i++)
+            {
+                cachePointers[i] = _localCaches[i].Pointer;
+                cacheSizes[i] = LocalCacheSize;
+            }
+
+            IntPtr[] sharedPointers = new IntPtr[_sharedCaches.Count];
+            int[] sharedSizes = new int[_sharedCaches.Count];
+
+            for (int i = 0; i < _sharedCaches.Count; i++)
+            {
+                sharedPointers[i] = _sharedCaches[i].Pointer;
+                sharedSizes[i] = SharedCacheSize;
+            }
+
+            // Iterate over the arrays and pass each element to GetCallStack
+            IEnumerable<ulong> callStack = null;
+            for (int i = 0; i < _localCaches.Count; i++)
+            {
+                callStack = _stackWalker.GetCallStack(
                     framePointer,
-                _localCache.Pointer,
-                LocalCacheSize,
-                _sharedCache.Pointer,
-                SharedCacheSize);
+                    cachePointers[i],   // Passing each individual cachePointer
+                    cacheSizes[i],      // Passing each individual cacheSize
+                    sharedPointers[i],  // Passing each individual sharedPointer
+                    sharedSizes[i]      // Passing each individual sharedSize
+                );
+            }
 
             List<(ulong, ThreadLocalCacheEntry)> toDelete = new();
 
@@ -237,7 +389,7 @@ namespace Ryujinx.Cpu.LightningJit.Cache
             {
                 // We only want to delete if the function is already on the shared cache,
                 // otherwise we will keep translating the same function over and over again.
-                bool canDelete = !_pendingMap.Has(address);
+                bool canDelete = !HasInAnyPendingMap(address);
                 if (!canDelete)
                 {
                     continue;
@@ -267,12 +419,14 @@ namespace Ryujinx.Cpu.LightningJit.Cache
                 _threadLocalCache.Remove(address);
 
                 int sizeAligned = BitUtils.AlignUp(entry.Size, pageSize);
+                var (cacheIndex, offset) = SplitCacheOffset(entry.Offset);
 
-                _localCache.Free(entry.Offset, sizeAligned);
-                _localCache.ReprotectAsRw(entry.Offset, sizeAligned);
+                _localCaches[cacheIndex].Free(offset, sizeAligned);
+                _localCaches[cacheIndex].ReprotectAsRw(offset, sizeAligned);
             }
         }
 
+
         public void ClearEntireThreadLocalCache()
         {
             // Thread is exiting, delete everything.
@@ -287,9 +441,10 @@ namespace Ryujinx.Cpu.LightningJit.Cache
             foreach ((_, ThreadLocalCacheEntry entry) in _threadLocalCache)
             {
                 int sizeAligned = BitUtils.AlignUp(entry.Size, pageSize);
+                var (cacheIndex, offset) = SplitCacheOffset(entry.Offset);
 
-                _localCache.Free(entry.Offset, sizeAligned);
-                _localCache.ReprotectAsRw(entry.Offset, sizeAligned);
+                _localCaches[cacheIndex].Free(offset, sizeAligned);
+                _localCaches[cacheIndex].ReprotectAsRw(offset, sizeAligned);
             }
 
             _threadLocalCache.Clear();
@@ -299,16 +454,17 @@ namespace Ryujinx.Cpu.LightningJit.Cache
         private unsafe IntPtr AddThreadLocalFunction(ReadOnlySpan<byte> code, ulong guestAddress)
         {
             int alignedSize = BitUtils.AlignUp(code.Length, (int)MemoryBlock.GetPageSize());
-            int funcOffset = _localCache.Allocate(alignedSize);
+            int combinedOffset = AllocateInLocalCache(alignedSize);
+            var (cacheIndex, funcOffset) = SplitCacheOffset(combinedOffset);
 
             Debug.Assert((funcOffset & (int)(MemoryBlock.GetPageSize() - 1)) == 0);
 
-            IntPtr funcPtr = _localCache.Pointer + funcOffset;
+            IntPtr funcPtr = _localCaches[cacheIndex].Pointer + funcOffset;
             code.CopyTo(new Span<byte>((void*)funcPtr, code.Length));
 
-            (_threadLocalCache ??= new()).Add(guestAddress, new(funcOffset, code.Length, funcPtr));
+            (_threadLocalCache ??= new()).Add(guestAddress, new(funcOffset, code.Length, funcPtr, cacheIndex));
 
-            _localCache.ReprotectAsRx(funcOffset, alignedSize);
+            _localCaches[cacheIndex].ReprotectAsRx(funcOffset, alignedSize);
 
             return funcPtr;
         }
@@ -326,8 +482,18 @@ namespace Ryujinx.Cpu.LightningJit.Cache
         {
             if (disposing)
             {
-                _localCache.Dispose();
-                _sharedCache.Dispose();
+                foreach (var cache in _localCaches)
+                {
+                    cache.Dispose();
+                }
+                
+                foreach (var cache in _sharedCaches)
+                {
+                    cache.Dispose();
+                }
+                
+                _localCaches.Clear();
+                _sharedCaches.Clear();
             }
         }
 

src/Ryujinx.Cpu/LightningJit/Cache/WriteZeroCache.cs

@@ -0,0 +1,622 @@
+using ARMeilleure.Memory;
+using Ryujinx.Common;
+using Ryujinx.Memory;
+using System;
+using System.Runtime.InteropServices;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+
+namespace Ryujinx.Cpu.LightningJit.Cache
+{
+    class WriteZeroCache : IDisposable
+    {
+        private const int CodeAlignment = 4; 
+        private const int InitialCacheSize = 2 * 1024 * 1024; 
+        private const int GrowthCacheSize = 2 * 1024 * 1024;  
+        private const int MaxSharedCacheSize = 512 * 1024 * 1024;
+        private const int MaxLocalCacheSize = 128 * 1024 * 1024; 
+
+        [DllImport("StosJIT.framework/StosJIT", EntryPoint = "writeZeroToMemory")]
+        public static extern bool WriteZeroToMemory(ulong addr, int length);
+
+        // How many calls to the same function we allow until we pad the shared cache to force the function to become available there
+        // and allow the guest to take the fast path.
+        private const int MinCallsForPad = 8;
+
+        private class MemoryCache : IDisposable
+        {
+            private readonly ReservedRegion _region;
+            private readonly CacheMemoryAllocator _cacheAllocator;
+            public readonly IJitMemoryAllocator Allocator;
+            private readonly ulong _maxSize;
+            private ulong _currentSize;
+            
+            private readonly Dictionary<int, HashSet<int>> _reusePages; 
+            private readonly object _reuselock = new object();
+
+            public CacheMemoryAllocator CacheAllocator => _cacheAllocator;
+            public IntPtr Pointer => _region.Block.Pointer;
+            public ulong CurrentSize => _currentSize;
+            public ulong MaxSize => _maxSize;
+
+            public MemoryCache(IJitMemoryAllocator allocator, ulong maxSize)
+            {
+                Allocator = allocator;
+                _maxSize = maxSize;
+                _currentSize = InitialCacheSize;
+
+                
+                _region = new(allocator, maxSize);
+                _cacheAllocator = new((int)maxSize);
+                
+                _reusePages = new Dictionary<int, HashSet<int>>();
+
+                _region.Block.MapAsRw(0, _currentSize);
+                _region.ExpandIfNeeded(_currentSize);
+
+                WriteZeroToMemory((ulong)_region.Block.Pointer.ToInt64(), (int)_currentSize);
+            }
+
+            public bool TryGetReusablePage(int size, out int offset)
+            {
+                lock (_reuselock)
+                {
+                    if (_reusePages.TryGetValue(size, out var exactOffsets) && exactOffsets.Count > 0)
+                    {
+                        offset = exactOffsets.First();
+                        exactOffsets.Remove(offset);
+                        return true;
+                    }
+
+                    var largerSizes = _reusePages.Where(kvp => kvp.Key > size && kvp.Value.Count > 0)
+                                                 .OrderBy(kvp => kvp.Key)
+                                                 .FirstOrDefault();
+
+                    if (largerSizes.Value != null && largerSizes.Value.Count > 0)
+                    {
+                        int largerSize = largerSizes.Key;
+                        var largerOffsets = largerSizes.Value;
+                        
+                        offset = largerOffsets.First();
+                        largerOffsets.Remove(offset);
+                        
+                        int remainingSize = largerSize - size;
+                        if (remainingSize > 0)
+                        {
+                            AddReusablePage(offset + size, remainingSize);
+                        }
+                        
+                        return true;
+                    }
+                    
+                    offset = -1;
+                    return false;
+                }
+            }
+
+            public void AddReusablePage(int offset, int size)
+            {
+                if (size < (int)MemoryBlock.GetPageSize())
+                {
+                    return;
+                }
+                
+                lock (_reuselock)
+                {
+                    if (!_reusePages.TryGetValue(size, out var offsets))
+                    {
+                        offsets = new HashSet<int>();
+                        _reusePages[size] = offsets;
+                    }
+                    offsets.Add(offset);
+                }
+            }
+
+            public int Allocate(int codeSize)
+            {
+                codeSize = AlignCodeSize(codeSize);
+                
+                if (codeSize >= (int)MemoryBlock.GetPageSize() && 
+                    (codeSize % (int)MemoryBlock.GetPageSize() == 0) && 
+                    TryGetReusablePage(codeSize, out int reuseOffset))
+                {
+                    ReprotectAsRw(reuseOffset, codeSize);
+                    return reuseOffset;
+                }
+
+                int allocOffset = _cacheAllocator.Allocate(codeSize);
+
+                if (allocOffset < 0)
+                {
+                    throw new OutOfMemoryException("JIT Cache exhausted.");
+                }
+
+    
+                ulong requiredSize = (ulong)allocOffset + (ulong)codeSize;
+                if (requiredSize > _currentSize)
+                {
+                    ulong neededGrowth = requiredSize - _currentSize;
+                    ulong growthIncrements = (neededGrowth + GrowthCacheSize - 1) / GrowthCacheSize;
+                    ulong newSize = _currentSize + (growthIncrements * GrowthCacheSize);
+                    
+                    newSize = Math.Min(newSize, _maxSize);
+                    
+                    if (newSize <= _currentSize || requiredSize > newSize)
+                    {
+                        throw new OutOfMemoryException("JIT Cache exhausted, cannot grow further.");
+                    }
+                
+                    _region.Block.MapAsRw(_currentSize, newSize - _currentSize);
+                    _region.ExpandIfNeeded(newSize);
+                    
+                    WriteZeroToMemory((ulong)(_region.Block.Pointer.ToInt64() + (long)_currentSize), (int)(newSize - _currentSize));
+                    
+                    _currentSize = newSize;
+                }
+
+                return allocOffset;
+            }
+
+            public void Free(int offset, int size)
+            {
+                if (size >= (int)MemoryBlock.GetPageSize() && (size % (int)MemoryBlock.GetPageSize() == 0) &&
+                    (offset % (int)MemoryBlock.GetPageSize() == 0))
+                {
+                    AddReusablePage(offset, size);
+                }
+                else
+                {
+                    _cacheAllocator.Free(offset, size);
+                }
+            }
+
+            public void ReprotectAsRw(int offset, int size)
+            {
+                Debug.Assert(offset >= 0 && (offset & (int)(MemoryBlock.GetPageSize() - 1)) == 0);
+                Debug.Assert(size > 0 && (size & (int)(MemoryBlock.GetPageSize() - 1)) == 0);
+
+                _region.Block.MapAsRw((ulong)offset, (ulong)size);
+            }
+
+            public void ReprotectAsRx(int offset, int size)
+            {
+                Debug.Assert(offset >= 0 && (offset & (int)(MemoryBlock.GetPageSize() - 1)) == 0);
+                Debug.Assert(size > 0 && (size & (int)(MemoryBlock.GetPageSize() - 1)) == 0);
+
+                _region.Block.MapAsRx((ulong)offset, (ulong)size);
+
+                if (OperatingSystem.IsMacOS() || OperatingSystem.IsIOS())
+                {
+                    JitSupportDarwin.SysIcacheInvalidate(_region.Block.Pointer + offset, size);
+                }
+                else
+                {
+                    throw new PlatformNotSupportedException();
+                }
+            }
+
+            public void ClearReusePool()
+            {
+                lock (_reuselock)
+                {
+                    _reusePages.Clear();
+                }
+            }
+
+            private static int AlignCodeSize(int codeSize)
+            {
+                return checked(codeSize + (CodeAlignment - 1)) & ~(CodeAlignment - 1);
+            }
+
+            protected virtual void Dispose(bool disposing)
+            {
+                if (disposing)
+                {
+                    ClearReusePool();
+                    _region.Dispose();
+                    _cacheAllocator.Clear();
+                }
+            }
+
+            public void Dispose()
+            {
+                Dispose(disposing: true);
+                GC.SuppressFinalize(this);
+            }
+        }
+
+        private readonly IStackWalker _stackWalker;
+        private readonly Translator _translator;
+        private readonly List<MemoryCache> _sharedCaches;
+        private readonly List<MemoryCache> _localCaches;
+        private readonly Dictionary<ulong, PageAlignedRangeList> _pendingMaps;
+        private readonly object _lock;
+
+        class ThreadLocalCacheEntry
+        {
+            public readonly int Offset;
+            public readonly int Size;
+            public readonly IntPtr FuncPtr;
+            public readonly int CacheIndex;
+            private int _useCount;
+
+            public ThreadLocalCacheEntry(int offset, int size, IntPtr funcPtr, int cacheIndex)
+            {
+                Offset = offset;
+                Size = size;
+                FuncPtr = funcPtr;
+                CacheIndex = cacheIndex;
+                _useCount = 0;
+            }
+
+            public int IncrementUseCount()
+            {
+                return ++_useCount;
+            }
+        }
+
+        [ThreadStatic]
+        private static Dictionary<ulong, ThreadLocalCacheEntry> _threadLocalCache;
+
+        public WriteZeroCache(IJitMemoryAllocator allocator, IStackWalker stackWalker, Translator translator)
+        {
+            _stackWalker = stackWalker;
+            _translator = translator;
+            _sharedCaches = new List<MemoryCache> { new(allocator, MaxSharedCacheSize) };
+            _localCaches = new List<MemoryCache> { new(allocator, MaxLocalCacheSize) };
+            _pendingMaps = new Dictionary<ulong, PageAlignedRangeList>();
+            _lock = new();
+        }
+
+        private PageAlignedRangeList GetPendingMapForCache(int cacheIndex)
+        {
+            ulong cacheKey = (ulong)cacheIndex;
+            if (!_pendingMaps.TryGetValue(cacheKey, out var pendingMap))
+            {
+                pendingMap = new PageAlignedRangeList(
+                    (offset, size) => _sharedCaches[cacheIndex].ReprotectAsRx(offset, size),
+                    (address, func) => RegisterFunction(address, func));
+                _pendingMaps[cacheKey] = pendingMap;
+            }
+            return pendingMap;
+        }
+
+        private bool HasInAnyPendingMap(ulong guestAddress)
+        {
+            foreach (var pendingMap in _pendingMaps.Values)
+            {
+                if (pendingMap.Has(guestAddress))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        private int AllocateInSharedCache(int codeLength)
+        {
+            for (int i = 0; i < _sharedCaches.Count; i++)
+            {
+                try
+                {
+                    return (i << 28) | _sharedCaches[i].Allocate(codeLength);
+                }
+                catch (OutOfMemoryException)
+                {
+                    // Try next cache
+                }
+            }
+
+            // All existing caches are full, create a new one
+            lock (_lock)
+            {
+                var allocator = _sharedCaches[0].Allocator;
+                _sharedCaches.Add(new(allocator, MaxSharedCacheSize));
+                return (_sharedCaches.Count - 1) << 28 | _sharedCaches[_sharedCaches.Count - 1].Allocate(codeLength);
+            }
+        }
+
+        private int AllocateInLocalCache(int codeLength)
+        {
+            for (int i = 0; i < _localCaches.Count; i++)
+            {
+                try
+                {
+                    return (i << 28) | _localCaches[i].Allocate(codeLength);
+                }
+                catch (OutOfMemoryException)
+                {
+                    // Try next cache
+                }
+            }
+
+            lock (_lock)
+            {
+                var allocator = _localCaches[0].Allocator;
+                _localCaches.Add(new(allocator, MaxLocalCacheSize));
+                return (_localCaches.Count - 1) << 28 | _localCaches[_localCaches.Count - 1].Allocate(codeLength);
+            }
+        }
+
+        private static (int cacheIndex, int offset) SplitCacheOffset(int combinedOffset)
+        {
+            return (combinedOffset >> 28, combinedOffset & 0xFFFFFFF);
+        }
+
+        public unsafe IntPtr Map(IntPtr framePointer, ReadOnlySpan<byte> code, ulong guestAddress, ulong guestSize)
+        {
+            if (TryGetThreadLocalFunction(guestAddress, out IntPtr funcPtr))
+            {
+                return funcPtr;
+            }
+
+            lock (_lock)
+            {
+                if (!HasInAnyPendingMap(guestAddress) && !_translator.Functions.ContainsKey(guestAddress))
+                {
+                    int combinedOffset = AllocateInSharedCache(code.Length);
+                    var (cacheIndex, funcOffset) = SplitCacheOffset(combinedOffset);
+                    
+                    MemoryCache cache = _sharedCaches[cacheIndex];
+                    funcPtr = cache.Pointer + funcOffset;
+
+                    code.CopyTo(new Span<byte>((void*)funcPtr, code.Length));
+
+                    TranslatedFunction function = new(funcPtr, guestSize);
+                    
+                    GetPendingMapForCache(cacheIndex).Add(funcOffset, code.Length, guestAddress, function);
+                }
+
+                ClearThreadLocalCache(framePointer);
+
+                return AddThreadLocalFunction(code, guestAddress);
+            }
+        }
+
+        public unsafe IntPtr MapPageAligned(ReadOnlySpan<byte> code)
+        {
+            lock (_lock)
+            {
+                int cacheIndex;
+                int funcOffset;
+                IntPtr mappedFuncPtr = IntPtr.Zero;
+                
+                for (cacheIndex = 0; cacheIndex < _sharedCaches.Count; cacheIndex++)
+                {
+                    try
+                    {
+                        var pendingMap = GetPendingMapForCache(cacheIndex);
+                        
+                        pendingMap.Pad(_sharedCaches[cacheIndex].CacheAllocator);
+
+                        int sizeAligned = BitUtils.AlignUp(code.Length, (int)MemoryBlock.GetPageSize());
+                        funcOffset = _sharedCaches[cacheIndex].Allocate(sizeAligned);
+                        
+                        Debug.Assert((funcOffset & ((int)MemoryBlock.GetPageSize() - 1)) == 0);
+
+                        IntPtr funcPtr1 = _sharedCaches[cacheIndex].Pointer + funcOffset;
+
+                        code.CopyTo(new Span<byte>((void*)funcPtr1, code.Length));
+
+                        _sharedCaches[cacheIndex].ReprotectAsRx(funcOffset, sizeAligned);
+
+                        return funcPtr1;
+                    }
+                    catch (OutOfMemoryException)
+                    {
+                        // Try next cache
+                    }
+                }
+
+                var allocator = _sharedCaches[0].Allocator;
+                var newCache = new MemoryCache(allocator, MaxSharedCacheSize);
+                _sharedCaches.Add(newCache);
+                cacheIndex = _sharedCaches.Count - 1;
+                
+                var newPendingMap = GetPendingMapForCache(cacheIndex);
+                
+                newPendingMap.Pad(newCache.CacheAllocator);
+
+                int newSizeAligned = BitUtils.AlignUp(code.Length, (int)MemoryBlock.GetPageSize());
+                funcOffset = newCache.Allocate(newSizeAligned);
+                
+                Debug.Assert((funcOffset & ((int)MemoryBlock.GetPageSize() - 1)) == 0);
+
+                IntPtr funcPtr = newCache.Pointer + funcOffset;
+                code.CopyTo(new Span<byte>((void*)funcPtr, code.Length));
+
+                newCache.ReprotectAsRx(funcOffset, newSizeAligned);
+
+                return funcPtr;
+            }
+        }
+
+        private bool TryGetThreadLocalFunction(ulong guestAddress, out IntPtr funcPtr)
+        {       
+            if ((_threadLocalCache ??= new()).TryGetValue(guestAddress, out var entry))
+            {
+                if (entry.IncrementUseCount() >= MinCallsForPad)
+                {
+                    // Function is being called often, let's make it available in the shared cache so that the guest code
+                    // can take the fast path and stop calling the emulator to get the function from the thread local cache.
+                    // To do that we pad all "pending" function until they complete a page of memory, allowing us to reprotect them as RX.
+
+                    lock (_lock)
+                    {
+                        foreach (var pendingMap in _pendingMaps.Values)
+                        {
+                            // Get the cache index from the pendingMap key
+                            if (_pendingMaps.FirstOrDefault(x => x.Value == pendingMap).Key is ulong cacheIndex)
+                            {
+                                // Use the correct shared cache for padding based on the cache index
+                                pendingMap.Pad(_sharedCaches[(int)cacheIndex].CacheAllocator);
+                            }
+                        }
+                    }
+                }
+
+                funcPtr = entry.FuncPtr;
+
+                return true;
+            }
+
+            funcPtr = IntPtr.Zero;
+
+            return false;
+        }
+
+        private void ClearThreadLocalCache(IntPtr framePointer)
+        {
+            // Try to delete functions that are already on the shared cache
+            // and no longer being executed.
+
+            if (_threadLocalCache == null)
+            {
+                return;
+            }
+
+            IntPtr[] cachePointers = new IntPtr[_localCaches.Count];
+            int[] cacheSizes = new int[_localCaches.Count];
+
+            for (int i = 0; i < _localCaches.Count; i++)
+            {
+                cachePointers[i] = _localCaches[i].Pointer;
+                cacheSizes[i] = (int)_localCaches[i].CurrentSize;
+            }
+
+            IntPtr[] sharedPointers = new IntPtr[_sharedCaches.Count];
+            int[] sharedSizes = new int[_sharedCaches.Count];
+
+            for (int i = 0; i < _sharedCaches.Count; i++)
+            {
+                sharedPointers[i] = _sharedCaches[i].Pointer;
+                sharedSizes[i] = (int)_sharedCaches[i].CurrentSize;
+            }
+
+            IEnumerable<ulong> callStack = null;
+            for (int i = 0; i < _localCaches.Count; i++)
+            {
+                callStack = _stackWalker.GetCallStack(
+                    framePointer,
+                    cachePointers[i],   
+                    cacheSizes[i],     
+                    sharedPointers[i],  
+                    sharedSizes[i]     
+                );
+            }
+
+            List<(ulong, ThreadLocalCacheEntry)> toDelete = new();
+
+            foreach ((ulong address, ThreadLocalCacheEntry entry) in _threadLocalCache)
+            {
+                bool canDelete = !HasInAnyPendingMap(address);
+                if (!canDelete)
+                {
+                    continue;
+                }
+
+                foreach (ulong funcAddress in callStack)
+                {
+                    if (funcAddress >= (ulong)entry.FuncPtr && funcAddress < (ulong)entry.FuncPtr + (ulong)entry.Size)
+                    {
+                        canDelete = false;
+                        break;
+                    }
+                }
+
+                if (canDelete)
+                {
+                    toDelete.Add((address, entry));
+                }
+            }
+
+            int pageSize = (int)MemoryBlock.GetPageSize();
+
+            foreach ((ulong address, ThreadLocalCacheEntry entry) in toDelete)
+            {
+                _threadLocalCache.Remove(address);
+
+                int sizeAligned = BitUtils.AlignUp(entry.Size, pageSize);
+                var (cacheIndex, offset) = SplitCacheOffset(entry.Offset);
+
+                _localCaches[cacheIndex].Free(offset, sizeAligned);
+                _localCaches[cacheIndex].ReprotectAsRw(offset, sizeAligned);
+            }
+        }
+
+        public void ClearEntireThreadLocalCache()
+        {
+            if (_threadLocalCache == null)
+            {
+                return;
+            }
+
+            int pageSize = (int)MemoryBlock.GetPageSize();
+
+            foreach ((_, ThreadLocalCacheEntry entry) in _threadLocalCache)
+            {
+                int sizeAligned = BitUtils.AlignUp(entry.Size, pageSize);
+                var (cacheIndex, offset) = SplitCacheOffset(entry.Offset);
+
+                _localCaches[cacheIndex].Free(offset, sizeAligned);
+                _localCaches[cacheIndex].ReprotectAsRw(offset, sizeAligned);
+            }
+
+            _threadLocalCache.Clear();
+            _threadLocalCache = null;
+        }
+
+        private unsafe IntPtr AddThreadLocalFunction(ReadOnlySpan<byte> code, ulong guestAddress)
+        {
+            int alignedSize = BitUtils.AlignUp(code.Length, (int)MemoryBlock.GetPageSize());
+            int combinedOffset = AllocateInLocalCache(alignedSize);
+            var (cacheIndex, funcOffset) = SplitCacheOffset(combinedOffset);
+
+            Debug.Assert((funcOffset & (int)(MemoryBlock.GetPageSize() - 1)) == 0);
+
+            IntPtr funcPtr = _localCaches[cacheIndex].Pointer + funcOffset;
+            code.CopyTo(new Span<byte>((void*)funcPtr, code.Length));
+
+            (_threadLocalCache ??= new()).Add(guestAddress, new(funcOffset, code.Length, funcPtr, cacheIndex));
+
+            _localCaches[cacheIndex].ReprotectAsRx(funcOffset, alignedSize);
+
+            return funcPtr;
+        }
+
+        private void RegisterFunction(ulong address, TranslatedFunction func)
+        {
+            TranslatedFunction oldFunc = _translator.Functions.GetOrAdd(address, func.GuestSize, func);
+
+            Debug.Assert(oldFunc == func);
+
+            _translator.RegisterFunction(address, func);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                foreach (var cache in _localCaches)
+                {
+                    cache.Dispose();
+                }
+                
+                foreach (var cache in _sharedCaches)
+                {
+                    cache.Dispose();
+                }
+                
+                _localCaches.Clear();
+                _sharedCaches.Clear();
+            }
+        }
+
+        public void Dispose()
+        {
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
+        }
+    }
+}

src/Ryujinx.Cpu/LightningJit/Translator.cs

@@ -11,6 +11,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Threading;
+using System.IO;
 
 namespace Ryujinx.Cpu.LightningJit
 {
@@ -40,6 +41,7 @@ namespace Ryujinx.Cpu.LightningJit
 
         private readonly ConcurrentQueue<KeyValuePair<ulong, TranslatedFunction>> _oldFuncs;
         private readonly NoWxCache _noWxCache;
+        private readonly WriteZeroCache _writeZeroCache;
         private bool _disposed;
 
         internal TranslatorCache<TranslatedFunction> Functions { get; }
@@ -54,17 +56,44 @@ namespace Ryujinx.Cpu.LightningJit
             _oldFuncs = new ConcurrentQueue<KeyValuePair<ulong, TranslatedFunction>>();
 
             if (IsNoWxPlatform)
+            {
+                if (File.Exists("/System/Library/CoreServices/SystemVersion.plist"))
+                {
+                    string content = File.ReadAllText("/System/Library/CoreServices/SystemVersion.plist");
+                    if (content.Contains("22E5200s") && content.Contains("18.4") && content.Contains("Beta"))
+                    {
+                        // iOS 18.4db1 (22E5200s) disables traditional JIT (R/X) and needs a debugger to fill to the page to make the executable region a debug map.
+                        // Apple has confirmed that this change will be coming to later iOS releases.
+                        // Credit to JJTech for figuring out a workaround: https://gist.github.com/JJTech0130/142aee0f7bda9c61a421140d17afbdeb
+                        Console.WriteLine($"User is using iOS 18.4db1 (22E5200s), enabling Debugger Memory Writing");
+                        _writeZeroCache = new(new JitMemoryAllocator(), CreateStackWalker(), this);
+                        Functions = new TranslatorCache<TranslatedFunction>();
+                        FunctionTable = new AddressTable<ulong>(for64Bits ? _levels64Bit : _levels32Bit);
+                        Stubs = new TranslatorStubs(FunctionTable, _writeZeroCache);
+                    }
+                    else
                     {
                         _noWxCache = new(new JitMemoryAllocator(), CreateStackWalker(), this);
+                        Functions = new TranslatorCache<TranslatedFunction>();
+                        FunctionTable = new AddressTable<ulong>(for64Bits ? _levels64Bit : _levels32Bit);
+                        Stubs = new TranslatorStubs(FunctionTable, _noWxCache);
+                    }
+                }
+                else
+                {
+                    _noWxCache = new(new JitMemoryAllocator(), CreateStackWalker(), this);
+                    Functions = new TranslatorCache<TranslatedFunction>();
+                    FunctionTable = new AddressTable<ulong>(for64Bits ? _levels64Bit : _levels32Bit);
+                    Stubs = new TranslatorStubs(FunctionTable, _noWxCache);
+                }
             }
             else
             {
                 JitCache.Initialize(new JitMemoryAllocator(forJit: true));
-            }
-
                 Functions = new TranslatorCache<TranslatedFunction>();
                 FunctionTable = new AddressTable<ulong>(for64Bits ? _levels64Bit : _levels32Bit);
-            Stubs = new TranslatorStubs(FunctionTable, _noWxCache);
+                Stubs = new TranslatorStubs(FunctionTable, (NoWxCache)null);
+            }
 
             FunctionTable.Fill = (ulong)Stubs.SlowDispatchStub;
 
@@ -96,6 +125,7 @@ namespace Ryujinx.Cpu.LightningJit
 
             NativeInterface.UnregisterThread();
             _noWxCache?.ClearEntireThreadLocalCache();
+            _writeZeroCache?.ClearEntireThreadLocalCache();
         }
 
         internal IntPtr GetOrTranslatePointer(IntPtr framePointer, ulong address, ExecutionMode mode)
@@ -103,9 +133,13 @@ namespace Ryujinx.Cpu.LightningJit
             if (_noWxCache != null)
             {
                 CompiledFunction func = Compile(address, mode);
-
                 return _noWxCache.Map(framePointer, func.Code, address, (ulong)func.GuestCodeLength);
             }
+            else if (_writeZeroCache != null)
+            {
+                CompiledFunction func = Compile(address, mode);
+                return _writeZeroCache.Map(framePointer, func.Code, address, (ulong)func.GuestCodeLength);
+            }
 
             return GetOrTranslate(address, mode).FuncPointer;
         }
@@ -205,6 +239,10 @@ namespace Ryujinx.Cpu.LightningJit
                     {
                         _noWxCache.Dispose();
                     }
+                    else if (_writeZeroCache != null)
+                    {
+                        _writeZeroCache.Dispose();
+                    }
                     else
                     {
                         ClearJitCache();

src/Ryujinx.Cpu/LightningJit/TranslatorStubs.cs

@@ -25,6 +25,8 @@ namespace Ryujinx.Cpu.LightningJit
 
         private readonly AddressTable<ulong> _functionTable;
         private readonly NoWxCache _noWxCache;
+        private readonly WriteZeroCache _writeZeroCache;
+
         private readonly GetFunctionAddressDelegate _getFunctionAddressRef;
         private readonly IntPtr _getFunctionAddress;
         private readonly Lazy<IntPtr> _dispatchStub;
@@ -92,6 +94,26 @@ namespace Ryujinx.Cpu.LightningJit
             _dispatchLoop = new(GenerateDispatchLoop, isThreadSafe: true);
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TranslatorStubs"/> class with the specified
+        /// <see cref="Translator"/> instance.
+        /// </summary>
+        /// <param name="functionTable">Function table used to store pointers to the functions that the guest code will call</param>
+        /// <param name="writeZeroCache">Cache used on iOS versions that need a debugger to make a debug map</param>
+        /// <exception cref="ArgumentNullException"><paramref name="translator"/> is null</exception>
+        public TranslatorStubs(AddressTable<ulong> functionTable, WriteZeroCache writeZeroCache)
+        {
+            ArgumentNullException.ThrowIfNull(functionTable);
+
+            _functionTable = functionTable;
+            _writeZeroCache = writeZeroCache;
+            _getFunctionAddressRef = NativeInterface.GetFunctionAddress;
+            _getFunctionAddress = Marshal.GetFunctionPointerForDelegate(_getFunctionAddressRef);
+            _slowDispatchStub = new(GenerateSlowDispatchStub, isThreadSafe: true);
+            _dispatchStub = new(GenerateDispatchStub, isThreadSafe: true);
+            _dispatchLoop = new(GenerateDispatchLoop, isThreadSafe: true);
+        }
+
         /// <summary>
         /// Releases all resources used by the <see cref="TranslatorStubs"/> instance.
         /// </summary>
@@ -361,6 +383,10 @@ namespace Ryujinx.Cpu.LightningJit
             {
                 return _noWxCache.MapPageAligned(code);
             }
+            else if (_writeZeroCache != null) 
+            {
+                return _writeZeroCache.MapPageAligned(code);
+            }
             else
             {
                 return JitCache.Map(code);

src/Ryujinx.Graphics.Vulkan/BufferManager.cs

@@ -106,6 +106,8 @@ namespace Ryujinx.Graphics.Vulkan
             var externalMemoryBuffer = new ExternalMemoryBufferCreateInfo
             {
                 SType = StructureType.ExternalMemoryBufferCreateInfo,
+                // For MoltenVK 1.3
+                // ExternalMemoryHandleTypeFlagsExt.MtlBufferBitExt
                 HandleTypes = ExternalMemoryHandleTypeFlags.HostAllocationBitExt,
             };
 
@@ -676,4 +678,10 @@ namespace Ryujinx.Graphics.Vulkan
             Dispose(true);
         }
     }
+
+    public static class ExternalMemoryHandleTypeFlagsExt
+    {
+        public const ExternalMemoryHandleTypeFlags MtlBufferBitExt = (ExternalMemoryHandleTypeFlags)0x00010000;
+        public const ExternalMemoryHandleTypeFlags MtlHeapBitExt = (ExternalMemoryHandleTypeFlags)0x00040000;
+    }
 }

src/Ryujinx.Graphics.Vulkan/Constants.cs

@@ -10,7 +10,7 @@ namespace Ryujinx.Graphics.Vulkan
         public const int MaxShaderStages = 5;
         public const int MaxUniformBuffersPerStage = 18;
         public const int MaxStorageBuffersPerStage = 16;
-        public const int MaxTexturesPerStage = 64;
+        public const int MaxTexturesPerStage = 31;
         public const int MaxImagesPerStage = 16;
         public const int MaxUniformBufferBindings = MaxUniformBuffersPerStage * MaxShaderStages;
         public const int MaxStorageBufferBindings = MaxStorageBuffersPerStage * MaxShaderStages;

src/Ryujinx.Graphics.Vulkan/DescriptorSetCollection.cs

@@ -47,27 +47,27 @@ namespace Ryujinx.Graphics.Vulkan
             }
         }
 
+
         public unsafe void UpdateBuffers(int setIndex, int baseBinding, ReadOnlySpan<DescriptorBufferInfo> bufferInfo, DescriptorType type)
         {
-    
-
-            // Proceed if all checks pass
-            fixed (DescriptorBufferInfo* pBufferInfo = bufferInfo)
+            for (int i = 0; i < bufferInfo.Length; i++)
+            {
+                fixed (DescriptorBufferInfo* pBufferInfo = &bufferInfo[i])
                 {
                     var writeDescriptorSet = new WriteDescriptorSet
                     {
                         SType = StructureType.WriteDescriptorSet,
                         DstSet = _descriptorSets[setIndex],
-                    DstBinding = (uint)baseBinding,
+                        DstBinding = (uint)(baseBinding + i),
                         DescriptorType = type,
-                    DescriptorCount = (uint)bufferInfo.Length,
+                        DescriptorCount = 1,
                         PBufferInfo = pBufferInfo
                     };
 
-            // Update descriptor sets
                     _holder.Api.UpdateDescriptorSets(_holder.Device, 1, writeDescriptorSet, 0, null);
                 }
             }
+        }
 
         public unsafe void UpdateImage(int setIndex, int bindingIndex, DescriptorImageInfo imageInfo, DescriptorType type)
         {
@@ -90,21 +90,24 @@ namespace Ryujinx.Graphics.Vulkan
 
         public unsafe void UpdateImages(int setIndex, int baseBinding, ReadOnlySpan<DescriptorImageInfo> imageInfo, DescriptorType type)
         {
-            fixed (DescriptorImageInfo* pImageInfo = imageInfo)
+            for (int i = 0; i < imageInfo.Length; i++)
+            {
+                fixed (DescriptorImageInfo* pImageInfo = &imageInfo[i])
                 {
                     var writeDescriptorSet = new WriteDescriptorSet
                     {
                         SType = StructureType.WriteDescriptorSet,
                         DstSet = _descriptorSets[setIndex],
-                    DstBinding = (uint)baseBinding,
+                        DstBinding = (uint)(baseBinding + i),
                         DescriptorType = type,
-                    DescriptorCount = (uint)imageInfo.Length,
+                        DescriptorCount = 1,
                         PImageInfo = pImageInfo,
                     };
 
                     _holder.Api.UpdateDescriptorSets(_holder.Device, 1, in writeDescriptorSet, 0, null);
                 }
             }
+        }
 
         public unsafe void UpdateImagesCombined(int setIndex, int baseBinding, ReadOnlySpan<DescriptorImageInfo> imageInfo, DescriptorType type)
         {
@@ -120,33 +123,24 @@ namespace Ryujinx.Graphics.Vulkan
                     bool nonNull = imageInfo[i].ImageView.Handle != 0 && imageInfo[i].Sampler.Handle != 0;
                     if (nonNull)
                     {
-                        int count = 1;
-
-                        while (i + count < imageInfo.Length &&
-                            imageInfo[i + count].ImageView.Handle != 0 &&
-                            imageInfo[i + count].Sampler.Handle != 0)
-                        {
-                            count++;
-                        }
-
                         var writeDescriptorSet = new WriteDescriptorSet
                         {
                             SType = StructureType.WriteDescriptorSet,
                             DstSet = _descriptorSets[setIndex],
                             DstBinding = (uint)(baseBinding + i),
-                            DescriptorType = DescriptorType.CombinedImageSampler,
+                            DescriptorType = type,
                             DescriptorCount = 1,
-                            PImageInfo = pImageInfo,
+                            PImageInfo = pImageInfo + i,
                         };
 
-                        _holder.Api.UpdateDescriptorSets(_holder.Device, 1, in writeDescriptorSet, 0, null);
 
-                        i += count - 1;
+                        _holder.Api.UpdateDescriptorSets(_holder.Device, 1, in writeDescriptorSet, 0, null);
                     }
                 }
             }
         }
 
+
         public unsafe void UpdateBufferImage(int setIndex, int bindingIndex, BufferView texelBufferView, DescriptorType type)
         {
             if (texelBufferView.Handle != 0UL)
@@ -174,22 +168,15 @@ namespace Ryujinx.Graphics.Vulkan
 
             fixed (BufferView* pTexelBufferView = texelBufferView)
             {
-                for (uint i = 0; i < texelBufferView.Length;)
+                for (int i = 0; i < texelBufferView.Length; i++)
                 {
-                    uint count = 1;
-
-                    if (texelBufferView[(int)i].Handle != 0UL)
+                    if (texelBufferView[i].Handle != 0UL)
                     {
-                        while (i + count < texelBufferView.Length && texelBufferView[(int)(i + count)].Handle != 0UL)
-                        {
-                            count++;
-                        }
-
                         var writeDescriptorSet = new WriteDescriptorSet
                         {
                             SType = StructureType.WriteDescriptorSet,
                             DstSet = _descriptorSets[setIndex],
-                            DstBinding = (uint)baseBinding + i,
+                            DstBinding = (uint)baseBinding + (uint)i,
                             DescriptorType = type,
                             DescriptorCount = 1,  
                             PTexelBufferView = pTexelBufferView + i,
@@ -197,8 +184,6 @@ namespace Ryujinx.Graphics.Vulkan
 
                         _holder.Api.UpdateDescriptorSets(_holder.Device, 1, in writeDescriptorSet, 0, null);
                     }
-
-                    i += count;
                 }
             }
         }