Merge branch 'main'

Author: matcool

.github/workflows/build.yml

@@ -313,22 +313,22 @@ jobs:
         has-sccache: ${{ inputs.use-ccache }}
       if: inputs.build-debug-info
 
-    - name: Setup caches
-      uses: ./.github/actions/setup-cache
-      with:
-        host: mac
-        target: ios
-        use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }}
+    # - name: Setup caches
+    #   uses: ./.github/actions/setup-cache
+    #   with:
+    #     host: mac
+    #     target: ios
+    #     use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }}
 
     - name: Setup Ninja
       uses: ./.github/actions/setup-ninja
       with:
         host: mac
 
-    - name: Install LLVM
-      run: |
-        brew install llvm
-        echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH
+    # - name: Install LLVM
+    #   run: |
+    #     brew install llvm
+    #     echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH
 
     - name: Setup CLI
       uses: geode-sdk/cli/.github/actions/setup@main

CHANGELOG.md

@@ -1,5 +1,25 @@
 # Geode Changelog
 
+## v4.9.0
+ * Add Modtober 2025 content (#1501)
+ * Add `geode::cocos::getObjectName` for getting demangled type names (c734b29)
+ * Add mod load priority, load mods in alphabetical order (#1492, #1500)
+ * Implement `CCImage::saveToFile` for macOS and iOS (#1496)
+ * Allow using SDK without `GEODE_MOD_ID` macro (useful for static libs) (a6f215f)
+ * Use OS APIs for file operations for improved performance and clearer error messages (ec46ad3)
+ * Fix crashlog window title and icons on Windows (d527c08, efdde0a)
+ * Fix custom settings not reloading dependants (#1488)
+ * Fix `removeAllChildren` UB (dd9446b)
+ * Fix Android `gd::string` causing double frees (#1490)
+ * Optimize `pathToString` conversion (2cd8559)
+ * `ConstexprString` can now be used as a template parameter (cf795fb)
+ * Add `Self` type on `Modify` to make referring to self type more idiomatic (945f6d5)
+ * Fix `aligned_storage` deprecation warnings when using C++23 (e7eed58)
+ * Fix `CC_SYNTHESIZE` calls and define inline getters/setters for cocos (869dcfa)
+ * EventV2 + async fixes (b3e6536)
+ * Improve the outdated GD version warning (#1475)
+ * Fix `VMTHookManager` (22ba7dd)
+
 ## v4.8.0
  * Fix `geode::Notification` z ordering (127733e)
  * Add `CCNode::getChildrenExt` (d198df5)

CMakeLists.txt

@@ -283,7 +283,7 @@ if (DEFINED GEODE_TULIPHOOK_REPO_PATH)
 	message(STATUS "Using ${GEODE_TULIPHOOK_REPO_PATH} for TulipHook")
 	add_subdirectory(${GEODE_TULIPHOOK_REPO_PATH} ${GEODE_TULIPHOOK_REPO_PATH}/build)
 else()
-	CPMAddPackage("gh:geode-sdk/[email protected].4")
+	CPMAddPackage("gh:geode-sdk/[email protected].5")
 endif()
 set(CMAKE_WARN_DEPRECATED ON CACHE BOOL "" FORCE)
 

VERSION

@@ -1 +1 @@
-4.8.0
+4.9.0

cmake/Platform.cmake

@@ -31,6 +31,7 @@ if (GEODE_TARGET_PLATFORM STREQUAL "iOS")
 		"-framework UIKit"        # needed for file picking (UIApplication)
 		"-framework Foundation"   # needed for many things
 		"-framework AVFoundation" # needed for microphone access
+		"-framework CoreGraphics" # needed for image saving
 		${GEODE_LOADER_PATH}/include/link/ios/libssl.a
 		${GEODE_LOADER_PATH}/include/link/ios/libcrypto.a
 		${GEODE_LOADER_PATH}/include/link/ios/libnghttp2.a

flash.toml

@@ -34,9 +34,12 @@ include = [
     "Geode/**/*.h",
 ]
 exclude = [
+    "Geode/Modify.hpp",
     "Geode/modify/Comparer.hpp",
     "Geode/platform/*.hpp",
-    "Geode/c++stl/*.hpp",
+    "Geode/c++stl/**/*.hpp",
+    "Geode/c++stl/**/*.h",
+    "Geode/fmod/fmod_android.h",
     # All of the relevant cocos headers are included through Geode headers
     "Geode/cocos/**/*.h"
 ]

loader/include/Geode/c++stl/gnustl/stl_vector.h

@@ -137,11 +137,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
 #endif
         : _M_current(__i.base()) { }
 
-      _GLIBCXX_NODISCARD __attribute__((__always_inline__))
-      _GLIBCXX_CONSTEXPR
-      __normal_iterator<_Iterator, _Container> _M_const_cast() const
-      { return __normal_iterator<_Iterator, _Container>(_M_current); }
-
       // Forward iterator requirements
 
       _GLIBCXX_NODISCARD __attribute__((__always_inline__))
@@ -235,46 +230,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
   // provide overloads whose operands are of the same type.  Can someone
   // remind me what generic programming is about? -- Gaby
 
-#ifdef __cpp_lib_three_way_comparison
-  template<typename _IteratorL, typename _IteratorR, typename _Container>
-    [[nodiscard, __gnu__::__always_inline__]]
-    constexpr bool
-    operator==(const __normal_iterator<_IteratorL, _Container>& __lhs,
-	       const __normal_iterator<_IteratorR, _Container>& __rhs)
-    noexcept(noexcept(__lhs.base() == __rhs.base()))
-    requires requires {
-      { __lhs.base() == __rhs.base() } -> std::convertible_to<bool>;
-    }
-    { return __lhs.base() == __rhs.base(); }
-
-  template<typename _IteratorL, typename _IteratorR, typename _Container>
-    [[nodiscard, __gnu__::__always_inline__]]
-    constexpr std::__detail::__synth3way_t<_IteratorR, _IteratorL>
-    operator<=>(const __normal_iterator<_IteratorL, _Container>& __lhs,
-		const __normal_iterator<_IteratorR, _Container>& __rhs)
-    noexcept(noexcept(std::__detail::__synth3way(__lhs.base(), __rhs.base())))
-    { return std::__detail::__synth3way(__lhs.base(), __rhs.base()); }
-
-  template<typename _Iterator, typename _Container>
-    [[nodiscard, __gnu__::__always_inline__]]
-    constexpr bool
-    operator==(const __normal_iterator<_Iterator, _Container>& __lhs,
-	       const __normal_iterator<_Iterator, _Container>& __rhs)
-    noexcept(noexcept(__lhs.base() == __rhs.base()))
-    requires requires {
-      { __lhs.base() == __rhs.base() } -> std::convertible_to<bool>;
-    }
-    { return __lhs.base() == __rhs.base(); }
-
-  template<typename _Iterator, typename _Container>
-    [[nodiscard, __gnu__::__always_inline__]]
-    constexpr std::__detail::__synth3way_t<_Iterator>
-    operator<=>(const __normal_iterator<_Iterator, _Container>& __lhs,
-		const __normal_iterator<_Iterator, _Container>& __rhs)
-    noexcept(noexcept(std::__detail::__synth3way(__lhs.base(), __rhs.base())))
-    { return std::__detail::__synth3way(__lhs.base(), __rhs.base()); }
-#else
-   // Forward iterator requirements
+  // Forward iterator requirements
   template<typename _IteratorL, typename _IteratorR, typename _Container>
     _GLIBCXX_NODISCARD __attribute__((__always_inline__)) _GLIBCXX_CONSTEXPR
     inline bool
@@ -371,7 +327,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
 	       const __normal_iterator<_Iterator, _Container>& __rhs)
     _GLIBCXX_NOEXCEPT
     { return __lhs.base() >= __rhs.base(); }
-#endif // three-way comparison
 
   // _GLIBCXX_RESOLVE_LIB_DEFECTS
   // According to the resolution of DR179 not only the various comparison
@@ -1378,7 +1333,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
       insert(const_iterator __position, size_type __n, const value_type& __x)
       {
 	difference_type __offset = __position - cbegin();
-	_M_fill_insert(__position._M_const_cast(), __n, __x);
+	_M_fill_insert(begin() + __offset, __n, __x);
 	return begin() + __offset;
       }
 #else
@@ -1423,7 +1378,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
 	       _InputIterator __last)
         {
 	  difference_type __offset = __position - cbegin();
-	  _M_insert_dispatch(__position._M_const_cast(),
+	  _M_insert_dispatch(begin() + __offset,
 			     __first, __last, __false_type());
 	  return begin() + __offset;
 	}
@@ -1471,10 +1426,11 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
       iterator
 #if __cplusplus >= 201103L
       erase(const_iterator __position)
+      { return _M_erase(begin() + (__position - cbegin())); }
 #else
       erase(iterator __position)
+      { return _M_erase(__position); }
 #endif
-      { return _M_erase(__position._M_const_cast()); }
 
       /**
        *  @brief  Remove a range of elements.
@@ -1497,10 +1453,15 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
       iterator
 #if __cplusplus >= 201103L
       erase(const_iterator __first, const_iterator __last)
+      {
+	const auto __beg = begin();
+	const auto __cbeg = cbegin();
+	return _M_erase(__beg + (__first - __cbeg), __beg + (__last - __cbeg));
+      }
 #else
       erase(iterator __first, iterator __last)
+      { return _M_erase(__first, __last); }
 #endif
-      { return _M_erase(__first._M_const_cast(), __last._M_const_cast()); }
 
       /**
        *  @brief  Swaps data with another %vector.

loader/include/Geode/cocos/actions/CCAction.h

@@ -111,12 +111,6 @@ class CC_DLL CCAction : public CCObject
     inline int getTag(void) { return m_nTag; }
     inline void setTag(int nTag) { m_nTag = nTag; }
 
-    // @note RobTop Addition
-    void setSpeedMod(float mod);
-
-    // 2.2 addition
-    float getSpeedMod();
-
 public:
     /** Create an action */
     static CCAction* create();
@@ -131,7 +125,7 @@ class CC_DLL CCAction : public CCObject
     /** The action tag. An identifier of the action */
     int     m_nTag;
     // @note RobTop Addition
-    float m_fSpeedMod;
+    CC_SYNTHESIZE_NV(float, m_fSpeedMod, SpeedMod);
 };
 
 /**

loader/include/Geode/cocos/actions/CCActionInterval.h

@@ -94,7 +94,7 @@ class CC_DLL CCActionInterval : public CCFiniteTimeAction
     float getAmplitudeRate(void);
 
     // 2.2 addition
-    bool getM_bFirstTick(); // rob were you like high on something when you wrote this
+    bool getM_bFirstTick() const { return m_bFirstTick; } // rob were you like high on something when you wrote this
 
 public:
     float m_elapsed;
@@ -1014,21 +1014,19 @@ class CC_DLL CCAnimate : public CCActionInterval
     virtual void update(float t);
     virtual CCActionInterval* reverse(void);
 
-    // 2.2 addition
-    bool getRecenterChildren() const;
-	bool getRecenterFrames() const;
-    void setRecenterChildren(bool recenter);
-    void setRecenterFrames(bool recenter);
-
 public:
     /** creates the action with an Animation and will restore the original frame when the animation is over */
     static CCAnimate* create(CCAnimation *pAnimation);
-    CC_SYNTHESIZE_RETAIN(CCAnimation*, m_pAnimation, Animation)
+    CC_SYNTHESIZE_NV_RETAIN(CCAnimation*, m_pAnimation, Animation)
 public:
     gd::vector<float>* m_pSplitTimes;
     int                m_nNextFrame;
     CCSpriteFrame*  m_pOrigFrame;
        unsigned int    m_uExecutedLoops;
+    // @note RobTop Addition
+    CC_SYNTHESIZE_NV(bool, m_bRecenterFrames, RecenterFrames);
+    // @note RobTop Addition
+    CC_SYNTHESIZE_NV(bool, m_bRecenterChildren, RecenterChildren);
 };
 
 /** Overrides the target of an action so that it always runs on the target
@@ -1064,7 +1062,7 @@ class CC_DLL CCTargetedAction : public CCActionInterval
     virtual void update(float time);
 
     /** This is the target that the action will be forced to run with */
-    CC_SYNTHESIZE_RETAIN(CCNode*, m_pForcedTarget, ForcedTarget);
+    CC_SYNTHESIZE_NV_RETAIN(CCNode*, m_pForcedTarget, ForcedTarget);
 public:
     CCFiniteTimeAction* m_pAction;
 };

loader/include/Geode/cocos/extensions/GUI/CCControlExtension/CCControlButton.h

@@ -66,10 +66,10 @@ class CC_DLL CCControlButton : public CCControl
     //bool m_bIsOpacityModifyRGB;
 
     /** The current title that is displayed on the button. */
-    CC_SYNTHESIZE_READONLY(CCString*, m_currentTitle, CurrentTitle);
+    CC_SYNTHESIZE_READONLY_NV(CCString*, m_currentTitle, CurrentTitle);
 
     /** The current color used to display the title. */
-    CC_SYNTHESIZE_READONLY_PASS_BY_REF(ccColor3B, m_currentTitleColor, CurrentTitleColor);
+    CC_SYNTHESIZE_READONLY_NV_PASS_BY_REF(ccColor3B, m_currentTitleColor, CurrentTitleColor);
 
     /** Adjust the background image. YES by default. If the property is set to NO, the
     background will use the prefered size of the background image. */
@@ -78,10 +78,10 @@ class CC_DLL CCControlButton : public CCControl
     bool m_doesAdjustBackgroundImage;
 
     /** The current title label. */
-    CC_SYNTHESIZE_RETAIN(CCNode*, m_titleLabel, TitleLabel);
+    CC_SYNTHESIZE_NV_RETAIN(CCNode*, m_titleLabel, TitleLabel);
 
     /** The current background sprite. */
-    CC_SYNTHESIZE_RETAIN(CCScale9Sprite*, m_backgroundSprite, BackgroundSprite);
+    CC_SYNTHESIZE_NV_RETAIN(CCScale9Sprite*, m_backgroundSprite, BackgroundSprite);
 
     /** The prefered size of the button, if label is larger it will be expanded. */
     CC_PROPERTY(CCSize, m_preferredSize, PreferredSize);
@@ -105,18 +105,18 @@ class CC_DLL CCControlButton : public CCControl
     bool isPushed() { return m_isPushed; }
 
     // <CCControlState, CCString*>
-    CC_SYNTHESIZE_RETAIN(CCDictionary*, m_titleDispatchTable, TitleDispatchTable);
+    CC_SYNTHESIZE_NV_RETAIN(CCDictionary*, m_titleDispatchTable, TitleDispatchTable);
     // <CCControlState, CCColor3bObject*>
-    CC_SYNTHESIZE_RETAIN(CCDictionary*, m_titleColorDispatchTable, TitleColorDispatchTable);
+    CC_SYNTHESIZE_NV_RETAIN(CCDictionary*, m_titleColorDispatchTable, TitleColorDispatchTable);
     // <CCControlState, CCNode*>
-    CC_SYNTHESIZE_RETAIN(CCDictionary*, m_titleLabelDispatchTable, TitleLabelDispatchTable);
+    CC_SYNTHESIZE_NV_RETAIN(CCDictionary*, m_titleLabelDispatchTable, TitleLabelDispatchTable);
     // <CCControlState, CCScale9Sprite*>
-    CC_SYNTHESIZE_RETAIN(CCDictionary*, m_backgroundSpriteDispatchTable, BackgroundSpriteDispatchTable);
+    CC_SYNTHESIZE_NV_RETAIN(CCDictionary*, m_backgroundSpriteDispatchTable, BackgroundSpriteDispatchTable);
 
     /* Define the button margin for Top/Bottom edge */
-    CC_SYNTHESIZE_READONLY(int, m_marginV, VerticalMargin);
+    CC_SYNTHESIZE_READONLY_NV(int, m_marginV, VerticalMargin);
     /* Define the button margin for Left/Right edge */
-    CC_SYNTHESIZE_READONLY(int, m_marginH, HorizontalOrigin);
+    CC_SYNTHESIZE_READONLY_NV(int, m_marginH, HorizontalOrigin);
     //set the margins at once (so we only have to do one call of needsLayout)
     virtual void setMargins(int marginH, int marginV);