Attempt to fix #14, and fix other things

Author: FireMario211

.forgejo/workflows/build.yaml

@@ -1,152 +1,63 @@
-name: Build Geode Mod (Codeberg)
-
-# Thank you very much to https://github.com/altalk23/Allium
+name: Build Geode Mod
 
 on:
   workflow_dispatch:
   push:
     branches:
       - "**"
 
-env:
-  MOD_ID: firee.object-workshop
-  BUILD_CONFIG: RelWithDebInfo
-
 jobs:
   build:
     strategy:
       fail-fast: false
       matrix:
         config:
         - name: Windows
-          target: windows
-          platform: win
+          image: windows
+          target: Win64
 
         # - name: macOS
-        #   target: macos
-        #   platform: macos
+        #   image: macos
+        #   target: MacOS
         #
         # - name: iOS
-        #   target: ios
-        #   platform: ios
+        #   image: ios
+        #   target: iOS
 
         - name: Android32
-          target: android
-          platform: android32
+          image: android
+          target: Android32
 
         - name: Android64
-          target: android
-          platform: android64
+          image: android
+          target: Android64
 
     name: ${{ matrix.config.name }}
     runs-on: codeberg-medium
     container:
-      image: prevter/geode-sdk:${{ matrix.config.target }}-latest
+      image: prevter/geode-sdk:${{ matrix.config.image }}-latest
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      # rest is taken from Dockerfile
-
-      - name: Install SDK & Binaries
-        run: |
-          geode sdk update 5.4.1
-          # geode sdk install-binaries -p ${{ matrix.config.platform }} # commenting this out for now as codeberg is ratelimited by github
-          curl -L "https://github.com/geode-sdk/geode/releases/download/v5.4.1/geode-v5.4.1-${{ matrix.config.platform }}.zip" -o geode-v5.4.1-${{ matrix.config.platform }}.zip
-          mkdir -p $GEODE_SDK/bin
-          mkdir -p $GEODE_SDK/bin/5.4.1
-          unzip -o geode-v5.4.1-${{ matrix.config.platform }}.zip -d $GEODE_SDK/bin/5.4.1
-          git clone https://github.com/geode-sdk/bindings --depth=1 /workspace/bindings
-
-      - name: Configure & Build
-        run: |
-          CMAKE_EXTRA_ARGS=""
-          if [ ${{ matrix.config.platform }} = "mac" ]; then
-            CMAKE_EXTRA_ARGS="-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 -DGEODE_DISABLE_PRECOMPILED_HEADERS=OFF"
-          elif [ ${{ matrix.config.platform }} = "android32" ]; then
-            CMAKE_EXTRA_ARGS="-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DANDROID_STL=c++_shared -DANDROID_ABI=armeabi-v7a -DANDROID_PLATFORM=android-23"
-          elif [ ${{ matrix.config.platform }} = "android64" ]; then
-            CMAKE_EXTRA_ARGS="-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DANDROID_STL=c++_shared -DANDROID_ABI=arm64-v8a -DANDROID_PLATFORM=android-23"
-          elif [ ${{ matrix.config.platform }} = "ios" ]; then
-            CMAKE_EXTRA_ARGS="-DCMAKE_SYSTEM_NAME=iOS -DGEODE_TARGET_PLATFORM=iOS -DGEODE_DISABLE_PRECOMPILED_HEADERS=OFF"
-          elif [ ${{ matrix.config.platform }} = "win" ]; then
-            CMAKE_EXTRA_ARGS="-DHOST_ARCH=x64 -DCMAKE_TOOLCHAIN_FILE=/root/.local/share/Geode/cross-tools/clang-msvc-sdk/clang-msvc.cmake -DSPLAT_DIR=/root/.local/share/Geode/cross-tools/splat"
-          fi
-          cmake -B build -DCMAKE_BUILD_TYPE=${{ env.BUILD_CONFIG }} -DGEODE_BINDINGS_REPO_PATH=/workspace/bindings -G Ninja $CMAKE_EXTRA_ARGS -DGEODE_DONT_INSTALL_MODS=ON
-          cmake --build build --config ${{ env.BUILD_CONFIG }} --parallel
-
-          mkdir /workspace/out
-
-          for file in $(find ./build -name *.geode); do
-            cp $file "/workspace/out"
-          done
-
-      - name: Upload artifact
-        uses: https://code.forgejo.org/actions/upload-artifact@v3
+      - name: Build the mod
+        uses: https://codeberg.org/geode-sdk/build-geode-mod@main
         with:
-          name: "geode-build-${{ matrix.config.platform }}"
-          path: /workspace/out/
+          combine: true
+          target: ${{ matrix.config.target }}
 
   package:
     name: Package builds
