remove Mod::getMetadataRef

Fleeym · Fleeym · commit 130dd130bc35 · 2025-12-23T16:09:40.000+02:00
Also make Mod::getMetadata return a const&amp;.
diff --git a/loader/include/Geode/loader/Mod.hpp b/loader/include/Geode/loader/Mod.hpp
@@ -101,9 +101,7 @@ namespace geode {
         bool isInternal() const;
         bool needsEarlyLoad() const;
 
-        [[deprecated("Use Mod::getMetadataRef which is better for efficiency")]]
-        ModMetadata getMetadata() const; // TODO: remove in v5
-        ModMetadata const& getMetadataRef() const;
+        ModMetadata const& getMetadata() const;
 
         std::filesystem::path getTempDir() const;
         /**
diff --git a/loader/src/hooks/MenuLayer.cpp b/loader/src/hooks/MenuLayer.cpp
@@ -223,7 +223,7 @@ struct CustomMenuLayer : Modify<CustomMenuLayer, MenuLayer> {
         }
 
         for (auto mod : Loader::get()->getAllMods()) {
-            if (mod->getMetadataRef().usesDeprecatedIDForm()) {
+            if (mod->getMetadata().usesDeprecatedIDForm()) {
                 log::error(
                     "Mod ID '{}' will be rejected in the future - "
                     "IDs must match the regex `[a-z0-9\\-_]+\\.[a-z0-9\\-_]+`",
diff --git a/loader/src/load.cpp b/loader/src/load.cpp
@@ -22,7 +22,7 @@ using namespace geode::prelude;
     });
 
     ipc::listen("loader-info", [](ipc::IPCEvent* event) -> matjson::Value {
-        return Mod::get()->getMetadataRef();
+        return Mod::get()->getMetadata();
     });
 
     ipc::listen("list-mods", [](ipc::IPCEvent* event) -> matjson::Value {
@@ -37,12 +37,12 @@ using namespace geode::prelude;
         if (!dontIncludeLoader) {
             res.push_back(
                 includeRunTimeInfo ? Mod::get()->getRuntimeInfo() :
-                                     Mod::get()->getMetadataRef().toJSON()
+                                     Mod::get()->getMetadata().toJSON()
             );
         }
 
         for (auto& mod : Loader::get()->getAllMods()) {
-            res.push_back(includeRunTimeInfo ? mod->getRuntimeInfo() : mod->getMetadataRef().toJSON());
+            res.push_back(includeRunTimeInfo ? mod->getRuntimeInfo() : mod->getMetadata().toJSON());
         }
 
         return res;
diff --git a/loader/src/loader/LoaderImpl.cpp b/loader/src/loader/LoaderImpl.cpp
@@ -253,7 +253,7 @@ void Loader::Impl::updateModResources(Mod* mod) {
     }
 
     // only thing needs previous setup is spritesheets
-    auto& sheets = mod->getMetadataRef().getSpritesheets();
+    auto& sheets = mod->getMetadata().getSpritesheets();
     if (sheets.empty())
         return;
 
@@ -416,7 +416,7 @@ void Loader::Impl::loadModGraph(Mod* node, bool early) {
     // invalid target version
     // Also this makes it so that when GD updates, outdated mods get shown as
     // "Outdated" in the UI instead of "Missing Dependencies"
-    auto res = node->getMetadataRef().checkGameVersion();
+    auto res = node->getMetadata().checkGameVersion();
     if (!res) {
         this->addProblem({
             LoadProblem::Type::UnsupportedVersion,
@@ -427,10 +427,10 @@ void Loader::Impl::loadModGraph(Mod* node, bool early) {
         return;
     }
 
-    auto geodeVerRes = node->getMetadataRef().checkGeodeVersion();
+    auto geodeVerRes = node->getMetadata().checkGeodeVersion();
     if (!geodeVerRes) {
         this->addProblem({
-            node->getMetadataRef().getGeodeVersion() > this->getVersion() ?
+            node->getMetadata().getGeodeVersion() > this->getVersion() ?
                 LoadProblem::Type::NeedsNewerGeodeVersion :
                 LoadProblem::Type::UnsupportedGeodeVersion,
             node,
@@ -463,7 +463,7 @@ void Loader::Impl::loadModGraph(Mod* node, bool early) {
 
     auto unzipFunction = [this, node]() {
         log::debug("Unzipping .geode file");
-        auto res = this->unzipGeodeFile(node->getMetadataRef());
+        auto res = this->unzipGeodeFile(node->getMetadata());
         return res;
     };
 
@@ -487,7 +487,7 @@ void Loader::Impl::loadModGraph(Mod* node, bool early) {
     };
 
     {   // version checking
-        if (auto reason = node->getMetadataRef().m_impl->m_softInvalidReason) {
+        if (auto reason = node->getMetadata().m_impl->m_softInvalidReason) {
             this->addProblem({
                 LoadProblem::Type::InvalidFile,
                 node,
@@ -553,7 +553,7 @@ void Loader::Impl::findProblems() {
         log::debug("{}", id);
         log::NestScope nest;
 
-        for (auto const& dep : mod->getMetadataRef().getDependencies()) {
+        for (auto const& dep : mod->getMetadata().getDependencies()) {
             if (dep.mod && dep.mod->isEnabled() && dep.version.compare(dep.mod->getVersion()))
                 continue;
 
@@ -628,7 +628,7 @@ void Loader::Impl::findProblems() {
             }
         }
 
-        for (auto const& dep : mod->getMetadataRef().getIncompatibilities()) {
+        for (auto const& dep : mod->getMetadata().getIncompatibilities()) {
             if (!dep.mod || !dep.version.compare(dep.mod->getVersion()) || !dep.mod->shouldLoad())
                 continue;
             switch(dep.importance) {
@@ -926,7 +926,7 @@ Result<> Loader::Impl::unzipGeodeFile(ModMetadata metadata) {
         }
 
         const std::string filename = utils::string::pathToString(entry.path().filename());
-        if (filename == metadata.getBinaryName() || !isPlatformBinary(metadata.getID(), filename)) {
+        if (metadata.getBinaryName() == filename || !isPlatformBinary(metadata.getID(), filename)) {
             continue;
         }
 
diff --git a/loader/src/loader/Mod.cpp b/loader/src/loader/Mod.cpp
@@ -72,11 +72,7 @@ bool Mod::needsEarlyLoad() const {
     return m_impl->needsEarlyLoad();
 }
 
-ModMetadata Mod::getMetadata() const {
-    return m_impl->getMetadata();
-}
-
-ModMetadata const& Mod::getMetadataRef() const {
+ModMetadata const& Mod::getMetadata() const {
     return m_impl->getMetadata();
 }
 
diff --git a/loader/src/server/DownloadManager.cpp b/loader/src/server/DownloadManager.cpp
@@ -397,7 +397,7 @@ bool ModDownloadManager::checkAutoConfirm() {
             // If some installed mod is incompatible with this one,
             // we need to ask for confirmation
             for (auto mod : Loader::get()->getAllMods()) {
-                for (auto inc : mod->getMetadataRef().getIncompatibilities()) {
+                for (auto inc : mod->getMetadata().getIncompatibilities()) {
                     if (inc.id == download.getID() && (!download.getVersion().has_value() || inc.version.compare(download.getVersion().value()))) {
                         return false;
                     }
diff --git a/loader/src/ui/GeodeUI.cpp b/loader/src/ui/GeodeUI.cpp
@@ -110,7 +110,7 @@ void geode::openModsList() {
 }
 
 void geode::openIssueReportPopup(Mod* mod) {
-    if (mod->getMetadataRef().getIssues()) {
+    if (mod->getMetadata().getIssues()) {
         MDPopup::create(
             "Issue Report",
                 fmt::format(
@@ -126,7 +126,7 @@ void geode::openIssueReportPopup(Mod* mod) {
                     return;
                 }
 
-                auto issues = mod->getMetadataRef().getIssues();
+                auto issues = mod->getMetadata().getIssues();
                 if (issues && issues->url) {
                     auto& url = *issues->url;
                     web::openLinkInBrowser(url);
@@ -151,7 +151,7 @@ void geode::openIssueReportPopup(Mod* mod) {
 }
 
 void geode::openSupportPopup(Mod* mod) {
-    openSupportPopup(mod->getMetadataRef());
+    openSupportPopup(mod->getMetadata());
 }
 
 void geode::openSupportPopup(ModMetadata const& metadata) {
diff --git a/loader/src/ui/mods/list/ModDeveloperList.cpp b/loader/src/ui/mods/list/ModDeveloperList.cpp
@@ -56,7 +56,7 @@ bool ModDeveloperList::init(DevListPopup* popup, ModSource const& source, CCSize
 
     m_source.visit(makeVisitor {
         [this, popup, itemSize](Mod* mod) {
-            for (auto& dev : mod->getMetadataRef().getDevelopers()) {
+            for (auto& dev : mod->getMetadata().getDevelopers()) {
                 m_list->m_contentLayer->addChild(ModDeveloperItem::create(popup, dev, itemSize, std::nullopt, false));
             }
         },
diff --git a/loader/src/ui/mods/list/ModProblemItem.cpp b/loader/src/ui/mods/list/ModProblemItem.cpp
@@ -256,7 +256,7 @@ std::string ModProblemItem::createProblemMessage() {
         case LoadProblem::Type::UnsupportedGeodeVersion: {
             ss << fmt::format(
                 "requires Geode {} to run (installed: {})",
-                m_source->getMetadataRef().getGeodeVersion(),
+                m_source->getMetadata().getGeodeVersion(),
                 Loader::get()->getVersion().toNonVString()
             );
             return ss.str();
diff --git a/loader/src/ui/mods/popups/ConfirmInstall.cpp b/loader/src/ui/mods/popups/ConfirmInstall.cpp
@@ -20,7 +20,7 @@ void askConfirmModInstalls() {
     auto toConfirm = ToConfirm();
 
     // Collect all things we need to ask confirmation for
-    for (auto download : ModDownloadManager::get()->getDownloads()) {
+    for (auto& download : ModDownloadManager::get()->getDownloads()) {
         auto status = download.getStatus();
         if (auto conf = std::get_if<DownloadStatusConfirm>(&status)) {
             if (auto dep = download.getDependencyFor()) {
@@ -37,38 +37,38 @@ void askConfirmModInstalls() {
                 // ones
 
                 // If this mod has incompatabilities that are installed, disable them
-                for (auto inc : conf->version.metadata.getIncompatibilities()) {
+                for (auto& inc : conf->version.metadata.getIncompatibilities()) {
                     if (inc.mod && inc.version.compare(conf->version.metadata.getVersion()) && inc.mod->isOrWillBeEnabled()) {
                         toConfirm.toDisable.insert(inc.mod);
                     }
-                    for (auto download : ModDownloadManager::get()->getDownloads()) {
+                    for (auto& download : ModDownloadManager::get()->getDownloads()) {
                         if (download.isDone() && inc.id == download.getID() && inc.version.compare(conf->version.metadata.getVersion())) {
                             toConfirm.toDisableModId.insert(inc.id);
                         }
                     }
                 }
                 // If some installed mods are incompatible with this one, disable them
                 for (auto mod : Loader::get()->getAllMods()) {
-                    for (auto inc : mod->getMetadataRef().getIncompatibilities()) {
-                        if (inc.id == conf->version.metadata.getID() && inc.version.compare(mod->getVersion()) && mod->isOrWillBeEnabled()) {
+                    for (auto& inc : mod->getMetadata().getIncompatibilities()) {
+                        if (conf->version.metadata.getID() == inc.id && inc.version.compare(mod->getVersion()) && mod->isOrWillBeEnabled()) {
                             toConfirm.toDisable.insert(mod);
                         }
                     }
                 }
                 // If some newly downloaded mods are incompatible with this one, disable them
-                for (auto download : ModDownloadManager::get()->getDownloads()) {
+                for (auto& download : ModDownloadManager::get()->getDownloads()) {
                     auto status = download.getStatus();
                     if (auto done = std::get_if<DownloadStatusDone>(&status)) {
-                        for (auto inc : done->version.metadata.getIncompatibilities()) {
-                            if (inc.id == conf->version.metadata.getID() && inc.version.compare(done->version.metadata.getVersion())) {
+                        for (auto& inc : done->version.metadata.getIncompatibilities()) {
+                            if (conf->version.metadata.getID() == inc.id && inc.version.compare(done->version.metadata.getVersion())) {
                                 toConfirm.toDisableModId.insert(download.getID());
                             }
                         }
                     }
                 }
 
                 // If this mod has required dependencies that are disabled, enable them
-                for (auto dep : conf->version.metadata.getDependencies()) {
+                for (auto& dep : conf->version.metadata.getDependencies()) {
                     if (
                         dep.importance == ModMetadata::Dependency::Importance::Required &&
                         dep.mod && !dep.mod->isOrWillBeEnabled()
diff --git a/loader/src/ui/mods/sources/InstalledModListSource.cpp b/loader/src/ui/mods/sources/InstalledModListSource.cpp
@@ -26,7 +26,7 @@ bool InstalledModsQuery::queryCheck(ModSource const& src, double& weighted) cons
         addToList = src.asMod()->isEnabled() == *enabledOnly;
     }
     if (query) {
-        addToList = modFuzzyMatch(src.asMod()->getMetadataRef(), *query, weighted);
+        addToList = modFuzzyMatch(src.asMod()->getMetadata(), *query, weighted);
     }
     // Loader gets boost to ensure it's normally always top of the list
     if (addToList && src.asMod()->isInternal()) {
diff --git a/loader/src/ui/mods/sources/ModSource.cpp b/loader/src/ui/mods/sources/ModSource.cpp
@@ -59,7 +59,7 @@ ModMetadata const& ModSource::getMetadata() const {
         // the return type annotation is super important here or else for some unknown to me reason
         // those lambdas decide to return a value and thus the function will return a ref to a temporary
         [](Mod* mod) -> ModMetadata const& {
-            return mod->getMetadataRef();
+            return mod->getMetadata();
         },
         [](server::ServerModMetadata const& metadata) -> ModMetadata const& {
             // Versions should be guaranteed to have at least one item
@@ -71,7 +71,7 @@ ModMetadata const& ModSource::getMetadata() const {
 std::string ModSource::formatDevelopers() const {
     return std::visit(makeVisitor {
         [](Mod* mod) {
-            return ModMetadata::formatDeveloperDisplayString(mod->getMetadataRef().getDevelopers());
+            return ModMetadata::formatDeveloperDisplayString(mod->getMetadata().getDevelopers());
         },
         [](server::ServerModMetadata const& metadata) {
             // Versions should be guaranteed to have at least one item
@@ -136,7 +136,7 @@ server::ServerRequest<std::optional<std::string>> ModSource::fetchAbout() const
     // todo: write as visit
     if(!this->hasUpdates()) {
         if (auto mod = this->asMod()) {
-            return server::ServerRequest<std::optional<std::string>>::immediate(Ok(mod->getMetadataRef().getDetails()));
+            return server::ServerRequest<std::optional<std::string>>::immediate(Ok(mod->getMetadata().getDetails()));
         }
     }
     return server::getMod(this->getID()).map(
@@ -151,7 +151,7 @@ server::ServerRequest<std::optional<std::string>> ModSource::fetchAbout() const
 server::ServerRequest<std::optional<std::string>> ModSource::fetchChangelog() const {
     if(!this->hasUpdates()) {
         if (auto mod = this->asMod()) {
-            return server::ServerRequest<std::optional<std::string>>::immediate(Ok(mod->getMetadataRef().getChangelog()));
+            return server::ServerRequest<std::optional<std::string>>::immediate(Ok(mod->getMetadata().getChangelog()));
         }
     }
     return server::getMod(this->getID()).map(
@@ -173,7 +173,7 @@ server::ServerRequest<std::vector<server::ServerTag>> ModSource::fetchValidTags(
     std::unordered_set<std::string> modTags;
     std::visit(makeVisitor {
         [&](Mod* mod) {
-            modTags = mod->getMetadataRef().getTags();
+            modTags = mod->getMetadata().getTags();
         },
         [&](server::ServerModMetadata const& metadata) {
             modTags = metadata.tags;

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ struct CustomMenuLayer : Modify<CustomMenuLayer, MenuLayer> {`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`for (auto mod : Loader::get()->getAllMods()) {`
`226`		`- if (mod->getMetadataRef().usesDeprecatedIDForm()) {`
	`226`	`+ if (mod->getMetadata().usesDeprecatedIDForm()) {`
`227`	`227`	`log::error(`
`228`	`228`	`"Mod ID '{}' will be rejected in the future - "`
`229`	`229`	"IDs must match the regex `[a-z0-9\\-_]+\\.[a-z0-9\\-_]+`",
Original file line number	Diff line number	Diff line change
`@@ -72,11 +72,7 @@ bool Mod::needsEarlyLoad() const {`
`72`	`72`	`return m_impl->needsEarlyLoad();`
`73`	`73`	`}`
`74`	`74`
`75`		`-ModMetadata Mod::getMetadata() const {`
`76`		`- return m_impl->getMetadata();`
`77`		`-}`
`78`		`-`
`79`		`-ModMetadata const& Mod::getMetadataRef() const {`
	`75`	`+ModMetadata const& Mod::getMetadata() const {`
`80`	`76`	`return m_impl->getMetadata();`
`81`	`77`	`}`
`82`	`78`
Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,7 @@ bool ModDownloadManager::checkAutoConfirm() {`
`397`	`397`	`// If some installed mod is incompatible with this one,`
`398`	`398`	`// we need to ask for confirmation`
`399`	`399`	`for (auto mod : Loader::get()->getAllMods()) {`
`400`		`- for (auto inc : mod->getMetadataRef().getIncompatibilities()) {`
	`400`	`+ for (auto inc : mod->getMetadata().getIncompatibilities()) {`
`401`	`401`	`if (inc.id == download.getID() && (!download.getVersion().has_value() \|\| inc.version.compare(download.getVersion().value()))) {`
`402`	`402`	`return false;`
`403`	`403`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ void geode::openModsList() {`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`void geode::openIssueReportPopup(Mod* mod) {`
`113`		`- if (mod->getMetadataRef().getIssues()) {`
	`113`	`+ if (mod->getMetadata().getIssues()) {`
`114`	`114`	`MDPopup::create(`
`115`	`115`	`"Issue Report",`
`116`	`116`	`fmt::format(`
`@@ -126,7 +126,7 @@ void geode::openIssueReportPopup(Mod* mod) {`
`126`	`126`	`return;`
`127`	`127`	`}`
`128`	`128`
`129`		`- auto issues = mod->getMetadataRef().getIssues();`
	`129`	`+ auto issues = mod->getMetadata().getIssues();`
`130`	`130`	`if (issues && issues->url) {`
`131`	`131`	`auto& url = *issues->url;`
`132`	`132`	`web::openLinkInBrowser(url);`
`@@ -151,7 +151,7 @@ void geode::openIssueReportPopup(Mod* mod) {`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`void geode::openSupportPopup(Mod* mod) {`
`154`		`- openSupportPopup(mod->getMetadataRef());`
	`154`	`+ openSupportPopup(mod->getMetadata());`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`void geode::openSupportPopup(ModMetadata const& metadata) {`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ bool ModDeveloperList::init(DevListPopup* popup, ModSource const& source, CCSize`
`56`	`56`
`57`	`57`	`m_source.visit(makeVisitor {`
`58`	`58`	`[this, popup, itemSize](Mod* mod) {`
`59`		`- for (auto& dev : mod->getMetadataRef().getDevelopers()) {`
	`59`	`+ for (auto& dev : mod->getMetadata().getDevelopers()) {`
`60`	`60`	`m_list->m_contentLayer->addChild(ModDeveloperItem::create(popup, dev, itemSize, std::nullopt, false));`
`61`	`61`	`}`
`62`	`62`	`},`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ void askConfirmModInstalls() {`
`20`	`20`	`auto toConfirm = ToConfirm();`
`21`	`21`
`22`	`22`	`// Collect all things we need to ask confirmation for`
`23`		`- for (auto download : ModDownloadManager::get()->getDownloads()) {`
	`23`	`+ for (auto& download : ModDownloadManager::get()->getDownloads()) {`
`24`	`24`	`auto status = download.getStatus();`
`25`	`25`	`if (auto conf = std::get_if<DownloadStatusConfirm>(&status)) {`
`26`	`26`	`if (auto dep = download.getDependencyFor()) {`
`@@ -37,38 +37,38 @@ void askConfirmModInstalls() {`
`37`	`37`	`// ones`
`38`	`38`
`39`	`39`	`// If this mod has incompatabilities that are installed, disable them`
`40`		`- for (auto inc : conf->version.metadata.getIncompatibilities()) {`
	`40`	`+ for (auto& inc : conf->version.metadata.getIncompatibilities()) {`
`41`	`41`	`if (inc.mod && inc.version.compare(conf->version.metadata.getVersion()) && inc.mod->isOrWillBeEnabled()) {`
`42`	`42`	`toConfirm.toDisable.insert(inc.mod);`
`43`	`43`	`}`
`44`		`- for (auto download : ModDownloadManager::get()->getDownloads()) {`
	`44`	`+ for (auto& download : ModDownloadManager::get()->getDownloads()) {`
`45`	`45`	`if (download.isDone() && inc.id == download.getID() && inc.version.compare(conf->version.metadata.getVersion())) {`
`46`	`46`	`toConfirm.toDisableModId.insert(inc.id);`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`	`// If some installed mods are incompatible with this one, disable them`
`51`	`51`	`for (auto mod : Loader::get()->getAllMods()) {`
`52`		`- for (auto inc : mod->getMetadataRef().getIncompatibilities()) {`
`53`		`- if (inc.id == conf->version.metadata.getID() && inc.version.compare(mod->getVersion()) && mod->isOrWillBeEnabled()) {`
	`52`	`+ for (auto& inc : mod->getMetadata().getIncompatibilities()) {`
	`53`	`+ if (conf->version.metadata.getID() == inc.id && inc.version.compare(mod->getVersion()) && mod->isOrWillBeEnabled()) {`
`54`	`54`	`toConfirm.toDisable.insert(mod);`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`	`// If some newly downloaded mods are incompatible with this one, disable them`
`59`		`- for (auto download : ModDownloadManager::get()->getDownloads()) {`
	`59`	`+ for (auto& download : ModDownloadManager::get()->getDownloads()) {`
`60`	`60`	`auto status = download.getStatus();`
`61`	`61`	`if (auto done = std::get_if<DownloadStatusDone>(&status)) {`
`62`		`- for (auto inc : done->version.metadata.getIncompatibilities()) {`
`63`		`- if (inc.id == conf->version.metadata.getID() && inc.version.compare(done->version.metadata.getVersion())) {`
	`62`	`+ for (auto& inc : done->version.metadata.getIncompatibilities()) {`
	`63`	`+ if (conf->version.metadata.getID() == inc.id && inc.version.compare(done->version.metadata.getVersion())) {`
`64`	`64`	`toConfirm.toDisableModId.insert(download.getID());`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`// If this mod has required dependencies that are disabled, enable them`
`71`		`- for (auto dep : conf->version.metadata.getDependencies()) {`
	`71`	`+ for (auto& dep : conf->version.metadata.getDependencies()) {`
`72`	`72`	`if (`
`73`	`73`	`dep.importance == ModMetadata::Dependency::Importance::Required &&`
`74`	`74`	`dep.mod && !dep.mod->isOrWillBeEnabled()`