Fix some issues

Alphalaneous · Jul 22, 2024 · a88e77e · a88e77e
1 parent 5a78244
commit a88e77e
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 42 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -34,8 +34,8 @@ jobs:
       - name: Build the mod
         uses: geode-sdk/build-geode-mod@main
         with:
-          sdk: 'v3.1.1'
-          cli: 'v3.0.0'
+          sdk: 'v3.2.0'
+          cli: 'v3.2.0'
           bindings: geode-sdk/bindings
           bindings-ref: main
           combine: true

diff --git a/mod.json b/mod.json
@@ -1,11 +1,11 @@
 {
-	"geode": "3.1.1",
+	"geode": "3.2.0",
 	"gd": {
 		"win": "2.206",
 		"android": "2.206",
 		"mac": "2.206"
 	},
-	"version": "v1.3.19",
+	"version": "v1.3.20",
 	"id": "alphalaneous.happy_textures",
 	"name": "Happy Textures :3",
 	"developer": "Alphalaneous",

diff --git a/src/UIModding.cpp b/src/UIModding.cpp
@@ -1491,7 +1491,7 @@ void UIModding::startFileListeners(){
         fw->stop();
     }
     listeners.clear();
-    std::vector<std::string> packs = getActivePacks();
+    std::vector<std::string> packs = Utils::getActivePacks();
     for(std::string path : packs){
 
         std::string uiPath = fmt::format("{}{}", path, "ui\\");
@@ -1519,41 +1519,7 @@ void UIModding::startFileListeners(){
     }
 }
 
-std::vector<std::string> UIModding::getActivePacks(){
 
-    gd::vector<gd::string> paths = CCFileUtils::sharedFileUtils()->getSearchPaths();
-    std::vector<std::string> packPaths;
-    Mod* textureLoader = Loader::get()->getLoadedMod("geode.texture-loader");
-    if(textureLoader){
-        std::filesystem::path textureLoaderPacks = textureLoader->getConfigDir();
-        std::string packDirStr = fmt::format("{}{}", textureLoaderPacks, "\\packs");
-        std::filesystem::path packDir = std::filesystem::path(packDirStr);
-
-        for(std::string path : paths){
-
-            std::filesystem::path fpath = std::filesystem::path(path);
-            std::filesystem::path pathParent = std::filesystem::path(path);
-
-            while(pathParent.has_parent_path()){
-
-                if(pathParent == packDir){
-                    if(std::find(packPaths.begin(), packPaths.end(), fpath.string()) == packPaths.end()) {
-                        packPaths.push_back(fpath.string());
-                        break;
-                    }
-                }
-                if(pathParent == std::filesystem::current_path().root_path()){
-                    break;
-                }
-                pathParent = pathParent.parent_path();
-            }
-        }
-    }
-    std::string resourcesDir = fmt::format("{}{}", CCFileUtils::sharedFileUtils()->getWritablePath2(), "Resources\\");
-    packPaths.push_back(resourcesDir);
-
-    return packPaths;
-}
 
 AxisAlignment UIModding::getAxisAlignment(std::string name){
     AxisAlignment axisAlignment = AxisAlignment::Start;

diff --git a/src/Utils.h b/src/Utils.h
@@ -70,5 +70,41 @@ namespace Utils {
         }
         return spr;
     }
+
+    static std::vector<std::string> getActivePacks(){
+
+        gd::vector<gd::string> paths = CCFileUtils::sharedFileUtils()->getSearchPaths();
+        std::vector<std::string> packPaths;
+        Mod* textureLoader = Loader::get()->getLoadedMod("geode.texture-loader");
+        if(textureLoader){
+            std::filesystem::path textureLoaderPacks = textureLoader->getConfigDir();
+            std::string packDirStr = fmt::format("{}{}", textureLoaderPacks, "\\packs");
+            std::filesystem::path packDir = std::filesystem::path(packDirStr);
+
+            for(std::string path : paths){
+
+                std::filesystem::path fpath = std::filesystem::path(path);
+                std::filesystem::path pathParent = std::filesystem::path(path);
+
+                while(pathParent.has_parent_path()){
+
+                    if(pathParent == packDir){
+                        if(std::find(packPaths.begin(), packPaths.end(), fpath.string()) == packPaths.end()) {
+                            packPaths.push_back(fpath.string());
+                            break;
+                        }
+                    }
+                    if(pathParent == std::filesystem::current_path().root_path()){
+                        break;
+                    }
+                    pathParent = pathParent.parent_path();
+                }
+            }
+        }
+        std::string resourcesDir = fmt::format("{}{}", CCFileUtils::sharedFileUtils()->getWritablePath2(), "Resources\\");
+        packPaths.push_back(resourcesDir);
+
+    return packPaths;
+}
 }
 #endif
diff --git a/src/icons/IconHandler.h b/src/icons/IconHandler.h
@@ -0,0 +1,15 @@
+#include <Geode/Geode.hpp>
+#include "../Utils.h"
+
+
+using namespace geode::prelude;
+
+/*$execute {
+
+    std::vector<std::string> packs = Utils::getActivePacks();
+
+    for(std::string path : packs){
+        log::info("{}", path);
+    }
+
+}*/
diff --git a/src/main.cpp b/src/main.cpp
@@ -15,6 +15,7 @@
 #include "nodes/LoadingLayer.h"
 #include "nodes/MenuGameLayer.h"
 #include "nodes/MenuLayer.h"
+#include "icons/IconHandler.h"
 #include "CCDirector.h"
 
 using namespace geode::prelude;
diff --git a/src/nodes/CCLabelBMFont.h b/src/nodes/CCLabelBMFont.h
@@ -36,8 +36,12 @@ class $modify(MyCCLabelBMFont, CCLabelBMFont){
 
         #ifndef GEODE_IS_MACOS
 
-        myRet->m_fields->m_schedule = schedule_selector(MyCCLabelBMFont::checkParent);
-        ret->schedule(myRet->m_fields->m_schedule);
+        bool doFix = Mod::get()->getSettingValue<bool>("pusab-fix");
+
+        if(doFix){
+            myRet->m_fields->m_schedule = schedule_selector(MyCCLabelBMFont::checkParent);
+            ret->schedule(myRet->m_fields->m_schedule);
+        }
 
         #endif
 
@@ -51,7 +55,9 @@ class $modify(MyCCLabelBMFont, CCLabelBMFont){
         if(auto parent = this->getParent()){
             if(typeinfo_cast<LabelGameObject*>(parent)){
                 if(strcmp(this->getFntFile(), "bigFont.fnt") == 0){
+                    ccBlendFunc blendFunc = this->getBlendFunc();
                     this->setFntFile("bigFont.fnt"_spr);
+                    this->setBlendFunc(blendFunc);
                 }
             }
             this->unschedule(m_fields->m_schedule);

diff --git a/src/nodes/CCMenuItemSpriteExtra.h b/src/nodes/CCMenuItemSpriteExtra.h
@@ -110,7 +110,7 @@ class $modify(EventCCMenuItemSpriteExtra, CCMenuItemSpriteExtra) {
 
     void checkTouch(bool hasLayerOnTop){
 
-        if(this && (m_fields->hasHover || m_fields->hasExit) && nodeIsVisible(this)){
+        if((m_fields->hasHover || m_fields->hasExit) && nodeIsVisible(this)){
 
             CCPoint point = getMousePos();