Port most macOS bindings from 2.2074

Author: hiimjasmine00

bindings/2.2081/Cocos2d.bro

@@ -32,7 +32,7 @@ void CCMenuItemSpriteExtra::useAnimationType(MenuAnimationType type) {
 }
 #endif
 
-#if defined(GEODE_IS_IOS) || defined(GEODE_IS_MACOS) || defined(GEODE_IS_ANDROID)
+#if defined(GEODE_IS_IOS) || defined(GEODE_IS_ANDROID)
 CCMenuItemSpriteExtra::CCMenuItemSpriteExtra() {
     m_animationEnabled = false; //this is changed to true in init
     m_colorEnabled = false;

bindings/2.2081/GeometryDash.bro

@@ -1714,7 +1714,7 @@ float GJBaseGameLayer::getGroundHeightForMode(int type) {
 }
 #endif
 
-#if defined(GEODE_IS_IOS) || defined(GEODE_IS_MACOS)
+#if defined(GEODE_IS_IOS) || defined(GEODE_IS_MACOS) || defined(GEODE_IS_ANDROID)
 
 void GJBaseGameLayer::moveAreaObject(GameObject* object, float dx, float dy) {
     auto result = this->resetAreaObjectValues(object, true);
@@ -1733,7 +1733,9 @@ void GJBaseGameLayer::moveAreaObject(GameObject* object, float dx, float dy) {
     }
     this->updateObjectSection(object);
 }
+#endif
 
+#if defined(GEODE_IS_ANDROID)
 bool GJBaseGameLayer::resetAreaObjectValues(GameObject* object, bool update) {
     if (m_gameState.m_commandIndex <= object->m_unk4C8) return false;
     if (update) this->updateAreaObjectLastValues(object);
@@ -1780,7 +1782,9 @@ bool GJBaseGameLayer::resetAreaObjectValues(GameObject* object, bool update) {
     else this->updateAreaObjectLastValues(object);
     return result;
 }
+#endif
 
+#if defined(GEODE_IS_ANDROID) || defined(GEODE_IS_MACOS) || defined(GEODE_IS_IOS)
 void GJBaseGameLayer::updateAreaObjectLastValues(GameObject* object) {
     if (object->m_isDecoration2) return;
     if (object->m_unk4C4 != m_gameState.m_commandIndex) {

bindings/2.2081/inline/CCMenuItemSpriteExtra.cpp

@@ -42,9 +42,9 @@ void GameObject::updateTextKerning(int kerning) {}
 
 int GameObject::getTextKerning() { return false; }
 
-#if defined(GEODE_IS_WINDOWS) || defined(GEODE_IS_IOS)
 cocos2d::CCLabelBMFont* GameObject::getObjectLabel() { return nullptr; }
 
+#if defined(GEODE_IS_WINDOWS) || defined(GEODE_IS_IOS)
 cocos2d::CCSprite* GameObject::addCustomBlackChild(gd::string frame, float opacity, bool color) {
     if (color) {
         return this->addCustomColorChild(frame);

bindings/2.2081/inline/GJBaseGameLayer.cpp

@@ -1,5 +1,6 @@
 #include <Geode/Geode.hpp>
 
+#if !defined(GEODE_IS_MACOS)
 ShaderLayer::ShaderLayer() {
     m_timesyncShaderActions = false;
     m_shader = nullptr;
@@ -12,6 +13,7 @@ ShaderLayer::ShaderLayer() {
     m_shockWaveTimeMult = 1.f;
     m_scaleFactor = 1.f;
 }
+#endif
 
 #if defined(GEODE_IS_WINDOWS) || defined(GEODE_IS_IOS)
 void ShaderLayer::setupInvertColorShader() {

bindings/2.2081/inline/GameObject.cpp

@@ -17,15 +17,3 @@ UpdateAccountSettingsPopup::~UpdateAccountSettingsPopup() {
 }
 #endif
 
-#if defined(GEODE_IS_IOS) || defined(GEODE_IS_MACOS) || defined(GEODE_IS_ANDROID)
-UpdateAccountSettingsPopup* UpdateAccountSettingsPopup::create(GJAccountSettingsLayer* settingsLayer, int messageStatus, int friendStatus, int commentStatus, gd::string youtubeURL, gd::string twitterURL, gd::string twitchURL, gd::string instagramURL, gd::string tiktokURL, gd::string discordUsername, gd::string customString) {
-    auto ret = new UpdateAccountSettingsPopup();
-    if (ret->init(settingsLayer, messageStatus, friendStatus, commentStatus, youtubeURL, twitterURL, twitchURL, instagramURL, tiktokURL, discordUsername, customString)) {
-        ret->autorelease();
-        return ret;
-    }
-    delete ret;
-    return nullptr;
-}
-#endif
-