Update for 1.40.2

- Update build script
- Update workflows
- Add inline-hook to CMakeLists.txt
- Sort qpm dependencies

Author: DanTheMan827

.github/workflows/build.yml

@@ -16,27 +16,21 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         name: Checkout
         with:
           submodules: true
           lfs: true
 
       - uses: seanmiddleditch/gha-setup-ninja@v3
 
-      - name: Create ndkpath.txt
-        run: |
-          echo "$ANDROID_NDK_LATEST_HOME" > ${GITHUB_WORKSPACE}/ndkpath.txt
-          cat ${GITHUB_WORKSPACE}/ndkpath.txt
-
       - name: QPM Action
-        uses: Fernthedev/qpm-action@main
+        uses: Fernthedev/qpm-action@v1
         with:
           workflow_token: ${{ secrets.GITHUB_TOKEN }}
-
+          resolve_ndk: true
           restore: true
           cache: true
-
           publish: false
 
       - name: List Post Restore

.github/workflows/publish.yml

@@ -19,28 +19,22 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         name: Checkout
         with:
           submodules: true
           lfs: true
 
       - uses: seanmiddleditch/gha-setup-ninja@v3
 
-      - name: Create ndkpath.txt
-        run: |
-          echo "$ANDROID_NDK_LATEST_HOME" > ${GITHUB_WORKSPACE}/ndkpath.txt
-          cat ${GITHUB_WORKSPACE}/ndkpath.txt
-
       - name: QPM Action
-        uses: Fernthedev/qpm-action@main
+        uses: Fernthedev/qpm-action@v1
         with:
           workflow_token: ${{ secrets.GITHUB_TOKEN }}
-
+          resolve_ndk: true
           restore: true
           cache: true
           version: "${{ github.event.inputs.version }}"
-
           publish: false
 
       - name: List Post Restore

CMakeLists.txt

@@ -32,8 +32,11 @@ add_compile_definitions(MOD_ID=\"${MOD_ID}\")
 recurse_files(cpp_file_list ${SOURCE_DIR}/*.cpp)
 recurse_files(c_file_list ${SOURCE_DIR}/*.c)
 
+recurse_files(src_inline_hook_beatsaber_hook_local_extra_c ${EXTERN_DIR}/includes/beatsaber-hook/shared/inline-hook/*.c)
+recurse_files(src_inline_hook_beatsaber_hook_local_extra_cpp ${EXTERN_DIR}/includes/beatsaber-hook/shared/inline-hook/*.cpp)
+
 # add all src files to compile
-add_library(${COMPILE_ID} SHARED ${cpp_file_list} ${c_file_list})
+add_library(${COMPILE_ID} SHARED ${cpp_file_list} ${c_file_list} ${src_inline_hook_beatsaber_hook_local_extra_c} ${src_inline_hook_beatsaber_hook_local_extra_cpp})
 
 target_include_directories(${COMPILE_ID} PRIVATE .)
 

cover.png

@@ -3,10 +3,10 @@
 #include "HMUI/ViewController.hpp"
 #include "config-utils/shared/config-utils.hpp"
 
-DECLARE_CONFIG(Config,
+DECLARE_CONFIG(Config) {
     CONFIG_VALUE(ShowWarning, bool, "Show Warning", false, "Shows the health warning when the game launches");
     CONFIG_VALUE(OverrideLength, bool, "Override Scene Transitions", true, "Forces all scene transitions to be a specific duration");
     CONFIG_VALUE(TransitionLength, float, "Scene Transitions Length", 0.2, "The duration to force for all transitions");
-)
+};
 
 void SettingsDidActivate(HMUI::ViewController* self, bool firstActivation, bool addedToHierarchy, bool screenSystemEnabling);

include/settings.hpp

@@ -6,7 +6,7 @@
   "version": "${version}",
   "modloader": "Scotland2",
   "packageId": "com.beatgames.beatsaber",
-  "packageVersion": "1.37.0_9064817954",
+  "packageVersion": "1.40.2_4113",
   "description": "Speed up or remove boring transitions in the game",
   "coverImage": "cover.png",
   "dependencies": [],

mod.template.json

@@ -1,10 +1,12 @@
 {
+  "$schema": "https://raw.githubusercontent.com/QuestPackageManager/QPM.Package/refs/heads/main/qpm.schema.json",
+  "version": "0.4.0",
   "sharedDir": "shared",
   "dependenciesDir": "extern",
   "info": {
     "name": "Transitions",
     "id": "transitions",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "url": null,
     "additionalData": {
       "overrideSoName": "libtransitions.so"
@@ -36,52 +38,51 @@
         "pwsh ./scripts/pull-tombstone.ps1 -analyze"
       ]
     },
-    "qmodIncludeDirs": [],
+    "ndk": "^27.2.12479018",
+    "qmodIncludeDirs": [
+      "build",
+      "extern/libs"
+    ],
     "qmodIncludeFiles": [],
     "qmodOutput": null
   },
   "dependencies": [
     {
       "id": "beatsaber-hook",
-      "versionRange": "^5.1.9",
-      "additionalData": {
-        "extraFiles": [
-          "src/inline-hook"
-        ]
-      }
+      "versionRange": "^6.4.0",
+      "additionalData": {}
     },
     {
-      "id": "scotland2",
-      "versionRange": "^0.1.0",
-      "additionalData": {
-        "includeQmod": false
-      }
+      "id": "bs-cordl",
+      "versionRange": "^4020.0.0",
+      "additionalData": {}
     },
     {
-      "id": "config-utils",
-      "versionRange": "^1.1.0",
+      "id": "bsml",
+      "versionRange": "^0.4.49",
       "additionalData": {}
     },
     {
-      "id": "bsml",
-      "versionRange": "^0.4.18",
+      "id": "config-utils",
+      "versionRange": "^2.0.2",
       "additionalData": {}
     },
     {
       "id": "custom-types",
-      "versionRange": "^0.17.10",
+      "versionRange": "^0.18.2",
       "additionalData": {}
     },
     {
-      "id": "bs-cordl",
-      "versionRange": "^3700.0.0",
+      "id": "paper2_scotland2",
+      "versionRange": "^4.5.0",
       "additionalData": {}
     },
     {
-      "id": "paper",
-      "versionRange": "^3.6.1",
-      "additionalData": {}
+      "id": "scotland2",
+      "versionRange": "^0.1.6",
+      "additionalData": {
+        "includeQmod": false
+      }
     }
-  ],
-  "additionalData": {}
-}
+  ]
+}