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

More browser cleanup

Browse Source
This commit is contained in:
Anuken
2020-12-23 12:03:43 -05:00
parent b6f1b67b24
commit 8ac027af70
4 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/mindustry/core/Version.java
View File

@@ -46,6 +46,19 @@ public class Version{
}
}
/** @return whether the version is greater than the specified version string, e.g. "120.1"*/
public static boolean isAtLeast(String str){
if(build <= 0 || str == null || str.isEmpty()) return true;
int dot = str.indexOf('.');
if(dot != -1){
int major = Strings.parseInt(str.substring(0, dot)), minor = Strings.parseInt(str.substring(dot + 1));
return build >= major && revision >= minor;
}else{
return build >= Strings.parseInt(str, 0);
}
}
public static String buildString(){
return build < 0 ? "custom" : build + (revision == 0 ? "" : "." + revision);
}

3
core/src/mindustry/mod/ModListing.java
View File

@@ -3,6 +3,7 @@ package mindustry.mod;
/** Mod listing as a data class. */
public class ModListing{
public String repo, name, author, lastUpdated, description, minGameVersion;
public boolean hasScripts, hasJava;
public int stars;
@Override
@@ -14,6 +15,8 @@ public class ModListing{
", lastUpdated='" + lastUpdated + '\'' +
", description='" + description + '\'' +
", minGameVersion='" + minGameVersion + '\'' +
", hasScripts=" + hasScripts +
", hasJava=" + hasJava +
", stars=" + stars +
'}';
}

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

@@ -13,6 +13,8 @@ import arc.struct.*;
import arc.util.*;
import arc.util.io.*;
import arc.util.serialization.*;
import mindustry.*;
import mindustry.core.*;
import mindustry.ctype.*;
import mindustry.gen.*;
import mindustry.graphics.*;
@@ -165,21 +167,22 @@ public class ModsDialog extends BaseDialog{
tablebrow.clear();
for(ModListing mod : listings){
if(!searchtxt.isEmpty() && !mod.repo.contains(searchtxt)) continue;
if(!searchtxt.isEmpty() && !mod.repo.contains(searchtxt) || (Vars.ios && (mod.hasScripts || mod.hasJava))) continue;
tablebrow.button(btn -> {
btn.top().left();
btn.margin(12f);
btn.table(con -> {
con.left();
con.add("[lightgray]Name:[] " + mod.name + "\n[lightgray]Author:[] " + mod.author + "\n[accent]\uE809 " + mod.stars)
con.add("[accent]" + mod.name + "\n[lightgray]Author:[] " + mod.author + "\n[accent]\uE809 " + mod.stars +
(Version.isAtLeast(mod.minGameVersion) ? "" : "\n" + Core.bundle.format("mod.requiresversion", mod.minGameVersion)))
.width(388f).wrap().growX().pad(0f, 6f, 0f, 6f).left().labelAlign(Align.left);
con.add().growX().pad(0f, 6f, 0f, 6f);
}).fillY().growX().pad(0f, 6f, 0f, 6f);
}, Styles.modsb, () -> {
var sel = new BaseDialog((Core.bundle.get("mods.browser.selected")) + ": " + mod.name);
var sel = new BaseDialog(mod.name);
sel.cont.add(mod.description).width(mobile ? 400f : 500f).wrap().pad(4f).labelAlign(Align.center, Align.left);
sel.buttons.defaults().size(200f, 54f).pad(2f);
sel.buttons.defaults().size(150f, 54f).pad(2f);
sel.setFillParent(false);
sel.buttons.button("@back", Icon.left, () -> {
sel.clear();