Merge branch 'master' of https://github.com/OmgRod/Geodify

Author: OmgRod

README.md

@@ -77,6 +77,20 @@ using namespace geode::prelude;
 SET_SWELVY(GlobedLevelListLayer, "dankmeme.globed2/GlobedLevelListLayer", "background");
 
 ```
+
+If the layer you're attempting to hook doesnt have an ID for its background, use `SET_SWELVY_SPRITE`.
+
+```cpp
+#include <Geode/Geode.hpp>
+#include "../../SwelvyBG.hpp"
+#include <alphalaneous.alphas_geode_utils/include/NodeModding.h>
+
+using namespace geode::prelude;
+
+SET_SWELVY_SPRITE(GlobedLevelListLayer, "dankmeme.globed2/GlobedLevelListLayer");
+
+```
+
 This way is new from v2.0.0+!
 
 ### Registering Layers

changelog.md

@@ -1,10 +1,7 @@
-# v2.1.2
+# v2.1.1
 
 - Bugfix: Certain screenshots wouldn't work
 - Added Layers: `gdutilsdevs.gdutils/MoreLeaderboards`
-
-# v2.1.1
-
 - Fixed issues which caused rejected mod (good job, rod!)
 
 ![garage plus joke](omgrod.geodify/changelog1.png)

mod.json

@@ -5,7 +5,7 @@
         "win": "2.2074",
         "mac": "2.2074"
     },
-    "version": "v2.1.1-beta.1",
+    "version": "v2.1.1",
     "id": "omgrod.geodify",
     "name": "Geodify",
     "developers": ["OmgRod", "Cosmella-v"],

src/layers/GYScreenshotPopup.cpp

@@ -0,0 +1,94 @@
+#include "GYScreenshotPopup.hpp"
+
+bool GYScreenshotPopup::setup(int const& layer) {
+    Tags tags;
+    auto layerName = tags.getStringFromTag(layer);
+
+    if (layerName.empty()) {
+        log::error("Layer name is empty for tag: {}", layer);
+        return false;
+    }
+
+    std::string result = extractLastSegment(layerName);
+
+    auto winSize = CCDirector::sharedDirector()->getWinSize();
+    if (!m_mainLayer) {
+        log::error("m_mainLayer is not initialized");
+        return false;
+    }
+
+    this->setTitle(result);
+    m_mainLayer->setContentSize({ winSize.width * 0.6f, winSize.height * 0.7f });
+    m_mainLayer->updateLayout();
+
+    std::string URL = fmt::format("https://raw.githubusercontent.com/OmgRod/Geodify/master/previews/{}Preview.png", layerName);
+
+    auto req = web::WebRequest();
+    m_downloadListener.bind([this](web::WebTask::Event* e) {
+        if (auto res = e->getValue()) {
+            if (!res->ok()) {
+                log::error("Failed to download image from URL.");
+                onDownloadFail();
+            } else {
+                auto data = res->data();
+                std::thread imageThread = std::thread([data, this]() {
+                    m_image = new CCImage();
+                    m_image->autorelease();
+                    m_image->initWithImageData(const_cast<uint8_t*>(data.data()), data.size());
+                    geode::Loader::get()->queueInMainThread([this]() {
+                        imageCreationFinished(m_image);
+                    });
+                });
+                imageThread.detach();
+            }
+        }
+    });
+    m_downloadListener.setFilter(req.get(URL));
+
+    return true;
+}
+
+void GYScreenshotPopup::imageCreationFinished(CCImage* image) {
+    CCTexture2D* texture = new CCTexture2D();
+    texture->autorelease();
+    texture->initWithImage(image);
+
+    m_sprite = CCSprite::createWithTexture(texture);
+    if (m_sprite) {
+        auto maxWidth = m_mainLayer->getContentSize().width * 0.75f;
+        auto maxHeight = m_mainLayer->getContentSize().height * 0.75f;
+
+        auto spriteWidth = m_sprite->getContentSize().width;
+        auto spriteHeight = m_sprite->getContentSize().height;
+
+        float scale = std::min(maxWidth / spriteWidth, maxHeight / spriteHeight);
+        m_sprite->setScale(scale);
+
+        m_mainLayer->addChildAtPosition(m_sprite, Anchor::Center);
+    }
+}
+
+void GYScreenshotPopup::onDownloadFail() {
+    CCSprite* fallbackSprite = CCSprite::create("noPreview.png"_spr);
+    m_mainLayer->addChildAtPosition(fallbackSprite, Anchor::Center);
+}
+
+std::string GYScreenshotPopup::extractLastSegment(const std::string& input) {
+    size_t lastDash = input.rfind('-');
+    if (lastDash != std::string::npos) {
+        return input.substr(lastDash + 1);
+    }
+    return input;
+}
+
+GYScreenshotPopup* GYScreenshotPopup::create(int const& text) {
+    auto ret = new GYScreenshotPopup();
+    auto winSize = CCDirector::sharedDirector()->getWinSize();
+    if (ret->initAnchored(winSize.width * .6f, winSize.height * .7f, text)) {
+        ret->autorelease();
+        return ret;
+    }
+
+    delete ret;
+    return nullptr;
+}

src/layers/GYScreenshotPopup.hpp

@@ -15,97 +15,11 @@ class GYScreenshotPopup : public geode::Popup<int const&> {
     Ref<CCImage> m_image;
     CCSprite* m_sprite;
 
-    bool setup(int const& layer) override {
-        Tags tags;
-        auto layerName = tags.getStringFromTag(layer);
-
-        if (layerName.empty()) {
-            log::error("Layer name is empty for tag: {}", layer);
-            return false;
-        }
-
-        std::string result = extractLastSegment(layerName);
-
-        auto winSize = CCDirector::sharedDirector()->getWinSize();
-        if (!m_mainLayer) {
-            log::error("m_mainLayer is not initialized");
-            return false;
-        }
-
-        this->setTitle(result);
-        m_mainLayer->setContentSize({ winSize.width * 0.6f, winSize.height * 0.7f });
-        m_mainLayer->updateLayout();
-
-        std::string URL = fmt::format("https://raw.githubusercontent.com/OmgRod/Geodify/master/previews/{}Preview.png", layerName);
-        
-        auto req = web::WebRequest();
-        m_downloadListener.bind([this](web::WebTask::Event* e) {
-            if (auto res = e->getValue()) {
-                if (!res->ok()) {
-                    log::error("Failed to download image from URL.");
-                    onDownloadFail();
-                } else {
-                    auto data = res->data();
-                    std::thread imageThread = std::thread([data, this]() {
-                        m_image = new CCImage();
-                        m_image->autorelease();
-                        m_image->initWithImageData(const_cast<uint8_t*>(data.data()), data.size());
-                        geode::Loader::get()->queueInMainThread([this]() {
-                            imageCreationFinished(m_image);
-                        });
-                    });
-                    imageThread.detach();
-                }
-            }
-        });
-        m_downloadListener.setFilter(req.get(URL));
-
-        return true;
-    }
-
-    void imageCreationFinished(CCImage* image) {
-        CCTexture2D* texture = new CCTexture2D();
-        texture->autorelease();
-        texture->initWithImage(image);
-
-        m_sprite = CCSprite::createWithTexture(texture);
-        if (m_sprite) {
-            auto maxWidth = m_mainLayer->getContentSize().width * 0.75f;
-            auto maxHeight = m_mainLayer->getContentSize().height * 0.75f;
-
-            auto spriteWidth = m_sprite->getContentSize().width;
-            auto spriteHeight = m_sprite->getContentSize().height;
-
-            float scale = std::min(maxWidth / spriteWidth, maxHeight / spriteHeight);
-            m_sprite->setScale(scale);
-
-            m_mainLayer->addChildAtPosition(m_sprite, Anchor::Center);
-        }
-    }
-
-    void onDownloadFail() {
-        CCSprite* fallbackSprite = CCSprite::create("noPreview.png"_spr);
-        m_mainLayer->addChildAtPosition(fallbackSprite, Anchor::Center);
-    }
+    bool setup(int const& layer) override;
+    void imageCreationFinished(CCImage* image);
+    void onDownloadFail();
 
 public:
-    std::string extractLastSegment(const std::string& input) {
-        size_t lastDash = input.rfind('-');
-        if (lastDash != std::string::npos) {
-            return input.substr(lastDash + 1);
-        }
-        return input;
-    }
-
-    static GYScreenshotPopup* create(int const& text) {
-        auto ret = new GYScreenshotPopup();
-        auto winSize = CCDirector::sharedDirector()->getWinSize();
-        if (ret->initAnchored(winSize.width * .6f, winSize.height * .7f, text)) {
-            ret->autorelease();
-            return ret;
-        }
-
-        delete ret;
-        return nullptr;
-    }
+    static GYScreenshotPopup* create(int const& text);
+    std::string extractLastSegment(const std::string& input);
 };