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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2020-08-20 14:00:36 -04:00
parent cee0ddce56 1237b14b7a
commit 6d20e354b1
1 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@ package mindustry.ui.dialogs;
import arc.*; import arc.*;
import arc.Net.*; import arc.Net.*;
import arc.files.*; import arc.files.*;
import arc.func.*;
import arc.graphics.*; import arc.graphics.*;
import arc.graphics.g2d.*; import arc.graphics.g2d.*;
import arc.scene.ui.TextButton.*; import arc.scene.ui.TextButton.*;
@@ -106,31 +107,13 @@ public class ModsDialog extends BaseDialog{
Core.settings.put("lastmod", text); Core.settings.put("lastmod", text);
ui.loadfrag.show(); ui.loadfrag.show();
Core.net.httpGet("http://api.github.com/repos/" + text + "/zipball/master", loc -> { // Try to download the 6.0 branch first, but if it doesnt exist try master.
Core.net.httpGet(loc.getHeader("Location"), result -> { githubImport("6.0", text, e1 -> {
if(result.getStatus() != HttpStatus.OK){ githubImport("master", text, e2 -> {
ui.showErrorMessage(Core.bundle.format("connectfail", result.getStatus())); ui.showErrorMessage(Core.bundle.format("connectfail", e2));
ui.loadfrag.hide(); ui.loadfrag.hide();
}else{ });
try{ });
Fi file = tmpDirectory.child(text.replace("/", "") + ".zip");
Streams.copy(result.getResultAsStream(), file.write(false));
mods.importMod(file);
file.delete();
Core.app.post(() -> {
try{
setup();
ui.loadfrag.hide();
}catch(Throwable e){
ui.showException(e);
}
});
}catch(Throwable e){
modError(e);
}
}
}, t2 -> Core.app.post(() -> modError(t2)));
}, t2 -> Core.app.post(() -> modError(t2)));
}); });
}).margin(12f); }).margin(12f);
}); });
@@ -288,8 +271,33 @@ public class ModsDialog extends BaseDialog{
}*/ }*/
}).width(400f); }).width(400f);
dialog.show(); dialog.show();
} }
private void githubImport(String branch, String repo, Cons<HttpStatus> err){
Core.net.httpGet("http://api.github.com/repos/" + repo + "/zipball/" + branch, loc -> {
Core.net.httpGet(loc.getHeader("Location"), result -> {
if(result.getStatus() != HttpStatus.OK){
err.get(result.getStatus());
}else{
try{
Fi file = tmpDirectory.child(repo.replace("/", "") + ".zip");
Streams.copy(result.getResultAsStream(), file.write(false));
mods.importMod(file);
file.delete();
Core.app.post(() -> {
try{
setup();
ui.loadfrag.hide();
}catch(Throwable e){
ui.showException(e);
}
});
}catch(Throwable e){
modError(e);
}
}
}, t2 -> Core.app.post(() -> modError(t2)));
}, t2 -> Core.app.post(() -> modError(t2)));
}
} }