Slightly cleaner code

This commit is contained in:
MEEPofFaith
2024-04-22 14:23:19 -07:00
parent d21cab42a7
commit 3019eb24dc
2 changed files with 5 additions and 9 deletions

View File

@@ -117,6 +117,7 @@ public class Mods implements Loadable{
var loaded = loadMod(dest, true, true);
mods.add(loaded);
newImports.add(loaded);
//invalidate ordered mods cache
lastOrderedMods = null;
requiresReload = true;
@@ -772,10 +773,14 @@ public class Mods implements Loadable{
}
cont.button("@ok", this::hide).size(300, 50);
closeOnBack();
}}.show();
}
public void reload(){
newImports.each(this::updateDependencies);
newImports.remove(m -> m.missingDependencies.isEmpty() && m.softDependencies.isEmpty());
if(newImports.any()){
checkDependencies(newImports, true);
}else{
@@ -1010,14 +1015,6 @@ public class Mods implements Loadable{
return result;
}
/** Checks if a newly imported mod's dependencies are already added. */
public void loadImportDependencies(LoadedMod mod){
updateDependencies(mod);
if(mod.missingDependencies.any() || mod.missingSoftDependencies.any()){
newImports.add(mod);
}
}
private boolean resolve(String element, ModResolutionContext context){
context.visited.add(element);
for(final var dependency : context.dependencies.get(element)){

View File

@@ -619,7 +619,6 @@ public class ModsDialog extends BaseDialog{
var mod = mods.importMod(file);
mod.setRepo(repo);
mods.loadImportDependencies(mod);
file.delete();
Core.app.post(() -> {