Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Display status after downloads are complete.

Browse Source
This commit is contained in:
MEEPofFaith
2024-04-18 11:40:14 -07:00
parent 6e3bc2b4c3
commit eff7d75712
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/mindustry/mod/Mods.java
View File

@@ -681,9 +681,10 @@ public class Mods implements Loadable{
mod.missingDependencies.each(toImport::addUnique); mod.missingDependencies.each(toImport::addUnique);
}); });
Seq<String> remaining = toImport.copy(); Seq<String> remaining = toImport.copy();
ui.mods.importDependencies(remaining); ui.mods.importDependencies(remaining, () -> {
toImport.removeAll(remaining); toImport.removeAll(remaining);
displayDependencyImportStatus(remaining, toImport); displayDependencyImportStatus(remaining, toImport);
});
}).size(150, 50); }).size(150, 50);
}}.show(); }}.show();
} }

5
core/src/mindustry/ui/dialogs/ModsDialog.java
View File

@@ -673,12 +673,13 @@ public class ModsDialog extends BaseDialog{
} }
} }
public void importDependencies(Seq<String> dependencies){ public void importDependencies(Seq<String> dependencies, Runnable done){
getModList(listings -> { getModList(listings -> {
listings.each(l -> dependencies.contains(l.internalName), l -> { listings.each(l -> dependencies.contains(l.internalName), l -> {
githubImportMod(l.repo, l.hasJava);
dependencies.remove(l.internalName); dependencies.remove(l.internalName);
githubImportMod(l.repo, l.hasJava);
}); });
done.run();
}); });
} }