Skip to content

Commit 421ed47

Browse files
TychoTheTacoTychoTheTaco
committed
Replaced Kaleb
1 parent 5539606 commit 421ed47

16 files changed

+379
-17
lines changed

‎.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ venv/
88
/extern/
99

1010
# Auto-generated files
11-
/include/Assets.hpp
11+
/include/assets.hpp
1212
mod.json
13-
qpm.shared.json
1413
qpm_defines.cmake
1514

1615
# Crash dump

‎qpm.shared.json‎

Lines changed: 335 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,335 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/QuestPackageManager/QPM.Package/refs/heads/main/qpm.shared.schema.json",
3+
"config": {
4+
"version": "0.4.0",
5+
"sharedDir": "shared",
6+
"dependenciesDir": "extern",
7+
"info": {
8+
"name": "Spotify Search",
9+
"id": "spotify-search",
10+
"version": "1.1.2",
11+
"url": "https://github.com/TychoTheTaco/Beat-Saber-Spotify-Search",
12+
"additionalData": {
13+
"overrideSoName": "libspotify-search.so",
14+
"cmake": true
15+
}
16+
},
17+
"workspace": {
18+
"scripts": {},
19+
"qmodIncludeDirs": [
20+
"./build",
21+
"./extern/libs"
22+
],
23+
"qmodIncludeFiles": [],
24+
"qmodOutput": "./Spotify Search.qmod"
25+
},
26+
"dependencies": [
27+
{
28+
"id": "beatsaber-hook",
29+
"versionRange": "^6.4.2",
30+
"additionalData": {}
31+
},
32+
{
33+
"id": "scotland2",
34+
"versionRange": "^0.1.4",
35+
"additionalData": {
36+
"includeQmod": false
37+
}
38+
},
39+
{
40+
"id": "bs-cordl",
41+
"versionRange": "^4008.0.0",
42+
"additionalData": {}
43+
},
44+
{
45+
"id": "paper2_scotland2",
46+
"versionRange": "^4.7.0",
47+
"additionalData": {}
48+
},
49+
{
50+
"id": "bsml",
51+
"versionRange": "^0.4.55",
52+
"additionalData": {}
53+
},
54+
{
55+
"id": "custom-types",
56+
"versionRange": "^0.18.4",
57+
"additionalData": {}
58+
},
59+
{
60+
"id": "web-utils",
61+
"versionRange": "^0.6.8",
62+
"additionalData": {}
63+
},
64+
{
65+
"id": "song-details",
66+
"versionRange": "^1.0.4",
67+
"additionalData": {}
68+
},
69+
{
70+
"id": "beatsaverplusplus",
71+
"versionRange": "^0.2.3",
72+
"additionalData": {}
73+
},
74+
{
75+
"id": "songcore",
76+
"versionRange": "^1.1.25",
77+
"additionalData": {}
78+
},
79+
{
80+
"id": "metacore",
81+
"versionRange": "^1.6.2",
82+
"additionalData": {}
83+
}
84+
]
85+
},
86+
"restoredDependencies": [
87+
{
88+
"dependency": {
89+
"id": "beatsaverplusplus",
90+
"versionRange": "=0.2.3",
91+
"additionalData": {
92+
"soLink": "https://github.com/bsq-ports/BeatSaverPlusPlus/releases/download/v0.2.3/libbeatsaverplusplus.so",
93+
"debugSoLink": "https://github.com/bsq-ports/BeatSaverPlusPlus/releases/download/v0.2.3/debug_libbeatsaverplusplus.so",
94+
"overrideSoName": "libbeatsaverplusplus.so",
95+
"modLink": "https://github.com/bsq-ports/BeatSaverPlusPlus/releases/download/v0.2.3/BeatSaverPlusPlus.qmod",
96+
"branchName": "version/v0_2_3",
97+
"cmake": false
98+
}
99+
},
100+
"version": "0.2.3"
101+
},
102+
{
103+
"dependency": {
104+
"id": "bs-cordl",
105+
"versionRange": "=4008.0.0",
106+
"additionalData": {
107+
"headersOnly": true,
108+
"branchName": "version/v4008_0_0",
109+
"compileOptions": {
110+
"includePaths": [
111+
"include"
112+
],
113+
"cppFeatures": [],
114+
"cppFlags": [
115+
"-DNEED_UNSAFE_CSHARP",
116+
"-fdeclspec",
117+
"-DUNITY_2021",
118+
"-DHAS_CODEGEN",
119+
"-Wno-invalid-offsetof"
120+
]
121+
}
122+
}
123+
},
124+
"version": "4008.0.0"
125+
},
126+
{
127+
"dependency": {
128+
"id": "metacore",
129+
"versionRange": "=1.6.2",
130+
"additionalData": {
131+
"soLink": "https://github.com/Metalit/MetaCore/releases/download/v1.6.2/libmetacore.so",
132+
"overrideSoName": "libmetacore.so",
133+
"modLink": "https://github.com/Metalit/MetaCore/releases/download/v1.6.2/MetaCore.qmod",
134+
"branchName": "version/v1_6_2",
135+
"cmake": true
136+
}
137+
},
138+
"version": "1.6.2"
139+
},
140+
{
141+
"dependency": {
142+
"id": "tinyxml2",
143+
"versionRange": "=10.0.0",
144+
"additionalData": {
145+
"soLink": "https://github.com/MillzyDev/NDK-tinyxml2/releases/download/v10.0.0/libtinyxml2.so",
146+
"debugSoLink": "https://github.com/MillzyDev/NDK-tinyxml2/releases/download/v10.0.0/debug_libtinyxml2.so",
147+
"overrideSoName": "libtinyxml2.so",
148+
"modLink": "https://github.com/MillzyDev/NDK-tinyxml2/releases/download/v10.0.0/tinyxml2.qmod",
149+
"branchName": "version/v10_0_0",
150+
"cmake": true
151+
}
152+
},
153+
"version": "10.0.0"
154+
},
155+
{
156+
"dependency": {
157+
"id": "fmt",
158+
"versionRange": "=11.0.2",
159+
"additionalData": {
160+
"headersOnly": true,
161+
"branchName": "version/v11_0_2",
162+
"compileOptions": {
163+
"systemIncludes": [
164+
"fmt/include/"
165+
],
166+
"cppFlags": [
167+
"-DFMT_HEADER_ONLY"
168+
]
169+
}
170+
}
171+
},
172+
"version": "11.0.2"
173+
},
174+
{
175+
"dependency": {
176+
"id": "web-utils",
177+
"versionRange": "=0.6.8",
178+
"additionalData": {
179+
"soLink": "https://github.com/bsq-ports/WebUtils/releases/download/v0.6.8/libweb-utils.so",
180+
"debugSoLink": "https://github.com/bsq-ports/WebUtils/releases/download/v0.6.8/debug_libweb-utils.so",
181+
"overrideSoName": "libweb-utils.so",
182+
"modLink": "https://github.com/bsq-ports/WebUtils/releases/download/v0.6.8/WebUtils.qmod",
183+
"branchName": "version/v0_6_8",
184+
"cmake": false
185+
}
186+
},
187+
"version": "0.6.8"
188+
},
189+
{
190+
"dependency": {
191+
"id": "scotland2",
192+
"versionRange": "=0.1.6",
193+
"additionalData": {
194+
"soLink": "https://github.com/sc2ad/scotland2/releases/download/v0.1.6/libsl2.so",
195+
"debugSoLink": "https://github.com/sc2ad/scotland2/releases/download/v0.1.6/debug_libsl2.so",
196+
"overrideSoName": "libsl2.so",
197+
"branchName": "version/v0_1_6"
198+
}
199+
},
200+
"version": "0.1.6"
201+
},
202+
{
203+
"dependency": {
204+
"id": "song-details",
205+
"versionRange": "=1.0.4",
206+
"additionalData": {
207+
"soLink": "https://github.com/bsq-ports/SongDetails/releases/download/v1.0.4/libsongdetails.so",
208+
"debugSoLink": "https://github.com/bsq-ports/SongDetails/releases/download/v1.0.4/debug_libsongdetails.so",
209+
"overrideSoName": "libsongdetails.so",
210+
"modLink": "https://github.com/bsq-ports/SongDetails/releases/download/v1.0.4/SongDetails.qmod",
211+
"branchName": "version/v1_0_4",
212+
"cmake": false
213+
}
214+
},
215+
"version": "1.0.4"
216+
},
217+
{
218+
"dependency": {
219+
"id": "libil2cpp",
220+
"versionRange": "=0.4.0",
221+
"additionalData": {
222+
"headersOnly": true,
223+
"compileOptions": {
224+
"systemIncludes": [
225+
"il2cpp/external/baselib/Include",
226+
"il2cpp/external/baselib/Platforms/Android/Include"
227+
]
228+
}
229+
}
230+
},
231+
"version": "0.4.0"
232+
},
233+
{
234+
"dependency": {
235+
"id": "custom-types",
236+
"versionRange": "=0.18.4",
237+
"additionalData": {
238+
"soLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.18.4/libcustom-types.so",
239+
"debugSoLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.18.4/debug_libcustom-types.so",
240+
"overrideSoName": "libcustom-types.so",
241+
"modLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.18.4/CustomTypes.qmod",
242+
"branchName": "version/v0_18_4",
243+
"compileOptions": {
244+
"cppFlags": [
245+
"-Wno-invalid-offsetof"
246+
]
247+
},
248+
"cmake": true
249+
}
250+
},
251+
"version": "0.18.4"
252+
},
253+
{
254+
"dependency": {
255+
"id": "rapidjson-macros",
256+
"versionRange": "=2.1.0",
257+
"additionalData": {
258+
"headersOnly": true,
259+
"branchName": "version/v2_1_0",
260+
"cmake": false
261+
}
262+
},
263+
"version": "2.1.0"
264+
},
265+
{
266+
"dependency": {
267+
"id": "paper2_scotland2",
268+
"versionRange": "=4.7.0",
269+
"additionalData": {
270+
"soLink": "https://github.com/Fernthedev/paperlog/releases/download/v4.7.0/libpaper2_scotland2.so",
271+
"overrideSoName": "libpaper2_scotland2.so",
272+
"modLink": "https://github.com/Fernthedev/paperlog/releases/download/v4.7.0/paper2_scotland2.qmod",
273+
"branchName": "version/v4_7_0",
274+
"compileOptions": {
275+
"systemIncludes": [
276+
"shared/utfcpp/source"
277+
]
278+
},
279+
"cmake": false
280+
}
281+
},
282+
"version": "4.7.0"
283+
},
284+
{
285+
"dependency": {
286+
"id": "beatsaber-hook",
287+
"versionRange": "=6.4.2",
288+
"additionalData": {
289+
"soLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v6.4.2/libbeatsaber-hook.so",
290+
"debugSoLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v6.4.2/debug_libbeatsaber-hook.so",
291+
"overrideSoName": "libbeatsaber-hook.so",
292+
"modLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v6.4.2/beatsaber-hook.qmod",
293+
"branchName": "version/v6_4_2",
294+
"compileOptions": {
295+
"cppFlags": [
296+
"-Wno-extra-qualification"
297+
]
298+
},
299+
"cmake": true
300+
}
301+
},
302+
"version": "6.4.2"
303+
},
304+
{
305+
"dependency": {
306+
"id": "songcore",
307+
"versionRange": "=1.1.25",
308+
"additionalData": {
309+
"soLink": "https://github.com/raineaeternal/Quest-SongCore/releases/download/v1.1.25/libsongcore.so",
310+
"debugSoLink": "https://github.com/raineaeternal/Quest-SongCore/releases/download/v1.1.25/debug_libsongcore.so",
311+
"overrideSoName": "libsongcore.so",
312+
"modLink": "https://github.com/raineaeternal/Quest-SongCore/releases/download/v1.1.25/SongCore.qmod",
313+
"branchName": "version/v1_1_25",
314+
"cmake": true
315+
}
316+
},
317+
"version": "1.1.25"
318+
},
319+
{
320+
"dependency": {
321+
"id": "bsml",
322+
"versionRange": "=0.4.55",
323+
"additionalData": {
324+
"soLink": "https://github.com/bsq-ports/Quest-BSML/releases/download/v0.4.55/libbsml.so",
325+
"debugSoLink": "https://github.com/bsq-ports/Quest-BSML/releases/download/v0.4.55/debug_libbsml.so",
326+
"overrideSoName": "libbsml.so",
327+
"modLink": "https://github.com/bsq-ports/Quest-BSML/releases/download/v0.4.55/BSML.qmod",
328+
"branchName": "version/v0_4_55",
329+
"cmake": true
330+
}
331+
},
332+
"version": "0.4.55"
333+
}
334+
]
335+
}

