Partial 7.0 merge - API preview

This commit is contained in:
Anuken
2021-06-02 11:08:08 -04:00
parent ea75a357ca
commit 28b235ef07
531 changed files with 12356 additions and 6286 deletions

View File

@@ -15,6 +15,9 @@ import static mindustry.Vars.*;
public class Schematic implements Publishable, Comparable<Schematic>{
public final Seq<Stile> tiles;
/** These are used for the schematic tag UI. */
public Seq<String> labels = new Seq<>();
/** Internal meta tags. */
public StringMap tags;
public int width, height;
public @Nullable Fi file;
@@ -29,7 +32,7 @@ public class Schematic implements Publishable, Comparable<Schematic>{
}
public float powerProduction(){
return tiles.sumf(s -> s.block instanceof PowerGenerator ? ((PowerGenerator)s.block).powerProduction : 0f);
return tiles.sumf(s -> s.block instanceof PowerGenerator p ? p.powerProduction : 0f);
}
public float powerConsumption(){