remove deprecated funcs from mod and fix wasSuccesfullyLoaded

geode-sdk · Dec 20, 2023 · 151303c · 151303c
1 parent 6bc67e9
commit 151303c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 20 deletions.
diff --git a/loader/include/Geode/loader/Mod.hpp b/loader/include/Geode/loader/Mod.hpp
@@ -84,10 +84,7 @@ namespace geode {
         ghc::filesystem::path getPackagePath() const;
         VersionInfo getVersion() const;
         bool isEnabled() const;
-        [[deprecated("use isEnabled instead")]] bool isLoaded() const;
         bool supportsDisabling() const;
-        [[deprecated("always true")]] bool canDisable() const;
-        [[deprecated("always true")]] bool canEnable() const;
         bool needsEarlyLoad() const;
         bool wasSuccessfullyLoaded() const;
         ModMetadata getMetadata() const;

diff --git a/loader/src/loader/Index.cpp b/loader/src/loader/Index.cpp
@@ -745,7 +745,7 @@ void Index::Impl::installNext(size_t index, IndexInstallList const& list) {
         .join("install_item_" + item->getMetadata().getID())
         .fetch(item->getDownloadURL())
         .into(tempFile)
-        .then([=](auto) {
+        .then([=, this](auto) {
             // Check for 404
             auto notFound = utils::file::readString(tempFile);
             if (notFound && notFound.unwrap() == "Not Found") {

diff --git a/loader/src/loader/LoaderImpl.cpp b/loader/src/loader/LoaderImpl.cpp
@@ -429,7 +429,7 @@ void Loader::Impl::loadModGraph(Mod* node, bool early) {
     else {
         std::thread([=]() {
             auto res = unzipFunction();
-            queueInMainThread([=]() {
+            queueInMainThread([=, this]() {
                 if (!res) {
                     m_problems.push_back({
                         LoadProblem::Type::UnzipFailed,
@@ -812,7 +812,7 @@ void Loader::Impl::downloadLoaderResources(bool useLatestRelease) {
                 this->getVersion().toString()
             ), true);  
         })
-        .expect([=](std::string const& info, int code) {
+        .expect([=, this](std::string const& info, int code) {
             if (code == 404) {
                 if (useLatestRelease) {
                     log::debug("Loader version {} does not exist on Github, downloading latest resources", this->getVersion().toString());

diff --git a/loader/src/loader/Mod.cpp b/loader/src/loader/Mod.cpp
@@ -44,28 +44,16 @@ bool Mod::isEnabled() const {
     return m_impl->isEnabled();
 }
 
-bool Mod::isLoaded() const {
-    return this->isEnabled();
-}
-
 bool Mod::supportsDisabling() const {
     return m_impl->supportsDisabling();
 }
 
-bool Mod::canDisable() const {
-    return true;
-}
-
-bool Mod::canEnable() const {
-    return true;
-}
-
 bool Mod::needsEarlyLoad() const {
     return m_impl->needsEarlyLoad();
 }
 
 bool Mod::wasSuccessfullyLoaded() const {
-    return m_impl->wasSuccessfullyLoaded();
+    return this->isEnabled();
 }
 
 ModMetadata Mod::getMetadata() const {
@@ -218,4 +206,4 @@ bool Mod::hasSavedValue(std::string const& key) {
 
 bool Mod::shouldLoad() const {
     return m_impl->shouldLoad();
-}
+}