Fixes

Author: Alphalaneous

changelog.md

@@ -1,23 +1,27 @@
-## 2.0.5
+# 2.0.6
+- Quick fixes you'll never see as an end user
+- Still haven't fixed certain reported issues that require extensive testing, please be patient on those
+
+# 2.0.5
 - No more flicker on table cells
 - Reduce hooks (using Alpha's Geode Utils)
 - Performance Improvements
 - Code cleanup
 
-## 2.0.4
+# 2.0.4
 - Fix a crash
 
-## 2.0.3
+# 2.0.3
 - Fix a cocos bug
 
-## 2.0.2
+# 2.0.2
 - Bug fix
 
-## 2.0.1
+# 2.0.1
 - Fix a crash when a texture name was too short
 - Update UI at end of frame rather than start
 
-## 2.0.0
+# 2.0.0
 **NOTICE! Modifying nodes by ID is removed. You must now modify them by their class name instead.**
 - Code cleanup
 - Multi pack UI modding (packs can now modify other packs based on priority in Texture Loader)
@@ -30,121 +34,121 @@
   - No longer double activates transitions
   - Hot reload fixes
 
-## 1.9.10
+# 1.9.10
 - Bug fixes
 
-## 1.9.9
+# 1.9.9
 - Fix sprite crash
 
-## 1.9.8
+# 1.9.8
 - Add basic support for SimpleAxisLayout
 - Fix setDisplayFrame not using changed textures
 
-## 1.9.7
+# 1.9.7
 - Fix 2
 
-## 1.9.6
+# 1.9.6
 - Fix
 
-## 1.9.5
+# 1.9.5
 - iOS support
 
-## 1.9.4
+# 1.9.4
 - Fix a bug with sprite frames not being able to be set
 - Fix some load delay
 
-## 1.9.3
+# 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 modifying 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.**
 - Fixed crash when pressing space on main menu for mac
 
-## 1.9.2
+# 1.9.2
 - Fix a memory leak when setting a font file on a CCLabelBMFont
 - Remove batch node hack :P
 
-## 1.9.1
+# 1.9.1
 - Fix a crash with labels
 - Revamp Texture Loader pack nodes
 - Add Friend Requests cells to the default cell color modifications
 - Use geode::Popup for alerts
 - General code cleanup
 
-## 1.9.0
+# 1.9.0
 - Conditionals (If statements) (See Wiki)
 - Root node shortcut (See Wiki)
 - More variables (See Wiki)
 - Updated Rift
 
-## 1.8.8
+# 1.8.8
 - Implement a fix for another mod's mistake :P
 
-## 1.8.7
+# 1.8.7
 - Fix a very teeny bug that may break MenuLayer changes
 
-## 1.8.6
+# 1.8.6
 - Added "after-transition" object for layers in a scene, allowing for you to only make changes after the transition finishes (see wiki for more details)
 - Fixed cache failing to be reset, resulting in missing textures when a pack is unapplied
 
-## 1.8.5
+# 1.8.5
 - Cleanup filesystem code
 - Fix a crash when there is an invalid path (hopefully)
 - Fix an issue with CCSpriteWithHue
 
-## 1.8.4
+# 1.8.4
 - Actually fix loading individual sprites from init
 
-## 1.8.3
+# 1.8.3
 - Fix loading individual sprites from init
 
-## 1.8.2
+# 1.8.2
 - Fix some layouting issues
 - Fix duplicated node modifications for certain layers
 - Fix individual sprites not working if only some qualities are present
 - Fix applied packs not updating (uses a new Texture Loader API, make sure Texture Loader is up to date if you experience this issue!)
 
-## 1.8.1
+# 1.8.1
 - Fix crash on non-windows
 - Change individual sprite changing logic
 
-## 1.8.0
+# 1.8.0
 - Support for retexturing individual sprites outside of spritesheets (see wiki for more details)
 - Support for disabling batch nodes (for UI purposes, in levels they will not be disabled)
 
-## 1.7.8
+# 1.7.8
 - list-cell-selected added to hardcoded color modifications for leaderboards
 - Changed hook prio logic
 - Mac support for everything
 
-## 1.7.7 
+# 1.7.7 
 - Zipped packs should work properly now
 - Fixed issues with file listener
 - Fixed issues with path separators
 
-## 1.7.6
+# 1.7.6
 - Node by typeid bugfix
 
-## 1.7.5
+# 1.7.5
 - Allow inputting hex colors
 - Fix sprite frame texture rotate bug
 - Fix an issue where onCreator and onGarage wouldn't work
 
-## 1.7.4
+# 1.7.4
 - Fix a crash that can occur when pressing space on the main menu
 - Fix a crash that can occur with invalid parents
 - Added new scroll-to-top attribute for ScrollLayers
 - Added new lock-attributes attribute to reset attributes every frame 
 
-## 1.7.3
+# 1.7.3
 - Fix an issue with MenuLayer::onPlay callbacks not working because apparently it is a meanie head and wanted to be rude :(
 
-## 1.7.2
+# 1.7.2
 - Add the ability to run certain button callbacks anywhere
 
-## 1.7.1
+# 1.7.1
 - Fix a freeze that could happen on launch if GD was on a separate drive
 - Fix node modifications not properly reloading on pack change
 - Getting a node by type now allows for any class to be passed in
 
-## 1.7.0
+# 1.7.0
 - Node Specific Changes Updates:
   - Now any node type can be modified
   - Node type modification code simplified (better performance)
@@ -158,16 +162,16 @@
 - Allow stacking multiple events on a button instead of only 1
 - General performance improvements
 
-## 1.6.2
+# 1.6.2
 - Fix a crash with cursed FLAlertLayers
 
-## 1.6.1
+# 1.6.1
 - Bug fix for variables not working in popups created by HT Packs
 
-## 1.6.0
+# 1.6.0
 - <cg>Add extensive label variables with RIFT</c>
 - Add color changing for music library cells
 - Code cleanup
 
-## <1.6.0
+# <1.6.0
 - Add everything

mod.json

@@ -1,20 +1,20 @@
 {
-    "geode": "4.6.2",
+    "geode": "4.7.0",
     "gd": {
         "win": "2.2074",
         "android": "2.2074",
         "mac": "2.2074",
         "ios": "2.2074"
     },
-    "version": "v2.0.5",
+    "version": "v2.0.6",
     "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",
+        "alphalaneous.alphas_geode_utils": ">=v1.1.8",
         "geode.texture-loader": {
             "importance": "suggested",
             "version": ">=v1.7.0"

src/NodeModding.hpp

@@ -36,7 +36,7 @@ class $modify(CCObject) {
 
         if (MyCCNode* node = static_cast<MyCCNode*>(typeinfo_cast<CCNode*>(this))) {
             if (!node->isModified()) {
-                const std::string& className = Utils::getNodeName(node);
+                const std::string& className = AlphaUtils::Cocos::getClassName(node, true);
                 node->retain();
                 LateQueue::get()->queue([modding, node, className] {
                     modding->doUICheckForType(className, node);

src/UIModding.cpp

@@ -1421,7 +1421,7 @@ void UIModding::reloadChildren(CCNode* parentNode, bool transition) {
 
 void UIModding::refreshChildren(CCNode* parentNode) {
     MyCCNode* myParentNode = static_cast<MyCCNode*>(parentNode);
-    doUICheckForType(Utils::getNodeName(parentNode), parentNode);
+    doUICheckForType(AlphaUtils::Cocos::getClassName(parentNode, true), parentNode);
     for (auto* node : CCArrayExt<MyCCNode*>(myParentNode->getChildren())) {
         refreshChildren(node);
     }

src/Utils.hpp

@@ -2,9 +2,9 @@
 
 #include <Geode/Geode.hpp>
 #include "UIModding.hpp"
-#include <random>
 #include "Macros.hpp"
 #include <geode.texture-loader/include/TextureLoader.hpp>
+#include <alphalaneous.alphas_geode_utils/include/Utils.h>
 
 using namespace geode::prelude;
 
@@ -22,15 +22,7 @@ namespace Utils {
 
     template <typename Layer, typename = std::enable_if_t<std::is_pointer_v<Layer>>>
     static Layer getLayer() {
-        auto* scene = CCDirector::sharedDirector()->getRunningScene();
-        if (!scene) return nullptr;
-
-        if (auto* trans = typeinfo_cast<CCTransitionScene*>(scene)) {
-            scene = public_cast(trans, m_pInScene);
-            if (!scene) return nullptr;
-        }
-
-        return scene->getChildByType<Layer>(0);
+        return AlphaUtils::Cocos::getLayer<Layer>().value_or(nullptr);
     }
 
     static int getValidStat(const std::string& key) {
@@ -49,62 +41,17 @@ namespace Utils {
     }
 
     static bool hasNode(CCNode* child, CCNode* node) {
-        for (CCNode* current = child; current != nullptr; current = current->getParent()) {
-            if (current == node) {
-                return true;
-            }
-        }
-        return false;
+        return AlphaUtils::Cocos::hasNode(child, node);
     }
 
-    
     //fix texture loader fallback
 
     static CCSprite* getValidSprite(const char* sprName) {
-        CCSprite* spr = CCSprite::create(sprName);
-        if (!spr || spr->getUserObject("geode.texture-loader/fallback")) {
-            return nullptr;
-        }
-        return spr;
+        return AlphaUtils::Cocos::getSprite(sprName).value_or(nullptr);
     }
 
-    //fix texture loader fallback
-
     static CCSprite* getValidSpriteFrame(const char* sprName) {
-        CCSprite* spr = CCSprite::createWithSpriteFrameName(sprName);
-        if (!spr || spr->getUserObject("geode.texture-loader/fallback")) {
-            return nullptr;
-        }
-        return spr;
-    }
-
-    static std::string nameForClass(const std::string& className) {
-        size_t lastSpace = className.rfind(' ');
-        size_t start = (lastSpace == std::string::npos) ? 0 : lastSpace + 1;
-
-        size_t lastColon = className.rfind("::");
-        size_t nameStart = (lastColon != std::string::npos && lastColon >= start)
-            ? lastColon + 2
-            : start;
-
-        return className.substr(nameStart);
-    }
-
-    static std::string getNodeName(CCObject* node) {
-    #ifdef GEODE_IS_WINDOWS
-        return nameForClass(typeid(*node).name() + 6);
-    #else 
-        std::string ret;
-
-        int status = 0;
-        auto demangle = abi::__cxa_demangle(typeid(*node).name(), 0, 0, &status);
-        if (status == 0) {
-            ret = demangle;
-        }
-        free(demangle);
-
-        return nameForClass(ret);
-    #endif
+        return AlphaUtils::Cocos::getSpriteByFrameName(sprName).value_or(nullptr);
     }
 
     static void setColorIfExists(CCRGBAProtocol* node, const std::string& colorId) {
@@ -131,15 +78,7 @@ namespace Utils {
     }
 
     static int getRandomNumber(int lower, int upper) {
-        if (lower > upper) {
-            std::swap(lower, upper);
-        }
-
-        static std::random_device rd; 
-        static std::mt19937 gen(rd()); 
-
-        std::uniform_int_distribution<> dist(lower, upper);
-        return dist(gen);
+        return AlphaUtils::Misc::getRandomNumber(lower, upper);
     }
 
     static void clearCaches() {
@@ -215,32 +154,7 @@ namespace Utils {
     }
 
     static CCNode* getChildByTypeName(CCNode* node, int index, const std::string& name) {
-        if (!node || node->getChildrenCount() == 0) return nullptr;
-
-        size_t indexCounter = 0;
-        const size_t childrenCount = node->getChildrenCount();
-
-        bool isNegativeIndex = (index < 0);
-        if (isNegativeIndex) {
-            index = -index - 1; 
-        }
-
-        for (size_t i = (isNegativeIndex ? childrenCount - 1 : 0); 
-            isNegativeIndex ? i >= 0 : i < childrenCount; 
-            isNegativeIndex ? --i : ++i) {
-
-            CCNode* idxNode = static_cast<CCNode*>(node->getChildren()->objectAtIndex(i));
-            if (getNodeName(idxNode) == name) {
-                if (indexCounter == index) {
-                    return idxNode;
-                }
-                ++indexCounter;
-            }
-
-            if (isNegativeIndex && i == 0) break;
-        }
-
-        return nullptr;
+        return AlphaUtils::Cocos::getChildByClassName(node, name, index).value_or(nullptr);
     }
 
 }