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

Implemented some PR features

Browse Source
This commit is contained in:
Anuken
2020-04-16 13:46:45 -04:00
parent c6bbdfdc9b
commit 2693f9c176
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/ui/dialogs/SchematicsDialog.java
View File

@@ -313,7 +313,11 @@ public class SchematicsDialog extends FloatingDialog{
int i = 0;
for(ItemStack s : arr){
r.addImage(s.item.icon(Cicon.small)).left();
r.add(s.amount + "").padLeft(2).left().color(Color.lightGray).padRight(4);
r.label(() -> {
Tilec core = player.closestCore();
if(core == null || state.rules.infiniteResources || core.items().has(s.item, s.amount)) return "[lightgray]" + s.amount + "";
return (core.items().has(s.item, s.amount) ? "[lightgray]" : "[scarlet]") + Math.min(core.items().get(s.item), s.amount) + "[lightgray]/" + s.amount;
}).padLeft(2).left().padRight(4);
if(++i % 4 == 0){
r.row();

1
core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@@ -326,6 +326,7 @@ public class SettingsMenuDialog extends SettingsDialog{
if(!mobile){
graphics.checkPref("blockselectkeys", true);
}
graphics.checkPref("playerindicators", true);
graphics.checkPref("indicators", true);
graphics.checkPref("animatedwater", true);
if(Shaders.shield != null){