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

Fixed startup crashing

Browse Source
This commit is contained in:
Anuken
2019-03-31 10:37:52 -04:00
parent a6c9bd3182
commit 160ae4e244
5 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/io/anuke/mindustry/ui/ContentDisplay.java
View File

@@ -1,6 +1,7 @@
package io.anuke.mindustry.ui;
import io.anuke.arc.Core;
import io.anuke.arc.collection.Array;
import io.anuke.arc.collection.OrderedMap;
import io.anuke.arc.graphics.Color;
import io.anuke.arc.scene.ui.layout.Table;
@@ -45,7 +46,7 @@ public class ContentDisplay{
BlockStats stats = block.stats;
for(StatCategory cat : stats.toMap().keys()){
OrderedMap<BlockStat, StatValue> map = stats.toMap().get(cat);
OrderedMap<BlockStat, Array<StatValue>> map = stats.toMap().get(cat);
if(map.size == 0) continue;
@@ -56,7 +57,11 @@ public class ContentDisplay{
table.table(inset -> {
inset.left();
inset.add("[LIGHT_GRAY]" + stat.localized() + ":[] ");
map.get(stat).display(inset);
Array<StatValue> arr = map.get(stat);
for(StatValue value : arr){
value.display(inset);
}
//map.get(stat).display(inset);
}).fillX().padLeft(10);
table.row();
}

2
core/src/io/anuke/mindustry/ui/LiquidDisplay.java
View File

@@ -23,7 +23,7 @@ public class LiquidDisplay extends Table{
t.add(Strings.toFixed(amount, 2));
add(t);
}
}}).size(8*3);
}}).size(8*4);
add(liquid.localizedName()).padLeft(3);
}
}