Fixes

Author: Alphalaneous

changelog.md

@@ -1,3 +1,9 @@
+## 2.0.5
+- No more flicker on table cells
+- Reduce hooks (using Alpha's Geode Utils)
+- Performance Improvements
+- Code cleanup
+
 ## 2.0.4
 - Fix a crash
 

mod.json

@@ -6,14 +6,15 @@
         "mac": "2.2074",
         "ios": "2.2074"
     },
-    "version": "v2.0.4",
+    "version": "v2.0.5",
     "id": "alphalaneous.happy_textures",
     "name": "Happy Textures :3",
     "developer": "Alphalaneous",
     "description": "Texture Packs on a whole new level!",
     "early-load": true,
     "dependencies": {
         "geode.node-ids": ">=v1.15.0",
+        "alphalaneous.alphas_geode_utils": ">=v1.1.7",
         "geode.texture-loader": {
             "importance": "suggested",
             "version": ">=v1.7.0"

src/BackgroundColors.hpp

@@ -7,6 +7,7 @@
 #include "UIModding.hpp"
 #include "Macros.hpp"
 #include "Utils.hpp"
+#include <alphalaneous.alphas_geode_utils/include/NodeModding.h>
 
 using namespace geode::prelude;
 
@@ -32,28 +33,14 @@ class $modify(CCDirector) {
     }
 };
 
-class $modify(LeaderboardsLayer) {
-
-    static void onModify(auto& self) {
-        HOOK_LATEST("LeaderboardsLayer::init");
-    }
-
-    bool init(LeaderboardState p0) {
-        if (!LeaderboardsLayer::init(p0)) return false;
+class $nodeModify(LeaderboardsLayer) {
+    void modify() {
         setBackground(this);
-        return true;
     }
 };
 
-class $modify(LevelBrowserLayer) {
-
-    static void onModify(auto& self) {
-        HOOK_LATEST("LevelBrowserLayer::init");
-    }
-
-    bool init(GJSearchObject* p0) {
-        if (!LevelBrowserLayer::init(p0)) return false;
+class $nodeModify(LevelBrowserLayer) {
+    void modify() {
         setBackground(this);
-        return true;
     }
 };

src/Config.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Geode/Geode.hpp>
-#include "Utils.hpp"
 #include <geode.texture-loader/include/TextureLoader.hpp>
 
 class Config {
@@ -25,7 +24,7 @@ class Config {
 
     void loadPackJsons() {
 
-        Mod* textureLoader = Loader::get()->getLoadedMod("geode.texture-loader");
+        geode::Mod* textureLoader = geode::Loader::get()->getLoadedMod("geode.texture-loader");
         if (textureLoader) {
             for (const geode::texture_loader::Pack& pack : geode::texture_loader::getAppliedPacks()) {
                 std::optional<matjson::Value> json = loadIntoJson(pack);
@@ -55,7 +54,6 @@ class Config {
     }
 
     void loadConfig(geode::texture_loader::Pack pack, matjson::Value config) {
-        
         loadSettings(pack, config);
     }
 

src/LateQueue.cpp

@@ -0,0 +1,21 @@
+#include "LateQueue.hpp"
+
+LateQueue* LateQueue::instance = nullptr;
+
+void LateQueue::queue(ScheduledFunction&& func) {
+    m_mainThreadQueue.push_back(std::move(func));
+}
+
+void LateQueue::executeQueue() {
+    for (auto const& func : m_mainThreadQueue) {
+        if (func) func();
+    }
+    m_mainThreadQueue.clear();
+}
+
+LateQueue* LateQueue::get() {
+    if (!instance) {
+        instance = new LateQueue();
+    };
+    return instance;
+}

src/LateQueue.hpp

@@ -0,0 +1,17 @@
+#pragma once
+
+#include <Geode/Geode.hpp>
+
+using namespace geode::prelude;
+
+//yoinked from geode
+class LateQueue {
+protected:
+    static LateQueue* instance;
+public:
+    std::vector<ScheduledFunction> m_mainThreadQueue;
+
+    void queue(ScheduledFunction&& func);
+    void executeQueue();
+    static LateQueue* get();
+};

src/Macros.hpp

@@ -68,29 +68,17 @@ if (eventVal.contains(#type)) {
     }                                                                           \
 }
 
-#define setCellColors(class, method, paramType)                                 \
-struct My##class : geode::Modify<My##class, class> {                            \
-    static void onModify(auto& self) {                                          \
-        HOOK_LATEST(#class "::" #method);                                       \
-    }                                                                           \
-    struct Fields {                                                             \
-        ccColor3B m_lastBG;                                                     \
-    };                                                                          \
-    void method(paramType* p0) {                                                \
-        class::method(p0);                                                      \
+#define setCellColors(className)                                                \
+class $nodeModify(My##className, className) {                                   \
+    void modify() {                                                             \
         if (UIModding::get()->doModify) {                                       \
             checkBG(0);                                                         \
-            this->schedule(schedule_selector(My##class::checkBG));              \
+            this->schedule(schedule_selector(My##className::checkBG));          \
         }                                                                       \
     }                                                                           \
     void checkBG(float dt) {                                                    \
-        auto* child = this->getChildByType<CCLayerColor>(0);                    \
-        if (!child) return;                                                     \
-                                                                                \
-        auto color = child->getColor();                                         \
-        auto fields = m_fields.self();                                          \
-        if (fields->m_lastBG == color) return;                                  \
-        fields->m_lastBG = color;                                               \
+        auto self = reinterpret_cast<className*>(this);                         \
+        auto color = self->m_backgroundLayer->getColor();                       \
                                                                                 \
         struct ColorMap {                                                       \
             ccColor3B match;                                                    \
@@ -107,14 +95,14 @@ struct My##class : geode::Modify<My##class, class> {
             if (color == entry.match) {                                         \
                 if (auto dataOpt = UIModding::get()->getColors(entry.ID)) {     \
                     const auto& data = *dataOpt;                                \
-                    child->setColor(data.color);                                \
-                    child->setOpacity(data.alpha);                              \
+                    self->m_backgroundLayer->setColor(data.color);              \
+                    self->m_backgroundLayer->setOpacity(data.alpha);            \
                 }                                                               \
                 break;                                                          \
             }                                                                   \
         }                                                                       \
     }                                                                           \
-};
+}
 
 #define LABEL(name, value) {name, rift::Value::from(value)}
 

src/NodeModding.hpp

@@ -8,36 +8,10 @@
 #include "nodes/CCNode.hpp"
 #include "Utils.hpp"
 #include "Macros.hpp"
+#include "LateQueue.hpp"
 
 using namespace geode::prelude;
 
-// yoinked from geode but removed mutex cuz I will likely never use this in a thread and seems to crash proton/wine ??
-class LateQueue {
-protected:
-    static LateQueue* instance;
-public:
-    std::vector<std::function<void(void)>> m_mainThreadQueue;
-
-    void queue(ScheduledFunction&& func) {
-        m_mainThreadQueue.push_back(std::forward<ScheduledFunction>(func));
-    }
-
-    void executeQueue() {
-        for (auto const& func : m_mainThreadQueue) {
-            if (func) func();
-        }
-        m_mainThreadQueue.clear();
-    }
-
-    static LateQueue* get() {
-        if (!instance) {
-            instance = new LateQueue();
-        };
-        return instance;
-    }
-};
-LateQueue* LateQueue::instance = nullptr;
-
 class $modify(CCDictionary) {
 
     // Cocos will call autorelease on a nullptr here for some reason, 
@@ -61,7 +35,7 @@ class $modify(CCObject) {
         if (!modding->doModify) return CCObject::autorelease();
 
         if (MyCCNode* node = static_cast<MyCCNode*>(typeinfo_cast<CCNode*>(this))) {
-            if (modding->finishedLoad && !node->isModified()) {
+            if (!node->isModified()) {
                 const std::string& className = Utils::getNodeName(node);
                 node->retain();
                 LateQueue::get()->queue([modding, node, className] {

src/UIModding.cpp

@@ -1285,7 +1285,7 @@ void UIModding::createAndModifyNewChild(CCNode* node, const matjson::Value& newC
                             buttonText = attributesVal["button-text"].asString().unwrapOr("");
                         }
                         FLAlertLayer* alert = geode::createQuickPopup(title.c_str(), description, buttonText.c_str(), nullptr, nullptr, false, true);
-                        static_cast<MyFLAlertLayer*>(alert)->setRift();
+                        reinterpret_cast<MyFLAlertLayer*>(alert)->setRift();
                         DataNode* data = DataNode::create(alert);
                         newNode = data;
                     }

src/UIModding.hpp

@@ -25,7 +25,6 @@ class UIModding {
     std::vector<FileWatcher*> listeners;
     Ref<CCArray> removalQueue = CCArray::create();
     bool doModify;
-    bool finishedLoad;
     bool skipCheck;
 
     void recursiveModify(CCNode* node, const matjson::Value& elements);