port to v5, remove tutorial, use event export macro

Author: matcool

include/TextureLoader.hpp

@@ -8,10 +8,15 @@
 #include <vector>
 #include <string>
 
+#ifdef MY_MOD_ID
+    #undef MY_MOD_ID
+#endif
+#define MY_MOD_ID "geode.texture-loader"
+
 namespace geode::texture_loader {
 
 inline bool isLoaded() {
-    return geode::Loader::get()->isModLoaded("geode.texture-loader");
+    return geode::Loader::get()->isModLoaded(MY_MOD_ID);
 }
 
 struct Pack {
@@ -26,21 +31,7 @@ struct Pack {
     std::filesystem::path resourcesPath;
 };
 
-namespace impl {
-    using EventGetAvailablePacks = geode::DispatchEvent<std::vector<Pack>*>;
-    using EventGetAppliedPacks = geode::DispatchEvent<std::vector<Pack>*>;
-}
-
-inline std::vector<Pack> getAvailablePacks() {
-    std::vector<Pack> result;
-    impl::EventGetAvailablePacks("geode.texture-loader/v1/get-available-packs", &result).post();
-    return result;
-}
-
-inline std::vector<Pack> getAppliedPacks() {
-    std::vector<Pack> result;
-    impl::EventGetAppliedPacks("geode.texture-loader/v1/get-applied-packs", &result).post();
-    return result;
-}
+inline std::vector<Pack> getAvailablePacks() GEODE_EVENT_EXPORT_NORES(&getAvailablePacks, ());
+inline std::vector<Pack> getAppliedPacks() GEODE_EVENT_EXPORT_NORES(&getAppliedPacks, ());
 
 }

mod.json

@@ -1,11 +1,11 @@
 {
-	"geode": "4.7.0",
-	"version": "v1.8.2",
+	"geode": "5.0.0-beta.3",
+	"version": "1.9.0",
 	"gd": {
-		"win": "2.2074",
-		"android": "2.2074",
-		"mac": "2.2074",
-		"ios": "2.2074"
+		"win": "2.2081",
+		"android": "2.2081",
+		"mac": "2.2081",
+		"ios": "2.2081"
 	},
 	"id": "geode.texture-loader",
 	"name": "Texture Loader",

src/API.cpp

@@ -1,24 +1,14 @@
+#define GEODE_DEFINE_EVENT_EXPORTS
 #include "../include/TextureLoader.hpp"
 
 #include "PackManager.hpp"
 
 using namespace geode;
 
-namespace ext = geode::texture_loader;
+namespace api = geode::texture_loader;
 
-template <class>
-struct ToFilterImpl;
-
-template <class... Args>
-struct ToFilterImpl<geode::DispatchEvent<Args...>> {
-    using type = geode::DispatchFilter<Args...>;
-};
-
-template <class T>
-using ToFilter = typename ToFilterImpl<T>::type;
-
-ext::Pack convertPack(std::shared_ptr<Pack> const& pack) {
-    ext::Pack res;
+api::Pack convertPack(std::shared_ptr<Pack> const& pack) {
+    api::Pack res;
     res.id = pack->getID();
     res.name = pack->getDisplayName();
     res.path = pack->getOriginPath();
@@ -32,14 +22,9 @@ ext::Pack convertPack(std::shared_ptr<Pack> const& pack) {
     return res;
 }
 
-$execute {
-    new EventListener(+[](std::vector<ext::Pack>* res) {
-        *res = utils::ranges::map<std::vector<ext::Pack>>(PackManager::get()->getAvailablePacks(), convertPack);
-        return ListenerResult::Stop;
-    }, ToFilter<ext::impl::EventGetAvailablePacks>("geode.texture-loader/v1/get-available-packs"));
-
-    new EventListener(+[](std::vector<ext::Pack>* res) {
-        *res = utils::ranges::map<std::vector<ext::Pack>>(PackManager::get()->getAppliedPacks(), convertPack);
-        return ListenerResult::Stop;
-    }, ToFilter<ext::impl::EventGetAppliedPacks>("geode.texture-loader/v1/get-applied-packs"));
-}
+std::vector<api::Pack> api::getAvailablePacks() {
+    return utils::ranges::map<std::vector<api::Pack>>(PackManager::get()->getAvailablePacks(), convertPack);
+}
+std::vector<api::Pack> api::getAppliedPacks() {
+    return utils::ranges::map<std::vector<api::Pack>>(PackManager::get()->getAppliedPacks(), convertPack);
+}

src/PackInfoPopup.cpp

@@ -62,11 +62,11 @@ std::filesystem::path PackInfoPopup::getPathInPack(const char* filename) const {
     }
 }
 
-bool PackInfoPopup::setup(std::shared_ptr<Pack> pack) {
-    m_pack = pack;
+bool PackInfoPopup::init() {
+    if (!Popup::init(320.f, 200.f, this->getPathInPack("GJ_square01.png").string().c_str())) return false;
 
     auto title = WackyBypassFont::create(
-        pack->getDisplayName().c_str(),
+        m_pack->getDisplayName().c_str(),
         this->getPathInPack("goldFont.fnt")
     );
     title->setPosition(
@@ -145,10 +145,7 @@ bool PackInfoPopup::setup(std::shared_ptr<Pack> pack) {
 PackInfoPopup* PackInfoPopup::create(const std::shared_ptr<Pack>& pack) {
     auto ret = new PackInfoPopup;
     ret->m_pack = pack;
-    if (ret->initAnchored(
-        320.f, 200.f, pack,
-        ret->getPathInPack("GJ_square01.png").string().c_str()
-    )) {
+    if (ret->init()) {
         ret->autorelease();
         return ret;
     }

src/PackInfoPopup.hpp

@@ -5,14 +5,13 @@
 
 using namespace geode::prelude;
 
-class PackInfoPopup : public Popup<std::shared_ptr<Pack>> {
+class PackInfoPopup : public Popup {
 protected:
     std::shared_ptr<Pack> m_pack;
 
-    bool setup(std::shared_ptr<Pack> pack) override;
+    bool init();
 
     std::filesystem::path getPathInPack(const char* filename) const;
-
 public:
     static PackInfoPopup* create(const std::shared_ptr<Pack>& pack);
 };

src/PackSelectPopup.cpp

@@ -37,7 +37,7 @@ class $modify(ReloadMenuLayer, MenuLayer) {
 static CCSize LAYER_SIZE = { 230.f, 210.f };
 
 bool PackSelectPopup::init() {
-    if (!Popup<>::initAnchored(440.f, 290.f, "GJ_square01.png")) return false;
+    if (!Popup::init(440.f, 290.f)) return false;
 
     GameManager::get()->fadeInMenuMusic();
 

src/PackSelectPopup.hpp

@@ -10,7 +10,7 @@ class PackNode;
 
 using namespace geode::prelude;
 
-class PackSelectPopup : public Popup<> {
+class PackSelectPopup : public Popup {
 protected:
     ScrollLayer* m_availableList = nullptr;
     ScrollLayer* m_appliedList = nullptr;
@@ -19,8 +19,7 @@ class PackSelectPopup : public Popup<> {
     size_t m_lastDragIdx = size_t(-1);
     PackListType m_dragListFrom, m_dragListTo;
 
-    bool setup() override { return true; }
-    bool init() override;
+    bool init();
 
     void updateList(
         ScrollLayer* list,