Remove hooks I no longer need

Author: Alphalaneous

src/HPTCCNode.hpp

@@ -50,6 +50,10 @@ class $modify(HPTCCNode, CCNode) {
     void enableTouch() {
         auto fields = m_fields.self();
         if (!fields->m_touchObject) {
+            if (auto nodeRGBA = typeinfo_cast<CCNodeRGBA*>(this)) {
+                nodeRGBA->setUserObject("orig-color"_spr, ObjWrapper<ccColor3B>::create(nodeRGBA->getColor()));
+                nodeRGBA->setUserObject("orig-opacity"_spr, CCInteger::create(nodeRGBA->getOpacity()));
+            }
             fields->m_touchObject = TouchObject::create(this);
             addChild(fields->m_touchObject);
         }

src/NodeModding.hpp

@@ -30,7 +30,6 @@ class $modify(CCDictionary) {
     }
 };
 
-
 class $modify(HTCCObject, CCObject) {
 
     CCObject* autorelease() {
@@ -54,7 +53,6 @@ class $modify(HTCCObject, CCObject) {
     }
 };
 
-
 class $modify(CCPoolManager) {
     void pop() {
         LateQueue::get()->executeQueue();

src/UIModding.cpp

@@ -3,7 +3,6 @@
 #include "FileWatcher.hpp"
 #include "Utils.hpp"
 #include "nodes/CCLabelBMFont.hpp"
-#include "nodes/CCMenuItemSpriteExtra.hpp"
 #include "nodes/FLAlertLayer.hpp"
 #include "nodes/CCNode.hpp"
 #include "UIModding.hpp"
@@ -579,11 +578,13 @@ void UIModding::setColor(CCNode* node, const matjson::Value& attributes) {
         std::string colorStr = color.asString().unwrapOr("");
 
         if (colorStr == "reset") {
-            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)) {
-                    buttonNode->setColor(originalColor);
+            if (auto node1 = typeinfo_cast<CCNodeRGBA*>(node)) {
+                if (auto color = static_cast<ObjWrapper<ccColor3B>*>(node1->getUserObject("orig-color"_spr))) {
+                    auto originalColor = color->getValue();
+                    node1->setColor(originalColor);
+                    if (auto buttonNode = node1->getChildByType<ButtonSprite>(0)) {
+                        buttonNode->setColor(originalColor);
+                    }
                 }
             }
         }
@@ -840,11 +841,13 @@ void UIModding::setOpacity(CCNode* node, const matjson::Value& attributes) {
     }
 
     if (opacity.isString() && opacity.asString().unwrapOr("") == "reset") {
-        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)) {
-                node2->setOpacity(original);
+        if (auto node1 = typeinfo_cast<CCNodeRGBA*>(node)) {
+            if (auto opacity = static_cast<CCInteger*>(node1->getUserObject("orig-opacity"_spr))) {
+                auto originalOpacity = opacity->getValue();
+                node1->setOpacity(originalOpacity);
+                if (auto buttonNode = node1->getChildByType<ButtonSprite>(0)) {
+                    buttonNode->setOpacity(originalOpacity);
+                }
             }
         }
     }
@@ -1415,9 +1418,10 @@ void UIModding::handleModifications(CCNode* node, matjson::Value nodeObject, boo
 
 void UIModding::reloadChildren(CCNode* parentNode, bool transition) {
     if (!parentNode) return;
+    if (!checkNodeValidity(parentNode)) return;
+
     MyCCNode* myParentNode = static_cast<MyCCNode*>(parentNode);
-    if (!checkNodeValidity(myParentNode)) return;
-    
+
     for (const matjson::Value& value : myParentNode->getAttributes()) {
         handleModifications(myParentNode, value, transition);
     }

src/main.cpp

@@ -1,8 +1,6 @@
 #include <Geode/Geode.hpp>
 #include "Macros.hpp"
 #include "nodes/CCLabelBMFont.hpp"
-#include "nodes/CCMenu.hpp"
-#include "nodes/CCMenuItemSpriteExtra.hpp"
 #include "nodes/CCScale9Sprite.hpp"
 #include "nodes/EditLevelLayer.hpp"
 #include "nodes/GJCommentListLayer.hpp"