Merge branch 'mod-dependencies' of https://github.com/MEEPofFaith/Mindustry into MEEPofFaith-mod-dependencies
This commit is contained in:
@@ -94,7 +94,7 @@ public class ModsDialog extends BaseDialog{
|
||||
|
||||
hidden(() -> {
|
||||
if(mods.requiresReload()){
|
||||
reload();
|
||||
mods.reload();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -378,13 +378,6 @@ public class ModsDialog extends BaseDialog{
|
||||
return null;
|
||||
}
|
||||
|
||||
private void reload(){
|
||||
ui.showInfoOnHidden("@mods.reloadexit", () -> {
|
||||
Log.info("Exiting to reload mods.");
|
||||
Core.app.exit();
|
||||
});
|
||||
}
|
||||
|
||||
private void showMod(LoadedMod mod){
|
||||
BaseDialog dialog = new BaseDialog(mod.meta.displayName);
|
||||
|
||||
@@ -696,6 +689,16 @@ public class ModsDialog extends BaseDialog{
|
||||
}
|
||||
}
|
||||
|
||||
public void importDependencies(Seq<String> dependencies, Runnable done){
|
||||
getModList(listings -> {
|
||||
listings.each(l -> dependencies.contains(l.internalName), l -> {
|
||||
dependencies.remove(l.internalName);
|
||||
githubImportMod(l.repo, l.hasJava);
|
||||
});
|
||||
done.run();
|
||||
});
|
||||
}
|
||||
|
||||
private void githubImportJavaMod(String repo, @Nullable String release){
|
||||
//grab latest release
|
||||
Http.get(ghApi + "/repos/" + repo + "/releases/" + (release == null ? "latest" : release), res -> {
|
||||
|
||||
Reference in New Issue
Block a user