Initial 2.2 build

mod.json

@@ -1,5 +1,5 @@
 {
-	"geode": "1.3.7",
+	"geode": "2.0.0",
 	"version": "v3.1.1",
 	"id": "cvolton.betterinfo",
 	"name": "BetterInfo",

src/hooks/CommentCell.cpp

@@ -25,7 +25,7 @@ class $modify(BICommentCell, CommentCell) {
         auto level = GJGameLevel::create();
         level->m_levelID = this->m_comment->m_levelID;
 
-        InfoLayer* infoLayer = InfoLayer::create(level, nullptr);
+        InfoLayer* infoLayer = InfoLayer::create(level, nullptr, nullptr);
         infoLayer->m_scene = this->getParent()->getParent()->getParent()->getParent()->getParent()->getParent();
         infoLayer->show();
     }
@@ -136,8 +136,9 @@ class $modify(BICommentCell, CommentCell) {
         bool liked = GameLevelManager::sharedState()->hasLikedItemFullCheck(type, this->m_comment->m_commentID, special);
         if(liked) return;
 
-        auto GM = GameManager::sharedState();
-        if (this->m_comment->m_userID == GM->m_playerUserID) return;
+        //TODO: missing game manager members
+        /*auto GM = GameManager::sharedState();
+        if (this->m_comment->m_userID == GM->m_playerUserID) return;*/
 
         auto AM = GJAccountManager::sharedState();
         if (this->m_comment->m_accountID && this->m_comment->m_accountID == AM->m_accountID) return;

src/hooks/CreatorLayer.cpp

@@ -19,7 +19,7 @@ class $modify(BICreatorLayer, CreatorLayer) {
     /*
      * Helpers
      */
-    void showQuestExclamationMark(){
+    /*void showQuestExclamationMark(){
         auto menu = static_cast<CCMenu*>(this->getChildByID("creator-buttons-menu"));
         auto GSM = GameStatsManager::sharedState();
 
@@ -45,7 +45,7 @@ class $modify(BICreatorLayer, CreatorLayer) {
         exMark->setScale(0.7f);
         exMark->setID("exclamation-mark"_spr);
         questBtn->addChild(exMark);
-    }
+    }*/
 
     /*
      * Hooks
@@ -74,7 +74,7 @@ class $modify(BICreatorLayer, CreatorLayer) {
 
         this->addChild(menu);
 
-        showQuestExclamationMark();
+        //showQuestExclamationMark();
 
         return true;
     }
@@ -88,9 +88,9 @@ class $modify(BICreatorLayer, CreatorLayer) {
         CreatorLayer::onChallenge(sender);
     }
 
-    void sceneWillResume(){
+    /*void sceneWillResume(){
         CreatorLayer::sceneWillResume();
 
         showQuestExclamationMark();
-    }
+    }*/
 };

src/hooks/DailyLevelPage.cpp

@@ -11,7 +11,8 @@ class $modify(BIDailyLevelPage, DailyLevelPage) {
      * Callbacks
      */
     void onDailyHistory(CCObject* sender){
-        auto layer = DailyViewLayer::scene(this->m_weekly);
+        //TODO: support event levels
+        auto layer = DailyViewLayer::scene(m_type == GJTimedLevelType::Weekly);
         auto transitionFade = CCTransitionFade::create(0.5, layer);
         CCDirector::sharedDirector()->pushScene(transitionFade);
     }
@@ -30,7 +31,7 @@ class $modify(BIDailyLevelPage, DailyLevelPage) {
         auto winSize = CCDirector::sharedDirector()->getWinSize();
 
         std::ostringstream currentDaily;
-        currentDaily << "Current: #" << ((this->m_weekly) ? GM->m_weeklyID % 100000 : GM->m_dailyID);
+        currentDaily << "Current: #" << ((m_type == GJTimedLevelType::Weekly) ? GM->m_weeklyID % 100000 : GM->m_dailyID);
         auto currentDailyNode = CCLabelBMFont::create(currentDaily.str().c_str(), "chatFont.fnt");
         currentDailyNode->setPosition({(winSize.width / 2) + 183, (winSize.height / 2) + 51});
         currentDailyNode->setAnchorPoint({1,0});
@@ -41,8 +42,8 @@ class $modify(BIDailyLevelPage, DailyLevelPage) {
         currentDailyNode->setID("current-daily-text"_spr);
     }
 
-    bool init(bool isWeekly) {
-        if(!DailyLevelPage::init(isWeekly)) return false;
+    bool init(GJTimedLevelType type) {
+        if(!DailyLevelPage::init(type)) return false;
 
         CCMenu* menu = this->m_buttonMenu;
 

src/hooks/GameLevelManager.cpp

@@ -15,15 +15,15 @@ class $modify(GameLevelManager) {
      * Helpers
      */
 
-    bool validateRangeOption(const std::string& option, int value) {
+    /*bool validateRangeOption(const std::string& option, int value) {
         if(Mod::get()->getSavedValue<bool>(option)) {
             int min = Mod::get()->getSavedValue<int>(fmt::format("{}_min", option));
             int max = Mod::get()->getSavedValue<int>(fmt::format("{}_max", option));
             if(min != 0 && value < min) return false;
             if(max != 0 && value > max) return false;
         }
         return true;
-    }
+    }*/
 
     /*
      * Hooks
@@ -43,7 +43,7 @@ class $modify(GameLevelManager) {
         return userName;
     }
 
-    CCArray* getCompletedLevels(bool newFilter){
+    /*CCArray* getCompletedLevels(bool newFilter){
         CompleteMode mode = static_cast<CompleteMode>(Mod::get()->getSavedValue<int>("search_completed"));
         if(mode == CompleteMode::modeDefault) return GameLevelManager::getCompletedLevels(newFilter);
 
@@ -206,5 +206,5 @@ class $modify(GameLevelManager) {
         GameLevelManager::limitSavedLevels();
 
         m_fields->skipSavedFilter = false;
-    }
+    }*/
 };

src/hooks/InfoLayer.cpp

@@ -28,8 +28,19 @@ class $modify(BIInfoLayer, InfoLayer) {
         bool nextVisible = this->m_rightArrow->isVisible();
 
         auto GLM = GameLevelManager::sharedState();
-        if(this->m_commentHistory) GLM->resetCommentTimersForLevelID(this->m_score->m_userID, this->m_commentHistory);
-        else GLM->resetCommentTimersForLevelID(this->m_level->m_levelID, this->m_commentHistory);
+        switch(m_mode) {
+            case CommentKeyType::Level:
+                GLM->resetCommentTimersForLevelID(this->m_level->m_levelID, m_mode);
+                break;
+            case CommentKeyType::User:
+                GLM->resetCommentTimersForLevelID(this->m_score->m_userID, m_mode);
+                break;
+            case CommentKeyType::LevelList:
+                //GLM->resetCommentTimersForLevelID(this->m_level->m_levelID, m_mode);
+                //TODO: need levellist class members
+                break;                
+        }
+
         this->loadPage(this->m_page, true);
 
         this->m_loadingCircle->setVisible(false);
@@ -54,11 +65,12 @@ class $modify(BIInfoLayer, InfoLayer) {
             this->getScheduler()->unscheduleSelector(schedule_selector(BIInfoLayer::onInfoLayerSchedule), this);
         }
 
-        this->addChild(TextAlertPopup::create(text, 0.5f, 0.6f), 100);
+        //this->addChild(TextAlertPopup::create(text, 0.5f, 0.6f), 100);
+        Notification::create(text, NotificationIcon::None, .1f)->show();
     }
 
-    bool init(GJGameLevel* level, GJUserScore* score) {
-        if (!InfoLayer::init(level, score)) return false;
+    bool init(GJGameLevel* level, GJUserScore* score, GJLevelList* list) {
+        if (!InfoLayer::init(level, score, list)) return false;
 
         if(level) {
             auto cache = BetterInfoCache::sharedState();

src/hooks/LevelCell.cpp

@@ -1,4 +1,6 @@
-#include <Geode/Bindings.hpp>
+//TODO: reverse LevelCell
+
+/*#include <Geode/Bindings.hpp>
 #include <Geode/modify/LevelCell.hpp>
 
 #include "../managers/BetterInfoCache.h"
@@ -14,7 +16,7 @@ class $modify(BILevelCell, LevelCell) {
 
     static void onModify(auto& self) {
         auto res = self.setHookPriority("LevelCell::onViewProfile", 99999);
-    }
+    }*/
 
     /*void showDesc() {
         if(m_fields->m_levelDesc) return;
@@ -100,7 +102,7 @@ class $modify(BILevelCell, LevelCell) {
      * Hooks
      */
 
-    void onViewProfile(CCObject* sender) {
+    /*void onViewProfile(CCObject* sender) {
 
         if(this->m_level->m_accountID == 0) {
             UnregisteredProfileLayer::displayProfile(this->m_level->m_userID, this->m_level->m_creatorName);
@@ -167,4 +169,4 @@ class $modify(BILevelCell, LevelCell) {
             }
         }
     }
-};
+};*/

src/hooks/LevelInfoLayer.cpp

@@ -15,8 +15,8 @@ class $modify(LevelInfoLayer) {
         res = self.setHookPriority("LevelInfoLayer::onLevelInfo", 99999);
     }
 
-    bool init(GJGameLevel* level) {
-        if (!LevelInfoLayer::init(level)) return false;
+    bool init(GJGameLevel* level, bool challenge) {
+        if (!LevelInfoLayer::init(level, challenge)) return false;
 
         /**
          * Clickable green username

src/hooks/LevelLeaderboard.cpp

@@ -1,15 +1,17 @@
-#include <Geode/Bindings.hpp>
+//TODO: reverse LevelLeaderboard
+
+/*#include <Geode/Bindings.hpp>
 #include <Geode/modify/LevelLeaderboard.hpp>
 
 using namespace geode::prelude;
 
-class $modify(BILevelLeaderboard, LevelLeaderboard) {
+class $modify(BILevelLeaderboard, LevelLeaderboard) {*/
 
     /*
      * Callbacks
      */
 
-    void onLeaderboardDaily(CCObject* sender){
+    /*void onLeaderboardDaily(CCObject* sender){
         auto level = GJGameLevel::create();
         level->m_levelID = this->m_level->m_levelID;
         level->m_levelName = this->m_level->m_levelName;
@@ -19,13 +21,13 @@ class $modify(BILevelLeaderboard, LevelLeaderboard) {
         newLeaderboard->onUpdate(sender);
         CCDirector::sharedDirector()->getRunningScene()->addChild(newLeaderboard);
         this->onClose(sender);
-    }
+    }*/
 
     /*
      * Hooks
      */
 
-    bool init(GJGameLevel* level, LevelLeaderboardType type) { //type is usually an enum but i dont have that rn
+    /*bool init(GJGameLevel* level, LevelLeaderboardType type) { //type is usually an enum but i dont have that rn
         if(!LevelLeaderboard::init(level, type)) return false;
 
         auto buttonSprite = ButtonSprite::create((level->m_dailyID ? "Daily" : "Normal"), 20, true, "bigFont.fnt", "GJ_button_01.png", 30, 0.5);
@@ -41,4 +43,4 @@ class $modify(BILevelLeaderboard, LevelLeaderboard) {
 
         return true;
     }
-};
+};*/

src/hooks/LevelPage.cpp

@@ -11,6 +11,7 @@ class $modify(LevelPage) {
     }
 
     void onInfo(CCObject* sender) {
+        //TODO: reverse LevelPage
         LevelProgressDialog::show(this->m_level);
     }
 };

src/hooks/MoreSearchLayer.cpp

@@ -1,4 +1,6 @@
-#include <Geode/Bindings.hpp>
+//TODO: reverse MoreSearchLayer
+
+/*#include <Geode/Bindings.hpp>
 #include <Geode/modify/MoreSearchLayer.hpp>
 
 #include "../layers/LevelFiltering/CvoltonSearchOptions.h"
@@ -12,13 +14,13 @@ class $modify(BIMoreSearchLayer, MoreSearchLayer) {
 
     bool shouldSavedBtnBeVisible(){
         return GameLevelManager::sharedState()->getBoolForKey("customsong_filter") && GameLevelManager::sharedState()->getBoolForKey("enable_songFilter");
-    }
+    }*/
 
     /*
      * Callbacks
      */
 
-    void onMoreSearchNext(CCObject* sender){
+    /*void onMoreSearchNext(CCObject* sender){
         auto layer = CvoltonSearchOptions::create();
         CCDirector::sharedDirector()->getRunningScene()->addChild(layer);
         this->onClose(sender);
@@ -37,13 +39,13 @@ class $modify(BIMoreSearchLayer, MoreSearchLayer) {
             GameLevelManager::sharedState()->setIntForKey(m_fields->m_songID, "song_filter");
             m_enterSongID->setString(std::to_string(m_fields->m_songID));
         }
-    }
+    }*/
 
     /*
      * Hooks
      */
 
-    void onClose(CCObject* sender){
+    /*void onClose(CCObject* sender){
         if(m_fields->m_settings) m_fields->m_settings->release();
 
         MoreSearchLayer::onClose(sender);
@@ -103,4 +105,4 @@ class $modify(BIMoreSearchLayer, MoreSearchLayer) {
 
         if(m_fields->m_savedBtn) m_fields->m_savedBtn->setVisible(shouldSavedBtnBeVisible());
     }
-};
+};*/

src/hooks/PlayLayer.cpp

@@ -1,4 +1,6 @@
-#include <Geode/Bindings.hpp>
+//TODO: reverse PlayLayer and GJBaseGameLayer
+
+/*#include <Geode/Bindings.hpp>
 #include <Geode/modify/PlayLayer.hpp>
 
 #include "../managers/BetterInfoScheduler.h"
@@ -55,7 +57,7 @@ class $modify(BIPlayLayer, PlayLayer) {
             .y = player->m_position.y,
             .rotation = player->getRotation()
         });*/
-    }
+    /*}
 
     void resetLevel(){
         needsReset = false;
@@ -65,4 +67,4 @@ class $modify(BIPlayLayer, PlayLayer) {
         auto stats = BetterInfoStats::sharedState();
         stats->logAttempt(this->m_level, this->m_isPracticeMode);
     }
-};
+};*/

src/hooks/ProfilePage.cpp

@@ -1,4 +1,4 @@
-#include <Geode/Bindings.hpp>
+/*#include <Geode/Bindings.hpp>
 #include <Geode/modify/ProfilePage.hpp>
 
 #include "../utils.hpp"
@@ -46,7 +46,7 @@ class $modify(BIProfilePage, ProfilePage) {
     /*
      * Callbacks
      */
-
+/*
     void onProfilePageInfo(CCObject* sender){
         auto score = this->m_score;
         auto GM = GameManager::sharedState();
@@ -105,7 +105,7 @@ class $modify(BIProfilePage, ProfilePage) {
      * Helper funcs
      */
 
-    inline void fixProfilePagePositions(){
+   /* inline void fixProfilePagePositions(){
         auto layer = static_cast<CCLayer*>(this->getChildren()->objectAtIndex(0));
         auto winSize = CCDirector::sharedDirector()->getWinSize();
 
@@ -117,12 +117,12 @@ class $modify(BIProfilePage, ProfilePage) {
         CCNode* followTxt = typeinfo_cast<CCNode*>(layer->getChildren()->objectAtIndex(6));
         if(followTxt->getPositionY() == (winSize.height / 2) - 125) followTxt->setVisible(false); //followTxt->setPositionX(followTxt->getPositionX() + 40);
     }
-
+*/
     /*
      * Hooks
      */
 
-    void loadPageFromUserInfo(GJUserScore* a2){
+    /*void loadPageFromUserInfo(GJUserScore* a2){
         GameLevelManager::sharedState()->storeUserName(a2->m_userID, a2->m_accountID, a2->m_userName);
 
         ProfilePage::loadPageFromUserInfo(a2);
@@ -277,4 +277,4 @@ class $modify(BIProfilePage, ProfilePage) {
 
         ProfilePage::keyBackClicked();
     }
-};
+};*/