Fix a crash

Author: Alphalaneous

changelog.md

@@ -1,3 +1,7 @@
+## 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.**
+- Fixed crash when pressing space on main menu for mac
+
 ## 1.9.2
 - Fix a memory leak when setting a font file on a CCLabelBMFont
 - Remove batch node hack :P

mod.json

@@ -1,11 +1,11 @@
 {
-    "geode": "4.1.1",
+    "geode": "4.2.1",
     "gd": {
         "win": "2.2074",
         "android": "2.2074",
         "mac": "2.2074"
     },
-    "version": "v1.9.2",
+    "version": "v1.9.3",
     "id": "alphalaneous.happy_textures",
     "name": "Happy Textures :3",
     "developer": "Alphalaneous",

src/Callbacks.cpp

@@ -28,13 +28,29 @@ CCMenuItemSpriteExtra* Callbacks::getDummyButton() {
     return m_dummyButton;
 }
 
+struct MenuLayerCallbacks : public CCNode {
+
+    void onPlay(CCObject* obj) {
+        CCDirector::get()->pushScene(CCTransitionFade::create(0.5, LevelSelectLayer::scene(0)));
+    }
+
+    void onCreator(CCObject* obj) {
+        CCDirector::get()->pushScene(CCTransitionFade::create(0.5, CreatorLayer::scene()));    
+    }
+
+    void onGarage(CCObject* obj) {
+        CCDirector::get()->pushScene(CCTransitionFade::create(0.5, GJGarageLayer::scene()));
+    }
+
+};
+
 void Callbacks::generateMenuLayerCallbacks() {
     CREATE_NORMAL(MenuLayer);
-    REGISTER_CALLBACK(MenuLayer, onPlay);
+    m_callbacks["MenuLayer"]["onPlay"] = std::pair<CCNode*, cocos2d::SEL_MenuHandler>(self, menu_selector(MenuLayerCallbacks::onPlay));
+    m_callbacks["MenuLayer"]["onGarage"] = std::pair<CCNode*, cocos2d::SEL_MenuHandler>(self, menu_selector(MenuLayerCallbacks::onGarage));
+    m_callbacks["MenuLayer"]["onCreator"] = std::pair<CCNode*, cocos2d::SEL_MenuHandler>(self, menu_selector(MenuLayerCallbacks::onCreator));
     REGISTER_CALLBACK(MenuLayer, onAchievements);
-    REGISTER_CALLBACK(MenuLayer, onCreator);
     REGISTER_CALLBACK(MenuLayer, onDaily);
-    REGISTER_CALLBACK(MenuLayer, onGarage);
     REGISTER_CALLBACK(MenuLayer, onMoreGames);
     REGISTER_CALLBACK(MenuLayer, onMyProfile);
     REGISTER_CALLBACK(MenuLayer, onOptions);

src/UIModding.cpp

@@ -1572,12 +1572,18 @@ void UIModding::doUICheck(CCNode* node, bool afterTransition) {
     unsigned long fileSize = 0;
     unsigned char* buffer = CCFileUtils::sharedFileUtils()->getFileData(path.c_str(), "rb", &fileSize);    
 
+    /*if (!buffer || fileSize == 0) {
+        path = "ui/nodes/" + nodeID + ".json";
+        buffer = CCFileUtils::sharedFileUtils()->getFileData(path.c_str(), "rb", &fileSize);
+    }*/
+
     if (buffer && fileSize != 0) {
 
         std::string data = std::string(reinterpret_cast<char*>(buffer), fileSize);
         geode::Result<matjson::Value, matjson::ParseError> value = matjson::parse(data);
 
         if (value.isOk()) {
+            log::warn("Modifying by ID with Happy Textures will soon be unsupported!");
 
             matjson::Value expandedValue = value.unwrap();
             if (expandedValue.isObject()) {

src/nodes/MenuLayer.h

@@ -13,36 +13,6 @@ class $modify(MyMenuLayer, MenuLayer) {
         HOOK_LATEST("MenuLayer::init");
     }
 
-    void onPlay(CCObject* obj) {
-        if (CCNode* node = typeinfo_cast<CCNode*>(obj)) {
-            if (node->getUserObject("dummy"_spr)) {
-                CCDirector::get()->pushScene(CCTransitionFade::create(0.5, LevelSelectLayer::scene(0)));
-                return;
-            }
-        }
-        MenuLayer::onPlay(obj);
-    }
-
-    void onCreator(CCObject* obj) {
-        if (CCNode* node = typeinfo_cast<CCNode*>(obj)) {
-            if (node->getUserObject("dummy"_spr)) {
-                CCDirector::get()->pushScene(CCTransitionFade::create(0.5, CreatorLayer::scene()));
-                return;
-            }
-        }
-        MenuLayer::onCreator(obj);
-    }
-
-    void onGarage(CCObject* obj) {
-        if (CCNode* node = typeinfo_cast<CCNode*>(obj)) {
-            if (node->getUserObject("dummy"_spr)) {
-                CCDirector::get()->pushScene(CCTransitionFade::create(0.5, GJGarageLayer::scene()));
-                return;
-            }
-        }
-        MenuLayer::onGarage(obj);
-    }
-
     bool init() {
         if (Callbacks::get()->m_ignoreUICheck) return MenuLayer::init();