Merge d86830028e into c0514b1915

* New image arguments format

* add ampersand support whoops

* first moves oh lord

* it's finished holy moly

* made it slightly better

* almost forgot

* texture revamp by @Alphalaneous

* why is it not loading

* whoops

* FINALLY

* targetsOutdatedVersion

* i love abi breaks

* how's this

* this thing

* this is driving me nuts

.github/actions/build-debug-info-post/action.yml

@@ -1,4 +1,4 @@
-name: Prepare for Build Debug Info
+name: Prepare for Build Debug Info
 description: Provides debug info for the build process
 
 inputs:
@@ -16,7 +16,15 @@ runs:
         cd build
         sed 's/\\\\/\//g' compile_commands.json | sed 's/D:\//\/d\//' > uni_compile_commands.json
         pip install compile-commands --break-system-packages
-      compile-commands --file=uni_compile_commands.json --filter_files='.*info\.rc.*' --filter='(.*) -o (.*)((?:/|\\).*)\.(?:obj|o) -c (.*)' --replacement="$BASH"' --noprofile --norc -c "mkdir -p ../build-debug-info-preprocessed/\g<2> && \g<1> -o ../build-debug-info-preprocessed/\g<2>\g<3>.i -E \g<4>"' -o ../build-debug-info/preprocess_commands.json --run --verbose
+        compile-commands --file=uni_compile_commands.json \
+          --filter_files='.*info\.rc.*' \
+          --filter='(.*) -o (.*)((?:/|\\).*)\.(?:obj|o) -c (.*)' \
+          --replacement="$BASH" \
+          --noprofile --norc -c "\
+            mkdir -p ../build-debug-info-preprocessed/\g<2> && \
+            \g<1> -o ../build-debug-info-preprocessed/\g<2>\g<3>.i -E \g<4>"' \
+          -o ../build-debug-info/preprocess_commands.json \
+          --run --verbose
 
     - name: Upload Build Debug Info
       uses: actions/upload-artifact@v4

.github/actions/build-debug-info/action.yml

@@ -1,16 +1,18 @@
-name: Prepare for Build Debug Info
+name: Prepare for Build Debug Info
 description: Provides debug info for the build process
 
 inputs:
   has-sccache:
     description: 'Whether the build action has sccache'
     required: true
+
 outputs:
   extra-configure:
     description: 'Extra stuff for CMake configure step'
     value: |
       -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
       cp ./build/compile_commands.json ./build-debug-info/
+
   extra-build:
     description: 'Extra stuff for CMake build step'
     value: |
@@ -28,7 +30,7 @@ runs:
         echo "SCCACHE_LOG=debug" >> $GITHUB_ENV
         echo "RUST_BACKTRACE=1" >> $GITHUB_ENV
 
-  - name: Checkout ninjatracing
+    - name: Checkout ninjatracing repository
       uses: actions/checkout@v4
       with:
         repository: 'nico/ninjatracing'

.github/workflows/build.yml

@@ -36,7 +36,7 @@ jobs:
     runs-on: ubuntu-24.04
 
     steps:
-    - name: Checkout
+      - name: Checkout repository
         uses: actions/checkout@v4
         with:
           submodules: recursive
@@ -64,7 +64,7 @@ jobs:
         uses: geode-sdk/cli/.github/actions/setup@main
 
       - name: Download xwin
-      uses: robinraju/release-downloader@v1.10
+        uses: robinraju/release-downloader@v1
         with:
           repository: Jake-Shadle/xwin
           latest: true
@@ -79,8 +79,6 @@ jobs:
           mv epic-xwin/xwin-*-x86_64-unknown-linux-musl/xwin ./xwin
           ./xwin --arch x86_64 --sdk-version 10.0.22621 --accept-license list
 
-    # this caches '.xwin-cache/**/*' but that's actually only gonna
-    # contain the manifest cuz we only ran `xwin list` so far
       - name: Setup xwin Cache
         id: xwin-cache
         uses: actions/cache@v4
@@ -111,18 +109,18 @@ jobs:
           ${{ env.base-build-command }}
           ${{ steps.build-debug-info.outputs.extra-build }}
 
-    - name: Upload Artifacts
+      - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
           name: geode-win
           path: ./bin/nightly
 
-    - name: Package Installer
+      - name: Package installer
         run: |
           sudo apt install nsis
           makensis -WX -V3 ./installer/windows/installer.nsi
 
-    - name: Upload Installer
+      - name: Upload installer
         uses: actions/upload-artifact@v4
         with:
           name: geode-installer-win
@@ -142,7 +140,7 @@ jobs:
       SCCACHE_CACHE_MULTIARCH: 1
 
     steps:
-    - name: Checkout
+      - name: Checkout repository
         uses: actions/checkout@v4
         with:
           submodules: recursive
