Fix

Author: Alphalaneous

changelog.md

@@ -1,3 +1,6 @@
+## 1.9.9
+- Fix sprite crash
+
 ## 1.9.8
 - Add basic support for SimpleAxisLayout
 - Fix setDisplayFrame not using changed textures

mod.json

@@ -6,7 +6,7 @@
         "mac": "2.2074",
         "ios": "2.2074"
     },
-    "version": "v1.9.8",
+    "version": "v1.9.9",
     "id": "alphalaneous.happy_textures",
     "name": "Happy Textures :3",
     "developer": "Alphalaneous",

src/nodes/CCSprite.h

@@ -1,71 +1,19 @@
 #pragma once
 
 #include <Geode/Geode.hpp>
-#include <Geode/modify/CCSprite.hpp>
-#include <Geode/modify/CCSpriteWithHue.hpp>
-#include "../Macros.h"
-
-class $modify(MyCCSpriteWithHue, CCSpriteWithHue) {
-
-    static void onModify(auto& self) {
-        (void) self.setHookPriority("cocos2d::CCSpriteWithHue::initWithSpriteFrame", Priority::VeryEarly);
-    }
-
-    bool initWithSpriteFrame(cocos2d::CCSpriteFrame* p0) {
-        std::string frameName = Utils::getSpriteName(p0);
-
-        if (Utils::spriteExistsInPacks(frameName)) {
-            CCSprite* spr = CCSprite::create(frameName.c_str());
-            auto spriteFrame = CCSpriteFrame::createWithTexture(spr->getTexture(), spr->getTextureRect());
-            CCSpriteFrameCache::get()->addSpriteFrame(spriteFrame, frameName.c_str());
-            return CCSpriteWithHue::initWithSpriteFrame(spriteFrame);
+#include <Geode/modify/CCSpriteFrameCache.hpp>
+
+class $modify(MyCCSpriteFrameCache, CCSpriteFrameCache) {
+    CCSpriteFrame* spriteFrameByName(const char *pszName) {
+
+        if (Utils::spriteExistsInPacks(pszName)) {
+            CCTexture2D* pTexture = CCTextureCache::get()->addImage(pszName, false);
+            if (pTexture){
+                CCRect rect = CCRectZero;
+                rect.size = pTexture->getContentSize();
+                return CCSpriteFrame::createWithTexture(pTexture, rect);
+            }
         }
-
-        return CCSpriteWithHue::initWithSpriteFrame(p0);
-    }
-};
-
-class $modify(MyCCSprite, CCSprite) {
-
-    static void onModify(auto& self) {
-        (void) self.setHookPriority("cocos2d::CCSprite::initWithSpriteFrameName", Priority::VeryEarly);
-        (void) self.setHookPriority("cocos2d::CCSprite::createWithSpriteFrameName", Priority::VeryEarly);
-        (void) self.setHookPriority("cocos2d::CCSprite::setDisplayFrame", Priority::VeryEarly);
-    }
-    
-    void setDisplayFrame(CCSpriteFrame *pNewFrame) {
-        std::string frameName = Utils::getSpriteName(pNewFrame);
-        if (Utils::spriteExistsInPacks(frameName)) {
-            CCSprite* spr = CCSprite::create(frameName.c_str());
-            auto spriteFrame = CCSpriteFrame::createWithTexture(spr->getTexture(), spr->getTextureRect());
-            CCSpriteFrameCache::get()->addSpriteFrame(spriteFrame, frameName.c_str());
-            return CCSprite::setDisplayFrame(spriteFrame);
-        }
-        CCSprite::setDisplayFrame(pNewFrame);
-    }
-
-    bool initWithSpriteFrameName(const char *pszSpriteFrameName) {
-        std::string copy = pszSpriteFrameName;
-        
-        if (Utils::spriteExistsInPacks(copy)) {
-            CCSprite* spr = CCSprite::create(copy.c_str());
-            auto spriteFrame = CCSpriteFrame::createWithTexture(spr->getTexture(), spr->getTextureRect());
-            CCSpriteFrameCache::get()->addSpriteFrame(spriteFrame, copy.c_str());
-        }
-
-        return CCSprite::initWithSpriteFrameName(copy.c_str());
-    }
-    
-    static CCSprite* createWithSpriteFrameName(const char *pszSpriteFrameName) {
-        std::string copy = pszSpriteFrameName;
-
-        if (Utils::spriteExistsInPacks(copy)) {
-
-            CCSprite* spr = CCSprite::create(copy.c_str());
-            auto spriteFrame = CCSpriteFrame::createWithTexture(spr->getTexture(), spr->getTextureRect());
-            CCSpriteFrameCache::get()->addSpriteFrame(spriteFrame, copy.c_str());
-        }
-
-        return CCSprite::createWithSpriteFrameName(copy.c_str());
+        return CCSpriteFrameCache::spriteFrameByName(pszName);
     }
 };