my backup

changelog.md

@@ -1,3 +1,9 @@
+# v2.2.0
+
+- Added shop shortcut menu
+- Added achievement count
+- Added Icon Kit Save
+
 # v2.1.0
 
 - Added Ko-fi promo video

mod.json

@@ -1,6 +1,6 @@
 {
 	"geode": "3.2.0",
-	"version": "v2.1.0",
+	"version": "v2.2.0",
 	"gd": {
 		"win": "2.206",
 		"android": "2.206"
@@ -69,7 +69,7 @@
             "default": false
         },
 		"shops-shortcut": {
-            "name": "Shops Shortcut (WIP)",
+            "name": "Shops Shortcut",
             "description": "Replaces default shop button with a menu with all shop buttons",
             "type": "bool",
             "default": true

src/GPIconSaveLayer.hpp

@@ -0,0 +1,219 @@
+#pragma once
+
+// OmgRod is too stupid to work on this
+
+#include <chrono>
+#include <iostream>
+#include <Geode/Geode.hpp>
+#include <Geode/modify/GJGarageLayer.hpp>
+#include <Geode/binding/GJGarageLayer.hpp>
+#include <Geode/utils/web.hpp>
+#include <Geode/ui/GeodeUI.hpp>
+#include <Geode/ui/Notification.hpp>
+
+using namespace geode::prelude;
+
+class GPFeedbackLayer : public CCLayer {
+public:
+    struct Fields {
+        EventListener<web::WebTask> m_listener;
+    };
+
+    virtual void KeyBackClicked() {
+        CCDirector::get()->popScene();
+    }
+
+    static CCScene* scene() {
+        auto scene = CCScene::create();
+        scene->addChild(GPFeedbackLayer::create());
+        return scene;
+    }
+
+    static CCScene* garageScene() {
+        auto scene = CCScene::create();
+        scene->addChild(GJGarageLayer::scene());
+        return scene;
+    }
+
+    static GPFeedbackLayer* create() {
+        GPFeedbackLayer* ret = new GPFeedbackLayer();
+        if (ret && ret->init()) {
+            ret->autorelease();
+            return ret;
+        }
+        delete ret;
+        return nullptr;
+    }
+
+    void onFeedbackClick(CCObject* sender) {
+        auto descInput = dynamic_cast<CCTextInputNode*>(this->getChildByID("descInput"));
+        if (!descInput)
+            return;
+
+        std::string feedback = descInput->getString();
+        std::string username = "Anonymous";
+
+        if (GJAccountManager::get()->m_accountID != 0) {
+            username = std::string(GJAccountManager::get()->m_username.c_str());
+        }
+
+        if (feedback.empty()) {
+            log::error("Feedback cannot be empty.");
+            geode::createQuickPopup(
+                "Garage Plus",
+                "Feedback cannot be empty.",
+                "OK", nullptr,
+                nullptr // No action on Exit button click
+            );
+            return;
+        }
+
+        std::string payload = "{\"username\": \"" + username + "\", \"feedback\": \"" + feedback + "\"}";
+
+        web::WebRequest request;
+        request.header("Content-Type", "application/json");
+        request.bodyString(payload);
+        request.timeout(std::chrono::seconds(30));
+
+        std::string url = "https://script.google.com/macros/s/AKfycbxQPpe9LzY11VCbCdr0A8Qb-cRaGyYhxo3jkpvSYSWgsSHfl6127SNI8sQdK-Y2A--krg/exec"; // Replace with your Google Apps Script web app URL
+
+        m_listener.bind([this](web::WebTask::Event* e) {
+            if (web::WebResponse* res = e->getValue()) {
+                if (res->ok()) {
+                    log::debug("Feedback sent successfully!");
+                    geode::createQuickPopup(
+                        "Garage Plus",
+                        "Feedback sent successfully!",
+                        "Exit", nullptr,
+                        [this](auto, bool btn1) {
+                            this->onClick(nullptr);
+                        }
+                    );
+                } else {
+                    log::error("Request failed with status code: {}", res->code());
+                    log::error("Response body: {}", res->string().unwrapOr("No response body"));
+                }
+            } else if (web::WebProgress* progress = e->getProgress()) {
+                // log::debug("Progress: ", progress->downloadProgress());
+            } else if (e->isCancelled()) {
+                log::error("The request was cancelled.");
+            }
+        });
+
+        log::debug("Sending POST request to URL: {}", url);
+        m_listener.setFilter(request.post(url));
+    }
+
+    bool init() {
+        if (!CCLayer::init())
+            return false;
+
+        setKeypadEnabled(true);
+
+        auto winSize = CCDirector::sharedDirector()->getWinSize();
+        auto menu = CCMenu::create();
+
+        auto corner1 = CCSprite::createWithSpriteFrameName("GJ_sideArt_001.png");
+        corner1->setPosition(CCPoint(winSize.width * -0.5, winSize.height * -0.5));
+        corner1->setAnchorPoint(CCPoint(0, 0));
+        corner1->setID("corner1");
+        menu->addChild(corner1);
+
+        auto corner2 = CCSprite::createWithSpriteFrameName("GJ_sideArt_001.png");
+        corner2->setPosition(CCPoint(winSize.width * 0.5, winSize.height * -0.5));
+        corner2->setAnchorPoint(CCPoint(1, 0));
+        corner2->setFlipX(true);
+        corner2->setID("corner2");
+        menu->addChild(corner2);
+
+        auto gameBgSpr = CCSprite::create("game_bg_01_001.png");
+        gameBgSpr->setScale(2.f);
+        gameBgSpr->setZOrder(-1);
+        gameBgSpr->setPositionY(winSize.height / -2);
+        gameBgSpr->setID("gameBgSpr");
+        menu->addChild(gameBgSpr);
+
+        auto squareSpr = CCScale9Sprite::create("GJ_square01.png");
+        squareSpr->setPosition(CCPoint(winSize.width * 0, winSize.height * 0));
+        squareSpr->setContentSize(CCPoint(winSize.width * 0.8, winSize.height * 0.8));
+        squareSpr->setID("squareSpr");
+        squareSpr->setZOrder(1);
+        menu->addChild(squareSpr);
+
+        auto backBtn = CCMenuItemSpriteExtra::create(
+            CCSprite::createWithSpriteFrameName("GJ_arrow_01_001.png"),
+            this,
+            menu_selector(GPFeedbackLayer::onClick)
+        );
+        backBtn->setPosition(winSize.width * -0.45, winSize.height * 0.4);
+        backBtn->setID("back-btn");
+        menu->addChild(backBtn);
+
+        auto infoBtn = CCMenuItemSpriteExtra::create(
+            CCSprite::createWithSpriteFrameName("GJ_infoIcon_001.png"),
+            this,
+            menu_selector(GPFeedbackLayer::onInfoClick)
+        );
+        infoBtn->setPosition(winSize.width * 0.45, winSize.height * 0.45);
+        infoBtn->setID("info-btn");
+        menu->addChild(infoBtn);
+
+        auto title = CCLabelBMFont::create("Garage Plus Feedback", "goldFont.fnt");
+        title->setZOrder(1);
+        title->setPositionY(winSize.width * 0.185);
+        title->setID("title");
+        menu->addChild(title);
+
+        auto descBg = CCScale9Sprite::create("square02b_001.png");
+        descBg->setPosition(CCPoint(winSize.width * 0.5, winSize.height * 0.5));
+        descBg->setContentSize(CCPoint(winSize.width * 0.6, winSize.height * 0.5));
+        descBg->setID("descBg");
+        descBg->setZOrder(1);
+        descBg->setColor(ccColor3B(0, 0, 0));
+        descBg->setOpacity(60);
+        this->addChild(descBg);
+
+        auto descInput = CCTextInputNode::create(winSize.width * 0.6, winSize.height * 0.5, "Type your feedback or feature request here...", "chatFont.fnt");
+        descInput->setPosition(CCPoint(winSize.width * 0.5, winSize.height * 0.5));
+        descInput->setZOrder(2);
+        descInput->setID("descInput");
+        descInput->setAllowedChars(" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~");
+        descInput->setMaxLabelWidth(winSize.width * 0.6);
+        this->addChild(descInput);
+
+        auto submitSpr = ButtonSprite::create("Submit");
+        auto submitBtn = CCMenuItemSpriteExtra::create(
+            submitSpr, this, menu_selector(GPFeedbackLayer::onFeedbackClick)
+        );
+        submitBtn->setPosition(CCPoint(winSize.width * 0, winSize.height * -0.325));
+        submitBtn->setZOrder(1);
+        submitBtn->setID("submit-btn");
+        menu->addChild(submitBtn);
+
+        this->addChild(menu);
+        return true;
+    }
+
+    void onClick(CCObject* sender) {
+        auto scenePrev = CCTransitionFade::create(0.5f, GPFeedbackLayer::garageScene());
+        CCDirector::sharedDirector()->replaceScene(scenePrev);
+    }
+
+    void onInfoClick(CCObject* sender) {
+        auto winSize = CCDirector::sharedDirector()->getWinSize();
+        FLAlertLayer::create(
+            nullptr, // No delegate needed
+            "Garage Plus", // Title
+            "By submitting your feedback, you agree to the collection and transmission of your username and feedback to a private spreadsheet accessible only to the developer of this mod, OmgRod. This data will be used solely for improving the mod.\n\nYou may disable the feedback button in this mod's settings at any time to add extra space.\n\nYour data will be stored securely and will not be shared with third parties.\n\nThank you for your feedback!\n\n-OmgRod", // Description
+            "OK", // Button 1 (OK)
+            nullptr, // Button 2 (no second button)
+            winSize.width * 0.75, // Width (adjust as necessary)
+            true, // Scrolling enabled
+            winSize.height * 0.75, // Height (adjust as necessary)
+            1.0f // Text scale (adjust as necessary)
+        )->show();
+    }
+
+private:
+    geode::EventListener<web::WebTask> m_listener;
+};

src/GPShopsLayer.hpp

@@ -4,15 +4,24 @@
 #include <iostream>
 #include <Geode/Geode.hpp>
 #include <Geode/binding/GJShopLayer.hpp>
+#include <Geode/modify/GJShopLayer.hpp>
 
 using namespace geode::prelude;
 
+class GPShopLayer;
+
 class GPShopsLayer : public CCLayer {
 public:
     struct Fields {
         EventListener<web::WebTask> m_listener;
     };
 
+    static CCScene* garageScene() {
+        auto scene = CCScene::create();
+        scene->addChild(GJGarageLayer::scene());
+        return scene;
+    }
+
     virtual void KeyBackClicked() {
         CCDirector::get()->popScene();
     }
@@ -59,15 +68,15 @@ class GPShopsLayer : public CCLayer {
         auto backBtn = CCMenuItemSpriteExtra::create(
             CCSprite::createWithSpriteFrameName("GJ_arrow_01_001.png"),
             this,
-            menu_selector(GPFeedbackLayer::onClick)
+            menu_selector(GPShopsLayer::onClick)
         );
         backBtn->setPosition(winSize.width * -0.45, winSize.height * 0.4);
         backBtn->setID("back-btn");
         menu->addChild(backBtn);
 
         auto shopSignBtnSpr = CCSprite::createWithSpriteFrameName("shopSign_001.png");
         auto shopSignBtn = CCMenuItemSpriteExtra::create(
-            shopSignBtnSpr, this, menu_selector(GJGarageLayer::onShop)
+            shopSignBtnSpr, this, menu_selector(GPShopLayer::onShop1)
         );
         menu->addChild(shopSignBtn);
 
@@ -77,6 +86,40 @@ class GPShopsLayer : public CCLayer {
         return true;
     }
 
+    void onClick(CCObject* sender) {
+        auto scenePrev = CCTransitionFade::create(0.5f, GPShopsLayer::garageScene());
+        CCDirector::sharedDirector()->replaceScene(scenePrev);
+    }
+
 private:
     geode::EventListener<web::WebTask> m_listener;
+};
+
+class GPShopLayer : public GJShopLayer {
+public:
+    void onBack(CCObject*) {
+        auto scenePrev = CCTransitionFade::create(0.5f, GPShopsLayer::scene());
+        CCDirector::sharedDirector()->replaceScene(scenePrev);
+    }
+
+    void onShop1(CCObject*) {
+        // Implement the functionality for onShop1 here
+        CCLOG("Shop1 button clicked");
+    }
+
+    static GPShopLayer* create() {
+        GPShopLayer* ret = new GPShopLayer();
+        if (ret && ret->init()) {
+            ret->autorelease();
+            return ret;
+        }
+        delete ret;
+        return nullptr;
+    }
+
+    static CCScene* scene(ShopType p0) {
+        auto scene = CCScene::create();
+        scene->addChild(GPShopLayer::create());
+        return scene;
+    }
 };

src/IconHack.cpp

@@ -1,5 +1,3 @@
-// Icon Hack - Doesn't work yet somehow
-
 #include <Geode/Geode.hpp>
 #include <Geode/modify/GameManager.hpp>
 

src/main.cpp

@@ -43,7 +43,7 @@ class $modify(GJGarageLayerModified, GJGarageLayer) {
         auto demonKeys = Mod::get()->getSettingValue<bool>("demon-keys");
         auto demons = Mod::get()->getSettingValue<bool>("demons");
         auto achCount = Mod::get()->getSettingValue<bool>("achievement-count----------------------------------------------------do-after");
-        auto shopsShortcut = Mod::get()->getSettingValue<bool>("shops-shortcut-------------------------do-later");
+        auto shopsShortcut = Mod::get()->getSettingValue<bool>("shops-shortcut");
 
         auto winSize = CCDirector::sharedDirector()->getWinSize();