Merge pull request #15 from DanTheMan827-BeatSaber/dev/1.40.7_7060

Bump for 1.40.7_7060

Author: vcmikuu

include/assets.hpp

@@ -4,6 +4,10 @@
 
 #include "beatsaber-hook/shared/utils/typedefs.h"
 
+#if __has_include("bsml/shared/Helpers/utilities.hpp")
+#include "bsml/shared/Helpers/utilities.hpp"
+#endif
+
 struct IncludedAsset {
     IncludedAsset(uint8_t* start, uint8_t* end) : array(reinterpret_cast<Array<uint8_t>*>(start)) {
         array->klass = nullptr;
@@ -36,7 +40,7 @@ struct IncludedAsset {
     Array<uint8_t>* array;
 };
 
-#define PNG_SPRITE(name) BSML::Utilities::LoadSpriteRaw(static_cast<ArrayW<uint8_t>>(IncludedAssets::name##_png))
+#define PNG_SPRITE(asset) BSML::Utilities::LoadSpriteRaw(static_cast<ArrayW<uint8_t>>(asset))
 
 /**
  * Namespace containing all embedded assets.

mod.template.json

@@ -7,7 +7,7 @@
   "author": "laynia",
   "version": "${version}",
   "packageId": "com.beatgames.beatsaber",
-  "packageVersion": "1.40.6_6407",
+  "packageVersion": "1.40.7_7060",
   "description": "Expands the song artwork to cover the right side of the level select.",
   "dependencies": [],
   "modFiles": [

qpm.json

@@ -86,12 +86,12 @@
     },
     {
       "id": "bs-cordl",
-      "versionRange": "4006.*",
+      "versionRange": "4007.*",
       "additionalData": {}
     },
     {
       "id": "bsml",
-      "versionRange": "^0.4.53",
+      "versionRange": "^0.4.54",
       "additionalData": {}
     },
     {

qpm.shared.json

@@ -7,7 +7,7 @@
     "info": {
       "name": "ImageCoverExpander",
       "id": "imagecoverexpander",
-      "version": "0.2.0",
+      "version": "0.2.2",
       "url": null,
       "additionalData": {
         "overrideSoName": "libimagecoverexpander.so",
@@ -87,12 +87,12 @@
       },
       {
         "id": "bs-cordl",
-        "versionRange": "4006.*",
+        "versionRange": "4007.*",
         "additionalData": {}
       },
       {
         "id": "bsml",
-        "versionRange": "^0.4.53",
+        "versionRange": "^0.4.54",
         "additionalData": {}
       },
       {
@@ -159,10 +159,10 @@
     {
       "dependency": {
         "id": "bs-cordl",
-        "versionRange": "=4006.0.0",
+        "versionRange": "=4007.0.0",
         "additionalData": {
           "headersOnly": true,
-          "branchName": "version/v4006_0_0",
+          "branchName": "version/v4007_0_0",
           "compileOptions": {
             "includePaths": [
               "include"
@@ -178,7 +178,7 @@
           }
         }
       },
-      "version": "4006.0.0"
+      "version": "4007.0.0"
     },
     {
       "dependency": {
@@ -295,17 +295,17 @@
     {
       "dependency": {
         "id": "bsml",
-        "versionRange": "=0.4.53",
+        "versionRange": "=0.4.54",
         "additionalData": {
-          "soLink": "https://github.com/bsq-ports/Quest-BSML/releases/download/v0.4.53/libbsml.so",
-          "debugSoLink": "https://github.com/bsq-ports/Quest-BSML/releases/download/v0.4.53/debug_libbsml.so",
+          "soLink": "https://github.com/bsq-ports/Quest-BSML/releases/download/v0.4.54/libbsml.so",
+          "debugSoLink": "https://github.com/bsq-ports/Quest-BSML/releases/download/v0.4.54/debug_libbsml.so",
           "overrideSoName": "libbsml.so",
-          "modLink": "https://github.com/bsq-ports/Quest-BSML/releases/download/v0.4.53/BSML.qmod",
-          "branchName": "version/v0_4_53",
+          "modLink": "https://github.com/bsq-ports/Quest-BSML/releases/download/v0.4.54/BSML.qmod",
+          "branchName": "version/v0_4_54",
           "cmake": true
         }
       },
-      "version": "0.4.53"
+      "version": "0.4.54"
     },
     {
       "dependency": {