many fixes and improvements

Author: Alphalaneous

changelog.md

@@ -1,3 +1,10 @@
+# 2.0.8
+- Rewrite hover logic (layering properly works now)
+- Add support for more sprite formats (GIF, JPEG XL, WebP, QOI) thanks to Prevter's ImagePlus.
+- Add scaling size modes
+- Fixed a potential crash when other mods do stupid *** like deleting a node manually right after autoreleasing.
+- Fix LoadingLayer not being modified
+
 # 2.0.7
 - Fix a crash
 

mod.json

@@ -6,7 +6,7 @@
         "mac": "2.2074",
         "ios": "2.2074"
     },
-    "version": "v2.0.7",
+    "version": "v2.0.8",
     "id": "alphalaneous.happy_textures",
     "name": "Happy Textures :3",
     "developer": "Alphalaneous",
@@ -15,6 +15,7 @@
     "dependencies": {
         "geode.node-ids": ">=v1.15.0",
         "alphalaneous.alphas_geode_utils": ">=v1.1.8",
+        "prevter.imageplus": ">=v1.0.0",
         "geode.texture-loader": {
             "importance": "suggested",
             "version": ">=v1.7.0"

src/LateQueue.cpp

@@ -2,13 +2,19 @@
 
 LateQueue* LateQueue::instance = nullptr;
 
-void LateQueue::queue(ScheduledFunction&& func) {
-    m_mainThreadQueue.push_back(std::move(func));
+void LateQueue::queue(CCObject* node, ScheduledFunction&& func) {
+    m_mainThreadQueue[node].push_back(std::move(func));
+}
+
+void LateQueue::remove(CCObject* node) {
+    m_mainThreadQueue.erase(node);
 }
 
 void LateQueue::executeQueue() {
-    for (auto const& func : m_mainThreadQueue) {
-        if (func) func();
+    for (auto const& [k, v] : m_mainThreadQueue) {
+        for (auto const& func : v) {
+            if (func) func();
+        }
     }
     m_mainThreadQueue.clear();
 }

src/LateQueue.hpp

@@ -9,9 +9,10 @@ class LateQueue {
 protected:
     static LateQueue* instance;
 public:
-    std::vector<ScheduledFunction> m_mainThreadQueue;
+    std::unordered_map<CCObject*, std::vector<ScheduledFunction>> m_mainThreadQueue;
 
-    void queue(ScheduledFunction&& func);
+    void queue(CCObject* node, ScheduledFunction&& func);
+    void remove(CCObject* node);
     void executeQueue();
     static LateQueue* get();
 };

src/NodeModding.hpp

@@ -6,6 +6,7 @@
 #include <Geode/modify/CCDictionary.hpp>
 #include "UIModding.hpp"
 #include "nodes/CCNode.hpp"
+#include <alphalaneous.alphas_geode_utils/include/NodeModding.h>
 #include "Utils.hpp"
 #include "Macros.hpp"
 #include "LateQueue.hpp"
@@ -36,16 +37,13 @@ class $modify(CCObject) {
 
         if (MyCCNode* node = static_cast<MyCCNode*>(typeinfo_cast<CCNode*>(this))) {
             if (!node->isModified()) {
-                const std::string& className = AlphaUtils::Cocos::getClassName(node, true);
-                node->retain();
-                LateQueue::get()->queue([modding, node, className] {
+                LateQueue::get()->queue(node, [modding, node] {
+                    std::string className = AlphaUtils::Cocos::getClassName(node, true);
                     modding->doUICheckForType(className, node);
                     node->setModified();
-                    node->release();
                 });
             }
         }
-        
         return CCObject::autorelease();
     }
 };
@@ -55,4 +53,10 @@ class $modify(CCPoolManager) {
         LateQueue::get()->executeQueue();
         CCPoolManager::pop();
     }
+
+    void removeObject(CCObject* pObject) {
+        LateQueue::get()->remove(pObject);
+        CCPoolManager::removeObject(pObject);
+    }
+
 };