Geode v5

.clang-format

@@ -0,0 +1,36 @@
+BasedOnStyle: LLVM
+Language: Cpp
+
+IndentWidth: 4
+TabWidth: 4
+UseTab: Never
+
+ColumnLimit: 100
+
+PointerAlignment: Left
+ReferenceAlignment: Left
+
+BreakBeforeBraces: Attach
+
+AlignEscapedNewlines: Left
+AlignConsecutiveMacros: false
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLoopsOnASingleLine: false
+AllowShortBlocksOnASingleLine: Never
+AllowShortLambdasOnASingleLine: Empty
+
+BinPackArguments: false
+BinPackParameters: false
+
+PackConstructorInitializers: Never
+
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+
+SortIncludes: false
+
+LambdaBodyIndentation: Signature

.github/workflows/multi-platform-v5.yml

@@ -0,0 +1,62 @@
+name: Build Geode Mod (Geode v5)
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - "geode-v5"
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+        - name: Windows
+          os: windows-latest
+          build-type: RelWithDebInfo
+
+        - name: macOS
+          os: macos-latest
+
+        - name: Android32
+          os: ubuntu-latest
+          target: Android32
+
+        - name: Android64
+          os: ubuntu-latest
+          target: Android64
+
+        - name: iOS
+          os: macos-latest
+          target: iOS
+
+    name: ${{ matrix.config.name }}
+    runs-on: ${{ matrix.config.os }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build the mod
+        uses: geode-sdk/build-geode-mod@main
+        with:
+          bindings: geode-sdk/bindings
+          build-config: ${{ matrix.config.build-type || 'Release' }}
+          export-pdb: true
+          bindings-ref: main
+          combine: true
+          target: ${{ matrix.config.target }}
+
+  package:
+    name: Package builds
+    runs-on: ubuntu-latest
+    needs: ['build']
+
+    steps:
+      - uses: geode-sdk/build-geode-mod/combine@main
+        id: build
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: Build Output
+          path: ${{ steps.build.outputs.build-output }}

.github/workflows/multi-platform.yml

@@ -15,6 +15,9 @@ jobs:
         - name: Windows
           os: windows-latest
           build-type: RelWithDebInfo
+
+        - name: macOS
+          os: macos-latest
 
         - name: Android32
           os: ubuntu-latest
@@ -23,6 +26,10 @@ jobs:
         - name: Android64
           os: ubuntu-latest
           target: Android64
+
+        - name: iOS
+          os: macos-latest
+          target: iOS
 
     name: ${{ matrix.config.name }}
     runs-on: ${{ matrix.config.os }}

.gitignore

@@ -67,3 +67,4 @@ build-*/
 
 # CLion
 /cmake-build-*/
+build.sh

CMakeLists.txt

@@ -1,42 +1,17 @@
 cmake_minimum_required(VERSION 3.21)
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
+if ("${CMAKE_SYSTEM_NAME}" STREQUAL "iOS" OR IOS)
+    set(CMAKE_OSX_ARCHITECTURES "arm64")
+else()
+    set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
+endif()
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 
 project(xdBot2 VERSION 1.0.0)
-
-add_library(${PROJECT_NAME} SHARED
-    src/main.cpp
-    src/global.cpp
-    src/macro.cpp
-    src/keybinds.cpp
-    src/utils/utils.cpp
-    src/gdr/gdr.cpp
-    src/renderer/renderer.cpp
-
-    src/hacks/other.cpp
-    src/hacks/tps_bypass.cpp
-    src/hacks/frame_stepper.cpp
-    src/hacks/layout_mode.cpp
-    src/hacks/show_trajectory.cpp
-    src/hacks/coin_finder.cpp
-    src/hacks/clickbot.cpp
-    src/hacks/autoclicker.cpp
 
-    src/ui/macro_editor.cpp
-    src/ui/button_edit_layer.cpp
-    src/ui/game_ui.cpp
-    src/ui/record_layer.cpp
-    src/ui/render_settings_layer.cpp
-    src/ui/load_macro_layer.cpp
-    src/ui/clickbot_layer.cpp
-    src/ui/button_setting.cpp
-
-    src/practice_fixes/input.cpp
-    src/practice_fixes/player.cpp
-    src/practice_fixes/play_layer.cpp
-)
+file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS src/*.cpp)
+add_library(${PROJECT_NAME} SHARED ${SOURCES})
 
 if (NOT DEFINED ENV{GEODE_SDK})
     message(FATAL_ERROR "Unable to find Geode SDK! Please define GEODE_SDK environment variable to point to Geode")
@@ -46,4 +21,9 @@ endif()
 
 add_subdirectory($ENV{GEODE_SDK} ${CMAKE_CURRENT_BINARY_DIR}/geode)
 
-setup_geode_mod(${PROJECT_NAME})
+CPMAddPackage("gh:prevter/msgpack-for-matjson#12edd5a")
+CPMAddPackage("gh:prevter/sinaps#b9c3434")
+CPMAddPackage("gh:maxnut/GDR-converter#71104a9")
+target_link_libraries(${PROJECT_NAME} sinaps libGDR GDRconverter)
+
+setup_geode_mod(${PROJECT_NAME})

changelog.md

@@ -1,3 +1,31 @@
+# v2.6.0
+* Renderer is now cross-platform, with one pass audio (meaning both video and audio will be recorded on the same attempt!)
+* Rewrite TPS bypass and make it compatible with Eclipse.
+* Rewrite practice fixes, hopefully bot is more accurate now (this update also includes a proper hold restore!).
+* Remove 2 delay frame, report on xdBot Discord server if this change causes side effects.
+* Code cleanup.
+* Fix some crashes.
+* Fix playing macros recorded before 2.2081.
+* Load macro UI should now show macro file creation date on all platforms.
+* Some fixes specifically for macOS.
+* Allow Click on Steps while recording/playing (does not actually affect the bot itself)
+
+# v2.5.0
+* Geode v5 support.
+* Cross-platform support. (Windows, macOS, Android, iOS, renderer is Windows only, mobile coming soon)
+* GDR2 support.
+* Rewrote Layout Mode. (Levels now load significantly faster and triggers do not break)
+* Fix seed freezing and crashing. (Switched to Geode's generator for seeds)
+* Fix iOS related filesystem crashes. (Switched to Geode utilities for filesystem operations, temporarily removed macros/renders/autosaves location settings in More Settings due to issues with Geode, where those settings would crash.)
+* Beautify game version display in macro information popup. (Used to have trailing zeros)
+* Port keybinds to Geode's keybind system (cross-platform keybinds, including mobile if connected to a Bluetooth/USB keyboard.)
+* Fix a bug where if a popup is open in xdBot, the keybinds would still be clickable, causing unexpected behavior like being able to close the xdBot menu via keybinds.
+* Added a setting to More Settings to open the xdBot menu instantly.
+* Added a setting to More Settings to choose the default macro format. (GDR2, GDR, JSON)
+* Made xdBot detect and prevent you from recording/playing a macro or rendering a level if you have Click Between Steps enabled in Geometry Dash settings.
+* Fix capitalization of 'OK' across UIs. (blame Zilko)
+* Removed Herobrine.
+
 # v2.4.1
 
 * Added Auto Clicker keybind.