Move assets dependency from mmkay to metacore

Author: Tatenshi

.gitignore

@@ -66,3 +66,4 @@ mod.json.schema
 
 # Clang stuff
 .cache/
+include/assets.hpp

CMakeLists.txt

@@ -106,4 +106,4 @@ add_custom_command(TARGET ${COMPILE_ID} POST_BUILD
         COMMENT "Copy a files for ndk stack")
         endforeach()
 
-include(${EXTERN_DIR}/includes/mmkay/shared/mmkay.cmake)
+include(${EXTERN_DIR}/includes/metacore/shared/assets.cmake)

include/assets.hpp

@@ -1,5 +1,4 @@
 {
-  "$schema": "https://raw.githubusercontent.com/QuestPackageManager/QPM.Package/refs/heads/main/qpm.schema.json",
   "version": "0.1.0",
   "sharedDir": "shared",
   "dependenciesDir": "extern",
@@ -40,13 +39,7 @@
         "pwsh pull-tombstone.ps1"
       ]
     },
-    "ndk": "^27.2.12479018",
-    "qmodIncludeDirs": [
-      "build",
-      "extern/libs"
-    ],
-    "qmodIncludeFiles": [],
-    "qmodOutput": "./RecentlyPlayed.qmod"
+    "ndk": "^27.2.12479018"
   },
   "dependencies": [
     {
@@ -79,11 +72,6 @@
       "versionRange": "^0.18.2",
       "additionalData": {}
     },
-    {
-      "id": "mmkay",
-      "versionRange": "^0.2.1",
-      "additionalData": {}
-    },
     {
       "id": "paper2_scotland2",
       "versionRange": "^4.6.1",
@@ -101,6 +89,11 @@
       "id": "songcore",
       "versionRange": "^1.1.20",
       "additionalData": {}
+    },
+    {
+      "id": "metacore",
+      "versionRange": "^1.0.0",
+      "additionalData": {}
     }
   ]
 }

qpm.json

@@ -42,12 +42,9 @@
         ]
       },
       "ndk": "^27.2.12479018",
-      "qmodIncludeDirs": [
-        "build",
-        "extern/libs"
-      ],
+      "qmodIncludeDirs": [],
       "qmodIncludeFiles": [],
-      "qmodOutput": "./RecentlyPlayed.qmod"
+      "qmodOutput": null
     },
     "dependencies": [
       {
@@ -80,11 +77,6 @@
         "versionRange": "^0.18.2",
         "additionalData": {}
       },
-      {
-        "id": "mmkay",
-        "versionRange": "^0.2.1",
-        "additionalData": {}
-      },
       {
         "id": "paper2_scotland2",
         "versionRange": "^4.6.1",
@@ -102,6 +94,11 @@
         "id": "songcore",
         "versionRange": "^1.1.20",
         "additionalData": {}
+      },
+      {
+        "id": "metacore",
+        "versionRange": "^1.0.0",
+        "additionalData": {}
       }
     ]
   },
@@ -123,14 +120,15 @@
     },
     {
       "dependency": {
-        "id": "mmkay",
-        "versionRange": "=0.2.1",
+        "id": "rapidjson-macros",
+        "versionRange": "=2.1.0",
         "additionalData": {
           "headersOnly": true,
-          "branchName": "version/v0_2_1"
+          "branchName": "version/v2_1_0",
+          "cmake": false
         }
       },
-      "version": "0.2.1"
+      "version": "2.1.0"
     },
     {
       "dependency": {
@@ -148,18 +146,6 @@
       },
       "version": "0.4.0"
     },
-    {
-      "dependency": {
-        "id": "rapidjson-macros",
-        "versionRange": "=2.1.0",
-        "additionalData": {
-          "headersOnly": true,
-          "branchName": "version/v2_1_0",
-          "cmake": false
-        }
-      },
-      "version": "2.1.0"
-    },
     {
       "dependency": {
         "id": "conditional-dependencies",
@@ -202,6 +188,20 @@
       },
       "version": "10.0.0"
     },
+    {
+      "dependency": {
+        "id": "metacore",
+        "versionRange": "=1.0.0",
+        "additionalData": {
+          "soLink": "https://github.com/Metalit/MetaCore/releases/download/v1.0.0/libmetacore.so",
+          "overrideSoName": "libmetacore.so",
+          "modLink": "https://github.com/Metalit/MetaCore/releases/download/v1.0.0/MetaCore.qmod",
+          "branchName": "version/v1_0_0",
+          "cmake": true
+        }
+      },
+      "version": "1.0.0"
+    },
     {
       "dependency": {
         "id": "paper2_scotland2",

qpm.shared.json

@@ -14,7 +14,7 @@ MAKE_HOOK_MATCH(SelectLevelCategoryViewControllerSetupHook, &GlobalNamespace::Se
         auto historyLevelCategoryInfo = GlobalNamespace::SelectLevelCategoryViewController::LevelCategoryInfo::New_ctor();
         historyLevelCategoryInfo->levelCategory = historyCategorie;
         historyLevelCategoryInfo->localizedKey = "";
-        historyLevelCategoryInfo->categoryIcon = PNG_SPRITE(IncludedAssets::icon_png);
+        historyLevelCategoryInfo->categoryIcon = PNG_SPRITE(icon);
 
         // Extend allLevelCategoryinfos with our HistoryCategoryInfo
         auto extendedLevelCategorieInfos = Array<GlobalNamespace::SelectLevelCategoryViewController::LevelCategoryInfo *>::NewLength(5);
@@ -122,7 +122,7 @@ MAKE_HOOK_MATCH(LevelFilteringNavigationControllerUpdateSecondChildControllerCon
 
         // Package our new collection in a BeatmapLevelPack and push it into the ViewController
         // auto collection = GlobalNamespace::CustomBeatmapLevelCollection::New_ctor(il2cpp_utils::vectorToArray(historyLevelVector));
-        auto historySprite = PNG_SPRITE(IncludedAssets::icon_png);
+        auto historySprite = PNG_SPRITE(icon);
         auto historyLevelPack = SongCore::SongLoader::CustomLevelPack::New("custom_levelPack_HLP","Recently Played", historySprite);
         historyLevelPack->SetLevels(historyLevelVector);
         auto historyLevelPackList = System::Collections::Generic::List_1<GlobalNamespace::BeatmapLevelPack*>::New_ctor();