start 2.206 update

Cvolton · Jun 4, 2024 · f798294 · f798294
1 parent 49dd80d
commit f798294
Show file tree

Hide file tree

Showing 14 changed files with 47 additions and 29 deletions.
diff --git a/mod.json b/mod.json
@@ -1,8 +1,8 @@
 {
-    "geode": "2.0.0-beta.26",
+    "geode": "2.0.0-beta.27",
     "version": "v4.1.13",
     "gd": {
-        "win": "2.204",
+        "win": "2.206",
         "android": "2.205",
         "mac": "2.200"
     },

diff --git a/src/hooks/ChallengesPage.cpp b/src/hooks/ChallengesPage.cpp
@@ -7,11 +7,13 @@
 using namespace geode::prelude;
 
 class BI_DLL $modify(BIChallengesPage, ChallengesPage) {
-    CCMenuItemSpriteExtra* m_nextArrowBtn;
-    CCMenuItemSpriteExtra* m_prevArrowBtn;
-    std::vector<ChallengeNode*> m_queuedNodes;
-    std::vector<CCNode*> m_queuedDots;
-    size_t m_page = 0;
+    struct Fields {
+        CCMenuItemSpriteExtra* m_nextArrowBtn;
+        CCMenuItemSpriteExtra* m_prevArrowBtn;
+        std::vector<ChallengeNode*> m_queuedNodes;
+        std::vector<CCNode*> m_queuedDots;
+        size_t m_page = 0;
+    };
 
     /*
      * Callbacks
@@ -196,7 +198,7 @@ class BI_DLL $modify(BIChallengesPage, ChallengesPage) {
                 double time = GameStatsManager::sharedState()->m_challengeTime;
                 bool useRobTopTime = time < 1048576;
                 if(!GameStatsManager::sharedState()->getChallenge(i)) time += 28800; // GDPS incompatible assumption
-                countdownLabel->setString(GameToolbox::getTimeString(time - (useRobTopTime ? TimeUtils::getRobTopTime() : TimeUtils::getFullDoubleTime())).c_str());
+                countdownLabel->setString(GameToolbox::getTimeString(time - (useRobTopTime ? TimeUtils::getRobTopTime() : TimeUtils::getFullDoubleTime()), false).c_str());
             }
         }
     }

diff --git a/src/hooks/CreatorLayer.cpp b/src/hooks/CreatorLayer.cpp
@@ -79,7 +79,7 @@ class BI_DLL $modify(BICreatorLayer, CreatorLayer) {
             updatePopup->show();
         }
 
-        Mod::get()->setSavedValue<std::string>("last_launch_version", Mod::get()->getVersion().toString());
+        Mod::get()->setSavedValue<std::string>("last_launch_version", Mod::get()->getVersion().toVString());
 
         //showQuestExclamationMark();
 

diff --git a/src/hooks/GameLevelManager.cpp b/src/hooks/GameLevelManager.cpp
@@ -8,8 +8,10 @@
 using namespace geode::prelude;
 
 class BI_DLL $modify(GameLevelManager) {
-    bool skipSavedFilter = false;
-    Ref<CCArray> filteredLevels = nullptr;
+    struct Fields {
+        bool skipSavedFilter = false;
+        Ref<CCArray> filteredLevels = nullptr;
+    };
 
     /*
      * Helpers
@@ -235,7 +237,7 @@ class BI_DLL $modify(GameLevelManager) {
             auto value = header.substr(13);
             auto seconds = BetterInfo::stoi(value);
 
-            Notification::create(fmt::format(" Rate limited by RobTop's server\n Try again in {}", GameToolbox::getTimeString(seconds)), NotificationIcon::Warning, 5.f)->show();
+            Notification::create(fmt::format(" Rate limited by RobTop's server\n Try again in {}", GameToolbox::getTimeString(seconds, false)), NotificationIcon::Warning, 5.f)->show();
             return;
         }
 

diff --git a/src/hooks/InfoLayer.cpp b/src/hooks/InfoLayer.cpp
@@ -10,7 +10,9 @@
 using namespace geode::prelude;
 
 class BI_DLL $modify(BIInfoLayer, InfoLayer) {
-    ButtonSprite* m_pageBtn = nullptr;
+    struct Fields {
+        ButtonSprite* m_pageBtn = nullptr;
+    };
 
     static void onModify(auto& self) {
         auto res = self.setHookPriority("InfoLayer::onMore", 99999);

diff --git a/src/hooks/LevelAreaInnerLayer.cpp b/src/hooks/LevelAreaInnerLayer.cpp
@@ -6,7 +6,9 @@
 using namespace geode::prelude;
 
 class BI_DLL $modify(BILevelAreaInnerLayer, LevelAreaInnerLayer) {
-    CCMenu* m_menu = nullptr;
+    struct Fields {
+        CCMenu* m_menu = nullptr;
+    };
 
     /*
      * Callbacks

diff --git a/src/hooks/LevelBrowserLayer.cpp b/src/hooks/LevelBrowserLayer.cpp
@@ -11,8 +11,10 @@ using namespace geode::prelude;
 
 class BI_DLL 
 $modify(BILevelBrowserLayer, LevelBrowserLayer) {
-    CCMenuItemSpriteExtra* m_biLastPageBtn = nullptr;
-    DoubleArrow* m_biLastPageBtnArrow = nullptr;
+    struct Fields {
+        CCMenuItemSpriteExtra* m_biLastPageBtn = nullptr;
+        DoubleArrow* m_biLastPageBtnArrow = nullptr;
+    };
 
     static void onModify(auto& self) {
         (void) self.setHookPriority("LevelBrowserLayer::onGoToPage", 99999);

diff --git a/src/hooks/LevelCell.cpp b/src/hooks/LevelCell.cpp
@@ -8,9 +8,11 @@
 using namespace geode::prelude;
 
 class BI_DLL $modify(BILevelCell, LevelCell) {
-    int m_hoverCount = 0;
-    CCPoint m_lastMousePos = {0,0};
-    CCNode* m_levelDesc = nullptr;
+    struct Fields {
+        int m_hoverCount = 0;
+        CCPoint m_lastMousePos = {0,0};
+        CCNode* m_levelDesc = nullptr;
+    };
 
     static void onModify(auto& self) {
         auto res = self.setHookPriority("LevelCell::onViewProfile", 99999);

diff --git a/src/hooks/MoreSearchLayer.cpp b/src/hooks/MoreSearchLayer.cpp
@@ -20,8 +20,10 @@ class BI_DLL DropDownDelegateHelper : public GJDropDownLayerDelegate {
 };
 
 class BI_DLL $modify(BIMoreSearchLayer, MoreSearchLayer) {
-    CCMenuItemSpriteExtra* m_savedBtn = nullptr;
-    int m_songID = 0;
+    struct Fields {
+        CCMenuItemSpriteExtra* m_savedBtn = nullptr;
+        int m_songID = 0;
+    };
 
     bool shouldSavedBtnBeVisible(){
         return GameLevelManager::sharedState()->getBoolForKey("customsong_filter") && GameLevelManager::sharedState()->getBoolForKey("enable_songFilter");

diff --git a/src/hooks/RewardsPage.cpp b/src/hooks/RewardsPage.cpp
@@ -7,7 +7,9 @@
 using namespace geode::prelude;
 
 class BI_DLL $modify(BIRewardsPage, RewardsPage) {
-    CCLabelBMFont* m_timeLabel = nullptr;
+    struct Fields {
+        CCLabelBMFont* m_timeLabel = nullptr;
+    };
 
     /*
      * Callbacks
@@ -21,7 +23,7 @@ class BI_DLL $modify(BIRewardsPage, RewardsPage) {
 
         double time = 0xFFFFF - TimeUtils::getRobTopTime();
         m_fields->m_timeLabel->setString(
-            fmt::format("Time until timer bug: {}", GameToolbox::getTimeString(time)).c_str()
+            fmt::format("Time until timer bug: {}", GameToolbox::getTimeString(time, false)).c_str()
         );
     }
 

diff --git a/src/managers/BaseJsonManager.cpp b/src/managers/BaseJsonManager.cpp
@@ -22,7 +22,7 @@ Result<> BaseJsonManager::load() {
     std::unique_lock guard(m_jsonMutex);
 
     auto savedPath = Mod::get()->getSaveDir() / m_filename;
-    if (ghc::filesystem::exists(savedPath)) {
+    if (std::filesystem::exists(savedPath)) {
         auto result = utils::file::readString(savedPath);
         if (!result) {
             return Err(result.unwrapErr());

diff --git a/src/managers/BetterInfoStats.cpp b/src/managers/BetterInfoStats.cpp
@@ -23,9 +23,9 @@ void BetterInfoStats::migrateSaveData() {
     auto oldPath = dirs::getSaveDir() / "CCBetterInfoStats.dat";
     auto newPath = dirs::getSaveDir() / std::string(this->m_fileName); //it would be better to utilize Mod::get()->getSaveDir, however that can result in future issues
 
-    if(ghc::filesystem::exists(oldPath) && !ghc::filesystem::exists(newPath)) {
+    if(std::filesystem::exists(oldPath) && !std::filesystem::exists(newPath)) {
         log::info("CCBetterInfoStats exists in main GD folder but not in mod folder, migrating");
-        ghc::filesystem::rename(oldPath, newPath);
+        std::filesystem::rename(oldPath, newPath);
 
         this->getScheduler()->scheduleSelector(schedule_selector(BetterInfoStats::migrationPopup), this, 1, 0, 3, false);
     }

diff --git a/src/utils/LevelUtils.h b/src/utils/LevelUtils.h
@@ -3,6 +3,8 @@
 #include <Geode/Geode.hpp>
 #include "../utils.hpp"
 
+#include <deque>
+
 using namespace geode::prelude;
 
 namespace LevelUtils {

diff --git a/src/utils/ServerUtils.cpp b/src/utils/ServerUtils.cpp
@@ -12,8 +12,8 @@ std::string ServerUtils::getBaseURL() {
     // in the main game executable
     char* originalUrl = nullptr;
     #ifdef GEODE_IS_WINDOWS
-        static_assert(GEODE_COMP_GD_VERSION == 22040, "Unsupported GD version");
-        originalUrl = (char*)(base::get() + 0x410a74); //not a mistake
+        static_assert(GEODE_COMP_GD_VERSION == 22060, "Unsupported GD version");
+        originalUrl = (char*)(base::get() + 0x5251d0);
     #elif defined(GEODE_IS_MACOS)
         static_assert(GEODE_COMP_GD_VERSION == 22000, "Unsupported GD version");
         originalUrl = (char*)(base::get() + 0x83c079);
@@ -138,7 +138,7 @@ void ServerUtils::getOnlineLevels(GJSearchObject* searchObject, std::function<vo
             getline(responseStream, songData, '#');
             getline(responseStream, pageData, '#');
 
-            MusicDownloadManager::sharedState()->createSongsInfo(songData);
+            MusicDownloadManager::sharedState()->createSongsInfo(songData, "");
 
             std::stringstream userStream(userData);
             std::string currentUser;