From e2e59d59825906a87d52b7ebcddc35598c7952dc Mon Sep 17 00:00:00 2001 From: YellowCat98 Date: Sun, 28 Apr 2024 20:19:25 +0100 Subject: [PATCH] ios support --- .github/workflows/action.yml | 51 ------------------- .github/workflows/main.yml | 51 ------------------- .../{build.yml => multi-platform.yml} | 24 +++++---- CHANGELOG.md | 5 +- mod.json | 11 +++- src/main.cpp | 20 ++++++++ 6 files changed, 47 insertions(+), 115 deletions(-) delete mode 100644 .github/workflows/action.yml delete mode 100644 .github/workflows/main.yml rename .github/workflows/{build.yml => multi-platform.yml} (69%) diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml deleted file mode 100644 index d1ce86a..0000000 --- a/.github/workflows/action.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: Build Geode Mod - -on: - workflow_dispatch: - push: - branches: - - "v110" - -jobs: - build: - strategy: - fail-fast: false - matrix: - config: - - name: Windows - os: windows-latest - - - name: Android64 - os: ubuntu-latest - target: Android64 - - - name: Android32 - os: ubuntu-latest - target: Android32 - - name: ${{ matrix.config.name }} - runs-on: ${{ matrix.config.os }} - - steps: - - uses: actions/checkout@v3 - - - name: Build the mod - uses: geode-sdk/build-geode-mod@main - with: - combine: true - sdk: nightly - 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@v3 - with: - name: Build Output - path: ${{ steps.build.outputs.build-output }} \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index e46a6d4..0000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: Build Geode Mod - -on: - workflow_dispatch: - push: - branches: - - "v110" - -jobs: - build: - strategy: - fail-fast: false - matrix: - config: - - name: Windows - os: windows-latest - - - name: Android64 - os: ubuntu-latest - target: Android64 - - - name: Android32 - os: ubuntu-latest - target: Android32 - - name: ${{ matrix.config.name }} - runs-on: ${{ matrix.config.os }} - - steps: - - uses: actions/checkout@v3 - - - name: Build the mod - uses: geode-sdk/build-geode-mod@main - with: - combine: true - sdk: nightly - 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@v3 - with: - name: Build Output - path: ${{ steps.build.outputs.build-output }} \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/multi-platform.yml similarity index 69% rename from .github/workflows/build.yml rename to .github/workflows/multi-platform.yml index e46a6d4..f1466ef 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/multi-platform.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: push: branches: - - "v110" + - "**" jobs: build: @@ -15,37 +15,41 @@ jobs: - name: Windows os: windows-latest - - name: Android64 - os: ubuntu-latest - target: Android64 + + - name: iOS # what kind of person makes an ios version of their mod but not macos (me) + os: macos-latest + target: iOS - name: Android32 os: ubuntu-latest target: Android32 + - name: Android64 + os: ubuntu-latest + target: Android64 + name: ${{ matrix.config.name }} runs-on: ${{ matrix.config.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build the mod - uses: geode-sdk/build-geode-mod@main + uses: RoootTheFox/build-geode-mod@main with: combine: true - sdk: nightly target: ${{ matrix.config.target }} - + package: name: Package builds runs-on: ubuntu-latest needs: ['build'] steps: - - uses: geode-sdk/build-geode-mod/combine@main + - uses: RoootTheFox/build-geode-mod/combine@main id: build - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: Build Output path: ${{ steps.build.outputs.build-output }} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 296ad2e..e04f697 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,4 +12,7 @@ # 1.2.1 - Change GDLite watermark position -- Removed "Hide GDLite watermark" option. can be hiden by setting GDLite watermark position to 0. \ No newline at end of file +- Removed "Hide GDLite watermark" option. can be hiden by setting GDLite watermark position to 0. + +# 1.2.2 +- ios support \ No newline at end of file diff --git a/mod.json b/mod.json index 806fe00..cca65a5 100644 --- a/mod.json +++ b/mod.json @@ -4,11 +4,12 @@ "win": "2.204", "android": "2.205" }, - "version": "v1.2.1", + "version": "v1.2.2", "id": "yellowcat98.gdlite", "name": "GDLite", "developer": "YellowCat98", "description": "This mod turns Geometry dash into Geometry Dash Lite, purely cosmetic, doesn't actually restrict you from any Full Version features.", + "early-load": true, "repository": "https://github.com/YellowCat98/GDLite/", "issues": { "url": "https://github.com/YellowCat98/GDLite/issues", @@ -32,7 +33,7 @@ "type": "bool", "default": false }, - "remove-more-games-menu-modification" : { + "remove-more-games-menu-modification": { "name": "Remove More Games Menu Modification", "description": "Remove more games menu modification to prevent incompatibility", "type": "bool", @@ -45,6 +46,12 @@ "default": 1, "min": 0, "max": 4 + }, + "lite-spr-onloadinglayer": { + "name": "Lite sprite in LoadingLayer", + "description": "Adds the Lite sprite in the LoadingLayer.", + "type": "bool", + "default": false } } } diff --git a/src/main.cpp b/src/main.cpp index 0e5fae9..1a671ce 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -181,4 +181,24 @@ class $modify(PlayLayer) { uilayer->addChild(label); return true; } +}; + +class $modify(LoadingLayer) { + bool init(bool p0) { + if (!LoadingLayer::init(p0)) + return false; + + CCSprite* litespr = CCSprite::createWithSpriteFrameName("GJ_lite_001.png"); + + CCSprite* maintitle = static_cast(this->getChildByID("gd-logo")); /* i love you robtop */ + auto maintitlexpos = maintitle->getPositionX(); + auto maintitleypos = maintitle->getPositionY(); + + litespr->setPosition(ccp(maintitlexpos + 149, maintitleypos - 32)); + + this->addChild(litespr); + + return true; + } + }; \ No newline at end of file