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

Gradual component conversion

Browse Source
This commit is contained in:
Anuken
2020-02-02 20:17:22 -05:00
parent 63fa50d111 ad6e0bcd0f
commit f2f31120a0
70 changed files with 1061 additions and 1217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/ui/ContentDisplay.java
View File

@@ -131,6 +131,8 @@ public class ContentDisplay{
table.row();
}
//TODO implement later
/*
public static void displayMech(Table table, Mech mech){
table.table(title -> {
title.addImage(mech.icon(Cicon.xlarge)).size(8 * 6);
@@ -177,9 +179,9 @@ public class ContentDisplay{
table.add(Core.bundle.format("mech.minepower", mech.drillPower));
table.row();
}
}
}*/
public static void displayUnit(Table table, UnitType unit){
public static void displayUnit(Table table, UnitDef unit){
table.table(title -> {
title.addImage(unit.icon(Cicon.xlarge)).size(8 * 6);
title.add("[accent]" + unit.localizedName).padLeft(5);

8
core/src/mindustry/ui/dialogs/JoinDialog.java
View File

@@ -144,16 +144,16 @@ public class JoinDialog extends FloatingDialog{
}
}
}).margin(3f).padTop(6f).top().right();
}).margin(3f).pad(2).padTop(6f).top().right();
inner.addImageButton(Icon.refresh, Styles.emptyi, () -> {
refreshServer(server);
}).margin(3f).padTop(6f).top().right();
}).margin(3f).pad(2).padTop(6f).top().right();
inner.addImageButton(Icon.pencil, Styles.emptyi, () -> {
renaming = server;
add.show();
}).margin(3f).padTop(6f).top().right();
}).margin(3f).pad(2).padTop(6f).top().right();
inner.addImageButton(Icon.trash, Styles.emptyi, () -> {
ui.showConfirm("$confirm", "$server.delete", () -> {
@@ -162,7 +162,7 @@ public class JoinDialog extends FloatingDialog{
setupRemote();
refreshRemote();
});
}).margin(3f).pad(6).top().right();
}).margin(3f).pad(2).pad(6).top().right();
button.row();