‎scripts/ndk-stack.ps1‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,6 @@ if (-not ($PSVersionTable.PSEdition -eq "Core")) {
2626
$stackScript += ".cmd"
2727
}
2828

29+
Write-Output "NDK PATH: $stackScript"
30+
2931
Get-Content $logName | & $stackScript -sym ./build/debug/

‎src/UI/ModalView.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include <bsml/shared/BSML.hpp>
44

5-
#include "Assets.hpp"
5+
#include "assets.hpp"
66
#include "Log.hpp"
77

88
DEFINE_TYPE(SpotifySearch::UI, ModalView);

‎src/UI/TableViewDataSources/CustomSongTableViewDataSource.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "UI/TableViewDataSources/CustomSongTableViewDataSource.hpp"
2-
#include "Assets.hpp"
2+
#include "assets.hpp"
33
#include "Log.hpp"
44
#include "UI/TableViewCells/CustomSongTableViewCell.hpp"
55

‎src/UI/TableViewDataSources/DownloadHistoryTableViewDataSource.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include <HMUI/Touchable.hpp>
44

5-
#include "Assets.hpp"
5+
#include "assets.hpp"
66
#include "Log.hpp"
77
#include "UI/TableViewCells/DownloadHistoryTableViewCell.hpp"
88

‎src/UI/TableViewDataSources/SpotifyPlaylistTableViewDataSource.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "HMUI/Touchable.hpp"
22
#include "bsml/shared/BSML/MainThreadScheduler.hpp"
33

4-
#include "Assets.hpp"
4+
#include "assets.hpp"
55
#include "Log.hpp"
66
#include "UI/TableViewCells/SpotifyPlaylistTableViewCell.hpp"
77
#include "UI/TableViewDataSources/SpotifyPlaylistTableViewDataSource.hpp"

‎src/UI/TableViewDataSources/SpotifyTrackTableViewDataSource.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "HMUI/Touchable.hpp"
22
#include "bsml/shared/BSML/MainThreadScheduler.hpp"
33

4-
#include "Assets.hpp"
4+
#include "assets.hpp"
55
#include "Log.hpp"
66
#include "UI/TableViewCells/SpotifyTrackTableViewCell.hpp"
77
#include "UI/TableViewDataSources/SpotifyTrackTableViewDataSource.hpp"

0 commit comments

Comments
 (0)