fuck arm

Author: Alphalaneous

changelog.md

@@ -1,3 +1,6 @@
+# 2.0.11
+- Fix a crash when pressing buttons
+
 # 2.0.10
 - Actually fix a crash
 

mod.json

@@ -6,7 +6,7 @@
         "mac": "2.2074",
         "ios": "2.2074"
     },
-    "version": "v2.0.10",
+    "version": "v2.0.11",
     "id": "alphalaneous.happy_textures",
     "name": "Happy Textures :3",
     "developer": "Alphalaneous",

src/UIModding.cpp

@@ -3,7 +3,7 @@
 #include "FileWatcher.hpp"
 #include "Utils.hpp"
 #include "nodes/CCLabelBMFont.hpp"
-#include "nodes/CCMenuItem.hpp"
+#include "nodes/CCMenuItemSpriteExtra.hpp"
 #include "nodes/FLAlertLayer.hpp"
 #include "nodes/CCNode.hpp"
 #include "UIModding.hpp"
@@ -906,7 +906,7 @@ void UIModding::setColor(CCNode* node, const matjson::Value& attributes) {
         std::string colorStr = color.asString().unwrapOr("");
 
         if (colorStr == "reset") {
-            if (auto node1 = static_cast<EventCCMenuItem*>(node)) {
+            if (auto node1 = static_cast<EventCCMenuItemSpriteExtra*>(typeinfo_cast<CCMenuItemSpriteExtra*>(node))) {
                 auto originalColor = node1->m_fields->originalColor;
                 node1->setColor(originalColor);
                 if (auto buttonNode = node1->getChildByType<ButtonSprite>(0)) {
@@ -1187,7 +1187,7 @@ void UIModding::setOpacity(CCNode* node, const matjson::Value& attributes) {
     }
 
     if (opacity.isString() && opacity.asString().unwrapOr("") == "reset") {
-        if (auto node1 = static_cast<EventCCMenuItem*>(node)) {
+        if (auto node1 = static_cast<EventCCMenuItemSpriteExtra*>(typeinfo_cast<CCMenuItemSpriteExtra*>(node))) {
             auto original = node1->m_fields->originalOpacity;
             node1->setOpacity(original);
             if (auto node2 = node1->getChildByType<ButtonSprite>(0)) {
@@ -1444,7 +1444,7 @@ void UIModding::handleAttributes(CCNode* node, const matjson::Value& attributes)
 }
 
 void UIModding::handleEvent(CCNode* node, const matjson::Value& eventVal) {
-    if (EventCCMenuItem* button = static_cast<EventCCMenuItem*>(node)) {
+    if (EventCCMenuItemSpriteExtra* button = static_cast<EventCCMenuItemSpriteExtra*>(typeinfo_cast<CCMenuItemSpriteExtra*>(node))) {
         forEvent(on-click, OnClick);
         forEvent(on-release, OnRelease);
         forEvent(on-activate, OnActivate);

src/main.cpp

@@ -2,7 +2,7 @@
 #include "Macros.hpp"
 #include "nodes/CCLabelBMFont.hpp"
 #include "nodes/CCMenu.hpp"
-#include "nodes/CCMenuItem.hpp"
+#include "nodes/CCMenuItemSpriteExtra.hpp"
 #include "nodes/CCScale9Sprite.hpp"
 #include "nodes/EditLevelLayer.hpp"
 #include "nodes/GJCommentListLayer.hpp"

src/nodes/CCMenu.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Geode/Geode.hpp>
-#include "CCMenuItem.hpp"
+#include "CCMenuItemSpriteExtra.hpp"
 #include "../UIModding.hpp"
 #include "../Utils.hpp"
 #include "../Macros.hpp"
@@ -80,7 +80,7 @@ class $nodeModify(MyCCMenu, cocos2d::CCMenu) {
         for (auto child : CCArrayExt<CCNode*>(getChildren())) {
             auto realItem = typeinfo_cast<CCMenuItem*>(child);
             if (!realItem) continue;
-            if (EventCCMenuItem* button = static_cast<EventCCMenuItem*>(realItem)) {
+            if (EventCCMenuItemSpriteExtra* button = static_cast<EventCCMenuItemSpriteExtra*>(realItem)) {
                 auto worldPos = button->convertToWorldSpaceAR(CCPointZero);
                 bool isValid = nodeIsVisible(button) && button->boundingBox().containsPoint(local) && isHoverable(button, worldPos);
                 button->checkTouch(!isValid);
@@ -89,7 +89,7 @@ class $nodeModify(MyCCMenu, cocos2d::CCMenu) {
 #else
         auto self = reinterpret_cast<CCMenu*>(this);
         if (auto item = self->m_pSelectedItem) {
-            if (EventCCMenuItem* button = static_cast<EventCCMenuItem*>(item)) {
+            if (EventCCMenuItemSpriteExtra* button = static_cast<EventCCMenuItemSpriteExtra*>(item)) {
                 button->checkTouch(!item->isSelected());
             }
         }

src/nodes/CCMenuItem.hpp src/nodes/CCMenuItemSpriteExtra.hppsrc/nodes/CCMenuItem.hpp renamed to src/nodes/CCMenuItemSpriteExtra.hpp

@@ -1,26 +1,13 @@
 #pragma once
 
 #include <Geode/Geode.hpp>
-#include <Geode/modify/CCMenuItem.hpp>
 #include <Geode/modify/CCMenuItemSpriteExtra.hpp>
 #include "../Macros.hpp"
 #include "../UIModding.hpp"
 
 using namespace geode::prelude;
 
 class $modify(EventCCMenuItemSpriteExtra, CCMenuItemSpriteExtra) {
-    void selected() {
-        CCMenuItem::selected();
-        CCMenuItemSpriteExtra::selected();
-    }
-
-    void unselected() {
-        CCMenuItem::unselected();
-        CCMenuItemSpriteExtra::unselected();
-    }
-};
-
-class $modify(EventCCMenuItem, CCMenuItem) {
 
     struct Fields {
         std::vector<matjson::Value> onClick = {};
@@ -105,21 +92,21 @@ class $modify(EventCCMenuItem, CCMenuItem) {
     void selected() {
         modifyForEach(m_fields->onClick);
         if (!m_fields->overrideOnClick) {
-            CCMenuItem::selected();
+            CCMenuItemSpriteExtra::selected();
         }
     }
 
     void unselected() {
         modifyForEach(m_fields->onRelease);
         if (!m_fields->overrideOnRelease) {
-            CCMenuItem::unselected();
+            CCMenuItemSpriteExtra::unselected();
         }
     }
 
     void activate() {
         modifyForEach(m_fields->onActivate);
         if (!m_fields->overrideOnActivate) {
-            CCMenuItem::activate();
+            CCMenuItemSpriteExtra::activate();
         }
     }