@@ -154,8 +152,7 @@ jobs:
           has-sccache: ${{ inputs.use-ccache }}
         if: inputs.build-debug-info
 
-    # due to very strange performance issues, sccache is currently disabled for macos. sorry
+      # macOS does not currently support sccache due to performance issues
-
       # - name: Setup caches
       #   uses: ./.github/actions/setup-cache
       #   with:
@@ -186,16 +183,16 @@ jobs:
           ${{ env.base-build-command }}
           ${{ steps.build-debug-info.outputs.extra-build }}
 
-    - name: Upload Artifacts
+      - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
           name: geode-mac
           path: ./bin/nightly
 
-    - name: Package Installer
+      - name: Package installer
         run: ./installer/mac/package.sh ./bin/nightly ./installer/mac/geode-installer-mac.pkg
 
-    - name: Upload Installer
+      - name: Upload installer
         uses: actions/upload-artifact@v4
         with:
           name: geode-installer-mac
@@ -215,7 +212,6 @@ jobs:
           - name: Android (32-bit)
             id: android32
             extra-configure: -DANDROID_ABI=armeabi-v7a
-
           - name: Android (64-bit)
             id: android64
             extra-configure: -DANDROID_ABI=arm64-v8a
@@ -224,7 +220,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout
+      - name: Checkout repository
         uses: actions/checkout@v4
         with:
           submodules: recursive
@@ -277,13 +273,12 @@ jobs:
           ${{ env.base-build-command }}
           ${{ steps.build-debug-info.outputs.extra-build }}
 
-    # hardcoding toolchain path :(
+      - name: Dump symbols
-    - name: Dump Symbols
         run: |
           ${{ steps.breakpad-tools.outputs.binary-path }} ./bin/nightly/Geode.${{ matrix.config.id }}.so -o ./bin/nightly/Geode.${{ matrix.config.id }}.so.sym
           $ANDROID_NDK_LATEST_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip ./bin/nightly/Geode.${{ matrix.config.id }}.so
 
-    - name: Upload Artifacts
+      - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
           name: geode-${{ matrix.config.id }}
@@ -300,55 +295,56 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ build-windows, build-mac, build-android ]
     if: github.ref == 'refs/heads/main'
+
     steps:
-      - name: Checkout
+      - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Declare Version Variables
+      - name: Declare version variables
         id: ref
         run: |
           echo "version=$(cat VERSION | xargs)" >> $GITHUB_OUTPUT
           echo "hash=$(git rev-parse --short "$GITHUB_SHA")" >> $GITHUB_OUTPUT
 
-      - name: Download Artifacts
+      - name: Download artifacts
         uses: actions/download-artifact@v4
 
-      - name: Move Installers
+      - name: Move installers
         run: |
           mv geode-installer-mac/geode-installer-mac.pkg geode-installer-${{ steps.ref.outputs.hash }}-mac.pkg
           mv geode-installer-win/geode-installer-win.exe geode-installer-${{ steps.ref.outputs.hash }}-win.exe
 
-      - name: Zip MacOS Artifacts
+      - name: Zip MacOS artifacts
         uses: vimtor/action-zip@v1.2
         with:
           files: geode-mac/Geode.dylib geode-mac/GeodeBootstrapper.dylib
           dest: geode-${{ steps.ref.outputs.hash }}-mac.zip
 
-      - name: Zip Windows Artifacts
+      - name: Zip Windows artifacts
         uses: vimtor/action-zip@v1.2
         with:
           files: geode-win/XInput1_4.dll geode-win/Geode.dll geode-win/GeodeUpdater.exe geode-win/Geode.lib geode-win/Geode.pdb
           dest: geode-${{ steps.ref.outputs.hash }}-win.zip
 
-      - name: Zip Android32 Artifacts
+      - name: Zip Android32 artifacts
         uses: vimtor/action-zip@v1.2
         with:
           files: geode-android32/Geode.android32.so geode-android32/Geode.android32.so.sym
           dest: geode-${{ steps.ref.outputs.hash }}-android32.zip
 
-      - name: Zip Android64 Artifacts
+      - name: Zip Android64 artifacts
         uses: vimtor/action-zip@v1.2
         with:
           files: geode-android64/Geode.android64.so geode-android64/Geode.android64.so.sym
           dest: geode-${{ steps.ref.outputs.hash }}-android64.zip
 
-      - name: Zip Resources
+      - name: Zip resources
         uses: vimtor/action-zip@v1.2
         with:
           files: geode-android64/resources
           dest: resources.zip
 
-      - name: Update Development Release
+      - name: Update development release
         uses: andelf/nightly-release@main
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/check-changelog.yml

