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

Fix UI

Browse Source
This commit is contained in:
MEEPofFaith
2024-04-22 14:29:47 -07:00
parent 3019eb24dc
commit 6862e18cef
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -184,7 +184,8 @@ mod.scripts.disable = Your device does not support mods with scripts. You must d
mod.dependencies.error = [scarlet]Mods are missing dependencies mod.dependencies.error = [scarlet]Mods are missing dependencies
mod.dependencies.soft = (optional) mod.dependencies.soft = (optional)
mod.dependencies.download = Import Required mod.dependencies.download = Import
mod.dependencies.downloadreq = Import Required
mod.dependencies.downloadall = Import All mod.dependencies.downloadall = Import All
mod.dependencies.status = Import Results mod.dependencies.status = Import Results
mod.dependencies.success = Successfully downloaded: mod.dependencies.success = Successfully downloaded:

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

@@ -670,9 +670,10 @@ public class Mods implements Loadable{
new Dialog(""){{ new Dialog(""){{
setFillParent(true); setFillParent(true);
cont.margin(15); cont.margin(15);
cont.add("@mod.dependencies.error").colspan(2); int span = soft ? 3 : 2;
cont.add("@mod.dependencies.error").colspan(span);
cont.row(); cont.row();
cont.image().width(300f).colspan(2).pad(2).height(4f).color(Color.scarlet); cont.image().width(300f).colspan(span).pad(2).height(4f).color(Color.scarlet);
cont.row(); cont.row();
cont.pane(p -> { cont.pane(p -> {
toCheck.each(mod -> { toCheck.each(mod -> {
@@ -692,17 +693,17 @@ public class Mods implements Loadable{
}).growX().padBottom(8f).padLeft(12f); }).growX().padBottom(8f).padLeft(12f);
p.row(); p.row();
}); });
}).fillX().colspan(2); }).fillX().colspan(span);
cont.row(); cont.row();
cont.button("@cancel", this::hide).size(soft ? 100 : 150, 50); cont.button("@cancel", this::hide).size(150, 50);
cont.button(soft ? "@mod.dependencies.downloadall" : "@mod.dependencies.download", () -> { cont.button(soft ? "@mod.dependencies.downloadreq" : "@mod.dependencies.download", () -> {
hide(); hide();
Seq<String> toImport = new Seq<>(); Seq<String> toImport = new Seq<>();
toCheck.each(mod -> mod.missingDependencies.each(toImport::addUnique)); toCheck.each(mod -> mod.missingDependencies.each(toImport::addUnique));
downloadDependencies(toImport); downloadDependencies(toImport);
}).size(soft ? 100 : 150, 50); }).size(150, 50);
if(soft){ if(soft){
cont.button("@mod.dependencies.downloadall", () -> { cont.button("@mod.dependencies.downloadall", () -> {
hide(); hide();
@@ -710,7 +711,7 @@ public class Mods implements Loadable{
toCheck.each(mod -> mod.missingDependencies.each(toImport::addUnique)); toCheck.each(mod -> mod.missingDependencies.each(toImport::addUnique));
toCheck.each(mod -> mod.missingSoftDependencies.each(toImport::addUnique)); toCheck.each(mod -> mod.missingSoftDependencies.each(toImport::addUnique));
downloadDependencies(toImport); downloadDependencies(toImport);
}).size(100, 50); }).size(150, 50);
} }
}}.show(); }}.show();
} }