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

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Browse Source 
 Conflicts:
	core/src/mindustry/ui/dialogs/PlanetDialog.java
This commit is contained in:
Anuken
2021-08-13 10:08:34 -04:00
parent 90a58388d6 033dadae2c
commit 2200a44653
56 changed files with 415 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/mindustry/world/meta/StatValues.java
View File

@@ -49,11 +49,7 @@ public class StatValues{
public static StatValue liquids(Boolf<Liquid> filter, float amount, boolean perSecond){
return table -> {
Seq<Liquid> list = new Seq<>();
for(Liquid item : content.liquids()){
if(!item.isHidden() && filter.get(item)) list.add(item);
}
Seq<Liquid> list = content.liquids().select(i -> filter.get(i) && i.unlockedNow());
for(int i = 0; i < list.size; i++){
table.add(new LiquidDisplay(list.get(i), amount, perSecond)).padRight(5);
@@ -91,7 +87,7 @@ public class StatValues{
public static StatValue items(float timePeriod, Boolf<Item> filter){
return table -> {
Seq<Item> list = content.items().select(filter);
Seq<Item> list = content.items().select(i -> filter.get(i) && i.unlockedNow());
for(int i = 0; i < list.size; i++){
Item item = list.get(i);