2.208 update (#71)

* Switch to geode::Function in a lot of places
* use pathToString instead of .string()

Author: hiimjasmine00

include/TextureLoader.hpp

@@ -35,3 +35,5 @@ inline std::vector<Pack> getAvailablePacks() GEODE_EVENT_EXPORT_NORES(&getAvaila
 inline std::vector<Pack> getAppliedPacks() GEODE_EVENT_EXPORT_NORES(&getAppliedPacks, ());
 
 }
+
+#undef MY_MOD_ID

src/DragThingy.cpp

@@ -2,7 +2,7 @@
 
 #include <utility>
 
-bool DragThingy::init(std::function<void()> onClick, std::function<void(CCPoint)> onMove, std::function<void()> onRelease) {
+bool DragThingy::init(Function<void()> onClick, Function<void(CCPoint)> onMove, Function<void()> onRelease) {
     if (!CCLayer::init()) return false;
 
     m_onClick = std::move(onClick);
@@ -38,12 +38,12 @@ void DragThingy::ccTouchEnded(CCTouch* touch, CCEvent*) {
         m_onRelease();
 }
 
-DragThingy* DragThingy::create(std::function<void()> onClick, std::function<void(CCPoint)> onMove, std::function<void()> onRelease) {
-    auto ret = new DragThingy;
+DragThingy* DragThingy::create(Function<void()> onClick, Function<void(CCPoint)> onMove, Function<void()> onRelease) {
+    auto ret = new DragThingy();
     if (ret->init(std::move(onClick), std::move(onMove), std::move(onRelease))) {
         ret->autorelease();
         return ret;
     }
-    CC_SAFE_DELETE(ret);
+    delete ret;
     return nullptr;
 }

src/DragThingy.hpp

@@ -6,16 +6,16 @@ using namespace geode::prelude;
 
 class DragThingy : public CCLayer {
 protected:
-    std::function<void()> m_onClick;
-    std::function<void(CCPoint)> m_onMove;
-    std::function<void()> m_onRelease;
+    Function<void()> m_onClick;
+    Function<void(CCPoint)> m_onMove;
+    Function<void()> m_onRelease;
 
-    bool init(std::function<void()> onClick, std::function<void(CCPoint)> onMove, std::function<void()> onRelease);
+    bool init(Function<void()> onClick, Function<void(CCPoint)> onMove, Function<void()> onRelease);
 
     bool ccTouchBegan(CCTouch* touch, CCEvent*) override;
     void ccTouchMoved(CCTouch* touch, CCEvent*) override;
     void ccTouchEnded(CCTouch* touch, CCEvent*) override;
 
 public:
-    static DragThingy* create(std::function<void()> onClick, std::function<void(CCPoint)> onMove, std::function<void()> onRelease);
+    static DragThingy* create(Function<void()> onClick, Function<void(CCPoint)> onMove, Function<void()> onRelease);
 };

src/Pack.cpp

@@ -50,13 +50,13 @@ std::filesystem::path Pack::getResourcesPath() const {
 std::string Pack::getID() const {
     return m_info.has_value() ? 
         m_info.value().m_id :
-        m_path.filename().string();
+        string::pathToString(m_path.filename());
 }
 
 std::string Pack::getDisplayName() const {
     return m_info.has_value() ?
         m_info.value().m_name :
-        m_path.filename().string();
+        string::pathToString(m_path.filename());
 }
 
 std::optional<PackInfo> Pack::getInfo() const {
@@ -66,7 +66,7 @@ std::optional<PackInfo> Pack::getInfo() const {
 Result<> Pack::apply() {
     CCFileUtils::get()->addTexturePack(CCTexturePack {
         .m_id = this->getID(),
-        .m_paths = { this->getResourcesPath().string() }
+        .m_paths = { string::pathToString(this->getResourcesPath()) }
     });
     return Ok();
 }
@@ -105,7 +105,7 @@ Result<> Pack::extract() {
     // this method is only for zips and stuff
     if (std::filesystem::is_directory(m_path)) return Ok();
 
-    auto const fileExt = m_path.extension().string();
+    auto const fileExt = string::pathToString(m_path.extension());
     // TODO: we dont support rar, lol
     if (fileExt != ".zip" && fileExt != ".apk") {
         return Err("Expected zip or apk");
@@ -153,7 +153,7 @@ Result<> Pack::extract() {
 std::optional<std::filesystem::path> Pack::findResourcesPath(std::filesystem::path targetPath) {
     // Packs are often distributed in weird ways, this code tries to find where the resources actually are..
 
-    if (m_path.extension().string() == ".apk") {
+    if (string::pathToString(m_path.extension()) == ".apk") {
         // resources can only be in one place! very easy
         return m_unzippedPath / "assets";
     }
@@ -183,8 +183,8 @@ std::optional<std::filesystem::path> Pack::findResourcesPath(std::filesystem::pa
         if (!file.is_regular_file()) continue;
 
         auto const path = file.path();
-        auto const name = path.stem().string();
-        auto const ext = path.extension().string();
+        auto const name = string::pathToString(path.stem());
+        auto const ext = string::pathToString(path.extension());
 
         if (ext == ".plist") {
             return targetPath;
@@ -219,14 +219,6 @@ Pack::~Pack() {
 }
 
 Result<std::shared_ptr<Pack>> Pack::from(std::filesystem::path const& dir) {
-    #ifdef GEODE_IS_WINDOWS
-    try {
-        (void) dir.filename().string();
-    } catch(const std::exception& e) {
-        return Err("Invalid path");
-    }
-    #endif
-
     if (!std::filesystem::exists(dir)) {
         return Err("Path does not exist");
     }

src/PackInfoPopup.cpp

@@ -6,8 +6,9 @@
 class WackyBypassFont : public CCLabelBMFont {
 protected:
     void setFntFile(std::filesystem::path fnt) {
-        auto conf = FNTConfigLoadFile(fnt.string().c_str());
-        m_sFntFile = fnt.string();
+        auto fntString = string::pathToString(fnt);
+        auto conf = FNTConfigLoadFile(fntString.c_str());
+        m_sFntFile = fntString;
         if (!conf) {
             log::error("!conf ?????");
             return;
@@ -16,7 +17,7 @@ class WackyBypassFont : public CCLabelBMFont {
         if (m_pConfiguration)
             m_pConfiguration->release();
         m_pConfiguration = conf;
-        conf->m_sAtlasName = fnt.replace_extension("png").string();
+        conf->m_sAtlasName = string::pathToString(fnt.replace_extension("png"));
 
         this->setTexture(
             CCTextureCache::sharedTextureCache()->addImage(conf->getAtlasName(), false)
@@ -52,7 +53,7 @@ std::filesystem::path PackInfoPopup::getPathInPack(const char* filename) const {
 
     auto fname = std::filesystem::path(filename);
     fname.replace_filename(
-        fname.stem().string() + suffix + fname.extension().string()
+        string::pathToString(fname.stem()) + suffix + string::pathToString(fname.extension())
     );
 
     if (std::filesystem::exists(m_pack->getResourcesPath() / fname)) {
@@ -62,8 +63,10 @@ std::filesystem::path PackInfoPopup::getPathInPack(const char* filename) const {
     }
 }
 
-bool PackInfoPopup::init() {
-    if (!Popup::init(320.f, 200.f, this->getPathInPack("GJ_square01.png").string().c_str())) return false;
+bool PackInfoPopup::init(const std::shared_ptr<Pack>& pack) {
+    if (!Popup::init(320.f, 200.f, string::pathToString(this->getPathInPack("GJ_square01.png")).c_str())) return false;
+
+    m_pack = pack;
 
     auto title = WackyBypassFont::create(
         m_pack->getDisplayName().c_str(),
@@ -96,8 +99,8 @@ bool PackInfoPopup::init() {
     auto defaultBtnSize =
         defaultBtnLabel->getScaledContentSize() + CCSize { 20.f, 15.f };
 
-    auto defaultBtnSpr = CCScale9Sprite::create(
-        this->getPathInPack("GJ_button_01.png").string().c_str(),
+    auto defaultBtnSpr = NineSlice::create(
+        string::pathToString(this->getPathInPack("GJ_button_01.png")),
         { 0, 0, 40, 40 }
     );
     defaultBtnSpr->setContentSize(defaultBtnSize);
@@ -123,8 +126,8 @@ bool PackInfoPopup::init() {
     auto altBtnSize =
         altBtnLabel->getScaledContentSize() + CCSize { 20.f, 15.f };
 
-    auto altBtnSpr = CCScale9Sprite::create(
-        this->getPathInPack("GJ_button_02.png").string().c_str(),
+    auto altBtnSpr = NineSlice::create(
+        string::pathToString(this->getPathInPack("GJ_button_02.png")),
         { 0, 0, 40, 40 }
     );
     altBtnSpr->setContentSize(altBtnSize);
@@ -144,8 +147,7 @@ bool PackInfoPopup::init() {
 
 PackInfoPopup* PackInfoPopup::create(const std::shared_ptr<Pack>& pack) {
     auto ret = new PackInfoPopup;
-    ret->m_pack = pack;
-    if (ret->init()) {
+    if (ret->init(pack)) {
         ret->autorelease();
         return ret;
     }

src/PackInfoPopup.hpp

@@ -9,7 +9,7 @@ class PackInfoPopup : public Popup {
 protected:
     std::shared_ptr<Pack> m_pack;
 
-    bool init();
+    bool init(const std::shared_ptr<Pack>& pack);
 
     std::filesystem::path getPathInPack(const char* filename) const;
 public:

src/PackManager.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "Pack.hpp"
-#include <unordered_map>
 #include <Geode/utils/cocos.hpp>
 
 enum class PackListType {

src/PackNode.cpp

@@ -1,7 +1,6 @@
 #include "PackNode.hpp"
 #include <Geode/binding/CCMenuItemToggler.hpp>
 #include <Geode/ui/LazySprite.hpp>
-#include "PackManager.hpp"
 #include "PackSelectPopup.hpp"
 #include "PackInfoPopup.hpp"
 #include "DragThingy.hpp"
@@ -125,10 +124,10 @@ bool PackNode::init(
 
     this->addChild(dragHandle);
 
-    m_draggingBg = CCScale9Sprite::create(
+    m_draggingBg = NineSlice::create(
         "square02b_001.png"
     );
-    m_draggingBg->setCapInsets({10, 10, 50, 50});
+    m_draggingBg->setInsets({10, 10, 10, 10});
     m_draggingBg->setColor({ 0, 0, 0 });
     m_draggingBg->setOpacity(90);
     m_draggingBg->setContentSize(this->getContentSize());
@@ -152,11 +151,11 @@ PackNode* PackNode::create(
     const std::shared_ptr<Pack>& pack,
     float width
 ) {
-    auto ret = new PackNode;
+    auto ret = new PackNode();
     if (ret->init(layer, pack, width)) {
         ret->autorelease();
         return ret;
     }
-    CC_SAFE_DELETE(ret);
+    delete ret;
     return nullptr;
 }

src/PackNode.hpp

@@ -2,7 +2,6 @@
 
 #include <Geode/binding/CCMenuItemSpriteExtra.hpp>
 #include "Pack.hpp"
-#include <functional>
 
 using namespace geode::prelude;
 
@@ -12,7 +11,7 @@ class PackNode : public CCNode {
 protected:
     PackSelectPopup* m_layer;
     std::shared_ptr<Pack> m_pack;
-    CCScale9Sprite* m_draggingBg;
+    NineSlice* m_draggingBg;
 
     bool init(
         PackSelectPopup* layer,

src/PackSelectPopup.cpp

@@ -105,7 +105,7 @@ bool PackSelectPopup::init() {
     availableTitle->setID("available-text");
     m_mainLayer->addChild(availableTitle);
 
-    auto availableListBG = CCScale9Sprite::create(
+    auto availableListBG = NineSlice::create(
         "square02b_001.png", { 0, 0, 80, 80 }
     );
     availableListBG->setColor({ 0, 0, 0 });
@@ -139,7 +139,7 @@ bool PackSelectPopup::init() {
     appliedTitle->setID("applied-text");
     m_mainLayer->addChild(appliedTitle);
 
-    auto appliedListBG = CCScale9Sprite::create(
+    auto appliedListBG = NineSlice::create(
         "square02b_001.png", { 0, 0, 80, 80 }
     );
     appliedListBG->setColor({ 0, 0, 0 });
@@ -389,6 +389,6 @@ PackSelectPopup* PackSelectPopup::create() {
         ret->autorelease();
         return ret;
     }
-    CC_SAFE_DELETE(ret);
+    delete ret;
     return nullptr;
 }