Merge branch 'main' of https://github.com/Jouca/BadgesAPI

Author: Jouca

.github/workflows/multi-platform.yml

@@ -39,13 +39,13 @@ jobs:
       - name: Build the mod
         uses: geode-sdk/build-geode-mod@main
         with:
-          sdk: nightly
+          # sdk: nightly
           bindings: geode-sdk/bindings
           bindings-ref: main
           combine: true
           export-pdb: true
           target: ${{ matrix.config.target }}
-          cli: nightly
+          # cli: nightly
 
   package:
     name: Package builds

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.21)
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 if ("${CMAKE_SYSTEM_NAME}" STREQUAL "iOS" OR IOS)

README.md

@@ -58,7 +58,7 @@ class $modify(ProfilePage) {
 
         // your code for create your badge
         
-        yourBadge->setID("mycustombadge-badge")
+        yourBadge->setID("mycustombadge-badge"_spr);
         username_menu->addChild(yourBadge);
         username_menu->updateLayout();
     }
@@ -73,7 +73,7 @@ class $modify(CommentCell) {
 
         // your code for create your badge
 
-        yourBadge->setID("mycustombadge-badge")
+        yourBadge->setID("mycustombadge-badge"_spr);
         username_menu->addChild(yourBadge);
         username_menu->updateLayout();
     }

mod.json

@@ -1,18 +1,18 @@
 {
-	"geode": "4.10.0",
+	"geode": "5.0.0-beta.3",
 	"gd": {
-		"win": "2.2074",
-		"android": "2.2074",
-		"mac": "2.2074",
-		"ios": "2.2074"
+		"win": "2.2081",
+		"mac": "2.2081",
+		"ios": "2.2081",
+		"android": "2.2081"
 	},
 	"id": "jouca.badgesapi",
 	"name": "Badges API",
 	"version": "v1.4.0",
 	"developer": "Jouca",
 	"description": "API mod to integrate badges & optimizing UI",
 	"dependencies": {
-		"geode.node-ids": ">=v1.21.1"
+		"geode.node-ids": ">=v1.22.0"
 	},
 	"links": {
 		"source": "https://github.com/Jouca/BadgesAPI"

src/OldBorder.cpp

@@ -134,7 +134,7 @@ void OldBorder::setNode(CCNode* node) {
     CCNode* content = this->getChildByID("border_content"_spr);
 
     // Can't assume an ID as the node is a user input and may have its ID changed
-    if (CCNode* oldNode = cocos::getChild<CCNode>(content, 0)) {
+    if (CCNode* oldNode = content->getChildByIndex<CCNode>(0)) {
         // Not going to mess with releasing the node, I'll leave that to the user
         oldNode->removeFromParent();
     }
@@ -145,7 +145,8 @@ void OldBorder::setNode(CCNode* node) {
 }
 
 CCNode* OldBorder::getNode() {
-    if (CCNode* node = cocos::getChild<CCNode>(this->getChildByID("border_content"_spr), 0)) {
+    if (!this->getChildByID("border_content"_spr)) return nullptr;
+    if (CCNode* node = this->getChildByID("border_content"_spr)->getChildByIndex<CCNode>(0)) {
         return node;
     } else {
         return nullptr;

src/badges/BadgeMenu.cpp

@@ -4,7 +4,7 @@
 BadgeMenu* BadgeMenu::scene(CCArray* array) {
     auto popup = new BadgeMenu(array);
 
-    if (popup && popup->initAnchored(300.0f, 210.0f)) {
+    if (popup && popup->init()) {
         popup->autorelease();
         popup->setZOrder(1000);
         popup->show();
@@ -17,7 +17,9 @@ BadgeMenu* BadgeMenu::scene(CCArray* array) {
 
 BadgeMenu::BadgeMenu(CCArray* data) : m_data(data) {}
 
-bool BadgeMenu::setup() {
+bool BadgeMenu::init() {
+    if (!geode::Popup::init(300.0f, 210.0f)) return false;
+
     auto winSize = cocos2d::CCDirector ::sharedDirector()->getWinSize();
     auto director = cocos2d::CCDirector::sharedDirector();
 
@@ -28,7 +30,15 @@ bool BadgeMenu::setup() {
 
     CCObject* obj;
     CCArray* cell = CCArray::create();
-    CCARRAY_FOREACH(m_data, obj) {
+    // CCARRAY_FOREACH(m_data, obj) {
+    //     cell->addObject(obj);
+    //     if (cell->count() == badges_max) {
+    //         cells.push_back(BadgeMenuCell::create(cell, { 300, 210 }));
+    //         cell = CCArray::create();
+    //     }
+    // }
+    for (CCObject* obj : CCArrayExt<CCObject*>(m_data)) {
+        if (!obj) continue;
         cell->addObject(obj);
         if (cell->count() == badges_max) {
             cells.push_back(BadgeMenuCell::create(cell, { 300, 210 }));

src/badges/BadgeMenu.h

@@ -2,9 +2,9 @@
 #include "../includes.h"
 #include "../OldBorder.hpp"
 
-class BadgeMenu : public Popup<> {
+class BadgeMenu : public Popup {
     protected:
-        bool setup() override;
+        bool init() override;
     public:
         CCArray* m_data;
 

src/badges/BadgeMenuCell.cpp

@@ -6,8 +6,8 @@ BadgeMenuCell* BadgeMenuCell::create(CCArray* badges, const CCSize& size) {
     if (instance && instance->init(size)) {
         return instance;
     } else {
-        CC_SAFE_DELETE(instance);
-
+        // CC_SAFE_DELETE(instance);
+        delete instance;
         return nullptr;
     }
 }