From f48d2eabc585353ba1b7e8c9ac5e001bc37ad749 Mon Sep 17 00:00:00 2001 From: mat <26722564+matcool@users.noreply.github.com> Date: Thu, 2 Feb 2023 22:06:23 -0300 Subject: [PATCH 1/4] its install-binaries --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 30bc946d..65075a92 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -167,8 +167,8 @@ elseif(EXISTS ${GEODE_PLATFORM_BIN_PATH}) ) else() message(FATAL_ERROR - "No valid loader binary to link to! Install prebuilts with `geode sdk install-prebuilts`, " - "or build Geode from source and add `set(GEODE_LINK_NIGHTLY On)` to your CMakeLists.txt " + "No valid loader binary to link to! Install prebuilts with `geode sdk install-binaries`, " + "or build Geode from source and add `set(GEODE_LINK_NIGHTLY ON)` to your CMakeLists.txt " "in the line before calling add_subdirectory for Geode." ) endif() From 9078670bfdddd9dc00cf6a867bd50c6c09d4adb8 Mon Sep 17 00:00:00 2001 From: dogotrigger Date: Fri, 3 Feb 2023 20:22:22 +0800 Subject: [PATCH 2/4] Add KeysLayer::init binding Added init() function for KeysLayer class. --- bindings/GeometryDash.bro | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bindings/GeometryDash.bro b/bindings/GeometryDash.bro index be0dc235..bc793917 100644 --- a/bindings/GeometryDash.bro +++ b/bindings/GeometryDash.bro @@ -3429,6 +3429,10 @@ class KeybindingsLayer : FLAlertLayer { cocos2d::CCNode* m_rightArrow; } +class KeysLayer : cocos2d::CCLayer { + virtual bool init() = win 0x154560; +} + class LabelGameObject : GameObject { virtual bool init() = mac 0x2f5520, win 0x25b7c0; void setObjectColor(cocos2d::_ccColor3B const&) = mac 0xdbca0; From 56c626c044c1e24a66ae41d62c0aa08baf8400d4 Mon Sep 17 00:00:00 2001 From: dogotrigger Date: Sat, 4 Feb 2023 17:11:03 +0800 Subject: [PATCH 3/4] Add more bindings Added bindings for `LevelTools`, `SetIDPopup`, `AchievementCell` --- bindings/GeometryDash.bro | 43 +++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/bindings/GeometryDash.bro b/bindings/GeometryDash.bro index bc793917..c1bba9d4 100644 --- a/bindings/GeometryDash.bro +++ b/bindings/GeometryDash.bro @@ -22,8 +22,10 @@ class AchievementBar : cocos2d::CCNodeRGBA { PAD = win 0x24; } -class AchievementCell { +class AchievementCell : cocos2d::CCLayer { void loadFromDict(cocos2d::CCDictionary*) = mac 0x10eaa0, win 0x59010; + + virtual bool init() = win 0x11070; } class AchievementManager : cocos2d::CCNode { @@ -2307,10 +2309,14 @@ class GJMapPack : cocos2d::CCNode { cocos2d::ccColor3B m_barColour; int m_MId; bool m_isGauntlet; + + virtual bool init() = win 0xc0080; + static GJMapPack *create() = win 0xbffe0; } class GJMessageCell : TableViewCell { void updateBGColor(unsigned int index) = win 0x5c6b0; + void loadFromMessage(GJUserMessage *) = win 0x64b60; } class GJOptionsLayer : FLAlertLayer { @@ -2460,6 +2466,10 @@ class GJUserCell : TableViewCell { void updateBGColor(unsigned int index) = win 0x5c6b0; } +class GJUserMessage : cocos2d::CCNode { + virtual bool init() = 0x33b40; +} + class GJUserScore : cocos2d::CCNode { IconType getIconType() const { return m_iconType; @@ -2568,6 +2578,12 @@ class GooglePlayDelegate { virtual void googlePlaySignedIn() {} } +class GooglePlayManager : cocos2d::CCNode { + virtual bool init() = win 0x11070; + + static GooglePlayManager *sharedState() = win 0x4295a0; +} + class GameLevelManager : cocos2d::CCNode { cocos2d::CCArray* createAndGetScores(gd::string, GJScoreType) = win 0xa2780; GJGameLevel* createNewLevel() = mac 0x2b8180, win 0xa0db0; @@ -3429,10 +3445,6 @@ class KeybindingsLayer : FLAlertLayer { cocos2d::CCNode* m_rightArrow; } -class KeysLayer : cocos2d::CCLayer { - virtual bool init() = win 0x154560; -} - class LabelGameObject : GameObject { virtual bool init() = mac 0x2f5520, win 0x25b7c0; void setObjectColor(cocos2d::_ccColor3B const&) = mac 0xdbca0; @@ -3903,11 +3915,15 @@ class LocalLevelManager : cocos2d::CCNode { class MapPackCell : TableViewCell { void updateBGColor(unsigned int index) = win 0x5c6b0; + void loadFromMapPack(GJMapPack *) = win 0x5cac0 } class MenuGameLayer { void resetPlayer() = mac 0x28fdc0, win 0x18f4b0; + void destroyPlayer() = win 0x190100; void update(float) = mac 0x28fa70, win 0x18f190; + virtual bool init() = win 0x18e770; + void updateColors() = win 0x18edd0; } class MenuLayer : cocos2d::CCLayer, FLAlertLayerProtocol, GooglePlayDelegate { @@ -4021,6 +4037,10 @@ class ObjectManager : cocos2d::CCNode { void setup() = win 0x2c3b0; } +class KeysLayer : cocos2d::CCLayer { + virtual bool init() = win 0x154560; +} + class ObjectToolbox : cocos2d::CCNode { cocos2d::CCArray* allKeys() { return m_frameToKeyDict->allKeys(); @@ -4853,7 +4873,13 @@ class SetIDLayer { static SetIDLayer* create(GameObject*) = mac 0x168f20, win 0x22eb90; } -class SetIDPopup {} +class SetIDPopup : FLAlertLayer, TextInputDelegate { + void valueChanged() = win 0x10a60; + + bool init(int, int, int, gd::string, gd::string, bool, int) = win 0x143270; + + static SetIDPopup *create(int, int, int, gd::string, gd::string, bool, int) = win 0x143130; +} class SetIDPopupDelegate { virtual void setIDPopupClosed(SetIDPopup*, int) {} @@ -5343,6 +5369,11 @@ class VideoOptionsLayer : FLAlertLayer { } class LevelTools { + static gd::string base64EncodeString(gd::string) = win 0x18b310; static gd::string base64DecodeString(gd::string) = mac 0x294510, win 0x18b3b0; + static GJGameLevel *getLevel(int, bool) = win 0x189370; + static bool verifyLevelIntegrity(gd::string, int) = win 0x18b180; + static float xPosForTime(float, CCArray *, int) = win 0x18acd0; + static float timeForXPos(float, CCArray *, int) = win 0x18ae70; } // clang-format on From 68e8e54dd2369e342418ef4f92b2abe476d26578 Mon Sep 17 00:00:00 2001 From: dogotrigger Date: Sat, 4 Feb 2023 17:14:05 +0800 Subject: [PATCH 4/4] Fix bindings Added bindings for `GJUserMessage`, `GJMapPack`, `MapPackCell`, `GJMessageCell` --- bindings/GeometryDash.bro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bindings/GeometryDash.bro b/bindings/GeometryDash.bro index c1bba9d4..d23ea1ac 100644 --- a/bindings/GeometryDash.bro +++ b/bindings/GeometryDash.bro @@ -2467,7 +2467,7 @@ class GJUserCell : TableViewCell { } class GJUserMessage : cocos2d::CCNode { - virtual bool init() = 0x33b40; + virtual bool init() = win 0x33b40; } class GJUserScore : cocos2d::CCNode { @@ -3915,7 +3915,7 @@ class LocalLevelManager : cocos2d::CCNode { class MapPackCell : TableViewCell { void updateBGColor(unsigned int index) = win 0x5c6b0; - void loadFromMapPack(GJMapPack *) = win 0x5cac0 + void loadFromMapPack(GJMapPack *) = win 0x5cac0; } class MenuGameLayer {