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

Mod release browser cleanup

Browse Source
This commit is contained in:
Anuken
2022-06-27 10:06:58 -04:00
parent b72702957b
commit 3ef0f0f56e
3 changed files with 46 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/bundles/bundle.properties
View File

@@ -46,7 +46,7 @@ mods.browser.add = Install
mods.browser.reinstall = Reinstall mods.browser.reinstall = Reinstall
mods.browser.view-releases = View Releases mods.browser.view-releases = View Releases
mods.browser.noreleases = [scarlet]No Releases Found\n[accent]Couldn't find any releases for this mod. Check if the mod's repository has any releases published. mods.browser.noreleases = [scarlet]No Releases Found\n[accent]Couldn't find any releases for this mod. Check if the mod's repository has any releases published.
mods.browser.latest = <Latest> mods.browser.latest = [lightgray][Latest]
mods.browser.releases = Releases mods.browser.releases = Releases
mods.github.open = Repo mods.github.open = Repo
mods.github.open-release = Release Page mods.github.open-release = Release Page

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

@@ -40,7 +40,7 @@ public class ModsDialog extends BaseDialog{
private float modImportProgress; private float modImportProgress;
private String searchtxt = ""; private String searchtxt = "";
private @Nullable Seq<ModListing> modList; private @Nullable Seq<ModListing> modList;
private boolean orderDate = false; private boolean orderDate = true;
private BaseDialog currentContent; private BaseDialog currentContent;
private BaseDialog browser; private BaseDialog browser;
@@ -506,10 +506,12 @@ public class ModsDialog extends BaseDialog{
load.cont.add("[accent]Fetching Releases..."); load.cont.add("[accent]Fetching Releases...");
load.show(); load.show();
Http.get(ghApi + "/repos/" + mod.repo + "/releases", res -> { Http.get(ghApi + "/repos/" + mod.repo + "/releases", res -> {
load.hide();
var json = Jval.read(res.getResultAsString()); var json = Jval.read(res.getResultAsString());
JsonArray releases = json.asArray(); JsonArray releases = json.asArray();
Core.app.post(() -> {
load.hide();
if(releases.size == 0){ if(releases.size == 0){
ui.showInfo("@mods.browser.noreleases"); ui.showInfo("@mods.browser.noreleases");
}else{ }else{
@@ -520,8 +522,8 @@ public class ModsDialog extends BaseDialog{
var release = releases.get(j); var release = releases.get(j);
int index = j; int index = j;
p.table(((TextureRegionDrawable) Tex.whiteui).tint(Pal.darkestGray), t -> { p.table(((TextureRegionDrawable)Tex.whiteui).tint(Pal.darkestGray), t -> {
t.add((index == 0 ? Core.bundle.get("mods.browser.latest") + " " : "") + release.getString("name")).top().left().growX().wrap().pad(5f).color(Pal.accent); t.add("[accent]" + release.getString("name") + (index == 0 ? " " + Core.bundle.get("mods.browser.latest") : "")).top().left().growX().wrap().pad(5f);
t.row(); t.row();
t.add((release.getString("published_at")).substring(0, 10).replaceAll("-", "/")).top().left().growX().wrap().pad(5f).color(Color.gray); t.add((release.getString("published_at")).substring(0, 10).replaceAll("-", "/")).top().left().growX().wrap().pad(5f).color(Color.gray);
t.table(b -> { t.table(b -> {
@@ -548,6 +550,10 @@ public class ModsDialog extends BaseDialog{
downloads.show(); downloads.show();
} }
}); });
}, t -> Core.app.post(() -> {
modError(t);
load.hide();
}));
}); });
sel.keyDown(KeyCode.escape, sel::hide); sel.keyDown(KeyCode.escape, sel::hide);
sel.keyDown(KeyCode.back, sel::hide); sel.keyDown(KeyCode.back, sel::hide);

2
gradle.properties
View File

@@ -25,4 +25,4 @@ org.gradle.caching=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000 org.gradle.internal.http.connectionTimeout=100000
archash=47a46d410b archash=da27a54ef9