diff --git a/CMakeLists.txt b/CMakeLists.txt index a3d00c1..cbc6e30 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,14 +6,6 @@ set(CMAKE_CXX_VISIBILITY_PRESET hidden) project(TWS VERSION 1.0.0) -if("${GEODE_TARGET_PLATFORM}" STREQUAL "iOS") - message(STATUS "building for ios uwu") - unset(CMAKE_OSX_ARCHITECTURES) - set(CMAKE_OSX_ARCHITECTURES arm64) - set(CMAKE_OSX_DEPLOYMENT_TARGET "14.0") - set(CMAKE_SYSTEM_NAME "iOS") -endif() - add_library(${PROJECT_NAME} SHARED src/main.cpp src/TextureWorkshopLayer.cpp @@ -26,7 +18,6 @@ else() message(STATUS "Found Geode: $ENV{GEODE_SDK}") endif() - add_subdirectory($ENV{GEODE_SDK} ${CMAKE_CURRENT_BINARY_DIR}/geode) -setup_geode_mod(${PROJECT_NAME}) \ No newline at end of file +setup_geode_mod(${PROJECT_NAME}) diff --git a/src/TexturePackCell.hpp b/src/TexturePackCell.hpp index 89a19cd..3c72526 100644 --- a/src/TexturePackCell.hpp +++ b/src/TexturePackCell.hpp @@ -44,7 +44,7 @@ class TexturePackCell : public CCLayerColor { this->setPositionY(207); float scale = CCDirector::sharedDirector()->getContentScaleFactor()/4; - ghc::filesystem::path filePath = fmt::format("{}/packs/{}.zip", Loader::get()->getInstalledMod("geode.texture-loader")->getConfigDir(), tp->name); + std::filesystem::path filePath = fmt::format("{}/packs/{}.zip", Loader::get()->getInstalledMod("geode.texture-loader")->getConfigDir(), tp->name); gradient = CCLayerGradient::create(ccc4(0, 0, 0, 100), ccc4(0, 255, 0, 100)); gradient->setContentSize(this->getContentSize()); @@ -53,7 +53,7 @@ class TexturePackCell : public CCLayerColor { std::string versionSaveThing = fmt::format("{} Version", tp->name); - if (ghc::filesystem::exists(filePath)) { + if (std::filesystem::exists(filePath)) { if (Mod::get()->getSavedValue(versionSaveThing) == tp->version) { gradient = CCLayerGradient::create(ccc4(0, 0, 0, 100), ccc4(0, 255, 0, 100)); gradient->setContentSize(this->getContentSize()); @@ -196,9 +196,9 @@ class TexturePackCell : public CCLayerColor { menu_selector(TexturePackCell::onDelete) ); - if (!ghc::filesystem::exists(filePath)) { + if (!std::filesystem::exists(filePath)) { viewBtnMenu->addChild(downloadButton); - } else if (ghc::filesystem::exists(filePath) && Mod::get()->getSavedValue(versionSaveThing) != tp->version) { + } else if (std::filesystem::exists(filePath) && Mod::get()->getSavedValue(versionSaveThing) != tp->version) { viewBtnMenu->addChild(downloadButton); } else { viewBtnMenu->addChild(deleteButton); @@ -239,7 +239,7 @@ class TexturePackCell : public CCLayerColor { }) .expect([this, fileName](std::string const& err) { Notification::create("Download Failed", CCSprite::createWithSpriteFrameName("GJ_deleteIcon_001.png"))->show(); - ghc::filesystem::remove(fileName); + std::filesystem::remove(fileName); }); } @@ -256,7 +256,7 @@ class TexturePackCell : public CCLayerColor { [this](auto, bool btn2) { if (btn2) { std::string fileName = fmt::format("{}/packs/{}.zip", Loader::get()->getInstalledMod("geode.texture-loader")->getConfigDir(), texturePack->name); - ghc::filesystem::remove(fileName); + std::filesystem::remove(fileName); Notification::create(fmt::format("Deleted {}!", texturePack->name), CCSprite::createWithSpriteFrameName("GJ_completesIcon_001.png"))->show(); auto workshopLayer = TextureWorkshopLayer::scene(); CCDirector::sharedDirector()->pushScene(workshopLayer); diff --git a/src/TexturePackInfo.hpp b/src/TexturePackInfo.hpp index 21b2f29..38b893e 100644 --- a/src/TexturePackInfo.hpp +++ b/src/TexturePackInfo.hpp @@ -23,7 +23,7 @@ class TexturePackInfo : public Popup { texturePack = tp; - ghc::filesystem::path filePath = fmt::format("{}/packs/{}.zip", Loader::get()->getInstalledMod("geode.texture-loader")->getConfigDir(), tp->name); + std::filesystem::path filePath = fmt::format("{}/packs/{}.zip", Loader::get()->getInstalledMod("geode.texture-loader")->getConfigDir(), tp->name); auto winSize = CCDirector::get()->getWinSize(); float scale = CCDirector::sharedDirector()->getContentScaleFactor()/4; @@ -128,7 +128,7 @@ class TexturePackInfo : public Popup { viewBtnMenu->setLayout(RowLayout::create()); viewBtnMenu->setContentSize(downloadButtonSpr->getContentSize()); - if (!ghc::filesystem::exists(filePath)) { + if (!std::filesystem::exists(filePath)) { viewBtnMenu->addChild(downloadButton); downloadButton->setPosition(downloadButtonSpr->getContentSize() / 2); } else { @@ -156,7 +156,7 @@ class TexturePackInfo : public Popup { .expect([this](std::string const& err) { Notification::create("Download Failed", CCSprite::createWithSpriteFrameName("GJ_deleteIcon_001.png"))->show(); std::string fileName = fmt::format("{}/packs/{}.zip", Loader::get()->getInstalledMod("geode.texture-loader")->getConfigDir(), texturePack->name); - ghc::filesystem::remove(fileName); + std::filesystem::remove(fileName); }); } @@ -168,7 +168,7 @@ class TexturePackInfo : public Popup { [this](auto, bool btn2) { if (btn2) { std::string fileName = fmt::format("{}/packs/{}.zip", Loader::get()->getInstalledMod("geode.texture-loader")->getConfigDir(), texturePack->name); - ghc::filesystem::remove(fileName); + std::filesystem::remove(fileName); Notification::create(fmt::format("Deleted {}!", texturePack->name), CCSprite::createWithSpriteFrameName("GJ_completesIcon_001.png"))->show(); auto workshopLayer = TextureWorkshopLayer::scene(); this->onClose(nullptr);