more fixes

Alphalaneous · Dec 28, 2024 · 94ed951 · 94ed951
1 parent 7230167
commit 94ed951
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 15 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,7 +1,7 @@
 ## 1.8.5
 - Cleanup filesystem code
 - Fix a crash when there is an invalid path (hopefully)
-- Fix an issue with CCSpriteWithHue. Do note that changing the wraith textures is still broken and has inconsistent behavior
+- Fix an issue with CCSpriteWithHue
 
 ## 1.8.4
 - Actually fix loading individual sprites from init

diff --git a/src/UIModding.h b/src/UIModding.h
@@ -21,8 +21,7 @@ class UIModding {
     std::map<std::string, std::string> randomSprites;
     std::vector<std::filesystem::path> activePackCache;
     std::unordered_map<std::string, bool> filenameCache;
-    std::unordered_map<std::string, bool> spritesChanged;
-    std::unordered_map<CCSpriteFrame*, std::string> frameToNameMap;
+    std::unordered_map<CCTexture2D*, std::string> textureToNameMap;
 
     std::vector<FileWatcher*> listeners;
     Ref<CCArray> removalQueue = CCArray::create();

diff --git a/src/Utils.h b/src/Utils.h
@@ -142,10 +142,13 @@ namespace Utils {
     }
 
     static std::string getSpriteName(CCSpriteFrame* spriteFrame) {
-        if (UIModding::get()->frameToNameMap.contains(spriteFrame)) return UIModding::get()->frameToNameMap[spriteFrame];
+        if (UIModding::get()->textureToNameMap.contains(spriteFrame->getTexture())) {
+            return UIModding::get()->textureToNameMap[spriteFrame->getTexture()];
+        }
+
         for (auto [key, frame] : CCDictionaryExt<std::string, CCSpriteFrame*>(CCSpriteFrameCache::sharedSpriteFrameCache()->m_pSpriteFrames)) {
-            if (spriteFrame == frame) {
-                UIModding::get()->frameToNameMap[spriteFrame] = key;
+            if (spriteFrame->getTexture() == frame->getTexture() && frame->getRect() == spriteFrame->getRect()) {
+                UIModding::get()->textureToNameMap[spriteFrame->getTexture()] = key;
                 return key;
             }
         }
@@ -241,7 +244,6 @@ namespace Utils {
                 if (entry.is_regular_file()) {
                     std::string pathStr = entry.path().string();
                     std::string subStr = pathStr.substr(packPath.string().size() + 1);
-                    log::info("subStr: {}", subStr);
                     UIModding::get()->filenameCache[qualityToNormal(utils::string::replace(subStr, "\\", "/"))] = true;
                 }
             }

diff --git a/src/nodes/CCSprite.h b/src/nodes/CCSprite.h
@@ -14,11 +14,11 @@ class $modify(MyCCSpriteWithHue, CCSpriteWithHue) {
     bool initWithSpriteFrame(cocos2d::CCSpriteFrame* p0) {
         std::string frameName = Utils::getSpriteName(p0);
 
-        if (Utils::spriteExistsInPacks(frameName) && !UIModding::get()->spritesChanged[frameName]) {
+        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());
-            UIModding::get()->spritesChanged[frameName] = true;
+            return CCSpriteWithHue::initWithSpriteFrame(spriteFrame);
         }
 
         return CCSpriteWithHue::initWithSpriteFrame(p0);
@@ -33,23 +33,21 @@ class $modify(MyCCSprite, CCSprite) {
     }
 
     bool initWithSpriteFrameName(const char *pszSpriteFrameName) {
-        if (Utils::spriteExistsInPacks(pszSpriteFrameName) && !UIModding::get()->spritesChanged[pszSpriteFrameName]) {
+        if (Utils::spriteExistsInPacks(pszSpriteFrameName)) {
 
             CCSprite* spr = CCSprite::create(pszSpriteFrameName);
             auto spriteFrame = CCSpriteFrame::createWithTexture(spr->getTexture(), spr->getTextureRect());
             CCSpriteFrameCache::get()->addSpriteFrame(spriteFrame, pszSpriteFrameName);
-            UIModding::get()->spritesChanged[pszSpriteFrameName] = true;
         }
         return CCSprite::initWithSpriteFrameName(pszSpriteFrameName);
     }
 
     static CCSprite* createWithSpriteFrameName(const char *pszSpriteFrameName) {
-        if (Utils::spriteExistsInPacks(pszSpriteFrameName) && !UIModding::get()->spritesChanged[pszSpriteFrameName]) {
+        if (Utils::spriteExistsInPacks(pszSpriteFrameName)) {
 
             CCSprite* spr = CCSprite::create(pszSpriteFrameName);
             auto spriteFrame = CCSpriteFrame::createWithTexture(spr->getTexture(), spr->getTextureRect());
             CCSpriteFrameCache::get()->addSpriteFrame(spriteFrame, pszSpriteFrameName);
-            UIModding::get()->spritesChanged[pszSpriteFrameName] = true;
         }
 
         return CCSprite::createWithSpriteFrameName(pszSpriteFrameName);

diff --git a/src/nodes/LoadingLayer.h b/src/nodes/LoadingLayer.h
@@ -19,8 +19,7 @@ class $modify(MyLoadingLayer, LoadingLayer) {
         UIModding::get()->finishedLoad = false;
         UIModding::get()->uiCache.clear();
         UIModding::get()->colorCache.clear();
-        UIModding::get()->spritesChanged.clear();
-        UIModding::get()->frameToNameMap.clear();
+        UIModding::get()->textureToNameMap.clear();
 
         queueInMainThread([] {
             Utils::clearActivePackCache();