Merge remote-tracking branch 'origin' into signals

Author: camila314

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -22,6 +22,7 @@ body:
         - "Windows"
         - "Android64"
         - "Android32"
+        - "iOS"
     validations:
       required: true
   - type: input

.github/ISSUE_TEMPLATE/crash-report.yml

@@ -22,6 +22,7 @@ body:
         - "Windows"
         - "Android64"
         - "Android32"
+        - "iOS"
     validations:
       required: true
   - type: input

CHANGELOG.md

@@ -1,5 +1,29 @@
 # Geode Changelog
 
+## v4.8.0
+ * Fix `geode::Notification` z ordering (127733e)
+ * Add `CCNode::getChildrenExt` (d198df5)
+ * Add `CCNode::getChildByIndex` (0ba1f2a)
+ * Fix `GEODE_MOD_STATIC_PATCH` not using the geode namespace (#1456)
+ * Fix Linux install script flatpak directory (2cf1e57)
+ * Document return paths for `dirs` functions (d821172)
+ * Add `VMTHookManager` for hooking virtual functions that have not been defined by virtual table patching (383f8fd)
+ * Fix Unicode logging on Windows (c5e93b9)
+ * Remove all `std::filesystem::path::string` calls as they can crash on Unicode paths (#1473)
+ * Replace all `A` WinApi calls with `W` calls (#1473)
+ * Hook and patch toggling (#1468)
+ * Added option to force cURL to use IPv4 (#1412)
+
+## v4.7.0
+ * Change from copying queue to moving queue for main thread (9b8fb73)
+ * Add reading from unzipped/launch-args.txt on iOS as an option (ae90fc9)
+ * Add new "binary-dir" launcher flag for changing the path of mod binaries (0b71c3c)
+ * Use ColorProvider for SwelvyBG colors (01ee436)
+ * Deprecate the usage of geode::cast::as (9d28ab9)
+ * Return success for patching if there is nothing to do (f92e5b6)
+ * Updated TulipHook to 3.1.4 (f469696)
+   * Fixes struct params and enabling after disabled.
+
 ## v4.6.3
  * Fix Windows crashlogs not appearing (for real this time) (dedf1eb)
 

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/TulipHook@3.1.3")
+	CPMAddPackage("gh:geode-sdk/TulipHook@3.1.4")
 endif()
 set(CMAKE_WARN_DEPRECATED ON CACHE BOOL "" FORCE)
 

VERSION

@@ -1 +1 @@
-4.6.3
+4.8.0

installer/linux/install.sh

@@ -71,7 +71,7 @@ find_gd_installation() {
     verbose_log "Searching for Geometry Dash..."
     local DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
 
-    for GD_IDX in "$DATA_HOME/Steam" "$HOME/Steam" "$HOME/.var/com.valvesoftware.Steam/data/Steam"; do
+    for GD_IDX in "$DATA_HOME/Steam" "$HOME/Steam" "$HOME/.var/app/com.valvesoftware.Steam/data/Steam"; do
         local PATH_TEST="$GD_IDX/steamapps/common/Geometry Dash"
         verbose_log "- Testing path ${YELLOW}$PATH_TEST${NC}"
 

loader/include/Geode/cocos/base_nodes/CCNode.h

@@ -44,6 +44,11 @@ namespace geode {
     class Layout;
     class LayoutOptions;
     enum class Anchor;
+
+    template <typename T, typename>
+    struct CCArrayExtCheck {
+        using type = void;
+    };
 }
 
 NS_CC_BEGIN
@@ -635,6 +640,21 @@ class CC_DLL CCNode : public CCObject
      */
     virtual CCArray* getChildren();
 
+    /*
+     * Like `getChildren()`, but returns a `CCArrayExt<CCNode>` instead.
+     * You must include `<Geode/utils/cocos.hpp>` to use this, otherwise it won't compile
+    */
+    template <typename T = CCNode, typename PleaseDontChangeMe = void>
+    inline auto getChildrenExt() {
+        // CCArrayExt is defined in geode/utils/cocos.hpp, which we cannot include due to circular includes.
+        // This is an incredibly hacky way to still be able to use the type
+
+        using CCArrayExt = geode::CCArrayExtCheck<T, PleaseDontChangeMe>::type;
+        static_assert(!std::is_void_v<CCArrayExt>, "Please include <Geode/utils/cocos.hpp> to use getChildrenExt()");
+
+        return CCArrayExt(getChildren());
+    }
+
     /**
      * Get the amount of children.
      *
@@ -1126,6 +1146,23 @@ class CC_DLL CCNode : public CCObject
 
     GEODE_DLL void reactToChanges(std::function<void()> onChanges);
 
+    /**
+     * Get child at index. Checks bounds. A negative
+     * index will get the child starting from the end
+     * @returns Child at index cast to the given type,
+     * or nullptr if index exceeds bounds
+     */
+    template <class InpT = cocos2d::CCNode*, class T = std::remove_pointer_t<InpT>>
+    T* getChildByIndex(int i) {
+        // start from end for negative index
+        if (i < 0) i = this->getChildrenCount() + i;
+        // check if backwards index is out of bounds
+        if (i < 0) return nullptr;
+        // check if forwards index is out of bounds
+        if (static_cast<int>(this->getChildrenCount()) <= i) return nullptr;
+        return static_cast<T*>(this->getChildren()->objectAtIndex(i));
+    }
+
     /**
      * Get nth child that is a given type. Checks bounds.
      * @returns Child at index cast to the given type,

loader/include/Geode/cocos/support/data_support/ccCArray.h

@@ -138,6 +138,7 @@ void ccArrayFullRemoveArray(ccArray *arr, ccArray *minusArr);
 
 typedef struct _ccCArray {
     unsigned int num, max;
+    unsigned int unk1, unk2;
     void** arr;
 } ccCArray;
 

loader/include/Geode/loader/Dirs.hpp

@@ -6,72 +6,99 @@
 namespace geode::dirs {
     /**
      * Directory where Geometry Dash is
+     *
+     * Windows: {GD installation folder}/ (traditionally Geometry Dash)
+     * macOS: {GD installation folder}/ (traditionally GeometryDash.app)
+     * Android: {Android Launcher's media directory}/game
+     * iOS: Documents/game (within the launcher's sandbox)
      */
     GEODE_DLL std::filesystem::path getGameDir();
     /**
      * Directory where GD saves its files
+     *
+     * Windows: %LOCALAPPDATA%/{executable name}
+     * macOS: ~/Library/Application Support/GeometryDash
+     * Android: {Android Launcher's media directory}/save
+     * iOS: Documents/save (within the launcher's sandbox)
      */
     GEODE_DLL std::filesystem::path getSaveDir();
     /**
      * Directory where Geode is
+     * `getGameDir()`/geode
      */
     GEODE_DLL std::filesystem::path getGeodeDir();
     /**
      * Directory where Geode saves its files
+     * `getSaveDir()`/geode
      */
     GEODE_DLL std::filesystem::path getGeodeSaveDir();
     /**
      * Directory where Geode's resources are stored
+     * `getGeodeDir()`/resources
      */
     GEODE_DLL std::filesystem::path getGeodeResourcesDir();
     /**
-     * Directory where Geode's resources are stored
+     * Directory where Geode's logs are stored
+     * `getGeodeDir()`/logs
      */
     GEODE_DLL std::filesystem::path getGeodeLogDir();
     /**
      * Directory to store temporary files
+     * `getGeodeDir()`/temp
      */
     GEODE_DLL std::filesystem::path getTempDir();
     /**
      * Directory where mods are stored by default
+     * `getGeodeDir()`/mods
      */
     GEODE_DLL std::filesystem::path getModsDir();
     /**
      * Directory where mods' save data is stored
+     * `getGeodeSaveDir()`/mods
      */
     GEODE_DLL std::filesystem::path getModsSaveDir();
     /**
      * Directory where mods' unzipped packages are stored at runtime
+     *
+     * Windows/macOS/iOS: `getGeodeDir()`/unzipped
+     * Android: {Android Launcher's internal files directory}/geode/unzipped
      */
     GEODE_DLL std::filesystem::path getModRuntimeDir();
     /**
      * Directory where mods' unzipped binary files are stored
      * This is used in order to override existing unzip binaries,
      * such as on iOS where signing the binary is required
      *
-     * TODO: enable on 4.7.0
+     * TODO: enable on ~~4.7.0~~ nice job
      */
     // GEODE_DLL std::filesystem::path getModBinariesDir();
     /**
      * Directory where mods' config files lie
+     * `getGeodeDir()`/config
      */
     GEODE_DLL std::filesystem::path getModConfigDir();
     /**
      * Directory where Geode stores the cached index
+     * `getGeodeDir()`/index
      */
     GEODE_DLL std::filesystem::path getIndexDir();
     /**
      * Directory where crashlogs are stored
+     * `getGeodeDir()`/crashlogs
      */
     GEODE_DLL std::filesystem::path getCrashlogsDir();
     /**
      * Directory where mods' persistent files lie
      * This directory is not deleted even when Geode is uninstalled
+     * `getSaveDir()`/geode-persistent
      */
     GEODE_DLL std::filesystem::path getModPersistentDir();
     /**
      * Directory where Geometry Dash's resources are stored
-     * On Android, the resources are stored in the APK, so this just returns "assets"
+     *
+     * Windows/macOS: `getGameDir()`/Resources
+     * Android: assets
+     * iOS: {GD bundle path}/Resources
      */
     GEODE_DLL std::filesystem::path getResourcesDir();
 }

loader/include/Geode/loader/Hook.hpp

@@ -88,6 +88,9 @@ namespace geode {
 
         Result<> disable();
 
+        Result<> toggle();
+        Result<> toggle(bool enable);
+
         /**
         * Get whether the hook should be auto enabled or not.
         * @returns Auto enable
@@ -176,6 +179,9 @@ namespace geode {
 
         Result<> disable();
 
+        Result<> toggle();
+        Result<> toggle(bool enable);
+
         /**
         * Get whether the patch should be auto enabled or not.
         * @returns Auto enable