Merge pull request #8 from kodenamekrak/master

1.26.2
EnderdracheLP · Dec 28, 2022 · ce5d766 · ce5d766
2 parents f911893 + 2ed92c0
commit ce5d766
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 32 deletions.
diff --git a/include/Config.hpp b/include/Config.hpp
@@ -10,13 +10,4 @@ DECLARE_CONFIG(ModConfig,
     CONFIG_VALUE(AlwaysMpCode, bool, "AlwaysShowMpCode", false);
     CONFIG_VALUE(AlwaysUpdate, bool, "UpdateOnSongSelect", false);
     CONFIG_VALUE(LastChanged, int, "LastChanged", 0);
-
-    CONFIG_INIT_FUNCTION(
-        CONFIG_INIT_VALUE(DecimalsForNumbers);
-        CONFIG_INIT_VALUE(DontEnergy);
-        CONFIG_INIT_VALUE(DontMpCode);
-        CONFIG_INIT_VALUE(AlwaysMpCode);
-        CONFIG_INIT_VALUE(AlwaysUpdate);
-        CONFIG_INIT_VALUE(LastChanged);
-    )
 )
diff --git a/mod.json b/mod.json
@@ -3,26 +3,26 @@
   "name": "Streamer Tools",
   "id": "Streamer-Tools",
   "author": "EnderdracheLP, ComputerElite, Lauriethefish, Phaze",
-  "version": "0.6.0",
+  "version": "0.8.0",
   "packageId": "com.beatgames.beatsaber",
