tweaks

Author: BlueWitherer

src/hooks/Freeze.cpp

@@ -23,7 +23,7 @@ class $modify(FreezeMenuLayer, MenuLayer) {
     bool init() {
         if (!MenuLayer::init()) return false;
 
-        if (auto gm = GameManager::get()) {
+        if (auto gm = GameManager::sharedState()) {
             // get and store user current fps
             float currentFPS = gm->m_customFPSTarget;
             (void)thisMod->setSavedValue<float>("fps", currentFPS);
@@ -60,7 +60,7 @@ class $modify(FreezePlayLayer, PlayLayer) {
 
     void revertFPS() {
         // default to user old fps
-        auto gm = GameManager::get();
+        auto gm = GameManager::sharedState();
 
         float oldFPS = thisMod->getSavedValue<float>("fps");
 
@@ -75,7 +75,7 @@ class $modify(FreezePlayLayer, PlayLayer) {
     };
 
     void capFPS(float value) {
-        auto gm = GameManager::get();
+        auto gm = GameManager::sharedState();
 
         gm->setGameVariable("0116", true);
         gm->setGameVariable("0116", true);
@@ -95,7 +95,7 @@ class $modify(FreezePlayLayer, PlayLayer) {
     void updateProgressbar() {
         // check if current percentage is less than or equal to 90
         if (getCurrentPercentInt() >= 90) {
-            auto gm = GameManager::get();
+            auto gm = GameManager::sharedState();
 
             gm->setGameVariable("0116", true);
 
@@ -110,7 +110,7 @@ class $modify(FreezePlayLayer, PlayLayer) {
             // log::debug("cap fps to {} (interval {})", rndFps, interval);
         } else {
             // default to user old fps
-            auto gm = GameManager::get();
+            auto gm = GameManager::sharedState();
 
             gm->setGameVariable("0116", true);
 

src/ui/Menu.h

@@ -5,7 +5,7 @@
 #include <Geode/Geode.hpp>
 
 namespace horrible {
-    class MenuNothingNode final : public CCNode {
+    class MenuNothingNode final : public cocos2d::CCNode {
     protected:
         bool init(cocos2d::CCSize const& size, cocos2d::CCPoint const& pos);
 

src/ui/SettingV3.h

@@ -24,13 +24,9 @@ namespace horrible {
 
     class HorribleSettingNodeV3 final : public geode::SettingNodeV3 {
     private:
-        class Impl;
-        std::unique_ptr<Impl> m_impl;
+        CCMenuItemSpriteExtra* m_button = nullptr;
 
     protected:
-        HorribleSettingNodeV3();
-        ~HorribleSettingNodeV3();
-
         void updateState(cocos2d::CCNode* invoker) override;
         void onCommit() override;
         void onResetToDefault() override;

src/ui/src/MenuCredits.cpp

@@ -24,18 +24,17 @@ bool MenuPlayer::init(ZStringView name, int account, int icon, ccColor3B const&
 
     addChild(playerIcon);
 
-    auto label = CCLabelBMFont::create(name.c_str(), "goldFont.fnt");
-    label->setScale(0.375f);
-
-    if (label->getScaledContentWidth() > getScaledContentWidth()) setContentWidth(label->getScaledContentWidth());
-
-    auto labelBtn = Button::createWithNode(
-        label,
+    auto labelBtn = Button::createWithLabel(
+        name.c_str(),
+        "goldFont.fnt",
         [account](auto) {
             if (auto page = ProfilePage::create(account, false)) page->show();
         });
     labelBtn->setID("profile-btn");
-    labelBtn->setPosition({getScaledContentWidth() / 2.f, getScaledContentHeight() + (label->getScaledContentHeight() * 0.875f)});
+    labelBtn->setScale(0.375f);
+    labelBtn->setPosition({getScaledContentWidth() / 2.f, getScaledContentHeight() + (labelBtn->getScaledContentHeight() * 0.875f)});
+
+    if (labelBtn->getScaledContentWidth() > getScaledContentWidth()) setContentWidth(labelBtn->getScaledContentWidth());
 
     playerIcon->setPositionX(getScaledContentWidth() / 2.f);
 
@@ -118,17 +117,14 @@ bool MenuCredits::init(ZStringView theme) {
     m_mainLayer->addChild(leadDevContainer);
     leadDevContainer->updateLayout();
 
-    constexpr auto creditsMdTxt =
+    auto creditsMd = MDTextArea::create(
         "# ![🛠](frame:GJ_hammerIcon_001.png?scale=0.875) Resources\n"
         "**[alk1m123](user:11535118)**: '*[Sapphire SDK](https://www.x.com/GeodeSDK/status/2039225279353176398/)*' logo\n\n"
         "**[Uproxide](user:25397826)**: '*The Yellow One*' sprite from [More Difficulties](mod:uproxide.more_difficulties)\n\n<mod:uproxide.more_difficulties>\n\n"
         "**[Cheeseworks](user:6408873)**: [Mod Developer Branding](mod:cheeseworks.moddevbranding) image for this mod\n\n<mod:cheeseworks.moddevbranding>\n\n"
         "# ![💝](frame:GJ_diamondsIcon_001.png?scale=0.875) Special Thanks\n"
         "**[Team Avalanche](user:31079132)**: Supporting the project since its experimental days\n\n"
-        "**[dankmeme](user:9735891)**: helped with pretty important programming decisions :D\n\n";
-
-    auto creditsMd = MDTextArea::create(
-        creditsMdTxt,
+        "**[dankmeme](user:9735891)**: helped with pretty important programming decisions :D\n\n",
         {m_mainLayer->getScaledContentWidth() - 55.f,
             140.f});
     creditsMd->setID("credits");

src/ui/src/MenuOption.cpp

@@ -49,7 +49,7 @@ class MenuOption::Impl final {
         if (auto label = WeakRef(newContainer).lock()) label->setVisible(false);
     };
 
-    constexpr const char* getTierDescString(SillyTier silly, bool compat) noexcept {
+    constexpr auto getTierDescString(SillyTier silly, bool compat) noexcept {
         if (!compat) return "<cp>OPTION UNAVAILABLE</c>";
 
         switch (silly) {

src/ui/src/SettingV3.cpp

@@ -40,14 +40,6 @@ SettingNodeV3* HorribleSettingV3::createNode(float width) {
     return HorribleSettingNodeV3::create(std::static_pointer_cast<HorribleSettingV3>(shared_from_this()), width);
 };
 
-class HorribleSettingNodeV3::Impl final {
-public:
-    CCMenuItemSpriteExtra* button = nullptr;
-};
-
-HorribleSettingNodeV3::HorribleSettingNodeV3() : m_impl(std::make_unique<Impl>()) {};
-HorribleSettingNodeV3::~HorribleSettingNodeV3() {};
-
 bool HorribleSettingNodeV3::init(std::shared_ptr<HorribleSettingV3> setting, float width) {
     if (!SettingNodeV3::init(setting, width)) return false;
 
@@ -58,17 +50,19 @@ bool HorribleSettingNodeV3::init(std::shared_ptr<HorribleSettingV3> setting, flo
         0.875f);
     buttonSprite->setScale(0.5f);
 
-    m_impl->button = CCMenuItemExt::createSpriteExtra(
+    m_button = CCMenuItemExt::createSpriteExtra(
         buttonSprite,
-        [](auto) { menu::open(); });
-    m_impl->button->setID("horrible-options-btn");
+        [](auto) {
+            menu::open();
+        });
+    m_button->setID("horrible-options-btn");
 
     if (auto menu = getButtonMenu()) {
         menu->setAnchorPoint({0.5, 0.5});
         menu->setPosition(getScaledContentSize() / 2.f);
         menu->setContentSize({getScaledContentWidth(), 0.f});
 
-        menu->addChildAtPosition(m_impl->button, Anchor::Center);
+        menu->addChildAtPosition(m_button, Anchor::Center);
         menu->updateLayout();
     } else {
         log::error("Couldn't find button menu in settings");
@@ -79,16 +73,16 @@ bool HorribleSettingNodeV3::init(std::shared_ptr<HorribleSettingV3> setting, flo
         [this](std::shared_ptr<SettingV3> setting) {
             auto strSetting = std::static_pointer_cast<StringSettingV3>(setting);
 
-            if (m_impl->button) {
+            if (m_button) {
                 auto buttonSprite = ButtonSprite::create(
                     "Horrible Options Menu",
                     "bigFont.fnt",
                     themes::getButtonSquareSprite(strSetting->getValue()),
                     0.875f);
                 buttonSprite->setScale(0.5f);
 
-                m_impl->button->setNormalImage(buttonSprite);
-                m_impl->button->updateSprite();
+                m_button->setNormalImage(buttonSprite);
+                m_button->updateSprite();
             } else {
                 log::error("Setting button not found");
             };

src/util/Jumpscares.hpp

@@ -6,7 +6,7 @@ namespace horrible {
     namespace util {
         // Jumpscare level manager
         namespace jumpscares {
-            class JumpscareDelegateBase {
+            class JumpscareDelegateData {
             private:
                 geode::WeakRef<PlayLayer> m_playLayer = nullptr;
 
@@ -18,8 +18,8 @@ namespace horrible {
                 bool m_useReplay = false;
 
             protected:
-                explicit JumpscareDelegateBase(PlayLayer* pl, int levelID, int songID, std::string levelName, bool dontCreateObjects, bool useReplay);
-                virtual ~JumpscareDelegateBase() = default;
+                explicit JumpscareDelegateData(PlayLayer* pl, int levelID, int songID, std::string levelName, bool dontCreateObjects, bool useReplay);
+                virtual ~JumpscareDelegateData() = default;
 
             public:
                 geode::WeakRef<PlayLayer> const& getPlayLayer() const noexcept;
@@ -32,15 +32,15 @@ namespace horrible {
                 bool getUseReplay() const noexcept;
             };
 
-            struct SearchDelegate final : public LevelManagerDelegate, public JumpscareDelegateBase {
+            struct SearchDelegate final : public LevelManagerDelegate, public JumpscareDelegateData {
             public:
                 SearchDelegate(PlayLayer* pl, int levelID, int songID, std::string levelName, bool dontCreateObjects, bool useReplay);
 
                 void loadLevelsFinished(cocos2d::CCArray* levels, char const* key) override;
                 void loadLevelsFailed(char const* key) override;
             };
 
-            struct DownloadDelegate final : public LevelDownloadDelegate, public JumpscareDelegateBase {
+            struct DownloadDelegate final : public LevelDownloadDelegate, public JumpscareDelegateData {
             public:
                 DownloadDelegate(PlayLayer* pl, int levelID, int songID, std::string levelName, bool dontCreateObjects, bool useReplay);
 

src/util/src/Jumpscares.cpp

@@ -7,35 +7,35 @@
 using namespace geode::prelude;
 using namespace horrible::util;
 
-jumpscares::JumpscareDelegateBase::JumpscareDelegateBase(PlayLayer* pl, int levelID, int songID, std::string levelName, bool dontCreateObjects, bool useReplay) :
+jumpscares::JumpscareDelegateData::JumpscareDelegateData(PlayLayer* pl, int levelID, int songID, std::string levelName, bool dontCreateObjects, bool useReplay) :
     m_playLayer(pl), m_levelID(levelID), m_songID(songID), m_levelName(std::move(levelName)), m_dontCreateObjects(dontCreateObjects), m_useReplay(useReplay) {};
 
-WeakRef<PlayLayer> const& jumpscares::JumpscareDelegateBase::getPlayLayer() const noexcept {
+WeakRef<PlayLayer> const& jumpscares::JumpscareDelegateData::getPlayLayer() const noexcept {
     return m_playLayer;
 };
 
-int jumpscares::JumpscareDelegateBase::getLevelID() const noexcept {
+int jumpscares::JumpscareDelegateData::getLevelID() const noexcept {
     return m_levelID;
 };
 
-int jumpscares::JumpscareDelegateBase::getSongID() const noexcept {
+int jumpscares::JumpscareDelegateData::getSongID() const noexcept {
     return m_songID;
 };
 
-ZStringView jumpscares::JumpscareDelegateBase::getLevelName() const noexcept {
+ZStringView jumpscares::JumpscareDelegateData::getLevelName() const noexcept {
     return m_levelName;
 };
 
-bool jumpscares::JumpscareDelegateBase::getDontCreateObjects() const noexcept {
+bool jumpscares::JumpscareDelegateData::getDontCreateObjects() const noexcept {
     return m_dontCreateObjects;
 };
 
-bool jumpscares::JumpscareDelegateBase::getUseReplay() const noexcept {
+bool jumpscares::JumpscareDelegateData::getUseReplay() const noexcept {
     return m_useReplay;
 };
 
 jumpscares::DownloadDelegate::DownloadDelegate(PlayLayer* pl, int levelID, int songID, std::string levelName, bool dontCreateObjects, bool useReplay) :
-    JumpscareDelegateBase(pl, levelID, songID, std::move(levelName), dontCreateObjects, useReplay) {};
+    JumpscareDelegateData(pl, levelID, songID, std::move(levelName), dontCreateObjects, useReplay) {};
 
 void jumpscares::DownloadDelegate::levelDownloadFinished(GJGameLevel* level) {
     log::trace("Download finished for level {}", getLevelID());
@@ -74,7 +74,7 @@ void jumpscares::DownloadDelegate::levelDownloadFailed(int response) {
 };
 
 jumpscares::SearchDelegate::SearchDelegate(PlayLayer* pl, int levelID, int songID, std::string levelName, bool dontCreateObjects, bool useReplay) :
-    JumpscareDelegateBase(pl, levelID, songID, std::move(levelName), dontCreateObjects, useReplay) {};
+    JumpscareDelegateData(pl, levelID, songID, std::move(levelName), dontCreateObjects, useReplay) {};
 
 void jumpscares::SearchDelegate::loadLevelsFinished(CCArray* levels, char const* key) {
     log::trace("Search finished for level {}", getLevelName());

src/util/ui/TermsAndConditions.hpp

@@ -8,13 +8,13 @@ namespace horrible {
     namespace ui {
         class TermsAndConditions final : public Popup {
         private:
-            using Callback = FunctionRef<void(bool)>;
+            using Callback = CopyableFunction<void(bool)>;
 
         protected:
-            bool init(Callback cb);
+            bool init(Callback&& cb);
 
         public:
-            static TermsAndConditions* create(Callback cb);
+            static TermsAndConditions* create(Callback&& cb);
         };
     };
 };

src/util/ui/src/TermsAndConditions.cpp

@@ -7,7 +7,7 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
-bool TermsAndConditions::init(Callback cb) {
+bool TermsAndConditions::init(Callback&& cb) {
     auto const theme = thisMod->getSettingValue<std::string>("theme");
 
     if (!Popup::init(420.f, 240.f, themes::getBackgroundSprite(theme))) return false;
@@ -74,9 +74,9 @@ bool TermsAndConditions::init(Callback cb) {
     return true;
 };
 
-TermsAndConditions* TermsAndConditions::create(Callback cb) {
+TermsAndConditions* TermsAndConditions::create(Callback&& cb) {
     auto ret = new TermsAndConditions();
-    if (ret && ret->init(cb)) {
+    if (ret && ret->init(std::move(cb))) {
         ret->autorelease();
         return ret;
     };