Skip to content

Commit 5e832c4

Browse files
hardcpphardcpp
committed
Merge branch 'dev'
2 parents c82cefb + 810b3a8 commit 5e832c4

22 files changed

+68
-58
lines changed

‎.github/workflows/build-ndk.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ jobs:
5050
restore: true
5151
cache: true
5252
publish: false
53+
qpm_qmod: ${{ env.qmodName }}
5354

5455
- name: Build & Create Qmod
5556
run: |
@@ -62,7 +63,7 @@ jobs:
6263
cd ./build/
6364
pattern="lib${module_id}*.so"
6465
files=( $pattern )
65-
echo "NAME=${files[0]}" >> ${GITHUB_OUTPUT}
66+
echo "NAME=${files[0]}" >> $GITHUB_OUTPUT
6667
6768
- name: Upload non-debug artifact
6869
uses: actions/upload-artifact@v2

‎.github/workflows/publish.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ jobs:
3131
id: get_tag_version
3232
run: |
3333
echo ${GITHUB_REF#refs/tags/}
34-
echo "TAG=${GITHUB_REF#refs/tags/}" >> ${GITHUB_OUTPUT}
35-
echo "VERSION=${GITHUB_REF#refs/tags/v}" >> ${GITHUB_OUTPUT}
34+
echo TAG="${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
35+
echo VERSION="${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
3636
3737
- name: Setup qpm
3838
uses: Fernthedev/qpm-action@main
@@ -45,7 +45,7 @@ jobs:
4545
tag: ${{ steps.get_tag_version.outputs.TAG }}
4646
qpm_release_bin: true
4747
qpm_debug_bin: true
48-
qpm_mod: ${{ env.qmod_name }}
48+
qpm_qmod: ${{ env.qmodName }}
4949

5050
- name: Build & Create Qmod
5151
run: |
@@ -56,8 +56,7 @@ jobs:
5656
uses: octokit/request-action@v2.x
5757
id: get_release
5858
with:
59-
route: GET /repos/:repository/releases/tags/${{ steps.get_tag_version.outputs.TAG }}
60-
repository: ${{ github.repository }}
59+
route: GET /repos/${{ github.repository }}/releases/tags/${{ steps.get_tag_version.outputs.TAG }}
6160
env:
6261
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6362

@@ -66,7 +65,7 @@ jobs:
6665
run: |
6766
url=$(echo "$response" | jq -r '.upload_url')
6867
echo $url
69-
echo "::set-output name=upload_url::$url"
68+
echo upload_url="$url" >> $GITHUB_OUTPUT
7069
env:
7170
response: ${{ steps.get_release.outputs.data }}
7271

@@ -76,8 +75,9 @@ jobs:
7675
cd ./build/
7776
pattern="lib${module_id}*.so"
7877
files=( $pattern )
79-
echo ::set-output name=NAME::"${files[0]}"
78+
echo NAME="${files[0]}" >> $GITHUB_OUTPUT
8079
80+
# Upload our release assets
8181
- name: Upload Release Asset
8282
id: upload_release_asset
8383
uses: actions/upload-release-asset@v1
@@ -100,13 +100,13 @@ jobs:
100100
asset_name: debug_${{ steps.libname.outputs.NAME }}
101101
asset_content_type: application/octet-stream
102102

103-
- name: Upload Qmod Asset
103+
- name: Upload Qmod asset
104104
id: upload_qmod_asset
105105
uses: actions/upload-release-asset@v1
106106
env:
107107
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
108108
with:
109109
upload_url: ${{ steps.get_upload_url.outputs.upload_url }}
110-
asset_path: ./${{env.qmodName}}.qmod
111-
asset_name: ${{env.qmodName}}.qmod
112-
asset_content_type: application/octet-stream
110+
asset_path: ./${{ env.qmodName }}.qmod
111+
asset_name: ${{ env.qmodName }}.qmod
112+
asset_content_type: application/octet-stream

‎cover.png‎

78.6 KB
Loading

‎createqmod.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ foreach ($mod in $modJson.modFiles) {
3434
}
3535

3636
foreach ($lib in $modJson.libraryFiles) {
37-
if ($lib -eq "libchatplex-sdk-bs.so") {
38-
Continue
39-
}
37+
#if ($lib -eq "libchatplex-sdk-bs.so") {
38+
# Continue
39+
#}
4040

4141

4242
$path = "./build/" + $lib

‎mod.template.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"packageId": "com.beatgames.beatsaber",
99
"packageVersion": "1.28.0_4124311467",
1010
"description": "Feel good!",
11+
"coverImage": "cover.png",
1112
"dependencies": [],
1213
"modFiles": [],
1314
"libraryFiles": [],

‎qpm.json‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"info": {
55
"name": "QBeatSaberPlus-MenuMusic",
66
"id": "qbeatsaberplus-menumusic",
7-
"version": "0.1.1-v6.2.0",
7+
"version": "1.0.0-v6.2.0",
88
"url": "https://github.com/hardcpp/QBeatSaberPlus-MenuMusic",
99
"additionalData": {
1010
"overrideSoName": "libqbeatsaberplus-menumusic.so"
@@ -47,8 +47,10 @@
4747
},
4848
{
4949
"id": "chatplex-sdk-bs",
50-
"versionRange": "^0.1.1-v6.2.0",
51-
"additionalData": {}
50+
"versionRange": "^1.0.0-v6.2.0",
51+
"additionalData": {
52+
"private": true
53+
}
5254
}
5355
],
5456
"workspace": {

‎qpm.shared.json‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"info": {
66
"name": "QBeatSaberPlus-MenuMusic",
77
"id": "qbeatsaberplus-menumusic",
8-
"version": "0.1.1-v6.2.0",
8+
"version": "1.0.0-v6.2.0",
99
"url": "https://github.com/hardcpp/QBeatSaberPlus-MenuMusic",
1010
"additionalData": {
1111
"overrideSoName": "libqbeatsaberplus-menumusic.so"
@@ -48,28 +48,30 @@
4848
},
4949
{
5050
"id": "chatplex-sdk-bs",
51-
"versionRange": "^0.1.1-v6.2.0",
52-
"additionalData": {}
51+
"versionRange": "^1.0.0-v6.2.0",
52+
"additionalData": {
53+
"private": true
54+
}
5355
}
5456
],
5557
"workspace": {
5658
"scripts": {
59+
"qmod": [
60+
"pwsh ./build.ps1 -clean",
61+
"qpm qmod build",
62+
"pwsh ./createqmod.ps1 -clean"
63+
],
5764
"build": [
5865
"pwsh ./build.ps1"
5966
],
60-
"clean": [
61-
"pwsh ./build.ps1 -clean"
67+
"log": [
68+
"pwsh ./start-logging.ps1"
6269
],
6370
"copy": [
6471
"pwsh ./copy.ps1"
6572
],
66-
"log": [
67-
"pwsh ./start-logging.ps1"
68-
],
69-
"qmod": [
70-
"pwsh ./build.ps1 -clean",
71-
"qpm qmod build",
72-
"pwsh ./createqmod.ps1 -clean"
73+
"clean": [
74+
"pwsh ./build.ps1 -clean"
7375
]
7476
}
7577
}
@@ -100,13 +102,17 @@
100102
{
101103
"dependency": {
102104
"id": "chatplex-sdk-bs",
103-
"versionRange": "=0.1.1-v6.2.0",
105+
"versionRange": "=1.0.0-v6.2.0",
104106
"additionalData": {
107+
"soLink": "https://github.com/hardcpp/QuestChatPlexSDK-BS/releases/download/v1.0.0-v6.2.0/libchatplex-sdk-bs.so",
108+
"debugSoLink": "https://github.com/hardcpp/QuestChatPlexSDK-BS/releases/download/v1.0.0-v6.2.0/debug_libchatplex-sdk-bs.so",
105109
"overrideSoName": "libchatplex-sdk-bs.so",
110+
"modLink": "https://github.com/hardcpp/QuestChatPlexSDK-BS/releases/download/v1.0.0-v6.2.0/ChatPlexSDK-BS",
111+
"branchName": "version/v1_0_0-v6_2_0",
106112
"cmake": true
107113
}
108114
},
109-
"version": "0.1.1-v6.2.0"
115+
"version": "1.0.0-v6.2.0"
110116
},
111117
{
112118
"dependency": {

‎shared/ChatPlexMod_MenuMusic/Data/CustomMusicProvider.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace ChatPlexMod_MenuMusic { namespace Data {
99
/// @brief Music provider interface
1010
class CustomMusicProvider : public IMusicProvider, public std::enable_shared_from_this<CustomMusicProvider>
1111
{
12-
DISABLE_COPY_MOVECONSTRUCTORS(CustomMusicProvider);
12+
CP_SDK_NO_COPYMOVE_CTORS(CustomMusicProvider);
1313

1414
private:
1515
std::vector<std::shared_ptr<Music>> m_Musics;

‎shared/ChatPlexMod_MenuMusic/Data/GameMusicProvider.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace ChatPlexMod_MenuMusic { namespace Data {
99
/// @brief Music provider interface
1010
class GameMusicProvider : public IMusicProvider
1111
{
12-
DISABLE_COPY_MOVECONSTRUCTORS(GameMusicProvider);
12+
CP_SDK_NO_COPYMOVE_CTORS(GameMusicProvider);
1313

1414
private:
1515
std::vector<std::shared_ptr<Music>> m_Musics;

‎shared/ChatPlexMod_MenuMusic/Data/IMusicProvider.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ namespace ChatPlexMod_MenuMusic { namespace Data {
1414
/// @brief Music provider interface
1515
class IMusicProvider
1616
{
17-
DISABLE_COPY_MOVECONSTRUCTORS(IMusicProvider);
17+
CP_SDK_NO_COPYMOVE_CTORS(IMusicProvider);
1818

1919
protected:
20-
PRIVATE_TAG();
20+
CP_SDK_PRIV_TAG();
2121

2222
public:
2323
virtual MusicProviderType::E Type() = 0;
@@ -29,7 +29,7 @@ namespace ChatPlexMod_MenuMusic { namespace Data {
2929
using Ptr = std::shared_ptr<IMusicProvider>;
3030

3131
/// @brief Constructor
32-
IMusicProvider(PRIVATE_TAG_ARG());
32+
IMusicProvider(CP_SDK_PRIV_TAG_ARG());
3333
/// @brief Destructor
3434
virtual ~IMusicProvider();
3535

0 commit comments

Comments
 (0)