@@ -1,5 +1,4 @@
-# check the changelog for non ascii characters
+name: Check Changelog
-name: Check CHANGELOG.md
 
 on:
   push:
@@ -11,16 +10,19 @@ on:
 
 jobs:
   check:
-    name: Check CHANGELOG.md
+    name: Check Changelog
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
+      - name: Checkout repository
         uses: actions/checkout@v4
         with:
           submodules: recursive
 
-      - run: |
+      - name: Check for non-ASCII characters in changelog
-          if grep -q -P -n "[\x80-\xFF]" CHANGELOG.md
+        run: |
-          then
+          if grep -q -P -n "[\x80-\xFF]" CHANGELOG.md; then
-              exit 1;
+            echo "Non-ASCII characters found in CHANGELOG.md"
+            exit 1
+          else
+            echo "No non-ASCII characters found in CHANGELOG.md"
           fi

.github/workflows/draft.yml

@@ -7,9 +7,10 @@ jobs:
   draft:
     name: Draft Release
     runs-on: ubuntu-latest
+
     steps:
-      - name: Download Development Release
+      - name: Download development release
-        uses: robinraju/release-downloader@v1.9
+        uses: robinraju/release-downloader@v1
         with:
           tag: nightly
           fileName: '*'
@@ -17,14 +18,14 @@ jobs:
           zipBall: true
           out-file-path: 'dev'
 
-      - name: Declare Version Variable
+      - name: Declare version variable
         id: ref
         shell: bash
         run: |
           VERSION=$(unzip -p ${{ github.workspace }}/dev/geode-nightly.zip geode-sdk-geode-*/VERSION | xargs)
           echo "version=$VERSION" >> $GITHUB_OUTPUT
 
-          # test if release already exists
+          # Test if release already exists
           set +e
           curl --fail "https://api.github.com/repos/geode-sdk/geode/releases/tags/v$VERSION" --silent --output /dev/null
           RESULT=$?
@@ -35,7 +36,7 @@ jobs:
             exit 1
           fi
 
-      - name: Move Files
+      - name: Move files
         run: |
           mv dev/geode-installer-*-win.exe geode-installer-v${{ steps.ref.outputs.version }}-win.exe
           mv dev/geode-installer-*-mac.pkg geode-installer-v${{ steps.ref.outputs.version }}-mac.pkg
@@ -45,8 +46,8 @@ jobs:
           mv dev/geode-*-android64.zip geode-v${{ steps.ref.outputs.version }}-android64.zip
           mv dev/resources.zip resources.zip
 
-      - name: Create Draft Release
+      - name: Create draft release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -54,9 +55,9 @@ jobs:
           name: Geode v${{ steps.ref.outputs.version }}
           body: |
             TODO before publishing:
-             - mark if pre-release
+             - Mark if pre-release
-             - add changelog
+             - Add changelog
-             - remove this
+             - Remove this
           draft: true
           files: |
             ./geode-installer-v${{ steps.ref.outputs.version }}-win.exe

.github/workflows/update-site.yml

@@ -1,20 +1,16 @@
-# Update the install page on the geode-sdk/website repository
 name: Update Website
 
 on:
-  # # trigger when a new release is released
-  # release:
-  #   types:
-  #     - released
-
   workflow_dispatch:
 
 jobs:
   trigger:
     name: Trigger site build
     runs-on: ubuntu-latest
+
     steps:
-    - uses: actions/github-script@v7
+      - name: Trigger build workflow on geode-sdk/website repository
+        uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.GEODE_BOT_PUSH_BIN_TOKEN }}
           script: |

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Geode Changelog
 