-  "packageVersion": "1.25.1",
+  "packageVersion": "1.26.2",
   "description": "Allows applications to get information from the game like, currently played song.",
   "coverImage": "cover.png",
   "dependencies": [
     {
-      "version": "^0.15.21",
+      "version": "^0.15.22",
       "id": "custom-types",
-      "downloadIfMissing": "https://github.com/sc2ad/Il2CppQuestTypePatching/releases/download/v0.15.21/CustomTypes.qmod"
+      "downloadIfMissing": "https://github.com/sc2ad/Il2CppQuestTypePatching/releases/download/v0.15.22/CustomTypes.qmod"
     },
     {
-      "version": "^0.28.0",
+      "version": "^0.31.0",
       "id": "codegen",
-      "downloadIfMissing": "https://github.com/sc2ad/BeatSaber-Quest-Codegen/releases/download/v0.28.0/Codegen.qmod"
+      "downloadIfMissing": "https://github.com/sc2ad/BeatSaber-Quest-Codegen/releases/download/v0.31.0/Codegen.qmod"
     },
     {
-      "version": "^0.17.5",
+      "version": "^0.17.9",
       "id": "questui",
-      "downloadIfMissing": "https://github.com/darknight1050/QuestUI/releases/download/v0.17.5/QuestUI.qmod"
+      "downloadIfMissing": "https://github.com/darknight1050/QuestUI/releases/download/v0.17.9/QuestUI.qmod"
     }
   ],
   "modFiles": [

diff --git a/mod.template.json b/mod.template.json
@@ -1,12 +1,12 @@
 
 {
     "_QPVersion": "0.1.1",
-    "name": "${mod_name}",
-    "id": "${mod_id}",
+    "name": "Streamer Tools",
+    "id": "Streamer-Tools",
     "author": "EnderdracheLP, ComputerElite, Lauriethefish, Phaze",
-    "version": "${version}",
+    "version": "0.8.0",
     "packageId": "com.beatgames.beatsaber",
-    "packageVersion": "1.25.1",
+    "packageVersion": "1.26.2",
     "description": "Allows applications to get information from the game like, currently played song.",
     "coverImage": "cover.png",
     "dependencies": [],

diff --git a/qpm.json b/qpm.json
@@ -4,7 +4,7 @@
   "info": {
     "name": "Streamer Tools",
     "id": "Streamer-Tools",
-    "version": "0.6.0",
+    "version": "0.8.0",
     "url": null,
     "additionalData": {
       "overrideSoName": "libStreamer-Tools.so"
@@ -27,22 +27,22 @@
     },
     {
       "id": "custom-types",
-      "versionRange": "^0.15.21",
+      "versionRange": "^0.15.22",
       "additionalData": {}
     },
     {
       "id": "questui",
-      "versionRange": "^0.17.5",
+      "versionRange": "^0.17.9",
       "additionalData": {}
     },
     {
-      "id": "config-utils",
-      "versionRange": "^0.8.0",
+      "id": "codegen",
+      "versionRange": "^0.31.0",
       "additionalData": {}
     },
     {
-      "id": "codegen",
-      "versionRange": "^0.28.0",
+      "id": "config-utils",
+      "versionRange": "^1.0.1",
       "additionalData": {}
     }
   ],

diff --git a/src/main.cpp b/src/main.cpp
@@ -80,6 +80,7 @@
 #include "GlobalNamespace/MultiplayerSpectatorController.hpp"
 #include "GlobalNamespace/MultiplayerSessionManager_SessionType.hpp"
 #include "GlobalNamespace/ComboController.hpp"
+#include "GlobalNamespace/BeatmapDataCache.hpp"
 using namespace GlobalNamespace;
 
 #if !defined(MAKE_HOOK_MATCH)
@@ -88,8 +89,6 @@ using namespace GlobalNamespace;
 
 //#define DEBUG_BUILD 1
 
-DEFINE_CONFIG(ModConfig);
-
 ModInfo STModInfo;
 
 Logger& getLogger() {
@@ -261,14 +260,14 @@ MAKE_HOOK_MATCH(RefreshContent, &StandardLevelDetailView::RefreshContent, void,
     }
 }
 
-MAKE_HOOK_MATCH(SongStart, &StandardLevelScenesTransitionSetupDataSO::Init, void, StandardLevelScenesTransitionSetupDataSO* self, StringW gameMode, IDifficultyBeatmap* dbm, IPreviewBeatmapLevel* previewBeatmapLevel, OverrideEnvironmentSettings* overrideEnvironmentSettings, ColorScheme* overrideColorScheme, GameplayModifiers* gameplayModifiers, PlayerSpecificSettings* playerSpecificSettings, PracticeSettings* practiceSettings, StringW backButtonText, bool startPaused, bool useTestNoteCutSoundEffects) {
+MAKE_HOOK_MATCH(SongStart, &StandardLevelScenesTransitionSetupDataSO::Init, void, StandardLevelScenesTransitionSetupDataSO* self, StringW gameMode, IDifficultyBeatmap* dbm, IPreviewBeatmapLevel* previewBeatmapLevel, OverrideEnvironmentSettings* overrideEnvironmentSettings, ColorScheme* overrideColorScheme, GameplayModifiers* gameplayModifiers, PlayerSpecificSettings* playerSpecificSettings, PracticeSettings* practiceSettings, StringW backButtonText, bool startPaused, bool useTestNoteCutSoundEffects, BeatmapDataCache* beatmapDataCache) {
     stManager->statusLock.lock();
     stManager->location = Solo_Song;
     ResetScores();
     stManager->isPractice = practiceSettings; // If practice settings isn't null, then we're in practice mode
     if (CoverStatus == Failed) GetCover(reinterpret_cast<GlobalNamespace::PreviewBeatmapLevelSO*>(previewBeatmapLevel)); // Try loading the Cover again if failed previously
     stManager->statusLock.unlock();
-    SongStart(self, gameMode, dbm, previewBeatmapLevel, overrideEnvironmentSettings, overrideColorScheme, gameplayModifiers, playerSpecificSettings, practiceSettings, backButtonText, startPaused, useTestNoteCutSoundEffects);
+    SongStart(self, gameMode, dbm, previewBeatmapLevel, overrideEnvironmentSettings, overrideColorScheme, gameplayModifiers, playerSpecificSettings, practiceSettings, backButtonText, startPaused, useTestNoteCutSoundEffects, beatmapDataCache);
 }
 
 MAKE_HOOK_MATCH(CampaignLevelStart, &MissionLevelScenesTransitionSetupDataSO::Init, void, MissionLevelScenesTransitionSetupDataSO* self, StringW missionId, IDifficultyBeatmap* difficultyBeatmap, IPreviewBeatmapLevel* previewBeatmapLevel, ArrayW<MissionObjective*> missionObjectives, ColorScheme* overrideColorScheme, GameplayModifiers* gameplayModifiers, PlayerSpecificSettings* playerSpecificSettings, StringW backButtonText) {