7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2025-04-04 09:11:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

revert the dependency stuff

Browse source
This commit is contained in:
altalk23 2024-01-01 20:51:29 +03:00
parent 00b90e2d98
commit 94d03ed630
2 changed files with 4 additions and 14 deletions

16
loader/src/loader/LoaderImpl.cpp
View file

@ -353,9 +353,6 @@ void Loader::Impl::buildModGraph() {
}
void Loader::Impl::loadModGraph(Mod* node, bool early) {
if (node->isEnabled()) {
return;
}
if (early && !node->needsEarlyLoad()) {
m_modsToLoad.push_back(node);
return;
@ -373,19 +370,12 @@ void Loader::Impl::loadModGraph(Mod* node, bool early) {
log::debug("{} {}", node->getID(), node->getVersion());
log::pushNest();
if (node->shouldLoad()) {
bool hasUnresolvedDependencies = false;
if (node->isEnabled()) {
for (auto const& dep : node->m_impl->m_dependants) {
if (dep->isEnabled())
continue;
m_modsToLoad.push_front(dep);
hasUnresolvedDependencies = true;
}
if (hasUnresolvedDependencies) {
log::debug("Has unresolved dependencies, loading later");
log::popNest();
return;
}
log::popNest();
return;
}
m_currentlyLoadingMod = node;

2
loader/src/loader/ModMetadataImpl.cpp
View file

@ -17,7 +17,7 @@ ModMetadata::Impl& ModMetadataImpl::getImpl(ModMetadata& info) {
bool ModMetadata::Dependency::isResolved() const {
return this->importance != Importance::Required ||
this->mod && this->mod->shouldLoad() && this->version.compare(this->mod->getVersion());
this->mod && this->mod->isEnabled() && this->version.compare(this->mod->getVersion());
}
bool ModMetadata::Incompatibility::isResolved() const {