+## v4.0.0-beta.2
+ * Add grid view to mod list (7bcf50d, 1ff24f0)
+ * Add safe mode tip to windows crashlog window (38f3385)
+ * Disable enabled button on outdated mods (302eea1)
+ * Add a button to copy list of mods to clipboard (#1039)
+ * Fix VersionInfo toJson (f6c2322)
+ * Add `GEODE_DESKTOP(...)` and `GEODE_MOBILE(...)` macros (d6f0c59)
+ * Fix CCCallFuncExt (b9fb2f6)
+ * Fix `utils::string::replaceIP` when filter is empty (4d5e465)
+ * Fix more log nesting issues (2221095)
+ * Fix new before/after priority system (17bf772)
+ * Added European Portuguese translation (#1160)
+ * Add missing CCHttpRequest methods and members (#1161)
+ * Fix downloading many mods at once causing the UI to lag (c94a533)
+ * Fix vv version (6e86b38)
+
 ## v4.0.0-beta.1
  * Button to manually install mods from files (e881dc5)
  * Add `ModRequestedAction::Update` (e881dc5)

VERSION

@@ -1 +1 @@
-4.0.0-beta.1
+4.0.0-beta.2

loader/resources/mod.json.in

@@ -91,6 +91,10 @@
             "name": "Expand Installed Mods List",
             "description": "Make the installed mods list a single infinite scrollable list instead of having pages"
         },
+        "copy-mods": {
+            "type": "custom:copy-mods",
+            "name": ""
+        },
         "developer-title": {
             "type": "title",
             "name": "Developer Settings"

loader/src/loader/CopyButtonSetting.cpp

@@ -0,0 +1,43 @@
+#include "CopyButtonSetting.hpp"
+#include <Geode/loader/Mod.hpp>
+
+$on_mod(Loaded) {
+    (void)Mod::get()->registerCustomSettingType("copy-mods", &CopyButtonSetting::parse);
+}
+
+SettingNodeV3* CopyButtonSetting::createNode(float width) {
+    return CopyButtonSettingNode::create(std::static_pointer_cast<CopyButtonSetting>(shared_from_this()), width);
+}
+
+void CopyButtonSettingNode::onCopy(CCObject*) {
+    auto mods = Loader::get()->getAllMods();
+    if (mods.empty()) {
+        Notification::create("No mods installed", NotificationIcon::Info, 0.5f)->show();
+        return;
+    }
+
+    std::sort(mods.begin(), mods.end(), [](Mod* a, Mod* b) {
+        auto const s1 = a->getID();
+        auto const s2 = b->getID();
+        return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), [](auto a, auto b) {
+            return std::tolower(a) < std::tolower(b);
+        });
+    });
+
+    std::string modsList;
+    using namespace std::string_view_literals;
+    for (int i = 0; i < mods.size(); i++) {
+        auto& mod = mods[i];
+        modsList += fmt::format("{} | [{}] {}{}",
+            mod->isEnabled() ? "x"sv : 
+            mod->hasLoadProblems() ? "!"sv :
+            mod->targetsOutdatedVersion() ? "*"sv :
+            " "sv,
+            mod->getVersion().toVString(), mod->getID(),
+            i < mods.size() ? "\n" : ""
+        );
+    }
+    clipboard::write(modsList);
+
+    Notification::create("Mods list copied to clipboard", NotificationIcon::Info, 0.5f)->show();
+}

loader/src/loader/CopyButtonSetting.hpp

@@ -0,0 +1,76 @@
+#include <Geode/loader/SettingV3.hpp>
+#include <ui/mods/GeodeStyle.hpp>
+
+using namespace geode::prelude;
+
+class CopyButtonSetting : public SettingV3 {
+public:
+    static Result<std::shared_ptr<SettingV3>> parse(std::string const& key, std::string const& modID, matjson::Value const& json) {
+        auto res = std::make_shared<CopyButtonSetting>();
+        auto root = checkJson(json, "CopyButtonSetting");
+
+        res->init(key, modID, root);
+        res->parseNameAndDescription(root);
+
+        return root.ok(std::static_pointer_cast<SettingV3>(res));
+    }
+
+    bool load(matjson::Value const& json) override {
+        return true;
+    }
+    bool save(matjson::Value& json) const override {
+        return true;
+    }
+
+    bool isDefaultValue() const override {
+        return true;
+    }
+    void reset() override {}
+
+    SettingNodeV3* createNode(float width) override;
+};
+
+class CopyButtonSettingNode : public SettingNodeV3 {
+protected:
+    bool init(std::shared_ptr<CopyButtonSetting> setting, float width) {
+        if (!SettingNodeV3::init(setting, width))
+            return false;
+    
+        auto buttonSprite = createGeodeButton("Copy Mods");
+        buttonSprite->setScale(.5f);
+        auto button = CCMenuItemSpriteExtra::create(
+            buttonSprite, this, menu_selector(CopyButtonSettingNode::onCopy)
+        );
+        this->getButtonMenu()->addChildAtPosition(button, Anchor::Center);
+        this->getButtonMenu()->setPosition(getContentSize() / 2);
+        this->getButtonMenu()->setAnchorPoint({ .5f, .5f });
+        this->getButtonMenu()->updateLayout();
+
+        this->updateState(nullptr);
+        
+        return true;
+    }
+    
+    void onCopy(CCObject*);
+
+    void onCommit() override {}
+    void onResetToDefault() override {}
+
+public:
+    static CopyButtonSettingNode* create(std::shared_ptr<CopyButtonSetting> setting, float width) {
+        auto ret = new CopyButtonSettingNode();
+        if (ret && ret->init(setting, width)) {
+            ret->autorelease();
+            return ret;
+        }
+        CC_SAFE_DELETE(ret);
+        return nullptr;
+    }
+
+    bool hasUncommittedChanges() const override {
+        return false;
+    }
+    bool hasNonDefaultValue() const override {
+        return false;
+    }
+};