Skip to content

Commit

Permalink
V6.3.2: Update for 1.37.0 (#3)
Browse files Browse the repository at this point in the history 
* Fix crash with SongDownloader

* ChatPlexSDK: Fix documentation

* Add Vector3RotateTowards

* Fix MonoPtr life check

* Update qpm.json

* Update game version

* UI: Fix game level details widget

* Game: Fix mapping capabilities detection

* Font manager hotfix until proper unstripped libunity.so

* UI: Flix Dropdown / Slider / TextInput disabled style

* Implement a proxy for Application::OpenURL

* Bump version 6.3.2
  • Loading branch information
@hardcpp
hardcpp authored Aug 22, 2024
1 parent 021facb commit 6d5bfab
Show file tree
Hide file tree
Showing 22 changed files with 294 additions and 129 deletions.
3 changes: 2 additions & 1 deletion .vscode/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@
"__std_stream": "cpp",
"memory_resource": "cpp",
"ranges": "cpp",
"__verbose_abort": "cpp"
"__verbose_abort": "cpp",
"numbers": "cpp"
},
"editor.formatOnSave": false,
"editor.trimAutoWhitespace": true,
Expand Down
20 changes: 10 additions & 10 deletions mod.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,39 @@
"id": "chatplex-sdk-bs",
"modloader": "Scotland2",
"author": "HardCPP",
"version": "6.3.1",
"version": "6.3.2",
"packageId": "com.beatgames.beatsaber",
"packageVersion": "1.35.0_8016709773",
"packageVersion": "1.37.0_9064817954",
"description": "ChatPlex BeatSaber modding SDK (Dependence for other mods)",
"coverImage": "cover.png",
"dependencies": [
{
"version": "^0.17.6",
"version": "^0.17.8",
"id": "custom-types",
"downloadIfMissing": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.8/CustomTypes.qmod"
"downloadIfMissing": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.10/CustomTypes.qmod"
},
{
"version": "^0.4.20",
"version": "^0.4.34",
"id": "bsml",
"downloadIfMissing": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.41/BSML.qmod"
"downloadIfMissing": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.43/BSML.qmod"
},
{
"version": "^1.1.9",
"version": "^1.1.12",
"id": "songcore",
"downloadIfMissing": "https://github.com/raineio/Quest-SongCore/releases/download/v1.1.9/SongCore.qmod"
"downloadIfMissing": "https://github.com/raineio/Quest-SongCore/releases/download/v1.1.15/SongCore.qmod"
},
{
"version": "^3.6.3",
"id": "paper",
"downloadIfMissing": "https://github.com/Fernthedev/paperlog/releases/download/v3.6.3/paperlog.qmod"
"downloadIfMissing": "https://github.com/Fernthedev/paperlog/releases/download/v3.6.4/paperlog.qmod"
}
],
"modFiles": [],
"lateModFiles": [
"libchatplex-sdk-bs.so"
],
"libraryFiles": [
"libbeatsaber-hook_5_1_7.so"
"libbeatsaber-hook_5_1_9.so"
],
"fileCopies": [],
"copyExtensions": []
Expand Down
2 changes: 1 addition & 1 deletion mod.template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"author": "HardCPP",
"version": "${version}",
"packageId": "com.beatgames.beatsaber",
"packageVersion": "1.35.0_8016709773",
"packageVersion": "1.37.0_9064817954",
"description": "ChatPlex BeatSaber modding SDK (Dependence for other mods)",
"coverImage": "cover.png",
"dependencies": [],
Expand Down
12 changes: 6 additions & 6 deletions qpm.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"info": {
"name": "ChatPlexSDK-BS",
"id": "chatplex-sdk-bs",
"version": "6.3.1",
"version": "6.3.2",
"url": "https://github.com/hardcpp/QuestChatPlexSDK-BS",
"additionalData": {
"overrideSoName": "libchatplex-sdk-bs.so",
Expand Down Expand Up @@ -40,17 +40,17 @@
"dependencies": [
{
"id": "beatsaber-hook",
"versionRange": "^5.1.6",
"versionRange": "^5.1.9",
"additionalData": {}
},
{
"id": "bs-cordl",
"versionRange": "^3500.0.0",
"versionRange": "^3700.*",
"additionalData": {}
},
{
"id": "custom-types",
"versionRange": "^0.17.6",
"versionRange": "^0.17.8",
"additionalData": {}
},
{
Expand All @@ -63,7 +63,7 @@
},
{
"id": "bsml",
"versionRange": "^0.4.20",
"versionRange": "^0.4.34",
"additionalData": {
"private": true
}
Expand All @@ -75,7 +75,7 @@
},
{
"id": "songcore",
"versionRange": "^1.1.9",
"versionRange": "^1.1.12",
"additionalData": {
"private": true
}
Expand Down
77 changes: 39 additions & 38 deletions qpm.shared.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"info": {
"name": "ChatPlexSDK-BS",
"id": "chatplex-sdk-bs",
"version": "6.3.1",
"version": "6.3.2",
"url": "https://github.com/hardcpp/QuestChatPlexSDK-BS",
"additionalData": {
"overrideSoName": "libchatplex-sdk-bs.so",
Expand Down Expand Up @@ -44,17 +44,17 @@
"dependencies": [
{
"id": "beatsaber-hook",
"versionRange": "^5.1.6",
"versionRange": "^5.1.9",
"additionalData": {}
},
{
"id": "bs-cordl",
"versionRange": "^3500.0.0",
"versionRange": "3700.*",
"additionalData": {}
},
{
"id": "custom-types",
"versionRange": "^0.17.6",
"versionRange": "^0.17.8",
"additionalData": {}
},
{
Expand All @@ -67,7 +67,7 @@
},
{
"id": "bsml",
"versionRange": "^0.4.20",
"versionRange": "^0.4.34",
"additionalData": {
"private": true
}
Expand All @@ -79,7 +79,7 @@
},
{
"id": "songcore",
"versionRange": "^1.1.9",
"versionRange": "^1.1.12",
"additionalData": {
"private": true
}
Expand Down Expand Up @@ -107,13 +107,13 @@
{
"dependency": {
"id": "paper",
"versionRange": "=3.6.3",
"versionRange": "=3.6.4",
"additionalData": {
"soLink": "https://github.com/Fernthedev/paperlog/releases/download/v3.6.3/libpaperlog.so",
"debugSoLink": "https://github.com/Fernthedev/paperlog/releases/download/v3.6.3/debug_libpaperlog.so",
"soLink": "https://github.com/Fernthedev/paperlog/releases/download/v3.6.4/libpaperlog.so",
"debugSoLink": "https://github.com/Fernthedev/paperlog/releases/download/v3.6.4/debug_libpaperlog.so",
"overrideSoName": "libpaperlog.so",
"modLink": "https://github.com/Fernthedev/paperlog/releases/download/v3.6.3/paperlog.qmod",
"branchName": "version/v3_6_3",
"modLink": "https://github.com/Fernthedev/paperlog/releases/download/v3.6.4/paperlog.qmod",
"branchName": "version/v3_6_4",
"compileOptions": {
"systemIncludes": [
"shared/utfcpp/source"
Expand All @@ -122,7 +122,7 @@
"cmake": false
}
},
"version": "3.6.3"
"version": "3.6.4"
},
{
"dependency": {
Expand All @@ -138,28 +138,28 @@
{
"dependency": {
"id": "bsml",
"versionRange": "=0.4.41",
"versionRange": "=0.4.43",
"additionalData": {
"soLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.41/libbsml.so",
"debugSoLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.41/debug_libbsml.so",
"soLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.43/libbsml.so",
"debugSoLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.43/debug_libbsml.so",
"overrideSoName": "libbsml.so",
"modLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.41/BSML.qmod",
"branchName": "version/v0_4_41",
"modLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.43/BSML.qmod",
"branchName": "version/v0_4_43",
"cmake": true
}
},
"version": "0.4.41"
"version": "0.4.43"
},
{
"dependency": {
"id": "custom-types",
"versionRange": "=0.17.8",
"versionRange": "=0.17.10",
"additionalData": {
"soLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.8/libcustom-types.so",
"debugSoLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.8/debug_libcustom-types.so",
"soLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.10/libcustom-types.so",
"debugSoLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.10/debug_libcustom-types.so",
"overrideSoName": "libcustom-types.so",
"modLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.8/CustomTypes.qmod",
"branchName": "version/v0_17_8",
"modLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.10/CustomTypes.qmod",
"branchName": "version/v0_17_10",
"compileOptions": {
"cppFlags": [
"-Wno-invalid-offsetof"
Expand All @@ -168,7 +168,7 @@
"cmake": true
}
},
"version": "0.17.8"
"version": "0.17.10"
},
{
"dependency": {
Expand All @@ -190,10 +190,10 @@
{
"dependency": {
"id": "bs-cordl",
"versionRange": "=3500.0.0",
"versionRange": "=3700.0.0",
"additionalData": {
"headersOnly": true,
"branchName": "version/v3500_0_0",
"branchName": "version/v3700_0_0",
"compileOptions": {
"includePaths": [
"include"
Expand All @@ -208,7 +208,7 @@
}
}
},
"version": "3500.0.0"
"version": "3700.0.0"
},
{
"dependency": {
Expand All @@ -225,29 +225,30 @@
{
"dependency": {
"id": "songcore",
"versionRange": "=1.1.9",
"versionRange": "=1.1.15",
"additionalData": {
"soLink": "https://github.com/raineio/Quest-SongCore/releases/download/v1.1.9/libsongcore.so",
"debugSoLink": "https://github.com/raineio/Quest-SongCore/releases/download/v1.1.9/debug_libsongcore.so",
"soLink": "https://github.com/raineio/Quest-SongCore/releases/download/v1.1.15/libsongcore.so",
"debugSoLink": "https://github.com/raineio/Quest-SongCore/releases/download/v1.1.15/debug_libsongcore.so",
"overrideSoName": "libsongcore.so",
"modLink": "https://github.com/raineio/Quest-SongCore/releases/download/v1.1.9/SongCore.qmod",
"branchName": "version/v1_1_9"
"modLink": "https://github.com/raineio/Quest-SongCore/releases/download/v1.1.15/SongCore.qmod",
"branchName": "version/v1_1_15",
"cmake": true
}
},
"version": "1.1.9"
"version": "1.1.15"
},
{
"dependency": {
"id": "beatsaber-hook",
"versionRange": "=5.1.7",
"versionRange": "=5.1.9",
"additionalData": {
"soLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v5.1.7/libbeatsaber-hook_5_1_7.so",
"debugSoLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v5.1.7/debug_libbeatsaber-hook_5_1_7.so",
"branchName": "version/v5_1_7",
"soLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v5.1.9/libbeatsaber-hook_5_1_9.so",
"debugSoLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v5.1.9/debug_libbeatsaber-hook_5_1_9.so",
"branchName": "version/v5_1_9",
"cmake": true
}
},
"version": "5.1.7"
"version": "5.1.9"
},
{
"dependency": {
Expand Down
33 changes: 19 additions & 14 deletions shared/CP_SDK/ChatPlexSDK.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ namespace CP_SDK {
CP_SDK_NO_DEF_CTORS(ChatPlexSDK);

public:
/// Logger instance
static Logging::ILogger* Logger() { return m_Logger; }

static std::u16string_view ProductName() { return m_ProductName; }
Expand All @@ -49,38 +48,44 @@ namespace CP_SDK {
/// @param p_BasePath Base path for file storage
/// @param p_RenderPipeline Rendering pipeline
static void Configure(Logging::ILogger* p_Logger, std::u16string_view p_ProductName, std::string_view p_BasePath, ERenderPipeline p_RenderPipeline);
/// When the assembly is loaded
/// @brief When the assembly is loaded
static void OnAssemblyLoaded();
/// On assembly exit
/// @brief On assembly exit
static void OnAssemblyExit();

public:
/// When unity is ready
/// @brief When unity is ready
static void OnUnityReady();
/// When unity is exiting
/// @brief When unity is exiting
static void OnUnityExit();

public:
/// Register a module
/// @p_Module: Module instance
/// @brief Register a module
/// @param p_Module: Module instance
static void RegisterModule(IModuleBase* p_Module);
/// Init all the available modules
/// @brief Init all the available modules
static void InitModules();
/// Stop modules
/// @brief Stop modules
static void StopModules();
/// Get modules
/// @brief Get modules
/// @return Const reference of a list containing the modules
static const std::vector<IModuleBase*> & GetModules() { return m_Modules; }

public:
/// On generic menu scene
/// @brief Open an URL on the system
/// @param p_URL URL to open
static void OpenURL(std::u16string_view p_URL);

public:
/// @brief On generic menu scene
static void Fire_OnGenericMenuSceneLoaded();
/// On generic menu scene
/// @brief On generic menu scene
static void Fire_OnGenericMenuScene();
/// On generic play scene
/// @brief On generic play scene
static void Fire_OnGenericPlayingScene();

private:
/// Install WEBP codecs
/// @brief Install WEBP codecs
static void InstallWEBPCodecs();

private:
Expand Down
1 change: 1 addition & 0 deletions shared/CP_SDK/UI/UISystem.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ namespace CP_SDK::UI {
static _u::Color TooltipBGColor;

static _u::Color TextColor;
static _u::Color TextColorDisabled;

public:
static SafePtr<_u::Type> Override_UnityComponent_Image;
Expand Down
Loading

0 comments on commit 6d5bfab

Please sign in to comment.