-    runs-on: codeberg-tiny-lazy # note for me: lazy basically means you dont care if it takes a while for the job to start (ref: https://codeberg.org/actions/meta)
+    # '-lazy' means you don't care if it takes a while for the job to start (ref: https://codeberg.org/actions/meta)
+    runs-on: codeberg-tiny-lazy
     needs: ['build']
 
     steps:
-      - uses: https://code.forgejo.org/actions/download-artifact@v3
-        with:
-          path: ./artifacts
-
-      # TODO: Fix this so it gets latest via https://api.github.com/repos/geode-sdk/cli/releases/latest
-      - name: Download CLI
-        run: |
-          curl -L "https://github.com/geode-sdk/cli/releases/download/v3.7.4/geode-cli-v3.7.4-linux.zip" -o cli.zip
-          unzip cli.zip -d .
-          chmod +x ./geode
-      
-      - name: Merge Artifacts
-        run: |
-          mkdir -p out
-          MODS=$(find ./artifacts -name *.geode -type f -printf "%f\n" | sort -u)
-          for mod in $MODS; do
-            echo "Merging $mod"
-            PACKAGE_ARGS=""
-            if [ -f "./artifacts/geode-build-win/$mod" ]; then
-              PACKAGE_ARGS="$PACKAGE_ARGS ./artifacts/geode-build-win/$mod"
-            fi
-            if [ -f "./artifacts/geode-build-mac/$mod" ]; then
-              PACKAGE_ARGS="$PACKAGE_ARGS ./artifacts/geode-build-mac/$mod"
-            fi
-            if [ -f "./artifacts/geode-build-android32/$mod" ]; then
-              PACKAGE_ARGS="$PACKAGE_ARGS ./artifacts/geode-build-android32/$mod"
-            fi
-            if [ -f "./artifacts/geode-build-android64/$mod" ]; then
-              PACKAGE_ARGS="$PACKAGE_ARGS ./artifacts/geode-build-android64/$mod"
-            fi
-            if [ -f "./artifacts/geode-build-ios/$mod" ]; then
-              PACKAGE_ARGS="$PACKAGE_ARGS ./artifacts/geode-build-ios/$mod"
-            fi
-            ARG_LIST=($PACKAGE_ARGS)
-            # why does it merge into the first one instead of just an output..
-            FIRST="${ARG_LIST[0]}"
-            if [ ${#ARG_LIST[@]} != 1 ]; then
-              ./geode package merge $PACKAGE_ARGS
-            fi
-            cp $FIRST out
-          done
-          # Copy the .pdb file from windows artifact if it exists
-          cp ./artifacts/geode-build-win/*.pdb out/ || true
-          # Copy the .sym files from android artifacts if they exist
-          cp ./artifacts/geode-build-android32/*.sym out/ || true
-          cp ./artifacts/geode-build-android64/*.sym out/ || true
-          # Copy the other debug files from android and macos/ios
-          cp ./artifacts/geode-build-android32/*.dbg out/ || true
-          cp ./artifacts/geode-build-android64/*.dbg out/ || true
-          cp -R ./artifacts/geode-build-mac/*.dSYM out/ || true
-          cp -R ./artifacts/geode-build-ios/*.dSYM out/ || true
+      - uses: https://codeberg.org/geode-sdk/build-geode-mod/combine@main
+        id: build
 
       - uses: https://code.forgejo.org/forgejo/upload-artifact@v3
         with:
           name: Build Output
-          path: ./out/
+          path: ${{ steps.build.outputs.build-output }}

about.md

@@ -18,8 +18,8 @@ Thank you to <cj>Midair</c> for the mod idea, <cy>Alphalaneous</c> for the extra
 - To upload, click on the <cy>My Objects</c> tab, and make sure that the object you want to upload is in your <co>custom objects</c> (C). Otherwise, you won't be able to <cy>upload an object</c>!
 
 # Authentication Methods
+- <cr>Argon</c> is an authentication method <cb>Globed</c> and other mods use. It's recommended to use this option as it's the most reliable. It does a similar method to <cp>DashAuth</c> where it <cy>sends a message to a bot</c> to confirm the authenticity of your <cy>GD account</c>.
 - <cp>DashAuth</c> is an authentication method that <cy>sends a message to a bot</c> to confirm the authenticity of your <cy>GD account</c>, similar to how mods like <cb>Globed</c> handles verifying your <cy>GD account</c>. Thanks to <cp>rooot</c> for creating it!
-- <cg>GDAuth</c> is an authentication method made by <cg>fig</c> which <cy>sends your GJP</c> (session token for GD) to <cg>fig's server</c> to confirm the authenticity of your <cy>GD account</c>. You should only use this <cy>if you trust fig's server</c>, as this method is like sending your GD account to <cy>fig's server</c>.
 - <cy>Do Later</c> is what it says. This will close the menu and open up the <cy>Object Workshop</c>. Although do note that you <cy>will be limited</c> in what features you can use.
 
 If none of the methods satisfy you, or you would like to receive an <cy>authentication token</c> without doing any of these methods, consider <cy>joining the Discord server</c> to ask me to verify you and give an <cy>authentication token</c> to you.

changelog.md

@@ -1,3 +1,10 @@
+# v1.5.0-beta.2
+- Added support button on bottom left
+- Changed description to remove GDAuth
+- Fixed object overwriting when editing an object
+- (hopefully) Fixed touch prio issues and compatibility with Better Touch Prio 
+- Fixed version not matching in user agent
+- Fixed colors not rendering properly for ratings
 # v1.5.0-beta.1 (Beta as it's not finished!)
 - Ported to Geode v5 (2.208!)
 - Revamped UI

mod.json

@@ -8,7 +8,7 @@
 	},
 	"id": "firee.object-workshop",
 	"name": "Object Workshop",
-	"version": "v1.5.0-beta.1",
+	"version": "v1.5.0-beta.2",
 	"developer": "Firee",
 	"description": "Download, upload, or find custom objects made by other creators!",
 	"resources": {

src/nodes/ComboComponent.hpp

@@ -58,7 +58,6 @@ namespace {
             scrollBlock->setScale(0.3f);
             scrollBlock->setContentSize({s_width, scrollHeight});
             scrollBlock->setZOrder(-100);
-            scrollBlock->registerWithTouchDispatcher();
             scrollBlock->setID("scroll-block"_spr);
 
             auto scrollBlockButton = CCMenuItemSpriteExtra::create(
@@ -84,7 +83,6 @@ namespace {
 
             for (size_t i = 0; auto const& value : m_options) {
                 auto menu = cocos2d::CCMenu::create();
-                // menu->registerWithTouchDispatcher();
                 menu->setContentSize({s_width * 0.3f, 80.f * 0.3f});
                 auto itemBG = NineSlice::createWithSpriteFrameName("geode.loader/tab-bg.png");
                 itemBG->setColor({0,0,0});
@@ -112,9 +110,6 @@ namespace {
             }
             m_scrollLayer->m_contentLayer->updateLayout();
             m_scrollLayer->moveToTop();
-            Loader::get()->queueInMainThread([this]() {
-                m_scrollLayer->fixTouchPrio();
-            });
         }
 
         void updateLabel() const {
@@ -201,8 +196,6 @@ namespace {
             m_callback = std::move(callback);
             m_opened = std::move(opened);
 
-            this->setUserFlag("alk.better-touch-prio/steals-touch");
-
             this->setContentSize({ width, 28.f });
 
             //m_background = geode::NineSlice::create("square02b_001.png");

src/nodes/ExtPreviewBG.cpp

@@ -55,7 +55,6 @@ bool ExtPreviewBG::init(LevelEditorLayer* editorLayer, std::string data, CCSize
     m_clippingNode->setZOrder(1);
     this->addChildAtPosition(m_clippingNode, Anchor::Center);
 
-    this->registerWithTouchDispatcher();
     this->setTouchEnabled(true);
     this->setTouchMode(kCCTouchesOneByOne);
     this->setMouseEnabled(true);

src/nodes/ItemNode.cpp

@@ -0,0 +1,37 @@
+#include "ItemNode.hpp"
+#include "../utils.hpp"
+using namespace geode::prelude;
+
+bool ItemNode::init(LevelEditorLayer* editorLayer, gd::string data) {
+    if (!CCNode::init()) return false;
+    this->setContentSize({ 32.0f, 32.0f });
+    auto bg = Build<CCScale9Sprite>::create("square02_small.png").opacity(60).contentSize(this->getContentSize()).parentAtPos(this, Anchor::Center).collect();
+    CCLayerColor* mask = CCLayerColor::create({255, 255, 255});
+    mask->setContentSize(bg->getContentSize());
+    Build<CCClippingNode>::create().contentSize(this->getContentSize()).anchorPoint(0.5f,0.5f).zOrder(1).with([editorLayer, data, mask](auto node) {
+        auto zData = ZStringView(data);
+        unsigned int objectCount = std::count(zData.begin(), zData.end(), ';');
+        if (!zData.empty()) {
+            auto smartBlock = CCArray::create();
+            int renderLimit = Mod::get()->getSettingValue<int64_t>("render-objects");
+            int preRender = Mod::get()->getSettingValue<int64_t>("prerender-objects");
+            CCSprite* sprite = editorLayer->m_editorUI->spriteFromObjectString(data, false, false, renderLimit, smartBlock, (CCArray *)0x0,(GameObject *)0x0);
+            editorLayer->updateObjectColors(smartBlock);
+            sprite->setScale(((node->getContentSize().height - 6) / sprite->getContentSize().height));
+            if (objectCount >= preRender) {
+                CCSize contentSize = node->getContentSize();
+                sprite->setPosition(contentSize / 2);
+                CCRenderTexture* tex = CCRenderTexture::create(contentSize.width, contentSize.height);
+                tex->beginWithClear(0, 0, 0, 0);
+                sprite->visit();
+                tex->end();
+                node->addChildAtPosition(tex, Anchor::Center);
+            } else {
+                node->addChildAtPosition(sprite, Anchor::Center);
+            }
+            node->setStencil(mask);
+        }
+    }).parentAtPos(bg, Anchor::Center);
+    Build<CCSprite>::create("select_outline.png"_spr).scale(0.4f).visible(false).store(m_bgSprBehind).parentAtPos(this, Anchor::Center);
+    return true;
+}

src/nodes/ItemNode.hpp

@@ -0,0 +1,19 @@
+#pragma once
+class ItemNode : public cocos2d::CCNode {
+    protected:
+        cocos2d::CCSprite* m_bgSprBehind;
+        bool init(LevelEditorLayer* editorLayer, gd::string data);
+    public:
+        void toggle(bool state) {
+            m_bgSprBehind->setVisible(state);
+        }
+        static ItemNode* create(LevelEditorLayer* editorLayer, gd::string data) {
+            auto pRet = new ItemNode();
+            if (pRet->init(editorLayer, data)) {
+                pRet->autorelease();
+                return pRet;
+            }
+            delete pRet;
+            return nullptr;
+        }
+};

src/nodes/ObjectItem.cpp

@@ -29,31 +29,35 @@ CCNode* ObjectItem::createStars(double rating) {
 }
 
 ccColor3B ObjectItem::starColor(double rating) {
-    ccColor3B ratingColor = { 255, 255, 0 };
     // yes i used chat jippity because i cant think at 2 am
-    if (rating != 5.0) {
-        if (rating >= 5.0) {
-            // Yellow
-            ratingColor = {255, 255, 0};
-        } else if (rating >= 4.0) {
-            // Green to Yellow
-            double t = (rating - 4.0);
-            ratingColor = {static_cast<GLubyte>(255 * t), 255, 0};
-        } else if (rating >= 3.0) {
-            // Orange to Green
-            double t = (rating - 3.0);
-            ratingColor = {static_cast<GLubyte>(255 * (1 - t)), static_cast<GLubyte>(165 * (1 - t)), 0};
-        } else if (rating >= 2.0) {
-            // Reddish Orange to Orange
-            double t = (rating - 2.0);
-            ratingColor = {255, static_cast<GLubyte>(70 + 95 * t), 0};
-        } else {
-            // Red to Reddish Orange
-            double t = (rating - 1.0);
-            ratingColor = {255, static_cast<GLubyte>(70 * t), 0};
-        }
+    
+    // Color stops: 1=Red, 2=Reddish Orange, 3=Orange, 4=Green, 5=Yellow
+    auto lerp = [](GLubyte a, GLubyte b, double t) -> GLubyte {
+        return static_cast<GLubyte>(a + (b - a) * t);
+    };
+    auto lerpColor = [&](ccColor3B a, ccColor3B b, double t) -> ccColor3B {
+        return { lerp(a.r, b.r, t), lerp(a.g, b.g, t), lerp(a.b, b.b, t) };
+    };
+    ccColor3B red          = { 255,   0, 0 };
+    ccColor3B reddishOrange = { 255,  70, 0 };
+    ccColor3B orange        = { 255, 165, 0 };
+    ccColor3B green         = {   0, 255, 0 };
+    ccColor3B yellow        = { 255, 255, 0 };
+    if (rating >= 5.0) {
+        return yellow;
+    } else if (rating >= 4.0) {
+        return lerpColor(green, yellow, rating - 4.0);
+    } else if (rating >= 3.0) {
+        return lerpColor(orange, green, rating - 3.0);
+    } else if (rating >= 2.0) {
+        return lerpColor(reddishOrange, orange, rating - 2.0);
+    } else if (rating >= 1.0) {
+        return lerpColor(red, reddishOrange, rating - 1.0);
+    } else if (rating == 0.0) {
+        return {255, 255, 255};
+    } else {
+        return red;
     }
-    return ratingColor;
 }
 
 CCMenu* ObjectItem::createClickableStars(CCObject* target, SEL_MenuHandler callback) {