iOS support

Author: Alphalaneous

.github/workflows/multi-platform.yml

@@ -26,6 +26,10 @@ jobs:
           os: ubuntu-latest
           target: Android64
 
+        - name: iOS
+          os: macos-latest
+          target: iOS
+
     name: ${{ matrix.config.name }}
     runs-on: ${{ matrix.config.os }}
 
@@ -35,6 +39,8 @@ jobs:
       - name: Build the mod
         uses: geode-sdk/build-geode-mod@main
         with:
+          cli: 'nightly'
+          sdk: 'nightly'
           bindings: geode-sdk/bindings
           bindings-ref: main
           combine: true

changelog.md

@@ -1,3 +1,6 @@
+# 1.0.5
+- iOS support
+
 # 1.0.4
 - Add tags
 

include/NodeModding.h

@@ -17,135 +17,6 @@
 
 namespace AlphaUtils {
 
-    static uint64_t fnv1aHash(char const* str) {
-        uint64_t hash = 0xcbf29ce484222325;
-        while (*str) {
-            hash ^= *str++;
-            hash *= 0x100000001b3;
-        }
-        return hash;
-    }
-    
-    template <typename T>
-    class NoHashHasher;
-    
-    template <>
-    class NoHashHasher<uint64_t> {
-    public:
-        size_t operator()(uint64_t key) const {
-            return key;
-        }
-    };
-
-    class ObjectFieldContainer {
-    private:
-        std::vector<void*> m_containedFields;
-        std::vector<std::function<void(void*)>> m_destructorFunctions;
-
-    public:
-        ~ObjectFieldContainer() {
-            for (auto i = 0u; i < m_containedFields.size(); i++) {
-                if (m_destructorFunctions[i] && m_containedFields[i]) {
-                    m_destructorFunctions[i](m_containedFields[i]);
-                    operator delete(m_containedFields[i]);
-                }
-            }
-        }
-
-        void* getField(size_t index) {
-            while (m_containedFields.size() <= index) {
-                m_containedFields.push_back(nullptr);
-                m_destructorFunctions.push_back(nullptr);
-            }
-            return m_containedFields.at(index);
-        }
-
-        void* setField(size_t index, size_t size, std::function<void(void*)> destructor) {
-            m_containedFields.at(index) = operator new(size);
-            m_destructorFunctions.at(index) = std::move(destructor);
-            return m_containedFields.at(index);
-        }
-
-        static ObjectFieldContainer* from(cocos2d::CCObject* node, char const* forClass) {
-            //return node->getFieldContainer(forClass);
-        }
-    };
-
-    class ObjectMetadata final : public cocos2d::CCNode {
-    private:
-        std::unordered_map<uint64_t, ObjectFieldContainer*, NoHashHasher<uint64_t>> m_classFieldContainers;
-    
-        friend class cocos2d::CCObject;
-    
-        ObjectMetadata() {}
-    
-        virtual ~ObjectMetadata() {
-            for (auto& [_, container] : m_classFieldContainers) {
-                delete container;
-            }
-        }
-    
-    public:
-        static ObjectMetadata* set(CCObject* target) {
-            if (!target) return nullptr;
-    
-            auto meta = new ObjectMetadata();
-            meta->autorelease();
-    
-            target->m_pUserObject = meta;
-            meta->retain();
-    
-            return meta;
-        }
-    
-        ObjectFieldContainer* getFieldContainer(char const* forClass) {
-            auto hash = fnv1aHash(forClass);
-    
-            auto& container = m_classFieldContainers[hash];
-            if (!container) {
-                container = new ObjectFieldContainer();
-            }
-    
-            return container;
-        }
-    };
-
-    GEODE_DLL size_t getFieldIndexForClass(char const* name);
-
-    template <class Parent, class Base>
-    class ObjectFieldIntermediate {
-        using Intermediate = Modify<Parent, Base>;
-        std::aligned_storage_t<std::alignment_of_v<Base>, std::alignment_of_v<Base>> m_padding;
-
-    public:
-        static void fieldConstructor(void* offsetField) {
-            (void) new (offsetField) typename Parent::Fields();
-        }
-
-        static void fieldDestructor(void* offsetField) {
-            static_cast<typename Parent::Fields*>(offsetField)->~Fields();
-        }
-
-        auto self() {
-
-            auto node = reinterpret_cast<Parent*>(reinterpret_cast<std::byte*>(this) - sizeof(Base));
-            auto container = ObjectFieldContainer::from(node, typeid(Base).name());
-            static size_t index = getFieldIndexForClass(typeid(Base).name());
-            auto offsetField = container->getField(index);
-            if (!offsetField) {
-                offsetField = container->setField(
-                    index, sizeof(typename Parent::Fields), &ObjectFieldIntermediate::fieldDestructor
-                );
-                ObjectFieldIntermediate::fieldConstructor(offsetField);
-            }
-
-            return reinterpret_cast<typename Parent::Fields*>(offsetField);
-        }
-        auto operator->() {
-            return this->self();
-        }
-    };
-
     struct ModifyInfo {
         int priority;
         std::function<void(cocos2d::CCNode*)> method;
@@ -199,6 +70,4 @@ struct derived : AlphaUtils::NodeWrapper<derived>
 #define MODIFY2(derived, base) ALPHA_MODIFY_DECLARE(base, derived)
 
 #define $nodeModify(...) \
-    GEODE_INVOKE(GEODE_CONCAT(MODIFY, GEODE_NUMBER_OF_ARGS(__VA_ARGS__)), __VA_ARGS__)
-
-#define $objectModify(...) $nodeModify(__VA_ARGS__)
+    GEODE_INVOKE(GEODE_CONCAT(MODIFY, GEODE_NUMBER_OF_ARGS(__VA_ARGS__)), __VA_ARGS__)

mod.json

@@ -1,5 +1,5 @@
 {
-	"geode": "4.3.0",
+	"geode": "4.3.1",
 	"gd": {
 		"win": "2.2074",
 		"android": "2.2074",
@@ -8,7 +8,7 @@
 	},
 	"id": "alphalaneous.alphas_geode_utils",
 	"name": "Alpha's Geode Utils",
-	"version": "v1.0.4",
+	"version": "v1.0.5",
 	"developer": "Alphalaneous",
 	"description": "Miscellaneous utilities for Geode Modding",
 	"api": {

src/hooks/CCObject.cpp

@@ -8,9 +8,9 @@ using namespace AlphaUtils;
 
 class $modify(CCObject) {
     CCObject* autorelease() {
-        //if (CCNode* node = typeinfo_cast<CCNode*>(this)) {
+        if (CCNode* node = typeinfo_cast<CCNode*>(this)) {
             NodeModding::get()->handleNode(node);
-        //}
+        }
         return CCObject::autorelease();
     }
 };