Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.22)
option(QUEST "Build for quest" ON)

# Globals
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED 20)
set(CMAKE_CXX_STANDARD 23)
set(CMAKE_CXX_STANDARD_REQUIRED 23)
set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)

set(SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
Expand Down
4 changes: 2 additions & 2 deletions include/Helpers/getMainFlowCoordinator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
*/
inline GlobalNamespace::MainFlowCoordinator* GetMainFlowCoordinator() {
auto flowCoordinators = UnityEngine::Resources::FindObjectsOfTypeAll<GlobalNamespace::MainFlowCoordinator*>();
if (flowCoordinators->get_Length() > 0) {
return flowCoordinators.get(0);
if (flowCoordinators.size() > 0) {
return flowCoordinators[0];
}

return nullptr;
Expand Down
16 changes: 16 additions & 0 deletions include/assets.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@

#include <string_view>

#if __has_include("beatsaber-hook/shared/utils/typedefs.h")
#include "beatsaber-hook/shared/utils/typedefs.h"
#else
#include "beatsaber-hook/shared/utils.hpp"
#endif

#if __has_include("bsml/shared/Helpers/utilities.hpp")
#include "bsml/shared/Helpers/utilities.hpp"
Expand All @@ -23,16 +27,28 @@ struct IncludedAsset {
}

operator std::string_view() const {
#if __has_include("beatsaber-hook/shared/utils/typedefs.h")
return {reinterpret_cast<char*>(array->_values), array->get_Length()};
#else
return {reinterpret_cast<char*>(array->_values), array->max_length};
#endif
}

operator std::span<uint8_t>() const {
#if __has_include("beatsaber-hook/shared/utils/typedefs.h")
return {array->_values, array->get_Length()};
#else
return {array->_values, array->max_length};
#endif
}

void init() const {
if (!array->klass) {
#if __has_include("beatsaber-hook/shared/utils/typedefs.h")
array->klass = classof(Array<uint8_t>*);
#else
array->klass = i2c::class_of<Array<uint8_t>*>();
#endif
}
}

Expand Down
2 changes: 1 addition & 1 deletion mod.template.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"author": "laynia",
"version": "${version}",
"packageId": "com.beatgames.beatsaber",
"packageVersion": "1.44.2_21558",
"packageVersion": "1.45.3_30054",
"description": "Expands the song artwork to cover the right side of the level select.",
"dependencies": [],
"modFiles": [
Expand Down
28 changes: 19 additions & 9 deletions qpm.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"pwsh ./scripts/update-version.ps1 $0:?"
]
},
"ndk": "^27.3.13750724",
"ndk": "^29.0.14206865",
"qmodIncludeDirs": [
"./build",
"./extern/libs"
Expand All @@ -81,37 +81,47 @@
},
{
"id": "beatsaber-hook",
"versionRange": "^8.0.1",
"versionRange": "^9.3.0",
"additionalData": {}
},
{
"id": "bs-cordl",
"versionRange": "4402.*",
"versionRange": "4503.*",
"additionalData": {}
},
{
"id": "bsml",
"versionRange": "^0.5.3",
"versionRange": "^0.6.5",
"additionalData": {}
},
{
"id": "config-utils",
"versionRange": "^2.0.4",
"versionRange": "^3.0.0",
"additionalData": {}
},
{
"id": "custom-types",
"versionRange": "^0.20.0",
"versionRange": "^0.21.2",
"additionalData": {}
},
{
"id": "flamingo",
"versionRange": "^1.2.1",
"additionalData": {}
},
{
"id": "mmkay",
"versionRange": "^0.2.1",
"versionRange": "^0.2.2",
"additionalData": {}
},
{
"id": "paper2_scotland2",
"versionRange": "^4.6.5",
"versionRange": "^4.8.0",
"additionalData": {}
},
{
"id": "reflectcpp",
"versionRange": "^0.25.0",
"additionalData": {}
},
{
Expand All @@ -122,4 +132,4 @@
}
}
]
}
}
Loading
Loading