Fixes

Author: Alphalaneous

changelog.md

@@ -1,5 +1,6 @@
 ## 1.9.4
 - Fix a bug with sprite frames not being able to be set
+- Fix some load delay
 
 ## 1.9.3
 **NOTICE! Modifying nodes by ID will soon be depreciated. Once the next GD update comes out, I will be removing that feature in favor of modiifying nodes by their class name. This is the name BEFORE the one in quotes in DevTools. For example `ui/cvolton.betterinfo$ExtendedLevelInfo.json` will become `ui/ExtendedLevelInfo.json` and anything in the nodes folder will no longer work and should be placed in the UI folder.**

src/NodeModding.h

@@ -45,9 +45,10 @@ class NodeModding {
     void handleCurrentNode(CCNode* node) {
         std::string className = Utils::getNodeName(node);
         if (m_nodesToModify.contains(className)) {
+            std::pair<std::function<void(CCNode*)>, bool> nodeToModify = m_nodesToModify[className];
             if (!node->getUserObject("node_modified"_spr)) {
-                if (!m_nodesToModify[className].second) {
-                    m_nodesToModify[className].first(node);
+                if (!nodeToModify.second) {
+                    nodeToModify.first(node);
                 }
                 node->setUserObject("node_modified"_spr, CCBool::create(true));
             }
@@ -56,19 +57,6 @@ class NodeModding {
             UIModding::get()->doUICheckForType(className, node);
         }
     }
-
-    void handleArray(CCArray* array) {
-        auto scene = CCDirector::sharedDirector()->getRunningScene();
-
-        if (scene && UIModding::get()->doModify && !Callbacks::get()->m_ignoreUICheck) {
-            
-            for (auto object : CCArrayExt<CCObject*>(array)) {
-                if (auto node = typeinfo_cast<CCNode*>(object)) {
-                    handleCurrentNode(node);
-                }
-            }
-        }
-    }
 };
 
 #include <Geode/modify/CCObject.hpp>
@@ -87,25 +75,8 @@ class $modify(CCObject) {
                     node->setUserObject("node_modified"_spr, CCBool::create(true));
                 }
             }
+            NodeModding::get()->handleCurrentNode(node);
         }
         return CCObject::autorelease();
     }
 };
-
-#include <Geode/modify/CCPoolManager.hpp>
-
-class $modify(CCPoolManager) {
-    void pop() {
-        auto poolManager = reinterpret_cast<CCPoolManagerHack*>(this);
-
-        if (poolManager && poolManager->m_pCurReleasePool) {
-            auto pool = reinterpret_cast<CCAutoreleasePoolHack*>(poolManager->m_pCurReleasePool);
-
-            if (pool->m_pManagedObjectArray) {
-                NodeModding::get()->handleArray(pool->m_pManagedObjectArray);
-            }
-        }
-
-        return CCPoolManager::pop();
-    }
-};

src/UIModding.cpp

@@ -944,7 +944,7 @@ std::vector<std::string> generateValidSprites(std::string path, matjson::Value s
 void UIModding::setSprite(CCNode* node, matjson::Value attributes) {
     if (attributes.contains("sprite")) {
         matjson::Value sprite = attributes["sprite"];
-        CCSprite* spr;
+        CCSprite* spr = nullptr;
         std::string spriteName;
         if (sprite.isObject()) {
             matjson::Value randomObject = sprite["random"];
@@ -964,14 +964,14 @@ void UIModding::setSprite(CCNode* node, matjson::Value attributes) {
                 }
                 spriteName = randomSprites[id];
             }
-            spr = Utils::getValidSprite(spriteName.c_str());
-            if (!spr) spr = Utils::getValidSpriteFrame(spriteName.c_str());
+            spr = Utils::getValidSpriteFrame(spriteName.c_str());
+            if (!spr) spr = Utils::getValidSprite(spriteName.c_str());
             if (!spr) return;
         }
         if (sprite.isString()) {
             spriteName = sprite.asString().unwrapOr("");
-            spr = Utils::getValidSprite(spriteName.c_str());
-            if (!spr) spr = Utils::getValidSpriteFrame(spriteName.c_str());
+            spr = Utils::getValidSpriteFrame(spriteName.c_str());
+            if (!spr) spr = Utils::getValidSprite(spriteName.c_str());
             if (!spr) return;
         }