2.207

Author: TimeStepYT

.github/workflows/multi-platform.yml

@@ -39,6 +39,7 @@ jobs:
           bindings-ref: main
           combine: true
           target: ${{ matrix.config.target }}
+          sdk: nightly
 
   package:
     name: Package builds

CMakeLists.txt

@@ -4,7 +4,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 
-project(NoStupidButtons VERSION 1.0.0)
+project(NoStupidButtons VERSION 1.1.3)
 
 add_library(${PROJECT_NAME} SHARED
     src/main.cpp

changelog.md

@@ -1,5 +1,8 @@
 # Changelog for NoStupidButtons
 
+## v1.1.3
+- Ported to 2.207
+
 ## v1.1.2
 - Fixed <cb>GitHub repo</c> link <cy>because I changed my username</c>
 - Bumped <cj>Geode version</c>

mod.json

@@ -1,17 +1,17 @@
 {
-    "geode": "3.7.1",
+    "geode": "4.0.0-alpha.1",
     "gd": {
-        "win": "2.206",
-        "android": "2.206",
-        "mac": "2.206",
-        "ios": "2.206"
+        "win": "2.2074",
+        "android": "2.2074",
+        "mac": "2.2074",
+        "ios": "2.2074"
     },
     "links": {
         "source": "https://github.com/TimeStepYT/NoStupidButtons"
     },
     "id": "timestepyt.nostupidbuttons",
     "name": "NoStupidButtons",
-    "version": "v1.1.2",
+    "version": "v1.1.3",
     "developer": "TimeStepYT",
     "description": "This mod hides the buttons nobody uses!",
 

src/main.cpp

@@ -9,54 +9,47 @@ bool isSettingEnabled(std::string setting) {
 }
 
 class $modify(MyMenuLayer, MenuLayer) {
-    struct Fields {
-        CCNode* bottomMenu;
-        CCNode* socialMediaMenu;
-        CCNode* moreGamesMenu;
-    };
-
-    bool init() {
+    bool init() override {
         if (!MenuLayer::init()) {
             return false;
         }
 
-        m_fields->bottomMenu = this->getChildByID("bottom-menu");
-        m_fields->socialMediaMenu = this->getChildByID("social-media-menu");
-        m_fields->moreGamesMenu = this->getChildByID("more-games-menu");
+        auto const bottomMenu = this->getChildByID("bottom-menu");
+        auto const socialMediaMenu = this->getChildByID("social-media-menu");
+        auto const moreGamesMenu = this->getChildByID("more-games-menu");
 
         if (isSettingEnabled("hide-newgrounds-button")) {
-            m_fields->bottomMenu->removeChildByID("newgrounds-button");
-            m_fields->bottomMenu->updateLayout();
+            bottomMenu->removeChildByID("newgrounds-button");
+            bottomMenu->updateLayout();
         }
 
         if (isSettingEnabled("hide-social-media-buttons")) {
-            m_fields->socialMediaMenu->removeChildByID("facebook-button");
-            m_fields->socialMediaMenu->removeChildByID("twitter-button");
-            m_fields->socialMediaMenu->removeChildByID("youtube-button");
-            m_fields->socialMediaMenu->removeChildByID("twitch-button");
-            m_fields->socialMediaMenu->removeChildByID("discord-button");
-            m_fields->socialMediaMenu->updateLayout();
+            socialMediaMenu->removeChildByID("facebook-button");
+            socialMediaMenu->removeChildByID("twitter-button");
+            socialMediaMenu->removeChildByID("youtube-button");
+            socialMediaMenu->removeChildByID("twitch-button");
+            socialMediaMenu->removeChildByID("discord-button");
+            socialMediaMenu->updateLayout();
         }
 
         if (isSettingEnabled("hide-robtop-logo")) {
-            m_fields->socialMediaMenu->removeChildByID("robtop-logo-button");
-            m_fields->socialMediaMenu->updateLayout();
+            socialMediaMenu->removeChildByID("robtop-logo-button");
+            socialMediaMenu->updateLayout();
         }
         else if (isSettingEnabled("hide-social-media-buttons")) {
-            CCNode* robtopButtonNode =
-                m_fields->socialMediaMenu->getChildByID("robtop-logo-button");
-            CCNode* bottomMenuButton = m_fields->bottomMenu->getChildByID("settings-button");
+            CCNode* const robtopButtonNode = socialMediaMenu->getChildByID("robtop-logo-button");
+            CCNode* const bottomMenuButton = bottomMenu->getChildByID("settings-button");
             robtopButtonNode->setPositionY(bottomMenuButton->getPositionY());
-            m_fields->socialMediaMenu->updateLayout();
+            socialMediaMenu->updateLayout();
         }
 
 #ifdef GEODE_IS_ANDROID
         if (Loader::get()->isModLoaded("geode.devtools"))
             return true;
 #endif
         if (isSettingEnabled("hide-more-games-button")) {
-            m_fields->moreGamesMenu->removeChildByID("more-games-button");
-            m_fields->moreGamesMenu->updateLayout();
+            moreGamesMenu->removeChildByID("more-games-button");
+            moreGamesMenu->updateLayout();
         }
 
         return true;