The big funny

Author: hiimjasmine00

.github/workflows/build.yml

@@ -36,7 +36,6 @@ jobs:
       - name: Build the mod
         uses: hiimjasmine00/build-geode-mod@main
         with:
-          sdk: nightly
           build-config: ${{ matrix.config.build-config || 'Release' }}
           export-pdb: true
           export-symbols: true

CMakeLists.txt

@@ -5,7 +5,7 @@ set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 set(GEODE_DISABLE_PRECOMPILED_HEADERS ON)
 
-project(DeveloperBadges VERSION 1.1.2)
+project(DeveloperBadges VERSION 1.1.3)
 
 add_library(${PROJECT_NAME} SHARED
     src/hooks/CommentCell.cpp

changelog.md

@@ -1,4 +1,7 @@
 # Developer Badges Changelog
+## v1.1.3 (2025-04-01)
+- Internal code changes (April Fools' Day)
+
 ## v1.1.2 (2025-02-09)
 - I don't want to talk about it
 

mod.json

@@ -1,11 +1,11 @@
 {
-    "geode": "4.2.0",
+    "geode": "4.3.1",
     "gd": {
         "android": "2.2074",
         "win": "2.2074",
         "mac": "2.2074"
     },
-    "version": "v1.1.2",
+    "version": "v1.1.3",
     "id": "hiimjustin000.developer_badges",
     "name": "Developer Badges",
     "developer": "hiimjasmine00",
@@ -81,7 +81,7 @@
     "links": {
         "community": "https://discord.gg/QVKmbvBXA7",
         "source": "https://github.com/hiimjasmine00/DeveloperBadges",
-        "homepage": "https://www.hiimjustin000.com"
+        "homepage": "https://www.hiimjasmine00.com"
     },
     "tags": [
         "content",

src/DeveloperBadges.cpp

@@ -1,60 +1,33 @@
 #include "DeveloperBadges.hpp"
 #include <Geode/binding/FLAlertLayer.hpp>
 #include <Geode/loader/Mod.hpp>
-#include <Geode/utils/ranges.hpp>
 
 using namespace geode::prelude;
 
-#define BADGE_URL "https://raw.githubusercontent.com/hiimjasmine00/developer-badges/master/badges/{}.json"
-
-DeveloperBadge DeveloperBadges::badgeForUser(int id) {
-    auto badge = ranges::find(DEVELOPER_BADGES, [id](const DeveloperBadge& badge) {
+DeveloperBadge& DeveloperBadges::badgeForUser(int id) {
+    static DeveloperBadge empty = { 0, "", BadgeType::None };
+    auto badge = std::ranges::find_if(developerBadges, [id](const DeveloperBadge& badge) {
         return badge.id == id && badge.badge != BadgeType::None;
     });
-    return badge.has_value() ? badge.value() : DeveloperBadge { 0, "", BadgeType::None };
+    return badge != developerBadges.end() ? *badge : empty;
 }
 
 ccColor3B DeveloperBadges::getCommentColor(BadgeType badge) {
+    auto mod = Mod::get();
     switch (badge) {
-        case BadgeType::ModDeveloper: return Mod::get()->getSettingValue<ccColor3B>("mod-developer-color");
-        case BadgeType::VerifiedDeveloper: return Mod::get()->getSettingValue<ccColor3B>("verified-developer-color");
-        case BadgeType::IndexStaff: return Mod::get()->getSettingValue<ccColor3B>("index-staff-color");
-        case BadgeType::LeadDeveloper: return Mod::get()->getSettingValue<ccColor3B>("lead-developer-color");
+        case BadgeType::ModDeveloper: return mod->getSettingValue<ccColor3B>("mod-developer-color");
+        case BadgeType::VerifiedDeveloper: return mod->getSettingValue<ccColor3B>("verified-developer-color");
+        case BadgeType::IndexStaff: return mod->getSettingValue<ccColor3B>("index-staff-color");
+        case BadgeType::LeadDeveloper: return mod->getSettingValue<ccColor3B>("lead-developer-color");
         default: return ccColor3B { 255, 255, 255 };
     }
 }
 
 void DeveloperBadges::showBadgeInfo(std::string username, BadgeType type) {
-    auto badgeName = "";
-    auto badgeDesc = "";
-    switch (type) {
-        case BadgeType::ModDeveloper:
-            badgeName = "Mod Developer";
-            badgeDesc = "is a <ca>mod developer</c> for <cy>Geode</c>.\n"
-            "They have created mods that are available on the <cy>Geode mod index</c>.\n"
-            "They will have to have new mods and mod updates approved by the <cd>index staff</c>";
-            break;
-        case BadgeType::VerifiedDeveloper:
-            badgeName = "Verified Developer";
-            badgeDesc = "is a <cp>verified mod developer</c> for <cy>Geode</c>.\n"
-            "They can update their mods on the <cy>Geode mod index</c> without the need for approval.\n"
-            "They will still have to have new mods approved by the <cd>index staff</c>";
-            break;
-        case BadgeType::IndexStaff:
-            badgeName = "Index Staff";
-            badgeDesc = "is a member of the <cd>index staff</c> for <cy>Geode</c>.\n"
-            "They can approve or reject mods uploaded to the <cy>Geode mod index</c>";
-            break;
-        case BadgeType::LeadDeveloper:
-            badgeName = "Lead Developer";
-            badgeDesc = "is a <co>lead developer</c> of <cy>Geode</c>.\n"
-            "They are part of the main development team and have significant contributions to the <cy>Geode ecosystem</c>";
-            break;
-        default:
-            badgeName = "";
-            badgeDesc = "";
-            break;
-    }
-
-    FLAlertLayer::create(badgeName, fmt::format("<cg>{}</c> {}.", username, badgeDesc), "OK")->show();
+    auto badgeType = (int)type;
+    FLAlertLayer::create(
+        badgeType < badgeNames.size() ? badgeNames[badgeType] : badgeNames[0],
+        fmt::format("<cg>{}</c> {}.", username, badgeType < badgeDescriptions.size() ? badgeDescriptions[badgeType] : badgeDescriptions[0]),
+        "OK"
+    )->show();
 }

src/DeveloperBadges.hpp

@@ -16,10 +16,29 @@ struct DeveloperBadge {
 
 class DeveloperBadges {
 public:
-    static inline std::vector<DeveloperBadge> DEVELOPER_BADGES;
-    static inline std::set<int> LOADED_IDS;
+    static inline constexpr std::array badgeNames = {
+        "No Badge",
+        "Mod Developer",
+        "Verified Developer",
+        "Index Staff",
+        "Lead Developer"
+    };
+    static inline constexpr std::array badgeDescriptions = {
+        "does not have a badge",
+        "is a <ca>mod developer</c> for <cy>Geode</c>.\n"
+        "They have created mods that are available on the <cy>Geode mod index</c>.\n"
+        "They will have to have new mods and mod updates approved by the <cd>index staff</c>",
+        "is a <cp>verified mod developer</c> for <cy>Geode</c>.\n"
+        "They can update their mods on the <cy>Geode mod index</c> without the need for approval.\n"
+        "They will still have to have new mods approved by the <cd>index staff</c>",
+        "is a member of the <cd>index staff</c> for <cy>Geode</c>.\n"
+        "They can approve or reject mods uploaded to the <cy>Geode mod index</c>",
+        "is a <co>lead developer</c> of <cy>Geode</c>.\n"
+        "They are part of the main development team and have significant contributions to the <cy>Geode ecosystem</c>"
+    };
+    static inline std::vector<DeveloperBadge> developerBadges;
 
-    static DeveloperBadge badgeForUser(int);
+    static DeveloperBadge& badgeForUser(int);
     static cocos2d::ccColor3B getCommentColor(BadgeType);
     static void showBadgeInfo(std::string, BadgeType);
 };

src/hooks/CommentCell.cpp

@@ -27,12 +27,15 @@ class $modify(DBCommentCell, CommentCell) {
         usernameMenu->addChild(badgeButton);
         usernameMenu->updateLayout();
 
-        auto savedLevel = GameLevelManager::get()->getSavedLevel(m_comment->m_levelID);
-        if (m_accountComment || m_comment->m_modBadge > 0 || (savedLevel && savedLevel->m_userID == m_comment->m_userID)) return;
-        if (badge.badge == BadgeType::ModDeveloper && !Mod::get()->getSettingValue<bool>("mod-developer-color-toggle")) return;
-        if (badge.badge == BadgeType::VerifiedDeveloper && !Mod::get()->getSettingValue<bool>("verified-developer-color-toggle")) return;
-        if (badge.badge == BadgeType::IndexStaff && !Mod::get()->getSettingValue<bool>("index-staff-color-toggle")) return;
-        if (badge.badge == BadgeType::LeadDeveloper && !Mod::get()->getSettingValue<bool>("lead-developer-color-toggle")) return;
+        if (m_accountComment || comment->m_modBadge > 0) return;
+        if (auto savedLevel = GameLevelManager::get()->getSavedLevel(comment->m_levelID);
+            savedLevel && savedLevel->m_userID == comment->m_userID) return;
+
+        auto mod = Mod::get();
+        if (badge.badge == BadgeType::ModDeveloper && !mod->getSettingValue<bool>("mod-developer-color-toggle")) return;
+        if (badge.badge == BadgeType::VerifiedDeveloper && !mod->getSettingValue<bool>("verified-developer-color-toggle")) return;
+        if (badge.badge == BadgeType::IndexStaff && !mod->getSettingValue<bool>("index-staff-color-toggle")) return;
+        if (badge.badge == BadgeType::LeadDeveloper && !mod->getSettingValue<bool>("lead-developer-color-toggle")) return;
 
         if (auto commentTextLabel = static_cast<CCLabelBMFont*>(m_mainLayer->getChildByID("comment-text-label")))
             commentTextLabel->setColor(DeveloperBadges::getCommentColor(badge.badge));
@@ -53,6 +56,6 @@ class $modify(DBCommentCell, CommentCell) {
 
     void onBadge(CCObject* sender) {
         auto badgeName = static_cast<CCString*>(static_cast<CCNode*>(sender)->getUserObject("badge-name"_spr));
-        DeveloperBadges::showBadgeInfo(badgeName ? badgeName->getCString() : m_comment->m_userScore->m_userName, (BadgeType)sender->getTag());
+        DeveloperBadges::showBadgeInfo(badgeName ? badgeName->m_sString : m_comment->m_userScore->m_userName, (BadgeType)sender->getTag());
     }
 };

src/hooks/MenuLayer.cpp

@@ -6,15 +6,13 @@
 using namespace geode::prelude;
 
 class $modify(DBMenuLayer, MenuLayer) {
-    struct Fields {
-        inline static bool TRIED_LOADING;
-    };
+    inline static bool triedLoading = false;
 
     bool init() override {
         if (!MenuLayer::init()) return false;
 
-        if (Fields::TRIED_LOADING) return true;
-        Fields::TRIED_LOADING = true;
+        if (triedLoading) return true;
+        triedLoading = true;
 
         static std::optional<web::WebTask> task;
         task = web::WebRequest().get(BADGES_URL).map([](web::WebResponse* res) {
@@ -23,17 +21,15 @@ class $modify(DBMenuLayer, MenuLayer) {
             auto badges = res->json().unwrapOr(std::vector<matjson::Value>());
             if (!badges.isArray()) return task = std::nullopt, *res;
 
-            DeveloperBadges::DEVELOPER_BADGES = ranges::map<std::vector<DeveloperBadge>>(ranges::filter(badges.asArray().unwrap(),
-                [](const matjson::Value& value) {
-                    return value.contains("id") && value["id"].isNumber() && value["id"].asInt().unwrap() > 0
+            DeveloperBadges::developerBadges = ranges::reduce<std::vector<DeveloperBadge>>(badges.asArray().unwrap(),
+                [](std::vector<DeveloperBadge> & vec, const matjson::Value& value) {
+                    if (value.contains("id") && value["id"].isNumber() && value["id"].asInt().unwrap() > 0
                         && value.contains("name") && value["name"].isString()
-                        && value.contains("badge") && value["badge"].isNumber() && value["badge"].asInt().unwrap() > 0;
-                }), [](const matjson::Value& value) {
-                    return DeveloperBadge {
-                        .id = (int)value["id"].asInt().unwrap(),
-                        .name = value["name"].asString().unwrap(),
-                        .badge = (BadgeType)value["badge"].asInt().unwrap()
-                    };
+                        && value.contains("badge") && value["badge"].isNumber() && value["badge"].asInt().unwrap() > 0) vec.push_back({
+                            .id = (int)value["id"].asInt().unwrap(),
+                            .name = value["name"].asString().unwrap(),
+                            .badge = (BadgeType)value["badge"].asInt().unwrap()
+                        });
                 });
 
             return task = std::nullopt, *res;

src/hooks/ProfilePage.cpp

@@ -1,7 +1,6 @@
 #include "../DeveloperBadges.hpp"
 #include <Geode/binding/GJUserScore.hpp>
 #include <Geode/modify/ProfilePage.hpp>
-#include <Geode/utils/ranges.hpp>
 
 using namespace geode::prelude;
 
@@ -37,6 +36,6 @@ class $modify(DBProfilePage, ProfilePage) {
 
     void onBadge(CCObject* sender) {
         auto badgeName = static_cast<CCString*>(static_cast<CCNode*>(sender)->getUserObject("badge-name"_spr));
-        DeveloperBadges::showBadgeInfo(badgeName ? badgeName->getCString() : m_score->m_userName, (BadgeType)sender->getTag());
+        DeveloperBadges::showBadgeInfo(badgeName ? badgeName->m_sString : m_score->m_userName, (BadgeType)sender->getTag());
     }
 };